From f3c2d3f772ea45d98e3e5f8a81b3c6d520f39990 Mon Sep 17 00:00:00 2001 From: Sergey Date: Thu, 18 Sep 2025 12:27:44 +0000 Subject: [PATCH] 1.21.6 --- assets/minecraft/atlases/gui.json | 5 + assets/minecraft/atlases/mob_effects.json | 9 - assets/minecraft/blockstates/dried_ghast.json | 64 + assets/minecraft/equipment/black_harness.json | 9 + assets/minecraft/equipment/blue_harness.json | 9 + assets/minecraft/equipment/brown_harness.json | 9 + assets/minecraft/equipment/cyan_harness.json | 9 + assets/minecraft/equipment/gray_harness.json | 9 + assets/minecraft/equipment/green_harness.json | 9 + .../equipment/light_blue_harness.json | 9 + .../equipment/light_gray_harness.json | 9 + assets/minecraft/equipment/lime_harness.json | 9 + .../minecraft/equipment/magenta_harness.json | 9 + .../minecraft/equipment/orange_harness.json | 9 + assets/minecraft/equipment/pink_harness.json | 9 + .../minecraft/equipment/purple_harness.json | 9 + assets/minecraft/equipment/red_harness.json | 9 + assets/minecraft/equipment/white_harness.json | 9 + .../minecraft/equipment/yellow_harness.json | 9 + assets/minecraft/items/black_harness.json | 6 + assets/minecraft/items/blue_harness.json | 6 + assets/minecraft/items/brown_harness.json | 6 + assets/minecraft/items/cyan_harness.json | 6 + assets/minecraft/items/dried_ghast.json | 6 + assets/minecraft/items/gray_harness.json | 6 + assets/minecraft/items/green_harness.json | 6 + .../items/happy_ghast_spawn_egg.json | 6 + .../minecraft/items/light_blue_harness.json | 6 + .../minecraft/items/light_gray_harness.json | 6 + assets/minecraft/items/lime_harness.json | 6 + assets/minecraft/items/magenta_harness.json | 6 + assets/minecraft/items/music_disc_tears.json | 6 + assets/minecraft/items/orange_harness.json | 6 + assets/minecraft/items/pink_harness.json | 6 + assets/minecraft/items/player_head.json | 3 +- assets/minecraft/items/purple_harness.json | 6 + assets/minecraft/items/red_harness.json | 6 + assets/minecraft/items/white_harness.json | 6 + assets/minecraft/items/yellow_harness.json | 6 + assets/minecraft/lang/deprecated.json | 21 +- assets/minecraft/lang/en_us.json | 240 +- .../minecraft/models/block/dried_ghast.json | 110 + .../models/block/dried_ghast_hydration_0.json | 13 + .../models/block/dried_ghast_hydration_1.json | 13 + .../models/block/dried_ghast_hydration_2.json | 13 + .../models/block/dried_ghast_hydration_3.json | 13 + assets/minecraft/models/block/lectern.json | 7 +- .../minecraft/models/item/black_harness.json | 6 + .../minecraft/models/item/blue_harness.json | 6 + .../minecraft/models/item/brown_harness.json | 6 + .../minecraft/models/item/cyan_harness.json | 6 + .../minecraft/models/item/gray_harness.json | 6 + .../minecraft/models/item/green_harness.json | 6 + .../models/item/happy_ghast_spawn_egg.json | 6 + .../models/item/light_blue_harness.json | 6 + .../models/item/light_gray_harness.json | 6 + .../minecraft/models/item/lime_harness.json | 6 + .../models/item/magenta_harness.json | 6 + .../models/item/music_disc_tears.json | 6 + .../minecraft/models/item/orange_harness.json | 6 + .../minecraft/models/item/pink_harness.json | 6 + .../minecraft/models/item/purple_harness.json | 6 + assets/minecraft/models/item/red_harness.json | 6 + .../minecraft/models/item/white_harness.json | 6 + .../minecraft/models/item/yellow_harness.json | 6 + assets/minecraft/post_effect/blur.json | 153 +- assets/minecraft/post_effect/creeper.json | 62 +- .../minecraft/post_effect/entity_outline.json | 58 +- assets/minecraft/post_effect/invert.json | 32 +- assets/minecraft/post_effect/spider.json | 410 +-- .../minecraft/post_effect/transparency.json | 16 +- assets/minecraft/shaders/core/entity.fsh | 11 +- assets/minecraft/shaders/core/entity.vsh | 18 +- assets/minecraft/shaders/core/glint.fsh | 12 +- assets/minecraft/shaders/core/glint.vsh | 13 +- assets/minecraft/shaders/core/gui.fsh | 12 +- assets/minecraft/shaders/core/gui.vsh | 16 +- assets/minecraft/shaders/core/lightmap.fsh | 42 +- assets/minecraft/shaders/core/panorama.fsh | 11 + assets/minecraft/shaders/core/panorama.vsh | 13 + assets/minecraft/shaders/core/particle.fsh | 11 +- assets/minecraft/shaders/core/particle.vsh | 12 +- assets/minecraft/shaders/core/position.fsh | 11 +- assets/minecraft/shaders/core/position.vsh | 12 +- .../minecraft/shaders/core/position_color.fsh | 4 +- .../minecraft/shaders/core/position_color.vsh | 6 +- .../shaders/core/position_color_lightmap.fsh | 4 +- .../shaders/core/position_color_lightmap.vsh | 6 +- .../core/position_color_tex_lightmap.fsh | 4 +- .../core/position_color_tex_lightmap.vsh | 6 +- .../minecraft/shaders/core/position_tex.fsh | 4 +- .../minecraft/shaders/core/position_tex.vsh | 6 +- .../shaders/core/position_tex_color.fsh | 12 +- .../shaders/core/position_tex_color.vsh | 16 +- .../shaders/core/rendertype_beacon_beam.fsh | 10 +- .../shaders/core/rendertype_beacon_beam.vsh | 6 +- .../shaders/core/rendertype_clouds.fsh | 7 +- .../shaders/core/rendertype_clouds.vsh | 87 +- .../shaders/core/rendertype_crumbling.fsh | 10 +- .../shaders/core/rendertype_crumbling.vsh | 11 +- .../shaders/core/rendertype_end_portal.fsh | 11 +- .../shaders/core/rendertype_end_portal.vsh | 12 +- .../shaders/core/rendertype_entity_alpha.vsh | 6 +- .../shaders/core/rendertype_entity_decal.fsh | 11 +- .../shaders/core/rendertype_entity_decal.vsh | 14 +- .../shaders/core/rendertype_entity_shadow.fsh | 11 +- .../shaders/core/rendertype_entity_shadow.vsh | 12 +- ...endertype_item_entity_translucent_cull.fsh | 11 +- ...endertype_item_entity_translucent_cull.vsh | 14 +- .../shaders/core/rendertype_leash.fsh | 8 +- .../shaders/core/rendertype_leash.vsh | 13 +- .../shaders/core/rendertype_lightning.fsh | 10 +- .../shaders/core/rendertype_lightning.vsh | 12 +- .../shaders/core/rendertype_lines.fsh | 11 +- .../shaders/core/rendertype_lines.vsh | 15 +- .../shaders/core/rendertype_outline.fsh | 4 +- .../shaders/core/rendertype_outline.vsh | 6 +- .../shaders/core/rendertype_text.fsh | 11 +- .../shaders/core/rendertype_text.vsh | 12 +- .../core/rendertype_text_background.fsh | 11 +- .../core/rendertype_text_background.vsh | 12 +- ...rendertype_text_background_see_through.fsh | 2 +- ...rendertype_text_background_see_through.vsh | 6 +- .../core/rendertype_text_intensity.fsh | 11 +- .../core/rendertype_text_intensity.vsh | 12 +- .../rendertype_text_intensity_see_through.fsh | 4 +- .../rendertype_text_intensity_see_through.vsh | 6 +- .../core/rendertype_text_see_through.fsh | 4 +- .../core/rendertype_text_see_through.vsh | 6 +- .../rendertype_translucent_moving_block.fsh | 10 +- .../rendertype_translucent_moving_block.vsh | 11 +- .../shaders/core/rendertype_water_mask.fsh | 2 +- .../shaders/core/rendertype_water_mask.vsh | 6 +- .../shaders/core/rendertype_world_border.fsh | 4 +- .../shaders/core/rendertype_world_border.vsh | 8 +- assets/minecraft/shaders/core/sky.fsh | 13 + assets/minecraft/shaders/core/sky.vsh | 17 + assets/minecraft/shaders/core/stars.fsh | 9 + assets/minecraft/shaders/core/stars.vsh | 10 + assets/minecraft/shaders/core/terrain.fsh | 11 +- assets/minecraft/shaders/core/terrain.vsh | 18 +- .../shaders/include/dynamictransforms.glsl | 9 + assets/minecraft/shaders/include/fog.glsl | 48 +- assets/minecraft/shaders/include/globals.glsl | 8 + assets/minecraft/shaders/include/light.glsl | 8 +- .../minecraft/shaders/include/projection.glsl | 4 + assets/minecraft/shaders/post/bits.fsh | 11 +- assets/minecraft/shaders/post/blit.fsh | 4 +- assets/minecraft/shaders/post/blit.vsh | 8 +- assets/minecraft/shaders/post/blur.vsh | 15 +- assets/minecraft/shaders/post/box_blur.fsh | 11 +- .../minecraft/shaders/post/color_convolve.fsh | 14 +- assets/minecraft/shaders/post/invert.fsh | 4 +- assets/minecraft/shaders/post/invert.vsh | 9 +- assets/minecraft/shaders/post/rotscale.vsh | 17 +- assets/minecraft/shaders/post/screenquad.vsh | 8 +- assets/minecraft/shaders/post/sobel.vsh | 9 +- assets/minecraft/shaders/post/spiderclip.fsh | 12 +- assets/minecraft/texts/credits.json | 2249 ++++++++++------- assets/minecraft/texts/splashes.txt | 10 +- .../textures/block/acacia_door_bottom.png | 4 +- .../textures/block/acacia_door_top.png | 4 +- .../textures/block/acacia_leaves.png | 4 +- .../minecraft/textures/block/acacia_log.png | 4 +- .../textures/block/acacia_log_top.png | 4 +- .../textures/block/acacia_sapling.png | 4 +- .../textures/block/activator_rail_on.png | 4 +- assets/minecraft/textures/block/allium.png | 4 +- .../textures/block/amethyst_cluster.png | 4 +- .../textures/block/ancient_debris_side.png | 4 +- .../textures/block/ancient_debris_top.png | 4 +- assets/minecraft/textures/block/andesite.png | 4 +- assets/minecraft/textures/block/anvil_top.png | 4 +- .../textures/block/attached_melon_stem.png | 4 +- .../textures/block/attached_pumpkin_stem.png | 4 +- .../minecraft/textures/block/azalea_plant.png | 4 +- .../minecraft/textures/block/azalea_side.png | 4 +- .../minecraft/textures/block/azure_bluet.png | 4 +- .../minecraft/textures/block/bamboo_block.png | 4 +- .../textures/block/bamboo_block_top.png | 4 +- .../textures/block/bamboo_door_bottom.png | 4 +- .../textures/block/bamboo_door_top.png | 4 +- .../minecraft/textures/block/bamboo_fence.png | 4 +- .../textures/block/bamboo_large_leaves.png | 4 +- .../textures/block/bamboo_mosaic.png | 4 +- .../textures/block/bamboo_planks.png | 4 +- .../textures/block/bamboo_singleleaf.png | 4 +- .../textures/block/bamboo_small_leaves.png | 4 +- .../textures/block/bamboo_stage0.png | 4 +- .../minecraft/textures/block/bamboo_stalk.png | 4 +- .../textures/block/bamboo_trapdoor.png | 4 +- .../textures/block/barrel_bottom.png | 4 +- .../minecraft/textures/block/barrel_side.png | 4 +- .../minecraft/textures/block/barrel_top.png | 4 +- .../textures/block/barrel_top_open.png | 4 +- assets/minecraft/textures/block/beacon.png | 4 +- assets/minecraft/textures/block/bedrock.png | 4 +- .../textures/block/bee_nest_bottom.png | 4 +- .../textures/block/bee_nest_front.png | 4 +- .../textures/block/bee_nest_front_honey.png | 4 +- .../textures/block/bee_nest_side.png | 4 +- .../minecraft/textures/block/bee_nest_top.png | 4 +- .../minecraft/textures/block/beehive_end.png | 4 +- .../textures/block/beehive_front.png | 4 +- .../textures/block/beehive_front_honey.png | 4 +- .../minecraft/textures/block/beehive_side.png | 4 +- .../textures/block/beetroots_stage0.png | 4 +- .../textures/block/beetroots_stage2.png | 4 +- .../textures/block/beetroots_stage3.png | 4 +- .../textures/block/big_dripleaf_stem.png | 4 +- .../textures/block/big_dripleaf_top.png | 4 +- .../textures/block/birch_door_bottom.png | 4 +- .../textures/block/birch_door_top.png | 4 +- .../minecraft/textures/block/birch_leaves.png | 4 +- assets/minecraft/textures/block/birch_log.png | 4 +- .../textures/block/birch_log_top.png | 4 +- .../minecraft/textures/block/birch_planks.png | 4 +- .../textures/block/birch_sapling.png | 4 +- .../textures/block/birch_trapdoor.png | 4 +- .../minecraft/textures/block/black_candle.png | 4 +- .../textures/block/black_candle_lit.png | 4 +- .../textures/block/black_concrete_powder.png | 4 +- .../block/black_glazed_terracotta.png | 4 +- .../textures/block/black_shulker_box.png | 4 +- .../textures/block/black_stained_glass.png | 4 +- .../block/black_stained_glass_pane_top.png | 4 +- .../textures/block/black_terracotta.png | 4 +- .../minecraft/textures/block/black_wool.png | 4 +- .../minecraft/textures/block/blackstone.png | 4 +- .../textures/block/blackstone_top.png | 4 +- .../textures/block/blast_furnace_front.png | 4 +- .../textures/block/blast_furnace_front_on.png | 4 +- .../textures/block/blast_furnace_side.png | 4 +- .../textures/block/blast_furnace_top.png | 4 +- .../minecraft/textures/block/blue_candle.png | 4 +- .../textures/block/blue_concrete.png | 4 +- .../textures/block/blue_concrete_powder.png | 4 +- .../textures/block/blue_glazed_terracotta.png | 4 +- assets/minecraft/textures/block/blue_ice.png | 4 +- .../minecraft/textures/block/blue_orchid.png | 4 +- .../textures/block/blue_shulker_box.png | 4 +- .../textures/block/blue_stained_glass.png | 4 +- .../block/blue_stained_glass_pane_top.png | 4 +- .../textures/block/blue_terracotta.png | 4 +- assets/minecraft/textures/block/blue_wool.png | 4 +- .../textures/block/bone_block_top.png | 4 +- assets/minecraft/textures/block/bookshelf.png | 4 +- .../minecraft/textures/block/brain_coral.png | 4 +- .../textures/block/brain_coral_fan.png | 4 +- .../textures/block/brewing_stand.png | 4 +- .../textures/block/brewing_stand_base.png | 4 +- .../minecraft/textures/block/brown_candle.png | 4 +- .../textures/block/brown_candle_lit.png | 4 +- .../textures/block/brown_concrete.png | 4 +- .../textures/block/brown_concrete_powder.png | 4 +- .../block/brown_glazed_terracotta.png | 4 +- .../textures/block/brown_mushroom.png | 4 +- .../textures/block/brown_shulker_box.png | 4 +- .../block/brown_stained_glass_pane_top.png | 4 +- .../textures/block/brown_terracotta.png | 4 +- .../minecraft/textures/block/bubble_coral.png | 4 +- .../textures/block/bubble_coral_block.png | 4 +- .../textures/block/bubble_coral_fan.png | 4 +- .../textures/block/budding_amethyst.png | 4 +- assets/minecraft/textures/block/bush.png | 4 +- .../textures/block/cactus_bottom.png | 4 +- .../textures/block/cactus_flower.png | 4 +- .../minecraft/textures/block/cactus_side.png | 4 +- .../minecraft/textures/block/cactus_top.png | 4 +- .../minecraft/textures/block/cake_bottom.png | 4 +- assets/minecraft/textures/block/cake_top.png | 4 +- assets/minecraft/textures/block/calcite.png | 4 +- .../block/calibrated_sculk_sensor_top.png | 4 +- .../textures/block/campfire_fire.png | 4 +- .../minecraft/textures/block/campfire_log.png | 4 +- .../textures/block/campfire_log_lit.png | 4 +- assets/minecraft/textures/block/candle.png | 4 +- .../minecraft/textures/block/candle_lit.png | 4 +- .../textures/block/carrots_stage0.png | 4 +- .../textures/block/carrots_stage2.png | 4 +- .../textures/block/carrots_stage3.png | 4 +- .../block/cartography_table_side1.png | 4 +- .../block/cartography_table_side2.png | 4 +- .../textures/block/cartography_table_top.png | 4 +- .../textures/block/carved_pumpkin.png | 4 +- .../textures/block/cauldron_inner.png | 4 +- .../textures/block/cauldron_side.png | 4 +- .../minecraft/textures/block/cauldron_top.png | 4 +- .../minecraft/textures/block/cave_vines.png | 4 +- .../textures/block/cave_vines_lit.png | 4 +- .../textures/block/cave_vines_plant.png | 4 +- .../textures/block/cave_vines_plant_lit.png | 4 +- .../block/chain_command_block_back.png | 4 +- .../block/chain_command_block_conditional.png | 4 +- .../block/chain_command_block_front.png | 4 +- .../block/chain_command_block_side.png | 4 +- .../textures/block/cherry_door_top.png | 4 +- .../textures/block/cherry_leaves.png | 4 +- .../minecraft/textures/block/cherry_log.png | 4 +- .../textures/block/cherry_log_top.png | 4 +- .../textures/block/cherry_planks.png | 4 +- .../textures/block/cherry_sapling.png | 4 +- .../textures/block/cherry_trapdoor.png | 4 +- .../textures/block/chipped_anvil_top.png | 4 +- .../block/chiseled_bookshelf_empty.png | 4 +- .../block/chiseled_bookshelf_occupied.png | 4 +- .../block/chiseled_bookshelf_side.png | 4 +- .../textures/block/chiseled_bookshelf_top.png | 4 +- .../textures/block/chiseled_copper.png | 4 +- .../textures/block/chiseled_deepslate.png | 4 +- .../block/chiseled_polished_blackstone.png | 4 +- .../textures/block/chiseled_quartz_block.png | 4 +- .../block/chiseled_quartz_block_top.png | 4 +- .../textures/block/chiseled_red_sandstone.png | 4 +- .../textures/block/chiseled_sandstone.png | 4 +- .../textures/block/chiseled_stone_bricks.png | 4 +- .../textures/block/chiseled_tuff.png | 4 +- .../textures/block/chiseled_tuff_bricks.png | 4 +- .../block/chiseled_tuff_bricks_top.png | 4 +- .../textures/block/chiseled_tuff_top.png | 4 +- .../textures/block/chorus_flower.png | 4 +- .../textures/block/chorus_flower_dead.png | 4 +- assets/minecraft/textures/block/clay.png | 4 +- .../textures/block/closed_eyeblossom.png | 4 +- .../minecraft/textures/block/coal_block.png | 4 +- assets/minecraft/textures/block/coal_ore.png | 4 +- .../minecraft/textures/block/coarse_dirt.png | 4 +- assets/minecraft/textures/block/cobweb.png | 4 +- .../minecraft/textures/block/cocoa_stage1.png | 4 +- .../minecraft/textures/block/cocoa_stage2.png | 4 +- .../textures/block/command_block_back.png | 4 +- .../block/command_block_conditional.png | 4 +- .../textures/block/command_block_front.png | 4 +- .../textures/block/command_block_side.png | 4 +- .../minecraft/textures/block/comparator.png | 4 +- .../textures/block/comparator_on.png | 4 +- .../textures/block/composter_compost.png | 4 +- .../textures/block/composter_side.png | 4 +- assets/minecraft/textures/block/conduit.png | 4 +- .../minecraft/textures/block/copper_block.png | 4 +- .../minecraft/textures/block/copper_bulb.png | 4 +- .../textures/block/copper_bulb_lit.png | 4 +- .../block/copper_bulb_lit_powered.png | 4 +- .../textures/block/copper_bulb_powered.png | 4 +- .../textures/block/copper_door_top.png | 4 +- .../minecraft/textures/block/copper_grate.png | 4 +- .../minecraft/textures/block/copper_ore.png | 4 +- .../textures/block/copper_trapdoor.png | 4 +- .../block/cracked_deepslate_bricks.png | 4 +- .../block/cracked_deepslate_tiles.png | 4 +- .../textures/block/cracked_nether_bricks.png | 4 +- .../textures/block/cracked_stone_bricks.png | 4 +- .../textures/block/crafter_bottom.png | 4 +- .../minecraft/textures/block/crafter_east.png | 4 +- .../textures/block/crafter_east_crafting.png | 4 +- .../textures/block/crafter_east_triggered.png | 4 +- .../textures/block/crafter_north.png | 4 +- .../textures/block/crafter_north_crafting.png | 4 +- .../textures/block/crafter_south.png | 4 +- .../minecraft/textures/block/crafter_top.png | 4 +- .../textures/block/crafter_top_crafting.png | 4 +- .../textures/block/crafter_top_triggered.png | 4 +- .../minecraft/textures/block/crafter_west.png | 4 +- .../textures/block/crafter_west_crafting.png | 4 +- .../textures/block/crafter_west_triggered.png | 4 +- .../textures/block/crafting_table_front.png | 4 +- .../textures/block/crafting_table_side.png | 4 +- .../textures/block/crafting_table_top.png | 4 +- .../textures/block/crimson_door_bottom.png | 4 +- .../textures/block/crimson_door_top.png | 4 +- .../textures/block/crimson_nylium_side.png | 4 +- .../textures/block/crimson_planks.png | 4 +- .../textures/block/crimson_roots.png | 4 +- .../textures/block/crimson_roots_pot.png | 4 +- .../textures/block/crimson_stem_top.png | 4 +- .../textures/block/crimson_trapdoor.png | 4 +- .../minecraft/textures/block/cut_copper.png | 4 +- .../textures/block/cut_red_sandstone.png | 4 +- .../textures/block/cut_sandstone.png | 4 +- .../minecraft/textures/block/cyan_candle.png | 4 +- .../textures/block/cyan_candle_lit.png | 4 +- .../textures/block/cyan_concrete.png | 4 +- .../textures/block/cyan_concrete_powder.png | 4 +- .../textures/block/cyan_glazed_terracotta.png | 4 +- .../textures/block/cyan_shulker_box.png | 4 +- .../block/cyan_stained_glass_pane_top.png | 4 +- .../textures/block/cyan_terracotta.png | 4 +- assets/minecraft/textures/block/cyan_wool.png | 4 +- .../textures/block/damaged_anvil_top.png | 4 +- assets/minecraft/textures/block/dandelion.png | 4 +- .../textures/block/dark_oak_door_bottom.png | 4 +- .../textures/block/dark_oak_door_top.png | 4 +- .../minecraft/textures/block/dark_oak_log.png | 4 +- .../textures/block/dark_oak_log_top.png | 4 +- .../textures/block/dark_oak_planks.png | 4 +- .../textures/block/dark_oak_trapdoor.png | 4 +- .../textures/block/dark_prismarine.png | 4 +- .../block/daylight_detector_inverted_top.png | 4 +- .../textures/block/daylight_detector_top.png | 4 +- .../textures/block/dead_brain_coral.png | 4 +- .../textures/block/dead_brain_coral_block.png | 4 +- .../textures/block/dead_brain_coral_fan.png | 4 +- .../textures/block/dead_bubble_coral.png | 4 +- .../block/dead_bubble_coral_block.png | 4 +- .../textures/block/dead_bubble_coral_fan.png | 4 +- assets/minecraft/textures/block/dead_bush.png | 4 +- .../textures/block/dead_fire_coral.png | 4 +- .../textures/block/dead_fire_coral_block.png | 4 +- .../textures/block/dead_fire_coral_fan.png | 4 +- .../textures/block/dead_horn_coral.png | 4 +- .../textures/block/dead_horn_coral_block.png | 4 +- .../textures/block/dead_horn_coral_fan.png | 4 +- .../textures/block/dead_tube_coral.png | 4 +- .../textures/block/dead_tube_coral_fan.png | 4 +- assets/minecraft/textures/block/debug.png | 4 +- assets/minecraft/textures/block/debug2.png | 4 +- assets/minecraft/textures/block/deepslate.png | 4 +- .../textures/block/deepslate_bricks.png | 4 +- .../textures/block/deepslate_coal_ore.png | 4 +- .../textures/block/deepslate_copper_ore.png | 4 +- .../textures/block/deepslate_diamond_ore.png | 4 +- .../textures/block/deepslate_emerald_ore.png | 4 +- .../textures/block/deepslate_gold_ore.png | 4 +- .../textures/block/deepslate_iron_ore.png | 4 +- .../textures/block/deepslate_lapis_ore.png | 4 +- .../textures/block/deepslate_redstone_ore.png | 4 +- .../textures/block/deepslate_tiles.png | 4 +- .../textures/block/deepslate_top.png | 4 +- .../textures/block/destroy_stage_0.png | 4 +- .../textures/block/destroy_stage_1.png | 4 +- .../textures/block/destroy_stage_2.png | 4 +- .../textures/block/destroy_stage_3.png | 4 +- .../textures/block/destroy_stage_4.png | 4 +- .../textures/block/destroy_stage_5.png | 4 +- .../textures/block/destroy_stage_7.png | 4 +- .../textures/block/destroy_stage_8.png | 4 +- .../textures/block/detector_rail.png | 4 +- .../textures/block/detector_rail_on.png | 4 +- .../textures/block/diamond_block.png | 4 +- .../minecraft/textures/block/diamond_ore.png | 4 +- assets/minecraft/textures/block/dirt.png | 4 +- .../textures/block/dirt_path_side.png | 4 +- .../textures/block/dirt_path_top.png | 4 +- .../textures/block/dispenser_front.png | 4 +- .../block/dispenser_front_vertical.png | 4 +- .../minecraft/textures/block/dragon_egg.png | 4 +- .../block/dried_ghast_hydration_0_bottom.png | 3 + .../block/dried_ghast_hydration_0_east.png | 3 + .../block/dried_ghast_hydration_0_north.png | 3 + .../block/dried_ghast_hydration_0_south.png | 3 + .../dried_ghast_hydration_0_tentacles.png | 3 + .../block/dried_ghast_hydration_0_top.png | 3 + .../block/dried_ghast_hydration_0_west.png | 3 + .../block/dried_ghast_hydration_1_bottom.png | 3 + .../block/dried_ghast_hydration_1_east.png | 3 + .../block/dried_ghast_hydration_1_north.png | 3 + .../block/dried_ghast_hydration_1_south.png | 3 + .../dried_ghast_hydration_1_tentacles.png | 3 + .../block/dried_ghast_hydration_1_top.png | 3 + .../block/dried_ghast_hydration_1_west.png | 3 + .../block/dried_ghast_hydration_2_bottom.png | 3 + .../block/dried_ghast_hydration_2_east.png | 3 + .../block/dried_ghast_hydration_2_north.png | 3 + .../block/dried_ghast_hydration_2_south.png | 3 + .../dried_ghast_hydration_2_tentacles.png | 3 + .../block/dried_ghast_hydration_2_top.png | 3 + .../block/dried_ghast_hydration_2_west.png | 3 + .../block/dried_ghast_hydration_3_bottom.png | 3 + .../block/dried_ghast_hydration_3_east.png | 3 + .../block/dried_ghast_hydration_3_north.png | 3 + .../block/dried_ghast_hydration_3_south.png | 3 + .../dried_ghast_hydration_3_tentacles.png | 3 + .../block/dried_ghast_hydration_3_top.png | 3 + .../block/dried_ghast_hydration_3_west.png | 3 + .../textures/block/dried_kelp_bottom.png | 4 +- .../textures/block/dried_kelp_side.png | 4 +- .../textures/block/dried_kelp_top.png | 4 +- .../textures/block/dropper_front.png | 4 +- .../textures/block/dropper_front_vertical.png | 4 +- .../textures/block/emerald_block.png | 4 +- .../minecraft/textures/block/emerald_ore.png | 4 +- .../textures/block/enchanting_table_side.png | 4 +- .../textures/block/end_portal_frame_side.png | 4 +- .../textures/block/end_portal_frame_top.png | 4 +- assets/minecraft/textures/block/end_rod.png | 4 +- assets/minecraft/textures/block/end_stone.png | 4 +- .../textures/block/end_stone_bricks.png | 4 +- .../block/exposed_chiseled_copper.png | 4 +- .../textures/block/exposed_copper.png | 4 +- .../textures/block/exposed_copper_bulb.png | 4 +- .../block/exposed_copper_bulb_lit.png | 4 +- .../block/exposed_copper_bulb_powered.png | 4 +- .../block/exposed_copper_door_top.png | 4 +- .../textures/block/exposed_copper_grate.png | 4 +- .../block/exposed_copper_trapdoor.png | 4 +- .../textures/block/exposed_cut_copper.png | 4 +- assets/minecraft/textures/block/farmland.png | 4 +- .../textures/block/farmland_moist.png | 4 +- assets/minecraft/textures/block/fern.png | 4 +- assets/minecraft/textures/block/fire_0.png | 4 +- assets/minecraft/textures/block/fire_1.png | 4 +- .../minecraft/textures/block/fire_coral.png | 4 +- .../textures/block/fire_coral_block.png | 4 +- .../minecraft/textures/block/firefly_bush.png | 4 +- .../textures/block/firefly_bush_emissive.png | 4 +- .../textures/block/fletching_table_front.png | 4 +- .../textures/block/fletching_table_side.png | 4 +- .../textures/block/fletching_table_top.png | 4 +- .../minecraft/textures/block/flower_pot.png | 4 +- .../block/flowering_azalea_leaves.png | 4 +- .../textures/block/flowering_azalea_side.png | 4 +- .../textures/block/flowering_azalea_top.png | 4 +- assets/minecraft/textures/block/frogspawn.png | 4 +- .../textures/block/frosted_ice_0.png | 4 +- .../textures/block/frosted_ice_1.png | 4 +- .../textures/block/frosted_ice_2.png | 4 +- .../textures/block/frosted_ice_3.png | 4 +- .../textures/block/furnace_front.png | 4 +- .../minecraft/textures/block/furnace_side.png | 4 +- .../minecraft/textures/block/furnace_top.png | 4 +- .../textures/block/gilded_blackstone.png | 4 +- .../textures/block/glass_pane_top.png | 4 +- .../textures/block/glow_item_frame.png | 4 +- .../minecraft/textures/block/glow_lichen.png | 4 +- .../minecraft/textures/block/gold_block.png | 4 +- assets/minecraft/textures/block/gold_ore.png | 4 +- .../textures/block/grass_block_side.png | 4 +- .../block/grass_block_side_overlay.png | 4 +- .../textures/block/grass_block_snow.png | 4 +- assets/minecraft/textures/block/gravel.png | 4 +- .../minecraft/textures/block/gray_candle.png | 4 +- .../textures/block/gray_concrete.png | 4 +- .../textures/block/gray_concrete_powder.png | 4 +- .../textures/block/gray_glazed_terracotta.png | 4 +- .../textures/block/gray_shulker_box.png | 4 +- .../textures/block/gray_stained_glass.png | 4 +- .../block/gray_stained_glass_pane_top.png | 4 +- .../textures/block/gray_terracotta.png | 4 +- assets/minecraft/textures/block/gray_wool.png | 4 +- .../minecraft/textures/block/green_candle.png | 4 +- .../textures/block/green_candle_lit.png | 4 +- .../textures/block/green_concrete.png | 4 +- .../block/green_glazed_terracotta.png | 4 +- .../textures/block/green_shulker_box.png | 4 +- .../block/green_stained_glass_pane_top.png | 4 +- .../textures/block/green_terracotta.png | 4 +- .../minecraft/textures/block/green_wool.png | 4 +- .../textures/block/grindstone_round.png | 4 +- .../textures/block/grindstone_side.png | 4 +- .../textures/block/hay_block_side.png | 4 +- .../textures/block/honey_block_bottom.png | 4 +- .../textures/block/honey_block_side.png | 4 +- .../textures/block/honey_block_top.png | 4 +- .../textures/block/honeycomb_block.png | 4 +- .../textures/block/hopper_inside.png | 4 +- .../textures/block/hopper_outside.png | 4 +- .../minecraft/textures/block/horn_coral.png | 4 +- .../textures/block/horn_coral_block.png | 4 +- .../textures/block/horn_coral_fan.png | 4 +- assets/minecraft/textures/block/ice.png | 4 +- assets/minecraft/textures/block/iron_bars.png | 4 +- .../minecraft/textures/block/iron_block.png | 4 +- .../textures/block/iron_door_bottom.png | 4 +- assets/minecraft/textures/block/iron_ore.png | 4 +- .../minecraft/textures/block/item_frame.png | 4 +- .../textures/block/jack_o_lantern.png | 4 +- .../textures/block/jigsaw_bottom.png | 4 +- .../minecraft/textures/block/jigsaw_lock.png | 4 +- .../minecraft/textures/block/jigsaw_side.png | 4 +- .../minecraft/textures/block/jigsaw_top.png | 4 +- .../minecraft/textures/block/jukebox_side.png | 4 +- .../minecraft/textures/block/jukebox_top.png | 4 +- .../textures/block/jungle_door_bottom.png | 4 +- .../textures/block/jungle_door_top.png | 4 +- .../minecraft/textures/block/jungle_log.png | 4 +- .../textures/block/jungle_log_top.png | 4 +- .../textures/block/jungle_planks.png | 4 +- .../textures/block/jungle_sapling.png | 4 +- .../textures/block/jungle_trapdoor.png | 4 +- assets/minecraft/textures/block/kelp.png | 4 +- .../minecraft/textures/block/lapis_block.png | 4 +- assets/minecraft/textures/block/lapis_ore.png | 4 +- .../textures/block/large_fern_bottom.png | 4 +- .../textures/block/large_fern_top.png | 4 +- assets/minecraft/textures/block/lava_flow.png | 4 +- .../minecraft/textures/block/lava_still.png | 4 +- .../minecraft/textures/block/leaf_litter.png | 4 +- .../minecraft/textures/block/lectern_base.png | 4 +- .../textures/block/lectern_front.png | 4 +- .../textures/block/lectern_sides.png | 4 +- .../minecraft/textures/block/lectern_top.png | 4 +- assets/minecraft/textures/block/lever.png | 4 +- .../textures/block/light_blue_candle.png | 4 +- .../textures/block/light_blue_candle_lit.png | 4 +- .../textures/block/light_blue_concrete.png | 4 +- .../block/light_blue_glazed_terracotta.png | 4 +- .../textures/block/light_blue_shulker_box.png | 4 +- .../light_blue_stained_glass_pane_top.png | 4 +- .../textures/block/light_blue_terracotta.png | 4 +- .../textures/block/light_blue_wool.png | 4 +- .../textures/block/light_gray_candle.png | 4 +- .../textures/block/light_gray_candle_lit.png | 4 +- .../block/light_gray_concrete_powder.png | 4 +- .../block/light_gray_glazed_terracotta.png | 4 +- .../textures/block/light_gray_shulker_box.png | 4 +- .../block/light_gray_stained_glass.png | 4 +- .../light_gray_stained_glass_pane_top.png | 4 +- .../textures/block/light_gray_terracotta.png | 4 +- .../textures/block/light_gray_wool.png | 4 +- .../minecraft/textures/block/lilac_bottom.png | 4 +- assets/minecraft/textures/block/lilac_top.png | 4 +- .../textures/block/lily_of_the_valley.png | 4 +- assets/minecraft/textures/block/lily_pad.png | 4 +- .../minecraft/textures/block/lime_candle.png | 4 +- .../textures/block/lime_candle_lit.png | 4 +- .../textures/block/lime_glazed_terracotta.png | 4 +- .../textures/block/lime_shulker_box.png | 4 +- .../block/lime_stained_glass_pane_top.png | 4 +- .../textures/block/lime_terracotta.png | 4 +- assets/minecraft/textures/block/lime_wool.png | 4 +- .../textures/block/lodestone_side.png | 4 +- .../textures/block/lodestone_top.png | 4 +- .../minecraft/textures/block/loom_bottom.png | 4 +- .../minecraft/textures/block/loom_front.png | 4 +- assets/minecraft/textures/block/loom_side.png | 4 +- assets/minecraft/textures/block/loom_top.png | 4 +- .../textures/block/magenta_candle.png | 4 +- .../textures/block/magenta_candle_lit.png | 4 +- .../textures/block/magenta_concrete.png | 4 +- .../block/magenta_concrete_powder.png | 4 +- .../block/magenta_glazed_terracotta.png | 4 +- .../textures/block/magenta_shulker_box.png | 4 +- .../block/magenta_stained_glass_pane_top.png | 4 +- .../textures/block/magenta_terracotta.png | 4 +- .../minecraft/textures/block/magenta_wool.png | 4 +- assets/minecraft/textures/block/magma.png | 4 +- .../textures/block/mangrove_door_bottom.png | 4 +- .../textures/block/mangrove_door_top.png | 4 +- .../minecraft/textures/block/mangrove_log.png | 4 +- .../textures/block/mangrove_log_top.png | 4 +- .../textures/block/mangrove_planks.png | 4 +- .../block/mangrove_propagule_hanging.png | 4 +- .../textures/block/mangrove_roots_side.png | 4 +- .../textures/block/mangrove_roots_top.png | 4 +- .../textures/block/mangrove_trapdoor.png | 4 +- .../textures/block/medium_amethyst_bud.png | 4 +- .../minecraft/textures/block/melon_side.png | 4 +- .../minecraft/textures/block/melon_stem.png | 4 +- assets/minecraft/textures/block/melon_top.png | 4 +- .../minecraft/textures/block/moss_block.png | 4 +- .../textures/block/mossy_cobblestone.png | 4 +- .../textures/block/mossy_stone_bricks.png | 4 +- assets/minecraft/textures/block/mud.png | 4 +- .../minecraft/textures/block/mud_bricks.png | 4 +- .../block/muddy_mangrove_roots_side.png | 4 +- .../block/muddy_mangrove_roots_top.png | 4 +- .../textures/block/mushroom_block_inside.png | 4 +- .../textures/block/mycelium_side.png | 4 +- .../minecraft/textures/block/mycelium_top.png | 4 +- .../textures/block/nether_gold_ore.png | 4 +- .../textures/block/nether_portal.png | 4 +- .../textures/block/nether_quartz_ore.png | 4 +- .../textures/block/nether_wart_block.png | 4 +- .../textures/block/nether_wart_stage0.png | 4 +- .../textures/block/netherite_block.png | 4 +- .../minecraft/textures/block/note_block.png | 4 +- .../textures/block/oak_door_bottom.png | 4 +- .../minecraft/textures/block/oak_door_top.png | 4 +- assets/minecraft/textures/block/oak_log.png | 4 +- .../minecraft/textures/block/oak_log_top.png | 4 +- .../minecraft/textures/block/oak_planks.png | 4 +- .../minecraft/textures/block/oak_sapling.png | 4 +- .../minecraft/textures/block/oak_trapdoor.png | 4 +- .../textures/block/observer_back.png | 4 +- .../textures/block/observer_back_on.png | 4 +- .../textures/block/observer_side.png | 4 +- .../textures/block/ochre_froglight_side.png | 4 +- .../textures/block/ochre_froglight_top.png | 4 +- .../textures/block/open_eyeblossom.png | 4 +- .../block/open_eyeblossom_emissive.png | 4 +- .../textures/block/orange_candle.png | 4 +- .../textures/block/orange_concrete.png | 4 +- .../textures/block/orange_concrete_powder.png | 4 +- .../block/orange_glazed_terracotta.png | 4 +- .../textures/block/orange_shulker_box.png | 4 +- .../block/orange_stained_glass_pane_top.png | 4 +- .../textures/block/orange_terracotta.png | 4 +- .../minecraft/textures/block/orange_tulip.png | 4 +- .../minecraft/textures/block/orange_wool.png | 4 +- .../minecraft/textures/block/oxeye_daisy.png | 4 +- .../block/oxidized_chiseled_copper.png | 4 +- .../textures/block/oxidized_copper.png | 4 +- .../textures/block/oxidized_copper_bulb.png | 4 +- .../oxidized_copper_bulb_lit_powered.png | 4 +- .../block/oxidized_copper_bulb_powered.png | 4 +- .../block/oxidized_copper_door_bottom.png | 4 +- .../block/oxidized_copper_door_top.png | 4 +- .../textures/block/oxidized_copper_grate.png | 4 +- .../block/oxidized_copper_trapdoor.png | 4 +- .../textures/block/oxidized_cut_copper.png | 4 +- .../minecraft/textures/block/packed_ice.png | 4 +- .../minecraft/textures/block/packed_mud.png | 4 +- .../textures/block/pale_oak_door_bottom.png | 4 +- .../textures/block/pale_oak_door_top.png | 4 +- .../minecraft/textures/block/pale_oak_log.png | 4 +- .../textures/block/pale_oak_log_top.png | 4 +- .../textures/block/pale_oak_planks.png | 4 +- .../textures/block/pale_oak_trapdoor.png | 4 +- .../block/pearlescent_froglight_side.png | 4 +- .../block/pearlescent_froglight_top.png | 4 +- .../minecraft/textures/block/peony_bottom.png | 4 +- assets/minecraft/textures/block/peony_top.png | 4 +- .../minecraft/textures/block/pink_candle.png | 4 +- .../textures/block/pink_candle_lit.png | 4 +- .../textures/block/pink_concrete.png | 4 +- .../textures/block/pink_glazed_terracotta.png | 4 +- .../minecraft/textures/block/pink_petals.png | 4 +- .../textures/block/pink_shulker_box.png | 4 +- .../block/pink_stained_glass_pane_top.png | 4 +- .../textures/block/pink_terracotta.png | 4 +- .../minecraft/textures/block/pink_tulip.png | 4 +- assets/minecraft/textures/block/pink_wool.png | 4 +- .../textures/block/piston_bottom.png | 4 +- .../minecraft/textures/block/piston_inner.png | 4 +- .../minecraft/textures/block/piston_side.png | 4 +- .../minecraft/textures/block/piston_top.png | 4 +- .../textures/block/piston_top_sticky.png | 4 +- .../textures/block/pitcher_crop_bottom.png | 4 +- .../block/pitcher_crop_bottom_stage_1.png | 4 +- .../block/pitcher_crop_bottom_stage_2.png | 4 +- .../block/pitcher_crop_bottom_stage_3.png | 4 +- .../block/pitcher_crop_bottom_stage_4.png | 4 +- .../textures/block/pitcher_crop_top.png | 4 +- .../block/pitcher_crop_top_stage_4.png | 4 +- .../minecraft/textures/block/podzol_side.png | 4 +- .../minecraft/textures/block/podzol_top.png | 4 +- .../block/pointed_dripstone_down_frustum.png | 4 +- .../pointed_dripstone_down_tip_merge.png | 4 +- .../block/pointed_dripstone_up_frustum.png | 4 +- .../block/pointed_dripstone_up_tip_merge.png | 4 +- .../textures/block/polished_andesite.png | 4 +- .../textures/block/polished_blackstone.png | 4 +- .../block/polished_blackstone_bricks.png | 4 +- .../textures/block/polished_deepslate.png | 4 +- .../textures/block/polished_diorite.png | 4 +- .../textures/block/polished_granite.png | 4 +- .../textures/block/polished_tuff.png | 4 +- assets/minecraft/textures/block/poppy.png | 4 +- .../textures/block/potatoes_stage0.png | 4 +- .../textures/block/potatoes_stage3.png | 4 +- .../block/potted_azalea_bush_plant.png | 4 +- .../textures/block/potted_azalea_bush_top.png | 4 +- .../potted_flowering_azalea_bush_plant.png | 4 +- .../textures/block/prismarine_bricks.png | 4 +- .../minecraft/textures/block/pumpkin_side.png | 4 +- .../minecraft/textures/block/pumpkin_stem.png | 4 +- .../minecraft/textures/block/pumpkin_top.png | 4 +- .../textures/block/purple_candle.png | 4 +- .../textures/block/purple_candle_lit.png | 4 +- .../textures/block/purple_concrete.png | 4 +- .../block/purple_glazed_terracotta.png | 4 +- .../textures/block/purple_shulker_box.png | 4 +- .../block/purple_stained_glass_pane_top.png | 4 +- .../textures/block/purple_terracotta.png | 4 +- .../minecraft/textures/block/purple_wool.png | 4 +- .../minecraft/textures/block/purpur_block.png | 4 +- .../textures/block/quartz_block_bottom.png | 4 +- .../textures/block/quartz_block_side.png | 4 +- .../textures/block/quartz_block_top.png | 4 +- .../textures/block/quartz_bricks.png | 4 +- .../textures/block/quartz_pillar.png | 4 +- .../textures/block/quartz_pillar_top.png | 4 +- assets/minecraft/textures/block/rail.png | 4 +- .../minecraft/textures/block/rail_corner.png | 4 +- .../textures/block/raw_copper_block.png | 4 +- .../textures/block/raw_gold_block.png | 4 +- .../minecraft/textures/block/red_candle.png | 4 +- .../textures/block/red_candle_lit.png | 4 +- .../textures/block/red_concrete_powder.png | 4 +- .../textures/block/red_glazed_terracotta.png | 4 +- .../minecraft/textures/block/red_mushroom.png | 4 +- .../textures/block/red_mushroom_block.png | 4 +- assets/minecraft/textures/block/red_sand.png | 4 +- .../textures/block/red_sandstone.png | 4 +- .../textures/block/red_sandstone_top.png | 4 +- .../textures/block/red_shulker_box.png | 4 +- .../textures/block/red_stained_glass.png | 4 +- .../block/red_stained_glass_pane_top.png | 4 +- assets/minecraft/textures/block/red_tulip.png | 4 +- assets/minecraft/textures/block/red_wool.png | 4 +- .../textures/block/redstone_block.png | 4 +- .../textures/block/redstone_dust_dot.png | 4 +- .../textures/block/redstone_dust_line0.png | 4 +- .../textures/block/redstone_dust_line1.png | 4 +- .../textures/block/redstone_dust_overlay.png | 4 +- .../textures/block/redstone_lamp.png | 4 +- .../textures/block/redstone_lamp_on.png | 4 +- .../minecraft/textures/block/redstone_ore.png | 4 +- .../textures/block/redstone_torch_off.png | 4 +- .../block/reinforced_deepslate_bottom.png | 4 +- .../block/reinforced_deepslate_side.png | 4 +- .../block/reinforced_deepslate_top.png | 4 +- assets/minecraft/textures/block/repeater.png | 4 +- .../minecraft/textures/block/repeater_on.png | 4 +- .../block/repeating_command_block_back.png | 4 +- .../repeating_command_block_conditional.png | 4 +- .../block/repeating_command_block_front.png | 4 +- .../block/repeating_command_block_side.png | 4 +- .../textures/block/respawn_anchor_side0.png | 4 +- .../textures/block/respawn_anchor_side1.png | 4 +- .../textures/block/respawn_anchor_side2.png | 4 +- .../textures/block/respawn_anchor_side3.png | 4 +- .../textures/block/respawn_anchor_side4.png | 4 +- .../textures/block/respawn_anchor_top.png | 4 +- .../textures/block/respawn_anchor_top_off.png | 4 +- .../minecraft/textures/block/rooted_dirt.png | 4 +- .../textures/block/rose_bush_bottom.png | 4 +- .../textures/block/rose_bush_top.png | 4 +- assets/minecraft/textures/block/sand.png | 4 +- assets/minecraft/textures/block/sandstone.png | 4 +- .../textures/block/sandstone_top.png | 4 +- .../textures/block/scaffolding_bottom.png | 4 +- .../textures/block/scaffolding_side.png | 4 +- .../textures/block/scaffolding_top.png | 4 +- assets/minecraft/textures/block/sculk.png | 4 +- .../textures/block/sculk_catalyst_bottom.png | 4 +- .../textures/block/sculk_catalyst_side.png | 4 +- .../block/sculk_catalyst_side_bloom.png | 4 +- .../textures/block/sculk_catalyst_top.png | 4 +- .../block/sculk_catalyst_top_bloom.png | 4 +- .../textures/block/sculk_sensor_bottom.png | 4 +- .../textures/block/sculk_sensor_side.png | 4 +- .../block/sculk_sensor_tendril_active.png | 4 +- .../block/sculk_sensor_tendril_inactive.png | 4 +- .../textures/block/sculk_sensor_top.png | 4 +- .../textures/block/sculk_shrieker_bottom.png | 4 +- .../textures/block/sculk_shrieker_side.png | 4 +- .../textures/block/sculk_shrieker_top.png | 4 +- .../minecraft/textures/block/sculk_vein.png | 4 +- .../minecraft/textures/block/sea_lantern.png | 4 +- .../minecraft/textures/block/sea_pickle.png | 4 +- assets/minecraft/textures/block/seagrass.png | 4 +- .../textures/block/short_dry_grass.png | 4 +- .../minecraft/textures/block/short_grass.png | 4 +- .../minecraft/textures/block/shulker_box.png | 4 +- .../textures/block/small_dripleaf_side.png | 4 +- .../block/small_dripleaf_stem_top.png | 4 +- .../textures/block/smithing_table_bottom.png | 4 +- .../textures/block/smithing_table_front.png | 4 +- .../textures/block/smithing_table_side.png | 4 +- .../textures/block/smithing_table_top.png | 4 +- .../minecraft/textures/block/smoker_front.png | 4 +- .../textures/block/smoker_front_on.png | 4 +- .../minecraft/textures/block/smoker_side.png | 4 +- .../minecraft/textures/block/smoker_top.png | 4 +- .../textures/block/smooth_basalt.png | 4 +- .../minecraft/textures/block/smooth_stone.png | 4 +- .../block/sniffer_egg_not_cracked_bottom.png | 4 +- .../block/sniffer_egg_not_cracked_east.png | 4 +- .../block/sniffer_egg_not_cracked_north.png | 4 +- .../block/sniffer_egg_not_cracked_south.png | 4 +- .../block/sniffer_egg_not_cracked_top.png | 4 +- .../block/sniffer_egg_not_cracked_west.png | 4 +- .../sniffer_egg_slightly_cracked_bottom.png | 4 +- .../sniffer_egg_slightly_cracked_east.png | 4 +- .../sniffer_egg_slightly_cracked_north.png | 4 +- .../sniffer_egg_slightly_cracked_south.png | 4 +- .../sniffer_egg_slightly_cracked_top.png | 4 +- .../sniffer_egg_slightly_cracked_west.png | 4 +- .../block/sniffer_egg_very_cracked_bottom.png | 4 +- .../block/sniffer_egg_very_cracked_east.png | 4 +- .../block/sniffer_egg_very_cracked_north.png | 4 +- .../block/sniffer_egg_very_cracked_south.png | 4 +- .../block/sniffer_egg_very_cracked_top.png | 4 +- assets/minecraft/textures/block/snow.png | 4 +- .../textures/block/soul_campfire_fire.png | 4 +- .../textures/block/soul_campfire_log_lit.png | 4 +- .../minecraft/textures/block/soul_fire_0.png | 4 +- .../minecraft/textures/block/soul_fire_1.png | 4 +- assets/minecraft/textures/block/soul_soil.png | 4 +- .../minecraft/textures/block/soul_torch.png | 4 +- assets/minecraft/textures/block/spawner.png | 4 +- .../textures/block/spore_blossom.png | 4 +- .../textures/block/spore_blossom_base.png | 4 +- .../textures/block/spruce_door_top.png | 4 +- .../textures/block/spruce_leaves.png | 4 +- .../minecraft/textures/block/spruce_log.png | 4 +- .../textures/block/spruce_log_top.png | 4 +- .../textures/block/spruce_planks.png | 4 +- .../textures/block/spruce_sapling.png | 4 +- .../textures/block/spruce_trapdoor.png | 4 +- assets/minecraft/textures/block/stone.png | 4 +- .../minecraft/textures/block/stone_bricks.png | 4 +- .../textures/block/stonecutter_bottom.png | 4 +- .../textures/block/stonecutter_saw.png | 4 +- .../textures/block/stonecutter_top.png | 4 +- .../block/stripped_acacia_log_top.png | 4 +- .../textures/block/stripped_bamboo_block.png | 4 +- .../block/stripped_bamboo_block_top.png | 4 +- .../textures/block/stripped_birch_log.png | 4 +- .../textures/block/stripped_birch_log_top.png | 4 +- .../textures/block/stripped_cherry_log.png | 4 +- .../block/stripped_cherry_log_top.png | 4 +- .../textures/block/stripped_crimson_stem.png | 4 +- .../block/stripped_crimson_stem_top.png | 4 +- .../textures/block/stripped_dark_oak_log.png | 4 +- .../block/stripped_dark_oak_log_top.png | 4 +- .../block/stripped_jungle_log_top.png | 4 +- .../textures/block/stripped_mangrove_log.png | 4 +- .../block/stripped_mangrove_log_top.png | 4 +- .../textures/block/stripped_oak_log_top.png | 4 +- .../block/stripped_pale_oak_log_top.png | 4 +- .../textures/block/stripped_spruce_log.png | 4 +- .../block/stripped_spruce_log_top.png | 4 +- .../textures/block/stripped_warped_stem.png | 4 +- .../textures/block/structure_block_corner.png | 4 +- .../textures/block/structure_block_data.png | 4 +- .../textures/block/structure_block_load.png | 4 +- .../textures/block/structure_block_save.png | 4 +- .../minecraft/textures/block/sugar_cane.png | 4 +- .../textures/block/sunflower_bottom.png | 4 +- .../textures/block/sunflower_front.png | 4 +- .../textures/block/suspicious_gravel_1.png | 4 +- .../textures/block/suspicious_gravel_2.png | 4 +- .../textures/block/suspicious_gravel_3.png | 4 +- .../textures/block/suspicious_sand_0.png | 4 +- .../textures/block/suspicious_sand_3.png | 4 +- .../block/sweet_berry_bush_stage0.png | 4 +- .../block/sweet_berry_bush_stage1.png | 4 +- .../block/sweet_berry_bush_stage2.png | 4 +- .../block/sweet_berry_bush_stage3.png | 4 +- .../textures/block/tall_dry_grass.png | 4 +- .../textures/block/tall_grass_bottom.png | 4 +- .../textures/block/tall_grass_top.png | 4 +- .../textures/block/tall_seagrass_bottom.png | 4 +- .../textures/block/tall_seagrass_top.png | 4 +- .../minecraft/textures/block/target_side.png | 4 +- .../minecraft/textures/block/target_top.png | 4 +- .../minecraft/textures/block/terracotta.png | 4 +- .../textures/block/test_block_accept.png | 4 +- .../textures/block/test_block_fail.png | 4 +- .../textures/block/test_block_log.png | 4 +- .../textures/block/test_block_start.png | 4 +- .../textures/block/test_instance_block.png | 4 +- .../minecraft/textures/block/tinted_glass.png | 4 +- .../minecraft/textures/block/tnt_bottom.png | 4 +- assets/minecraft/textures/block/tnt_side.png | 4 +- assets/minecraft/textures/block/tnt_top.png | 4 +- assets/minecraft/textures/block/torch.png | 4 +- .../minecraft/textures/block/torchflower.png | 4 +- .../block/torchflower_crop_stage0.png | 4 +- .../block/torchflower_crop_stage1.png | 4 +- .../block/trial_spawner_side_active.png | 4 +- .../trial_spawner_side_active_ominous.png | 4 +- .../block/trial_spawner_side_inactive.png | 4 +- .../trial_spawner_side_inactive_ominous.png | 4 +- .../block/trial_spawner_top_active.png | 4 +- .../trial_spawner_top_active_ominous.png | 4 +- .../trial_spawner_top_ejecting_reward.png | 4 +- ...al_spawner_top_ejecting_reward_ominous.png | 4 +- .../block/trial_spawner_top_inactive.png | 4 +- .../trial_spawner_top_inactive_ominous.png | 4 +- assets/minecraft/textures/block/tripwire.png | 4 +- .../textures/block/tripwire_hook.png | 4 +- .../minecraft/textures/block/tube_coral.png | 4 +- .../textures/block/tube_coral_fan.png | 4 +- assets/minecraft/textures/block/tuff.png | 4 +- .../minecraft/textures/block/tuff_bricks.png | 4 +- .../minecraft/textures/block/turtle_egg.png | 4 +- .../block/turtle_egg_slightly_cracked.png | 4 +- .../block/turtle_egg_very_cracked.png | 4 +- .../textures/block/twisting_vines.png | 4 +- .../textures/block/twisting_vines_plant.png | 4 +- .../minecraft/textures/block/vault_bottom.png | 4 +- .../textures/block/vault_bottom_ominous.png | 4 +- .../textures/block/vault_side_off.png | 4 +- .../textures/block/vault_side_off_ominous.png | 4 +- .../textures/block/vault_side_on.png | 4 +- .../textures/block/vault_side_on_ominous.png | 4 +- assets/minecraft/textures/block/vault_top.png | 4 +- .../textures/block/vault_top_ejecting.png | 4 +- .../block/vault_top_ejecting_ominous.png | 4 +- .../textures/block/vault_top_ominous.png | 4 +- .../textures/block/verdant_froglight_side.png | 4 +- .../textures/block/verdant_froglight_top.png | 4 +- assets/minecraft/textures/block/vine.png | 4 +- .../textures/block/warped_door_bottom.png | 4 +- .../textures/block/warped_door_top.png | 4 +- .../textures/block/warped_nylium_side.png | 4 +- .../textures/block/warped_planks.png | 4 +- .../minecraft/textures/block/warped_roots.png | 4 +- .../textures/block/warped_roots_pot.png | 4 +- .../textures/block/warped_stem_top.png | 4 +- .../textures/block/warped_trapdoor.png | 4 +- .../textures/block/warped_wart_block.png | 4 +- .../minecraft/textures/block/water_flow.png | 4 +- .../minecraft/textures/block/water_still.png | 4 +- .../block/weathered_chiseled_copper.png | 4 +- .../textures/block/weathered_copper.png | 4 +- .../textures/block/weathered_copper_bulb.png | 4 +- .../weathered_copper_bulb_lit_powered.png | 4 +- .../block/weathered_copper_bulb_powered.png | 4 +- .../block/weathered_copper_door_top.png | 4 +- .../textures/block/weathered_copper_grate.png | 4 +- .../block/weathered_copper_trapdoor.png | 4 +- .../textures/block/weathered_cut_copper.png | 4 +- .../textures/block/weeping_vines.png | 4 +- .../textures/block/weeping_vines_plant.png | 4 +- .../minecraft/textures/block/wheat_stage0.png | 4 +- .../minecraft/textures/block/wheat_stage1.png | 4 +- .../minecraft/textures/block/wheat_stage2.png | 4 +- .../minecraft/textures/block/wheat_stage5.png | 4 +- .../minecraft/textures/block/wheat_stage6.png | 4 +- .../minecraft/textures/block/wheat_stage7.png | 4 +- .../minecraft/textures/block/white_candle.png | 4 +- .../textures/block/white_candle_lit.png | 4 +- .../textures/block/white_concrete.png | 4 +- .../textures/block/white_concrete_powder.png | 4 +- .../block/white_glazed_terracotta.png | 4 +- .../textures/block/white_shulker_box.png | 4 +- .../textures/block/white_stained_glass.png | 4 +- .../block/white_stained_glass_pane_top.png | 4 +- .../textures/block/white_terracotta.png | 4 +- .../minecraft/textures/block/white_tulip.png | 4 +- .../minecraft/textures/block/white_wool.png | 4 +- .../minecraft/textures/block/wildflowers.png | 4 +- .../minecraft/textures/block/wither_rose.png | 4 +- .../textures/block/yellow_candle.png | 4 +- .../textures/block/yellow_candle_lit.png | 4 +- .../textures/block/yellow_concrete.png | 4 +- .../block/yellow_glazed_terracotta.png | 4 +- .../textures/block/yellow_shulker_box.png | 4 +- .../block/yellow_stained_glass_pane_top.png | 4 +- .../textures/block/yellow_terracotta.png | 4 +- .../minecraft/textures/block/yellow_wool.png | 4 +- assets/minecraft/textures/colormap/grass.png | 4 +- .../minecraft/textures/entity/allay/allay.png | 4 +- .../textures/entity/armorstand/wood.png | 4 +- .../minecraft/textures/entity/banner/base.png | 4 +- .../textures/entity/banner/border.png | 4 +- .../textures/entity/banner/bricks.png | 4 +- .../textures/entity/banner/circle.png | 4 +- .../textures/entity/banner/creeper.png | 4 +- .../textures/entity/banner/cross.png | 4 +- .../textures/entity/banner/curly_border.png | 4 +- .../textures/entity/banner/diagonal_left.png | 4 +- .../textures/entity/banner/diagonal_right.png | 4 +- .../entity/banner/diagonal_up_left.png | 4 +- .../entity/banner/diagonal_up_right.png | 4 +- .../textures/entity/banner/flower.png | 4 +- .../textures/entity/banner/globe.png | 4 +- .../textures/entity/banner/gradient.png | 4 +- .../textures/entity/banner/gradient_up.png | 4 +- .../entity/banner/half_horizontal.png | 4 +- .../entity/banner/half_horizontal_bottom.png | 4 +- .../textures/entity/banner/half_vertical.png | 4 +- .../entity/banner/half_vertical_right.png | 4 +- .../textures/entity/banner/mojang.png | 4 +- .../textures/entity/banner/rhombus.png | 4 +- .../textures/entity/banner/skull.png | 4 +- .../textures/entity/banner/small_stripes.png | 4 +- .../entity/banner/square_bottom_left.png | 4 +- .../entity/banner/square_bottom_right.png | 4 +- .../entity/banner/square_top_left.png | 4 +- .../entity/banner/square_top_right.png | 4 +- .../textures/entity/banner/straight_cross.png | 4 +- .../textures/entity/banner/stripe_bottom.png | 4 +- .../textures/entity/banner/stripe_center.png | 4 +- .../entity/banner/stripe_downleft.png | 4 +- .../entity/banner/stripe_downright.png | 4 +- .../textures/entity/banner/stripe_left.png | 4 +- .../textures/entity/banner/stripe_middle.png | 4 +- .../textures/entity/banner/stripe_right.png | 4 +- .../textures/entity/banner/stripe_top.png | 4 +- .../entity/banner/triangle_bottom.png | 4 +- .../textures/entity/banner/triangle_top.png | 4 +- .../entity/banner/triangles_bottom.png | 4 +- .../textures/entity/banner/triangles_top.png | 4 +- .../minecraft/textures/entity/banner_base.png | 4 +- assets/minecraft/textures/entity/bat.png | 4 +- .../minecraft/textures/entity/bed/black.png | 4 +- assets/minecraft/textures/entity/bed/blue.png | 4 +- .../minecraft/textures/entity/bed/brown.png | 4 +- assets/minecraft/textures/entity/bed/cyan.png | 4 +- assets/minecraft/textures/entity/bed/gray.png | 4 +- .../minecraft/textures/entity/bed/green.png | 4 +- .../textures/entity/bed/light_blue.png | 4 +- .../textures/entity/bed/light_gray.png | 4 +- assets/minecraft/textures/entity/bed/lime.png | 4 +- .../minecraft/textures/entity/bed/magenta.png | 4 +- .../minecraft/textures/entity/bed/orange.png | 4 +- assets/minecraft/textures/entity/bed/pink.png | 4 +- .../minecraft/textures/entity/bed/purple.png | 4 +- assets/minecraft/textures/entity/bed/red.png | 4 +- .../minecraft/textures/entity/bed/white.png | 4 +- .../minecraft/textures/entity/bed/yellow.png | 4 +- .../textures/entity/bee/bee_stinger.png | 4 +- .../textures/entity/bell/bell_body.png | 4 +- .../minecraft/textures/entity/boat/acacia.png | 4 +- .../minecraft/textures/entity/boat/birch.png | 4 +- .../minecraft/textures/entity/boat/cherry.png | 4 +- .../textures/entity/boat/dark_oak.png | 4 +- .../minecraft/textures/entity/boat/jungle.png | 4 +- .../textures/entity/boat/mangrove.png | 4 +- assets/minecraft/textures/entity/boat/oak.png | 4 +- .../minecraft/textures/entity/boat/spruce.png | 4 +- .../textures/entity/breeze/breeze_eyes.png | 4 +- .../minecraft/textures/entity/camel/camel.png | 4 +- .../textures/entity/cat/all_black.png | 4 +- .../minecraft/textures/entity/cat/black.png | 4 +- .../textures/entity/cat/british_shorthair.png | 4 +- .../minecraft/textures/entity/cat/calico.png | 4 +- .../textures/entity/cat/cat_collar.png | 4 +- .../minecraft/textures/entity/cat/jellie.png | 4 +- .../minecraft/textures/entity/cat/ocelot.png | 4 +- .../minecraft/textures/entity/cat/persian.png | 4 +- .../minecraft/textures/entity/cat/ragdoll.png | 4 +- assets/minecraft/textures/entity/cat/red.png | 4 +- .../minecraft/textures/entity/cat/siamese.png | 4 +- .../minecraft/textures/entity/cat/tabby.png | 4 +- .../minecraft/textures/entity/cat/white.png | 4 +- .../textures/entity/chest/christmas_left.png | 4 +- .../textures/entity/chest/christmas_right.png | 4 +- .../textures/entity/chest/normal.png | 4 +- .../textures/entity/chest/normal_left.png | 4 +- .../textures/entity/chest/normal_right.png | 4 +- .../textures/entity/chest/trapped.png | 4 +- .../textures/entity/chest/trapped_left.png | 4 +- .../textures/entity/chest/trapped_right.png | 4 +- .../textures/entity/chest_boat/acacia.png | 4 +- .../textures/entity/chest_boat/bamboo.png | 4 +- .../textures/entity/chest_boat/birch.png | 4 +- .../textures/entity/chest_boat/cherry.png | 4 +- .../textures/entity/chest_boat/dark_oak.png | 4 +- .../textures/entity/chest_boat/jungle.png | 4 +- .../textures/entity/chest_boat/mangrove.png | 4 +- .../textures/entity/chest_boat/oak.png | 4 +- .../textures/entity/chest_boat/pale_oak.png | 4 +- .../textures/entity/chest_boat/spruce.png | 4 +- .../textures/entity/chicken/cold_chicken.png | 4 +- .../textures/entity/chicken/warm_chicken.png | 4 +- .../textures/entity/conduit/base.png | 4 +- .../entity/conduit/break_particle.png | 4 +- .../textures/entity/conduit/cage.png | 4 +- .../textures/entity/conduit/open_eye.png | 4 +- .../textures/entity/cow/brown_mooshroom.png | 4 +- .../textures/entity/cow/cold_cow.png | 4 +- .../textures/entity/cow/temperate_cow.png | 4 +- .../textures/entity/cow/warm_cow.png | 4 +- .../textures/entity/creeper/creeper.png | 4 +- .../textures/entity/creeper/creeper_armor.png | 4 +- .../decorated_pot/angler_pottery_pattern.png | 4 +- .../decorated_pot/archer_pottery_pattern.png | 4 +- .../decorated_pot/arms_up_pottery_pattern.png | 4 +- .../decorated_pot/blade_pottery_pattern.png | 4 +- .../decorated_pot/brewer_pottery_pattern.png | 4 +- .../decorated_pot/burn_pottery_pattern.png | 4 +- .../decorated_pot/danger_pottery_pattern.png | 4 +- .../decorated_pot/decorated_pot_side.png | 4 +- .../explorer_pottery_pattern.png | 4 +- .../decorated_pot/flow_pottery_pattern.png | 4 +- .../decorated_pot/friend_pottery_pattern.png | 4 +- .../decorated_pot/guster_pottery_pattern.png | 4 +- .../decorated_pot/heart_pottery_pattern.png | 4 +- .../heartbreak_pottery_pattern.png | 4 +- .../decorated_pot/howl_pottery_pattern.png | 4 +- .../decorated_pot/miner_pottery_pattern.png | 4 +- .../decorated_pot/mourner_pottery_pattern.png | 4 +- .../decorated_pot/plenty_pottery_pattern.png | 4 +- .../decorated_pot/prize_pottery_pattern.png | 4 +- .../decorated_pot/scrape_pottery_pattern.png | 4 +- .../decorated_pot/sheaf_pottery_pattern.png | 4 +- .../decorated_pot/shelter_pottery_pattern.png | 4 +- .../decorated_pot/skull_pottery_pattern.png | 4 +- .../decorated_pot/snort_pottery_pattern.png | 4 +- assets/minecraft/textures/entity/dolphin.png | 4 +- .../textures/entity/enchanting_table_book.png | 4 +- .../entity/end_crystal/end_crystal_beam.png | 4 +- .../textures/entity/end_gateway_beam.png | 4 +- .../minecraft/textures/entity/end_portal.png | 4 +- .../textures/entity/enderdragon/dragon.png | 4 +- .../entity/enderdragon/dragon_exploding.png | 4 +- .../entity/enderdragon/dragon_fireball.png | 4 +- .../entity/enderman/enderman_eyes.png | 4 +- .../minecraft/textures/entity/endermite.png | 4 +- .../entity/equipment/camel_saddle/saddle.png | 4 +- .../happy_ghast_body/black_harness.png | 3 + .../happy_ghast_body/blue_harness.png | 3 + .../happy_ghast_body/brown_harness.png | 3 + .../happy_ghast_body/cyan_harness.png | 3 + .../happy_ghast_body/gray_harness.png | 3 + .../happy_ghast_body/green_harness.png | 3 + .../happy_ghast_body/light_blue_harness.png | 3 + .../happy_ghast_body/light_gray_harness.png | 3 + .../happy_ghast_body/lime_harness.png | 3 + .../happy_ghast_body/magenta_harness.png | 3 + .../happy_ghast_body/orange_harness.png | 3 + .../happy_ghast_body/pink_harness.png | 3 + .../happy_ghast_body/purple_harness.png | 3 + .../happy_ghast_body/red_harness.png | 3 + .../happy_ghast_body/white_harness.png | 3 + .../happy_ghast_body/yellow_harness.png | 3 + .../entity/equipment/horse_body/diamond.png | 4 +- .../entity/equipment/horse_body/gold.png | 4 +- .../entity/equipment/horse_body/iron.png | 4 +- .../entity/equipment/horse_body/leather.png | 4 +- .../entity/equipment/humanoid/chainmail.png | 4 +- .../entity/equipment/humanoid/diamond.png | 4 +- .../equipment/humanoid/leather_overlay.png | 4 +- .../equipment/humanoid/turtle_scute.png | 4 +- .../equipment/humanoid_leggings/netherite.png | 4 +- .../entity/equipment/llama_body/brown.png | 4 +- .../entity/equipment/llama_body/cyan.png | 4 +- .../entity/equipment/llama_body/gray.png | 4 +- .../entity/equipment/llama_body/green.png | 4 +- .../equipment/llama_body/light_blue.png | 4 +- .../equipment/llama_body/light_gray.png | 4 +- .../entity/equipment/llama_body/lime.png | 4 +- .../entity/equipment/llama_body/magenta.png | 4 +- .../entity/equipment/llama_body/orange.png | 4 +- .../entity/equipment/llama_body/pink.png | 4 +- .../entity/equipment/llama_body/purple.png | 4 +- .../entity/equipment/llama_body/red.png | 4 +- .../equipment/llama_body/trader_llama.png | 4 +- .../entity/equipment/llama_body/white.png | 4 +- .../entity/equipment/llama_body/yellow.png | 4 +- .../equipment/strider_saddle/saddle.png | 4 +- .../entity/equipment/wings/elytra.png | 4 +- .../equipment/wolf_body/armadillo_scute.png | 4 +- .../wolf_body/armadillo_scute_overlay.png | 4 +- .../textures/entity/experience_orb.png | 4 +- assets/minecraft/textures/entity/fish/cod.png | 4 +- .../textures/entity/fish/pufferfish.png | 4 +- .../minecraft/textures/entity/fish/salmon.png | 4 +- .../textures/entity/fish/tropical_a.png | 4 +- .../entity/fish/tropical_a_pattern_4.png | 4 +- .../entity/fish/tropical_a_pattern_6.png | 4 +- .../textures/entity/fish/tropical_b.png | 4 +- .../entity/fish/tropical_b_pattern_1.png | 4 +- .../entity/fish/tropical_b_pattern_3.png | 4 +- .../entity/fish/tropical_b_pattern_6.png | 4 +- .../textures/entity/fishing_hook.png | 4 +- assets/minecraft/textures/entity/fox/fox.png | 4 +- .../textures/entity/fox/fox_sleep.png | 4 +- .../textures/entity/fox/snow_fox.png | 4 +- .../textures/entity/fox/snow_fox_sleep.png | 4 +- .../textures/entity/frog/warm_frog.png | 4 +- .../minecraft/textures/entity/ghast/ghast.png | 4 +- .../textures/entity/ghast/ghast_shooting.png | 4 +- .../textures/entity/ghast/happy_ghast.png | 3 + .../entity/ghast/happy_ghast_baby.png | 3 + .../entity/ghast/happy_ghast_ropes.png | 3 + .../minecraft/textures/entity/goat/goat.png | 4 +- assets/minecraft/textures/entity/guardian.png | 4 +- .../textures/entity/guardian_beam.png | 4 +- .../textures/entity/guardian_elder.png | 4 +- .../textures/entity/hoglin/hoglin.png | 4 +- .../textures/entity/hoglin/zoglin.png | 4 +- .../textures/entity/horse/donkey.png | 4 +- .../textures/entity/horse/horse_brown.png | 4 +- .../textures/entity/horse/horse_chestnut.png | 4 +- .../textures/entity/horse/horse_creamy.png | 4 +- .../entity/horse/horse_markings_blackdots.png | 4 +- .../entity/horse/horse_markings_white.png | 4 +- .../entity/horse/horse_markings_whitedots.png | 4 +- .../horse/horse_markings_whitefield.png | 4 +- .../textures/entity/horse/horse_skeleton.png | 4 +- .../textures/entity/horse/horse_zombie.png | 4 +- .../minecraft/textures/entity/horse/mule.png | 4 +- .../textures/entity/illager/evoker.png | 4 +- .../textures/entity/illager/evoker_fangs.png | 4 +- .../textures/entity/illager/illusioner.png | 4 +- .../textures/entity/illager/pillager.png | 4 +- .../textures/entity/illager/ravager.png | 4 +- .../minecraft/textures/entity/illager/vex.png | 4 +- .../textures/entity/iron_golem/iron_golem.png | 4 +- .../iron_golem/iron_golem_crackiness_high.png | 4 +- .../iron_golem/iron_golem_crackiness_low.png | 4 +- .../iron_golem_crackiness_medium.png | 4 +- .../minecraft/textures/entity/lead_knot.png | 4 +- .../minecraft/textures/entity/llama/brown.png | 4 +- .../textures/entity/llama/creamy.png | 4 +- .../minecraft/textures/entity/llama/white.png | 4 +- .../entity/panda/aggressive_panda.png | 4 +- .../textures/entity/panda/brown_panda.png | 4 +- .../textures/entity/panda/lazy_panda.png | 4 +- .../minecraft/textures/entity/panda/panda.png | 4 +- .../textures/entity/panda/playful_panda.png | 4 +- .../textures/entity/panda/weak_panda.png | 4 +- .../textures/entity/panda/worried_panda.png | 4 +- .../textures/entity/parrot/parrot_blue.png | 4 +- .../textures/entity/parrot/parrot_green.png | 4 +- .../textures/entity/parrot/parrot_grey.png | 4 +- .../entity/parrot/parrot_red_blue.png | 4 +- .../entity/parrot/parrot_yellow_blue.png | 4 +- assets/minecraft/textures/entity/phantom.png | 4 +- .../textures/entity/piglin/piglin_brute.png | 4 +- .../textures/entity/player/slim/ari.png | 4 +- .../textures/entity/player/slim/kai.png | 4 +- .../textures/entity/player/slim/noor.png | 4 +- .../textures/entity/player/slim/steve.png | 4 +- .../textures/entity/player/wide/ari.png | 4 +- .../textures/entity/player/wide/efe.png | 4 +- .../textures/entity/player/wide/kai.png | 4 +- .../textures/entity/player/wide/makena.png | 4 +- .../textures/entity/player/wide/steve.png | 4 +- .../textures/entity/player/wide/zuri.png | 4 +- .../textures/entity/projectiles/arrow.png | 4 +- .../entity/projectiles/spectral_arrow.png | 4 +- .../entity/projectiles/tipped_arrow.png | 4 +- .../entity/projectiles/wind_charge.png | 4 +- .../textures/entity/rabbit/caerbannog.png | 4 +- .../minecraft/textures/entity/rabbit/gold.png | 4 +- .../minecraft/textures/entity/rabbit/salt.png | 4 +- .../textures/entity/rabbit/toast.png | 4 +- .../textures/entity/rabbit/white.png | 4 +- .../entity/rabbit/white_splotched.png | 4 +- .../minecraft/textures/entity/sheep/sheep.png | 4 +- .../entity/sheep/sheep_wool_undercoat.png | 4 +- .../minecraft/textures/entity/shield/base.png | 4 +- .../textures/entity/shield/border.png | 4 +- .../textures/entity/shield/bricks.png | 4 +- .../textures/entity/shield/circle.png | 4 +- .../textures/entity/shield/creeper.png | 4 +- .../textures/entity/shield/cross.png | 4 +- .../textures/entity/shield/curly_border.png | 4 +- .../textures/entity/shield/diagonal_left.png | 4 +- .../textures/entity/shield/diagonal_right.png | 4 +- .../entity/shield/diagonal_up_left.png | 4 +- .../entity/shield/diagonal_up_right.png | 4 +- .../minecraft/textures/entity/shield/flow.png | 4 +- .../textures/entity/shield/flower.png | 4 +- .../textures/entity/shield/globe.png | 4 +- .../textures/entity/shield/gradient.png | 4 +- .../textures/entity/shield/gradient_up.png | 4 +- .../textures/entity/shield/guster.png | 4 +- .../entity/shield/half_horizontal.png | 4 +- .../entity/shield/half_horizontal_bottom.png | 4 +- .../textures/entity/shield/half_vertical.png | 4 +- .../entity/shield/half_vertical_right.png | 4 +- .../textures/entity/shield/mojang.png | 4 +- .../textures/entity/shield/piglin.png | 4 +- .../textures/entity/shield/rhombus.png | 4 +- .../textures/entity/shield/skull.png | 4 +- .../textures/entity/shield/small_stripes.png | 4 +- .../entity/shield/square_bottom_left.png | 4 +- .../entity/shield/square_bottom_right.png | 4 +- .../entity/shield/square_top_left.png | 4 +- .../entity/shield/square_top_right.png | 4 +- .../textures/entity/shield/straight_cross.png | 4 +- .../textures/entity/shield/stripe_bottom.png | 4 +- .../textures/entity/shield/stripe_center.png | 4 +- .../entity/shield/stripe_downleft.png | 4 +- .../entity/shield/stripe_downright.png | 4 +- .../textures/entity/shield/stripe_left.png | 4 +- .../textures/entity/shield/stripe_middle.png | 4 +- .../textures/entity/shield/stripe_right.png | 4 +- .../textures/entity/shield/stripe_top.png | 4 +- .../entity/shield/triangle_bottom.png | 4 +- .../textures/entity/shield/triangle_top.png | 4 +- .../entity/shield/triangles_bottom.png | 4 +- .../textures/entity/shield/triangles_top.png | 4 +- .../minecraft/textures/entity/shield_base.png | 4 +- .../textures/entity/shield_base_nopattern.png | 4 +- .../textures/entity/shulker/shulker.png | 4 +- .../textures/entity/shulker/shulker_black.png | 4 +- .../textures/entity/shulker/shulker_blue.png | 4 +- .../textures/entity/shulker/shulker_brown.png | 4 +- .../textures/entity/shulker/shulker_cyan.png | 4 +- .../textures/entity/shulker/shulker_gray.png | 4 +- .../textures/entity/shulker/shulker_green.png | 4 +- .../entity/shulker/shulker_light_blue.png | 4 +- .../entity/shulker/shulker_light_gray.png | 4 +- .../textures/entity/shulker/shulker_lime.png | 4 +- .../entity/shulker/shulker_magenta.png | 4 +- .../entity/shulker/shulker_orange.png | 4 +- .../textures/entity/shulker/shulker_pink.png | 4 +- .../entity/shulker/shulker_purple.png | 4 +- .../textures/entity/shulker/shulker_red.png | 4 +- .../textures/entity/shulker/shulker_white.png | 4 +- .../entity/shulker/shulker_yellow.png | 4 +- .../textures/entity/shulker/spark.png | 4 +- .../textures/entity/signs/crimson.png | 4 +- .../minecraft/textures/entity/silverfish.png | 4 +- .../textures/entity/skeleton/bogged.png | 4 +- .../textures/entity/skeleton/skeleton.png | 4 +- .../textures/entity/skeleton/stray.png | 4 +- .../entity/skeleton/stray_overlay.png | 4 +- .../entity/skeleton/wither_skeleton.png | 4 +- .../textures/entity/slime/magmacube.png | 4 +- .../textures/entity/sniffer/sniffer.png | 4 +- .../minecraft/textures/entity/spider_eyes.png | 4 +- .../textures/entity/squid/glow_squid.png | 4 +- .../minecraft/textures/entity/squid/squid.png | 4 +- .../textures/entity/strider/strider.png | 4 +- .../textures/entity/strider/strider_cold.png | 4 +- assets/minecraft/textures/entity/trident.png | 4 +- .../textures/entity/trident_riptide.png | 4 +- .../textures/entity/turtle/big_sea_turtle.png | 4 +- .../entity/villager/profession/armorer.png | 4 +- .../entity/villager/profession/butcher.png | 4 +- .../entity/villager/profession/cleric.png | 4 +- .../entity/villager/profession/farmer.png | 4 +- .../entity/villager/profession/fletcher.png | 4 +- .../villager/profession/leatherworker.png | 4 +- .../entity/villager/profession/librarian.png | 4 +- .../entity/villager/profession/shepherd.png | 4 +- .../entity/villager/profession/toolsmith.png | 4 +- .../villager/profession/weaponsmith.png | 4 +- .../villager/profession_level/diamond.png | 4 +- .../villager/profession_level/emerald.png | 4 +- .../entity/villager/profession_level/gold.png | 4 +- .../textures/entity/villager/type/plains.png | 4 +- .../textures/entity/villager/type/savanna.png | 4 +- .../textures/entity/villager/type/swamp.png | 4 +- .../textures/entity/villager/villager.png | 4 +- .../textures/entity/warden/warden.png | 4 +- .../warden/warden_pulsating_spots_1.png | 4 +- .../warden/warden_pulsating_spots_2.png | 4 +- assets/minecraft/textures/entity/witch.png | 4 +- .../textures/entity/wither/wither.png | 4 +- .../textures/entity/wither/wither_armor.png | 4 +- .../entity/wither/wither_invulnerable.png | 4 +- .../minecraft/textures/entity/wolf/wolf.png | 4 +- .../textures/entity/wolf/wolf_angry.png | 4 +- .../wolf/wolf_armor_crackiness_high.png | 4 +- .../entity/wolf/wolf_armor_crackiness_low.png | 4 +- .../wolf/wolf_armor_crackiness_medium.png | 4 +- .../textures/entity/wolf/wolf_ashen.png | 4 +- .../textures/entity/wolf/wolf_ashen_angry.png | 4 +- .../textures/entity/wolf/wolf_ashen_tame.png | 4 +- .../textures/entity/wolf/wolf_black.png | 4 +- .../textures/entity/wolf/wolf_black_angry.png | 4 +- .../textures/entity/wolf/wolf_black_tame.png | 4 +- .../textures/entity/wolf/wolf_chestnut.png | 4 +- .../entity/wolf/wolf_chestnut_angry.png | 4 +- .../entity/wolf/wolf_chestnut_tame.png | 4 +- .../textures/entity/wolf/wolf_collar.png | 4 +- .../textures/entity/wolf/wolf_rusty.png | 4 +- .../textures/entity/wolf/wolf_rusty_angry.png | 4 +- .../textures/entity/wolf/wolf_rusty_tame.png | 4 +- .../textures/entity/wolf/wolf_snowy.png | 4 +- .../textures/entity/wolf/wolf_snowy_angry.png | 4 +- .../textures/entity/wolf/wolf_snowy_tame.png | 4 +- .../entity/wolf/wolf_spotted_angry.png | 4 +- .../entity/wolf/wolf_spotted_tame.png | 4 +- .../textures/entity/wolf/wolf_striped.png | 4 +- .../entity/wolf/wolf_striped_angry.png | 4 +- .../entity/wolf/wolf_striped_tame.png | 4 +- .../textures/entity/wolf/wolf_tame.png | 4 +- .../textures/entity/wolf/wolf_woods.png | 4 +- .../textures/entity/wolf/wolf_woods_angry.png | 4 +- .../textures/entity/wolf/wolf_woods_tame.png | 4 +- .../textures/entity/zombie/drowned.png | 4 +- .../entity/zombie/drowned_outer_layer.png | 4 +- .../minecraft/textures/entity/zombie/husk.png | 4 +- .../textures/entity/zombie/zombie.png | 4 +- .../zombie_villager/profession/butcher.png | 4 +- .../zombie_villager/profession/cleric.png | 4 +- .../zombie_villager/profession/farmer.png | 4 +- .../zombie_villager/profession/fletcher.png | 4 +- .../profession/leatherworker.png | 4 +- .../zombie_villager/profession/librarian.png | 4 +- .../zombie_villager/profession/nitwit.png | 4 +- .../zombie_villager/profession/shepherd.png | 4 +- .../zombie_villager/profession/toolsmith.png | 4 +- .../profession/weaponsmith.png | 4 +- .../profession_level/diamond.png | 4 +- .../profession_level/emerald.png | 4 +- .../zombie_villager/profession_level/gold.png | 4 +- .../entity/zombie_villager/type/desert.png | 4 +- .../entity/zombie_villager/type/plains.png | 4 +- .../entity/zombie_villager/type/swamp.png | 4 +- .../zombie_villager/zombie_villager.png | 4 +- .../minecraft/textures/environment/clouds.png | 4 +- .../textures/environment/end_sky.png | 4 +- .../textures/environment/moon_phases.png | 4 +- .../minecraft/textures/environment/rain.png | 4 +- .../minecraft/textures/environment/snow.png | 4 +- .../textures/font/nonlatin_european.png | 4 +- .../advancements/backgrounds/husbandry.png | 4 +- .../gui/advancements/backgrounds/stone.png | 4 +- .../textures/gui/advancements/window.png | 4 +- assets/minecraft/textures/gui/book.png | 4 +- .../textures/gui/container/beacon.png | 4 +- .../textures/gui/container/crafter.png | 4 +- .../creative_inventory/tab_inventory.png | 4 +- .../creative_inventory/tab_item_search.png | 4 +- .../creative_inventory/tab_items.png | 4 +- .../textures/gui/container/smithing.png | 4 +- .../textures/gui/footer_separator.png | 4 +- .../textures/gui/hanging_signs/acacia.png | 4 +- .../textures/gui/hanging_signs/bamboo.png | 4 +- .../textures/gui/hanging_signs/birch.png | 4 +- .../textures/gui/hanging_signs/cherry.png | 4 +- .../textures/gui/hanging_signs/crimson.png | 4 +- .../textures/gui/hanging_signs/dark_oak.png | 4 +- .../textures/gui/hanging_signs/jungle.png | 4 +- .../textures/gui/hanging_signs/mangrove.png | 4 +- .../textures/gui/hanging_signs/oak.png | 4 +- .../textures/gui/hanging_signs/pale_oak.png | 4 +- .../textures/gui/hanging_signs/spruce.png | 4 +- .../textures/gui/hanging_signs/warped.png | 4 +- .../textures/gui/header_separator.png | 4 +- .../textures/gui/inworld_footer_separator.png | 4 +- .../textures/gui/inworld_header_separator.png | 4 +- .../textures/gui/inworld_menu_background.png | 4 +- .../gui/inworld_menu_list_background.png | 4 +- .../textures/gui/menu_background.png | 4 +- .../textures/gui/menu_list_background.png | 4 +- .../textures/gui/realms/adventure.png | 4 +- .../textures/gui/realms/empty_frame.png | 4 +- .../textures/gui/realms/experience.png | 4 +- .../textures/gui/realms/new_world.png | 4 +- .../textures/gui/realms/no_realms.png | 4 +- .../minecraft/textures/gui/realms/upload.png | 4 +- .../gui/sprites/advancements/box_obtained.png | 4 +- .../sprites/advancements/box_unobtained.png | 4 +- .../advancements/challenge_frame_obtained.png | 4 +- .../challenge_frame_unobtained.png | 4 +- .../advancements/goal_frame_obtained.png | 4 +- .../advancements/goal_frame_unobtained.png | 4 +- .../sprites/advancements/tab_above_left.png | 4 +- .../advancements/tab_above_left_selected.png | 4 +- .../sprites/advancements/tab_above_middle.png | 4 +- .../tab_above_middle_selected.png | 4 +- .../sprites/advancements/tab_above_right.png | 4 +- .../advancements/tab_above_right_selected.png | 4 +- .../sprites/advancements/tab_below_left.png | 4 +- .../advancements/tab_below_left_selected.png | 4 +- .../sprites/advancements/tab_below_middle.png | 4 +- .../tab_below_middle_selected.png | 4 +- .../sprites/advancements/tab_below_right.png | 4 +- .../advancements/tab_below_right_selected.png | 4 +- .../sprites/advancements/tab_left_bottom.png | 4 +- .../advancements/tab_left_bottom_selected.png | 4 +- .../sprites/advancements/tab_left_middle.png | 4 +- .../advancements/tab_left_middle_selected.png | 4 +- .../gui/sprites/advancements/tab_left_top.png | 4 +- .../advancements/tab_left_top_selected.png | 4 +- .../sprites/advancements/tab_right_bottom.png | 4 +- .../tab_right_bottom_selected.png | 4 +- .../sprites/advancements/tab_right_middle.png | 4 +- .../tab_right_middle_selected.png | 4 +- .../sprites/advancements/tab_right_top.png | 4 +- .../advancements/tab_right_top_selected.png | 4 +- .../advancements/task_frame_obtained.png | 4 +- .../advancements/task_frame_unobtained.png | 4 +- .../gui/sprites/advancements/title_box.png | 4 +- .../gui/sprites/boss_bar/blue_progress.png | 4 +- .../gui/sprites/boss_bar/green_progress.png | 4 +- .../boss_bar/notched_10_background.png | 4 +- .../sprites/boss_bar/notched_10_progress.png | 4 +- .../boss_bar/notched_12_background.png | 4 +- .../sprites/boss_bar/notched_12_progress.png | 4 +- .../boss_bar/notched_20_background.png | 4 +- .../sprites/boss_bar/notched_20_progress.png | 4 +- .../sprites/boss_bar/notched_6_background.png | 4 +- .../sprites/boss_bar/notched_6_progress.png | 4 +- .../gui/sprites/boss_bar/red_progress.png | 4 +- .../gui/sprites/boss_bar/white_background.png | 4 +- .../gui/sprites/boss_bar/white_progress.png | 4 +- .../gui/sprites/boss_bar/yellow_progress.png | 4 +- .../gui/sprites/container/anvil/error.png | 4 +- .../gui/sprites/container/beacon/button.png | 4 +- .../container/beacon/button_disabled.png | 4 +- .../container/beacon/button_highlighted.png | 4 +- .../container/beacon/button_selected.png | 4 +- .../gui/sprites/container/beacon/cancel.png | 4 +- .../gui/sprites/container/beacon/confirm.png | 4 +- .../container/blast_furnace/burn_progress.png | 4 +- .../container/blast_furnace/lit_progress.png | 4 +- .../container/brewing_stand/brew_progress.png | 4 +- .../container/brewing_stand/bubbles.png | 4 +- .../container/brewing_stand/fuel_length.png | 4 +- .../bundle/bundle_progressbar_border.png | 4 +- .../bundle/bundle_progressbar_fill.png | 4 +- .../bundle/bundle_progressbar_full.png | 4 +- .../container/bundle/slot_background.png | 4 +- .../container/bundle/slot_highlight_back.png | 4 +- .../container/bundle/slot_highlight_front.png | 4 +- .../cartography_table/duplicated_map.png | 4 +- .../container/cartography_table/error.png | 4 +- .../container/cartography_table/locked.png | 4 +- .../container/cartography_table/map.png | 4 +- .../cartography_table/scaled_map.png | 4 +- .../container/crafter/disabled_slot.png | 4 +- .../container/crafter/powered_redstone.png | 4 +- .../container/crafter/unpowered_redstone.png | 4 +- .../container/creative_inventory/scroller.png | 4 +- .../creative_inventory/scroller_disabled.png | 4 +- .../tab_bottom_selected_1.png | 4 +- .../tab_bottom_selected_2.png | 4 +- .../tab_bottom_selected_3.png | 4 +- .../tab_bottom_selected_4.png | 4 +- .../tab_bottom_selected_5.png | 4 +- .../tab_bottom_selected_6.png | 4 +- .../tab_bottom_selected_7.png | 4 +- .../tab_bottom_unselected_1.png | 4 +- .../tab_bottom_unselected_2.png | 4 +- .../tab_bottom_unselected_3.png | 4 +- .../tab_bottom_unselected_4.png | 4 +- .../tab_bottom_unselected_5.png | 4 +- .../tab_bottom_unselected_6.png | 4 +- .../tab_bottom_unselected_7.png | 4 +- .../creative_inventory/tab_top_selected_1.png | 4 +- .../creative_inventory/tab_top_selected_2.png | 4 +- .../creative_inventory/tab_top_selected_3.png | 4 +- .../creative_inventory/tab_top_selected_4.png | 4 +- .../creative_inventory/tab_top_selected_5.png | 4 +- .../creative_inventory/tab_top_selected_6.png | 4 +- .../creative_inventory/tab_top_selected_7.png | 4 +- .../tab_top_unselected_1.png | 4 +- .../tab_top_unselected_2.png | 4 +- .../tab_top_unselected_3.png | 4 +- .../tab_top_unselected_4.png | 4 +- .../tab_top_unselected_5.png | 4 +- .../tab_top_unselected_6.png | 4 +- .../tab_top_unselected_7.png | 4 +- .../container/enchanting_table/level_1.png | 4 +- .../enchanting_table/level_1_disabled.png | 4 +- .../container/enchanting_table/level_2.png | 4 +- .../enchanting_table/level_2_disabled.png | 4 +- .../container/enchanting_table/level_3.png | 4 +- .../enchanting_table/level_3_disabled.png | 4 +- .../container/furnace/burn_progress.png | 4 +- .../container/furnace/lit_progress.png | 4 +- .../sprites/container/grindstone/error.png | 4 +- .../sprites/container/horse/chest_slots.png | 4 +- .../inventory/effect_background_large.png | 4 +- .../inventory/effect_background_small.png | 4 +- .../gui/sprites/container/loom/error.png | 4 +- .../gui/sprites/container/loom/pattern.png | 4 +- .../container/loom/pattern_highlighted.png | 4 +- .../container/loom/pattern_selected.png | 4 +- .../gui/sprites/container/loom/scroller.png | 4 +- .../container/loom/scroller_disabled.png | 4 +- .../textures/gui/sprites/container/slot.png | 4 +- .../sprites/container/slot/amethyst_shard.png | 4 +- .../gui/sprites/container/slot/axe.png | 4 +- .../gui/sprites/container/slot/banner.png | 4 +- .../sprites/container/slot/banner_pattern.png | 4 +- .../gui/sprites/container/slot/boots.png | 4 +- .../sprites/container/slot/brewing_fuel.png | 4 +- .../gui/sprites/container/slot/chestplate.png | 4 +- .../gui/sprites/container/slot/diamond.png | 4 +- .../gui/sprites/container/slot/dye.png | 4 +- .../gui/sprites/container/slot/emerald.png | 4 +- .../gui/sprites/container/slot/helmet.png | 4 +- .../gui/sprites/container/slot/hoe.png | 4 +- .../sprites/container/slot/horse_armor.png | 4 +- .../gui/sprites/container/slot/ingot.png | 4 +- .../sprites/container/slot/lapis_lazuli.png | 4 +- .../gui/sprites/container/slot/leggings.png | 4 +- .../sprites/container/slot/llama_armor.png | 4 +- .../gui/sprites/container/slot/pickaxe.png | 4 +- .../gui/sprites/container/slot/potion.png | 4 +- .../gui/sprites/container/slot/quartz.png | 4 +- .../sprites/container/slot/redstone_dust.png | 4 +- .../gui/sprites/container/slot/saddle.png | 4 +- .../gui/sprites/container/slot/shield.png | 4 +- .../gui/sprites/container/slot/shovel.png | 4 +- .../slot/smithing_template_armor_trim.png | 4 +- .../smithing_template_netherite_upgrade.png | 4 +- .../gui/sprites/container/slot/sword.png | 4 +- .../sprites/container/slot_highlight_back.png | 4 +- .../container/slot_highlight_front.png | 4 +- .../gui/sprites/container/smithing/error.png | 4 +- .../container/smoker/burn_progress.png | 4 +- .../sprites/container/smoker/lit_progress.png | 4 +- .../sprites/container/stonecutter/recipe.png | 4 +- .../stonecutter/recipe_highlighted.png | 4 +- .../container/stonecutter/recipe_selected.png | 4 +- .../container/stonecutter/scroller.png | 4 +- .../stonecutter/scroller_disabled.png | 4 +- .../villager/discount_strikethrough.png | 4 +- .../villager/experience_bar_current.png | 4 +- .../villager/experience_bar_result.png | 4 +- .../container/villager/out_of_stock.png | 4 +- .../sprites/container/villager/scroller.png | 4 +- .../container/villager/scroller_disabled.png | 4 +- .../container/villager/trade_arrow.png | 4 +- .../villager/trade_arrow_out_of_stock.png | 4 +- .../gui/sprites/dialog/warning_button.png | 3 + .../dialog/warning_button_disabled.png | 3 + .../dialog/warning_button_highlighted.png | 3 + .../textures/gui/sprites/hud/air_bursting.png | 4 +- .../textures/gui/sprites/hud/air_empty.png | 4 +- .../textures/gui/sprites/hud/armor_empty.png | 4 +- .../textures/gui/sprites/hud/armor_full.png | 4 +- .../textures/gui/sprites/hud/crosshair.png | 4 +- .../crosshair_attack_indicator_background.png | 4 +- .../hud/crosshair_attack_indicator_full.png | 4 +- .../crosshair_attack_indicator_progress.png | 4 +- .../gui/sprites/hud/effect_background.png | 4 +- .../sprites/hud/effect_background_ambient.png | 4 +- .../sprites/hud/experience_bar_background.png | 4 +- .../textures/gui/sprites/hud/food_empty.png | 4 +- .../gui/sprites/hud/food_empty_hunger.png | 4 +- .../textures/gui/sprites/hud/food_full.png | 4 +- .../gui/sprites/hud/food_full_hunger.png | 4 +- .../textures/gui/sprites/hud/food_half.png | 4 +- .../gui/sprites/hud/food_half_hunger.png | 4 +- .../gui/sprites/hud/heart/absorbing_full.png | 4 +- .../hud/heart/absorbing_full_blinking.png | 4 +- .../gui/sprites/hud/heart/absorbing_half.png | 4 +- .../hud/heart/absorbing_half_blinking.png | 4 +- .../hud/heart/absorbing_hardcore_full.png | 4 +- .../absorbing_hardcore_full_blinking.png | 4 +- .../hud/heart/absorbing_hardcore_half.png | 4 +- .../absorbing_hardcore_half_blinking.png | 4 +- .../gui/sprites/hud/heart/container.png | 4 +- .../sprites/hud/heart/container_blinking.png | 4 +- .../sprites/hud/heart/container_hardcore.png | 4 +- .../hud/heart/container_hardcore_blinking.png | 4 +- .../gui/sprites/hud/heart/frozen_full.png | 4 +- .../hud/heart/frozen_full_blinking.png | 4 +- .../gui/sprites/hud/heart/frozen_half.png | 4 +- .../hud/heart/frozen_half_blinking.png | 4 +- .../hud/heart/frozen_hardcore_full.png | 4 +- .../heart/frozen_hardcore_full_blinking.png | 4 +- .../hud/heart/frozen_hardcore_half.png | 4 +- .../heart/frozen_hardcore_half_blinking.png | 4 +- .../textures/gui/sprites/hud/heart/full.png | 4 +- .../gui/sprites/hud/heart/full_blinking.png | 4 +- .../textures/gui/sprites/hud/heart/half.png | 4 +- .../gui/sprites/hud/heart/half_blinking.png | 4 +- .../gui/sprites/hud/heart/hardcore_full.png | 4 +- .../hud/heart/hardcore_full_blinking.png | 4 +- .../gui/sprites/hud/heart/hardcore_half.png | 4 +- .../hud/heart/hardcore_half_blinking.png | 4 +- .../gui/sprites/hud/heart/poisoned_full.png | 4 +- .../hud/heart/poisoned_full_blinking.png | 4 +- .../gui/sprites/hud/heart/poisoned_half.png | 4 +- .../hud/heart/poisoned_half_blinking.png | 4 +- .../hud/heart/poisoned_hardcore_full.png | 4 +- .../heart/poisoned_hardcore_full_blinking.png | 4 +- .../hud/heart/poisoned_hardcore_half.png | 4 +- .../heart/poisoned_hardcore_half_blinking.png | 4 +- .../sprites/hud/heart/vehicle_container.png | 4 +- .../gui/sprites/hud/heart/vehicle_full.png | 4 +- .../gui/sprites/hud/heart/vehicle_half.png | 4 +- .../gui/sprites/hud/heart/withered_full.png | 4 +- .../hud/heart/withered_full_blinking.png | 4 +- .../gui/sprites/hud/heart/withered_half.png | 4 +- .../hud/heart/withered_half_blinking.png | 4 +- .../hud/heart/withered_hardcore_full.png | 4 +- .../heart/withered_hardcore_full_blinking.png | 4 +- .../hud/heart/withered_hardcore_half.png | 4 +- .../heart/withered_hardcore_half_blinking.png | 4 +- .../hotbar_attack_indicator_background.png | 4 +- .../hud/hotbar_attack_indicator_progress.png | 4 +- .../gui/sprites/hud/hotbar_offhand_right.png | 4 +- .../sprites/hud/locator_bar_arrow_down.png | 3 + .../hud/locator_bar_arrow_down.png.mcmeta | 15 + .../gui/sprites/hud/locator_bar_arrow_up.png | 3 + .../hud/locator_bar_arrow_up.png.mcmeta | 15 + .../sprites/hud/locator_bar_background.png | 3 + .../hud/locator_bar_background.png.mcmeta | 15 + .../sprites/hud/locator_bar_dot/bowtie.png | 3 + .../sprites/hud/locator_bar_dot/default_0.png | 3 + .../sprites/hud/locator_bar_dot/default_1.png | 3 + .../sprites/hud/locator_bar_dot/default_2.png | 3 + .../sprites/hud/locator_bar_dot/default_3.png | 3 + .../gui/sprites/icon/accessibility.png | 4 +- .../gui/sprites/icon/chat_modified.png | 4 +- .../textures/gui/sprites/icon/checkmark.png | 4 +- .../gui/sprites/icon/draft_report.png | 4 +- .../textures/gui/sprites/icon/info.png | 4 +- .../textures/gui/sprites/icon/invite.png | 4 +- .../textures/gui/sprites/icon/link.png | 4 +- .../gui/sprites/icon/link_highlighted.png | 4 +- .../textures/gui/sprites/icon/music_notes.png | 3 + .../gui/sprites/icon/music_notes.png.mcmeta | 5 + .../textures/gui/sprites/icon/new_realm.png | 4 +- .../textures/gui/sprites/icon/news.png | 4 +- .../textures/gui/sprites/icon/ping_1.png | 4 +- .../textures/gui/sprites/icon/ping_2.png | 4 +- .../textures/gui/sprites/icon/ping_3.png | 4 +- .../textures/gui/sprites/icon/ping_4.png | 4 +- .../textures/gui/sprites/icon/ping_5.png | 4 +- .../gui/sprites/icon/ping_unknown.png | 4 +- .../textures/gui/sprites/icon/search.png | 4 +- .../gui/sprites/icon/trial_available.png | 4 +- .../gui/sprites/icon/unseen_notification.png | 4 +- .../textures/gui/sprites/icon/video_link.png | 4 +- .../sprites/icon/video_link_highlighted.png | 4 +- .../textures/gui/sprites/notification/1.png | 4 +- .../textures/gui/sprites/notification/2.png | 4 +- .../textures/gui/sprites/notification/3.png | 4 +- .../textures/gui/sprites/notification/4.png | 4 +- .../textures/gui/sprites/notification/5.png | 4 +- .../gui/sprites/notification/more.png | 4 +- .../gui/sprites/pending_invite/accept.png | 4 +- .../pending_invite/accept_highlighted.png | 4 +- .../gui/sprites/pending_invite/reject.png | 4 +- .../pending_invite/reject_highlighted.png | 4 +- .../gui/sprites/player_list/make_operator.png | 4 +- .../sprites/player_list/remove_operator.png | 4 +- .../gui/sprites/player_list/remove_player.png | 4 +- .../textures/gui/sprites/popup/background.png | 4 +- .../gui/sprites/realm_status/closed.png | 4 +- .../gui/sprites/realm_status/expired.png | 4 +- .../gui/sprites/realm_status/expires_soon.png | 4 +- .../gui/sprites/realm_status/open.png | 4 +- .../gui/sprites/recipe_book/button.png | 4 +- .../recipe_book/button_highlighted.png | 4 +- .../sprites/recipe_book/crafting_overlay.png | 4 +- .../recipe_book/crafting_overlay_disabled.png | 4 +- .../crafting_overlay_disabled_highlighted.png | 4 +- .../crafting_overlay_highlighted.png | 4 +- .../sprites/recipe_book/filter_disabled.png | 4 +- .../filter_disabled_highlighted.png | 4 +- .../sprites/recipe_book/filter_enabled.png | 4 +- .../filter_enabled_highlighted.png | 4 +- .../recipe_book/furnace_filter_disabled.png | 4 +- .../furnace_filter_disabled_highlighted.png | 4 +- .../recipe_book/furnace_filter_enabled.png | 4 +- .../furnace_filter_enabled_highlighted.png | 4 +- .../sprites/recipe_book/furnace_overlay.png | 4 +- .../recipe_book/furnace_overlay_disabled.png | 4 +- .../furnace_overlay_disabled_highlighted.png | 4 +- .../furnace_overlay_highlighted.png | 4 +- .../sprites/recipe_book/overlay_recipe.png | 4 +- .../gui/sprites/recipe_book/page_backward.png | 4 +- .../recipe_book/page_backward_highlighted.png | 4 +- .../gui/sprites/recipe_book/page_forward.png | 4 +- .../recipe_book/page_forward_highlighted.png | 4 +- .../sprites/recipe_book/slot_craftable.png | 4 +- .../recipe_book/slot_many_craftable.png | 4 +- .../recipe_book/slot_many_uncraftable.png | 4 +- .../sprites/recipe_book/slot_uncraftable.png | 4 +- .../textures/gui/sprites/recipe_book/tab.png | 4 +- .../gui/sprites/recipe_book/tab_selected.png | 4 +- .../gui/sprites/server_list/incompatible.png | 4 +- .../textures/gui/sprites/server_list/join.png | 4 +- .../sprites/server_list/join_highlighted.png | 4 +- .../gui/sprites/server_list/move_down.png | 4 +- .../server_list/move_down_highlighted.png | 4 +- .../gui/sprites/server_list/move_up.png | 4 +- .../server_list/move_up_highlighted.png | 4 +- .../gui/sprites/server_list/ping_1.png | 4 +- .../gui/sprites/server_list/ping_2.png | 4 +- .../gui/sprites/server_list/ping_3.png | 4 +- .../gui/sprites/server_list/ping_4.png | 4 +- .../gui/sprites/server_list/ping_5.png | 4 +- .../gui/sprites/server_list/pinging_1.png | 4 +- .../gui/sprites/server_list/pinging_2.png | 4 +- .../gui/sprites/server_list/pinging_3.png | 4 +- .../gui/sprites/server_list/pinging_4.png | 4 +- .../gui/sprites/server_list/pinging_5.png | 4 +- .../gui/sprites/server_list/unreachable.png | 4 +- .../social_interactions/background.png | 4 +- .../social_interactions/report_button.png | 4 +- .../report_button_disabled.png | 4 +- .../report_button_highlighted.png | 4 +- .../textures/gui/sprites/spectator/close.png | 4 +- .../gui/sprites/spectator/scroll_left.png | 4 +- .../gui/sprites/spectator/scroll_right.png | 4 +- .../sprites/spectator/teleport_to_player.png | 4 +- .../sprites/spectator/teleport_to_team.png | 4 +- .../gui/sprites/statistics/block_mined.png | 4 +- .../gui/sprites/statistics/header.png | 4 +- .../gui/sprites/statistics/item_crafted.png | 4 +- .../gui/sprites/statistics/item_dropped.png | 4 +- .../gui/sprites/statistics/item_picked_up.png | 4 +- .../gui/sprites/statistics/item_used.png | 4 +- .../gui/sprites/statistics/sort_down.png | 4 +- .../gui/sprites/statistics/sort_up.png | 4 +- .../textures/gui/sprites/toast/mouse.png | 4 +- .../gui/sprites/toast/now_playing.png | 3 + .../gui/sprites/toast/now_playing.png.mcmeta | 10 + .../gui/sprites/toast/recipe_book.png | 4 +- .../gui/sprites/toast/right_click.png | 4 +- .../gui/sprites/toast/social_interactions.png | 4 +- .../gui/sprites/tooltip/background.png | 4 +- .../textures/gui/sprites/tooltip/frame.png | 4 +- .../sprites/transferable_list/unselect.png | 4 +- .../gui/sprites/widget/button_disabled.png | 4 +- .../textures/gui/sprites/widget/checkbox.png | 4 +- .../sprites/widget/checkbox_highlighted.png | 4 +- .../gui/sprites/widget/checkbox_selected.png | 4 +- .../widget/checkbox_selected_highlighted.png | 4 +- .../gui/sprites/widget/cross_button.png | 4 +- .../widget/cross_button_highlighted.png | 4 +- .../gui/sprites/widget/page_backward.png | 4 +- .../widget/page_backward_highlighted.png | 4 +- .../gui/sprites/widget/page_forward.png | 4 +- .../widget/page_forward_highlighted.png | 4 +- .../textures/gui/sprites/widget/scroller.png | 4 +- .../textures/gui/sprites/widget/slider.png | 4 +- .../gui/sprites/widget/slider_handle.png | 4 +- .../widget/slider_handle_highlighted.png | 4 +- .../gui/sprites/widget/slot_frame.png | 4 +- .../textures/gui/sprites/widget/tab.png | 4 +- .../gui/sprites/widget/tab_highlighted.png | 4 +- .../gui/sprites/widget/tab_selected.png | 4 +- .../widget/tab_selected_highlighted.png | 4 +- .../textures/gui/sprites/world_list/error.png | 4 +- .../sprites/world_list/error_highlighted.png | 4 +- .../textures/gui/sprites/world_list/join.png | 4 +- .../sprites/world_list/join_highlighted.png | 4 +- .../gui/sprites/world_list/marked_join.png | 4 +- .../world_list/marked_join_highlighted.png | 4 +- .../gui/sprites/world_list/warning.png | 4 +- .../world_list/warning_highlighted.png | 4 +- .../textures/gui/tab_header_background.png | 4 +- .../minecraft/textures/gui/title/edition.png | 4 +- .../textures/gui/title/edition.png.mcmeta | 5 - .../textures/gui/title/minceraft.png.mcmeta | 5 - .../textures/gui/title/minecraft.png.mcmeta | 5 - .../textures/gui/title/realms.png.mcmeta | 5 - .../minecraft/textures/item/acacia_boat.png | 4 +- .../textures/item/acacia_chest_boat.png | 4 +- .../minecraft/textures/item/acacia_door.png | 4 +- .../textures/item/acacia_hanging_sign.png | 4 +- .../textures/item/allay_spawn_egg.png | 4 +- .../textures/item/amethyst_shard.png | 4 +- .../textures/item/angler_pottery_sherd.png | 4 +- assets/minecraft/textures/item/apple.png | 4 +- .../textures/item/archer_pottery_sherd.png | 4 +- .../minecraft/textures/item/armor_stand.png | 4 +- .../textures/item/arms_up_pottery_sherd.png | 4 +- assets/minecraft/textures/item/arrow.png | 4 +- .../textures/item/axolotl_spawn_egg.png | 4 +- .../minecraft/textures/item/baked_potato.png | 4 +- assets/minecraft/textures/item/bamboo.png | 4 +- .../minecraft/textures/item/bamboo_door.png | 4 +- .../textures/item/bamboo_hanging_sign.png | 4 +- .../minecraft/textures/item/bamboo_sign.png | 4 +- assets/minecraft/textures/item/barrier.png | 4 +- .../minecraft/textures/item/bat_spawn_egg.png | 4 +- .../minecraft/textures/item/bee_spawn_egg.png | 4 +- assets/minecraft/textures/item/beef.png | 4 +- assets/minecraft/textures/item/birch_boat.png | 4 +- .../textures/item/birch_chest_boat.png | 4 +- assets/minecraft/textures/item/birch_door.png | 4 +- .../textures/item/birch_hanging_sign.png | 4 +- assets/minecraft/textures/item/birch_sign.png | 4 +- .../minecraft/textures/item/black_bundle.png | 4 +- .../textures/item/black_bundle_open_back.png | 4 +- .../textures/item/black_bundle_open_front.png | 4 +- .../minecraft/textures/item/black_candle.png | 4 +- assets/minecraft/textures/item/black_dye.png | 4 +- .../minecraft/textures/item/black_harness.png | 3 + .../textures/item/blade_pottery_sherd.png | 4 +- .../minecraft/textures/item/blaze_powder.png | 4 +- assets/minecraft/textures/item/blaze_rod.png | 4 +- .../textures/item/blaze_spawn_egg.png | 4 +- .../minecraft/textures/item/blue_bundle.png | 4 +- .../textures/item/blue_bundle_open_back.png | 4 +- .../textures/item/blue_bundle_open_front.png | 4 +- .../minecraft/textures/item/blue_candle.png | 4 +- assets/minecraft/textures/item/blue_egg.png | 4 +- .../minecraft/textures/item/blue_harness.png | 3 + .../bolt_armor_trim_smithing_template.png | 4 +- assets/minecraft/textures/item/bone.png | 4 +- assets/minecraft/textures/item/bone_meal.png | 4 +- assets/minecraft/textures/item/book.png | 4 +- .../item/bordure_indented_banner_pattern.png | 4 +- assets/minecraft/textures/item/bow.png | 4 +- .../minecraft/textures/item/bow_pulling_0.png | 4 +- .../minecraft/textures/item/bow_pulling_1.png | 4 +- .../minecraft/textures/item/bow_pulling_2.png | 4 +- assets/minecraft/textures/item/bread.png | 4 +- assets/minecraft/textures/item/breeze_rod.png | 4 +- .../textures/item/breeze_spawn_egg.png | 4 +- .../textures/item/brewer_pottery_sherd.png | 4 +- assets/minecraft/textures/item/brick.png | 4 +- .../minecraft/textures/item/brown_bundle.png | 4 +- .../textures/item/brown_bundle_open_back.png | 4 +- .../textures/item/brown_bundle_open_front.png | 4 +- .../minecraft/textures/item/brown_candle.png | 4 +- assets/minecraft/textures/item/brown_dye.png | 4 +- assets/minecraft/textures/item/brown_egg.png | 4 +- .../minecraft/textures/item/brown_harness.png | 3 + assets/minecraft/textures/item/bucket.png | 4 +- assets/minecraft/textures/item/bundle.png | 4 +- .../textures/item/bundle_open_back.png | 4 +- .../textures/item/bundle_open_front.png | 4 +- .../textures/item/burn_pottery_sherd.png | 4 +- .../textures/item/camel_spawn_egg.png | 4 +- assets/minecraft/textures/item/candle.png | 4 +- assets/minecraft/textures/item/carrot.png | 4 +- .../textures/item/cave_spider_spawn_egg.png | 4 +- assets/minecraft/textures/item/chain.png | 4 +- .../textures/item/chainmail_boots.png | 4 +- .../textures/item/chainmail_chestplate.png | 4 +- .../textures/item/chainmail_helmet.png | 4 +- .../textures/item/chainmail_leggings.png | 4 +- assets/minecraft/textures/item/charcoal.png | 4 +- .../minecraft/textures/item/cherry_boat.png | 4 +- .../minecraft/textures/item/cherry_door.png | 4 +- .../textures/item/cherry_hanging_sign.png | 4 +- .../minecraft/textures/item/cherry_sign.png | 4 +- assets/minecraft/textures/item/chicken.png | 4 +- assets/minecraft/textures/item/clock_00.png | 4 +- assets/minecraft/textures/item/clock_01.png | 4 +- assets/minecraft/textures/item/clock_02.png | 4 +- assets/minecraft/textures/item/clock_03.png | 4 +- assets/minecraft/textures/item/clock_04.png | 4 +- assets/minecraft/textures/item/clock_05.png | 4 +- assets/minecraft/textures/item/clock_06.png | 4 +- assets/minecraft/textures/item/clock_07.png | 4 +- assets/minecraft/textures/item/clock_08.png | 4 +- assets/minecraft/textures/item/clock_09.png | 4 +- assets/minecraft/textures/item/clock_10.png | 4 +- assets/minecraft/textures/item/clock_22.png | 4 +- assets/minecraft/textures/item/clock_23.png | 4 +- assets/minecraft/textures/item/clock_24.png | 4 +- assets/minecraft/textures/item/clock_25.png | 4 +- assets/minecraft/textures/item/clock_26.png | 4 +- assets/minecraft/textures/item/clock_27.png | 4 +- assets/minecraft/textures/item/clock_28.png | 4 +- assets/minecraft/textures/item/clock_29.png | 4 +- assets/minecraft/textures/item/clock_30.png | 4 +- assets/minecraft/textures/item/clock_31.png | 4 +- assets/minecraft/textures/item/clock_32.png | 4 +- assets/minecraft/textures/item/clock_33.png | 4 +- assets/minecraft/textures/item/clock_34.png | 4 +- assets/minecraft/textures/item/clock_35.png | 4 +- assets/minecraft/textures/item/clock_36.png | 4 +- assets/minecraft/textures/item/clock_37.png | 4 +- assets/minecraft/textures/item/clock_38.png | 4 +- assets/minecraft/textures/item/clock_39.png | 4 +- assets/minecraft/textures/item/clock_40.png | 4 +- assets/minecraft/textures/item/clock_41.png | 4 +- assets/minecraft/textures/item/clock_42.png | 4 +- assets/minecraft/textures/item/clock_44.png | 4 +- assets/minecraft/textures/item/clock_47.png | 4 +- assets/minecraft/textures/item/clock_48.png | 4 +- assets/minecraft/textures/item/clock_49.png | 4 +- assets/minecraft/textures/item/clock_50.png | 4 +- assets/minecraft/textures/item/clock_51.png | 4 +- assets/minecraft/textures/item/clock_52.png | 4 +- assets/minecraft/textures/item/clock_53.png | 4 +- assets/minecraft/textures/item/clock_54.png | 4 +- assets/minecraft/textures/item/clock_55.png | 4 +- assets/minecraft/textures/item/clock_56.png | 4 +- assets/minecraft/textures/item/clock_57.png | 4 +- assets/minecraft/textures/item/clock_58.png | 4 +- assets/minecraft/textures/item/clock_59.png | 4 +- assets/minecraft/textures/item/clock_60.png | 4 +- assets/minecraft/textures/item/clock_61.png | 4 +- assets/minecraft/textures/item/clock_62.png | 4 +- assets/minecraft/textures/item/clock_63.png | 4 +- .../minecraft/textures/item/cocoa_beans.png | 4 +- assets/minecraft/textures/item/cod.png | 4 +- assets/minecraft/textures/item/cod_bucket.png | 4 +- .../minecraft/textures/item/cod_spawn_egg.png | 4 +- assets/minecraft/textures/item/compass_00.png | 4 +- assets/minecraft/textures/item/compass_01.png | 4 +- assets/minecraft/textures/item/compass_02.png | 4 +- assets/minecraft/textures/item/compass_03.png | 4 +- assets/minecraft/textures/item/compass_04.png | 4 +- assets/minecraft/textures/item/compass_05.png | 4 +- assets/minecraft/textures/item/compass_06.png | 4 +- assets/minecraft/textures/item/compass_07.png | 4 +- assets/minecraft/textures/item/compass_08.png | 4 +- assets/minecraft/textures/item/compass_09.png | 4 +- assets/minecraft/textures/item/compass_10.png | 4 +- assets/minecraft/textures/item/compass_11.png | 4 +- assets/minecraft/textures/item/compass_12.png | 4 +- assets/minecraft/textures/item/compass_13.png | 4 +- assets/minecraft/textures/item/compass_14.png | 4 +- assets/minecraft/textures/item/compass_15.png | 4 +- assets/minecraft/textures/item/compass_16.png | 4 +- assets/minecraft/textures/item/compass_17.png | 4 +- assets/minecraft/textures/item/compass_18.png | 4 +- assets/minecraft/textures/item/compass_19.png | 4 +- assets/minecraft/textures/item/compass_20.png | 4 +- assets/minecraft/textures/item/compass_21.png | 4 +- assets/minecraft/textures/item/compass_22.png | 4 +- assets/minecraft/textures/item/compass_23.png | 4 +- assets/minecraft/textures/item/compass_24.png | 4 +- assets/minecraft/textures/item/compass_25.png | 4 +- assets/minecraft/textures/item/compass_26.png | 4 +- assets/minecraft/textures/item/compass_27.png | 4 +- assets/minecraft/textures/item/compass_28.png | 4 +- assets/minecraft/textures/item/compass_29.png | 4 +- assets/minecraft/textures/item/compass_30.png | 4 +- assets/minecraft/textures/item/compass_31.png | 4 +- .../textures/item/cooked_chicken.png | 4 +- assets/minecraft/textures/item/cooked_cod.png | 4 +- .../minecraft/textures/item/cooked_mutton.png | 4 +- .../minecraft/textures/item/cooked_rabbit.png | 4 +- .../minecraft/textures/item/cooked_salmon.png | 4 +- assets/minecraft/textures/item/cookie.png | 4 +- .../minecraft/textures/item/copper_door.png | 4 +- .../minecraft/textures/item/copper_ingot.png | 4 +- .../minecraft/textures/item/cow_spawn_egg.png | 4 +- .../textures/item/creaking_spawn_egg.png | 4 +- .../textures/item/creeper_banner_pattern.png | 4 +- .../minecraft/textures/item/crimson_door.png | 4 +- .../textures/item/crimson_hanging_sign.png | 4 +- .../minecraft/textures/item/crimson_sign.png | 4 +- .../textures/item/crossbow_arrow.png | 4 +- .../textures/item/crossbow_firework.png | 4 +- .../textures/item/crossbow_pulling_0.png | 4 +- .../textures/item/crossbow_pulling_1.png | 4 +- .../textures/item/crossbow_pulling_2.png | 4 +- .../textures/item/crossbow_standby.png | 4 +- .../minecraft/textures/item/cyan_bundle.png | 4 +- .../textures/item/cyan_bundle_open_back.png | 4 +- .../minecraft/textures/item/cyan_candle.png | 4 +- .../minecraft/textures/item/cyan_harness.png | 3 + .../textures/item/danger_pottery_sherd.png | 4 +- .../minecraft/textures/item/dark_oak_boat.png | 4 +- .../textures/item/dark_oak_chest_boat.png | 4 +- .../minecraft/textures/item/dark_oak_door.png | 4 +- .../textures/item/dark_oak_hanging_sign.png | 4 +- assets/minecraft/textures/item/diamond.png | 4 +- .../minecraft/textures/item/diamond_axe.png | 4 +- .../textures/item/diamond_leggings.png | 4 +- .../textures/item/diamond_pickaxe.png | 4 +- .../textures/item/disc_fragment_5.png | 4 +- .../textures/item/dolphin_spawn_egg.png | 4 +- .../textures/item/donkey_spawn_egg.png | 4 +- assets/minecraft/textures/item/dried_kelp.png | 4 +- .../dune_armor_trim_smithing_template.png | 4 +- assets/minecraft/textures/item/echo_shard.png | 4 +- .../item/elder_guardian_spawn_egg.png | 4 +- assets/minecraft/textures/item/elytra.png | 4 +- .../minecraft/textures/item/elytra_broken.png | 4 +- .../minecraft/textures/item/end_crystal.png | 4 +- .../textures/item/ender_dragon_spawn_egg.png | 4 +- assets/minecraft/textures/item/ender_eye.png | 4 +- .../textures/item/enderman_spawn_egg.png | 4 +- .../textures/item/evoker_spawn_egg.png | 4 +- .../textures/item/explorer_pottery_sherd.png | 4 +- .../item/eye_armor_trim_smithing_template.png | 4 +- assets/minecraft/textures/item/feather.png | 4 +- .../item/field_masoned_banner_pattern.png | 4 +- assets/minecraft/textures/item/filled_map.png | 4 +- .../textures/item/filled_map_markings.png | 4 +- .../minecraft/textures/item/fire_charge.png | 4 +- .../minecraft/textures/item/firefly_bush.png | 4 +- .../textures/item/firework_rocket.png | 4 +- .../minecraft/textures/item/firework_star.png | 4 +- .../textures/item/firework_star_overlay.png | 4 +- .../textures/item/fishing_rod_cast.png | 4 +- assets/minecraft/textures/item/flint.png | 4 +- .../textures/item/flint_and_steel.png | 4 +- .../flow_armor_trim_smithing_template.png | 4 +- .../textures/item/flow_banner_pattern.png | 4 +- .../textures/item/flow_pottery_sherd.png | 4 +- .../textures/item/flower_banner_pattern.png | 4 +- assets/minecraft/textures/item/flower_pot.png | 4 +- .../textures/item/friend_pottery_sherd.png | 4 +- .../textures/item/frog_spawn_egg.png | 4 +- .../textures/item/ghast_spawn_egg.png | 4 +- .../textures/item/globe_banner_pattern.png | 4 +- .../minecraft/textures/item/glow_berries.png | 4 +- .../minecraft/textures/item/glow_ink_sac.png | 4 +- assets/minecraft/textures/item/goat_horn.png | 4 +- .../textures/item/goat_spawn_egg.png | 4 +- assets/minecraft/textures/item/gold_ingot.png | 4 +- .../minecraft/textures/item/golden_apple.png | 4 +- assets/minecraft/textures/item/golden_axe.png | 4 +- .../minecraft/textures/item/golden_carrot.png | 4 +- .../textures/item/golden_chestplate.png | 4 +- .../textures/item/golden_pickaxe.png | 4 +- .../minecraft/textures/item/golden_sword.png | 4 +- .../minecraft/textures/item/gray_bundle.png | 4 +- .../textures/item/gray_bundle_open_back.png | 4 +- .../textures/item/gray_bundle_open_front.png | 4 +- .../minecraft/textures/item/gray_candle.png | 4 +- .../minecraft/textures/item/gray_harness.png | 3 + .../minecraft/textures/item/green_bundle.png | 4 +- .../textures/item/green_bundle_open_back.png | 4 +- .../minecraft/textures/item/green_candle.png | 4 +- assets/minecraft/textures/item/green_dye.png | 4 +- .../minecraft/textures/item/green_harness.png | 3 + assets/minecraft/textures/item/gunpowder.png | 4 +- .../textures/item/guster_banner_pattern.png | 4 +- .../textures/item/guster_pottery_sherd.png | 4 +- .../textures/item/happy_ghast_spawn_egg.png | 3 + .../textures/item/heart_of_the_sea.png | 4 +- .../textures/item/heart_pottery_sherd.png | 4 +- .../item/heartbreak_pottery_sherd.png | 4 +- .../minecraft/textures/item/honey_bottle.png | 4 +- assets/minecraft/textures/item/honeycomb.png | 4 +- assets/minecraft/textures/item/hopper.png | 4 +- .../textures/item/hopper_minecart.png | 4 +- .../host_armor_trim_smithing_template.png | 4 +- .../textures/item/howl_pottery_sherd.png | 4 +- assets/minecraft/textures/item/iron_boots.png | 4 +- .../textures/item/iron_chestplate.png | 4 +- assets/minecraft/textures/item/iron_door.png | 4 +- .../minecraft/textures/item/iron_helmet.png | 4 +- assets/minecraft/textures/item/iron_ingot.png | 4 +- .../minecraft/textures/item/iron_leggings.png | 4 +- .../minecraft/textures/item/iron_nugget.png | 4 +- .../minecraft/textures/item/iron_pickaxe.png | 4 +- .../minecraft/textures/item/iron_shovel.png | 4 +- assets/minecraft/textures/item/iron_sword.png | 4 +- assets/minecraft/textures/item/item_frame.png | 4 +- .../minecraft/textures/item/jungle_boat.png | 4 +- .../textures/item/jungle_chest_boat.png | 4 +- .../minecraft/textures/item/jungle_door.png | 4 +- .../textures/item/jungle_hanging_sign.png | 4 +- .../minecraft/textures/item/jungle_sign.png | 4 +- assets/minecraft/textures/item/kelp.png | 4 +- .../textures/item/knowledge_book.png | 4 +- .../minecraft/textures/item/lapis_lazuli.png | 4 +- .../minecraft/textures/item/lava_bucket.png | 4 +- assets/minecraft/textures/item/lead.png | 4 +- .../minecraft/textures/item/leaf_litter.png | 4 +- assets/minecraft/textures/item/leather.png | 4 +- .../minecraft/textures/item/leather_boots.png | 4 +- .../textures/item/leather_chestplate.png | 4 +- .../item/leather_chestplate_overlay.png | 4 +- .../textures/item/leather_helmet.png | 4 +- .../textures/item/leather_helmet_overlay.png | 4 +- .../textures/item/leather_leggings.png | 4 +- assets/minecraft/textures/item/light.png | 4 +- assets/minecraft/textures/item/light_00.png | 4 +- assets/minecraft/textures/item/light_01.png | 4 +- assets/minecraft/textures/item/light_02.png | 4 +- assets/minecraft/textures/item/light_03.png | 4 +- assets/minecraft/textures/item/light_04.png | 4 +- assets/minecraft/textures/item/light_05.png | 4 +- assets/minecraft/textures/item/light_06.png | 4 +- assets/minecraft/textures/item/light_07.png | 4 +- assets/minecraft/textures/item/light_08.png | 4 +- assets/minecraft/textures/item/light_09.png | 4 +- assets/minecraft/textures/item/light_11.png | 4 +- assets/minecraft/textures/item/light_14.png | 4 +- assets/minecraft/textures/item/light_15.png | 4 +- .../textures/item/light_blue_bundle.png | 4 +- .../item/light_blue_bundle_open_back.png | 4 +- .../item/light_blue_bundle_open_front.png | 4 +- .../textures/item/light_blue_candle.png | 4 +- .../textures/item/light_blue_harness.png | 3 + .../textures/item/light_gray_bundle.png | 4 +- .../item/light_gray_bundle_open_back.png | 4 +- .../item/light_gray_bundle_open_front.png | 4 +- .../textures/item/light_gray_candle.png | 4 +- .../textures/item/light_gray_harness.png | 3 + .../minecraft/textures/item/lime_bundle.png | 4 +- .../textures/item/lime_bundle_open_back.png | 4 +- .../textures/item/lime_bundle_open_front.png | 4 +- .../minecraft/textures/item/lime_candle.png | 4 +- .../minecraft/textures/item/lime_harness.png | 3 + .../textures/item/lingering_potion.png | 4 +- .../textures/item/llama_spawn_egg.png | 4 +- assets/minecraft/textures/item/mace.png | 4 +- .../textures/item/magenta_bundle.png | 4 +- .../item/magenta_bundle_open_back.png | 4 +- .../textures/item/magenta_candle.png | 4 +- .../textures/item/magenta_harness.png | 3 + .../minecraft/textures/item/magma_cream.png | 4 +- .../textures/item/magma_cube_spawn_egg.png | 4 +- .../minecraft/textures/item/mangrove_boat.png | 4 +- .../textures/item/mangrove_chest_boat.png | 4 +- .../minecraft/textures/item/mangrove_door.png | 4 +- .../textures/item/mangrove_hanging_sign.png | 4 +- .../minecraft/textures/item/mangrove_sign.png | 4 +- assets/minecraft/textures/item/map.png | 4 +- .../minecraft/textures/item/melon_seeds.png | 4 +- .../minecraft/textures/item/milk_bucket.png | 4 +- assets/minecraft/textures/item/minecart.png | 4 +- .../textures/item/miner_pottery_sherd.png | 4 +- .../textures/item/mojang_banner_pattern.png | 4 +- .../textures/item/mooshroom_spawn_egg.png | 4 +- .../textures/item/mourner_pottery_sherd.png | 4 +- .../minecraft/textures/item/music_disc_11.png | 4 +- .../minecraft/textures/item/music_disc_13.png | 4 +- .../minecraft/textures/item/music_disc_5.png | 4 +- .../textures/item/music_disc_blocks.png | 4 +- .../textures/item/music_disc_cat.png | 4 +- .../textures/item/music_disc_creator.png | 4 +- .../item/music_disc_creator_music_box.png | 4 +- .../textures/item/music_disc_far.png | 4 +- .../textures/item/music_disc_mall.png | 4 +- .../textures/item/music_disc_mellohi.png | 4 +- .../textures/item/music_disc_pigstep.png | 4 +- .../textures/item/music_disc_relic.png | 4 +- .../textures/item/music_disc_stal.png | 4 +- .../textures/item/music_disc_strad.png | 4 +- .../textures/item/music_disc_tears.png | 3 + .../textures/item/music_disc_wait.png | 4 +- .../textures/item/music_disc_ward.png | 4 +- assets/minecraft/textures/item/mutton.png | 4 +- assets/minecraft/textures/item/name_tag.png | 4 +- .../textures/item/nautilus_shell.png | 4 +- .../minecraft/textures/item/nether_brick.png | 4 +- .../textures/item/nether_sprouts.png | 4 +- .../minecraft/textures/item/nether_wart.png | 4 +- .../textures/item/netherite_boots.png | 4 +- .../textures/item/netherite_chestplate.png | 4 +- .../textures/item/netherite_helmet.png | 4 +- .../minecraft/textures/item/netherite_hoe.png | 4 +- .../textures/item/netherite_ingot.png | 4 +- .../textures/item/netherite_scrap.png | 4 +- .../textures/item/netherite_shovel.png | 4 +- .../textures/item/netherite_sword.png | 4 +- .../netherite_upgrade_smithing_template.png | 4 +- assets/minecraft/textures/item/oak_boat.png | 4 +- .../textures/item/oak_chest_boat.png | 4 +- assets/minecraft/textures/item/oak_door.png | 4 +- .../textures/item/oak_hanging_sign.png | 4 +- .../textures/item/ominous_trial_key.png | 4 +- .../minecraft/textures/item/orange_bundle.png | 4 +- .../textures/item/orange_bundle_open_back.png | 4 +- .../item/orange_bundle_open_front.png | 4 +- .../minecraft/textures/item/orange_candle.png | 4 +- assets/minecraft/textures/item/orange_dye.png | 4 +- .../textures/item/orange_harness.png | 3 + .../minecraft/textures/item/pale_oak_boat.png | 2 +- .../textures/item/pale_oak_chest_boat.png | 4 +- .../textures/item/panda_spawn_egg.png | 4 +- assets/minecraft/textures/item/paper.png | 4 +- .../textures/item/phantom_membrane.png | 4 +- .../textures/item/phantom_spawn_egg.png | 4 +- .../minecraft/textures/item/pig_spawn_egg.png | 4 +- .../textures/item/piglin_banner_pattern.png | 4 +- .../minecraft/textures/item/pink_bundle.png | 4 +- .../textures/item/pink_bundle_open_back.png | 4 +- .../textures/item/pink_bundle_open_front.png | 4 +- .../minecraft/textures/item/pink_candle.png | 4 +- .../minecraft/textures/item/pink_harness.png | 3 + .../minecraft/textures/item/pink_petals.png | 4 +- .../minecraft/textures/item/pitcher_plant.png | 4 +- .../minecraft/textures/item/pitcher_pod.png | 4 +- .../textures/item/plenty_pottery_sherd.png | 4 +- .../textures/item/pointed_dripstone.png | 4 +- .../textures/item/poisonous_potato.png | 4 +- .../textures/item/polar_bear_spawn_egg.png | 4 +- .../textures/item/popped_chorus_fruit.png | 4 +- assets/minecraft/textures/item/porkchop.png | 4 +- assets/minecraft/textures/item/potato.png | 4 +- .../textures/item/potion_overlay.png | 4 +- .../textures/item/powder_snow_bucket.png | 4 +- .../textures/item/prismarine_crystals.png | 4 +- .../textures/item/prismarine_shard.png | 4 +- .../textures/item/prize_pottery_sherd.png | 4 +- assets/minecraft/textures/item/pufferfish.png | 4 +- .../textures/item/pufferfish_bucket.png | 4 +- .../minecraft/textures/item/pumpkin_pie.png | 4 +- .../minecraft/textures/item/pumpkin_seeds.png | 4 +- .../minecraft/textures/item/purple_bundle.png | 4 +- .../textures/item/purple_bundle_open_back.png | 4 +- .../minecraft/textures/item/purple_candle.png | 4 +- .../textures/item/purple_harness.png | 3 + assets/minecraft/textures/item/quartz.png | 4 +- assets/minecraft/textures/item/rabbit.png | 4 +- .../minecraft/textures/item/rabbit_foot.png | 4 +- .../minecraft/textures/item/rabbit_hide.png | 4 +- .../textures/item/rabbit_spawn_egg.png | 4 +- .../minecraft/textures/item/rabbit_stew.png | 4 +- .../raiser_armor_trim_smithing_template.png | 4 +- .../textures/item/ravager_spawn_egg.png | 4 +- assets/minecraft/textures/item/raw_copper.png | 4 +- assets/minecraft/textures/item/raw_gold.png | 4 +- assets/minecraft/textures/item/raw_iron.png | 4 +- .../textures/item/recovery_compass_00.png | 4 +- .../textures/item/recovery_compass_01.png | 4 +- .../textures/item/recovery_compass_02.png | 4 +- .../textures/item/recovery_compass_03.png | 4 +- .../textures/item/recovery_compass_04.png | 4 +- .../textures/item/recovery_compass_05.png | 4 +- .../textures/item/recovery_compass_06.png | 4 +- .../textures/item/recovery_compass_07.png | 4 +- .../textures/item/recovery_compass_08.png | 4 +- .../textures/item/recovery_compass_09.png | 4 +- .../textures/item/recovery_compass_10.png | 4 +- .../textures/item/recovery_compass_11.png | 4 +- .../textures/item/recovery_compass_12.png | 4 +- .../textures/item/recovery_compass_13.png | 4 +- .../textures/item/recovery_compass_14.png | 4 +- .../textures/item/recovery_compass_15.png | 4 +- .../textures/item/recovery_compass_16.png | 4 +- .../textures/item/recovery_compass_17.png | 4 +- .../textures/item/recovery_compass_18.png | 4 +- .../textures/item/recovery_compass_19.png | 4 +- .../textures/item/recovery_compass_20.png | 4 +- .../textures/item/recovery_compass_21.png | 4 +- .../textures/item/recovery_compass_22.png | 4 +- .../textures/item/recovery_compass_23.png | 4 +- .../textures/item/recovery_compass_24.png | 4 +- .../textures/item/recovery_compass_25.png | 4 +- .../textures/item/recovery_compass_26.png | 4 +- .../textures/item/recovery_compass_27.png | 4 +- .../textures/item/recovery_compass_28.png | 4 +- .../textures/item/recovery_compass_29.png | 4 +- .../textures/item/recovery_compass_30.png | 4 +- .../textures/item/recovery_compass_31.png | 4 +- assets/minecraft/textures/item/red_bundle.png | 4 +- .../textures/item/red_bundle_open_back.png | 4 +- assets/minecraft/textures/item/red_candle.png | 4 +- assets/minecraft/textures/item/red_dye.png | 4 +- .../minecraft/textures/item/red_harness.png | 3 + assets/minecraft/textures/item/repeater.png | 4 +- .../item/rib_armor_trim_smithing_template.png | 4 +- .../minecraft/textures/item/rotten_flesh.png | 4 +- assets/minecraft/textures/item/salmon.png | 4 +- .../minecraft/textures/item/salmon_bucket.png | 4 +- .../textures/item/scrape_pottery_sherd.png | 4 +- assets/minecraft/textures/item/sea_pickle.png | 4 +- assets/minecraft/textures/item/seagrass.png | 4 +- .../sentry_armor_trim_smithing_template.png | 4 +- .../shaper_armor_trim_smithing_template.png | 4 +- .../textures/item/sheaf_pottery_sherd.png | 4 +- assets/minecraft/textures/item/shears.png | 4 +- .../textures/item/sheep_spawn_egg.png | 4 +- .../textures/item/shelter_pottery_sherd.png | 4 +- .../minecraft/textures/item/shulker_shell.png | 4 +- .../textures/item/shulker_spawn_egg.png | 4 +- .../item/skeleton_horse_spawn_egg.png | 4 +- .../textures/item/skeleton_spawn_egg.png | 4 +- .../textures/item/skull_banner_pattern.png | 4 +- .../textures/item/skull_pottery_sherd.png | 4 +- .../textures/item/slime_spawn_egg.png | 4 +- .../minecraft/textures/item/sniffer_egg.png | 4 +- .../textures/item/snort_pottery_sherd.png | 4 +- .../snout_armor_trim_smithing_template.png | 4 +- assets/minecraft/textures/item/snowball.png | 4 +- .../minecraft/textures/item/soul_campfire.png | 4 +- .../textures/item/spider_spawn_egg.png | 4 +- .../spire_armor_trim_smithing_template.png | 4 +- .../minecraft/textures/item/splash_potion.png | 4 +- .../minecraft/textures/item/spruce_boat.png | 4 +- .../textures/item/spruce_chest_boat.png | 4 +- .../minecraft/textures/item/spruce_door.png | 4 +- .../textures/item/spruce_hanging_sign.png | 4 +- assets/minecraft/textures/item/spyglass.png | 4 +- .../textures/item/spyglass_model.png | 4 +- .../textures/item/squid_spawn_egg.png | 4 +- assets/minecraft/textures/item/stick.png | 4 +- assets/minecraft/textures/item/stone_axe.png | 4 +- .../minecraft/textures/item/stone_pickaxe.png | 4 +- .../minecraft/textures/item/stone_shovel.png | 4 +- .../minecraft/textures/item/stone_sword.png | 4 +- .../textures/item/stray_spawn_egg.png | 4 +- .../textures/item/strider_spawn_egg.png | 4 +- assets/minecraft/textures/item/string.png | 4 +- .../textures/item/structure_void.png | 4 +- assets/minecraft/textures/item/sugar.png | 4 +- assets/minecraft/textures/item/sugar_cane.png | 4 +- .../minecraft/textures/item/sweet_berries.png | 4 +- .../tide_armor_trim_smithing_template.png | 4 +- .../textures/item/tipped_arrow_base.png | 4 +- .../textures/item/tipped_arrow_head.png | 4 +- .../textures/item/torchflower_seeds.png | 4 +- .../textures/item/totem_of_undying.png | 4 +- .../textures/item/trader_llama_spawn_egg.png | 4 +- .../minecraft/textures/item/tropical_fish.png | 4 +- .../textures/item/tropical_fish_bucket.png | 4 +- .../textures/item/tropical_fish_spawn_egg.png | 4 +- assets/minecraft/textures/item/turtle_egg.png | 4 +- .../minecraft/textures/item/turtle_scute.png | 4 +- .../textures/item/turtle_spawn_egg.png | 4 +- .../item/vex_armor_trim_smithing_template.png | 4 +- .../minecraft/textures/item/vex_spawn_egg.png | 4 +- .../textures/item/villager_spawn_egg.png | 4 +- .../ward_armor_trim_smithing_template.png | 4 +- .../minecraft/textures/item/warped_door.png | 4 +- .../textures/item/warped_hanging_sign.png | 4 +- .../minecraft/textures/item/warped_sign.png | 4 +- .../minecraft/textures/item/water_bucket.png | 4 +- ...wayfinder_armor_trim_smithing_template.png | 4 +- assets/minecraft/textures/item/wheat.png | 4 +- .../minecraft/textures/item/wheat_seeds.png | 4 +- .../minecraft/textures/item/white_bundle.png | 4 +- .../textures/item/white_bundle_open_back.png | 4 +- .../textures/item/white_bundle_open_front.png | 4 +- .../minecraft/textures/item/white_candle.png | 4 +- assets/minecraft/textures/item/white_dye.png | 4 +- .../minecraft/textures/item/white_harness.png | 3 + .../wild_armor_trim_smithing_template.png | 4 +- .../minecraft/textures/item/wildflowers.png | 4 +- .../item/wither_skeleton_spawn_egg.png | 4 +- .../textures/item/wither_spawn_egg.png | 4 +- assets/minecraft/textures/item/wolf_armor.png | 4 +- .../textures/item/wolf_armor_overlay.png | 4 +- .../textures/item/wolf_spawn_egg.png | 4 +- assets/minecraft/textures/item/wooden_axe.png | 4 +- .../textures/item/wooden_pickaxe.png | 4 +- .../minecraft/textures/item/wooden_shovel.png | 4 +- .../minecraft/textures/item/wooden_sword.png | 4 +- .../minecraft/textures/item/writable_book.png | 4 +- .../minecraft/textures/item/written_book.png | 4 +- .../minecraft/textures/item/yellow_bundle.png | 4 +- .../textures/item/yellow_bundle_open_back.png | 4 +- .../item/yellow_bundle_open_front.png | 4 +- .../minecraft/textures/item/yellow_candle.png | 4 +- assets/minecraft/textures/item/yellow_dye.png | 4 +- .../textures/item/yellow_harness.png | 3 + .../textures/item/zoglin_spawn_egg.png | 4 +- .../textures/item/zombie_horse_spawn_egg.png | 4 +- .../item/zombie_villager_spawn_egg.png | 4 +- .../textures/map/decorations/black_banner.png | 4 +- .../textures/map/decorations/blue_banner.png | 4 +- .../textures/map/decorations/blue_marker.png | 4 +- .../textures/map/decorations/brown_banner.png | 4 +- .../textures/map/decorations/cyan_banner.png | 4 +- .../map/decorations/desert_village.png | 4 +- .../textures/map/decorations/frame.png | 4 +- .../textures/map/decorations/gray_banner.png | 4 +- .../textures/map/decorations/green_banner.png | 4 +- .../map/decorations/jungle_temple.png | 4 +- .../map/decorations/light_blue_banner.png | 4 +- .../map/decorations/light_gray_banner.png | 4 +- .../textures/map/decorations/lime_banner.png | 4 +- .../map/decorations/magenta_banner.png | 4 +- .../map/decorations/ocean_monument.png | 4 +- .../map/decorations/orange_banner.png | 4 +- .../textures/map/decorations/pink_banner.png | 4 +- .../map/decorations/plains_village.png | 4 +- .../textures/map/decorations/player.png | 4 +- .../map/decorations/player_off_limits.png | 4 +- .../map/decorations/player_off_map.png | 4 +- .../map/decorations/purple_banner.png | 4 +- .../textures/map/decorations/red_banner.png | 4 +- .../textures/map/decorations/red_marker.png | 4 +- .../textures/map/decorations/red_x.png | 4 +- .../map/decorations/savanna_village.png | 4 +- .../map/decorations/snowy_village.png | 4 +- .../textures/map/decorations/swamp_hut.png | 4 +- .../map/decorations/taiga_village.png | 4 +- .../textures/map/decorations/target_point.png | 4 +- .../textures/map/decorations/target_x.png | 4 +- .../map/decorations/trial_chambers.png | 4 +- .../textures/map/decorations/white_banner.png | 4 +- .../map/decorations/woodland_mansion.png | 4 +- .../map/decorations/yellow_banner.png | 4 +- .../textures/misc/credits_vignette.png | 4 +- assets/minecraft/textures/misc/forcefield.png | 4 +- assets/minecraft/textures/misc/nausea.png | 4 +- .../textures/misc/powder_snow_outline.png | 4 +- .../minecraft/textures/misc/pumpkinblur.png | 4 +- assets/minecraft/textures/misc/shadow.png | 4 +- .../textures/misc/spyglass_scope.png | 4 +- assets/minecraft/textures/misc/underwater.png | 4 +- .../textures/misc/unknown_server.png | 4 +- assets/minecraft/textures/misc/vignette.png | 4 +- assets/minecraft/textures/misc/white.png | 4 +- .../textures/mob_effect/absorption.png | 4 +- .../textures/mob_effect/blindness.png | 4 +- .../textures/mob_effect/conduit_power.png | 4 +- .../textures/mob_effect/darkness.png | 4 +- .../textures/mob_effect/dolphins_grace.png | 4 +- .../textures/mob_effect/fire_resistance.png | 4 +- .../minecraft/textures/mob_effect/glowing.png | 4 +- .../minecraft/textures/mob_effect/haste.png | 4 +- .../textures/mob_effect/health_boost.png | 4 +- .../mob_effect/hero_of_the_village.png | 4 +- .../minecraft/textures/mob_effect/hunger.png | 4 +- .../textures/mob_effect/infested.png | 4 +- .../textures/mob_effect/instant_damage.png | 4 +- .../textures/mob_effect/instant_health.png | 4 +- .../textures/mob_effect/invisibility.png | 4 +- .../textures/mob_effect/jump_boost.png | 4 +- .../textures/mob_effect/levitation.png | 4 +- assets/minecraft/textures/mob_effect/luck.png | 4 +- .../textures/mob_effect/mining_fatigue.png | 4 +- .../minecraft/textures/mob_effect/nausea.png | 4 +- .../textures/mob_effect/night_vision.png | 4 +- .../minecraft/textures/mob_effect/oozing.png | 4 +- .../minecraft/textures/mob_effect/poison.png | 4 +- .../textures/mob_effect/raid_omen.png | 4 +- .../textures/mob_effect/regeneration.png | 4 +- .../textures/mob_effect/resistance.png | 4 +- .../textures/mob_effect/saturation.png | 4 +- .../textures/mob_effect/slow_falling.png | 4 +- .../minecraft/textures/mob_effect/speed.png | 4 +- .../textures/mob_effect/strength.png | 4 +- .../textures/mob_effect/trial_omen.png | 4 +- .../minecraft/textures/mob_effect/unluck.png | 4 +- .../textures/mob_effect/water_breathing.png | 4 +- .../textures/mob_effect/weakness.png | 4 +- .../minecraft/textures/mob_effect/weaving.png | 4 +- .../textures/mob_effect/wind_charged.png | 4 +- .../minecraft/textures/mob_effect/wither.png | 4 +- assets/minecraft/textures/painting/alban.png | 4 +- assets/minecraft/textures/painting/aztec.png | 4 +- assets/minecraft/textures/painting/aztec2.png | 4 +- .../minecraft/textures/painting/backyard.png | 4 +- assets/minecraft/textures/painting/bomb.png | 4 +- .../minecraft/textures/painting/bouquet.png | 4 +- .../textures/painting/burning_skull.png | 4 +- .../minecraft/textures/painting/cavebird.png | 4 +- .../minecraft/textures/painting/changing.png | 4 +- .../textures/painting/donkey_kong.png | 4 +- assets/minecraft/textures/painting/earth.png | 4 +- assets/minecraft/textures/painting/fern.png | 4 +- .../minecraft/textures/painting/finding.png | 4 +- assets/minecraft/textures/painting/fire.png | 4 +- assets/minecraft/textures/painting/graham.png | 4 +- assets/minecraft/textures/painting/kebab.png | 4 +- .../minecraft/textures/painting/owlemons.png | 4 +- .../minecraft/textures/painting/passage.png | 4 +- .../minecraft/textures/painting/pigscene.png | 4 +- assets/minecraft/textures/painting/plant.png | 4 +- .../minecraft/textures/painting/pointer.png | 4 +- assets/minecraft/textures/painting/pond.png | 4 +- .../textures/painting/sunflowers.png | 4 +- assets/minecraft/textures/painting/sunset.png | 4 +- assets/minecraft/textures/painting/tides.png | 4 +- assets/minecraft/textures/painting/void.png | 4 +- .../minecraft/textures/painting/wasteland.png | 4 +- assets/minecraft/textures/painting/water.png | 4 +- assets/minecraft/textures/painting/wind.png | 4 +- .../textures/particle/big_smoke_0.png | 4 +- .../textures/particle/big_smoke_1.png | 4 +- .../textures/particle/big_smoke_10.png | 4 +- .../textures/particle/big_smoke_11.png | 4 +- .../textures/particle/big_smoke_2.png | 4 +- .../textures/particle/big_smoke_3.png | 4 +- .../textures/particle/big_smoke_4.png | 4 +- .../textures/particle/big_smoke_5.png | 4 +- .../textures/particle/big_smoke_6.png | 4 +- .../textures/particle/big_smoke_7.png | 4 +- .../textures/particle/big_smoke_8.png | 4 +- .../textures/particle/big_smoke_9.png | 4 +- assets/minecraft/textures/particle/bubble.png | 4 +- .../textures/particle/bubble_pop_0.png | 4 +- .../textures/particle/bubble_pop_1.png | 4 +- .../textures/particle/bubble_pop_2.png | 4 +- .../textures/particle/bubble_pop_3.png | 4 +- .../textures/particle/bubble_pop_4.png | 4 +- .../minecraft/textures/particle/cherry_0.png | 4 +- .../minecraft/textures/particle/cherry_1.png | 4 +- .../minecraft/textures/particle/cherry_10.png | 4 +- .../minecraft/textures/particle/cherry_11.png | 4 +- .../minecraft/textures/particle/cherry_2.png | 4 +- .../minecraft/textures/particle/cherry_3.png | 4 +- .../minecraft/textures/particle/cherry_4.png | 4 +- .../minecraft/textures/particle/cherry_5.png | 4 +- .../minecraft/textures/particle/cherry_6.png | 4 +- .../minecraft/textures/particle/cherry_7.png | 4 +- .../minecraft/textures/particle/cherry_8.png | 4 +- .../minecraft/textures/particle/cherry_9.png | 4 +- .../textures/particle/critical_hit.png | 4 +- assets/minecraft/textures/particle/damage.png | 4 +- .../minecraft/textures/particle/drip_fall.png | 4 +- .../minecraft/textures/particle/drip_hang.png | 4 +- .../minecraft/textures/particle/drip_land.png | 4 +- .../minecraft/textures/particle/effect_0.png | 4 +- .../minecraft/textures/particle/effect_1.png | 4 +- .../minecraft/textures/particle/effect_2.png | 4 +- .../minecraft/textures/particle/effect_3.png | 4 +- .../minecraft/textures/particle/effect_4.png | 4 +- .../minecraft/textures/particle/effect_5.png | 4 +- .../minecraft/textures/particle/effect_6.png | 4 +- .../minecraft/textures/particle/effect_7.png | 4 +- .../textures/particle/enchanted_hit.png | 4 +- .../textures/particle/explosion_0.png | 4 +- .../textures/particle/explosion_1.png | 4 +- .../textures/particle/explosion_10.png | 4 +- .../textures/particle/explosion_11.png | 4 +- .../textures/particle/explosion_12.png | 4 +- .../textures/particle/explosion_13.png | 4 +- .../textures/particle/explosion_14.png | 4 +- .../textures/particle/explosion_15.png | 4 +- .../textures/particle/explosion_2.png | 4 +- .../textures/particle/explosion_3.png | 4 +- .../textures/particle/explosion_4.png | 4 +- .../textures/particle/explosion_5.png | 4 +- .../textures/particle/explosion_6.png | 4 +- .../textures/particle/explosion_7.png | 4 +- .../textures/particle/explosion_8.png | 4 +- .../textures/particle/explosion_9.png | 4 +- assets/minecraft/textures/particle/flame.png | 4 +- assets/minecraft/textures/particle/flash.png | 4 +- .../minecraft/textures/particle/generic_0.png | 4 +- .../minecraft/textures/particle/generic_1.png | 4 +- .../minecraft/textures/particle/generic_2.png | 4 +- .../minecraft/textures/particle/generic_3.png | 4 +- .../minecraft/textures/particle/generic_4.png | 4 +- .../minecraft/textures/particle/generic_5.png | 4 +- .../minecraft/textures/particle/generic_6.png | 4 +- .../minecraft/textures/particle/generic_7.png | 4 +- assets/minecraft/textures/particle/glint.png | 4 +- .../minecraft/textures/particle/glitter_0.png | 4 +- .../minecraft/textures/particle/glitter_1.png | 4 +- .../minecraft/textures/particle/glitter_2.png | 4 +- .../minecraft/textures/particle/glitter_3.png | 4 +- .../minecraft/textures/particle/glitter_4.png | 4 +- .../minecraft/textures/particle/glitter_5.png | 4 +- .../minecraft/textures/particle/glitter_6.png | 4 +- .../minecraft/textures/particle/glitter_7.png | 4 +- assets/minecraft/textures/particle/glow.png | 4 +- .../textures/particle/goldheart_0.png | 4 +- .../textures/particle/goldheart_1.png | 4 +- .../textures/particle/goldheart_2.png | 4 +- assets/minecraft/textures/particle/gust_0.png | 4 +- assets/minecraft/textures/particle/gust_1.png | 4 +- .../minecraft/textures/particle/gust_10.png | 4 +- .../minecraft/textures/particle/gust_11.png | 4 +- assets/minecraft/textures/particle/gust_2.png | 4 +- assets/minecraft/textures/particle/gust_3.png | 4 +- assets/minecraft/textures/particle/gust_4.png | 4 +- assets/minecraft/textures/particle/gust_5.png | 4 +- assets/minecraft/textures/particle/gust_6.png | 4 +- assets/minecraft/textures/particle/gust_7.png | 4 +- assets/minecraft/textures/particle/gust_8.png | 4 +- assets/minecraft/textures/particle/gust_9.png | 4 +- assets/minecraft/textures/particle/heart.png | 4 +- .../minecraft/textures/particle/infested.png | 4 +- assets/minecraft/textures/particle/lava.png | 4 +- assets/minecraft/textures/particle/leaf_0.png | 4 +- assets/minecraft/textures/particle/leaf_1.png | 4 +- .../minecraft/textures/particle/leaf_10.png | 4 +- .../minecraft/textures/particle/leaf_11.png | 4 +- assets/minecraft/textures/particle/leaf_2.png | 4 +- assets/minecraft/textures/particle/leaf_3.png | 4 +- assets/minecraft/textures/particle/leaf_4.png | 4 +- assets/minecraft/textures/particle/leaf_5.png | 4 +- assets/minecraft/textures/particle/leaf_6.png | 4 +- assets/minecraft/textures/particle/leaf_7.png | 4 +- assets/minecraft/textures/particle/leaf_8.png | 4 +- assets/minecraft/textures/particle/leaf_9.png | 4 +- .../minecraft/textures/particle/nautilus.png | 4 +- assets/minecraft/textures/particle/note.png | 4 +- .../textures/particle/ominous_spawning.png | 4 +- .../minecraft/textures/particle/raid_omen.png | 4 +- .../textures/particle/sculk_charge_0.png | 4 +- .../textures/particle/sculk_charge_1.png | 4 +- .../textures/particle/sculk_charge_2.png | 4 +- .../textures/particle/sculk_charge_3.png | 4 +- .../textures/particle/sculk_charge_4.png | 4 +- .../textures/particle/sculk_charge_5.png | 4 +- .../textures/particle/sculk_charge_pop_0.png | 4 +- .../textures/particle/sculk_charge_pop_2.png | 4 +- .../textures/particle/sculk_charge_pop_3.png | 4 +- .../textures/particle/sculk_soul_2.png | 4 +- .../textures/particle/sculk_soul_4.png | 4 +- .../textures/particle/sculk_soul_5.png | 4 +- .../textures/particle/sculk_soul_6.png | 4 +- .../textures/particle/sculk_soul_8.png | 4 +- .../textures/particle/sculk_soul_9.png | 4 +- assets/minecraft/textures/particle/sga_a.png | 4 +- assets/minecraft/textures/particle/sga_b.png | 4 +- assets/minecraft/textures/particle/sga_c.png | 4 +- assets/minecraft/textures/particle/sga_d.png | 4 +- assets/minecraft/textures/particle/sga_e.png | 4 +- assets/minecraft/textures/particle/sga_f.png | 4 +- assets/minecraft/textures/particle/sga_g.png | 4 +- assets/minecraft/textures/particle/sga_h.png | 4 +- assets/minecraft/textures/particle/sga_i.png | 4 +- assets/minecraft/textures/particle/sga_j.png | 4 +- assets/minecraft/textures/particle/sga_k.png | 4 +- assets/minecraft/textures/particle/sga_l.png | 4 +- assets/minecraft/textures/particle/sga_m.png | 4 +- assets/minecraft/textures/particle/sga_n.png | 4 +- assets/minecraft/textures/particle/sga_o.png | 4 +- assets/minecraft/textures/particle/sga_p.png | 4 +- assets/minecraft/textures/particle/sga_q.png | 4 +- assets/minecraft/textures/particle/sga_r.png | 4 +- assets/minecraft/textures/particle/sga_s.png | 4 +- assets/minecraft/textures/particle/sga_t.png | 4 +- assets/minecraft/textures/particle/sga_u.png | 4 +- assets/minecraft/textures/particle/sga_v.png | 4 +- assets/minecraft/textures/particle/sga_w.png | 4 +- assets/minecraft/textures/particle/sga_x.png | 4 +- assets/minecraft/textures/particle/sga_y.png | 4 +- assets/minecraft/textures/particle/sga_z.png | 4 +- .../textures/particle/small_gust_0.png | 4 +- .../textures/particle/small_gust_1.png | 4 +- .../textures/particle/small_gust_2.png | 4 +- .../textures/particle/small_gust_3.png | 4 +- .../textures/particle/small_gust_4.png | 4 +- .../textures/particle/small_gust_5.png | 4 +- .../textures/particle/small_gust_6.png | 4 +- .../textures/particle/sonic_boom_0.png | 4 +- .../textures/particle/sonic_boom_1.png | 4 +- .../textures/particle/sonic_boom_10.png | 4 +- .../textures/particle/sonic_boom_11.png | 4 +- .../textures/particle/sonic_boom_12.png | 4 +- .../textures/particle/sonic_boom_13.png | 4 +- .../textures/particle/sonic_boom_14.png | 4 +- .../textures/particle/sonic_boom_15.png | 4 +- .../textures/particle/sonic_boom_2.png | 4 +- .../textures/particle/sonic_boom_3.png | 4 +- .../textures/particle/sonic_boom_4.png | 4 +- .../textures/particle/sonic_boom_5.png | 4 +- .../textures/particle/sonic_boom_6.png | 4 +- .../textures/particle/sonic_boom_7.png | 4 +- .../textures/particle/sonic_boom_8.png | 4 +- .../textures/particle/sonic_boom_9.png | 4 +- assets/minecraft/textures/particle/soul_2.png | 4 +- assets/minecraft/textures/particle/soul_5.png | 4 +- .../textures/particle/soul_fire_flame.png | 4 +- .../minecraft/textures/particle/spark_0.png | 4 +- .../minecraft/textures/particle/spark_1.png | 4 +- .../minecraft/textures/particle/spark_2.png | 4 +- .../minecraft/textures/particle/spark_3.png | 4 +- .../minecraft/textures/particle/spark_4.png | 4 +- .../minecraft/textures/particle/spark_5.png | 4 +- .../minecraft/textures/particle/spark_6.png | 4 +- .../minecraft/textures/particle/spark_7.png | 4 +- .../minecraft/textures/particle/spell_0.png | 4 +- .../minecraft/textures/particle/spell_1.png | 4 +- .../minecraft/textures/particle/spell_2.png | 4 +- .../minecraft/textures/particle/spell_3.png | 4 +- .../minecraft/textures/particle/spell_4.png | 4 +- .../minecraft/textures/particle/spell_5.png | 4 +- .../minecraft/textures/particle/spell_6.png | 4 +- .../minecraft/textures/particle/spell_7.png | 4 +- .../minecraft/textures/particle/sweep_0.png | 4 +- .../minecraft/textures/particle/sweep_1.png | 4 +- .../minecraft/textures/particle/sweep_2.png | 4 +- .../minecraft/textures/particle/sweep_3.png | 4 +- .../minecraft/textures/particle/sweep_4.png | 4 +- .../minecraft/textures/particle/sweep_5.png | 4 +- .../minecraft/textures/particle/sweep_6.png | 4 +- .../minecraft/textures/particle/sweep_7.png | 4 +- .../textures/particle/trial_omen.png | 4 +- .../particle/trial_spawner_detection_0.png | 4 +- .../particle/trial_spawner_detection_1.png | 4 +- .../particle/trial_spawner_detection_2.png | 4 +- .../trial_spawner_detection_ominous_0.png | 4 +- .../trial_spawner_detection_ominous_1.png | 4 +- .../trial_spawner_detection_ominous_2.png | 4 +- .../textures/particle/vault_connection.png | 4 +- .../trims/color_palettes/trim_palette.png | 4 +- .../textures/trims/entity/humanoid/coast.png | 4 +- .../textures/trims/entity/humanoid/dune.png | 4 +- .../textures/trims/entity/humanoid/eye.png | 4 +- .../textures/trims/entity/humanoid/flow.png | 4 +- .../textures/trims/entity/humanoid/host.png | 4 +- .../textures/trims/entity/humanoid/raiser.png | 4 +- .../textures/trims/entity/humanoid/rib.png | 4 +- .../textures/trims/entity/humanoid/sentry.png | 4 +- .../textures/trims/entity/humanoid/shaper.png | 4 +- .../trims/entity/humanoid/silence.png | 4 +- .../textures/trims/entity/humanoid/snout.png | 4 +- .../textures/trims/entity/humanoid/spire.png | 4 +- .../textures/trims/entity/humanoid/tide.png | 4 +- .../textures/trims/entity/humanoid/vex.png | 4 +- .../textures/trims/entity/humanoid/ward.png | 4 +- .../textures/trims/entity/humanoid/wild.png | 4 +- .../trims/entity/humanoid_leggings/bolt.png | 4 +- .../trims/entity/humanoid_leggings/coast.png | 4 +- .../trims/entity/humanoid_leggings/dune.png | 4 +- .../trims/entity/humanoid_leggings/eye.png | 4 +- .../trims/entity/humanoid_leggings/flow.png | 4 +- .../trims/entity/humanoid_leggings/host.png | 4 +- .../trims/entity/humanoid_leggings/raiser.png | 4 +- .../trims/entity/humanoid_leggings/rib.png | 4 +- .../trims/entity/humanoid_leggings/sentry.png | 4 +- .../trims/entity/humanoid_leggings/shaper.png | 4 +- .../entity/humanoid_leggings/silence.png | 4 +- .../trims/entity/humanoid_leggings/snout.png | 4 +- .../trims/entity/humanoid_leggings/spire.png | 4 +- .../trims/entity/humanoid_leggings/tide.png | 4 +- .../trims/entity/humanoid_leggings/vex.png | 4 +- .../trims/entity/humanoid_leggings/ward.png | 4 +- .../entity/humanoid_leggings/wayfinder.png | 4 +- .../trims/entity/humanoid_leggings/wild.png | 4 +- .../textures/trims/items/boots_trim.png | 4 +- .../textures/trims/items/chestplate_trim.png | 4 +- .../textures/trims/items/helmet_trim.png | 4 +- .../textures/trims/items/leggings_trim.png | 4 +- assets/minecraft/waypoint_style/bowtie.json | 10 + assets/minecraft/waypoint_style/default.json | 8 + com/mojang/blaze3d/TracyFrameCapture.java | 63 +- com/mojang/blaze3d/buffers/BufferType.java | 17 - com/mojang/blaze3d/buffers/BufferUsage.java | 35 - com/mojang/blaze3d/buffers/GpuBuffer.java | 39 +- .../blaze3d/buffers/GpuBufferSlice.java | 17 + com/mojang/blaze3d/buffers/GpuFence.java | 27 +- com/mojang/blaze3d/buffers/Std140Builder.java | 156 ++ .../blaze3d/buffers/Std140SizeCalculator.java | 75 + .../blaze3d/font/TrueTypeGlyphProvider.java | 47 +- .../blaze3d/framegraph/FrameGraphBuilder.java | 3 +- .../blaze3d/opengl/AbstractUniform.java | 49 - com/mojang/blaze3d/opengl/BufferStorage.java | 115 + .../blaze3d/opengl/DirectStateAccess.java | 132 + com/mojang/blaze3d/opengl/GlBuffer.java | 52 +- .../blaze3d/opengl/GlCommandEncoder.java | 549 ++-- com/mojang/blaze3d/opengl/GlConst.java | 66 +- com/mojang/blaze3d/opengl/GlDebug.java | 12 +- com/mojang/blaze3d/opengl/GlDebugLabel.java | 18 +- com/mojang/blaze3d/opengl/GlDevice.java | 167 +- com/mojang/blaze3d/opengl/GlFence.java | 34 + com/mojang/blaze3d/opengl/GlProgram.java | 281 +- com/mojang/blaze3d/opengl/GlRenderPass.java | 110 +- .../blaze3d/opengl/GlRenderPipeline.java | 5 - com/mojang/blaze3d/opengl/GlStateManager.java | 7 - com/mojang/blaze3d/opengl/GlTexture.java | 54 +- com/mojang/blaze3d/opengl/GlTextureView.java | 32 + com/mojang/blaze3d/opengl/Uniform.java | 196 +- .../blaze3d/opengl/VertexArrayCache.java | 41 +- .../blaze3d/pipeline/BlendFunction.java | 4 +- .../pipeline/CompiledRenderPipeline.java | 2 - com/mojang/blaze3d/pipeline/MainTarget.java | 16 +- .../blaze3d/pipeline/RenderPipeline.java | 53 +- com/mojang/blaze3d/pipeline/RenderTarget.java | 46 +- com/mojang/blaze3d/platform/Lighting.java | 70 +- com/mojang/blaze3d/platform/TextureUtil.java | 8 +- com/mojang/blaze3d/platform/Window.java | 17 +- com/mojang/blaze3d/shaders/FogShape.java | 20 - com/mojang/blaze3d/shaders/UniformType.java | 34 +- .../blaze3d/systems/CommandEncoder.java | 26 +- com/mojang/blaze3d/systems/GpuDevice.java | 17 +- com/mojang/blaze3d/systems/RenderPass.java | 37 +- com/mojang/blaze3d/systems/RenderSystem.java | 213 +- com/mojang/blaze3d/systems/ScissorState.java | 30 +- com/mojang/blaze3d/textures/GpuTexture.java | 29 +- .../blaze3d/textures/GpuTextureView.java | 43 + .../blaze3d/textures/TextureFormat.java | 1 + com/mojang/blaze3d/vertex/BufferBuilder.java | 19 +- .../blaze3d/vertex/ByteBufferBuilder.java | 74 +- .../blaze3d/vertex/DefaultVertexFormat.java | 1 + com/mojang/blaze3d/vertex/VertexConsumer.java | 7 + com/mojang/blaze3d/vertex/VertexFormat.java | 20 +- com/mojang/realmsclient/RealmsMainScreen.java | 227 +- .../realmsclient/client/FileUpload.java | 20 +- .../realmsclient/client/RealmsClient.java | 137 +- .../realmsclient/client/RealmsError.java | 21 +- .../worldupload/RealmsCreateWorldFlow.java | 14 +- .../client/worldupload/RealmsWorldUpload.java | 18 +- com/mojang/realmsclient/dto/BackupList.java | 12 +- com/mojang/realmsclient/dto/Exclude.java | 14 + .../realmsclient/dto/GuardedSerializer.java | 16 +- com/mojang/realmsclient/dto/Ops.java | 16 +- .../realmsclient/dto/PendingInvitesList.java | 12 +- com/mojang/realmsclient/dto/PlayerInfo.java | 3 + .../realmsclient/dto/PreferredRegionsDto.java | 13 + .../dto/RealmsConfigurationDto.java | 16 + .../dto/RealmsDescriptionDto.java | 4 +- .../dto/RealmsJoinInformation.java | 40 + com/mojang/realmsclient/dto/RealmsNews.java | 4 +- .../realmsclient/dto/RealmsNotification.java | 4 +- com/mojang/realmsclient/dto/RealmsRegion.java | 78 + com/mojang/realmsclient/dto/RealmsServer.java | 288 +-- .../realmsclient/dto/RealmsServerAddress.java | 36 - .../realmsclient/dto/RealmsServerList.java | 33 +- .../dto/RealmsServerPlayerLists.java | 4 +- .../realmsclient/dto/RealmsSetting.java | 23 + .../realmsclient/dto/RealmsSettings.java | 8 - com/mojang/realmsclient/dto/RealmsSlot.java | 56 + .../realmsclient/dto/RealmsSlotUpdateDto.java | 56 + .../realmsclient/dto/RealmsWorldOptions.java | 163 +- .../realmsclient/dto/RegionDataDto.java | 10 + .../dto/RegionSelectionPreference.java | 48 + .../dto/RegionSelectionPreferenceDto.java | 49 + .../realmsclient/dto/ServerActivityList.java | 7 +- .../realmsclient/dto/ServiceQuality.java | 68 + com/mojang/realmsclient/dto/Subscription.java | 9 +- com/mojang/realmsclient/dto/UploadInfo.java | 9 +- .../realmsclient/dto/WorldDownload.java | 9 +- .../dto/WorldTemplatePaginatedList.java | 12 +- .../realmsclient/gui/RealmsDataFetcher.java | 17 +- .../realmsclient/gui/RealmsNewsManager.java | 11 +- .../gui/RealmsWorldSlotButton.java | 136 +- .../gui/screens/AddRealmPopupScreen.java | 24 +- .../gui/screens/RealmsBrokenWorldScreen.java | 58 +- .../screens/RealmsClientOutdatedScreen.java | 4 +- .../screens/RealmsConfigureWorldScreen.java | 470 ---- .../gui/screens/RealmsCreateRealmScreen.java | 4 +- .../RealmsDownloadLatestWorldScreen.java | 2 +- ...RealmsLongRunningMcoConnectTaskScreen.java | 72 + .../RealmsLongRunningMcoTaskScreen.java | 5 +- .../RealmsLongRunningMcoTickTaskScreen.java | 28 - .../screens/RealmsNotificationsScreen.java | 28 +- .../screens/RealmsPendingInvitesScreen.java | 63 +- .../gui/screens/RealmsPopups.java | 8 + .../gui/screens/RealmsResetWorldScreen.java | 29 +- .../RealmsSelectFileToUploadScreen.java | 6 +- .../RealmsSelectWorldTemplateScreen.java | 111 +- .../gui/screens/RealmsSettingsScreen.java | 90 - .../screens/RealmsSubscriptionInfoScreen.java | 172 -- .../gui/screens/RealmsTermsScreen.java | 2 +- .../gui/screens/RealmsUploadScreen.java | 8 +- .../RealmsBackupInfoScreen.java | 2 +- .../RealmsBackupScreen.java | 34 +- .../configuration/RealmsConfigurationTab.java | 16 + .../RealmsConfigureWorldScreen.java | 360 +++ .../RealmsInviteScreen.java | 67 +- .../RealmsPlayersTab.java} | 230 +- .../RealmsPreferredRegionSelectionScreen.java | 165 ++ .../configuration/RealmsSettingsTab.java | 192 ++ .../RealmsSlotOptionsScreen.java | 164 +- .../configuration/RealmsSubscriptionTab.java | 183 ++ .../configuration/RealmsWorldsTab.java | 208 ++ .../screens/configuration/package-info.java | 11 + com/mojang/realmsclient/util/RealmsUtil.java | 61 + .../util/task/CloseServerTask.java | 5 +- .../realmsclient/util/task/ConnectTask.java | 10 +- .../util/task/GetServerDetailsTask.java | 60 +- .../util/task/OpenServerTask.java | 9 +- .../realmsclient/util/task/RestoreTask.java | 8 +- .../util/task/SwitchMinigameTask.java | 12 +- .../adventure/heart_transplanter.json | 305 +++ .../husbandry/place_dried_ghast_in_water.json | 37 + .../husbandry/remove_wolf_armor.json | 4 +- .../recipes/building_blocks/dried_ghast.json | 32 + .../recipes/combat/black_harness.json | 32 + .../recipes/combat/blue_harness.json | 32 + .../recipes/combat/brown_harness.json | 32 + .../recipes/combat/cyan_harness.json | 32 + .../recipes/combat/dye_black_harness.json | 32 + .../recipes/combat/dye_blue_harness.json | 32 + .../recipes/combat/dye_brown_harness.json | 32 + .../recipes/combat/dye_cyan_harness.json | 32 + .../recipes/combat/dye_gray_harness.json | 32 + .../recipes/combat/dye_green_harness.json | 32 + .../combat/dye_light_blue_harness.json | 32 + .../combat/dye_light_gray_harness.json | 32 + .../recipes/combat/dye_lime_harness.json | 32 + .../recipes/combat/dye_magenta_harness.json | 32 + .../recipes/combat/dye_orange_harness.json | 32 + .../recipes/combat/dye_pink_harness.json | 32 + .../recipes/combat/dye_purple_harness.json | 32 + .../recipes/combat/dye_red_harness.json | 32 + .../recipes/combat/dye_white_harness.json | 32 + .../recipes/combat/dye_yellow_harness.json | 32 + .../recipes/combat/gray_harness.json | 32 + .../recipes/combat/green_harness.json | 32 + .../recipes/combat/light_blue_harness.json | 32 + .../recipes/combat/light_gray_harness.json | 32 + .../recipes/combat/lime_harness.json | 32 + .../recipes/combat/magenta_harness.json | 32 + .../recipes/combat/orange_harness.json | 32 + .../recipes/combat/pink_harness.json | 32 + .../recipes/combat/purple_harness.json | 32 + .../recipes/combat/red_harness.json | 32 + .../advancement/recipes/combat/saddle.json | 32 + .../recipes/combat/white_harness.json | 32 + .../recipes/combat/yellow_harness.json | 32 + .../dye_black_bed.json | 0 .../dye_black_carpet.json | 0 .../dye_blue_bed.json | 0 .../dye_blue_carpet.json | 0 .../dye_brown_bed.json | 0 .../dye_brown_carpet.json | 0 .../dye_cyan_bed.json | 0 .../dye_cyan_carpet.json | 0 .../dye_gray_bed.json | 0 .../dye_gray_carpet.json | 0 .../dye_green_bed.json | 0 .../dye_green_carpet.json | 0 .../dye_light_blue_bed.json | 0 .../dye_light_blue_carpet.json | 0 .../dye_light_gray_bed.json | 0 .../dye_light_gray_carpet.json | 0 .../dye_lime_bed.json | 0 .../dye_lime_carpet.json | 0 .../dye_magenta_bed.json | 0 .../dye_magenta_carpet.json | 0 .../dye_orange_bed.json | 0 .../dye_orange_carpet.json | 0 .../dye_pink_bed.json | 0 .../dye_pink_carpet.json | 0 .../dye_purple_bed.json | 0 .../dye_purple_carpet.json | 0 .../dye_red_bed.json | 0 .../dye_red_carpet.json | 0 .../dye_white_bed.json | 0 .../dye_white_carpet.json | 0 .../dye_yellow_bed.json | 0 .../dye_yellow_carpet.json | 0 .../advancement/recipes/tools/lead.json | 6 +- .../minecart_improvements/pack.mcmeta | 2 +- .../redstone_experiments/pack.mcmeta | 2 +- .../datapacks/trade_rebalance/pack.mcmeta | 2 +- data/minecraft/dialog/custom_options.json | 18 + data/minecraft/dialog/quick_actions.json | 18 + data/minecraft/dialog/server_links.json | 17 + data/minecraft/dimension_type/overworld.json | 1 + .../dimension_type/overworld_caves.json | 1 + data/minecraft/jukebox_song/tears.json | 8 + .../loot_table/blocks/dried_ghast.json | 21 + .../loot_table/chests/ancient_city.json | 8 +- .../loot_table/chests/desert_pyramid.json | 13 +- .../loot_table/chests/jungle_temple.json | 13 +- .../loot_table/chests/simple_dungeon.json | 13 +- .../chests/stronghold_corridor.json | 13 +- data/minecraft/loot_table/entities/ghast.json | 36 + .../loot_table/entities/happy_ghast.json | 4 + .../loot_table/gameplay/piglin_bartering.json | 12 + data/minecraft/recipe/black_harness.json | 18 + data/minecraft/recipe/blue_harness.json | 18 + data/minecraft/recipe/brown_harness.json | 18 + data/minecraft/recipe/cyan_harness.json | 18 + data/minecraft/recipe/dried_ghast.json | 18 + data/minecraft/recipe/dye_black_bed.json | 4 +- data/minecraft/recipe/dye_black_carpet.json | 4 +- data/minecraft/recipe/dye_black_harness.json | 29 + data/minecraft/recipe/dye_blue_bed.json | 4 +- data/minecraft/recipe/dye_blue_carpet.json | 4 +- data/minecraft/recipe/dye_blue_harness.json | 29 + data/minecraft/recipe/dye_brown_bed.json | 4 +- data/minecraft/recipe/dye_brown_carpet.json | 4 +- data/minecraft/recipe/dye_brown_harness.json | 29 + data/minecraft/recipe/dye_cyan_bed.json | 4 +- data/minecraft/recipe/dye_cyan_carpet.json | 4 +- data/minecraft/recipe/dye_cyan_harness.json | 29 + data/minecraft/recipe/dye_gray_bed.json | 4 +- data/minecraft/recipe/dye_gray_carpet.json | 4 +- data/minecraft/recipe/dye_gray_harness.json | 29 + data/minecraft/recipe/dye_green_bed.json | 4 +- data/minecraft/recipe/dye_green_carpet.json | 4 +- data/minecraft/recipe/dye_green_harness.json | 29 + data/minecraft/recipe/dye_light_blue_bed.json | 4 +- .../recipe/dye_light_blue_carpet.json | 4 +- .../recipe/dye_light_blue_harness.json | 29 + data/minecraft/recipe/dye_light_gray_bed.json | 4 +- .../recipe/dye_light_gray_carpet.json | 4 +- .../recipe/dye_light_gray_harness.json | 29 + data/minecraft/recipe/dye_lime_bed.json | 4 +- data/minecraft/recipe/dye_lime_carpet.json | 4 +- data/minecraft/recipe/dye_lime_harness.json | 29 + data/minecraft/recipe/dye_magenta_bed.json | 4 +- data/minecraft/recipe/dye_magenta_carpet.json | 4 +- .../minecraft/recipe/dye_magenta_harness.json | 29 + data/minecraft/recipe/dye_orange_bed.json | 4 +- data/minecraft/recipe/dye_orange_carpet.json | 4 +- data/minecraft/recipe/dye_orange_harness.json | 29 + data/minecraft/recipe/dye_pink_bed.json | 4 +- data/minecraft/recipe/dye_pink_carpet.json | 4 +- data/minecraft/recipe/dye_pink_harness.json | 29 + data/minecraft/recipe/dye_purple_bed.json | 4 +- data/minecraft/recipe/dye_purple_carpet.json | 4 +- data/minecraft/recipe/dye_purple_harness.json | 29 + data/minecraft/recipe/dye_red_bed.json | 4 +- data/minecraft/recipe/dye_red_carpet.json | 4 +- data/minecraft/recipe/dye_red_harness.json | 29 + data/minecraft/recipe/dye_white_bed.json | 4 +- data/minecraft/recipe/dye_white_carpet.json | 4 +- data/minecraft/recipe/dye_white_harness.json | 29 + data/minecraft/recipe/dye_yellow_bed.json | 4 +- data/minecraft/recipe/dye_yellow_carpet.json | 4 +- data/minecraft/recipe/dye_yellow_harness.json | 29 + data/minecraft/recipe/gray_harness.json | 18 + data/minecraft/recipe/green_harness.json | 18 + data/minecraft/recipe/lead.json | 3 +- data/minecraft/recipe/light_blue_harness.json | 18 + data/minecraft/recipe/light_gray_harness.json | 18 + data/minecraft/recipe/lime_harness.json | 18 + data/minecraft/recipe/magenta_harness.json | 18 + data/minecraft/recipe/orange_harness.json | 18 + data/minecraft/recipe/pink_harness.json | 18 + data/minecraft/recipe/purple_harness.json | 18 + data/minecraft/recipe/red_harness.json | 18 + data/minecraft/recipe/saddle.json | 16 + data/minecraft/recipe/white_harness.json | 18 + data/minecraft/recipe/yellow_harness.json | 18 + .../city/entrance/entrance_connector.nbt | 4 +- .../city/entrance/entrance_path_1.nbt | 2 +- .../city/entrance/entrance_path_2.nbt | 4 +- .../city/entrance/entrance_path_3.nbt | 4 +- .../city/entrance/entrance_path_4.nbt | 4 +- .../city/entrance/entrance_path_5.nbt | 4 +- .../city_center/city_center_1.nbt | 4 +- .../city_center/city_center_2.nbt | 4 +- .../city_center/city_center_3.nbt | 4 +- .../city_center/walls/bottom_1.nbt | 2 +- .../city_center/walls/bottom_2.nbt | 4 +- .../city_center/walls/bottom_left_corner.nbt | 4 +- .../city_center/walls/bottom_right_corner.nbt | 4 +- .../walls/bottom_right_corner_1.nbt | 4 +- .../walls/bottom_right_corner_2.nbt | 4 +- .../ancient_city/city_center/walls/left.nbt | 4 +- .../ancient_city/city_center/walls/right.nbt | 4 +- .../ancient_city/city_center/walls/top.nbt | 4 +- .../city_center/walls/top_left_corner.nbt | 4 +- .../city_center/walls/top_right_corner.nbt | 4 +- .../ancient_city/structures/barracks.nbt | 4 +- .../ancient_city/structures/camp_1.nbt | 2 +- .../ancient_city/structures/camp_2.nbt | 4 +- .../ancient_city/structures/camp_3.nbt | 4 +- .../ancient_city/structures/chamber_1.nbt | 4 +- .../ancient_city/structures/chamber_2.nbt | 4 +- .../ancient_city/structures/chamber_3.nbt | 4 +- .../ancient_city/structures/ice_box_1.nbt | 4 +- .../structures/large_pillar_1.nbt | 4 +- .../ancient_city/structures/large_ruin_1.nbt | 4 +- .../structures/medium_pillar_1.nbt | 4 +- .../ancient_city/structures/medium_ruin_1.nbt | 4 +- .../ancient_city/structures/medium_ruin_2.nbt | 2 +- .../ancient_city/structures/sauna_1.nbt | 4 +- .../ancient_city/structures/small_ruin_1.nbt | 4 +- .../ancient_city/structures/small_ruin_2.nbt | 2 +- .../ancient_city/structures/small_statue.nbt | 4 +- .../ancient_city/structures/tall_ruin_1.nbt | 4 +- .../ancient_city/structures/tall_ruin_2.nbt | 4 +- .../ancient_city/structures/tall_ruin_3.nbt | 4 +- .../ancient_city/structures/tall_ruin_4.nbt | 4 +- .../walls/intact_corner_wall_1.nbt | 4 +- .../walls/intact_horizontal_wall_1.nbt | 4 +- .../walls/intact_horizontal_wall_2.nbt | 4 +- .../walls/intact_horizontal_wall_bridge.nbt | 4 +- .../intact_horizontal_wall_passage_1.nbt | 4 +- .../walls/intact_horizontal_wall_stairs_1.nbt | 2 +- .../walls/intact_horizontal_wall_stairs_2.nbt | 4 +- .../walls/intact_horizontal_wall_stairs_3.nbt | 4 +- .../walls/intact_horizontal_wall_stairs_4.nbt | 4 +- .../walls/intact_intersection_wall_1.nbt | 4 +- .../walls/intact_lshape_wall_1.nbt | 4 +- .../walls/ruined_corner_wall_1.nbt | 4 +- .../walls/ruined_corner_wall_2.nbt | 4 +- .../walls/ruined_horizontal_wall_stairs_1.nbt | 4 +- .../walls/ruined_horizontal_wall_stairs_2.nbt | 4 +- .../walls/ruined_horizontal_wall_stairs_3.nbt | 4 +- .../walls/ruined_horizontal_wall_stairs_4.nbt | 4 +- .../structure/bastion/blocks/air.nbt | 2 +- .../structure/bastion/blocks/gold.nbt | 2 +- .../bastion/bridge/bridge_pieces/bridge.nbt | 4 +- .../bridge/connectors/back_bridge_bottom.nbt | 4 +- .../bridge/connectors/back_bridge_top.nbt | 4 +- .../structure/bastion/bridge/legs/leg_0.nbt | 4 +- .../structure/bastion/bridge/legs/leg_1.nbt | 4 +- .../bastion/bridge/rampart_plates/plate_0.nbt | 4 +- .../bastion/bridge/ramparts/rampart_0.nbt | 4 +- .../bastion/bridge/ramparts/rampart_1.nbt | 4 +- .../bridge/starting_pieces/entrance.nbt | 4 +- .../bridge/starting_pieces/entrance_base.nbt | 4 +- .../bridge/starting_pieces/entrance_face.nbt | 4 +- .../bastion/bridge/walls/wall_base_0.nbt | 2 +- .../bastion/bridge/walls/wall_base_1.nbt | 4 +- .../bastion/hoglin_stable/air_base.nbt | 4 +- .../connectors/end_post_connector.nbt | 2 +- .../hoglin_stable/large_stables/inner_0.nbt | 4 +- .../hoglin_stable/large_stables/inner_1.nbt | 4 +- .../hoglin_stable/large_stables/inner_2.nbt | 4 +- .../hoglin_stable/large_stables/inner_3.nbt | 4 +- .../hoglin_stable/large_stables/inner_4.nbt | 2 +- .../hoglin_stable/large_stables/outer_0.nbt | 4 +- .../hoglin_stable/large_stables/outer_1.nbt | 4 +- .../hoglin_stable/large_stables/outer_2.nbt | 4 +- .../hoglin_stable/large_stables/outer_3.nbt | 4 +- .../hoglin_stable/large_stables/outer_4.nbt | 2 +- .../bastion/hoglin_stable/posts/end_post.nbt | 2 +- .../hoglin_stable/posts/stair_post.nbt | 4 +- .../rampart_plates/rampart_plate_1.nbt | 2 +- .../hoglin_stable/ramparts/ramparts_1.nbt | 4 +- .../hoglin_stable/ramparts/ramparts_2.nbt | 4 +- .../hoglin_stable/ramparts/ramparts_3.nbt | 4 +- .../hoglin_stable/small_stables/inner_0.nbt | 4 +- .../hoglin_stable/small_stables/inner_1.nbt | 2 +- .../hoglin_stable/small_stables/inner_2.nbt | 4 +- .../hoglin_stable/small_stables/inner_3.nbt | 4 +- .../hoglin_stable/small_stables/outer_0.nbt | 4 +- .../hoglin_stable/small_stables/outer_1.nbt | 2 +- .../hoglin_stable/small_stables/outer_2.nbt | 4 +- .../hoglin_stable/small_stables/outer_3.nbt | 4 +- .../hoglin_stable/stairs/stairs_1_0.nbt | 4 +- .../hoglin_stable/stairs/stairs_1_1.nbt | 4 +- .../hoglin_stable/stairs/stairs_1_2.nbt | 4 +- .../hoglin_stable/stairs/stairs_1_3.nbt | 4 +- .../hoglin_stable/stairs/stairs_1_4.nbt | 4 +- .../hoglin_stable/stairs/stairs_2_0.nbt | 4 +- .../hoglin_stable/stairs/stairs_2_1.nbt | 2 +- .../hoglin_stable/stairs/stairs_2_2.nbt | 4 +- .../hoglin_stable/stairs/stairs_2_3.nbt | 4 +- .../hoglin_stable/stairs/stairs_2_4.nbt | 4 +- .../hoglin_stable/stairs/stairs_3_0.nbt | 4 +- .../hoglin_stable/stairs/stairs_3_1.nbt | 2 +- .../hoglin_stable/stairs/stairs_3_2.nbt | 4 +- .../hoglin_stable/stairs/stairs_3_3.nbt | 4 +- .../hoglin_stable/stairs/stairs_3_4.nbt | 2 +- .../starting_pieces/stairs_0_mirrored.nbt | 4 +- .../starting_pieces/stairs_1_mirrored.nbt | 4 +- .../starting_pieces/stairs_2_mirrored.nbt | 4 +- .../starting_pieces/stairs_3_mirrored.nbt | 4 +- .../starting_pieces/stairs_4_mirrored.nbt | 2 +- .../starting_pieces/starting_stairs_0.nbt | 4 +- .../starting_pieces/starting_stairs_1.nbt | 4 +- .../starting_pieces/starting_stairs_2.nbt | 2 +- .../starting_pieces/starting_stairs_3.nbt | 4 +- .../starting_pieces/starting_stairs_4.nbt | 4 +- .../hoglin_stable/walls/side_wall_0.nbt | 4 +- .../hoglin_stable/walls/side_wall_1.nbt | 4 +- .../bastion/hoglin_stable/walls/wall_base.nbt | 4 +- .../bastion/mobs/crossbow_piglin.nbt | 2 +- .../structure/bastion/mobs/empty.nbt | 4 +- .../structure/bastion/mobs/hoglin.nbt | 2 +- .../structure/bastion/mobs/melee_piglin.nbt | 2 +- .../bastion/mobs/melee_piglin_always.nbt | 4 +- .../structure/bastion/mobs/sword_piglin.nbt | 2 +- .../treasure/bases/centers/center_0.nbt | 4 +- .../treasure/bases/centers/center_1.nbt | 4 +- .../treasure/bases/centers/center_2.nbt | 4 +- .../treasure/bases/centers/center_3.nbt | 4 +- .../bastion/treasure/bases/lava_basin.nbt | 4 +- .../bastion/treasure/big_air_full.nbt | 4 +- .../bastion/treasure/brains/center_brain.nbt | 2 +- .../connectors/center_to_wall_middle.nbt | 4 +- .../connectors/center_to_wall_top.nbt | 4 +- .../center_to_wall_top_entrance.nbt | 4 +- .../treasure/corners/bottom/corner_0.nbt | 2 +- .../treasure/corners/bottom/corner_1.nbt | 2 +- .../bastion/treasure/corners/edges/bottom.nbt | 4 +- .../bastion/treasure/corners/edges/middle.nbt | 2 +- .../bastion/treasure/corners/edges/top.nbt | 4 +- .../treasure/corners/middle/corner_0.nbt | 4 +- .../treasure/corners/middle/corner_1.nbt | 4 +- .../bastion/treasure/corners/top/corner_0.nbt | 2 +- .../bastion/treasure/corners/top/corner_1.nbt | 2 +- .../bastion/treasure/entrances/entrance_0.nbt | 4 +- .../bastion/treasure/extensions/empty.nbt | 4 +- .../bastion/treasure/extensions/fire_room.nbt | 4 +- .../bastion/treasure/extensions/house_0.nbt | 2 +- .../bastion/treasure/extensions/house_1.nbt | 4 +- .../treasure/extensions/large_bridge_0.nbt | 2 +- .../treasure/extensions/large_bridge_1.nbt | 2 +- .../treasure/extensions/large_bridge_2.nbt | 4 +- .../treasure/extensions/large_bridge_3.nbt | 4 +- .../treasure/extensions/roofed_bridge.nbt | 2 +- .../treasure/extensions/small_bridge_0.nbt | 2 +- .../treasure/extensions/small_bridge_1.nbt | 2 +- .../treasure/extensions/small_bridge_2.nbt | 2 +- .../treasure/extensions/small_bridge_3.nbt | 4 +- .../treasure/ramparts/bottom_wall_0.nbt | 4 +- .../treasure/ramparts/lava_basin_main.nbt | 4 +- .../treasure/ramparts/lava_basin_side.nbt | 2 +- .../treasure/ramparts/mid_wall_main.nbt | 4 +- .../treasure/ramparts/mid_wall_side.nbt | 4 +- .../bastion/treasure/ramparts/top_wall.nbt | 4 +- .../bastion/treasure/roofs/center_roof.nbt | 4 +- .../bastion/treasure/roofs/corner_roof.nbt | 2 +- .../bastion/treasure/roofs/wall_roof.nbt | 2 +- .../bastion/treasure/stairs/lower_stairs.nbt | 2 +- .../bastion/treasure/walls/bottom/wall_0.nbt | 4 +- .../bastion/treasure/walls/bottom/wall_1.nbt | 4 +- .../bastion/treasure/walls/bottom/wall_2.nbt | 4 +- .../bastion/treasure/walls/bottom/wall_3.nbt | 4 +- .../bastion/treasure/walls/entrance_wall.nbt | 4 +- .../bastion/treasure/walls/lava_wall.nbt | 4 +- .../bastion/treasure/walls/mid/wall_0.nbt | 4 +- .../bastion/treasure/walls/mid/wall_1.nbt | 4 +- .../bastion/treasure/walls/mid/wall_2.nbt | 2 +- .../treasure/walls/outer/bottom_corner.nbt | 2 +- .../walls/outer/medium_outer_wall.nbt | 4 +- .../treasure/walls/outer/mid_corner.nbt | 2 +- .../treasure/walls/outer/outer_wall.nbt | 4 +- .../treasure/walls/outer/tall_outer_wall.nbt | 4 +- .../treasure/walls/outer/top_corner.nbt | 4 +- .../treasure/walls/top/main_entrance.nbt | 4 +- .../bastion/treasure/walls/top/wall_0.nbt | 4 +- .../bastion/treasure/walls/top/wall_1.nbt | 4 +- .../structure/bastion/units/air_base.nbt | 4 +- .../bastion/units/center_pieces/center_0.nbt | 4 +- .../bastion/units/center_pieces/center_1.nbt | 4 +- .../bastion/units/center_pieces/center_2.nbt | 4 +- .../structure/bastion/units/edges/edge_0.nbt | 4 +- .../bastion/units/fillers/stage_0.nbt | 2 +- .../bastion/units/pathways/pathway_0.nbt | 2 +- .../bastion/units/pathways/pathway_wall_0.nbt | 4 +- .../bastion/units/rampart_plates/plate_0.nbt | 2 +- .../bastion/units/ramparts/ramparts_0.nbt | 4 +- .../bastion/units/ramparts/ramparts_1.nbt | 4 +- .../bastion/units/ramparts/ramparts_2.nbt | 4 +- .../bastion/units/stages/rot/stage_1_0.nbt | 4 +- .../bastion/units/stages/stage_0_0.nbt | 4 +- .../bastion/units/stages/stage_0_1.nbt | 2 +- .../bastion/units/stages/stage_0_2.nbt | 4 +- .../bastion/units/stages/stage_0_3.nbt | 2 +- .../bastion/units/stages/stage_1_0.nbt | 2 +- .../bastion/units/stages/stage_1_1.nbt | 2 +- .../bastion/units/stages/stage_1_2.nbt | 4 +- .../bastion/units/stages/stage_1_3.nbt | 2 +- .../bastion/units/stages/stage_2_0.nbt | 2 +- .../bastion/units/stages/stage_2_1.nbt | 4 +- .../bastion/units/stages/stage_3_0.nbt | 4 +- .../bastion/units/stages/stage_3_1.nbt | 4 +- .../bastion/units/stages/stage_3_2.nbt | 4 +- .../bastion/units/stages/stage_3_3.nbt | 4 +- .../bastion/units/wall_units/edge_0_large.nbt | 4 +- .../bastion/units/wall_units/unit_0.nbt | 4 +- .../bastion/units/walls/connected_wall.nbt | 4 +- .../bastion/units/walls/wall_base.nbt | 4 +- data/minecraft/structure/empty.nbt | 4 +- .../structure/end_city/base_floor.nbt | 4 +- .../structure/end_city/base_roof.nbt | 4 +- .../structure/end_city/bridge_end.nbt | 4 +- .../end_city/bridge_gentle_stairs.nbt | 4 +- .../structure/end_city/bridge_piece.nbt | 4 +- .../end_city/bridge_steep_stairs.nbt | 4 +- .../structure/end_city/fat_tower_base.nbt | 4 +- .../structure/end_city/fat_tower_middle.nbt | 4 +- .../structure/end_city/fat_tower_top.nbt | 4 +- .../structure/end_city/second_floor_1.nbt | 4 +- .../structure/end_city/second_floor_2.nbt | 4 +- .../structure/end_city/second_roof.nbt | 4 +- data/minecraft/structure/end_city/ship.nbt | 4 +- .../structure/end_city/third_floor_1.nbt | 4 +- .../structure/end_city/third_floor_2.nbt | 4 +- .../structure/end_city/third_roof.nbt | 4 +- .../structure/end_city/tower_base.nbt | 2 +- .../structure/end_city/tower_floor.nbt | 4 +- .../structure/end_city/tower_piece.nbt | 2 +- .../structure/end_city/tower_top.nbt | 4 +- data/minecraft/structure/fossil/skull_1.nbt | 4 +- .../structure/fossil/skull_1_coal.nbt | 4 +- data/minecraft/structure/fossil/skull_2.nbt | 4 +- .../structure/fossil/skull_2_coal.nbt | 4 +- data/minecraft/structure/fossil/skull_3.nbt | 4 +- .../structure/fossil/skull_3_coal.nbt | 4 +- data/minecraft/structure/fossil/skull_4.nbt | 4 +- .../structure/fossil/skull_4_coal.nbt | 4 +- data/minecraft/structure/fossil/spine_1.nbt | 4 +- .../structure/fossil/spine_1_coal.nbt | 4 +- data/minecraft/structure/fossil/spine_2.nbt | 4 +- .../structure/fossil/spine_2_coal.nbt | 4 +- data/minecraft/structure/fossil/spine_3.nbt | 4 +- .../structure/fossil/spine_3_coal.nbt | 4 +- data/minecraft/structure/fossil/spine_4.nbt | 4 +- .../structure/fossil/spine_4_coal.nbt | 4 +- data/minecraft/structure/igloo/bottom.nbt | 2 +- data/minecraft/structure/igloo/middle.nbt | 4 +- data/minecraft/structure/igloo/top.nbt | 4 +- .../structure/nether_fossils/fossil_1.nbt | 4 +- .../structure/nether_fossils/fossil_10.nbt | 4 +- .../structure/nether_fossils/fossil_11.nbt | 4 +- .../structure/nether_fossils/fossil_12.nbt | 4 +- .../structure/nether_fossils/fossil_13.nbt | 4 +- .../structure/nether_fossils/fossil_14.nbt | 4 +- .../structure/nether_fossils/fossil_2.nbt | 4 +- .../structure/nether_fossils/fossil_3.nbt | 2 +- .../structure/nether_fossils/fossil_4.nbt | 4 +- .../structure/nether_fossils/fossil_5.nbt | 4 +- .../structure/nether_fossils/fossil_6.nbt | 4 +- .../structure/nether_fossils/fossil_7.nbt | 2 +- .../structure/nether_fossils/fossil_8.nbt | 4 +- .../structure/nether_fossils/fossil_9.nbt | 4 +- .../structure/pillager_outpost/base_plate.nbt | 2 +- .../pillager_outpost/feature_cage1.nbt | 4 +- .../pillager_outpost/feature_cage2.nbt | 4 +- .../feature_cage_with_allays.nbt | 2 +- .../pillager_outpost/feature_logs.nbt | 4 +- .../pillager_outpost/feature_plate.nbt | 4 +- .../pillager_outpost/feature_targets.nbt | 4 +- .../pillager_outpost/feature_tent1.nbt | 4 +- .../pillager_outpost/feature_tent2.nbt | 4 +- .../structure/pillager_outpost/watchtower.nbt | 4 +- .../pillager_outpost/watchtower_overgrown.nbt | 4 +- .../ruined_portal/giant_portal_1.nbt | 4 +- .../ruined_portal/giant_portal_2.nbt | 4 +- .../ruined_portal/giant_portal_3.nbt | 4 +- .../structure/ruined_portal/portal_1.nbt | 4 +- .../structure/ruined_portal/portal_10.nbt | 4 +- .../structure/ruined_portal/portal_2.nbt | 2 +- .../structure/ruined_portal/portal_3.nbt | 4 +- .../structure/ruined_portal/portal_4.nbt | 4 +- .../structure/ruined_portal/portal_5.nbt | 4 +- .../structure/ruined_portal/portal_6.nbt | 4 +- .../structure/ruined_portal/portal_7.nbt | 4 +- .../structure/ruined_portal/portal_8.nbt | 4 +- .../structure/ruined_portal/portal_9.nbt | 4 +- .../shipwreck/rightsideup_backhalf.nbt | 4 +- .../rightsideup_backhalf_degraded.nbt | 4 +- .../shipwreck/rightsideup_fronthalf.nbt | 4 +- .../rightsideup_fronthalf_degraded.nbt | 4 +- .../structure/shipwreck/rightsideup_full.nbt | 4 +- .../shipwreck/rightsideup_full_degraded.nbt | 4 +- .../structure/shipwreck/sideways_backhalf.nbt | 4 +- .../shipwreck/sideways_backhalf_degraded.nbt | 4 +- .../shipwreck/sideways_fronthalf.nbt | 4 +- .../shipwreck/sideways_fronthalf_degraded.nbt | 4 +- .../structure/shipwreck/sideways_full.nbt | 4 +- .../shipwreck/sideways_full_degraded.nbt | 4 +- .../shipwreck/upsidedown_backhalf.nbt | 4 +- .../upsidedown_backhalf_degraded.nbt | 4 +- .../shipwreck/upsidedown_fronthalf.nbt | 4 +- .../upsidedown_fronthalf_degraded.nbt | 4 +- .../structure/shipwreck/upsidedown_full.nbt | 4 +- .../shipwreck/upsidedown_full_degraded.nbt | 4 +- .../structure/shipwreck/with_mast.nbt | 4 +- .../shipwreck/with_mast_degraded.nbt | 4 +- .../trail_ruins/buildings/group_full_1.nbt | 2 +- .../trail_ruins/buildings/group_full_2.nbt | 4 +- .../trail_ruins/buildings/group_full_3.nbt | 4 +- .../trail_ruins/buildings/group_full_4.nbt | 2 +- .../trail_ruins/buildings/group_full_5.nbt | 4 +- .../trail_ruins/buildings/group_hall_1.nbt | 4 +- .../trail_ruins/buildings/group_hall_2.nbt | 4 +- .../trail_ruins/buildings/group_hall_3.nbt | 2 +- .../trail_ruins/buildings/group_hall_4.nbt | 2 +- .../trail_ruins/buildings/group_hall_5.nbt | 2 +- .../trail_ruins/buildings/group_lower_1.nbt | 2 +- .../trail_ruins/buildings/group_lower_2.nbt | 4 +- .../trail_ruins/buildings/group_lower_3.nbt | 2 +- .../trail_ruins/buildings/group_lower_4.nbt | 2 +- .../trail_ruins/buildings/group_lower_5.nbt | 4 +- .../trail_ruins/buildings/group_room_1.nbt | 2 +- .../trail_ruins/buildings/group_room_2.nbt | 4 +- .../trail_ruins/buildings/group_room_3.nbt | 4 +- .../trail_ruins/buildings/group_room_4.nbt | 4 +- .../trail_ruins/buildings/group_room_5.nbt | 2 +- .../trail_ruins/buildings/group_upper_1.nbt | 4 +- .../trail_ruins/buildings/group_upper_2.nbt | 4 +- .../trail_ruins/buildings/group_upper_3.nbt | 4 +- .../trail_ruins/buildings/group_upper_4.nbt | 2 +- .../trail_ruins/buildings/group_upper_5.nbt | 4 +- .../trail_ruins/buildings/large_room_1.nbt | 4 +- .../trail_ruins/buildings/large_room_2.nbt | 4 +- .../trail_ruins/buildings/large_room_3.nbt | 2 +- .../trail_ruins/buildings/large_room_4.nbt | 4 +- .../trail_ruins/buildings/large_room_5.nbt | 4 +- .../trail_ruins/buildings/one_room_1.nbt | 4 +- .../trail_ruins/buildings/one_room_2.nbt | 2 +- .../trail_ruins/buildings/one_room_3.nbt | 2 +- .../trail_ruins/buildings/one_room_4.nbt | 4 +- .../trail_ruins/buildings/one_room_5.nbt | 2 +- .../structure/trail_ruins/decor/decor_1.nbt | 4 +- .../structure/trail_ruins/decor/decor_2.nbt | 4 +- .../structure/trail_ruins/decor/decor_3.nbt | 4 +- .../structure/trail_ruins/decor/decor_4.nbt | 2 +- .../structure/trail_ruins/decor/decor_5.nbt | 4 +- .../structure/trail_ruins/decor/decor_6.nbt | 2 +- .../structure/trail_ruins/decor/decor_7.nbt | 4 +- .../trail_ruins/roads/long_road_end.nbt | 2 +- .../trail_ruins/roads/road_end_1.nbt | 4 +- .../trail_ruins/roads/road_section_1.nbt | 4 +- .../trail_ruins/roads/road_section_2.nbt | 4 +- .../trail_ruins/roads/road_section_3.nbt | 4 +- .../trail_ruins/roads/road_section_4.nbt | 4 +- .../trail_ruins/roads/road_spacer_1.nbt | 4 +- .../structure/trail_ruins/tower/hall_1.nbt | 4 +- .../structure/trail_ruins/tower/hall_2.nbt | 4 +- .../structure/trail_ruins/tower/hall_3.nbt | 4 +- .../structure/trail_ruins/tower/hall_4.nbt | 2 +- .../structure/trail_ruins/tower/hall_5.nbt | 4 +- .../trail_ruins/tower/large_hall_1.nbt | 4 +- .../trail_ruins/tower/large_hall_2.nbt | 2 +- .../trail_ruins/tower/large_hall_3.nbt | 2 +- .../trail_ruins/tower/large_hall_4.nbt | 2 +- .../trail_ruins/tower/large_hall_5.nbt | 4 +- .../trail_ruins/tower/one_room_1.nbt | 2 +- .../trail_ruins/tower/one_room_2.nbt | 2 +- .../trail_ruins/tower/one_room_3.nbt | 4 +- .../trail_ruins/tower/one_room_4.nbt | 2 +- .../trail_ruins/tower/one_room_5.nbt | 4 +- .../trail_ruins/tower/platform_1.nbt | 2 +- .../trail_ruins/tower/platform_2.nbt | 2 +- .../trail_ruins/tower/platform_3.nbt | 4 +- .../trail_ruins/tower/platform_4.nbt | 4 +- .../trail_ruins/tower/platform_5.nbt | 4 +- .../structure/trail_ruins/tower/stable_1.nbt | 4 +- .../structure/trail_ruins/tower/stable_2.nbt | 2 +- .../structure/trail_ruins/tower/stable_3.nbt | 2 +- .../structure/trail_ruins/tower/stable_4.nbt | 4 +- .../structure/trail_ruins/tower/stable_5.nbt | 2 +- .../structure/trail_ruins/tower/tower_1.nbt | 4 +- .../structure/trail_ruins/tower/tower_2.nbt | 4 +- .../structure/trail_ruins/tower/tower_3.nbt | 4 +- .../structure/trail_ruins/tower/tower_4.nbt | 4 +- .../structure/trail_ruins/tower/tower_5.nbt | 4 +- .../trail_ruins/tower/tower_top_1.nbt | 4 +- .../trail_ruins/tower/tower_top_2.nbt | 4 +- .../trail_ruins/tower/tower_top_3.nbt | 4 +- .../trail_ruins/tower/tower_top_4.nbt | 2 +- .../trail_ruins/tower/tower_top_5.nbt | 2 +- .../chamber/addon/c1_breeze.nbt | 4 +- .../chamber/addon/full_corner_column.nbt | 4 +- .../chamber/addon/full_stacked_walkway.nbt | 4 +- .../chamber/addon/full_stacked_walkway_2.nbt | 4 +- .../chamber/addon/grate_bridge.nbt | 4 +- .../chamber/addon/hanging_platform.nbt | 4 +- .../chamber/addon/lower_staircase_down.nbt | 2 +- .../chamber/addon/short_grate_platform.nbt | 2 +- .../chamber/addon/short_platform.nbt | 4 +- .../chamber/addon/walkway_with_bridge_1.nbt | 4 +- .../trial_chambers/chamber/assembly.nbt | 4 +- .../chamber/assembly/cover_1.nbt | 2 +- .../chamber/assembly/cover_2.nbt | 4 +- .../chamber/assembly/cover_3.nbt | 2 +- .../chamber/assembly/cover_4.nbt | 4 +- .../chamber/assembly/cover_5.nbt | 2 +- .../chamber/assembly/cover_6.nbt | 2 +- .../chamber/assembly/cover_7.nbt | 4 +- .../chamber/assembly/full_column.nbt | 2 +- .../chamber/assembly/hanging_1.nbt | 4 +- .../chamber/assembly/hanging_2.nbt | 4 +- .../chamber/assembly/hanging_3.nbt | 4 +- .../chamber/assembly/hanging_4.nbt | 4 +- .../chamber/assembly/hanging_5.nbt | 4 +- .../chamber/assembly/left_staircase_1.nbt | 2 +- .../chamber/assembly/left_staircase_2.nbt | 4 +- .../chamber/assembly/left_staircase_3.nbt | 4 +- .../chamber/assembly/platform_1.nbt | 4 +- .../chamber/assembly/right_staircase_1.nbt | 4 +- .../chamber/assembly/right_staircase_2.nbt | 4 +- .../chamber/assembly/right_staircase_3.nbt | 4 +- .../chamber/assembly/spawner_1.nbt | 4 +- .../trial_chambers/chamber/chamber_1.nbt | 4 +- .../trial_chambers/chamber/chamber_2.nbt | 4 +- .../trial_chambers/chamber/chamber_4.nbt | 4 +- .../trial_chambers/chamber/chamber_8.nbt | 2 +- .../trial_chambers/chamber/entrance_cap.nbt | 4 +- .../trial_chambers/chamber/eruption.nbt | 2 +- .../chamber/eruption/breeze_slice_1.nbt | 4 +- .../chamber/eruption/center_1.nbt | 4 +- .../chamber/eruption/quadrant_1.nbt | 4 +- .../chamber/eruption/quadrant_2.nbt | 4 +- .../chamber/eruption/quadrant_3.nbt | 4 +- .../chamber/eruption/quadrant_4.nbt | 4 +- .../chamber/eruption/quadrant_5.nbt | 4 +- .../chamber/eruption/slice_1.nbt | 4 +- .../chamber/eruption/slice_2.nbt | 4 +- .../chamber/eruption/slice_3.nbt | 4 +- .../trial_chambers/chamber/pedestal.nbt | 2 +- .../chamber/pedestal/center_1.nbt | 4 +- .../chamber/pedestal/ominous_slice_1.nbt | 4 +- .../chamber/pedestal/quadrant_1.nbt | 4 +- .../chamber/pedestal/quadrant_2.nbt | 4 +- .../chamber/pedestal/quadrant_3.nbt | 4 +- .../chamber/pedestal/slice_1.nbt | 2 +- .../chamber/pedestal/slice_2.nbt | 4 +- .../chamber/pedestal/slice_3.nbt | 4 +- .../chamber/pedestal/slice_4.nbt | 4 +- .../chamber/pedestal/slice_5.nbt | 4 +- .../trial_chambers/chamber/slanted.nbt | 4 +- .../trial_chambers/chamber/slanted/center.nbt | 2 +- .../chamber/slanted/hallway_1.nbt | 2 +- .../chamber/slanted/hallway_2.nbt | 4 +- .../chamber/slanted/hallway_3.nbt | 2 +- .../chamber/slanted/ominous_upper_arm_1.nbt | 4 +- .../chamber/slanted/quadrant_1.nbt | 2 +- .../chamber/slanted/quadrant_2.nbt | 2 +- .../chamber/slanted/quadrant_3.nbt | 2 +- .../chamber/slanted/quadrant_4.nbt | 4 +- .../trial_chambers/chamber/slanted/ramp_1.nbt | 2 +- .../trial_chambers/chamber/slanted/ramp_2.nbt | 4 +- .../trial_chambers/chamber/slanted/ramp_3.nbt | 4 +- .../trial_chambers/chamber/slanted/ramp_4.nbt | 4 +- .../chests/connectors/supply.nbt | 4 +- .../trial_chambers/chests/supply.nbt | 4 +- .../corridor/addon/arrow_dispenser.nbt | 4 +- .../corridor/addon/bridge_lower.nbt | 4 +- .../corridor/addon/chandelier_upper.nbt | 4 +- .../corridor/addon/decoration_upper.nbt | 4 +- .../corridor/addon/display_1.nbt | 4 +- .../corridor/addon/display_2.nbt | 4 +- .../corridor/addon/display_3.nbt | 4 +- .../corridor/addon/head_upper.nbt | 4 +- .../corridor/addon/ladder_to_middle.nbt | 4 +- .../corridor/addon/open_walkway.nbt | 4 +- .../corridor/addon/open_walkway_upper.nbt | 4 +- .../corridor/addon/reward_upper.nbt | 4 +- .../corridor/addon/staircase.nbt | 4 +- .../trial_chambers/corridor/addon/wall.nbt | 4 +- .../corridor/addon/walled_walkway.nbt | 4 +- .../corridor/atrium/bogged_relief.nbt | 4 +- .../corridor/atrium/breeze_relief.nbt | 4 +- .../corridor/atrium/grand_staircase_1.nbt | 4 +- .../corridor/atrium/grand_staircase_2.nbt | 4 +- .../corridor/atrium/grand_staircase_3.nbt | 4 +- .../corridor/atrium/spider_relief.nbt | 2 +- .../corridor/atrium/spiral_relief.nbt | 4 +- .../trial_chambers/corridor/atrium_1.nbt | 4 +- .../trial_chambers/corridor/end_1.nbt | 4 +- .../trial_chambers/corridor/end_2.nbt | 4 +- .../trial_chambers/corridor/entrance_1.nbt | 4 +- .../trial_chambers/corridor/entrance_2.nbt | 4 +- .../trial_chambers/corridor/entrance_3.nbt | 4 +- .../trial_chambers/corridor/first_plate.nbt | 4 +- .../trial_chambers/corridor/second_plate.nbt | 4 +- .../trial_chambers/corridor/straight_1.nbt | 2 +- .../trial_chambers/corridor/straight_2.nbt | 2 +- .../trial_chambers/corridor/straight_3.nbt | 4 +- .../trial_chambers/corridor/straight_4.nbt | 4 +- .../trial_chambers/corridor/straight_5.nbt | 4 +- .../trial_chambers/corridor/straight_6.nbt | 4 +- .../trial_chambers/corridor/straight_7.nbt | 4 +- .../trial_chambers/corridor/straight_8.nbt | 2 +- .../structure/trial_chambers/decor/barrel.nbt | 4 +- .../trial_chambers/decor/black_bed.nbt | 4 +- .../trial_chambers/decor/blue_bed.nbt | 4 +- .../trial_chambers/decor/brown_bed.nbt | 4 +- .../trial_chambers/decor/candle_1.nbt | 2 +- .../trial_chambers/decor/candle_2.nbt | 2 +- .../trial_chambers/decor/candle_3.nbt | 2 +- .../trial_chambers/decor/candle_4.nbt | 2 +- .../trial_chambers/decor/cyan_bed.nbt | 4 +- .../trial_chambers/decor/dead_bush_pot.nbt | 4 +- .../trial_chambers/decor/disposal.nbt | 4 +- .../trial_chambers/decor/empty_pot.nbt | 4 +- .../trial_chambers/decor/flow_pot.nbt | 4 +- .../trial_chambers/decor/gray_bed.nbt | 4 +- .../trial_chambers/decor/green_bed.nbt | 4 +- .../trial_chambers/decor/guster_pot.nbt | 4 +- .../trial_chambers/decor/light_blue_bed.nbt | 2 +- .../trial_chambers/decor/light_gray_bed.nbt | 2 +- .../trial_chambers/decor/lime_bed.nbt | 4 +- .../trial_chambers/decor/magenta_bed.nbt | 4 +- .../trial_chambers/decor/orange_bed.nbt | 4 +- .../trial_chambers/decor/pink_bed.nbt | 2 +- .../trial_chambers/decor/purple_bed.nbt | 4 +- .../trial_chambers/decor/red_bed.nbt | 4 +- .../trial_chambers/decor/scrape_pot.nbt | 4 +- .../trial_chambers/decor/undecorated_pot.nbt | 4 +- .../trial_chambers/decor/white_bed.nbt | 4 +- .../trial_chambers/decor/yellow_bed.nbt | 2 +- .../trial_chambers/dispensers/chamber.nbt | 4 +- .../dispensers/floor_dispenser.nbt | 4 +- .../dispensers/wall_dispenser.nbt | 4 +- .../trial_chambers/hallway/cache_1.nbt | 4 +- .../hallway/corner_staircase.nbt | 4 +- .../hallway/corner_staircase_down.nbt | 4 +- .../hallway/corridor_connector_1.nbt | 2 +- .../trial_chambers/hallway/encounter_1.nbt | 4 +- .../trial_chambers/hallway/encounter_2.nbt | 2 +- .../trial_chambers/hallway/encounter_3.nbt | 4 +- .../trial_chambers/hallway/encounter_4.nbt | 4 +- .../trial_chambers/hallway/encounter_5.nbt | 4 +- .../trial_chambers/hallway/left_corner.nbt | 2 +- .../hallway/long_straight_staircase.nbt | 4 +- .../hallway/long_straight_staircase_down.nbt | 4 +- .../hallway/lower_hallway_connector.nbt | 4 +- .../trial_chambers/hallway/right_corner.nbt | 2 +- .../trial_chambers/hallway/rubble.nbt | 4 +- .../trial_chambers/hallway/rubble_chamber.nbt | 4 +- .../hallway/rubble_chamber_thin.nbt | 2 +- .../trial_chambers/hallway/rubble_thin.nbt | 2 +- .../trial_chambers/hallway/straight.nbt | 2 +- .../hallway/straight_staircase.nbt | 2 +- .../hallway/straight_staircase_down.nbt | 4 +- .../hallway/trapped_staircase.nbt | 4 +- .../hallway/upper_hallway_connector.nbt | 4 +- .../intersection/intersection_1.nbt | 4 +- .../intersection/intersection_2.nbt | 4 +- .../intersection/intersection_3.nbt | 4 +- .../trial_chambers/reward/ominous_vault.nbt | 4 +- .../structure/trial_chambers/reward/vault.nbt | 2 +- .../trial_chambers/spawner/breeze/breeze.nbt | 4 +- .../spawner/connectors/breeze.nbt | 4 +- .../spawner/connectors/melee.nbt | 4 +- .../spawner/connectors/ranged.nbt | 4 +- .../spawner/connectors/slow_ranged.nbt | 4 +- .../spawner/connectors/small_melee.nbt | 4 +- .../trial_chambers/spawner/melee/husk.nbt | 4 +- .../trial_chambers/spawner/melee/spider.nbt | 4 +- .../trial_chambers/spawner/melee/zombie.nbt | 4 +- .../spawner/ranged/poison_skeleton.nbt | 2 +- .../spawner/ranged/skeleton.nbt | 4 +- .../trial_chambers/spawner/ranged/stray.nbt | 4 +- .../spawner/slow_ranged/poison_skeleton.nbt | 4 +- .../spawner/slow_ranged/skeleton.nbt | 4 +- .../spawner/slow_ranged/stray.nbt | 4 +- .../spawner/small_melee/baby_zombie.nbt | 4 +- .../spawner/small_melee/cave_spider.nbt | 4 +- .../spawner/small_melee/silverfish.nbt | 4 +- .../spawner/small_melee/slime.nbt | 2 +- .../structure/underwater_ruin/big_brick_1.nbt | 4 +- .../structure/underwater_ruin/big_brick_2.nbt | 4 +- .../structure/underwater_ruin/big_brick_3.nbt | 4 +- .../structure/underwater_ruin/big_brick_8.nbt | 4 +- .../underwater_ruin/big_cracked_1.nbt | 2 +- .../underwater_ruin/big_cracked_2.nbt | 4 +- .../underwater_ruin/big_cracked_3.nbt | 4 +- .../underwater_ruin/big_cracked_8.nbt | 4 +- .../structure/underwater_ruin/big_mossy_1.nbt | 4 +- .../structure/underwater_ruin/big_mossy_2.nbt | 4 +- .../structure/underwater_ruin/big_mossy_3.nbt | 4 +- .../structure/underwater_ruin/big_mossy_8.nbt | 4 +- .../structure/underwater_ruin/big_warm_4.nbt | 4 +- .../structure/underwater_ruin/big_warm_5.nbt | 4 +- .../structure/underwater_ruin/big_warm_6.nbt | 4 +- .../structure/underwater_ruin/big_warm_7.nbt | 4 +- .../structure/underwater_ruin/brick_1.nbt | 4 +- .../structure/underwater_ruin/brick_2.nbt | 4 +- .../structure/underwater_ruin/brick_3.nbt | 4 +- .../structure/underwater_ruin/brick_4.nbt | 4 +- .../structure/underwater_ruin/brick_5.nbt | 4 +- .../structure/underwater_ruin/brick_6.nbt | 4 +- .../structure/underwater_ruin/brick_7.nbt | 4 +- .../structure/underwater_ruin/brick_8.nbt | 4 +- .../structure/underwater_ruin/cracked_1.nbt | 4 +- .../structure/underwater_ruin/cracked_2.nbt | 2 +- .../structure/underwater_ruin/cracked_3.nbt | 4 +- .../structure/underwater_ruin/cracked_4.nbt | 4 +- .../structure/underwater_ruin/cracked_5.nbt | 4 +- .../structure/underwater_ruin/cracked_6.nbt | 4 +- .../structure/underwater_ruin/cracked_7.nbt | 4 +- .../structure/underwater_ruin/cracked_8.nbt | 4 +- .../structure/underwater_ruin/mossy_1.nbt | 4 +- .../structure/underwater_ruin/mossy_2.nbt | 4 +- .../structure/underwater_ruin/mossy_3.nbt | 4 +- .../structure/underwater_ruin/mossy_4.nbt | 4 +- .../structure/underwater_ruin/mossy_5.nbt | 4 +- .../structure/underwater_ruin/mossy_6.nbt | 4 +- .../structure/underwater_ruin/mossy_7.nbt | 4 +- .../structure/underwater_ruin/mossy_8.nbt | 4 +- .../structure/underwater_ruin/warm_1.nbt | 4 +- .../structure/underwater_ruin/warm_2.nbt | 4 +- .../structure/underwater_ruin/warm_3.nbt | 4 +- .../structure/underwater_ruin/warm_4.nbt | 4 +- .../structure/underwater_ruin/warm_5.nbt | 4 +- .../structure/underwater_ruin/warm_6.nbt | 4 +- .../structure/underwater_ruin/warm_7.nbt | 4 +- .../structure/underwater_ruin/warm_8.nbt | 4 +- .../village/common/animals/cat_black.nbt | 2 +- .../village/common/animals/cat_british.nbt | 2 +- .../village/common/animals/cat_calico.nbt | 4 +- .../village/common/animals/cat_jellie.nbt | 4 +- .../village/common/animals/cat_persian.nbt | 4 +- .../village/common/animals/cat_ragdoll.nbt | 4 +- .../village/common/animals/cat_red.nbt | 4 +- .../village/common/animals/cat_siamese.nbt | 4 +- .../village/common/animals/cat_tabby.nbt | 2 +- .../village/common/animals/cat_white.nbt | 4 +- .../village/common/animals/cows_1.nbt | 4 +- .../village/common/animals/horses_1.nbt | 4 +- .../village/common/animals/horses_2.nbt | 4 +- .../village/common/animals/horses_3.nbt | 4 +- .../village/common/animals/horses_4.nbt | 2 +- .../village/common/animals/horses_5.nbt | 4 +- .../village/common/animals/pigs_1.nbt | 4 +- .../village/common/animals/sheep_1.nbt | 2 +- .../village/common/animals/sheep_2.nbt | 4 +- .../structure/village/common/iron_golem.nbt | 2 +- .../structure/village/common/well_bottom.nbt | 2 +- .../structure/village/decays/grass_11x13.nbt | 4 +- .../structure/village/decays/grass_16x16.nbt | 2 +- .../structure/village/decays/grass_9x9.nbt | 2 +- .../structure/village/desert/camel_spawn.nbt | 2 +- .../village/desert/desert_lamp_1.nbt | 4 +- .../desert/houses/desert_animal_pen_1.nbt | 4 +- .../desert/houses/desert_animal_pen_2.nbt | 4 +- .../desert/houses/desert_armorer_1.nbt | 4 +- .../desert/houses/desert_butcher_shop_1.nbt | 4 +- .../houses/desert_cartographer_house_1.nbt | 4 +- .../village/desert/houses/desert_farm_1.nbt | 4 +- .../village/desert/houses/desert_farm_2.nbt | 4 +- .../village/desert/houses/desert_fisher_1.nbt | 4 +- .../desert/houses/desert_fletcher_house_1.nbt | 4 +- .../desert/houses/desert_large_farm_1.nbt | 4 +- .../desert/houses/desert_library_1.nbt | 4 +- .../village/desert/houses/desert_mason_1.nbt | 4 +- .../desert/houses/desert_medium_house_1.nbt | 4 +- .../desert/houses/desert_medium_house_2.nbt | 4 +- .../desert/houses/desert_shepherd_house_1.nbt | 4 +- .../desert/houses/desert_small_house_1.nbt | 4 +- .../desert/houses/desert_small_house_2.nbt | 4 +- .../desert/houses/desert_small_house_3.nbt | 4 +- .../desert/houses/desert_small_house_4.nbt | 4 +- .../desert/houses/desert_small_house_5.nbt | 4 +- .../desert/houses/desert_small_house_6.nbt | 4 +- .../desert/houses/desert_small_house_7.nbt | 4 +- .../desert/houses/desert_small_house_8.nbt | 4 +- .../desert/houses/desert_tannery_1.nbt | 4 +- .../village/desert/houses/desert_temple_1.nbt | 4 +- .../village/desert/houses/desert_temple_2.nbt | 4 +- .../desert/houses/desert_tool_smith_1.nbt | 4 +- .../desert/houses/desert_weaponsmith_1.nbt | 4 +- .../village/desert/streets/corner_01.nbt | 2 +- .../village/desert/streets/corner_02.nbt | 2 +- .../village/desert/streets/crossroad_01.nbt | 4 +- .../village/desert/streets/crossroad_02.nbt | 4 +- .../village/desert/streets/crossroad_03.nbt | 4 +- .../village/desert/streets/square_01.nbt | 4 +- .../village/desert/streets/square_02.nbt | 4 +- .../village/desert/streets/straight_01.nbt | 4 +- .../village/desert/streets/straight_02.nbt | 4 +- .../village/desert/streets/straight_03.nbt | 4 +- .../village/desert/streets/turn_01.nbt | 4 +- .../desert/terminators/terminator_01.nbt | 4 +- .../desert/terminators/terminator_02.nbt | 4 +- .../town_centers/desert_meeting_point_1.nbt | 4 +- .../town_centers/desert_meeting_point_2.nbt | 2 +- .../town_centers/desert_meeting_point_3.nbt | 4 +- .../village/desert/villagers/baby.nbt | 4 +- .../village/desert/villagers/nitwit.nbt | 4 +- .../village/desert/villagers/unemployed.nbt | 2 +- .../zombie/houses/desert_medium_house_1.nbt | 4 +- .../zombie/houses/desert_medium_house_2.nbt | 4 +- .../zombie/houses/desert_small_house_1.nbt | 4 +- .../zombie/houses/desert_small_house_2.nbt | 4 +- .../zombie/houses/desert_small_house_3.nbt | 4 +- .../zombie/houses/desert_small_house_4.nbt | 4 +- .../zombie/houses/desert_small_house_5.nbt | 4 +- .../zombie/houses/desert_small_house_6.nbt | 4 +- .../zombie/houses/desert_small_house_7.nbt | 4 +- .../zombie/houses/desert_small_house_8.nbt | 4 +- .../desert/zombie/streets/corner_01.nbt | 2 +- .../desert/zombie/streets/corner_02.nbt | 2 +- .../desert/zombie/streets/crossroad_01.nbt | 4 +- .../desert/zombie/streets/crossroad_02.nbt | 4 +- .../desert/zombie/streets/crossroad_03.nbt | 2 +- .../desert/zombie/streets/square_01.nbt | 4 +- .../desert/zombie/streets/square_02.nbt | 4 +- .../desert/zombie/streets/straight_01.nbt | 2 +- .../desert/zombie/streets/straight_02.nbt | 2 +- .../desert/zombie/streets/straight_03.nbt | 2 +- .../village/desert/zombie/streets/turn_01.nbt | 4 +- .../zombie/terminators/terminator_02.nbt | 4 +- .../town_centers/desert_meeting_point_1.nbt | 4 +- .../town_centers/desert_meeting_point_2.nbt | 4 +- .../town_centers/desert_meeting_point_3.nbt | 4 +- .../desert/zombie/villagers/nitwit.nbt | 2 +- .../desert/zombie/villagers/unemployed.nbt | 2 +- .../plains/houses/plains_accessory_1.nbt | 2 +- .../plains/houses/plains_animal_pen_1.nbt | 4 +- .../plains/houses/plains_animal_pen_2.nbt | 4 +- .../plains/houses/plains_animal_pen_3.nbt | 4 +- .../plains/houses/plains_armorer_house_1.nbt | 4 +- .../plains/houses/plains_big_house_1.nbt | 4 +- .../plains/houses/plains_butcher_shop_1.nbt | 4 +- .../plains/houses/plains_butcher_shop_2.nbt | 4 +- .../plains/houses/plains_cartographer_1.nbt | 4 +- .../plains/houses/plains_fisher_cottage_1.nbt | 4 +- .../plains/houses/plains_fletcher_house_1.nbt | 4 +- .../plains/houses/plains_large_farm_1.nbt | 2 +- .../plains/houses/plains_library_1.nbt | 4 +- .../plains/houses/plains_library_2.nbt | 2 +- .../plains/houses/plains_masons_house_1.nbt | 4 +- .../plains/houses/plains_medium_house_1.nbt | 4 +- .../plains/houses/plains_medium_house_2.nbt | 4 +- .../plains/houses/plains_meeting_point_4.nbt | 4 +- .../plains/houses/plains_meeting_point_5.nbt | 4 +- .../houses/plains_shepherds_house_1.nbt | 2 +- .../plains/houses/plains_small_farm_1.nbt | 2 +- .../plains/houses/plains_small_house_1.nbt | 4 +- .../plains/houses/plains_small_house_2.nbt | 4 +- .../plains/houses/plains_small_house_3.nbt | 4 +- .../plains/houses/plains_small_house_4.nbt | 4 +- .../plains/houses/plains_small_house_5.nbt | 4 +- .../plains/houses/plains_small_house_6.nbt | 4 +- .../plains/houses/plains_small_house_7.nbt | 4 +- .../plains/houses/plains_small_house_8.nbt | 4 +- .../village/plains/houses/plains_stable_1.nbt | 2 +- .../village/plains/houses/plains_stable_2.nbt | 4 +- .../plains/houses/plains_tannery_1.nbt | 4 +- .../village/plains/houses/plains_temple_3.nbt | 4 +- .../village/plains/houses/plains_temple_4.nbt | 4 +- .../plains/houses/plains_tool_smith_1.nbt | 4 +- .../plains/houses/plains_weaponsmith_1.nbt | 4 +- .../village/plains/plains_lamp_1.nbt | 4 +- .../village/plains/streets/corner_01.nbt | 4 +- .../village/plains/streets/corner_02.nbt | 2 +- .../village/plains/streets/corner_03.nbt | 2 +- .../village/plains/streets/crossroad_01.nbt | 4 +- .../village/plains/streets/crossroad_02.nbt | 4 +- .../village/plains/streets/crossroad_03.nbt | 2 +- .../village/plains/streets/crossroad_04.nbt | 4 +- .../village/plains/streets/crossroad_05.nbt | 4 +- .../village/plains/streets/crossroad_06.nbt | 2 +- .../village/plains/streets/straight_01.nbt | 2 +- .../village/plains/streets/straight_02.nbt | 4 +- .../village/plains/streets/straight_03.nbt | 2 +- .../village/plains/streets/straight_04.nbt | 2 +- .../village/plains/streets/straight_05.nbt | 4 +- .../village/plains/streets/straight_06.nbt | 4 +- .../village/plains/streets/turn_01.nbt | 4 +- .../plains/terminators/terminator_01.nbt | 4 +- .../plains/terminators/terminator_02.nbt | 4 +- .../plains/terminators/terminator_03.nbt | 4 +- .../plains/terminators/terminator_04.nbt | 4 +- .../town_centers/plains_fountain_01.nbt | 4 +- .../town_centers/plains_meeting_point_1.nbt | 4 +- .../town_centers/plains_meeting_point_2.nbt | 4 +- .../town_centers/plains_meeting_point_3.nbt | 4 +- .../village/plains/villagers/baby.nbt | 2 +- .../village/plains/villagers/nitwit.nbt | 4 +- .../village/plains/villagers/unemployed.nbt | 4 +- .../zombie/houses/plains_animal_pen_3.nbt | 4 +- .../zombie/houses/plains_big_house_1.nbt | 4 +- .../zombie/houses/plains_butcher_shop_2.nbt | 2 +- .../zombie/houses/plains_fletcher_house_1.nbt | 4 +- .../zombie/houses/plains_medium_house_1.nbt | 2 +- .../zombie/houses/plains_medium_house_2.nbt | 4 +- .../zombie/houses/plains_meeting_point_4.nbt | 4 +- .../zombie/houses/plains_meeting_point_5.nbt | 4 +- .../houses/plains_shepherds_house_1.nbt | 2 +- .../zombie/houses/plains_small_house_1.nbt | 4 +- .../zombie/houses/plains_small_house_2.nbt | 4 +- .../zombie/houses/plains_small_house_3.nbt | 4 +- .../zombie/houses/plains_small_house_4.nbt | 4 +- .../zombie/houses/plains_small_house_5.nbt | 4 +- .../zombie/houses/plains_small_house_6.nbt | 4 +- .../zombie/houses/plains_small_house_7.nbt | 4 +- .../zombie/houses/plains_small_house_8.nbt | 4 +- .../plains/zombie/houses/plains_stable_1.nbt | 2 +- .../plains/zombie/streets/corner_01.nbt | 4 +- .../plains/zombie/streets/corner_02.nbt | 2 +- .../plains/zombie/streets/corner_03.nbt | 2 +- .../plains/zombie/streets/crossroad_01.nbt | 4 +- .../plains/zombie/streets/crossroad_02.nbt | 2 +- .../plains/zombie/streets/crossroad_03.nbt | 4 +- .../plains/zombie/streets/crossroad_04.nbt | 4 +- .../plains/zombie/streets/crossroad_05.nbt | 2 +- .../plains/zombie/streets/crossroad_06.nbt | 4 +- .../plains/zombie/streets/straight_01.nbt | 2 +- .../plains/zombie/streets/straight_02.nbt | 2 +- .../plains/zombie/streets/straight_03.nbt | 4 +- .../plains/zombie/streets/straight_04.nbt | 4 +- .../plains/zombie/streets/straight_05.nbt | 4 +- .../plains/zombie/streets/straight_06.nbt | 4 +- .../village/plains/zombie/streets/turn_01.nbt | 4 +- .../town_centers/plains_fountain_01.nbt | 4 +- .../town_centers/plains_meeting_point_1.nbt | 4 +- .../town_centers/plains_meeting_point_2.nbt | 4 +- .../town_centers/plains_meeting_point_3.nbt | 2 +- .../plains/zombie/villagers/nitwit.nbt | 4 +- .../plains/zombie/villagers/unemployed.nbt | 4 +- .../savanna/houses/savanna_animal_pen_1.nbt | 4 +- .../savanna/houses/savanna_animal_pen_2.nbt | 2 +- .../savanna/houses/savanna_animal_pen_3.nbt | 4 +- .../savanna/houses/savanna_armorer_1.nbt | 4 +- .../houses/savanna_butchers_shop_1.nbt | 4 +- .../houses/savanna_butchers_shop_2.nbt | 4 +- .../savanna/houses/savanna_cartographer_1.nbt | 4 +- .../houses/savanna_fisher_cottage_1.nbt | 4 +- .../houses/savanna_fletcher_house_1.nbt | 4 +- .../savanna/houses/savanna_large_farm_1.nbt | 4 +- .../savanna/houses/savanna_large_farm_2.nbt | 4 +- .../savanna/houses/savanna_library_1.nbt | 4 +- .../savanna/houses/savanna_mason_1.nbt | 4 +- .../savanna/houses/savanna_medium_house_1.nbt | 4 +- .../savanna/houses/savanna_medium_house_2.nbt | 4 +- .../savanna/houses/savanna_shepherd_1.nbt | 4 +- .../savanna/houses/savanna_small_farm.nbt | 4 +- .../savanna/houses/savanna_small_house_1.nbt | 4 +- .../savanna/houses/savanna_small_house_2.nbt | 4 +- .../savanna/houses/savanna_small_house_3.nbt | 2 +- .../savanna/houses/savanna_small_house_4.nbt | 4 +- .../savanna/houses/savanna_small_house_5.nbt | 4 +- .../savanna/houses/savanna_small_house_6.nbt | 2 +- .../savanna/houses/savanna_small_house_7.nbt | 4 +- .../savanna/houses/savanna_small_house_8.nbt | 4 +- .../savanna/houses/savanna_tannery_1.nbt | 4 +- .../savanna/houses/savanna_temple_1.nbt | 4 +- .../savanna/houses/savanna_temple_2.nbt | 4 +- .../savanna/houses/savanna_tool_smith_1.nbt | 4 +- .../savanna/houses/savanna_weaponsmith_1.nbt | 2 +- .../savanna/houses/savanna_weaponsmith_2.nbt | 4 +- .../village/savanna/savanna_lamp_post_01.nbt | 4 +- .../village/savanna/streets/corner_01.nbt | 4 +- .../village/savanna/streets/corner_03.nbt | 2 +- .../village/savanna/streets/crossroad_02.nbt | 4 +- .../village/savanna/streets/crossroad_03.nbt | 2 +- .../village/savanna/streets/crossroad_04.nbt | 4 +- .../village/savanna/streets/crossroad_05.nbt | 2 +- .../village/savanna/streets/crossroad_06.nbt | 4 +- .../village/savanna/streets/crossroad_07.nbt | 4 +- .../village/savanna/streets/split_01.nbt | 4 +- .../village/savanna/streets/split_02.nbt | 4 +- .../village/savanna/streets/straight_02.nbt | 4 +- .../village/savanna/streets/straight_04.nbt | 4 +- .../village/savanna/streets/straight_05.nbt | 4 +- .../village/savanna/streets/straight_06.nbt | 4 +- .../village/savanna/streets/straight_08.nbt | 4 +- .../village/savanna/streets/straight_09.nbt | 4 +- .../village/savanna/streets/straight_10.nbt | 4 +- .../village/savanna/streets/straight_11.nbt | 4 +- .../village/savanna/streets/turn_01.nbt | 4 +- .../savanna/terminators/terminator_05.nbt | 2 +- .../town_centers/savanna_meeting_point_1.nbt | 4 +- .../town_centers/savanna_meeting_point_2.nbt | 4 +- .../town_centers/savanna_meeting_point_3.nbt | 2 +- .../town_centers/savanna_meeting_point_4.nbt | 4 +- .../village/savanna/villagers/baby.nbt | 4 +- .../village/savanna/villagers/nitwit.nbt | 2 +- .../village/savanna/villagers/unemployed.nbt | 4 +- .../zombie/houses/savanna_animal_pen_2.nbt | 4 +- .../zombie/houses/savanna_animal_pen_3.nbt | 2 +- .../zombie/houses/savanna_large_farm_2.nbt | 4 +- .../zombie/houses/savanna_medium_house_1.nbt | 4 +- .../zombie/houses/savanna_medium_house_2.nbt | 4 +- .../zombie/houses/savanna_small_house_1.nbt | 2 +- .../zombie/houses/savanna_small_house_2.nbt | 4 +- .../zombie/houses/savanna_small_house_3.nbt | 2 +- .../zombie/houses/savanna_small_house_4.nbt | 4 +- .../zombie/houses/savanna_small_house_5.nbt | 4 +- .../zombie/houses/savanna_small_house_6.nbt | 4 +- .../zombie/houses/savanna_small_house_7.nbt | 4 +- .../zombie/houses/savanna_small_house_8.nbt | 4 +- .../savanna/zombie/streets/corner_01.nbt | 4 +- .../savanna/zombie/streets/corner_03.nbt | 4 +- .../savanna/zombie/streets/crossroad_02.nbt | 4 +- .../savanna/zombie/streets/crossroad_03.nbt | 2 +- .../savanna/zombie/streets/crossroad_04.nbt | 4 +- .../savanna/zombie/streets/crossroad_05.nbt | 4 +- .../savanna/zombie/streets/crossroad_06.nbt | 4 +- .../savanna/zombie/streets/crossroad_07.nbt | 4 +- .../savanna/zombie/streets/split_01.nbt | 2 +- .../savanna/zombie/streets/split_02.nbt | 2 +- .../savanna/zombie/streets/straight_02.nbt | 2 +- .../savanna/zombie/streets/straight_04.nbt | 4 +- .../savanna/zombie/streets/straight_05.nbt | 4 +- .../savanna/zombie/streets/straight_06.nbt | 4 +- .../savanna/zombie/streets/straight_08.nbt | 4 +- .../savanna/zombie/streets/straight_09.nbt | 2 +- .../savanna/zombie/streets/straight_10.nbt | 4 +- .../savanna/zombie/streets/straight_11.nbt | 4 +- .../savanna/zombie/streets/turn_01.nbt | 4 +- .../zombie/terminators/terminator_05.nbt | 4 +- .../town_centers/savanna_meeting_point_1.nbt | 4 +- .../town_centers/savanna_meeting_point_2.nbt | 4 +- .../town_centers/savanna_meeting_point_3.nbt | 4 +- .../town_centers/savanna_meeting_point_4.nbt | 2 +- .../savanna/zombie/villagers/nitwit.nbt | 4 +- .../savanna/zombie/villagers/unemployed.nbt | 4 +- .../snowy/houses/snowy_animal_pen_1.nbt | 4 +- .../snowy/houses/snowy_animal_pen_2.nbt | 4 +- .../snowy/houses/snowy_armorer_house_1.nbt | 4 +- .../snowy/houses/snowy_armorer_house_2.nbt | 4 +- .../snowy/houses/snowy_butchers_shop_1.nbt | 4 +- .../snowy/houses/snowy_butchers_shop_2.nbt | 4 +- .../houses/snowy_cartographer_house_1.nbt | 4 +- .../village/snowy/houses/snowy_farm_1.nbt | 4 +- .../village/snowy/houses/snowy_farm_2.nbt | 2 +- .../snowy/houses/snowy_fisher_cottage.nbt | 4 +- .../snowy/houses/snowy_fletcher_house_1.nbt | 4 +- .../village/snowy/houses/snowy_library_1.nbt | 4 +- .../snowy/houses/snowy_masons_house_1.nbt | 4 +- .../snowy/houses/snowy_masons_house_2.nbt | 4 +- .../snowy/houses/snowy_medium_house_1.nbt | 4 +- .../snowy/houses/snowy_medium_house_2.nbt | 4 +- .../snowy/houses/snowy_medium_house_3.nbt | 4 +- .../snowy/houses/snowy_shepherds_house_1.nbt | 4 +- .../snowy/houses/snowy_small_house_1.nbt | 4 +- .../snowy/houses/snowy_small_house_2.nbt | 4 +- .../snowy/houses/snowy_small_house_3.nbt | 4 +- .../snowy/houses/snowy_small_house_4.nbt | 4 +- .../snowy/houses/snowy_small_house_5.nbt | 4 +- .../snowy/houses/snowy_small_house_6.nbt | 4 +- .../snowy/houses/snowy_small_house_7.nbt | 4 +- .../snowy/houses/snowy_small_house_8.nbt | 4 +- .../village/snowy/houses/snowy_tannery_1.nbt | 4 +- .../village/snowy/houses/snowy_temple_1.nbt | 4 +- .../snowy/houses/snowy_tool_smith_1.nbt | 4 +- .../snowy/houses/snowy_weapon_smith_1.nbt | 4 +- .../village/snowy/snowy_lamp_post_01.nbt | 4 +- .../village/snowy/snowy_lamp_post_02.nbt | 4 +- .../village/snowy/snowy_lamp_post_03.nbt | 4 +- .../village/snowy/streets/corner_01.nbt | 2 +- .../village/snowy/streets/corner_02.nbt | 4 +- .../village/snowy/streets/corner_03.nbt | 4 +- .../village/snowy/streets/crossroad_01.nbt | 2 +- .../village/snowy/streets/crossroad_02.nbt | 2 +- .../village/snowy/streets/crossroad_03.nbt | 4 +- .../village/snowy/streets/crossroad_04.nbt | 4 +- .../village/snowy/streets/crossroad_05.nbt | 4 +- .../village/snowy/streets/crossroad_06.nbt | 4 +- .../village/snowy/streets/square_01.nbt | 4 +- .../village/snowy/streets/straight_01.nbt | 4 +- .../village/snowy/streets/straight_02.nbt | 4 +- .../village/snowy/streets/straight_03.nbt | 4 +- .../village/snowy/streets/straight_04.nbt | 4 +- .../village/snowy/streets/straight_06.nbt | 4 +- .../village/snowy/streets/straight_08.nbt | 4 +- .../village/snowy/streets/turn_01.nbt | 4 +- .../town_centers/snowy_meeting_point_1.nbt | 2 +- .../town_centers/snowy_meeting_point_2.nbt | 4 +- .../town_centers/snowy_meeting_point_3.nbt | 4 +- .../village/snowy/villagers/baby.nbt | 2 +- .../village/snowy/villagers/nitwit.nbt | 4 +- .../village/snowy/villagers/unemployed.nbt | 4 +- .../zombie/houses/snowy_medium_house_1.nbt | 4 +- .../zombie/houses/snowy_medium_house_2.nbt | 4 +- .../zombie/houses/snowy_medium_house_3.nbt | 4 +- .../zombie/houses/snowy_small_house_1.nbt | 4 +- .../zombie/houses/snowy_small_house_2.nbt | 4 +- .../zombie/houses/snowy_small_house_3.nbt | 4 +- .../zombie/houses/snowy_small_house_4.nbt | 4 +- .../zombie/houses/snowy_small_house_5.nbt | 4 +- .../zombie/houses/snowy_small_house_6.nbt | 4 +- .../zombie/houses/snowy_small_house_7.nbt | 4 +- .../zombie/houses/snowy_small_house_8.nbt | 4 +- .../snowy/zombie/streets/corner_01.nbt | 2 +- .../snowy/zombie/streets/corner_02.nbt | 4 +- .../snowy/zombie/streets/corner_03.nbt | 2 +- .../snowy/zombie/streets/crossroad_01.nbt | 2 +- .../snowy/zombie/streets/crossroad_02.nbt | 2 +- .../snowy/zombie/streets/crossroad_03.nbt | 4 +- .../snowy/zombie/streets/crossroad_04.nbt | 2 +- .../snowy/zombie/streets/crossroad_05.nbt | 4 +- .../snowy/zombie/streets/crossroad_06.nbt | 4 +- .../snowy/zombie/streets/square_01.nbt | 4 +- .../snowy/zombie/streets/straight_01.nbt | 4 +- .../snowy/zombie/streets/straight_02.nbt | 4 +- .../snowy/zombie/streets/straight_03.nbt | 4 +- .../snowy/zombie/streets/straight_04.nbt | 4 +- .../snowy/zombie/streets/straight_06.nbt | 2 +- .../snowy/zombie/streets/straight_08.nbt | 4 +- .../village/snowy/zombie/streets/turn_01.nbt | 2 +- .../town_centers/snowy_meeting_point_1.nbt | 4 +- .../town_centers/snowy_meeting_point_2.nbt | 2 +- .../town_centers/snowy_meeting_point_3.nbt | 4 +- .../village/snowy/zombie/villagers/nitwit.nbt | 4 +- .../snowy/zombie/villagers/unemployed.nbt | 2 +- .../taiga/houses/taiga_animal_pen_1.nbt | 4 +- .../village/taiga/houses/taiga_armorer_2.nbt | 2 +- .../taiga/houses/taiga_armorer_house_1.nbt | 4 +- .../taiga/houses/taiga_butcher_shop_1.nbt | 4 +- .../houses/taiga_cartographer_house_1.nbt | 4 +- .../taiga/houses/taiga_fisher_cottage_1.nbt | 4 +- .../taiga/houses/taiga_fletcher_house_1.nbt | 4 +- .../taiga/houses/taiga_large_farm_1.nbt | 4 +- .../taiga/houses/taiga_large_farm_2.nbt | 4 +- .../village/taiga/houses/taiga_library_1.nbt | 2 +- .../taiga/houses/taiga_masons_house_1.nbt | 4 +- .../taiga/houses/taiga_medium_house_1.nbt | 4 +- .../taiga/houses/taiga_medium_house_2.nbt | 4 +- .../taiga/houses/taiga_medium_house_3.nbt | 4 +- .../taiga/houses/taiga_medium_house_4.nbt | 4 +- .../taiga/houses/taiga_shepherds_house_1.nbt | 4 +- .../taiga/houses/taiga_small_farm_1.nbt | 4 +- .../taiga/houses/taiga_small_house_1.nbt | 2 +- .../taiga/houses/taiga_small_house_2.nbt | 4 +- .../taiga/houses/taiga_small_house_3.nbt | 4 +- .../taiga/houses/taiga_small_house_4.nbt | 4 +- .../taiga/houses/taiga_small_house_5.nbt | 4 +- .../village/taiga/houses/taiga_tannery_1.nbt | 4 +- .../village/taiga/houses/taiga_temple_1.nbt | 4 +- .../taiga/houses/taiga_tool_smith_1.nbt | 4 +- .../taiga/houses/taiga_weaponsmith_1.nbt | 4 +- .../taiga/houses/taiga_weaponsmith_2.nbt | 4 +- .../village/taiga/streets/corner_01.nbt | 2 +- .../village/taiga/streets/corner_02.nbt | 4 +- .../village/taiga/streets/corner_03.nbt | 2 +- .../village/taiga/streets/crossroad_01.nbt | 2 +- .../village/taiga/streets/crossroad_02.nbt | 2 +- .../village/taiga/streets/crossroad_03.nbt | 2 +- .../village/taiga/streets/crossroad_04.nbt | 4 +- .../village/taiga/streets/crossroad_05.nbt | 4 +- .../village/taiga/streets/crossroad_06.nbt | 2 +- .../village/taiga/streets/straight_01.nbt | 2 +- .../village/taiga/streets/straight_02.nbt | 4 +- .../village/taiga/streets/straight_03.nbt | 4 +- .../village/taiga/streets/straight_04.nbt | 4 +- .../village/taiga/streets/straight_05.nbt | 4 +- .../village/taiga/streets/straight_06.nbt | 4 +- .../village/taiga/streets/turn_01.nbt | 2 +- .../village/taiga/taiga_decoration_1.nbt | 4 +- .../village/taiga/taiga_decoration_2.nbt | 2 +- .../village/taiga/taiga_decoration_3.nbt | 4 +- .../village/taiga/taiga_decoration_4.nbt | 4 +- .../village/taiga/taiga_decoration_5.nbt | 4 +- .../village/taiga/taiga_decoration_6.nbt | 4 +- .../village/taiga/taiga_lamp_post_1.nbt | 2 +- .../town_centers/taiga_meeting_point_1.nbt | 4 +- .../town_centers/taiga_meeting_point_2.nbt | 4 +- .../village/taiga/villagers/baby.nbt | 2 +- .../village/taiga/villagers/nitwit.nbt | 2 +- .../village/taiga/villagers/unemployed.nbt | 4 +- .../houses/taiga_cartographer_house_1.nbt | 4 +- .../zombie/houses/taiga_fisher_cottage_1.nbt | 4 +- .../zombie/houses/taiga_large_farm_2.nbt | 4 +- .../taiga/zombie/houses/taiga_library_1.nbt | 4 +- .../zombie/houses/taiga_medium_house_1.nbt | 4 +- .../zombie/houses/taiga_medium_house_2.nbt | 4 +- .../zombie/houses/taiga_medium_house_3.nbt | 4 +- .../zombie/houses/taiga_medium_house_4.nbt | 4 +- .../zombie/houses/taiga_shepherds_house_1.nbt | 4 +- .../zombie/houses/taiga_small_house_1.nbt | 2 +- .../zombie/houses/taiga_small_house_2.nbt | 2 +- .../zombie/houses/taiga_small_house_3.nbt | 4 +- .../zombie/houses/taiga_small_house_4.nbt | 4 +- .../zombie/houses/taiga_small_house_5.nbt | 4 +- .../taiga/zombie/houses/taiga_temple_1.nbt | 4 +- .../zombie/houses/taiga_tool_smith_1.nbt | 4 +- .../zombie/houses/taiga_weaponsmith_2.nbt | 4 +- .../taiga/zombie/streets/corner_01.nbt | 4 +- .../taiga/zombie/streets/corner_02.nbt | 2 +- .../taiga/zombie/streets/corner_03.nbt | 2 +- .../taiga/zombie/streets/crossroad_01.nbt | 4 +- .../taiga/zombie/streets/crossroad_02.nbt | 2 +- .../taiga/zombie/streets/crossroad_03.nbt | 4 +- .../taiga/zombie/streets/crossroad_04.nbt | 4 +- .../taiga/zombie/streets/crossroad_05.nbt | 4 +- .../taiga/zombie/streets/crossroad_06.nbt | 4 +- .../taiga/zombie/streets/straight_01.nbt | 2 +- .../taiga/zombie/streets/straight_02.nbt | 2 +- .../taiga/zombie/streets/straight_03.nbt | 2 +- .../taiga/zombie/streets/straight_04.nbt | 4 +- .../taiga/zombie/streets/straight_05.nbt | 4 +- .../taiga/zombie/streets/straight_06.nbt | 4 +- .../village/taiga/zombie/streets/turn_01.nbt | 4 +- .../town_centers/taiga_meeting_point_1.nbt | 2 +- .../town_centers/taiga_meeting_point_2.nbt | 4 +- .../village/taiga/zombie/villagers/nitwit.nbt | 4 +- .../taiga/zombie/villagers/unemployed.nbt | 4 +- .../structure/woodland_mansion/1x1_a1.nbt | 4 +- .../structure/woodland_mansion/1x1_a2.nbt | 4 +- .../structure/woodland_mansion/1x1_a3.nbt | 4 +- .../structure/woodland_mansion/1x1_a4.nbt | 4 +- .../structure/woodland_mansion/1x1_a5.nbt | 4 +- .../structure/woodland_mansion/1x1_as1.nbt | 4 +- .../structure/woodland_mansion/1x1_as2.nbt | 4 +- .../structure/woodland_mansion/1x1_as3.nbt | 4 +- .../structure/woodland_mansion/1x1_as4.nbt | 2 +- .../structure/woodland_mansion/1x1_b1.nbt | 4 +- .../structure/woodland_mansion/1x1_b2.nbt | 4 +- .../structure/woodland_mansion/1x1_b3.nbt | 4 +- .../structure/woodland_mansion/1x1_b4.nbt | 4 +- .../structure/woodland_mansion/1x1_b5.nbt | 4 +- .../structure/woodland_mansion/1x2_a1.nbt | 4 +- .../structure/woodland_mansion/1x2_a2.nbt | 2 +- .../structure/woodland_mansion/1x2_a3.nbt | 4 +- .../structure/woodland_mansion/1x2_a4.nbt | 4 +- .../structure/woodland_mansion/1x2_a5.nbt | 4 +- .../structure/woodland_mansion/1x2_a6.nbt | 4 +- .../structure/woodland_mansion/1x2_a7.nbt | 4 +- .../structure/woodland_mansion/1x2_a8.nbt | 4 +- .../structure/woodland_mansion/1x2_a9.nbt | 4 +- .../structure/woodland_mansion/1x2_b1.nbt | 4 +- .../structure/woodland_mansion/1x2_b2.nbt | 4 +- .../structure/woodland_mansion/1x2_b3.nbt | 4 +- .../structure/woodland_mansion/1x2_b4.nbt | 4 +- .../structure/woodland_mansion/1x2_b5.nbt | 4 +- .../structure/woodland_mansion/1x2_c1.nbt | 4 +- .../structure/woodland_mansion/1x2_c2.nbt | 4 +- .../structure/woodland_mansion/1x2_c3.nbt | 4 +- .../structure/woodland_mansion/1x2_c4.nbt | 4 +- .../woodland_mansion/1x2_c_stairs.nbt | 4 +- .../structure/woodland_mansion/1x2_d1.nbt | 4 +- .../structure/woodland_mansion/1x2_d2.nbt | 4 +- .../structure/woodland_mansion/1x2_d3.nbt | 4 +- .../structure/woodland_mansion/1x2_d4.nbt | 4 +- .../structure/woodland_mansion/1x2_d5.nbt | 2 +- .../woodland_mansion/1x2_d_stairs.nbt | 4 +- .../structure/woodland_mansion/1x2_s1.nbt | 4 +- .../structure/woodland_mansion/1x2_s2.nbt | 4 +- .../structure/woodland_mansion/1x2_se1.nbt | 4 +- .../structure/woodland_mansion/2x2_a1.nbt | 4 +- .../structure/woodland_mansion/2x2_a2.nbt | 4 +- .../structure/woodland_mansion/2x2_a3.nbt | 4 +- .../structure/woodland_mansion/2x2_a4.nbt | 4 +- .../structure/woodland_mansion/2x2_b1.nbt | 4 +- .../structure/woodland_mansion/2x2_b2.nbt | 4 +- .../structure/woodland_mansion/2x2_b3.nbt | 4 +- .../structure/woodland_mansion/2x2_b4.nbt | 4 +- .../structure/woodland_mansion/2x2_b5.nbt | 4 +- .../structure/woodland_mansion/2x2_s1.nbt | 4 +- .../woodland_mansion/carpet_east.nbt | 4 +- .../woodland_mansion/carpet_north.nbt | 4 +- .../woodland_mansion/carpet_south_1.nbt | 4 +- .../woodland_mansion/carpet_south_2.nbt | 4 +- .../woodland_mansion/carpet_west_1.nbt | 4 +- .../woodland_mansion/carpet_west_2.nbt | 2 +- .../woodland_mansion/corridor_floor.nbt | 4 +- .../structure/woodland_mansion/entrance.nbt | 4 +- .../woodland_mansion/indoors_door_1.nbt | 4 +- .../woodland_mansion/indoors_door_2.nbt | 4 +- .../woodland_mansion/indoors_wall_1.nbt | 4 +- .../woodland_mansion/indoors_wall_2.nbt | 4 +- .../structure/woodland_mansion/roof.nbt | 4 +- .../woodland_mansion/roof_corner.nbt | 4 +- .../structure/woodland_mansion/roof_front.nbt | 4 +- .../woodland_mansion/roof_inner_corner.nbt | 4 +- .../structure/woodland_mansion/small_wall.nbt | 4 +- .../woodland_mansion/small_wall_corner.nbt | 4 +- .../woodland_mansion/wall_corner.nbt | 4 +- .../structure/woodland_mansion/wall_flat.nbt | 4 +- .../woodland_mansion/wall_window.nbt | 2 +- .../tags/block/happy_ghast_avoids.json | 10 + data/minecraft/tags/block/sand.json | 1 - ...t_desert_dry_vegetation_block_sounds.json} | 0 ...gers_ambient_desert_sand_block_sounds.json | 6 + ...gers_ambient_dried_ghast_block_sounds.json | 6 + .../tags/dialog/pause_screen_additions.json | 3 + data/minecraft/tags/dialog/quick_actions.json | 3 + .../tags/entity_type/can_equip_harness.json | 5 + .../entity_type/dismounts_underwater.json | 1 + .../tags/entity_type/fall_damage_immune.json | 1 + .../entity_type/followable_friendly_mobs.json | 29 + .../minecraft/tags/item/happy_ghast_food.json | 5 + .../tags/item/happy_ghast_tempt_items.json | 6 + data/minecraft/tags/item/harnesses.json | 20 + data/minecraft/tags/item/horse_food.json | 1 + data/minecraft/tags/item/sand.json | 1 - .../configured_feature/patch_leaf_litter.json | 18 +- net/minecraft/DetectedVersion.java | 85 +- net/minecraft/FileUtil.java | 8 +- net/minecraft/SharedConstants.java | 20 +- net/minecraft/SystemReport.java | 4 +- net/minecraft/Util.java | 20 +- net/minecraft/WorldVersion.java | 26 +- net/minecraft/advancements/Advancement.java | 7 +- .../advancements/AdvancementRewards.java | 29 +- .../advancements/CriteriaTriggers.java | 1 + .../critereon/AnyBlockInteractionTrigger.java | 10 +- .../critereon/BredAnimalsTrigger.java | 6 +- .../critereon/ChanneledLightningTrigger.java | 2 +- .../critereon/ConsumeItemTrigger.java | 3 +- .../critereon/ContextAwarePredicate.java | 3 +- .../critereon/CriterionValidator.java | 6 +- .../critereon/CuredZombieVillagerTrigger.java | 4 +- .../critereon/DamageSourcePredicate.java | 2 +- .../critereon/DataComponentMatchers.java | 6 +- .../DefaultBlockInteractionTrigger.java | 10 +- .../critereon/DistanceTrigger.java | 2 +- .../critereon/EffectsChangedTrigger.java | 2 +- .../critereon/EntityPredicate.java | 4 +- .../critereon/FallAfterExplosionTrigger.java | 4 +- .../critereon/FishingRodHookedTrigger.java | 7 +- .../critereon/InventoryChangeTrigger.java | 34 +- .../advancements/critereon/ItemPredicate.java | 6 +- .../critereon/ItemUsedOnLocationTrigger.java | 43 +- .../critereon/KilledByArrowTrigger.java | 19 +- .../advancements/critereon/KilledTrigger.java | 2 +- .../critereon/LightningStrikeTrigger.java | 4 +- .../critereon/LootTableTrigger.java | 3 +- .../advancements/critereon/MinMaxBounds.java | 20 +- .../advancements/critereon/NbtPredicate.java | 24 +- .../critereon/PickedUpItemTrigger.java | 2 +- .../critereon/PlayerHurtEntityTrigger.java | 2 +- .../critereon/PlayerInteractTrigger.java | 13 +- .../critereon/PlayerPredicate.java | 7 +- .../advancements/critereon/PlayerTrigger.java | 8 +- .../critereon/RecipeCraftedTrigger.java | 3 +- .../critereon/RecipeUnlockedTrigger.java | 3 +- .../critereon/ShotCrossbowTrigger.java | 3 +- .../critereon/SimpleCriterionTrigger.java | 2 +- .../critereon/SummonedEntityTrigger.java | 2 +- .../critereon/TameAnimalTrigger.java | 2 +- .../critereon/TargetBlockTrigger.java | 2 +- .../advancements/critereon/TradeTrigger.java | 2 +- .../critereon/UsedTotemTrigger.java | 3 +- net/minecraft/client/Camera.java | 38 +- net/minecraft/client/ClientBootstrap.java | 6 + net/minecraft/client/GameNarrator.java | 28 +- net/minecraft/client/GuiMessageTag.java | 4 +- net/minecraft/client/KeyMapping.java | 36 +- net/minecraft/client/KeyboardHandler.java | 125 +- net/minecraft/client/Minecraft.java | 264 +- net/minecraft/client/MouseHandler.java | 7 +- net/minecraft/client/NarratorStatus.java | 4 + net/minecraft/client/OptionInstance.java | 92 +- net/minecraft/client/Options.java | 162 +- .../client/PeriodicNotificationManager.java | 13 +- net/minecraft/client/Screenshot.java | 62 +- net/minecraft/client/ToggleKeyMapping.java | 4 +- .../client/animation/AnimationDefinition.java | 5 + .../client/animation/KeyframeAnimation.java | 94 + .../client/animation/KeyframeAnimations.java | 37 - .../definitions/BreezeAnimation.java | 356 +-- .../definitions/CreakingAnimation.java | 469 ++-- .../definitions/WardenAnimation.java | 88 - net/minecraft/client/color/ColorLerper.java | 73 + net/minecraft/client/data/AtlasProvider.java | 13 +- net/minecraft/client/data/Main.java | 5 +- .../data/models/BlockModelGenerators.java | 165 +- .../data/models/EquipmentAssetProvider.java | 20 +- .../data/models/ItemModelGenerators.java | 47 +- .../client/data/models/ModelProvider.java | 38 +- .../data/models/WaypointStyleProvider.java | 72 + .../models/blockstates/PropertyValueList.java | 14 +- .../data/models/model/ModelTemplates.java | 11 + .../data/models/model/TextureMapping.java | 12 + .../client/data/models/model/TextureSlot.java | 1 + net/minecraft/client/gui/Font.java | 360 ++- net/minecraft/client/gui/Gui.java | 403 +-- net/minecraft/client/gui/GuiGraphics.java | 1095 ++++---- net/minecraft/client/gui/LayeredDraw.java | 45 - .../client/gui/components/AbstractButton.java | 13 +- .../gui/components/AbstractScrollArea.java | 10 +- .../gui/components/AbstractSelectionList.java | 11 +- .../gui/components/AbstractSliderButton.java | 11 +- .../gui/components/AbstractStringWidget.java | 5 +- .../components/AbstractTextAreaWidget.java | 34 +- .../client/gui/components/AbstractWidget.java | 19 +- .../gui/components/BossHealthOverlay.java | 27 +- .../client/gui/components/ChatComponent.java | 158 +- .../client/gui/components/Checkbox.java | 8 +- .../gui/components/CommandSuggestions.java | 25 +- .../ContainerObjectSelectionList.java | 24 +- .../client/gui/components/CycleButton.java | 41 +- .../gui/components/DebugScreenOverlay.java | 77 +- .../client/gui/components/EditBox.java | 96 +- .../FittingMultiLineTextWidget.java | 6 +- .../gui/components/FocusableTextWidget.java | 24 +- .../client/gui/components/ImageButton.java | 4 +- .../client/gui/components/ImageWidget.java | 22 +- .../gui/components/ItemDisplayWidget.java | 53 + .../client/gui/components/LockIconButton.java | 4 +- .../client/gui/components/LogoRenderer.java | 10 +- .../gui/components/MultiLineEditBox.java | 157 +- .../client/gui/components/MultiLineLabel.java | 79 +- .../gui/components/MultiLineTextWidget.java | 47 +- .../gui/components/MultilineTextField.java | 61 +- .../gui/components/ObjectSelectionList.java | 3 +- .../gui/components/PlayerFaceRenderer.java | 6 +- .../gui/components/PlayerSkinWidget.java | 54 +- .../gui/components/PlayerTabOverlay.java | 39 +- .../client/gui/components/PopupScreen.java | 10 +- .../gui/components/ScrollableLayout.java | 176 ++ .../client/gui/components/SplashRenderer.java | 16 +- .../gui/components/SpriteIconButton.java | 6 +- .../gui/components/StateSwitchingButton.java | 4 +- .../client/gui/components/StringWidget.java | 8 +- .../gui/components/SubtitleOverlay.java | 11 +- .../client/gui/components/TabButton.java | 10 +- .../gui/components/WidgetTooltipHolder.java | 16 +- .../debugchart/AbstractDebugChart.java | 25 +- .../debugchart/BandwidthDebugChart.java | 3 +- .../components/debugchart/FpsDebugChart.java | 5 +- .../debugchart/ProfilerPieChart.java | 54 +- .../components/debugchart/TpsDebugChart.java | 7 +- .../events/ContainerEventHandler.java | 10 +- .../components/spectator/SpectatorGui.java | 36 +- .../gui/components/tabs/GridLayoutTab.java | 5 + .../gui/components/tabs/LoadingTab.java | 48 + .../client/gui/components/tabs/Tab.java | 2 + .../gui/components/tabs/TabManager.java | 12 + .../gui/components/tabs/TabNavigationBar.java | 52 +- .../components/toasts/AdvancementToast.java | 13 +- .../components/toasts/NowPlayingToast.java | 122 + .../gui/components/toasts/RecipeToast.java | 10 +- .../gui/components/toasts/SystemToast.java | 4 +- .../client/gui/components/toasts/Toast.java | 11 + .../gui/components/toasts/ToastManager.java | 74 +- .../gui/components/toasts/TutorialToast.java | 6 +- .../contextualbar/ContextualBarRenderer.java | 48 + .../contextualbar/ExperienceBarRenderer.java | 40 + .../JumpableVehicleBarRenderer.java | 45 + .../gui/contextualbar/LocatorBarRenderer.java | 86 + .../client/gui/font/FontManager.java | 106 +- net/minecraft/client/gui/font/FontSet.java | 9 +- .../client/gui/font/FontTexture.java | 8 +- .../client/gui/font/GlyphRenderTypes.java | 10 +- .../client/gui/font/glyphs/BakedGlyph.java | 155 +- .../client/gui/font/glyphs/EmptyGlyph.java | 4 +- .../client/gui/font/glyphs/SpecialGlyphs.java | 2 +- .../gui/font/providers/BitmapProvider.java | 43 +- .../gui/font/providers/GlyphProviderType.java | 4 +- .../gui/font/providers/UnihexProvider.java | 42 +- .../client/gui/layouts/FrameLayout.java | 9 +- .../client/gui/layouts/LayoutSettings.java | 50 +- .../gui/navigation/ScreenRectangle.java | 37 +- .../client/gui/render/GuiRenderer.java | 715 ++++++ .../client/gui/render/TextureSetup.java | 37 + .../client/gui/render/package-info.java | 11 + .../render/pip/GuiBannerResultRenderer.java | 45 + .../gui/render/pip/GuiBookModelRenderer.java | 55 + .../gui/render/pip/GuiEntityRenderer.java | 52 + .../render/pip/GuiProfilerChartRenderer.java | 75 + .../gui/render/pip/GuiSignRenderer.java | 40 + .../gui/render/pip/GuiSkinRenderer.java | 46 + .../gui/render/pip/OversizedItemRenderer.java | 86 + .../render/pip/PictureInPictureRenderer.java | 142 ++ .../client/gui/render/pip/package-info.java | 11 + .../gui/render/state/BlitRenderState.java | 60 + .../state/ColoredRectangleRenderState.java | 54 + .../render/state/GlyphEffectRenderState.java | 40 + .../gui/render/state/GlyphRenderState.java | 39 + .../render/state/GuiElementRenderState.java | 21 + .../gui/render/state/GuiItemRenderState.java | 96 + .../gui/render/state/GuiRenderState.java | 338 +++ .../gui/render/state/GuiTextRenderState.java | 61 + .../client/gui/render/state/ScreenArea.java | 12 + .../client/gui/render/state/package-info.java | 11 + .../state/pip/GuiBannerResultRenderState.java | 33 + .../state/pip/GuiBookModelRenderState.java | 29 + .../state/pip/GuiEntityRenderState.java | 51 + .../pip/GuiProfilerChartRenderState.java | 22 + .../render/state/pip/GuiSignRenderState.java | 17 + .../render/state/pip/GuiSkinRenderState.java | 42 + .../state/pip/OversizedItemRenderState.java | 33 + .../pip/PictureInPictureRenderState.java | 36 + .../gui/render/state/pip/package-info.java | 11 + .../AccessibilityOnboardingScreen.java | 42 +- .../client/gui/screens/AlertScreen.java | 2 +- .../gui/screens/BackupConfirmScreen.java | 2 +- .../client/gui/screens/ChatScreen.java | 10 +- .../client/gui/screens/ConfirmLinkScreen.java | 35 +- .../client/gui/screens/ConfirmScreen.java | 79 +- .../client/gui/screens/ConnectScreen.java | 16 +- .../gui/screens/CreateBuffetWorldScreen.java | 48 +- .../gui/screens/CreateFlatWorldScreen.java | 85 +- .../client/gui/screens/DeathScreen.java | 26 +- .../client/gui/screens/DemoIntroScreen.java | 10 +- .../gui/screens/DirectJoinServerScreen.java | 4 +- .../client/gui/screens/EditServerScreen.java | 6 +- .../client/gui/screens/ErrorScreen.java | 4 +- .../gui/screens/GenericMessageScreen.java | 2 +- .../gui/screens/GenericWaitingScreen.java | 4 +- .../gui/screens/LevelLoadingScreen.java | 2 +- .../client/gui/screens/LoadingOverlay.java | 16 +- .../gui/screens/NoticeWithLinkScreen.java | 5 +- .../client/gui/screens/PauseScreen.java | 122 +- .../gui/screens/PresetFlatWorldScreen.java | 79 +- .../client/gui/screens/ProgressScreen.java | 4 +- .../gui/screens/ReceivingLevelScreen.java | 19 +- net/minecraft/client/gui/screens/Screen.java | 249 +- .../client/gui/screens/ShareToLanScreen.java | 13 +- .../client/gui/screens/TitleScreen.java | 75 +- .../client/gui/screens/WinScreen.java | 56 +- .../gui/screens/achievement/StatsScreen.java | 188 +- .../screens/advancements/AdvancementTab.java | 13 +- .../advancements/AdvancementTabType.java | 4 +- .../advancements/AdvancementWidget.java | 16 +- .../advancements/AdvancementsScreen.java | 31 +- .../screens/debug/GameModeSwitcherScreen.java | 55 +- .../dialog/ButtonListDialogScreen.java | 35 + .../dialog/DialogConnectionAccess.java | 26 + .../gui/screens/dialog/DialogControlSet.java | 62 + .../dialog/DialogListDialogScreen.java | 33 + .../gui/screens/dialog/DialogScreen.java | 254 ++ .../gui/screens/dialog/DialogScreens.java | 44 + .../dialog/MultiButtonDialogScreen.java | 20 + .../dialog/ServerLinksDialogScreen.java | 29 + .../screens/dialog/SimpleDialogScreen.java | 28 + .../dialog/WaitingForResponseScreen.java | 92 + .../dialog/body/DialogBodyHandler.java | 12 + .../dialog/body/DialogBodyHandlers.java | 112 + .../gui/screens/dialog/body/package-info.java | 11 + .../dialog/input/InputControlHandler.java | 20 + .../dialog/input/InputControlHandlers.java | 205 ++ .../screens/dialog/input/package-info.java | 11 + .../gui/screens/dialog/package-info.java | 11 + .../AbstractCommandBlockEditScreen.java | 6 +- .../inventory/AbstractContainerScreen.java | 103 +- .../inventory/AbstractFurnaceScreen.java | 8 +- .../inventory/AbstractRecipeBookScreen.java | 6 +- .../inventory/AbstractSignEditScreen.java | 29 +- .../gui/screens/inventory/AnvilScreen.java | 25 +- .../gui/screens/inventory/BeaconScreen.java | 24 +- .../gui/screens/inventory/BookEditScreen.java | 659 +---- .../gui/screens/inventory/BookSignScreen.java | 103 + .../gui/screens/inventory/BookViewScreen.java | 57 +- .../screens/inventory/BrewingStandScreen.java | 10 +- .../inventory/CartographyTableScreen.java | 41 +- .../screens/inventory/ContainerScreen.java | 6 +- .../gui/screens/inventory/CrafterScreen.java | 10 +- .../gui/screens/inventory/CraftingScreen.java | 4 +- .../CreativeModeInventoryScreen.java | 88 +- .../inventory/CyclingSlotBackground.java | 4 +- .../screens/inventory/DispenserScreen.java | 4 +- .../screens/inventory/EffectsInInventory.java | 49 +- .../screens/inventory/EnchantmentScreen.java | 72 +- .../screens/inventory/GrindstoneScreen.java | 6 +- .../inventory/HangingSignEditScreen.java | 13 +- .../gui/screens/inventory/HopperScreen.java | 4 +- .../inventory/HorseInventoryScreen.java | 8 +- .../screens/inventory/InventoryScreen.java | 46 +- .../screens/inventory/ItemCombinerScreen.java | 8 +- .../inventory/JigsawBlockEditScreen.java | 14 +- .../gui/screens/inventory/LecternScreen.java | 2 +- .../gui/screens/inventory/LoomScreen.java | 100 +- .../gui/screens/inventory/MerchantScreen.java | 47 +- .../gui/screens/inventory/PageButton.java | 10 +- .../screens/inventory/ShulkerBoxScreen.java | 4 +- .../gui/screens/inventory/SignEditScreen.java | 26 +- .../gui/screens/inventory/SmithingScreen.java | 22 +- .../screens/inventory/StonecutterScreen.java | 21 +- .../inventory/StructureBlockEditScreen.java | 24 +- .../inventory/TestBlockEditScreen.java | 6 +- .../TestInstanceBlockEditScreen.java | 11 +- .../tooltip/ClientBundleTooltip.java | 23 +- .../inventory/tooltip/ClientTextTooltip.java | 7 +- .../tooltip/ClientTooltipComponent.java | 4 +- .../inventory/tooltip/TooltipRenderUtil.java | 11 +- .../multiplayer/JoinMultiplayerScreen.java | 64 +- .../multiplayer/ServerLinksScreen.java | 107 - .../multiplayer/ServerSelectionList.java | 81 +- .../screens/options/LanguageSelectScreen.java | 77 +- .../gui/screens/options/OptionsScreen.java | 6 +- .../screens/options/SoundOptionsScreen.java | 9 +- .../UnsupportedGraphicsWarningScreen.java | 5 +- .../screens/options/VideoSettingsScreen.java | 9 +- .../options/controls/KeyBindsList.java | 15 +- .../options/controls/KeyBindsScreen.java | 3 +- .../screens/packs/PackSelectionScreen.java | 8 +- .../packs/TransferableSelectionList.java | 22 +- .../gui/screens/recipebook/GhostSlots.java | 5 +- .../recipebook/OverlayRecipeComponent.java | 58 +- .../recipebook/RecipeBookComponent.java | 9 +- .../screens/recipebook/RecipeBookPage.java | 3 +- .../recipebook/RecipeBookTabButton.java | 14 +- .../gui/screens/recipebook/RecipeButton.java | 16 +- .../reporting/AbstractReportScreen.java | 11 +- .../screens/reporting/ChatReportScreen.java | 9 +- .../reporting/ChatSelectionScreen.java | 287 ++- .../screens/reporting/NameReportScreen.java | 9 +- .../ReportReasonSelectionScreen.java | 56 +- .../screens/reporting/SkinReportScreen.java | 9 +- .../gui/screens/social/PlayerEntry.java | 14 +- .../social/SocialInteractionsPlayerList.java | 8 +- .../social/SocialInteractionsScreen.java | 20 +- .../telemetry/TelemetryEventWidget.java | 6 +- .../ConfirmExperimentalFeaturesScreen.java | 61 +- .../worldselection/CreateWorldScreen.java | 99 +- .../worldselection/EditGameRulesScreen.java | 60 +- .../worldselection/EditWorldScreen.java | 2 +- .../worldselection/ExperimentsScreen.java | 112 +- .../worldselection/OptimizeWorldScreen.java | 17 +- .../worldselection/SelectWorldScreen.java | 16 +- .../worldselection/WorldCreationContext.java | 3 +- .../worldselection/WorldOpenFlows.java | 5 +- .../worldselection/WorldSelectionList.java | 70 +- .../client/gui/spectator/SpectatorMenu.java | 10 +- .../TeleportToPlayerMenuCategory.java | 4 +- .../TeleportToTeamMenuCategory.java | 4 +- net/minecraft/client/main/GameConfig.java | 47 +- net/minecraft/client/main/Main.java | 54 +- .../client/model/AbstractBoatModel.java | 16 +- .../client/model/AbstractEquineModel.java | 32 +- .../client/model/AbstractPiglinModel.java | 14 +- net/minecraft/client/model/AllayModel.java | 26 +- .../client/model/ArmadilloModel.java | 27 +- .../client/model/ArmorStandArmorModel.java | 44 +- .../client/model/ArmorStandModel.java | 42 +- net/minecraft/client/model/ArrowModel.java | 8 +- net/minecraft/client/model/AxolotlModel.java | 22 +- net/minecraft/client/model/BatModel.java | 17 +- net/minecraft/client/model/BeeModel.java | 18 +- net/minecraft/client/model/BlazeModel.java | 20 +- net/minecraft/client/model/BreezeModel.java | 29 +- net/minecraft/client/model/CamelModel.java | 31 +- .../client/model/CamelSaddleModel.java | 6 +- net/minecraft/client/model/ChickenModel.java | 14 +- net/minecraft/client/model/CodModel.java | 8 +- net/minecraft/client/model/ColdPigModel.java | 4 +- net/minecraft/client/model/CreakingModel.java | 37 +- net/minecraft/client/model/CreeperModel.java | 12 +- net/minecraft/client/model/DolphinModel.java | 16 +- net/minecraft/client/model/DonkeyModel.java | 12 +- net/minecraft/client/model/DrownedModel.java | 4 +- net/minecraft/client/model/ElytraModel.java | 12 +- .../client/model/EndCrystalModel.java | 10 +- net/minecraft/client/model/EntityModel.java | 4 +- .../client/model/EquineSaddleModel.java | 16 +- .../client/model/EvokerFangsModel.java | 6 +- net/minecraft/client/model/FelineModel.java | 40 +- net/minecraft/client/model/FoxModel.java | 40 +- net/minecraft/client/model/FrogModel.java | 33 +- net/minecraft/client/model/GhastModel.java | 21 +- net/minecraft/client/model/GoatModel.java | 12 +- net/minecraft/client/model/GuardianModel.java | 24 +- .../client/model/HappyGhastHarnessModel.java | 51 + .../client/model/HappyGhastModel.java | 104 + net/minecraft/client/model/HoglinModel.java | 14 +- .../client/model/HumanoidArmorModel.java | 4 +- net/minecraft/client/model/HumanoidModel.java | 64 +- net/minecraft/client/model/IllagerModel.java | 32 +- .../client/model/IronGolemModel.java | 16 +- .../client/model/LavaSlimeModel.java | 6 +- net/minecraft/client/model/LlamaModel.java | 16 +- net/minecraft/client/model/Model.java | 36 +- net/minecraft/client/model/PandaModel.java | 64 +- net/minecraft/client/model/ParrotModel.java | 35 +- net/minecraft/client/model/PhantomModel.java | 6 +- net/minecraft/client/model/PigModel.java | 2 +- net/minecraft/client/model/PiglinModel.java | 32 +- net/minecraft/client/model/PlayerModel.java | 18 +- .../client/model/PolarBearModel.java | 10 +- .../client/model/QuadrupedModel.java | 35 +- net/minecraft/client/model/RabbitModel.java | 10 +- net/minecraft/client/model/RavagerModel.java | 20 +- net/minecraft/client/model/SalmonModel.java | 8 +- net/minecraft/client/model/SheepFurModel.java | 8 +- net/minecraft/client/model/SheepModel.java | 10 +- .../client/model/ShulkerBulletModel.java | 8 +- net/minecraft/client/model/ShulkerModel.java | 14 +- net/minecraft/client/model/SkeletonModel.java | 14 +- net/minecraft/client/model/SnifferModel.java | 45 +- .../client/model/SnowGolemModel.java | 10 +- net/minecraft/client/model/SpiderModel.java | 12 +- .../client/model/SpinAttackEffectModel.java | 12 +- net/minecraft/client/model/SquidModel.java | 6 +- net/minecraft/client/model/StriderModel.java | 26 +- net/minecraft/client/model/TadpoleModel.java | 8 +- .../client/model/TropicalFishModelA.java | 8 +- .../client/model/TropicalFishModelB.java | 8 +- net/minecraft/client/model/TurtleModel.java | 16 +- net/minecraft/client/model/VexModel.java | 16 +- net/minecraft/client/model/VillagerModel.java | 16 +- net/minecraft/client/model/WardenModel.java | 37 +- net/minecraft/client/model/WitchModel.java | 20 +- .../client/model/WitherBossModel.java | 14 +- net/minecraft/client/model/WolfModel.java | 33 +- .../client/model/ZombieVillagerModel.java | 12 +- .../client/model/dragon/EnderDragonModel.java | 26 +- .../client/model/geom/LayerDefinitions.java | 8 + .../client/model/geom/ModelLayers.java | 6 + .../client/model/geom/ModelPart.java | 50 +- .../client/model/geom/PartNames.java | 7 + .../model/geom/builders/PartDefinition.java | 8 +- .../AccountProfileKeyPairManager.java | 4 +- .../client/multiplayer/ClientChunkCache.java | 10 +- .../ClientCommonPacketListenerImpl.java | 119 +- ...ClientConfigurationPacketListenerImpl.java | 54 +- .../ClientHandshakePacketListenerImpl.java | 5 +- .../client/multiplayer/ClientLevel.java | 33 +- .../multiplayer/ClientPacketListener.java | 284 ++- .../multiplayer/ClientSuggestionProvider.java | 38 +- .../multiplayer/MultiPlayerGameMode.java | 30 +- .../client/multiplayer/PlayerInfo.java | 4 +- .../client/multiplayer/ServerData.java | 8 +- .../multiplayer/SessionSearchTrees.java | 5 +- .../client/multiplayer/chat/ChatListener.java | 26 +- .../multiplayer/chat/LoggedChatEvent.java | 6 +- .../multiplayer/chat/report/BanReason.java | 2 +- .../multiplayer/chat/report/ChatReport.java | 28 +- .../chat/report/ReportEnvironment.java | 22 +- .../chat/report/ReportingContext.java | 4 +- .../particle/BubbleColumnUpParticle.java | 10 +- .../client/particle/BubbleParticle.java | 10 +- .../client/particle/CritParticle.java | 18 +- .../client/particle/DripParticle.java | 4 +- .../particle/DustColorTransitionParticle.java | 6 +- .../client/particle/DustPlumeParticle.java | 4 +- .../particle/FallingLeavesParticle.java | 14 +- .../client/particle/FireflyParticle.java | 14 +- .../client/particle/FireworkParticles.java | 7 +- .../client/particle/FlameParticle.java | 8 +- .../particle/FlyStraightTowardsParticle.java | 6 +- .../particle/FlyTowardsPositionParticle.java | 16 +- .../client/particle/GlowParticle.java | 60 +- .../client/particle/GustParticle.java | 8 +- .../client/particle/GustSeedParticle.java | 4 +- .../client/particle/HeartParticle.java | 4 +- .../particle/HugeExplosionSeedParticle.java | 4 +- .../client/particle/LavaParticle.java | 4 +- .../particle/MobAppearanceParticle.java | 4 +- .../client/particle/NoRenderParticle.java | 8 +- .../client/particle/ParticleEngine.java | 225 +- .../client/particle/PortalParticle.java | 24 +- .../particle/ReversePortalParticle.java | 4 +- .../client/particle/ShriekParticle.java | 4 +- .../client/particle/SingleQuadParticle.java | 8 +- .../client/particle/SnowflakeParticle.java | 4 +- .../client/particle/SonicBoomParticle.java | 10 +- .../client/particle/SoulParticle.java | 4 +- .../client/particle/SpellParticle.java | 8 +- .../client/particle/SpitParticle.java | 4 +- .../client/particle/SquidInkParticle.java | 4 +- .../client/particle/SuspendedParticle.java | 14 +- .../particle/SuspendedTownParticle.java | 16 +- .../client/particle/TextureSheetParticle.java | 8 +- .../client/particle/TrailParticle.java | 6 +- .../TrialSpawnerDetectionParticle.java | 4 +- .../particle/VibrationSignalParticle.java | 8 +- .../particle/WaterCurrentDownParticle.java | 4 +- .../client/particle/WaterDropParticle.java | 8 +- .../client/particle/WhiteSmokeParticle.java | 4 +- .../client/player/AbstractClientPlayer.java | 6 +- net/minecraft/client/player/LocalPlayer.java | 72 +- .../ClientMetricsSamplersProvider.java | 4 +- net/minecraft/client/quickplay/QuickPlay.java | 76 +- .../CachedOrthoProjectionMatrixBuffer.java | 56 + ...chedPerspectiveProjectionMatrixBuffer.java | 56 + .../client/renderer/CloudRenderer.java | 370 ++- net/minecraft/client/renderer/CubeMap.java | 156 +- .../renderer/DimensionSpecialEffects.java | 23 +- .../renderer/DynamicUniformStorage.java | 127 + .../client/renderer/DynamicUniforms.java | 54 + .../client/renderer/FogParameters.java | 10 - .../client/renderer/FogRenderer.java | 354 --- .../client/renderer/GameRenderer.java | 283 ++- .../renderer/GlobalSettingsUniform.java | 35 + .../client/renderer/GpuWarnlistManager.java | 6 +- .../client/renderer/ItemBlockRenderTypes.java | 704 +++--- .../client/renderer/ItemInHandRenderer.java | 3 +- .../client/renderer/LevelEventHandler.java | 7 +- .../client/renderer/LevelRenderer.java | 318 ++- .../client/renderer/LightTexture.java | 73 +- .../client/renderer/MapRenderer.java | 18 +- .../client/renderer/MappableRingBuffer.java | 66 + .../client/renderer/OutlineBufferSource.java | 7 +- .../client/renderer/PanoramaRenderer.java | 23 +- .../PerspectiveProjectionMatrixBuffer.java | 37 + net/minecraft/client/renderer/PostChain.java | 139 +- .../client/renderer/PostChainConfig.java | 76 +- net/minecraft/client/renderer/PostPass.java | 160 +- .../client/renderer/RenderBuffers.java | 9 +- .../client/renderer/RenderPipelines.java | 186 +- .../client/renderer/RenderStateShard.java | 54 +- net/minecraft/client/renderer/RenderType.java | 389 ++- .../client/renderer/ScreenEffectRenderer.java | 109 +- .../renderer/SectionBufferBuilderPack.java | 19 +- .../renderer/SectionOcclusionGraph.java | 8 +- .../client/renderer/ShaderManager.java | 18 +- net/minecraft/client/renderer/Sheets.java | 3 +- .../client/renderer/SkyRenderer.java | 89 +- .../client/renderer/UniformValue.java | 192 ++ .../renderer/WeatherEffectRenderer.java | 12 +- .../client/renderer/WorldBorderRenderer.java | 54 +- .../renderer/block/ModelBlockRenderer.java | 22 +- .../renderer/block/model/BakedQuad.java | 3 + .../renderer/block/model/BlockElement.java | 4 +- .../renderer/block/model/BlockStateModel.java | 7 +- .../renderer/block/model/FaceBakery.java | 117 +- .../block/model/ItemModelGenerator.java | 3 +- .../renderer/block/model/TextureSlots.java | 25 +- .../model/multipart/CombinedCondition.java | 15 +- .../block/model/multipart/MultiPartModel.java | 22 +- .../blockentity/AbstractSignRenderer.java | 24 +- .../renderer/blockentity/BannerRenderer.java | 34 +- .../renderer/blockentity/BeaconRenderer.java | 5 +- .../renderer/blockentity/BedRenderer.java | 52 +- .../renderer/blockentity/BellRenderer.java | 13 +- .../BlockEntityRenderDispatcher.java | 3 +- .../blockentity/BlockEntityRenderer.java | 2 +- .../blockentity/BlockEntityRenderers.java | 3 +- .../BlockEntityWithBoundingBoxRenderer.java | 5 +- .../blockentity/BrightnessCombiner.java | 12 +- .../blockentity/BrushableBlockRenderer.java | 29 +- .../blockentity/CampfireRenderer.java | 25 +- .../renderer/blockentity/ChestRenderer.java | 10 +- .../renderer/blockentity/ConduitRenderer.java | 58 +- .../blockentity/DecoratedPotRenderer.java | 52 +- .../blockentity/EnchantTableRenderer.java | 43 +- .../blockentity/HangingSignRenderer.java | 10 +- .../renderer/blockentity/LecternRenderer.java | 17 +- .../blockentity/PistonHeadRenderer.java | 39 +- .../blockentity/ShulkerBoxRenderer.java | 41 +- .../renderer/blockentity/SignRenderer.java | 16 +- .../blockentity/SkullBlockRenderer.java | 35 +- .../renderer/blockentity/SpawnerRenderer.java | 15 +- .../blockentity/TestInstanceRenderer.java | 26 +- .../blockentity/TheEndGatewayRenderer.java | 3 +- .../blockentity/TheEndPortalRenderer.java | 7 +- .../blockentity/TrialSpawnerRenderer.java | 25 +- .../renderer/blockentity/VaultRenderer.java | 19 +- .../renderer/chunk/ChunkSectionLayer.java | 75 + .../chunk/ChunkSectionLayerGroup.java | 41 + .../renderer/chunk/ChunkSectionsToRender.java | 57 + .../chunk/CompileTaskDynamicQueue.java | 27 +- .../renderer/chunk/CompiledSectionMesh.java | 220 ++ .../renderer/chunk/RenderRegionCache.java | 74 +- ...nkRegion.java => RenderSectionRegion.java} | 38 +- .../client/renderer/chunk/SectionBuffers.java | 63 + .../renderer/chunk/SectionCompiler.java | 46 +- .../{RenderChunk.java => SectionCopy.java} | 46 +- .../client/renderer/chunk/SectionMesh.java | 42 + .../chunk/SectionRenderDispatcher.java | 590 ++--- .../chunk/TranslucencyPointOfView.java | 44 + .../renderer/debug/BeeDebugRenderer.java | 39 +- .../renderer/debug/BrainDebugRenderer.java | 22 +- .../renderer/debug/BreezeDebugRenderer.java | 12 +- .../debug/ChunkCullingDebugRenderer.java | 4 +- .../client/renderer/debug/DebugRenderer.java | 10 +- .../debug/GameEventListenerRenderer.java | 3 +- .../debug/GoalSelectorDebugRenderer.java | 8 +- .../renderer/debug/LightDebugRenderer.java | 2 +- .../debug/LightSectionDebugRenderer.java | 8 +- .../renderer/debug/PathfindingRenderer.java | 3 +- .../RedstoneWireOrientationsRenderer.java | 3 +- .../renderer/debug/StructureRenderer.java | 15 +- .../renderer/entity/AbstractBoatRenderer.java | 45 +- .../entity/AbstractHoglinRenderer.java | 6 +- .../entity/AbstractHorseRenderer.java | 19 +- .../entity/AbstractMinecartRenderer.java | 81 +- .../entity/AbstractSkeletonRenderer.java | 18 +- .../entity/AbstractZombieRenderer.java | 14 +- .../renderer/entity/AgeableMobRenderer.java | 6 +- .../renderer/entity/ArmorStandRenderer.java | 65 +- .../client/renderer/entity/ArrowRenderer.java | 27 +- .../renderer/entity/AxolotlRenderer.java | 5 +- .../client/renderer/entity/BoatRenderer.java | 6 +- .../renderer/entity/BreezeRenderer.java | 22 +- .../client/renderer/entity/CamelRenderer.java | 3 +- .../client/renderer/entity/CatRenderer.java | 3 +- .../renderer/entity/ChickenRenderer.java | 27 +- .../client/renderer/entity/CodRenderer.java | 3 +- .../client/renderer/entity/CowRenderer.java | 23 +- .../renderer/entity/DisplayRenderer.java | 162 +- .../renderer/entity/DonkeyRenderer.java | 11 +- .../entity/DragonFireballRenderer.java | 3 +- .../renderer/entity/DrownedRenderer.java | 13 +- .../entity/ElderGuardianRenderer.java | 5 +- .../renderer/entity/EndCrystalRenderer.java | 33 +- .../renderer/entity/EnderDragonRenderer.java | 112 +- .../entity/EntityRenderDispatcher.java | 15 +- .../renderer/entity/EntityRenderer.java | 181 +- .../renderer/entity/EntityRenderers.java | 16 +- .../renderer/entity/EvokerFangsRenderer.java | 3 +- .../renderer/entity/EvokerRenderer.java | 3 +- .../entity/ExperienceOrbRenderer.java | 51 +- .../renderer/entity/FallingBlockRenderer.java | 3 +- .../entity/FireworkEntityRenderer.java | 3 +- .../renderer/entity/FishingHookRenderer.java | 55 +- .../client/renderer/entity/FoxRenderer.java | 3 +- .../client/renderer/entity/FrogRenderer.java | 3 +- .../renderer/entity/GiantMobRenderer.java | 8 +- .../renderer/entity/GlowSquidRenderer.java | 5 +- .../renderer/entity/GuardianRenderer.java | 58 +- .../renderer/entity/HappyGhastRenderer.java | 58 + .../client/renderer/entity/HorseRenderer.java | 3 +- .../renderer/entity/HumanoidMobRenderer.java | 10 +- .../client/renderer/entity/HuskRenderer.java | 2 +- .../renderer/entity/IllagerRenderer.java | 22 +- .../renderer/entity/IllusionerRenderer.java | 3 +- .../renderer/entity/IronGolemRenderer.java | 3 +- .../renderer/entity/ItemEntityRenderer.java | 35 +- .../renderer/entity/ItemFrameRenderer.java | 81 +- .../client/renderer/entity/ItemRenderer.java | 25 +- .../renderer/entity/LeashKnotRenderer.java | 3 +- .../entity/LightningBoltRenderer.java | 83 +- .../renderer/entity/LivingEntityRenderer.java | 167 +- .../client/renderer/entity/LlamaRenderer.java | 16 +- .../renderer/entity/LlamaSpitRenderer.java | 3 +- .../renderer/entity/MagmaCubeRenderer.java | 20 +- .../renderer/entity/MinecartRenderer.java | 3 +- .../client/renderer/entity/MobRenderer.java | 7 +- .../renderer/entity/MushroomCowRenderer.java | 10 +- .../client/renderer/entity/NoopRenderer.java | 3 +- .../entity/OminousItemSpawnerRenderer.java | 3 +- .../renderer/entity/PaintingRenderer.java | 57 +- .../client/renderer/entity/PandaRenderer.java | 123 +- .../renderer/entity/ParrotRenderer.java | 18 +- .../renderer/entity/PhantomRenderer.java | 3 +- .../client/renderer/entity/PigRenderer.java | 25 +- .../renderer/entity/PiglinRenderer.java | 20 +- .../client/renderer/entity/RaftRenderer.java | 3 +- .../renderer/entity/SalmonRenderer.java | 3 +- .../client/renderer/entity/SheepRenderer.java | 3 +- .../entity/ShulkerBulletRenderer.java | 27 +- .../renderer/entity/ShulkerRenderer.java | 33 +- .../entity/SpectralArrowRenderer.java | 3 +- .../renderer/entity/SpiderRenderer.java | 4 +- .../client/renderer/entity/SquidRenderer.java | 27 +- .../renderer/entity/StriderRenderer.java | 3 +- .../renderer/entity/ThrownItemRenderer.java | 17 +- .../entity/ThrownTridentRenderer.java | 3 +- .../entity/TippableArrowRenderer.java | 3 +- .../renderer/entity/TntMinecartRenderer.java | 15 +- .../client/renderer/entity/TntRenderer.java | 3 +- .../renderer/entity/TropicalFishRenderer.java | 37 +- .../renderer/entity/UndeadHorseRenderer.java | 5 +- .../client/renderer/entity/VexRenderer.java | 12 +- .../renderer/entity/VindicatorRenderer.java | 3 +- .../renderer/entity/WardenRenderer.java | 22 +- .../renderer/entity/WindChargeRenderer.java | 3 +- .../renderer/entity/WitherBossRenderer.java | 24 +- .../renderer/entity/WitherSkullRenderer.java | 23 +- .../client/renderer/entity/WolfRenderer.java | 3 +- .../entity/ZombifiedPiglinRenderer.java | 11 +- .../renderer/entity/layers/ArrowLayer.java | 4 +- .../entity/layers/BeeStingerLayer.java | 4 +- .../entity/layers/BreezeWindLayer.java | 8 +- .../renderer/entity/layers/CapeLayer.java | 16 +- .../entity/layers/CarriedBlockLayer.java | 8 +- .../entity/layers/CatCollarLayer.java | 10 +- .../entity/layers/CreeperPowerLayer.java | 4 +- .../entity/layers/CrossedArmsItemLayer.java | 12 +- .../entity/layers/CustomHeadLayer.java | 14 +- .../entity/layers/Deadmau5EarsLayer.java | 12 +- .../entity/layers/DrownedOuterLayer.java | 6 +- .../entity/layers/EnergySwirlLayer.java | 4 +- .../entity/layers/HumanoidArmorLayer.java | 10 +- .../layers/IronGolemCrackinessLayer.java | 14 +- .../entity/layers/IronGolemFlowerLayer.java | 8 +- .../entity/layers/ItemInHandLayer.java | 10 +- .../layers/LivingEntityEmissiveLayer.java | 14 +- .../entity/layers/LlamaDecorLayer.java | 10 +- .../layers/MushroomCowMushroomLayer.java | 18 +- .../entity/layers/ParrotOnShoulderLayer.java | 10 +- .../entity/layers/PlayerItemInHandLayer.java | 17 +- .../renderer/entity/layers/RopesLayer.java | 37 + .../entity/layers/SheepWoolLayer.java | 18 +- .../layers/SheepWoolUndercoatLayer.java | 10 +- .../entity/layers/SimpleEquipmentLayer.java | 10 +- .../entity/layers/SkeletonClothingLayer.java | 4 +- .../entity/layers/SlimeOuterLayer.java | 14 +- .../entity/layers/SnowGolemHeadLayer.java | 18 +- .../entity/layers/SpinAttackEffectLayer.java | 10 +- .../entity/layers/StuckInBodyLayer.java | 28 +- .../layers/TropicalFishPatternLayer.java | 8 +- .../layers/VillagerProfessionLayer.java | 14 +- .../renderer/entity/layers/WingsLayer.java | 14 +- .../entity/layers/WitherArmorLayer.java | 4 +- .../entity/layers/WolfArmorLayer.java | 31 +- .../entity/player/PlayerRenderer.java | 162 +- .../entity/state/ArmedEntityRenderState.java | 6 +- .../state/BlockDisplayEntityRenderState.java | 4 +- .../entity/state/EnderDragonRenderState.java | 5 +- .../entity/state/EntityRenderState.java | 4 +- .../entity/state/HappyGhastRenderState.java | 12 + .../entity/state/IronGolemRenderState.java | 4 +- .../entity/state/SheepRenderState.java | 19 +- .../state/TextDisplayEntityRenderState.java | 7 +- .../client/renderer/fog/FogData.java | 14 + .../client/renderer/fog/FogRenderer.java | 235 ++ .../environment/AirBasedFogEnvironment.java | 69 + .../AtmosphericFogEnvironment.java | 42 + .../environment/BlindnessFogEnvironment.java | 51 + .../environment/DarknessFogEnvironment.java | 43 + .../DimensionOrBossFogEnvironment.java | 27 + .../fog/environment/FogEnvironment.java | 39 + .../fog/environment/LavaFogEnvironment.java | 46 + .../environment/MobEffectFogEnvironment.java | 30 + .../PowderedSnowFogEnvironment.java | 41 + .../fog/environment/WaterFogEnvironment.java | 72 + .../client/renderer/fog/package-info.java | 11 + .../renderer/item/BlockModelWrapper.java | 24 +- .../BundleSelectedItemSpecialRenderer.java | 1 + .../client/renderer/item/ClientItem.java | 9 +- .../client/renderer/item/CompositeModel.java | 1 + .../renderer/item/ConditionalItemModel.java | 1 + .../client/renderer/item/EmptyModel.java | 1 + .../renderer/item/ItemModelResolver.java | 16 +- .../renderer/item/ItemStackRenderState.java | 49 + .../renderer/item/MissingItemModel.java | 1 + .../renderer/item/RangeSelectItemModel.java | 1 + .../client/renderer/item/SelectItemModel.java | 1 + .../renderer/item/SpecialModelWrapper.java | 31 +- .../properties/numeric/CompassAngleState.java | 39 +- .../item/properties/numeric/Time.java | 24 +- .../item/properties/select/LocalTime.java | 2 +- .../special/BannerSpecialRenderer.java | 25 +- .../renderer/special/BedSpecialRenderer.java | 9 +- .../special/ChestSpecialRenderer.java | 11 +- .../special/ConduitSpecialRenderer.java | 9 + .../special/DecoratedPotSpecialRenderer.java | 26 +- .../special/HangingSignSpecialRenderer.java | 12 +- .../special/NoDataSpecialModelRenderer.java | 12 +- .../special/PlayerHeadSpecialRenderer.java | 121 + .../special/ShieldSpecialRenderer.java | 51 +- .../special/ShulkerBoxSpecialRenderer.java | 10 +- .../special/SkullSpecialRenderer.java | 57 +- .../special/SpecialModelRenderer.java | 4 + .../special/SpecialModelRenderers.java | 31 +- .../special/StandingSignSpecialRenderer.java | 11 +- .../special/TridentSpecialRenderer.java | 9 + .../renderer/texture/AbstractTexture.java | 30 +- .../renderer/texture/CubeMapTexture.java | 107 + .../renderer/texture/DynamicTexture.java | 22 +- .../renderer/texture/OverlayTexture.java | 3 +- .../renderer/texture/ReloadableTexture.java | 6 +- .../texture/SkinTextureDownloader.java | 3 +- .../renderer/texture/SpriteContents.java | 5 +- .../client/renderer/texture/SpriteLoader.java | 4 +- .../client/renderer/texture/TextureAtlas.java | 12 +- .../renderer/texture/TextureAtlasSprite.java | 7 + .../texture/atlas/SpriteSourceList.java | 4 +- .../atlas/sources/PalettedPermutations.java | 4 +- .../client/resources/ClientPackSource.java | 10 +- .../client/resources/DefaultPlayerSkin.java | 39 +- .../DryFoliageColorReloadListener.java | 7 +- .../resources/MobEffectTextureManager.java | 23 - .../client/resources/SkinManager.java | 12 +- .../client/resources/TextureAtlasHolder.java | 4 +- .../client/resources/WaypointStyle.java | 48 + .../resources/WaypointStyleManager.java | 38 + ...tion.java => VillagerMetadataSection.java} | 0 .../metadata/gui/GuiSpriteScaling.java | 33 +- .../client/resources/model/AtlasIds.java | 1 - .../client/resources/model/AtlasSet.java | 4 +- .../model/BlockStateDefinitions.java | 3 +- .../model/BlockStateModelLoader.java | 4 +- .../resources/model/ClientItemInfoLoader.java | 8 +- .../model/EquipmentAssetManager.java | 4 +- .../resources/model/EquipmentClientInfo.java | 3 +- .../resources/model/MissingBlockModel.java | 4 +- .../client/resources/model/ModelBakery.java | 18 +- .../server/DownloadedPackSource.java | 68 +- .../sounds/AbstractSoundInstance.java | 9 +- .../sounds/RidingHappyGhastSoundInstance.java | 45 + .../sounds/RidingMinecartSoundInstance.java | 3 +- .../resources/sounds/SimpleSoundInstance.java | 19 +- .../resources/sounds/SoundInstance.java | 1 + .../client/server/IntegratedPlayerList.java | 11 +- .../client/server/IntegratedServer.java | 2 +- net/minecraft/client/sounds/MusicInfo.java | 2 +- net/minecraft/client/sounds/MusicManager.java | 100 +- net/minecraft/client/sounds/SoundEngine.java | 287 +-- net/minecraft/client/sounds/SoundManager.java | 74 +- .../telemetry/ClientTelemetryManager.java | 2 +- .../client/telemetry/TelemetryLogManager.java | 3 +- .../client/telemetry/TelemetryProperty.java | 23 +- .../FindTreeTutorialStepInstance.java | 3 +- .../waypoints/ClientWaypointManager.java | 42 + .../commands/CommandSourceStack.java | 50 +- net/minecraft/commands/Commands.java | 108 +- .../commands/ExecutionCommandSource.java | 4 +- net/minecraft/commands/PermissionSource.java | 17 + .../commands/SharedSuggestionProvider.java | 25 +- .../commands/arguments/EntityArgument.java | 46 +- .../arguments/GameProfileArgument.java | 4 +- .../commands/arguments/HexColorArgument.java | 59 + .../commands/arguments/ParticleArgument.java | 5 +- .../commands/arguments/ResourceArgument.java | 63 +- .../arguments/ResourceKeyArgument.java | 51 +- .../arguments/ResourceOrIdArgument.java | 143 +- .../arguments/ResourceOrTagArgument.java | 53 +- .../arguments/ResourceOrTagKeyArgument.java | 38 +- .../arguments/ResourceSelectorArgument.java | 58 +- .../arguments/ScoreHolderArgument.java | 42 +- .../commands/arguments/TimeArgument.java | 38 +- .../commands/arguments/WaypointArgument.java | 23 + .../commands/arguments/blocks/BlockInput.java | 29 +- .../arguments/blocks/BlockStateParser.java | 3 +- .../arguments/item/ItemPredicateArgument.java | 61 +- .../arguments/selector/EntitySelector.java | 2 +- .../selector/EntitySelectorParser.java | 4 +- .../options/EntitySelectorOptions.java | 26 +- .../execution/CustomCommandExecutor.java | 8 +- .../execution/CustomModifierExecutor.java | 2 +- .../execution/tasks/CallFunction.java | 9 +- .../execution/tasks/ExecuteCommand.java | 6 +- .../commands/functions/FunctionBuilder.java | 8 +- .../commands/functions/StringTemplate.java | 30 +- .../synchronization/ArgumentTypeInfos.java | 25 +- .../synchronization/ArgumentUtils.java | 69 +- .../SingletonArgumentInfo.java | 10 +- .../synchronization/SuggestionProviders.java | 54 +- .../brigadier/DoubleArgumentInfo.java | 30 +- .../brigadier/FloatArgumentInfo.java | 30 +- .../brigadier/IntegerArgumentInfo.java | 30 +- .../brigadier/LongArgumentInfo.java | 30 +- .../brigadier/StringArgumentSerializer.java | 20 +- net/minecraft/core/BlockPos.java | 102 +- .../core/DefaultedMappedRegistry.java | 11 +- net/minecraft/core/Direction.java | 84 +- net/minecraft/core/Holder.java | 16 +- net/minecraft/core/HolderGetter.java | 20 +- net/minecraft/core/HolderLookup.java | 76 +- net/minecraft/core/MappedRegistry.java | 179 +- net/minecraft/core/Registry.java | 48 +- net/minecraft/core/RegistryAccess.java | 4 +- net/minecraft/core/RegistrySetBuilder.java | 99 +- net/minecraft/core/Rotations.java | 5 + net/minecraft/core/SectionPos.java | 8 +- net/minecraft/core/WritableRegistry.java | 3 +- .../core/cauldron/CauldronInteraction.java | 6 +- .../DataComponentExactPredicate.java | 4 +- .../core/component/DataComponentMap.java | 37 +- .../core/component/DataComponentPatch.java | 44 +- .../core/component/DataComponents.java | 5 +- .../component/PatchedDataComponentMap.java | 4 +- .../core/component/TypedDataComponent.java | 10 +- .../predicates/EnchantmentsPredicate.java | 4 +- .../predicates/PotionsPredicate.java | 4 +- .../dispenser/ProjectileDispenseBehavior.java | 3 +- .../dispenser/ShearsDispenseItemBehavior.java | 14 +- .../core/particles/ParticleType.java | 4 +- .../core/particles/ParticleTypes.java | 4 +- .../core/registries/BuiltInRegistries.java | 32 +- net/minecraft/core/registries/Registries.java | 29 +- net/minecraft/data/BlockFamilies.java | 5 +- net/minecraft/data/DataGenerator.java | 2 +- net/minecraft/data/DataProvider.java | 4 +- net/minecraft/data/HashCache.java | 2 +- net/minecraft/data/Main.java | 16 +- .../advancements/AdvancementProvider.java | 6 +- .../packs/VanillaAdventureAdvancements.java | 416 +-- .../packs/VanillaHusbandryAdvancements.java | 143 +- .../packs/VanillaNetherAdvancements.java | 111 +- .../packs/VanillaStoryAdvancements.java | 36 +- .../packs/VanillaTheEndAdvancements.java | 34 +- .../data/info/BiomeParametersDumpReport.java | 10 +- net/minecraft/data/info/BlockListReport.java | 6 +- net/minecraft/data/info/CommandsReport.java | 19 +- .../data/info/DatapackStructureReport.java | 3 +- net/minecraft/data/info/ItemListReport.java | 6 +- net/minecraft/data/info/PacketReport.java | 3 +- .../data/loot/BlockLootSubProvider.java | 123 +- .../data/loot/EntityLootSubProvider.java | 22 +- .../data/loot/LootTableProvider.java | 44 +- .../data/loot/packs/VanillaBlockLoot.java | 125 +- .../data/loot/packs/VanillaChestLoot.java | 42 +- .../data/loot/packs/VanillaEntityLoot.java | 19 +- .../data/loot/packs/VanillaEquipmentLoot.java | 20 +- .../loot/packs/VanillaPiglinBarterLoot.java | 1 + .../data/metadata/PackMetadataGenerator.java | 2 +- net/minecraft/data/recipes/RecipeOutput.java | 4 +- .../data/recipes/RecipeProvider.java | 197 +- .../data/recipes/ShapedRecipeBuilder.java | 19 +- .../data/recipes/ShapelessRecipeBuilder.java | 19 +- .../recipes/SimpleCookingRecipeBuilder.java | 19 +- .../data/recipes/SingleItemRecipeBuilder.java | 19 +- .../SmithingTransformRecipeBuilder.java | 4 +- .../recipes/SmithingTrimRecipeBuilder.java | 4 +- .../data/recipes/TransmuteRecipeBuilder.java | 12 +- .../recipes/packs/VanillaRecipeProvider.java | 63 +- .../RegistriesDatapackGenerator.java | 8 +- .../registries/RegistryPatchGenerator.java | 4 +- .../data/registries/VanillaRegistries.java | 11 +- .../data/structures/StructureUpdater.java | 9 +- .../data/tags/BannerPatternTagsProvider.java | 2 +- .../data/tags/BiomeTagsProvider.java | 18 +- .../data/tags/BlockItemTagsProvider.java | 585 +++++ .../data/tags/DamageTypeTagsProvider.java | 2 +- .../data/tags/DialogTagsProvider.java | 20 + .../data/tags/EnchantmentTagsProvider.java | 2 +- .../data/tags/EntityTypeTagsProvider.java | 31 + .../FlatLevelGeneratorPresetTagsProvider.java | 2 +- .../data/tags/FluidTagsProvider.java | 6 +- .../data/tags/GameEventTagsProvider.java | 2 +- .../data/tags/InstrumentTagsProvider.java | 2 +- .../tags/IntrinsicHolderTagsProvider.java | 41 +- net/minecraft/data/tags/ItemTagsProvider.java | 55 - net/minecraft/data/tags/KeyTagProvider.java | 20 + .../tags/PaintingVariantTagsProvider.java | 2 +- .../data/tags/PoiTypeTagsProvider.java | 2 +- .../data/tags/StructureTagsProvider.java | 2 +- net/minecraft/data/tags/TagAppender.java | 88 + net/minecraft/data/tags/TagsProvider.java | 67 +- ...TradeRebalanceEnchantmentTagsProvider.java | 2 +- .../data/tags/VanillaBlockTagsProvider.java | 585 +---- .../data/tags/VanillaItemTagsProvider.java | 145 +- .../data/tags/WorldPresetTagsProvider.java | 2 +- .../data/worldgen/BiomeDefaultFeatures.java | 160 +- .../data/worldgen/DimensionTypes.java | 5 + net/minecraft/data/worldgen/Structures.java | 88 +- .../data/worldgen/TerrainProvider.java | 9 +- .../data/worldgen/biome/NetherBiomes.java | 12 +- .../data/worldgen/biome/OverworldBiomes.java | 90 +- .../features/MiscOverworldFeatures.java | 7 +- .../data/worldgen/features/TreeFeatures.java | 54 +- .../worldgen/features/VegetationFeatures.java | 17 +- .../framework/BlockBasedTestInstance.java | 4 +- .../gametest/framework/FailedTestTracker.java | 8 +- .../framework/FunctionGameTestInstance.java | 3 +- .../framework/GameTestBatchFactory.java | 5 +- .../gametest/framework/GameTestException.java | 4 +- .../gametest/framework/GameTestHelper.java | 8 +- .../gametest/framework/GameTestInfo.java | 40 +- .../gametest/framework/GameTestMainUtil.java | 8 +- .../gametest/framework/GameTestRunner.java | 3 +- .../gametest/framework/GameTestServer.java | 21 +- .../gametest/framework/GameTestTicker.java | 7 +- .../framework/StructureGridSpawner.java | 35 +- .../gametest/framework/StructureUtils.java | 13 +- .../gametest/framework/TestCommand.java | 21 +- .../framework/TestEnvironmentDefinition.java | 89 +- .../gametest/framework/TestFinder.java | 11 +- .../framework/TestInstanceFinder.java | 4 +- .../locale/DeprecatedTranslationsInfo.java | 4 +- net/minecraft/nbt/ByteArrayTag.java | 10 +- net/minecraft/nbt/ByteTag.java | 7 +- net/minecraft/nbt/CompoundTag.java | 11 +- net/minecraft/nbt/DoubleTag.java | 7 +- net/minecraft/nbt/EndTag.java | 3 + net/minecraft/nbt/FloatTag.java | 7 +- net/minecraft/nbt/IntArrayTag.java | 15 +- net/minecraft/nbt/IntTag.java | 7 +- net/minecraft/nbt/ListTag.java | 24 +- net/minecraft/nbt/LongArrayTag.java | 13 +- net/minecraft/nbt/LongTag.java | 7 +- net/minecraft/nbt/NbtAccounter.java | 4 +- net/minecraft/nbt/NbtUtils.java | 12 +- net/minecraft/nbt/ShortTag.java | 7 +- net/minecraft/nbt/SnbtGrammar.java | 83 +- net/minecraft/nbt/StringTag.java | 35 +- net/minecraft/network/Connection.java | 46 +- net/minecraft/network/FriendlyByteBuf.java | 29 +- net/minecraft/network/HiddenByteBuf.java | 8 +- net/minecraft/network/PacketSendListener.java | 47 +- net/minecraft/network/ProtocolInfo.java | 9 +- .../network/chat/ChatTypeDecoration.java | 21 +- net/minecraft/network/chat/ClickEvent.java | 38 +- .../network/chat/CommonComponents.java | 5 + net/minecraft/network/chat/Component.java | 78 +- .../network/chat/ComponentContents.java | 6 +- .../network/chat/LastSeenMessages.java | 4 +- .../network/chat/PlayerChatMessage.java | 4 +- .../chat/contents/SelectorContents.java | 7 +- .../chat/numbers/NumberFormatTypes.java | 8 +- .../network/codec/ByteBufCodecs.java | 107 +- .../network/codec/IdDispatchCodec.java | 20 +- net/minecraft/network/codec/StreamCodec.java | 60 + .../network/protocol/ProtocolInfoBuilder.java | 3 +- .../common/ClientCommonPacketListener.java | 4 + .../common/ClientboundClearDialogPacket.java | 23 + .../ClientboundCustomPayloadPacket.java | 7 +- .../common/ClientboundDisconnectPacket.java | 7 +- .../common/ClientboundKeepAlivePacket.java | 7 +- .../common/ClientboundPingPacket.java | 7 +- .../ClientboundResourcePackPopPacket.java | 7 +- .../ClientboundResourcePackPushPacket.java | 7 +- .../common/ClientboundShowDialogPacket.java | 27 + .../common/ClientboundStoreCookiePacket.java | 7 +- .../common/ClientboundTransferPacket.java | 7 +- .../common/ClientboundUpdateTagsPacket.java | 17 +- .../protocol/common/CommonPacketTypes.java | 3 + .../common/ServerCommonPacketListener.java | 2 + .../ServerboundClientInformationPacket.java | 7 +- .../ServerboundCustomClickActionPacket.java | 32 + .../common/ServerboundKeepAlivePacket.java | 7 +- .../common/ServerboundPongPacket.java | 7 +- .../common/ServerboundResourcePackPacket.java | 7 +- .../common/custom/CustomPacketPayload.java | 10 +- ...lientboundUpdateEnabledFeaturesPacket.java | 7 +- .../configuration/ConfigurationProtocols.java | 6 + .../ClientboundCookieRequestPacket.java | 7 +- .../ServerboundCookieResponsePacket.java | 7 +- .../game/ClientGamePacketListener.java | 4 +- .../ClientboundBlockChangedAckPacket.java | 7 +- .../ClientboundChangeDifficultyPacket.java | 41 +- .../ClientboundChunkBatchFinishedPacket.java | 7 +- .../game/ClientboundChunksBiomesPacket.java | 11 +- .../game/ClientboundClearTitlesPacket.java | 7 +- .../game/ClientboundCommandsPacket.java | 192 +- ...lientboundCustomChatCompletionsPacket.java | 7 +- .../game/ClientboundDamageEventPacket.java | 7 +- .../game/ClientboundDebugSamplePacket.java | 7 +- .../game/ClientboundDeleteChatPacket.java | 15 +- .../ClientboundEntityPositionSyncPacket.java | 7 +- .../game/ClientboundHurtAnimationPacket.java | 7 +- .../ClientboundInitializeBorderPacket.java | 7 +- .../game/ClientboundLevelChunkPacketData.java | 4 + .../ClientboundLevelChunkWithLightPacket.java | 7 +- .../protocol/game/ClientboundLoginPacket.java | 3 + .../game/ClientboundMoveMinecartPacket.java | 7 +- .../game/ClientboundPlayerChatPacket.java | 21 +- .../ClientboundPlayerCombatEndPacket.java | 7 +- .../ClientboundPlayerCombatKillPacket.java | 7 +- .../ClientboundPlayerInfoRemovePacket.java | 7 +- .../ClientboundPlayerInfoUpdatePacket.java | 32 +- .../ClientboundProjectilePowerPacket.java | 7 +- .../game/ClientboundRecipeBookAddPacket.java | 7 +- .../game/ClientboundRemoveEntitiesPacket.java | 7 +- .../game/ClientboundResetScorePacket.java | 7 +- .../game/ClientboundServerDataPacket.java | 7 +- .../ClientboundSetActionBarTextPacket.java | 7 +- .../ClientboundSetBorderCenterPacket.java | 7 +- .../ClientboundSetBorderLerpSizePacket.java | 7 +- .../game/ClientboundSetBorderSizePacket.java | 7 +- ...lientboundSetBorderWarningDelayPacket.java | 7 +- ...ntboundSetBorderWarningDistancePacket.java | 7 +- .../game/ClientboundSetHeldSlotPacket.java | 7 +- ...lientboundSetSimulationDistancePacket.java | 7 +- .../ClientboundSetSubtitleTextPacket.java | 7 +- .../game/ClientboundSetTitleTextPacket.java | 7 +- .../ClientboundSetTitlesAnimationPacket.java | 7 +- .../game/ClientboundTickingStatePacket.java | 7 +- .../game/ClientboundTickingStepPacket.java | 7 +- .../ClientboundTrackedWaypointPacket.java | 89 + .../protocol/game/GamePacketTypes.java | 2 + .../network/protocol/game/GameProtocols.java | 8 + .../game/ServerGamePacketListener.java | 2 + .../ServerboundBlockEntityTagQueryPacket.java | 7 +- .../ServerboundChangeDifficultyPacket.java | 28 +- .../game/ServerboundChangeGameModePacket.java | 22 + .../game/ServerboundChatAckPacket.java | 7 +- .../game/ServerboundChatCommandPacket.java | 7 +- .../ServerboundChatCommandSignedPacket.java | 16 +- .../ServerboundChatSessionUpdatePacket.java | 15 +- .../ServerboundChunkBatchReceivedPacket.java | 7 +- .../game/ServerboundContainerClickPacket.java | 12 + ...rboundContainerSlotStateChangedPacket.java | 7 +- ...verboundDebugSampleSubscriptionPacket.java | 7 +- .../game/ServerboundEntityTagQueryPacket.java | 7 +- .../game/ServerboundMovePlayerPacket.java | 4 +- .../game/ServerboundPlayerCommandPacket.java | 2 - .../ServerboundSelectBundleItemPacket.java | 7 +- ...verboundTestInstanceBlockActionPacket.java | 10 +- .../ClientboundLoginDisconnectPacket.java | 36 +- .../ServerboundCustomQueryAnswerPacket.java | 7 +- .../ping/ClientboundPongResponsePacket.java | 7 +- .../ping/ServerboundPingRequestPacket.java | 7 +- .../ClientboundStatusResponsePacket.java | 25 +- .../network/protocol/status/ServerStatus.java | 2 +- .../realms/DisconnectedRealmsScreen.java | 54 - net/minecraft/realms/RealmsConnect.java | 16 +- net/minecraft/realms/RealmsScreen.java | 25 +- net/minecraft/realms/RepeatedNarrator.java | 2 +- .../resources/FileToIdConverter.java | 4 +- net/minecraft/resources/HolderSetCodec.java | 5 +- .../resources/RegistryDataLoader.java | 38 +- net/minecraft/resources/RegistryOps.java | 6 +- net/minecraft/resources/ResourceLocation.java | 4 +- .../server/DebugLoggedPrintStream.java | 4 +- net/minecraft/server/Main.java | 23 +- net/minecraft/server/MinecraftServer.java | 100 +- net/minecraft/server/PlayerAdvancements.java | 30 +- .../server/ReloadableServerRegistries.java | 41 +- .../server/ReloadableServerResources.java | 5 +- .../server/ServerAdvancementManager.java | 14 +- .../server/ServerFunctionLibrary.java | 5 +- net/minecraft/server/ServerScoreboard.java | 27 +- .../server/commands/AdvancementCommands.java | 45 +- .../server/commands/AttributeCommand.java | 13 +- .../server/commands/BanIpCommands.java | 2 +- .../server/commands/BanListCommands.java | 2 +- .../server/commands/BanPlayerCommands.java | 2 +- .../server/commands/BossBarCommands.java | 2 +- .../commands/ClearInventoryCommands.java | 2 +- .../server/commands/CloneCommands.java | 109 +- .../server/commands/DamageCommand.java | 2 +- .../server/commands/DataPackCommand.java | 132 +- .../server/commands/DeOpCommands.java | 2 +- .../server/commands/DebugCommand.java | 35 +- .../server/commands/DebugConfigCommand.java | 61 +- .../commands/DebugMobSpawningCommand.java | 3 +- .../server/commands/DebugPathCommand.java | 2 +- .../commands/DefaultGameModeCommands.java | 2 +- .../server/commands/DialogCommand.java | 74 + .../server/commands/DifficultyCommand.java | 2 +- .../server/commands/EffectCommands.java | 2 +- .../server/commands/EnchantCommand.java | 2 +- .../server/commands/ExecuteCommand.java | 126 +- .../server/commands/ExperienceCommand.java | 4 +- .../server/commands/FillBiomeCommand.java | 2 +- .../server/commands/FillCommand.java | 17 +- .../server/commands/ForceLoadCommand.java | 2 +- .../server/commands/FunctionCommand.java | 28 +- .../server/commands/GameModeCommand.java | 18 +- .../server/commands/GameRuleCommand.java | 3 +- .../server/commands/GiveCommand.java | 2 +- .../server/commands/ItemCommands.java | 20 +- net/minecraft/server/commands/JfrCommand.java | 2 +- .../server/commands/KickCommand.java | 2 +- .../server/commands/KillCommand.java | 2 +- .../server/commands/LocateCommand.java | 22 +- net/minecraft/server/commands/LookAt.java | 4 +- .../server/commands/LootCommand.java | 20 +- net/minecraft/server/commands/OpCommand.java | 2 +- .../server/commands/PardonCommand.java | 2 +- .../server/commands/PardonIpCommand.java | 2 +- .../server/commands/ParticleCommand.java | 2 +- .../server/commands/PerfCommand.java | 4 +- .../server/commands/PermissionCheck.java | 7 + .../server/commands/PlaceCommand.java | 7 +- .../server/commands/PlaySoundCommand.java | 57 +- .../server/commands/PublishCommand.java | 2 +- .../server/commands/RaidCommand.java | 10 +- .../server/commands/RandomCommand.java | 4 +- .../server/commands/RecipeCommand.java | 2 +- .../server/commands/ReloadCommand.java | 2 +- .../server/commands/ReturnCommand.java | 11 +- .../server/commands/RideCommand.java | 2 +- .../server/commands/RotateCommand.java | 5 +- .../server/commands/SaveAllCommand.java | 2 +- .../server/commands/SaveOffCommand.java | 2 +- .../server/commands/SaveOnCommand.java | 2 +- net/minecraft/server/commands/SayCommand.java | 18 +- .../server/commands/ScheduleCommand.java | 2 +- .../server/commands/ScoreboardCommand.java | 5 +- .../server/commands/SeedCommand.java | 16 +- .../server/commands/ServerPackCommand.java | 2 +- .../server/commands/SetBlockCommand.java | 6 +- .../commands/SetPlayerIdleTimeoutCommand.java | 2 +- .../server/commands/SetSpawnCommand.java | 2 +- .../server/commands/SetWorldSpawnCommand.java | 2 +- .../commands/SpawnArmorTrimsCommand.java | 24 +- .../server/commands/SpectateCommand.java | 2 +- .../server/commands/SpreadPlayersCommand.java | 2 +- .../server/commands/StopCommand.java | 2 +- .../server/commands/StopSoundCommand.java | 6 +- .../server/commands/SummonCommand.java | 10 +- net/minecraft/server/commands/TagCommand.java | 2 +- .../server/commands/TeamCommand.java | 2 +- .../server/commands/TeamMsgCommand.java | 7 +- .../server/commands/TeleportCommand.java | 7 +- .../server/commands/TellRawCommand.java | 2 +- .../server/commands/TickCommand.java | 2 +- .../server/commands/TimeCommand.java | 2 +- .../server/commands/TitleCommand.java | 2 +- .../server/commands/TransferCommand.java | 2 +- .../server/commands/VersionCommand.java | 38 + .../commands/WardenSpawnTrackerCommand.java | 2 +- .../server/commands/WaypointCommand.java | 164 ++ .../server/commands/WeatherCommand.java | 2 +- .../server/commands/WhitelistCommand.java | 2 +- .../server/commands/WorldBorderCommand.java | 2 +- .../commands/data/BlockDataAccessor.java | 14 +- .../server/commands/data/DataCommands.java | 3 +- .../commands/data/EntityDataAccessor.java | 12 +- .../server/dedicated/DedicatedServer.java | 11 +- .../dedicated/DedicatedServerProperties.java | 15 +- net/minecraft/server/dialog/ActionButton.java | 13 + .../server/dialog/ButtonListDialog.java | 19 + .../server/dialog/CommonButtonData.java | 23 + .../server/dialog/CommonDialogData.java | 43 + .../server/dialog/ConfirmationDialog.java | 33 + net/minecraft/server/dialog/Dialog.java | 34 + net/minecraft/server/dialog/DialogAction.java | 34 + .../server/dialog/DialogListDialog.java | 26 + net/minecraft/server/dialog/DialogTypes.java | 14 + net/minecraft/server/dialog/Dialogs.java | 81 + net/minecraft/server/dialog/Input.java | 13 + .../server/dialog/MultiActionDialog.java | 24 + net/minecraft/server/dialog/NoticeDialog.java | 33 + .../server/dialog/ServerLinksDialog.java | 23 + net/minecraft/server/dialog/SimpleDialog.java | 11 + .../server/dialog/action/Action.java | 58 + .../server/dialog/action/ActionTypes.java | 14 + .../server/dialog/action/CommandTemplate.java | 24 + .../server/dialog/action/CustomAll.java | 30 + .../server/dialog/action/ParsedTemplate.java | 36 + .../server/dialog/action/StaticAction.java | 34 + .../server/dialog/action/package-info.java | 8 + .../server/dialog/body/DialogBody.java | 14 + .../server/dialog/body/DialogBodyTypes.java | 12 + .../server/dialog/body/ItemBody.java | 28 + .../server/dialog/body/PlainMessage.java | 27 + .../server/dialog/body/package-info.java | 8 + .../server/dialog/input/BooleanInput.java | 24 + .../server/dialog/input/InputControl.java | 10 + .../dialog/input/InputControlTypes.java | 14 + .../server/dialog/input/NumberRangeInput.java | 94 + .../dialog/input/SingleOptionInput.java | 55 + .../server/dialog/input/TextInput.java | 47 + .../server/dialog/input/package-info.java | 8 + net/minecraft/server/dialog/package-info.java | 8 + net/minecraft/server/level/ChunkMap.java | 14 +- .../server/level/ChunkTaskDispatcher.java | 10 +- net/minecraft/server/level/ChunkTracker.java | 4 +- net/minecraft/server/level/DemoMode.java | 8 +- .../server/level/DistanceManager.java | 6 +- .../server/level/ParticleStatus.java | 3 +- .../server/level/SectionTracker.java | 4 +- .../server/level/ServerChunkCache.java | 5 +- net/minecraft/server/level/ServerEntity.java | 24 +- net/minecraft/server/level/ServerLevel.java | 86 +- net/minecraft/server/level/ServerPlayer.java | 250 +- .../server/level/ServerPlayerGameMode.java | 25 +- .../level/ThrottlingChunkTaskDispatcher.java | 5 +- .../server/level/WorldGenRegion.java | 3 +- .../server/network/PlayerChunkSender.java | 2 +- .../PlayerSafetyServiceTextFilter.java | 12 +- .../ServerCommonPacketListenerImpl.java | 15 +- ...ServerConfigurationPacketListenerImpl.java | 15 +- .../network/ServerGamePacketListenerImpl.java | 320 +-- .../ServerHandshakePacketListenerImpl.java | 6 +- .../server/network/ServerTextFilter.java | 10 +- net/minecraft/server/packs/DownloadQueue.java | 3 +- .../server/packs/PathPackResources.java | 11 +- .../packs/repository/BuiltInPackSource.java | 10 +- .../server/packs/repository/KnownPack.java | 2 +- .../server/packs/repository/Pack.java | 2 +- .../packs/repository/ServerPacksSource.java | 10 +- .../resources/ProfiledReloadInstance.java | 12 +- .../packs/resources/ResourceMetadata.java | 10 +- .../SimpleJsonResourceReloadListener.java | 4 +- .../packs/resources/SimpleReloadInstance.java | 6 +- .../server/players/GameProfileCache.java | 4 +- net/minecraft/server/players/PlayerList.java | 205 +- .../waypoints/ServerWaypointManager.java | 138 + net/minecraft/sounds/Music.java | 29 +- net/minecraft/sounds/SoundEvents.java | 264 +- net/minecraft/sounds/SoundSource.java | 3 +- net/minecraft/stats/RecipeBook.java | 2 +- net/minecraft/stats/RecipeBookSettings.java | 190 +- net/minecraft/stats/ServerRecipeBook.java | 79 +- net/minecraft/stats/ServerStatsCounter.java | 52 +- net/minecraft/stats/Stats.java | 1 + net/minecraft/tags/BlockTags.java | 53 +- net/minecraft/tags/DialogTags.java | 17 + net/minecraft/tags/EntityTypeTags.java | 2 + net/minecraft/tags/ItemTags.java | 57 +- net/minecraft/tags/TagLoader.java | 6 +- .../tags/TagNetworkSerialization.java | 3 +- net/minecraft/util/ARGB.java | 85 + net/minecraft/util/CommonColors.java | 2 + net/minecraft/util/ExtraCodecs.java | 16 + net/minecraft/util/GsonHelper.java | 84 +- net/minecraft/util/HashOps.java | 112 +- net/minecraft/util/HttpUtil.java | 4 +- net/minecraft/util/LenientJsonParser.java | 17 + .../util/LowerCaseEnumTypeAdapterFactory.java | 57 - net/minecraft/util/Mth.java | 18 +- .../util/PlaceholderLookupProvider.java | 24 +- net/minecraft/util/ProblemReporter.java | 240 +- net/minecraft/util/StrictJsonParser.java | 36 + net/minecraft/util/datafix/DataFixTypes.java | 5 +- net/minecraft/util/datafix/DataFixers.java | 728 +++--- .../datafix/LegacyComponentDataFixUtils.java | 6 +- .../fixes/ChunkPalettedStorageFix.java | 56 +- .../fixes/EntityCustomNameToComponentFix.java | 21 +- .../datafix/fixes/FeatureFlagRemoveFix.java | 4 +- .../fixes/ItemRemoveBlockEntityTagFix.java | 54 - .../fixes/ItemStackTagRemainderFix.java | 4 +- .../util/datafix/fixes/LeavesFix.java | 4 +- .../datafix/fixes/LegacyDimensionIdFix.java | 47 + .../fixes/LevelDataGeneratorOptionsFix.java | 6 +- .../util/datafix/fixes/MapIdFix.java | 10 +- .../datafix/fixes/RaidRenamesDataFix.java | 3 +- .../util/datafix/fixes/References.java | 1 + .../fixes/RemoveBlockEntityTagFix.java | 72 + .../datafix/fixes/SignTextStrictJsonFix.java | 29 + .../datafix/fixes/SimpleEntityRenameFix.java | 4 +- .../fixes/TextComponentStrictJsonFix.java | 20 - .../fixes/TooltipDisplayComponentFix.java | 1 + .../fixes/TrappedChestBlockEntityFix.java | 4 +- .../fixes/UnflattenTextComponentFix.java | 4 +- .../fixes/WrittenBookPagesStrictJsonFix.java | 25 + net/minecraft/util/datafix/schemas/V1125.java | 4 +- net/minecraft/util/datafix/schemas/V1451.java | 4 +- .../util/datafix/schemas/V1451_1.java | 4 +- .../util/datafix/schemas/V1451_2.java | 4 +- .../util/datafix/schemas/V1451_3.java | 4 +- .../util/datafix/schemas/V1451_4.java | 4 +- .../util/datafix/schemas/V1451_5.java | 4 +- .../util/datafix/schemas/V1451_6.java | 4 +- net/minecraft/util/datafix/schemas/V1458.java | 4 +- net/minecraft/util/datafix/schemas/V1460.java | 15 +- net/minecraft/util/datafix/schemas/V1466.java | 4 +- net/minecraft/util/datafix/schemas/V1470.java | 4 +- net/minecraft/util/datafix/schemas/V1481.java | 4 +- net/minecraft/util/datafix/schemas/V1483.java | 4 +- net/minecraft/util/datafix/schemas/V1486.java | 4 +- net/minecraft/util/datafix/schemas/V1488.java | 4 +- net/minecraft/util/datafix/schemas/V1510.java | 4 +- net/minecraft/util/datafix/schemas/V1800.java | 4 +- net/minecraft/util/datafix/schemas/V1801.java | 4 +- net/minecraft/util/datafix/schemas/V1904.java | 4 +- net/minecraft/util/datafix/schemas/V1906.java | 4 +- net/minecraft/util/datafix/schemas/V1909.java | 4 +- net/minecraft/util/datafix/schemas/V1920.java | 4 +- net/minecraft/util/datafix/schemas/V1925.java | 24 - net/minecraft/util/datafix/schemas/V1928.java | 4 +- net/minecraft/util/datafix/schemas/V1929.java | 4 +- net/minecraft/util/datafix/schemas/V1931.java | 4 +- net/minecraft/util/datafix/schemas/V2100.java | 4 +- net/minecraft/util/datafix/schemas/V2501.java | 4 +- net/minecraft/util/datafix/schemas/V2502.java | 4 +- net/minecraft/util/datafix/schemas/V2505.java | 4 +- net/minecraft/util/datafix/schemas/V2509.java | 4 +- .../util/datafix/schemas/V2511_1.java | 4 +- net/minecraft/util/datafix/schemas/V2519.java | 4 +- net/minecraft/util/datafix/schemas/V2522.java | 4 +- net/minecraft/util/datafix/schemas/V2551.java | 4 +- net/minecraft/util/datafix/schemas/V2568.java | 4 +- net/minecraft/util/datafix/schemas/V2571.java | 4 +- net/minecraft/util/datafix/schemas/V2684.java | 4 +- net/minecraft/util/datafix/schemas/V2686.java | 4 +- net/minecraft/util/datafix/schemas/V2688.java | 4 +- net/minecraft/util/datafix/schemas/V2704.java | 4 +- net/minecraft/util/datafix/schemas/V2707.java | 4 +- net/minecraft/util/datafix/schemas/V2831.java | 4 +- net/minecraft/util/datafix/schemas/V2832.java | 4 +- net/minecraft/util/datafix/schemas/V2842.java | 4 +- net/minecraft/util/datafix/schemas/V3076.java | 4 +- net/minecraft/util/datafix/schemas/V3078.java | 4 +- net/minecraft/util/datafix/schemas/V3081.java | 4 +- net/minecraft/util/datafix/schemas/V3082.java | 4 +- net/minecraft/util/datafix/schemas/V3083.java | 4 +- net/minecraft/util/datafix/schemas/V3202.java | 4 +- net/minecraft/util/datafix/schemas/V3203.java | 4 +- net/minecraft/util/datafix/schemas/V3204.java | 4 +- net/minecraft/util/datafix/schemas/V3325.java | 4 +- net/minecraft/util/datafix/schemas/V3326.java | 4 +- net/minecraft/util/datafix/schemas/V3327.java | 4 +- net/minecraft/util/datafix/schemas/V3328.java | 4 +- net/minecraft/util/datafix/schemas/V3438.java | 4 +- net/minecraft/util/datafix/schemas/V3439.java | 7 +- .../util/datafix/schemas/V3439_1.java | 19 + net/minecraft/util/datafix/schemas/V3448.java | 4 +- net/minecraft/util/datafix/schemas/V3682.java | 4 +- net/minecraft/util/datafix/schemas/V3683.java | 4 +- net/minecraft/util/datafix/schemas/V3685.java | 4 +- net/minecraft/util/datafix/schemas/V3689.java | 4 +- net/minecraft/util/datafix/schemas/V3799.java | 4 +- net/minecraft/util/datafix/schemas/V3807.java | 4 +- net/minecraft/util/datafix/schemas/V3808.java | 4 +- .../util/datafix/schemas/V3808_1.java | 4 +- .../util/datafix/schemas/V3808_2.java | 4 +- net/minecraft/util/datafix/schemas/V3813.java | 4 +- net/minecraft/util/datafix/schemas/V3816.java | 4 +- net/minecraft/util/datafix/schemas/V3818.java | 4 +- .../util/datafix/schemas/V3818_3.java | 4 +- .../util/datafix/schemas/V3818_4.java | 4 +- .../util/datafix/schemas/V3818_5.java | 4 +- net/minecraft/util/datafix/schemas/V3825.java | 4 +- net/minecraft/util/datafix/schemas/V3938.java | 4 +- net/minecraft/util/datafix/schemas/V4059.java | 4 +- net/minecraft/util/datafix/schemas/V4067.java | 4 +- net/minecraft/util/datafix/schemas/V4070.java | 4 +- net/minecraft/util/datafix/schemas/V4071.java | 4 +- net/minecraft/util/datafix/schemas/V4290.java | 4 +- net/minecraft/util/datafix/schemas/V4292.java | 4 +- net/minecraft/util/datafix/schemas/V4300.java | 4 +- net/minecraft/util/datafix/schemas/V4301.java | 4 +- net/minecraft/util/datafix/schemas/V4302.java | 4 +- net/minecraft/util/datafix/schemas/V4306.java | 4 +- net/minecraft/util/datafix/schemas/V4307.java | 4 +- net/minecraft/util/datafix/schemas/V4312.java | 4 +- net/minecraft/util/datafix/schemas/V4420.java | 24 + net/minecraft/util/datafix/schemas/V4421.java | 19 + net/minecraft/util/datafix/schemas/V705.java | 4 +- net/minecraft/util/datafix/schemas/V808.java | 4 +- net/minecraft/util/datafix/schemas/V99.java | 11 +- .../util/debugchart/LocalSampleLogger.java | 6 +- .../util/eventlog/JsonEventLogReader.java | 3 +- .../util/parsing/packrat/ErrorCollector.java | 18 +- net/minecraft/util/parsing/packrat/Scope.java | 4 +- net/minecraft/util/parsing/packrat/Term.java | 4 +- .../util/profiling/ActiveProfiler.java | 4 +- .../util/profiling/ContinuousProfiler.java | 4 +- .../util/profiling/FilledProfileResults.java | 2 +- .../util/profiling/InactiveProfiler.java | 3 +- .../util/profiling/ProfileCollector.java | 3 +- net/minecraft/util/profiling/ResultField.java | 2 +- .../util/profiling/jfr/JfrProfiler.java | 13 +- .../profiling/jfr/parse/JfrStatsParser.java | 7 +- .../profiling/jfr/parse/JfrStatsResult.java | 12 +- .../serialize/JfrResultJsonSerializer.java | 23 +- .../util/thread/ParallelMapTransform.java | 16 +- .../thread/ReentrantBlockableEventLoop.java | 4 +- net/minecraft/util/thread/StrictQueue.java | 6 +- .../util/worldupdate/WorldUpgrader.java | 16 +- net/minecraft/world/ContainerHelper.java | 35 +- net/minecraft/world/Difficulty.java | 8 +- net/minecraft/world/ItemStackWithSlot.java | 19 + net/minecraft/world/LockCode.java | 13 +- .../world/RandomizableContainer.java | 19 +- net/minecraft/world/SimpleContainer.java | 19 +- .../world/effect/InstantenousMobEffect.java | 4 +- net/minecraft/world/effect/MobEffects.java | 11 +- net/minecraft/world/entity/AgeableMob.java | 22 +- .../world/entity/AnimationState.java | 4 +- .../world/entity/AreaEffectCloud.java | 110 +- .../world/entity/ConversionType.java | 22 +- net/minecraft/world/entity/Display.java | 258 +- net/minecraft/world/entity/Entity.java | 638 +++-- .../world/entity/EntityAttachments.java | 19 +- net/minecraft/world/entity/EntityEvent.java | 1 + .../world/entity/EntityReference.java | 33 +- .../world/entity/EntitySelector.java | 2 +- net/minecraft/world/entity/EntityType.java | 70 +- net/minecraft/world/entity/EquipmentSlot.java | 3 +- .../world/entity/EquipmentSlotGroup.java | 5 +- net/minecraft/world/entity/ExperienceOrb.java | 73 +- net/minecraft/world/entity/FlyingMob.java | 49 - net/minecraft/world/entity/GlowSquid.java | 18 +- net/minecraft/world/entity/HumanoidArm.java | 3 +- net/minecraft/world/entity/Interaction.java | 30 +- .../world/entity/InterpolationHandler.java | 2 +- net/minecraft/world/entity/Leashable.java | 240 +- net/minecraft/world/entity/LightningBolt.java | 11 +- net/minecraft/world/entity/LivingEntity.java | 210 +- net/minecraft/world/entity/Marker.java | 11 +- net/minecraft/world/entity/Mob.java | 152 +- net/minecraft/world/entity/NeutralMob.java | 15 +- .../world/entity/OminousItemSpawner.java | 26 +- net/minecraft/world/entity/PathfinderMob.java | 10 +- .../world/entity/SpawnPlacements.java | 1 + net/minecraft/world/entity/TamableAnimal.java | 38 +- net/minecraft/world/entity/ai/Brain.java | 10 +- .../ai/attributes/AttributeInstance.java | 35 +- .../entity/ai/attributes/AttributeMap.java | 22 +- .../ai/attributes/AttributeModifier.java | 5 +- .../entity/ai/attributes/Attributes.java | 19 +- .../ai/attributes/DefaultAttributes.java | 2 + .../world/entity/ai/behavior/AnimalPanic.java | 50 +- .../entity/ai/behavior/BabyFollowAdult.java | 40 +- .../entity/ai/behavior/EntityTracker.java | 8 +- .../entity/ai/behavior/FollowTemptation.java | 40 +- .../entity/ai/behavior/HarvestFarmland.java | 3 +- .../entity/ai/behavior/LongJumpMidJump.java | 26 +- .../ai/behavior/LongJumpToPreferredBlock.java | 6 +- .../ai/behavior/LongJumpToRandomPos.java | 42 +- .../ai/behavior/PrepareRamNearestTarget.java | 46 +- .../world/entity/ai/behavior/RamTarget.java | 58 +- .../entity/ai/behavior/RandomLookAround.java | 10 +- .../entity/ai/behavior/SetHiddenState.java | 4 +- .../behavior/TryLaySpawnOnWaterNearLand.java | 3 +- .../ai/behavior/VillagerGoalPackages.java | 14 +- .../entity/ai/behavior/warden/Digging.java | 26 +- .../entity/ai/behavior/warden/Emerging.java | 14 +- .../entity/ai/behavior/warden/Sniffing.java | 24 +- .../entity/ai/behavior/warden/SonicBoom.java | 45 +- .../world/entity/ai/control/LookControl.java | 9 +- .../world/entity/ai/control/MoveControl.java | 4 + .../world/entity/ai/goal/AvoidEntityGoal.java | 3 +- .../world/entity/ai/goal/BegGoal.java | 3 +- .../entity/ai/goal/DoorInteractGoal.java | 4 +- .../world/entity/ai/goal/EatBlockGoal.java | 3 +- .../world/entity/ai/goal/FleeSunGoal.java | 3 +- .../world/entity/ai/goal/GoalSelector.java | 2 - .../goal/GolemRandomStrollInVillageGoal.java | 4 +- .../world/entity/ai/goal/MeleeAttackGoal.java | 5 +- .../ai/goal/MoveThroughVillageGoal.java | 9 +- .../world/entity/ai/goal/MoveToBlockGoal.java | 2 +- .../ai/goal/MoveTowardsRestrictionGoal.java | 4 +- .../world/entity/ai/goal/OfferFlowerGoal.java | 3 +- .../entity/ai/goal/PathfindToRaidGoal.java | 3 +- .../entity/ai/goal/RandomStrollGoal.java | 4 +- .../entity/ai/goal/SitWhenOrderedToGoal.java | 5 +- .../ai/goal/StrollThroughVillageGoal.java | 3 +- .../world/entity/ai/goal/TemptGoal.java | 50 +- .../goal/WaterAvoidingRandomStrollGoal.java | 4 +- .../goal/target/DefendVillageTargetGoal.java | 4 +- .../target/NearestAttackableTargetGoal.java | 4 +- .../entity/ai/goal/target/TargetGoal.java | 2 +- .../entity/ai/memory/MemoryModuleType.java | 2 +- .../navigation/AmphibiousPathNavigation.java | 5 + .../ai/navigation/FlyingPathNavigation.java | 9 +- .../ai/navigation/GroundPathNavigation.java | 13 +- .../entity/ai/navigation/PathNavigation.java | 23 +- .../navigation/WaterBoundPathNavigation.java | 5 + .../world/entity/ai/sensing/AdultSensor.java | 21 +- .../entity/ai/sensing/AdultSensorAnyType.java | 18 + .../world/entity/ai/sensing/GolemSensor.java | 4 +- .../NearestVisibleLivingEntitySensor.java | 6 +- .../world/entity/ai/sensing/SensorType.java | 3 + .../entity/ai/sensing/TemptingSensor.java | 14 +- .../entity/ai/sensing/WardenEntitySensor.java | 12 +- .../world/entity/ai/util/GoalUtils.java | 7 +- .../world/entity/ai/util/RandomPos.java | 4 +- .../entity/ai/village/poi/PoiManager.java | 7 +- .../world/entity/ai/village/poi/PoiTypes.java | 2 + net/minecraft/world/entity/ambient/Bat.java | 21 +- .../world/entity/animal/AbstractCow.java | 4 +- .../world/entity/animal/AbstractFish.java | 20 +- net/minecraft/world/entity/animal/Animal.java | 43 +- net/minecraft/world/entity/animal/Bee.java | 73 +- net/minecraft/world/entity/animal/Cat.java | 35 +- .../world/entity/animal/CatVariants.java | 10 - .../world/entity/animal/Chicken.java | 37 +- .../world/entity/animal/ChickenVariants.java | 11 - net/minecraft/world/entity/animal/Cow.java | 26 +- .../world/entity/animal/CowVariants.java | 11 - .../world/entity/animal/Dolphin.java | 34 +- net/minecraft/world/entity/animal/Fox.java | 71 +- .../world/entity/animal/HappyGhast.java | 644 +++++ .../world/entity/animal/HappyGhastAi.java | 99 + .../world/entity/animal/IronGolem.java | 29 +- .../world/entity/animal/MushroomCow.java | 31 +- net/minecraft/world/entity/animal/Ocelot.java | 25 +- net/minecraft/world/entity/animal/Panda.java | 33 +- net/minecraft/world/entity/animal/Parrot.java | 25 +- net/minecraft/world/entity/animal/Pig.java | 29 +- .../world/entity/animal/PigVariants.java | 11 - .../world/entity/animal/PolarBear.java | 21 +- .../world/entity/animal/Pufferfish.java | 28 +- net/minecraft/world/entity/animal/Rabbit.java | 36 +- net/minecraft/world/entity/animal/Salmon.java | 21 +- .../entity/animal/ShoulderRidingEntity.java | 24 +- .../world/entity/animal/SnowGolem.java | 24 +- net/minecraft/world/entity/animal/Squid.java | 4 +- .../world/entity/animal/TropicalFish.java | 18 +- net/minecraft/world/entity/animal/Turtle.java | 32 +- .../world/entity/animal/allay/Allay.java | 54 +- .../entity/animal/armadillo/Armadillo.java | 58 +- .../entity/animal/armadillo/ArmadilloAi.java | 62 +- .../world/entity/animal/axolotl/Axolotl.java | 27 +- .../entity/animal/axolotl/AxolotlAi.java | 8 +- .../world/entity/animal/camel/Camel.java | 36 +- .../world/entity/animal/camel/CamelAi.java | 27 +- .../world/entity/animal/frog/Frog.java | 23 +- .../world/entity/animal/frog/FrogAi.java | 6 +- .../entity/animal/frog/FrogVariants.java | 15 +- .../world/entity/animal/frog/ShootTongue.java | 54 +- .../world/entity/animal/frog/Tadpole.java | 18 +- .../world/entity/animal/frog/TadpoleAi.java | 6 +- .../world/entity/animal/goat/Goat.java | 39 +- .../animal/horse/AbstractChestedHorse.java | 48 +- .../entity/animal/horse/AbstractHorse.java | 102 +- .../world/entity/animal/horse/Horse.java | 18 +- .../world/entity/animal/horse/Llama.java | 39 +- .../entity/animal/horse/SkeletonHorse.java | 23 +- .../entity/animal/horse/TraderLlama.java | 19 +- .../world/entity/animal/horse/Variant.java | 3 +- .../entity/animal/horse/ZombieHorse.java | 4 +- .../world/entity/animal/sheep/Sheep.java | 51 +- .../world/entity/animal/sniffer/Sniffer.java | 23 +- .../entity/animal/sniffer/SnifferAi.java | 103 +- .../world/entity/animal/wolf/Wolf.java | 111 +- .../entity/animal/wolf/WolfSoundVariants.java | 4 +- .../entity/animal/wolf/WolfVariants.java | 10 - .../world/entity/boss/EnderDragonPart.java | 11 +- .../entity/boss/enderdragon/EndCrystal.java | 18 +- .../entity/boss/enderdragon/EnderDragon.java | 38 +- .../phases/DragonChargePlayerPhase.java | 4 +- .../enderdragon/phases/DragonDeathPhase.java | 8 +- .../phases/DragonHoldingPatternPhase.java | 8 +- .../enderdragon/phases/DragonHoverPhase.java | 4 +- .../phases/DragonLandingApproachPhase.java | 8 +- .../phases/DragonLandingPhase.java | 8 +- .../phases/DragonSittingAttackingPhase.java | 4 +- .../phases/DragonSittingFlamingPhase.java | 6 +- .../phases/DragonSittingScanningPhase.java | 6 +- .../phases/DragonStrafePlayerPhase.java | 4 +- .../phases/DragonTakeoffPhase.java | 8 +- .../world/entity/boss/wither/WitherBoss.java | 28 +- .../world/entity/decoration/ArmorStand.java | 180 +- .../decoration/BlockAttachedEntity.java | 18 +- .../entity/decoration/HangingEntity.java | 63 +- .../world/entity/decoration/ItemFrame.java | 61 +- .../decoration/LeashFenceKnotEntity.java | 60 +- .../world/entity/decoration/Painting.java | 28 +- .../entity/decoration/PaintingVariant.java | 4 +- .../world/entity/item/FallingBlockEntity.java | 75 +- .../world/entity/item/ItemEntity.java | 59 +- .../world/entity/item/PrimedTnt.java | 37 +- .../entity/monster/AbstractSkeleton.java | 10 +- net/minecraft/world/entity/monster/Blaze.java | 9 +- .../world/entity/monster/Bogged.java | 21 +- .../world/entity/monster/CaveSpider.java | 4 +- .../world/entity/monster/Creeper.java | 33 +- .../world/entity/monster/Drowned.java | 33 +- .../world/entity/monster/ElderGuardian.java | 8 +- .../world/entity/monster/EnderMan.java | 51 +- .../world/entity/monster/Endermite.java | 19 +- .../world/entity/monster/Evoker.java | 25 +- net/minecraft/world/entity/monster/Ghast.java | 266 +- net/minecraft/world/entity/monster/Giant.java | 10 +- .../world/entity/monster/Guardian.java | 17 +- .../world/entity/monster/Illusioner.java | 4 +- .../world/entity/monster/MagmaCube.java | 4 +- .../world/entity/monster/Monster.java | 4 +- .../entity/monster/PatrollingMonster.java | 26 +- .../world/entity/monster/Phantom.java | 43 +- .../world/entity/monster/Pillager.java | 21 +- .../world/entity/monster/Ravager.java | 91 +- .../world/entity/monster/Shulker.java | 37 +- .../world/entity/monster/Silverfish.java | 7 +- .../world/entity/monster/Skeleton.java | 18 +- net/minecraft/world/entity/monster/Slime.java | 31 +- .../entity/monster/SpellcasterIllager.java | 24 +- .../world/entity/monster/Spider.java | 6 +- .../world/entity/monster/Strider.java | 10 +- net/minecraft/world/entity/monster/Vex.java | 48 +- .../world/entity/monster/Vindicator.java | 23 +- net/minecraft/world/entity/monster/Witch.java | 6 +- .../world/entity/monster/Zoglin.java | 21 +- .../world/entity/monster/Zombie.java | 39 +- .../world/entity/monster/ZombieVillager.java | 50 +- .../world/entity/monster/ZombifiedPiglin.java | 19 +- .../world/entity/monster/breeze/Breeze.java | 4 +- .../entity/monster/breeze/BreezeUtil.java | 6 +- .../world/entity/monster/breeze/LongJump.java | 87 +- .../world/entity/monster/breeze/Shoot.java | 50 +- .../world/entity/monster/breeze/Slide.java | 22 +- .../entity/monster/creaking/Creaking.java | 21 +- .../world/entity/monster/hoglin/Hoglin.java | 29 +- .../entity/monster/piglin/AbstractPiglin.java | 28 +- .../world/entity/monster/piglin/Piglin.java | 29 +- .../world/entity/monster/piglin/PiglinAi.java | 8 +- .../entity/monster/piglin/PiglinBrute.java | 4 +- .../world/entity/monster/warden/Warden.java | 42 +- .../world/entity/monster/warden/WardenAi.java | 3 +- .../world/entity/npc/AbstractVillager.java | 23 +- .../world/entity/npc/CatSpawner.java | 4 +- .../world/entity/npc/InventoryCarrier.java | 12 +- net/minecraft/world/entity/npc/Villager.java | 62 +- .../world/entity/npc/VillagerProfession.java | 4 + .../world/entity/npc/VillagerTrades.java | 4 +- .../world/entity/npc/WanderingTrader.java | 26 +- .../entity/npc/WanderingTraderSpawner.java | 5 +- .../world/entity/player/Abilities.java | 55 +- .../world/entity/player/Inventory.java | 41 +- net/minecraft/world/entity/player/Player.java | 130 +- .../entity/projectile/AbstractArrow.java | 78 +- .../projectile/AbstractHurtingProjectile.java | 30 +- .../projectile/AbstractThrownPotion.java | 8 +- .../world/entity/projectile/Arrow.java | 3 +- .../entity/projectile/DragonFireball.java | 5 +- .../world/entity/projectile/EvokerFangs.java | 38 +- .../world/entity/projectile/EyeOfEnder.java | 145 +- .../world/entity/projectile/Fireball.java | 31 +- .../projectile/FireworkRocketEntity.java | 44 +- .../world/entity/projectile/FishingHook.java | 24 +- .../entity/projectile/LargeFireball.java | 15 +- .../world/entity/projectile/LlamaSpit.java | 4 +- .../world/entity/projectile/Projectile.java | 80 +- .../entity/projectile/ProjectileUtil.java | 32 +- .../entity/projectile/ShulkerBullet.java | 83 +- .../entity/projectile/SpectralArrow.java | 15 +- .../projectile/ThrowableItemProjectile.java | 23 +- .../projectile/ThrowableProjectile.java | 5 +- .../entity/projectile/ThrownEnderpearl.java | 47 +- .../projectile/ThrownExperienceBottle.java | 16 +- .../projectile/ThrownLingeringPotion.java | 5 +- .../entity/projectile/ThrownSplashPotion.java | 23 +- .../entity/projectile/ThrownTrident.java | 18 +- .../world/entity/projectile/WitherSkull.java | 18 +- .../windcharge/AbstractWindCharge.java | 4 +- net/minecraft/world/entity/raid/Raid.java | 2 +- net/minecraft/world/entity/raid/Raider.java | 39 +- net/minecraft/world/entity/raid/Raids.java | 8 +- .../entity/variant/MoonBrightnessCheck.java | 4 +- .../world/entity/variant/StructureCheck.java | 4 +- .../world/entity/variant/VariantUtils.java | 21 +- .../world/entity/vehicle/AbstractBoat.java | 36 +- .../entity/vehicle/AbstractChestBoat.java | 40 +- .../entity/vehicle/AbstractMinecart.java | 52 +- .../vehicle/AbstractMinecartContainer.java | 15 +- .../world/entity/vehicle/ContainerEntity.java | 24 +- .../world/entity/vehicle/MinecartChest.java | 3 +- .../entity/vehicle/MinecartCommandBlock.java | 18 +- .../world/entity/vehicle/MinecartFurnace.java | 26 +- .../world/entity/vehicle/MinecartHopper.java | 15 +- .../world/entity/vehicle/MinecartSpawner.java | 15 +- .../world/entity/vehicle/MinecartTNT.java | 23 +- .../entity/vehicle/NewMinecartBehavior.java | 4 +- .../entity/vehicle/OldMinecartBehavior.java | 6 +- .../world/entity/vehicle/VehicleEntity.java | 3 +- net/minecraft/world/flag/FeatureFlags.java | 3 +- net/minecraft/world/food/FoodData.java | 31 +- .../inventory/AbstractContainerMenu.java | 2 +- net/minecraft/world/inventory/AnvilMenu.java | 7 + net/minecraft/world/inventory/BeaconMenu.java | 4 +- .../world/inventory/BrewingStandMenu.java | 8 +- net/minecraft/world/inventory/ClickType.java | 3 +- .../world/inventory/CrafterMenu.java | 2 +- .../world/inventory/CraftingContainer.java | 3 +- .../world/inventory/EnchantmentMenu.java | 6 +- .../world/inventory/InventoryMenu.java | 3 +- .../world/inventory/ItemCombinerMenu.java | 3 +- .../inventory/PlayerEnderChestContainer.java | 28 +- .../world/inventory/RecipeBookMenu.java | 4 +- .../world/inventory/RecipeCraftingHolder.java | 6 +- net/minecraft/world/inventory/ResultSlot.java | 3 +- .../world/inventory/ShulkerBoxSlot.java | 4 +- .../world/inventory/StonecutterMenu.java | 13 +- .../world/item/AdventureModePredicate.java | 24 +- net/minecraft/world/item/AxeItem.java | 3 +- net/minecraft/world/item/BlockItem.java | 15 +- net/minecraft/world/item/BoatItem.java | 9 +- net/minecraft/world/item/BottleItem.java | 10 +- net/minecraft/world/item/BrushItem.java | 5 +- net/minecraft/world/item/BucketItem.java | 11 +- .../world/item/CreativeModeTabs.java | 236 +- net/minecraft/world/item/DyeColor.java | 5 +- net/minecraft/world/item/EnderEyeItem.java | 18 +- .../world/item/ExperienceBottleItem.java | 8 +- net/minecraft/world/item/FireChargeItem.java | 5 +- .../world/item/FireworkRocketItem.java | 44 +- net/minecraft/world/item/HoeItem.java | 5 +- net/minecraft/world/item/HoneycombItem.java | 3 +- net/minecraft/world/item/InstrumentItem.java | 3 +- net/minecraft/world/item/Item.java | 71 +- .../world/item/ItemDisplayContext.java | 3 +- net/minecraft/world/item/ItemFrameItem.java | 4 +- net/minecraft/world/item/ItemStack.java | 124 +- .../world/item/ItemUseAnimation.java | 3 +- net/minecraft/world/item/Items.java | 77 +- net/minecraft/world/item/JukeboxPlayable.java | 3 +- .../world/item/JukeboxSongPlayer.java | 5 +- net/minecraft/world/item/JukeboxSongs.java | 2 + net/minecraft/world/item/LeadItem.java | 29 +- net/minecraft/world/item/MapItem.java | 33 +- net/minecraft/world/item/MinecartItem.java | 3 +- .../world/item/PlaceOnWaterBlockItem.java | 4 +- .../world/item/ProjectileWeaponItem.java | 4 +- net/minecraft/world/item/Rarity.java | 3 +- net/minecraft/world/item/ShearsItem.java | 3 +- net/minecraft/world/item/ShovelItem.java | 3 +- net/minecraft/world/item/SpawnEggItem.java | 8 +- .../world/item/ThrowablePotionItem.java | 8 +- net/minecraft/world/item/WindChargeItem.java | 5 +- .../world/item/component/Consumables.java | 5 +- .../world/item/component/CustomData.java | 54 +- .../item/component/FireworkExplosion.java | 5 +- .../component/ItemAttributeModifiers.java | 210 +- .../item/component/ResolvableProfile.java | 41 +- .../item/component/WritableBookContent.java | 4 +- .../item/component/WrittenBookContent.java | 4 +- .../PlaySoundConsumeEffect.java | 5 +- .../TeleportRandomlyConsumeEffect.java | 8 +- .../world/item/context/BlockPlaceContext.java | 11 +- .../item/context/DirectionalPlaceContext.java | 3 +- .../item/crafting/AbstractCookingRecipe.java | 10 +- .../item/crafting/CookingBookCategory.java | 3 +- .../item/crafting/CraftingBookCategory.java | 3 +- .../world/item/crafting/CustomRecipe.java | 8 +- .../item/crafting/DecoratedPotRecipe.java | 24 +- .../world/item/crafting/Ingredient.java | 22 +- .../item/crafting/MapExtendingRecipe.java | 12 +- .../world/item/crafting/RecipeManager.java | 30 +- .../world/item/crafting/RepairItemRecipe.java | 16 +- .../world/item/crafting/ShapedRecipe.java | 17 +- .../world/item/crafting/ShapelessRecipe.java | 21 +- .../world/item/crafting/SingleItemRecipe.java | 6 +- .../crafting/SmithingTransformRecipe.java | 4 +- .../item/crafting/SmithingTrimRecipe.java | 4 +- .../item/crafting/StonecutterRecipe.java | 6 +- .../world/item/crafting/TransmuteRecipe.java | 14 +- .../item/crafting/display/SlotDisplay.java | 16 +- .../item/enchantment/ConditionalEffect.java | 10 +- .../EnchantmentEffectComponents.java | 7 +- .../item/enchantment/EnchantmentHelper.java | 8 +- .../item/enchantment/EnchantmentInstance.java | 2 + .../world/item/enchantment/Enchantments.java | 75 +- .../item/enchantment/ItemEnchantments.java | 3 +- .../effects/SpawnParticlesEffect.java | 10 +- .../world/item/equipment/EquipmentAssets.java | 1 + .../world/item/equipment/Equippable.java | 46 +- .../world/level/BaseCommandBlock.java | 44 +- net/minecraft/world/level/BaseSpawner.java | 181 +- net/minecraft/world/level/BlockGetter.java | 37 +- .../world/level/CollisionGetter.java | 14 +- net/minecraft/world/level/GameRules.java | 30 +- net/minecraft/world/level/GameType.java | 7 +- net/minecraft/world/level/Level.java | 32 +- net/minecraft/world/level/LevelAccessor.java | 11 +- net/minecraft/world/level/LevelReader.java | 3 +- net/minecraft/world/level/NaturalSpawner.java | 6 +- .../world/level/ServerExplosion.java | 26 +- net/minecraft/world/level/TicketStorage.java | 29 +- net/minecraft/world/level/biome/Biome.java | 28 +- .../world/level/biome/BiomeSource.java | 13 +- .../level/biome/BiomeSpecialEffects.java | 22 +- .../biome/CheckerboardColumnBiomeSource.java | 3 +- net/minecraft/world/level/biome/Climate.java | 147 +- .../world/level/biome/FeatureSorter.java | 6 +- .../world/level/biome/FixedBiomeSource.java | 12 +- .../world/level/biome/MobSpawnSettings.java | 4 + .../level/biome/MultiNoiseBiomeSource.java | 21 +- .../level/biome/OverworldBiomeBuilder.java | 572 +++-- .../world/level/biome/TheEndBiomeSource.java | 3 +- .../level/block/AbstractCauldronBlock.java | 7 +- .../world/level/block/AbstractChestBlock.java | 3 +- .../level/block/AbstractFurnaceBlock.java | 4 +- .../world/level/block/AbstractSkullBlock.java | 11 +- .../level/block/AmethystClusterBlock.java | 4 +- .../world/level/block/AnvilBlock.java | 4 +- .../world/level/block/AttachedStemBlock.java | 4 +- .../world/level/block/BambooStalkBlock.java | 4 +- .../world/level/block/BannerBlock.java | 10 +- .../world/level/block/BarrelBlock.java | 4 +- .../world/level/block/BarrierBlock.java | 4 +- .../level/block/BaseCoralPlantTypeBlock.java | 4 +- .../level/block/BaseCoralWallFanBlock.java | 4 +- .../world/level/block/BaseRailBlock.java | 132 + net/minecraft/world/level/block/BedBlock.java | 9 +- .../world/level/block/BeehiveBlock.java | 7 +- .../world/level/block/BeetrootBlock.java | 4 +- .../world/level/block/BellBlock.java | 4 +- .../world/level/block/BigDripleafBlock.java | 4 +- .../level/block/BigDripleafStemBlock.java | 4 +- net/minecraft/world/level/block/Block.java | 19 +- .../world/level/block/BlockTypes.java | 2 +- net/minecraft/world/level/block/Blocks.java | 22 +- .../world/level/block/BrewingStandBlock.java | 4 +- .../world/level/block/BrushableBlock.java | 4 +- .../world/level/block/BubbleColumnBlock.java | 4 +- .../world/level/block/ButtonBlock.java | 4 +- .../world/level/block/CactusBlock.java | 4 +- .../world/level/block/CakeBlock.java | 4 +- .../block/CalibratedSculkSensorBlock.java | 4 +- .../world/level/block/CampfireBlock.java | 4 +- .../world/level/block/CandleBlock.java | 4 +- .../world/level/block/CandleCakeBlock.java | 4 +- .../world/level/block/CarvedPumpkinBlock.java | 15 +- .../world/level/block/CauldronBlock.java | 5 +- .../world/level/block/CaveVines.java | 3 +- .../world/level/block/CaveVinesBlock.java | 4 +- .../level/block/CaveVinesPlantBlock.java | 4 +- .../level/block/CeilingHangingSignBlock.java | 8 +- .../world/level/block/ChainBlock.java | 4 +- .../world/level/block/ChestBlock.java | 60 +- .../level/block/ChiseledBookShelfBlock.java | 8 +- .../world/level/block/ChorusFlowerBlock.java | 4 +- .../world/level/block/ChorusPlantBlock.java | 4 +- .../world/level/block/CocoaBlock.java | 4 +- .../world/level/block/CommandBlock.java | 4 +- .../world/level/block/ComparatorBlock.java | 4 +- .../world/level/block/ComposterBlock.java | 9 +- .../world/level/block/ConduitBlock.java | 4 +- .../world/level/block/CopperBulbBlock.java | 4 +- .../world/level/block/CrafterBlock.java | 4 +- .../world/level/block/CreakingHeartBlock.java | 4 +- .../world/level/block/CropBlock.java | 4 +- .../level/block/DaylightDetectorBlock.java | 7 +- .../world/level/block/DecoratedPotBlock.java | 7 +- .../world/level/block/DetectorRailBlock.java | 118 +- .../world/level/block/DispenserBlock.java | 7 +- .../world/level/block/DoorBlock.java | 4 +- .../level/block/DoubleBlockCombiner.java | 36 +- .../world/level/block/DoublePlantBlock.java | 4 +- .../world/level/block/DriedGhastBlock.java | 207 ++ .../world/level/block/DryVegetationBlock.java | 17 +- .../world/level/block/EndPortalBlock.java | 4 +- .../level/block/EndPortalFrameBlock.java | 4 +- .../world/level/block/EndRodBlock.java | 4 +- .../world/level/block/EnderChestBlock.java | 10 +- .../world/level/block/EyeblossomBlock.java | 3 +- .../world/level/block/FarmBlock.java | 7 +- .../world/level/block/FenceBlock.java | 4 +- .../world/level/block/FenceGateBlock.java | 7 +- .../world/level/block/FireBlock.java | 4 +- .../world/level/block/FlowerBedBlock.java | 4 +- .../world/level/block/FrostedIceBlock.java | 4 +- .../world/level/block/GrassBlock.java | 3 +- .../world/level/block/GrindstoneBlock.java | 4 +- .../level/block/GrowingPlantBodyBlock.java | 4 +- .../level/block/GrowingPlantHeadBlock.java | 4 +- .../world/level/block/HangingMossBlock.java | 4 +- .../world/level/block/HangingRootsBlock.java | 4 +- .../world/level/block/HeavyCoreBlock.java | 4 +- .../world/level/block/HopperBlock.java | 4 +- .../world/level/block/HugeMushroomBlock.java | 4 +- .../block/InfestedRotatedPillarBlock.java | 8 +- .../world/level/block/IronBarsBlock.java | 4 +- .../world/level/block/JigsawBlock.java | 4 +- .../world/level/block/JukeboxBlock.java | 4 +- .../world/level/block/LadderBlock.java | 4 +- .../world/level/block/LanternBlock.java | 4 +- .../world/level/block/LavaCauldronBlock.java | 17 +- .../level/block/LayeredCauldronBlock.java | 44 +- .../world/level/block/LeafLitterBlock.java | 4 +- .../world/level/block/LeavesBlock.java | 4 +- .../world/level/block/LecternBlock.java | 7 +- .../world/level/block/LeverBlock.java | 4 +- .../world/level/block/LightBlock.java | 4 +- .../world/level/block/LightningRodBlock.java | 4 +- .../world/level/block/LiquidBlock.java | 7 +- .../level/block/MangrovePropaguleBlock.java | 4 +- .../world/level/block/MangroveRootsBlock.java | 4 +- .../world/level/block/MossyCarpetBlock.java | 4 +- .../world/level/block/MultifaceBlock.java | 3 +- .../world/level/block/NetherPortalBlock.java | 35 +- .../world/level/block/NetherWartBlock.java | 4 +- .../world/level/block/NoteBlock.java | 4 +- .../world/level/block/ObserverBlock.java | 4 +- .../world/level/block/PitcherCropBlock.java | 4 +- .../level/block/PointedDripstoneBlock.java | 7 +- .../world/level/block/PoweredRailBlock.java | 118 +- .../world/level/block/PressurePlateBlock.java | 4 +- .../world/level/block/RailBlock.java | 130 +- .../world/level/block/RedStoneOreBlock.java | 4 +- .../world/level/block/RedStoneWireBlock.java | 4 +- .../world/level/block/RedstoneLampBlock.java | 4 +- .../world/level/block/RedstoneTorchBlock.java | 4 +- .../level/block/RedstoneWallTorchBlock.java | 4 +- .../world/level/block/RepeaterBlock.java | 4 +- .../world/level/block/RespawnAnchorBlock.java | 10 +- .../world/level/block/RotatedPillarBlock.java | 4 +- net/minecraft/world/level/block/Rotation.java | 3 +- .../world/level/block/SandBlock.java | 2 +- .../world/level/block/SaplingBlock.java | 4 +- .../world/level/block/ScaffoldingBlock.java | 4 +- .../world/level/block/SculkBehaviour.java | 9 +- .../world/level/block/SculkCatalystBlock.java | 4 +- .../world/level/block/SculkSensorBlock.java | 11 +- .../world/level/block/SculkShriekerBlock.java | 4 +- .../world/level/block/SculkSpreader.java | 11 +- .../world/level/block/SculkVeinBlock.java | 14 +- .../world/level/block/SeaPickleBlock.java | 4 +- .../world/level/block/ShortDryGrassBlock.java | 6 + .../world/level/block/ShulkerBoxBlock.java | 7 +- .../world/level/block/SignBlock.java | 41 +- .../world/level/block/SkullBlock.java | 4 +- .../world/level/block/SlabBlock.java | 4 +- .../world/level/block/SmallDripleafBlock.java | 4 +- .../world/level/block/SnifferEggBlock.java | 7 +- .../world/level/block/SnowLayerBlock.java | 4 +- .../world/level/block/SnowyDirtBlock.java | 4 +- .../world/level/block/SoundType.java | 3 + .../world/level/block/StairBlock.java | 4 +- .../world/level/block/StandingSignBlock.java | 8 +- .../world/level/block/StemBlock.java | 4 +- .../world/level/block/StonecutterBlock.java | 4 +- .../world/level/block/StructureBlock.java | 4 +- .../world/level/block/SugarCaneBlock.java | 4 +- .../level/block/SweetBerryBushBlock.java | 9 +- .../world/level/block/TallDryGrassBlock.java | 6 + .../world/level/block/TargetBlock.java | 4 +- .../world/level/block/TerracottaBlock.java | 27 - .../world/level/block/TestBlock.java | 4 +- .../world/level/block/TestInstanceBlock.java | 2 +- net/minecraft/world/level/block/TntBlock.java | 4 +- .../level/block/TorchflowerCropBlock.java | 4 +- .../world/level/block/TrapDoorBlock.java | 4 +- .../world/level/block/TrialSpawnerBlock.java | 4 +- .../world/level/block/TripWireBlock.java | 4 +- .../world/level/block/TripWireHookBlock.java | 4 +- .../world/level/block/TurtleEggBlock.java | 11 +- .../world/level/block/VaultBlock.java | 4 +- .../world/level/block/VineBlock.java | 4 +- .../world/level/block/WallBannerBlock.java | 8 +- .../world/level/block/WallBlock.java | 4 +- .../level/block/WallHangingSignBlock.java | 8 +- .../world/level/block/WallSignBlock.java | 8 +- .../world/level/block/WallSkullBlock.java | 4 +- .../world/level/block/WallTorchBlock.java | 8 +- .../block/WaterloggedTransparentBlock.java | 4 +- .../block/WeightedPressurePlateBlock.java | 4 +- .../world/level/block/WitherRoseBlock.java | 4 +- .../world/level/block/WitherSkullBlock.java | 3 +- .../entity/AbstractFurnaceBlockEntity.java | 38 +- .../level/block/entity/BannerBlockEntity.java | 29 +- .../block/entity/BannerPatternLayers.java | 3 +- .../level/block/entity/BarrelBlockEntity.java | 20 +- .../entity/BaseContainerBlockEntity.java | 35 +- .../level/block/entity/BeaconBlockEntity.java | 43 +- .../block/entity/BeehiveBlockEntity.java | 58 +- .../world/level/block/entity/BlockEntity.java | 138 +- .../level/block/entity/BlockEntityType.java | 6 +- .../block/entity/BrewingStandBlockEntity.java | 24 +- .../block/entity/BrushableBlockEntity.java | 37 +- .../CalibratedSculkSensorBlockEntity.java | 7 +- .../block/entity/CampfireBlockEntity.java | 47 +- .../level/block/entity/ChestBlockEntity.java | 24 +- .../entity/ChiseledBookShelfBlockEntity.java | 27 +- .../block/entity/CommandBlockEntity.java | 38 +- .../block/entity/ComparatorBlockEntity.java | 16 +- .../block/entity/ConduitBlockEntity.java | 108 +- .../block/entity/CrafterBlockEntity.java | 40 +- .../entity/CreakingHeartBlockEntity.java | 20 +- .../block/entity/DecoratedPotBlockEntity.java | 34 +- .../block/entity/DispenserBlockEntity.java | 24 +- .../entity/EnchantingTableBlockEntity.java | 23 +- .../level/block/entity/HopperBlockEntity.java | 24 +- .../level/block/entity/JigsawBlockEntity.java | 38 +- .../block/entity/JukeboxBlockEntity.java | 30 +- .../block/entity/LecternBlockEntity.java | 25 +- .../RandomizableContainerBlockEntity.java | 14 +- .../entity/SculkCatalystBlockEntity.java | 27 +- .../block/entity/SculkSensorBlockEntity.java | 36 +- .../entity/SculkShriekerBlockEntity.java | 38 +- .../block/entity/ShulkerBoxBlockEntity.java | 24 +- .../level/block/entity/SignBlockEntity.java | 57 +- .../level/block/entity/SkullBlockEntity.java | 33 +- .../block/entity/SpawnerBlockEntity.java | 14 +- .../block/entity/StructureBlockEntity.java | 111 +- .../level/block/entity/TestBlockEntity.java | 18 +- .../block/entity/TestInstanceBlockEntity.java | 41 +- .../entity/TheEndGatewayBlockEntity.java | 26 +- .../block/entity/TheEndPortalBlockEntity.java | 4 +- .../block/entity/TrialSpawnerBlockEntity.java | 22 +- .../entity/trialspawner/PlayerDetector.java | 36 +- .../entity/trialspawner/TrialSpawner.java | 261 +- .../trialspawner/TrialSpawnerState.java | 96 +- ...erData.java => TrialSpawnerStateData.java} | 118 +- .../block/entity/vault/VaultBlockEntity.java | 32 +- .../level/block/piston/MovingPistonBlock.java | 7 +- .../level/block/piston/PistonBaseBlock.java | 11 +- .../level/block/piston/PistonHeadBlock.java | 4 +- .../block/piston/PistonMovingBlockEntity.java | 37 +- .../AmbientDesertBlockSoundsPlayer.java | 98 +- .../level/block/state/BlockBehaviour.java | 60 +- .../properties/BlockStateProperties.java | 1 + .../state/properties/BooleanProperty.java | 7 +- .../block/state/properties/EnumProperty.java | 7 +- .../state/properties/IntegerProperty.java | 7 +- .../block/state/properties/TestBlockMode.java | 3 +- .../world/level/chunk/ChunkAccess.java | 28 +- .../world/level/chunk/ChunkGenerator.java | 26 +- .../chunk/ChunkGeneratorStructureState.java | 7 +- .../world/level/chunk/EmptyLevelChunk.java | 5 - .../world/level/chunk/ImposterProtoChunk.java | 4 +- .../world/level/chunk/LevelChunk.java | 19 +- .../world/level/chunk/LevelChunkSection.java | 4 +- .../world/level/chunk/PalettedContainer.java | 66 +- .../world/level/chunk/ProtoChunk.java | 13 +- .../world/level/chunk/UpgradeData.java | 246 +- .../level/chunk/status/ChunkStatusTasks.java | 26 +- .../level/chunk/storage/ChunkStorage.java | 2 +- .../level/chunk/storage/EntityStorage.java | 54 +- .../world/level/chunk/storage/IOWorker.java | 4 +- .../level/chunk/storage/SectionStorage.java | 4 +- .../chunk/storage/SerializableChunkData.java | 47 +- .../level/dimension/DimensionDefaults.java | 2 + .../world/level/dimension/DimensionType.java | 27 +- .../level/dimension/end/EndDragonFight.java | 11 +- .../PersistentEntitySectionManager.java | 2 +- .../world/level/entity/UUIDLookup.java | 2 + .../gameevent/vibrations/VibrationSystem.java | 18 +- .../world/level/levelgen/Aquifer.java | 22 +- .../level/levelgen/DebugLevelSource.java | 4 +- .../world/level/levelgen/DensityFunction.java | 25 +- .../level/levelgen/DensityFunctions.java | 368 ++- .../world/level/levelgen/Heightmap.java | 3 +- .../levelgen/NoiseBasedChunkGenerator.java | 21 +- .../world/level/levelgen/NoiseChunk.java | 61 +- .../world/level/levelgen/NoiseRouterData.java | 54 +- .../world/level/levelgen/RandomState.java | 29 +- .../world/level/levelgen/SurfaceRules.java | 192 +- .../world/level/levelgen/SurfaceSystem.java | 17 +- .../world/level/levelgen/WorldDimensions.java | 19 +- .../level/levelgen/XoroshiroRandomSource.java | 5 +- .../level/levelgen/blending/Blender.java | 10 +- .../blockpredicates/AllOfPredicate.java | 4 +- .../levelgen/carver/CanyonWorldCarver.java | 41 +- .../levelgen/carver/CaveWorldCarver.java | 77 +- .../levelgen/feature/BlockColumnFeature.java | 5 +- .../levelgen/feature/FallenTreeFeature.java | 3 +- .../feature/LargeDripstoneFeature.java | 7 +- .../level/levelgen/feature/OreFeature.java | 5 +- .../levelgen/feature/ReplaceBlockFeature.java | 4 +- .../levelgen/feature/ScatteredOreFeature.java | 3 +- .../level/levelgen/feature/TreeFeature.java | 15 +- .../feature/VegetationPatchFeature.java | 4 +- .../MultifaceGrowthConfiguration.java | 3 +- .../stateproviders/DualNoiseProvider.java | 11 +- .../feature/stateproviders/NoiseProvider.java | 6 +- .../NoiseThresholdProvider.java | 4 +- .../treedecorators/AlterGroundDecorator.java | 7 +- .../AttachedToLogsDecorator.java | 3 +- .../treedecorators/BeehiveDecorator.java | 6 +- .../treedecorators/CocoaDecorator.java | 6 +- .../CreakingHeartDecorator.java | 3 +- .../treedecorators/PaleMossDecorator.java | 5 +- .../PlaceOnGroundDecorator.java | 9 +- .../trunkplacers/DarkOakTrunkPlacer.java | 17 +- .../trunkplacers/FancyTrunkPlacer.java | 24 +- .../trunkplacers/ForkingTrunkPlacer.java | 19 +- .../trunkplacers/GiantTrunkPlacer.java | 10 +- .../trunkplacers/MegaJungleTrunkPlacer.java | 12 +- .../trunkplacers/StraightTrunkPlacer.java | 10 +- .../level/levelgen/flat/FlatLayerInfo.java | 4 + .../levelgen/material/MaterialRuleList.java | 4 +- .../level/levelgen/presets/WorldPresets.java | 9 +- .../structure/ScatteredFeaturePiece.java | 12 +- .../structure/SinglePieceStructure.java | 4 +- .../level/levelgen/structure/Structure.java | 55 +- .../levelgen/structure/StructureCheck.java | 3 +- .../ConcentricRingsStructurePlacement.java | 4 +- .../structure/pools/JigsawPlacement.java | 15 +- .../pools/alias/DirectPoolAlias.java | 4 +- .../pools/alias/PoolAliasBinding.java | 2 +- .../pools/alias/RandomGroupPoolAlias.java | 4 +- .../pools/alias/RandomPoolAlias.java | 4 +- .../structures/BuriedTreasureStructure.java | 11 +- .../structures/EndCityStructure.java | 4 +- .../structure/structures/IglooStructure.java | 8 +- .../structure/structures/JigsawStructure.java | 13 +- .../structure/structures/MineshaftPieces.java | 6 +- .../structures/MineshaftStructure.java | 14 +- .../structures/NetherFortressPieces.java | 16 +- .../structures/NetherFortressStructure.java | 13 +- .../structures/NetherFossilPieces.java | 18 +- .../structures/OceanMonumentPieces.java | 4 +- .../structures/OceanMonumentStructure.java | 13 +- .../structures/OceanRuinStructure.java | 9 +- .../structures/RuinedPortalStructure.java | 11 +- .../structures/ShipwreckStructure.java | 7 +- .../structures/StrongholdPieces.java | 78 +- .../structures/StrongholdStructure.java | 4 +- .../structures/SwampHutStructure.java | 8 +- .../structures/WoodlandMansionPieces.java | 2 +- .../structures/WoodlandMansionStructure.java | 7 +- .../templatesystem/StructureTemplate.java | 275 +- .../level/lighting/LevelLightEngine.java | 5 +- .../world/level/material/FlowingFluid.java | 4 +- net/minecraft/world/level/material/Fluid.java | 11 +- .../world/level/material/FogType.java | 2 + .../world/level/material/LavaFluid.java | 4 +- .../world/level/material/WaterFluid.java | 4 +- .../world/level/pathfinder/Path.java | 8 +- .../level/pathfinder/SwimNodeEvaluator.java | 3 +- .../world/level/pathfinder/Target.java | 4 +- .../level/pathfinder/WalkNodeEvaluator.java | 10 +- .../world/level/portal/PortalForcer.java | 6 +- .../world/level/portal/PortalShape.java | 4 +- .../level/portal/TeleportTransition.java | 6 +- .../DefaultRedstoneWireEvaluator.java | 4 +- .../ExperimentalRedstoneWireEvaluator.java | 7 +- .../saveddata/maps/MapItemSavedData.java | 3 +- .../world/level/storage/DataVersion.java | 27 +- .../level/storage/DimensionDataStorage.java | 2 +- .../level/storage/LevelStorageSource.java | 70 +- .../world/level/storage/LevelSummary.java | 8 +- .../world/level/storage/LevelVersion.java | 10 +- .../level/storage/PlayerDataStorage.java | 16 +- .../world/level/storage/PrimaryLevelData.java | 8 +- .../world/level/storage/TagValueInput.java | 459 ++++ .../world/level/storage/TagValueOutput.java | 244 ++ .../world/level/storage/ValueInput.java | 65 + .../storage/ValueInputContextHelper.java | 177 ++ .../world/level/storage/ValueOutput.java | 56 + .../level/storage/loot/LootDataType.java | 5 +- .../world/level/storage/loot/LootParams.java | 4 +- .../world/level/storage/loot/LootPool.java | 19 +- .../world/level/storage/loot/LootTable.java | 9 +- .../level/storage/loot/ValidationContext.java | 46 +- .../loot/entries/AlternativesEntry.java | 13 +- .../loot/entries/CompositeEntryBase.java | 11 +- .../storage/loot/entries/EntryGroup.java | 4 +- .../loot/entries/LootPoolEntryContainer.java | 7 +- .../entries/LootPoolSingletonContainer.java | 7 +- .../storage/loot/entries/NestedLootTable.java | 18 +- .../storage/loot/entries/SequentialEntry.java | 4 +- .../functions/CopyCustomDataFunction.java | 37 +- .../functions/EnchantRandomlyFunction.java | 4 +- .../functions/EnchantWithLevelsFunction.java | 4 +- .../functions/ExplorationMapFunction.java | 4 +- .../loot/functions/FilteredFunction.java | 3 +- .../loot/functions/FunctionReference.java | 9 +- .../LootItemConditionalFunction.java | 3 +- .../functions/ModifyContainerContents.java | 3 +- .../loot/functions/SequenceFunction.java | 3 +- .../loot/functions/SetAttributesFunction.java | 13 +- .../loot/functions/SetBookCoverFunction.java | 4 +- .../loot/functions/SetContainerContents.java | 3 +- .../loot/functions/SetContainerLootTable.java | 4 +- .../functions/SetCustomModelDataFunction.java | 35 +- .../CompositeLootItemCondition.java | 3 +- .../loot/predicates/ConditionReference.java | 9 +- ...ndomChanceWithEnchantedBonusCondition.java | 3 +- net/minecraft/world/phys/AABB.java | 11 + net/minecraft/world/phys/BlockHitResult.java | 5 +- net/minecraft/world/phys/Vec3.java | 4 + .../phys/shapes/BitSetDiscreteVoxelShape.java | 12 +- .../world/phys/shapes/CollisionContext.java | 16 +- .../world/phys/shapes/CubeVoxelShape.java | 4 +- net/minecraft/world/scores/DisplaySlot.java | 3 +- net/minecraft/world/scores/Team.java | 5 +- .../world/waypoints/TrackedWaypoint.java | 324 +++ .../waypoints/TrackedWaypointManager.java | 4 + net/minecraft/world/waypoints/Waypoint.java | 77 + .../world/waypoints/WaypointManager.java | 9 + .../world/waypoints/WaypointStyleAsset.java | 4 + .../world/waypoints/WaypointStyleAssets.java | 15 + .../world/waypoints/WaypointTransmitter.java | 198 ++ version.json | 14 +- 6575 files changed, 59341 insertions(+), 37421 deletions(-) delete mode 100644 assets/minecraft/atlases/mob_effects.json create mode 100644 assets/minecraft/blockstates/dried_ghast.json create mode 100644 assets/minecraft/equipment/black_harness.json create mode 100644 assets/minecraft/equipment/blue_harness.json create mode 100644 assets/minecraft/equipment/brown_harness.json create mode 100644 assets/minecraft/equipment/cyan_harness.json create mode 100644 assets/minecraft/equipment/gray_harness.json create mode 100644 assets/minecraft/equipment/green_harness.json create mode 100644 assets/minecraft/equipment/light_blue_harness.json create mode 100644 assets/minecraft/equipment/light_gray_harness.json create mode 100644 assets/minecraft/equipment/lime_harness.json create mode 100644 assets/minecraft/equipment/magenta_harness.json create mode 100644 assets/minecraft/equipment/orange_harness.json create mode 100644 assets/minecraft/equipment/pink_harness.json create mode 100644 assets/minecraft/equipment/purple_harness.json create mode 100644 assets/minecraft/equipment/red_harness.json create mode 100644 assets/minecraft/equipment/white_harness.json create mode 100644 assets/minecraft/equipment/yellow_harness.json create mode 100644 assets/minecraft/items/black_harness.json create mode 100644 assets/minecraft/items/blue_harness.json create mode 100644 assets/minecraft/items/brown_harness.json create mode 100644 assets/minecraft/items/cyan_harness.json create mode 100644 assets/minecraft/items/dried_ghast.json create mode 100644 assets/minecraft/items/gray_harness.json create mode 100644 assets/minecraft/items/green_harness.json create mode 100644 assets/minecraft/items/happy_ghast_spawn_egg.json create mode 100644 assets/minecraft/items/light_blue_harness.json create mode 100644 assets/minecraft/items/light_gray_harness.json create mode 100644 assets/minecraft/items/lime_harness.json create mode 100644 assets/minecraft/items/magenta_harness.json create mode 100644 assets/minecraft/items/music_disc_tears.json create mode 100644 assets/minecraft/items/orange_harness.json create mode 100644 assets/minecraft/items/pink_harness.json create mode 100644 assets/minecraft/items/purple_harness.json create mode 100644 assets/minecraft/items/red_harness.json create mode 100644 assets/minecraft/items/white_harness.json create mode 100644 assets/minecraft/items/yellow_harness.json create mode 100644 assets/minecraft/models/block/dried_ghast.json create mode 100644 assets/minecraft/models/block/dried_ghast_hydration_0.json create mode 100644 assets/minecraft/models/block/dried_ghast_hydration_1.json create mode 100644 assets/minecraft/models/block/dried_ghast_hydration_2.json create mode 100644 assets/minecraft/models/block/dried_ghast_hydration_3.json create mode 100644 assets/minecraft/models/item/black_harness.json create mode 100644 assets/minecraft/models/item/blue_harness.json create mode 100644 assets/minecraft/models/item/brown_harness.json create mode 100644 assets/minecraft/models/item/cyan_harness.json create mode 100644 assets/minecraft/models/item/gray_harness.json create mode 100644 assets/minecraft/models/item/green_harness.json create mode 100644 assets/minecraft/models/item/happy_ghast_spawn_egg.json create mode 100644 assets/minecraft/models/item/light_blue_harness.json create mode 100644 assets/minecraft/models/item/light_gray_harness.json create mode 100644 assets/minecraft/models/item/lime_harness.json create mode 100644 assets/minecraft/models/item/magenta_harness.json create mode 100644 assets/minecraft/models/item/music_disc_tears.json create mode 100644 assets/minecraft/models/item/orange_harness.json create mode 100644 assets/minecraft/models/item/pink_harness.json create mode 100644 assets/minecraft/models/item/purple_harness.json create mode 100644 assets/minecraft/models/item/red_harness.json create mode 100644 assets/minecraft/models/item/white_harness.json create mode 100644 assets/minecraft/models/item/yellow_harness.json create mode 100644 assets/minecraft/shaders/core/panorama.fsh create mode 100644 assets/minecraft/shaders/core/panorama.vsh create mode 100644 assets/minecraft/shaders/core/sky.fsh create mode 100644 assets/minecraft/shaders/core/sky.vsh create mode 100644 assets/minecraft/shaders/core/stars.fsh create mode 100644 assets/minecraft/shaders/core/stars.vsh create mode 100644 assets/minecraft/shaders/include/dynamictransforms.glsl create mode 100644 assets/minecraft/shaders/include/globals.glsl create mode 100644 assets/minecraft/textures/block/dried_ghast_hydration_0_bottom.png create mode 100644 assets/minecraft/textures/block/dried_ghast_hydration_0_east.png create mode 100644 assets/minecraft/textures/block/dried_ghast_hydration_0_north.png create mode 100644 assets/minecraft/textures/block/dried_ghast_hydration_0_south.png create mode 100644 assets/minecraft/textures/block/dried_ghast_hydration_0_tentacles.png create mode 100644 assets/minecraft/textures/block/dried_ghast_hydration_0_top.png create mode 100644 assets/minecraft/textures/block/dried_ghast_hydration_0_west.png create mode 100644 assets/minecraft/textures/block/dried_ghast_hydration_1_bottom.png create mode 100644 assets/minecraft/textures/block/dried_ghast_hydration_1_east.png create mode 100644 assets/minecraft/textures/block/dried_ghast_hydration_1_north.png create mode 100644 assets/minecraft/textures/block/dried_ghast_hydration_1_south.png create mode 100644 assets/minecraft/textures/block/dried_ghast_hydration_1_tentacles.png create mode 100644 assets/minecraft/textures/block/dried_ghast_hydration_1_top.png create mode 100644 assets/minecraft/textures/block/dried_ghast_hydration_1_west.png create mode 100644 assets/minecraft/textures/block/dried_ghast_hydration_2_bottom.png create mode 100644 assets/minecraft/textures/block/dried_ghast_hydration_2_east.png create mode 100644 assets/minecraft/textures/block/dried_ghast_hydration_2_north.png create mode 100644 assets/minecraft/textures/block/dried_ghast_hydration_2_south.png create mode 100644 assets/minecraft/textures/block/dried_ghast_hydration_2_tentacles.png create mode 100644 assets/minecraft/textures/block/dried_ghast_hydration_2_top.png create mode 100644 assets/minecraft/textures/block/dried_ghast_hydration_2_west.png create mode 100644 assets/minecraft/textures/block/dried_ghast_hydration_3_bottom.png create mode 100644 assets/minecraft/textures/block/dried_ghast_hydration_3_east.png create mode 100644 assets/minecraft/textures/block/dried_ghast_hydration_3_north.png create mode 100644 assets/minecraft/textures/block/dried_ghast_hydration_3_south.png create mode 100644 assets/minecraft/textures/block/dried_ghast_hydration_3_tentacles.png create mode 100644 assets/minecraft/textures/block/dried_ghast_hydration_3_top.png create mode 100644 assets/minecraft/textures/block/dried_ghast_hydration_3_west.png create mode 100644 assets/minecraft/textures/entity/equipment/happy_ghast_body/black_harness.png create mode 100644 assets/minecraft/textures/entity/equipment/happy_ghast_body/blue_harness.png create mode 100644 assets/minecraft/textures/entity/equipment/happy_ghast_body/brown_harness.png create mode 100644 assets/minecraft/textures/entity/equipment/happy_ghast_body/cyan_harness.png create mode 100644 assets/minecraft/textures/entity/equipment/happy_ghast_body/gray_harness.png create mode 100644 assets/minecraft/textures/entity/equipment/happy_ghast_body/green_harness.png create mode 100644 assets/minecraft/textures/entity/equipment/happy_ghast_body/light_blue_harness.png create mode 100644 assets/minecraft/textures/entity/equipment/happy_ghast_body/light_gray_harness.png create mode 100644 assets/minecraft/textures/entity/equipment/happy_ghast_body/lime_harness.png create mode 100644 assets/minecraft/textures/entity/equipment/happy_ghast_body/magenta_harness.png create mode 100644 assets/minecraft/textures/entity/equipment/happy_ghast_body/orange_harness.png create mode 100644 assets/minecraft/textures/entity/equipment/happy_ghast_body/pink_harness.png create mode 100644 assets/minecraft/textures/entity/equipment/happy_ghast_body/purple_harness.png create mode 100644 assets/minecraft/textures/entity/equipment/happy_ghast_body/red_harness.png create mode 100644 assets/minecraft/textures/entity/equipment/happy_ghast_body/white_harness.png create mode 100644 assets/minecraft/textures/entity/equipment/happy_ghast_body/yellow_harness.png create mode 100644 assets/minecraft/textures/entity/ghast/happy_ghast.png create mode 100644 assets/minecraft/textures/entity/ghast/happy_ghast_baby.png create mode 100644 assets/minecraft/textures/entity/ghast/happy_ghast_ropes.png create mode 100644 assets/minecraft/textures/gui/sprites/dialog/warning_button.png create mode 100644 assets/minecraft/textures/gui/sprites/dialog/warning_button_disabled.png create mode 100644 assets/minecraft/textures/gui/sprites/dialog/warning_button_highlighted.png create mode 100644 assets/minecraft/textures/gui/sprites/hud/locator_bar_arrow_down.png create mode 100644 assets/minecraft/textures/gui/sprites/hud/locator_bar_arrow_down.png.mcmeta create mode 100644 assets/minecraft/textures/gui/sprites/hud/locator_bar_arrow_up.png create mode 100644 assets/minecraft/textures/gui/sprites/hud/locator_bar_arrow_up.png.mcmeta create mode 100644 assets/minecraft/textures/gui/sprites/hud/locator_bar_background.png create mode 100644 assets/minecraft/textures/gui/sprites/hud/locator_bar_background.png.mcmeta create mode 100644 assets/minecraft/textures/gui/sprites/hud/locator_bar_dot/bowtie.png create mode 100644 assets/minecraft/textures/gui/sprites/hud/locator_bar_dot/default_0.png create mode 100644 assets/minecraft/textures/gui/sprites/hud/locator_bar_dot/default_1.png create mode 100644 assets/minecraft/textures/gui/sprites/hud/locator_bar_dot/default_2.png create mode 100644 assets/minecraft/textures/gui/sprites/hud/locator_bar_dot/default_3.png create mode 100644 assets/minecraft/textures/gui/sprites/icon/music_notes.png create mode 100644 assets/minecraft/textures/gui/sprites/icon/music_notes.png.mcmeta create mode 100644 assets/minecraft/textures/gui/sprites/toast/now_playing.png create mode 100644 assets/minecraft/textures/gui/sprites/toast/now_playing.png.mcmeta delete mode 100644 assets/minecraft/textures/gui/title/edition.png.mcmeta delete mode 100644 assets/minecraft/textures/gui/title/minceraft.png.mcmeta delete mode 100644 assets/minecraft/textures/gui/title/minecraft.png.mcmeta delete mode 100644 assets/minecraft/textures/gui/title/realms.png.mcmeta create mode 100644 assets/minecraft/textures/item/black_harness.png create mode 100644 assets/minecraft/textures/item/blue_harness.png create mode 100644 assets/minecraft/textures/item/brown_harness.png create mode 100644 assets/minecraft/textures/item/cyan_harness.png create mode 100644 assets/minecraft/textures/item/gray_harness.png create mode 100644 assets/minecraft/textures/item/green_harness.png create mode 100644 assets/minecraft/textures/item/happy_ghast_spawn_egg.png create mode 100644 assets/minecraft/textures/item/light_blue_harness.png create mode 100644 assets/minecraft/textures/item/light_gray_harness.png create mode 100644 assets/minecraft/textures/item/lime_harness.png create mode 100644 assets/minecraft/textures/item/magenta_harness.png create mode 100644 assets/minecraft/textures/item/music_disc_tears.png create mode 100644 assets/minecraft/textures/item/orange_harness.png create mode 100644 assets/minecraft/textures/item/pink_harness.png create mode 100644 assets/minecraft/textures/item/purple_harness.png create mode 100644 assets/minecraft/textures/item/red_harness.png create mode 100644 assets/minecraft/textures/item/white_harness.png create mode 100644 assets/minecraft/textures/item/yellow_harness.png create mode 100644 assets/minecraft/waypoint_style/bowtie.json create mode 100644 assets/minecraft/waypoint_style/default.json delete mode 100644 com/mojang/blaze3d/buffers/BufferType.java delete mode 100644 com/mojang/blaze3d/buffers/BufferUsage.java create mode 100644 com/mojang/blaze3d/buffers/GpuBufferSlice.java create mode 100644 com/mojang/blaze3d/buffers/Std140Builder.java create mode 100644 com/mojang/blaze3d/buffers/Std140SizeCalculator.java delete mode 100644 com/mojang/blaze3d/opengl/AbstractUniform.java create mode 100644 com/mojang/blaze3d/opengl/BufferStorage.java create mode 100644 com/mojang/blaze3d/opengl/GlFence.java create mode 100644 com/mojang/blaze3d/opengl/GlTextureView.java delete mode 100644 com/mojang/blaze3d/shaders/FogShape.java create mode 100644 com/mojang/blaze3d/textures/GpuTextureView.java create mode 100644 com/mojang/realmsclient/dto/Exclude.java create mode 100644 com/mojang/realmsclient/dto/PreferredRegionsDto.java create mode 100644 com/mojang/realmsclient/dto/RealmsConfigurationDto.java create mode 100644 com/mojang/realmsclient/dto/RealmsJoinInformation.java create mode 100644 com/mojang/realmsclient/dto/RealmsRegion.java delete mode 100644 com/mojang/realmsclient/dto/RealmsServerAddress.java create mode 100644 com/mojang/realmsclient/dto/RealmsSetting.java delete mode 100644 com/mojang/realmsclient/dto/RealmsSettings.java create mode 100644 com/mojang/realmsclient/dto/RealmsSlot.java create mode 100644 com/mojang/realmsclient/dto/RealmsSlotUpdateDto.java create mode 100644 com/mojang/realmsclient/dto/RegionDataDto.java create mode 100644 com/mojang/realmsclient/dto/RegionSelectionPreference.java create mode 100644 com/mojang/realmsclient/dto/RegionSelectionPreferenceDto.java create mode 100644 com/mojang/realmsclient/dto/ServiceQuality.java delete mode 100644 com/mojang/realmsclient/gui/screens/RealmsConfigureWorldScreen.java create mode 100644 com/mojang/realmsclient/gui/screens/RealmsLongRunningMcoConnectTaskScreen.java delete mode 100644 com/mojang/realmsclient/gui/screens/RealmsLongRunningMcoTickTaskScreen.java delete mode 100644 com/mojang/realmsclient/gui/screens/RealmsSettingsScreen.java delete mode 100644 com/mojang/realmsclient/gui/screens/RealmsSubscriptionInfoScreen.java rename com/mojang/realmsclient/gui/screens/{ => configuration}/RealmsBackupInfoScreen.java (99%) rename com/mojang/realmsclient/gui/screens/{ => configuration}/RealmsBackupScreen.java (90%) create mode 100644 com/mojang/realmsclient/gui/screens/configuration/RealmsConfigurationTab.java create mode 100644 com/mojang/realmsclient/gui/screens/configuration/RealmsConfigureWorldScreen.java rename com/mojang/realmsclient/gui/screens/{ => configuration}/RealmsInviteScreen.java (68%) rename com/mojang/realmsclient/gui/screens/{RealmsPlayerScreen.java => configuration/RealmsPlayersTab.java} (52%) create mode 100644 com/mojang/realmsclient/gui/screens/configuration/RealmsPreferredRegionSelectionScreen.java create mode 100644 com/mojang/realmsclient/gui/screens/configuration/RealmsSettingsTab.java rename com/mojang/realmsclient/gui/screens/{ => configuration}/RealmsSlotOptionsScreen.java (68%) create mode 100644 com/mojang/realmsclient/gui/screens/configuration/RealmsSubscriptionTab.java create mode 100644 com/mojang/realmsclient/gui/screens/configuration/RealmsWorldsTab.java create mode 100644 com/mojang/realmsclient/gui/screens/configuration/package-info.java create mode 100644 data/minecraft/advancement/adventure/heart_transplanter.json create mode 100644 data/minecraft/advancement/husbandry/place_dried_ghast_in_water.json create mode 100644 data/minecraft/advancement/recipes/building_blocks/dried_ghast.json create mode 100644 data/minecraft/advancement/recipes/combat/black_harness.json create mode 100644 data/minecraft/advancement/recipes/combat/blue_harness.json create mode 100644 data/minecraft/advancement/recipes/combat/brown_harness.json create mode 100644 data/minecraft/advancement/recipes/combat/cyan_harness.json create mode 100644 data/minecraft/advancement/recipes/combat/dye_black_harness.json create mode 100644 data/minecraft/advancement/recipes/combat/dye_blue_harness.json create mode 100644 data/minecraft/advancement/recipes/combat/dye_brown_harness.json create mode 100644 data/minecraft/advancement/recipes/combat/dye_cyan_harness.json create mode 100644 data/minecraft/advancement/recipes/combat/dye_gray_harness.json create mode 100644 data/minecraft/advancement/recipes/combat/dye_green_harness.json create mode 100644 data/minecraft/advancement/recipes/combat/dye_light_blue_harness.json create mode 100644 data/minecraft/advancement/recipes/combat/dye_light_gray_harness.json create mode 100644 data/minecraft/advancement/recipes/combat/dye_lime_harness.json create mode 100644 data/minecraft/advancement/recipes/combat/dye_magenta_harness.json create mode 100644 data/minecraft/advancement/recipes/combat/dye_orange_harness.json create mode 100644 data/minecraft/advancement/recipes/combat/dye_pink_harness.json create mode 100644 data/minecraft/advancement/recipes/combat/dye_purple_harness.json create mode 100644 data/minecraft/advancement/recipes/combat/dye_red_harness.json create mode 100644 data/minecraft/advancement/recipes/combat/dye_white_harness.json create mode 100644 data/minecraft/advancement/recipes/combat/dye_yellow_harness.json create mode 100644 data/minecraft/advancement/recipes/combat/gray_harness.json create mode 100644 data/minecraft/advancement/recipes/combat/green_harness.json create mode 100644 data/minecraft/advancement/recipes/combat/light_blue_harness.json create mode 100644 data/minecraft/advancement/recipes/combat/light_gray_harness.json create mode 100644 data/minecraft/advancement/recipes/combat/lime_harness.json create mode 100644 data/minecraft/advancement/recipes/combat/magenta_harness.json create mode 100644 data/minecraft/advancement/recipes/combat/orange_harness.json create mode 100644 data/minecraft/advancement/recipes/combat/pink_harness.json create mode 100644 data/minecraft/advancement/recipes/combat/purple_harness.json create mode 100644 data/minecraft/advancement/recipes/combat/red_harness.json create mode 100644 data/minecraft/advancement/recipes/combat/saddle.json create mode 100644 data/minecraft/advancement/recipes/combat/white_harness.json create mode 100644 data/minecraft/advancement/recipes/combat/yellow_harness.json rename data/minecraft/advancement/recipes/{building_blocks => decorations}/dye_black_bed.json (100%) rename data/minecraft/advancement/recipes/{building_blocks => decorations}/dye_black_carpet.json (100%) rename data/minecraft/advancement/recipes/{building_blocks => decorations}/dye_blue_bed.json (100%) rename data/minecraft/advancement/recipes/{building_blocks => decorations}/dye_blue_carpet.json (100%) rename data/minecraft/advancement/recipes/{building_blocks => decorations}/dye_brown_bed.json (100%) rename data/minecraft/advancement/recipes/{building_blocks => decorations}/dye_brown_carpet.json (100%) rename data/minecraft/advancement/recipes/{building_blocks => decorations}/dye_cyan_bed.json (100%) rename data/minecraft/advancement/recipes/{building_blocks => decorations}/dye_cyan_carpet.json (100%) rename data/minecraft/advancement/recipes/{building_blocks => decorations}/dye_gray_bed.json (100%) rename data/minecraft/advancement/recipes/{building_blocks => decorations}/dye_gray_carpet.json (100%) rename data/minecraft/advancement/recipes/{building_blocks => decorations}/dye_green_bed.json (100%) rename data/minecraft/advancement/recipes/{building_blocks => decorations}/dye_green_carpet.json (100%) rename data/minecraft/advancement/recipes/{building_blocks => decorations}/dye_light_blue_bed.json (100%) rename data/minecraft/advancement/recipes/{building_blocks => decorations}/dye_light_blue_carpet.json (100%) rename data/minecraft/advancement/recipes/{building_blocks => decorations}/dye_light_gray_bed.json (100%) rename data/minecraft/advancement/recipes/{building_blocks => decorations}/dye_light_gray_carpet.json (100%) rename data/minecraft/advancement/recipes/{building_blocks => decorations}/dye_lime_bed.json (100%) rename data/minecraft/advancement/recipes/{building_blocks => decorations}/dye_lime_carpet.json (100%) rename data/minecraft/advancement/recipes/{building_blocks => decorations}/dye_magenta_bed.json (100%) rename data/minecraft/advancement/recipes/{building_blocks => decorations}/dye_magenta_carpet.json (100%) rename data/minecraft/advancement/recipes/{building_blocks => decorations}/dye_orange_bed.json (100%) rename data/minecraft/advancement/recipes/{building_blocks => decorations}/dye_orange_carpet.json (100%) rename data/minecraft/advancement/recipes/{building_blocks => decorations}/dye_pink_bed.json (100%) rename data/minecraft/advancement/recipes/{building_blocks => decorations}/dye_pink_carpet.json (100%) rename data/minecraft/advancement/recipes/{building_blocks => decorations}/dye_purple_bed.json (100%) rename data/minecraft/advancement/recipes/{building_blocks => decorations}/dye_purple_carpet.json (100%) rename data/minecraft/advancement/recipes/{building_blocks => decorations}/dye_red_bed.json (100%) rename data/minecraft/advancement/recipes/{building_blocks => decorations}/dye_red_carpet.json (100%) rename data/minecraft/advancement/recipes/{building_blocks => decorations}/dye_white_bed.json (100%) rename data/minecraft/advancement/recipes/{building_blocks => decorations}/dye_white_carpet.json (100%) rename data/minecraft/advancement/recipes/{building_blocks => decorations}/dye_yellow_bed.json (100%) rename data/minecraft/advancement/recipes/{building_blocks => decorations}/dye_yellow_carpet.json (100%) create mode 100644 data/minecraft/dialog/custom_options.json create mode 100644 data/minecraft/dialog/quick_actions.json create mode 100644 data/minecraft/dialog/server_links.json create mode 100644 data/minecraft/jukebox_song/tears.json create mode 100644 data/minecraft/loot_table/blocks/dried_ghast.json create mode 100644 data/minecraft/loot_table/entities/happy_ghast.json create mode 100644 data/minecraft/recipe/black_harness.json create mode 100644 data/minecraft/recipe/blue_harness.json create mode 100644 data/minecraft/recipe/brown_harness.json create mode 100644 data/minecraft/recipe/cyan_harness.json create mode 100644 data/minecraft/recipe/dried_ghast.json create mode 100644 data/minecraft/recipe/dye_black_harness.json create mode 100644 data/minecraft/recipe/dye_blue_harness.json create mode 100644 data/minecraft/recipe/dye_brown_harness.json create mode 100644 data/minecraft/recipe/dye_cyan_harness.json create mode 100644 data/minecraft/recipe/dye_gray_harness.json create mode 100644 data/minecraft/recipe/dye_green_harness.json create mode 100644 data/minecraft/recipe/dye_light_blue_harness.json create mode 100644 data/minecraft/recipe/dye_light_gray_harness.json create mode 100644 data/minecraft/recipe/dye_lime_harness.json create mode 100644 data/minecraft/recipe/dye_magenta_harness.json create mode 100644 data/minecraft/recipe/dye_orange_harness.json create mode 100644 data/minecraft/recipe/dye_pink_harness.json create mode 100644 data/minecraft/recipe/dye_purple_harness.json create mode 100644 data/minecraft/recipe/dye_red_harness.json create mode 100644 data/minecraft/recipe/dye_white_harness.json create mode 100644 data/minecraft/recipe/dye_yellow_harness.json create mode 100644 data/minecraft/recipe/gray_harness.json create mode 100644 data/minecraft/recipe/green_harness.json create mode 100644 data/minecraft/recipe/light_blue_harness.json create mode 100644 data/minecraft/recipe/light_gray_harness.json create mode 100644 data/minecraft/recipe/lime_harness.json create mode 100644 data/minecraft/recipe/magenta_harness.json create mode 100644 data/minecraft/recipe/orange_harness.json create mode 100644 data/minecraft/recipe/pink_harness.json create mode 100644 data/minecraft/recipe/purple_harness.json create mode 100644 data/minecraft/recipe/red_harness.json create mode 100644 data/minecraft/recipe/saddle.json create mode 100644 data/minecraft/recipe/white_harness.json create mode 100644 data/minecraft/recipe/yellow_harness.json create mode 100644 data/minecraft/tags/block/happy_ghast_avoids.json rename data/minecraft/tags/block/{plays_ambient_desert_block_sounds.json => triggers_ambient_desert_dry_vegetation_block_sounds.json} (100%) create mode 100644 data/minecraft/tags/block/triggers_ambient_desert_sand_block_sounds.json create mode 100644 data/minecraft/tags/block/triggers_ambient_dried_ghast_block_sounds.json create mode 100644 data/minecraft/tags/dialog/pause_screen_additions.json create mode 100644 data/minecraft/tags/dialog/quick_actions.json create mode 100644 data/minecraft/tags/entity_type/can_equip_harness.json create mode 100644 data/minecraft/tags/entity_type/followable_friendly_mobs.json create mode 100644 data/minecraft/tags/item/happy_ghast_food.json create mode 100644 data/minecraft/tags/item/happy_ghast_tempt_items.json create mode 100644 data/minecraft/tags/item/harnesses.json create mode 100644 net/minecraft/client/animation/KeyframeAnimation.java create mode 100644 net/minecraft/client/color/ColorLerper.java create mode 100644 net/minecraft/client/data/models/WaypointStyleProvider.java delete mode 100644 net/minecraft/client/gui/LayeredDraw.java create mode 100644 net/minecraft/client/gui/components/ItemDisplayWidget.java create mode 100644 net/minecraft/client/gui/components/ScrollableLayout.java create mode 100644 net/minecraft/client/gui/components/tabs/LoadingTab.java create mode 100644 net/minecraft/client/gui/components/toasts/NowPlayingToast.java create mode 100644 net/minecraft/client/gui/contextualbar/ContextualBarRenderer.java create mode 100644 net/minecraft/client/gui/contextualbar/ExperienceBarRenderer.java create mode 100644 net/minecraft/client/gui/contextualbar/JumpableVehicleBarRenderer.java create mode 100644 net/minecraft/client/gui/contextualbar/LocatorBarRenderer.java create mode 100644 net/minecraft/client/gui/render/GuiRenderer.java create mode 100644 net/minecraft/client/gui/render/TextureSetup.java create mode 100644 net/minecraft/client/gui/render/package-info.java create mode 100644 net/minecraft/client/gui/render/pip/GuiBannerResultRenderer.java create mode 100644 net/minecraft/client/gui/render/pip/GuiBookModelRenderer.java create mode 100644 net/minecraft/client/gui/render/pip/GuiEntityRenderer.java create mode 100644 net/minecraft/client/gui/render/pip/GuiProfilerChartRenderer.java create mode 100644 net/minecraft/client/gui/render/pip/GuiSignRenderer.java create mode 100644 net/minecraft/client/gui/render/pip/GuiSkinRenderer.java create mode 100644 net/minecraft/client/gui/render/pip/OversizedItemRenderer.java create mode 100644 net/minecraft/client/gui/render/pip/PictureInPictureRenderer.java create mode 100644 net/minecraft/client/gui/render/pip/package-info.java create mode 100644 net/minecraft/client/gui/render/state/BlitRenderState.java create mode 100644 net/minecraft/client/gui/render/state/ColoredRectangleRenderState.java create mode 100644 net/minecraft/client/gui/render/state/GlyphEffectRenderState.java create mode 100644 net/minecraft/client/gui/render/state/GlyphRenderState.java create mode 100644 net/minecraft/client/gui/render/state/GuiElementRenderState.java create mode 100644 net/minecraft/client/gui/render/state/GuiItemRenderState.java create mode 100644 net/minecraft/client/gui/render/state/GuiRenderState.java create mode 100644 net/minecraft/client/gui/render/state/GuiTextRenderState.java create mode 100644 net/minecraft/client/gui/render/state/ScreenArea.java create mode 100644 net/minecraft/client/gui/render/state/package-info.java create mode 100644 net/minecraft/client/gui/render/state/pip/GuiBannerResultRenderState.java create mode 100644 net/minecraft/client/gui/render/state/pip/GuiBookModelRenderState.java create mode 100644 net/minecraft/client/gui/render/state/pip/GuiEntityRenderState.java create mode 100644 net/minecraft/client/gui/render/state/pip/GuiProfilerChartRenderState.java create mode 100644 net/minecraft/client/gui/render/state/pip/GuiSignRenderState.java create mode 100644 net/minecraft/client/gui/render/state/pip/GuiSkinRenderState.java create mode 100644 net/minecraft/client/gui/render/state/pip/OversizedItemRenderState.java create mode 100644 net/minecraft/client/gui/render/state/pip/PictureInPictureRenderState.java create mode 100644 net/minecraft/client/gui/render/state/pip/package-info.java create mode 100644 net/minecraft/client/gui/screens/dialog/ButtonListDialogScreen.java create mode 100644 net/minecraft/client/gui/screens/dialog/DialogConnectionAccess.java create mode 100644 net/minecraft/client/gui/screens/dialog/DialogControlSet.java create mode 100644 net/minecraft/client/gui/screens/dialog/DialogListDialogScreen.java create mode 100644 net/minecraft/client/gui/screens/dialog/DialogScreen.java create mode 100644 net/minecraft/client/gui/screens/dialog/DialogScreens.java create mode 100644 net/minecraft/client/gui/screens/dialog/MultiButtonDialogScreen.java create mode 100644 net/minecraft/client/gui/screens/dialog/ServerLinksDialogScreen.java create mode 100644 net/minecraft/client/gui/screens/dialog/SimpleDialogScreen.java create mode 100644 net/minecraft/client/gui/screens/dialog/WaitingForResponseScreen.java create mode 100644 net/minecraft/client/gui/screens/dialog/body/DialogBodyHandler.java create mode 100644 net/minecraft/client/gui/screens/dialog/body/DialogBodyHandlers.java create mode 100644 net/minecraft/client/gui/screens/dialog/body/package-info.java create mode 100644 net/minecraft/client/gui/screens/dialog/input/InputControlHandler.java create mode 100644 net/minecraft/client/gui/screens/dialog/input/InputControlHandlers.java create mode 100644 net/minecraft/client/gui/screens/dialog/input/package-info.java create mode 100644 net/minecraft/client/gui/screens/dialog/package-info.java create mode 100644 net/minecraft/client/gui/screens/inventory/BookSignScreen.java delete mode 100644 net/minecraft/client/gui/screens/multiplayer/ServerLinksScreen.java create mode 100644 net/minecraft/client/model/HappyGhastHarnessModel.java create mode 100644 net/minecraft/client/model/HappyGhastModel.java create mode 100644 net/minecraft/client/renderer/CachedOrthoProjectionMatrixBuffer.java create mode 100644 net/minecraft/client/renderer/CachedPerspectiveProjectionMatrixBuffer.java create mode 100644 net/minecraft/client/renderer/DynamicUniformStorage.java create mode 100644 net/minecraft/client/renderer/DynamicUniforms.java delete mode 100644 net/minecraft/client/renderer/FogParameters.java delete mode 100644 net/minecraft/client/renderer/FogRenderer.java create mode 100644 net/minecraft/client/renderer/GlobalSettingsUniform.java create mode 100644 net/minecraft/client/renderer/MappableRingBuffer.java create mode 100644 net/minecraft/client/renderer/PerspectiveProjectionMatrixBuffer.java create mode 100644 net/minecraft/client/renderer/UniformValue.java create mode 100644 net/minecraft/client/renderer/chunk/ChunkSectionLayer.java create mode 100644 net/minecraft/client/renderer/chunk/ChunkSectionLayerGroup.java create mode 100644 net/minecraft/client/renderer/chunk/ChunkSectionsToRender.java create mode 100644 net/minecraft/client/renderer/chunk/CompiledSectionMesh.java rename net/minecraft/client/renderer/chunk/{RenderChunkRegion.java => RenderSectionRegion.java} (53%) create mode 100644 net/minecraft/client/renderer/chunk/SectionBuffers.java rename net/minecraft/client/renderer/chunk/{RenderChunk.java => SectionCopy.java} (62%) create mode 100644 net/minecraft/client/renderer/chunk/SectionMesh.java create mode 100644 net/minecraft/client/renderer/chunk/TranslucencyPointOfView.java create mode 100644 net/minecraft/client/renderer/entity/HappyGhastRenderer.java create mode 100644 net/minecraft/client/renderer/entity/layers/RopesLayer.java create mode 100644 net/minecraft/client/renderer/entity/state/HappyGhastRenderState.java create mode 100644 net/minecraft/client/renderer/fog/FogData.java create mode 100644 net/minecraft/client/renderer/fog/FogRenderer.java create mode 100644 net/minecraft/client/renderer/fog/environment/AirBasedFogEnvironment.java create mode 100644 net/minecraft/client/renderer/fog/environment/AtmosphericFogEnvironment.java create mode 100644 net/minecraft/client/renderer/fog/environment/BlindnessFogEnvironment.java create mode 100644 net/minecraft/client/renderer/fog/environment/DarknessFogEnvironment.java create mode 100644 net/minecraft/client/renderer/fog/environment/DimensionOrBossFogEnvironment.java create mode 100644 net/minecraft/client/renderer/fog/environment/FogEnvironment.java create mode 100644 net/minecraft/client/renderer/fog/environment/LavaFogEnvironment.java create mode 100644 net/minecraft/client/renderer/fog/environment/MobEffectFogEnvironment.java create mode 100644 net/minecraft/client/renderer/fog/environment/PowderedSnowFogEnvironment.java create mode 100644 net/minecraft/client/renderer/fog/environment/WaterFogEnvironment.java create mode 100644 net/minecraft/client/renderer/fog/package-info.java create mode 100644 net/minecraft/client/renderer/special/PlayerHeadSpecialRenderer.java create mode 100644 net/minecraft/client/renderer/texture/CubeMapTexture.java delete mode 100644 net/minecraft/client/resources/MobEffectTextureManager.java create mode 100644 net/minecraft/client/resources/WaypointStyle.java create mode 100644 net/minecraft/client/resources/WaypointStyleManager.java rename net/minecraft/client/resources/metadata/animation/{VillagerMetaDataSection.java => VillagerMetadataSection.java} (100%) create mode 100644 net/minecraft/client/resources/sounds/RidingHappyGhastSoundInstance.java create mode 100644 net/minecraft/client/waypoints/ClientWaypointManager.java create mode 100644 net/minecraft/commands/PermissionSource.java create mode 100644 net/minecraft/commands/arguments/HexColorArgument.java create mode 100644 net/minecraft/commands/arguments/WaypointArgument.java create mode 100644 net/minecraft/data/tags/BlockItemTagsProvider.java create mode 100644 net/minecraft/data/tags/DialogTagsProvider.java delete mode 100644 net/minecraft/data/tags/ItemTagsProvider.java create mode 100644 net/minecraft/data/tags/KeyTagProvider.java create mode 100644 net/minecraft/data/tags/TagAppender.java create mode 100644 net/minecraft/network/protocol/common/ClientboundClearDialogPacket.java create mode 100644 net/minecraft/network/protocol/common/ClientboundShowDialogPacket.java create mode 100644 net/minecraft/network/protocol/common/ServerboundCustomClickActionPacket.java create mode 100644 net/minecraft/network/protocol/game/ClientboundTrackedWaypointPacket.java create mode 100644 net/minecraft/network/protocol/game/ServerboundChangeGameModePacket.java delete mode 100644 net/minecraft/realms/DisconnectedRealmsScreen.java create mode 100644 net/minecraft/server/commands/DialogCommand.java create mode 100644 net/minecraft/server/commands/PermissionCheck.java create mode 100644 net/minecraft/server/commands/VersionCommand.java create mode 100644 net/minecraft/server/commands/WaypointCommand.java create mode 100644 net/minecraft/server/dialog/ActionButton.java create mode 100644 net/minecraft/server/dialog/ButtonListDialog.java create mode 100644 net/minecraft/server/dialog/CommonButtonData.java create mode 100644 net/minecraft/server/dialog/CommonDialogData.java create mode 100644 net/minecraft/server/dialog/ConfirmationDialog.java create mode 100644 net/minecraft/server/dialog/Dialog.java create mode 100644 net/minecraft/server/dialog/DialogAction.java create mode 100644 net/minecraft/server/dialog/DialogListDialog.java create mode 100644 net/minecraft/server/dialog/DialogTypes.java create mode 100644 net/minecraft/server/dialog/Dialogs.java create mode 100644 net/minecraft/server/dialog/Input.java create mode 100644 net/minecraft/server/dialog/MultiActionDialog.java create mode 100644 net/minecraft/server/dialog/NoticeDialog.java create mode 100644 net/minecraft/server/dialog/ServerLinksDialog.java create mode 100644 net/minecraft/server/dialog/SimpleDialog.java create mode 100644 net/minecraft/server/dialog/action/Action.java create mode 100644 net/minecraft/server/dialog/action/ActionTypes.java create mode 100644 net/minecraft/server/dialog/action/CommandTemplate.java create mode 100644 net/minecraft/server/dialog/action/CustomAll.java create mode 100644 net/minecraft/server/dialog/action/ParsedTemplate.java create mode 100644 net/minecraft/server/dialog/action/StaticAction.java create mode 100644 net/minecraft/server/dialog/action/package-info.java create mode 100644 net/minecraft/server/dialog/body/DialogBody.java create mode 100644 net/minecraft/server/dialog/body/DialogBodyTypes.java create mode 100644 net/minecraft/server/dialog/body/ItemBody.java create mode 100644 net/minecraft/server/dialog/body/PlainMessage.java create mode 100644 net/minecraft/server/dialog/body/package-info.java create mode 100644 net/minecraft/server/dialog/input/BooleanInput.java create mode 100644 net/minecraft/server/dialog/input/InputControl.java create mode 100644 net/minecraft/server/dialog/input/InputControlTypes.java create mode 100644 net/minecraft/server/dialog/input/NumberRangeInput.java create mode 100644 net/minecraft/server/dialog/input/SingleOptionInput.java create mode 100644 net/minecraft/server/dialog/input/TextInput.java create mode 100644 net/minecraft/server/dialog/input/package-info.java create mode 100644 net/minecraft/server/dialog/package-info.java create mode 100644 net/minecraft/server/waypoints/ServerWaypointManager.java create mode 100644 net/minecraft/tags/DialogTags.java create mode 100644 net/minecraft/util/LenientJsonParser.java delete mode 100644 net/minecraft/util/LowerCaseEnumTypeAdapterFactory.java create mode 100644 net/minecraft/util/StrictJsonParser.java delete mode 100644 net/minecraft/util/datafix/fixes/ItemRemoveBlockEntityTagFix.java create mode 100644 net/minecraft/util/datafix/fixes/LegacyDimensionIdFix.java create mode 100644 net/minecraft/util/datafix/fixes/RemoveBlockEntityTagFix.java create mode 100644 net/minecraft/util/datafix/fixes/SignTextStrictJsonFix.java delete mode 100644 net/minecraft/util/datafix/fixes/TextComponentStrictJsonFix.java create mode 100644 net/minecraft/util/datafix/fixes/WrittenBookPagesStrictJsonFix.java delete mode 100644 net/minecraft/util/datafix/schemas/V1925.java create mode 100644 net/minecraft/util/datafix/schemas/V3439_1.java create mode 100644 net/minecraft/util/datafix/schemas/V4420.java create mode 100644 net/minecraft/util/datafix/schemas/V4421.java create mode 100644 net/minecraft/world/ItemStackWithSlot.java delete mode 100644 net/minecraft/world/entity/FlyingMob.java create mode 100644 net/minecraft/world/entity/ai/sensing/AdultSensorAnyType.java create mode 100644 net/minecraft/world/entity/animal/HappyGhast.java create mode 100644 net/minecraft/world/entity/animal/HappyGhastAi.java create mode 100644 net/minecraft/world/level/block/DriedGhastBlock.java delete mode 100644 net/minecraft/world/level/block/TerracottaBlock.java rename net/minecraft/world/level/block/entity/trialspawner/{TrialSpawnerData.java => TrialSpawnerStateData.java} (74%) create mode 100644 net/minecraft/world/level/storage/TagValueInput.java create mode 100644 net/minecraft/world/level/storage/TagValueOutput.java create mode 100644 net/minecraft/world/level/storage/ValueInput.java create mode 100644 net/minecraft/world/level/storage/ValueInputContextHelper.java create mode 100644 net/minecraft/world/level/storage/ValueOutput.java create mode 100644 net/minecraft/world/waypoints/TrackedWaypoint.java create mode 100644 net/minecraft/world/waypoints/TrackedWaypointManager.java create mode 100644 net/minecraft/world/waypoints/Waypoint.java create mode 100644 net/minecraft/world/waypoints/WaypointManager.java create mode 100644 net/minecraft/world/waypoints/WaypointStyleAsset.java create mode 100644 net/minecraft/world/waypoints/WaypointStyleAssets.java create mode 100644 net/minecraft/world/waypoints/WaypointTransmitter.java diff --git a/assets/minecraft/atlases/gui.json b/assets/minecraft/atlases/gui.json index fd2c246a..1ad438f0 100644 --- a/assets/minecraft/atlases/gui.json +++ b/assets/minecraft/atlases/gui.json @@ -4,6 +4,11 @@ "type": "minecraft:directory", "prefix": "", "source": "gui/sprites" + }, + { + "type": "minecraft:directory", + "prefix": "mob_effect/", + "source": "mob_effect" } ] } \ No newline at end of file diff --git a/assets/minecraft/atlases/mob_effects.json b/assets/minecraft/atlases/mob_effects.json deleted file mode 100644 index d159398c..00000000 --- a/assets/minecraft/atlases/mob_effects.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "sources": [ - { - "type": "minecraft:directory", - "prefix": "", - "source": "mob_effect" - } - ] -} \ No newline at end of file diff --git a/assets/minecraft/blockstates/dried_ghast.json b/assets/minecraft/blockstates/dried_ghast.json new file mode 100644 index 00000000..3d9e9611 --- /dev/null +++ b/assets/minecraft/blockstates/dried_ghast.json @@ -0,0 +1,64 @@ +{ + "variants": { + "facing=east,hydration=0": { + "model": "minecraft:block/dried_ghast_hydration_0", + "y": 90 + }, + "facing=east,hydration=1": { + "model": "minecraft:block/dried_ghast_hydration_1", + "y": 90 + }, + "facing=east,hydration=2": { + "model": "minecraft:block/dried_ghast_hydration_2", + "y": 90 + }, + "facing=east,hydration=3": { + "model": "minecraft:block/dried_ghast_hydration_3", + "y": 90 + }, + "facing=north,hydration=0": { + "model": "minecraft:block/dried_ghast_hydration_0" + }, + "facing=north,hydration=1": { + "model": "minecraft:block/dried_ghast_hydration_1" + }, + "facing=north,hydration=2": { + "model": "minecraft:block/dried_ghast_hydration_2" + }, + "facing=north,hydration=3": { + "model": "minecraft:block/dried_ghast_hydration_3" + }, + "facing=south,hydration=0": { + "model": "minecraft:block/dried_ghast_hydration_0", + "y": 180 + }, + "facing=south,hydration=1": { + "model": "minecraft:block/dried_ghast_hydration_1", + "y": 180 + }, + "facing=south,hydration=2": { + "model": "minecraft:block/dried_ghast_hydration_2", + "y": 180 + }, + "facing=south,hydration=3": { + "model": "minecraft:block/dried_ghast_hydration_3", + "y": 180 + }, + "facing=west,hydration=0": { + "model": "minecraft:block/dried_ghast_hydration_0", + "y": 270 + }, + "facing=west,hydration=1": { + "model": "minecraft:block/dried_ghast_hydration_1", + "y": 270 + }, + "facing=west,hydration=2": { + "model": "minecraft:block/dried_ghast_hydration_2", + "y": 270 + }, + "facing=west,hydration=3": { + "model": "minecraft:block/dried_ghast_hydration_3", + "y": 270 + } + } +} \ No newline at end of file diff --git a/assets/minecraft/equipment/black_harness.json b/assets/minecraft/equipment/black_harness.json new file mode 100644 index 00000000..5d9f10a0 --- /dev/null +++ b/assets/minecraft/equipment/black_harness.json @@ -0,0 +1,9 @@ +{ + "layers": { + "happy_ghast_body": [ + { + "texture": "minecraft:black_harness" + } + ] + } +} \ No newline at end of file diff --git a/assets/minecraft/equipment/blue_harness.json b/assets/minecraft/equipment/blue_harness.json new file mode 100644 index 00000000..e1022efa --- /dev/null +++ b/assets/minecraft/equipment/blue_harness.json @@ -0,0 +1,9 @@ +{ + "layers": { + "happy_ghast_body": [ + { + "texture": "minecraft:blue_harness" + } + ] + } +} \ No newline at end of file diff --git a/assets/minecraft/equipment/brown_harness.json b/assets/minecraft/equipment/brown_harness.json new file mode 100644 index 00000000..59607ff7 --- /dev/null +++ b/assets/minecraft/equipment/brown_harness.json @@ -0,0 +1,9 @@ +{ + "layers": { + "happy_ghast_body": [ + { + "texture": "minecraft:brown_harness" + } + ] + } +} \ No newline at end of file diff --git a/assets/minecraft/equipment/cyan_harness.json b/assets/minecraft/equipment/cyan_harness.json new file mode 100644 index 00000000..e80cbca3 --- /dev/null +++ b/assets/minecraft/equipment/cyan_harness.json @@ -0,0 +1,9 @@ +{ + "layers": { + "happy_ghast_body": [ + { + "texture": "minecraft:cyan_harness" + } + ] + } +} \ No newline at end of file diff --git a/assets/minecraft/equipment/gray_harness.json b/assets/minecraft/equipment/gray_harness.json new file mode 100644 index 00000000..f7dce681 --- /dev/null +++ b/assets/minecraft/equipment/gray_harness.json @@ -0,0 +1,9 @@ +{ + "layers": { + "happy_ghast_body": [ + { + "texture": "minecraft:gray_harness" + } + ] + } +} \ No newline at end of file diff --git a/assets/minecraft/equipment/green_harness.json b/assets/minecraft/equipment/green_harness.json new file mode 100644 index 00000000..71797ca3 --- /dev/null +++ b/assets/minecraft/equipment/green_harness.json @@ -0,0 +1,9 @@ +{ + "layers": { + "happy_ghast_body": [ + { + "texture": "minecraft:green_harness" + } + ] + } +} \ No newline at end of file diff --git a/assets/minecraft/equipment/light_blue_harness.json b/assets/minecraft/equipment/light_blue_harness.json new file mode 100644 index 00000000..37d50d47 --- /dev/null +++ b/assets/minecraft/equipment/light_blue_harness.json @@ -0,0 +1,9 @@ +{ + "layers": { + "happy_ghast_body": [ + { + "texture": "minecraft:light_blue_harness" + } + ] + } +} \ No newline at end of file diff --git a/assets/minecraft/equipment/light_gray_harness.json b/assets/minecraft/equipment/light_gray_harness.json new file mode 100644 index 00000000..14322de9 --- /dev/null +++ b/assets/minecraft/equipment/light_gray_harness.json @@ -0,0 +1,9 @@ +{ + "layers": { + "happy_ghast_body": [ + { + "texture": "minecraft:light_gray_harness" + } + ] + } +} \ No newline at end of file diff --git a/assets/minecraft/equipment/lime_harness.json b/assets/minecraft/equipment/lime_harness.json new file mode 100644 index 00000000..6571bf65 --- /dev/null +++ b/assets/minecraft/equipment/lime_harness.json @@ -0,0 +1,9 @@ +{ + "layers": { + "happy_ghast_body": [ + { + "texture": "minecraft:lime_harness" + } + ] + } +} \ No newline at end of file diff --git a/assets/minecraft/equipment/magenta_harness.json b/assets/minecraft/equipment/magenta_harness.json new file mode 100644 index 00000000..3289e42b --- /dev/null +++ b/assets/minecraft/equipment/magenta_harness.json @@ -0,0 +1,9 @@ +{ + "layers": { + "happy_ghast_body": [ + { + "texture": "minecraft:magenta_harness" + } + ] + } +} \ No newline at end of file diff --git a/assets/minecraft/equipment/orange_harness.json b/assets/minecraft/equipment/orange_harness.json new file mode 100644 index 00000000..a36917ec --- /dev/null +++ b/assets/minecraft/equipment/orange_harness.json @@ -0,0 +1,9 @@ +{ + "layers": { + "happy_ghast_body": [ + { + "texture": "minecraft:orange_harness" + } + ] + } +} \ No newline at end of file diff --git a/assets/minecraft/equipment/pink_harness.json b/assets/minecraft/equipment/pink_harness.json new file mode 100644 index 00000000..bff56cbf --- /dev/null +++ b/assets/minecraft/equipment/pink_harness.json @@ -0,0 +1,9 @@ +{ + "layers": { + "happy_ghast_body": [ + { + "texture": "minecraft:pink_harness" + } + ] + } +} \ No newline at end of file diff --git a/assets/minecraft/equipment/purple_harness.json b/assets/minecraft/equipment/purple_harness.json new file mode 100644 index 00000000..e1377411 --- /dev/null +++ b/assets/minecraft/equipment/purple_harness.json @@ -0,0 +1,9 @@ +{ + "layers": { + "happy_ghast_body": [ + { + "texture": "minecraft:purple_harness" + } + ] + } +} \ No newline at end of file diff --git a/assets/minecraft/equipment/red_harness.json b/assets/minecraft/equipment/red_harness.json new file mode 100644 index 00000000..636c174d --- /dev/null +++ b/assets/minecraft/equipment/red_harness.json @@ -0,0 +1,9 @@ +{ + "layers": { + "happy_ghast_body": [ + { + "texture": "minecraft:red_harness" + } + ] + } +} \ No newline at end of file diff --git a/assets/minecraft/equipment/white_harness.json b/assets/minecraft/equipment/white_harness.json new file mode 100644 index 00000000..82275b41 --- /dev/null +++ b/assets/minecraft/equipment/white_harness.json @@ -0,0 +1,9 @@ +{ + "layers": { + "happy_ghast_body": [ + { + "texture": "minecraft:white_harness" + } + ] + } +} \ No newline at end of file diff --git a/assets/minecraft/equipment/yellow_harness.json b/assets/minecraft/equipment/yellow_harness.json new file mode 100644 index 00000000..f0a7a82d --- /dev/null +++ b/assets/minecraft/equipment/yellow_harness.json @@ -0,0 +1,9 @@ +{ + "layers": { + "happy_ghast_body": [ + { + "texture": "minecraft:yellow_harness" + } + ] + } +} \ No newline at end of file diff --git a/assets/minecraft/items/black_harness.json b/assets/minecraft/items/black_harness.json new file mode 100644 index 00000000..245f3c6d --- /dev/null +++ b/assets/minecraft/items/black_harness.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "minecraft:item/black_harness" + } +} \ No newline at end of file diff --git a/assets/minecraft/items/blue_harness.json b/assets/minecraft/items/blue_harness.json new file mode 100644 index 00000000..6f4dada3 --- /dev/null +++ b/assets/minecraft/items/blue_harness.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "minecraft:item/blue_harness" + } +} \ No newline at end of file diff --git a/assets/minecraft/items/brown_harness.json b/assets/minecraft/items/brown_harness.json new file mode 100644 index 00000000..c9b874f2 --- /dev/null +++ b/assets/minecraft/items/brown_harness.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "minecraft:item/brown_harness" + } +} \ No newline at end of file diff --git a/assets/minecraft/items/cyan_harness.json b/assets/minecraft/items/cyan_harness.json new file mode 100644 index 00000000..282a58d0 --- /dev/null +++ b/assets/minecraft/items/cyan_harness.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "minecraft:item/cyan_harness" + } +} \ No newline at end of file diff --git a/assets/minecraft/items/dried_ghast.json b/assets/minecraft/items/dried_ghast.json new file mode 100644 index 00000000..4bd0466e --- /dev/null +++ b/assets/minecraft/items/dried_ghast.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "minecraft:block/dried_ghast_hydration_0" + } +} \ No newline at end of file diff --git a/assets/minecraft/items/gray_harness.json b/assets/minecraft/items/gray_harness.json new file mode 100644 index 00000000..f14c87cc --- /dev/null +++ b/assets/minecraft/items/gray_harness.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "minecraft:item/gray_harness" + } +} \ No newline at end of file diff --git a/assets/minecraft/items/green_harness.json b/assets/minecraft/items/green_harness.json new file mode 100644 index 00000000..5dc05d03 --- /dev/null +++ b/assets/minecraft/items/green_harness.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "minecraft:item/green_harness" + } +} \ No newline at end of file diff --git a/assets/minecraft/items/happy_ghast_spawn_egg.json b/assets/minecraft/items/happy_ghast_spawn_egg.json new file mode 100644 index 00000000..47dcddc7 --- /dev/null +++ b/assets/minecraft/items/happy_ghast_spawn_egg.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "minecraft:item/happy_ghast_spawn_egg" + } +} \ No newline at end of file diff --git a/assets/minecraft/items/light_blue_harness.json b/assets/minecraft/items/light_blue_harness.json new file mode 100644 index 00000000..df65c0e0 --- /dev/null +++ b/assets/minecraft/items/light_blue_harness.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "minecraft:item/light_blue_harness" + } +} \ No newline at end of file diff --git a/assets/minecraft/items/light_gray_harness.json b/assets/minecraft/items/light_gray_harness.json new file mode 100644 index 00000000..cce3f7e3 --- /dev/null +++ b/assets/minecraft/items/light_gray_harness.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "minecraft:item/light_gray_harness" + } +} \ No newline at end of file diff --git a/assets/minecraft/items/lime_harness.json b/assets/minecraft/items/lime_harness.json new file mode 100644 index 00000000..00aac700 --- /dev/null +++ b/assets/minecraft/items/lime_harness.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "minecraft:item/lime_harness" + } +} \ No newline at end of file diff --git a/assets/minecraft/items/magenta_harness.json b/assets/minecraft/items/magenta_harness.json new file mode 100644 index 00000000..48783c42 --- /dev/null +++ b/assets/minecraft/items/magenta_harness.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "minecraft:item/magenta_harness" + } +} \ No newline at end of file diff --git a/assets/minecraft/items/music_disc_tears.json b/assets/minecraft/items/music_disc_tears.json new file mode 100644 index 00000000..015f4528 --- /dev/null +++ b/assets/minecraft/items/music_disc_tears.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "minecraft:item/music_disc_tears" + } +} \ No newline at end of file diff --git a/assets/minecraft/items/orange_harness.json b/assets/minecraft/items/orange_harness.json new file mode 100644 index 00000000..c896407e --- /dev/null +++ b/assets/minecraft/items/orange_harness.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "minecraft:item/orange_harness" + } +} \ No newline at end of file diff --git a/assets/minecraft/items/pink_harness.json b/assets/minecraft/items/pink_harness.json new file mode 100644 index 00000000..a6dbb77b --- /dev/null +++ b/assets/minecraft/items/pink_harness.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "minecraft:item/pink_harness" + } +} \ No newline at end of file diff --git a/assets/minecraft/items/player_head.json b/assets/minecraft/items/player_head.json index 2d522d2f..51896d5c 100644 --- a/assets/minecraft/items/player_head.json +++ b/assets/minecraft/items/player_head.json @@ -3,8 +3,7 @@ "type": "minecraft:special", "base": "minecraft:item/template_skull", "model": { - "type": "minecraft:head", - "kind": "player" + "type": "minecraft:player_head" } } } \ No newline at end of file diff --git a/assets/minecraft/items/purple_harness.json b/assets/minecraft/items/purple_harness.json new file mode 100644 index 00000000..56023ee0 --- /dev/null +++ b/assets/minecraft/items/purple_harness.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "minecraft:item/purple_harness" + } +} \ No newline at end of file diff --git a/assets/minecraft/items/red_harness.json b/assets/minecraft/items/red_harness.json new file mode 100644 index 00000000..2852c95d --- /dev/null +++ b/assets/minecraft/items/red_harness.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "minecraft:item/red_harness" + } +} \ No newline at end of file diff --git a/assets/minecraft/items/white_harness.json b/assets/minecraft/items/white_harness.json new file mode 100644 index 00000000..6c4fe855 --- /dev/null +++ b/assets/minecraft/items/white_harness.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "minecraft:item/white_harness" + } +} \ No newline at end of file diff --git a/assets/minecraft/items/yellow_harness.json b/assets/minecraft/items/yellow_harness.json new file mode 100644 index 00000000..94c168a1 --- /dev/null +++ b/assets/minecraft/items/yellow_harness.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "minecraft:item/yellow_harness" + } +} \ No newline at end of file diff --git a/assets/minecraft/lang/deprecated.json b/assets/minecraft/lang/deprecated.json index c684c464..bd041ce2 100644 --- a/assets/minecraft/lang/deprecated.json +++ b/assets/minecraft/lang/deprecated.json @@ -106,11 +106,13 @@ "mco.configure.world.delete.question.line2", "mco.configure.world.invited", "mco.configure.world.leave.question.line2", + "mco.configure.world.minigame", "mco.configure.world.resourcepack.question.line1", "mco.configure.world.resourcepack.question.line2", "mco.configure.world.restore.download.question.line2", "mco.configure.world.restore.question.line2", "mco.configure.world.slot.switch.question.line2", + "mco.configure.world.slot.tooltip.active", "mco.configure.world.spawnAnimals", "mco.configure.world.spawnNPCs", "mco.configure.world.spawn_toggle.title", @@ -118,6 +120,8 @@ "mco.configure.world.subscription.days", "mco.configure.world.subscription.month", "mco.configure.world.subscription.months", + "mco.configure.world.subscription.title", + "mco.configure.world.title", "mco.configure.world.uninvite.question", "mco.create.world.skip", "mco.create.world.subtitle", @@ -127,6 +131,7 @@ "mco.gui.ok", "mco.reset.world.seed", "mco.reset.world.upload", + "mco.selectServer.closeserver", "mco.selectServer.configureRealm", "mco.selectServer.expiredSubscribe", "mco.selectServer.minigame", @@ -178,6 +183,8 @@ "subtitles.block.trial_spawner.charge_activate", "subtitles.entity.camel.step", "subtitles.entity.camel.step_sand", + "subtitles.entity.leash_knot.break", + "subtitles.entity.leash_knot.place", "subtitles.entity.drowned.step", "subtitles.entity.generic.wind_burst", "subtitles.entity.goat.step", @@ -245,7 +252,15 @@ "entity.minecraft.potion", "argument.nbt.list.mixed", "item.minecraft.crossbow.projectile", - "subtitles.entity.wolf.ambient" + "subtitles.entity.wolf.ambient", + "subtitles.block.trapdoor.toggle", + "subtitles.block.iron_trapdoor.close", + "subtitles.block.iron_trapdoor.open", + "dataPack.bundle.description", + "dataPack.bundle.name", + "dataPack.locator_bar.description", + "dataPack.locator_bar.name", + "argument.resource_or_id.invalid" ], "renamed": { "item.minecraft.dune_armor_trim_smithing_template.new": "item.minecraft.dune_armor_trim_smithing_template", @@ -289,6 +304,8 @@ "container.shulkerBox.itemCount": "item.container.item_count", "container.shulkerBox.more": "item.container.more_items", "advancements.nether.use_lodestone.description": "advancements.adventure.use_lodestone.description", - "advancements.nether.use_lodestone.title": "advancements.adventure.use_lodestone.title" + "advancements.nether.use_lodestone.title": "advancements.adventure.use_lodestone.title", + "subtitles.block.sand.wind": "subtitles.block.dry_grass.ambient", + "snbt.parser.undescore_not_allowed": "snbt.parser.underscore_not_allowed" } } diff --git a/assets/minecraft/lang/en_us.json b/assets/minecraft/lang/en_us.json index 8394be03..f0e61c85 100644 --- a/assets/minecraft/lang/en_us.json +++ b/assets/minecraft/lang/en_us.json @@ -29,6 +29,8 @@ "advancements.adventure.crafters_crafting_crafters.title": "Crafters Crafting Crafters", "advancements.adventure.fall_from_world_height.description": "Free fall from the top of the world (build limit) to the bottom of the world and survive", "advancements.adventure.fall_from_world_height.title": "Caves & Cliffs", + "advancements.adventure.heart_transplanter.description": "Place a Creaking Heart with the correct alignment between two Pale Oak Log blocks", + "advancements.adventure.heart_transplanter.title": "Heart Transplanter", "advancements.adventure.hero_of_the_village.description": "Successfully defend a village from a raid", "advancements.adventure.hero_of_the_village.title": "Hero of the Village", "advancements.adventure.honey_block_slide.description": "Jump into a Honey Block to break your fall", @@ -150,6 +152,8 @@ "advancements.husbandry.netherite_hoe.title": "Serious Dedication", "advancements.husbandry.obtain_sniffer_egg.description": "Obtain a Sniffer Egg", "advancements.husbandry.obtain_sniffer_egg.title": "Smells Interesting", + "advancements.husbandry.place_dried_ghast_in_water.description": "Place a Dried Ghast block into water", + "advancements.husbandry.place_dried_ghast_in_water.title": "Stay Hydrated!", "advancements.husbandry.plant_any_sniffer_seed.description": "Plant any Sniffer seed", "advancements.husbandry.plant_any_sniffer_seed.title": "Planting the Past", "advancements.husbandry.plant_seed.description": "Plant a seed and watch it grow", @@ -344,6 +348,7 @@ "argument.float.big": "Float must not be more than %s, found %s", "argument.float.low": "Float must not be less than %s, found %s", "argument.gamemode.invalid": "Unknown game mode: %s", + "argument.hexcolor.invalid": "Invalid hex color code '%s'", "argument.id.invalid": "Invalid ID", "argument.id.unknown": "Unknown ID: %s", "argument.integer.big": "Integer must not be more than %s, found %s", @@ -377,6 +382,7 @@ "argument.range.swapped": "Min cannot be bigger than max", "argument.resource_or_id.failed_to_parse": "Failed to parse structure: %s", "argument.resource_or_id.invalid": "Invalid id or tag", + "argument.resource_or_id.no_such_element": "Can't find element '%s' in registry '%s'", "argument.resource_selector.not_found": "No matches for selector '%s' of type '%s'", "argument.resource_tag.invalid_type": "Tag '%s' has wrong type '%s' (expected '%s')", "argument.resource_tag.not_found": "Can't find tag '%s' of type '%s'", @@ -390,6 +396,7 @@ "argument.time.invalid_unit": "Invalid unit", "argument.time.tick_count_too_low": "The tick count must not be less than %s, found %s", "argument.uuid.invalid": "Invalid UUID", + "argument.waypoint.invalid": "Selected entity is not a waypoint", "arguments.block.tag.unknown": "Unknown block tag '%s'", "arguments.function.tag.unknown": "Unknown function tag '%s'", "arguments.function.unknown": "Unknown function %s", @@ -428,6 +435,7 @@ "attribute.name.block_break_speed": "Block Break Speed", "attribute.name.block_interaction_range": "Block Interaction Range", "attribute.name.burning_time": "Burning Time", + "attribute.name.camera_distance": "Camera Distance", "attribute.name.entity_interaction_range": "Entity Interaction Range", "attribute.name.explosion_knockback_resistance": "Explosion Knockback Resistance", "attribute.name.fall_damage_multiplier": "Fall Damage Multiplier", @@ -485,6 +493,8 @@ "attribute.name.sweeping_damage_ratio": "Sweeping Damage Ratio", "attribute.name.tempt_range": "Mob Tempt Range", "attribute.name.water_movement_efficiency": "Water Movement Efficiency", + "attribute.name.waypoint_receive_range": "Waypoint Receive Range", + "attribute.name.waypoint_transmit_range": "Waypoint Transmit Range", "attribute.name.zombie.spawn_reinforcements": "Zombie Reinforcements", "biome.minecraft.badlands": "Badlands", "biome.minecraft.bamboo_jungle": "Bamboo Jungle", @@ -1592,6 +1602,7 @@ "block.minecraft.dragon_egg": "Dragon Egg", "block.minecraft.dragon_head": "Dragon Head", "block.minecraft.dragon_wall_head": "Dragon Wall Head", + "block.minecraft.dried_ghast": "Dried Ghast", "block.minecraft.dried_kelp_block": "Dried Kelp Block", "block.minecraft.dripstone_block": "Dripstone Block", "block.minecraft.dropper": "Dropper", @@ -2343,6 +2354,7 @@ "block.minecraft.zombie_head": "Zombie Head", "block.minecraft.zombie_wall_head": "Zombie Wall Head", "book.byAuthor": "by %1$s", + "book.edit.title": "Book Edit Screen", "book.editTitle": "Enter Book Title:", "book.finalizeButton": "Sign and Close", "book.finalizeWarning": "Note! When you sign the book, it will no longer be editable.", @@ -2351,8 +2363,13 @@ "book.generation.2": "Copy of a copy", "book.generation.3": "Tattered", "book.invalid.tag": "* Invalid book tag *", + "book.page_button.next": "Next Page", + "book.page_button.previous": "Previous Page", "book.pageIndicator": "Page %1$s of %2$s", + "book.sign.title": "Book Sign Screen", + "book.sign.titlebox": "Title", "book.signButton": "Sign", + "book.view.title": "Book View Screen", "build.tooHigh": "Height limit for building is %s", "chat_screen.message": "Message to send: %s", "chat_screen.title": "Chat screen", @@ -2535,6 +2552,12 @@ "commands.data.storage.get": "%s in storage %s after scale factor of %s is %s", "commands.data.storage.modified": "Modified storage %s", "commands.data.storage.query": "Storage %s has the following contents: %s", + "commands.datapack.create.already_exists": "Pack with name '%s' already exists", + "commands.datapack.create.invalid_full_name": "Invalid new pack name '%s'", + "commands.datapack.create.invalid_name": "Invalid characters in new pack name '%s'", + "commands.datapack.create.io_failure": "Can't create pack with name '%s', check logs", + "commands.datapack.create.metadata_encode_failure": "Failed to encode metadata for pack with name '%s': %s", + "commands.datapack.create.success": "Created new empty pack with name '%s'", "commands.datapack.disable.failed": "Pack '%s' is not enabled!", "commands.datapack.disable.failed.feature": "Pack '%s' cannot be disabled, since it is part of an enabled flag!", "commands.datapack.enable.failed": "Pack '%s' is already enabled!", @@ -2558,6 +2581,10 @@ "commands.defaultgamemode.success": "The default game mode is now %s", "commands.deop.failed": "Nothing changed. The player is not an operator", "commands.deop.success": "Made %s no longer a server operator", + "commands.dialog.clear.multiple": "Cleared dialog for %s players", + "commands.dialog.clear.single": "Cleared dialog for %s", + "commands.dialog.show.multiple": "Displayed dialog to %s players", + "commands.dialog.show.single": "Displayed dialog to %s", "commands.difficulty.failure": "The difficulty did not change; it is already set to %s", "commands.difficulty.query": "The difficulty is %s", "commands.difficulty.success": "The difficulty has been set to %s", @@ -2925,6 +2952,22 @@ "commands.trigger.failed.unprimed": "You cannot trigger this objective yet", "commands.trigger.set.success": "Triggered %s (set value to %s)", "commands.trigger.simple.success": "Triggered %s", + "commands.version.build_time": "build_time = %s", + "commands.version.data": "data = %s", + "commands.version.header": "Server version info:", + "commands.version.id": "id = %s", + "commands.version.name": "name = %s", + "commands.version.pack.data": "pack_data = %s", + "commands.version.pack.resource": "pack_resource = %s", + "commands.version.protocol": "protocol = %s (%s)", + "commands.version.series": "series = %s", + "commands.version.stable.no": "stable = no", + "commands.version.stable.yes": "stable = yes", + "commands.waypoint.list.empty": "No waypoints in %s", + "commands.waypoint.list.success": "%s waypoint(s) in %s: %s", + "commands.waypoint.modify.color": "Waypoint color is now %s", + "commands.waypoint.modify.color.reset": "Reset waypoint color", + "commands.waypoint.modify.style": "Waypoint style changed", "commands.weather.set.clear": "Set the weather to clear", "commands.weather.set.rain": "Set the weather to rain", "commands.weather.set.thunder": "Set the weather to rain & thunder", @@ -3043,6 +3086,8 @@ "credits_and_attribution.screen.title": "Credits and Attribution", "dataPack.bundle.description": "Enables experimental Bundle item", "dataPack.bundle.name": "Bundles", + "dataPack.locator_bar.description": "Show the direction of other players in multiplayer", + "dataPack.locator_bar.name": "Locator Bar", "dataPack.minecart_improvements.description": "Improved movement for Minecarts", "dataPack.minecart_improvements.name": "Minecart Improvements", "dataPack.redstone_experiments.description": "Experimental Redstone changes", @@ -3216,6 +3261,8 @@ "debug.show_hitboxes.help": "F3 + B = Show hitboxes", "debug.show_hitboxes.off": "Hitboxes: hidden", "debug.show_hitboxes.on": "Hitboxes: shown", + "debug.version.header": "Client version info:", + "debug.version.help": "F3 + V = Client version info", "demo.day.1": "This demo will last five game days. Do your best!", "demo.day.2": "Day Two", "demo.day.3": "Day Three", @@ -3418,6 +3465,7 @@ "entity.minecraft.glow_squid": "Glow Squid", "entity.minecraft.goat": "Goat", "entity.minecraft.guardian": "Guardian", + "entity.minecraft.happy_ghast": "Happy Ghast", "entity.minecraft.hoglin": "Hoglin", "entity.minecraft.hopper_minecart": "Minecart with Hopper", "entity.minecraft.horse": "Horse", @@ -3649,6 +3697,8 @@ "gamerule.keepInventory": "Keep inventory after death", "gamerule.lavaSourceConversion": "Lava converts to source", "gamerule.lavaSourceConversion.description": "When flowing lava is surrounded on two sides by lava sources it converts into a source.", + "gamerule.locatorBar": "Enable player Locator Bar", + "gamerule.locatorBar.description": "When enabled, a bar is shown on the screen to indicate the direction of players.", "gamerule.logAdminCommands": "Broadcast admin commands", "gamerule.maxCommandChainLength": "Command chain size limit", "gamerule.maxCommandChainLength.description": "Applies to command block chains and functions.", @@ -3836,6 +3886,7 @@ "gui.done": "Done", "gui.down": "Down", "gui.entity_tooltip.type": "Type: %s", + "gui.experience.level": "%s", "gui.fileDropFailure.detail": "Rejected %s files", "gui.fileDropFailure.title": "Failed to add files", "gui.hours": "%s hour(s)", @@ -3897,6 +3948,8 @@ "gui.toTitle": "Back to Title Screen", "gui.toWorld": "Back to World List", "gui.up": "Up", + "gui.waitingForResponse.button.inactive": "Back (%ss)", + "gui.waitingForResponse.title": "Waiting for Server", "gui.yes": "Yes", "hanging_sign.edit": "Edit Hanging Sign Message", "instrument.minecraft.admire_goat_horn": "Admire", @@ -3949,6 +4002,7 @@ "item.minecraft.birch_chest_boat": "Birch Boat with Chest", "item.minecraft.black_bundle": "Black Bundle", "item.minecraft.black_dye": "Black Dye", + "item.minecraft.black_harness": "Black Harness", "item.minecraft.blade_pottery_shard": "Blade Pottery Shard", "item.minecraft.blade_pottery_sherd": "Blade Pottery Sherd", "item.minecraft.blaze_powder": "Blaze Powder", @@ -3957,6 +4011,7 @@ "item.minecraft.blue_bundle": "Blue Bundle", "item.minecraft.blue_dye": "Blue Dye", "item.minecraft.blue_egg": "Blue Egg", + "item.minecraft.blue_harness": "Blue Harness", "item.minecraft.bogged_spawn_egg": "Bogged Spawn Egg", "item.minecraft.bolt_armor_trim_smithing_template": "Smithing Template", "item.minecraft.bolt_armor_trim_smithing_template.new": "Bolt Armor Trim", @@ -3976,6 +4031,7 @@ "item.minecraft.brown_bundle": "Brown Bundle", "item.minecraft.brown_dye": "Brown Dye", "item.minecraft.brown_egg": "Brown Egg", + "item.minecraft.brown_harness": "Brown Harness", "item.minecraft.brush": "Brush", "item.minecraft.bucket": "Bucket", "item.minecraft.bundle": "Bundle", @@ -4034,6 +4090,7 @@ "item.minecraft.crossbow.projectile.single": "Projectile: %s", "item.minecraft.cyan_bundle": "Cyan Bundle", "item.minecraft.cyan_dye": "Cyan Dye", + "item.minecraft.cyan_harness": "Cyan Harness", "item.minecraft.danger_pottery_shard": "Danger Pottery Shard", "item.minecraft.danger_pottery_sherd": "Danger Pottery Sherd", "item.minecraft.dark_oak_boat": "Dark Oak Boat", @@ -4165,14 +4222,18 @@ "item.minecraft.golden_sword": "Golden Sword", "item.minecraft.gray_bundle": "Gray Bundle", "item.minecraft.gray_dye": "Gray Dye", + "item.minecraft.gray_harness": "Gray Harness", "item.minecraft.green_bundle": "Green Bundle", "item.minecraft.green_dye": "Green Dye", + "item.minecraft.green_harness": "Green Harness", "item.minecraft.guardian_spawn_egg": "Guardian Spawn Egg", "item.minecraft.gunpowder": "Gunpowder", "item.minecraft.guster_banner_pattern": "Banner Pattern", "item.minecraft.guster_banner_pattern.desc": "Guster", "item.minecraft.guster_banner_pattern.new": "Guster Banner Pattern", "item.minecraft.guster_pottery_sherd": "Guster Pottery Sherd", + "item.minecraft.happy_ghast_spawn_egg": "Happy Ghast Spawn Egg", + "item.minecraft.harness": "Harness", "item.minecraft.heart_of_the_sea": "Heart of the Sea", "item.minecraft.heart_pottery_shard": "Heart Pottery Shard", "item.minecraft.heart_pottery_sherd": "Heart Pottery Sherd", @@ -4217,10 +4278,13 @@ "item.minecraft.leather_leggings": "Leather Pants", "item.minecraft.light_blue_bundle": "Light Blue Bundle", "item.minecraft.light_blue_dye": "Light Blue Dye", + "item.minecraft.light_blue_harness": "Light Blue Harness", "item.minecraft.light_gray_bundle": "Light Gray Bundle", "item.minecraft.light_gray_dye": "Light Gray Dye", + "item.minecraft.light_gray_harness": "Light Gray Harness", "item.minecraft.lime_bundle": "Lime Bundle", "item.minecraft.lime_dye": "Lime Dye", + "item.minecraft.lime_harness": "Lime Harness", "item.minecraft.lingering_potion": "Lingering Potion", "item.minecraft.lingering_potion.effect.awkward": "Awkward Lingering Potion", "item.minecraft.lingering_potion.effect.empty": "Lingering Uncraftable Potion", @@ -4253,6 +4317,7 @@ "item.minecraft.mace": "Mace", "item.minecraft.magenta_bundle": "Magenta Bundle", "item.minecraft.magenta_dye": "Magenta Dye", + "item.minecraft.magenta_harness": "Magenta Harness", "item.minecraft.magma_cream": "Magma Cream", "item.minecraft.magma_cube_spawn_egg": "Magma Cube Spawn Egg", "item.minecraft.mangrove_boat": "Mangrove Boat", @@ -4306,6 +4371,8 @@ "item.minecraft.music_disc_stal.desc": "C418 - stal", "item.minecraft.music_disc_strad": "Music Disc", "item.minecraft.music_disc_strad.desc": "C418 - strad", + "item.minecraft.music_disc_tears": "Music Disc", + "item.minecraft.music_disc_tears.desc": "Amos Roddy - Tears", "item.minecraft.music_disc_wait": "Music Disc", "item.minecraft.music_disc_wait.desc": "C418 - wait", "item.minecraft.music_disc_ward": "Music Disc", @@ -4336,6 +4403,7 @@ "item.minecraft.ominous_trial_key": "Ominous Trial Key", "item.minecraft.orange_bundle": "Orange Bundle", "item.minecraft.orange_dye": "Orange Dye", + "item.minecraft.orange_harness": "Orange Harness", "item.minecraft.painting": "Painting", "item.minecraft.pale_oak_boat": "Pale Oak Boat", "item.minecraft.pale_oak_chest_boat": "Pale Oak Boat with Chest", @@ -4353,6 +4421,7 @@ "item.minecraft.pillager_spawn_egg": "Pillager Spawn Egg", "item.minecraft.pink_bundle": "Pink Bundle", "item.minecraft.pink_dye": "Pink Dye", + "item.minecraft.pink_harness": "Pink Harness", "item.minecraft.pitcher_plant": "Pitcher Plant", "item.minecraft.pitcher_pod": "Pitcher Pod", "item.minecraft.plenty_pottery_shard": "Plenty Pottery Shard", @@ -4405,6 +4474,7 @@ "item.minecraft.pumpkin_seeds": "Pumpkin Seeds", "item.minecraft.purple_bundle": "Purple Bundle", "item.minecraft.purple_dye": "Purple Dye", + "item.minecraft.purple_harness": "Purple Harness", "item.minecraft.quartz": "Nether Quartz", "item.minecraft.rabbit": "Raw Rabbit", "item.minecraft.rabbit_foot": "Rabbit's Foot", @@ -4420,6 +4490,7 @@ "item.minecraft.recovery_compass": "Recovery Compass", "item.minecraft.red_bundle": "Red Bundle", "item.minecraft.red_dye": "Red Dye", + "item.minecraft.red_harness": "Red Harness", "item.minecraft.redstone": "Redstone Dust", "item.minecraft.resin_brick": "Resin Brick", "item.minecraft.resin_clump": "Resin Clump", @@ -4601,6 +4672,7 @@ "item.minecraft.wheat_seeds": "Wheat Seeds", "item.minecraft.white_bundle": "White Bundle", "item.minecraft.white_dye": "White Dye", + "item.minecraft.white_harness": "White Harness", "item.minecraft.wild_armor_trim_smithing_template": "Smithing Template", "item.minecraft.wild_armor_trim_smithing_template.new": "Wild Armor Trim", "item.minecraft.wind_charge": "Wind Charge", @@ -4618,6 +4690,7 @@ "item.minecraft.written_book": "Written Book", "item.minecraft.yellow_bundle": "Yellow Bundle", "item.minecraft.yellow_dye": "Yellow Dye", + "item.minecraft.yellow_harness": "Yellow Harness", "item.minecraft.zoglin_spawn_egg": "Zoglin Spawn Egg", "item.minecraft.zombie_horse_spawn_egg": "Zombie Horse Spawn Egg", "item.minecraft.zombie_spawn_egg": "Zombie Spawn Egg", @@ -4686,6 +4759,7 @@ "jukebox_song.minecraft.relic": "Aaron Cherof - Relic", "jukebox_song.minecraft.stal": "C418 - stal", "jukebox_song.minecraft.strad": "C418 - strad", + "jukebox_song.minecraft.tears": "Amos Roddy - Tears", "jukebox_song.minecraft.wait": "C418 - wait", "jukebox_song.minecraft.ward": "C418 - ward", "key.advancements": "Advancements", @@ -4807,6 +4881,7 @@ "key.mouse.right": "Right Button", "key.pickItem": "Pick Block", "key.playerlist": "List Players", + "key.quickActions": "Quick Actions", "key.right": "Strafe Right", "key.saveToolbarActivator": "Save Hotbar Activator", "key.screenshot": "Take Screenshot", @@ -4903,22 +4978,26 @@ "mco.configure.world.activityfeed.disabled": "Player feed temporarily disabled", "mco.configure.world.backup": "World Backups", "mco.configure.world.buttons.activity": "Player activity", - "mco.configure.world.buttons.close": "Close Realm", + "mco.configure.world.buttons.close": "Temporarily Close Realm", "mco.configure.world.buttons.delete": "Delete", "mco.configure.world.buttons.done": "Done", "mco.configure.world.buttons.edit": "Settings", "mco.configure.world.buttons.invite": "Invite Player", "mco.configure.world.buttons.moreoptions": "More options", - "mco.configure.world.buttons.open": "Open Realm", + "mco.configure.world.buttons.newworld": "New World", + "mco.configure.world.buttons.open": "Reopen Realm", "mco.configure.world.buttons.options": "World Options", "mco.configure.world.buttons.players": "Players", + "mco.configure.world.buttons.region_preference": "Select Region...", "mco.configure.world.buttons.resetworld": "Reset World", + "mco.configure.world.buttons.save": "Save", "mco.configure.world.buttons.settings": "Settings", "mco.configure.world.buttons.subscription": "Subscription", "mco.configure.world.buttons.switchminigame": "Switch Minigame", - "mco.configure.world.close.question.line1": "Your Realm will become unavailable.", + "mco.configure.world.close.question.line1": "You can temporarily close your Realm, preventing play while you make adjustments. Open it back up when you're ready. \n\nThis does not cancel your Realms Subscription.", "mco.configure.world.close.question.line2": "Are you sure you want to continue?", - "mco.configure.world.closing": "Closing the Realm...", + "mco.configure.world.close.question.title": "Need to make changes without disruption?", + "mco.configure.world.closing": "Temporarily closing the Realm...", "mco.configure.world.commandBlocks": "Command Blocks", "mco.configure.world.delete.button": "Delete Realm", "mco.configure.world.delete.question.line1": "Your Realm will be permanently deleted", @@ -4938,6 +5017,7 @@ "mco.configure.world.invites.remove.tooltip": "Remove", "mco.configure.world.leave.question.line1": "If you leave this Realm you won't see it unless you are invited again", "mco.configure.world.leave.question.line2": "Are you sure you want to continue?", + "mco.configure.world.loading": "Loading Realm", "mco.configure.world.location": "Location", "mco.configure.world.minigame": "Current: %s", "mco.configure.world.name": "Realm Name", @@ -4946,6 +5026,8 @@ "mco.configure.world.players.inviting": "Inviting player...", "mco.configure.world.players.title": "Players", "mco.configure.world.pvp": "PVP", + "mco.configure.world.region_preference": "Region Preference", + "mco.configure.world.region_preference.title": "Region Preference Selection", "mco.configure.world.reset.question.line1": "Your world will be regenerated and your current world will be lost", "mco.configure.world.reset.question.line2": "Are you sure you want to continue?", "mco.configure.world.resourcepack.question": "You need a custom resource pack to play on this Realm\n\nDo you want to download it and play?", @@ -4955,6 +5037,7 @@ "mco.configure.world.restore.download.question.line2": "Do you want to continue?", "mco.configure.world.restore.question.line1": "Your world will be restored to date '%s' (%s)", "mco.configure.world.restore.question.line2": "Are you sure you want to continue?", + "mco.configure.world.settings.expired": "You cannot edit settings of an expired Realm", "mco.configure.world.settings.title": "Settings", "mco.configure.world.slot": "World %s", "mco.configure.world.slot.empty": "Empty", @@ -4984,6 +5067,7 @@ "mco.configure.world.subscription.remaining.months": "%1$s month(s)", "mco.configure.world.subscription.remaining.months.days": "%1$s month(s), %2$s day(s)", "mco.configure.world.subscription.start": "Start Date", + "mco.configure.world.subscription.tab": "Subscription", "mco.configure.world.subscription.timeleft": "Time Left", "mco.configure.world.subscription.title": "Your Subscription", "mco.configure.world.subscription.unknown": "Unknown", @@ -4996,6 +5080,7 @@ "mco.connect.authorizing": "Logging in...", "mco.connect.connecting": "Connecting to the Realm...", "mco.connect.failed": "Failed to connect to the Realm", + "mco.connect.region": "Server region: %s", "mco.connect.success": "Done", "mco.create.world": "Create", "mco.create.world.error": "You must enter a name!", @@ -5034,6 +5119,7 @@ "mco.errorMessage.initialize.failed": "Failed to initialize Realm", "mco.errorMessage.noDetails": "No error details provided", "mco.errorMessage.realmsService": "An error occurred (%s):", + "mco.errorMessage.realmsService.configurationError": "An unexpected error occurred while editing world options", "mco.errorMessage.realmsService.connectivity": "Could not connect to Realms: %s", "mco.errorMessage.realmsService.realmsError": "Realms (%s):", "mco.errorMessage.realmsService.unknownCompatibility": "Could not check compatible version, got response: %s", @@ -5070,6 +5156,7 @@ "mco.notification.visitUrl.buttonText.default": "Open Link", "mco.notification.visitUrl.message.default": "Please visit the link below", "mco.onlinePlayers": "Online Players", + "mco.play.button.realm.closed": "Realm is closed", "mco.question": "Question", "mco.reset.world.adventure": "Adventures", "mco.reset.world.experience": "Experiences", @@ -5083,7 +5170,7 @@ "mco.reset.world.warning": "This will replace the current world of your Realm", "mco.selectServer.buy": "Buy a Realm!", "mco.selectServer.close": "Close", - "mco.selectServer.closed": "Closed Realm", + "mco.selectServer.closed": "Deactivated Realm", "mco.selectServer.closeserver": "Close Realm", "mco.selectServer.configure": "Configure", "mco.selectServer.configureRealm": "Configure Realm", @@ -5175,6 +5262,14 @@ "mco.version": "Version: %s", "mco.warning": "Warning!", "mco.worldSlot.minigame": "Minigame", + "menu.custom_options": "Custom Options...", + "menu.custom_options.title": "Custom Options", + "menu.custom_options.tooltip": "Note: Custom options are provided by third-party servers and/or content.\nHandle with care!", + "menu.custom_screen_info.button_narration": "This is a custom screen. Learn more.", + "menu.custom_screen_info.contents": "The contents of this screen are controlled by third-party servers and maps that are not owned, operated, or supervised by Mojang Studios or Microsoft.\n\nHandle with care! Always be careful when following links and never give away your personal information, including login details.\n\nIf this screen prevents you from playing, you can also disconnect from the current server by using the button below.", + "menu.custom_screen_info.disconnect": "Custom screen rejected", + "menu.custom_screen_info.title": "Note about custom screens", + "menu.custom_screen_info.tooltip": "This is a custom screen. Click here to learn more.", "menu.disconnect": "Disconnect", "menu.feedback": "Feedback...", "menu.feedback.title": "Feedback", @@ -5187,6 +5282,8 @@ "menu.playdemo": "Play Demo World", "menu.playerReporting": "Player Reporting", "menu.preparingSpawn": "Preparing spawn area: %s%%", + "menu.quick_actions": "Quick Actions...", + "menu.quick_actions.title": "Quick Actions", "menu.quit": "Quit Game", "menu.reportBugs": "Report Bugs", "menu.resetdemo": "Reset Demo World", @@ -5213,6 +5310,9 @@ "mirror.none": "|", "mount.onboard": "Press %1$s to Dismount", "multiplayer.applyingPack": "Applying resource pack", + "multiplayer.confirm_command.parse_errors": "You are trying to execute an unrecognized or invalid command.\nAre you sure?\nCommand: %s", + "multiplayer.confirm_command.permissions_required": "You are trying to execute a command that requires elevated permissions.\nThis might negatively affect your game.\nAre you sure?\nCommand: %s", + "multiplayer.confirm_command.title": "Confirm Command Execution", "multiplayer.disconnect.authservers_down": "Authentication servers are down. Please try again later, sorry!", "multiplayer.disconnect.bad_chat_index": "Detected missed or reordered chat message from server", "multiplayer.disconnect.banned": "You are banned from this server", @@ -5296,6 +5396,71 @@ "multiplayerWarning.check": "Do not show this screen again", "multiplayerWarning.header": "Caution: Third-Party Online Play", "multiplayerWarning.message": "Caution: Online play is offered by third-party servers that are not owned, operated, or supervised by Mojang Studios or Microsoft. During online play, you may be exposed to unmoderated chat messages or other types of user-generated content that may not be suitable for everyone.", + "music.game.a_familiar_room": "Aaron Cherof - A Familiar Room", + "music.game.an_ordinary_day": "Kumi Tanioka - An Ordinary Day", + "music.game.ancestry": "Lena Raine - Ancestry", + "music.game.below_and_above": "Amos Roddy - Below and Above", + "music.game.broken_clocks": "Amos Roddy - Broken Clocks", + "music.game.bromeliad": "Aaron Cherof - Bromeliad", + "music.game.clark": "C418 - Clark", + "music.game.comforting_memories": "Kumi Tanioka - Comforting Memories", + "music.game.creative.aria_math": "C418 - Aria Math", + "music.game.creative.biome_fest": "C418 - Biome Fest", + "music.game.creative.blind_spots": "C418 - Blind Spots", + "music.game.creative.dreiton": "C418 - Dreiton", + "music.game.creative.haunt_muskie": "C418 - Haunt Muskie", + "music.game.creative.taswell": "C418 - Taswell", + "music.game.crescent_dunes": "Aaron Cherof - Crescent Dunes", + "music.game.danny": "C418 - Danny", + "music.game.deeper": "Lena Raine - Deeper", + "music.game.dry_hands": "C418 - Dry Hands", + "music.game.echo_in_the_wind": "Aaron Cherof - Echo in the Wind", + "music.game.eld_unknown": "Lena Raine - Eld Unknown", + "music.game.end.alpha": "C418 - Alpha", + "music.game.end.boss": "C418 - Boss", + "music.game.end.the_end": "C418 - The End", + "music.game.endless": "Lena Raine - Endless", + "music.game.featherfall": "Aaron Cherof - Featherfall", + "music.game.fireflies": "Amos Roddy - Fireflies", + "music.game.floating_dream": "Kumi Tanioka - Floating Dream", + "music.game.haggstrom": "C418 - Haggstrom", + "music.game.infinite_amethyst": "Lena Raine - Infinite Amethyst", + "music.game.key": "C418 - Key", + "music.game.komorebi": "Kumi Tanioka - komorebi", + "music.game.left_to_bloom": "Lena Raine - Left to Bloom", + "music.game.lilypad": "Amos Roddy - Lilypad", + "music.game.living_mice": "C418 - Living Mice", + "music.game.mice_on_venus": "C418 - Mice on Venus", + "music.game.minecraft": "C418 - Minecraft", + "music.game.nether.ballad_of_the_cats": "C418 - Ballad of the Cats", + "music.game.nether.concrete_halls": "C418 - Concrete Halls", + "music.game.nether.crimson_forest.chrysopoeia": "Lena Raine - Chrysopoeia", + "music.game.nether.dead_voxel": "C418 - Dead Voxel", + "music.game.nether.nether_wastes.rubedo": "Lena Raine - Rubedo", + "music.game.nether.soulsand_valley.so_below": "Lena Raine - So Below", + "music.game.nether.warmth": "C418 - Warmth", + "music.game.one_more_day": "Lena Raine - One More Day", + "music.game.os_piano": "Amos Roddy - O's Piano", + "music.game.oxygene": "C418 - Oxygène", + "music.game.pokopoko": "Kumi Tanioka - pokopoko", + "music.game.puzzlebox": "Aaron Cherof - Puzzlebox", + "music.game.stand_tall": "Lena Raine - Stand Tall", + "music.game.subwoofer_lullaby": "C418 - Subwoofer Lullaby", + "music.game.swamp.aerie": "Lena Raine - Aerie", + "music.game.swamp.firebugs": "Lena Raine - Firebugs", + "music.game.swamp.labyrinthine": "Lena Raine - Labyrinthine", + "music.game.sweden": "C418 - Sweden", + "music.game.watcher": "Aaron Cherof - Watcher", + "music.game.water.axolotl": "C418 - Axolotl", + "music.game.water.dragon_fish": "C418 - Dragon Fish", + "music.game.water.shuniji": "C418 - Shuniji", + "music.game.wending": "Lena Raine - Wending", + "music.game.wet_hands": "C418 - Wet Hands", + "music.game.yakusoku": "Kumi Tanioka - yakusoku", + "music.menu.beginning_2": "C418 - Beginning 2", + "music.menu.floating_trees": "C418 - Floating Trees", + "music.menu.moog_city_2": "C418 - Moog City 2", + "music.menu.mutation": "C418 - Mutation", "narration.button": "Button: %s", "narration.button.usage.focused": "Press Enter to activate", "narration.button.usage.hovered": "Left click to activate", @@ -5306,6 +5471,7 @@ "narration.cycle_button.usage.focused": "Press Enter to switch to %s", "narration.cycle_button.usage.hovered": "Left click to switch to %s", "narration.edit_box": "Edit box: %s", + "narration.item": "Item: %s", "narration.recipe": "Recipe for %s", "narration.recipe.usage": "Left click to select", "narration.recipe.usage.more": "Right click to show more recipes", @@ -5525,6 +5691,11 @@ "options.mouseWheelSensitivity": "Scroll Sensitivity", "options.multiplayer.title": "Multiplayer Settings...", "options.multiplier": "%sx", + "options.music_frequency": "Music Frequency", + "options.music_frequency.constant": "Constant", + "options.music_frequency.default": "Default", + "options.music_frequency.frequent": "Frequent", + "options.music_frequency.tooltip": "Changes how frequently music plays while in a game world.", "options.narrator": "Narrator", "options.narrator.all": "Narrates All", "options.narrator.chat": "Narrates Chat", @@ -5561,6 +5732,7 @@ "options.realmsNotifications.tooltip": "Fetches Realms news and invites in the title screen and displays their respective icon on the Realms button.", "options.reducedDebugInfo": "Reduced Debug Info", "options.renderClouds": "Clouds", + "options.renderCloudsDistance": "Cloud Distance", "options.renderDistance": "Render Distance", "options.resourcepack": "Resource Packs...", "options.rotateWithMinecart": "Rotate with Minecarts", @@ -5570,6 +5742,8 @@ "options.sensitivity": "Sensitivity", "options.sensitivity.max": "HYPERSPEED!!!", "options.sensitivity.min": "*yawn*", + "options.showNowPlayingToast": "Show Music Toast", + "options.showNowPlayingToast.tooltip": "Displays a toast whenever a song starts playing. The same toast is constantly displayed in the in-game pause menu while a song is playing.", "options.showSubtitles": "Show Subtitles", "options.simulationDistance": "Simulation Distance", "options.skinCustomisation": "Skin Customization...", @@ -5747,6 +5921,31 @@ "quickplay.error.realm_connect": "Could not connect to Realm", "quickplay.error.realm_permission": "Lacking permission to connect to this Realm", "quickplay.error.title": "Failed to Quick Play", + "realms.configuration.region_preference.automatic_owner": "Automatic (Realm owner ping)", + "realms.configuration.region_preference.automatic_player": "Automatic (first to join session)", + "realms.configuration.region.australia_east": "New South Wales, Australia", + "realms.configuration.region.australia_southeast": "Victoria, Australia", + "realms.configuration.region.brazil_south": "Brazil", + "realms.configuration.region.central_india": "India", + "realms.configuration.region.central_us": "Iowa, USA", + "realms.configuration.region.east_asia": "Hong Kong", + "realms.configuration.region.east_us": "Virginia, USA", + "realms.configuration.region.east_us_2": "North Carolina, USA", + "realms.configuration.region.france_central": "France", + "realms.configuration.region.japan_east": "Eastern Japan", + "realms.configuration.region.japan_west": "Western Japan", + "realms.configuration.region.korea_central": "South Korea", + "realms.configuration.region.north_central_us": "Illinois, USA", + "realms.configuration.region.north_europe": "Ireland", + "realms.configuration.region.south_central_us": "Texas, USA", + "realms.configuration.region.southeast_asia": "Singapore", + "realms.configuration.region.sweden_central": "Sweden", + "realms.configuration.region.uae_north": "United Arab Emirates (UAE)", + "realms.configuration.region.uk_south": "Southern England", + "realms.configuration.region.west_central_us": "Utah, USA", + "realms.configuration.region.west_europe": "Netherlands", + "realms.configuration.region.west_us": "California, USA", + "realms.configuration.region.west_us_2": "Washington, USA", "realms.missing.snapshot.error.text": "Realms is currently not supported in snapshots", "recipe.notFound": "Unknown recipe: %s", "recipe.toast.description": "Check your recipe book", @@ -5944,12 +6143,13 @@ "snbt.parser.undescore_not_allowed": "Underscore characters are not allowed at the start or end of a number", "soundCategory.ambient": "Ambient/Environment", "soundCategory.block": "Blocks", - "soundCategory.hostile": "Hostile Creatures", + "soundCategory.hostile": "Hostile Mobs", "soundCategory.master": "Master Volume", "soundCategory.music": "Music", - "soundCategory.neutral": "Friendly Creatures", + "soundCategory.neutral": "Friendly Mobs", "soundCategory.player": "Players", "soundCategory.record": "Jukebox/Note Blocks", + "soundCategory.ui": "UI", "soundCategory.voice": "Voice/Speech", "soundCategory.weather": "Weather", "spectatorMenu.close": "Close Menu", @@ -5996,6 +6196,7 @@ "stat.minecraft.fill_cauldron": "Cauldrons Filled", "stat.minecraft.fish_caught": "Fish Caught", "stat.minecraft.fly_one_cm": "Distance Flown", + "stat.minecraft.happy_ghast_one_cm": "Distance by Happy Ghast", "stat.minecraft.horse_one_cm": "Distance by Horse", "stat.minecraft.inspect_dispenser": "Dispensers Searched", "stat.minecraft.inspect_dropper": "Droppers Searched", @@ -6153,6 +6354,11 @@ "subtitles.block.dispenser.dispense": "Dispensed item", "subtitles.block.dispenser.fail": "Dispenser failed", "subtitles.block.door.toggle": "Door creaks", + "subtitles.block.dried_ghast.ambient": "Sounds of dryness", + "subtitles.block.dried_ghast.ambient_water": "Dried Ghast rehydrates", + "subtitles.block.dried_ghast.place_in_water": "Dried Ghast soaks", + "subtitles.block.dried_ghast.transition": "Dried Ghast feels better", + "subtitles.block.dry_grass.ambient": "Windy sounds", "subtitles.block.enchantment_table.use": "Enchanting Table used", "subtitles.block.end_portal_frame.fill": "Eye of Ender attaches", "subtitles.block.end_portal.spawn": "End Portal opens", @@ -6215,6 +6421,8 @@ "subtitles.block.sniffer_egg.plop": "Sniffer plops", "subtitles.block.sponge.absorb": "Sponge sucks", "subtitles.block.sweet_berry_bush.pick_berries": "Berries pop", + "subtitles.block.trapdoor.close": "Trapdoor closes", + "subtitles.block.trapdoor.open": "Trapdoor opens", "subtitles.block.trapdoor.toggle": "Trapdoor creaks", "subtitles.block.trial_spawner.about_to_spawn_item": "Ominous item prepares", "subtitles.block.trial_spawner.ambient": "Trial Spawner crackles", @@ -6453,6 +6661,10 @@ "subtitles.entity.ghast.death": "Ghast dies", "subtitles.entity.ghast.hurt": "Ghast hurts", "subtitles.entity.ghast.shoot": "Ghast shoots", + "subtitles.entity.ghastling.ambient": "Ghastling coos", + "subtitles.entity.ghastling.death": "Ghastling dies", + "subtitles.entity.ghastling.hurt": "Ghastling hurts", + "subtitles.entity.ghastling.spawn": "Ghastling appears", "subtitles.entity.glow_item_frame.add_item": "Glow Item Frame fills", "subtitles.entity.glow_item_frame.break": "Glow Item Frame broken", "subtitles.entity.glow_item_frame.place": "Glow Item Frame placed", @@ -6479,6 +6691,13 @@ "subtitles.entity.guardian.death": "Guardian dies", "subtitles.entity.guardian.flop": "Guardian flops", "subtitles.entity.guardian.hurt": "Guardian hurts", + "subtitles.entity.happy_ghast.ambient": "Happy Ghast croons", + "subtitles.entity.happy_ghast.death": "Happy Ghast dies", + "subtitles.entity.happy_ghast.equip": "Harness equips", + "subtitles.entity.happy_ghast.harness_goggles_down": "Happy Ghast is ready", + "subtitles.entity.happy_ghast.harness_goggles_up": "Happy Ghast stops", + "subtitles.entity.happy_ghast.hurt": "Happy Ghast hurts", + "subtitles.entity.happy_ghast.unequip": "Harness unequips", "subtitles.entity.hoglin.ambient": "Hoglin growls", "subtitles.entity.hoglin.angry": "Hoglin growls angrily", "subtitles.entity.hoglin.attack": "Hoglin attacks", @@ -6918,13 +7137,20 @@ "subtitles.item.hoe.till": "Hoe tills", "subtitles.item.honey_bottle.drink": "Gulping", "subtitles.item.honeycomb.wax_on": "Wax on", + "subtitles.item.horse_armor.unequip": "Horse Armor snips away", "subtitles.item.ink_sac.use": "Ink Sac splotches", + "subtitles.item.lead.break": "Lead snaps", + "subtitles.item.lead.tied": "Lead tied", + "subtitles.item.lead.untied": "Lead untied", + "subtitles.item.llama_carpet.unequip": "Carpet snips away", "subtitles.item.lodestone_compass.lock": "Lodestone Compass locks onto Lodestone", "subtitles.item.mace.smash_air": "Mace smashes", "subtitles.item.mace.smash_ground": "Mace smashes", "subtitles.item.nether_wart.plant": "Crop planted", "subtitles.item.ominous_bottle.dispose": "Bottle breaks", + "subtitles.item.saddle.unequip": "Saddle snips away", "subtitles.item.shears.shear": "Shears click", + "subtitles.item.shears.snip": "Shears snip", "subtitles.item.shield.block": "Shield blocks", "subtitles.item.shovel.flatten": "Shovel flattens", "subtitles.item.spyglass.stop_using": "Spyglass retracts", diff --git a/assets/minecraft/models/block/dried_ghast.json b/assets/minecraft/models/block/dried_ghast.json new file mode 100644 index 00000000..d145c579 --- /dev/null +++ b/assets/minecraft/models/block/dried_ghast.json @@ -0,0 +1,110 @@ +{ + "parent": "block/block", + "display": { + "gui": { + "rotation": [30, 225, 0], + "translation": [0.4, 1.6, 0], + "scale": [0.8, 0.8, 0.8] + } + }, + "elements": [ + { + "name": "body", + "from": [3, 0, 3], + "to": [13, 10, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 0, 11]}, + "faces": { + "north": {"uv": [0, 0, 10, 10], "texture": "#north"}, + "east": {"uv": [0, 0, 10, 10], "texture": "#east"}, + "south": {"uv": [0, 0, 10, 10], "texture": "#south"}, + "west": {"uv": [0, 0, 10, 10], "texture": "#west"}, + "up": {"uv": [0, 0, 10, 10], "rotation": 180, "texture": "#top"}, + "down": {"uv": [10, 0, 0, 10], "texture": "#bottom", "cullface": "down"} + } + }, + { + "name": "left_tent_1", + "from": [0, 0, 5], + "to": [3, 1, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 13]}, + "faces": { + "north": {"uv": [1, 1.5, 2.5, 2], "texture": "#tentacles"}, + "east": {"uv": [0, 1.5, 1, 2], "texture": "#tentacles"}, + "south": {"uv": [3.5, 1.5, 5, 2], "texture": "#tentacles"}, + "west": {"uv": [2.5, 1.5, 3.5, 2], "texture": "#tentacles", "cullface": "west"}, + "up": {"uv": [2.5, 1.5, 1.5, 0], "rotation": 90, "texture": "#tentacles"}, + "down": {"uv": [2.5, 1.5, 3.5, 0], "rotation": 90, "texture": "#tentacles", "cullface": "down"} + } + }, + { + "name": "left_tent_2", + "from": [0, 0, 9], + "to": [3, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 17]}, + "faces": { + "north": {"uv": [1, 3.5, 2.5, 4], "texture": "#tentacles"}, + "east": {"uv": [0, 3.5, 1, 4], "texture": "#tentacles"}, + "south": {"uv": [3.5, 3.5, 5, 4], "texture": "#tentacles"}, + "west": {"uv": [2.5, 3.5, 3.5, 4], "texture": "#tentacles", "cullface": "west"}, + "up": {"uv": [2.5, 3.5, 1.5, 2], "rotation": 90, "texture": "#tentacles"}, + "down": {"uv": [2.5, 3.5, 3.5, 2], "rotation": 90, "texture": "#tentacles", "cullface": "down"} + } + }, + { + "name": "right_tent_1", + "from": [13, 0, 5], + "to": [16, 1, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 13]}, + "faces": { + "north": {"uv": [2.5, 7.5, 1, 8], "texture": "#tentacles"}, + "east": {"uv": [3.5, 7.5, 2.5, 8], "texture": "#tentacles", "cullface": "east"}, + "south": {"uv": [5, 7.5, 3.5, 8], "texture": "#tentacles"}, + "west": {"uv": [1, 7.5, 0, 8], "texture": "#tentacles"}, + "up": {"uv": [2.5, 6, 1.5, 7.5], "rotation": 90, "texture": "#tentacles"}, + "down": {"uv": [2.5, 6, 3.5, 7.5], "rotation": 90, "texture": "#tentacles", "cullface": "down"} + } + }, + { + "name": "right_tent_2", + "from": [13, 0, 9], + "to": [16, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 17]}, + "faces": { + "north": {"uv": [2.5, 5.5, 1, 6], "texture": "#tentacles"}, + "east": {"uv": [3.5, 5.5, 2.5, 6], "texture": "#tentacles", "cullface": "east"}, + "south": {"uv": [5, 5.5, 3.5, 6], "texture": "#tentacles"}, + "west": {"uv": [1, 5.5, 0, 6], "texture": "#tentacles"}, + "up": {"uv": [2.5, 4, 1.5, 5.5], "rotation": 90, "texture": "#tentacles"}, + "down": {"uv": [2.5, 4, 3.5, 5.5], "rotation": 90, "texture": "#tentacles", "cullface": "down"} + } + }, + { + "name": "back_tent_2", + "from": [9, 0, 13], + "to": [11, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [10.5, 0.5, 14.5]}, + "faces": { + "north": {"uv": [6, 2.5, 5, 3], "texture": "#tentacles"}, + "east": {"uv": [7.5, 2.5, 6, 3], "texture": "#tentacles"}, + "south": {"uv": [8.5, 2.5, 7.5, 3], "texture": "#tentacles", "cullface": "south"}, + "west": {"uv": [10, 2.5, 8.5, 3], "texture": "#tentacles"}, + "up": {"uv": [6, 2.5, 7.5, 1.5], "rotation": 90, "texture": "#tentacles"}, + "down": {"uv": [7.5, 1.5, 9, 2.5], "rotation": 270, "texture": "#tentacles", "cullface": "down"} + } + }, + { + "name": "back_tent_1", + "from": [5, 0, 13], + "to": [7, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [5.5, 0.5, 14.5]}, + "faces": { + "north": {"uv": [6, 1, 5, 1.5], "texture": "#tentacles"}, + "east": {"uv": [7.5, 1, 6, 1.5], "texture": "#tentacles"}, + "south": {"uv": [8.5, 1, 7.5, 1.5], "texture": "#tentacles", "cullface": "south" }, + "west": {"uv": [10, 1, 8.5, 1.5], "texture": "#tentacles"}, + "up": {"uv": [6, 1, 7.5, 0], "rotation": 90, "texture": "#tentacles"}, + "down": {"uv": [7.5, 0, 9, 1], "rotation": 270, "texture": "#tentacles", "cullface": "down"} + } + } + ] +} diff --git a/assets/minecraft/models/block/dried_ghast_hydration_0.json b/assets/minecraft/models/block/dried_ghast_hydration_0.json new file mode 100644 index 00000000..7862b605 --- /dev/null +++ b/assets/minecraft/models/block/dried_ghast_hydration_0.json @@ -0,0 +1,13 @@ +{ + "parent": "minecraft:block/dried_ghast", + "textures": { + "bottom": "minecraft:block/dried_ghast_hydration_0_bottom", + "east": "minecraft:block/dried_ghast_hydration_0_east", + "north": "minecraft:block/dried_ghast_hydration_0_north", + "particle": "minecraft:block/dried_ghast_hydration_0_north", + "south": "minecraft:block/dried_ghast_hydration_0_south", + "tentacles": "minecraft:block/dried_ghast_hydration_0_tentacles", + "top": "minecraft:block/dried_ghast_hydration_0_top", + "west": "minecraft:block/dried_ghast_hydration_0_west" + } +} \ No newline at end of file diff --git a/assets/minecraft/models/block/dried_ghast_hydration_1.json b/assets/minecraft/models/block/dried_ghast_hydration_1.json new file mode 100644 index 00000000..82cf1092 --- /dev/null +++ b/assets/minecraft/models/block/dried_ghast_hydration_1.json @@ -0,0 +1,13 @@ +{ + "parent": "minecraft:block/dried_ghast", + "textures": { + "bottom": "minecraft:block/dried_ghast_hydration_1_bottom", + "east": "minecraft:block/dried_ghast_hydration_1_east", + "north": "minecraft:block/dried_ghast_hydration_1_north", + "particle": "minecraft:block/dried_ghast_hydration_1_north", + "south": "minecraft:block/dried_ghast_hydration_1_south", + "tentacles": "minecraft:block/dried_ghast_hydration_1_tentacles", + "top": "minecraft:block/dried_ghast_hydration_1_top", + "west": "minecraft:block/dried_ghast_hydration_1_west" + } +} \ No newline at end of file diff --git a/assets/minecraft/models/block/dried_ghast_hydration_2.json b/assets/minecraft/models/block/dried_ghast_hydration_2.json new file mode 100644 index 00000000..6af95c38 --- /dev/null +++ b/assets/minecraft/models/block/dried_ghast_hydration_2.json @@ -0,0 +1,13 @@ +{ + "parent": "minecraft:block/dried_ghast", + "textures": { + "bottom": "minecraft:block/dried_ghast_hydration_2_bottom", + "east": "minecraft:block/dried_ghast_hydration_2_east", + "north": "minecraft:block/dried_ghast_hydration_2_north", + "particle": "minecraft:block/dried_ghast_hydration_2_north", + "south": "minecraft:block/dried_ghast_hydration_2_south", + "tentacles": "minecraft:block/dried_ghast_hydration_2_tentacles", + "top": "minecraft:block/dried_ghast_hydration_2_top", + "west": "minecraft:block/dried_ghast_hydration_2_west" + } +} \ No newline at end of file diff --git a/assets/minecraft/models/block/dried_ghast_hydration_3.json b/assets/minecraft/models/block/dried_ghast_hydration_3.json new file mode 100644 index 00000000..3d2812b1 --- /dev/null +++ b/assets/minecraft/models/block/dried_ghast_hydration_3.json @@ -0,0 +1,13 @@ +{ + "parent": "minecraft:block/dried_ghast", + "textures": { + "bottom": "minecraft:block/dried_ghast_hydration_3_bottom", + "east": "minecraft:block/dried_ghast_hydration_3_east", + "north": "minecraft:block/dried_ghast_hydration_3_north", + "particle": "minecraft:block/dried_ghast_hydration_3_north", + "south": "minecraft:block/dried_ghast_hydration_3_south", + "tentacles": "minecraft:block/dried_ghast_hydration_3_tentacles", + "top": "minecraft:block/dried_ghast_hydration_3_top", + "west": "minecraft:block/dried_ghast_hydration_3_west" + } +} \ No newline at end of file diff --git a/assets/minecraft/models/block/lectern.json b/assets/minecraft/models/block/lectern.json index 0487bf02..a504fa96 100644 --- a/assets/minecraft/models/block/lectern.json +++ b/assets/minecraft/models/block/lectern.json @@ -5,6 +5,11 @@ "rotation": [ 0, 135, 0 ], "translation": [ 0, 0, 0 ], "scale": [ 0.4, 0.4, 0.4 ] + }, + "gui": { + "rotation": [ 30, 225, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.6, 0.6, 0.6 ] } }, "textures": { @@ -52,4 +57,4 @@ } } ] -} \ No newline at end of file +} diff --git a/assets/minecraft/models/item/black_harness.json b/assets/minecraft/models/item/black_harness.json new file mode 100644 index 00000000..c8216ebe --- /dev/null +++ b/assets/minecraft/models/item/black_harness.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "minecraft:item/black_harness" + } +} \ No newline at end of file diff --git a/assets/minecraft/models/item/blue_harness.json b/assets/minecraft/models/item/blue_harness.json new file mode 100644 index 00000000..77d82cf2 --- /dev/null +++ b/assets/minecraft/models/item/blue_harness.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "minecraft:item/blue_harness" + } +} \ No newline at end of file diff --git a/assets/minecraft/models/item/brown_harness.json b/assets/minecraft/models/item/brown_harness.json new file mode 100644 index 00000000..ec3ce2b4 --- /dev/null +++ b/assets/minecraft/models/item/brown_harness.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "minecraft:item/brown_harness" + } +} \ No newline at end of file diff --git a/assets/minecraft/models/item/cyan_harness.json b/assets/minecraft/models/item/cyan_harness.json new file mode 100644 index 00000000..11c6b931 --- /dev/null +++ b/assets/minecraft/models/item/cyan_harness.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "minecraft:item/cyan_harness" + } +} \ No newline at end of file diff --git a/assets/minecraft/models/item/gray_harness.json b/assets/minecraft/models/item/gray_harness.json new file mode 100644 index 00000000..20d4b49b --- /dev/null +++ b/assets/minecraft/models/item/gray_harness.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "minecraft:item/gray_harness" + } +} \ No newline at end of file diff --git a/assets/minecraft/models/item/green_harness.json b/assets/minecraft/models/item/green_harness.json new file mode 100644 index 00000000..e2646286 --- /dev/null +++ b/assets/minecraft/models/item/green_harness.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "minecraft:item/green_harness" + } +} \ No newline at end of file diff --git a/assets/minecraft/models/item/happy_ghast_spawn_egg.json b/assets/minecraft/models/item/happy_ghast_spawn_egg.json new file mode 100644 index 00000000..2a1ccf30 --- /dev/null +++ b/assets/minecraft/models/item/happy_ghast_spawn_egg.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "minecraft:item/happy_ghast_spawn_egg" + } +} \ No newline at end of file diff --git a/assets/minecraft/models/item/light_blue_harness.json b/assets/minecraft/models/item/light_blue_harness.json new file mode 100644 index 00000000..31259cdd --- /dev/null +++ b/assets/minecraft/models/item/light_blue_harness.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "minecraft:item/light_blue_harness" + } +} \ No newline at end of file diff --git a/assets/minecraft/models/item/light_gray_harness.json b/assets/minecraft/models/item/light_gray_harness.json new file mode 100644 index 00000000..432f83fd --- /dev/null +++ b/assets/minecraft/models/item/light_gray_harness.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "minecraft:item/light_gray_harness" + } +} \ No newline at end of file diff --git a/assets/minecraft/models/item/lime_harness.json b/assets/minecraft/models/item/lime_harness.json new file mode 100644 index 00000000..cade16bf --- /dev/null +++ b/assets/minecraft/models/item/lime_harness.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "minecraft:item/lime_harness" + } +} \ No newline at end of file diff --git a/assets/minecraft/models/item/magenta_harness.json b/assets/minecraft/models/item/magenta_harness.json new file mode 100644 index 00000000..f51483f5 --- /dev/null +++ b/assets/minecraft/models/item/magenta_harness.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "minecraft:item/magenta_harness" + } +} \ No newline at end of file diff --git a/assets/minecraft/models/item/music_disc_tears.json b/assets/minecraft/models/item/music_disc_tears.json new file mode 100644 index 00000000..97bafe41 --- /dev/null +++ b/assets/minecraft/models/item/music_disc_tears.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/template_music_disc", + "textures": { + "layer0": "minecraft:item/music_disc_tears" + } +} \ No newline at end of file diff --git a/assets/minecraft/models/item/orange_harness.json b/assets/minecraft/models/item/orange_harness.json new file mode 100644 index 00000000..3f218082 --- /dev/null +++ b/assets/minecraft/models/item/orange_harness.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "minecraft:item/orange_harness" + } +} \ No newline at end of file diff --git a/assets/minecraft/models/item/pink_harness.json b/assets/minecraft/models/item/pink_harness.json new file mode 100644 index 00000000..cbaf8262 --- /dev/null +++ b/assets/minecraft/models/item/pink_harness.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "minecraft:item/pink_harness" + } +} \ No newline at end of file diff --git a/assets/minecraft/models/item/purple_harness.json b/assets/minecraft/models/item/purple_harness.json new file mode 100644 index 00000000..1693ad85 --- /dev/null +++ b/assets/minecraft/models/item/purple_harness.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "minecraft:item/purple_harness" + } +} \ No newline at end of file diff --git a/assets/minecraft/models/item/red_harness.json b/assets/minecraft/models/item/red_harness.json new file mode 100644 index 00000000..55b06b9f --- /dev/null +++ b/assets/minecraft/models/item/red_harness.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "minecraft:item/red_harness" + } +} \ No newline at end of file diff --git a/assets/minecraft/models/item/white_harness.json b/assets/minecraft/models/item/white_harness.json new file mode 100644 index 00000000..5c9e9f68 --- /dev/null +++ b/assets/minecraft/models/item/white_harness.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "minecraft:item/white_harness" + } +} \ No newline at end of file diff --git a/assets/minecraft/models/item/yellow_harness.json b/assets/minecraft/models/item/yellow_harness.json new file mode 100644 index 00000000..b2783beb --- /dev/null +++ b/assets/minecraft/models/item/yellow_harness.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "minecraft:item/yellow_harness" + } +} \ No newline at end of file diff --git a/assets/minecraft/post_effect/blur.json b/assets/minecraft/post_effect/blur.json index 1823c5ec..691a2863 100644 --- a/assets/minecraft/post_effect/blur.json +++ b/assets/minecraft/post_effect/blur.json @@ -14,17 +14,20 @@ } ], "output": "swap", - "uniforms": [ - { - "name": "BlurDir", - "type": "vec2", - "values": [ 1.0, 0.0 ] - }, - { - "name": "Radius", - "type": "float" - } - ] + "uniforms": { + "BlurConfig": [ + { + "name": "BlurDir", + "type": "vec2", + "value": [ 1.0, 0.0 ] + }, + { + "name": "Radius", + "type": "float", + "value": 0.0 + } + ] + } }, { "vertex_shader": "minecraft:post/blur", @@ -37,17 +40,20 @@ } ], "output": "minecraft:main", - "uniforms": [ - { - "name": "BlurDir", - "type": "vec2", - "values": [ 0.0, 1.0 ] - }, - { - "name": "Radius", - "type": "float" - } - ] + "uniforms": { + "BlurConfig": [ + { + "name": "BlurDir", + "type": "vec2", + "value": [ 0.0, 1.0 ] + }, + { + "name": "Radius", + "type": "float", + "value": 0.0 + } + ] + } }, { "vertex_shader": "minecraft:post/blur", "fragment_shader": "minecraft:post/box_blur", @@ -59,17 +65,20 @@ } ], "output": "swap", - "uniforms": [ - { - "name": "BlurDir", - "type": "vec2", - "values": [ 1.0, 0.0 ] - }, - { - "name": "Radius", - "type": "float" - } - ] + "uniforms": { + "BlurConfig": [ + { + "name": "BlurDir", + "type": "vec2", + "value": [ 1.0, 0.0 ] + }, + { + "name": "Radius", + "type": "float", + "value": 0.0 + } + ] + } }, { "vertex_shader": "minecraft:post/blur", @@ -82,18 +91,22 @@ } ], "output": "minecraft:main", - "uniforms": [ - { - "name": "BlurDir", - "type": "vec2", - "values": [ 0.0, 1.0 ] - }, - { - "name": "Radius", - "type": "float" - } - ] - }, { + "uniforms": { + "BlurConfig": [ + { + "name": "BlurDir", + "type": "vec2", + "value": [ 0.0, 1.0 ] + }, + { + "name": "Radius", + "type": "float", + "value": 0.0 + } + ] + } + }, + { "vertex_shader": "minecraft:post/blur", "fragment_shader": "minecraft:post/box_blur", "inputs": [ @@ -104,17 +117,20 @@ } ], "output": "swap", - "uniforms": [ - { - "name": "BlurDir", - "type": "vec2", - "values": [ 1.0, 0.0 ] - }, - { - "name": "Radius", - "type": "float" - } - ] + "uniforms": { + "BlurConfig": [ + { + "name": "BlurDir", + "type": "vec2", + "value": [ 1.0, 0.0 ] + }, + { + "name": "Radius", + "type": "float", + "value": 0.0 + } + ] + } }, { "vertex_shader": "minecraft:post/blur", @@ -127,17 +143,20 @@ } ], "output": "minecraft:main", - "uniforms": [ - { - "name": "BlurDir", - "type": "vec2", - "values": [ 0.0, 1.0 ] - }, - { - "name": "Radius", - "type": "float" - } - ] + "uniforms": { + "BlurConfig": [ + { + "name": "BlurDir", + "type": "vec2", + "value": [ 0.0, 1.0 ] + }, + { + "name": "Radius", + "type": "float", + "value": 0.0 + } + ] + } } ] } diff --git a/assets/minecraft/post_effect/creeper.json b/assets/minecraft/post_effect/creeper.json index ce02f7ef..c3d06a74 100644 --- a/assets/minecraft/post_effect/creeper.json +++ b/assets/minecraft/post_effect/creeper.json @@ -13,23 +13,25 @@ } ], "output": "swap", - "uniforms": [ - { - "name": "RedMatrix", - "type": "vec3", - "values": [ 0.0, 0.0, 0.0 ] - }, - { - "name": "GreenMatrix", - "type": "vec3", - "values": [ 0.3, 0.59, 0.11 ] - }, - { - "name": "BlueMatrix", - "type": "vec3", - "values": [ 0.0, 0.0, 0.0 ] - } - ] + "uniforms": { + "ColorConfig": [ + { + "name": "RedMatrix", + "type": "vec3", + "value": [ 0.0, 0.0, 0.0 ] + }, + { + "name": "GreenMatrix", + "type": "vec3", + "value": [ 0.3, 0.59, 0.11 ] + }, + { + "name": "BlueMatrix", + "type": "vec3", + "value": [ 0.0, 0.0, 0.0 ] + } + ] + } }, { "vertex_shader": "minecraft:post/sobel", @@ -41,18 +43,20 @@ } ], "output": "minecraft:main", - "uniforms": [ - { - "name": "Resolution", - "type": "float", - "values": [ 16.0 ] - }, - { - "name": "MosaicSize", - "type": "float", - "values": [ 4.0 ] - } - ] + "uniforms": { + "BitsConfig": [ + { + "name": "Resolution", + "type": "float", + "value": 16.0 + }, + { + "name": "MosaicSize", + "type": "float", + "value": 4.0 + } + ] + } } ] } diff --git a/assets/minecraft/post_effect/entity_outline.json b/assets/minecraft/post_effect/entity_outline.json index c091ac8d..05d5ce61 100644 --- a/assets/minecraft/post_effect/entity_outline.json +++ b/assets/minecraft/post_effect/entity_outline.json @@ -25,13 +25,20 @@ } ], "output": "minecraft:entity_outline", - "uniforms": [ - { - "name": "BlurDir", - "type": "vec2", - "values": [ 1.0, 0.0 ] - } - ] + "uniforms": { + "BlurConfig": [ + { + "name": "BlurDir", + "type": "vec2", + "value": [ 1.0, 0.0 ] + }, + { + "name": "Radius", + "type": "float", + "value": 2.0 + } + ] + } }, { "vertex_shader": "minecraft:post/blur", @@ -44,13 +51,20 @@ } ], "output": "swap", - "uniforms": [ - { - "name": "BlurDir", - "type": "vec2", - "values": [ 0.0, 1.0 ] - } - ] + "uniforms": { + "BlurConfig": [ + { + "name": "BlurDir", + "type": "vec2", + "value": [ 0.0, 1.0 ] + }, + { + "name": "Radius", + "type": "float", + "value": 2.0 + } + ] + } }, { "vertex_shader": "minecraft:post/blit", @@ -61,13 +75,15 @@ "target": "swap" } ], - "uniforms": [ - { - "name": "ColorModulate", - "type": "vec4", - "values": [ 1.0, 1.0, 1.0, 1.0 ] - } - ], + "uniforms": { + "BlitConfig": [ + { + "name": "ColorModulate", + "type": "vec4", + "value": [ 1.0, 1.0, 1.0, 1.0 ] + } + ] + }, "output": "minecraft:entity_outline" } ] diff --git a/assets/minecraft/post_effect/invert.json b/assets/minecraft/post_effect/invert.json index a4fa8d23..d3a4057c 100644 --- a/assets/minecraft/post_effect/invert.json +++ b/assets/minecraft/post_effect/invert.json @@ -13,13 +13,15 @@ } ], "output": "swap", - "uniforms": [ - { - "name": "InverseAmount", - "type": "float", - "values": [ 0.8 ] - } - ] + "uniforms": { + "InvertConfig": [ + { + "name": "InverseAmount", + "type": "float", + "value": 0.8 + } + ] + } }, { "vertex_shader": "minecraft:post/blit", @@ -30,13 +32,15 @@ "target": "swap" } ], - "uniforms": [ - { - "name": "ColorModulate", - "type": "vec4", - "values": [ 1.0, 1.0, 1.0, 1.0 ] - } - ], + "uniforms": { + "BlitConfig": [ + { + "name": "ColorModulate", + "type": "vec4", + "value": [ 1.0, 1.0, 1.0, 1.0 ] + } + ] + }, "output": "minecraft:main" } ] diff --git a/assets/minecraft/post_effect/spider.json b/assets/minecraft/post_effect/spider.json index bbe6eef0..45b7df00 100644 --- a/assets/minecraft/post_effect/spider.json +++ b/assets/minecraft/post_effect/spider.json @@ -17,18 +17,20 @@ } ], "output": "temp", - "uniforms": [ - { - "name": "BlurDir", - "type": "vec2", - "values": [ 1.0, 0.0 ] - }, - { - "name": "Radius", - "type": "float", - "values": [ 15.0 ] - } - ] + "uniforms": { + "BlurConfig": [ + { + "name": "BlurDir", + "type": "vec2", + "value": [ 1.0, 0.0 ] + }, + { + "name": "Radius", + "type": "float", + "value": 15.0 + } + ] + } }, { "vertex_shader": "minecraft:post/blur", @@ -41,18 +43,20 @@ } ], "output": "large_blur", - "uniforms": [ - { - "name": "BlurDir", - "type": "vec2", - "values": [ 0.0, 1.0 ] - }, - { - "name": "Radius", - "type": "float", - "values": [ 15.0 ] - } - ] + "uniforms": { + "BlurConfig": [ + { + "name": "BlurDir", + "type": "vec2", + "value": [ 0.0, 1.0 ] + }, + { + "name": "Radius", + "type": "float", + "value": 15.0 + } + ] + } }, { "vertex_shader": "minecraft:post/blur", @@ -65,18 +69,20 @@ } ], "output": "temp", - "uniforms": [ - { - "name": "BlurDir", - "type": "vec2", - "values": [ 1.0, 0.0 ] - }, - { - "name": "Radius", - "type": "float", - "values": [ 7.0 ] - } - ] + "uniforms": { + "BlurConfig": [ + { + "name": "BlurDir", + "type": "vec2", + "value": [ 1.0, 0.0 ] + }, + { + "name": "Radius", + "type": "float", + "value": 7.0 + } + ] + } }, { "vertex_shader": "minecraft:post/blur", @@ -89,18 +95,20 @@ } ], "output": "small_blur", - "uniforms": [ - { - "name": "BlurDir", - "type": "vec2", - "values": [ 0.0, 1.0 ] - }, - { - "name": "Radius", - "type": "float", - "values": [ 7.0 ] - } - ] + "uniforms": { + "BlurConfig": [ + { + "name": "BlurDir", + "type": "vec2", + "value": [ 0.0, 1.0 ] + }, + { + "name": "Radius", + "type": "float", + "value": 7.0 + } + ] + } }, { "vertex_shader": "minecraft:post/rotscale", @@ -116,33 +124,37 @@ } ], "output": "temp", - "uniforms": [ - { - "name": "InScale", - "type": "vec2", - "values": [ 1.25, 2.0 ] - }, - { - "name": "InOffset", - "type": "vec2", - "values": [ -0.125, -0.1 ] - }, - { - "name": "InRotation", - "type": "float", - "values": [ 0 ] - }, - { - "name": "Scissor", - "type": "vec4", - "values": [ 0.0, 0.0, 1.0, 1.0 ] - }, - { - "name": "Vignette", - "type": "vec4", - "values": [ 0.1, 0.1, 0.9, 0.9 ] - } - ] + "uniforms": { + "RotScaleConfig": [ + { + "name": "InScale", + "type": "vec2", + "value": [ 1.25, 2.0 ] + }, + { + "name": "InOffset", + "type": "vec2", + "value": [ -0.125, -0.1 ] + }, + { + "name": "InRotation", + "type": "float", + "value": 0.0 + } + ], + "SpiderConfig": [ + { + "name": "Scissor", + "type": "vec4", + "value": [ 0.0, 0.0, 1.0, 1.0 ] + }, + { + "name": "Vignette", + "type": "vec4", + "value": [ 0.1, 0.1, 0.9, 0.9 ] + } + ] + } }, { "vertex_shader": "minecraft:post/rotscale", @@ -158,33 +170,37 @@ } ], "output": "swap", - "uniforms": [ - { - "name": "InScale", - "type": "vec2", - "values": [ 2.35, 4.2 ] - }, - { - "name": "InOffset", - "type": "vec2", - "values": [ -1.1, -1.5 ] - }, - { - "name": "InRotation", - "type": "float", - "values": [ -45.0 ] - }, - { - "name": "Scissor", - "type": "vec4", - "values": [ 0.21, 0.0, 0.79, 1.0 ] - }, - { - "name": "Vignette", - "type": "vec4", - "values": [ 0.31, 0.1, 0.69, 0.9 ] - } - ] + "uniforms": { + "RotScaleConfig": [ + { + "name": "InScale", + "type": "vec2", + "value": [ 2.35, 4.2 ] + }, + { + "name": "InOffset", + "type": "vec2", + "value": [ -1.1, -1.5 ] + }, + { + "name": "InRotation", + "type": "float", + "value": -45.0 + } + ], + "SpiderConfig": [ + { + "name": "Scissor", + "type": "vec4", + "value": [ 0.21, 0.0, 0.79, 1.0 ] + }, + { + "name": "Vignette", + "type": "vec4", + "value": [ 0.31, 0.1, 0.69, 0.9 ] + } + ] + } }, { "vertex_shader": "minecraft:post/rotscale", @@ -200,33 +216,37 @@ } ], "output": "temp", - "uniforms": [ - { - "name": "InScale", - "type": "vec2", - "values": [ 2.35, 4.2 ] - }, - { - "name": "InOffset", - "type": "vec2", - "values": [ 0.45, -4.45 ] - }, - { - "name": "InRotation", - "type": "float", - "values": [ 45.0 ] - }, - { - "name": "Scissor", - "type": "vec4", - "values": [ 0.21, 0.0, 0.79, 1.0 ] - }, - { - "name": "Vignette", - "type": "vec4", - "values": [ 0.31, 0.1, 0.69, 0.9 ] - } - ] + "uniforms": { + "RotScaleConfig": [ + { + "name": "InScale", + "type": "vec2", + "value": [ 2.35, 4.2 ] + }, + { + "name": "InOffset", + "type": "vec2", + "value": [ 0.45, -4.45 ] + }, + { + "name": "InRotation", + "type": "float", + "value": 45.0 + } + ], + "SpiderConfig": [ + { + "name": "Scissor", + "type": "vec4", + "value": [ 0.21, 0.0, 0.79, 1.0 ] + }, + { + "name": "Vignette", + "type": "vec4", + "value": [ 0.31, 0.1, 0.69, 0.9 ] + } + ] + } }, { "vertex_shader": "minecraft:post/rotscale", @@ -242,33 +262,37 @@ } ], "output": "swap", - "uniforms": [ - { - "name": "InScale", - "type": "vec2", - "values": [ 2.35, 2.35 ] - }, - { - "name": "InOffset", - "type": "vec2", - "values": [ -0.385, -1.29 ] - }, - { - "name": "InRotation", - "type": "float", - "values": [ 0.0 ] - }, - { - "name": "Scissor", - "type": "vec4", - "values": [ 0.0, 0.0, 1.0, 1.0 ] - }, - { - "name": "Vignette", - "type": "vec4", - "values": [ 0.31, 0.1, 0.69, 0.9 ] - } - ] + "uniforms": { + "RotScaleConfig": [ + { + "name": "InScale", + "type": "vec2", + "value": [ 2.35, 2.35 ] + }, + { + "name": "InOffset", + "type": "vec2", + "value": [ -0.385, -1.29 ] + }, + { + "name": "InRotation", + "type": "float", + "value": 0.0 + } + ], + "SpiderConfig": [ + { + "name": "Scissor", + "type": "vec4", + "value": [ 0.0, 0.0, 1.0, 1.0 ] + }, + { + "name": "Vignette", + "type": "vec4", + "value": [ 0.31, 0.1, 0.69, 0.9 ] + } + ] + } }, { "vertex_shader": "minecraft:post/rotscale", @@ -284,33 +308,37 @@ } ], "output": "temp", - "uniforms": [ - { - "name": "InScale", - "type": "vec2", - "values": [ 2.35, 2.35 ] - }, - { - "name": "InOffset", - "type": "vec2", - "values": [ -0.965, -1.29 ] - }, - { - "name": "InRotation", - "type": "float", - "values": [ 0 ] - }, - { - "name": "Scissor", - "type": "vec4", - "values": [ 0.0, 0.0, 1.0, 1.0 ] - }, - { - "name": "Vignette", - "type": "vec4", - "values": [ 0.31, 0.1, 0.69, 0.9 ] - } - ] + "uniforms": { + "RotScaleConfig": [ + { + "name": "InScale", + "type": "vec2", + "value": [ 2.35, 2.35 ] + }, + { + "name": "InOffset", + "type": "vec2", + "value": [ -0.965, -1.29 ] + }, + { + "name": "InRotation", + "type": "float", + "value": 0.0 + } + ], + "SpiderConfig": [ + { + "name": "Scissor", + "type": "vec4", + "value": [ 0.0, 0.0, 1.0, 1.0 ] + }, + { + "name": "Vignette", + "type": "vec4", + "value": [ 0.31, 0.1, 0.69, 0.9 ] + } + ] + } }, { "vertex_shader": "minecraft:post/blit", @@ -322,13 +350,15 @@ } ], "output": "minecraft:main", - "uniforms": [ - { - "name": "ColorModulate", - "type": "vec4", - "values": [ 1.0, 0.8, 0.8, 1.0 ] - } - ] + "uniforms": { + "BlitConfig": [ + { + "name": "ColorModulate", + "type": "vec4", + "value": [ 1.0, 0.8, 0.8, 1.0 ] + } + ] + } } ] } diff --git a/assets/minecraft/post_effect/transparency.json b/assets/minecraft/post_effect/transparency.json index ab38829a..469aa4d2 100644 --- a/assets/minecraft/post_effect/transparency.json +++ b/assets/minecraft/post_effect/transparency.json @@ -73,13 +73,15 @@ "target": "final" } ], - "uniforms": [ - { - "name": "ColorModulate", - "type": "vec4", - "values": [ 1.0, 1.0, 1.0, 1.0 ] - } - ], + "uniforms": { + "BlitConfig": [ + { + "name": "ColorModulate", + "type": "vec4", + "value": [ 1.0, 1.0, 1.0, 1.0 ] + } + ] + }, "output": "minecraft:main" } ] diff --git a/assets/minecraft/shaders/core/entity.fsh b/assets/minecraft/shaders/core/entity.fsh index 9ac7cb71..35291947 100644 --- a/assets/minecraft/shaders/core/entity.fsh +++ b/assets/minecraft/shaders/core/entity.fsh @@ -1,15 +1,12 @@ #version 150 #moj_import +#moj_import uniform sampler2D Sampler0; -uniform vec4 ColorModulator; -uniform float FogStart; -uniform float FogEnd; -uniform vec4 FogColor; - -in float vertexDistance; +in float sphericalVertexDistance; +in float cylindricalVertexDistance; in vec4 vertexColor; in vec4 lightMapColor; in vec4 overlayColor; @@ -31,5 +28,5 @@ void main() { #ifndef EMISSIVE color *= lightMapColor; #endif - fragColor = linear_fog(color, vertexDistance, FogStart, FogEnd, FogColor); + fragColor = apply_fog(color, sphericalVertexDistance, cylindricalVertexDistance, FogEnvironmentalStart, FogEnvironmentalEnd, FogRenderDistanceStart, FogRenderDistanceEnd, FogColor); } diff --git a/assets/minecraft/shaders/core/entity.vsh b/assets/minecraft/shaders/core/entity.vsh index df60034b..5c901ff4 100644 --- a/assets/minecraft/shaders/core/entity.vsh +++ b/assets/minecraft/shaders/core/entity.vsh @@ -2,6 +2,8 @@ #moj_import #moj_import +#moj_import +#moj_import in vec3 Position; in vec4 Color; @@ -13,15 +15,8 @@ in vec3 Normal; uniform sampler2D Sampler1; uniform sampler2D Sampler2; -uniform mat4 ModelViewMat; -uniform mat4 ProjMat; -uniform mat4 TextureMat; -uniform int FogShape; - -uniform vec3 Light0_Direction; -uniform vec3 Light1_Direction; - -out float vertexDistance; +out float sphericalVertexDistance; +out float cylindricalVertexDistance; out vec4 vertexColor; out vec4 lightMapColor; out vec4 overlayColor; @@ -30,13 +25,16 @@ out vec2 texCoord0; void main() { gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0); - vertexDistance = fog_distance(Position, FogShape); + sphericalVertexDistance = fog_spherical_distance(Position); + cylindricalVertexDistance = fog_cylindrical_distance(Position); #ifdef NO_CARDINAL_LIGHTING vertexColor = Color; #else vertexColor = minecraft_mix_light(Light0_Direction, Light1_Direction, Normal, Color); #endif +#ifndef EMISSIVE lightMapColor = texelFetch(Sampler2, UV2 / 16, 0); +#endif overlayColor = texelFetch(Sampler1, UV1, 0); texCoord0 = UV0; diff --git a/assets/minecraft/shaders/core/glint.fsh b/assets/minecraft/shaders/core/glint.fsh index 500c14b1..5e905f7d 100644 --- a/assets/minecraft/shaders/core/glint.fsh +++ b/assets/minecraft/shaders/core/glint.fsh @@ -1,15 +1,13 @@ #version 150 #moj_import +#moj_import +#moj_import uniform sampler2D Sampler0; -uniform vec4 ColorModulator; -uniform float FogStart; -uniform float FogEnd; -uniform float GlintAlpha; - -in float vertexDistance; +in float sphericalVertexDistance; +in float cylindricalVertexDistance; in vec2 texCoord0; out vec4 fragColor; @@ -19,6 +17,6 @@ void main() { if (color.a < 0.1) { discard; } - float fade = linear_fog_fade(vertexDistance, FogStart, FogEnd) * GlintAlpha; + float fade = (1.0f - total_fog_value(sphericalVertexDistance, cylindricalVertexDistance, FogEnvironmentalStart, FogEnvironmentalEnd, FogRenderDistanceStart, FogRenderDistanceEnd)) * GlintAlpha; fragColor = vec4(color.rgb * fade, color.a); } diff --git a/assets/minecraft/shaders/core/glint.vsh b/assets/minecraft/shaders/core/glint.vsh index 8ba97c1f..2febb065 100644 --- a/assets/minecraft/shaders/core/glint.vsh +++ b/assets/minecraft/shaders/core/glint.vsh @@ -1,21 +1,20 @@ #version 150 #moj_import +#moj_import +#moj_import in vec3 Position; in vec2 UV0; -uniform mat4 ModelViewMat; -uniform mat4 ProjMat; -uniform mat4 TextureMat; -uniform int FogShape; - -out float vertexDistance; +out float sphericalVertexDistance; +out float cylindricalVertexDistance; out vec2 texCoord0; void main() { gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0); - vertexDistance = fog_distance(Position, FogShape); + sphericalVertexDistance = fog_spherical_distance(Position); + cylindricalVertexDistance = fog_cylindrical_distance(Position); texCoord0 = (TextureMat * vec4(UV0, 0.0, 1.0)).xy; } diff --git a/assets/minecraft/shaders/core/gui.fsh b/assets/minecraft/shaders/core/gui.fsh index d7da70e8..6dc48f34 100644 --- a/assets/minecraft/shaders/core/gui.fsh +++ b/assets/minecraft/shaders/core/gui.fsh @@ -1,8 +1,16 @@ #version 150 -in vec4 vertexColor; +// Can't moj_import in things used during startup, when resource packs don't exist. +// This is a copy of dynamicimports.glsl +layout(std140) uniform DynamicTransforms { + mat4 ModelViewMat; + vec4 ColorModulator; + vec3 ModelOffset; + mat4 TextureMat; + float LineWidth; +}; -uniform vec4 ColorModulator; +in vec4 vertexColor; out vec4 fragColor; diff --git a/assets/minecraft/shaders/core/gui.vsh b/assets/minecraft/shaders/core/gui.vsh index 19d3fdba..378994ad 100644 --- a/assets/minecraft/shaders/core/gui.vsh +++ b/assets/minecraft/shaders/core/gui.vsh @@ -1,11 +1,21 @@ #version 150 +// Can't moj_import in things used during startup, when resource packs don't exist. +// This is a copy of dynamicimports.glsl and projection.glsl +layout(std140) uniform DynamicTransforms { + mat4 ModelViewMat; + vec4 ColorModulator; + vec3 ModelOffset; + mat4 TextureMat; + float LineWidth; +}; +layout(std140) uniform Projection { + mat4 ProjMat; +}; + in vec3 Position; in vec4 Color; -uniform mat4 ModelViewMat; -uniform mat4 ProjMat; - out vec4 vertexColor; void main() { diff --git a/assets/minecraft/shaders/core/lightmap.fsh b/assets/minecraft/shaders/core/lightmap.fsh index 657bd9df..10b31667 100644 --- a/assets/minecraft/shaders/core/lightmap.fsh +++ b/assets/minecraft/shaders/core/lightmap.fsh @@ -1,14 +1,16 @@ #version 150 -uniform float AmbientLightFactor; -uniform float SkyFactor; -uniform float BlockFactor; -uniform int UseBrightLightmap; -uniform vec3 SkyLightColor; -uniform float NightVisionFactor; -uniform float DarknessScale; -uniform float DarkenWorldFactor; -uniform float BrightnessFactor; +layout(std140) uniform LightmapInfo { + float AmbientLightFactor; + float SkyFactor; + float BlockFactor; + int UseBrightLightmap; + float NightVisionFactor; + float DarknessScale; + float DarkenWorldFactor; + float BrightnessFactor; + vec3 SkyLightColor; +} lightmapInfo; in vec2 texCoord; @@ -16,7 +18,7 @@ out vec4 fragColor; float get_brightness(float level) { float curved_level = level / (4.0 - 3.0 * level); - return mix(curved_level, 1.0, AmbientLightFactor); + return mix(curved_level, 1.0, lightmapInfo.AmbientLightFactor); } vec3 notGamma(vec3 x) { @@ -25,8 +27,8 @@ vec3 notGamma(vec3 x) { } void main() { - float block_brightness = get_brightness(floor(texCoord.x * 16) / 15) * BlockFactor; - float sky_brightness = get_brightness(floor(texCoord.y * 16) / 15) * SkyFactor; + float block_brightness = get_brightness(floor(texCoord.x * 16) / 15) * lightmapInfo.BlockFactor; + float sky_brightness = get_brightness(floor(texCoord.y * 16) / 15) * lightmapInfo.SkyFactor; // cubic nonsense, dips to yellowish in the middle, white when fully saturated vec3 color = vec3( @@ -35,32 +37,32 @@ void main() { block_brightness * (block_brightness * block_brightness * 0.6 + 0.4) ); - if (UseBrightLightmap != 0) { + if (lightmapInfo.UseBrightLightmap != 0) { color = mix(color, vec3(0.99, 1.12, 1.0), 0.25); color = clamp(color, 0.0, 1.0); } else { - color += SkyLightColor * sky_brightness; + color += lightmapInfo.SkyLightColor * sky_brightness; color = mix(color, vec3(0.75), 0.04); vec3 darkened_color = color * vec3(0.7, 0.6, 0.6); - color = mix(color, darkened_color, DarkenWorldFactor); + color = mix(color, darkened_color, lightmapInfo.DarkenWorldFactor); } - if (NightVisionFactor > 0.0) { + if (lightmapInfo.NightVisionFactor > 0.0) { // scale up uniformly until 1.0 is hit by one of the colors float max_component = max(color.r, max(color.g, color.b)); if (max_component < 1.0) { vec3 bright_color = color / max_component; - color = mix(color, bright_color, NightVisionFactor); + color = mix(color, bright_color, lightmapInfo.NightVisionFactor); } } - if (UseBrightLightmap == 0) { - color = clamp(color - vec3(DarknessScale), 0.0, 1.0); + if (lightmapInfo.UseBrightLightmap == 0) { + color = clamp(color - vec3(lightmapInfo.DarknessScale), 0.0, 1.0); } vec3 notGamma = notGamma(color); - color = mix(color, notGamma, BrightnessFactor); + color = mix(color, notGamma, lightmapInfo.BrightnessFactor); color = mix(color, vec3(0.75), 0.04); color = clamp(color, 0.0, 1.0); diff --git a/assets/minecraft/shaders/core/panorama.fsh b/assets/minecraft/shaders/core/panorama.fsh new file mode 100644 index 00000000..42a7f093 --- /dev/null +++ b/assets/minecraft/shaders/core/panorama.fsh @@ -0,0 +1,11 @@ +#version 150 + +uniform samplerCube Sampler0; + +in vec3 texCoord0; + +out vec4 fragColor; + +void main() { + fragColor = texture(Sampler0, texCoord0); +} diff --git a/assets/minecraft/shaders/core/panorama.vsh b/assets/minecraft/shaders/core/panorama.vsh new file mode 100644 index 00000000..83be8eb0 --- /dev/null +++ b/assets/minecraft/shaders/core/panorama.vsh @@ -0,0 +1,13 @@ +#version 150 + +#moj_import +#moj_import + +in vec3 Position; +out vec3 texCoord0; + +void main() { + gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0); + + texCoord0 = Position; +} diff --git a/assets/minecraft/shaders/core/particle.fsh b/assets/minecraft/shaders/core/particle.fsh index a08e0742..e1942645 100644 --- a/assets/minecraft/shaders/core/particle.fsh +++ b/assets/minecraft/shaders/core/particle.fsh @@ -1,15 +1,12 @@ #version 150 #moj_import +#moj_import uniform sampler2D Sampler0; -uniform vec4 ColorModulator; -uniform float FogStart; -uniform float FogEnd; -uniform vec4 FogColor; - -in float vertexDistance; +in float sphericalVertexDistance; +in float cylindricalVertexDistance; in vec2 texCoord0; in vec4 vertexColor; @@ -20,5 +17,5 @@ void main() { if (color.a < 0.1) { discard; } - fragColor = linear_fog(color, vertexDistance, FogStart, FogEnd, FogColor); + fragColor = apply_fog(color, sphericalVertexDistance, cylindricalVertexDistance, FogEnvironmentalStart, FogEnvironmentalEnd, FogRenderDistanceStart, FogRenderDistanceEnd, FogColor); } diff --git a/assets/minecraft/shaders/core/particle.vsh b/assets/minecraft/shaders/core/particle.vsh index 2d1cce3f..6300f2d0 100644 --- a/assets/minecraft/shaders/core/particle.vsh +++ b/assets/minecraft/shaders/core/particle.vsh @@ -1,6 +1,8 @@ #version 150 #moj_import +#moj_import +#moj_import in vec3 Position; in vec2 UV0; @@ -9,18 +11,16 @@ in ivec2 UV2; uniform sampler2D Sampler2; -uniform mat4 ModelViewMat; -uniform mat4 ProjMat; -uniform int FogShape; - -out float vertexDistance; +out float sphericalVertexDistance; +out float cylindricalVertexDistance; out vec2 texCoord0; out vec4 vertexColor; void main() { gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0); - vertexDistance = fog_distance(Position, FogShape); + sphericalVertexDistance = fog_spherical_distance(Position); + cylindricalVertexDistance = fog_cylindrical_distance(Position); texCoord0 = UV0; vertexColor = Color * texelFetch(Sampler2, UV2 / 16, 0); } diff --git a/assets/minecraft/shaders/core/position.fsh b/assets/minecraft/shaders/core/position.fsh index 00b37260..60c09934 100644 --- a/assets/minecraft/shaders/core/position.fsh +++ b/assets/minecraft/shaders/core/position.fsh @@ -1,16 +1,13 @@ #version 150 #moj_import +#moj_import -uniform vec4 ColorModulator; -uniform float FogStart; -uniform float FogEnd; -uniform vec4 FogColor; - -in float vertexDistance; +in float sphericalVertexDistance; +in float cylindricalVertexDistance; out vec4 fragColor; void main() { - fragColor = linear_fog(ColorModulator, vertexDistance, FogStart, FogEnd, FogColor); + fragColor = apply_fog(ColorModulator, sphericalVertexDistance, cylindricalVertexDistance, FogEnvironmentalStart, FogEnvironmentalEnd, FogRenderDistanceStart, FogRenderDistanceEnd, FogColor); } diff --git a/assets/minecraft/shaders/core/position.vsh b/assets/minecraft/shaders/core/position.vsh index a667402d..1f3bd9d4 100644 --- a/assets/minecraft/shaders/core/position.vsh +++ b/assets/minecraft/shaders/core/position.vsh @@ -1,17 +1,17 @@ #version 150 #moj_import +#moj_import +#moj_import in vec3 Position; -uniform mat4 ProjMat; -uniform mat4 ModelViewMat; -uniform int FogShape; - -out float vertexDistance; +out float sphericalVertexDistance; +out float cylindricalVertexDistance; void main() { gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0); - vertexDistance = fog_distance(Position, FogShape); + sphericalVertexDistance = fog_spherical_distance(Position); + cylindricalVertexDistance = fog_cylindrical_distance(Position); } diff --git a/assets/minecraft/shaders/core/position_color.fsh b/assets/minecraft/shaders/core/position_color.fsh index d7da70e8..bd3ff05e 100644 --- a/assets/minecraft/shaders/core/position_color.fsh +++ b/assets/minecraft/shaders/core/position_color.fsh @@ -1,8 +1,8 @@ #version 150 -in vec4 vertexColor; +#moj_import -uniform vec4 ColorModulator; +in vec4 vertexColor; out vec4 fragColor; diff --git a/assets/minecraft/shaders/core/position_color.vsh b/assets/minecraft/shaders/core/position_color.vsh index 19d3fdba..2e50bbe4 100644 --- a/assets/minecraft/shaders/core/position_color.vsh +++ b/assets/minecraft/shaders/core/position_color.vsh @@ -1,11 +1,11 @@ #version 150 +#moj_import +#moj_import + in vec3 Position; in vec4 Color; -uniform mat4 ModelViewMat; -uniform mat4 ProjMat; - out vec4 vertexColor; void main() { diff --git a/assets/minecraft/shaders/core/position_color_lightmap.fsh b/assets/minecraft/shaders/core/position_color_lightmap.fsh index 49a182cb..dda4fadc 100644 --- a/assets/minecraft/shaders/core/position_color_lightmap.fsh +++ b/assets/minecraft/shaders/core/position_color_lightmap.fsh @@ -1,8 +1,8 @@ #version 150 -uniform sampler2D Sampler2; +#moj_import -uniform vec4 ColorModulator; +uniform sampler2D Sampler2; in vec4 vertexColor; in vec2 texCoord2; diff --git a/assets/minecraft/shaders/core/position_color_lightmap.vsh b/assets/minecraft/shaders/core/position_color_lightmap.vsh index 8a08d3c7..9497915b 100644 --- a/assets/minecraft/shaders/core/position_color_lightmap.vsh +++ b/assets/minecraft/shaders/core/position_color_lightmap.vsh @@ -1,12 +1,12 @@ #version 150 +#moj_import +#moj_import + in vec3 Position; in vec4 Color; in vec2 UV2; -uniform mat4 ModelViewMat; -uniform mat4 ProjMat; - out vec4 vertexColor; out vec2 texCoord2; diff --git a/assets/minecraft/shaders/core/position_color_tex_lightmap.fsh b/assets/minecraft/shaders/core/position_color_tex_lightmap.fsh index d04bdec4..0568d470 100644 --- a/assets/minecraft/shaders/core/position_color_tex_lightmap.fsh +++ b/assets/minecraft/shaders/core/position_color_tex_lightmap.fsh @@ -1,8 +1,8 @@ #version 150 -uniform sampler2D Sampler0; +#moj_import -uniform vec4 ColorModulator; +uniform sampler2D Sampler0; in vec4 vertexColor; in vec2 texCoord0; diff --git a/assets/minecraft/shaders/core/position_color_tex_lightmap.vsh b/assets/minecraft/shaders/core/position_color_tex_lightmap.vsh index 75bbab4f..346f7f17 100644 --- a/assets/minecraft/shaders/core/position_color_tex_lightmap.vsh +++ b/assets/minecraft/shaders/core/position_color_tex_lightmap.vsh @@ -1,13 +1,13 @@ #version 150 +#moj_import +#moj_import + in vec3 Position; in vec4 Color; in vec2 UV0; in vec2 UV2; -uniform mat4 ModelViewMat; -uniform mat4 ProjMat; - out vec4 vertexColor; out vec2 texCoord0; out vec2 texCoord2; diff --git a/assets/minecraft/shaders/core/position_tex.fsh b/assets/minecraft/shaders/core/position_tex.fsh index ded49d39..b57e74fb 100644 --- a/assets/minecraft/shaders/core/position_tex.fsh +++ b/assets/minecraft/shaders/core/position_tex.fsh @@ -1,8 +1,8 @@ #version 150 -uniform sampler2D Sampler0; +#moj_import -uniform vec4 ColorModulator; +uniform sampler2D Sampler0; in vec2 texCoord0; diff --git a/assets/minecraft/shaders/core/position_tex.vsh b/assets/minecraft/shaders/core/position_tex.vsh index 15336e2e..19761c38 100644 --- a/assets/minecraft/shaders/core/position_tex.vsh +++ b/assets/minecraft/shaders/core/position_tex.vsh @@ -1,11 +1,11 @@ #version 150 +#moj_import +#moj_import + in vec3 Position; in vec2 UV0; -uniform mat4 ModelViewMat; -uniform mat4 ProjMat; - out vec2 texCoord0; void main() { diff --git a/assets/minecraft/shaders/core/position_tex_color.fsh b/assets/minecraft/shaders/core/position_tex_color.fsh index 759ec1a2..128a891c 100644 --- a/assets/minecraft/shaders/core/position_tex_color.fsh +++ b/assets/minecraft/shaders/core/position_tex_color.fsh @@ -1,8 +1,16 @@ #version 150 -uniform sampler2D Sampler0; +// Can't moj_import in things used during startup, when resource packs don't exist. +// This is a copy of dynamicimports.glsl +layout(std140) uniform DynamicTransforms { + mat4 ModelViewMat; + vec4 ColorModulator; + vec3 ModelOffset; + mat4 TextureMat; + float LineWidth; +}; -uniform vec4 ColorModulator; +uniform sampler2D Sampler0; in vec2 texCoord0; in vec4 vertexColor; diff --git a/assets/minecraft/shaders/core/position_tex_color.vsh b/assets/minecraft/shaders/core/position_tex_color.vsh index 1ed8e406..839fbbde 100644 --- a/assets/minecraft/shaders/core/position_tex_color.vsh +++ b/assets/minecraft/shaders/core/position_tex_color.vsh @@ -1,12 +1,22 @@ #version 150 +// Can't moj_import in things used during startup, when resource packs don't exist. +// This is a copy of dynamicimports.glsl and projection.glsl +layout(std140) uniform DynamicTransforms { + mat4 ModelViewMat; + vec4 ColorModulator; + vec3 ModelOffset; + mat4 TextureMat; + float LineWidth; +}; +layout(std140) uniform Projection { + mat4 ProjMat; +}; + in vec3 Position; in vec2 UV0; in vec4 Color; -uniform mat4 ModelViewMat; -uniform mat4 ProjMat; - out vec2 texCoord0; out vec4 vertexColor; diff --git a/assets/minecraft/shaders/core/rendertype_beacon_beam.fsh b/assets/minecraft/shaders/core/rendertype_beacon_beam.fsh index 7669c9e1..083dde04 100644 --- a/assets/minecraft/shaders/core/rendertype_beacon_beam.fsh +++ b/assets/minecraft/shaders/core/rendertype_beacon_beam.fsh @@ -1,15 +1,11 @@ #version 150 #moj_import +#moj_import +#moj_import uniform sampler2D Sampler0; -uniform mat4 ProjMat; -uniform vec4 ColorModulator; -uniform float FogStart; -uniform float FogEnd; -uniform vec4 FogColor; - in vec4 vertexColor; in vec2 texCoord0; @@ -19,5 +15,5 @@ void main() { vec4 color = texture(Sampler0, texCoord0); color *= vertexColor * ColorModulator; float fragmentDistance = -ProjMat[3].z / ((gl_FragCoord.z) * -2.0 + 1.0 - ProjMat[2].z); - fragColor = linear_fog(color, fragmentDistance, FogStart, FogEnd, FogColor); + fragColor = apply_fog(color, fragmentDistance, fragmentDistance, FogEnvironmentalStart, FogEnvironmentalEnd, FogRenderDistanceStart, FogRenderDistanceEnd, FogColor); } diff --git a/assets/minecraft/shaders/core/rendertype_beacon_beam.vsh b/assets/minecraft/shaders/core/rendertype_beacon_beam.vsh index 44e105d4..75608eaa 100644 --- a/assets/minecraft/shaders/core/rendertype_beacon_beam.vsh +++ b/assets/minecraft/shaders/core/rendertype_beacon_beam.vsh @@ -1,12 +1,12 @@ #version 150 +#moj_import +#moj_import + in vec3 Position; in vec4 Color; in vec2 UV0; -uniform mat4 ModelViewMat; -uniform mat4 ProjMat; - out vec4 vertexColor; out vec2 texCoord0; diff --git a/assets/minecraft/shaders/core/rendertype_clouds.fsh b/assets/minecraft/shaders/core/rendertype_clouds.fsh index 19f60967..b6a56cc5 100644 --- a/assets/minecraft/shaders/core/rendertype_clouds.fsh +++ b/assets/minecraft/shaders/core/rendertype_clouds.fsh @@ -2,9 +2,6 @@ #moj_import -uniform float FogStart; -uniform float FogEnd; -uniform vec4 FogColor; in float vertexDistance; in vec4 vertexColor; @@ -12,5 +9,7 @@ in vec4 vertexColor; out vec4 fragColor; void main() { - fragColor = linear_fog(vertexColor, vertexDistance, FogStart, FogEnd, FogColor); + vec4 color = vertexColor; + color.a *= 1.0f - linear_fog_value(vertexDistance, 0, FogCloudsEnd); + fragColor = color; } diff --git a/assets/minecraft/shaders/core/rendertype_clouds.vsh b/assets/minecraft/shaders/core/rendertype_clouds.vsh index 1abb3766..6698eebc 100644 --- a/assets/minecraft/shaders/core/rendertype_clouds.vsh +++ b/assets/minecraft/shaders/core/rendertype_clouds.vsh @@ -1,23 +1,90 @@ #version 150 #moj_import +#moj_import +#moj_import -in vec3 Position; -in vec4 Color; +const int FLAG_MASK_DIR = 7; +const int FLAG_INSIDE_FACE = 1 << 4; +const int FLAG_USE_TOP_COLOR = 1 << 5; +const int FLAG_EXTRA_Z = 1 << 6; +const int FLAG_EXTRA_X = 1 << 7; -uniform mat4 ModelViewMat; -uniform mat4 ProjMat; -uniform vec3 ModelOffset; -uniform int FogShape; -uniform vec4 ColorModulator; +layout(std140) uniform CloudInfo { + vec4 CloudColor; + vec3 CloudOffset; + vec3 CellSize; +}; + +uniform isamplerBuffer CloudFaces; out float vertexDistance; out vec4 vertexColor; +const vec3[] vertices = vec3[]( + // Bottom face + vec3(1, 0, 0), + vec3(1, 0, 1), + vec3(0, 0, 1), + vec3(0, 0, 0), + // Top face + vec3(0, 1, 0), + vec3(0, 1, 1), + vec3(1, 1, 1), + vec3(1, 1, 0), + // North face + vec3(0, 0, 0), + vec3(0, 1, 0), + vec3(1, 1, 0), + vec3(1, 0, 0), + // South face + vec3(1, 0, 1), + vec3(1, 1, 1), + vec3(0, 1, 1), + vec3(0, 0, 1), + // West face + vec3(0, 0, 1), + vec3(0, 1, 1), + vec3(0, 1, 0), + vec3(0, 0, 0), + // East face + vec3(1, 0, 0), + vec3(1, 1, 0), + vec3(1, 1, 1), + vec3(1, 0, 1) +); + +const vec4[] faceColors = vec4[]( + // Bottom face + vec4(0.7, 0.7, 0.7, 0.8), + // Top face + vec4(1.0, 1.0, 1.0, 0.8), + // North face + vec4(0.8, 0.8, 0.8, 0.8), + // South face + vec4(0.8, 0.8, 0.8, 0.8), + // West face + vec4(0.9, 0.9, 0.9, 0.8), + // East face + vec4(0.9, 0.9, 0.9, 0.8) +); + void main() { - vec3 pos = Position + ModelOffset; + int quadVertex = gl_VertexID % 4; + int index = (gl_VertexID / 4) * 3; + + int cellX = texelFetch(CloudFaces, index).r; + int cellZ = texelFetch(CloudFaces, index + 1).r; + int dirAndFlags = texelFetch(CloudFaces, index + 2).r; + int direction = dirAndFlags & FLAG_MASK_DIR; + bool isInsideFace = (dirAndFlags & FLAG_INSIDE_FACE) == FLAG_INSIDE_FACE; + bool useTopColor = (dirAndFlags & FLAG_USE_TOP_COLOR) == FLAG_USE_TOP_COLOR; + cellX = (cellX << 1) | ((dirAndFlags & FLAG_EXTRA_X) >> 7); + cellZ = (cellZ << 1) | ((dirAndFlags & FLAG_EXTRA_Z) >> 6); + vec3 faceVertex = vertices[(direction * 4) + (isInsideFace ? 3 - quadVertex : quadVertex)]; + vec3 pos = (faceVertex * CellSize) + (vec3(cellX, 0, cellZ) * CellSize) + CloudOffset; gl_Position = ProjMat * ModelViewMat * vec4(pos, 1.0); - vertexDistance = fog_distance(pos, FogShape); - vertexColor = Color * ColorModulator; + vertexDistance = fog_spherical_distance(pos); + vertexColor = (useTopColor ? faceColors[1] : faceColors[direction]) * CloudColor; } diff --git a/assets/minecraft/shaders/core/rendertype_crumbling.fsh b/assets/minecraft/shaders/core/rendertype_crumbling.fsh index d04bdec4..96f82046 100644 --- a/assets/minecraft/shaders/core/rendertype_crumbling.fsh +++ b/assets/minecraft/shaders/core/rendertype_crumbling.fsh @@ -1,9 +1,12 @@ #version 150 +#moj_import +#moj_import + uniform sampler2D Sampler0; -uniform vec4 ColorModulator; - +in float sphericalVertexDistance; +in float cylindricalVertexDistance; in vec4 vertexColor; in vec2 texCoord0; in vec2 texCoord2; @@ -15,5 +18,6 @@ void main() { if (color.a < 0.1) { discard; } - fragColor = color * ColorModulator; + color = color * ColorModulator; + fragColor = apply_fog(color, sphericalVertexDistance, cylindricalVertexDistance, FogEnvironmentalStart, FogEnvironmentalEnd, FogRenderDistanceStart, FogRenderDistanceEnd, FogColor); } diff --git a/assets/minecraft/shaders/core/rendertype_crumbling.vsh b/assets/minecraft/shaders/core/rendertype_crumbling.vsh index 06341163..30decdb3 100644 --- a/assets/minecraft/shaders/core/rendertype_crumbling.vsh +++ b/assets/minecraft/shaders/core/rendertype_crumbling.vsh @@ -1,14 +1,17 @@ #version 150 +#moj_import +#moj_import +#moj_import + in vec3 Position; in vec4 Color; in vec2 UV0; in vec2 UV2; in vec3 Normal; -uniform mat4 ModelViewMat; -uniform mat4 ProjMat; - +out float sphericalVertexDistance; +out float cylindricalVertexDistance; out vec4 vertexColor; out vec2 texCoord0; out vec2 texCoord2; @@ -16,6 +19,8 @@ out vec2 texCoord2; void main() { gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0); + sphericalVertexDistance = fog_spherical_distance(Position); + cylindricalVertexDistance = fog_cylindrical_distance(Position); vertexColor = Color; texCoord0 = UV0; texCoord2 = UV2; diff --git a/assets/minecraft/shaders/core/rendertype_end_portal.fsh b/assets/minecraft/shaders/core/rendertype_end_portal.fsh index 539d33d4..490e02b4 100644 --- a/assets/minecraft/shaders/core/rendertype_end_portal.fsh +++ b/assets/minecraft/shaders/core/rendertype_end_portal.fsh @@ -2,17 +2,14 @@ #moj_import #moj_import +#moj_import uniform sampler2D Sampler0; uniform sampler2D Sampler1; -uniform float GameTime; -uniform float FogStart; -uniform float FogEnd; -uniform vec4 FogColor; - in vec4 texProj0; -in float vertexDistance; +in float sphericalVertexDistance; +in float cylindricalVertexDistance; const vec3[] COLORS = vec3[]( vec3(0.022087, 0.098399, 0.110818), @@ -62,5 +59,5 @@ void main() { for (int i = 0; i < PORTAL_LAYERS; i++) { color += textureProj(Sampler1, texProj0 * end_portal_layer(float(i + 1))).rgb * COLORS[i]; } - fragColor = linear_fog(vec4(color, 1.0), vertexDistance, FogStart, FogEnd, FogColor); + fragColor = apply_fog(vec4(color, 1.0), sphericalVertexDistance, cylindricalVertexDistance, FogEnvironmentalStart, FogEnvironmentalEnd, FogRenderDistanceStart, FogRenderDistanceEnd, FogColor); } diff --git a/assets/minecraft/shaders/core/rendertype_end_portal.vsh b/assets/minecraft/shaders/core/rendertype_end_portal.vsh index 37b5d5c1..5269645e 100644 --- a/assets/minecraft/shaders/core/rendertype_end_portal.vsh +++ b/assets/minecraft/shaders/core/rendertype_end_portal.vsh @@ -2,19 +2,19 @@ #moj_import #moj_import +#moj_import +#moj_import in vec3 Position; -uniform mat4 ModelViewMat; -uniform mat4 ProjMat; -uniform int FogShape; - out vec4 texProj0; -out float vertexDistance; +out float sphericalVertexDistance; +out float cylindricalVertexDistance; void main() { gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0); texProj0 = projection_from_position(gl_Position); - vertexDistance = fog_distance(Position, FogShape); + sphericalVertexDistance = fog_spherical_distance(Position); + cylindricalVertexDistance = fog_cylindrical_distance(Position); } diff --git a/assets/minecraft/shaders/core/rendertype_entity_alpha.vsh b/assets/minecraft/shaders/core/rendertype_entity_alpha.vsh index fd9dfbfc..fce457bc 100644 --- a/assets/minecraft/shaders/core/rendertype_entity_alpha.vsh +++ b/assets/minecraft/shaders/core/rendertype_entity_alpha.vsh @@ -1,5 +1,8 @@ #version 150 +#moj_import +#moj_import + in vec3 Position; in vec4 Color; in vec2 UV0; @@ -7,9 +10,6 @@ in vec2 UV1; in vec2 UV2; in vec3 Normal; -uniform mat4 ModelViewMat; -uniform mat4 ProjMat; - out vec4 vertexColor; out vec2 texCoord0; out vec2 texCoord1; diff --git a/assets/minecraft/shaders/core/rendertype_entity_decal.fsh b/assets/minecraft/shaders/core/rendertype_entity_decal.fsh index d1d0929e..657536b4 100644 --- a/assets/minecraft/shaders/core/rendertype_entity_decal.fsh +++ b/assets/minecraft/shaders/core/rendertype_entity_decal.fsh @@ -1,15 +1,12 @@ #version 150 #moj_import +#moj_import uniform sampler2D Sampler0; -uniform vec4 ColorModulator; -uniform float FogStart; -uniform float FogEnd; -uniform vec4 FogColor; - -in float vertexDistance; +in float sphericalVertexDistance; +in float cylindricalVertexDistance; in vec4 vertexColor; in vec4 overlayColor; in vec2 texCoord0; @@ -23,5 +20,5 @@ void main() { } color.rgb = mix(overlayColor.rgb, color.rgb, overlayColor.a); color *= vertexColor * ColorModulator; - fragColor = linear_fog(color, vertexDistance, FogStart, FogEnd, FogColor); + fragColor = apply_fog(color, sphericalVertexDistance, cylindricalVertexDistance, FogEnvironmentalStart, FogEnvironmentalEnd, FogRenderDistanceStart, FogRenderDistanceEnd, FogColor); } diff --git a/assets/minecraft/shaders/core/rendertype_entity_decal.vsh b/assets/minecraft/shaders/core/rendertype_entity_decal.vsh index a20e6611..07194af4 100644 --- a/assets/minecraft/shaders/core/rendertype_entity_decal.vsh +++ b/assets/minecraft/shaders/core/rendertype_entity_decal.vsh @@ -2,6 +2,8 @@ #moj_import #moj_import +#moj_import +#moj_import in vec3 Position; in vec4 Color; @@ -13,14 +15,9 @@ in vec3 Normal; uniform sampler2D Sampler1; uniform sampler2D Sampler2; -uniform mat4 ModelViewMat; -uniform mat4 ProjMat; -uniform int FogShape; -uniform vec3 Light0_Direction; -uniform vec3 Light1_Direction; - -out float vertexDistance; +out float sphericalVertexDistance; +out float cylindricalVertexDistance; out vec4 vertexColor; out vec4 overlayColor; out vec2 texCoord0; @@ -28,7 +25,8 @@ out vec2 texCoord0; void main() { gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0); - vertexDistance = fog_distance(Position, FogShape); + sphericalVertexDistance = fog_spherical_distance(Position); + cylindricalVertexDistance = fog_cylindrical_distance(Position); vertexColor = minecraft_mix_light(Light0_Direction, Light1_Direction, Normal, Color) * texelFetch(Sampler2, UV2 / 16, 0); overlayColor = texelFetch(Sampler1, UV1, 0); texCoord0 = UV0; diff --git a/assets/minecraft/shaders/core/rendertype_entity_shadow.fsh b/assets/minecraft/shaders/core/rendertype_entity_shadow.fsh index 9ee628f5..1b9ab2ad 100644 --- a/assets/minecraft/shaders/core/rendertype_entity_shadow.fsh +++ b/assets/minecraft/shaders/core/rendertype_entity_shadow.fsh @@ -1,15 +1,12 @@ #version 150 #moj_import +#moj_import uniform sampler2D Sampler0; -uniform vec4 ColorModulator; -uniform float FogStart; -uniform float FogEnd; -uniform vec4 FogColor; - -in float vertexDistance; +in float sphericalVertexDistance; +in float cylindricalVertexDistance; in vec4 vertexColor; in vec2 texCoord0; @@ -18,5 +15,5 @@ out vec4 fragColor; void main() { vec4 color = texture(Sampler0, clamp(texCoord0, 0.0, 1.0)); color *= vertexColor * ColorModulator; - fragColor = linear_fog(color, vertexDistance, FogStart, FogEnd, FogColor); + fragColor = apply_fog(color, sphericalVertexDistance, cylindricalVertexDistance, FogEnvironmentalStart, FogEnvironmentalEnd, FogRenderDistanceStart, FogRenderDistanceEnd, FogColor); } diff --git a/assets/minecraft/shaders/core/rendertype_entity_shadow.vsh b/assets/minecraft/shaders/core/rendertype_entity_shadow.vsh index d88ec239..333cb7d6 100644 --- a/assets/minecraft/shaders/core/rendertype_entity_shadow.vsh +++ b/assets/minecraft/shaders/core/rendertype_entity_shadow.vsh @@ -1,23 +1,23 @@ #version 150 #moj_import +#moj_import +#moj_import in vec3 Position; in vec4 Color; in vec2 UV0; -uniform mat4 ModelViewMat; -uniform mat4 ProjMat; -uniform int FogShape; - -out float vertexDistance; +out float sphericalVertexDistance; +out float cylindricalVertexDistance; out vec4 vertexColor; out vec2 texCoord0; void main() { gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0); - vertexDistance = fog_distance(Position, FogShape); + sphericalVertexDistance = fog_spherical_distance(Position); + cylindricalVertexDistance = fog_cylindrical_distance(Position); vertexColor = Color; texCoord0 = UV0; } diff --git a/assets/minecraft/shaders/core/rendertype_item_entity_translucent_cull.fsh b/assets/minecraft/shaders/core/rendertype_item_entity_translucent_cull.fsh index 0eb9feea..9f2978e6 100644 --- a/assets/minecraft/shaders/core/rendertype_item_entity_translucent_cull.fsh +++ b/assets/minecraft/shaders/core/rendertype_item_entity_translucent_cull.fsh @@ -1,15 +1,12 @@ #version 150 #moj_import +#moj_import uniform sampler2D Sampler0; -uniform vec4 ColorModulator; -uniform float FogStart; -uniform float FogEnd; -uniform vec4 FogColor; - -in float vertexDistance; +in float sphericalVertexDistance; +in float cylindricalVertexDistance; in vec4 vertexColor; in vec2 texCoord0; in vec2 texCoord1; @@ -21,5 +18,5 @@ void main() { if (color.a < 0.1) { discard; } - fragColor = linear_fog(color, vertexDistance, FogStart, FogEnd, FogColor); + fragColor = apply_fog(color, sphericalVertexDistance, cylindricalVertexDistance, FogEnvironmentalStart, FogEnvironmentalEnd, FogRenderDistanceStart, FogRenderDistanceEnd, FogColor); } diff --git a/assets/minecraft/shaders/core/rendertype_item_entity_translucent_cull.vsh b/assets/minecraft/shaders/core/rendertype_item_entity_translucent_cull.vsh index 022efea3..74e89f21 100644 --- a/assets/minecraft/shaders/core/rendertype_item_entity_translucent_cull.vsh +++ b/assets/minecraft/shaders/core/rendertype_item_entity_translucent_cull.vsh @@ -2,6 +2,8 @@ #moj_import #moj_import +#moj_import +#moj_import in vec3 Position; in vec4 Color; @@ -12,14 +14,9 @@ in vec3 Normal; uniform sampler2D Sampler2; -uniform mat4 ModelViewMat; -uniform mat4 ProjMat; -uniform int FogShape; -uniform vec3 Light0_Direction; -uniform vec3 Light1_Direction; - -out float vertexDistance; +out float sphericalVertexDistance; +out float cylindricalVertexDistance; out vec4 vertexColor; out vec2 texCoord0; out vec2 texCoord1; @@ -28,7 +25,8 @@ out vec2 texCoord2; void main() { gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0); - vertexDistance = fog_distance(Position, FogShape); + sphericalVertexDistance = fog_spherical_distance(Position); + cylindricalVertexDistance = fog_cylindrical_distance(Position); vertexColor = minecraft_mix_light(Light0_Direction, Light1_Direction, Normal, Color) * texelFetch(Sampler2, UV2 / 16, 0); texCoord0 = UV0; texCoord1 = UV1; diff --git a/assets/minecraft/shaders/core/rendertype_leash.fsh b/assets/minecraft/shaders/core/rendertype_leash.fsh index 0f0cf302..3e93cd78 100644 --- a/assets/minecraft/shaders/core/rendertype_leash.fsh +++ b/assets/minecraft/shaders/core/rendertype_leash.fsh @@ -2,15 +2,13 @@ #moj_import -uniform float FogStart; -uniform float FogEnd; -uniform vec4 FogColor; -in float vertexDistance; +in float sphericalVertexDistance; +in float cylindricalVertexDistance; flat in vec4 vertexColor; out vec4 fragColor; void main() { - fragColor = linear_fog(vertexColor, vertexDistance, FogStart, FogEnd, FogColor); + fragColor = apply_fog(vertexColor, sphericalVertexDistance, cylindricalVertexDistance, FogEnvironmentalStart, FogEnvironmentalEnd, FogRenderDistanceStart, FogRenderDistanceEnd, FogColor); } diff --git a/assets/minecraft/shaders/core/rendertype_leash.vsh b/assets/minecraft/shaders/core/rendertype_leash.vsh index 28073fdd..f70872a0 100644 --- a/assets/minecraft/shaders/core/rendertype_leash.vsh +++ b/assets/minecraft/shaders/core/rendertype_leash.vsh @@ -1,6 +1,8 @@ #version 150 #moj_import +#moj_import +#moj_import in vec3 Position; in vec4 Color; @@ -8,17 +10,14 @@ in ivec2 UV2; uniform sampler2D Sampler2; -uniform mat4 ModelViewMat; -uniform mat4 ProjMat; -uniform vec4 ColorModulator; -uniform int FogShape; - -out float vertexDistance; +out float sphericalVertexDistance; +out float cylindricalVertexDistance; flat out vec4 vertexColor; void main() { gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0); - vertexDistance = fog_distance(Position, FogShape); + sphericalVertexDistance = fog_spherical_distance(Position); + cylindricalVertexDistance = fog_cylindrical_distance(Position); vertexColor = Color * ColorModulator * texelFetch(Sampler2, UV2 / 16, 0); } diff --git a/assets/minecraft/shaders/core/rendertype_lightning.fsh b/assets/minecraft/shaders/core/rendertype_lightning.fsh index 552521f1..0e577f8d 100644 --- a/assets/minecraft/shaders/core/rendertype_lightning.fsh +++ b/assets/minecraft/shaders/core/rendertype_lightning.fsh @@ -1,16 +1,14 @@ #version 150 #moj_import +#moj_import -uniform vec4 ColorModulator; -uniform float FogStart; -uniform float FogEnd; - -in float vertexDistance; +in float sphericalVertexDistance; +in float cylindricalVertexDistance; in vec4 vertexColor; out vec4 fragColor; void main() { - fragColor = vertexColor * ColorModulator * linear_fog_fade(vertexDistance, FogStart, FogEnd); + fragColor = vertexColor * ColorModulator * (1.0f - total_fog_value(sphericalVertexDistance, cylindricalVertexDistance, FogEnvironmentalStart, FogEnvironmentalEnd, FogRenderDistanceStart, FogRenderDistanceEnd)); } diff --git a/assets/minecraft/shaders/core/rendertype_lightning.vsh b/assets/minecraft/shaders/core/rendertype_lightning.vsh index d58eb6da..294941c6 100644 --- a/assets/minecraft/shaders/core/rendertype_lightning.vsh +++ b/assets/minecraft/shaders/core/rendertype_lightning.vsh @@ -1,20 +1,20 @@ #version 150 #moj_import +#moj_import +#moj_import in vec3 Position; in vec4 Color; -uniform mat4 ModelViewMat; -uniform mat4 ProjMat; -uniform int FogShape; - -out float vertexDistance; +out float sphericalVertexDistance; +out float cylindricalVertexDistance; out vec4 vertexColor; void main() { gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0); - vertexDistance = fog_distance(Position, FogShape); + sphericalVertexDistance = fog_spherical_distance(Position); + cylindricalVertexDistance = fog_cylindrical_distance(Position); vertexColor = Color; } diff --git a/assets/minecraft/shaders/core/rendertype_lines.fsh b/assets/minecraft/shaders/core/rendertype_lines.fsh index 46949e1f..4e6f6ac9 100644 --- a/assets/minecraft/shaders/core/rendertype_lines.fsh +++ b/assets/minecraft/shaders/core/rendertype_lines.fsh @@ -1,18 +1,15 @@ #version 150 #moj_import +#moj_import -uniform vec4 ColorModulator; -uniform float FogStart; -uniform float FogEnd; -uniform vec4 FogColor; - -in float vertexDistance; +in float sphericalVertexDistance; +in float cylindricalVertexDistance; in vec4 vertexColor; out vec4 fragColor; void main() { vec4 color = vertexColor * ColorModulator; - fragColor = linear_fog(color, vertexDistance, FogStart, FogEnd, FogColor); + fragColor = apply_fog(color, sphericalVertexDistance, cylindricalVertexDistance, FogEnvironmentalStart, FogEnvironmentalEnd, FogRenderDistanceStart, FogRenderDistanceEnd, FogColor); } diff --git a/assets/minecraft/shaders/core/rendertype_lines.vsh b/assets/minecraft/shaders/core/rendertype_lines.vsh index a7408de6..c358bc4b 100644 --- a/assets/minecraft/shaders/core/rendertype_lines.vsh +++ b/assets/minecraft/shaders/core/rendertype_lines.vsh @@ -1,18 +1,16 @@ #version 150 #moj_import +#moj_import +#moj_import +#moj_import in vec3 Position; in vec4 Color; in vec3 Normal; -uniform mat4 ModelViewMat; -uniform mat4 ProjMat; -uniform float LineWidth; -uniform vec2 ScreenSize; -uniform int FogShape; - -out float vertexDistance; +out float sphericalVertexDistance; +out float cylindricalVertexDistance; out vec4 vertexColor; const float VIEW_SHRINK = 1.0 - (1.0 / 256.0); @@ -43,6 +41,7 @@ void main() { gl_Position = vec4((ndc1 - vec3(lineOffset, 0.0)) * linePosStart.w, linePosStart.w); } - vertexDistance = fog_distance(Position, FogShape); + sphericalVertexDistance = fog_spherical_distance(Position); + cylindricalVertexDistance = fog_cylindrical_distance(Position); vertexColor = Color; } diff --git a/assets/minecraft/shaders/core/rendertype_outline.fsh b/assets/minecraft/shaders/core/rendertype_outline.fsh index 0155fe51..5f427348 100644 --- a/assets/minecraft/shaders/core/rendertype_outline.fsh +++ b/assets/minecraft/shaders/core/rendertype_outline.fsh @@ -1,8 +1,8 @@ #version 150 -uniform sampler2D Sampler0; +#moj_import -uniform vec4 ColorModulator; +uniform sampler2D Sampler0; in vec4 vertexColor; in vec2 texCoord0; diff --git a/assets/minecraft/shaders/core/rendertype_outline.vsh b/assets/minecraft/shaders/core/rendertype_outline.vsh index 44e105d4..75608eaa 100644 --- a/assets/minecraft/shaders/core/rendertype_outline.vsh +++ b/assets/minecraft/shaders/core/rendertype_outline.vsh @@ -1,12 +1,12 @@ #version 150 +#moj_import +#moj_import + in vec3 Position; in vec4 Color; in vec2 UV0; -uniform mat4 ModelViewMat; -uniform mat4 ProjMat; - out vec4 vertexColor; out vec2 texCoord0; diff --git a/assets/minecraft/shaders/core/rendertype_text.fsh b/assets/minecraft/shaders/core/rendertype_text.fsh index 49cbc4b5..a635f9a9 100644 --- a/assets/minecraft/shaders/core/rendertype_text.fsh +++ b/assets/minecraft/shaders/core/rendertype_text.fsh @@ -1,15 +1,12 @@ #version 150 #moj_import +#moj_import uniform sampler2D Sampler0; -uniform vec4 ColorModulator; -uniform float FogStart; -uniform float FogEnd; -uniform vec4 FogColor; - -in float vertexDistance; +in float sphericalVertexDistance; +in float cylindricalVertexDistance; in vec4 vertexColor; in vec2 texCoord0; @@ -20,5 +17,5 @@ void main() { if (color.a < 0.1) { discard; } - fragColor = linear_fog(color, vertexDistance, FogStart, FogEnd, FogColor); + fragColor = apply_fog(color, sphericalVertexDistance, cylindricalVertexDistance, FogEnvironmentalStart, FogEnvironmentalEnd, FogRenderDistanceStart, FogRenderDistanceEnd, FogColor); } diff --git a/assets/minecraft/shaders/core/rendertype_text.vsh b/assets/minecraft/shaders/core/rendertype_text.vsh index 2852ddd7..c56743c2 100644 --- a/assets/minecraft/shaders/core/rendertype_text.vsh +++ b/assets/minecraft/shaders/core/rendertype_text.vsh @@ -1,6 +1,8 @@ #version 150 #moj_import +#moj_import +#moj_import in vec3 Position; in vec4 Color; @@ -9,18 +11,16 @@ in ivec2 UV2; uniform sampler2D Sampler2; -uniform mat4 ModelViewMat; -uniform mat4 ProjMat; -uniform int FogShape; - -out float vertexDistance; +out float sphericalVertexDistance; +out float cylindricalVertexDistance; out vec4 vertexColor; out vec2 texCoord0; void main() { gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0); - vertexDistance = fog_distance(Position, FogShape); + sphericalVertexDistance = fog_spherical_distance(Position); + cylindricalVertexDistance = fog_cylindrical_distance(Position); vertexColor = Color * texelFetch(Sampler2, UV2 / 16, 0); texCoord0 = UV0; } diff --git a/assets/minecraft/shaders/core/rendertype_text_background.fsh b/assets/minecraft/shaders/core/rendertype_text_background.fsh index 1879b4a2..e9bcf8b8 100644 --- a/assets/minecraft/shaders/core/rendertype_text_background.fsh +++ b/assets/minecraft/shaders/core/rendertype_text_background.fsh @@ -1,15 +1,12 @@ #version 150 #moj_import +#moj_import uniform sampler2D Sampler0; -uniform vec4 ColorModulator; -uniform float FogStart; -uniform float FogEnd; -uniform vec4 FogColor; - -in float vertexDistance; +in float sphericalVertexDistance; +in float cylindricalVertexDistance; in vec4 vertexColor; in vec2 texCoord0; @@ -20,5 +17,5 @@ void main() { if (color.a < 0.1) { discard; } - fragColor = linear_fog(color, vertexDistance, FogStart, FogEnd, FogColor); + fragColor = apply_fog(color, sphericalVertexDistance, cylindricalVertexDistance, FogEnvironmentalStart, FogEnvironmentalEnd, FogRenderDistanceStart, FogRenderDistanceEnd, FogColor); } diff --git a/assets/minecraft/shaders/core/rendertype_text_background.vsh b/assets/minecraft/shaders/core/rendertype_text_background.vsh index e1a2769b..6ee48c89 100644 --- a/assets/minecraft/shaders/core/rendertype_text_background.vsh +++ b/assets/minecraft/shaders/core/rendertype_text_background.vsh @@ -1,6 +1,8 @@ #version 150 #moj_import +#moj_import +#moj_import in vec3 Position; in vec4 Color; @@ -8,16 +10,14 @@ in ivec2 UV2; uniform sampler2D Sampler2; -uniform mat4 ModelViewMat; -uniform mat4 ProjMat; -uniform int FogShape; - -out float vertexDistance; +out float sphericalVertexDistance; +out float cylindricalVertexDistance; out vec4 vertexColor; void main() { gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0); - vertexDistance = fog_distance(Position, FogShape); + sphericalVertexDistance = fog_spherical_distance(Position); + cylindricalVertexDistance = fog_cylindrical_distance(Position); vertexColor = Color * texelFetch(Sampler2, UV2 / 16, 0); } diff --git a/assets/minecraft/shaders/core/rendertype_text_background_see_through.fsh b/assets/minecraft/shaders/core/rendertype_text_background_see_through.fsh index 6b1c565f..ce363a57 100644 --- a/assets/minecraft/shaders/core/rendertype_text_background_see_through.fsh +++ b/assets/minecraft/shaders/core/rendertype_text_background_see_through.fsh @@ -1,6 +1,6 @@ #version 150 -uniform vec4 ColorModulator; +#moj_import in vec4 vertexColor; diff --git a/assets/minecraft/shaders/core/rendertype_text_background_see_through.vsh b/assets/minecraft/shaders/core/rendertype_text_background_see_through.vsh index 19d3fdba..2e50bbe4 100644 --- a/assets/minecraft/shaders/core/rendertype_text_background_see_through.vsh +++ b/assets/minecraft/shaders/core/rendertype_text_background_see_through.vsh @@ -1,11 +1,11 @@ #version 150 +#moj_import +#moj_import + in vec3 Position; in vec4 Color; -uniform mat4 ModelViewMat; -uniform mat4 ProjMat; - out vec4 vertexColor; void main() { diff --git a/assets/minecraft/shaders/core/rendertype_text_intensity.fsh b/assets/minecraft/shaders/core/rendertype_text_intensity.fsh index c842858b..be686d49 100644 --- a/assets/minecraft/shaders/core/rendertype_text_intensity.fsh +++ b/assets/minecraft/shaders/core/rendertype_text_intensity.fsh @@ -1,15 +1,12 @@ #version 150 #moj_import +#moj_import uniform sampler2D Sampler0; -uniform vec4 ColorModulator; -uniform float FogStart; -uniform float FogEnd; -uniform vec4 FogColor; - -in float vertexDistance; +in float sphericalVertexDistance; +in float cylindricalVertexDistance; in vec4 vertexColor; in vec2 texCoord0; @@ -20,5 +17,5 @@ void main() { if (color.a < 0.1) { discard; } - fragColor = linear_fog(color, vertexDistance, FogStart, FogEnd, FogColor); + fragColor = apply_fog(color, sphericalVertexDistance, cylindricalVertexDistance, FogEnvironmentalStart, FogEnvironmentalEnd, FogRenderDistanceStart, FogRenderDistanceEnd, FogColor); } diff --git a/assets/minecraft/shaders/core/rendertype_text_intensity.vsh b/assets/minecraft/shaders/core/rendertype_text_intensity.vsh index 2852ddd7..c56743c2 100644 --- a/assets/minecraft/shaders/core/rendertype_text_intensity.vsh +++ b/assets/minecraft/shaders/core/rendertype_text_intensity.vsh @@ -1,6 +1,8 @@ #version 150 #moj_import +#moj_import +#moj_import in vec3 Position; in vec4 Color; @@ -9,18 +11,16 @@ in ivec2 UV2; uniform sampler2D Sampler2; -uniform mat4 ModelViewMat; -uniform mat4 ProjMat; -uniform int FogShape; - -out float vertexDistance; +out float sphericalVertexDistance; +out float cylindricalVertexDistance; out vec4 vertexColor; out vec2 texCoord0; void main() { gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0); - vertexDistance = fog_distance(Position, FogShape); + sphericalVertexDistance = fog_spherical_distance(Position); + cylindricalVertexDistance = fog_cylindrical_distance(Position); vertexColor = Color * texelFetch(Sampler2, UV2 / 16, 0); texCoord0 = UV0; } diff --git a/assets/minecraft/shaders/core/rendertype_text_intensity_see_through.fsh b/assets/minecraft/shaders/core/rendertype_text_intensity_see_through.fsh index ae4ed270..9dac05f2 100644 --- a/assets/minecraft/shaders/core/rendertype_text_intensity_see_through.fsh +++ b/assets/minecraft/shaders/core/rendertype_text_intensity_see_through.fsh @@ -1,8 +1,8 @@ #version 150 -uniform sampler2D Sampler0; +#moj_import -uniform vec4 ColorModulator; +uniform sampler2D Sampler0; in vec4 vertexColor; in vec2 texCoord0; diff --git a/assets/minecraft/shaders/core/rendertype_text_intensity_see_through.vsh b/assets/minecraft/shaders/core/rendertype_text_intensity_see_through.vsh index 44e105d4..75608eaa 100644 --- a/assets/minecraft/shaders/core/rendertype_text_intensity_see_through.vsh +++ b/assets/minecraft/shaders/core/rendertype_text_intensity_see_through.vsh @@ -1,12 +1,12 @@ #version 150 +#moj_import +#moj_import + in vec3 Position; in vec4 Color; in vec2 UV0; -uniform mat4 ModelViewMat; -uniform mat4 ProjMat; - out vec4 vertexColor; out vec2 texCoord0; diff --git a/assets/minecraft/shaders/core/rendertype_text_see_through.fsh b/assets/minecraft/shaders/core/rendertype_text_see_through.fsh index cfdb7b2b..892d4a63 100644 --- a/assets/minecraft/shaders/core/rendertype_text_see_through.fsh +++ b/assets/minecraft/shaders/core/rendertype_text_see_through.fsh @@ -1,8 +1,8 @@ #version 150 -uniform sampler2D Sampler0; +#moj_import -uniform vec4 ColorModulator; +uniform sampler2D Sampler0; in vec4 vertexColor; in vec2 texCoord0; diff --git a/assets/minecraft/shaders/core/rendertype_text_see_through.vsh b/assets/minecraft/shaders/core/rendertype_text_see_through.vsh index 44e105d4..75608eaa 100644 --- a/assets/minecraft/shaders/core/rendertype_text_see_through.vsh +++ b/assets/minecraft/shaders/core/rendertype_text_see_through.vsh @@ -1,12 +1,12 @@ #version 150 +#moj_import +#moj_import + in vec3 Position; in vec4 Color; in vec2 UV0; -uniform mat4 ModelViewMat; -uniform mat4 ProjMat; - out vec4 vertexColor; out vec2 texCoord0; diff --git a/assets/minecraft/shaders/core/rendertype_translucent_moving_block.fsh b/assets/minecraft/shaders/core/rendertype_translucent_moving_block.fsh index 39ddb91d..7e58ff16 100644 --- a/assets/minecraft/shaders/core/rendertype_translucent_moving_block.fsh +++ b/assets/minecraft/shaders/core/rendertype_translucent_moving_block.fsh @@ -1,10 +1,13 @@ #version 150 +#moj_import +#moj_import + uniform sampler2D Sampler0; uniform sampler2D Sampler2; -uniform vec4 ColorModulator; - +in float sphericalVertexDistance; +in float cylindricalVertexDistance; in vec4 vertexColor; in vec2 texCoord0; @@ -12,5 +15,6 @@ out vec4 fragColor; void main() { vec4 color = texture(Sampler0, texCoord0) * vertexColor; - fragColor = color * ColorModulator; + color = color * ColorModulator; + fragColor = apply_fog(color, sphericalVertexDistance, cylindricalVertexDistance, FogEnvironmentalStart, FogEnvironmentalEnd, FogRenderDistanceStart, FogRenderDistanceEnd, FogColor); } diff --git a/assets/minecraft/shaders/core/rendertype_translucent_moving_block.vsh b/assets/minecraft/shaders/core/rendertype_translucent_moving_block.vsh index 33c7d419..49dee1d1 100644 --- a/assets/minecraft/shaders/core/rendertype_translucent_moving_block.vsh +++ b/assets/minecraft/shaders/core/rendertype_translucent_moving_block.vsh @@ -1,5 +1,9 @@ #version 150 +#moj_import +#moj_import +#moj_import + in vec3 Position; in vec4 Color; in vec2 UV0; @@ -8,15 +12,16 @@ in vec3 Normal; uniform sampler2D Sampler2; -uniform mat4 ModelViewMat; -uniform mat4 ProjMat; - +out float sphericalVertexDistance; +out float cylindricalVertexDistance; out vec4 vertexColor; out vec2 texCoord0; void main() { gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0); + sphericalVertexDistance = fog_spherical_distance(Position); + cylindricalVertexDistance = fog_cylindrical_distance(Position); vertexColor = Color * texelFetch(Sampler2, UV2 / 16, 0); texCoord0 = UV0; } diff --git a/assets/minecraft/shaders/core/rendertype_water_mask.fsh b/assets/minecraft/shaders/core/rendertype_water_mask.fsh index e0799241..6dd8d18e 100644 --- a/assets/minecraft/shaders/core/rendertype_water_mask.fsh +++ b/assets/minecraft/shaders/core/rendertype_water_mask.fsh @@ -1,6 +1,6 @@ #version 150 -uniform vec4 ColorModulator; +#moj_import out vec4 fragColor; diff --git a/assets/minecraft/shaders/core/rendertype_water_mask.vsh b/assets/minecraft/shaders/core/rendertype_water_mask.vsh index fa2d216d..a27ad467 100644 --- a/assets/minecraft/shaders/core/rendertype_water_mask.vsh +++ b/assets/minecraft/shaders/core/rendertype_water_mask.vsh @@ -1,9 +1,9 @@ #version 150 -in vec3 Position; +#moj_import +#moj_import -uniform mat4 ModelViewMat; -uniform mat4 ProjMat; +in vec3 Position; void main() { gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0); diff --git a/assets/minecraft/shaders/core/rendertype_world_border.fsh b/assets/minecraft/shaders/core/rendertype_world_border.fsh index ded49d39..b57e74fb 100644 --- a/assets/minecraft/shaders/core/rendertype_world_border.fsh +++ b/assets/minecraft/shaders/core/rendertype_world_border.fsh @@ -1,8 +1,8 @@ #version 150 -uniform sampler2D Sampler0; +#moj_import -uniform vec4 ColorModulator; +uniform sampler2D Sampler0; in vec2 texCoord0; diff --git a/assets/minecraft/shaders/core/rendertype_world_border.vsh b/assets/minecraft/shaders/core/rendertype_world_border.vsh index 61d7f05c..23ceddfc 100644 --- a/assets/minecraft/shaders/core/rendertype_world_border.vsh +++ b/assets/minecraft/shaders/core/rendertype_world_border.vsh @@ -1,13 +1,11 @@ #version 150 +#moj_import +#moj_import + in vec3 Position; in vec2 UV0; -uniform mat4 TextureMat; -uniform mat4 ModelViewMat; -uniform mat4 ProjMat; -uniform vec3 ModelOffset; - out vec2 texCoord0; void main() { diff --git a/assets/minecraft/shaders/core/sky.fsh b/assets/minecraft/shaders/core/sky.fsh new file mode 100644 index 00000000..8057e550 --- /dev/null +++ b/assets/minecraft/shaders/core/sky.fsh @@ -0,0 +1,13 @@ +#version 150 + +#moj_import +#moj_import + +in float sphericalVertexDistance; +in float cylindricalVertexDistance; + +out vec4 fragColor; + +void main() { + fragColor = apply_fog(ColorModulator, sphericalVertexDistance, cylindricalVertexDistance, 0.0, FogSkyEnd, FogSkyEnd, FogSkyEnd, FogColor); +} diff --git a/assets/minecraft/shaders/core/sky.vsh b/assets/minecraft/shaders/core/sky.vsh new file mode 100644 index 00000000..1f3bd9d4 --- /dev/null +++ b/assets/minecraft/shaders/core/sky.vsh @@ -0,0 +1,17 @@ +#version 150 + +#moj_import +#moj_import +#moj_import + +in vec3 Position; + +out float sphericalVertexDistance; +out float cylindricalVertexDistance; + +void main() { + gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0); + + sphericalVertexDistance = fog_spherical_distance(Position); + cylindricalVertexDistance = fog_cylindrical_distance(Position); +} diff --git a/assets/minecraft/shaders/core/stars.fsh b/assets/minecraft/shaders/core/stars.fsh new file mode 100644 index 00000000..6dd8d18e --- /dev/null +++ b/assets/minecraft/shaders/core/stars.fsh @@ -0,0 +1,9 @@ +#version 150 + +#moj_import + +out vec4 fragColor; + +void main() { + fragColor = ColorModulator; +} diff --git a/assets/minecraft/shaders/core/stars.vsh b/assets/minecraft/shaders/core/stars.vsh new file mode 100644 index 00000000..a27ad467 --- /dev/null +++ b/assets/minecraft/shaders/core/stars.vsh @@ -0,0 +1,10 @@ +#version 150 + +#moj_import +#moj_import + +in vec3 Position; + +void main() { + gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0); +} diff --git a/assets/minecraft/shaders/core/terrain.fsh b/assets/minecraft/shaders/core/terrain.fsh index d56036e6..144bfc5b 100644 --- a/assets/minecraft/shaders/core/terrain.fsh +++ b/assets/minecraft/shaders/core/terrain.fsh @@ -1,15 +1,12 @@ #version 150 #moj_import +#moj_import uniform sampler2D Sampler0; -uniform vec4 ColorModulator; -uniform float FogStart; -uniform float FogEnd; -uniform vec4 FogColor; - -in float vertexDistance; +in float sphericalVertexDistance; +in float cylindricalVertexDistance; in vec4 vertexColor; in vec2 texCoord0; @@ -22,5 +19,5 @@ void main() { discard; } #endif - fragColor = linear_fog(color, vertexDistance, FogStart, FogEnd, FogColor); + fragColor = apply_fog(color, sphericalVertexDistance, cylindricalVertexDistance, FogEnvironmentalStart, FogEnvironmentalEnd, FogRenderDistanceStart, FogRenderDistanceEnd, FogColor); } diff --git a/assets/minecraft/shaders/core/terrain.vsh b/assets/minecraft/shaders/core/terrain.vsh index ca48c669..e226a602 100644 --- a/assets/minecraft/shaders/core/terrain.vsh +++ b/assets/minecraft/shaders/core/terrain.vsh @@ -1,7 +1,8 @@ #version 150 -#moj_import #moj_import +#moj_import +#moj_import in vec3 Position; in vec4 Color; @@ -11,20 +12,21 @@ in vec3 Normal; uniform sampler2D Sampler2; -uniform mat4 ModelViewMat; -uniform mat4 ProjMat; -uniform vec3 ModelOffset; -uniform int FogShape; - -out float vertexDistance; +out float sphericalVertexDistance; +out float cylindricalVertexDistance; out vec4 vertexColor; out vec2 texCoord0; +vec4 minecraft_sample_lightmap(sampler2D lightMap, ivec2 uv) { + return texture(lightMap, clamp(uv / 256.0, vec2(0.5 / 16.0), vec2(15.5 / 16.0))); +} + void main() { vec3 pos = Position + ModelOffset; gl_Position = ProjMat * ModelViewMat * vec4(pos, 1.0); - vertexDistance = fog_distance(pos, FogShape); + sphericalVertexDistance = fog_spherical_distance(pos); + cylindricalVertexDistance = fog_cylindrical_distance(pos); vertexColor = Color * minecraft_sample_lightmap(Sampler2, UV2); texCoord0 = UV0; } diff --git a/assets/minecraft/shaders/include/dynamictransforms.glsl b/assets/minecraft/shaders/include/dynamictransforms.glsl new file mode 100644 index 00000000..385ebdbf --- /dev/null +++ b/assets/minecraft/shaders/include/dynamictransforms.glsl @@ -0,0 +1,9 @@ +#version 150 + +layout(std140) uniform DynamicTransforms { + mat4 ModelViewMat; + vec4 ColorModulator; + vec3 ModelOffset; + mat4 TextureMat; + float LineWidth; +}; diff --git a/assets/minecraft/shaders/include/fog.glsl b/assets/minecraft/shaders/include/fog.glsl index 601478c6..99973da2 100644 --- a/assets/minecraft/shaders/include/fog.glsl +++ b/assets/minecraft/shaders/include/fog.glsl @@ -1,30 +1,40 @@ #version 150 -vec4 linear_fog(vec4 inColor, float vertexDistance, float fogStart, float fogEnd, vec4 fogColor) { +layout(std140) uniform Fog { + vec4 FogColor; + float FogEnvironmentalStart; + float FogEnvironmentalEnd; + float FogRenderDistanceStart; + float FogRenderDistanceEnd; + float FogSkyEnd; + float FogCloudsEnd; +}; + +float linear_fog_value(float vertexDistance, float fogStart, float fogEnd) { if (vertexDistance <= fogStart) { - return inColor; + return 0.0; + } else if (vertexDistance >= fogEnd) { + return 1.0; } - float fogValue = vertexDistance < fogEnd ? smoothstep(fogStart, fogEnd, vertexDistance) : 1.0; + return (vertexDistance - fogStart) / (fogEnd - fogStart); +} + +float total_fog_value(float sphericalVertexDistance, float cylindricalVertexDistance, float environmentalStart, float environmantalEnd, float renderDistanceStart, float renderDistanceEnd) { + return max(linear_fog_value(sphericalVertexDistance, environmentalStart, environmantalEnd), linear_fog_value(cylindricalVertexDistance, renderDistanceStart, renderDistanceEnd)); +} + +vec4 apply_fog(vec4 inColor, float sphericalVertexDistance, float cylindricalVertexDistance, float environmentalStart, float environmantalEnd, float renderDistanceStart, float renderDistanceEnd, vec4 fogColor) { + float fogValue = total_fog_value(sphericalVertexDistance, cylindricalVertexDistance, environmentalStart, environmantalEnd, renderDistanceStart, renderDistanceEnd); return vec4(mix(inColor.rgb, fogColor.rgb, fogValue * fogColor.a), inColor.a); } -float linear_fog_fade(float vertexDistance, float fogStart, float fogEnd) { - if (vertexDistance <= fogStart) { - return 1.0; - } else if (vertexDistance >= fogEnd) { - return 0.0; - } - - return smoothstep(fogEnd, fogStart, vertexDistance); +float fog_spherical_distance(vec3 pos) { + return length(pos); } -float fog_distance(vec3 pos, int shape) { - if (shape == 0) { - return length(pos); - } else { - float distXZ = length(pos.xz); - float distY = abs(pos.y); - return max(distXZ, distY); - } +float fog_cylindrical_distance(vec3 pos) { + float distXZ = length(pos.xz); + float distY = abs(pos.y); + return max(distXZ, distY); } diff --git a/assets/minecraft/shaders/include/globals.glsl b/assets/minecraft/shaders/include/globals.glsl new file mode 100644 index 00000000..28d163a2 --- /dev/null +++ b/assets/minecraft/shaders/include/globals.glsl @@ -0,0 +1,8 @@ +#version 150 + +layout(std140) uniform Globals { + vec2 ScreenSize; + float GlintAlpha; + float GameTime; + int MenuBlurRadius; +}; diff --git a/assets/minecraft/shaders/include/light.glsl b/assets/minecraft/shaders/include/light.glsl index 9924b90a..81e86862 100644 --- a/assets/minecraft/shaders/include/light.glsl +++ b/assets/minecraft/shaders/include/light.glsl @@ -3,6 +3,11 @@ #define MINECRAFT_LIGHT_POWER (0.6) #define MINECRAFT_AMBIENT_LIGHT (0.4) +layout(std140) uniform Lighting { + vec3 Light0_Direction; + vec3 Light1_Direction; +}; + vec4 minecraft_mix_light(vec3 lightDir0, vec3 lightDir1, vec3 normal, vec4 color) { float light0 = max(0.0, dot(lightDir0, normal)); float light1 = max(0.0, dot(lightDir1, normal)); @@ -10,6 +15,3 @@ vec4 minecraft_mix_light(vec3 lightDir0, vec3 lightDir1, vec3 normal, vec4 color return vec4(color.rgb * lightAccum, color.a); } -vec4 minecraft_sample_lightmap(sampler2D lightMap, ivec2 uv) { - return texture(lightMap, clamp(uv / 256.0, vec2(0.5 / 16.0), vec2(15.5 / 16.0))); -} diff --git a/assets/minecraft/shaders/include/projection.glsl b/assets/minecraft/shaders/include/projection.glsl index cc4e5245..32021eb2 100644 --- a/assets/minecraft/shaders/include/projection.glsl +++ b/assets/minecraft/shaders/include/projection.glsl @@ -1,5 +1,9 @@ #version 150 +layout(std140) uniform Projection { + mat4 ProjMat; +}; + vec4 projection_from_position(vec4 position) { vec4 projection = position * 0.5; projection.xy = vec2(projection.x + projection.w, projection.y + projection.w); diff --git a/assets/minecraft/shaders/post/bits.fsh b/assets/minecraft/shaders/post/bits.fsh index 65338e84..348c5f35 100644 --- a/assets/minecraft/shaders/post/bits.fsh +++ b/assets/minecraft/shaders/post/bits.fsh @@ -5,10 +5,15 @@ uniform sampler2D InSampler; in vec2 texCoord; in vec2 oneTexel; -uniform vec2 InSize; +layout(std140) uniform SamplerInfo { + vec2 OutSize; + vec2 InSize; +}; -uniform float Resolution; -uniform float MosaicSize; +layout(std140) uniform BitsConfig { + float Resolution; + float MosaicSize; +}; out vec4 fragColor; diff --git a/assets/minecraft/shaders/post/blit.fsh b/assets/minecraft/shaders/post/blit.fsh index db4d0d1e..c3f8a3b4 100644 --- a/assets/minecraft/shaders/post/blit.fsh +++ b/assets/minecraft/shaders/post/blit.fsh @@ -2,7 +2,9 @@ uniform sampler2D InSampler; -uniform vec4 ColorModulate; +layout(std140) uniform BlitConfig { + vec4 ColorModulate; +}; in vec2 texCoord; diff --git a/assets/minecraft/shaders/post/blit.vsh b/assets/minecraft/shaders/post/blit.vsh index b7f943f5..66eb597a 100644 --- a/assets/minecraft/shaders/post/blit.vsh +++ b/assets/minecraft/shaders/post/blit.vsh @@ -1,9 +1,13 @@ #version 150 +#moj_import + in vec4 Position; -uniform mat4 ProjMat; -uniform vec2 OutSize; +layout(std140) uniform SamplerInfo { + vec2 OutSize; + vec2 InSize; +}; out vec2 texCoord; diff --git a/assets/minecraft/shaders/post/blur.vsh b/assets/minecraft/shaders/post/blur.vsh index 31aadb4a..f553b29d 100644 --- a/assets/minecraft/shaders/post/blur.vsh +++ b/assets/minecraft/shaders/post/blur.vsh @@ -1,11 +1,18 @@ #version 150 +#moj_import + in vec4 Position; -uniform mat4 ProjMat; -uniform vec2 InSize; -uniform vec2 OutSize; -uniform vec2 BlurDir; +layout(std140) uniform SamplerInfo { + vec2 OutSize; + vec2 InSize; +}; + +layout(std140) uniform BlurConfig { + vec2 BlurDir; + float Radius; +}; out vec2 texCoord; out vec2 sampleStep; diff --git a/assets/minecraft/shaders/post/box_blur.fsh b/assets/minecraft/shaders/post/box_blur.fsh index 32780bbc..1f4db1ed 100644 --- a/assets/minecraft/shaders/post/box_blur.fsh +++ b/assets/minecraft/shaders/post/box_blur.fsh @@ -1,12 +1,17 @@ #version 150 +#moj_import + uniform sampler2D InSampler; +layout(std140) uniform BlurConfig { + vec2 BlurDir; + float Radius; +}; + in vec2 texCoord; in vec2 sampleStep; -uniform float Radius; - out vec4 fragColor; // This shader relies on GL_LINEAR sampling to reduce the amount of texture samples in half. @@ -14,7 +19,7 @@ out vec4 fragColor; // In the end we sample the last pixel with a half weight, since the amount of pixels to sample is always odd (actualRadius * 2 + 1). void main() { vec4 blurred = vec4(0.0); - float actualRadius = round(Radius); + float actualRadius = Radius >= 0.5 ? round(Radius) : float(MenuBlurRadius); for (float a = -actualRadius + 0.5; a <= actualRadius; a += 2.0) { blurred += texture(InSampler, texCoord + sampleStep * a); } diff --git a/assets/minecraft/shaders/post/color_convolve.fsh b/assets/minecraft/shaders/post/color_convolve.fsh index c8de40ac..935516f6 100644 --- a/assets/minecraft/shaders/post/color_convolve.fsh +++ b/assets/minecraft/shaders/post/color_convolve.fsh @@ -4,11 +4,17 @@ uniform sampler2D InSampler; in vec2 texCoord; in vec2 oneTexel; -uniform vec2 InSize; -uniform vec3 RedMatrix; -uniform vec3 GreenMatrix; -uniform vec3 BlueMatrix; +layout(std140) uniform SamplerInfo { + vec2 OutSize; + vec2 InSize; +}; + +layout(std140) uniform ColorConfig { + vec3 RedMatrix; + vec3 GreenMatrix; + vec3 BlueMatrix; +}; const vec3 Gray = vec3(0.3, 0.59, 0.11); const float Saturation = 1.8; diff --git a/assets/minecraft/shaders/post/invert.fsh b/assets/minecraft/shaders/post/invert.fsh index 106418f6..45ca0631 100644 --- a/assets/minecraft/shaders/post/invert.fsh +++ b/assets/minecraft/shaders/post/invert.fsh @@ -4,7 +4,9 @@ uniform sampler2D InSampler; in vec2 texCoord; -uniform float InverseAmount; +layout(std140) uniform InvertConfig { + float InverseAmount; +}; out vec4 fragColor; diff --git a/assets/minecraft/shaders/post/invert.vsh b/assets/minecraft/shaders/post/invert.vsh index c4fb025c..ca4c3ba5 100644 --- a/assets/minecraft/shaders/post/invert.vsh +++ b/assets/minecraft/shaders/post/invert.vsh @@ -1,10 +1,13 @@ #version 150 +#moj_import + in vec4 Position; -uniform mat4 ProjMat; -uniform vec2 InSize; -uniform vec2 OutSize; +layout(std140) uniform SamplerInfo { + vec2 OutSize; + vec2 InSize; +}; out vec2 texCoord; diff --git a/assets/minecraft/shaders/post/rotscale.vsh b/assets/minecraft/shaders/post/rotscale.vsh index 599ca499..8c01073f 100644 --- a/assets/minecraft/shaders/post/rotscale.vsh +++ b/assets/minecraft/shaders/post/rotscale.vsh @@ -1,14 +1,19 @@ #version 150 +#moj_import + in vec4 Position; -uniform mat4 ProjMat; -uniform vec2 InSize; -uniform vec2 OutSize; +layout(std140) uniform SamplerInfo { + vec2 OutSize; + vec2 InSize; +}; -uniform vec2 InScale; -uniform vec2 InOffset; -uniform float InRotation; +layout(std140) uniform RotScaleConfig { + vec2 InScale; + vec2 InOffset; + float InRotation; +}; out vec2 texCoord; out vec2 scaledCoord; diff --git a/assets/minecraft/shaders/post/screenquad.vsh b/assets/minecraft/shaders/post/screenquad.vsh index c510ceed..cecbb066 100644 --- a/assets/minecraft/shaders/post/screenquad.vsh +++ b/assets/minecraft/shaders/post/screenquad.vsh @@ -1,9 +1,13 @@ #version 150 +#moj_import + in vec4 Position; -uniform mat4 ProjMat; -uniform vec2 OutSize; +layout(std140) uniform SamplerInfo { + vec2 OutSize; + vec2 InSize; +}; out vec2 texCoord; diff --git a/assets/minecraft/shaders/post/sobel.vsh b/assets/minecraft/shaders/post/sobel.vsh index 65dd8581..0d83a51d 100644 --- a/assets/minecraft/shaders/post/sobel.vsh +++ b/assets/minecraft/shaders/post/sobel.vsh @@ -1,10 +1,13 @@ #version 150 +#moj_import + in vec4 Position; -uniform mat4 ProjMat; -uniform vec2 InSize; -uniform vec2 OutSize; +layout(std140) uniform SamplerInfo { + vec2 OutSize; + vec2 InSize; +}; out vec2 texCoord; out vec2 oneTexel; diff --git a/assets/minecraft/shaders/post/spiderclip.fsh b/assets/minecraft/shaders/post/spiderclip.fsh index 4d4eafc6..fbf8ee63 100644 --- a/assets/minecraft/shaders/post/spiderclip.fsh +++ b/assets/minecraft/shaders/post/spiderclip.fsh @@ -6,9 +6,15 @@ uniform sampler2D BlurSampler; in vec2 texCoord; in vec2 scaledCoord; -uniform vec2 InSize; -uniform vec4 Scissor; -uniform vec4 Vignette; +layout(std140) uniform SamplerInfo { + vec2 OutSize; + vec2 InSize; +}; + +layout(std140) uniform SpiderConfig { + vec4 Scissor; + vec4 Vignette; +}; out vec4 fragColor; diff --git a/assets/minecraft/texts/credits.json b/assets/minecraft/texts/credits.json index da4b8013..ee7abf1f 100644 --- a/assets/minecraft/texts/credits.json +++ b/assets/minecraft/texts/credits.json @@ -6,9 +6,9 @@ "discipline": "Mojang Studios Leadership", "titles": [ { - "title": "Studio Head of Mojang Studios", + "title": "Studio Head", "names": [ - "Åsa Bredin" + "Kayleen Walters" ] }, { @@ -18,7 +18,7 @@ ] }, { - "title": "Head of Growth Products & Partnerships", + "title": "Head of Brand, Growth & Partnerships", "names": [ "Ada Duan" ] @@ -42,22 +42,16 @@ ] }, { - "title": "Head of Brand & Entertainment", - "names": [ - "Kayleen Walters" - ] - }, - { - "title": "Head of Games Expansion", - "names": [ - "John Thornton" - ] - }, - { - "title": "Franchise Strategic Advisor", + "title": "Head of Franchise Product Strategy", "names": [ "Scott Dell'Osso" ] + }, + { + "title": "Head of People Operations", + "names": [ + "Emma Brandt" + ] } ] }, @@ -91,37 +85,42 @@ ] }, { - "title": "Creative Director, Original Content", + "title": "Creative Director, Entertainment", "names": [ "Torfi Frans Ólafsson" ] }, { - "title": "Creative Leads", + "title": "Creative Managers", "names": [ - "Louise Smith (Formosa)", - "Michael Harnisch" + "Alex Macleod", + "Rasmus Eriksson", + "Samir Belarbi" ] }, { - "title": "Design Director", + "title": "Design Directors", "names": [ - "Laura de Llorens Garcia" + "Antti Meriluoto", + "Laura de Llorens Garcia", + "Orvar Halldorsson" ] }, { "title": "Design Managers", "names": [ - "Isak de Jong", - "Oskar Hansson Wettergren", - "Robin Hedin", - "Sherin Kwan" + "Art Usher", + "Jesper Staafjord", + "Robin Hedin" ] }, { "title": "Lead Game Designers", "names": [ + "Cory Scheviak", + "Daniel Jansson", "Guillaume Mroz", + "Matthew Gatland", "Nickole Li", "Rob Poerschke", "Robin V Vincent", @@ -131,20 +130,16 @@ { "title": "Game Designers", "names": [ - "Art Usher", "Brandon Pearce", "Christian Berg", - "Cole Phillips", - "Cory Scheviak", + "Colton Phillips", "Dana Lee (Insight Global, Inc)", - "Daniel Jansson", - "Jacob Presley (Insight Global, Inc)", - "Jesper Westlund", + "Giuseppe Libonati (Insight Global, Inc)", "Justice Mealer (Insight Global, Inc)", "Katherine Durkin (Insight Global, Inc)", "Kelsey Howard", + "Kyle Wood (Insight Global, Inc)", "Mark Anthony Esparagoza (Insight Global, Inc)", - "Matthew Gatland", "Michael Söderqvist", "Michael Stagnitta", "Nir Vaknin", @@ -160,21 +155,21 @@ ] }, { - "title": "Narrative Editor", + "title": "Narrative Director, Entertainment", "names": [ "Alex Wiltshire" ] }, { - "title": "User Experience Design Director", + "title": "User Experience Design Directors", "names": [ - "Anna Wendelin" + "Anna Wendelin", + "Carlos Lidón" ] }, { "title": "User Experience Design Leads", "names": [ - "Carlos Lidón", "Josefine Lindqvist", "Unn Swanström" ] @@ -184,22 +179,13 @@ "names": [ "Aksel Englund", "Alejandra Ricciardi (Globant)", - "Clory Luo (Formosa)", "Hajar Harda", "Imani Ricks", + "Jem Alexander", + "Karolin Pettersson", "Margot Laucournet", - "Rowel Ocampo (Allegis Group Services, Inc)", - "Sarah Mack (Digital Intelligence Systems, LLC)", "Sebastian Melchor Hedman", - "Shaun Basil Mendonsa", - "Tom Keen", - "William Hollowell" - ] - }, - { - "title": "User Experience Writer", - "names": [ - "Juan Buis" + "Tom Keen" ] } ] @@ -210,15 +196,20 @@ { "title": "Technical Directors", "names": [ - "Daniel Johansson", - "James S Yarrow", - "Michael J. Ott" + "Michael J. Ott", + "Stefan Annell" ] }, { - "title": "Engineering Director, Bedrock Platform", + "title": "Engineering Director", "names": [ - "Vince Curley" + "Mathias Ericsson" + ] + }, + { + "title": "Engineering Director, Franchise Technologies and Services", + "names": [ + "Geoff Ebersol" ] }, { @@ -234,11 +225,10 @@ ] }, { - "title": "Engineering Directors", + "title": "Engineering Directors, Bedrock Platform", "names": [ - "Geoff Ebersol", - "Mathias Ericsson", - "Matthew Ng" + "Jeff McKune", + "Vince Curley" ] }, { @@ -250,49 +240,52 @@ { "title": "Engineering Managers", "names": [ - "Brian Schwartz", "Christian Diefenbach", "Elina Dettner", - "Elizabeth Carty (Insight Global, Inc)", "Ellenor Wiig", + "Elvira Melentyeva", "Erik Wallin", "Erika Renlund", "Fanny P Vadillo Herrera", "Haronid Moncivais", - "Jeff McKune", + "Henrik Savenstedt", + "Joel Bergman", + "Jonas Jonsson", "Jonas Keating", "Lie Fujita", "Magnus Puig De La Bellacasa Cristiansson", - "Mikael Stenelund", + "Nick Horvath", "Per Sahlée", "Rijil Narath", - "Rose Higgins", - "Sue Loh" + "Tanya Reinhardt (Ascendion, Inc)" ] }, { "title": "Lead Software Engineers", "names": [ "Bill Carlson", + "Brian Schwartz", "Brock Davis", "Bryan Yeo", "Chris BeHanna", - "Dan Posluns", "Dan Samhold", "David Carlton", "David Cowan", "Derrick Price", "Gary McLaughlin", + "Henning Erlandsen", "Jake Shirley", - "Joel Bergman", "Jose Marcos De Oliveira", "Kanita Rauniyar", + "Loren Hoffman", "Mason McCuskey", "Matt Cooley", + "Max Bouchez", "Nickolas Graczyk", "Paul Crawford", - "Robert Goins", + "River Gillis", "Ryan Burns", + "Torbjörn Allard", "Yash Shroff" ] }, @@ -301,22 +294,27 @@ "names": [ "Andrew Maher", "Anton Arbring", + "Dan Mauk", "David Ekermann", "Felix Jones", + "Garrett Allen", "Jahmai O'Sullivan", "Jakob Rydén", + "James S Yarrow", + "Jeffrey Kumley", + "Joe Brockhaus", "Mangal Srinivasamurthy", "Michael Kranz", "Michael Stoyke", "Mikael Hedberg", - "Niclas Unnervik", + "Nick Burlingame", "Oleg Kozitsyn", "Patrick McGannon", "Paulo Ragonha", "Raphael Landaverde", + "Robert Sanchez", "Robert Sjödahl", - "Stefan Annell", - "Torbjörn Allard", + "Sue Loh", "Tristan Schneider", "Zhengwu Zhang" ] @@ -325,23 +323,26 @@ "title": "Software Engineers", "names": [ "A.J. Fairfield", - "Aaron Ward (Insight Global, Inc)", "Abhinav Jain (Ascendion, Inc)", + "Abhishek Talati (Ascendion, Inc)", "Abinaya Sambandam (Ascendion, Inc)", - "Adam Granzer (TEKsystems, Inc)", "Addison Kaufmann", + "Adrian Ferrer (Insight Global, Inc)", "Adrian Ster (Globant)", "Aileen Hadsell", - "Ajit Belkunde (Ascendion Inc)", + "Ajit Belkunde (Ascendion, Inc)", "Alec Chan", "Alejandro Rosales Martinez (Artech Consulting, LLC)", "Alex Carvalho Camargo (Ascendion, Inc)", + "Alex Schuldberg", "Alex Troyer", "Alex Wouters (Insight Global, Inc)", "Alexander Kofford (Insight Global, Inc)", "Alexander Torstling", "Alexandru Boaru (Globant)", + "Ali Yassiry (Netlight)", "Álvaro García Gutiérrez (Globant)", + "Alvee Akash (Ascendion, Inc)", "Amy Bernhoft", "Andres Altamirano Montealvo", "Andrew Griffin", @@ -350,192 +351,177 @@ "Anthony Young", "Antonino Liconti", "Apurva Raman", - "Ashish Sharma (Ascendion Inc)", + "Ashwin Brahmarouthu (Ascendion, Inc)", "Austin Shaythong (Insight Global, Inc)", "Ayannah Rashida Oluwatoyin Adegeye", "Bartosz Bok", "Billy Sjöberg", - "Bjarni Gudmundsson", "Björn Larsson", "Brian Luger", - "Bryan DeNosky (Murphy & Associates, Inc)", + "Bryan DeNosky", "Cameron Chancey (Insight Global, Inc)", "Chad George", "Chad Meyers", "Chloe Basel", - "Chris Dauchot (Insight Global, Inc)", + "Chris Mhley", + "Chris Sedar", + "Christian Adåker", "Christopher Miceli", "Cierra Shawe", "Corey Goodman (Insight Global, Inc)", "Corey Smith (Insight Global, Inc)", "Craig Steyn", - "Dan Mauk", "Dana Zhu", "Daniel Lobo", "Daniel Stevens", "Dat Trieu", - "David Karlehagen", "David Rice (Ascendion, Inc)", "David Westen", "Declan Hopkins", - "Delia Varzariu (Globant)", + "Dmytro Safonov", + "Dominic DaCosta", "Dragos Bogdan (Globant)", "Dylan Johanson", "Dylan Ross (Insight Global, Inc)", - "Elliot Strait (Ascendion, Inc)", - "Emily Yellen", + "Elisabeth Gangenes", + "Emma Villemoes", + "Eric Grimsborn (Netlight)", "Eric Johnston", "Eric Rehmeyer", "Eric Sjögren", + "Eric Walston", "Ericson Gonzalez (Globant)", - "Erik Broes", "Erik M Schulz", - "Esther Peters (Ascendion, Inc)", - "Evin Watson (Insight Global, Inc)", - "Fernando Cerdeira (Globant)", - "Francisco A Garcia Cebada", - "Gabriel Gerhardsson", - "Garrett Allen", - "Geof Sawaya (Ascendion, Inc)", + "Francisco Alejandro Garcia Cebada", "Georgii \"Fry\" Gavrichev", - "Gustaf Zetterlund", - "Håkan Jonson", + "Guilherme Recchi Cardozo", + "Gunnar Headley", + "Gustav Taxén", "Harald Johansson", "Hebert Pena Serna (Artech Consulting, LLC)", - "Hector Llanos III", "Hector M Arriaga Pineda", - "Herbert Mocke (Ascendion, Inc)", - "Ian Gaither (Insight Global, Inc)", + "Hector M Llanos III", + "Hedvig Fahlstedt (Netlight)", + "Huanyu Shao", + "Hugo Hägglund", + "Ian Gaither", "Isaac Dayton", + "Isaiah Dickison (Insight Global, Inc)", "Jaafer Sheriff", "Jacek Wołkowicz", + "Jacob Presley (Insight Global, Inc)", + "Jaime Vargas", + "James Friedenberg (Insight Global, Inc)", "James G Moore", "James Nicholls", "Jamie Fristrom", - "Jason Chionh", - "Javi Romero (Globant)", "Javier Castro Landaverde (Artech Consulting, LLC)", - "Jay Sharma (Insight Global, Inc)", - "Jeffrey Kumley", "Jeremy Robinson (Insight Global, Inc)", "Jessica Chen", "Jifeng Zhang", "Jillian Polsin", "Jithin Joji Anchanattu (Ascendion, Inc)", - "Joe Brockhaus", + "Johan Yngman", "Johannes Busch", - "John Graf (Collabera, LLC)", - "John-Philip Johansson", + "John Littlewood (Mirado Consulting)", "Jon Maiga", "Jonas Eriksson", + "Jonas Johansson", "Jordan Maxwell (Insight Global, Inc)", "José Carlos Bellido", - "Joseph Kichline", "Jozsef Hollo (Globant)", - "Juliana Montes", "Julio Novais Raffaine", "Justin Watkins", - "Khaled Fahmy (Ascendion, Inc)", "Khaleel Harper", - "Kiran Beersing-Vasquez", + "Kiran Beersing-Vasquez (Netlight)", + "Kirsten Springer", + "Kyle Schwaneke", "Lina Juuso", "Lorenzo Vigano", "Marco Ballabio", "Mark Elling (Ascendion, Inc)", "Mark Rowland (Insight Global, Inc)", "Markus Gustavsson", + "Markus Winroth", "Marlon Huber-Smith", + "Martin Hornqvist", "Martin Moe", "Matijas Matijevic", "Matt Staubus", - "Matthew Moses (Ascendion, Inc)", - "Matthew Phair", - "Mattias Selin", - "Maxime Bouchez", + "Matthew Clohessy", + "Max Perea Düring", "Maxime Lebrot", "Michael Davidson (Insight Global, Inc)", "Michael Oliveira-Silva", - "Michel Miranda (Globant)", + "Michael Seydl", "Michelle Burd", - "Mike Carlson", + "Michelle Rosenbarker (Insight Global, Inc)", "Mike Swartz", "Miles Mbo", "Molly Flemming", "Mona El-Falou (Ascendion, Inc)", - "Mykhalio Ostapysko (Globant)", - "Nat Meo (Ascendion, Inc)", + "Natalie Mueller", "Nathan Adams", "Nicholas Curtis", - "Nick Burlingame", "Nico Suc", "Nicolas del Fiorentino (Globant)", - "Nikita Zetilov", - "Niklas Ekman", + "Niklas Erhard Olsson", "Nilay Karaoglu", - "Nirali Vadera (Ascendion, Inc)", + "Nishith Gadhiya (Ascendion, Inc)", "Oden Stark", "Omar ElGaml", "Oscar Åkesson", - "Oskar Pedersen", + "Oscar Andersson (Netlight)", "Oswaldo Leyva Barrientos", "Pär Axelsson", - "Patrick Szafranko (Ascendion, Inc)", + "Parth Parikh (Ascendion, Inc)", "Patrick Tobin", "Paul Schierman", - "Pavel Grebnev", - "Peter Larsson", + "Per Ersson", "Petter Gisslen", - "Petter Holmberg", "Petter Lundgren", - "Pouya Ashraf", - "Prashant Sharma (Ascendion, Inc)", + "Pouya Ashraf (Netlight)", + "Ragnar Rova", "Rasmus Källqvist", "Rebecca Kullenius", "Rebecca McFadden", "Reece Sagun (Ascendion, Inc)", "Richard Meurling", "Richard Payne (Insight Global, Inc)", - "River Gillis", "Robert Di Battista", "Robert Hunt", - "Robert Hurley (Ascendion, Inc)", - "Robert Sanchez", - "Robin Somers", "Rodel Dela Cruz (Ascendion, Inc)", - "Rodrick Edwards", - "Roger Duke (Insight Global, Inc)", - "Samantha Hallam", + "Sam Hallam", "Samuel Sage (Insight Global, Inc)", "Samuel Schimmel (Insight Global, Inc)", - "Samuel Smethurst (Ascendion, Inc)", "Santosha Bhat (Ascendion, Inc)", - "Sarmis-Stefan Streanga (Globant)", - "Sean Reilly", + "Sarmis Streanga (Globant)", "Sebastian Ross", "Shane Pierce", "Shipra Behera", "Simon Fagerholm", "Sofie Niska", + "Soundar B (Ascendion, Inc)", "Stauffer Taylor", "Stefan Torstensson", "Stephanie Huynh", - "Stephen Trigger (Insight Global, Inc)", "Sunil Nikam (Ascendion, Inc)", "Tara Pratap", "Taylor Feddersen", + "Tejas Shah", "Therese Andersson", "Timur Nazarov", - "Tommy Wallberg", - "Tushar Patil (Ascendion Inc)", + "Tobias Bexelius", + "Trancy Xiaoying Zhu", + "Tushar Patil (Ascendion, Inc)", "Tyler Fedoris (Insight Global, Inc)", - "Udit Gandhi (Ascendion, Inc)", - "Vinay Kumar S B (Ascendion Inc)", - "Volodymyr Belianinov (Ascendion, Inc)", + "Vinay Kumar S B (Ascendion, Inc)", + "Vincent Telleria", + "Vishnu Kumar (Ascendion, Inc)", "Wenfei Zhu", "Wes Pesetti", - "Will Van Keulen", - "William Harmon (Insight Global, Inc)", - "Zeshan Ahmed (Ascendion, Inc)" + "Yeabsira Mekonnen", + "Zawar Alam (Ascendion, Inc)" ] } ] @@ -543,6 +529,12 @@ { "discipline": "Production", "titles": [ + { + "title": "Head of Franchise Technologies and Services", + "names": [ + "Elvir Bahtijaragic" + ] + }, { "title": "Executive Producer, Education", "names": [ @@ -553,29 +545,23 @@ "title": "Executive Producers", "names": [ "Anita Sujarit", - "Chloe Brennan", "Fredrik Telenius", + "Hai Shi", "Ingela Garneij", - "Kayla Kinnunen", - "Klas Hammarström" + "Klas Hammarström", + "Nikoo Jorjani" ] }, { "title": "Director of Bedrock Platform", "names": [ - "Michael McManus" + "Dave Cohen" ] }, { "title": "Director of Creator", "names": [ - "Travis Howland" - ] - }, - { - "title": "Director of Ecosystem Experiences", - "names": [ - "Saher Hirji" + "Kayla Kinnunen" ] }, { @@ -587,13 +573,13 @@ { "title": "Director of Minecraft Launcher", "names": [ - "David Siegel" + "David Marc Siegel" ] }, { "title": "Director of Minecraft Online & Marketplace", "names": [ - "Jessica Zahn" + "Travis Howland" ] }, { @@ -608,118 +594,143 @@ "Dennis Ries" ] }, + { + "title": "Director of Trust and Safety", + "names": [ + "Carlos Figueiredo" + ] + }, { "title": "Production Directors", "names": [ "Alina Skripnyk", - "Donald Brinkman", + "Bryant Hawthorne", "Eric Taylor", - "Jaime Vargas", "Justin Edwards", "Kristina Ashment", "Marcus Bodin", - "Melinda Knight", + "Mike Ammerlaan", "Molly Woodruff", "Nathan Rose", - "Todd Stevens", - "Tyler Jeffers (Formosa)" + "Todd Stevens" + ] + }, + { + "title": "Production Managers", + "names": [ + "Caroline Smith (Insight Global, Inc)", + "Luis Cascante" ] }, { "title": "Production Leads", "names": [ "Carrie Doring", - "Micah Myerscough", "Milo Bengtsson", "Mona Landh Gullberg", - "Sarah Carton", "Tim Mardell" ] }, + { + "title": "Principal Producers", + "names": [ + "Melinda Knight", + "Su Liu" + ] + }, { "title": "Producers", "names": [ + "Aaron Hughes (Insight Global, Inc)", "Adrian Östergård", - "Allan Contreras (Insight Global, Inc)", "Anjelika Zora Kosanic", - "Anna Lundgren", - "Annica Strand", - "Aqsa Rauf (Apex Systems, Inc)", + "Barrett Livingston", "Bryan G. Bonham", "Carlos Naranjo", - "Carolin Szymaniak", - "Charlotte Angantyr", - "Dejan Dimic", + "Dawn Boughton (Apex Systems, Inc)", "Elin Roslund", - "Eliot Lee", - "Emily Steele (Formosa)", - "Grace Jung-Stanley (Allegis Group Services, Inc)", - "Hillary Good (Aquent, LLC)", - "Isaac Barron (Globant)", - "Jennifer Dotson (Insight Global, Inc)", + "Ellen Karlsten", + "Eric Karlshammar", + "Gareth Young", + "Heesung Koo", + "Hillary Good (Simplicity Consulting Inc.)", + "Jennifer Boespflug Dotson (Insight Global, Inc)", "Josefin Olsson", - "Josefine Brink", + "Kev Katona (Insight Global, Inc)", "Kristina Barandiy", "Laylah Bulman", "Linda Dalin", "Lisa Kempe", - "Luis Qiang Liu", - "Marc Watson", - "Marie Bustgaard Granlund", - "Megan Rodes (Formosa)", + "Marie Bustgaard", "Micael Sjölund", - "Natalie Selin", "Nicolette Suraga", - "Nikoo Jorjani", "Petter Denninger", + "Rakiv Joy", "Riccardo Lenzi", + "Sarah Von Reis", "Seo Hee Hong", - "Seyit Ivhed", - "Steph Huske (TEKsystems, Inc)", - "Tess Kearney (Formosa)", - "Tina Lin (Ascendion, Inc)" + "Sofia Gothlin" ] }, { "title": "Media Producers", "names": [ - "André Angerbjörn", - "Ines Quintanar Cardenas", - "Johan Kvarnemo" + "Andreas Dea Svensson", + "Johan Björnung Kvarnemo", + "Sandra Schöön" + ] + }, + { + "title": "Product Directors, Franchise Technologies and Services", + "names": [ + "Deanna Hearns", + "Saher Hirji" ] }, { "title": "Product Manager Leads", "names": [ + "Anna Lundgren", "Candice Giffin", - "Carlos Figueiredo", - "Justin Johnson", - "Nick Horvath" + "Divya Babuji", + "Justin Johnson" ] }, { "title": "Product Managers", "names": [ - "Andrea Lam-Flannery", + "Ahmed Asif", + "August Carow", "Barbara Konchinski", + "Carolina Broberg (Netlight)", + "Dejan Dimic", "Donyea Cooley-White", - "Erica Lares (Apex Systems, Inc)", + "Eliot Lee", "Esteban Balbuena (Globant)", + "Grace Jung (Allegis Group Services, Inc)", "Jorge Aleman Rodriguez", + "Kara Kono", "Kari C Whiteside", "Kat Siegert", + "Katie Ellison", "Liz Smith", "Madeline Psenka", - "Mike Ammerlaan", + "Malte Tammerström", + "Marc Watson", + "Micah Myerscough", "Milena Gonzalez", - "Stephen A Scott", - "Su Liu" + "Nick Ljungqvist (MVP Global AB)", + "Rachel Ji", + "Stephen Scott", + "Tia Dalupan", + "Tori Tippin", + "Zerelina Mukherjee" ] }, { - "title": "Organizational Coaches", + "title": "Organizational Coach", "names": [ - "Rasmus Noah Hansen" + "Jennie Martensson (Jenuine Coaching & Consulting AB)" ] }, { @@ -735,14 +746,15 @@ "Hailey Dice (Hanson Consulting Group, Inc)", "Joseph Panaccione (Apex Systems, Inc)", "Joshua Bullard", + "Kristian Björk Grimberg", "Kyle Sullivan (Hanson Consulting Group, Inc)" ] }, { "title": "Technical Writers", "names": [ - "Jill Headen (Insight Global, Inc)", - "Jim Seaman (Insight Global, Inc)" + "Jeff Kim (Insight Global, Inc)", + "Jill Headen (Insight Global, Inc)" ] }, { @@ -754,45 +766,32 @@ { "title": "Technical Program Managers", "names": [ - "Aysha Davis (Cyborg Mobile LLC)", - "Beth Carty (Insight Global, Inc)", - "Brynn Medelsohn (Insight Global, Inc)", + "Andrea Lam-Flannery", + "Aqsa Rauf (Apex Systems, Inc)", + "Benjamin Fall", + "Bobby Ou (my3Twelve, LLC)", + "Brynn Mendelsohn (Insight Global, Inc)", + "Chloe Li (my3Twelve, LLC)", "Daniel Stewart", - "Devarshi Hazarika", + "David Jho (my3Twelve, LLC)", "Diana Lind (Harvey Nash, Inc)", - "DJ Stiner", - "Dom Arcamone", - "Dylan Kesselring (Insight Global, Inc)", - "Eloise Espel", - "Erfon Haubenstock", - "Hai Shi", - "Heesung Koo", - "Henning Erlandsen", - "James Friedenberg (Insight Global, Inc)", + "Dylan Kesselring", + "Elizabeth Carty (Insight Global, Inc)", + "Garbo Chan (my3Twelve, LLC)", "James Gregory", - "Joshua Mueller (Apex Systems, Inc)", - "Kara Kono", - "Katie Ellison", + "Jered Dowden (Ascendion, Inc)", "Kei Schafer", "Lauren Henderson", - "Quinn Richter", - "Rachel Ji", - "Stephen Frothingham (Wimmer Solutions)", - "Tia Dalupan", - "Tori Tippin", + "Mabel Chan (my3Twelve, LLC)", + "Timothy Mehta (Aquent, LLC)", + "Tina Lin (Ascendion, Inc)", "William Weber (Apex Systems, Inc)" ] }, - { - "title": "Localization", - "names": [ - "Amber Wu (Shanghai Wicresoft Co, Ltd.)" - ] - }, { "title": "Playtest Coordinator", "names": [ - "Axel Savage" + "Jonathan Carroll (Insight Global, Inc)" ] } ] @@ -803,18 +802,11 @@ { "title": "Creative Leads", "names": [ - "Antti Meriluoto", "Erik Gestrelius", "Johan Aronsson", "Martin Johansson-He" ] }, - { - "title": "Creative Manager", - "names": [ - "Samir Belarbi" - ] - }, { "title": "Art Directors", "names": [ @@ -822,12 +814,17 @@ "Filip Keatley Thoms", "Jasper Boerstra", "Julian Kerr", - "Lynwood Montgomery (Formosa)", "Markus Karlsson Frost", "Ninni Landin", "Seung Sung", - "Telemachus Stavropoulos", - "Viktor Blanke" + "Sherin Kwan", + "Ullis Linder" + ] + }, + { + "title": "Art Manager", + "names": [ + "Magdalena Berglind" ] }, { @@ -836,54 +833,44 @@ "Alexandra Dogaru", "Evelina Kolovou", "Joule Garvin", + "Meagan Dumford", "Michael Apolis", - "Michael Ray Neumann" + "Michael Neumann" ] }, { "title": "Artists", "names": [ "Adam Sellerfors", - "Aleesa Tana (Formosa)", - "Andrea Sanchez Sepulveda (Formosa)", + "Amelie Bjurenhed", "Brandon Korvas (Ten Gun Design, Inc)", - "Brendan 'Sully' Sullivan", - "Celene Tolentino (Harvey Nash, Inc)", + "Celene Presto (Harvey Nash, Inc)", + "Chase Farthing (Allegis Group Services, Inc)", "Chi Wong", "Christian Nordgren", - "Claire Selvog (Formosa)", + "Christina Dolan (Aquent, LLC)", "Cristina Bravo Amigueti", "Dana Mack (Harvey Nash, Inc)", - "Erin Biafore (Formosa)", - "Florian Decupper", "Jan Cariaga", - "Jei Ling (Formosa)", "Jesse Munguia", - "Kailey Hara (Formosa)", - "Kate Anderson (Formosa)", "Kirk Barnett", "Lauren Bravo-Kohler", - "Linus Chan (Formosa)", - "Mariana Salimena", - "Mark Eash Hershberger (Formosa)", - "Mark Reyes (Formosa)", + "Margarita Sanchez (Allegis Group Services, Inc)", "Mattis Grahm", "Morten Rasmussen", - "Patrick Rodes (Formosa)", + "Noam Briner", "Peter Sheff", - "Rudy Solidarios (Formosa)", - "Salinee Goldenberg (Formosa)", + "Rodrigo Corvalan Vivedes", "Sarah Boeving", - "Sarah Corean (Formosa)", - "Sarah Martino (Formosa)", - "Stephanie Nannariello (Harvey Nash, Inc)", - "William Thomas" + "Scott Jobe (Allegis Group Services, Inc)", + "Stephanie Nannariello (Harvey Nash, Inc)" ] }, { - "title": "Technical Artist", + "title": "Technical Artists", "names": [ - "Dan Sönne" + "Brendan 'Sully' Sullivan", + "Dan Sonne" ] }, { @@ -898,21 +885,17 @@ "title": "Product Designers", "names": [ "Adrian Ward", - "Affe Piran", "Débora Martins", - "Kelsey Ranallo", "Laura Palmroth", - "Lisa Dahlström" + "Ro Ocampo (Allegis Group Services, Inc)", + "Timothy Lusk (Allegis Group Services, Inc)" ] }, { "title": "Graphic Designers", "names": [ - "Adrian Leon (Formosa)", "Caitlin Willhoite (Ten Gun Design, Inc)", - "Dalila Copeland (Formosa)", - "Javier Rodriguez (Formosa)", - "Meagan Dumford" + "Isak de Jong" ] } ] @@ -930,7 +913,7 @@ { "title": "Sound Designers", "names": [ - "Magnus Mikander", + "Sandra Karlsson", "Thareeq Roshan", "Tom Koselnik Olovsson" ] @@ -939,16 +922,30 @@ "title": "Music composed by", "names": [ "Aaron Cherof", + "Amos Roddy", "Daniel Rosenfeld", "Kumi Tanioka", "Lena Raine" ] + }, + { + "title": "Music Supervisors", + "names": [ + "Kyle Hopkins", + "Maya Halfon Cordova" + ] } ] }, { "discipline": "Quality Assessment", "titles": [ + { + "title": "Quality Director, Franchise Technologies and Services", + "names": [ + "Matthew Ng" + ] + }, { "title": "Quality Manager", "names": [ @@ -967,23 +964,19 @@ "names": [ "Agata Monk", "Aidan Bower", + "Alyssa Liu", "Angela Ong", "Archita Keni", "Chris Woelfel", "Christina Tran", + "Dalrek Davis", "Erik Davis", "Lisa Porter", "Mark McAllister", "Melissa Moorehead", + "Michelle Hyde", "Mike Su", - "Tom Brisbane" - ] - }, - { - "title": "Quality Analysts", - "names": [ - "Alyssa Liu", - "Dalrek Davis", + "Tom Brisbane", "Tom French" ] }, @@ -991,7 +984,6 @@ "title": "Quality Assessment Specialists", "names": [ "Björn Philipson", - "Kristian Björk Grimberg", "Matthew Dryden", "Olle Personne" ] @@ -1003,42 +995,42 @@ "Darren Benskin (Experis)", "Dave Watkins (Experis)", "Jon Doyle (Experis)", - "Lewis Read (Experis)" + "Lewis Read (Experis)", + "Onur Unaldi" ] }, { - "title": "Test Directors", + "title": "Test Director", "names": [ - "Angelica Morris (Experis)", - "Brian Canning (Experis)" + "Angelica Morris (Experis)" ] }, { "title": "Test Managers", "names": [ "Ben Farley (Experis)", - "Benjamin Sousa (Experis)", - "Ian S. Nelson (Experis)", - "Łukasz Mikusek (Lionbridge)", + "Emily Lovering (Experis)", "Mateusz Kałuża (Lionbridge)", "Paweł Piekarski (Lionbridge)", + "Raasahn Browder (Experis)", "Tyler Lovemark (Experis)" ] }, { "title": "Team Leads", "names": [ - "Kamil Kostrzewa (Lionbridge)", + "Iwona Cieśla (Lionbridge)", "Michał Sławek (Lionbridge)", + "Paulina Pałdyna (Lionbridge)", "Piotr Jasiński (Lionbridge)", - "Zuzanna Gieszcz (Lionbridge)" + "Witold Matejewski (Lionbridge)" ] }, { "title": "Test Leads", "names": [ "Adam Ronowski (Lionbridge)", - "Alan Aclon (Insight Global, Inc)", + "Benjamin Sousa (Experis)", "Daniel March (Lionbridge)", "Kamil Zakrzewski (Lionbridge)", "Maria Berube (Experis)", @@ -1049,6 +1041,7 @@ "title": "Test Automation Engineers", "names": [ "Łukasz Marek (Lionbridge)", + "Marcin Cudny (Lionbridge)", "Michał Nowak (Lionbridge)" ] }, @@ -1059,51 +1052,51 @@ "Adam DuBois (Experis)", "Adam Rączkowski (Lionbridge)", "Agata 'Tiger' Kawalec (Lionbridge)", + "Albert Wujkowski (Lionbridge)", "Aleksandra Traczyk (Lionbridge)", + "Alex Vue (Experis)", + "Amelia Rozborska (Lionbridge)", + "Bartłomiej Krupiński (Lionbridge)", "Bartłomiej Łobocki (Lionbridge)", "Bartłomiej Mathea (Lionbridge)", + "Bartosz Kacprzak (Lionbridge)", "Błażej Rajewski (Lionbridge)", "Cezary Romecki (Lionbridge)", - "Chris Youngs (Insight Global, Inc)", + "Damian Galicki (Lionbridge)", + "Daniel Posiadała (Lionbridge)", "Daniel Tazelaar (Lionbridge)", "David Deans (Experis)", "Eric Izurieta (Experis)", "Gabe Castro (Experis)", + "Gabriel Mróz (Lionbridge)", "Henrik Ackler (Lionbridge)", "Isaac Villagomez (Lionbridge)", - "Iwona Cieśla (Lionbridge)", + "Jakub Budzyński (Lionbridge)", "Jakub Opaliński (Lionbridge)", - "Jared Lesczynski (Experis)", "Jordan Heredia (Experis)", "Joseph Cuen (Experis)", "Julie Tucker (Experis)", "Katarzyna Pastor (Lionbridge)", - "Kinga Izdebska (Lionbridge)", - "Konrad Czaplewski (Lionbridge)", "Krzysztof Górski (Lionbridge)", "Logan Marshall-Medlock (Experis)", "Łukasz Jankowski (Lionbridge)", "Łukasz Michalak (Lionbridge)", "Marcin Klimek (Lionbridge)", "Marcin Krysiak (Lionbridge)", - "Marcin Morel (Lionbridge)", "Marcin Rosłon (Lionbridge)", - "Mateusz Janiszewski (Lionbridge)", "Mateusz Miksa (Lionbridge)", - "Michał Tomaszewski (Lionbridge)", - "Paulina Pałdyna (Lionbridge)", + "Mikaela Reed (Experis)", + "Mikołaj Gruźliński (Lionbridge)", "Piotr Burkowski (Lionbridge)", "Piotr Gruszczyński (Lionbridge)", "Piotr Orłowski (Lionbridge)", "Richard Withrow (Experis)", - "Robert Alvarez (Experis)", "Robert Bergeron (Experis)", "Ryan Weant (Experis)", "Sebastian Polanica (Lionbridge)", "Sviatoslav Porubanskyi (Lionbridge)", - "Tevis Campbell (Experis)", - "Witold Januszewski-Skup (Lionbridge)", - "Witold Matejewski (Lionbridge)" + "Weronika Szajnfeld (Lionbridge)", + "Witold Januszewski-Skup (Lionbridge)" ] }, { @@ -1115,86 +1108,101 @@ "Agnieszka Sobieszuk (Lionbridge)", "Aibat Yelemes (Lionbridge)", "Alan Kotowski (Lionbridge)", - "Albert Wujkowski (Lionbridge)", "Aleksander Borysiak (Lionbridge)", + "Aleksander Sierocinski (Lionbridge)", + "Aleksander Zygier (Lionbridge)", "Aleksandra Jakubowska (Lionbridge)", "Aleksandra Stelmach (Lionbridge)", + "Alex Nissen (Insight Global, Inc)", "Alexey Solopov (Lionbridge)", - "Amelia Rozborska (Lionbridge)", "Andrew McFarland (Lionbridge)", "Andżelika Kurek (Lionbridge)", + "Aneta Woźnica (Lionbridge)", "Anna Gordon (Lionbridge)", "Anna Gutowska (Lionbridge)", "Anna Zachara (Lionbridge)", "Anthony Lopez (Lionbridge)", "Anthony Zehm (Lionbridge)", - "Arkadiusz Grzanka (Lionbridge)", + "Antoni Kostrzewa (Lionbridge)", + "Arkadiusz Czarnecki (Lionbridge)", "Arkadiusz Grzesiński (Lionbridge)", "Artem Matvieievskyi (Lionbridge)", "Ata Helvacioglu (Lionbridge)", "Barbara Rutkowska (Lionbridge)", - "Bartłomiej Krupiński (Lionbridge)", "Bartłomiej Słodkowski (Lionbridge)", - "Bartosz Kacprzak (Lionbridge)", + "Bartłomiej Truszkowski (Lionbridge)", + "Bartlomiej Wysocki", + "Bartosz Paciorkiewicz (Lionbridge)", "Bartosz Pikutin (Lionbridge)", "Bartosz Sowiński (Lionbridge)", + "Bartosz Staszczak (Lionbridge)", "Bartosz Świderski (Lionbridge)", "Bartosz Waleśkiewicz (Lionbridge)", "Brady Smith (Lionbridge)", "Burton Groves (Lionbridge)", "Casey Nelson (Lionbridge)", + "Casper Sparks (Insight Global, Inc)", "Cassan François (Lionbridge)", - "Damian Bartak (Lionbridge)", - "Damian Galicki (Lionbridge)", + "Damian Rokosz (Lionbridge)", "Damian Spysiński (Lionbridge)", "Damian Sztyk (Lionbridge)", "Daniel Niewiadomski (Lionbridge)", - "Daniel Posiadała (Lionbridge)", + "Dawid Gryczan (Lionbridge)", "Dominik Zwoliński (Lionbridge)", - "Evan Armstrong (Experis)", + "Emir Ali Misiratov (Lionbridge)", "Ewa Merska (Lionbridge)", "Filip Busłowicz (Lionbridge)", "Filip Firlej (Lionbridge)", "Franciszek Ścirka (Lionbridge)", - "Gabriel Mróz (Lionbridge)", "Gabriel Wiśniowski (Lionbridge)", - "Heorhii Lystopad (Lionbridge)", + "Hayden Dalton (Lionbridge)", "Hubert Uberman (Lionbridge)", - "Ignacy Kukliński (Lionbridge)", "Igor Bogusiewicz (Lionbridge)", + "Igor Grabski (Lionbridge)", + "Igor Niewiadomski (Lionbridge)", "Jacek Misztal (Lionbridge)", "Jacob Childers (Experis)", "Jacob Otto (Lionbridge)", "Jakub Bobiński (Lionbridge)", + "Jakub Byliniak (Lionbridge)", "Jakub Górnicki (Lionbridge)", "Jakub Grzebisz (Lionbridge)", "Jakub Istynowicz (Lionbridge)", - "Jakub Kliś (Lionbridge)", + "Jakub Łuckiewicz (Lionbridge)", "Jakub Malinowski (Lionbridge)", "Jakub Mierzejewski (Lionbridge)", "Jakub Mihułka (Lionbridge)", "Jakub Obstawski (Lionbridge)", "Jakub Owczarzak (Lionbridge)", + "Jakub Piekart (Lionbridge)", + "Jakub Puzio (Lionbridge)", + "Jakub Sierociński (Lionbridge)", + "Jakub Tabiszewski (Lionbridge)", "Jakub Więch (Lionbridge)", "Jakub Wojciechowski (Lionbridge)", + "Jakub Zgajewski (Lionbridge)", + "Jan Górski (Lionbridge)", "Jan Kamiński (Lionbridge)", "Jan Owczarczyk (Lionbridge)", "Jan Tomaszewski (Lionbridge)", + "Jarosław Gasiński (Lionbridge)", + "Jessica Stephenson (Lionbridge)", "Joanna Kossut (Lionbridge)", - "John Castro Chico", "Julia Fischbach (Lionbridge)", + "Julia Jóźwiak (Lionbridge)", + "Kacper Bujakowski (Lionbridge)", "Kacper Gosławski (Lionbridge)", - "Kacper Lędzion (Lionbridge)", + "Kacper Paś (Lionbridge)", "Kacper Pławny (Lionbridge)", - "Kacper Pućka (Lionbridge)", "Kacper Senkowicz (Lionbridge)", - "Kacper Stalewski (Lionbridge)", "Kamil Szymański (Lionbridge)", - "Kamil Wiktorowski (Lionbridge)", "Kamran Akhundov (Lionbridge)", "Kansas Spence (Experis)", - "Karol Mikusek (Lionbridge)", + "Karol Kopeć (Lionbridge)", + "Karolina Pietraś (Lionbridge)", "Karolina Prekurat (Lionbridge)", + "Karolina Zaleszczyk (Lionbridge)", + "Khaya Mvimbi (Lionbridge)", "Kinga Banasiuk (Lionbridge)", "Klim Kuznetsov (Lionbridge)", "Konrad Justyński (Lionbridge)", @@ -1202,11 +1210,18 @@ "Konrad Pyrzanowski (Lionbridge)", "Krzysztof Bajor (Lionbridge)", "Kuba Karakula (Lionbridge)", + "Kyrylo Kunytskyi (Lionbridge)", "Laura Androsiuk (Lionbridge)", + "Łukasz Majchrowski (Lionbridge)", "Łukasz Sterna (Lionbridge)", + "Maciej Bielecki (Lionbridge)", "Maciej Ginter (Lionbridge)", + "Maciej Michaluk (Lionbridge)", + "Maciej Pieszalski (Lionbridge)", + "Maciej Ruciński (Lionbridge)", "Maciej Waszczuk (Lionbridge)", "Maciej Wnuk (Lionbridge)", + "Maciej Wójcik (Lionbridge)", "Magdalena Orzyłowska (Lionbridge)", "Magdalena Wardak (Lionbridge)", "Maja Piątek (Lionbridge)", @@ -1214,15 +1229,18 @@ "Maksymilian Kubiak (Lionbridge)", "Maksymilian Skalski (Lionbridge)", "Maksymilian Szydlik (Lionbridge)", + "Malichi Wilson (Lionbridge)", "Maliki Wilson (Lionbridge)", "Marceli Naskrętski (Lionbridge)", - "Marcin Cudny (Lionbridge)", "Marcin Kubicki (Lionbridge)", "Marcin Paszkiewicz (Lionbridge)", + "Marcin Słoniewski (Lionbridge)", "Marharyta Yelsukova (Lionbridge)", "Marion Bojarski (Lionbridge)", "Marta Czwarnóg (Lionbridge)", "Martyna Szczepańska (Lionbridge)", + "Mateusz Borowski (Lionbridge)", + "Mateusz Iwaniuk (Lionbridge)", "Mateusz Koriat (Lionbridge)", "Mateusz Panek (Lionbridge)", "Mateusz Radzyński (Lionbridge)", @@ -1233,16 +1251,17 @@ "Michał Przystup (Lionbridge)", "Michał Sobianek (Lionbridge)", "Mikołaj Błażejewski (Lionbridge)", - "Mikołaj Gruźliński (Lionbridge)", "Mikołaj Pawlak (Lionbridge)", - "Mikołaj Szadkowski (Lionbridge)", + "Milena Olesiejuk (Lionbridge)", "Mykhailo Prokhorov (Lionbridge)", - "Nicholas Latino", + "Natalia Walczyńska (Lionbridge)", "Nikola Janiak (Lionbridge)", + "Odo Przęczka (Lionbridge)", "Oleksandr Lohin (Lionbridge)", "Oleksii Hrabovskyi (Lionbridge)", "Oskar Wiktorowicz (Lionbridge)", "Oskar Żurawski (Lionbridge)", + "Patrycja Dwojak (Lionbridge)", "Patryk Karwowski (Lionbridge)", "Patryk Kubiszewski (Lionbridge)", "Patryk Piekarski (Lionbridge)", @@ -1252,39 +1271,48 @@ "Piotr Adamiak (Lionbridge)", "Piotr Gałecki (Lionbridge)", "Piotr Kompa (Lionbridge)", + "Piotr Kruszewicz (Lionbridge)", + "Piotr Mudryk (Lionbridge)", "Piotr Szafranowski (Lionbridge)", + "Platon Ogarev (Lionbridge)", "Przemysław Rybicki (Lionbridge)", "Przemysław Wojtaszek (Lionbridge)", "Radosław Czerniszewski (Lionbridge)", "Rafał Adamski (Lionbridge)", - "Rafał Gołębiewski (Lionbridge)", + "Rafał Gołębiowski (Lionbridge)", "Rafał Owsa (Lionbridge)", "Rafał Żulewski (Lionbridge)", - "Rion Cox (Lionbridge)", - "Rob Thomas", "Robert Zabłocki (Lionbridge)", "Robert Żulewski (Lionbridge)", + "Sabina Ocaya Gamon (Lionbridge)", + "Samanta Giedraityte (Lionbridge)", + "Samantha Glass (Insight Global, Inc)", "Sebastian Biegaj (Lionbridge)", "Sebastian Esqueda (Experis)", "Sebastian Łuczak (Lionbridge)", "Sebastian Michalski (Lionbridge)", - "Sophie James (Lionbridge)", "Stanisław Świderski (Lionbridge)", "Szymon Barciś (Lionbridge)", "Szymon Pielacha (Lionbridge)", "Szymon Studencki (Lionbridge)", "Thomas Jessup (Lionbridge)", "Tim Radoń-Dubiniecki (Lionbridge)", + "Tomasz Kubajka (Lionbridge)", "Tomasz Pyszczek (Lionbridge)", "Uladzislau Kakhniuk (Lionbridge)", "Viktoryia Liashkevich (Lionbridge)", - "Weronika Szajnfeld (Lionbridge)", + "Wiktor Wrona (Lionbridge)", + "Wiktoria Błaszkiewicz (Lionbridge)", + "Wiktoria Brodzik (Lionbridge)", + "Wiktoria Hałatkiewicz (Lionbridge)", "Wiktoria Książek (Lionbridge)", "Wiktoria Zatyka (Lionbridge)", "Wojciech Olszewski (Lionbridge)", "Wojciech Przewdziecki (Lionbridge)", + "Wyat Simmons (Lionbridge)", "Yuliia Stefurak (Lionbridge)", - "Zofia Kossarzecka (Lionbridge)" + "Zofia Kossarzecka (Lionbridge)", + "Zuzanna Krężlewicz (Lionbridge)" ] } ] @@ -1310,22 +1338,15 @@ "discipline": "Operations", "titles": [ { - "title": "Player Operations Director", + "title": "Operations Director, Global", "names": [ - "Deanna Hearns" + "Shanlenn B. Colby" ] }, { - "title": "Operations Directors, Global", + "title": "Operations Director", "names": [ - "Shanlenn B. Colby", - "Yassal Sundman" - ] - }, - { - "title": "Operations Manager, Global", - "names": [ - "Ellen Hahm" + "Jewell Morelli" ] }, { @@ -1334,6 +1355,7 @@ "Karolina Nylén", "Mikaela Illanes", "Renee Wikander", + "Sheila Ho", "Stephanie Golden (Insight Global, Inc)" ] }, @@ -1359,12 +1381,13 @@ "title": "People Operations Managers", "names": [ "Adam Lemcio", + "Aleksandra Ola Zajac", "Ani Grey", "Brittney Pettway", "Catherine Hendrix", "Georgia Marra", - "Ludwig Moberg Edenbäck", - "Mira Aboulhoson" + "Joël Älveroth", + "Ludwig Moberg Edenbäck" ] }, { @@ -1377,45 +1400,32 @@ { "title": "Human Resources", "names": [ - "Aleksandra Ola Zajac", - "Alexandra Ward", - "Jonas Bergelli", - "Katarina Starendal", + "Line Thomson", "Linn Holmertz", - "Marie Tolf", - "Milica Tesic Stojanovic", - "Richard Nelleus", - "Sheila Ho", - "Ulrika Wörding" + "Yvonne Zarrin Manesh" ] }, { "title": "Talent Acquisition", "names": [ - "Elnaz Tajahmadi Tabrizi", - "Eman Lakhani (Insight Global, Inc)", + "Adam Conder (Insight Global, Inc)", "Jeff Guyton (Insight Global, Inc)", - "Scott MacPherson (Insight Global, Inc)" - ] - }, - { - "title": "Office Manager", - "names": [ - "Joël Älveroth" + "Scott MacPherson (Insight Global, Inc)", + "Sofia Andersson" ] }, { "title": "Executive Business Administrators", "names": [ + "Dinah Divinagracia", "Erin Decker", - "Francine Jordan (Simplicity Consulting Inc)", + "Francine Jordan", "Lovisa Grindelius" ] }, { "title": "IT Managers", "names": [ - "Adam MacDowall", "Jason Perry Minard", "Rene Astorga" ] @@ -1423,12 +1433,17 @@ { "title": "IT", "names": [ - "Anton Wu", - "Cesar Sima Falck", - "Dacke Blixt", - "Morris Kellokoski", + "Aaron Brindell (Experis)", + "Aaron Ingram (Experis)", + "Adam Barnette (Experis)", + "Brian Hein (Experis)", + "Dacke Blixt (Techfactory, AB)", + "Eric Filarski (My3Twelve, LLC)", + "Hannah Feilberg-Maiti (Techfactory, AB)", + "Matthew Cha (my3Twelve, LLC)", "Shoghi Cervantes Pueyo", - "Zelda Karttunen" + "Tim Foster (my3Twelve, LLC)", + "Zelda Karttunen (Academic Work IT AB)" ] }, { @@ -1438,9 +1453,9 @@ ] }, { - "title": "Automation Support", + "title": "DevOps Engineer", "names": [ - "Bill Erhard (Insight Global, Inc)" + "Jordan Crockett (Allegis Group Services, Inc)" ] } ] @@ -1457,15 +1472,37 @@ { "title": "Player Support Program Leads", "names": [ + "Alexandru Giuglea", + "Erfon Haubenstock", "Jake Rexus", "Jen Pedersen" ] }, + { + "title": "Player Support Operations Manager", + "names": [ + "Justin Putnam (Apex Systems, Inc)" + ] + }, { "title": "Player Support", "names": [ - "Dan Coronel (Apex Systems, Inc)", - "Justin Putnam (Apex Systems, Inc)" + "Angel De Aguiar (Apex Systems, Inc)", + "Arturo Gutierrez (Apex Systems, Inc)", + "Briana Acosta (Apex Systems, Inc)", + "Caleb Masters (Apex Systems, Inc)", + "Chirs Lok (Apex Systems, Inc)", + "Chris Eells (Apex Systems, Inc)", + "Daniel Coronel (Apex Systems, Inc)", + "Gabriel Gonzales (Apex Systems, Inc)", + "Julia Osobampo (Apex Systems, Inc)", + "Karoline Malik (Apex Systems, Inc)", + "Mara Croesy (Apex Systems, Inc)", + "Melinda Morales (Apex Systems, Inc)", + "Mey Saechao (Apex Systems, Inc)", + "Raul Garza (Apex Systems, Inc)", + "Sarah Wylie (Apex Systems, Inc)", + "Whitney Okafor (Apex Systems, Inc)" ] } ] @@ -1480,9 +1517,12 @@ ] }, { - "title": "Data Science and Analytics Manager", + "title": "Data Science and Analytics Managers", "names": [ - "Abby Gaddis" + "Abby Gaddis", + "Duncan Davis", + "Laura Funa", + "Miguel Fierro" ] }, { @@ -1491,6 +1531,12 @@ "Bill Chism" ] }, + { + "title": "Data and Analytics Lead", + "names": [ + "Smitha Menon" + ] + }, { "title": "Analytics Environment Manager", "names": [ @@ -1500,8 +1546,10 @@ { "title": "Analytics Environment Engineering", "names": [ - "Saif Adeeb (Ascendion, Inc)", - "Sebastian Soffici" + "Lucas Neubert (Ascendion, Inc)", + "Ryan Cox (Ascendion, Inc)", + "Sebastian Soffici", + "Whitney King (Fractal Analytics Inc)" ] }, { @@ -1509,21 +1557,22 @@ "names": [ "Aaron Johnson", "Alvaro Gil Moradillo", + "Axel Orrenius", "Bhrigu Shree", "Christer Norstrom", - "Erin Michet", "Grant Poinsatte", - "Jonathan Bush (KellyMitchell Group, LLC)", - "Julianne Toto (Kelly Management Services, Inc)", - "Matilda Eriksson", + "Kent Go (Aquent, LLC)", + "Kyle Iman", + "Matilda Tamm", "Matthew Skirvin", - "Max Davidson", - "Miguel Fierro", - "Pujeethaa Jakka (Apex Systems, Inc)", + "Pujeethaa Jakka", "Ramitha Kotarkonda", - "Ricardo Silva Oquendo (KellyMitchell Group, LLC)", "Scott Graham", + "Siva Balantrapu (Hitachi Digital Services LLC)", "Swathi Sivadas", + "Tiana Ramirez (KellyMitchell Group, LLC)", + "Usama Bin Salim (Agility Partners LLC)", + "Victor Fong (Ascendion, Inc)", "Xuan Ting Liu" ] }, @@ -1534,8 +1583,7 @@ "Deepthi Rajashekar", "Dhiraj Nilange", "Olusola Timothy Olojede", - "Sachin Dekate", - "Smitha Menon" + "Sachin Dekate" ] } ] @@ -1543,12 +1591,6 @@ { "discipline": "Business Management & Licensing", "titles": [ - { - "title": "Strategy Director", - "names": [ - "Jonas Martensson" - ] - }, { "title": "Program Director, China Consumer & Global Partnerships", "names": [ @@ -1557,6 +1599,12 @@ }, { "title": "Program Director, Consumer Products", + "names": [ + "Hanna Willis" + ] + }, + { + "title": "Program Director, Franchise Development", "names": [ "Federico San Martin" ] @@ -1568,6 +1616,7 @@ "Bob Brennecke", "Eileen Lee", "Gaylon Blank", + "Sonal Majmudar", "Stephanie Louie Craig" ] }, @@ -1584,56 +1633,64 @@ ] }, { - "title": "Business Director, Operations", + "title": "Business Directors, Operations", "names": [ - "Bill Lindell" + "Bill Lindell", + "Donald Brinkman" ] }, { "title": "Business Directors", "names": [ "Dan Zou", - "Hanna Willis", "Michelle Hua", "Patrick Geuder", - "Shabnam Elmi" + "Shabnam Elmi", + "Tim Gould" + ] + }, + { + "title": "Business Development Manager Leads", + "names": [ + "Inga Chamberlain", + "Rebecca A Miller" ] }, { "title": "Business Development Managers", "names": [ + "Albert Pastore", + "Amy Barenblat (Iconma LLC)", "Christy Weckner", - "Inga Chamberlain", - "Maru Zamora", - "Nick Gallagher (Digital Intelligence Systems, LLC)", - "Rebecca A Miller", - "Ryan Eng (Aerotek, Inc)" + "MaryKate Mullen (Allegis Global Services, Inc)", + "Roger Villegas (Allegis Global Services, Inc)", + "Timothy Norton (Ascendion, Inc)" + ] + }, + { + "title": "Program Manager Lead", + "names": [ + "Susie Tinker" ] }, { "title": "Program Managers", "names": [ - "Aaron Hughes (Insight Global, Inc)", - "Adam Conder (Insight Global, Inc)", - "Aria Azizi", - "Bobby Ou (my3Twelve, LLC)", + "Alex Luschen", + "Anita Collins (Excelsior Staffing LLC)", + "Bethany Gager (Apex Systems, Inc)", "Brett Coleman (Apex Systems, Inc)", - "David Jho (my3Twelve, LLC)", + "Chris Dauchot (Insight Global, Inc)", "Emily Carlson", - "Felix Huang Jr. (Insight Global, Inc)", - "Garbo Chan (my3Twelve, LLC)", "Greg Walls (Insight Global, Inc)", "John Mercil (Insight Global, Inc)", "Josh Ayala (Insight Global, Inc)", - "Julie Olden", "Liz Leo", - "Mabel Chan (my3Twelve, LLC)", "Micky Yamaguchi", "Monica Burba (Apex Systems, Inc)", "Morgan Farrar", "Nedra Wilson", - "Stuart U (my3Twelve, LLC)", - "Susie Tinker", + "Susan Morales (Apex Systems, Inc)", "Vince Davis Espino (Insight Global, Inc)" ] }, @@ -1641,21 +1698,26 @@ "title": "Business Managers", "names": [ "Audrey Searcy", - "Brandon H Kim (Insight Global, Inc)", + "Brandon H Kim", "Christopher Johnsen (Allegis Group Services, Inc)", - "Dana Friesen (Insight Global, Inc)", - "David K Lau", + "David K. Lau", "Elizabeth Link (Aquent, LLC)", "Ellen Wu", "Eve Vashkus", - "Fredrika Wessman", - "Janet Cunningham (Harvey Nash, Inc)", + "Janet Cunningham", "Kristin Grein", + "Lori Merritt (SGF USA LLC)", "Matt Morgan", "Natalia Ellenson", "Nichole Green", - "Sarah Souza (Epitec Inc)", - "Stephanie Turl (JeffreyM Consulting, LLC)" + "Stephanie Turl (Simplicity Consulting Inc.)" + ] + }, + { + "title": "Technical Program Managers", + "names": [ + "DJ Stiner", + "Quinn Richter" ] } ] @@ -1674,18 +1736,24 @@ "names": [ "Harry Elonen" ] + }, + { + "title": "Brand Strategist", + "names": [ + "Astrid Segerlund" + ] + }, + { + "title": "Brand Analyst", + "names": [ + "Sofia Alm" + ] } ] }, { "discipline": "Communications", "titles": [ - { - "title": "Chief Storyteller", - "names": [ - "Lydia Winters" - ] - }, { "title": "Media Director", "names": [ @@ -1704,22 +1772,22 @@ "names": [ "Addie Coronado", "Alexis Crofts (Assembly Media, Inc)", - "Hollis Wacker-Leja", + "Cristina Anderca", + "Cynthia Park (Assembly Media, Inc)", "Holly Amber Smith", - "Katie Guo (Assembly Media, Inc)", "Maysan Zubi (Assembly Media, Inc)", "Michael Rougeau (Assembly Media, Inc)", "Petra Tell", "Ramona Suris (Assembly Media, Inc)", "Wesley Gore (Assembly Media, Inc)", - "Zulai Serrano" + "Zulai Serrano Shimamoto" ] }, { "title": "Creative Writers", "names": [ - "Cristina Anderca", - "Linn Wiberg", + "Julius Olofsson", + "Linn Viberg", "Per Landin", "Sophie Austin" ] @@ -1739,12 +1807,12 @@ { "title": "Social Media Managers", "names": [ + "Angelica Batth (Kforce, Inc)", "Anthony Toczek", - "Chad Oetken (Troy Consulting LLC)", - "Matt Pearsall (Aston Carter, Inc)", + "Cassandra Jones (Cypress Human Capital)", "Paulina Espinoza-Gonzalez (Kforce, Inc)", - "Sarah Beecroft (JeffreyM Consulting, LLC)", - "Will Chang (Randstad)" + "Will Mowery (Harvey Nash, Inc)", + "William Chang (Randstad)" ] }, { @@ -1756,27 +1824,28 @@ { "title": "Community Managers", "names": [ - "DèJa Easter (Apex Systems, Inc)", + "Emily Hayes (Averro LLC)", "Gustav Höglund", "Jay Wells", "Kristina Horner", "Lindsey Schaal", "Matt Gartzke", "Michelle Archer Waterman", - "Nadine Ebri (Apex Systems, Inc)" + "Sophia Lyon" ] }, { - "title": "Content Manager", + "title": "Content Managers", "names": [ - "Oskar Thysell" + "John Hansen (Insight Global, Inc)", + "Nadja Anderberg", + "Oskar Thysell", + "Reagan Sterner (Apex Systems, Inc)" ] }, { - "title": "Publishing Editors", + "title": "Publishing Editor", "names": [ - "Giuseppe Libonati (Insight Global, Inc)", - "Kyle Wood (Insight Global, Inc)", "Lauren Marklund" ] } @@ -1788,39 +1857,55 @@ { "title": "Head of Marketing", "names": [ - "Jessica Freeman" + "Jeanie DuMont" ] }, { "title": "Marketing Directors", "names": [ "Fergus Lynch", - "Jeanie DuMont", + "Gaylord Escalona", "Katie Penza" ] }, { "title": "Marketing Managers", "names": [ + "Amanda Correia", + "Amy Vuong (Cypress Human Capital)", "Anton Maslennikov", "Arkadiy Goldenshtern", - "Barrett Livingston (Apex Systems, Inc)", "Bradley Cummings", - "Cori Anne Montero", "Egil Gloersen", - "Gaylord Escalona", + "Emily Orrson (Unfollow Media)", "Halley Chang", "Irene Ahn", "Jaime Limon", - "Janis Fein (Ascendion Inc)", + "Janis Fein (Ascendion, Inc)", "Jeff Rivait", "Jen Barry (Ten Gun Design, Inc)", "Lauren Schuur (Ten Gun Design, Inc)", "Lindsay Auten (Synaxis Corporation)", + "Makayla Mota (Harvey Nash, Inc)", "Melissa Jenkins", "Nick Ketter", - "Sam Brody (Ten Gun Design, Inc)", - "Sara Cornish" + "Nicolas Sherman (Nextant LLC)", + "Sam Brody", + "Sara Cornish", + "Shari Gari (Aquent, LLC)", + "Terry Lewis (Ten Gun Design, Inc)" + ] + }, + { + "title": "Marketing Content Managers", + "names": [ + "Britt Riley (Insight Global, Inc)", + "Daria Sykuleva (Tata Consultancy Services LTD)", + "Jules Caesar (Insight Global, Inc)", + "Nicole Fabian Parodi (Tata Consultancy Services LTD)", + "Richard Lecker (Insight Global, Inc)", + "Sanjana Jadhav (Tata Consultancy Services LTD)", + "Wanda Roe (Tata Consultancy Services LTD)" ] }, { @@ -1832,7 +1917,8 @@ { "title": "Web Content Authors & QA", "names": [ - "Deepak Bahadoor (HCL Technologies)", + "Arvapally Bharath (HCL Technologies)", + "Jack Markley (HCL Technologies)", "Nilesh Jaiswal (HCL Technologies)", "Tobias Bankson (Ten Gun Design, Inc)" ] @@ -1851,19 +1937,20 @@ { "title": "Head of Legal", "names": [ - "Nick Morgan" + "Nick Morgan (CELA)" ] }, { "title": "Senior Legal Counsel", "names": [ - "Timothy Han" + "Tim Han (CELA)" ] }, { "title": "Legal Counsel", "names": [ - "Jyl Brown", + "Jessica Henderson", + "Jyl Brown (CELA)", "Kari Annand (Snodgrass Annand)", "Maya Yamazaki (Davis Wright Tremaine)" ] @@ -1883,21 +1970,22 @@ "title": "Finance Managers", "names": [ "Dennis Laviolette (Apex Systems, Inc)", + "Felix Huang Jr.", + "Mikkel Flækøy", "Robert Scheibeck" ] }, { - "title": "Financial Accountants", + "title": "Financial Accountant", "names": [ - "Aleksandra Dragosavljevic", - "Josefina Axelsson", - "Mikkel Flaekoy" + "Josefina Axelsson" ] }, { - "title": "Financial Consultant", + "title": "Financial Consultants", "names": [ - "Ulrika Kihl" + "Elias Selmo", + "Martin Rybrink" ] } ] @@ -1914,7 +2002,7 @@ "title": "", "names": [ "4J Studios", - "Albert Pastore, Director of Business Development, Music and Talent", + "Accenture, Web Engineering Services", "Dan Roque, Creature Developer", "Gideon Driver, Zen3 Infosolutions America, Inc", "Jannis Petersen, Creator of Blockbench", @@ -1925,7 +2013,6 @@ "Microsoft Gaming Safety Team", "Microsoft Magic Team", "Reza Elghazi, Developer Account Manager", - "Sprung Studios, Ltd.", "The PlayFab Team", "The Xbox Live Team", "Vishnu Nalagangula, Zen3 Infosolutions America, Inc", @@ -1942,92 +2029,35 @@ { "discipline": "", "titles": [ - { - "title": "Technical Director", - "names": [ - "James Fairweather" - ] - }, { "title": "Programmers", "names": [ - "Aaron Freytag", - "Ben Jones", - "Curtis Hodgins", - "Darren Grant", "David Galloway", "Devon Plourde", - "Dylan Reviczky", - "Jacky Cai", - "Jakob Trounce", + "Jc Fowles", "Michelle Rocha", "Mike Biddlecombe", + "Sabrina Korsch-Sharma", "Stevie Giovanni", - "Tim Stump", - "Zehao Lu" + "Tim Stump" ] }, { - "title": "Producers", + "title": "Producer", "names": [ - "Matt Kernachan", - "Paul Pera" + "Jeremy Powell" ] }, { - "title": "UI Artist", - "names": [ - "Richelle Brunt" - ] - }, - { - "title": "UX Designer", - "names": [ - "Sam Flores" - ] - }, - { - "title": "Quality Assurance Director", - "names": [ - "Max McNiven" - ] - }, - { - "title": "Quality Assurance Analysts", - "names": [ - "Jamie Cheung", - "Jonathan Lin", - "Kelsey Gottschlich" - ] - }, - { - "title": "Vice President, Stategic Projects", + "title": "Vice President, Development", "names": [ "Lee McKinnon Pederson" ] - } - ] - } - ] - }, - { - "section": "Development Partner - CSI Interfusion Inc", - "disciplines": [ - { - "discipline": "", - "titles": [ + }, { - "title": "Software Engineers", + "title": "Studio Technical Director", "names": [ - "Alfred Wang", - "Dowen Zhu", - "Fernly Li", - "Jeremy Robinson", - "Johnny Guo Xiao", - "Michael Braley", - "Neo Yu", - "Robert Wang", - "Robin Lu" + "Michael Sikora" ] } ] @@ -2077,21 +2107,41 @@ ] }, { - "title": "Senior Programmer", + "title": "Senior Programmers", "names": [ + "Matt Mackowski", "Torin Wiebelt" ] }, { "title": "Programmers", "names": [ - "Caden Parker", + "Abhijit Zala", "David Stout", "Dylan Borg", "Emmaline Kelly", + "Hugo Machado", "Joey Montgomery", "Micah Johnston" ] + }, + { + "title": "Art Director", + "names": [ + "Gabe Bott" + ] + }, + { + "title": "Senior Technical Artist", + "names": [ + "Katie McCarthy" + ] + }, + { + "title": "Technical Artist", + "names": [ + "Ezri Sullivan" + ] } ] } @@ -2130,13 +2180,13 @@ { "title": "Software Engineers", "names": [ - "Johnathan Liu", + "Elgin Ciani", "Grady Wright", + "Johnathan Liu", "Jon Castro", "Joshua Greene", - "Mitchell Lee", "Minji Chhaysy-Park", - "Elgin Ciani", + "Mitchell Lee", "Skyler Powers" ] } @@ -2161,31 +2211,31 @@ { "title": "Production", "names": [ - "Casey White", - "Dayna Cassidy", - "Dee Rueter", - "Isaac Calon", - "Jai Kristjan", + "Chris Aduna", "Jason Obertas", "Jennifer Barron", "Keegan Dillman", "Madeeha Ahmad", + "Michael Tolkamp", + "Phoenix Valencia", + "Tud Racanelli", + "Veronica Ng", "Yaw Obiri-Yeboah" ] }, { "title": "Quality Assurance", "names": [ - "Chuan Shi Yu", + "Ace Cheung", "Faith Chow", - "Felipe Mauricio", "Franka Mostert", "Ivan Yemelianov", + "Jimmy Chen", "Leo Hewitt", "Mark Ball", - "Vicky Huang", - "Jimmy Chen", "Valeriia Kirka", + "Vicky Huang", + "William Redmond", "Zack Hutchinson" ] }, @@ -2193,37 +2243,29 @@ "title": "Software Developers", "names": [ "Adrien Givry", + "Aidan Dearing", "Alex Denford", "Alexandra Kabak", - "Amy Liu", - "Amy Zhao", "Andrew Halabourda", "Anthony Wong", - "Aidan Dearing", "Benny Wang", - "Carsten Hooker", + "Brandon Chan", "Chris Spyropoulos", - "Cody Clattenburg", "Cody Ward", "Colin Basnett", - "Dan Wesley", "Daniel Shim", "Delling Ingvaldson", "Derek Bell", + "Don Liu", "Eser Kokturk", + "Eugene Kuznetsov", "Fred Zhang", "Glen Conolly", - "Gordon Tisher", - "Graham Park", - "Gustav Louw", - "Hamza Khachan", "Hao Tian", + "Harrison Mulder", "Hayden Hur", - "Houman Gholami", "Jaegar Sarauer", "Jaidon van Herwaarden", - "Jake Roman-Barnes", - "Jeffrey Chou", "Jian Bang Xu", "Jiazhi Chang", "John Ferguson", @@ -2231,31 +2273,29 @@ "Jonathan Yim", "Jordan Lacey", "Jordan Millar", - "Joseph Cameron", "Justin Tim", - "Kelsey Zirk", "Kirill Bizin", "Kyle Roblin", - "Leonardo Stark", - "Mauricio A. P. Burdelis", + "Lawrence Wu", + "Marija Petkova", "Max Fanning", "Michael Di Spirito", + "Michael Stickland", "Michel Morin", "Mike Demone", - "Mitch Lockhart", "Mukund Agarwal", "Nathan Lacey", "Niamh Cuileann", "Remy Truong", - "Richard Hawkes", "Richard Walker", - "Rick Huang", "Robert Felizardo", - "Ronald Ariel Kamanga", + "Sardana Nikolaeva", "Shreyas Babu", + "Teo Dutra", + "Thierry Bouchard", "Thomas Le Gerroue-Drevillon", + "Ting-Chun Sun", "Todd Saharchuk", - "Ty Lauriente", "Vassil Anguelov", "Yong Hou", "Younggi Kim", @@ -2267,6 +2307,111 @@ } ] }, + { + "section": "Development Partner - Sprung Studios Ltd", + "disciplines": [ + { + "discipline": "", + "titles": [ + { + "title": "CEO", + "names": [ + "James Chaytor" + ] + }, + { + "title": "Director of Global Business Development", + "names": [ + "Brooke Allison" + ] + }, + { + "title": "Studio Director", + "names": [ + "Ben Adams" + ] + }, + { + "title": "Senior Producer", + "names": [ + "Amelia Wales" + ] + }, + { + "title": "Producer", + "names": [ + "Jaclynn Wong" + ] + }, + { + "title": "Head of UX/UI", + "names": [ + "Anton Li" + ] + }, + { + "title": "Senior UX/UI Designer", + "names": [ + "Dimitria Eleftherios" + ] + }, + { + "title": "UX/UI Designers", + "names": [ + "Felix Pham", + "Leticia Dornel", + "Ryan Chen" + ] + }, + { + "title": "Head of Engineering", + "names": [ + "Matthew Jarvis" + ] + }, + { + "title": "Senior UI Engineer", + "names": [ + "Louis Edbrooke" + ] + }, + { + "title": "Front-End Developers", + "names": [ + "Daniel Gomme", + "Spring McParlin Jones" + ] + }, + { + "title": "UI Engineers", + "names": [ + "Andrew Ting", + "Michael Nation", + "Yewon Jung" + ] + }, + { + "title": "Head of User Research", + "names": [ + "Luke Fraser" + ] + }, + { + "title": "Senior User Researcher", + "names": [ + "Erica Qiu" + ] + }, + { + "title": "IT Support", + "names": [ + "Sofwan Naing" + ] + } + ] + } + ] + }, { "section": "Mojang Studios Alumni", "disciplines": [ @@ -2280,8 +2425,9 @@ ] }, { - "title": "Studio Head of Mojang Studios", + "title": "Studio Head", "names": [ + "Åsa Bredin", "Helen Chiang" ] }, @@ -2312,7 +2458,8 @@ { "title": "Chief of Staff", "names": [ - "Andrew J. Adamyk" + "Andrew J. Adamyk", + "Yassal Sundman" ] }, { @@ -2327,12 +2474,6 @@ "Josh Bliggenstorfer" ] }, - { - "title": "Franchise Technical Director", - "names": [ - "Michael Weilbacher" - ] - }, { "title": "Head of Games", "names": [ @@ -2353,14 +2494,17 @@ ] }, { - "title": "Creative Lead", + "title": "Creative Leads", "names": [ - "Jesse Merriam" + "Jesse Merriam", + "Louise Smith (Formosa)", + "Michael Harnisch" ] }, { "title": "Design Managers", "names": [ + "Oskar Hansson Wettergren", "Peter Diar Friman", "Rabi Afram" ] @@ -2374,6 +2518,7 @@ "H Jones", "Henrik Kniberg", "Jared Greiner", + "Jesper Westlund", "Jesse A Hibbs (TEKsystems, Inc.)", "Justin Van Oort", "Lauren E. Careccia", @@ -2396,10 +2541,17 @@ "Jason Cahill" ] }, + { + "title": "Franchise Technical Director", + "names": [ + "Michael Weilbacher" + ] + }, { "title": "Technical Directors", "names": [ "Christopher Östlund", + "Daniel Johansson", "Jason Major", "Kristoffer Jelbring" ] @@ -2412,7 +2564,9 @@ "Johan Williams", "Martin Almgren", "Michael Scott", + "Mikael Stenelund", "Peter Olsson", + "Rose Higgins", "Selma Hosni", "Wenlan Yang" ] @@ -2422,6 +2576,7 @@ "names": [ "Aaron Heysse", "Adrian LaVallee", + "Dan Posluns", "Henry Golding", "Jeff Ott", "John Copic", @@ -2432,6 +2587,7 @@ "Nathan Miller", "Niklas Börestam", "Piotr Kundu", + "Robert Goins", "Sebastian Hindefelt", "Steve Robinson", "Syrgak Turgumbaev", @@ -2444,26 +2600,30 @@ "title": "Technical Leads", "names": [ "Anton Nikolaienko", - "Fernando Via Canel" + "Fernando Via Canel", + "Niclas Unnervik" ] }, { "title": "Software Engineers", "names": [ + "Aaron Ward (Insight Global, Inc)", "Aaron Woodward", + "Adam Granzer (TEKsystems, Inc)", "Adam Ramberg", "Adam Schoelz (Ascendion, Inc)", "Adrian T Orszulak", "Adrian Toncean", "Afeez Olusegun K Bello", "Albin Odervall", - "Alex Baird (Collabera, LLC) (Software Development)", + "Alex Baird (Collabera, LLC)", "Alex Wennström", "Alexander Johansson", "Alexander Kandalaft (Insight Global, Inc)", "Alexander Östman", "Alexander Sandor", "Alexander Wilkinson", + "Ali Alidoust", "Amir Moulavi", "Anders Gärdenäs", "Anders Martini", @@ -2478,6 +2638,7 @@ "Arman Vatandoust", "Aron Nieminen", "Arunkumar Jeganathan (Artech Consulting, LLC)", + "Ashish Sharma (Ascendion Inc)", "Ashley Rentz (Insight Global, Inc)", "Astrid Gunne", "Astrid Rehn", @@ -2485,6 +2646,7 @@ "Austin Larkin (Insight Global, Inc)", "Benjamin Arnold (Insight Global, Inc)", "Benny Hellström", + "Bjarni Gudmundsson", "Brendan Lauck (Insight Global, Inc)", "Campbell Tran", "Cezary Tomczak", @@ -2504,38 +2666,53 @@ "Dartangan Jackson (Ascendion, Inc)", "Dave Stevens", "David Dalström", + "David Karlehagen", "David 'Lion' Kimbro (Insight Global, Inc)", "David Marby", "David Reiley (Collabera, LLC)", "David Roberts (Insight Global, Inc)", + "Delia Varzariu (Globant)", "Dimitri Kishmareishvili (CSI Interfusion, Inc)", "Dodge Lafnitzegger (Insight Global, Inc)", "Dolly Mackwan", "Don S Frazier II", "Drew Okenfuss", "Elijah J Emerson", + "Elliot Strait (Ascendion, Inc)", "Emelie Sidesiö", "Emil Hedemalm", "Emily Black", "Emily Mattlin", "Emily Rizzo (Insight Global, Inc)", + "Emily Yellen", "Eric Grimsborn", + "Erik Broes", "Erik Bylund", "Erik Soderberg", "Esteban Richey (Insight Global, Inc)", + "Esther Peters (Ascendion, Inc)", "Evelyn Collier (Insight Global, Inc)", + "Evin Watson (Insight Global, Inc)", "Fenil Shah (Collabera, LLC)", + "Fernando Cerdeira (Globant)", "Filip Hedenskog", "Fredrik Bergstrand", + "Gabriel Gerhardsson", + "Gabriel Gessle", "Gage Way (Insight Global, Inc)", + "Geof Sawaya (Ascendion, Inc)", "Guillaume Le Chenadec", + "Gustaf Zetterlund", + "Håkan Jonson", "Håkan Wallin", "Haley Eisenshtadt", "Hampus Fristedt", "Hannes Heijkenskjöld", "Hazen Miller (Insight Global, Inc)", "Heather Mace", + "Helena Hjertén", "Henrik Barratt-Due", + "Herbert Mocke (Ascendion, Inc)", "Irina Koulinitch", "Isaac de la Vega", "Jacob Bergdahl", @@ -2544,7 +2721,10 @@ "James Klock (Collabera, LLC)", "James Linden (Insight Global, Inc)", "James McNatton", + "Jason Chionh", "Jason Orion Burch", + "Javi Romero (Globant)", + "Jay Sharma (Insight Global, Inc)", "Jeff 'Dextor' Blazier", "Jeff Yanick (Ascendion, Inc)", "Jeffery Yanick (Collabera, LLC)", @@ -2559,25 +2739,30 @@ "Johannes Sundqvist", "John Davis (Collabera, LLC)", "John Estess (Randstad)", + "John Graf (Collabera, LLC)", "John Haynes", "John Littlewood", "John Wordsworth", "Johnny Sjöö", + "John-Philip Johansson", "Jonas Bergström", "Jonathan M Ortiz", "Jonathan R Hoof", "Jorge Antonio Jimenez (Design Laboratory, Inc)", + "Joseph Kichline", "Josh Letellier", "Joshua B Davis", "Joshua Letellier", "Joshua Owens (Collabera, LLC)", "Joy Cedor (Ascendion, Inc)", + "Juliana Montes", "Jun Fu (Ascendion, Inc)", "Karim A Luccin", "Kaylee Benoit (Randstad)", "Kelly Fox (Insight Global Inc)", "Kelly Keniston (Insight Global, Inc)", "Kento Murawski (Insight Global, Inc)", + "Khaled Fahmy (Ascendion, Inc)", "Kirill Mikhel", "Kristin A Siu", "Kristoffer Kobosko", @@ -2613,6 +2798,9 @@ "Martin Pola", "Mats Henricson", "Matthew Guze (WaferWire Cloud Technologies)", + "Matthew Moses (Ascendion, Inc)", + "Matthew Phair", + "Mattias Selin", "Maxwell Orth (Insight Global, Inc)", "Maxxwell Plum (Insight Global, Inc)", "Michael Andersson", @@ -2621,44 +2809,62 @@ "Michael Malmqvist", "Michael 'Mikaus' Whiteley", "Michael Novén", + "Michel Miranda (Globant)", "Miguel Menindez Segura (Ascendion, Inc)", "Mikael Malmqvist", + "Mikael Persson", + "Mike Carlson", "Mike Marven (Insight Global, Inc)", "Mohamed Fouad Saga", + "Mykhalio Ostapysko (Globant)", + "Nat Meo (Ascendion, Inc)", "Nathan Gilbert", "Nathan Sosnovske", "Nicholas Draper (Insight Global, Inc)", + "Nikita Zetilov", + "Niklas Ekman", "Norman Skinner (Insight Global, Inc)", "Osama Balkasem (Collabera, LLC)", "Oskar Carlbaum", + "Oskar Pedersen", "Pär Berge", "Patrick O'Leary", + "Patrick Szafranko (Ascendion, Inc)", "Patrik Hillgren", "Paula Roth", + "Pavel Grebnev", + "Peter Larsson", "Petr Mrázek", + "Petter Holmberg", "Philip Vieira", "Poojitha Ponakala", + "Prashant Sharma (Ascendion, Inc)", "Radha Kotamarti", "Randy Gonzalez-Murillo (Collabera, LLC)", "Rashad Murray (Insight Global, Inc)", "Richard Pihlcrantz", "Rob Austin", + "Robert Hurley (Ascendion, Inc)", "Robert Thresher (Collabera, LLC)", + "Robin Somers", "Robyn R To", + "Rodrick Edwards", "Roman Timurson (Insight Global, Inc)", "Rui Ma", "Rui Xie (Insight Global, Inc)", "Ryan Holtz", "Ryan Seaman (Collabera, LLC)", "Ryan Tyler Rae", + "Samuel Smethurst (Ascendion, Inc)", "Scott Edsall (Collabera, LLC)", + "Sean Reilly", "Sebasian Hindefeldt", "Semih Energin", "Sina Tamanna", "Spencer Peterson (Insight Global, Inc)", "Srinivasa Rao Chatala (Ascendion, Inc)", "Stacy J Chen", - "Sumith Kumar (Virtuosity)", + "Stephen Trigger (Insight Global, Inc)", "Tanner Pearson (Insight Global, Inc)", "Taylor M Riviera", "Theodor Fleming", @@ -2669,17 +2875,21 @@ "Tobias Möllstam", "Tomas Alaeus", "Tomer Braff (Collabera, LLC)", + "Tommy Wallberg", "Travis Gates (Insight Global, Inc)", - "Uma Senthil Raj (Virtuosity)", + "Udit Gandhi (Ascendion, Inc)", "Victor Connor", - "Vignesh Masilamani (Virtuosity)", "Viktor Bergehall", "Virgilio Jr Blones", "Vitalii Sych", "Vladimir Repcak (Collabera, LLC)", + "Volodymyr Belianinov (Ascendion, Inc)", + "Will Van Keulen", + "William Harmon (Insight Global, Inc)", "Ying Guo (TEKsystems, Inc.)", "Zack Moxley (Insight Global, Inc)", - "Zane Hintzman" + "Zane Hintzman", + "Zeshan Ahmed (Ascendion, Inc)" ] }, { @@ -2693,7 +2903,6 @@ "title": "Architects", "names": [ "Dom Humphrey", - "Michael Seydl", "Mike Frost", "Tommaso Checchi" ] @@ -2720,6 +2929,12 @@ "Olof Carlson Sandvik" ] }, + { + "title": "Head of Games Expansion", + "names": [ + "John Thornton" + ] + }, { "title": "Head of Minecraft Atlas", "names": [ @@ -2727,9 +2942,22 @@ ] }, { - "title": "Production Director", + "title": "Production Directors", "names": [ - "Daniel Kaplan" + "Daniel Kaplan", + "Tyler Jeffers (Formosa)" + ] + }, + { + "title": "Director of Minecraft Online & Marketplace", + "names": [ + "Jessica Zahn" + ] + }, + { + "title": "Director of Bedrock Platform", + "names": [ + "Michael McManus" ] }, { @@ -2741,8 +2969,9 @@ ] }, { - "title": "Production Manager", + "title": "Production Managers", "names": [ + "Magdalena Björkman", "Shah Rahman" ] }, @@ -2751,6 +2980,7 @@ "names": [ "Charlotte Backer", "Christine Platon", + "Sarah Carton", "Sofie Lundberg" ] }, @@ -2760,9 +2990,11 @@ "Aaron Culbreth (Insight Global, Inc)", "Adele Major", "Alen Voljevica", + "Allan Contreras (Insight Global, Inc)", "Anna Holdosi-Simon", "Anna Jensen", "Anna Zakipour", + "Annica Strand", "Annie Desimone (Insight Global, Inc)", "Ann-Kristin Adwent", "Anthony Hanses (Insight Global, Inc)", @@ -2772,7 +3004,9 @@ "Best Liang", "Carina Kovacs Lockhart", "Carina Pettersson", + "Carolin Szymaniak", "Caylin Kaunas (Randstad)", + "Charlotte Angantyr", "Chris Casanova", "Chris Massena (Insight Global, Inc)", "Christina-Antoinette Neofotistou", @@ -2783,7 +3017,7 @@ "Dayana Sharshukova (Aquent, LLC)", "Decker Geddes (Insight Global, Inc)", "Elizabeth Batson (Insight Global, Inc)", - "Ellen Karlsten", + "Emily Steele (Formosa)", "Emma Erixson", "Ethan Koltz (Insight Global, Inc)", "Foluso Akerele", @@ -2791,6 +3025,7 @@ "Hampus Nilsson", "Hedwig Laza", "Hugo Lang", + "Isaac Barron (Globant)", "Isabella Arningsmark", "Jason Rice", "Jeffrey Carlo (Apex Systems, Inc)", @@ -2801,6 +3036,7 @@ "Johannes Fridd", "John Garcia (Collabera, LLC)", "Jonas Olaussen", + "Josefine Brink", "Juan Gril", "Julian Tunru", "Justin So (Randstad)", @@ -2813,13 +3049,16 @@ "Lina Hagman", "Lisa Bryer", "Loudon St Hill (Insight Global, Inc)", + "Luis Qiang Liu", "Marcus Rundström", "Marie Stålkrantz", "Markus Waltré", "Martin Kurtovic", "Matt Rodgers (eXcell, a division of CompuCom)", + "Megan Rodes (Formosa)", "Michael Welch (Insight Global, Inc)", "Moira Ingeltun", + "Natalie Selin", "Nathan Tompkins (Randstad)", "Negin Javanmardi", "Nick Severson", @@ -2828,10 +3067,14 @@ "Pontus Åselius", "Robin Linder", "Sara Lidberg", + "Seyit Ivhed", "Sloane Delancer", "Sofia Orrheim", "Sofie Lekkas", + "Steph Huske (Allegis Group Services, Inc)", "Stephanie Chen (Collabera, LLC)", + "Susanne Granlöf", + "Tess Kearney (Formosa)", "Thomas Feng", "Tien-Hung Nguyen (TEKsystems, Inc.)", "Tilde Westrup", @@ -2848,8 +3091,17 @@ ] }, { - "title": "Product Manager", + "title": "Media Producers", "names": [ + "André Angerbjörn", + "Ines Quintanar Cardenas" + ] + }, + { + "title": "Product Managers", + "names": [ + "Carmille Gidfors Netzler", + "Erica Lares (Apex Systems, Inc)", "Halishia Chugani" ] }, @@ -2859,7 +3111,8 @@ "Jonas Ekstrand", "Karin Hagren", "Linda Ahlström Nilsson", - "Martin Bloomstine" + "Martin Bloomstine", + "Rasmus Noah Hansen" ] }, { @@ -2875,7 +3128,7 @@ "title": "Technical Writers", "names": [ "Bryce Bortree (Insight Global, Inc)", - "Jeff Kim (Insight Global, Inc)", + "Jim Seaman (Insight Global, Inc)", "Joshua Jones (Insight Global, Inc)", "Nate Mackie (TEKsystems, Inc.)" ] @@ -2884,15 +3137,29 @@ "title": "Technical Program Managers", "names": [ "Andy Puntahachart", + "Aysha Davis (Cyborg Mobile LLC)", + "Devarshi Hazarika", + "Dom Arcamone", + "Eloise Espel", "Emily Price", "Holly Pollock", + "Joshua Mueller (Apex Systems, Inc)", "Morgan J. East (Randstad)", - "Ryan Seymour (TEKsystems, Inc.)" + "Roger Duke (Insight Global, Inc)", + "Ryan Seymour (TEKsystems, Inc.)", + "Stephen Frothingham (Wimmer Solutions)" + ] + }, + { + "title": "Localization", + "names": [ + "Amber Wu (Shanghai Wicresoft Co, Ltd.)" ] }, { "title": "Playtest Coordinators", "names": [ + "Axel Savage", "Liam Allman (Aquent, LLC)", "Ricky White (Randstad)" ] @@ -2906,7 +3173,10 @@ "Daniel Björkefors", "Kim Petersen", "Logan Lubera", + "Lynwood Montgomery (Formosa)", "Ola Lanteli", + "Telemachus Stavropoulos", + "Viktor Blanke", "Wiktor Persson" ] }, @@ -2922,46 +3192,69 @@ { "title": "Artists", "names": [ + "Aleesa Tana (Formosa)", "Amanda Cook (Harvey Nash, Inc)", + "Andrea Sanchez Sepulveda (Formosa)", "Bart Kaufman (Randstad)", "Branden Brushett (Aquent, LLC)", + "Claire Selvog (Formosa)", "Dylan Sunkel (Collabera, LLC)", "Elin Ölund Forsling", + "Erin Biafore (Formosa)", "Erin Caswell (eXcell, a division of CompuCom)", + "Florian Decupper", "Heath Night (Aquent, LLC)", "Husein Kurbegovic", "Jakob Gavelli", "Jei G Ling (Allegis Group Services, Inc)", + "Jei Ling (Formosa)", "Jerica Harada (TEKsystems, Inc.)", "Jesper Hallin", "Jonatan Pöljö", "Jules Norcross (Aquent, LLC)", + "Kailey Hara (Formosa)", + "Kate Anderson (Formosa)", "Kelly Greene (CompuCom Systems, Inc)", "Kristen Malone (Randstad)", "Kristoffer Zetterstrand", "Lilei Yu (Collabera, LLC)", "Liliia Chorna", - "Linus Chan (TEKsystems, Inc.)", + "Linus Chan (Formosa)", "Marco Vale", "Mariana Graham Ramirez", + "Mariana Salimena", + "Mark Eash Hershberger (Formosa)", "Mark Hershberger (Apex Systems, Inc)", + "Mark Reyes (Formosa)", "Michael R Fiedler (Insight Global, Inc)", "Miki Bishop (Randstad)", + "Patrick Rodes (Formosa)", "Phoebe Piepenbrok", "Poi Poi Chen", - "Richard Worley" + "Richard Worley", + "Rudy Solidarios (Formosa)", + "Salinee Goldenberg (Formosa)", + "Sarah Corean (Formosa)", + "Sarah Martino (Formosa)", + "William Thomas" ] }, { "title": "Product Designers", "names": [ + "Affe Piran", "Jennifer Hammervald", - "Jonathan Gallina" + "Jonathan Gallina", + "Kelsey Ranallo", + "Lisa Dahlström" ] }, { - "title": "Graphic Designer", + "title": "Graphic Designers", "names": [ + "Adrian Leon (Formosa)", + "Dalila Copeland (Formosa)", + "Javier Rodriguez (Formosa)", "Yong-Namm Lee" ] }, @@ -2976,6 +3269,7 @@ "names": [ "Johan Pettersson", "Kevin Martinez", + "Magnus Mikander", "Rostislav Trifonov", "Shauny Jang (Insight Global, Inc)" ] @@ -3013,6 +3307,70 @@ "Mimmi Boman-Borjesson" ] }, + { + "title": "Software Test Engineers", + "names": [ + "Chris Youngs (Insight Global, Inc)", + "Jared Lesczynski (Experis)", + "Karol Szymański (Lionbridge)", + "Kinga Izdebska (Lionbridge)", + "Konrad Czaplewski (Lionbridge)", + "Marcin Morel (Lionbridge)", + "Mateusz Janiszewski (Lionbridge)", + "Robert Alvarez (Experis)", + "Tevis Campbell (Experis)" + ] + }, + { + "title": "Test Associates", + "names": [ + "Arkadiusz Grzanka (Lionbridge)", + "Damian Bartak (Lionbridge)", + "Daryna Kalashnova (Lionbridge)", + "Dominik Głowacki (Lionbridge)", + "Ermias Tesfaye (Lionbridge)", + "Evan Armstrong (Experis)", + "Heorhii Lystopad (Lionbridge)", + "Ignacy Kukliński (Lionbridge)", + "Jakub Kliś (Lionbridge)", + "John Castro Chico (Insight Global, Inc)", + "Kacper Lędzion (Lionbridge)", + "Kacper Pućka (Lionbridge)", + "Kacper Stalewski (Lionbridge)", + "Kamil Wiktorowski (Lionbridge)", + "Karol Mikusek (Lionbridge)", + "Karolina Malik (Lionbridge)", + "Korentin Delisle (Lionbridge)", + "Mikołaj Szadkowski (Lionbridge)", + "NIck Latino (Insight Global, Inc)", + "Paulina Prus (Lionbridge)", + "Rion Cox (Lionbridge)", + "Robert Thomas (Insight Global, Inc)", + "Sophie James (Lionbridge)", + "Teresa Stelmach (Lionbridge)", + "Zakery Haynes (Experis)" + ] + }, + { + "title": "Test Managers", + "names": [ + "Ian S. Nelson (Experis)", + "Marcus King (Experis)" + ] + }, + { + "title": "Team Leads", + "names": [ + "Kamil Kostrzewa (Lionbridge)", + "Zuzanna Gieszcz (Lionbridge)" + ] + }, + { + "title": "Test Lead", + "names": [ + "Alan Aclon (Insight Global, Inc)" + ] + }, { "title": "User Experience Design Directors", "names": [ @@ -3023,6 +3381,7 @@ { "title": "User Experience Designers", "names": [ + "Clory Luo (Formosa)", "Connor Tompsett (CompuCom Systems, Inc)", "Eric Alm", "Gaby Salinas", @@ -3032,11 +3391,20 @@ "Lily Ekman", "Lucas Morales Sousa", "Melissa Kay (Prieto)", + "Nirali Vadera (Ascendion, Inc)", "Oscar Nilsson", "Sabrina Cuevas-Pagoaga (Randstad)", "Sam Paye (Aquent, LLC)", "Sandra Bornemark", - "Timothy Lusk (Randstad)" + "Sarah Mack (Digital Intelligence Systems, LLC)", + "Shaun Basil Mendonsa", + "William Hollowell" + ] + }, + { + "title": "User Experience Writer", + "names": [ + "Juan Buis" ] }, { @@ -3060,9 +3428,142 @@ ] }, { - "title": "Head of Player Operations", + "title": "Head of Creator Marketplace", "names": [ - "Aubrey Norris" + "Aaron Buckley" + ] + }, + { + "title": "Business Director, Minecraft Game", + "names": [ + "Jesper Altren" + ] + }, + { + "title": "Directors of Business Management", + "names": [ + "Stephen McHugh" + ] + }, + { + "title": "Director of Business Planning", + "names": [ + "Adam Tratt" + ] + }, + { + "title": "Director of Business Development", + "names": [ + "Cherie D Lutz" + ] + }, + { + "title": "Project Director", + "names": [ + "Jakob Porsér" + ] + }, + { + "title": "Operations Managers", + "names": [ + "Anna Hamilton", + "Barbara Acevedo Visser (Lions and Tigers)", + "Carl Kyhlberg", + "Ellen Hahm", + "Gustav Roth", + "Kaya Hatcher", + "Mira Aboulhoson", + "Sarah Grimmond" + ] + }, + { + "title": "Business Development Managers", + "names": [ + "Ellen Deng (JeffreyM Consulting, LLC)", + "Jordan Comar (Digital Intelligence Systems, LLC)", + "Maru Zamora", + "Nick Gallagher (Digital Intelligence Systems, LLC)", + "Ryan Eng (Aerotek, Inc)" + ] + }, + { + "title": "Program Managers", + "names": [ + "Amador Abreu (Insight Global, Inc)", + "Aria Azizi", + "Brian Canning (Experis)", + "Clint Baggett (Experis)", + "Helene Aku Brown", + "James Pfeiffer (Experis)", + "Jonathan Hartung-Jenkins (my3Twelve, LLC)", + "Julie Olden", + "Kaiwen Li (Populus Group, LLC)", + "Liz Butowicz (Bluehawk LLC)", + "Maria Olekheyko", + "Mark Fredo (Aerotek, Inc)", + "Mary Elizabeth Pearson (Apex Systems, Inc)", + "May Qiang (my3Twelve, LLC)", + "Meenoo Rami", + "Natalie Haggin (Simplicity Consulting Inc.)", + "Phillip Wang (Digital Intelligence Systems, LLC)", + "Steven Hosey (Simplicity Consulting Inc.)", + "Stuart U (my3Twelve, LLC)", + "Tess Opincarne (Amaxra)", + "Timothy J Ross (Simplicity Consulting Inc.)", + "Todd Agnello (TEKsystems, Inc)", + "Tori Park (Cypress Human Capital)", + "Wendy Gorton" + ] + }, + { + "title": "Business Managers", + "names": [ + "Bill Wu", + "Claudine Ursino (Simplicity Consulting Inc.)", + "Dana Friesen (Insight Global, Inc)", + "Daniel Beasley", + "Emily Clock", + "Jennifer Cox (Aston Carter, Inc)", + "Leslie Tullis", + "Matthew Ortegon (Rylem)", + "Sarah Souza (Epitec Inc)", + "Vanessa Dagnino (Simplicity Consulting Inc.)" + ] + }, + { + "title": "Business Analysts", + "names": [ + "Alvin M Chin (Populus Group, LLC)", + "Keiko Ramer (Apex Systems, Inc)", + "Zheng Wang (Populus Group, LLC)" + ] + }, + { + "title": "Lead Project Manager", + "names": [ + "Vera Mirchev" + ] + }, + { + "title": "Intellectual Property Enforcement Leads", + "names": [ + "Mathias Andersson", + "Teresa Lee Rodewald" + ] + }, + { + "title": "Intellectual Property Enforcement Agents", + "names": [ + "Johan Hedlund", + "Marcus Forss", + "Matilda Åkerman", + "Sylvia Chen" + ] + }, + { + "title": "People Operations Director", + "names": [ + "Briana Roberts" ] }, { @@ -3082,16 +3583,24 @@ { "title": "Human Resources", "names": [ + "Alexandra Ward", "Anna Lyth", "Aron Glauser", "Charlie Bjurström", "Emma Bergström", + "Jennie Sjöman", + "Jonas Bergelli", + "Katarina Starendal", "Kristian Idehaag", "Maria Sjöman", + "Marie Tolf", + "Milica Tesic Stojanovic", "Petra Stenqvist", + "Richard Nelléus", "Sasa Stamenkovic", "Simon Taylor", "Ulrika Karlsson", + "Ulrika Wörding", "Veronica Camaj Ericson", "Viktoria Petersson" ] @@ -3100,11 +3609,11 @@ "title": "Talent Acquisition", "names": [ "Aimée Narfström", + "Elnaz Tajahmadi Tabrizi", "Filip Hultin", "Hanan Naamneh", "Ida Utterström", "Roza Kawa", - "Sofia Andersson", "Sofia Lindquist", "Tove Oldebäck", "Vidar Bjurström" @@ -3147,6 +3656,13 @@ "Shae M. Flanigan (C2S Technologies, Inc)" ] }, + { + "title": "Administrative Support", + "names": [ + "Carol Stearns (Experis)", + "Paul Gradwohl (Experis)" + ] + }, { "title": "Front of House", "names": [ @@ -3156,12 +3672,21 @@ "Felicia Björn Nordling" ] }, + { + "title": "IT Managers", + "names": [ + "Adam MacDowall" + ] + }, { "title": "IT", "names": [ "Alexandre Pretto Nunes", + "Anton Wu", "Carl Johan Svärd", + "Cesar Sima Falck", "Daniel Miller (Insight Global, Inc)", + "Derek Wilson (my3Twelve, LLC)", "Dessie Andersson (Centric Professionals AB)", "Eetu Närhi", "Evelina Rollfelt", @@ -3169,34 +3694,23 @@ "Frida Karlsson", "Henrik Lindgren", "John Klervad", + "Morris Kellokoski", "Natalia Filapek", "Ondrej Magath", "Przemyslaw Elwart", "Rickard Randa Hedvall", "Shoaib Hosseini", "Stephanie De Leeouv Markov", - "Tim Foster (Warner Marketing, Inc)", "Vanessa Butt", "Yaser Mosavi" ] }, - { - "title": "Operations Managers", - "names": [ - "Anna Hamilton", - "Barbara Acevedo Visser (Lions and Tigers)", - "Carl Kyhlberg", - "Gustav Roth", - "Kaya Hatcher", - "Sarah Grimmond" - ] - }, { "title": "Automation Support", "names": [ + "Bill Erhard (Insight Global, Inc)", "Gregory D Searing (WaferWire Cloud Technologies)", "Johnny Cocks (Collabera, LLC)", - "Jordan Crockett (TEKsystems, Inc.)", "Matthew Gustaff (Digital Intelligence Systems, LLC)", "Sean Connolly (Insight Global, Inc)" ] @@ -3207,6 +3721,76 @@ "Chris Ilson (Collabera, LLC)" ] }, + { + "title": "Data Engineering", + "names": [ + "Addy Deodikar (Design Laboratory, Inc)", + "Patrick Worthey" + ] + }, + { + "title": "Data and Analytics Lead", + "names": [ + "Warren Durrett" + ] + }, + { + "title": "Analytics Environment Engineering", + "names": [ + "Nitesh Kulkarni (Manpower Services Canada Limit)", + "Saif Adeeb (Ascendion, Inc)", + "Vini De Lima De Sousa (0965688 BC Ltd)" + ] + }, + { + "title": "Data Science", + "names": [ + "Abby Jaloway (National Business Innovations)", + "Akshaya Renganathan (KellyMitchell Group, LLC)", + "Anh Ying Lang (Design Laboratory, Inc)", + "Brynjólfur Erlingsson", + "Conor Maguire (KellyMitchell Group, LLC)", + "Cyrus Rustomji (KellyMitchell Group, LLC)", + "Daniel Camarena (KellyMitchell Group, LLC)", + "Darin LaSota (Design Laboratory, Inc)", + "David Heller (KellyMitchell Group, LLC)", + "Dusanka Poljak (Design Laboratory, Inc)", + "Emma Matilda Charlotte Kalzen", + "Erin Michet", + "Ethan Batson (Design Laboratory, Inc)", + "Forrest Wheeler (Insight Global, Inc)", + "Gil Darves (Design Laboratory, Inc)", + "Jake Kelly", + "Jari Williams", + "Jonathan Bush (KellyMitchell Group, LLC)", + "Jonathan Selenkow (Allegis Group Services, Inc)", + "Joseph Bushagour (KellyMitchell Group, LLC)", + "Julianne Toto (Kelly Management Services, Inc)", + "Krishan Deo (Allegis Global Solutions)", + "Marie-Claire Kore (Agility Partners, LLC)", + "Matilda Eriksson", + "Max Davidson", + "Megan Henry (KellyMitchell Group, LLC)", + "Melissa Alleyne", + "Michael Hernandez (Insight Global, Inc)", + "Murali Nagarajan (Design Laboratory, Inc)", + "Nick Martin (Design Laboratory, Inc)", + "Pawan Panaganti (Design Laboratory, Inc)", + "Ricardo Silva Oquendo (KellyMitchell Group, LLC)", + "Simona Pirani", + "Srini Viswanatham (Design Laboratory, Inc)", + "Tejasvini Deshpande (KellyMitchell Group, LLC)", + "Tim Ross (Simplicity Consulting Inc.)", + "Tong Shen (KellyMitchell Group, LLC)", + "Yuvaraj Duraisamy (Design Laboratory, Inc)" + ] + }, + { + "title": "Head of Player Operations", + "names": [ + "Aubrey Norris" + ] + }, { "title": "Player Support Leads", "names": [ @@ -3234,6 +3818,7 @@ "Antonia Kousathana", "Carl Johnsson", "Cim Borg", + "Dan Coronel (Apex Systems, Inc)", "Dante Stjernberg", "David Carlsson", "David Stuart Dahlgren", @@ -3272,148 +3857,9 @@ ] }, { - "title": "Data Engineering", + "title": "Brand Director", "names": [ - "Addy Deodikar (Design Laboratory, Inc)", - "Patrick Worthey" - ] - }, - { - "title": "Data and Analytics Lead", - "names": [ - "Warren Durrett" - ] - }, - { - "title": "Analytics Environment Engineering", - "names": [ - "Nitesh Kulkarni (Manpower Services Canada Limit)", - "Vini De Lima De Sousa (0965688 BC Ltd)" - ] - }, - { - "title": "Data Science", - "names": [ - "Abby Jaloway (National Business Innovations)", - "Akshaya Renganathan (KellyMitchell Group, LLC)", - "Anh Ying Lang (Design Laboratory, Inc)", - "Brynjólfur Erlingsson", - "Conor Maguire (KellyMitchell Group, LLC)", - "Cyrus Rustomji (KellyMitchell Group, LLC)", - "Daniel Camarena (KellyMitchell Group, LLC)", - "Darin LaSota (Design Laboratory, Inc)", - "David Heller (KellyMitchell Group, LLC)", - "Dusanka Poljak (Design Laboratory, Inc)", - "Emma Matilda Charlotte Kalzen", - "Ethan Batson (Design Laboratory, Inc)", - "Forrest Wheeler (Insight Global, Inc)", - "Gil Darves (Design Laboratory, Inc)", - "Jake Kelly", - "Jari Williams", - "Jonathan Selenkow (Allegis Group Services, Inc)", - "Joseph Bushagour (KellyMitchell Group, LLC)", - "Krishan Deo (Allegis Global Solutions)", - "Marie-Claire Kore (Agility Partners, LLC)", - "Megan Henry (KellyMitchell Group, LLC)", - "Melissa Alleyne", - "Michael Hernandez (Insight Global, Inc)", - "Murali Nagarajan (Design Laboratory, Inc)", - "Nick Martin (Design Laboratory, Inc)", - "Pawan Panaganti (Design Laboratory, Inc)", - "Simona Pirani", - "Srini Viswanatham (Design Laboratory, Inc)", - "Tejasvini Deshpande (KellyMitchell Group, LLC)", - "Tim Ross (Simplicity Consulting Inc.)", - "Tong Shen (KellyMitchell Group, LLC)", - "Yuvaraj Duraisamy (Design Laboratory, Inc)" - ] - }, - { - "title": "Head of Creator Marketplace", - "names": [ - "Aaron Buckley" - ] - }, - { - "title": "Business Director, Minecraft Game", - "names": [ - "Jesper Altren" - ] - }, - { - "title": "Directors of Business Management", - "names": [ - "Stephen McHugh" - ] - }, - { - "title": "Director of Business Planning", - "names": [ - "Adam Tratt" - ] - }, - { - "title": "Director of Business Development", - "names": [ - "Cherie D Lutz" - ] - }, - { - "title": "Project Director", - "names": [ - "Jakob Porsér" - ] - }, - { - "title": "Business Development Managers", - "names": [ - "Ellen Deng (JeffreyM Consulting, LLC)", - "Jordan Comar (Digital Intelligence Systems, LLC)" - ] - }, - { - "title": "Program Managers", - "names": [ - "Clint Baggett (Experis)", - "Helene Aku Brown", - "James Pfeiffer (Experis)", - "Jonathan Hartung-Jenkins (my3Twelve, LLC)", - "Kaiwen Li (Populus Group, LLC)", - "Liz Butowicz (Bluehawk LLC)", - "Maria Olekheyko", - "Mark Fredo (Aerotek, Inc)", - "Mary Elizabeth Pearson (Apex Systems, Inc)", - "May Qiang (my3Twelve, LLC)", - "Meenoo Rami", - "Natalie Haggin (Simplicity Consulting Inc.)", - "Phillip Wang (Digital Intelligence Systems, LLC)", - "Steven Hosey (Simplicity Consulting Inc.)", - "Tess Opincarne (Amaxra)", - "Timothy J Ross (Simplicity Consulting Inc.)", - "Todd Agnello (TEKsystems, Inc)", - "Tori Park (Cypress Human Capital)", - "Wendy Gorton" - ] - }, - { - "title": "Business Managers", - "names": [ - "Bill Wu", - "Claudine Ursino (Simplicity Consulting Inc.)", - "Daniel Beasley", - "Emily Clock", - "Jennifer Cox (Aston Carter, Inc)", - "Leslie Tullis", - "Matthew Ortegon (Rylem)", - "Vanessa Dagnino (Simplicity Consulting Inc.)" - ] - }, - { - "title": "Business Analysts", - "names": [ - "Alvin M Chin (Populus Group, LLC)", - "Keiko Ramer (Apex Systems, Inc)", - "Zheng Wang (Populus Group, LLC)" + "Jonathan Symington" ] }, { @@ -3422,34 +3868,6 @@ "Katharina Hautz" ] }, - { - "title": "Lead Project Manager", - "names": [ - "Vera Mirchev" - ] - }, - { - "title": "Intellectual Property Enforcement Leads", - "names": [ - "Mathias Andersson", - "Teresa Lee Rodewald" - ] - }, - { - "title": "Intellectual Property Enforcement Agents", - "names": [ - "Johan Hedlund", - "Marcus Forss", - "Matilda Åkerman", - "Sylvia Chen" - ] - }, - { - "title": "Brand Director", - "names": [ - "Jonathan Symington" - ] - }, { "title": "Lead Producer - Brand Experience", "names": [ @@ -3462,6 +3880,12 @@ "Hans Abrahamsson" ] }, + { + "title": "Chief Storyteller", + "names": [ + "Lydia Winters" + ] + }, { "title": "Head of Creative Communications", "names": [ @@ -3480,9 +3904,11 @@ "Adam Pannel (Assembly Media, Inc)", "Christopher de Haan (Simplicity Consulting Inc)", "Elias Arnehall", + "Hollis Wacker-Leja", "Jane Billet", "Jessica Xie", "John Schork", + "Katie Guo (Assembly Media, Inc)", "Rebecca Gordius" ] }, @@ -3545,6 +3971,7 @@ "names": [ "Aleksander Gilyadov (Aston Carter Inc)", "Alex Fleck (Adecco)", + "Chad Oetken (Troy Consulting LLC)", "David Ramos (Collabera, LLC)", "Jeremy Chan (Aerotek, Inc)", "Natascha Cox", @@ -3556,9 +3983,11 @@ "title": "Community Managers", "names": [ "Cameron Thomas", + "DèJa Easter (Apex Systems, Inc)", "Glory Robinson (Experis)", "Helen Zbihlyj", "Matt Martin", + "Nadine Ebri (Apex Systems, Inc)", "Trella Rath (Corestaff)" ] }, @@ -3568,19 +3997,30 @@ "Niclas Fredriksson" ] }, + { + "title": "Publishing Editor", + "names": [ + "Jay Castello" + ] + }, + { + "title": "Head of Marketing", + "names": [ + "Jessica Freeman" + ] + }, { "title": "Marketing Managers", "names": [ "Ankita Rao", "Ashley Davidson (Simplicity Consulting Inc.)", "Bianca Ciotti", + "Cori Anne Montero", "Danielle Ma", "Delilah Liu", "Didac Hormiga", - "Emily Orrson (Emily)", "Eva Stefanac", "Gabi Ibarra (Simplicity Consulting Inc.)", - "Lindsay Auten (Simplicity Consulting Inc.)", "Nathaniel Wipfler", "Stephanie Gielarowski (Ascendion Inc)" ] @@ -3608,6 +4048,7 @@ { "title": "Financial Accountants", "names": [ + "Aleksandra Dragosavljevic", "Camilla Brantefelt", "Jelena Pejic", "Karin Severinson", @@ -3616,9 +4057,10 @@ ] }, { - "title": "Financial Consultant", + "title": "Financial Consultants", "names": [ - "Stefan Lyrmark" + "Stefan Lyrmark", + "Ulrika Kihl" ] } ] @@ -3666,21 +4108,18 @@ "Chelsi Hohnbaum", "Fiona Belmont", "Herve Iradukunda", - "Jeff MacDermot", "Ryan Mayes" ] }, { - "title": "Quality Analysts", + "title": "Quality Analyst", "names": [ - "Michelle Hyde", "Yi Zhao (Kforce)" ] }, { "title": "Program Managers", "names": [ - "Amador Abreu (Insight Global, Inc)", "Justin Ice (Pivotal Consulting)", "Misti Lommen", "Norah Hogoboom (Insight Global, Inc)" @@ -3691,7 +4130,6 @@ "names": [ "Aaron Amlag", "Dustin Randall", - "Henry Golding", "Jay Baxter", "Moodie Ghaddar", "Paula Yuan", @@ -3706,20 +4144,11 @@ "Patrick Fraioli" ] }, - { - "title": "Test Managers", - "names": [ - "Marcus King (Experis)" - ] - }, { "title": "Team Leads", "names": [ "Anna Wróbel (Lionbridge)", "Kamil Bazydło (Lionbridge)", - "Michał Sławek (Lionbridge)", - "Paweł Piekarski (Lionbridge)", - "Sebastian Polanica (Lionbridge)", "Tomasz Bokotko (Lionbridge)", "Wojciech Kujawa (Lionbridge)" ] @@ -3758,10 +4187,8 @@ "Kyle Rennie (Experis)", "Leon Langston (Insight Global, Inc.)", "Maciej Łajszczak (Lionbridge)", - "Marcin Słoniewski (Lionbridge)", "Mariusz Gil (Lionbridge)", "Mariusz Podgórski (Lionbridge)", - "Mateusz Janiszewski (Lionbridge)", "Michał Cieślak (Lionbridge)", "Michelle Elbert (Experis)", "Miłosz Kahlan (Lionbridge)", @@ -3796,7 +4223,6 @@ "Bartosz Szklarzyński (Lionbridge)", "Bartosz Urbankowski (Lionbridge)", "Brian Sears (Experis)", - "Casper Sparks (Insight Global, Inc.)", "Cezary Kociński (Lionbridge)", "Cezary Wojewoda (Lionbridge)", "Damian Golik (Lionbridge)", @@ -3821,14 +4247,12 @@ "Jordan Leeper (Lionbridge)", "Justin Jones (Lionbridge)", "Justin Smick (Experis)", - "Kacper Bujakowski (Lionbridge)", "Kacper Kobyliński (Lionbridge)", "Kacper Krupa (Lionbridge)", "Kamil Konarski (Lionbridge)", "Kamil Marut (Lionbridge)", "Kamil Owczarczyk (Lionbridge)", "Karol Kotowicz (Lionbridge)", - "Karol Mikusek (Lionbridge)", "Karol Sobotka (Lionbridge)", "Karolina Otłowska (Lionbridge)", "Katarzyna Jaworska (Lionbridge)", @@ -3883,7 +4307,6 @@ "Rafał Pruszkowski (Lionbridge)", "Rafał Sapała (Lionbridge)", "Rajkumar Kulandaivelu (Lionbridge)", - "Robert Thomas (Experis)", "Robert Wypasek (Lionbridge)", "Ryan Atwater (Experis)", "Ryszard Kowalczyk (Lionbridge)", @@ -3904,7 +4327,6 @@ "Tyler Gladstone (Experis)", "Tyler Riojas (Experis)", "Weronika Smoleń (Lionbridge)", - "Wiktor Wrona (Lionbridge)", "Wojciech Komada (Lionbridge)", "Wojciech Nieckarz (Lionbridge)", "Zuzanna Wielkopolan (Lionbridge)" @@ -3913,13 +4335,8 @@ { "title": "Studios Quality Special Thanks", "names": [ - "Aaron Brindell (Experis)", - "Aaron Ingram (Experis)", "Adrian Brown – Data Science Manager", - "Alex Luschen – Executive Business Administrator", "Andrew Franklin – Outsourcing Manager", - "Brian Canning (Experis) – Test Manager, Tempe", - "Carol Stearns (Experis)", "Chad Rankin – Client Account Director (Experis)", "Dante Carrasco – Business Manager", "David Boker – Director XGS Business Operations", @@ -3930,7 +4347,6 @@ "Kenna Gillooly – Executive Business Administrator", "Lucas Rathburn (Experis)", "Matthew Call – Software Engineering Manager", - "Ryan Burns – Software Engineering Lead", "Zachary Bohnenkamp – Center of Excellence (Experis)" ] } @@ -3944,30 +4360,45 @@ { "discipline": "", "titles": [ + { + "title": "Technical Director", + "names": [ + "James Fairweather" + ] + }, { "title": "Programmers", "names": [ + "Aaron Freytag", "Andrew Yuennan", "Anish Shenwai", + "Ben Jones", "Bhavesh Gupta", "Branko Bajcetic", "Christina Oh", "Christopher Whitman", + "Curtis Hodgins", "Daniel Gold", + "Darren Grant", "Duarte Maia", + "Dylan Reviczky", "Elizabeth Pieters", "Eric Dahl", "Erick Tavares", "Gupta Bhavesh", "Hugo Burd", + "Jacky Cai", + "Jakob Trounce", "Kevin Yu", "Koki Pan", "Riley Godard", + "Samuel Lapointe", "Sandro Furini", "Thomas Paterson", "Umut Polat", "Vlad Ryzhov", - "Youhan Guan" + "Youhan Guan", + "Zehao Lu" ] }, { @@ -3976,6 +4407,8 @@ "Alex Sharp", "David McKay", "Kelsey Primar", + "Matt Kernachan", + "Paul Pera", "Russell White" ] }, @@ -3986,6 +4419,24 @@ "Vidhi Shah" ] }, + { + "title": "UI Artist", + "names": [ + "Richelle Brunt" + ] + }, + { + "title": "UX Designer", + "names": [ + "Sam Flores" + ] + }, + { + "title": "Quality Assurance Director", + "names": [ + "Max McNiven" + ] + }, { "title": "Lead Quality Assurance Analysts", "names": [ @@ -3996,6 +4447,9 @@ { "title": "Quality Assurance Analysts", "names": [ + "Jamie Cheung", + "Jonathan Lin", + "Kelsey Gottschlich", "Richard Kim", "Wes Trevor" ] @@ -4018,17 +4472,26 @@ "Albert Jin", "Alex Chen", "Alexey Qian", + "Alfred Wang", "Arvin Zhang", "Bob Wang", + "Dowen Zhu", "Eric Jia", + "Fernly Li", "Harris Zhou", "Hong Chao Fang", "Jana Rogers", "Jason Zhang", "Jeff Zhang", + "Jeremy Robinson", + "Johnny Guo Xiao", "Kiren Li", "Leon Wang", - "Martin Zhen" + "Martin Zhen", + "Michael Braley", + "Neo Yu", + "Robert Wang", + "Robin Lu" ] } ] @@ -4064,6 +4527,7 @@ { "title": "Programmers", "names": [ + "Caden Parker", "Eric Nguyen", "Kainin Tankersley", "Luke Mayo", @@ -4090,8 +4554,8 @@ { "title": "Dev Leads", "names": [ - "Stephen Chiavelli", - "Arend Danielek" + "Arend Danielek", + "Stephen Chiavelli" ] }, { @@ -4126,13 +4590,12 @@ "Christopher Kohnert", "Dane Curbow", "Dylan Washburne", - "Sapphira Riza", "Grant Wynn", "Joshua Claeys", - "Kyle Schwaneke", "Lorenzo DeMaine", "Ryan Davison", "Ryota Dan", + "Sapphira Riza", "Tim Royal", "Tyler Perry", "Zach Bowman", @@ -4149,15 +4612,10 @@ { "discipline": "", "titles": [ - { - "title": "Software Engineer", - "names": [ - "Anton Mateasik" - ] - }, { "title": "Software Engineers", "names": [ + "Anton Mateasik", "Martin Kusnier", "Milos Bazelides", "Vladimir Sisolak" @@ -4180,79 +4638,84 @@ { "discipline": "", "titles": [ - { - "title": "Quality Assurance", - "names": [ - "Lera Kirka", - "Jake Megrian" - ] - }, - { - "title": "Software Developers", - "names": [ - "Baktash Abdollah-Shamshir-saz", - "Cole Pollock", - "Cyro Paulino da Costa Jr", - "Eugene Kuznetsov", - "Guillermo Trejo Torres", - "Gursaanj Singh Bajaj", - "Jacob Jensen", - "Mitch Filmer", - "Russell Gillette", - "Sean Siemens", - "Supriya Singh", - "William Sherif", - "Yang Zhao", - "Yen-Chun Wang" - ] - }, { "title": "", "names": [ - "Ace Cheung", "Adam Bryant", "Adrian Smith", "Alex MacKay", "Alfonso Muñoz", "Alina Varela", "Amandeep Malhi", - "Ashlyn Gadow", + "Amy Liu", + "Amy Zhao", "Arta Seify", + "Ashlyn Gadow", + "Baktash Abdollah-Shamshir-saz", "Blair Hitchens", "Bren Lynne", + "Carsten Hooker", + "Casey White", "Chander Siddarth", "Chris Klassen", + "Chuan Shi Yu", + "Cody Clattenburg", + "Cole Pollock", + "Cyro Paulino da Costa Jr", + "Dan Wesley", "Dave MacLean", "David Getley", + "Dayna Cassidy", + "Dee Rueter", "Diana Jutras", + "Felipe Mauricio", "Gabriel J. Gonzalez", "Gary Shaw", "Gary Texmo", "Ghafur Remtulla", + "Gordon Tisher", "Graham Laverty", + "Graham Park", + "Guillermo Trejo Torres", + "Gursaanj Singh Bajaj", + "Gustav Louw", + "Hamza Khachan", "Hiren Amin", + "Houman Gholami", "Ilya Solnyshkin", + "Isaac Calon", + "Jacob Jensen", "Jagger Nast", + "Jai Kristjan", + "Jake Megrian", + "Jake Roman-Barnes", "Jason Allen", + "Jeffrey Chou", "Jeffrey Yamasaki", "Jesse Taylor", "Jessica Muniz", "Joel Stack", - "Jorge Amengol", "Jordan Pongracz", + "Jorge Amengol", + "Joseph Cameron", "Josue Pacheco", "Jun Luo", "Justin Moon", + "Kelsey Zirk", "Keven Nguyen", "Kevin Hsu", "Kris Morness", "Kyra Yung", + "Leonardo Stark", "Marc Faulise", "Marcel Brake", "Matheus Depra Gudergues", "Matt Klassen", + "Mauricio A. P. Burdelis", "Mitch Armstrong", "Mitch Dawdy", + "Mitch Filmer", + "Mitch Lockhart", "Oliver Cannon", "Olivia Chung", "Orhun Erkilic", @@ -4261,13 +4724,18 @@ "Pedro Kauti", "Peter Martin", "Peter Zhang", - "Pope Kim", "Piotr Wiacek", + "Pope Kim", "Prithiraj Ghosh", "Rex Bai", "Rey Brassard", + "Richard Hawkes", + "Rick Huang", "Rohit Moni", + "Ronald Ariel Kamanga", + "Russell Gillette", "Sam Martens", + "Sean Siemens", "Serge Lansiquot", "Shaun Foley", "Shiva Gupta", @@ -4275,15 +4743,19 @@ "Simon Gleizes", "Stefan Sarnev", "Steven Wong", + "Supriya Singh", "Thiago Braga", "Tim Bruecker", "Tim Hinds", "Tina Dhaliwal", - "Ting-Chun Sun", "Tom Baird", "Trevin Wong", + "Ty Lauriente", "Tyler Da Costa", "Vivian Ortenzi", + "William Sherif", + "Yang Zhao", + "Yen-Chun Wang", "Yuri Fomenko", "Zach Chan", "Zike Wu" @@ -4303,6 +4775,7 @@ "title": "Game Developers", "names": [ "Aishwarya Jayabal", + "Jagannathan Mannu", "Janani Senrayaperumal", "Maha Srinivasan", "Packiyanath Sivathanu", @@ -4311,50 +4784,80 @@ "Shanmugam Sanjay", "Sheena Mathew", "Sriram Sreenivasan", + "Subramani Ramanathan", "Sumit Kumar Suman", - "Vivek Kumar", - "Jagannathan Mannu", - "Subramani Ramanathan" + "Sumith Kumar", + "Uma Senthil Raj", + "Vignesh Masilamani", + "Vivek Kumar" ] }, { "title": "Services Developers", "names": [ - "Ganesh Sethy", - "Nandha Arulanandam", "Barani Dharan", "Brogan Irwin", - "Shanthi Kanchibhotla", - "Vasanth Kumar", + "Ganesh Sethy", "Jake Van Hyning", - "Mahesh Kumar Badam Venkata", - "Nathan VanHouten", "Keerthana Hariharan", - "Malliga Muthuraj", "Lenin Kumar", + "Mahesh Kumar Badam Venkata", + "Malliga Muthuraj", + "Nandha Arulanandam", + "Nathan VanHouten", + "Shanthi Kanchibhotla", + "Srinivasan Kandhallu Gnanamoorthy", "Tanmay Kamath", - "Srinivasan Kandhallu Gnanamoorthy" + "Vasanth Kumar" ] }, { "title": "Web Developers", "names": [ - "Nazia Nazia", - "Sripriya Gunasekaran", "Aravindan Aarumugam", + "Arockia Stanly", + "Nazia Nazia", "Rakshith Murthy", - "Arockia Stanly" + "Sripriya Gunasekaran" ] }, { "title": "Producers", "names": [ - "Swati S Thakar", - "Chokkalingam Ramu Kuppaswamy" + "Chokkalingam Ramu Kuppaswamy", + "Swati S Thakar" + ] + } + ] + } + ] + }, + { + "section": "Development Partner - Sprung Studios Ltd Alumni", + "disciplines": [ + { + "discipline": "", + "titles": [ + { + "title": "Senior UX/UI Designer II", + "names": [ + "Rebecca Williams" + ] + }, + { + "title": "UI Engineer", + "names": [ + "Praneil Kamat" + ] + }, + { + "title": "IT Support", + "names": [ + "Alex Chai" ] } ] } ] } -] \ No newline at end of file +] diff --git a/assets/minecraft/texts/splashes.txt b/assets/minecraft/texts/splashes.txt index b71e723f..69fdf672 100644 --- a/assets/minecraft/texts/splashes.txt +++ b/assets/minecraft/texts/splashes.txt @@ -53,7 +53,6 @@ Fat free! Absolutely no memes! Free dental! Ask your doctor! -Minors welcome! Cloud computing! Legal in Finland! Hard to label! @@ -273,7 +272,7 @@ From the streets of Södermalm! 150 bpm for 400000 minutes! Technologic! Funk soul brother! -Pumpa kungen! +Pumpakungen! 日本ハロー！ 한국 안녕하세요! Helo Cymru! @@ -369,7 +368,7 @@ Look mum, I'm in a splash! It came from space. Awesome game design right there! Ph1lza had a good run! -10 years of Mining and Crafting! +15 years of Mining and Crafting! Ping the human! In case it isn't obvious, foxes aren't players. Buzzy Bees! @@ -444,3 +443,8 @@ Has working bookshelves! Sniff sniff... Place hanging sign here Joule is neat too! +Music by Aaron Cherof! +Music by Kumi Tanioka! +Music by Amos Roddy! +Flint and Steel! +Chicken Jockey! diff --git a/assets/minecraft/textures/block/acacia_door_bottom.png b/assets/minecraft/textures/block/acacia_door_bottom.png index 7a88f773..9edcd7ff 100644 --- a/assets/minecraft/textures/block/acacia_door_bottom.png +++ b/assets/minecraft/textures/block/acacia_door_bottom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c5c76cb20a697a0c902b22b51e47f06cc0943abcfb65db07dfed4713ea5e86cf -size 219 +oid sha256:b38b2d097cac0b7b08efa43045bba368abc4a3b190ccb2e594862766c5e1e8c2 +size 212 diff --git a/assets/minecraft/textures/block/acacia_door_top.png b/assets/minecraft/textures/block/acacia_door_top.png index 7577ae87..bf0abb9e 100644 --- a/assets/minecraft/textures/block/acacia_door_top.png +++ b/assets/minecraft/textures/block/acacia_door_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:36aa0eee8760e248342d73ec44d6a19b125d2c12949bfc72eb66c8365779456c -size 233 +oid sha256:2552920fee394ac3b6d165d5638bc84d2223374d8974bdd668bced3be16e5f3c +size 225 diff --git a/assets/minecraft/textures/block/acacia_leaves.png b/assets/minecraft/textures/block/acacia_leaves.png index f1abcdbe..10f34442 100644 --- a/assets/minecraft/textures/block/acacia_leaves.png +++ b/assets/minecraft/textures/block/acacia_leaves.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e9578d4e462ca2865a6f8db3492a783705844d2748fb030a53e1964d664e9b57 -size 210 +oid sha256:682b0c06da3e0c462cecf0df741bd86ce3ce4857cf94c4189e11658d27261f98 +size 209 diff --git a/assets/minecraft/textures/block/acacia_log.png b/assets/minecraft/textures/block/acacia_log.png index 25ad9617..b456ba1f 100644 --- a/assets/minecraft/textures/block/acacia_log.png +++ b/assets/minecraft/textures/block/acacia_log.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3761f4cfc02c88215da85259a2069f7ac43ab647f100fd68a94a22af7c209f9d -size 193 +oid sha256:cdf7c1971c2bb95e4ddfdb6b53bd0be69a341415e43030629bb4c72b339b83c1 +size 191 diff --git a/assets/minecraft/textures/block/acacia_log_top.png b/assets/minecraft/textures/block/acacia_log_top.png index de340c82..8427f809 100644 --- a/assets/minecraft/textures/block/acacia_log_top.png +++ b/assets/minecraft/textures/block/acacia_log_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:31d0c54f61b5829cc725f5ddf7c4017acd8f99b368a7339d61e9d74ea89324fb -size 243 +oid sha256:eb28d69bc1503d3c46c751fa03cc35400c8cfd262ddfc54b8d272425cef7c298 +size 218 diff --git a/assets/minecraft/textures/block/acacia_sapling.png b/assets/minecraft/textures/block/acacia_sapling.png index 31706212..8caf7a4e 100644 --- a/assets/minecraft/textures/block/acacia_sapling.png +++ b/assets/minecraft/textures/block/acacia_sapling.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f0eddf27ea5cb34775c53b29caf004a49ea85d4e08a63cd6d7cfa27c930c08b -size 204 +oid sha256:b90c4c1982194a950b3f70d790d85854f74ed3c228d0271aa6d78e6ea1b4599d +size 187 diff --git a/assets/minecraft/textures/block/activator_rail_on.png b/assets/minecraft/textures/block/activator_rail_on.png index 31e15f7e..fca4a34b 100644 --- a/assets/minecraft/textures/block/activator_rail_on.png +++ b/assets/minecraft/textures/block/activator_rail_on.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a9a7e8696da1ebd9fedf80c6a9f7492c073026dc2f54614a21cc6f28b290eb39 -size 243 +oid sha256:6b0664ee8c16530356fa4bf7eb375514e43ac030b4de7d35d32072a22509e191 +size 242 diff --git a/assets/minecraft/textures/block/allium.png b/assets/minecraft/textures/block/allium.png index 3419ecea..d0460dd2 100644 --- a/assets/minecraft/textures/block/allium.png +++ b/assets/minecraft/textures/block/allium.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e821156d752c1cde84a71db59cdd25c308747c607c0759b72ba36a68e959ab7d -size 250 +oid sha256:b14b430af7e6dd487356a9a7d060d8e880fd7ae6f9cb91a570c2a7bce1536dbe +size 169 diff --git a/assets/minecraft/textures/block/amethyst_cluster.png b/assets/minecraft/textures/block/amethyst_cluster.png index 5538c787..9b7e4131 100644 --- a/assets/minecraft/textures/block/amethyst_cluster.png +++ b/assets/minecraft/textures/block/amethyst_cluster.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:96e6011d4f1f5ed50c0c16f90f99ec28ed287dc51e8e9f7db04bbc018356a7ce -size 215 +oid sha256:1dc3ee2f06ed48824d698bfa06de38e2f1d12dedd5f5f5e2956abc8e620e6918 +size 202 diff --git a/assets/minecraft/textures/block/ancient_debris_side.png b/assets/minecraft/textures/block/ancient_debris_side.png index a333003f..09e92aa6 100644 --- a/assets/minecraft/textures/block/ancient_debris_side.png +++ b/assets/minecraft/textures/block/ancient_debris_side.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b357286224a18b152312601f920f83939249b51d1229c9811e3e6aa8659ee57d -size 207 +oid sha256:413ee9be65cce2e401c0fba9e1d647b34757eb0fbe1050b03592641b49902d8e +size 200 diff --git a/assets/minecraft/textures/block/ancient_debris_top.png b/assets/minecraft/textures/block/ancient_debris_top.png index 079544d8..56b1c57b 100644 --- a/assets/minecraft/textures/block/ancient_debris_top.png +++ b/assets/minecraft/textures/block/ancient_debris_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:12c41056de502e7f8723367108143f7e386f3001b8c838234978d4e5be25676d -size 222 +oid sha256:8f21c800a0517e16be7a5ff79d46366a5499463fa96e8beedd5d962b937c6eef +size 207 diff --git a/assets/minecraft/textures/block/andesite.png b/assets/minecraft/textures/block/andesite.png index 83ef5522..090f0a7d 100644 --- a/assets/minecraft/textures/block/andesite.png +++ b/assets/minecraft/textures/block/andesite.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bc1fec2c9136bfe15f10dcc8fbd447d82c876c01342fedb5c7092291e89f50f0 -size 198 +oid sha256:7c7960dd3dd2084233907c1529dcbea0b8a2195fadaa608027f395b6f430fbd7 +size 196 diff --git a/assets/minecraft/textures/block/anvil_top.png b/assets/minecraft/textures/block/anvil_top.png index f04f29bf..48442b86 100644 --- a/assets/minecraft/textures/block/anvil_top.png +++ b/assets/minecraft/textures/block/anvil_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d5555ea400a6e4b60db3e938dc2ed970939ed2fbc0ec8d5104f169cbce8ebce1 -size 192 +oid sha256:757d6f79099583c159e3f95e9981efe0b16b524bed90739ae213142ad40fad26 +size 165 diff --git a/assets/minecraft/textures/block/attached_melon_stem.png b/assets/minecraft/textures/block/attached_melon_stem.png index f28a30f9..0b99350c 100644 --- a/assets/minecraft/textures/block/attached_melon_stem.png +++ b/assets/minecraft/textures/block/attached_melon_stem.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d8978c4bd0d31c77fe649ce107c10e27ef3aa1bdd1dd840bb670ee806ae9b509 -size 144 +oid sha256:e4d13c59148a817de5319b01a4439e79dcaf7aa31d7a49436968837f024f5ea0 +size 128 diff --git a/assets/minecraft/textures/block/attached_pumpkin_stem.png b/assets/minecraft/textures/block/attached_pumpkin_stem.png index 8abf1cf4..bcc91dee 100644 --- a/assets/minecraft/textures/block/attached_pumpkin_stem.png +++ b/assets/minecraft/textures/block/attached_pumpkin_stem.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:61f1257519f6655e1f08a9d1f13aff609e3834b8476c1b23b76f0c5feccfc04f -size 165 +oid sha256:7adee684e4aa1aa56560000129769bde2a6d74b305eed38b9075f9def71238d0 +size 128 diff --git a/assets/minecraft/textures/block/azalea_plant.png b/assets/minecraft/textures/block/azalea_plant.png index 2b3539c5..642b678d 100644 --- a/assets/minecraft/textures/block/azalea_plant.png +++ b/assets/minecraft/textures/block/azalea_plant.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9b9f6aa9210c7b47275698fee8ba2bd5d7e8b309ab685f97ecfde4a832836dea -size 248 +oid sha256:6c8ce38013e6ae0e3ebd7ecb712a53ce35b91bdd5bd382c7b627870690bcd51a +size 234 diff --git a/assets/minecraft/textures/block/azalea_side.png b/assets/minecraft/textures/block/azalea_side.png index 1541686f..ef09e83f 100644 --- a/assets/minecraft/textures/block/azalea_side.png +++ b/assets/minecraft/textures/block/azalea_side.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:479e13e478b18735b0f2622b498d2390ec012a3efdae5ead5cfae4bd29bcc38d -size 201 +oid sha256:dda7fa2de1ac92d112cf7df5fc0b82c544cb265d885c288c603abbda6c4cb497 +size 190 diff --git a/assets/minecraft/textures/block/azure_bluet.png b/assets/minecraft/textures/block/azure_bluet.png index 54b9506e..1a85cdd3 100644 --- a/assets/minecraft/textures/block/azure_bluet.png +++ b/assets/minecraft/textures/block/azure_bluet.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:193ecc37de69c45dad499a1703391fd71e137ae0fc3cc34c9352d9b0ec748f96 -size 247 +oid sha256:c7a05524e62b5b27b919270c64a8e3523d8dd01ae29f14863d721ed6807ff5ee +size 161 diff --git a/assets/minecraft/textures/block/bamboo_block.png b/assets/minecraft/textures/block/bamboo_block.png index dffd4dda..45c86571 100644 --- a/assets/minecraft/textures/block/bamboo_block.png +++ b/assets/minecraft/textures/block/bamboo_block.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:15521f47bc3cab94718810f2be7f0656d26cb57ac433526f3963f20a1afb231e -size 219 +oid sha256:d6d35f572a1942724db90ef47879574272f2d81eaee388de3a4e009be9487b82 +size 218 diff --git a/assets/minecraft/textures/block/bamboo_block_top.png b/assets/minecraft/textures/block/bamboo_block_top.png index 3f1ed694..02e34acd 100644 --- a/assets/minecraft/textures/block/bamboo_block_top.png +++ b/assets/minecraft/textures/block/bamboo_block_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f63c2a692f7817a7c229e115261f164d4f806439fbda1f5ae847c109d303e4c4 -size 166 +oid sha256:802a25c59a40126e00f6c7f56634f4cb369653eb9a15b72ad452f10c09540989 +size 162 diff --git a/assets/minecraft/textures/block/bamboo_door_bottom.png b/assets/minecraft/textures/block/bamboo_door_bottom.png index 47968bce..17c5e554 100644 --- a/assets/minecraft/textures/block/bamboo_door_bottom.png +++ b/assets/minecraft/textures/block/bamboo_door_bottom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6c91f9e2a7388b4a502ec5f1e6120aba1fee784b2b033fa72da6d0aef59824b6 -size 244 +oid sha256:07a38a693f5efaf6a28d1d924ccffe60d453ac55056088c5796777b82e73644c +size 231 diff --git a/assets/minecraft/textures/block/bamboo_door_top.png b/assets/minecraft/textures/block/bamboo_door_top.png index d3cad633..a1b82bee 100644 --- a/assets/minecraft/textures/block/bamboo_door_top.png +++ b/assets/minecraft/textures/block/bamboo_door_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4568e4c54b440005b8183f9dda7969359a73157a8bd86510e0a61ebfd6992cca -size 253 +oid sha256:90f8ca7ab7ade430a96fc176de2cfc4294a86136646fb82f24d2159997cfb2b6 +size 243 diff --git a/assets/minecraft/textures/block/bamboo_fence.png b/assets/minecraft/textures/block/bamboo_fence.png index aa0feded..eb2bbbe8 100644 --- a/assets/minecraft/textures/block/bamboo_fence.png +++ b/assets/minecraft/textures/block/bamboo_fence.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b82e5b109de7adc495cf3977a9bc6026bafe4686381c211b6a8c1ec28604ee80 -size 249 +oid sha256:a87792a033d194247b9aa81579ad6d7dba6b01201b7c34d0537446abfff6f0f8 +size 236 diff --git a/assets/minecraft/textures/block/bamboo_large_leaves.png b/assets/minecraft/textures/block/bamboo_large_leaves.png index bf0986e4..f93cb663 100644 --- a/assets/minecraft/textures/block/bamboo_large_leaves.png +++ b/assets/minecraft/textures/block/bamboo_large_leaves.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:576194bb2ae473fa336ee36f43f058575b4c89133b5aca165b6f6b757b77c0ca -size 255 +oid sha256:cc2abd5199cb8d480451042e4befeb4bef74a18787bf5ace197541be7f213675 +size 218 diff --git a/assets/minecraft/textures/block/bamboo_mosaic.png b/assets/minecraft/textures/block/bamboo_mosaic.png index 8e35d99e..a7408b0c 100644 --- a/assets/minecraft/textures/block/bamboo_mosaic.png +++ b/assets/minecraft/textures/block/bamboo_mosaic.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6f03dc54869f8691c8b6f04df06a2f8cf2436fdb29e9e64d9d8e72c11c9fee8a -size 230 +oid sha256:fd1f84c51173cdbc46579e01cc67ff9df9bdbbcbac53e86662ec447865a44dfe +size 219 diff --git a/assets/minecraft/textures/block/bamboo_planks.png b/assets/minecraft/textures/block/bamboo_planks.png index 7fe11406..8589e19e 100644 --- a/assets/minecraft/textures/block/bamboo_planks.png +++ b/assets/minecraft/textures/block/bamboo_planks.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0fd66fc81a0e7ffe5fbbbb03a297e46255bde0abdc9eac348846bbc60f9a11bd -size 225 +oid sha256:030e245c4bd4cd30e07b3195c2bd0593d8a123f4814b622a36ae060056b1c0cf +size 215 diff --git a/assets/minecraft/textures/block/bamboo_singleleaf.png b/assets/minecraft/textures/block/bamboo_singleleaf.png index 9e3f2fbe..f5f1ffdc 100644 --- a/assets/minecraft/textures/block/bamboo_singleleaf.png +++ b/assets/minecraft/textures/block/bamboo_singleleaf.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b5f0ad89435ba4abbdbbc8109a5a7f7c59aeffa46404942244381182bc257501 -size 138 +oid sha256:b78af32c0711b6075298566decc54abe77b0bd1deb088aa35e7944c74a9d40be +size 102 diff --git a/assets/minecraft/textures/block/bamboo_small_leaves.png b/assets/minecraft/textures/block/bamboo_small_leaves.png index 4f1a4527..b10b42bf 100644 --- a/assets/minecraft/textures/block/bamboo_small_leaves.png +++ b/assets/minecraft/textures/block/bamboo_small_leaves.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e732edbff7537cc3231be6ada970c4ea5c91abe8874885e39c4107d2c22eb0ff -size 232 +oid sha256:ed2e3e82377fd6c6bce040e27c6a28ac651cb0e8c6db32a2344d185b1a243339 +size 185 diff --git a/assets/minecraft/textures/block/bamboo_stage0.png b/assets/minecraft/textures/block/bamboo_stage0.png index 6dee7099..d40d9146 100644 --- a/assets/minecraft/textures/block/bamboo_stage0.png +++ b/assets/minecraft/textures/block/bamboo_stage0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f17810c3ec29ad867d9caec6aa43ded7f9a7d856904d7abdc5bfeffe057318e6 -size 241 +oid sha256:eab8c20310c34f6008adba66978e4b690763a428dc1dc295642b29096438c4f5 +size 219 diff --git a/assets/minecraft/textures/block/bamboo_stalk.png b/assets/minecraft/textures/block/bamboo_stalk.png index 33079a5b..1a7eca4f 100644 --- a/assets/minecraft/textures/block/bamboo_stalk.png +++ b/assets/minecraft/textures/block/bamboo_stalk.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c490d62516aeda9565cd3f6471edbfa52f9b306879bc56b23d115eb9a2de2ad8 -size 203 +oid sha256:05f2e137b9777130a9d6417c8d1edd71f5ec1eb2001cd230d6986d20e65c8262 +size 197 diff --git a/assets/minecraft/textures/block/bamboo_trapdoor.png b/assets/minecraft/textures/block/bamboo_trapdoor.png index c28e655e..ffd2ce4a 100644 --- a/assets/minecraft/textures/block/bamboo_trapdoor.png +++ b/assets/minecraft/textures/block/bamboo_trapdoor.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:91436b21c28c5ab45f8edafb66914c97bf728cb32a143ec215a6881e94050d39 -size 261 +oid sha256:4b3fc966d9f9c5021a387519a1cee3fd53814d5605e5623b9aacb5930453f3dd +size 254 diff --git a/assets/minecraft/textures/block/barrel_bottom.png b/assets/minecraft/textures/block/barrel_bottom.png index dc4a613c..12ccd0a0 100644 --- a/assets/minecraft/textures/block/barrel_bottom.png +++ b/assets/minecraft/textures/block/barrel_bottom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4391b6198ce8a8195d72eed294dcc037c1a99590de3ea3f4ee3501a3bb961fb4 -size 214 +oid sha256:1addc57c6221210107b7e64db8d2756983458a14828d8eb85b61f13bbf5a1028 +size 210 diff --git a/assets/minecraft/textures/block/barrel_side.png b/assets/minecraft/textures/block/barrel_side.png index d95a49b3..3d56120f 100644 --- a/assets/minecraft/textures/block/barrel_side.png +++ b/assets/minecraft/textures/block/barrel_side.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a805eaf42d3bfff3fdd04b7e29ae1a8b10c8ac0aead2b171da505b17a22c66c1 -size 205 +oid sha256:30f31d8cecfbd44412af13983eee56220bcffbf7ce8dd5a948f1ab73c98d8dc8 +size 204 diff --git a/assets/minecraft/textures/block/barrel_top.png b/assets/minecraft/textures/block/barrel_top.png index 00b237b4..bc64a925 100644 --- a/assets/minecraft/textures/block/barrel_top.png +++ b/assets/minecraft/textures/block/barrel_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f128c7d5dd1efe6c858789ea35d617663f925b20a0d5104c66e36cd859adb7e1 -size 203 +oid sha256:6b4cb64b1c34bd87225147479100bec9889ac69c7dcdb5694003248e3004fe1e +size 182 diff --git a/assets/minecraft/textures/block/barrel_top_open.png b/assets/minecraft/textures/block/barrel_top_open.png index 58aa0e79..f2411c80 100644 --- a/assets/minecraft/textures/block/barrel_top_open.png +++ b/assets/minecraft/textures/block/barrel_top_open.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:31e414576c0aac370e248edcc96f401a1aba1d506c4693adc47c2824d48012aa -size 193 +oid sha256:ca852462e7131d5410ca8ae65932f4b5a5452f80a428e7c0570fdb8c020e7326 +size 181 diff --git a/assets/minecraft/textures/block/beacon.png b/assets/minecraft/textures/block/beacon.png index 5d182bba..f7e6d938 100644 --- a/assets/minecraft/textures/block/beacon.png +++ b/assets/minecraft/textures/block/beacon.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dc3a8dcbb98f6aa619e6fb9ebb005ee2b6ae2adbf34367c3a9902850c55535f4 -size 198 +oid sha256:d42a2fbc58cd9953e0e921754a1b9254902eaa679f4f3d0120f266e0df795f4b +size 186 diff --git a/assets/minecraft/textures/block/bedrock.png b/assets/minecraft/textures/block/bedrock.png index f515f23f..30015b4e 100644 --- a/assets/minecraft/textures/block/bedrock.png +++ b/assets/minecraft/textures/block/bedrock.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:52f57443f329e53404c73c697ffd75770f1e2abf935a28315621fb0ca94b7571 -size 169 +oid sha256:a71e7dce773df8c797506296f58eca840e53ceb3319bc405af7e15e5c25551da +size 166 diff --git a/assets/minecraft/textures/block/bee_nest_bottom.png b/assets/minecraft/textures/block/bee_nest_bottom.png index 8e721dee..3ceade78 100644 --- a/assets/minecraft/textures/block/bee_nest_bottom.png +++ b/assets/minecraft/textures/block/bee_nest_bottom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aa641263066274fb68b7b8bffb5cde25f7713c4ef0717d4fd3558b6b947e03c2 -size 185 +oid sha256:114d2bc735562a774af4baed2bb9a38f52ac93f168ad426dceb1570624b00be0 +size 171 diff --git a/assets/minecraft/textures/block/bee_nest_front.png b/assets/minecraft/textures/block/bee_nest_front.png index 2b74655c..c8726f74 100644 --- a/assets/minecraft/textures/block/bee_nest_front.png +++ b/assets/minecraft/textures/block/bee_nest_front.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:90a6514c7320bd0b16eb1d0143785b423b05a3a88e5f7969341a276e527f3285 -size 237 +oid sha256:7997d770319c2633b0b1ee9ebd2d1faf3bc5cf6b2bffd6a7b026d5fd04d30dc7 +size 217 diff --git a/assets/minecraft/textures/block/bee_nest_front_honey.png b/assets/minecraft/textures/block/bee_nest_front_honey.png index a0dfc74d..1ef0b38a 100644 --- a/assets/minecraft/textures/block/bee_nest_front_honey.png +++ b/assets/minecraft/textures/block/bee_nest_front_honey.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f2e6f80fde4df2f0061baf31e84d81d2e910be371457ac558bf96c38372d5fc1 -size 249 +oid sha256:caac0c02f72e479b63221c77104dd4f8f0d5f6633fd773597c7f49959d3d84d0 +size 243 diff --git a/assets/minecraft/textures/block/bee_nest_side.png b/assets/minecraft/textures/block/bee_nest_side.png index a1cf8c61..9995c1bd 100644 --- a/assets/minecraft/textures/block/bee_nest_side.png +++ b/assets/minecraft/textures/block/bee_nest_side.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b7880fdaabb919e53eb1fe7454d7131da93d02a9316e4add9c3ba5eb83b6f944 -size 208 +oid sha256:1a8a7a167b619ab28547cafc10f57953fba76a7a1f75747ba205582774fced2a +size 193 diff --git a/assets/minecraft/textures/block/bee_nest_top.png b/assets/minecraft/textures/block/bee_nest_top.png index 58fdc6a9..ec8c8203 100644 --- a/assets/minecraft/textures/block/bee_nest_top.png +++ b/assets/minecraft/textures/block/bee_nest_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:52f0ba0e20122a8f0b58ea7eea1c52888247f2b1e71aed525e213ef7da877c3d -size 185 +oid sha256:94307946a8c0d4b8545d1d785bb2223396e9db3709029118a9e2fcbd8ae6be5d +size 171 diff --git a/assets/minecraft/textures/block/beehive_end.png b/assets/minecraft/textures/block/beehive_end.png index e80a7553..4b909ab4 100644 --- a/assets/minecraft/textures/block/beehive_end.png +++ b/assets/minecraft/textures/block/beehive_end.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1b8d07925775b1638ed50e0ee27c841c591f5643341f50efb81c5efd29c8f740 -size 181 +oid sha256:77597900866e30d111aa0cae909136d762a06c9d8284689c0c69e55df6fe7f55 +size 165 diff --git a/assets/minecraft/textures/block/beehive_front.png b/assets/minecraft/textures/block/beehive_front.png index a739f31b..3a95f769 100644 --- a/assets/minecraft/textures/block/beehive_front.png +++ b/assets/minecraft/textures/block/beehive_front.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:07392dcad8c8adb1fe34211118f10bb2a1e1e993243b940d5be4ae76fe9bec36 -size 207 +oid sha256:3d3fa761ee64d179fa1d29344e3eebbbcae609e2a8053421908dc854181b1dfa +size 192 diff --git a/assets/minecraft/textures/block/beehive_front_honey.png b/assets/minecraft/textures/block/beehive_front_honey.png index 7cbc019e..455ddb4d 100644 --- a/assets/minecraft/textures/block/beehive_front_honey.png +++ b/assets/minecraft/textures/block/beehive_front_honey.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b3eb56b258da6116462a09d7f0c3328a062faeaa72e1580c5e26dd4bcf5d89c0 -size 243 +oid sha256:ff4ecedc9039b9579811d855a9188f22e00799708f940883fb4a2306950b15ec +size 226 diff --git a/assets/minecraft/textures/block/beehive_side.png b/assets/minecraft/textures/block/beehive_side.png index 810d66d1..b5505857 100644 --- a/assets/minecraft/textures/block/beehive_side.png +++ b/assets/minecraft/textures/block/beehive_side.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:73d1e98ec3ece436a9edcfe9e2089bd14b0a15c63dcb04a9104df42c5753d2e7 -size 207 +oid sha256:db5aea136601a620f92acbe52c567d716bc7262f4142a3b43e6e09736927ca5c +size 187 diff --git a/assets/minecraft/textures/block/beetroots_stage0.png b/assets/minecraft/textures/block/beetroots_stage0.png index 278a8ac5..557d73b5 100644 --- a/assets/minecraft/textures/block/beetroots_stage0.png +++ b/assets/minecraft/textures/block/beetroots_stage0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eaf394710b9f274b63054914aa1ebd8b0bf73b69f2b160f4a00581f5727d56aa -size 118 +oid sha256:4549bb303e3db9a21771425c6e0103fcd754ed7918e5f8fb6f18d4bec30a13c8 +size 116 diff --git a/assets/minecraft/textures/block/beetroots_stage2.png b/assets/minecraft/textures/block/beetroots_stage2.png index a02ac08f..f6c4cab6 100644 --- a/assets/minecraft/textures/block/beetroots_stage2.png +++ b/assets/minecraft/textures/block/beetroots_stage2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b899881e890f46d96362ba0f657b75b4b4a88a0a377636470d29245f6ca3e004 -size 180 +oid sha256:51770ca5e0a0cc78ca68fc07034b404f22644aa6bc17de97f5b92103e64874d9 +size 170 diff --git a/assets/minecraft/textures/block/beetroots_stage3.png b/assets/minecraft/textures/block/beetroots_stage3.png index 4f658928..09b01607 100644 --- a/assets/minecraft/textures/block/beetroots_stage3.png +++ b/assets/minecraft/textures/block/beetroots_stage3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3cfc3b91dd1c5e00c916898443fdf421444535e1082df22aaa175f4b1e1ea9fd -size 200 +oid sha256:5c881406a15001174fcbdadd89a342be02985333438420d18b7cdc1b1f493cec +size 190 diff --git a/assets/minecraft/textures/block/big_dripleaf_stem.png b/assets/minecraft/textures/block/big_dripleaf_stem.png index 34a3b4f8..f52ce388 100644 --- a/assets/minecraft/textures/block/big_dripleaf_stem.png +++ b/assets/minecraft/textures/block/big_dripleaf_stem.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9a59df8bd6a6db5bd37009a64f19758c9b6d68335c4b9d2d02cabe234ec25612 -size 182 +oid sha256:1287ead688ca30730508e79e043aa9a2015d928dde7bf3c725e1ebcd49d4f8a7 +size 173 diff --git a/assets/minecraft/textures/block/big_dripleaf_top.png b/assets/minecraft/textures/block/big_dripleaf_top.png index c4d0d7d7..5cfa925e 100644 --- a/assets/minecraft/textures/block/big_dripleaf_top.png +++ b/assets/minecraft/textures/block/big_dripleaf_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0eb3e4989ba7501b7035357db01bbcba211654d43c1fae72cef7b353c03a2b2f -size 214 +oid sha256:8f63aa6ce22e1e17427c625bf4cd3af3e3f06d05d739bb994a793a8aabe63125 +size 197 diff --git a/assets/minecraft/textures/block/birch_door_bottom.png b/assets/minecraft/textures/block/birch_door_bottom.png index e710b390..07b4b778 100644 --- a/assets/minecraft/textures/block/birch_door_bottom.png +++ b/assets/minecraft/textures/block/birch_door_bottom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5a0f57920a0c143dd056eac1d3f7f3c1b16bb718e9aeea28dd15141f68bef028 -size 234 +oid sha256:7bd6636532ffc21e9ecc7aa5fc8d975e9d5b4f2e2d32db2cb3c4d00115c29c70 +size 211 diff --git a/assets/minecraft/textures/block/birch_door_top.png b/assets/minecraft/textures/block/birch_door_top.png index c7bcc396..63036326 100644 --- a/assets/minecraft/textures/block/birch_door_top.png +++ b/assets/minecraft/textures/block/birch_door_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d798cbc8190a532abdfae102bfbded46760f65ab9a8175a944c00aa0ec9d5f7 -size 230 +oid sha256:48b63883ce9a4b4c72b437d5eb5c712f6b2b465ef1bbcb37a52dee9e30d0a4ea +size 208 diff --git a/assets/minecraft/textures/block/birch_leaves.png b/assets/minecraft/textures/block/birch_leaves.png index e88079b1..8a361cd2 100644 --- a/assets/minecraft/textures/block/birch_leaves.png +++ b/assets/minecraft/textures/block/birch_leaves.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:42ba8c5b9aaecef27ce17b730abd45ebebd8240811b78bb836088ed58e89c332 -size 198 +oid sha256:03ea357f700a55a3e830e9bd0264c8b0a6c2901e3d1d328808adc1c7c97cc330 +size 197 diff --git a/assets/minecraft/textures/block/birch_log.png b/assets/minecraft/textures/block/birch_log.png index 6a75d5df..9a7ad182 100644 --- a/assets/minecraft/textures/block/birch_log.png +++ b/assets/minecraft/textures/block/birch_log.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cebcca1885e46164bf028cb7d1c2df6cb391da0e792b3d9c99641577d0c8baaf -size 208 +oid sha256:81f2e40265758846858019a6b65b7617a205ac654dd2854b8b6cd31426e7c930 +size 206 diff --git a/assets/minecraft/textures/block/birch_log_top.png b/assets/minecraft/textures/block/birch_log_top.png index 42f46c87..9053b727 100644 --- a/assets/minecraft/textures/block/birch_log_top.png +++ b/assets/minecraft/textures/block/birch_log_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7127d988e865ddaa53faa23251b8703c3c4003d0f82f35489daee2a39a562c4e -size 239 +oid sha256:85f362f5c269af976a6b3dcea4130404b58687a7bbd963bc8c743a05817c8382 +size 218 diff --git a/assets/minecraft/textures/block/birch_planks.png b/assets/minecraft/textures/block/birch_planks.png index 4885828e..59bfc463 100644 --- a/assets/minecraft/textures/block/birch_planks.png +++ b/assets/minecraft/textures/block/birch_planks.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cdbfdcd32d0241c5c6c0179e323cc1a3198b5a86a2936f0553850ffbb9666797 -size 202 +oid sha256:e1559eaabbee0c1ea0fca983e3bcba1a188e0a29b6c25ea7d725651cc2569216 +size 195 diff --git a/assets/minecraft/textures/block/birch_sapling.png b/assets/minecraft/textures/block/birch_sapling.png index 7f767adf..5202150d 100644 --- a/assets/minecraft/textures/block/birch_sapling.png +++ b/assets/minecraft/textures/block/birch_sapling.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2d96c7b2f694569c5bf32045ea9ae42447aebe3e0d62619243c90cee619bd813 -size 196 +oid sha256:53d5061fd3004d1578fb97c20fc91abf4be54961d09ff53709fc100fcda92578 +size 185 diff --git a/assets/minecraft/textures/block/birch_trapdoor.png b/assets/minecraft/textures/block/birch_trapdoor.png index 55b34283..df243e4c 100644 --- a/assets/minecraft/textures/block/birch_trapdoor.png +++ b/assets/minecraft/textures/block/birch_trapdoor.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:77e234ea588f5d3396c15b9bc1bc737f156530e83f3b220aa6e7a6a2537f444d -size 248 +oid sha256:48e96dc1f95daee99412dc0724411c3671ab529658f00ca0aa66227ae30a3092 +size 221 diff --git a/assets/minecraft/textures/block/black_candle.png b/assets/minecraft/textures/block/black_candle.png index 539e7e78..956f4194 100644 --- a/assets/minecraft/textures/block/black_candle.png +++ b/assets/minecraft/textures/block/black_candle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:02020fd322e0545f4b07193f48c875953ce069a27d0241ffab4b07d139de5489 -size 127 +oid sha256:12e76d52487e6119aefc6a7c921d2ebcab7bbfc655b84a71bdf678225117aacb +size 117 diff --git a/assets/minecraft/textures/block/black_candle_lit.png b/assets/minecraft/textures/block/black_candle_lit.png index bc4ff7e6..43c24775 100644 --- a/assets/minecraft/textures/block/black_candle_lit.png +++ b/assets/minecraft/textures/block/black_candle_lit.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a3909c8162397a2789ecf06166a856d7bcad67edb4cb75ba843154659ade6b44 -size 136 +oid sha256:a9f5a4949161d2614b88ad94a13f01a528708f6dbb4c0625e4c0097951391a0d +size 135 diff --git a/assets/minecraft/textures/block/black_concrete_powder.png b/assets/minecraft/textures/block/black_concrete_powder.png index d57278ff..028f3a16 100644 --- a/assets/minecraft/textures/block/black_concrete_powder.png +++ b/assets/minecraft/textures/block/black_concrete_powder.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b7811e5cf02e21e902ae729fa54bd62cd0ed98e46e1198468310626f39921eb4 -size 480 +oid sha256:8c9df6213d21f5dad0a3df3c1d2f2eae1ead83c48041c01a46d05a36e9b9ec15 +size 476 diff --git a/assets/minecraft/textures/block/black_glazed_terracotta.png b/assets/minecraft/textures/block/black_glazed_terracotta.png index 70db50ab..3ebc7c7d 100644 --- a/assets/minecraft/textures/block/black_glazed_terracotta.png +++ b/assets/minecraft/textures/block/black_glazed_terracotta.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4b822051df2eed97e227143c5fcb4a7c6ea8b879dc8a9fee546d7f1af7d679c4 -size 285 +oid sha256:214ce8ca46c60a42b8863655b3895aca839c7ef7cfa511a192dc1974a0ca2758 +size 284 diff --git a/assets/minecraft/textures/block/black_shulker_box.png b/assets/minecraft/textures/block/black_shulker_box.png index c4fb4b85..95ec7f86 100644 --- a/assets/minecraft/textures/block/black_shulker_box.png +++ b/assets/minecraft/textures/block/black_shulker_box.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:612b8f01ae812ea702d3d990d2dc8bc7a0f8e86fa9163340c96c8f779a535624 -size 256 +oid sha256:38023c4e908dfdc0540cfe2a3f56b741cf69bc524f4d8d9ec6d056a08ddea064 +size 252 diff --git a/assets/minecraft/textures/block/black_stained_glass.png b/assets/minecraft/textures/block/black_stained_glass.png index 2140c4c4..c4ac4fc7 100644 --- a/assets/minecraft/textures/block/black_stained_glass.png +++ b/assets/minecraft/textures/block/black_stained_glass.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c05b4138b96551d63357ec3845911ef3848cbbd76957ac1aa1ae4003b113c75f -size 105 +oid sha256:62c705812949f0372dcc2fa82a5d89f7028ba1d9b3bd38765613e344f34f5b1c +size 100 diff --git a/assets/minecraft/textures/block/black_stained_glass_pane_top.png b/assets/minecraft/textures/block/black_stained_glass_pane_top.png index de05b838..504f7d6f 100644 --- a/assets/minecraft/textures/block/black_stained_glass_pane_top.png +++ b/assets/minecraft/textures/block/black_stained_glass_pane_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:69c870dcf258cf38c9c5074fce0d7f0d50b57c52a176734505adbe32dc3cb705 -size 114 +oid sha256:4d1ee0872f2233599df282cbff991455399dc726b1e98bba6f06b5836aa21eb2 +size 100 diff --git a/assets/minecraft/textures/block/black_terracotta.png b/assets/minecraft/textures/block/black_terracotta.png index 82e0e41b..043da92c 100644 --- a/assets/minecraft/textures/block/black_terracotta.png +++ b/assets/minecraft/textures/block/black_terracotta.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:22384ced217ef531cac2ed9bb3e6d8ecc4405525a1eede5308f861b9e807a3ec -size 334 +oid sha256:85f96e768a35ed127d0397c0df7412c54080428229f87dca0ee32b4bc7044a92 +size 327 diff --git a/assets/minecraft/textures/block/black_wool.png b/assets/minecraft/textures/block/black_wool.png index 52967964..8a863f94 100644 --- a/assets/minecraft/textures/block/black_wool.png +++ b/assets/minecraft/textures/block/black_wool.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ca2d4dc4ee191a3d49bf3ed4a097f0e817bbfd34d6b3424d12d54ad14c7f8ec4 -size 364 +oid sha256:8cefbc855a4ff04f6125ded6a69e8bd21144802fc466b179665c8c0203daffd9 +size 360 diff --git a/assets/minecraft/textures/block/blackstone.png b/assets/minecraft/textures/block/blackstone.png index 66e36619..c1c188f1 100644 --- a/assets/minecraft/textures/block/blackstone.png +++ b/assets/minecraft/textures/block/blackstone.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:99233c7c54210c813163833158dd631b0bb495c03db5d90aa2cd76be195f3678 -size 204 +oid sha256:8104d381f680eeb7d71a023aa056b593ef0855821538e435949c94b58033e7cb +size 202 diff --git a/assets/minecraft/textures/block/blackstone_top.png b/assets/minecraft/textures/block/blackstone_top.png index 1f4f5c19..26e9b5b7 100644 --- a/assets/minecraft/textures/block/blackstone_top.png +++ b/assets/minecraft/textures/block/blackstone_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:804caaa08dbf54590712ebb85286ab2af47903e256700d933022503d1b1a1c65 -size 195 +oid sha256:9eb9bce7a27defc49dd8a2b2dc74f4c7710dc3bbcaa5108a6c1193c82922935d +size 193 diff --git a/assets/minecraft/textures/block/blast_furnace_front.png b/assets/minecraft/textures/block/blast_furnace_front.png index 16f8aac3..1c89ebe5 100644 --- a/assets/minecraft/textures/block/blast_furnace_front.png +++ b/assets/minecraft/textures/block/blast_furnace_front.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:babfa1ba948634cb426e5f0076d6711f6a4a754869b629fbfb4187fea6a4e8c2 -size 266 +oid sha256:df580828cf9079059e167dc13b51713d8029cdcf0f0b20374367c71a805d7f62 +size 248 diff --git a/assets/minecraft/textures/block/blast_furnace_front_on.png b/assets/minecraft/textures/block/blast_furnace_front_on.png index dc293fdf..b88bc635 100644 --- a/assets/minecraft/textures/block/blast_furnace_front_on.png +++ b/assets/minecraft/textures/block/blast_furnace_front_on.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d5c62ced40c0d84564fffb696e79b7a7004756180fe84b4761a62aa5f914fe6f -size 286 +oid sha256:5363eaaf29c6cfed922c05fd4df9eaa7ef52b2d78ca56affda9ebf45ba33215d +size 283 diff --git a/assets/minecraft/textures/block/blast_furnace_side.png b/assets/minecraft/textures/block/blast_furnace_side.png index 62b2f53c..20fc3cdc 100644 --- a/assets/minecraft/textures/block/blast_furnace_side.png +++ b/assets/minecraft/textures/block/blast_furnace_side.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1dbd2fc36dffaf23b83557b2a57ced221d5b4feda3f2b5c7e08ccafa041eff91 -size 256 +oid sha256:2254b141bca1943258f66bca2ce34d4c7fb5f777d27cb2d5d8d9a4f0ad6f3ab7 +size 238 diff --git a/assets/minecraft/textures/block/blast_furnace_top.png b/assets/minecraft/textures/block/blast_furnace_top.png index 92f0c751..30fdd791 100644 --- a/assets/minecraft/textures/block/blast_furnace_top.png +++ b/assets/minecraft/textures/block/blast_furnace_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6bd2cac0544d82d79f892ec131ffa77f446c35bc46cea87ac1959f1bae5cfefb -size 204 +oid sha256:003c4e4c615a20a7f0ba48baf0e9cf3bae55b6a2a387d34e0cff9958aa2420c0 +size 187 diff --git a/assets/minecraft/textures/block/blue_candle.png b/assets/minecraft/textures/block/blue_candle.png index 8198ffe7..799c6c6a 100644 --- a/assets/minecraft/textures/block/blue_candle.png +++ b/assets/minecraft/textures/block/blue_candle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3039e6bcdc7f3342d9293765ea9f1fefab91ea251f40747fd298102c0cd3b740 -size 128 +oid sha256:89d8c9d6eb68632633fadeedffa3842131fdb901ebfc4ca6246cd59f8a1e3418 +size 118 diff --git a/assets/minecraft/textures/block/blue_concrete.png b/assets/minecraft/textures/block/blue_concrete.png index 05b050d4..b69de58b 100644 --- a/assets/minecraft/textures/block/blue_concrete.png +++ b/assets/minecraft/textures/block/blue_concrete.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:02e4177ac67b4cb29c8ebbcdc7ba1980acac9f9c3f83c119bccb839b48cb983f -size 172 +oid sha256:54eea9be4c801ed6206fdb79fab7711185e5dcda5ccf5251871013ce14d1da33 +size 171 diff --git a/assets/minecraft/textures/block/blue_concrete_powder.png b/assets/minecraft/textures/block/blue_concrete_powder.png index 2938d89b..ab467715 100644 --- a/assets/minecraft/textures/block/blue_concrete_powder.png +++ b/assets/minecraft/textures/block/blue_concrete_powder.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:45cac30cee63a9d701887e7e978ae0a65a5a18008c326b57b84d8955e62d60b1 -size 608 +oid sha256:6ae85f071c9d8e25c99d48d8e8bd410170c19291b9b8f574185f3ab950cedff3 +size 605 diff --git a/assets/minecraft/textures/block/blue_glazed_terracotta.png b/assets/minecraft/textures/block/blue_glazed_terracotta.png index fda76ab9..2545d411 100644 --- a/assets/minecraft/textures/block/blue_glazed_terracotta.png +++ b/assets/minecraft/textures/block/blue_glazed_terracotta.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:efded0cf2afe652323ec654b4fbfb17eb5d0f64c4034ca36dc5c8b5d72ca907f -size 202 +oid sha256:82716fc13dffde28bf422a91bf8d24cfc0451e361208fe8d695c3bf6b9fa3f6a +size 198 diff --git a/assets/minecraft/textures/block/blue_ice.png b/assets/minecraft/textures/block/blue_ice.png index f1c0c32b..c2dd8da0 100644 --- a/assets/minecraft/textures/block/blue_ice.png +++ b/assets/minecraft/textures/block/blue_ice.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7170dfc70083df07ee61cd65aeaeb7add46c9d11397e401babc2a36d82599b07 -size 189 +oid sha256:6a9e9a3a604a935a6fadbea65434cff7a5677fa4cc3e7abe365d29969309211b +size 183 diff --git a/assets/minecraft/textures/block/blue_orchid.png b/assets/minecraft/textures/block/blue_orchid.png index c742456b..82150a4a 100644 --- a/assets/minecraft/textures/block/blue_orchid.png +++ b/assets/minecraft/textures/block/blue_orchid.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e15cea1035869808b16ab03efae88deeefd6dcaa859f9f647927739fd6e34436 -size 179 +oid sha256:e12e33fdf0f0482458d71add4de7887e43e6a1eef6b3186152c8befe7c98dee1 +size 176 diff --git a/assets/minecraft/textures/block/blue_shulker_box.png b/assets/minecraft/textures/block/blue_shulker_box.png index a7866049..8b93ac54 100644 --- a/assets/minecraft/textures/block/blue_shulker_box.png +++ b/assets/minecraft/textures/block/blue_shulker_box.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:862f7819e1b175c396b0bb9aacc8234f807212e5c2d5d86db9a2539bc52f86cc -size 277 +oid sha256:72fdc97a3dffa0af96f7c64f835e390fccbb1864a6f679402e7facf9f46760c3 +size 272 diff --git a/assets/minecraft/textures/block/blue_stained_glass.png b/assets/minecraft/textures/block/blue_stained_glass.png index 2c3917a1..85d02551 100644 --- a/assets/minecraft/textures/block/blue_stained_glass.png +++ b/assets/minecraft/textures/block/blue_stained_glass.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e5a10997341d041c091cd6bd7fdc150a18e510075bf2803d79540bd8c620290 -size 134 +oid sha256:7d6cfe98ddc5d975b3bcf5f9cffc008f90db94d5d981ef440f7b68e8267ae247 +size 106 diff --git a/assets/minecraft/textures/block/blue_stained_glass_pane_top.png b/assets/minecraft/textures/block/blue_stained_glass_pane_top.png index 12db76a8..4f77d270 100644 --- a/assets/minecraft/textures/block/blue_stained_glass_pane_top.png +++ b/assets/minecraft/textures/block/blue_stained_glass_pane_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fc7facf745b2cd5dbdcf45bc5e001c8f725e37986fb893a1d73a4d6f9e24e1bf -size 120 +oid sha256:174206483bb73da9d657b341ed27cab16e019d8391c5b460d1651f15240e7979 +size 118 diff --git a/assets/minecraft/textures/block/blue_terracotta.png b/assets/minecraft/textures/block/blue_terracotta.png index a9703d9c..86bce368 100644 --- a/assets/minecraft/textures/block/blue_terracotta.png +++ b/assets/minecraft/textures/block/blue_terracotta.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:793604d49d52bf7a7bfa44b7f37479cf4a945be1d8b12a7cf57ed67149e67bbb -size 390 +oid sha256:99b4ec0a8a02a9d609d4987cbb7ba594a59f93c76b5fd98e3a1f12c2df1f9a70 +size 384 diff --git a/assets/minecraft/textures/block/blue_wool.png b/assets/minecraft/textures/block/blue_wool.png index 262b4c73..ef0861b5 100644 --- a/assets/minecraft/textures/block/blue_wool.png +++ b/assets/minecraft/textures/block/blue_wool.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d648659165a4b450323de777533b1c1eb3978655c967508bf8ecb6daff1e2854 -size 382 +oid sha256:2ca85a3e25a3ea9b0d8209edab2ab93f64e458d8c6baf8215536912159a6e2db +size 381 diff --git a/assets/minecraft/textures/block/bone_block_top.png b/assets/minecraft/textures/block/bone_block_top.png index a29da72f..dad0447d 100644 --- a/assets/minecraft/textures/block/bone_block_top.png +++ b/assets/minecraft/textures/block/bone_block_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:58375ebbea5933b4de41dc3360232883105d6ddba1777e34a19fc6b53e966b00 -size 194 +oid sha256:a78957c52f57fb337035896e1fe7482df2cd9c7c45f2af54810bdc5a1b88b726 +size 175 diff --git a/assets/minecraft/textures/block/bookshelf.png b/assets/minecraft/textures/block/bookshelf.png index 1131e650..1eae9369 100644 --- a/assets/minecraft/textures/block/bookshelf.png +++ b/assets/minecraft/textures/block/bookshelf.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a1c9dd1cdd60c60dbd285645af578e4e3f473704489ccab6d329071842f70197 -size 319 +oid sha256:cf2b8c0da8e7164162ad4991916492b724c62c31de6c18b2abb7d60ec19ba418 +size 304 diff --git a/assets/minecraft/textures/block/brain_coral.png b/assets/minecraft/textures/block/brain_coral.png index 5f2573fe..592dc44b 100644 --- a/assets/minecraft/textures/block/brain_coral.png +++ b/assets/minecraft/textures/block/brain_coral.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f25d1d0c2ede8452ca38830a55f8958a258f7bb35f2763387cb86660e9d948c5 -size 206 +oid sha256:8632880e9cd8142f3696c1b57c76c375476e414ab7b52c05dd12aca4790d8fe7 +size 192 diff --git a/assets/minecraft/textures/block/brain_coral_fan.png b/assets/minecraft/textures/block/brain_coral_fan.png index 224ecd9d..51194d97 100644 --- a/assets/minecraft/textures/block/brain_coral_fan.png +++ b/assets/minecraft/textures/block/brain_coral_fan.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:076ca0458b10e466a96e162b81ab059fbd25015933f8e6147241c8f418c53561 -size 188 +oid sha256:a89182e452582d3afc6a0d076f6cbe3e23b381ed149d27fa35b22caf7ed62059 +size 180 diff --git a/assets/minecraft/textures/block/brewing_stand.png b/assets/minecraft/textures/block/brewing_stand.png index 5dcb7128..6b7de2fb 100644 --- a/assets/minecraft/textures/block/brewing_stand.png +++ b/assets/minecraft/textures/block/brewing_stand.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6a6d6e28127131688bd90d829dccf0af457a327bf6402f2765429a25260cdff1 -size 285 +oid sha256:47c941652083abefb8ebed3f74ef8ae1c5616a2053d4e3c9a02e65aa6565be04 +size 279 diff --git a/assets/minecraft/textures/block/brewing_stand_base.png b/assets/minecraft/textures/block/brewing_stand_base.png index 920e8e25..3a2e3375 100644 --- a/assets/minecraft/textures/block/brewing_stand_base.png +++ b/assets/minecraft/textures/block/brewing_stand_base.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:799e4a57f39d91afb93c66beffbc0efb0a15ce6c3f2e27c3e2d9391f1b33d4fc -size 202 +oid sha256:952ed2f04d8f6074a3ec5a431fcb0915897e4278b2ce16feea081f57d649a75c +size 187 diff --git a/assets/minecraft/textures/block/brown_candle.png b/assets/minecraft/textures/block/brown_candle.png index f52fa18c..f133d718 100644 --- a/assets/minecraft/textures/block/brown_candle.png +++ b/assets/minecraft/textures/block/brown_candle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d75214414b58460b9fe50014dfa06594c75d7a9730004ae61ea7baeaeabb1a05 -size 127 +oid sha256:b923f8905020f4eb570ccdb64db501da283fcb2172751380d6c34089a810f8bb +size 117 diff --git a/assets/minecraft/textures/block/brown_candle_lit.png b/assets/minecraft/textures/block/brown_candle_lit.png index f05dd6db..a12895d5 100644 --- a/assets/minecraft/textures/block/brown_candle_lit.png +++ b/assets/minecraft/textures/block/brown_candle_lit.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:83c703fdbb811064c90d581a4deb92ca2c4eff17e8cf97edd3e8fc32c1178c65 -size 136 +oid sha256:5c50ccd019bc21bc8b4523f6987b6519455b358c5bece729c6fe807e89f1d89b +size 135 diff --git a/assets/minecraft/textures/block/brown_concrete.png b/assets/minecraft/textures/block/brown_concrete.png index db991081..b91d372e 100644 --- a/assets/minecraft/textures/block/brown_concrete.png +++ b/assets/minecraft/textures/block/brown_concrete.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c5c9faa80b7d6da6ba02981ce9059ba602b24efe71092c9e25571273e40ba25f -size 176 +oid sha256:a616865ca284efd841d1e469ff9bf8a0ad692ad8219642aca3639c50224268b4 +size 173 diff --git a/assets/minecraft/textures/block/brown_concrete_powder.png b/assets/minecraft/textures/block/brown_concrete_powder.png index 6a19f0c4..c7657b8b 100644 --- a/assets/minecraft/textures/block/brown_concrete_powder.png +++ b/assets/minecraft/textures/block/brown_concrete_powder.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1c9fccc76ff77d1a812b06f374dfa9d7832c23849ae066e5ec894f84498b115e -size 612 +oid sha256:4e7474e8bc509adde998536859306ec4d641666be8adab273eb0f8b6397a24f0 +size 609 diff --git a/assets/minecraft/textures/block/brown_glazed_terracotta.png b/assets/minecraft/textures/block/brown_glazed_terracotta.png index d1c70e60..a8456825 100644 --- a/assets/minecraft/textures/block/brown_glazed_terracotta.png +++ b/assets/minecraft/textures/block/brown_glazed_terracotta.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:db595f490387e066397f615f60daafe9cc30db2cf9d133e84139934fb3b04f30 -size 269 +oid sha256:f3f2d5225a5b89e4587f77c25b0ab9851d90a20cc9f4cc1c525b31f4fe1e06c3 +size 256 diff --git a/assets/minecraft/textures/block/brown_mushroom.png b/assets/minecraft/textures/block/brown_mushroom.png index c287fa54..6aa278ea 100644 --- a/assets/minecraft/textures/block/brown_mushroom.png +++ b/assets/minecraft/textures/block/brown_mushroom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a7e9990f39be45a2f09c0e4b690ee04cf72930e924a3abf5e615153b8d1af931 -size 139 +oid sha256:2726ed1eb5c0e2c6a0ffee0296aeb78bf23b28f7da4eed7b0b717544cac4a0c5 +size 138 diff --git a/assets/minecraft/textures/block/brown_shulker_box.png b/assets/minecraft/textures/block/brown_shulker_box.png index 2a501c7c..ccc9359b 100644 --- a/assets/minecraft/textures/block/brown_shulker_box.png +++ b/assets/minecraft/textures/block/brown_shulker_box.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a6d4a3439db75d6b8931736bc537064f70499b6d9a744f7429f9ed5e7f5c8b75 -size 285 +oid sha256:69d6fee1f3b4d345f92144ffadc3217c659b87cac695b51499ae64151e26a434 +size 282 diff --git a/assets/minecraft/textures/block/brown_stained_glass_pane_top.png b/assets/minecraft/textures/block/brown_stained_glass_pane_top.png index a977bdab..3872ece6 100644 --- a/assets/minecraft/textures/block/brown_stained_glass_pane_top.png +++ b/assets/minecraft/textures/block/brown_stained_glass_pane_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0593bd7434b5b935ce5553fbac1d5c61e8e80de448946208cd3bc6e56ab9874b -size 119 +oid sha256:d2ff4fa371397877927718d509dcb0f4a5cdebdb6248baff2b9eb01876f7039d +size 117 diff --git a/assets/minecraft/textures/block/brown_terracotta.png b/assets/minecraft/textures/block/brown_terracotta.png index c6424e26..8e1adfb7 100644 --- a/assets/minecraft/textures/block/brown_terracotta.png +++ b/assets/minecraft/textures/block/brown_terracotta.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:88f43c0d3544385de2d0ea4b45654394ea37c592d83d04943d47ab18dc1b58b5 -size 385 +oid sha256:e162788c4a41a06711dcef4572ca4f4dfee090463fdd0d523ff98d00458b1daf +size 353 diff --git a/assets/minecraft/textures/block/bubble_coral.png b/assets/minecraft/textures/block/bubble_coral.png index 303953af..72f578e1 100644 --- a/assets/minecraft/textures/block/bubble_coral.png +++ b/assets/minecraft/textures/block/bubble_coral.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5bc0a0c318ad17c367aaa2003a55255e3ff94bfd6f07af5f1f83db8c371ce305 -size 196 +oid sha256:d0dcac588c87409fef51c5e37e998cbe16aa689325c960de59b701bafeb33d4a +size 188 diff --git a/assets/minecraft/textures/block/bubble_coral_block.png b/assets/minecraft/textures/block/bubble_coral_block.png index ea6a086d..285e6eff 100644 --- a/assets/minecraft/textures/block/bubble_coral_block.png +++ b/assets/minecraft/textures/block/bubble_coral_block.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7702b8e91c72c6abf1b45ba39e924887300d3faf6876d96a3f5adbff7373e826 -size 201 +oid sha256:15a05b5fe7556c665eff345088991f64283a331ca4ea79f3eafe6ea6848df2ad +size 198 diff --git a/assets/minecraft/textures/block/bubble_coral_fan.png b/assets/minecraft/textures/block/bubble_coral_fan.png index 90804041..9d7f9eec 100644 --- a/assets/minecraft/textures/block/bubble_coral_fan.png +++ b/assets/minecraft/textures/block/bubble_coral_fan.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:27b714c2dc1906d94ce1ac98981f5bc978d6f6ab02f2b0790d831359aa8d6cf2 -size 178 +oid sha256:74e862871ff699dda971a3fb683205c499aac754dc9e13380e4df88d9dee29bd +size 170 diff --git a/assets/minecraft/textures/block/budding_amethyst.png b/assets/minecraft/textures/block/budding_amethyst.png index a9db1eef..ca6e4bf5 100644 --- a/assets/minecraft/textures/block/budding_amethyst.png +++ b/assets/minecraft/textures/block/budding_amethyst.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9b708a170d41ddbcd5b3fbc4a0b11fbaccf2730c6503f542b8ab494c1e13f6f4 -size 237 +oid sha256:1370de704ca64a39dac879f538739d4b814ef783de33b825d794105037464bba +size 220 diff --git a/assets/minecraft/textures/block/bush.png b/assets/minecraft/textures/block/bush.png index 7d8d0577..96053f2a 100644 --- a/assets/minecraft/textures/block/bush.png +++ b/assets/minecraft/textures/block/bush.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4749dab15dd8baccfb3eb295f0a7241175e02a8ec66c6ce4601337147974812f -size 198 +oid sha256:e7c45a573116132f68bbcb3b5a07f3ac6d5c370e75cb59ea7968eb17110e0874 +size 192 diff --git a/assets/minecraft/textures/block/cactus_bottom.png b/assets/minecraft/textures/block/cactus_bottom.png index aebc2e4a..89eef6a6 100644 --- a/assets/minecraft/textures/block/cactus_bottom.png +++ b/assets/minecraft/textures/block/cactus_bottom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:894c5af21ea5233fc3c67c6809ad1263bf143fca8484972845068bb678be54e2 -size 210 +oid sha256:141de5b159bfde2ca7ee78344b8a79aaa53507613ae312404b1349cb836560da +size 193 diff --git a/assets/minecraft/textures/block/cactus_flower.png b/assets/minecraft/textures/block/cactus_flower.png index 5416813e..abeded0c 100644 --- a/assets/minecraft/textures/block/cactus_flower.png +++ b/assets/minecraft/textures/block/cactus_flower.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ce712339cfeb510319c8f313bdb77fe42912b7c87eeab6e6faa1f70c74ace512 -size 182 +oid sha256:13c57e44a689ac82de92466d67f6ee0b8a2dca0fbb4159b46329d30b5084308d +size 176 diff --git a/assets/minecraft/textures/block/cactus_side.png b/assets/minecraft/textures/block/cactus_side.png index 6c757196..508e170b 100644 --- a/assets/minecraft/textures/block/cactus_side.png +++ b/assets/minecraft/textures/block/cactus_side.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1ee20b055746fde30c11e16eaedeef962c359df78fac4ba944d4e2d40df53888 -size 227 +oid sha256:9d7c4aa01b420bee766d65adc75465296b89aff426e19b8aded310654352cd6d +size 211 diff --git a/assets/minecraft/textures/block/cactus_top.png b/assets/minecraft/textures/block/cactus_top.png index 342a870f..70376c8e 100644 --- a/assets/minecraft/textures/block/cactus_top.png +++ b/assets/minecraft/textures/block/cactus_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f5f366dda4ec8bd6237c21517bcbc66a5e14013f146999d5f1367c09c7fc07f -size 219 +oid sha256:3bdf4d5e07f160ce10b220826fc877b7336fc38c4b97cf435bff53ff9f651410 +size 210 diff --git a/assets/minecraft/textures/block/cake_bottom.png b/assets/minecraft/textures/block/cake_bottom.png index ecf4096b..30920ac2 100644 --- a/assets/minecraft/textures/block/cake_bottom.png +++ b/assets/minecraft/textures/block/cake_bottom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a3e26256dc1b1901c8f583516d31e0c1589a5ffcf8f654ead5bbd21d61116dd9 -size 190 +oid sha256:39fdb08fa21fa2583498ff3ebfe310d4c7fd1e4313b78429ed885c4bf77d47cc +size 176 diff --git a/assets/minecraft/textures/block/cake_top.png b/assets/minecraft/textures/block/cake_top.png index 7a3dad90..72440549 100644 --- a/assets/minecraft/textures/block/cake_top.png +++ b/assets/minecraft/textures/block/cake_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b687b2401533f0f828deea33e1e567237579ac6f496119f6958acd8ff6b8f2e0 -size 213 +oid sha256:2d2866b25e4b3b32d9f36cd703a8a0f0e3a5d9559789db4a14fd3e7365e519ee +size 203 diff --git a/assets/minecraft/textures/block/calcite.png b/assets/minecraft/textures/block/calcite.png index 1e368ccf..1ca2eb02 100644 --- a/assets/minecraft/textures/block/calcite.png +++ b/assets/minecraft/textures/block/calcite.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e86f627a56d98168784b4f630c502f4490450072d763057a0bea3660ed84cf8f -size 201 +oid sha256:bf4d6a2d7e044fb5e17ba86b86e24df4f031e75df600bc0fa6aabb5377644cb9 +size 197 diff --git a/assets/minecraft/textures/block/calibrated_sculk_sensor_top.png b/assets/minecraft/textures/block/calibrated_sculk_sensor_top.png index 1c3b9dff..e0d0735d 100644 --- a/assets/minecraft/textures/block/calibrated_sculk_sensor_top.png +++ b/assets/minecraft/textures/block/calibrated_sculk_sensor_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f24ec12b3e05d927a3bef6640cd40526e5cd3b05f5bd04edb657d1cd21380b9 -size 204 +oid sha256:0776390f44b5a5305a1bbc8232bcbba2e29aff0790c9e8f45baf79008efabb15 +size 188 diff --git a/assets/minecraft/textures/block/campfire_fire.png b/assets/minecraft/textures/block/campfire_fire.png index 46a1ca6b..b07a7189 100644 --- a/assets/minecraft/textures/block/campfire_fire.png +++ b/assets/minecraft/textures/block/campfire_fire.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:35d5e013ec297d0ff2e09cac67a35d5228d6c36a8e9b70209f89e86db0a06542 -size 635 +oid sha256:7ffc0f0108876a0182e975cf268c389495bbcec13f0bb0608366c78c67c44b67 +size 611 diff --git a/assets/minecraft/textures/block/campfire_log.png b/assets/minecraft/textures/block/campfire_log.png index 5397c082..bc0a6a8f 100644 --- a/assets/minecraft/textures/block/campfire_log.png +++ b/assets/minecraft/textures/block/campfire_log.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f17e54bca739ad5e7b4bdf2f44f4e2f454658aae2a385acfaa0c5949e1693f42 -size 249 +oid sha256:f4975ec634736b79a21088c1f2b4cadd62d091a8f41b9c4fab309f7e8d5b2acc +size 244 diff --git a/assets/minecraft/textures/block/campfire_log_lit.png b/assets/minecraft/textures/block/campfire_log_lit.png index 1afc78df..44311580 100644 --- a/assets/minecraft/textures/block/campfire_log_lit.png +++ b/assets/minecraft/textures/block/campfire_log_lit.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dcb53ea93adf74b78df5c5b0a225f08e9e1419e7eb8f79c15db3cd1d35761c94 -size 519 +oid sha256:a870a5a9cb003ae390a6bb8121e8e183c2d6d703cefe120e74bfaac3029d993d +size 518 diff --git a/assets/minecraft/textures/block/candle.png b/assets/minecraft/textures/block/candle.png index 6310b14f..4459eb85 100644 --- a/assets/minecraft/textures/block/candle.png +++ b/assets/minecraft/textures/block/candle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:96a2809ec549473ba312312f343a40700a29cd7d4c5fb410a9abc86b156a0c40 -size 130 +oid sha256:b10145abf3bf6108a636a921ba49000e249dc4639b5f3cf8b14cbe5b71c289b6 +size 119 diff --git a/assets/minecraft/textures/block/candle_lit.png b/assets/minecraft/textures/block/candle_lit.png index d99cdbfd..d37b0064 100644 --- a/assets/minecraft/textures/block/candle_lit.png +++ b/assets/minecraft/textures/block/candle_lit.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f53c3452eacff0039ca6907039c22d9f0a31e7c16b5d95bbb9c9f7ce756202ba -size 135 +oid sha256:f171f47ba34573a11bf60c5c59476619dc3c77d685b892a84dca36e31adff56d +size 134 diff --git a/assets/minecraft/textures/block/carrots_stage0.png b/assets/minecraft/textures/block/carrots_stage0.png index 2743ce1d..e744b462 100644 --- a/assets/minecraft/textures/block/carrots_stage0.png +++ b/assets/minecraft/textures/block/carrots_stage0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3c3bb388d21f334d8b9882d8e4014799edd9120dad2565dc23fba3a1de03ac0e -size 102 +oid sha256:7e9c88b561c38562a84f115d30a0b9f91956b12b8a27f9c558609415a33e0ba0 +size 101 diff --git a/assets/minecraft/textures/block/carrots_stage2.png b/assets/minecraft/textures/block/carrots_stage2.png index 122ed3bd..839c62fd 100644 --- a/assets/minecraft/textures/block/carrots_stage2.png +++ b/assets/minecraft/textures/block/carrots_stage2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e920a27776f97b51c83e228849c76a60d0c4b156b00d59a867eaa0e4e5dbe039 -size 178 +oid sha256:24997077ba0832205292227a9699e867a8e26b37f61515b7308ebec13e3aa052 +size 171 diff --git a/assets/minecraft/textures/block/carrots_stage3.png b/assets/minecraft/textures/block/carrots_stage3.png index c7f11c83..2661f840 100644 --- a/assets/minecraft/textures/block/carrots_stage3.png +++ b/assets/minecraft/textures/block/carrots_stage3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6a5b6a44b3978e507f35f4ad9f92d897f60434492b8f75dbc68f4e614834ff15 -size 220 +oid sha256:89606fd0ea1495d99019afc0a2557a160b2e740c61f814d35639f9211f5c9f37 +size 206 diff --git a/assets/minecraft/textures/block/cartography_table_side1.png b/assets/minecraft/textures/block/cartography_table_side1.png index e5e675ef..00939a23 100644 --- a/assets/minecraft/textures/block/cartography_table_side1.png +++ b/assets/minecraft/textures/block/cartography_table_side1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:52407f1807dc834393bf14c5fe7f4395c8eb80ddc28244dbee63e4e62424f4ab -size 273 +oid sha256:225ada9b2a86ffd3d261179170a9533498c503f43c4fa537fde14a3f425aa0b5 +size 268 diff --git a/assets/minecraft/textures/block/cartography_table_side2.png b/assets/minecraft/textures/block/cartography_table_side2.png index d47cb9d5..77822037 100644 --- a/assets/minecraft/textures/block/cartography_table_side2.png +++ b/assets/minecraft/textures/block/cartography_table_side2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c8cf456d21f252c5178d4a79c6a754eb57693cc3de1e94dce8aa074d02fab6ea -size 299 +oid sha256:684f86d2f816031385d95591176004f8cc8fee94fe547b0c404e2d5e724aaca5 +size 278 diff --git a/assets/minecraft/textures/block/cartography_table_top.png b/assets/minecraft/textures/block/cartography_table_top.png index ed8e7dc6..5d12c4ab 100644 --- a/assets/minecraft/textures/block/cartography_table_top.png +++ b/assets/minecraft/textures/block/cartography_table_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aed439298745595d507baca1152ed2586abb6fc25ad799b190c31db544aa6c0d -size 314 +oid sha256:5273a61b0f07d0c6f60937ebe3e1489836b1b4d0ecaace95a2e22fa243f6f3f0 +size 313 diff --git a/assets/minecraft/textures/block/carved_pumpkin.png b/assets/minecraft/textures/block/carved_pumpkin.png index 621a6d9d..c3da6fc4 100644 --- a/assets/minecraft/textures/block/carved_pumpkin.png +++ b/assets/minecraft/textures/block/carved_pumpkin.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:824da242f8c8ad4d7bd72b2e48230abcecb14a418fdbb93b18b8ad6151aa949a -size 221 +oid sha256:283c2bad988f950bf4dd9b2eefdd27dafe68d9775307b780b1c4890104e406dd +size 204 diff --git a/assets/minecraft/textures/block/cauldron_inner.png b/assets/minecraft/textures/block/cauldron_inner.png index cdea1b3f..65279400 100644 --- a/assets/minecraft/textures/block/cauldron_inner.png +++ b/assets/minecraft/textures/block/cauldron_inner.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a7e398c824f90fcb3b05b952a585fcaffc6272b5c90e43891d1e22164994c9d3 -size 165 +oid sha256:28bc729c234075ad5c375bd2bf9681f9a6f217119223a8910fd7b2b20e4a07eb +size 154 diff --git a/assets/minecraft/textures/block/cauldron_side.png b/assets/minecraft/textures/block/cauldron_side.png index 4a3c3563..d16f8b80 100644 --- a/assets/minecraft/textures/block/cauldron_side.png +++ b/assets/minecraft/textures/block/cauldron_side.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0d9eef4675538fa2f98c2c574cd42481549414c0d32e884680b29a6a46da7f26 -size 207 +oid sha256:242bbae92fffcc53261ce31777d5bd1c800e31834ffc2fefd5a75330287890ec +size 189 diff --git a/assets/minecraft/textures/block/cauldron_top.png b/assets/minecraft/textures/block/cauldron_top.png index f372c3c3..0b565b01 100644 --- a/assets/minecraft/textures/block/cauldron_top.png +++ b/assets/minecraft/textures/block/cauldron_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0dbf4bf5c6afe3817d253f66fb9e11aab8f24f02a415ef73976b390a77de9a15 -size 203 +oid sha256:ca88e285e0903f6df2532975aafea261be19c638a6c5049bbc57b331ce8a7a9d +size 184 diff --git a/assets/minecraft/textures/block/cave_vines.png b/assets/minecraft/textures/block/cave_vines.png index 137b8801..525d6e90 100644 --- a/assets/minecraft/textures/block/cave_vines.png +++ b/assets/minecraft/textures/block/cave_vines.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cbe11e90f8aa22fbf15549732bef63c20aa9699e8426d4eceba5d2d9381e11b5 -size 238 +oid sha256:102a2725691436bb721e42c692f615c1035a81da3958d8718766bd18dffdd9a6 +size 222 diff --git a/assets/minecraft/textures/block/cave_vines_lit.png b/assets/minecraft/textures/block/cave_vines_lit.png index 04cf545c..57393215 100644 --- a/assets/minecraft/textures/block/cave_vines_lit.png +++ b/assets/minecraft/textures/block/cave_vines_lit.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:12206e002cae14c460baa15395f8bc32dec00b2669c7f2ba33d011fbb75e820f -size 248 +oid sha256:12c52ce43d666be83db0d3bd8e01ea9de1e6529ae5ee36d9f3d058f24fae5b00 +size 240 diff --git a/assets/minecraft/textures/block/cave_vines_plant.png b/assets/minecraft/textures/block/cave_vines_plant.png index bb0e1a81..cc4b86db 100644 --- a/assets/minecraft/textures/block/cave_vines_plant.png +++ b/assets/minecraft/textures/block/cave_vines_plant.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d6b2fd44803540da21313db78fb7ad6278ef438a22894d5459079b92fde55ad -size 241 +oid sha256:85fb79c512e159ffbeb7f9f412f5eaa1d725466975b728034267a0b3910f5606 +size 222 diff --git a/assets/minecraft/textures/block/cave_vines_plant_lit.png b/assets/minecraft/textures/block/cave_vines_plant_lit.png index 4cf1e4ce..858b739c 100644 --- a/assets/minecraft/textures/block/cave_vines_plant_lit.png +++ b/assets/minecraft/textures/block/cave_vines_plant_lit.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fa488f2009756a3435291d6313180e6e19d7231d22e9a7b77ebf7b7451f26687 -size 261 +oid sha256:8521c74a148da3266101aa6ef6e3e00da044b5d197ff9f30d9aa2a0ed651e62c +size 245 diff --git a/assets/minecraft/textures/block/chain_command_block_back.png b/assets/minecraft/textures/block/chain_command_block_back.png index 02b846f0..93dc382b 100644 --- a/assets/minecraft/textures/block/chain_command_block_back.png +++ b/assets/minecraft/textures/block/chain_command_block_back.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0efc00139d13e397e92c2cc8b9bcb8cfc8ba95738ef3e8dddbd4973a4817f2b4 -size 391 +oid sha256:ad51226233f957f66db0cf02976c8fbc4db10f328eb74e7f35b61e6900fba070 +size 378 diff --git a/assets/minecraft/textures/block/chain_command_block_conditional.png b/assets/minecraft/textures/block/chain_command_block_conditional.png index 3868e6a3..2f5199d7 100644 --- a/assets/minecraft/textures/block/chain_command_block_conditional.png +++ b/assets/minecraft/textures/block/chain_command_block_conditional.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:90cf14983df797d64c2f5283c3a150dbebfcea775caff1af5c1c53df9d7b6946 -size 360 +oid sha256:91a8080729717f13913368e8d2e87f00f98441783feb426564d8780a5cd6aad0 +size 353 diff --git a/assets/minecraft/textures/block/chain_command_block_front.png b/assets/minecraft/textures/block/chain_command_block_front.png index aff63f12..f3e6cc2d 100644 --- a/assets/minecraft/textures/block/chain_command_block_front.png +++ b/assets/minecraft/textures/block/chain_command_block_front.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:958aa52f640b0a852ae0c7c250f95f9e82c1fffaacb1c362cd2499064986ec9d -size 352 +oid sha256:bfcfe90ec9b7062930f0319cd1b5b377767383106b5c500767e0b3c0ebd622d8 +size 346 diff --git a/assets/minecraft/textures/block/chain_command_block_side.png b/assets/minecraft/textures/block/chain_command_block_side.png index 62e75a23..f3244445 100644 --- a/assets/minecraft/textures/block/chain_command_block_side.png +++ b/assets/minecraft/textures/block/chain_command_block_side.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5b3b61a804c0340924991aa3fadfef3e581e380f8599cc6da7b855c382ecbf8d -size 388 +oid sha256:506681489e5d74694ec004ebcf6827f7b3b2c4b20b1ed1862730ab1c126bb2e4 +size 378 diff --git a/assets/minecraft/textures/block/cherry_door_top.png b/assets/minecraft/textures/block/cherry_door_top.png index 8ecdabb5..1ad1691f 100644 --- a/assets/minecraft/textures/block/cherry_door_top.png +++ b/assets/minecraft/textures/block/cherry_door_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:93c50ff1404d73e740ebfa613ced5cde04974fb658299613416cf619511db9d8 -size 273 +oid sha256:9f81189ffe46f5a3fb31b89f5ae22b15c895920ee297fcce0bbc0e3f0654b47b +size 260 diff --git a/assets/minecraft/textures/block/cherry_leaves.png b/assets/minecraft/textures/block/cherry_leaves.png index f7ff41b1..81c63e07 100644 --- a/assets/minecraft/textures/block/cherry_leaves.png +++ b/assets/minecraft/textures/block/cherry_leaves.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0280f50c8daeed2b51b2cee8d94461fdc95aab74654c57d727323e49a76136ba -size 276 +oid sha256:c7cf3670f701e5983bd7c0f074baf999f8972d0dcdd7c16371551c652fd5e80a +size 265 diff --git a/assets/minecraft/textures/block/cherry_log.png b/assets/minecraft/textures/block/cherry_log.png index fa72b130..62541384 100644 --- a/assets/minecraft/textures/block/cherry_log.png +++ b/assets/minecraft/textures/block/cherry_log.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3e943f5cb0db486680c6cddaf688e9005c03c70732b5c6ed82aafb331033ad83 -size 183 +oid sha256:675b2bcd6bb6440bc768f47735e13446284c80e5c07e18177073bf3a75e4dd4d +size 181 diff --git a/assets/minecraft/textures/block/cherry_log_top.png b/assets/minecraft/textures/block/cherry_log_top.png index a71ccf1d..8f44507c 100644 --- a/assets/minecraft/textures/block/cherry_log_top.png +++ b/assets/minecraft/textures/block/cherry_log_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6462064932cf410017da2d68f63cfffe5f5732e7332daa4564c484890276d38e -size 230 +oid sha256:2b234001dcf8bdd5e23cc17cd5852440662d2ae87a287192d29f865619f0e2da +size 216 diff --git a/assets/minecraft/textures/block/cherry_planks.png b/assets/minecraft/textures/block/cherry_planks.png index af55e1bd..f3b59e81 100644 --- a/assets/minecraft/textures/block/cherry_planks.png +++ b/assets/minecraft/textures/block/cherry_planks.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:efbbc8ffdbe0d7803a2da0e350987d12390ad79c4eb375246d7115dcc904a436 -size 202 +oid sha256:46f93c17e9baae47e9a6b07b049255a94d72b2d4d74323384f9f72649f7be581 +size 195 diff --git a/assets/minecraft/textures/block/cherry_sapling.png b/assets/minecraft/textures/block/cherry_sapling.png index 64badaa4..25e0d7d1 100644 --- a/assets/minecraft/textures/block/cherry_sapling.png +++ b/assets/minecraft/textures/block/cherry_sapling.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eb9e0212b6938a385c5f9d9378299b348cf818c819ed65067d1cf1a1dddb468f -size 234 +oid sha256:0d3b30fc9222e2f61316467ad8222359f98a49d44b7d44eeedc9e712325b2982 +size 229 diff --git a/assets/minecraft/textures/block/cherry_trapdoor.png b/assets/minecraft/textures/block/cherry_trapdoor.png index 8307b17b..011a6b06 100644 --- a/assets/minecraft/textures/block/cherry_trapdoor.png +++ b/assets/minecraft/textures/block/cherry_trapdoor.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:161505e7e0c9abd2eb6f4d7eb73bff92652e8bedf8c080e8a502de54fb45c28d -size 257 +oid sha256:21180e8d199bc79d8bf95ae72af08dc4df3ae02519818b13b78ba91af580dc27 +size 246 diff --git a/assets/minecraft/textures/block/chipped_anvil_top.png b/assets/minecraft/textures/block/chipped_anvil_top.png index 6b5d7ccf..bc9e5823 100644 --- a/assets/minecraft/textures/block/chipped_anvil_top.png +++ b/assets/minecraft/textures/block/chipped_anvil_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:36418315ceec4ab8220f647268346a7ba97c7eddbbbe241aff687350c75958e9 -size 222 +oid sha256:e0def3d40af13091e54b3eaea7e18eb5deb62e8142365f32b689bc23ba34f5a9 +size 212 diff --git a/assets/minecraft/textures/block/chiseled_bookshelf_empty.png b/assets/minecraft/textures/block/chiseled_bookshelf_empty.png index 5c037cb5..a5e65125 100644 --- a/assets/minecraft/textures/block/chiseled_bookshelf_empty.png +++ b/assets/minecraft/textures/block/chiseled_bookshelf_empty.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7f43646c612a44e4a8ab531dceddbb87f97f6771bf5d05c38c9dcf4327ecff61 -size 202 +oid sha256:a756e5f993f698a566b73b24c0610b9832781d4a5f20358f38442b77d028841d +size 187 diff --git a/assets/minecraft/textures/block/chiseled_bookshelf_occupied.png b/assets/minecraft/textures/block/chiseled_bookshelf_occupied.png index 23a47bb4..c99ccaf9 100644 --- a/assets/minecraft/textures/block/chiseled_bookshelf_occupied.png +++ b/assets/minecraft/textures/block/chiseled_bookshelf_occupied.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a20a83a9aa472ca82629d475ec9f58f91006e651d58299bdc4f4503bd146dd54 -size 360 +oid sha256:a314c81a2dd8c3f14bec2428a0252322e6b37e95810d56316ac23c938540fb4e +size 357 diff --git a/assets/minecraft/textures/block/chiseled_bookshelf_side.png b/assets/minecraft/textures/block/chiseled_bookshelf_side.png index 0f1e5ce3..cc067539 100644 --- a/assets/minecraft/textures/block/chiseled_bookshelf_side.png +++ b/assets/minecraft/textures/block/chiseled_bookshelf_side.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a8159af1be95b1918063cda6eab3971cb7d3b93388256447c0b59d5cb658abfa -size 191 +oid sha256:254ffa60a5ed6bd0adb2e89dc09e8de2345c6c786ea58d92e1c400f168d2002d +size 174 diff --git a/assets/minecraft/textures/block/chiseled_bookshelf_top.png b/assets/minecraft/textures/block/chiseled_bookshelf_top.png index b274ea6a..f1ad2c7b 100644 --- a/assets/minecraft/textures/block/chiseled_bookshelf_top.png +++ b/assets/minecraft/textures/block/chiseled_bookshelf_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:06d90ee799e1d1419a7cfc2929864ba1d378538b751676140aa7197980160f8b -size 199 +oid sha256:59f74e2c723f21f37ec0965975169aaf1d9c3e4f712c52e616c9064017b5ad0a +size 187 diff --git a/assets/minecraft/textures/block/chiseled_copper.png b/assets/minecraft/textures/block/chiseled_copper.png index fd491cef..2fffd37b 100644 --- a/assets/minecraft/textures/block/chiseled_copper.png +++ b/assets/minecraft/textures/block/chiseled_copper.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c47a941defa3854a22804f5f655998bb7889436d6d9b38560e2732c4fc6f352d -size 213 +oid sha256:65385cd0c716c8285d1d4761b161dd4ef944a5a0f5131f6d2c0fdd96f6610d44 +size 206 diff --git a/assets/minecraft/textures/block/chiseled_deepslate.png b/assets/minecraft/textures/block/chiseled_deepslate.png index 828f530a..597bf7b6 100644 --- a/assets/minecraft/textures/block/chiseled_deepslate.png +++ b/assets/minecraft/textures/block/chiseled_deepslate.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e537542f8ffa02ed350216f479836ce5d1ee119e1870252b77d7d3e1344c5ee2 -size 199 +oid sha256:e3f5ccc1f293e9fb6720aa64f81372654f551b52b0cc369673d82b20225f40f2 +size 174 diff --git a/assets/minecraft/textures/block/chiseled_polished_blackstone.png b/assets/minecraft/textures/block/chiseled_polished_blackstone.png index 7d9561d2..50160efc 100644 --- a/assets/minecraft/textures/block/chiseled_polished_blackstone.png +++ b/assets/minecraft/textures/block/chiseled_polished_blackstone.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:18fbf32eb24e21febf59daf4cc25ffd2ec562bb315d601b615a909f921b86dce -size 196 +oid sha256:fa713a4d1d0269482764471949cc9feee2c35fc13c0309a9826b3602940ce82c +size 179 diff --git a/assets/minecraft/textures/block/chiseled_quartz_block.png b/assets/minecraft/textures/block/chiseled_quartz_block.png index 449cf49e..bd26ab96 100644 --- a/assets/minecraft/textures/block/chiseled_quartz_block.png +++ b/assets/minecraft/textures/block/chiseled_quartz_block.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:40767ed458089f10c46c7fff891e74afa5860201f6b9f3f264b1d697add48fe5 -size 204 +oid sha256:76644c96e0135d292058ac728ce07b60ea4b16ca8b9bcd41b30efb0c72a0745f +size 192 diff --git a/assets/minecraft/textures/block/chiseled_quartz_block_top.png b/assets/minecraft/textures/block/chiseled_quartz_block_top.png index a6199a1a..350a2947 100644 --- a/assets/minecraft/textures/block/chiseled_quartz_block_top.png +++ b/assets/minecraft/textures/block/chiseled_quartz_block_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f04fa86e81ac39c4f25474315c2ef446c36602ff6d901d29bf12c312f137fea0 -size 194 +oid sha256:86d86d5339f2779ba1095e2c16c87f9a5f00b7428bbd515ec637374780ea35b1 +size 191 diff --git a/assets/minecraft/textures/block/chiseled_red_sandstone.png b/assets/minecraft/textures/block/chiseled_red_sandstone.png index 92a6e310..08f1c2ed 100644 --- a/assets/minecraft/textures/block/chiseled_red_sandstone.png +++ b/assets/minecraft/textures/block/chiseled_red_sandstone.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b9930aebcba652e2d3e3336cff8d9234540e178e5ebc89b4a44f39703719a9d9 -size 211 +oid sha256:c8b2ab9dba37b91b2bacfd816aae2866603b6fe00fb64888e86b75e3a0b25f34 +size 197 diff --git a/assets/minecraft/textures/block/chiseled_sandstone.png b/assets/minecraft/textures/block/chiseled_sandstone.png index d218be6b..29056cd8 100644 --- a/assets/minecraft/textures/block/chiseled_sandstone.png +++ b/assets/minecraft/textures/block/chiseled_sandstone.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a599bcd6db806f930ba3f8661111ae34eed1eca4b958a0aa9ce640e1cb59f497 -size 208 +oid sha256:b83985fce4ec27112eddeb8759145198f77014cc7eceb81daa4390a9e1a5aafa +size 193 diff --git a/assets/minecraft/textures/block/chiseled_stone_bricks.png b/assets/minecraft/textures/block/chiseled_stone_bricks.png index e5f94de4..0a226f22 100644 --- a/assets/minecraft/textures/block/chiseled_stone_bricks.png +++ b/assets/minecraft/textures/block/chiseled_stone_bricks.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9de3cdfa63b9956058b6ef27cb82faa1bc11622a6b8145c12b0c7a2783a50b3b -size 206 +oid sha256:fbd59c309a861f63cfbb1f0f2348316d16bafa3bdd1ef81550357e1b5778df8f +size 198 diff --git a/assets/minecraft/textures/block/chiseled_tuff.png b/assets/minecraft/textures/block/chiseled_tuff.png index 73308755..76964a60 100644 --- a/assets/minecraft/textures/block/chiseled_tuff.png +++ b/assets/minecraft/textures/block/chiseled_tuff.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8c5593d5855170c38ebf12ac9e17441def2c617857236b8daaad7e186b70c4e8 -size 271 +oid sha256:8c11d0d65bc67e8d2017466f84fed6582940a73d7d6d29b73fa2aa5689065eed +size 202 diff --git a/assets/minecraft/textures/block/chiseled_tuff_bricks.png b/assets/minecraft/textures/block/chiseled_tuff_bricks.png index 10780ec0..9d74de54 100644 --- a/assets/minecraft/textures/block/chiseled_tuff_bricks.png +++ b/assets/minecraft/textures/block/chiseled_tuff_bricks.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fbf5e685213634a1e18f56cf2c2b500d0b0c0dd6e2a1a3a34b1e7895ff4e53e5 -size 208 +oid sha256:f45964ad925c2c27c4907c95f707d9322d8ddf4eba1b8f03f47c7ee225023563 +size 190 diff --git a/assets/minecraft/textures/block/chiseled_tuff_bricks_top.png b/assets/minecraft/textures/block/chiseled_tuff_bricks_top.png index 7cc98764..ed8a3d4c 100644 --- a/assets/minecraft/textures/block/chiseled_tuff_bricks_top.png +++ b/assets/minecraft/textures/block/chiseled_tuff_bricks_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:57842051d38040374056ff781436d23a6397e7f46a39836dc7e02896266bde10 -size 198 +oid sha256:c0918b0b5c3f3daa2f240f2b42b0fa786e17eb72c02fc79db300c0e41abd34ec +size 186 diff --git a/assets/minecraft/textures/block/chiseled_tuff_top.png b/assets/minecraft/textures/block/chiseled_tuff_top.png index 34e675f4..61086eb1 100644 --- a/assets/minecraft/textures/block/chiseled_tuff_top.png +++ b/assets/minecraft/textures/block/chiseled_tuff_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a7ca3a8118b1fb5cb03a234ba050f1aabe18566a41f1d2a5f5425e8893f508f5 -size 211 +oid sha256:76ea3e2c161cd44ce781fcf4bc065f091c2ffdf57bbb13e4fc1d679fab7ff6e2 +size 179 diff --git a/assets/minecraft/textures/block/chorus_flower.png b/assets/minecraft/textures/block/chorus_flower.png index 80cc9157..106d3ce6 100644 --- a/assets/minecraft/textures/block/chorus_flower.png +++ b/assets/minecraft/textures/block/chorus_flower.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1b6aadfc12424f4ade66593294413d7b4d583cd7c9928e64e9461b56cd9b8650 -size 257 +oid sha256:1513916d623ea4d40b351da2524b247b84f3da6ab62d9feb80c93edef3cca7dd +size 243 diff --git a/assets/minecraft/textures/block/chorus_flower_dead.png b/assets/minecraft/textures/block/chorus_flower_dead.png index 200efa3d..b910663b 100644 --- a/assets/minecraft/textures/block/chorus_flower_dead.png +++ b/assets/minecraft/textures/block/chorus_flower_dead.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f8303f620a7a5b3572cbc6eee62fc32352a58ba6cb6aa841f5fd402e4726ea61 -size 246 +oid sha256:5859b8f5546255ba6bc264d0d2a46851bc5d100446784b094f651aa5c8618abe +size 231 diff --git a/assets/minecraft/textures/block/clay.png b/assets/minecraft/textures/block/clay.png index 410a72b4..6895a8da 100644 --- a/assets/minecraft/textures/block/clay.png +++ b/assets/minecraft/textures/block/clay.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9684ba263ef0878ecdb5447cefc518c3f2509ab361b93f9851e9dbe3b8fcf855 -size 200 +oid sha256:b07491d561b5814961019829cc802a4ec5ad8cc66a9075572364eacc51350c58 +size 199 diff --git a/assets/minecraft/textures/block/closed_eyeblossom.png b/assets/minecraft/textures/block/closed_eyeblossom.png index 7cf73997..36031c51 100644 --- a/assets/minecraft/textures/block/closed_eyeblossom.png +++ b/assets/minecraft/textures/block/closed_eyeblossom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:581ecac12232a67e56a6becd110d7bd764ae7b40ab3e2d4f109ebd0030749989 -size 297 +oid sha256:54808a84618cfaa86a416fa5bb9d92a9320b7d0be724d41e6d42901ce1527c70 +size 165 diff --git a/assets/minecraft/textures/block/coal_block.png b/assets/minecraft/textures/block/coal_block.png index 2f4d259d..d2fbbe7a 100644 --- a/assets/minecraft/textures/block/coal_block.png +++ b/assets/minecraft/textures/block/coal_block.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4314b09718c2d53f477c41f1cf4ff23a7e8e048bf63e4e5f84addc049cc8ee81 -size 181 +oid sha256:4987dbd954475908df08f13e8114510285825fb8c189263317d4a0c1bf78b030 +size 177 diff --git a/assets/minecraft/textures/block/coal_ore.png b/assets/minecraft/textures/block/coal_ore.png index f9fbf795..88eebca4 100644 --- a/assets/minecraft/textures/block/coal_ore.png +++ b/assets/minecraft/textures/block/coal_ore.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5088136494a0109d597c1bcdce6f8ba74b4284703ee71a95f4134db03e7df5f2 -size 235 +oid sha256:a24553e4cb9cfe70aae48fdb19d8205736135551301dc9c16ecca842d8dd3ae3 +size 217 diff --git a/assets/minecraft/textures/block/coarse_dirt.png b/assets/minecraft/textures/block/coarse_dirt.png index 9b10d1d1..cdada000 100644 --- a/assets/minecraft/textures/block/coarse_dirt.png +++ b/assets/minecraft/textures/block/coarse_dirt.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:00f317cb04d7484982d4288c4f4ff5ab5c9f881e6940bbac05a84a02b09cb640 -size 503 +oid sha256:6889a193decb2c38cd8559456693c15192917c7b917d6ef9c3c2e142f7819ad4 +size 495 diff --git a/assets/minecraft/textures/block/cobweb.png b/assets/minecraft/textures/block/cobweb.png index 8ad1daa7..4e07e6cb 100644 --- a/assets/minecraft/textures/block/cobweb.png +++ b/assets/minecraft/textures/block/cobweb.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:409632826c6b942db77edc8828e3e04f56417e6004cc2e24331d3c1535a2a39f -size 183 +oid sha256:36642d7db5b1b214d71ea01aa4926eaf195af8ee6e5985c3f8ec354fcc1578c9 +size 182 diff --git a/assets/minecraft/textures/block/cocoa_stage1.png b/assets/minecraft/textures/block/cocoa_stage1.png index 9d38e68c..610bc95c 100644 --- a/assets/minecraft/textures/block/cocoa_stage1.png +++ b/assets/minecraft/textures/block/cocoa_stage1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1b9eb313ca2e7f99c88187bde311b3a15e31768b958b102ce6f76cfe3b2d33bb -size 182 +oid sha256:7a2d2eb0083e39e6da4e700dbfd7f4ec688ba3ecf720727faa431adfa348612b +size 177 diff --git a/assets/minecraft/textures/block/cocoa_stage2.png b/assets/minecraft/textures/block/cocoa_stage2.png index 452316a8..66596fff 100644 --- a/assets/minecraft/textures/block/cocoa_stage2.png +++ b/assets/minecraft/textures/block/cocoa_stage2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3a6fc098619340d66745ad0b21d0e561baf9ab500a418e302e8bc77274264ad9 -size 205 +oid sha256:deda13b75f4363a45ad35eec5fc0ea9b4887d64d68145d2d986cf4e586c63868 +size 202 diff --git a/assets/minecraft/textures/block/command_block_back.png b/assets/minecraft/textures/block/command_block_back.png index 9486b3b4..691e3ecd 100644 --- a/assets/minecraft/textures/block/command_block_back.png +++ b/assets/minecraft/textures/block/command_block_back.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:78105193ebca07de3d9ff27548de38656d3557d7b2dd84facd0e58e3d5203e54 -size 383 +oid sha256:e738f92f408595bc6b62d1575db88e3c007f8fcdc96ebca23140867490457018 +size 371 diff --git a/assets/minecraft/textures/block/command_block_conditional.png b/assets/minecraft/textures/block/command_block_conditional.png index 094404e5..2dbea725 100644 --- a/assets/minecraft/textures/block/command_block_conditional.png +++ b/assets/minecraft/textures/block/command_block_conditional.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f105dc29ff82e34a09fc185ad0c01d674e4ae0cfb3f5ef341e3b8e07580b49bd -size 343 +oid sha256:e903ac7d0218c38b62dd941d9ceb454a377d2ba23746bc05003c04b5c048782d +size 332 diff --git a/assets/minecraft/textures/block/command_block_front.png b/assets/minecraft/textures/block/command_block_front.png index 4b970edd..01ee7ccb 100644 --- a/assets/minecraft/textures/block/command_block_front.png +++ b/assets/minecraft/textures/block/command_block_front.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e46b813ab2800da1a5cf6181416b2ce1edb706e214592cbbe994925f3472669c -size 343 +oid sha256:cb1594f5b62e212cea5dc0b703e527343c1a8607e4ada7a277342552c6bed299 +size 336 diff --git a/assets/minecraft/textures/block/command_block_side.png b/assets/minecraft/textures/block/command_block_side.png index a626330a..0845a7c8 100644 --- a/assets/minecraft/textures/block/command_block_side.png +++ b/assets/minecraft/textures/block/command_block_side.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3eb1433272b66d6cf05897971a3ca74d77f14b1ae3f0658dba7d7ce10dc8664b -size 374 +oid sha256:fb934bc12b090ecf0a61c932342e5d5d72c26cf85f0d15499ff899e22c24dc5f +size 363 diff --git a/assets/minecraft/textures/block/comparator.png b/assets/minecraft/textures/block/comparator.png index 0e496093..5ee9ce88 100644 --- a/assets/minecraft/textures/block/comparator.png +++ b/assets/minecraft/textures/block/comparator.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f03ee0cabca19416013e97e46327f85faa51bf03ed4c235f6f99c61166a3e4e -size 242 +oid sha256:18ad6e6dbafce61514ab5b153a184ddb192bf16b5a00a820451071ec5d87eaa7 +size 228 diff --git a/assets/minecraft/textures/block/comparator_on.png b/assets/minecraft/textures/block/comparator_on.png index 00ff9539..b0f4d3c5 100644 --- a/assets/minecraft/textures/block/comparator_on.png +++ b/assets/minecraft/textures/block/comparator_on.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:54b9029d07054e21f6da6a63814bd1bdbf55608f51ac9f1d5fd7dd83e2f0ed5b -size 247 +oid sha256:82b959b23ad1cf682730641c1232a72d79ba98ebdd4aa6e75efcbc37a20fa44d +size 231 diff --git a/assets/minecraft/textures/block/composter_compost.png b/assets/minecraft/textures/block/composter_compost.png index 46af4e16..de5dd80e 100644 --- a/assets/minecraft/textures/block/composter_compost.png +++ b/assets/minecraft/textures/block/composter_compost.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:455b02c55575b7fe289c6397019e6f739708d1029c272ed028e9ed08f20e202b -size 192 +oid sha256:0b55d9976f580c746de6691d7445a591157e430784225496134ec3bf1e795a61 +size 189 diff --git a/assets/minecraft/textures/block/composter_side.png b/assets/minecraft/textures/block/composter_side.png index d03fe106..c0e2943e 100644 --- a/assets/minecraft/textures/block/composter_side.png +++ b/assets/minecraft/textures/block/composter_side.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3c028cf28f288e2eb0fd5468d54fcbea7d51edfffbe327cff9184019588ba19d -size 215 +oid sha256:de177e06f262bc3d1d2b506ec276ccf33459153ab868d55f0758736f7378038e +size 206 diff --git a/assets/minecraft/textures/block/conduit.png b/assets/minecraft/textures/block/conduit.png index 9d2588fe..133a9302 100644 --- a/assets/minecraft/textures/block/conduit.png +++ b/assets/minecraft/textures/block/conduit.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:63c97527a4d9539d180593eeb90ea82ef8fee46e409e09d18c2d3f4d2bf8a8f3 -size 205 +oid sha256:53587c945f4d94c5196753efb18e3e5c9ffb7bc19a4d9329a96fa811b6565221 +size 201 diff --git a/assets/minecraft/textures/block/copper_block.png b/assets/minecraft/textures/block/copper_block.png index edf44df8..d6649258 100644 --- a/assets/minecraft/textures/block/copper_block.png +++ b/assets/minecraft/textures/block/copper_block.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e5587b25d698a33eaa84b4f9faca00115cf91ff01e0340004c604913a1b2b22c -size 214 +oid sha256:1b0aaab59d19b4f909a9ac1208b02363bd2796637b10641a8b7cb0ed587c2aa7 +size 204 diff --git a/assets/minecraft/textures/block/copper_bulb.png b/assets/minecraft/textures/block/copper_bulb.png index 2eb7a7f2..4f13b0fa 100644 --- a/assets/minecraft/textures/block/copper_bulb.png +++ b/assets/minecraft/textures/block/copper_bulb.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d107b5d0a1bd7973e74ce35d3071abfc2489565f162e2c20626862ce87664bfb -size 242 +oid sha256:aae8d1c0ff540a9315ca80d520cf9a28531edbaeab52ced34d1dd96efd757b3c +size 215 diff --git a/assets/minecraft/textures/block/copper_bulb_lit.png b/assets/minecraft/textures/block/copper_bulb_lit.png index 83fe94d4..f4857cbb 100644 --- a/assets/minecraft/textures/block/copper_bulb_lit.png +++ b/assets/minecraft/textures/block/copper_bulb_lit.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f1a460ba570fe11fcac2c5c4a8fe96398278ca3dd1e8b2e7af9cfb215569c643 -size 243 +oid sha256:255257cc68b35b2c9cfa7d311876e9230549d5adf59ed7dfddc4abe465dfdb56 +size 218 diff --git a/assets/minecraft/textures/block/copper_bulb_lit_powered.png b/assets/minecraft/textures/block/copper_bulb_lit_powered.png index 7d1f37e3..b6f3e7cf 100644 --- a/assets/minecraft/textures/block/copper_bulb_lit_powered.png +++ b/assets/minecraft/textures/block/copper_bulb_lit_powered.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5a542acdf135a2f76ddc4f07c6aab24180119013604468ac7e6ee9453a99edaa -size 252 +oid sha256:be583f97bd5d1e5b0a8e77cc79d10a05327821af78e3b3253007919a9e106075 +size 228 diff --git a/assets/minecraft/textures/block/copper_bulb_powered.png b/assets/minecraft/textures/block/copper_bulb_powered.png index c8f6a2ce..b246e4fb 100644 --- a/assets/minecraft/textures/block/copper_bulb_powered.png +++ b/assets/minecraft/textures/block/copper_bulb_powered.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5ad61cca9403dfda82f633edf281adfa13f2642ff35c3def1a1729ef8b5f5c74 -size 257 +oid sha256:c85d0d02176ec77fc89221c50decd3bf6b2579d41432103ddb2b2c0119418268 +size 231 diff --git a/assets/minecraft/textures/block/copper_door_top.png b/assets/minecraft/textures/block/copper_door_top.png index 31134c32..e5b4cb29 100644 --- a/assets/minecraft/textures/block/copper_door_top.png +++ b/assets/minecraft/textures/block/copper_door_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3ef3f11ef647389c8d5a91808be7a16e417bdefb65d9c6e03a2374f0da4df195 -size 242 +oid sha256:d9babd455d4714ff303f1bd09173404d5a8f916c0d0c59753aea50cd2ef8d252 +size 225 diff --git a/assets/minecraft/textures/block/copper_grate.png b/assets/minecraft/textures/block/copper_grate.png index 0fa0a74e..3b3d2617 100644 --- a/assets/minecraft/textures/block/copper_grate.png +++ b/assets/minecraft/textures/block/copper_grate.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:814e8acf4ba262d1d84b154098b95a7b8f02a44d45030009b4f644fc8abdcf65 -size 243 +oid sha256:c704177ce251df01260937e301723ceadc29fb6f586ea669782cc7174aa32b72 +size 227 diff --git a/assets/minecraft/textures/block/copper_ore.png b/assets/minecraft/textures/block/copper_ore.png index d4e532b9..417724af 100644 --- a/assets/minecraft/textures/block/copper_ore.png +++ b/assets/minecraft/textures/block/copper_ore.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b83ac68ddccbd37b2fd61f80443e0c7b43fc5bbf9d33dec5b40a167fd0456ad6 -size 261 +oid sha256:3b102154c38a9cacb5f545b5102e2c09ec20e12830e6dfe5db88bdfd658b95f3 +size 242 diff --git a/assets/minecraft/textures/block/copper_trapdoor.png b/assets/minecraft/textures/block/copper_trapdoor.png index 324267dd..d6c9d4d3 100644 --- a/assets/minecraft/textures/block/copper_trapdoor.png +++ b/assets/minecraft/textures/block/copper_trapdoor.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4916deb3a2774a24a645350f0df3d991ba99fc012cf640a08f5cd15f2f1de4e1 -size 245 +oid sha256:d992e097952d4cb7f84529ed0546a4c8ec9bacc18c5f59b870811844db59f2f0 +size 234 diff --git a/assets/minecraft/textures/block/cracked_deepslate_bricks.png b/assets/minecraft/textures/block/cracked_deepslate_bricks.png index ba3fe8e1..88df3fb2 100644 --- a/assets/minecraft/textures/block/cracked_deepslate_bricks.png +++ b/assets/minecraft/textures/block/cracked_deepslate_bricks.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:041835e0cae9540cbc52936bf8a16e5ee0a247d94a3401de219ad25a08ba0d6d -size 222 +oid sha256:4460322cfce49b09da79db66c35cc7c910b89deacaa8f50452408fa05a1cbbdf +size 210 diff --git a/assets/minecraft/textures/block/cracked_deepslate_tiles.png b/assets/minecraft/textures/block/cracked_deepslate_tiles.png index 9b7ee173..a59292d5 100644 --- a/assets/minecraft/textures/block/cracked_deepslate_tiles.png +++ b/assets/minecraft/textures/block/cracked_deepslate_tiles.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8f6e4f1d72fb92ef453441fbb557fe3a5bc35b5661900192e8853aa22f32b146 -size 200 +oid sha256:e2e806edef42975ac2e97fadc6ea3cd6b3083e0cc51a7c4871264347204f1a92 +size 191 diff --git a/assets/minecraft/textures/block/cracked_nether_bricks.png b/assets/minecraft/textures/block/cracked_nether_bricks.png index 2f87930e..461919c3 100644 --- a/assets/minecraft/textures/block/cracked_nether_bricks.png +++ b/assets/minecraft/textures/block/cracked_nether_bricks.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e4d72096b6d64c111322abe482b13ec8d859fa85537dad25b26f16cb3122c982 -size 215 +oid sha256:1e5945e78cab90cc4a11b85f9b60d8a514911699781e99079d001c133e1d1b6c +size 206 diff --git a/assets/minecraft/textures/block/cracked_stone_bricks.png b/assets/minecraft/textures/block/cracked_stone_bricks.png index 0f9b575a..c6618e8c 100644 --- a/assets/minecraft/textures/block/cracked_stone_bricks.png +++ b/assets/minecraft/textures/block/cracked_stone_bricks.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:185b70d98bc6b1298fda8d6b7f52b0bfe0e8bb02711fd8d5e8bb581be69322a6 -size 214 +oid sha256:eb8ba94381d27de90102e3effd16fede4a78106120563b02caff4c2ee597f3a2 +size 204 diff --git a/assets/minecraft/textures/block/crafter_bottom.png b/assets/minecraft/textures/block/crafter_bottom.png index e6899d78..ae365f75 100644 --- a/assets/minecraft/textures/block/crafter_bottom.png +++ b/assets/minecraft/textures/block/crafter_bottom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b9e44b34ce868701d6493e07d6300dfec9bafaec9dac0bdc287538f1882f0983 -size 172 +oid sha256:42c78713a3cdb1f6d0980170461e237a004669126397a010798a05c36df0d1cd +size 171 diff --git a/assets/minecraft/textures/block/crafter_east.png b/assets/minecraft/textures/block/crafter_east.png index 504bda7e..7138b82f 100644 --- a/assets/minecraft/textures/block/crafter_east.png +++ b/assets/minecraft/textures/block/crafter_east.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c8aba9ecf4387fff6bfeda8bd2f29190c8a3036a4a36837a7548832733573cc9 -size 269 +oid sha256:61b9adce7595dfa399a1c162d5152aa3d35b86fee503ed13dd857a70249b3c32 +size 267 diff --git a/assets/minecraft/textures/block/crafter_east_crafting.png b/assets/minecraft/textures/block/crafter_east_crafting.png index 0964f539..00c70496 100644 --- a/assets/minecraft/textures/block/crafter_east_crafting.png +++ b/assets/minecraft/textures/block/crafter_east_crafting.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cc7f5c35faf9ae462e5408a050013e9615f7665e5ca0c4cc230bd5fd165f926d -size 270 +oid sha256:00938bcfd1faef0bc8defb5fa1d54be1c75f389789907aabc44ca6fc9b50e5bf +size 260 diff --git a/assets/minecraft/textures/block/crafter_east_triggered.png b/assets/minecraft/textures/block/crafter_east_triggered.png index 67d6d9c2..d8a2d3ac 100644 --- a/assets/minecraft/textures/block/crafter_east_triggered.png +++ b/assets/minecraft/textures/block/crafter_east_triggered.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4497f036dc9eb6f1f93b7e7f9e555599fed1a56d10154d93902d4d0dc133c34e -size 273 +oid sha256:9dafa7d139c3cac3e24962ab6669e613c77d997c0428e7ddf454477696544a2d +size 271 diff --git a/assets/minecraft/textures/block/crafter_north.png b/assets/minecraft/textures/block/crafter_north.png index 0ccee26c..3eb95553 100644 --- a/assets/minecraft/textures/block/crafter_north.png +++ b/assets/minecraft/textures/block/crafter_north.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4c98a47933d760f42df7f1436ee58dc921cd5fda2cad6256b918b3cbe5eceee9 -size 267 +oid sha256:1b015289076e08c3d8546c77dac989d81cb3ef70a0205f4f55330f73ae226232 +size 252 diff --git a/assets/minecraft/textures/block/crafter_north_crafting.png b/assets/minecraft/textures/block/crafter_north_crafting.png index 2dc3189f..6fdc2da0 100644 --- a/assets/minecraft/textures/block/crafter_north_crafting.png +++ b/assets/minecraft/textures/block/crafter_north_crafting.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a0a88ed32cf42f28965dad45eec0b5ad547e723a837a82c5eb2e5c51f49ff75d -size 253 +oid sha256:90685ef354a5fd8218d8247f9b61c417641d4f68bac2ba68185bb265b10c4a03 +size 251 diff --git a/assets/minecraft/textures/block/crafter_south.png b/assets/minecraft/textures/block/crafter_south.png index 95b5f6c3..19e8868a 100644 --- a/assets/minecraft/textures/block/crafter_south.png +++ b/assets/minecraft/textures/block/crafter_south.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c4fad853663d4043cd5d41a7b550243babd72b04caa9e65c627d16d1e2f55428 -size 270 +oid sha256:4a916114347449341d7c482a5fb900b5954fe3d35d5bec4060d2c2c61337f0cd +size 268 diff --git a/assets/minecraft/textures/block/crafter_top.png b/assets/minecraft/textures/block/crafter_top.png index 14eed5ce..0abdafcb 100644 --- a/assets/minecraft/textures/block/crafter_top.png +++ b/assets/minecraft/textures/block/crafter_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eb8c9cea034f3f5d032634699b16e8b573d7cee61fb5cb8d0257cf221032598c -size 243 +oid sha256:aec36edfb538119742d251cee88902058c8b329d9b8a7180a05ef414ddad2e3c +size 225 diff --git a/assets/minecraft/textures/block/crafter_top_crafting.png b/assets/minecraft/textures/block/crafter_top_crafting.png index 6e55c692..3680463b 100644 --- a/assets/minecraft/textures/block/crafter_top_crafting.png +++ b/assets/minecraft/textures/block/crafter_top_crafting.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:83caff0e5d1d34887a50317aca65294967f08863295affb0165b6965b1b37638 -size 241 +oid sha256:5ef2f96c8e74369c5f233145c6911a102b1ff8daf18a67c9cd7897ac89b2c0ef +size 222 diff --git a/assets/minecraft/textures/block/crafter_top_triggered.png b/assets/minecraft/textures/block/crafter_top_triggered.png index 92a72940..0df4bba4 100644 --- a/assets/minecraft/textures/block/crafter_top_triggered.png +++ b/assets/minecraft/textures/block/crafter_top_triggered.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7926c9aa1569cc6c058b113517ce57f8aa4a483df4e0bc04074a2dbb2c27f67d -size 252 +oid sha256:c310918cb6d450b92a480749b984d09b164d7edd5801b883ddb3867155fe1fb7 +size 236 diff --git a/assets/minecraft/textures/block/crafter_west.png b/assets/minecraft/textures/block/crafter_west.png index 221942ae..377f09a3 100644 --- a/assets/minecraft/textures/block/crafter_west.png +++ b/assets/minecraft/textures/block/crafter_west.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:574ec61f4f0cf0fab6f52b1edb0d70e1131cf024afe75a07d6fea28bd6e2d65f -size 266 +oid sha256:58bbc4f949b5179fad0978de9a2965cc329cf169752254e9589979fef48ef85d +size 261 diff --git a/assets/minecraft/textures/block/crafter_west_crafting.png b/assets/minecraft/textures/block/crafter_west_crafting.png index b0dd997e..bd543887 100644 --- a/assets/minecraft/textures/block/crafter_west_crafting.png +++ b/assets/minecraft/textures/block/crafter_west_crafting.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2b8cb6869734aabddeb6bfe5fc03ff889e143f9979ada6c2ffcc2873acf54637 -size 266 +oid sha256:b8eb208398a00154388c8a5119e7790d8113ad1eedbb7191360a118c07e6dbcb +size 258 diff --git a/assets/minecraft/textures/block/crafter_west_triggered.png b/assets/minecraft/textures/block/crafter_west_triggered.png index 585da5b1..6604e349 100644 --- a/assets/minecraft/textures/block/crafter_west_triggered.png +++ b/assets/minecraft/textures/block/crafter_west_triggered.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5992d08b5a1ad2a538b880b9f3c76a26bd8d479a2b89206b8f2d1ad9c68b1877 -size 264 +oid sha256:545f551956aed1c3a15383a0bca4dc4bcc16484fe3145453eb6be07dd135ea00 +size 261 diff --git a/assets/minecraft/textures/block/crafting_table_front.png b/assets/minecraft/textures/block/crafting_table_front.png index 744375d6..cb8ac243 100644 --- a/assets/minecraft/textures/block/crafting_table_front.png +++ b/assets/minecraft/textures/block/crafting_table_front.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:16c23b5802c71aa439b9d5a5707d304f1cf84d45a08c146aa4078cd5073067f2 -size 271 +oid sha256:1659c76a33039640e8bd5584af8db04bf626486432a389bcaf1567e1a45c6464 +size 265 diff --git a/assets/minecraft/textures/block/crafting_table_side.png b/assets/minecraft/textures/block/crafting_table_side.png index c793c71a..460531ec 100644 --- a/assets/minecraft/textures/block/crafting_table_side.png +++ b/assets/minecraft/textures/block/crafting_table_side.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c962364f8165a2702ceb42eed59f1983194e4b7fd0a08de8790617f6c06bbaab -size 265 +oid sha256:e9755fc6da763909b285342eae12c5f7d1cc8462fab695bb157504ea207cda8c +size 260 diff --git a/assets/minecraft/textures/block/crafting_table_top.png b/assets/minecraft/textures/block/crafting_table_top.png index e9bc91ec..81577883 100644 --- a/assets/minecraft/textures/block/crafting_table_top.png +++ b/assets/minecraft/textures/block/crafting_table_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8046b35b6ed5696ec21a0135b8a897f35acd7f2500b6b2e4b5b28ae4d25ac76c -size 211 +oid sha256:251e8aa014e30d040261022895853db3204bba241b9b44c11762628550986f2d +size 203 diff --git a/assets/minecraft/textures/block/crimson_door_bottom.png b/assets/minecraft/textures/block/crimson_door_bottom.png index b9554cb2..dd755331 100644 --- a/assets/minecraft/textures/block/crimson_door_bottom.png +++ b/assets/minecraft/textures/block/crimson_door_bottom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:65f892dce9ed4fe13bf51c9518718a25e2cac2312be21070aa2705e5c87190bf -size 225 +oid sha256:d62a34aa5330f27eee2735375749e2210b3f807cdf54b73586e4fe8efaf7c0cb +size 212 diff --git a/assets/minecraft/textures/block/crimson_door_top.png b/assets/minecraft/textures/block/crimson_door_top.png index 0e164700..720985f7 100644 --- a/assets/minecraft/textures/block/crimson_door_top.png +++ b/assets/minecraft/textures/block/crimson_door_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:12b1d77aa29f8c6610b4650b288c27980fe9f68a8ac52714bcd13128dba23626 -size 224 +oid sha256:9cb68d510d0cbdd796023c432d0d61ca0c0f8660225d2468913fd4b7809a2b7b +size 201 diff --git a/assets/minecraft/textures/block/crimson_nylium_side.png b/assets/minecraft/textures/block/crimson_nylium_side.png index 636f11d9..f6b65dc4 100644 --- a/assets/minecraft/textures/block/crimson_nylium_side.png +++ b/assets/minecraft/textures/block/crimson_nylium_side.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4956432f26b485ba3114531bdf76b592c55f4c77a35a1ed8b8c6881b4cabb4eb -size 263 +oid sha256:626fc877e04bc584c90ec98d0ec390fc284aacad10f2f5bca0f88fb82e0703fd +size 241 diff --git a/assets/minecraft/textures/block/crimson_planks.png b/assets/minecraft/textures/block/crimson_planks.png index 4ac3f4f3..bae53e96 100644 --- a/assets/minecraft/textures/block/crimson_planks.png +++ b/assets/minecraft/textures/block/crimson_planks.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:13aa3312f40d191a25bbcc5f73bc3a56fab6b69d3a9c409abe146fe00d56aa60 -size 202 +oid sha256:eba5d8f1fc24a284237178111e7f99a5c836ce89ab5c5013aff69b8298cb0f03 +size 195 diff --git a/assets/minecraft/textures/block/crimson_roots.png b/assets/minecraft/textures/block/crimson_roots.png index 03835bc8..a20a4ef3 100644 --- a/assets/minecraft/textures/block/crimson_roots.png +++ b/assets/minecraft/textures/block/crimson_roots.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:68dbc147bdf06a8d0b25aedce24531521c745edd381e336faab67a29001dac69 -size 183 +oid sha256:7ebebb61363dab96b18777ff34b558b3b3a21d30260f4bab08e8c3d6c0f85791 +size 175 diff --git a/assets/minecraft/textures/block/crimson_roots_pot.png b/assets/minecraft/textures/block/crimson_roots_pot.png index ac8ce2e1..eb025d60 100644 --- a/assets/minecraft/textures/block/crimson_roots_pot.png +++ b/assets/minecraft/textures/block/crimson_roots_pot.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:95e0764b87d67bc7e41b8599f5eb953126cd09b6651050e70134175da4f6312e -size 186 +oid sha256:2251b63ed0e6c793816e5143c484463009649f93e712a8655e7073d42b8fd2a3 +size 176 diff --git a/assets/minecraft/textures/block/crimson_stem_top.png b/assets/minecraft/textures/block/crimson_stem_top.png index e2f3121a..2cbe3dee 100644 --- a/assets/minecraft/textures/block/crimson_stem_top.png +++ b/assets/minecraft/textures/block/crimson_stem_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a21c0711a60301c749497ffd909538bbbd45dd042142371c4a597563950e1963 -size 240 +oid sha256:872d15dd6dc1f46b478f239b193e7cc062843db97cf8095e2ab7999428a730f2 +size 221 diff --git a/assets/minecraft/textures/block/crimson_trapdoor.png b/assets/minecraft/textures/block/crimson_trapdoor.png index 7838dbc0..66e204ab 100644 --- a/assets/minecraft/textures/block/crimson_trapdoor.png +++ b/assets/minecraft/textures/block/crimson_trapdoor.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:190dd83297a1c782d829fcc5079a35281b2741d3e9d377f1d9e279475f31c196 -size 215 +oid sha256:654f72862b0f2c7b84ad11ff53d4b0a7e85d538af1a4d4a568e1cbb34b2fd5cf +size 208 diff --git a/assets/minecraft/textures/block/cut_copper.png b/assets/minecraft/textures/block/cut_copper.png index bd470f87..2cdf87cf 100644 --- a/assets/minecraft/textures/block/cut_copper.png +++ b/assets/minecraft/textures/block/cut_copper.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a18f8e12937a0a9ab2ad9968af57586e314505c9e0fc3c2c9395e6e54e846f2b -size 202 +oid sha256:4bfc7253ccb07028fcefd90b4f7960873cd843521a1fdaaa6d4c450e7d032bba +size 196 diff --git a/assets/minecraft/textures/block/cut_red_sandstone.png b/assets/minecraft/textures/block/cut_red_sandstone.png index d38ce7cc..e43ff826 100644 --- a/assets/minecraft/textures/block/cut_red_sandstone.png +++ b/assets/minecraft/textures/block/cut_red_sandstone.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:144f32d165fa47421e730429333423499ca07dd57f69620ebfb306d8a3575aed -size 202 +oid sha256:23743a080a3c4b2165ffdcddecac26524c7ef0550ff72654c850a17fab55c4d4 +size 179 diff --git a/assets/minecraft/textures/block/cut_sandstone.png b/assets/minecraft/textures/block/cut_sandstone.png index 9c614999..7f941db1 100644 --- a/assets/minecraft/textures/block/cut_sandstone.png +++ b/assets/minecraft/textures/block/cut_sandstone.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3deb1313da4ee31db72e5f29ebaa352d8f6ad77fbd5567bf539a35cc4d6f366e -size 202 +oid sha256:1d930274a3b36ea0753d6e6a61eebee4aa2b24ac257c958ce38adef19cf83302 +size 179 diff --git a/assets/minecraft/textures/block/cyan_candle.png b/assets/minecraft/textures/block/cyan_candle.png index 3a76880d..319a5cf9 100644 --- a/assets/minecraft/textures/block/cyan_candle.png +++ b/assets/minecraft/textures/block/cyan_candle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:091824701bffc93f37cdfa80e191496a04f1fd437af120ea1f9c0ed3043fb885 -size 128 +oid sha256:5b7a0ff8022368d1b380f78f614bfef9046a8d51e13cb0270c47ec225cfe7899 +size 118 diff --git a/assets/minecraft/textures/block/cyan_candle_lit.png b/assets/minecraft/textures/block/cyan_candle_lit.png index 74f8018a..97e1e4e2 100644 --- a/assets/minecraft/textures/block/cyan_candle_lit.png +++ b/assets/minecraft/textures/block/cyan_candle_lit.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f063e9553e9f6448c33302d8ed4a74b7df0de9166744139eb2675bdcbc830f1 -size 137 +oid sha256:c7f16a572cd333b075cd0a1d7ac0efbc7caebbdf29b7dfb0fae942e8e2999526 +size 136 diff --git a/assets/minecraft/textures/block/cyan_concrete.png b/assets/minecraft/textures/block/cyan_concrete.png index 04a81bbc..71a9d386 100644 --- a/assets/minecraft/textures/block/cyan_concrete.png +++ b/assets/minecraft/textures/block/cyan_concrete.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:137591d295aa6c13558621c8fa24053420b89a2c65477c5daff3f8c0d9518c49 -size 182 +oid sha256:c7d1b167051b113da46f134a0a89f04493df978563b03e74daee2763e92eb49d +size 180 diff --git a/assets/minecraft/textures/block/cyan_concrete_powder.png b/assets/minecraft/textures/block/cyan_concrete_powder.png index 770b7ae7..76f8f20a 100644 --- a/assets/minecraft/textures/block/cyan_concrete_powder.png +++ b/assets/minecraft/textures/block/cyan_concrete_powder.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bd5681d35dcd2db51fed9ad67b5606855ecae592f461a4d55b60c873a3f6ba44 -size 590 +oid sha256:3aed3172512b98455d7afd953fa7337cf9d5a754ffc2d4918c733f8b4490a5d5 +size 585 diff --git a/assets/minecraft/textures/block/cyan_glazed_terracotta.png b/assets/minecraft/textures/block/cyan_glazed_terracotta.png index 1648c0c1..19992420 100644 --- a/assets/minecraft/textures/block/cyan_glazed_terracotta.png +++ b/assets/minecraft/textures/block/cyan_glazed_terracotta.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:49ba8426f70994ab9b26fc83b5dc430b151030ddd00dbaf3977e34be1409b40a -size 275 +oid sha256:c5d986d98e2411a9778bb08436e4f976973d310f26af47107522945bebb4da18 +size 274 diff --git a/assets/minecraft/textures/block/cyan_shulker_box.png b/assets/minecraft/textures/block/cyan_shulker_box.png index 87c990b2..76989ae9 100644 --- a/assets/minecraft/textures/block/cyan_shulker_box.png +++ b/assets/minecraft/textures/block/cyan_shulker_box.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8dc848c3f319063cc55f21d4b8ad0fc7991218d70b6e4fc59f5bf0146ae1ee5d -size 277 +oid sha256:7dd2f64344d9bb2170e62b03b1add8128aeecea440b54c685c02adb881972723 +size 272 diff --git a/assets/minecraft/textures/block/cyan_stained_glass_pane_top.png b/assets/minecraft/textures/block/cyan_stained_glass_pane_top.png index 598d8052..013b71cd 100644 --- a/assets/minecraft/textures/block/cyan_stained_glass_pane_top.png +++ b/assets/minecraft/textures/block/cyan_stained_glass_pane_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:16231acd2ee9b158298d87912f72cb4b49f2fa07fdb0375b955cf8f1665dfd24 -size 119 +oid sha256:21e22a31c98baa43adb264e52db4db7aea8f9092ee8bed0434ea27cf46aee210 +size 118 diff --git a/assets/minecraft/textures/block/cyan_terracotta.png b/assets/minecraft/textures/block/cyan_terracotta.png index 33ddf745..2d256d7a 100644 --- a/assets/minecraft/textures/block/cyan_terracotta.png +++ b/assets/minecraft/textures/block/cyan_terracotta.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0a5b6294554ab6152626f48aa9ac35d0a6239302f3e8f5199f90c103393df7d2 -size 444 +oid sha256:22125696599d357cbfc6de1dcca0ee73f47269bfe1532d6b2cc7cf56f5aeda76 +size 395 diff --git a/assets/minecraft/textures/block/cyan_wool.png b/assets/minecraft/textures/block/cyan_wool.png index e0aec4b0..56628691 100644 --- a/assets/minecraft/textures/block/cyan_wool.png +++ b/assets/minecraft/textures/block/cyan_wool.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9c388570eca46cc62628360c34368747e8fd670c99319b2cb195d4af5646a9b0 -size 372 +oid sha256:68706949a22ed0877a42ddca38e5ec428039d52ff23e6614f2900e33cb759303 +size 370 diff --git a/assets/minecraft/textures/block/damaged_anvil_top.png b/assets/minecraft/textures/block/damaged_anvil_top.png index 743d011a..25600836 100644 --- a/assets/minecraft/textures/block/damaged_anvil_top.png +++ b/assets/minecraft/textures/block/damaged_anvil_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7c67e72e819a03ca06eeed82ffa13bbc263f90b038cba8a8c1cefac3978750a9 -size 226 +oid sha256:b174ff7109ffb2c97c2546b29f404ecf549799c41f57da01c041a0499d0d41c8 +size 213 diff --git a/assets/minecraft/textures/block/dandelion.png b/assets/minecraft/textures/block/dandelion.png index a8331c0d..0e87b2e9 100644 --- a/assets/minecraft/textures/block/dandelion.png +++ b/assets/minecraft/textures/block/dandelion.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b8e2897e3dfecc1c863a861dd6b92b66987f33770054c2179c15b5c2abbc0e51 -size 139 +oid sha256:eb0cdf11d96f9b0aef8201c05c51f2c6cf1fc00d8a09d26c50530aff2b05ae33 +size 138 diff --git a/assets/minecraft/textures/block/dark_oak_door_bottom.png b/assets/minecraft/textures/block/dark_oak_door_bottom.png index 3f05d6ea..18b8729d 100644 --- a/assets/minecraft/textures/block/dark_oak_door_bottom.png +++ b/assets/minecraft/textures/block/dark_oak_door_bottom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2f5413d0f9264bef301a7663417e7c2535516a878de36b328ce53c577e76274d -size 221 +oid sha256:ebc0a45241cf261b382e20398e477f26803124382d20fbbdb764706401706ece +size 196 diff --git a/assets/minecraft/textures/block/dark_oak_door_top.png b/assets/minecraft/textures/block/dark_oak_door_top.png index 5fd1b42d..826e5921 100644 --- a/assets/minecraft/textures/block/dark_oak_door_top.png +++ b/assets/minecraft/textures/block/dark_oak_door_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dc181a0c9a35f6867c860f3de6c3314c755738a01739e75cb279abf1c24e852b -size 231 +oid sha256:68c26c4b6c54d9deb639b248cdd3fdf4823bd043be0d8f6b1494c815a75cbb84 +size 210 diff --git a/assets/minecraft/textures/block/dark_oak_log.png b/assets/minecraft/textures/block/dark_oak_log.png index bcacda2e..99211ed2 100644 --- a/assets/minecraft/textures/block/dark_oak_log.png +++ b/assets/minecraft/textures/block/dark_oak_log.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:10fff32071a6f562064322321e481a4091e9aa21836ad272fe9e19b63527fc2c -size 193 +oid sha256:b5d28ee7e1c88d8d1719468c9d798157159a82ab84209ec4236373de21496d0e +size 191 diff --git a/assets/minecraft/textures/block/dark_oak_log_top.png b/assets/minecraft/textures/block/dark_oak_log_top.png index b66644cb..ee8c8635 100644 --- a/assets/minecraft/textures/block/dark_oak_log_top.png +++ b/assets/minecraft/textures/block/dark_oak_log_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a1e6627bb321e5751c90ee451f7c96b7cf742be9ef9b0813d9967419effa6e4a -size 243 +oid sha256:40ef6b748d3d78a02d97617aca2a7f92d6f8dca5c4adbc3fd99df2de025c9512 +size 222 diff --git a/assets/minecraft/textures/block/dark_oak_planks.png b/assets/minecraft/textures/block/dark_oak_planks.png index 179d9501..2ceed471 100644 --- a/assets/minecraft/textures/block/dark_oak_planks.png +++ b/assets/minecraft/textures/block/dark_oak_planks.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2bccdc1ef269b7ae6050d46b70071ead5c3ad4c3a16e3f6baf24fc629752b8bc -size 202 +oid sha256:665f44b119f5a21711c4cb83749d871635134c001cb0c14761c4f02a40dd8645 +size 195 diff --git a/assets/minecraft/textures/block/dark_oak_trapdoor.png b/assets/minecraft/textures/block/dark_oak_trapdoor.png index 982af992..ff61ab58 100644 --- a/assets/minecraft/textures/block/dark_oak_trapdoor.png +++ b/assets/minecraft/textures/block/dark_oak_trapdoor.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0707938f92d30e2f483620389d45ec493fce0fcb564ea33546540014f2a761fc -size 189 +oid sha256:b56fddb418e82004eb6371e85acf9dc7cac608f5230049543159b2ddcc3196ed +size 179 diff --git a/assets/minecraft/textures/block/dark_prismarine.png b/assets/minecraft/textures/block/dark_prismarine.png index 799f8d5a..92db349e 100644 --- a/assets/minecraft/textures/block/dark_prismarine.png +++ b/assets/minecraft/textures/block/dark_prismarine.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:86e10a155a5894c2131225d5c5f0858e0ec854244d3c6547fac2f1ba8bf6071c -size 185 +oid sha256:f5055d900a645407ce199318d5c2471e403e283cff569125c5bc8185b8f47972 +size 181 diff --git a/assets/minecraft/textures/block/daylight_detector_inverted_top.png b/assets/minecraft/textures/block/daylight_detector_inverted_top.png index a0e7e2da..85106c93 100644 --- a/assets/minecraft/textures/block/daylight_detector_inverted_top.png +++ b/assets/minecraft/textures/block/daylight_detector_inverted_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6c05c8832f33ff2fe6d5f8273f00d6740609551121d65791fbc5c16bff974ade -size 148 +oid sha256:b37e5b86ab06d0cffe6a2e5648ff2c42df926fa23d30d40ef9c3b3323b34b252 +size 144 diff --git a/assets/minecraft/textures/block/daylight_detector_top.png b/assets/minecraft/textures/block/daylight_detector_top.png index 4a6282c9..a4cbcd20 100644 --- a/assets/minecraft/textures/block/daylight_detector_top.png +++ b/assets/minecraft/textures/block/daylight_detector_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:89b60535b6016cfe10484039c370f39c9b4f38d51a6c4e10de755ea929f7bf8f -size 171 +oid sha256:5db6251c3e677e4e7346462f13df6abaa8efe31a775b4d00d82b22df332e763e +size 169 diff --git a/assets/minecraft/textures/block/dead_brain_coral.png b/assets/minecraft/textures/block/dead_brain_coral.png index 0fd9d870..e3fb3f7e 100644 --- a/assets/minecraft/textures/block/dead_brain_coral.png +++ b/assets/minecraft/textures/block/dead_brain_coral.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6975c7d9f9bc1ed5cd057fa8e4cdda55585fe8cf1d4bbb21fd9ebffb13bd5a1f -size 206 +oid sha256:e9bdd69776ac8cbbe0aca7b34d7408615a3a1d3283bb10e16e1ff5e3f349eab3 +size 192 diff --git a/assets/minecraft/textures/block/dead_brain_coral_block.png b/assets/minecraft/textures/block/dead_brain_coral_block.png index 0c5d1228..e2fc60c8 100644 --- a/assets/minecraft/textures/block/dead_brain_coral_block.png +++ b/assets/minecraft/textures/block/dead_brain_coral_block.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:30807f2d89d3a3f3ee297fb725a4589d0cd6c990c9e4b44750ee50ad28d57ca8 -size 205 +oid sha256:773b9f5e6e793618bfe517700c18044eb83d04a16718aa04e0ff61a153f54117 +size 203 diff --git a/assets/minecraft/textures/block/dead_brain_coral_fan.png b/assets/minecraft/textures/block/dead_brain_coral_fan.png index 341b1c67..beae1a79 100644 --- a/assets/minecraft/textures/block/dead_brain_coral_fan.png +++ b/assets/minecraft/textures/block/dead_brain_coral_fan.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8dd2fa72b85ce7e6fcb4df769219538c2af4b318234af58f439a7d2044e3c734 -size 227 +oid sha256:be5045a38d5655d03308d0951199d8e69fa59532b92eaea0b3e6ea7eafd34fa5 +size 184 diff --git a/assets/minecraft/textures/block/dead_bubble_coral.png b/assets/minecraft/textures/block/dead_bubble_coral.png index 03c06516..f7afed76 100644 --- a/assets/minecraft/textures/block/dead_bubble_coral.png +++ b/assets/minecraft/textures/block/dead_bubble_coral.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c4dbd554c0110e44fe5fe1c027a77c489e2987c078155a9880599df3486148ca -size 196 +oid sha256:96cd755cbf55581d1a5af1af378ac09ec3bfd75b3acb6d82bb61cb29c76482d4 +size 188 diff --git a/assets/minecraft/textures/block/dead_bubble_coral_block.png b/assets/minecraft/textures/block/dead_bubble_coral_block.png index 5ca6b28f..8b45a0b8 100644 --- a/assets/minecraft/textures/block/dead_bubble_coral_block.png +++ b/assets/minecraft/textures/block/dead_bubble_coral_block.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0cd2822fbb1dd9a6f7381ef9dd4153814c350b30fa995696fae7a2777dacf047 -size 201 +oid sha256:f14ca629880afcad5882307c4af41fd412dec2472ee4ac69d207db701350eaed +size 198 diff --git a/assets/minecraft/textures/block/dead_bubble_coral_fan.png b/assets/minecraft/textures/block/dead_bubble_coral_fan.png index 307a3100..bd2137c3 100644 --- a/assets/minecraft/textures/block/dead_bubble_coral_fan.png +++ b/assets/minecraft/textures/block/dead_bubble_coral_fan.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:92274f87cd2cbb81d130754b8bc695db26df88a2eccbf4ce52c11848e859615d -size 205 +oid sha256:fd3fde093dabde090a040f0b430c4ef1c576bb35cd9117d6d163943c250e5056 +size 170 diff --git a/assets/minecraft/textures/block/dead_bush.png b/assets/minecraft/textures/block/dead_bush.png index 9ea40604..39468d91 100644 --- a/assets/minecraft/textures/block/dead_bush.png +++ b/assets/minecraft/textures/block/dead_bush.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ed63c66ef4f4694d5e5ba4603576b0ca8bb45ea1ade4412d9b889d79ab4c38c2 -size 180 +oid sha256:bc01775d76a30a1088f5c8f77a36001def423165178e680997c5bfcb2dbfd4af +size 171 diff --git a/assets/minecraft/textures/block/dead_fire_coral.png b/assets/minecraft/textures/block/dead_fire_coral.png index ef340c9d..3a3cfc45 100644 --- a/assets/minecraft/textures/block/dead_fire_coral.png +++ b/assets/minecraft/textures/block/dead_fire_coral.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4e3fb1269b4917c38e05b1de93dec65d68e3d4bc055a8d17de2e29d8d51cc032 -size 189 +oid sha256:4bd00980bd4527785acf19c6185fead8f5037790d4c6942b802ea17f6fe1d4c8 +size 180 diff --git a/assets/minecraft/textures/block/dead_fire_coral_block.png b/assets/minecraft/textures/block/dead_fire_coral_block.png index dd82c4db..f79c1380 100644 --- a/assets/minecraft/textures/block/dead_fire_coral_block.png +++ b/assets/minecraft/textures/block/dead_fire_coral_block.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d61d1627b51998d8350304e3c12b55f56397167b3553595f668b796e91a3c68 -size 195 +oid sha256:7413201c4c8e28d8805eeeb40981b2afb26ddb9eecd8fe23257518a23f278e8c +size 191 diff --git a/assets/minecraft/textures/block/dead_fire_coral_fan.png b/assets/minecraft/textures/block/dead_fire_coral_fan.png index c8df09e0..06de1822 100644 --- a/assets/minecraft/textures/block/dead_fire_coral_fan.png +++ b/assets/minecraft/textures/block/dead_fire_coral_fan.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:41427bc9a41bb5ae472a66ad81e38c9bec36b476e3f02b196918292000037495 -size 225 +oid sha256:c3faeeb9634cc22494642f7f5db8a9aef554aab40afd14af20f6d1ddf2dd7445 +size 193 diff --git a/assets/minecraft/textures/block/dead_horn_coral.png b/assets/minecraft/textures/block/dead_horn_coral.png index ed99e939..debb605d 100644 --- a/assets/minecraft/textures/block/dead_horn_coral.png +++ b/assets/minecraft/textures/block/dead_horn_coral.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:45c5ded2a9ad7aed10018d334d4542d32c9424f7937b0bc529ff083ce3734431 -size 192 +oid sha256:224a10b719d60e9a41c6101dec3894fe3d4b1d2f05ef090b9627d4bdc6b7e61b +size 182 diff --git a/assets/minecraft/textures/block/dead_horn_coral_block.png b/assets/minecraft/textures/block/dead_horn_coral_block.png index f2c75675..8e447053 100644 --- a/assets/minecraft/textures/block/dead_horn_coral_block.png +++ b/assets/minecraft/textures/block/dead_horn_coral_block.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3079e23b5faee1780e59b4aea4c0ba06e5188ad7e4d8d3c819ae95b73250f801 -size 206 +oid sha256:2d69d8922d2c2f01aef14ecf528fe019f3a3b83d1b7347e4e1f94df26371dcfc +size 202 diff --git a/assets/minecraft/textures/block/dead_horn_coral_fan.png b/assets/minecraft/textures/block/dead_horn_coral_fan.png index 33b4bdd2..c1b7fadc 100644 --- a/assets/minecraft/textures/block/dead_horn_coral_fan.png +++ b/assets/minecraft/textures/block/dead_horn_coral_fan.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a97f6f649cae41eb2c8956dd1eb03b319fbf166fa89df58965faafb2b8146e53 -size 202 +oid sha256:c82dea9df0660af602431947eddfbc07570059429b40fb7dda539b7bd602ef78 +size 175 diff --git a/assets/minecraft/textures/block/dead_tube_coral.png b/assets/minecraft/textures/block/dead_tube_coral.png index 5d9547fb..bb4a1aee 100644 --- a/assets/minecraft/textures/block/dead_tube_coral.png +++ b/assets/minecraft/textures/block/dead_tube_coral.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:59cccbe2658309b2507b670e8eaf4cfbe41cdd8ca3775f9bfb11e6cc5dc8baf3 -size 216 +oid sha256:22e69622acbebeb8f6cc9432faccb9e526aeec5bbc26d4fa3d97a0509a9a06c6 +size 203 diff --git a/assets/minecraft/textures/block/dead_tube_coral_fan.png b/assets/minecraft/textures/block/dead_tube_coral_fan.png index fb6b89ea..ab48b458 100644 --- a/assets/minecraft/textures/block/dead_tube_coral_fan.png +++ b/assets/minecraft/textures/block/dead_tube_coral_fan.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3f9fdc576ac81c67414c5abb61e400af7dfcae0df66312ddae1c7596817f8ed1 -size 205 +oid sha256:663634bc03bae804109a8f3f1dbd999eda2e468b262d547dae2715ceee036e18 +size 181 diff --git a/assets/minecraft/textures/block/debug.png b/assets/minecraft/textures/block/debug.png index f69ec774..b20301a4 100644 --- a/assets/minecraft/textures/block/debug.png +++ b/assets/minecraft/textures/block/debug.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a1c4d10da9bc682b58e21e7c307c790bf45e9c927b2c2f9c7edca63f3bdc05e4 -size 560 +oid sha256:6cbf4e2d10aa7365c62bab3c49f94806b545e42708ec3a61aa5e6937246c8afd +size 500 diff --git a/assets/minecraft/textures/block/debug2.png b/assets/minecraft/textures/block/debug2.png index 008c4a94..0282702d 100644 --- a/assets/minecraft/textures/block/debug2.png +++ b/assets/minecraft/textures/block/debug2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0f27458b3db5ad8c540ddcde993cdb25717fc74af496f41dba674dbcf686ac45 -size 269 +oid sha256:19549f80f5f8b14acfc401cfc31c7e62c483ee06150827bcc51ac4d9d9d9e0af +size 236 diff --git a/assets/minecraft/textures/block/deepslate.png b/assets/minecraft/textures/block/deepslate.png index 772e9c2d..8cdc50ab 100644 --- a/assets/minecraft/textures/block/deepslate.png +++ b/assets/minecraft/textures/block/deepslate.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b4c5e7f5538608a371fd4c1f6b398e4b76f723702d10144432636a85a1a61832 -size 185 +oid sha256:dc72c722bec23c929817fab7cc56e08e5e828ae3607fbfb7e7730e68b67d4cfc +size 181 diff --git a/assets/minecraft/textures/block/deepslate_bricks.png b/assets/minecraft/textures/block/deepslate_bricks.png index 987fcd71..26098265 100644 --- a/assets/minecraft/textures/block/deepslate_bricks.png +++ b/assets/minecraft/textures/block/deepslate_bricks.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:18bd891e8b1b9520005c6dd436560873faadcac113eeac6948499ca52a3f9a2a -size 197 +oid sha256:d9533c750ce1910c821626f4fe9187f5d36e9e9cf5efa4fb8fd1b2574ff8f6b1 +size 177 diff --git a/assets/minecraft/textures/block/deepslate_coal_ore.png b/assets/minecraft/textures/block/deepslate_coal_ore.png index 9d06d305..dbb9ce6e 100644 --- a/assets/minecraft/textures/block/deepslate_coal_ore.png +++ b/assets/minecraft/textures/block/deepslate_coal_ore.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a6e4d4c144d85be16fc67080fcc819e4c5d065af89ab900346b34e4ca34bdc88 -size 225 +oid sha256:62ea6c01050148f32c081f7d03a3039e4cf918322943ebf31c4a39af9896e3bf +size 217 diff --git a/assets/minecraft/textures/block/deepslate_copper_ore.png b/assets/minecraft/textures/block/deepslate_copper_ore.png index b98b08f6..1f25fd14 100644 --- a/assets/minecraft/textures/block/deepslate_copper_ore.png +++ b/assets/minecraft/textures/block/deepslate_copper_ore.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:37d6d3fa66a15e1acda7c52910b0904ab8d1027163fcc81d5a5cd5733148d6e4 -size 252 +oid sha256:d1af5c209e42642d9cd21c93e8ec52637d2aad2167a9bb8ef8b4c9b791d15ff0 +size 238 diff --git a/assets/minecraft/textures/block/deepslate_diamond_ore.png b/assets/minecraft/textures/block/deepslate_diamond_ore.png index e440e317..2c594b4d 100644 --- a/assets/minecraft/textures/block/deepslate_diamond_ore.png +++ b/assets/minecraft/textures/block/deepslate_diamond_ore.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7ff158066e1a9a9832b52b1eec7a54071c95478b18bd16207b322f41756753b0 -size 253 +oid sha256:0acd146e99716a104c6053198fa51fe0d1ef464501c123ae9a56ba3f6f957dd7 +size 239 diff --git a/assets/minecraft/textures/block/deepslate_emerald_ore.png b/assets/minecraft/textures/block/deepslate_emerald_ore.png index 56ef159f..84b5d3d1 100644 --- a/assets/minecraft/textures/block/deepslate_emerald_ore.png +++ b/assets/minecraft/textures/block/deepslate_emerald_ore.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:29054e35459ee1a9e150d5f43432032095dde90291e9aca52f57b908ea2bef05 -size 247 +oid sha256:9920fa86166024c04adb8596f6243f5d5456733b79c718855b58840bef968977 +size 230 diff --git a/assets/minecraft/textures/block/deepslate_gold_ore.png b/assets/minecraft/textures/block/deepslate_gold_ore.png index ceb3a12a..63275366 100644 --- a/assets/minecraft/textures/block/deepslate_gold_ore.png +++ b/assets/minecraft/textures/block/deepslate_gold_ore.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f468e3f00c7393aa01c234058095610820e7dbdc0b26eb64044beadac647701c -size 228 +oid sha256:ae0e8aec748e94a966e35b06a171aef39d208c651d77f68d47b459d250305854 +size 219 diff --git a/assets/minecraft/textures/block/deepslate_iron_ore.png b/assets/minecraft/textures/block/deepslate_iron_ore.png index 8635e295..5abe4c0a 100644 --- a/assets/minecraft/textures/block/deepslate_iron_ore.png +++ b/assets/minecraft/textures/block/deepslate_iron_ore.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4565d56881e85ceef38107f0ba37c588788cb96ba1c8e269ddc716d972e7a951 -size 236 +oid sha256:63ea4e6794a98251c475a160ee889273cfccfb37fd3c5098b24b6dc4d34113c0 +size 225 diff --git a/assets/minecraft/textures/block/deepslate_lapis_ore.png b/assets/minecraft/textures/block/deepslate_lapis_ore.png index d6dd332f..feb37a6b 100644 --- a/assets/minecraft/textures/block/deepslate_lapis_ore.png +++ b/assets/minecraft/textures/block/deepslate_lapis_ore.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e8855090fee951faa4ee5e29714f033aa56778f155eaaeb72a3b97f33382db19 -size 257 +oid sha256:b035ec69053435892f3a3300fb908171aecbeed373f44288b7ae50c3a498ecd8 +size 238 diff --git a/assets/minecraft/textures/block/deepslate_redstone_ore.png b/assets/minecraft/textures/block/deepslate_redstone_ore.png index 93bb0478..f696faa8 100644 --- a/assets/minecraft/textures/block/deepslate_redstone_ore.png +++ b/assets/minecraft/textures/block/deepslate_redstone_ore.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5cd3c3b20045c4ab9fe5d3803a9304ec4d723209c51d2bd609126c90a6eb74af -size 270 +oid sha256:ebfe512c3840e87f55d2bd64c0e6ba38a2b426fb9b6d12f51e2034afd89b17c3 +size 255 diff --git a/assets/minecraft/textures/block/deepslate_tiles.png b/assets/minecraft/textures/block/deepslate_tiles.png index e493ec3e..15584e81 100644 --- a/assets/minecraft/textures/block/deepslate_tiles.png +++ b/assets/minecraft/textures/block/deepslate_tiles.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:de5b1065c13dfbf4b758a886b5565c881ee1b2b13a36e1f46ad80969977fdb48 -size 194 +oid sha256:4e0ff4aa76d467697383c776f94d855d3fc2a49a40363d3fa846e441003ebc57 +size 183 diff --git a/assets/minecraft/textures/block/deepslate_top.png b/assets/minecraft/textures/block/deepslate_top.png index 9ca111ab..ddcbe839 100644 --- a/assets/minecraft/textures/block/deepslate_top.png +++ b/assets/minecraft/textures/block/deepslate_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:920bdd201cfe0caef83c9ed483b705998feeaab6ff9ee9260e08a3a86260ff81 -size 191 +oid sha256:9f2f5e0a67b4a007244cf7064e09da7e693322cfd21b1884190bcd6b26e91aec +size 189 diff --git a/assets/minecraft/textures/block/destroy_stage_0.png b/assets/minecraft/textures/block/destroy_stage_0.png index ff9450a2..8d6122c1 100644 --- a/assets/minecraft/textures/block/destroy_stage_0.png +++ b/assets/minecraft/textures/block/destroy_stage_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f499533ea289fe9f34b0917d630129b4805ae39b9491859eba496682cd2fd0c3 -size 102 +oid sha256:a9646f290314ddff5edf4e8cfcaeabf5cd3679f35256547f9ab606139fd66cf7 +size 89 diff --git a/assets/minecraft/textures/block/destroy_stage_1.png b/assets/minecraft/textures/block/destroy_stage_1.png index 22eb46c3..9fbb449c 100644 --- a/assets/minecraft/textures/block/destroy_stage_1.png +++ b/assets/minecraft/textures/block/destroy_stage_1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0de13fe3603a953791dc229fbd78ff825845af57bfdb4137eddcc7ef9debce34 -size 115 +oid sha256:888c47b9ddfa60a35d3a8323829aa2db75ae19d2e04b82951510b755a5f7b6db +size 102 diff --git a/assets/minecraft/textures/block/destroy_stage_2.png b/assets/minecraft/textures/block/destroy_stage_2.png index c493420c..a3041928 100644 --- a/assets/minecraft/textures/block/destroy_stage_2.png +++ b/assets/minecraft/textures/block/destroy_stage_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3dad4672e2cd127105cc113bc7584785ae1d600a993e5e5261661d4805fe9b11 -size 123 +oid sha256:b4d1779c587523960817b862611bd13375415892a739751cd518b82574d108b4 +size 111 diff --git a/assets/minecraft/textures/block/destroy_stage_3.png b/assets/minecraft/textures/block/destroy_stage_3.png index dd5be44e..97c26fed 100644 --- a/assets/minecraft/textures/block/destroy_stage_3.png +++ b/assets/minecraft/textures/block/destroy_stage_3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d7eca4b992e6a5e33b7a9247b28f7ecb5ef7d64ca876cd6fa4239aca4822552b -size 140 +oid sha256:a4ff05650ad917dd875ba2b6fa0b3fd4ed4a1773ecac87ef241ec0d3c4ff2cd1 +size 128 diff --git a/assets/minecraft/textures/block/destroy_stage_4.png b/assets/minecraft/textures/block/destroy_stage_4.png index 674a380e..f1ce5ace 100644 --- a/assets/minecraft/textures/block/destroy_stage_4.png +++ b/assets/minecraft/textures/block/destroy_stage_4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5d26b667ba1b56164cfa9cc8860a7f603fe0091223249a3c312febd7526c18a3 -size 143 +oid sha256:ba6abd3eef8474fb5b769f7a26e400769d7a806048c9b95e7bea91e7de47ef1f +size 139 diff --git a/assets/minecraft/textures/block/destroy_stage_5.png b/assets/minecraft/textures/block/destroy_stage_5.png index cf5a6e19..799da634 100644 --- a/assets/minecraft/textures/block/destroy_stage_5.png +++ b/assets/minecraft/textures/block/destroy_stage_5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e66112ebadbed250bf374685e5e8f49ecab78aae6d7c8c3c05f503f5a0e2fb28 -size 159 +oid sha256:633e558c9bb13da4ab71df667bb4533c484f9cc5c166164e04292502ab2351a9 +size 153 diff --git a/assets/minecraft/textures/block/destroy_stage_7.png b/assets/minecraft/textures/block/destroy_stage_7.png index 38368ed8..5ad4ef49 100644 --- a/assets/minecraft/textures/block/destroy_stage_7.png +++ b/assets/minecraft/textures/block/destroy_stage_7.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e57b32b06a2f1dea079b880bfe6b767d1ee638b07027c82f4abb82ed5330cba7 -size 174 +oid sha256:6e5ccf47bd4534bca0ef360bd93330e354bfc3f7aaf1d6c498cd9f30c21bd8a5 +size 171 diff --git a/assets/minecraft/textures/block/destroy_stage_8.png b/assets/minecraft/textures/block/destroy_stage_8.png index 0c7ace31..6bfb4d9b 100644 --- a/assets/minecraft/textures/block/destroy_stage_8.png +++ b/assets/minecraft/textures/block/destroy_stage_8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e1c1d8c8ec097fa8de5d0dd6e8f69972c1afb1504bff4899d1911f245de81cc7 -size 180 +oid sha256:b3ca3a7f5c75c242bf3adbe0f63289e6ab28dd2f6b8f7d6f25f3da39b10eb4aa +size 179 diff --git a/assets/minecraft/textures/block/detector_rail.png b/assets/minecraft/textures/block/detector_rail.png index 1ac67bf5..c8ea9444 100644 --- a/assets/minecraft/textures/block/detector_rail.png +++ b/assets/minecraft/textures/block/detector_rail.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bd28edac07bd89806d5a9e9ece9f8649b21ee8662ce86d07e2410b4fdf919320 -size 237 +oid sha256:b352d30abe9a7034d93e86c87a45d084f9bd0c487de7104262ffc2a5b83706c5 +size 234 diff --git a/assets/minecraft/textures/block/detector_rail_on.png b/assets/minecraft/textures/block/detector_rail_on.png index 8d77b6c5..9b4f77eb 100644 --- a/assets/minecraft/textures/block/detector_rail_on.png +++ b/assets/minecraft/textures/block/detector_rail_on.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:326bbe253d1b576cece39f57473aa9033a5b130891970d4d533fd8a90dc01577 -size 251 +oid sha256:ad94fe443daf2786aa4049d0e7b2cb028e9a252e384f0a0a9895a04bdb51f252 +size 248 diff --git a/assets/minecraft/textures/block/diamond_block.png b/assets/minecraft/textures/block/diamond_block.png index 427740d3..e47bd198 100644 --- a/assets/minecraft/textures/block/diamond_block.png +++ b/assets/minecraft/textures/block/diamond_block.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:93a63fa544d416188412584fffdf01e7fcb218f8a7e9f3e82232e773fc207fc9 -size 218 +oid sha256:866b9325ce953fcfdb2cfd95a4096d34b933aa90c8391332d2738bf302732699 +size 199 diff --git a/assets/minecraft/textures/block/diamond_ore.png b/assets/minecraft/textures/block/diamond_ore.png index e90af998..ea3a967a 100644 --- a/assets/minecraft/textures/block/diamond_ore.png +++ b/assets/minecraft/textures/block/diamond_ore.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:79abdde719a9bdf99279ab3f19b90da8e949c6c7cb7dcf453e0c3ce1f568577f -size 235 +oid sha256:2ef421308b678d2225aef41affc087ae512a81213a24a98cf456dbe231884122 +size 219 diff --git a/assets/minecraft/textures/block/dirt.png b/assets/minecraft/textures/block/dirt.png index 62b4962d..91fefe0d 100644 --- a/assets/minecraft/textures/block/dirt.png +++ b/assets/minecraft/textures/block/dirt.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f0f0e619e7dfe683ea45b9254859f14b0ed5f1debdb242ea878828575be5bf0 -size 200 +oid sha256:67197d5371efc3ca1638217c38349665dbd5a977b47bfb20075c858dff87d510 +size 197 diff --git a/assets/minecraft/textures/block/dirt_path_side.png b/assets/minecraft/textures/block/dirt_path_side.png index 4718d1e3..b26ca744 100644 --- a/assets/minecraft/textures/block/dirt_path_side.png +++ b/assets/minecraft/textures/block/dirt_path_side.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:beaa93a455aeb1fa679a63aed59736914c17bc0fe4cda6b14d0308dba0f391f1 -size 251 +oid sha256:10a6c00835541537a0254f4210acc944b603ff7239dc1b458ddc5fae00686830 +size 241 diff --git a/assets/minecraft/textures/block/dirt_path_top.png b/assets/minecraft/textures/block/dirt_path_top.png index 2c00db82..74ddc154 100644 --- a/assets/minecraft/textures/block/dirt_path_top.png +++ b/assets/minecraft/textures/block/dirt_path_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c4f922a0e28e1f2e4d97de81f1b97dc9386260ee4e9ca1ee9abd23e9119731fa -size 171 +oid sha256:653ab9be45372827da221f787435e2ad5adddc6257c29d45fe56947963784ac3 +size 170 diff --git a/assets/minecraft/textures/block/dispenser_front.png b/assets/minecraft/textures/block/dispenser_front.png index 9d0b0d25..cba42b6f 100644 --- a/assets/minecraft/textures/block/dispenser_front.png +++ b/assets/minecraft/textures/block/dispenser_front.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:507e40de192e1a0ffd8201a246d047ba992df9a01dfd1d9e7136cf3aa9e988c9 -size 256 +oid sha256:b537b00654b8b6f7101d95a0a87a95fcad7f6d375236b437ab3b20e651c3d4a3 +size 252 diff --git a/assets/minecraft/textures/block/dispenser_front_vertical.png b/assets/minecraft/textures/block/dispenser_front_vertical.png index e609ec91..521e0843 100644 --- a/assets/minecraft/textures/block/dispenser_front_vertical.png +++ b/assets/minecraft/textures/block/dispenser_front_vertical.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5a5348a4c7a56054de0d717691919d6e934f10a3122fd4996d02c074272f46ab -size 229 +oid sha256:d56a00a41c7a3381ed86d36939c17ac2cb33317d502bc5124f1793519263f973 +size 218 diff --git a/assets/minecraft/textures/block/dragon_egg.png b/assets/minecraft/textures/block/dragon_egg.png index 1efae98b..778b4e77 100644 --- a/assets/minecraft/textures/block/dragon_egg.png +++ b/assets/minecraft/textures/block/dragon_egg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2f016a67cf5acc9e4f11862dae6c12ac95684476c6eddc99fd5af522661e44ca -size 156 +oid sha256:5ec895a4fd60650f1d08c2f66888e809f539832565c12cfc4b7d3df16d519b12 +size 153 diff --git a/assets/minecraft/textures/block/dried_ghast_hydration_0_bottom.png b/assets/minecraft/textures/block/dried_ghast_hydration_0_bottom.png new file mode 100644 index 00000000..fc632507 --- /dev/null +++ b/assets/minecraft/textures/block/dried_ghast_hydration_0_bottom.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4ff390df82340fd28907a6fb5eab702dcdb199ad90e5da24676e8860248a650b +size 117 diff --git a/assets/minecraft/textures/block/dried_ghast_hydration_0_east.png b/assets/minecraft/textures/block/dried_ghast_hydration_0_east.png new file mode 100644 index 00000000..61602f52 --- /dev/null +++ b/assets/minecraft/textures/block/dried_ghast_hydration_0_east.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1299e0634d079d3d4e9a3b97c871a2eb31d2f13ba2689a98032ab0e4dd06ce44 +size 139 diff --git a/assets/minecraft/textures/block/dried_ghast_hydration_0_north.png b/assets/minecraft/textures/block/dried_ghast_hydration_0_north.png new file mode 100644 index 00000000..fcdc3972 --- /dev/null +++ b/assets/minecraft/textures/block/dried_ghast_hydration_0_north.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:afe65f225c8ce6fa661399a1e8d2919ed2d5cb24ee15c7bde356e971eae368ec +size 153 diff --git a/assets/minecraft/textures/block/dried_ghast_hydration_0_south.png b/assets/minecraft/textures/block/dried_ghast_hydration_0_south.png new file mode 100644 index 00000000..784458b5 --- /dev/null +++ b/assets/minecraft/textures/block/dried_ghast_hydration_0_south.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:57721bc66a2a694310d7263cf266cdf7d08a4c95d6945641f3d4d8436ab8b652 +size 135 diff --git a/assets/minecraft/textures/block/dried_ghast_hydration_0_tentacles.png b/assets/minecraft/textures/block/dried_ghast_hydration_0_tentacles.png new file mode 100644 index 00000000..9f053f32 --- /dev/null +++ b/assets/minecraft/textures/block/dried_ghast_hydration_0_tentacles.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3956e8276f4a5c6db11d268b726cd1d84b18343d07ac1d47fb8f5918304a3ae1 +size 142 diff --git a/assets/minecraft/textures/block/dried_ghast_hydration_0_top.png b/assets/minecraft/textures/block/dried_ghast_hydration_0_top.png new file mode 100644 index 00000000..4aea9e22 --- /dev/null +++ b/assets/minecraft/textures/block/dried_ghast_hydration_0_top.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:74e498a666b4c64bd9c2df66899fce2282263c31c45fc818c41f8cd8f338723c +size 139 diff --git a/assets/minecraft/textures/block/dried_ghast_hydration_0_west.png b/assets/minecraft/textures/block/dried_ghast_hydration_0_west.png new file mode 100644 index 00000000..1a1223aa --- /dev/null +++ b/assets/minecraft/textures/block/dried_ghast_hydration_0_west.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3b2eb846d64d8353a68e3abddda33604ad06458ce6eed1e888f6db19a149a5d4 +size 136 diff --git a/assets/minecraft/textures/block/dried_ghast_hydration_1_bottom.png b/assets/minecraft/textures/block/dried_ghast_hydration_1_bottom.png new file mode 100644 index 00000000..703335c1 --- /dev/null +++ b/assets/minecraft/textures/block/dried_ghast_hydration_1_bottom.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6971f486d75b94d2ed7442237468bc2ac223fb6ee32c85deec8a5bf3dba11a1c +size 120 diff --git a/assets/minecraft/textures/block/dried_ghast_hydration_1_east.png b/assets/minecraft/textures/block/dried_ghast_hydration_1_east.png new file mode 100644 index 00000000..7c6962c4 --- /dev/null +++ b/assets/minecraft/textures/block/dried_ghast_hydration_1_east.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6be016e5ef1eab5314cae46be13ac74f42677d36a0ff72fed3e08587d2fdb058 +size 146 diff --git a/assets/minecraft/textures/block/dried_ghast_hydration_1_north.png b/assets/minecraft/textures/block/dried_ghast_hydration_1_north.png new file mode 100644 index 00000000..ff828f32 --- /dev/null +++ b/assets/minecraft/textures/block/dried_ghast_hydration_1_north.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1fa6a2f9538fcf20002dba042b880c1836cc09cc257af1e7113e223fc10b4866 +size 151 diff --git a/assets/minecraft/textures/block/dried_ghast_hydration_1_south.png b/assets/minecraft/textures/block/dried_ghast_hydration_1_south.png new file mode 100644 index 00000000..8fd64577 --- /dev/null +++ b/assets/minecraft/textures/block/dried_ghast_hydration_1_south.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4b943d0163d62e80a4fcda88ed608a38ab09abcb8dabd9e2767b9d578f1fc90d +size 156 diff --git a/assets/minecraft/textures/block/dried_ghast_hydration_1_tentacles.png b/assets/minecraft/textures/block/dried_ghast_hydration_1_tentacles.png new file mode 100644 index 00000000..cc11d553 --- /dev/null +++ b/assets/minecraft/textures/block/dried_ghast_hydration_1_tentacles.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:56d55f819cd0dac4755818b3073207745740b4109ac4bbd312af9c0319f0856f +size 142 diff --git a/assets/minecraft/textures/block/dried_ghast_hydration_1_top.png b/assets/minecraft/textures/block/dried_ghast_hydration_1_top.png new file mode 100644 index 00000000..190a7822 --- /dev/null +++ b/assets/minecraft/textures/block/dried_ghast_hydration_1_top.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2d8b7465329124899dcf44a842aaa6be4ff59ac5ea90d5cc22a7d09dedbffa30 +size 161 diff --git a/assets/minecraft/textures/block/dried_ghast_hydration_1_west.png b/assets/minecraft/textures/block/dried_ghast_hydration_1_west.png new file mode 100644 index 00000000..93ee97e2 --- /dev/null +++ b/assets/minecraft/textures/block/dried_ghast_hydration_1_west.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bdbedd081f30802e76861829a0b4f6a69356374220eeeaa22c919a3454aabea5 +size 147 diff --git a/assets/minecraft/textures/block/dried_ghast_hydration_2_bottom.png b/assets/minecraft/textures/block/dried_ghast_hydration_2_bottom.png new file mode 100644 index 00000000..161b5e42 --- /dev/null +++ b/assets/minecraft/textures/block/dried_ghast_hydration_2_bottom.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a5b515bfe02690da836fbe3b1ae1e52e2b511e9decd5d81b82badbff629e2d20 +size 120 diff --git a/assets/minecraft/textures/block/dried_ghast_hydration_2_east.png b/assets/minecraft/textures/block/dried_ghast_hydration_2_east.png new file mode 100644 index 00000000..70d702e2 --- /dev/null +++ b/assets/minecraft/textures/block/dried_ghast_hydration_2_east.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3fcb80d520b176a813fca9f70f8762d0cb9bdd5e7a773c119706dde3850470eb +size 146 diff --git a/assets/minecraft/textures/block/dried_ghast_hydration_2_north.png b/assets/minecraft/textures/block/dried_ghast_hydration_2_north.png new file mode 100644 index 00000000..a9cfa3df --- /dev/null +++ b/assets/minecraft/textures/block/dried_ghast_hydration_2_north.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aa02757a7d007d39ccd42ff49943dfd1f3b4a786926f353798d37731f24329ad +size 152 diff --git a/assets/minecraft/textures/block/dried_ghast_hydration_2_south.png b/assets/minecraft/textures/block/dried_ghast_hydration_2_south.png new file mode 100644 index 00000000..82577503 --- /dev/null +++ b/assets/minecraft/textures/block/dried_ghast_hydration_2_south.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:edf9d90755d15dad9dc10cb606d0bc34899c759b5ee8de2c58fe365ee5e28470 +size 155 diff --git a/assets/minecraft/textures/block/dried_ghast_hydration_2_tentacles.png b/assets/minecraft/textures/block/dried_ghast_hydration_2_tentacles.png new file mode 100644 index 00000000..fb6ea3ba --- /dev/null +++ b/assets/minecraft/textures/block/dried_ghast_hydration_2_tentacles.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6a339ac299858bffbe0f6cd45f485e9a9399b6ed5b184229d764e09c96c51f65 +size 142 diff --git a/assets/minecraft/textures/block/dried_ghast_hydration_2_top.png b/assets/minecraft/textures/block/dried_ghast_hydration_2_top.png new file mode 100644 index 00000000..0722d4fe --- /dev/null +++ b/assets/minecraft/textures/block/dried_ghast_hydration_2_top.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc90f1e79dd883dfff89c1727b29fb4a043a39ef04a6150de104c446ea6cb7c1 +size 161 diff --git a/assets/minecraft/textures/block/dried_ghast_hydration_2_west.png b/assets/minecraft/textures/block/dried_ghast_hydration_2_west.png new file mode 100644 index 00000000..9d2e95bc --- /dev/null +++ b/assets/minecraft/textures/block/dried_ghast_hydration_2_west.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:50f6b2f08073ff3e75b9e95686cffc504f6fc77488a34c63bc5d58a16fa5c5a2 +size 147 diff --git a/assets/minecraft/textures/block/dried_ghast_hydration_3_bottom.png b/assets/minecraft/textures/block/dried_ghast_hydration_3_bottom.png new file mode 100644 index 00000000..1880f7bb --- /dev/null +++ b/assets/minecraft/textures/block/dried_ghast_hydration_3_bottom.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:75ddce4f5b61e85451cb7561c5476aa104780c141177d3a87018be7a5dfafe8c +size 120 diff --git a/assets/minecraft/textures/block/dried_ghast_hydration_3_east.png b/assets/minecraft/textures/block/dried_ghast_hydration_3_east.png new file mode 100644 index 00000000..0232b1b0 --- /dev/null +++ b/assets/minecraft/textures/block/dried_ghast_hydration_3_east.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:873eb3aaa9dc2f0665f04da020c431f78d2585b65a93e144463a98ed8f30b2bd +size 140 diff --git a/assets/minecraft/textures/block/dried_ghast_hydration_3_north.png b/assets/minecraft/textures/block/dried_ghast_hydration_3_north.png new file mode 100644 index 00000000..6918d3f8 --- /dev/null +++ b/assets/minecraft/textures/block/dried_ghast_hydration_3_north.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:baa80eb4f9867cc14e7cd6d6d0e5355b7f2adb52548d5b40f54ea7854fcaa5b1 +size 150 diff --git a/assets/minecraft/textures/block/dried_ghast_hydration_3_south.png b/assets/minecraft/textures/block/dried_ghast_hydration_3_south.png new file mode 100644 index 00000000..94b73534 --- /dev/null +++ b/assets/minecraft/textures/block/dried_ghast_hydration_3_south.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f295c36bbcaf6dfac2445c20f7db86f60ebe617902e85446b52d5068d46a383f +size 152 diff --git a/assets/minecraft/textures/block/dried_ghast_hydration_3_tentacles.png b/assets/minecraft/textures/block/dried_ghast_hydration_3_tentacles.png new file mode 100644 index 00000000..c78a44b4 --- /dev/null +++ b/assets/minecraft/textures/block/dried_ghast_hydration_3_tentacles.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:95e5cb9c7c31a8b446dc3d00e99a140ffd45a803bc892a67ef58e167af432970 +size 142 diff --git a/assets/minecraft/textures/block/dried_ghast_hydration_3_top.png b/assets/minecraft/textures/block/dried_ghast_hydration_3_top.png new file mode 100644 index 00000000..3c4c0e21 --- /dev/null +++ b/assets/minecraft/textures/block/dried_ghast_hydration_3_top.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cb96b00d01129cb9b9954360f1ed40dcbf2b4fff39ccf9fdf632ef1bd82534fc +size 155 diff --git a/assets/minecraft/textures/block/dried_ghast_hydration_3_west.png b/assets/minecraft/textures/block/dried_ghast_hydration_3_west.png new file mode 100644 index 00000000..3602b546 --- /dev/null +++ b/assets/minecraft/textures/block/dried_ghast_hydration_3_west.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb1d16d97b99b54bd4af9147cd63183984567571b607f29a7be13142958f2bb9 +size 139 diff --git a/assets/minecraft/textures/block/dried_kelp_bottom.png b/assets/minecraft/textures/block/dried_kelp_bottom.png index 7be2ab33..fd8e67e3 100644 --- a/assets/minecraft/textures/block/dried_kelp_bottom.png +++ b/assets/minecraft/textures/block/dried_kelp_bottom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3f02f7490b090970df3c6b90f3c6c4f0087f91aa10a5c0ac9355d2ec7f3d9624 -size 241 +oid sha256:cb52e1e63bd0286133535eca5facc62998a61adb2cf8c796c4ff3e1b84f0d83f +size 224 diff --git a/assets/minecraft/textures/block/dried_kelp_side.png b/assets/minecraft/textures/block/dried_kelp_side.png index b93c5d37..4a74d489 100644 --- a/assets/minecraft/textures/block/dried_kelp_side.png +++ b/assets/minecraft/textures/block/dried_kelp_side.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1a00ffc239f8b9aaa020b29e627c80de58801115733dea246d489d0cccfd7e4f -size 233 +oid sha256:f310c35b1fe8222bfb573a1bb007531eff848876ee5eea5c776aa5e27cf1c7c9 +size 223 diff --git a/assets/minecraft/textures/block/dried_kelp_top.png b/assets/minecraft/textures/block/dried_kelp_top.png index ace175e6..b1bd1403 100644 --- a/assets/minecraft/textures/block/dried_kelp_top.png +++ b/assets/minecraft/textures/block/dried_kelp_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6799a88f42f92c6b4adc5e084728fd6517df275016e7bb8f101348f6c0a891a2 -size 238 +oid sha256:5b6b36bca3362e9e2dfa747b5be2fd1e1da96f04e80b83e89242913f66e70c64 +size 222 diff --git a/assets/minecraft/textures/block/dropper_front.png b/assets/minecraft/textures/block/dropper_front.png index 7e5d40d9..6c3b78ae 100644 --- a/assets/minecraft/textures/block/dropper_front.png +++ b/assets/minecraft/textures/block/dropper_front.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7aa94996609498293bb4734f7a71ac3837e809d9bcee489a8fa9794776bad354 -size 263 +oid sha256:4806cb730cec7141443f309306a01ae288d049f113cf75a996d9f8a1c9268c04 +size 253 diff --git a/assets/minecraft/textures/block/dropper_front_vertical.png b/assets/minecraft/textures/block/dropper_front_vertical.png index c5b96fd6..ca0ba717 100644 --- a/assets/minecraft/textures/block/dropper_front_vertical.png +++ b/assets/minecraft/textures/block/dropper_front_vertical.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:83246bc462a73147867e2ece60ff8ce2c4498b000d0c1ed49eced72be69ac42e -size 228 +oid sha256:7864667be602bf4218573675852900ed2b8c55ce1ac2dbde928ed364f21ee5c6 +size 213 diff --git a/assets/minecraft/textures/block/emerald_block.png b/assets/minecraft/textures/block/emerald_block.png index 374676ba..f3ac8216 100644 --- a/assets/minecraft/textures/block/emerald_block.png +++ b/assets/minecraft/textures/block/emerald_block.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ea814555c745af25c199caa155d0816c48424a5cc623454274373db037d5a843 -size 193 +oid sha256:00864ae55266a8116038baeb7f877b0bf61012576d06eda4b97e93cb5e533dff +size 185 diff --git a/assets/minecraft/textures/block/emerald_ore.png b/assets/minecraft/textures/block/emerald_ore.png index 3d4f27bd..f2fa5a4c 100644 --- a/assets/minecraft/textures/block/emerald_ore.png +++ b/assets/minecraft/textures/block/emerald_ore.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:692ef7e7622bab160bc3624bf73697ad4ae7b86173213ab7d2367069ae5c1972 -size 247 +oid sha256:4b67bad7d39643dd712b06d74437aaa17b63bf9cbb77e7dd7a037e352f2407dc +size 229 diff --git a/assets/minecraft/textures/block/enchanting_table_side.png b/assets/minecraft/textures/block/enchanting_table_side.png index 07da2e4d..28c78a91 100644 --- a/assets/minecraft/textures/block/enchanting_table_side.png +++ b/assets/minecraft/textures/block/enchanting_table_side.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7b94e576e7abeace63f32ff372ecdd63717c5c9931da933dc51e01ccddb65934 -size 246 +oid sha256:fed6f599ec71ce4307f6e9d08985dc40bedec60d50033e32c6a3c80496939a6a +size 228 diff --git a/assets/minecraft/textures/block/end_portal_frame_side.png b/assets/minecraft/textures/block/end_portal_frame_side.png index 79732f60..5d88ab3f 100644 --- a/assets/minecraft/textures/block/end_portal_frame_side.png +++ b/assets/minecraft/textures/block/end_portal_frame_side.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dae20a99b71aa031228443e9dde1e7268ea0397df51bb99955f48e3a8b70e525 -size 241 +oid sha256:32d21a1d65a184d20843670d9928464c73fa5a929663a79591f75fd56dc666e7 +size 237 diff --git a/assets/minecraft/textures/block/end_portal_frame_top.png b/assets/minecraft/textures/block/end_portal_frame_top.png index 809aba06..d4785344 100644 --- a/assets/minecraft/textures/block/end_portal_frame_top.png +++ b/assets/minecraft/textures/block/end_portal_frame_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c37045c38c98bfcd6a5c093afb3a155598e9b8f4886ed3597f823818922e468d -size 208 +oid sha256:9f2b9eeee9b8b6d4cf01e3c8ab60f52ccd492886e6832cd8ff5628703f31b134 +size 200 diff --git a/assets/minecraft/textures/block/end_rod.png b/assets/minecraft/textures/block/end_rod.png index 8733a536..c2163405 100644 --- a/assets/minecraft/textures/block/end_rod.png +++ b/assets/minecraft/textures/block/end_rod.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:94f20a6cd82eed61af0597d690f26411f83693ef943f2c0d31d9fa5a5721128e -size 159 +oid sha256:b07e8ff07283460ee6c99cab96a542083dcaa25c82ff960ea994d46bcaa1f8d3 +size 158 diff --git a/assets/minecraft/textures/block/end_stone.png b/assets/minecraft/textures/block/end_stone.png index 8762d5e5..4dc2f3db 100644 --- a/assets/minecraft/textures/block/end_stone.png +++ b/assets/minecraft/textures/block/end_stone.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:48eadb631e434beb46f380440db106519da1e692e74954a8bd2c987d6c978d76 -size 206 +oid sha256:1fd05dbb86e8f49c518cabb82f706b71db6e94f03d9fd2b18f053f8e7a01e498 +size 202 diff --git a/assets/minecraft/textures/block/end_stone_bricks.png b/assets/minecraft/textures/block/end_stone_bricks.png index d330669b..ca552fe1 100644 --- a/assets/minecraft/textures/block/end_stone_bricks.png +++ b/assets/minecraft/textures/block/end_stone_bricks.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cb768956c716d76d5c1c23afa12f3b62940b04fd589dc2b80f01e6c32a6e8ba3 -size 210 +oid sha256:901e935159b9be141d5c3dc8c4f8db26f45db2efd784b9aa3414e5b356f14eb8 +size 199 diff --git a/assets/minecraft/textures/block/exposed_chiseled_copper.png b/assets/minecraft/textures/block/exposed_chiseled_copper.png index 56361673..1fd20288 100644 --- a/assets/minecraft/textures/block/exposed_chiseled_copper.png +++ b/assets/minecraft/textures/block/exposed_chiseled_copper.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0ddaab677b4d4e0123573bc6a14835989f9f724a83d7113b1e9da791032721be -size 216 +oid sha256:9443260f6a62e167a6175e115ade18a2c69e13d905f8148d4d6b5c94f002b13c +size 206 diff --git a/assets/minecraft/textures/block/exposed_copper.png b/assets/minecraft/textures/block/exposed_copper.png index 498dbf85..0b5e0298 100644 --- a/assets/minecraft/textures/block/exposed_copper.png +++ b/assets/minecraft/textures/block/exposed_copper.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c1296b631dae31858d75fddc9cb381375c46b7c42e8254d7cd259738232749e5 -size 222 +oid sha256:cfb6c192d230fa65f83c7691a4e8d5b686d904b1df329949e792ad85ae372fb7 +size 211 diff --git a/assets/minecraft/textures/block/exposed_copper_bulb.png b/assets/minecraft/textures/block/exposed_copper_bulb.png index c2561f7c..c972e934 100644 --- a/assets/minecraft/textures/block/exposed_copper_bulb.png +++ b/assets/minecraft/textures/block/exposed_copper_bulb.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f1d1e2a53117f5d2b4bfaa5c81ea95558f6ef8437fca0af5830550793330f15 -size 244 +oid sha256:b0363108951ab5e1b4e91f4c90006fc5da803629ba80da3deb8d117622db0776 +size 222 diff --git a/assets/minecraft/textures/block/exposed_copper_bulb_lit.png b/assets/minecraft/textures/block/exposed_copper_bulb_lit.png index 6fa2ba9e..02041438 100644 --- a/assets/minecraft/textures/block/exposed_copper_bulb_lit.png +++ b/assets/minecraft/textures/block/exposed_copper_bulb_lit.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b2b086cc6d9d925b765076ed79ea70239943d36c08305c8b6e46f236ea954a53 -size 255 +oid sha256:c0c9e0fe9c8a95f539a4b4175a48ca37f14671e947a65c13827d3d10974632ef +size 254 diff --git a/assets/minecraft/textures/block/exposed_copper_bulb_powered.png b/assets/minecraft/textures/block/exposed_copper_bulb_powered.png index 091ac3dd..f7677c0d 100644 --- a/assets/minecraft/textures/block/exposed_copper_bulb_powered.png +++ b/assets/minecraft/textures/block/exposed_copper_bulb_powered.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a76c2dcafe104311e0f1531659e572f03741d6a128a0f337f300651b076fe2a5 -size 252 +oid sha256:699592514ae11854e307478820e1ae7578111ec7a7a0acbc984371af037a2968 +size 227 diff --git a/assets/minecraft/textures/block/exposed_copper_door_top.png b/assets/minecraft/textures/block/exposed_copper_door_top.png index 77b9438a..f2cc9a07 100644 --- a/assets/minecraft/textures/block/exposed_copper_door_top.png +++ b/assets/minecraft/textures/block/exposed_copper_door_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:35896095545a0fe47f0eaa8a441efa5a682cf1bdadd8d69e6b96f9ea960db389 -size 254 +oid sha256:fd200347e8c55b9c86969994b034e073edb142fadc9cf5786dcbab39ac2b7b8d +size 238 diff --git a/assets/minecraft/textures/block/exposed_copper_grate.png b/assets/minecraft/textures/block/exposed_copper_grate.png index 79268d46..e5e0b43a 100644 --- a/assets/minecraft/textures/block/exposed_copper_grate.png +++ b/assets/minecraft/textures/block/exposed_copper_grate.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0c17c9925e466bf83cbb6d041d6ec2351d584f29108c380c60185c8be3aeedfc -size 242 +oid sha256:c708cec1537c18e27792008c81ed2ed32c08229c4a1112409d2a2474df839c52 +size 228 diff --git a/assets/minecraft/textures/block/exposed_copper_trapdoor.png b/assets/minecraft/textures/block/exposed_copper_trapdoor.png index 1e881939..525e6a4f 100644 --- a/assets/minecraft/textures/block/exposed_copper_trapdoor.png +++ b/assets/minecraft/textures/block/exposed_copper_trapdoor.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:85e1458f9b66ca381e1cc84c5fa84ef0bd8034f9db4b6214f748ceb5736665be -size 239 +oid sha256:eec72d91f424738a11dc9ffbd158723f576adaa68d0478d58c41ccb057eb6eb3 +size 232 diff --git a/assets/minecraft/textures/block/exposed_cut_copper.png b/assets/minecraft/textures/block/exposed_cut_copper.png index d7aeb5c0..f66d95af 100644 --- a/assets/minecraft/textures/block/exposed_cut_copper.png +++ b/assets/minecraft/textures/block/exposed_cut_copper.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d9b05415cf2c424a77d564e3fd73bae6f11f559561f33d2ccd677b3afd0b8583 -size 224 +oid sha256:7d2bd18a2b2d92204face126960c1afdf9564d48be015dc9cce9c63435bdf43f +size 209 diff --git a/assets/minecraft/textures/block/farmland.png b/assets/minecraft/textures/block/farmland.png index 1a5be57e..1ce7d07b 100644 --- a/assets/minecraft/textures/block/farmland.png +++ b/assets/minecraft/textures/block/farmland.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:324fa08c758ea228711d312b6cabec69c5494646173f28b4047372a310573cad -size 186 +oid sha256:bce8e5bdaccdcb5d76e2f5a2b6b6449d7b056566bbeee7769795255b6c187b15 +size 185 diff --git a/assets/minecraft/textures/block/farmland_moist.png b/assets/minecraft/textures/block/farmland_moist.png index 31b3b835..468fab3c 100644 --- a/assets/minecraft/textures/block/farmland_moist.png +++ b/assets/minecraft/textures/block/farmland_moist.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b8f89f1840546beaccd05f2ad340b54e00223fb755d1225c7e2c4c63eacc1c2e -size 190 +oid sha256:28d754ebc6e3aa0c7c8680dc8f3ce18304152cd2d2374a574a66237f4b5b9ecf +size 185 diff --git a/assets/minecraft/textures/block/fern.png b/assets/minecraft/textures/block/fern.png index d45aa2f9..82862571 100644 --- a/assets/minecraft/textures/block/fern.png +++ b/assets/minecraft/textures/block/fern.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c8e5d55a1b10a92cd398540412ebf2f035d14c66aa21ec126bb2da6596f94746 -size 210 +oid sha256:f2297218feef30a1ad5e0a1cc75765e97f64bf9952580a9e2ef2e623fc7f0b41 +size 188 diff --git a/assets/minecraft/textures/block/fire_0.png b/assets/minecraft/textures/block/fire_0.png index 3b8e48a8..6e1912c0 100644 --- a/assets/minecraft/textures/block/fire_0.png +++ b/assets/minecraft/textures/block/fire_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d6d68cbf19f2f9aaed72086069faaedb78b9d8384b55b663fbebb2d02afeb48 -size 11703 +oid sha256:00cd7ff06026f0261b9d8dc4dc492e9e8abebc50b057738d0f3e4a39a3df7a09 +size 8008 diff --git a/assets/minecraft/textures/block/fire_1.png b/assets/minecraft/textures/block/fire_1.png index 5bb63f00..98417613 100644 --- a/assets/minecraft/textures/block/fire_1.png +++ b/assets/minecraft/textures/block/fire_1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0593f9a4ac647db8c300713907edda488e3d442a0cb458af300dcf5a707a4431 -size 12257 +oid sha256:14f2aff3b724d5c0e015536b591d21735f4954bc04241f34f2fc2cbce2f263ec +size 8347 diff --git a/assets/minecraft/textures/block/fire_coral.png b/assets/minecraft/textures/block/fire_coral.png index 30ab0a93..901e98dc 100644 --- a/assets/minecraft/textures/block/fire_coral.png +++ b/assets/minecraft/textures/block/fire_coral.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:da259123de6a38cbb59ac8670d85c9e88c7ea03dd8fd9b148fb918cfe26dc803 -size 189 +oid sha256:a4d5c1c0643f89853cd584aa1f0fdf766e9c8a119e46d2845582a8a0d742a7b3 +size 180 diff --git a/assets/minecraft/textures/block/fire_coral_block.png b/assets/minecraft/textures/block/fire_coral_block.png index 56b0112b..25172db9 100644 --- a/assets/minecraft/textures/block/fire_coral_block.png +++ b/assets/minecraft/textures/block/fire_coral_block.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b2188aa481419260a1dd5602366cc1405cc558525300322c38d8d9eca52337ed -size 195 +oid sha256:4f74c9b20e92e775b6a4c66fe458f0e5f3bc363c3126a3756f905030f74338f4 +size 191 diff --git a/assets/minecraft/textures/block/firefly_bush.png b/assets/minecraft/textures/block/firefly_bush.png index 153c8fe4..dab0b4b6 100644 --- a/assets/minecraft/textures/block/firefly_bush.png +++ b/assets/minecraft/textures/block/firefly_bush.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c8561248bf33ef1dea7ed84a16b3623aa7a974a707c06b3b2a161a122cbe1600 -size 224 +oid sha256:b8e4dcb74551645c1bb1426140cc4fecb0c05d8ffcb5ab4e4f853ea53a33a150 +size 210 diff --git a/assets/minecraft/textures/block/firefly_bush_emissive.png b/assets/minecraft/textures/block/firefly_bush_emissive.png index 3218f922..168ef387 100644 --- a/assets/minecraft/textures/block/firefly_bush_emissive.png +++ b/assets/minecraft/textures/block/firefly_bush_emissive.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9519a8118504163df75438045befeaa440778bbb7c91f38066729be326358399 -size 188 +oid sha256:8739b3b476264a229c572faee038049bd26e0a8e33050be62de352ded21d580c +size 184 diff --git a/assets/minecraft/textures/block/fletching_table_front.png b/assets/minecraft/textures/block/fletching_table_front.png index 1e6a55e2..851c31da 100644 --- a/assets/minecraft/textures/block/fletching_table_front.png +++ b/assets/minecraft/textures/block/fletching_table_front.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aa83a3f74f87645ac98d03109b817ddafc12718c46667d5c4629220055f5aee8 -size 290 +oid sha256:1fef8372dbf5790428505f20ab0679faa77543e75fae2f181da50b19799bb258 +size 286 diff --git a/assets/minecraft/textures/block/fletching_table_side.png b/assets/minecraft/textures/block/fletching_table_side.png index 83d5bfbc..14cee387 100644 --- a/assets/minecraft/textures/block/fletching_table_side.png +++ b/assets/minecraft/textures/block/fletching_table_side.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2b79c47255f816fef4b61e1f763469a6f58693be78acee7e87036e39b6f6059e -size 370 +oid sha256:caf955475352ff9dac7296259bbf78044c45319caa79325528c3e388094ce39e +size 365 diff --git a/assets/minecraft/textures/block/fletching_table_top.png b/assets/minecraft/textures/block/fletching_table_top.png index 447bb6c4..86f97031 100644 --- a/assets/minecraft/textures/block/fletching_table_top.png +++ b/assets/minecraft/textures/block/fletching_table_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:38a98dcc3722bc4aeeeadae699f58c4d75f2aeb77bdcc9f1da78197f89f9db57 -size 255 +oid sha256:5287b6e5fbbf56e3d7ca28cb1094ef9dfb7656a435a25dc140dece576db79386 +size 236 diff --git a/assets/minecraft/textures/block/flower_pot.png b/assets/minecraft/textures/block/flower_pot.png index 1a15331d..c73ad180 100644 --- a/assets/minecraft/textures/block/flower_pot.png +++ b/assets/minecraft/textures/block/flower_pot.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7c72119fc47918edeedb19d83e52ab3eb73953af03868780b02ae1249236f60d -size 149 +oid sha256:46224a661a0ede6b3e994ad852b3e8cdf45322436eb88f648f33dc38e1a7ae3e +size 148 diff --git a/assets/minecraft/textures/block/flowering_azalea_leaves.png b/assets/minecraft/textures/block/flowering_azalea_leaves.png index d6bb26d2..871f9796 100644 --- a/assets/minecraft/textures/block/flowering_azalea_leaves.png +++ b/assets/minecraft/textures/block/flowering_azalea_leaves.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:df9e52332b4b23dcab17c7a756b8e8875e669595b52558aa4a8a77a84d9221c9 -size 232 +oid sha256:b6e494ed60f5e4fa2704645777d56d585ac0aa4b2c7493879f286a954ce9a9d6 +size 220 diff --git a/assets/minecraft/textures/block/flowering_azalea_side.png b/assets/minecraft/textures/block/flowering_azalea_side.png index f376d1f3..4eb7c2cb 100644 --- a/assets/minecraft/textures/block/flowering_azalea_side.png +++ b/assets/minecraft/textures/block/flowering_azalea_side.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2e11f7d11958171e8a5a12ca279ee5345f70b7c6960cf02079220d8e06a2c269 -size 219 +oid sha256:6f620b0436cb72a7845f22046670aeccbc9bc63f6d594fd3e05c10639e76bdad +size 214 diff --git a/assets/minecraft/textures/block/flowering_azalea_top.png b/assets/minecraft/textures/block/flowering_azalea_top.png index 76316f2a..158e7158 100644 --- a/assets/minecraft/textures/block/flowering_azalea_top.png +++ b/assets/minecraft/textures/block/flowering_azalea_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8a44e507048de271ef83b99edccc82b93e28d6f60ac9b1bf24db43f28287633e -size 221 +oid sha256:cb276e1f266d770dd33fa89a95b87da96adf8935ea9573977433fb18c9cc6ece +size 219 diff --git a/assets/minecraft/textures/block/frogspawn.png b/assets/minecraft/textures/block/frogspawn.png index 5e3973bc..110c0ba2 100644 --- a/assets/minecraft/textures/block/frogspawn.png +++ b/assets/minecraft/textures/block/frogspawn.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bb4b2e237b596c86f0b24ebe529805c49126314799d8ecb767417f92a58c7b00 -size 157 +oid sha256:0a4a78ef05f9ddce1a634301f1a62cb87d5bfb6bc847353e40f27f434c2d4f42 +size 153 diff --git a/assets/minecraft/textures/block/frosted_ice_0.png b/assets/minecraft/textures/block/frosted_ice_0.png index ffbe4986..9ae8f5c4 100644 --- a/assets/minecraft/textures/block/frosted_ice_0.png +++ b/assets/minecraft/textures/block/frosted_ice_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dcf67bf09fbc1ae5479daf8f0670b059cfe12c6650af10476c9a805a9231fc75 -size 199 +oid sha256:a1932db971ea4914a4f7ecac138b8596cc12f3ae1692100ac1167768b08078bb +size 188 diff --git a/assets/minecraft/textures/block/frosted_ice_1.png b/assets/minecraft/textures/block/frosted_ice_1.png index 518a3688..831d1785 100644 --- a/assets/minecraft/textures/block/frosted_ice_1.png +++ b/assets/minecraft/textures/block/frosted_ice_1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c33821278f0d231467fcbb2c7f3a640c261dbf7ea509d8406c8c384489273383 -size 254 +oid sha256:e6c2bb0dc3467f5edc501ae4d3cf87f3ad6977d322d4f65bf25882a2e9fe8696 +size 236 diff --git a/assets/minecraft/textures/block/frosted_ice_2.png b/assets/minecraft/textures/block/frosted_ice_2.png index 75e1401c..f91b33ca 100644 --- a/assets/minecraft/textures/block/frosted_ice_2.png +++ b/assets/minecraft/textures/block/frosted_ice_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:766c0b2fd40680561fe1f4b58a50e06fb58f36b947ccbc7cf1662daea86b834b -size 303 +oid sha256:c72f72f3b337b0a7b8b306b2f5157741acbe29aa54d5cf03dfc3ed32bfeff8ff +size 292 diff --git a/assets/minecraft/textures/block/frosted_ice_3.png b/assets/minecraft/textures/block/frosted_ice_3.png index 96ecce90..0d8533da 100644 --- a/assets/minecraft/textures/block/frosted_ice_3.png +++ b/assets/minecraft/textures/block/frosted_ice_3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e147fcc5c1bbb0062511b916fbf3cb7edb59796fe0ad4873823a3e81c51ddb75 -size 334 +oid sha256:0d49eabd43f501b23de0a407999ba6d806d928b0e78cd19ac1a2261b493ff6e9 +size 325 diff --git a/assets/minecraft/textures/block/furnace_front.png b/assets/minecraft/textures/block/furnace_front.png index 680d87ff..abe0e8f2 100644 --- a/assets/minecraft/textures/block/furnace_front.png +++ b/assets/minecraft/textures/block/furnace_front.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:809df7f59ef95a65da1dc2c7c86b5c6288a93dea2fde8ee506ee1e2b753397cb -size 254 +oid sha256:aae808f71f1bddf4a25592f7dd3d7f6e9b3adaa739502170766424f4eb6bf9c5 +size 224 diff --git a/assets/minecraft/textures/block/furnace_side.png b/assets/minecraft/textures/block/furnace_side.png index 2fc059dd..32e2520e 100644 --- a/assets/minecraft/textures/block/furnace_side.png +++ b/assets/minecraft/textures/block/furnace_side.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3e3673a0c87a636b51e6ceb33081dda1fd3c89fe0c013d69c0244487e3b65d52 -size 243 +oid sha256:cada9065da8d26b3a7324a203edb42f2564975519e8504d520e10d530822bb5b +size 228 diff --git a/assets/minecraft/textures/block/furnace_top.png b/assets/minecraft/textures/block/furnace_top.png index 936ea1f3..bf74c024 100644 --- a/assets/minecraft/textures/block/furnace_top.png +++ b/assets/minecraft/textures/block/furnace_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d92e36ac9025e4cb46e450ac3bd21692f50c54ebc9373c512530247fc1c2b65c -size 215 +oid sha256:59e26149cde8b86ea1d165c1a4ba5c44531a4b7be134b30c93120bba1cefb162 +size 208 diff --git a/assets/minecraft/textures/block/gilded_blackstone.png b/assets/minecraft/textures/block/gilded_blackstone.png index d809ade1..d7940b35 100644 --- a/assets/minecraft/textures/block/gilded_blackstone.png +++ b/assets/minecraft/textures/block/gilded_blackstone.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9eb2e4dfa30c1101f107b15b6339ab3b9f04cca761bbdf93bc44a6315e5aab86 -size 240 +oid sha256:d192fce017d850d0adfc1f6bd1f9586244923e1cdb81b70d59ae8a6d2c104ae1 +size 221 diff --git a/assets/minecraft/textures/block/glass_pane_top.png b/assets/minecraft/textures/block/glass_pane_top.png index 91a98edc..e04c1f20 100644 --- a/assets/minecraft/textures/block/glass_pane_top.png +++ b/assets/minecraft/textures/block/glass_pane_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cf813fd7c62ff76a81a5d1a55df02bd9f7565be23539a8896b757eff468ec3de -size 116 +oid sha256:9473b8b4dcd8d9a54f54ddc1df4d049fef9a6f4662f8a9b15fa06cc3e2d285b6 +size 114 diff --git a/assets/minecraft/textures/block/glow_item_frame.png b/assets/minecraft/textures/block/glow_item_frame.png index ac3c7a10..ee59a8db 100644 --- a/assets/minecraft/textures/block/glow_item_frame.png +++ b/assets/minecraft/textures/block/glow_item_frame.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d39028d4cd6470061fec217010329bc62a981f339687247bbd8feb4bd6c760b -size 248 +oid sha256:435047d9973fc00d729b6470c323fb37d4c9db38b346ef559e021fa76442a51f +size 236 diff --git a/assets/minecraft/textures/block/glow_lichen.png b/assets/minecraft/textures/block/glow_lichen.png index 4caeabe2..56584ca2 100644 --- a/assets/minecraft/textures/block/glow_lichen.png +++ b/assets/minecraft/textures/block/glow_lichen.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:271996002fe57d21fcd1c42413d33cdbbffbb3d78e05a3e66c2a1332ac0ec404 -size 196 +oid sha256:2ceca88f67b0d3275e222191738902984a374d4872cfce8926973ad7b193f0d2 +size 184 diff --git a/assets/minecraft/textures/block/gold_block.png b/assets/minecraft/textures/block/gold_block.png index d0890aba..df99df18 100644 --- a/assets/minecraft/textures/block/gold_block.png +++ b/assets/minecraft/textures/block/gold_block.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a66720b7a7a3a253ae02ac9ebafeb74fbe1e933dac1c752c8cd18bcd75422509 -size 218 +oid sha256:75d99ac8de448cfbf35a5688b773dac2c517ca696fe87459b63115af3794937b +size 199 diff --git a/assets/minecraft/textures/block/gold_ore.png b/assets/minecraft/textures/block/gold_ore.png index 1834d494..b5a50474 100644 --- a/assets/minecraft/textures/block/gold_ore.png +++ b/assets/minecraft/textures/block/gold_ore.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e9228a6ea34328cf37dadef5953f4474ccc7321ab34bf1656dda3effb02eb69d -size 241 +oid sha256:5253e5a8ea32739a5c8cb1d844f0e46c8c85641f77c3d07dcc03645e2914dd1f +size 225 diff --git a/assets/minecraft/textures/block/grass_block_side.png b/assets/minecraft/textures/block/grass_block_side.png index 7f7fdcf8..811ccb77 100644 --- a/assets/minecraft/textures/block/grass_block_side.png +++ b/assets/minecraft/textures/block/grass_block_side.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ab572ac7ebd373abdeb961de1f3cba0afcd91e1acb700745ece4f719790bae3d -size 345 +oid sha256:76a677640eb91d6a9aed844bc66e329b1894f89e241a0071333b6678c0854580 +size 329 diff --git a/assets/minecraft/textures/block/grass_block_side_overlay.png b/assets/minecraft/textures/block/grass_block_side_overlay.png index f98cf4d3..a9596e57 100644 --- a/assets/minecraft/textures/block/grass_block_side_overlay.png +++ b/assets/minecraft/textures/block/grass_block_side_overlay.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:43d98318407d9d122b83468cf183d18722e548c2144f9c2ffe2021b5c3e770e0 -size 177 +oid sha256:872056682c3b059c04aba88f8b4e706f2526b907e1acef12626a9f912f573a85 +size 135 diff --git a/assets/minecraft/textures/block/grass_block_snow.png b/assets/minecraft/textures/block/grass_block_snow.png index 11caefb3..b6d39011 100644 --- a/assets/minecraft/textures/block/grass_block_snow.png +++ b/assets/minecraft/textures/block/grass_block_snow.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:11d95dcc86bfedd82b6c291e043c98df1f9779098afdd2a9f1d4627ab0150d30 -size 251 +oid sha256:8802c885e4d689be9c85102ca3e4469ef2f6e382603a811bdc3b65fbcf76c0df +size 247 diff --git a/assets/minecraft/textures/block/gravel.png b/assets/minecraft/textures/block/gravel.png index 5c030eb3..f6eeabfa 100644 --- a/assets/minecraft/textures/block/gravel.png +++ b/assets/minecraft/textures/block/gravel.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cc9feb24f18337c9a4f01ca0c28a61bc2f0c629962d4f002c23623528c5ca0ea -size 216 +oid sha256:bc1558fa64b238fabca4cc957e61c232337d410495784b106676bf73e52e16e0 +size 199 diff --git a/assets/minecraft/textures/block/gray_candle.png b/assets/minecraft/textures/block/gray_candle.png index e70dc3e5..9f889a01 100644 --- a/assets/minecraft/textures/block/gray_candle.png +++ b/assets/minecraft/textures/block/gray_candle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4e14ebdab8ceef3fa3e0322a88ec99e7adf8713013d1d418575c958a01c19119 -size 127 +oid sha256:8621ff3d1d987c11f2e9c99f7b34075bc0e5bff4f8f46ce89037b2e1adbbdffc +size 117 diff --git a/assets/minecraft/textures/block/gray_concrete.png b/assets/minecraft/textures/block/gray_concrete.png index 23ef046a..fe544922 100644 --- a/assets/minecraft/textures/block/gray_concrete.png +++ b/assets/minecraft/textures/block/gray_concrete.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cf20082db6204d0abe96f4ae66569d45e3f5d111be39f2c4426806c6b20e4c10 -size 154 +oid sha256:a760d9bc6255fc2c1bcbe481b57a8a242687eda6c64459812398d7c40c9769bc +size 153 diff --git a/assets/minecraft/textures/block/gray_concrete_powder.png b/assets/minecraft/textures/block/gray_concrete_powder.png index a3d36edd..c35779a9 100644 --- a/assets/minecraft/textures/block/gray_concrete_powder.png +++ b/assets/minecraft/textures/block/gray_concrete_powder.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6a2c438d6664e538f0ae514dd7f817697eacb291a41b4542600f0295635d6c50 -size 493 +oid sha256:df036a8b6889e6e99e30535e0e34003ed540ddcc5882d10515f12b306eb0664b +size 486 diff --git a/assets/minecraft/textures/block/gray_glazed_terracotta.png b/assets/minecraft/textures/block/gray_glazed_terracotta.png index 790200cf..c77bdc7e 100644 --- a/assets/minecraft/textures/block/gray_glazed_terracotta.png +++ b/assets/minecraft/textures/block/gray_glazed_terracotta.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eee973fabd139e7703f7e65317482be50083c3732cf83ef62a5af00e36d15da9 -size 266 +oid sha256:7ccff43032955c3ffe697f2d622997163ab379aaea1454ccc425442ea044fc0a +size 251 diff --git a/assets/minecraft/textures/block/gray_shulker_box.png b/assets/minecraft/textures/block/gray_shulker_box.png index 7105052d..2d90e59e 100644 --- a/assets/minecraft/textures/block/gray_shulker_box.png +++ b/assets/minecraft/textures/block/gray_shulker_box.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:31a9d334afc1582655adbb6eab300caa8719431de21077ca39ed5352956455c4 -size 274 +oid sha256:e3180430b21242cb26720e6acf327758a485ef1d4ee8575cd0fdd40420bdd503 +size 271 diff --git a/assets/minecraft/textures/block/gray_stained_glass.png b/assets/minecraft/textures/block/gray_stained_glass.png index b1a9f968..750ec114 100644 --- a/assets/minecraft/textures/block/gray_stained_glass.png +++ b/assets/minecraft/textures/block/gray_stained_glass.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef63e3fa74f2dda2c65c0946698493e063f42f4b9f411abaa03b98ea57499e6d -size 105 +oid sha256:47801cab3d0e381acd50c3d1a3dfb26ef4c17b12a8fba8b9ca1380606f12ecda +size 100 diff --git a/assets/minecraft/textures/block/gray_stained_glass_pane_top.png b/assets/minecraft/textures/block/gray_stained_glass_pane_top.png index bd47290b..1b83af28 100644 --- a/assets/minecraft/textures/block/gray_stained_glass_pane_top.png +++ b/assets/minecraft/textures/block/gray_stained_glass_pane_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:15ca80d3ed449ec6d6ada0d9ee9d842304785ce8796cd2a4bb7d7433b6d9b487 -size 119 +oid sha256:6bb179383dac91d8a9985530f9ddb8cf621ed98741e716d3891314699fa4818b +size 103 diff --git a/assets/minecraft/textures/block/gray_terracotta.png b/assets/minecraft/textures/block/gray_terracotta.png index 01317c62..9e3c7662 100644 --- a/assets/minecraft/textures/block/gray_terracotta.png +++ b/assets/minecraft/textures/block/gray_terracotta.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e81447ecbe3ab9478ac8a8c9f472ddc2c770924ef55416a468000d3dc0530cdc -size 351 +oid sha256:4c058f690eb0e0e108a98de8e3cea35ec6f3a61b0b39bff76075a387b719d1f3 +size 319 diff --git a/assets/minecraft/textures/block/gray_wool.png b/assets/minecraft/textures/block/gray_wool.png index 12f86252..41456a82 100644 --- a/assets/minecraft/textures/block/gray_wool.png +++ b/assets/minecraft/textures/block/gray_wool.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aabf83cf9dc5eb7ed254405e2fb312974e26198b3b2fcd0640b67fa9368cd654 -size 374 +oid sha256:0945d38cc78c67a8ba9f8cf0c2a86a0ba3487c9dfbafaed20e3259cf86806c54 +size 372 diff --git a/assets/minecraft/textures/block/green_candle.png b/assets/minecraft/textures/block/green_candle.png index 519d3b7b..4b0fb0d1 100644 --- a/assets/minecraft/textures/block/green_candle.png +++ b/assets/minecraft/textures/block/green_candle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6fb4273d04d0e40ffbc4a0047665b1a0c96864c631c5b1c5b696202dedefc2ff -size 127 +oid sha256:85bab5b1b1c2bc1ee3a167a4f84ea9be0a86233b6ae25db5b884e7c214986aa2 +size 117 diff --git a/assets/minecraft/textures/block/green_candle_lit.png b/assets/minecraft/textures/block/green_candle_lit.png index 13e89f30..2a05e0a1 100644 --- a/assets/minecraft/textures/block/green_candle_lit.png +++ b/assets/minecraft/textures/block/green_candle_lit.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7ce9abdb398e7d947e199d5c3e35b760e051f0d0016da816cbf7f0737a6fcf7e -size 135 +oid sha256:ffde40e18548a0ea5867ed6d6c374a216e91512eb47ec59429a434a002964ba5 +size 134 diff --git a/assets/minecraft/textures/block/green_concrete.png b/assets/minecraft/textures/block/green_concrete.png index 9e692190..55a60df3 100644 --- a/assets/minecraft/textures/block/green_concrete.png +++ b/assets/minecraft/textures/block/green_concrete.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5b6fcfbd33ba882074a83620449719c93cc49300e7973606ccaae5d57419456d -size 181 +oid sha256:42bf8de7fd911c4f649f03eb428e35bd303a571f012046b929bea9070ab37f34 +size 174 diff --git a/assets/minecraft/textures/block/green_glazed_terracotta.png b/assets/minecraft/textures/block/green_glazed_terracotta.png index 931e1916..f1d4138e 100644 --- a/assets/minecraft/textures/block/green_glazed_terracotta.png +++ b/assets/minecraft/textures/block/green_glazed_terracotta.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4bb8385303f9605b3b171754d50871329e4388042b6ac2574ba0449b744e6c36 -size 272 +oid sha256:59fa7f7971e797720faba637b97da3e62876056766b56072c6d0968feae72fdc +size 271 diff --git a/assets/minecraft/textures/block/green_shulker_box.png b/assets/minecraft/textures/block/green_shulker_box.png index 22f99e0b..b90c0851 100644 --- a/assets/minecraft/textures/block/green_shulker_box.png +++ b/assets/minecraft/textures/block/green_shulker_box.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:10246dfb33cb087628f15feee066eafa2a61f06228a33b9bd9e4a0e492a99a31 -size 281 +oid sha256:703e35594326d44b7bb61e3e81d03f5270ee38a91e3d174aae8c5663a93fca11 +size 277 diff --git a/assets/minecraft/textures/block/green_stained_glass_pane_top.png b/assets/minecraft/textures/block/green_stained_glass_pane_top.png index 83910a67..9a503e75 100644 --- a/assets/minecraft/textures/block/green_stained_glass_pane_top.png +++ b/assets/minecraft/textures/block/green_stained_glass_pane_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:578f59519229f5834086cb60fcad76d428f92086b2ac704cd1f07dca2a911f25 -size 119 +oid sha256:cc73cc240f32e24fd72d368772b286424e18d73643d33839a312c373445ee12a +size 117 diff --git a/assets/minecraft/textures/block/green_terracotta.png b/assets/minecraft/textures/block/green_terracotta.png index 5cff7c8b..6af34623 100644 --- a/assets/minecraft/textures/block/green_terracotta.png +++ b/assets/minecraft/textures/block/green_terracotta.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5d5b1ccbfe807da597a8622a7e7fbf0f1686a3174b259446510a524e96a2e1af -size 394 +oid sha256:ffe10089bcef9873c74f18be35e605c5d035f472c06bf677746d39ff8a656c07 +size 362 diff --git a/assets/minecraft/textures/block/green_wool.png b/assets/minecraft/textures/block/green_wool.png index 85a43955..5607e054 100644 --- a/assets/minecraft/textures/block/green_wool.png +++ b/assets/minecraft/textures/block/green_wool.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f327ad998ee5e5a25a5b0f7beaafe3ee13f88f2694600597e1267efe296bd3e -size 386 +oid sha256:a2cd93d4bcead9b808d367fefa17081e12e5bd96ebff6993fc3d486422ecb9ad +size 384 diff --git a/assets/minecraft/textures/block/grindstone_round.png b/assets/minecraft/textures/block/grindstone_round.png index b3468cb1..48de4f7d 100644 --- a/assets/minecraft/textures/block/grindstone_round.png +++ b/assets/minecraft/textures/block/grindstone_round.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9ff29fd315f83013e7d14421a7ecb319734da47982b7d569da09f6a67a8584ee -size 176 +oid sha256:d353bc51fe47c4b477360ef55f08632d44d6fde713a5c5177dd228119da1b373 +size 150 diff --git a/assets/minecraft/textures/block/grindstone_side.png b/assets/minecraft/textures/block/grindstone_side.png index 8cf162eb..b2e250a9 100644 --- a/assets/minecraft/textures/block/grindstone_side.png +++ b/assets/minecraft/textures/block/grindstone_side.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a9227f68ebe86622d9e9f1db8dfa674ac4fbeea4c3e6275a156de3fbbc40d49c -size 204 +oid sha256:bce35de490d1c22c5937abb5264f3bc1bd1629071010787b827b9bd0ddd5ead3 +size 167 diff --git a/assets/minecraft/textures/block/hay_block_side.png b/assets/minecraft/textures/block/hay_block_side.png index 1f3c6728..c448c1c5 100644 --- a/assets/minecraft/textures/block/hay_block_side.png +++ b/assets/minecraft/textures/block/hay_block_side.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b0181d301e7819daa8719067c616ca47aab766e538cdaf1f722a711efac3ea6f -size 202 +oid sha256:02ee6ed996363e25cf2ae47043f3af8b775ff788099ff00ebcde7c9ca9fa6cd5 +size 196 diff --git a/assets/minecraft/textures/block/honey_block_bottom.png b/assets/minecraft/textures/block/honey_block_bottom.png index 601b33f3..fbb22c4b 100644 --- a/assets/minecraft/textures/block/honey_block_bottom.png +++ b/assets/minecraft/textures/block/honey_block_bottom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e26698888bcdb6c7d8798ab7b9a92d665cba3b8517be0ada357596460060f58 -size 199 +oid sha256:f94579b58d12b57573dacee815ffc8e24f0cd7c283683fd651041fab268ebbca +size 198 diff --git a/assets/minecraft/textures/block/honey_block_side.png b/assets/minecraft/textures/block/honey_block_side.png index 7780efdd..54e411c7 100644 --- a/assets/minecraft/textures/block/honey_block_side.png +++ b/assets/minecraft/textures/block/honey_block_side.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8c2cda947179a75d5d17b63d039d250e660f97ae7c51ab82ef0aa195733da43f -size 213 +oid sha256:3dd769e70cff0d4900e9e1713d8a5ef2c50376687888779feafae3a98898e316 +size 211 diff --git a/assets/minecraft/textures/block/honey_block_top.png b/assets/minecraft/textures/block/honey_block_top.png index a1905340..1a066f94 100644 --- a/assets/minecraft/textures/block/honey_block_top.png +++ b/assets/minecraft/textures/block/honey_block_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aa6a49f5c548aba677c7957431d26bd4066034de3ba702abd4dee7e34cd751f8 -size 211 +oid sha256:ba036bec3694c130edb6d7382fd81f01348749b8efef7f3599ef5c5cc93f878e +size 205 diff --git a/assets/minecraft/textures/block/honeycomb_block.png b/assets/minecraft/textures/block/honeycomb_block.png index bdf6c53c..164b1617 100644 --- a/assets/minecraft/textures/block/honeycomb_block.png +++ b/assets/minecraft/textures/block/honeycomb_block.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:211b71fe068c63cc4fccd1cce7a95ee471a4121e349f3ad1f6a1e1f37b3632b0 -size 199 +oid sha256:0d6b5ade9957457520f113c258412545cc6c06a1d72a60a67470da2333c3bdbf +size 196 diff --git a/assets/minecraft/textures/block/hopper_inside.png b/assets/minecraft/textures/block/hopper_inside.png index cdea1b3f..65279400 100644 --- a/assets/minecraft/textures/block/hopper_inside.png +++ b/assets/minecraft/textures/block/hopper_inside.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a7e398c824f90fcb3b05b952a585fcaffc6272b5c90e43891d1e22164994c9d3 -size 165 +oid sha256:28bc729c234075ad5c375bd2bf9681f9a6f217119223a8910fd7b2b20e4a07eb +size 154 diff --git a/assets/minecraft/textures/block/hopper_outside.png b/assets/minecraft/textures/block/hopper_outside.png index c1abb66b..3862c707 100644 --- a/assets/minecraft/textures/block/hopper_outside.png +++ b/assets/minecraft/textures/block/hopper_outside.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0eb22f306e0c62fd704326f835e9a70b8ac6d88217c7a8d4e1de45e6ac2494ef -size 189 +oid sha256:83ccaffd41564465b45997c5f171a3af354d6951e4c4472fe1d1d953c4f57685 +size 177 diff --git a/assets/minecraft/textures/block/horn_coral.png b/assets/minecraft/textures/block/horn_coral.png index 2a0cc9bc..67d8fbf7 100644 --- a/assets/minecraft/textures/block/horn_coral.png +++ b/assets/minecraft/textures/block/horn_coral.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cee974b81a32df1c6aad86dfa6b03fd1b5dbbe274af1ade3cd0a4250528ef67a -size 203 +oid sha256:0a40e26fa2dcdc79bba10e721bba11fe4e42e3b7c41ef2219afd851daee5398d +size 189 diff --git a/assets/minecraft/textures/block/horn_coral_block.png b/assets/minecraft/textures/block/horn_coral_block.png index 86c20b7c..6bd5d8b5 100644 --- a/assets/minecraft/textures/block/horn_coral_block.png +++ b/assets/minecraft/textures/block/horn_coral_block.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e6a57b447ee8fbadf2f67f5636334e8e6004cb1bcc249f20501917628e63f68a -size 206 +oid sha256:fda1b1aff7b2b87706e7049c61baeca7948e37d203a6d63b0c4bec9280112efc +size 202 diff --git a/assets/minecraft/textures/block/horn_coral_fan.png b/assets/minecraft/textures/block/horn_coral_fan.png index 45ae3d9e..3a0d4c32 100644 --- a/assets/minecraft/textures/block/horn_coral_fan.png +++ b/assets/minecraft/textures/block/horn_coral_fan.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:65f51ffdbeca97909c40b5799773f203c53f0e1055500585fddd65bd76b06d8e -size 183 +oid sha256:d5026b609ea3180995d0b617caf92cf6ad3e5f8cbe1e449da5572e6865559edb +size 175 diff --git a/assets/minecraft/textures/block/ice.png b/assets/minecraft/textures/block/ice.png index 1b55fa37..03607d9b 100644 --- a/assets/minecraft/textures/block/ice.png +++ b/assets/minecraft/textures/block/ice.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4d158c24f2ec563d52806642ac7f4e20a5bda168af8c2ae528ed8e9ef1a58771 -size 205 +oid sha256:3049e6ae0c7d0625bb92238e69a520fa2e4f1067f234653b20dc91b1d84b07ad +size 196 diff --git a/assets/minecraft/textures/block/iron_bars.png b/assets/minecraft/textures/block/iron_bars.png index 5dcb5289..421a5044 100644 --- a/assets/minecraft/textures/block/iron_bars.png +++ b/assets/minecraft/textures/block/iron_bars.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7a1e5a72fa4d1e37e1077b79a4fe7b3df9b158ad5eefa921d2afbea8cba6d4c5 -size 193 +oid sha256:55c60ab25a9ef48ece153a10f6195cdc890dbb3a1c667362e323e1f8ea08bfce +size 183 diff --git a/assets/minecraft/textures/block/iron_block.png b/assets/minecraft/textures/block/iron_block.png index 5d6bc55d..098ae355 100644 --- a/assets/minecraft/textures/block/iron_block.png +++ b/assets/minecraft/textures/block/iron_block.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:910646c90f391ec42cfebdd356ed1e1be36ad513a684a930e38c36ab610a7a24 -size 184 +oid sha256:dafa9944ba49fe71958553eded50e87d7bea9c7410cfe568745989bede101c49 +size 169 diff --git a/assets/minecraft/textures/block/iron_door_bottom.png b/assets/minecraft/textures/block/iron_door_bottom.png index 7c11f29f..45db84da 100644 --- a/assets/minecraft/textures/block/iron_door_bottom.png +++ b/assets/minecraft/textures/block/iron_door_bottom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:70126b91566a6f743838d0e3f4054e29dc9291a45a41376178ff4a7991f657d2 -size 198 +oid sha256:e9d6c7dc182ca275a3d455ba28a8df325d1ad0c1539aace4ee11d0359f6fc83a +size 190 diff --git a/assets/minecraft/textures/block/iron_ore.png b/assets/minecraft/textures/block/iron_ore.png index 4c93a3b1..c927faa6 100644 --- a/assets/minecraft/textures/block/iron_ore.png +++ b/assets/minecraft/textures/block/iron_ore.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d3a50d2c689f8ade6445488f2edc68ca107c343ef09df8eaa27e51aa83d5a5ed -size 222 +oid sha256:72fb64f5a1c7ef0c356b1510b84174576d8cca5ae1de3bb9fa41e3dd1a7a2719 +size 212 diff --git a/assets/minecraft/textures/block/item_frame.png b/assets/minecraft/textures/block/item_frame.png index 14483537..ebcfe822 100644 --- a/assets/minecraft/textures/block/item_frame.png +++ b/assets/minecraft/textures/block/item_frame.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9f4c1ec124a30e4f3583278e22e25e1617719a4178ec5b98cf9eac837e5a1c5a -size 243 +oid sha256:ebe9f80167cd15bbcd38cb92cbce4393672e128210aa02ef4266213f78b9d978 +size 226 diff --git a/assets/minecraft/textures/block/jack_o_lantern.png b/assets/minecraft/textures/block/jack_o_lantern.png index 152070e4..d73d64ed 100644 --- a/assets/minecraft/textures/block/jack_o_lantern.png +++ b/assets/minecraft/textures/block/jack_o_lantern.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:04a4e4460fbba1a9e61045f4f2a5cc670d9c2ce93dcb7f41e2b3eed6d62e911d -size 234 +oid sha256:683f28ce2b158ca82e12b1d8aae379798b556b430115b7b84bf10a2f62d9ebf5 +size 221 diff --git a/assets/minecraft/textures/block/jigsaw_bottom.png b/assets/minecraft/textures/block/jigsaw_bottom.png index 48eba12e..001a503e 100644 --- a/assets/minecraft/textures/block/jigsaw_bottom.png +++ b/assets/minecraft/textures/block/jigsaw_bottom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:30f6462f651c078032de2dbe3f085d03450420e5b90df5f49c61296ccec76aef -size 113 +oid sha256:ab83f6b7f99c86417a9a278dc457828ffb8b88a9a02ab39c67cc9e36446ff2e6 +size 112 diff --git a/assets/minecraft/textures/block/jigsaw_lock.png b/assets/minecraft/textures/block/jigsaw_lock.png index a190bd67..a4987e97 100644 --- a/assets/minecraft/textures/block/jigsaw_lock.png +++ b/assets/minecraft/textures/block/jigsaw_lock.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0fc8dd869c8fc9e9c5ca72a980839f651ebee48b413d36da34f2e598fa2e79e9 -size 145 +oid sha256:19cee59bed08740f1d4e780d04aecb8ee3f7089f08002d8ddcb90f86a0253ed9 +size 142 diff --git a/assets/minecraft/textures/block/jigsaw_side.png b/assets/minecraft/textures/block/jigsaw_side.png index fba62b3f..8bed1afc 100644 --- a/assets/minecraft/textures/block/jigsaw_side.png +++ b/assets/minecraft/textures/block/jigsaw_side.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a5f58c4ead4f619200084b58533f3a0048f198f5a03f2f499a6b35673ebe54e7 -size 211 +oid sha256:7cc0681c1cdce51371ed263f0d66b1efcac97d7860786ca3ae2208c37e8feea1 +size 191 diff --git a/assets/minecraft/textures/block/jigsaw_top.png b/assets/minecraft/textures/block/jigsaw_top.png index 7b731e31..ad645f85 100644 --- a/assets/minecraft/textures/block/jigsaw_top.png +++ b/assets/minecraft/textures/block/jigsaw_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f4bee17064681c184719723f966193d5597adcfe7b56f59e01c456652d927c60 -size 221 +oid sha256:da94bf115d322f8a30cbafe1e172a50ee39136f00743087cf4cbdb3d02457316 +size 206 diff --git a/assets/minecraft/textures/block/jukebox_side.png b/assets/minecraft/textures/block/jukebox_side.png index c4b87a3a..a4fbe912 100644 --- a/assets/minecraft/textures/block/jukebox_side.png +++ b/assets/minecraft/textures/block/jukebox_side.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f1d496c7ed21c63382fb517527549961252283221c837c1850761bc98eaa82f -size 174 +oid sha256:ce5e56da299713779c49b55fcdb705fbdc1381d4f449615b932877ba13c9fabb +size 172 diff --git a/assets/minecraft/textures/block/jukebox_top.png b/assets/minecraft/textures/block/jukebox_top.png index 972d94d8..c158df37 100644 --- a/assets/minecraft/textures/block/jukebox_top.png +++ b/assets/minecraft/textures/block/jukebox_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:846ea82ea7764212dbe90528513399cb409f4ec9edf514e8e1b97c85295bfacc -size 179 +oid sha256:e03e910eeac1f84a5694045902504a9cdd832a143374a2857f9e25a7f83f80a5 +size 169 diff --git a/assets/minecraft/textures/block/jungle_door_bottom.png b/assets/minecraft/textures/block/jungle_door_bottom.png index 06402746..58c5eb37 100644 --- a/assets/minecraft/textures/block/jungle_door_bottom.png +++ b/assets/minecraft/textures/block/jungle_door_bottom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d4ffff63cc942d02bfff2f97b41f571b39521e759fd1e4eb7759f45343ba611c -size 234 +oid sha256:950163d50f24987a7138d639a645fca91f07fe1be9873c0b50e1b30474f71c78 +size 218 diff --git a/assets/minecraft/textures/block/jungle_door_top.png b/assets/minecraft/textures/block/jungle_door_top.png index a6d21723..cdc53fe6 100644 --- a/assets/minecraft/textures/block/jungle_door_top.png +++ b/assets/minecraft/textures/block/jungle_door_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3d2dc600845fcf08a4e0f051f9fa70415c15d739cf03496fbd0281c30a411503 -size 268 +oid sha256:b16b363c0a645e1f5b5520e15fc8c708ceffa0a5d3a523a294d2e22106d32077 +size 251 diff --git a/assets/minecraft/textures/block/jungle_log.png b/assets/minecraft/textures/block/jungle_log.png index befadf76..6b6b605a 100644 --- a/assets/minecraft/textures/block/jungle_log.png +++ b/assets/minecraft/textures/block/jungle_log.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5fbebd043751f997f36cafec1645deb96e7fb46fc65b6942a67759e55b2d40b3 -size 225 +oid sha256:811df91d6cc2999e236b1a4a3888807602f7368402c33fbb5cc3f757cb71f071 +size 212 diff --git a/assets/minecraft/textures/block/jungle_log_top.png b/assets/minecraft/textures/block/jungle_log_top.png index b4afae12..88524811 100644 --- a/assets/minecraft/textures/block/jungle_log_top.png +++ b/assets/minecraft/textures/block/jungle_log_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7de45035995663fe7ad7ad5ad7547298da693e13b69e569700b0a7acf3f7234a -size 221 +oid sha256:686024fe1092783785df332d7306176f49b28530fc146d3530557f9146d0ba3b +size 208 diff --git a/assets/minecraft/textures/block/jungle_planks.png b/assets/minecraft/textures/block/jungle_planks.png index adefd625..fcc41de8 100644 --- a/assets/minecraft/textures/block/jungle_planks.png +++ b/assets/minecraft/textures/block/jungle_planks.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3868d8eaeccd90157cb91c10a2bd1e884b13088f1ef4ea7253be8abcc13e450f -size 202 +oid sha256:eef0710428abe05aa915dd7f8d3f2ae2b85aba719a85c6f3e5daf7c5b2aae2d3 +size 195 diff --git a/assets/minecraft/textures/block/jungle_sapling.png b/assets/minecraft/textures/block/jungle_sapling.png index a92bd0ee..411fa72f 100644 --- a/assets/minecraft/textures/block/jungle_sapling.png +++ b/assets/minecraft/textures/block/jungle_sapling.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:28f2686cca35c16e0d59496902bc7f178404f88be2cfc6920e2c48f7b0432c8d -size 196 +oid sha256:411d513c45fe0c9aab5abfc63e6b17cd1bc5a29525d69830ea3d2b180cb07999 +size 190 diff --git a/assets/minecraft/textures/block/jungle_trapdoor.png b/assets/minecraft/textures/block/jungle_trapdoor.png index 7dc7af16..2a6e0837 100644 --- a/assets/minecraft/textures/block/jungle_trapdoor.png +++ b/assets/minecraft/textures/block/jungle_trapdoor.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:013c4bc7d6fd9cbb01abb013697be00688f8778c058feca1971226b25d2bc84a -size 248 +oid sha256:cf12b835daed7c1d7e666144c85ff78e94bc41ddc45bbb49c130f89493e51244 +size 229 diff --git a/assets/minecraft/textures/block/kelp.png b/assets/minecraft/textures/block/kelp.png index fd384b33..d8ed5e72 100644 --- a/assets/minecraft/textures/block/kelp.png +++ b/assets/minecraft/textures/block/kelp.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:885bd57d74dccd15c8fad3e2356a0fdd13abfc72c3b46163c6a7d70b5674235a -size 565 +oid sha256:e6a87ed4ea52322df67700dd2349ec9cbf99ff08f66e4bb1a18161938c474279 +size 529 diff --git a/assets/minecraft/textures/block/lapis_block.png b/assets/minecraft/textures/block/lapis_block.png index f4302653..e5be712f 100644 --- a/assets/minecraft/textures/block/lapis_block.png +++ b/assets/minecraft/textures/block/lapis_block.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:689c526f6991929acdd5876844f263b0aeafa1056a1a0d21960516b33a7deb38 -size 252 +oid sha256:c83672bc005ea48c01ac182c66340226f2187ec298794c23894862161990dad4 +size 235 diff --git a/assets/minecraft/textures/block/lapis_ore.png b/assets/minecraft/textures/block/lapis_ore.png index 13e6b937..65c9fde8 100644 --- a/assets/minecraft/textures/block/lapis_ore.png +++ b/assets/minecraft/textures/block/lapis_ore.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:190000ef0594f76f279cbbd0acff448ab1f9a32e788cc81beea380963082563d -size 264 +oid sha256:f85afc08c133c664a39f1526da82b4627960d1d460982185b1a6e1d4eebda312 +size 246 diff --git a/assets/minecraft/textures/block/large_fern_bottom.png b/assets/minecraft/textures/block/large_fern_bottom.png index a78c1291..f309932f 100644 --- a/assets/minecraft/textures/block/large_fern_bottom.png +++ b/assets/minecraft/textures/block/large_fern_bottom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:16d525d2eb000644756b40e861b495243d64390e0b2cd8bac3ebd2cb3a9fd6c0 -size 210 +oid sha256:90411d1c29ff066b25f107822ed892dedc8ca62414c403f219e7074d89cac767 +size 208 diff --git a/assets/minecraft/textures/block/large_fern_top.png b/assets/minecraft/textures/block/large_fern_top.png index 3c146d91..ff6bd3ab 100644 --- a/assets/minecraft/textures/block/large_fern_top.png +++ b/assets/minecraft/textures/block/large_fern_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:13134b57910f50e125751ec36ffb23b841dcebc647b17ffaa4409df8815f571c -size 179 +oid sha256:3fe952425a1033a0090d42d2df856a3241179d77ecf85a54183587cae5a84789 +size 173 diff --git a/assets/minecraft/textures/block/lava_flow.png b/assets/minecraft/textures/block/lava_flow.png index 163cbb64..3dcc3664 100644 --- a/assets/minecraft/textures/block/lava_flow.png +++ b/assets/minecraft/textures/block/lava_flow.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d64204c75b085e8a58b349d785e7c0bfcec3d3fdc91d37f8ae5c9e491863aaf8 -size 3164 +oid sha256:a598f8bf033bc5bb3c7567b6bc790c2c3b6c57504e9d9efd498a1798303d8bfb +size 3109 diff --git a/assets/minecraft/textures/block/lava_still.png b/assets/minecraft/textures/block/lava_still.png index eca705b9..65fca969 100644 --- a/assets/minecraft/textures/block/lava_still.png +++ b/assets/minecraft/textures/block/lava_still.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7ba546bb9093670f1277ad39d4e973a693ce362f1854a9db00fdb7ab3e434c3c -size 4910 +oid sha256:9d28ac5d4ac1a9965552e5c8b5e1229a38a5f7216c0250b35d2400dee1f1b8be +size 4573 diff --git a/assets/minecraft/textures/block/leaf_litter.png b/assets/minecraft/textures/block/leaf_litter.png index fd6f8452..12f92d56 100644 --- a/assets/minecraft/textures/block/leaf_litter.png +++ b/assets/minecraft/textures/block/leaf_litter.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:671d40e6b84d5bade73eb6738e358ead56b8cc5e5f2e67592bc6ee32e05db885 -size 251 +oid sha256:0a415d917e0c41c76966a3e1ee077df76365010f4d36e416b51d7c8ba8cb9b1b +size 190 diff --git a/assets/minecraft/textures/block/lectern_base.png b/assets/minecraft/textures/block/lectern_base.png index 9c2a45e6..c8e242d8 100644 --- a/assets/minecraft/textures/block/lectern_base.png +++ b/assets/minecraft/textures/block/lectern_base.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7add44485f9aeb317237aecc1adb672f91d7a00274cb1ca2e709869b208229ad -size 222 +oid sha256:498b13eb82f8a3079748357885a4ab0a9041b8664c35ca2285c255b2348c9183 +size 200 diff --git a/assets/minecraft/textures/block/lectern_front.png b/assets/minecraft/textures/block/lectern_front.png index 4eed25f3..a356b5ab 100644 --- a/assets/minecraft/textures/block/lectern_front.png +++ b/assets/minecraft/textures/block/lectern_front.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5c407f98f0dfad93d317e57641ff2776d4814c55fd7975a91ab46e82c3ca971a -size 258 +oid sha256:14025b2d73dc1e6dbdee3c7ee9afa373c953b6b9cbd475b64c30c8e0c6f17339 +size 254 diff --git a/assets/minecraft/textures/block/lectern_sides.png b/assets/minecraft/textures/block/lectern_sides.png index aee5af52..d5251e39 100644 --- a/assets/minecraft/textures/block/lectern_sides.png +++ b/assets/minecraft/textures/block/lectern_sides.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3cea60d4ed44868a058212efa6056252f209db22b2d033f34e41d1a9105dea7f -size 178 +oid sha256:139d215c1d644dd22efc4c674de1e0a31d1db392b4106774497ee5b6685ada7b +size 168 diff --git a/assets/minecraft/textures/block/lectern_top.png b/assets/minecraft/textures/block/lectern_top.png index 52a9f917..31499d06 100644 --- a/assets/minecraft/textures/block/lectern_top.png +++ b/assets/minecraft/textures/block/lectern_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a1b8f9b861ae3b722c4e572dd89db2fbec066a45fba28c603087033224958c71 -size 194 +oid sha256:591388e68a0629affdc438e1031acb5b7d6b78b72535bf2c3de0a6ca1c73cb2e +size 182 diff --git a/assets/minecraft/textures/block/lever.png b/assets/minecraft/textures/block/lever.png index 3104f36e..e73824bf 100644 --- a/assets/minecraft/textures/block/lever.png +++ b/assets/minecraft/textures/block/lever.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aff928c7f11f56fe4f41a4e0dc5365c067a5a33fa099e41f789cb053f6fe6403 -size 138 +oid sha256:0ee6f47a1b5b86c8277dc2248d0a717b92e656f8f8d6d9cb89e6c2cb0f39d5c7 +size 137 diff --git a/assets/minecraft/textures/block/light_blue_candle.png b/assets/minecraft/textures/block/light_blue_candle.png index c4e200d6..95cced24 100644 --- a/assets/minecraft/textures/block/light_blue_candle.png +++ b/assets/minecraft/textures/block/light_blue_candle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f254368469398a427afe1bc066eabd101aad1afd5d0f11cef33496038904071c -size 128 +oid sha256:5967263f68be42826c24c5b03f8bda799c9ab7c00f9d0d8117b15ffcae49735b +size 118 diff --git a/assets/minecraft/textures/block/light_blue_candle_lit.png b/assets/minecraft/textures/block/light_blue_candle_lit.png index ebbbf406..0ff354e4 100644 --- a/assets/minecraft/textures/block/light_blue_candle_lit.png +++ b/assets/minecraft/textures/block/light_blue_candle_lit.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:810d4c159ac6d13b80abae72b6e6bbd9cfb5c40ee464abb5a0377ea127e4eb88 -size 137 +oid sha256:eaadce787087557a648ff7ad26c4e82c6cbcaa0d98db2770b472216447fc06d6 +size 136 diff --git a/assets/minecraft/textures/block/light_blue_concrete.png b/assets/minecraft/textures/block/light_blue_concrete.png index 6beaf9d3..2a33fa2e 100644 --- a/assets/minecraft/textures/block/light_blue_concrete.png +++ b/assets/minecraft/textures/block/light_blue_concrete.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:964c54c074d6a94d2ef8a1ffc1a82098f56e7665ac2e309b5a4c03961b840ddf -size 223 +oid sha256:d3d750201676c4279e3d9ec28058d9fafe7a483bb9cf6604df4737a33017ea88 +size 219 diff --git a/assets/minecraft/textures/block/light_blue_glazed_terracotta.png b/assets/minecraft/textures/block/light_blue_glazed_terracotta.png index b42971e1..562e0c5a 100644 --- a/assets/minecraft/textures/block/light_blue_glazed_terracotta.png +++ b/assets/minecraft/textures/block/light_blue_glazed_terracotta.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:406467d96de7c538a3c532286503773a074126f361c8b5ad483bb3e837f6c17a -size 260 +oid sha256:2e640ba118b35619337f8ff7be13178e2b5004841c8e7eb05d1a28e3f7e06405 +size 245 diff --git a/assets/minecraft/textures/block/light_blue_shulker_box.png b/assets/minecraft/textures/block/light_blue_shulker_box.png index 4c55d008..433a0644 100644 --- a/assets/minecraft/textures/block/light_blue_shulker_box.png +++ b/assets/minecraft/textures/block/light_blue_shulker_box.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0f61784b28af015e37111938e8031a51c59468ec8e81074302acc673a17f678c -size 271 +oid sha256:d6ab1f3c8ed8d0a4d72910f81385efa78225fa438f6148843cf342ed81bd806c +size 268 diff --git a/assets/minecraft/textures/block/light_blue_stained_glass_pane_top.png b/assets/minecraft/textures/block/light_blue_stained_glass_pane_top.png index b319b53d..04ea14b9 100644 --- a/assets/minecraft/textures/block/light_blue_stained_glass_pane_top.png +++ b/assets/minecraft/textures/block/light_blue_stained_glass_pane_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6315dca8278d48d5d220d3ded835f735f2241950519f15f35eae217ef0908dbd -size 120 +oid sha256:90f865d6e06d6f0e8eb683622f656ee46a673beb362422f1abded38ea230eda5 +size 118 diff --git a/assets/minecraft/textures/block/light_blue_terracotta.png b/assets/minecraft/textures/block/light_blue_terracotta.png index 546f570f..81a0baae 100644 --- a/assets/minecraft/textures/block/light_blue_terracotta.png +++ b/assets/minecraft/textures/block/light_blue_terracotta.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7f91b8412417d3176ed10b8ba99f03ee2d3e966c57e8eddc007db95a7ff943d0 -size 392 +oid sha256:513dffd0886a88bb5ad9f2efa317e4701673a939e1630cbe9fdc4f488a63c40e +size 366 diff --git a/assets/minecraft/textures/block/light_blue_wool.png b/assets/minecraft/textures/block/light_blue_wool.png index ed5768ff..3698a89d 100644 --- a/assets/minecraft/textures/block/light_blue_wool.png +++ b/assets/minecraft/textures/block/light_blue_wool.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:80ebec0ffcaaeef75809dd94f0583141ebec56198b39603bdcd282b6445fe6ab -size 408 +oid sha256:f16b56ab1c5187b04fdd0048cd2f16bc57b1dcf738c68aa2523eaefbc5192c49 +size 406 diff --git a/assets/minecraft/textures/block/light_gray_candle.png b/assets/minecraft/textures/block/light_gray_candle.png index 35e18af0..43966377 100644 --- a/assets/minecraft/textures/block/light_gray_candle.png +++ b/assets/minecraft/textures/block/light_gray_candle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c6a6b89b2951be1a5a3e7ab23b17f1465c85d93762d62885128a3c96634f0f18 -size 128 +oid sha256:a17b68c7a7282b463c7146dd2a373d219e1c9b7e08a155852f5742a470221e18 +size 118 diff --git a/assets/minecraft/textures/block/light_gray_candle_lit.png b/assets/minecraft/textures/block/light_gray_candle_lit.png index 7613a6f8..e150a7fc 100644 --- a/assets/minecraft/textures/block/light_gray_candle_lit.png +++ b/assets/minecraft/textures/block/light_gray_candle_lit.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:349bd005383c01e35370599cd63b95b56171c23596991a9c513799145068202b -size 137 +oid sha256:9f466f01774957000a6fb58e5e10fcf1ee1edbe778538700eee256da1142cca5 +size 136 diff --git a/assets/minecraft/textures/block/light_gray_concrete_powder.png b/assets/minecraft/textures/block/light_gray_concrete_powder.png index a62dc4e9..a48da176 100644 --- a/assets/minecraft/textures/block/light_gray_concrete_powder.png +++ b/assets/minecraft/textures/block/light_gray_concrete_powder.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a0752c63ce80111874a5eff4cb552754a1d538ed864caffaed8d8a1578c4414a -size 567 +oid sha256:4a855caf678f24930cb8980aa8d8c48cccd4d7d19b9f17858cedf1c7dd42c85d +size 563 diff --git a/assets/minecraft/textures/block/light_gray_glazed_terracotta.png b/assets/minecraft/textures/block/light_gray_glazed_terracotta.png index 7bda8405..3397f9e1 100644 --- a/assets/minecraft/textures/block/light_gray_glazed_terracotta.png +++ b/assets/minecraft/textures/block/light_gray_glazed_terracotta.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1b6a9de368836631990dbd24d3457d31bfee9cf2cc083df9cb85e8d47b2999f9 -size 272 +oid sha256:e7f5d67d2e87c80896da600fdffaacdedd022d7593eee920b98bda69ae2d6914 +size 264 diff --git a/assets/minecraft/textures/block/light_gray_shulker_box.png b/assets/minecraft/textures/block/light_gray_shulker_box.png index 9e1ec333..72171329 100644 --- a/assets/minecraft/textures/block/light_gray_shulker_box.png +++ b/assets/minecraft/textures/block/light_gray_shulker_box.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c7b6c6fcdf9c7b5165cf75b1b71795d7e298557d754a58ddd43ee0f918d63a1c -size 271 +oid sha256:1b0f35d60cd2a475d0dbe3d2eea324cbfae22c3c851195798714bf888e597658 +size 268 diff --git a/assets/minecraft/textures/block/light_gray_stained_glass.png b/assets/minecraft/textures/block/light_gray_stained_glass.png index 356ae004..550a34e3 100644 --- a/assets/minecraft/textures/block/light_gray_stained_glass.png +++ b/assets/minecraft/textures/block/light_gray_stained_glass.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:be543d3ad17a329c69b7496bb45ab5ee34d6cb174b35a50c72a871dc45caf1e8 -size 106 +oid sha256:2232ac591071591a6387ff1bf5a4c1cd9571c199bb0f2bc3b9b67cd2040c30b6 +size 100 diff --git a/assets/minecraft/textures/block/light_gray_stained_glass_pane_top.png b/assets/minecraft/textures/block/light_gray_stained_glass_pane_top.png index 28fb61f1..3ce5c312 100644 --- a/assets/minecraft/textures/block/light_gray_stained_glass_pane_top.png +++ b/assets/minecraft/textures/block/light_gray_stained_glass_pane_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3b99a406433dad805fc62c2704b52e0a033939be52b8d05c5466b8ce7169538c -size 120 +oid sha256:3dfe2cb571a911930d2446f11c47f5d502561515087fae6cff75814d64e362af +size 103 diff --git a/assets/minecraft/textures/block/light_gray_terracotta.png b/assets/minecraft/textures/block/light_gray_terracotta.png index b27b7def..1c5cdb48 100644 --- a/assets/minecraft/textures/block/light_gray_terracotta.png +++ b/assets/minecraft/textures/block/light_gray_terracotta.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fd6a1459926dd8eb3fa8dccdb5ac784564e295036fc47dd5ec11136fb1a30d1a -size 421 +oid sha256:4009af3d4a161d75d676c525d3d49a80848156c174f0cfad6e2594ac388c9414 +size 411 diff --git a/assets/minecraft/textures/block/light_gray_wool.png b/assets/minecraft/textures/block/light_gray_wool.png index 57c93fcb..87f9904f 100644 --- a/assets/minecraft/textures/block/light_gray_wool.png +++ b/assets/minecraft/textures/block/light_gray_wool.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5bde87dc311adde7b581ad469ec8ff31d4593f4a1f914d749978ff807a1dc7ce -size 394 +oid sha256:127108dea091a93bf28f075e312021ed95cc19c3816ce7436c5cec1d65588c13 +size 392 diff --git a/assets/minecraft/textures/block/lilac_bottom.png b/assets/minecraft/textures/block/lilac_bottom.png index 46a01a6c..af0864e4 100644 --- a/assets/minecraft/textures/block/lilac_bottom.png +++ b/assets/minecraft/textures/block/lilac_bottom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:02b4d6428b3897f2bc2d42c3250c0387763950f2b11ca876abefd6344573684c -size 212 +oid sha256:e914938139e05c292303492f808c884e3cd06db60ae702f3cf10f53c7fe59f5d +size 198 diff --git a/assets/minecraft/textures/block/lilac_top.png b/assets/minecraft/textures/block/lilac_top.png index 72b95e76..53f9f773 100644 --- a/assets/minecraft/textures/block/lilac_top.png +++ b/assets/minecraft/textures/block/lilac_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:de72fcfdac85da26cf706af1d5f2c6cbb24895f772bb45d519ddd61c8ea3a2ca -size 201 +oid sha256:9ad01e980d151fa6508f5a0eabdb616bfdca6149c31cef45b30962be214bdbe0 +size 193 diff --git a/assets/minecraft/textures/block/lily_of_the_valley.png b/assets/minecraft/textures/block/lily_of_the_valley.png index c7c9f5e9..dbfc9b52 100644 --- a/assets/minecraft/textures/block/lily_of_the_valley.png +++ b/assets/minecraft/textures/block/lily_of_the_valley.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:efff30a261967cf1065f677622d26b74f366d8178498e0bd579afbf0ff87585c -size 184 +oid sha256:24e06979687c454270e6d37e403d0b93d0499ba7b3e6b44f048ebacd7e68fba1 +size 172 diff --git a/assets/minecraft/textures/block/lily_pad.png b/assets/minecraft/textures/block/lily_pad.png index 05341a20..ab385f6d 100644 --- a/assets/minecraft/textures/block/lily_pad.png +++ b/assets/minecraft/textures/block/lily_pad.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5e672ae307932bc4ee46bc29113369bb6f189fdb4f44ca88a1f7408c8ce2d4df -size 196 +oid sha256:481a8b576cc180f86a1060f73af1edfc3943b2f2f5a0a94e84864a942ffbb174 +size 163 diff --git a/assets/minecraft/textures/block/lime_candle.png b/assets/minecraft/textures/block/lime_candle.png index f813e352..6363869f 100644 --- a/assets/minecraft/textures/block/lime_candle.png +++ b/assets/minecraft/textures/block/lime_candle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5a92f406a143492ef7ce905191c0b832c52f8bb285cc138af710e28902c03793 -size 128 +oid sha256:a5f89e889f67a9271fafe204d4b52b629ddc2557423483e70eb018974ac32149 +size 118 diff --git a/assets/minecraft/textures/block/lime_candle_lit.png b/assets/minecraft/textures/block/lime_candle_lit.png index 53e9ff26..361cbddc 100644 --- a/assets/minecraft/textures/block/lime_candle_lit.png +++ b/assets/minecraft/textures/block/lime_candle_lit.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5f5f4f0db9bdc9134c993de081017995da8929bd5d53b1d8c79ffab786608bbb -size 137 +oid sha256:303b8a1a98536c496f47cde309eb4bc9272b90fcc3d4021e8dc485fe1e17de9d +size 136 diff --git a/assets/minecraft/textures/block/lime_glazed_terracotta.png b/assets/minecraft/textures/block/lime_glazed_terracotta.png index 1e44524d..e3df1f0a 100644 --- a/assets/minecraft/textures/block/lime_glazed_terracotta.png +++ b/assets/minecraft/textures/block/lime_glazed_terracotta.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d4bfaff791205f197d3d82f6f44297c79a357467c857186a92d1afc3975e8d0c -size 254 +oid sha256:8287475c84718db287cc445b1b784b558ad08d388baea7bd3aef824e1c376600 +size 237 diff --git a/assets/minecraft/textures/block/lime_shulker_box.png b/assets/minecraft/textures/block/lime_shulker_box.png index cdc601b0..8b020e21 100644 --- a/assets/minecraft/textures/block/lime_shulker_box.png +++ b/assets/minecraft/textures/block/lime_shulker_box.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ce14cd3cadb5a434774cbb1040cb37c4ae4a9a7339bd593ed9250c6279a55125 -size 285 +oid sha256:1e5d562db9a490b66e7c7d8d8b969c33fc35634630984e342320c4c3eefa2d15 +size 282 diff --git a/assets/minecraft/textures/block/lime_stained_glass_pane_top.png b/assets/minecraft/textures/block/lime_stained_glass_pane_top.png index e9553bd9..46b6410c 100644 --- a/assets/minecraft/textures/block/lime_stained_glass_pane_top.png +++ b/assets/minecraft/textures/block/lime_stained_glass_pane_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d2c2ca123203a6d631c039d5192c786c18e06bb3444408a18524c3ab2163ce96 -size 119 +oid sha256:229770c98188f1d545d5822f7b4274f7d1ab87054c222e6f566cad4859a38a55 +size 117 diff --git a/assets/minecraft/textures/block/lime_terracotta.png b/assets/minecraft/textures/block/lime_terracotta.png index cdd1d005..809a40d1 100644 --- a/assets/minecraft/textures/block/lime_terracotta.png +++ b/assets/minecraft/textures/block/lime_terracotta.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:65443c5e6988278d42cdbd1a7e23d97f5125bc0e43031537d2d3e2ae1dbea5a7 -size 461 +oid sha256:f4e0b8ac372c252afbbd2ac00650ca9386bf3571ca06cd386060b980d03466c9 +size 417 diff --git a/assets/minecraft/textures/block/lime_wool.png b/assets/minecraft/textures/block/lime_wool.png index 07da60df..198dedf0 100644 --- a/assets/minecraft/textures/block/lime_wool.png +++ b/assets/minecraft/textures/block/lime_wool.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:859212a0539264adf8a5d15d796fb22eed3a8dcf5fbfa9a22a12ad1ca2ca3240 -size 379 +oid sha256:e9b5aec9ce3ff89f3faf5161c4a07414c8006f0675560d7daaf5496df23c5143 +size 377 diff --git a/assets/minecraft/textures/block/lodestone_side.png b/assets/minecraft/textures/block/lodestone_side.png index 6f7953ab..25c871e7 100644 --- a/assets/minecraft/textures/block/lodestone_side.png +++ b/assets/minecraft/textures/block/lodestone_side.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c8ec9d4f441253da0c4dd8a369ef50dde5540859195622fcea61ecd9137864e8 -size 228 +oid sha256:62c423642a31cb509e8104e48b483564917dd8c15f0b9cb01f088c311a022cb4 +size 217 diff --git a/assets/minecraft/textures/block/lodestone_top.png b/assets/minecraft/textures/block/lodestone_top.png index ef67501c..995308b8 100644 --- a/assets/minecraft/textures/block/lodestone_top.png +++ b/assets/minecraft/textures/block/lodestone_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5069f8ff79a8e4fb1e6097dcbc80ca8510ad64fbbc22566603dd767638ae62e5 -size 187 +oid sha256:1ca424a8e6a6236234585387da1486dbebf9a7a1040862078959461d21ca536e +size 172 diff --git a/assets/minecraft/textures/block/loom_bottom.png b/assets/minecraft/textures/block/loom_bottom.png index a71f63f3..b2ee1c82 100644 --- a/assets/minecraft/textures/block/loom_bottom.png +++ b/assets/minecraft/textures/block/loom_bottom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dec77821fa414c1309477892bb7f81b330d5cdaa46468db1efac7e63b23aca13 -size 122 +oid sha256:8c03dae076929484d6116805429a5dfe2b92fe161d4c3219dff8cc6a7e0e47dd +size 107 diff --git a/assets/minecraft/textures/block/loom_front.png b/assets/minecraft/textures/block/loom_front.png index 23fe8e1a..b7b43e72 100644 --- a/assets/minecraft/textures/block/loom_front.png +++ b/assets/minecraft/textures/block/loom_front.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:389d7c24667d5d7dd6a055d1470d048d2a5588ca0ff1a01ed9298653c0ff42bc -size 215 +oid sha256:1e3d24d6d7a05a8be4648afdc1c2c8f83558474b888da7a24a5f93a3f57a2505 +size 200 diff --git a/assets/minecraft/textures/block/loom_side.png b/assets/minecraft/textures/block/loom_side.png index 24144c40..22bfcafa 100644 --- a/assets/minecraft/textures/block/loom_side.png +++ b/assets/minecraft/textures/block/loom_side.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d8a86fb427a3310b4a1a56d1e0f4901d2c3618c5a170c09f1e3de0e5c697cc6 -size 200 +oid sha256:526372c59e91f10c1d690124d3f72a3938a154081cbc1a26a6151b924c8293f2 +size 184 diff --git a/assets/minecraft/textures/block/loom_top.png b/assets/minecraft/textures/block/loom_top.png index e106d886..c067d9c3 100644 --- a/assets/minecraft/textures/block/loom_top.png +++ b/assets/minecraft/textures/block/loom_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e0b7d23ce544a20d0f19a20b8ba7eb28034392cd237582c2a623d5b1e91bace5 -size 226 +oid sha256:66dbdf1c6edcb5a68f20bc8279c5008ac4630c4476264730f2cf52f14cf47555 +size 209 diff --git a/assets/minecraft/textures/block/magenta_candle.png b/assets/minecraft/textures/block/magenta_candle.png index a9539e01..f0b7d980 100644 --- a/assets/minecraft/textures/block/magenta_candle.png +++ b/assets/minecraft/textures/block/magenta_candle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4a2196c8da509ebef5179fa88da3c85fda4a1a99d9d806ab4e79d828f9d0c9ac -size 128 +oid sha256:0ceb563fdbcc226665ae1d8263c9a3b9c680e4ccfa72ed963c96fe62ee6f3e3b +size 118 diff --git a/assets/minecraft/textures/block/magenta_candle_lit.png b/assets/minecraft/textures/block/magenta_candle_lit.png index 9a5f073e..2a6ebbc3 100644 --- a/assets/minecraft/textures/block/magenta_candle_lit.png +++ b/assets/minecraft/textures/block/magenta_candle_lit.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b5b6d44ec3a0008af67ce2be7f22d4a174fd236eecb0879f01c9e51710a1400f -size 137 +oid sha256:652020b90bc77ec3e8fbe23a892ad7855d183a2455c39d0a5e5225c4c104bc41 +size 136 diff --git a/assets/minecraft/textures/block/magenta_concrete.png b/assets/minecraft/textures/block/magenta_concrete.png index 673fa0e4..71e226c6 100644 --- a/assets/minecraft/textures/block/magenta_concrete.png +++ b/assets/minecraft/textures/block/magenta_concrete.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:910538f0133c873db64c1213814d741a485035ffcfef6d95599f2e0d06322dbb -size 198 +oid sha256:feb4ef774122b9acf2cd105ab1a06f83819f88722db225c375a21ec22ef1cf7c +size 196 diff --git a/assets/minecraft/textures/block/magenta_concrete_powder.png b/assets/minecraft/textures/block/magenta_concrete_powder.png index 7d9e88ff..023c2960 100644 --- a/assets/minecraft/textures/block/magenta_concrete_powder.png +++ b/assets/minecraft/textures/block/magenta_concrete_powder.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6c5350e2409678db2f31898f63bd511bc71496d6c4934ae76600d67609a0e6e5 -size 684 +oid sha256:551294dec43cdef96f13a28881946eb672591dc91682fd8289d70e99d5a9b39e +size 683 diff --git a/assets/minecraft/textures/block/magenta_glazed_terracotta.png b/assets/minecraft/textures/block/magenta_glazed_terracotta.png index bfa06802..3b9986a8 100644 --- a/assets/minecraft/textures/block/magenta_glazed_terracotta.png +++ b/assets/minecraft/textures/block/magenta_glazed_terracotta.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e99993afbd12dd84685c7d12e2036b42ece3f9a5bd9964ffefb2b108a99c9b21 -size 227 +oid sha256:5376ee917d5f814baa7356882ba0f28b3f9bf7b2c25aa87cf0ce6819b3eff6f3 +size 218 diff --git a/assets/minecraft/textures/block/magenta_shulker_box.png b/assets/minecraft/textures/block/magenta_shulker_box.png index 0c3a1313..a58eb646 100644 --- a/assets/minecraft/textures/block/magenta_shulker_box.png +++ b/assets/minecraft/textures/block/magenta_shulker_box.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:444dce1d039915e037b2e432f43515a37f107d8e38d5b3176bb0ce7d7d4ed71c -size 285 +oid sha256:bb36e4cced08690fc4705efb5cf65ea871008bfb8f9c7b3dc7812ba45480bb9e +size 282 diff --git a/assets/minecraft/textures/block/magenta_stained_glass_pane_top.png b/assets/minecraft/textures/block/magenta_stained_glass_pane_top.png index 5ea9e6d9..ce563e7c 100644 --- a/assets/minecraft/textures/block/magenta_stained_glass_pane_top.png +++ b/assets/minecraft/textures/block/magenta_stained_glass_pane_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6f15e858211514044a90d52c9f2a895d7c3f1a816501aaa656611edfb903639f -size 120 +oid sha256:67d5320f618c3c8a316f71dac347896b3ca450dcdb522db18003a5716d9c6828 +size 118 diff --git a/assets/minecraft/textures/block/magenta_terracotta.png b/assets/minecraft/textures/block/magenta_terracotta.png index 15c139aa..e805deb3 100644 --- a/assets/minecraft/textures/block/magenta_terracotta.png +++ b/assets/minecraft/textures/block/magenta_terracotta.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:04ec5e50fd07b4de88543d6ef23e914bf755a5061aa4a1e7aebea271c72f46db -size 467 +oid sha256:d8d03369a0c8c7ad4dc9eafebaba84ebdc935cb20acac1c9207597ced415c51b +size 417 diff --git a/assets/minecraft/textures/block/magenta_wool.png b/assets/minecraft/textures/block/magenta_wool.png index 75c82c7f..97c7ebfc 100644 --- a/assets/minecraft/textures/block/magenta_wool.png +++ b/assets/minecraft/textures/block/magenta_wool.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f9ffec3612741cf9a65fa5975cdbf8bc5b6af68d72e5d7c6087351bb264963c -size 392 +oid sha256:79699fdb73e565d67ef50a7a1d6492a279f2a2700fb38bdecbfd89b0b9ab759b +size 390 diff --git a/assets/minecraft/textures/block/magma.png b/assets/minecraft/textures/block/magma.png index 95231ab0..ba33382d 100644 --- a/assets/minecraft/textures/block/magma.png +++ b/assets/minecraft/textures/block/magma.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:94d559da1a3229eb012789f2e1adff24de1d4b17523eed94ed5d690f2a9909ad -size 437 +oid sha256:c46011d6d4672eca674e8d0073842d5d59f980e6b39a873f3d364c71ed547b54 +size 416 diff --git a/assets/minecraft/textures/block/mangrove_door_bottom.png b/assets/minecraft/textures/block/mangrove_door_bottom.png index 405441e1..344a940f 100644 --- a/assets/minecraft/textures/block/mangrove_door_bottom.png +++ b/assets/minecraft/textures/block/mangrove_door_bottom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:79560034eeec3f0ecb23786de7fabaee9e61545e19c1ef2005549284c4a10e00 -size 236 +oid sha256:aa84032ae9968b58dfb347ab4062695caaea4e793ed2b6c20f9f5f909bc145af +size 218 diff --git a/assets/minecraft/textures/block/mangrove_door_top.png b/assets/minecraft/textures/block/mangrove_door_top.png index 89d3fb87..9dbccf6e 100644 --- a/assets/minecraft/textures/block/mangrove_door_top.png +++ b/assets/minecraft/textures/block/mangrove_door_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3a4e0dca36399b2634adab316e947dd53132909883a4630a95093b25b9ce6ab4 -size 234 +oid sha256:50a7be61312a2f7ab4ee61e037e5ef7c1b1878a215d50616445c16378927bf1c +size 217 diff --git a/assets/minecraft/textures/block/mangrove_log.png b/assets/minecraft/textures/block/mangrove_log.png index ca7523b8..ea1854e6 100644 --- a/assets/minecraft/textures/block/mangrove_log.png +++ b/assets/minecraft/textures/block/mangrove_log.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c8b97bee5a31b8608a1c2ad9efb3a434218628b6072a7633890b76c23ce6e1ce -size 182 +oid sha256:7535a87d474b8dd5fa6bce5932c3f3d49b9c44dfa9ef518843a02c9186805dc0 +size 179 diff --git a/assets/minecraft/textures/block/mangrove_log_top.png b/assets/minecraft/textures/block/mangrove_log_top.png index 168b4549..a18a9225 100644 --- a/assets/minecraft/textures/block/mangrove_log_top.png +++ b/assets/minecraft/textures/block/mangrove_log_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c114ca6a1f06c89a705ebc1a39406227aaa9f405fd240905ea898eac173a6adb -size 235 +oid sha256:149d5eb299559bf4d0a36259fba01736117bc473921a5d7441029884a8eede41 +size 212 diff --git a/assets/minecraft/textures/block/mangrove_planks.png b/assets/minecraft/textures/block/mangrove_planks.png index 1b2615ae..52a29fba 100644 --- a/assets/minecraft/textures/block/mangrove_planks.png +++ b/assets/minecraft/textures/block/mangrove_planks.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b9b9969300ee9aa3e69c2dd908616ee3dfe5211fbf5706ea787803fd12196d3a -size 202 +oid sha256:8a23e913f39c14c050df721a775b2e2bd0dd7b9b0a74cab1056070e3d781119f +size 195 diff --git a/assets/minecraft/textures/block/mangrove_propagule_hanging.png b/assets/minecraft/textures/block/mangrove_propagule_hanging.png index 5acc1ee7..b35e3d88 100644 --- a/assets/minecraft/textures/block/mangrove_propagule_hanging.png +++ b/assets/minecraft/textures/block/mangrove_propagule_hanging.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:213c81651fff320d9a2a37529d36469deb2297447959bf9bac54669264f577cd -size 244 +oid sha256:1dae78b4e8c517597cd23692ffc19bdcacfa0f88768b633a412fa4b36099d8df +size 241 diff --git a/assets/minecraft/textures/block/mangrove_roots_side.png b/assets/minecraft/textures/block/mangrove_roots_side.png index 0e043359..f1a88e31 100644 --- a/assets/minecraft/textures/block/mangrove_roots_side.png +++ b/assets/minecraft/textures/block/mangrove_roots_side.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1927db6d760041db8ca46d938fa1658326c912394e93e702f8ec7b8eef488fe8 -size 203 +oid sha256:4268751c29c70745f276aec002644a0411c491d39116d447f97773df71baadcf +size 200 diff --git a/assets/minecraft/textures/block/mangrove_roots_top.png b/assets/minecraft/textures/block/mangrove_roots_top.png index f4de66ee..a286dc1f 100644 --- a/assets/minecraft/textures/block/mangrove_roots_top.png +++ b/assets/minecraft/textures/block/mangrove_roots_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c4f204c7739f2a8dde1014913b26f47c1020ee7a8394cbee2fe0e8466c1671b6 -size 214 +oid sha256:d198f0e38810b978895a06fdaa6a43b1d6af1602cb6735aa123750e59d3edc8e +size 212 diff --git a/assets/minecraft/textures/block/mangrove_trapdoor.png b/assets/minecraft/textures/block/mangrove_trapdoor.png index 7f3a8de6..efb5dcd0 100644 --- a/assets/minecraft/textures/block/mangrove_trapdoor.png +++ b/assets/minecraft/textures/block/mangrove_trapdoor.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d3317602e14e5f61d84dacddccda7a49f9639eeb8a30a3cb3a2bc42d46394e1 -size 234 +oid sha256:65087166442d0a5d9edf1c467d44ab3b4f9969f1bd851c5d9ffa82259b90f1fc +size 218 diff --git a/assets/minecraft/textures/block/medium_amethyst_bud.png b/assets/minecraft/textures/block/medium_amethyst_bud.png index 0e39e4ce..a60b3dfa 100644 --- a/assets/minecraft/textures/block/medium_amethyst_bud.png +++ b/assets/minecraft/textures/block/medium_amethyst_bud.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a7609ca5d8bbbcf7a2a3f820b5e2b5fe84334d539665a4b6adbe3b7d6afaeada -size 146 +oid sha256:f7668df03286aaf13c5c356c6ab0bff6b9414c0df38948173dd98ab9329c8bf0 +size 145 diff --git a/assets/minecraft/textures/block/melon_side.png b/assets/minecraft/textures/block/melon_side.png index c848b3a6..253027be 100644 --- a/assets/minecraft/textures/block/melon_side.png +++ b/assets/minecraft/textures/block/melon_side.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6a556b42d0c87084a30068f1b4684e5c7ef7762d348e227f161a19db61c51fbb -size 164 +oid sha256:f8609c25b72f81d0449667ad922eca0f2a10ae1721b20b0472c92aa2a0fc2fdc +size 162 diff --git a/assets/minecraft/textures/block/melon_stem.png b/assets/minecraft/textures/block/melon_stem.png index 7e72740e..8fe587fe 100644 --- a/assets/minecraft/textures/block/melon_stem.png +++ b/assets/minecraft/textures/block/melon_stem.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ffbf229bd2ff13ff410011ed6172d35cc56dfa364c9800791c1b1755651dbad6 -size 189 +oid sha256:30089ec094672cb4bcc59b1491e915dcfdc90e02c1d823e1769b1b0fd2cb32ef +size 136 diff --git a/assets/minecraft/textures/block/melon_top.png b/assets/minecraft/textures/block/melon_top.png index ecae816a..21726c8e 100644 --- a/assets/minecraft/textures/block/melon_top.png +++ b/assets/minecraft/textures/block/melon_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2f7a13779e9a782351ae66848dd9e1e67ae73a947d0f85da50ea6772ee04952b -size 186 +oid sha256:3f5e8b09c3dae6880aa451427350aced66c62c6deac1a1321352bf91dada6673 +size 185 diff --git a/assets/minecraft/textures/block/moss_block.png b/assets/minecraft/textures/block/moss_block.png index 23f4ebbd..bc519892 100644 --- a/assets/minecraft/textures/block/moss_block.png +++ b/assets/minecraft/textures/block/moss_block.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ff2be8de2198aa42ce405734b69e69a2c220cd6996e2e170f29e4f5a8f649eb1 -size 208 +oid sha256:863aae6a09178ccd3700c7ee6e3e9f2448e99f51cbbd8c157dd0126f8c749c80 +size 204 diff --git a/assets/minecraft/textures/block/mossy_cobblestone.png b/assets/minecraft/textures/block/mossy_cobblestone.png index 9a439ce1..46a88501 100644 --- a/assets/minecraft/textures/block/mossy_cobblestone.png +++ b/assets/minecraft/textures/block/mossy_cobblestone.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1c069f0513d01272d5e9951e96ca3d9279c34400a88c3c47d52d79b9ac21ef2f -size 246 +oid sha256:68ceb02b0c41e799677320ff46c2c5b6d71450142a3c948e68641a6da66bc469 +size 231 diff --git a/assets/minecraft/textures/block/mossy_stone_bricks.png b/assets/minecraft/textures/block/mossy_stone_bricks.png index 700e73a1..e2c196ab 100644 --- a/assets/minecraft/textures/block/mossy_stone_bricks.png +++ b/assets/minecraft/textures/block/mossy_stone_bricks.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:51d9f7354dcc25f6f731f82e553c6f9385dddb64ccda84265e5eebe8409b4010 -size 258 +oid sha256:fe683558b728495db02c2d53160cdabd0bbf93170ec2b81d0ee5e82c8d97ec4c +size 241 diff --git a/assets/minecraft/textures/block/mud.png b/assets/minecraft/textures/block/mud.png index b6dfa340..6f68f7a5 100644 --- a/assets/minecraft/textures/block/mud.png +++ b/assets/minecraft/textures/block/mud.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:758f2c1e87cc21f7a59a58d0ef1addb4d16fe120f8e311470ca43793301b49c9 -size 216 +oid sha256:3ddc6e47abc12db1e2e85938da5d0b0d49e0357d8c3424b069f521741ec42d23 +size 211 diff --git a/assets/minecraft/textures/block/mud_bricks.png b/assets/minecraft/textures/block/mud_bricks.png index 412017b7..fc5201c8 100644 --- a/assets/minecraft/textures/block/mud_bricks.png +++ b/assets/minecraft/textures/block/mud_bricks.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f5127d8a356391e0921fd3be658791f22df36ad6dba5ce684c47ca2b7d62adca -size 209 +oid sha256:b9d94455caf0651b7ff777f2f85a92f4d67d04ae669cd4f65c308595ec9d38fa +size 200 diff --git a/assets/minecraft/textures/block/muddy_mangrove_roots_side.png b/assets/minecraft/textures/block/muddy_mangrove_roots_side.png index c0b01180..aed970db 100644 --- a/assets/minecraft/textures/block/muddy_mangrove_roots_side.png +++ b/assets/minecraft/textures/block/muddy_mangrove_roots_side.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef5192e1668a7bea4cee7e9f868c310af83329d2b5b80dc45f10fdf424c07a9c -size 254 +oid sha256:5d851f6ec2924111417b85ab4e3ca01af0360740ffdb5b2214d5942b0c19918e +size 236 diff --git a/assets/minecraft/textures/block/muddy_mangrove_roots_top.png b/assets/minecraft/textures/block/muddy_mangrove_roots_top.png index b6e267a3..b1457fa0 100644 --- a/assets/minecraft/textures/block/muddy_mangrove_roots_top.png +++ b/assets/minecraft/textures/block/muddy_mangrove_roots_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:96b400fa142bb7e385047e50ef0bab7f6ef1bd2c84958ac58b42d78859b4f7bc -size 257 +oid sha256:98993bc94bb7fd8a264d40035babed4686de814597bdc63a6cc57e317721169a +size 236 diff --git a/assets/minecraft/textures/block/mushroom_block_inside.png b/assets/minecraft/textures/block/mushroom_block_inside.png index 4517651d..7df10e1e 100644 --- a/assets/minecraft/textures/block/mushroom_block_inside.png +++ b/assets/minecraft/textures/block/mushroom_block_inside.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d5889ca24e6ddcfbf73cb7c3f92c76e754f1e3635ee19509763d912ab1273d93 -size 184 +oid sha256:f05ba31a164d059e45e4f3449f3e08ef90f91d1a4cfc8c5b7ce7a28171f67569 +size 180 diff --git a/assets/minecraft/textures/block/mycelium_side.png b/assets/minecraft/textures/block/mycelium_side.png index 14bcf1d5..16b265ff 100644 --- a/assets/minecraft/textures/block/mycelium_side.png +++ b/assets/minecraft/textures/block/mycelium_side.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3b6252e7288b1c01c670efa4ca7350fd39a84555ef9e98c1a060a386c4883076 -size 275 +oid sha256:74b0c4fa6c6b8d32bf42f8cbaa97eb6ec8fabc1f4f049bc8b22023c3b49032c7 +size 268 diff --git a/assets/minecraft/textures/block/mycelium_top.png b/assets/minecraft/textures/block/mycelium_top.png index e29ef128..79543f32 100644 --- a/assets/minecraft/textures/block/mycelium_top.png +++ b/assets/minecraft/textures/block/mycelium_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:96bf8f88f02e9b3957c74a6b1c2bd9020abf58be355b50f6c03557083d7734d6 -size 234 +oid sha256:46e638ba8ca9fd17c47447d991da3f40ddac238129920863cb72bdbf129055c6 +size 213 diff --git a/assets/minecraft/textures/block/nether_gold_ore.png b/assets/minecraft/textures/block/nether_gold_ore.png index ae42c40c..d99edb20 100644 --- a/assets/minecraft/textures/block/nether_gold_ore.png +++ b/assets/minecraft/textures/block/nether_gold_ore.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2e8b34d2f640c171bf26e63ffe279f29d2b3acad34d60fd240c6d46bec5aedc0 -size 255 +oid sha256:295aaf7c30043e25550d4131b706e5f3c292f093e7e8930d06d7cb941a041b93 +size 229 diff --git a/assets/minecraft/textures/block/nether_portal.png b/assets/minecraft/textures/block/nether_portal.png index 2fbd8eb4..8a344b95 100644 --- a/assets/minecraft/textures/block/nether_portal.png +++ b/assets/minecraft/textures/block/nether_portal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:845ceb03d82607ec15ab26d32c6e389efb9f7a118baea3944b68363c33f70172 -size 9005 +oid sha256:83f7f02814cf0dcf2b7ddd7be5c4ef03ab50e279bbca4acdcab5cd1d11a694f7 +size 8945 diff --git a/assets/minecraft/textures/block/nether_quartz_ore.png b/assets/minecraft/textures/block/nether_quartz_ore.png index cffdb42f..1bb4e017 100644 --- a/assets/minecraft/textures/block/nether_quartz_ore.png +++ b/assets/minecraft/textures/block/nether_quartz_ore.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b8083d01cbaf82ad2f6101646dcfa64bcedaa49f1c9363dca478ee0a1c378978 -size 255 +oid sha256:9cb790a75366bc6dffc35918f33aa46928410571aba4e263fd29389df0d0bfd4 +size 236 diff --git a/assets/minecraft/textures/block/nether_wart_block.png b/assets/minecraft/textures/block/nether_wart_block.png index e9503b7a..c56eb100 100644 --- a/assets/minecraft/textures/block/nether_wart_block.png +++ b/assets/minecraft/textures/block/nether_wart_block.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d74077268d87cedadd16b3dc27acae6c26dcf5af85f67b75ebd5bfc55fc68eab -size 181 +oid sha256:11c7567e6945e4425cb5eb22bf4b973600fc0ace33f9e556759eb949564e34b1 +size 178 diff --git a/assets/minecraft/textures/block/nether_wart_stage0.png b/assets/minecraft/textures/block/nether_wart_stage0.png index 17448f78..5640b25b 100644 --- a/assets/minecraft/textures/block/nether_wart_stage0.png +++ b/assets/minecraft/textures/block/nether_wart_stage0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:208ff03180998517dde7c6a0972fbe604b1a20c41ec81ebe2af92b4822a71080 -size 150 +oid sha256:c40ec87e0c13907e4816cc748a2103485af4257c536174cbfe8fbb7bcb8e44fe +size 143 diff --git a/assets/minecraft/textures/block/netherite_block.png b/assets/minecraft/textures/block/netherite_block.png index bdfc606f..eb1f6bfb 100644 --- a/assets/minecraft/textures/block/netherite_block.png +++ b/assets/minecraft/textures/block/netherite_block.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7f9ec5010d043fb4bafa661f27a255f04db6393d95f83a663f2f92206531298e -size 230 +oid sha256:805d1d84a2fc3c8dbf6eb1b0198814da94396548794ff4c8dcc71406d5355102 +size 217 diff --git a/assets/minecraft/textures/block/note_block.png b/assets/minecraft/textures/block/note_block.png index 590a786d..a4fbe912 100644 --- a/assets/minecraft/textures/block/note_block.png +++ b/assets/minecraft/textures/block/note_block.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:52ce801f021f96960ae3f1693e36045e138c093b295a5dfd00d6ee75da2f583a -size 182 +oid sha256:ce5e56da299713779c49b55fcdb705fbdc1381d4f449615b932877ba13c9fabb +size 172 diff --git a/assets/minecraft/textures/block/oak_door_bottom.png b/assets/minecraft/textures/block/oak_door_bottom.png index eb356b42..b9be400a 100644 --- a/assets/minecraft/textures/block/oak_door_bottom.png +++ b/assets/minecraft/textures/block/oak_door_bottom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2798f124c14eba14e1aa98459e5ba4575279bdd8b0656c42dffbe660d0d619f6 -size 202 +oid sha256:a209e7e8611d56d211445d5df23a50c31185a293c51f4e03f3cb691209a49df4 +size 191 diff --git a/assets/minecraft/textures/block/oak_door_top.png b/assets/minecraft/textures/block/oak_door_top.png index ee81c99a..a37801b4 100644 --- a/assets/minecraft/textures/block/oak_door_top.png +++ b/assets/minecraft/textures/block/oak_door_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:06db4c9c6c0b8e19e0cd26f37421964557fb42ac2fe0459a395473f05ca3781d -size 213 +oid sha256:0cdc592715a8145d1837f551adf774227dedf7650569e7a50f6cb831c7c0a6c6 +size 209 diff --git a/assets/minecraft/textures/block/oak_log.png b/assets/minecraft/textures/block/oak_log.png index 6d67f0e9..90610db8 100644 --- a/assets/minecraft/textures/block/oak_log.png +++ b/assets/minecraft/textures/block/oak_log.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:060c93128fb65aa350a84e4b6576e616c47d40211bbe537cfe923a81d072e30c -size 193 +oid sha256:61735859c9c9ea82601191a77c6f256d93619cbaf7cad998a3ed5762877a34e6 +size 191 diff --git a/assets/minecraft/textures/block/oak_log_top.png b/assets/minecraft/textures/block/oak_log_top.png index cf47101b..eb063e91 100644 --- a/assets/minecraft/textures/block/oak_log_top.png +++ b/assets/minecraft/textures/block/oak_log_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:62f38b25ae28b6c4842ee5a83f790394b1ec4d6c6f20dd52044394855346a2a7 -size 223 +oid sha256:a520800a833ea0c6214481245ab40397aa0c08b4ffc909046dac266386f9fc01 +size 206 diff --git a/assets/minecraft/textures/block/oak_planks.png b/assets/minecraft/textures/block/oak_planks.png index ed16bf24..ee0616d1 100644 --- a/assets/minecraft/textures/block/oak_planks.png +++ b/assets/minecraft/textures/block/oak_planks.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3a33db67a3ba30537d0890a5cb37c8087ca336be89cbb1393a71c23224e361a8 -size 202 +oid sha256:65665943ef9c8bcf63fc67d2083ed0c50243f724106d0e4bb1abea5d921b16d3 +size 195 diff --git a/assets/minecraft/textures/block/oak_sapling.png b/assets/minecraft/textures/block/oak_sapling.png index 4b6892ab..0575d043 100644 --- a/assets/minecraft/textures/block/oak_sapling.png +++ b/assets/minecraft/textures/block/oak_sapling.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:964a13ebf4cabc1a11bc5afc890a03e15635a20c3d56608ed55c7e1b3daca0cb -size 221 +oid sha256:c30b586442aea7e22af3b480360493225a0dd5b85920600845ce73e6ab4ed1fd +size 205 diff --git a/assets/minecraft/textures/block/oak_trapdoor.png b/assets/minecraft/textures/block/oak_trapdoor.png index a4418fbf..67db33fc 100644 --- a/assets/minecraft/textures/block/oak_trapdoor.png +++ b/assets/minecraft/textures/block/oak_trapdoor.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d9bcc9384d838118faa92d487125b7db883e953aa6b77b9bca5780fc8593697 -size 208 +oid sha256:7f2d78c69dcfb71d4900b974d40f6e334065f4e4c72aa36fe37ce034df9a2abd +size 198 diff --git a/assets/minecraft/textures/block/observer_back.png b/assets/minecraft/textures/block/observer_back.png index 50a40b6d..d08c2890 100644 --- a/assets/minecraft/textures/block/observer_back.png +++ b/assets/minecraft/textures/block/observer_back.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e8415ec6fc78c54c08898472dd5c56ecb6be8bb2a16050a2135a2a4ec02070c4 -size 260 +oid sha256:cbed479fc6df6ebc7e3c005cfe571a8237cc83625f377f26b52b59280fe63717 +size 241 diff --git a/assets/minecraft/textures/block/observer_back_on.png b/assets/minecraft/textures/block/observer_back_on.png index a9acd2f5..f6b75dd7 100644 --- a/assets/minecraft/textures/block/observer_back_on.png +++ b/assets/minecraft/textures/block/observer_back_on.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ccca244120c3a7cf79c343996b1335219e4b42fc55a891245660dac3e075abb3 -size 274 +oid sha256:aa8b6d2b02fe46467d883eaddcb24140008c8b9ebc8bb6f24afb586b3d07d4f2 +size 270 diff --git a/assets/minecraft/textures/block/observer_side.png b/assets/minecraft/textures/block/observer_side.png index 00fe0f9a..0705b7b8 100644 --- a/assets/minecraft/textures/block/observer_side.png +++ b/assets/minecraft/textures/block/observer_side.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2fbfd95eba0e9171e8771371b83777c740c1f6eea2af154ccca3ab5afa0aa0e8 -size 230 +oid sha256:fc989d0b6d95672094e1b096f4d298b9ebbd04c0b0c47ffc1cd752948fb54448 +size 214 diff --git a/assets/minecraft/textures/block/ochre_froglight_side.png b/assets/minecraft/textures/block/ochre_froglight_side.png index 1c95424a..0b66d587 100644 --- a/assets/minecraft/textures/block/ochre_froglight_side.png +++ b/assets/minecraft/textures/block/ochre_froglight_side.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2df7796116e35fba54fdd9483779772bef95fb509cc4cd947bce60a0add0e87c -size 196 +oid sha256:afa9189ced6451f2aeffac559fc15f71d10bf0fa19e26c1322ee1a71260bbdd7 +size 184 diff --git a/assets/minecraft/textures/block/ochre_froglight_top.png b/assets/minecraft/textures/block/ochre_froglight_top.png index 2e8d0309..17d01ed1 100644 --- a/assets/minecraft/textures/block/ochre_froglight_top.png +++ b/assets/minecraft/textures/block/ochre_froglight_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ab713973d0fd8fdeac6a3e4536503f22b3a23e3eb39011f4ed91c3d3c1dfd2b4 -size 175 +oid sha256:67c50f8bbc67959446c2d1fb421a107381068b515bcb237f09dc0c2b2d73e470 +size 167 diff --git a/assets/minecraft/textures/block/open_eyeblossom.png b/assets/minecraft/textures/block/open_eyeblossom.png index 4486637f..b0fc3e72 100644 --- a/assets/minecraft/textures/block/open_eyeblossom.png +++ b/assets/minecraft/textures/block/open_eyeblossom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fedee209983d9df1df1eb4946664d1f0bdc1cb2b703720573fb4533772bb8efb -size 316 +oid sha256:ef39a61a2c6e31c27a522fae8512ff6d1242318f8cf4c0036964bf83f5d26243 +size 175 diff --git a/assets/minecraft/textures/block/open_eyeblossom_emissive.png b/assets/minecraft/textures/block/open_eyeblossom_emissive.png index 960ca884..14293b70 100644 --- a/assets/minecraft/textures/block/open_eyeblossom_emissive.png +++ b/assets/minecraft/textures/block/open_eyeblossom_emissive.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0bbccb88bf07c8225da7ee2a5ba4bbe75c6b60400eb67b166364f980703bdce6 -size 101 +oid sha256:7fea37682a188f42b1571dd158e934ffe00e6042d49eddf70d0ba607d5f94b6e +size 86 diff --git a/assets/minecraft/textures/block/orange_candle.png b/assets/minecraft/textures/block/orange_candle.png index 84afbf71..33b565f9 100644 --- a/assets/minecraft/textures/block/orange_candle.png +++ b/assets/minecraft/textures/block/orange_candle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f265ed9f6550ad40b24abd71e8296c884c5311dc620dbd51756ae08ccbf34bcf -size 127 +oid sha256:a9f7d58fa926890e9223ef1083a5c6d5e172dfa1479699dfdfad30ca70d8e00b +size 119 diff --git a/assets/minecraft/textures/block/orange_concrete.png b/assets/minecraft/textures/block/orange_concrete.png index 24808aba..1fcfb152 100644 --- a/assets/minecraft/textures/block/orange_concrete.png +++ b/assets/minecraft/textures/block/orange_concrete.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:76531a8ae786933581448b091b2e698966e6c6d59b1833cfc88e328d1a04ec11 -size 243 +oid sha256:a4bba5accd14ce61b6d7530630de02b4f33aa306894c72817c725be8de91bd9e +size 222 diff --git a/assets/minecraft/textures/block/orange_concrete_powder.png b/assets/minecraft/textures/block/orange_concrete_powder.png index 88037af6..d65add1d 100644 --- a/assets/minecraft/textures/block/orange_concrete_powder.png +++ b/assets/minecraft/textures/block/orange_concrete_powder.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0fcdc0a420adc3762f305335d218c7513b913a713e852afa9a9b1950550cf025 -size 669 +oid sha256:94d34c06d2cb1e0c5228f74c3658e8efd51efafad574c8b68be36a647887a4b2 +size 668 diff --git a/assets/minecraft/textures/block/orange_glazed_terracotta.png b/assets/minecraft/textures/block/orange_glazed_terracotta.png index ba82778c..6d36d8d7 100644 --- a/assets/minecraft/textures/block/orange_glazed_terracotta.png +++ b/assets/minecraft/textures/block/orange_glazed_terracotta.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4c10a0bd5208657748fac06acd745a6e2b29fb4265c41031d85387aedda1b14c -size 272 +oid sha256:a501442b6fe5a7aad4e80165bcb8944d59218af75cca7f8315271b0fc8641be5 +size 264 diff --git a/assets/minecraft/textures/block/orange_shulker_box.png b/assets/minecraft/textures/block/orange_shulker_box.png index e8d85fed..b965ae6e 100644 --- a/assets/minecraft/textures/block/orange_shulker_box.png +++ b/assets/minecraft/textures/block/orange_shulker_box.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:881a350e4616f01a90666d66ae32b451f372e916ee6276edd5a7e8abfbcf2ea4 -size 285 +oid sha256:f008dcb696b4cbd4c419d2a8fbb079a7b07700e3d70c76ea2400c9521a31ddb2 +size 282 diff --git a/assets/minecraft/textures/block/orange_stained_glass_pane_top.png b/assets/minecraft/textures/block/orange_stained_glass_pane_top.png index c2dad6c1..cb70d819 100644 --- a/assets/minecraft/textures/block/orange_stained_glass_pane_top.png +++ b/assets/minecraft/textures/block/orange_stained_glass_pane_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:09b15047b4e70d36c12059e4672039b43970ba29dcd8baf59a5c2be3c12cb6f5 -size 120 +oid sha256:26daefd0a1bbf7e5e6f4d4d720064b5829c815e826c04e90367a25fe9e4101cc +size 118 diff --git a/assets/minecraft/textures/block/orange_terracotta.png b/assets/minecraft/textures/block/orange_terracotta.png index 744dfd39..7db9ab8c 100644 --- a/assets/minecraft/textures/block/orange_terracotta.png +++ b/assets/minecraft/textures/block/orange_terracotta.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7bae57ffb39843cbe778cb35696ee43d1060c050940209ce5d188e56aab77522 -size 463 +oid sha256:3074d90b0a27d1c149df2f3eacc9c6895c4cc0548999f864146dc18f64bcab5a +size 416 diff --git a/assets/minecraft/textures/block/orange_tulip.png b/assets/minecraft/textures/block/orange_tulip.png index 4f1d4b66..c8430efc 100644 --- a/assets/minecraft/textures/block/orange_tulip.png +++ b/assets/minecraft/textures/block/orange_tulip.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d4685f7ac70a5b380e6b1a822089abbe0ba0ae5eb4ced5c19120a41be4da42fb -size 224 +oid sha256:aad64a9caf497332bc1233b270fd8742663b8d29379aa442688858f789437b7c +size 164 diff --git a/assets/minecraft/textures/block/orange_wool.png b/assets/minecraft/textures/block/orange_wool.png index 5ed0c124..d8488347 100644 --- a/assets/minecraft/textures/block/orange_wool.png +++ b/assets/minecraft/textures/block/orange_wool.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:efe422b1ff12e6517b62cd94a9b53f31b028a095d8e527464be8a7478eb29987 -size 400 +oid sha256:de3ec43fe8ca99026bdda3c036a964990e7d9b08c8b67690e2f975ddbdc5ff68 +size 398 diff --git a/assets/minecraft/textures/block/oxeye_daisy.png b/assets/minecraft/textures/block/oxeye_daisy.png index 91a51957..20d924fd 100644 --- a/assets/minecraft/textures/block/oxeye_daisy.png +++ b/assets/minecraft/textures/block/oxeye_daisy.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a64161a5f4c5d112935fd1abf86be6e4729e5c7ad4cd80913e7f278785894667 -size 277 +oid sha256:f4356fbcc3921433e150356384ccd739166d248a07d9edb7baaf187d03766372 +size 179 diff --git a/assets/minecraft/textures/block/oxidized_chiseled_copper.png b/assets/minecraft/textures/block/oxidized_chiseled_copper.png index 10bb1025..b005ce09 100644 --- a/assets/minecraft/textures/block/oxidized_chiseled_copper.png +++ b/assets/minecraft/textures/block/oxidized_chiseled_copper.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7570e63d19c7889f837635d310697bc83aad2e5fde6ddb59ed439ffe5151268a -size 210 +oid sha256:e90bc7f6acbd5a0cc08fca2e5dba58fd29a5d46805be8b0d9c7a65d09ae2c8db +size 200 diff --git a/assets/minecraft/textures/block/oxidized_copper.png b/assets/minecraft/textures/block/oxidized_copper.png index ef981352..a21defe4 100644 --- a/assets/minecraft/textures/block/oxidized_copper.png +++ b/assets/minecraft/textures/block/oxidized_copper.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:565994e5f9e3c03cf8ba0f3821bd4f65ab9151ea732a4942d7da6341e7148920 -size 214 +oid sha256:c784fc83327169877d6a125f2eae00a5fbf784b9caaaa64e2fbc015d664d0bfb +size 194 diff --git a/assets/minecraft/textures/block/oxidized_copper_bulb.png b/assets/minecraft/textures/block/oxidized_copper_bulb.png index 4badf9be..5e204899 100644 --- a/assets/minecraft/textures/block/oxidized_copper_bulb.png +++ b/assets/minecraft/textures/block/oxidized_copper_bulb.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:99e3de6dd55fef623a866c1b116d6bae29311a177819eb765c116076e29a1abe -size 238 +oid sha256:4234cd7772d215961982e7a30f0e72a1bcc34f69c919597165315c46bacd1352 +size 222 diff --git a/assets/minecraft/textures/block/oxidized_copper_bulb_lit_powered.png b/assets/minecraft/textures/block/oxidized_copper_bulb_lit_powered.png index e5518fe8..f483abe5 100644 --- a/assets/minecraft/textures/block/oxidized_copper_bulb_lit_powered.png +++ b/assets/minecraft/textures/block/oxidized_copper_bulb_lit_powered.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fd80351ef938176d5375c314cef0ec31bee604beffc1104f0d7d0f6bbc8f9ccd -size 256 +oid sha256:41d917671f2c9c4f1400a5d7725a0b92569bd91db0c25045fa85fddb55c9dfe6 +size 252 diff --git a/assets/minecraft/textures/block/oxidized_copper_bulb_powered.png b/assets/minecraft/textures/block/oxidized_copper_bulb_powered.png index ffb8dc0a..71feeb3c 100644 --- a/assets/minecraft/textures/block/oxidized_copper_bulb_powered.png +++ b/assets/minecraft/textures/block/oxidized_copper_bulb_powered.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b639bc87b3f6242568adf635220157714935db46a7799d64007da630ee792ad1 -size 247 +oid sha256:a31d6d357bfb4c2541edb5e4b20d67985d055a2b3ce44f689296999ceaa8c76c +size 231 diff --git a/assets/minecraft/textures/block/oxidized_copper_door_bottom.png b/assets/minecraft/textures/block/oxidized_copper_door_bottom.png index 843e16c4..c675bfc7 100644 --- a/assets/minecraft/textures/block/oxidized_copper_door_bottom.png +++ b/assets/minecraft/textures/block/oxidized_copper_door_bottom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6ac6b4bce9442fa8d6bc253bb24c87a187ae8c149b046bd6edae68bb16ff9d49 -size 218 +oid sha256:13eb5e8bf92a75d01cbd88c055a6bd1231ea3ecd1ebd17308ac66de7e6cddfe1 +size 217 diff --git a/assets/minecraft/textures/block/oxidized_copper_door_top.png b/assets/minecraft/textures/block/oxidized_copper_door_top.png index ad72bf30..b4543226 100644 --- a/assets/minecraft/textures/block/oxidized_copper_door_top.png +++ b/assets/minecraft/textures/block/oxidized_copper_door_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bcbc00d68f1112fe8d72d231c9188d6e682dda8dfd678d374324e687bbb66921 -size 244 +oid sha256:f0cba81f0cd46492fa1ac8671962f6c610e667e53f62c2a36fb01cd6eafdad21 +size 226 diff --git a/assets/minecraft/textures/block/oxidized_copper_grate.png b/assets/minecraft/textures/block/oxidized_copper_grate.png index 91e40462..20ae031e 100644 --- a/assets/minecraft/textures/block/oxidized_copper_grate.png +++ b/assets/minecraft/textures/block/oxidized_copper_grate.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b1dbb5dc8cfa02202c536dc4029176f0641838fa380d72ff7544da2de8eef8a8 -size 238 +oid sha256:0c2b82da713ece3f3547f129897fb2ecb4531956a1bdafec80b549f4a870834a +size 224 diff --git a/assets/minecraft/textures/block/oxidized_copper_trapdoor.png b/assets/minecraft/textures/block/oxidized_copper_trapdoor.png index 3eb682c6..808a74a7 100644 --- a/assets/minecraft/textures/block/oxidized_copper_trapdoor.png +++ b/assets/minecraft/textures/block/oxidized_copper_trapdoor.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0d51b4e1977a3135757b97719e1ac25e0e6f769677c49a30207e834c73960b66 -size 237 +oid sha256:6f21de25314c6ee8edde41492d71be0ac90b033e9bd76a2f0c9161f68f21ed04 +size 219 diff --git a/assets/minecraft/textures/block/oxidized_cut_copper.png b/assets/minecraft/textures/block/oxidized_cut_copper.png index 555df611..ab871245 100644 --- a/assets/minecraft/textures/block/oxidized_cut_copper.png +++ b/assets/minecraft/textures/block/oxidized_cut_copper.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f2608f6e7c20a9bcbe97da01c4392134c6a9e4a39b1d76e72aa6bd224fa13492 -size 221 +oid sha256:b8e34245f1f57752b3095894bc05733c193d28458672f2c8e9324032a805d581 +size 193 diff --git a/assets/minecraft/textures/block/packed_ice.png b/assets/minecraft/textures/block/packed_ice.png index aee2758b..047f538e 100644 --- a/assets/minecraft/textures/block/packed_ice.png +++ b/assets/minecraft/textures/block/packed_ice.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:69bbfa529e480c86fac5ba3c8607b8d263e140d0f4d0f1c915fac20b5aa2b691 -size 193 +oid sha256:c4d8f5f496dc63c9e667178332e855e3bded96a4654510f45aa5c79cc7ef5f48 +size 182 diff --git a/assets/minecraft/textures/block/packed_mud.png b/assets/minecraft/textures/block/packed_mud.png index f4bcf3e2..5b2d89c1 100644 --- a/assets/minecraft/textures/block/packed_mud.png +++ b/assets/minecraft/textures/block/packed_mud.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:76b64cb616c42c44c225de1e341c4df840cec940fb9c0cdff5240560d12c7243 -size 197 +oid sha256:143f1729042262d675f0eefe5a8b2704c5d5837f8526aa36b8930328dfb141bf +size 192 diff --git a/assets/minecraft/textures/block/pale_oak_door_bottom.png b/assets/minecraft/textures/block/pale_oak_door_bottom.png index 7c162a2d..fef25b12 100644 --- a/assets/minecraft/textures/block/pale_oak_door_bottom.png +++ b/assets/minecraft/textures/block/pale_oak_door_bottom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:263d795388af54610f76afe6a64f0d60ff15adbd4aa8e00c8ca237eea4fc2978 -size 227 +oid sha256:c8809e32d3bb3f86ce5c2d267bcc4c11b1a9c3a830d05e5e0aa7a529c2b95973 +size 212 diff --git a/assets/minecraft/textures/block/pale_oak_door_top.png b/assets/minecraft/textures/block/pale_oak_door_top.png index 4ad5848d..9ca391e5 100644 --- a/assets/minecraft/textures/block/pale_oak_door_top.png +++ b/assets/minecraft/textures/block/pale_oak_door_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:25c04fdc28cea14863fae6de4aaccf1fad603414337a0d3824d9eb84565d48bb -size 224 +oid sha256:858dd3cb031848ed8b64544a87614e04f0924a4e1253f182c2c0a5286039b6b8 +size 197 diff --git a/assets/minecraft/textures/block/pale_oak_log.png b/assets/minecraft/textures/block/pale_oak_log.png index 0c7d6cc4..decc8ab1 100644 --- a/assets/minecraft/textures/block/pale_oak_log.png +++ b/assets/minecraft/textures/block/pale_oak_log.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:04c5f2e1f381eea1664b70d44d8e5a041485478f393b2fbb50c721f26e317c96 -size 201 +oid sha256:dca4fd9a79731135eba9993cd304a2702fed04fa2191df0a1a7f022c0597b344 +size 196 diff --git a/assets/minecraft/textures/block/pale_oak_log_top.png b/assets/minecraft/textures/block/pale_oak_log_top.png index bd3c65a3..83bc81ec 100644 --- a/assets/minecraft/textures/block/pale_oak_log_top.png +++ b/assets/minecraft/textures/block/pale_oak_log_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dec26b8cd793955cb048d67e3060f473a3fe73f8ad18045b88b79a4f2dd2da5d -size 231 +oid sha256:a957b3af1a7fed8838f06b32ff8780f2e70adeba488d3316498e030be88b3214 +size 220 diff --git a/assets/minecraft/textures/block/pale_oak_planks.png b/assets/minecraft/textures/block/pale_oak_planks.png index 5ebfdd5a..377952ec 100644 --- a/assets/minecraft/textures/block/pale_oak_planks.png +++ b/assets/minecraft/textures/block/pale_oak_planks.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5813b68f896bd4e68a6748b6987372aa1217e223a9fa0ed666c22ed2a74649c0 -size 202 +oid sha256:d478269d770f5bbefc0373a597155329d2f8d089ab76376c14c7eec8e79ea66f +size 195 diff --git a/assets/minecraft/textures/block/pale_oak_trapdoor.png b/assets/minecraft/textures/block/pale_oak_trapdoor.png index c564afd1..c6034ea6 100644 --- a/assets/minecraft/textures/block/pale_oak_trapdoor.png +++ b/assets/minecraft/textures/block/pale_oak_trapdoor.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cb81fbccea7d22c56cecf0cfce1d17c1194f83aceb4d4d645c653ee320bf408a -size 188 +oid sha256:5eafb6cfd036b128aea6daca3dba44f9fb3521aacb7f682d774be8c1c9c72c8a +size 186 diff --git a/assets/minecraft/textures/block/pearlescent_froglight_side.png b/assets/minecraft/textures/block/pearlescent_froglight_side.png index 3bab5eb5..69b25844 100644 --- a/assets/minecraft/textures/block/pearlescent_froglight_side.png +++ b/assets/minecraft/textures/block/pearlescent_froglight_side.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bf79d1cf3a37449378a61c505cf768d58a1082ab28032f74216a23d635b3acaa -size 196 +oid sha256:702d2996a235e5bfe964acf32a8692a281e44ef4dadbbe5d7ab7b557e6b66e97 +size 184 diff --git a/assets/minecraft/textures/block/pearlescent_froglight_top.png b/assets/minecraft/textures/block/pearlescent_froglight_top.png index e69d63b8..fe8cad6a 100644 --- a/assets/minecraft/textures/block/pearlescent_froglight_top.png +++ b/assets/minecraft/textures/block/pearlescent_froglight_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:29a87517055c6708c9b836bb35361578d8c86caed60ca2e927cea62a30cde8ce -size 175 +oid sha256:184c6440e2adc27fa112f59decc05410330e6dd9d0ed9d830c0fea054b1dc139 +size 167 diff --git a/assets/minecraft/textures/block/peony_bottom.png b/assets/minecraft/textures/block/peony_bottom.png index 72a727f4..85fa3766 100644 --- a/assets/minecraft/textures/block/peony_bottom.png +++ b/assets/minecraft/textures/block/peony_bottom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ee5a1bf0f72db74101e44279eeffa07bbc03cb8aa8457492ec7d42d7559a0526 -size 230 +oid sha256:672c11d25bdb4856dde6f816d47db945bebc5bf760bebb9edc7608503ea88ab5 +size 220 diff --git a/assets/minecraft/textures/block/peony_top.png b/assets/minecraft/textures/block/peony_top.png index 1dc9cdb0..9be476d7 100644 --- a/assets/minecraft/textures/block/peony_top.png +++ b/assets/minecraft/textures/block/peony_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:318be29d07cab2db0cb790acf74377d2424208cfee419523b522007b335978b5 -size 206 +oid sha256:87d001fac3725b1c238bffb6b35fdbfcf134005169db20829e4c185f8b7f84f4 +size 205 diff --git a/assets/minecraft/textures/block/pink_candle.png b/assets/minecraft/textures/block/pink_candle.png index 58955ce7..cd326fd9 100644 --- a/assets/minecraft/textures/block/pink_candle.png +++ b/assets/minecraft/textures/block/pink_candle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:089b0abf1d9b74c6f8fe204e1e6d610d2cae8406bd459fcbf39ea3aa1b9f17fe -size 128 +oid sha256:2e2d53f0c75946baefb360767956173a205b0857f195de79b5fd9d6871be294e +size 118 diff --git a/assets/minecraft/textures/block/pink_candle_lit.png b/assets/minecraft/textures/block/pink_candle_lit.png index 37cbee11..5abeeb7e 100644 --- a/assets/minecraft/textures/block/pink_candle_lit.png +++ b/assets/minecraft/textures/block/pink_candle_lit.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:50af3e6a03c2d5026e1758cbf4fc6149262b70c421668263a68c558aa1909605 -size 138 +oid sha256:d81547e1da442515441956ad89e472e8bf74c2d1cb8c527b796b9d8bd258863f +size 137 diff --git a/assets/minecraft/textures/block/pink_concrete.png b/assets/minecraft/textures/block/pink_concrete.png index daa55218..f4e16b7c 100644 --- a/assets/minecraft/textures/block/pink_concrete.png +++ b/assets/minecraft/textures/block/pink_concrete.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:66431c251d44e33d7ef4c1ee6d4c2f70670be2ac662092de82f3c612d7c0cd27 -size 218 +oid sha256:577e1d95bae21c0e91e9300b116266bd4d6efeed30d43fc2cb8fd1d8f4440b59 +size 212 diff --git a/assets/minecraft/textures/block/pink_glazed_terracotta.png b/assets/minecraft/textures/block/pink_glazed_terracotta.png index 36a96d96..d4d26630 100644 --- a/assets/minecraft/textures/block/pink_glazed_terracotta.png +++ b/assets/minecraft/textures/block/pink_glazed_terracotta.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7ff89af9ffbdf1538d7af9bbc02c6de2839b0ebabff6ca9d75d781b751028691 -size 199 +oid sha256:87f3c9cdbf5ebdd9bc80136087705042c846d1e57ebe01aa0ab2c4dc92651eef +size 186 diff --git a/assets/minecraft/textures/block/pink_petals.png b/assets/minecraft/textures/block/pink_petals.png index 070a5014..e83fa092 100644 --- a/assets/minecraft/textures/block/pink_petals.png +++ b/assets/minecraft/textures/block/pink_petals.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2ea08d4b868a8d59a7e1b7393fc5ffed49905235da6d176867a59e2070c55400 -size 222 +oid sha256:a64f1e96e947cc395545707e30af62374fc62c5a8515a02057a7a97b2d44dd03 +size 218 diff --git a/assets/minecraft/textures/block/pink_shulker_box.png b/assets/minecraft/textures/block/pink_shulker_box.png index bf04d7cb..1ac542d5 100644 --- a/assets/minecraft/textures/block/pink_shulker_box.png +++ b/assets/minecraft/textures/block/pink_shulker_box.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b88d314f045ecb1b4632363de10f2f2dbec26155020f8997e9ddc49f8cfc78eb -size 285 +oid sha256:86ae5613ef7560b96fb62dd2d8f8cac307e85b46fb85510110e7ebe6b4719c7f +size 282 diff --git a/assets/minecraft/textures/block/pink_stained_glass_pane_top.png b/assets/minecraft/textures/block/pink_stained_glass_pane_top.png index 1f672ac2..6be146ff 100644 --- a/assets/minecraft/textures/block/pink_stained_glass_pane_top.png +++ b/assets/minecraft/textures/block/pink_stained_glass_pane_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:42336b58bcae96e4459a39feb440166404cb9e41ee59564fd0a9e4c3b65e00ad -size 120 +oid sha256:c8ff9701d09b74d55430595e73a0cd04dde7691791d4a8beaf9060116407a564 +size 118 diff --git a/assets/minecraft/textures/block/pink_terracotta.png b/assets/minecraft/textures/block/pink_terracotta.png index 537acd24..ea0ff50c 100644 --- a/assets/minecraft/textures/block/pink_terracotta.png +++ b/assets/minecraft/textures/block/pink_terracotta.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3c5d2cb4071aaea6730f6c43e46048deacd10ea630f668a869bfee36e561c263 -size 477 +oid sha256:58a811b050b61eda8ae84743d04f70e97dc485750c6858873cce934e95d98c74 +size 423 diff --git a/assets/minecraft/textures/block/pink_tulip.png b/assets/minecraft/textures/block/pink_tulip.png index 20aec4cc..40a40158 100644 --- a/assets/minecraft/textures/block/pink_tulip.png +++ b/assets/minecraft/textures/block/pink_tulip.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b0c9a0fdf3430f5ffceb24bcdffb9a5f250a31ec71b2f837ab17b0b86b24259b -size 202 +oid sha256:dcff50c1fde8baabc4a011cecbf294fe0a2d2b21224dffabd5eaba73964c8ca0 +size 163 diff --git a/assets/minecraft/textures/block/pink_wool.png b/assets/minecraft/textures/block/pink_wool.png index 74976587..09371f5d 100644 --- a/assets/minecraft/textures/block/pink_wool.png +++ b/assets/minecraft/textures/block/pink_wool.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ea5d97e12e3d9c95f29d91c944f3409902bb0c5f880024c8c40fc3c464a441b1 -size 412 +oid sha256:fd0fb51c2865b3fa69d086277ca8d2b0a7e35a64dea73b90c594b548bb692453 +size 410 diff --git a/assets/minecraft/textures/block/piston_bottom.png b/assets/minecraft/textures/block/piston_bottom.png index 26bfdc0a..ca84cdbd 100644 --- a/assets/minecraft/textures/block/piston_bottom.png +++ b/assets/minecraft/textures/block/piston_bottom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d997ee5e249498121cf17bcce08620b7e268f68b994e7eb665e5cc3ea34fb8bf -size 223 +oid sha256:2659df57f53673f77b9f2eb9dd34e9bb1098389aaba783c9d2c5aa1c6417734c +size 204 diff --git a/assets/minecraft/textures/block/piston_inner.png b/assets/minecraft/textures/block/piston_inner.png index 36f49d6e..208c9e9e 100644 --- a/assets/minecraft/textures/block/piston_inner.png +++ b/assets/minecraft/textures/block/piston_inner.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c4361091b3f3d4a7018390fb75f6e5d7beb0ecc26d533ee201015ac9efd414aa -size 242 +oid sha256:915fc1755ef37e3d3f8ee5072a450c827e625175bf52bcf549d5330cccb5bc62 +size 217 diff --git a/assets/minecraft/textures/block/piston_side.png b/assets/minecraft/textures/block/piston_side.png index f81f1314..c4936190 100644 --- a/assets/minecraft/textures/block/piston_side.png +++ b/assets/minecraft/textures/block/piston_side.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b8280a55f499a704b42e39f2be1cb68479484eb72384f56ab715d4432afaa7b -size 270 +oid sha256:e0582688ee63cc695434c0f0e90b3750046ead23a00242e9c18b74c105bd34e1 +size 269 diff --git a/assets/minecraft/textures/block/piston_top.png b/assets/minecraft/textures/block/piston_top.png index fd827208..cc859fcc 100644 --- a/assets/minecraft/textures/block/piston_top.png +++ b/assets/minecraft/textures/block/piston_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1835a66720f10230d9bb4ca307eaca1f9d4585b73be25f4778b1b592804836f5 -size 214 +oid sha256:582677eed9633f9c71a3b4b44050bb5a2290b31a073fc7061d165e614a2acb9d +size 198 diff --git a/assets/minecraft/textures/block/piston_top_sticky.png b/assets/minecraft/textures/block/piston_top_sticky.png index 3fcbda6d..9bb9a793 100644 --- a/assets/minecraft/textures/block/piston_top_sticky.png +++ b/assets/minecraft/textures/block/piston_top_sticky.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:432ba061ec855a1f8607a81cc1becf82d6070ce3c2b70f3ecd9d931656bf13f3 -size 262 +oid sha256:6a00ae4c73fae0a1b5ab57f2adab460459ee80342e16b60ec4eb4b98fd098445 +size 251 diff --git a/assets/minecraft/textures/block/pitcher_crop_bottom.png b/assets/minecraft/textures/block/pitcher_crop_bottom.png index 31e29084..307ad6e0 100644 --- a/assets/minecraft/textures/block/pitcher_crop_bottom.png +++ b/assets/minecraft/textures/block/pitcher_crop_bottom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8294b709843038ca6f4bd8ecfbb88039a05aa0315f8406249dcdf3f80183390c -size 159 +oid sha256:2a65555805a621dc9d6c1bcf316af6e90276a02e730b32c47af75180e521855d +size 156 diff --git a/assets/minecraft/textures/block/pitcher_crop_bottom_stage_1.png b/assets/minecraft/textures/block/pitcher_crop_bottom_stage_1.png index f27f4415..7c1bcb85 100644 --- a/assets/minecraft/textures/block/pitcher_crop_bottom_stage_1.png +++ b/assets/minecraft/textures/block/pitcher_crop_bottom_stage_1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fcc6f8a12578f4745e3250a8d62e15ce7ec372a507960191f9ebec974a7e2ca2 -size 157 +oid sha256:742624fb48437956534f1cf439e34d69452cc68fe3a28c602ba380d611664114 +size 156 diff --git a/assets/minecraft/textures/block/pitcher_crop_bottom_stage_2.png b/assets/minecraft/textures/block/pitcher_crop_bottom_stage_2.png index d659a06f..cb069e33 100644 --- a/assets/minecraft/textures/block/pitcher_crop_bottom_stage_2.png +++ b/assets/minecraft/textures/block/pitcher_crop_bottom_stage_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2ce7b26fe6d057a26d56cdbab327474e0f0397943ce041518a1cf3aaef0b4068 -size 192 +oid sha256:a744d838ad06fc393b8a2eaecf68aa11ff8ce81320a6c32ad505b53dacdea3d2 +size 184 diff --git a/assets/minecraft/textures/block/pitcher_crop_bottom_stage_3.png b/assets/minecraft/textures/block/pitcher_crop_bottom_stage_3.png index 009edbb9..059259fe 100644 --- a/assets/minecraft/textures/block/pitcher_crop_bottom_stage_3.png +++ b/assets/minecraft/textures/block/pitcher_crop_bottom_stage_3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3c5811c1cfe9b8e771865855f1001607e5230e698264bebcca708f1b8083ca3a -size 180 +oid sha256:8f6c1675cb36afdb87819198fb74da4b0eb4cb19ef40041edfcc4858cf7a4574 +size 172 diff --git a/assets/minecraft/textures/block/pitcher_crop_bottom_stage_4.png b/assets/minecraft/textures/block/pitcher_crop_bottom_stage_4.png index 137b3a29..194dc543 100644 --- a/assets/minecraft/textures/block/pitcher_crop_bottom_stage_4.png +++ b/assets/minecraft/textures/block/pitcher_crop_bottom_stage_4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c3c5bfea37f483e285c77c9ae30a2c272d652ae3072f119224b6e93cd5997c5b -size 198 +oid sha256:5725adc012008104490a4eba29b3bcaf2737b34947b6e6a290fbdb8e687a2703 +size 186 diff --git a/assets/minecraft/textures/block/pitcher_crop_top.png b/assets/minecraft/textures/block/pitcher_crop_top.png index 7ac8846d..65ab7231 100644 --- a/assets/minecraft/textures/block/pitcher_crop_top.png +++ b/assets/minecraft/textures/block/pitcher_crop_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1c2f95db16a88e6e1c8f031b98c40da04b5a3ef10ba19eb337740d7a1f0c006d -size 179 +oid sha256:7fb4f2933f6bc448117dd7e93ebf3d42fe7020cd47ccb59d1126d686901f4f86 +size 178 diff --git a/assets/minecraft/textures/block/pitcher_crop_top_stage_4.png b/assets/minecraft/textures/block/pitcher_crop_top_stage_4.png index 0ecc01f7..d99e72fa 100644 --- a/assets/minecraft/textures/block/pitcher_crop_top_stage_4.png +++ b/assets/minecraft/textures/block/pitcher_crop_top_stage_4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:83ad6694eba708bd07080d316b5043c16ef2aaee62dae9831493ebdef5712a28 -size 213 +oid sha256:0a69b2e2d7cd5ab41c8eefd317aafb6ff8f24d5aebfa9acc184d0c7930e90669 +size 206 diff --git a/assets/minecraft/textures/block/podzol_side.png b/assets/minecraft/textures/block/podzol_side.png index c562b499..5e1a4378 100644 --- a/assets/minecraft/textures/block/podzol_side.png +++ b/assets/minecraft/textures/block/podzol_side.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b467dfb29852744f42f0affad95f5bbc8c7e528040da9f18c46ac10c9cee15c2 -size 412 +oid sha256:dacef78790b567396241e3d1453cdc5cd63eb79484f77fe8bd9311281805e283 +size 395 diff --git a/assets/minecraft/textures/block/podzol_top.png b/assets/minecraft/textures/block/podzol_top.png index 7aff9b96..5952c7a2 100644 --- a/assets/minecraft/textures/block/podzol_top.png +++ b/assets/minecraft/textures/block/podzol_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:868a87d8655f824a5633d737f9f0dbf92145b99bf1df043818b8f5048490cd45 -size 197 +oid sha256:598072d5a4db38ec4ea081a584a2de6b5960785bc2287e18e93427c7433c5d56 +size 196 diff --git a/assets/minecraft/textures/block/pointed_dripstone_down_frustum.png b/assets/minecraft/textures/block/pointed_dripstone_down_frustum.png index e7ecb9db..2abee2f2 100644 --- a/assets/minecraft/textures/block/pointed_dripstone_down_frustum.png +++ b/assets/minecraft/textures/block/pointed_dripstone_down_frustum.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2211de45d7a9d17a4e7c1c3dd2414e6a2c0ed48e74451f50c58a5814132d8fdc -size 197 +oid sha256:5ce6a1ce930dc0c81f71b4d359b016563aea7b1b7974ac59acf8dc94a76caeb8 +size 186 diff --git a/assets/minecraft/textures/block/pointed_dripstone_down_tip_merge.png b/assets/minecraft/textures/block/pointed_dripstone_down_tip_merge.png index 22e168ed..d72de643 100644 --- a/assets/minecraft/textures/block/pointed_dripstone_down_tip_merge.png +++ b/assets/minecraft/textures/block/pointed_dripstone_down_tip_merge.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e5784e765e7cf79f61b1e3ed917e840906e9d8a13f2e1d9b85ece81551461d8c -size 172 +oid sha256:87aed976335e749d5725f96f236495b74cd1ab4d52733c693db1ad4caba721ce +size 165 diff --git a/assets/minecraft/textures/block/pointed_dripstone_up_frustum.png b/assets/minecraft/textures/block/pointed_dripstone_up_frustum.png index 117da89a..ea3c56b9 100644 --- a/assets/minecraft/textures/block/pointed_dripstone_up_frustum.png +++ b/assets/minecraft/textures/block/pointed_dripstone_up_frustum.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:74edf74c4c1b267700f7c9a0f75484a12cd7f1a28ed02f9e53618ad5101be098 -size 197 +oid sha256:49b2da03881f179f8e504a863f4f2f52e482ae7a1ac8a9cf1d7e440956a84acb +size 185 diff --git a/assets/minecraft/textures/block/pointed_dripstone_up_tip_merge.png b/assets/minecraft/textures/block/pointed_dripstone_up_tip_merge.png index 7bb5da5f..20fd4b80 100644 --- a/assets/minecraft/textures/block/pointed_dripstone_up_tip_merge.png +++ b/assets/minecraft/textures/block/pointed_dripstone_up_tip_merge.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f96eb79844927684ee18a6af78328bffc0751b0a5a501dc7aabdf018a357899a -size 168 +oid sha256:71f1848ed39ac2fef4067a0c3de5b4c81b8547dbd1b0fd06d5936ca35a18763b +size 161 diff --git a/assets/minecraft/textures/block/polished_andesite.png b/assets/minecraft/textures/block/polished_andesite.png index 89709793..517f6577 100644 --- a/assets/minecraft/textures/block/polished_andesite.png +++ b/assets/minecraft/textures/block/polished_andesite.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ffe83daad907f1240fa6f872c5a89aed1d17c5a5c65815e0cdc5cc896069ca16 -size 224 +oid sha256:1faaa8bacab00d23de46321801e7147a02e388febc43b6c7b31f0ae364e8137e +size 205 diff --git a/assets/minecraft/textures/block/polished_blackstone.png b/assets/minecraft/textures/block/polished_blackstone.png index 0799fdd3..b0420977 100644 --- a/assets/minecraft/textures/block/polished_blackstone.png +++ b/assets/minecraft/textures/block/polished_blackstone.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:df7c7d7328616faf241616af37fbcbc391b09316e7a96667372116eed730313c -size 193 +oid sha256:4a36ac06b65d5330bc83e4711b4f62c3afe788b95526f2983730461a35b401ff +size 189 diff --git a/assets/minecraft/textures/block/polished_blackstone_bricks.png b/assets/minecraft/textures/block/polished_blackstone_bricks.png index 62c943cb..aa6096c4 100644 --- a/assets/minecraft/textures/block/polished_blackstone_bricks.png +++ b/assets/minecraft/textures/block/polished_blackstone_bricks.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b277a43ff38c99a2d4ded58f07650ad8a2c0cc3e116869f7c097f7ca96178480 -size 197 +oid sha256:91d65c74a532535cd761b4f6760467e907450c9bfa7adc6b2e11587f00942953 +size 190 diff --git a/assets/minecraft/textures/block/polished_deepslate.png b/assets/minecraft/textures/block/polished_deepslate.png index c18e4979..bce0d8ab 100644 --- a/assets/minecraft/textures/block/polished_deepslate.png +++ b/assets/minecraft/textures/block/polished_deepslate.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e6b777f3ba1b44e7ceaea9cfb963c053c1562ab89b348824d5c1ea0e9629f744 -size 207 +oid sha256:5843efd88bee24d560957d038d4634276ed4ad8e47797ba1850a07ad45b33729 +size 196 diff --git a/assets/minecraft/textures/block/polished_diorite.png b/assets/minecraft/textures/block/polished_diorite.png index 34b15e14..22b77ec1 100644 --- a/assets/minecraft/textures/block/polished_diorite.png +++ b/assets/minecraft/textures/block/polished_diorite.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bf0a493d29f2864f5b1fe05b6d5963d69fe90065427638df99963696ed46aba8 -size 219 +oid sha256:dfe6b1ae9ecfc263f031d15f53b5775eb519217a2b0c6f2f887fbebf522558d5 +size 218 diff --git a/assets/minecraft/textures/block/polished_granite.png b/assets/minecraft/textures/block/polished_granite.png index 62c70b01..753d1b90 100644 --- a/assets/minecraft/textures/block/polished_granite.png +++ b/assets/minecraft/textures/block/polished_granite.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0863a64add73db058babc3dcaee46f1c77f8801e5e2bd3e5ccbe4d32a9678e8a -size 219 +oid sha256:455445b2134e66ca93246b6b005f2adc3b75d90baa400f720e1643b66bd8336f +size 201 diff --git a/assets/minecraft/textures/block/polished_tuff.png b/assets/minecraft/textures/block/polished_tuff.png index 12da56b9..2b1f1593 100644 --- a/assets/minecraft/textures/block/polished_tuff.png +++ b/assets/minecraft/textures/block/polished_tuff.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e3f921460e17b5bf539a754798bcb56b037c98209dc0f594888f128a152bce5a -size 204 +oid sha256:316455dd51bf0b17c91a4e1f2e2fb4e8bfc0f80cc740a6fe92f5fcaa22938bb0 +size 203 diff --git a/assets/minecraft/textures/block/poppy.png b/assets/minecraft/textures/block/poppy.png index 3b93882c..dc30449b 100644 --- a/assets/minecraft/textures/block/poppy.png +++ b/assets/minecraft/textures/block/poppy.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:419b360fb68a795a61100da382884aed41973ee9ba3c236d5a95e47d36462a62 -size 170 +oid sha256:9678d89814d640f88305add21ee6d157f52007aac60bbc363b30054bb3388561 +size 143 diff --git a/assets/minecraft/textures/block/potatoes_stage0.png b/assets/minecraft/textures/block/potatoes_stage0.png index 4ac69fb0..2e7be82b 100644 --- a/assets/minecraft/textures/block/potatoes_stage0.png +++ b/assets/minecraft/textures/block/potatoes_stage0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e49fdeba4798affef4e7c217e580a6231d954473c977f08ab95566398c6abd28 -size 115 +oid sha256:1f993a15fc46a2333645f776fcdb7f5157915b61d28e6290b71cb2c2caf5d14a +size 113 diff --git a/assets/minecraft/textures/block/potatoes_stage3.png b/assets/minecraft/textures/block/potatoes_stage3.png index 21537488..96eee837 100644 --- a/assets/minecraft/textures/block/potatoes_stage3.png +++ b/assets/minecraft/textures/block/potatoes_stage3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b4d33aef464a8d03c4bfc5011f77b4857e808e55269ed866739b1db2fc2279ee -size 204 +oid sha256:6a10c0b7aba77d82035af692f03cc6e63f1068eb92ab8a10f00f688d6410ba32 +size 192 diff --git a/assets/minecraft/textures/block/potted_azalea_bush_plant.png b/assets/minecraft/textures/block/potted_azalea_bush_plant.png index dbba7000..0e62d7e6 100644 --- a/assets/minecraft/textures/block/potted_azalea_bush_plant.png +++ b/assets/minecraft/textures/block/potted_azalea_bush_plant.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a6531bb57de9916c3d40f6be071bb24ee08b23b0d56a14b17344cb907d7dc2ab -size 189 +oid sha256:7497222ff33342d6922622b48dc47f04a1e3b5031c3c9c9b71c51bd3f4ca46a2 +size 188 diff --git a/assets/minecraft/textures/block/potted_azalea_bush_top.png b/assets/minecraft/textures/block/potted_azalea_bush_top.png index 64d64076..be509292 100644 --- a/assets/minecraft/textures/block/potted_azalea_bush_top.png +++ b/assets/minecraft/textures/block/potted_azalea_bush_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:180a5bea9304f7c5b5e4e2cdeb239c3081d931ded4aa4dea9dc37a8af8d1cf8c -size 150 +oid sha256:6a634eec88f131248712b3df84e84e7346cd7028df0d3ebd46a4701f8b7c308b +size 149 diff --git a/assets/minecraft/textures/block/potted_flowering_azalea_bush_plant.png b/assets/minecraft/textures/block/potted_flowering_azalea_bush_plant.png index 47b417d0..75251bc7 100644 --- a/assets/minecraft/textures/block/potted_flowering_azalea_bush_plant.png +++ b/assets/minecraft/textures/block/potted_flowering_azalea_bush_plant.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cc838dbc6ca6f9d53165bcd0e788b25bf2792e1ecb2578dd763d1dc98268145d -size 205 +oid sha256:940b9902f13ddec8cffb6e0f89d83ddc1cf7886b816550df8bce1fb2a1403b57 +size 202 diff --git a/assets/minecraft/textures/block/prismarine_bricks.png b/assets/minecraft/textures/block/prismarine_bricks.png index bea7efcc..0a741aa3 100644 --- a/assets/minecraft/textures/block/prismarine_bricks.png +++ b/assets/minecraft/textures/block/prismarine_bricks.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:052c3cd7870700bd2e3f13242024f4526ace612e2f6488158b11e0dab6cfaad8 -size 217 +oid sha256:337aaa7dc951acd1cb10ade9675d3c85a0a190d462ba2a484c19be5060a5eb56 +size 210 diff --git a/assets/minecraft/textures/block/pumpkin_side.png b/assets/minecraft/textures/block/pumpkin_side.png index c3811ae5..d0096232 100644 --- a/assets/minecraft/textures/block/pumpkin_side.png +++ b/assets/minecraft/textures/block/pumpkin_side.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:616ef8db5a90e1f02843f4c3fe5ecb57e681a7cbad695bc7c1b1e34f7c7dc3e9 -size 187 +oid sha256:8f67ee060dd5c1ecc66913caed4294937e3cda8a11d0e0866ec8f558c157c30d +size 178 diff --git a/assets/minecraft/textures/block/pumpkin_stem.png b/assets/minecraft/textures/block/pumpkin_stem.png index 24940dd0..f034c3a9 100644 --- a/assets/minecraft/textures/block/pumpkin_stem.png +++ b/assets/minecraft/textures/block/pumpkin_stem.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f1dc96a2213f5d333cc5b92e584316b74f44b60a3c496b91d91ac6535b18e3d2 -size 145 +oid sha256:ca5015f8b47df4159f6d60747022069c8c969f0ac317f3251f590e76d7cef1e7 +size 137 diff --git a/assets/minecraft/textures/block/pumpkin_top.png b/assets/minecraft/textures/block/pumpkin_top.png index 21e9b543..b81fdf9f 100644 --- a/assets/minecraft/textures/block/pumpkin_top.png +++ b/assets/minecraft/textures/block/pumpkin_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aa23338fd28b9c6d7c00a1be45946a31ae36663efa83371ea4f897639104d12f -size 212 +oid sha256:d56a36f0fea290d79d9a23122255627181ca54541d0599791fdf23b617b160c6 +size 199 diff --git a/assets/minecraft/textures/block/purple_candle.png b/assets/minecraft/textures/block/purple_candle.png index ca585535..4c33387e 100644 --- a/assets/minecraft/textures/block/purple_candle.png +++ b/assets/minecraft/textures/block/purple_candle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4e4eb069c16593d426b66c1894c458f37e86a1b3bb23be51f100068f169d3264 -size 128 +oid sha256:786e783af37ee1b20bfebc47017434da3d204c9f171874edcece9edd537034f0 +size 118 diff --git a/assets/minecraft/textures/block/purple_candle_lit.png b/assets/minecraft/textures/block/purple_candle_lit.png index 8e331546..3c432cd2 100644 --- a/assets/minecraft/textures/block/purple_candle_lit.png +++ b/assets/minecraft/textures/block/purple_candle_lit.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eeab63fe3f5899557e95d9f4fe8bd5c6a514efc23588b577f918d3eb814fa005 -size 136 +oid sha256:ad4e111d97fa18f34eba0ce209cf3498ccd95bd0213be5cdaca8d542c98d7cbf +size 135 diff --git a/assets/minecraft/textures/block/purple_concrete.png b/assets/minecraft/textures/block/purple_concrete.png index 501caf05..8fdb01d8 100644 --- a/assets/minecraft/textures/block/purple_concrete.png +++ b/assets/minecraft/textures/block/purple_concrete.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b02767593f142784ea16205315ab19262daa595ce5f2e209d524b42350d29a73 -size 185 +oid sha256:f439d27ccc62f90e47a1ddae0901e88e60a9911f044e1c68f6bfd1f293fe9c41 +size 181 diff --git a/assets/minecraft/textures/block/purple_glazed_terracotta.png b/assets/minecraft/textures/block/purple_glazed_terracotta.png index 74163dbe..b655c705 100644 --- a/assets/minecraft/textures/block/purple_glazed_terracotta.png +++ b/assets/minecraft/textures/block/purple_glazed_terracotta.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d49c69dbf0c239a20f8d119fbd4d8335d43a6ecad7edbaedb6bfec838c0221ee -size 237 +oid sha256:ccb31f33068425cb1a13f92d503ae776d812b5676cb8b4c7930fc7bfb1e07012 +size 225 diff --git a/assets/minecraft/textures/block/purple_shulker_box.png b/assets/minecraft/textures/block/purple_shulker_box.png index ee4dd5e6..fa9744a2 100644 --- a/assets/minecraft/textures/block/purple_shulker_box.png +++ b/assets/minecraft/textures/block/purple_shulker_box.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:526e0b37e5cd36dff6bd608882d3c4121c62eb1e055fd471cab02fd642f4ae7f -size 280 +oid sha256:cf9b41d4fac0abe19640cd74f393e3aa484315bb651538df5aa56283316d8862 +size 277 diff --git a/assets/minecraft/textures/block/purple_stained_glass_pane_top.png b/assets/minecraft/textures/block/purple_stained_glass_pane_top.png index 6720fded..769713ee 100644 --- a/assets/minecraft/textures/block/purple_stained_glass_pane_top.png +++ b/assets/minecraft/textures/block/purple_stained_glass_pane_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a874defe348a097af15ae1677b7123eb6dd4501fe6607c442607d3a8677e9343 -size 120 +oid sha256:8e39ad5e4f2cfa8ac2dcc89f8bb1680bee0c0a91000736654788f2a055896b4e +size 118 diff --git a/assets/minecraft/textures/block/purple_terracotta.png b/assets/minecraft/textures/block/purple_terracotta.png index b615f223..a7a4045a 100644 --- a/assets/minecraft/textures/block/purple_terracotta.png +++ b/assets/minecraft/textures/block/purple_terracotta.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:58710e8a23e1a6a9e7475df241391bb9c91196c781e5e4104eb9f45de6d0b093 -size 476 +oid sha256:f267c2238056f8d1787e3904ff2cb4c16ff562956d3e7ecbbbfe1088a696f839 +size 423 diff --git a/assets/minecraft/textures/block/purple_wool.png b/assets/minecraft/textures/block/purple_wool.png index 027df2b5..73eefc91 100644 --- a/assets/minecraft/textures/block/purple_wool.png +++ b/assets/minecraft/textures/block/purple_wool.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:18ec46e904333a9800b94ec8dd5f57207dca87b33159d45bbae9c5e52cf2c293 -size 400 +oid sha256:f8f5d7eb9145633d27d80c4c06a9a71e21eaea522c277f81a4d6d9e8fd60f0d9 +size 399 diff --git a/assets/minecraft/textures/block/purpur_block.png b/assets/minecraft/textures/block/purpur_block.png index 393a0347..40fb561e 100644 --- a/assets/minecraft/textures/block/purpur_block.png +++ b/assets/minecraft/textures/block/purpur_block.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3604f85dc6f47762475497131e5b1ede906c932d6e30aeccf1bdd376ebf4d3bc -size 179 +oid sha256:3e6a2fe3f74a47f110e7870ad2a55814129bd0c1908391c4e5465345a8402dbd +size 168 diff --git a/assets/minecraft/textures/block/quartz_block_bottom.png b/assets/minecraft/textures/block/quartz_block_bottom.png index 8ee7e321..b52f08a9 100644 --- a/assets/minecraft/textures/block/quartz_block_bottom.png +++ b/assets/minecraft/textures/block/quartz_block_bottom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:71257d89af4fa37b33d9454eb6575ec187022dfc591c39a771bd0ffb1cad23e5 -size 153 +oid sha256:99da01fae2c0a8980730fcb30d3881a94649ec51445cb9c8283ad35851ac5ebd +size 151 diff --git a/assets/minecraft/textures/block/quartz_block_side.png b/assets/minecraft/textures/block/quartz_block_side.png index b1bf91dd..a9b02a5e 100644 --- a/assets/minecraft/textures/block/quartz_block_side.png +++ b/assets/minecraft/textures/block/quartz_block_side.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6a1525cca96303a1fa02e019861ae4fe795c9ad93a79123c654db242cce898f8 -size 181 +oid sha256:63d3d5c7184b3f83b269933b306ea587bc28792c9c5118227b218cd4e3a6bd8c +size 165 diff --git a/assets/minecraft/textures/block/quartz_block_top.png b/assets/minecraft/textures/block/quartz_block_top.png index b1bf91dd..a9b02a5e 100644 --- a/assets/minecraft/textures/block/quartz_block_top.png +++ b/assets/minecraft/textures/block/quartz_block_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6a1525cca96303a1fa02e019861ae4fe795c9ad93a79123c654db242cce898f8 -size 181 +oid sha256:63d3d5c7184b3f83b269933b306ea587bc28792c9c5118227b218cd4e3a6bd8c +size 165 diff --git a/assets/minecraft/textures/block/quartz_bricks.png b/assets/minecraft/textures/block/quartz_bricks.png index f6a2127c..01d9fad5 100644 --- a/assets/minecraft/textures/block/quartz_bricks.png +++ b/assets/minecraft/textures/block/quartz_bricks.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:67ab2f8008fcb67b2fa465c7c7a3aa3f284389e8ed96ef1796dd93e1dc4a3d7d -size 194 +oid sha256:686315c8ee96a25564033e544250620da72a290b892ef18687a884f035130b3f +size 171 diff --git a/assets/minecraft/textures/block/quartz_pillar.png b/assets/minecraft/textures/block/quartz_pillar.png index 817f0d3c..224a5cf6 100644 --- a/assets/minecraft/textures/block/quartz_pillar.png +++ b/assets/minecraft/textures/block/quartz_pillar.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ab2830d534354b5c36c93b23905a9e860c6f1e5482f106ce54ceb930d54f0f2e -size 151 +oid sha256:aaef1129f042a6bafa8e276c314253693e7d5c71de15815a02724e01ab6413a3 +size 150 diff --git a/assets/minecraft/textures/block/quartz_pillar_top.png b/assets/minecraft/textures/block/quartz_pillar_top.png index 40efe5e1..75002b43 100644 --- a/assets/minecraft/textures/block/quartz_pillar_top.png +++ b/assets/minecraft/textures/block/quartz_pillar_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:be9c0e0da646d65bf8b085a70612009d25a2c996ebf16fb6756e3ad045acb0e7 -size 188 +oid sha256:7c31c6bc763ab5dbd1449fb92eb317be01922d0da5ef503fe61e02c520adb940 +size 176 diff --git a/assets/minecraft/textures/block/rail.png b/assets/minecraft/textures/block/rail.png index 45c8c8a4..7faed43d 100644 --- a/assets/minecraft/textures/block/rail.png +++ b/assets/minecraft/textures/block/rail.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:37d88051df220b81bfeb5f59add18a3a019307671ac59c68e7c0bdb79c599313 -size 216 +oid sha256:db73ebf85b0f5090c232de60059b761a9a62fa8a9bb2084d121f9d08b0bde5a7 +size 213 diff --git a/assets/minecraft/textures/block/rail_corner.png b/assets/minecraft/textures/block/rail_corner.png index 5e8a31e3..10f07bb2 100644 --- a/assets/minecraft/textures/block/rail_corner.png +++ b/assets/minecraft/textures/block/rail_corner.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cf15400bedf3176ba4d9f7d62f5308fbcd182790dfdd666d8d4de18d02ce00ef -size 232 +oid sha256:5dadaef5909fe7af3a3251cffbd44ebecc7e7da3081ecdf92e380a0b782cdc73 +size 216 diff --git a/assets/minecraft/textures/block/raw_copper_block.png b/assets/minecraft/textures/block/raw_copper_block.png index 88fabc69..66978441 100644 --- a/assets/minecraft/textures/block/raw_copper_block.png +++ b/assets/minecraft/textures/block/raw_copper_block.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:edbd8bb4dbc260ad35c27dcac1ca1d6c11bf573b425f67dde6f4658693410bf4 -size 273 +oid sha256:aed8352213c7f820c3cf0e09e63981d203538fa025201f28f35d046a2c375de7 +size 265 diff --git a/assets/minecraft/textures/block/raw_gold_block.png b/assets/minecraft/textures/block/raw_gold_block.png index d4f08911..4e9083bd 100644 --- a/assets/minecraft/textures/block/raw_gold_block.png +++ b/assets/minecraft/textures/block/raw_gold_block.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7b7dfe6cd60f10a7269c7f0f08f5c92aed0c9ea722bfad2e732232b01a8cfc37 -size 205 +oid sha256:ceb097f7218d597da9bcc71a7736d3ac7c0a870d666949301871b773aaa90ef1 +size 203 diff --git a/assets/minecraft/textures/block/red_candle.png b/assets/minecraft/textures/block/red_candle.png index 01b15b4b..a6f72369 100644 --- a/assets/minecraft/textures/block/red_candle.png +++ b/assets/minecraft/textures/block/red_candle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:22a39ec7bf3add4a0385f1783d8ce6b1cfce7b1905ce421aab5988da2e464d6b -size 128 +oid sha256:78b27ce18ddbd87e20c770ad0dc28a90e3aae43268ce8d45b128444ce85f1430 +size 118 diff --git a/assets/minecraft/textures/block/red_candle_lit.png b/assets/minecraft/textures/block/red_candle_lit.png index 3025b138..b216693c 100644 --- a/assets/minecraft/textures/block/red_candle_lit.png +++ b/assets/minecraft/textures/block/red_candle_lit.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0bf6fe1caa420cbf1de3eed1e093126f4a77a5c5b39693836213e7f67bf6c525 -size 136 +oid sha256:3a2027d1210cdbbaf0d374955a79a1fb3cef98c4d8fb7970b8366ce42dabf079 +size 135 diff --git a/assets/minecraft/textures/block/red_concrete_powder.png b/assets/minecraft/textures/block/red_concrete_powder.png index fedea027..8b399584 100644 --- a/assets/minecraft/textures/block/red_concrete_powder.png +++ b/assets/minecraft/textures/block/red_concrete_powder.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ab035a2aec4412eeeb55aa792d269327d73393c75da3dd074d9493ab965d3bdc -size 565 +oid sha256:39f9bb7a9f0e11986b65cec8bb58252405f26f048ee3c62397038e3a0eff9e1d +size 564 diff --git a/assets/minecraft/textures/block/red_glazed_terracotta.png b/assets/minecraft/textures/block/red_glazed_terracotta.png index f9539944..82d5febb 100644 --- a/assets/minecraft/textures/block/red_glazed_terracotta.png +++ b/assets/minecraft/textures/block/red_glazed_terracotta.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6ce3d040f5accbc81682fee434a3cbca6a60aed4985bc2ba5906e70747c790d1 -size 236 +oid sha256:d53804d0e13c6f23ecd8417374c3c9c9fe154c3e2d27544436f3185580e5acf7 +size 222 diff --git a/assets/minecraft/textures/block/red_mushroom.png b/assets/minecraft/textures/block/red_mushroom.png index 1d978fb9..286ddbad 100644 --- a/assets/minecraft/textures/block/red_mushroom.png +++ b/assets/minecraft/textures/block/red_mushroom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:abeb8b575f4217b5eefc058b9de14252ca07a8667da1d446f0c02bc7343e4350 -size 148 +oid sha256:b3257798e3e8cfd06fbfa21f5d222d3705a84558d93ab0cc0554f8a4d0b803f4 +size 147 diff --git a/assets/minecraft/textures/block/red_mushroom_block.png b/assets/minecraft/textures/block/red_mushroom_block.png index ada0f768..8ecc4656 100644 --- a/assets/minecraft/textures/block/red_mushroom_block.png +++ b/assets/minecraft/textures/block/red_mushroom_block.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c83641051b7d3c730b74e93facf825c55db7bc776b59d326be2c1459febd0d05 -size 189 +oid sha256:f59f0d967a535491e6c072a421e392a97c286c236b80540ab0c4f9649246ea9d +size 179 diff --git a/assets/minecraft/textures/block/red_sand.png b/assets/minecraft/textures/block/red_sand.png index 70b9ddb2..786fdaf9 100644 --- a/assets/minecraft/textures/block/red_sand.png +++ b/assets/minecraft/textures/block/red_sand.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:477b032e46f4c576e8be64e7e342d0088412229c92305adcd27f3e47502576d7 -size 189 +oid sha256:2acb7fb7307394c003a74a09371cd50cf5f7dcb80e7aff3adb4ae96dc854367a +size 188 diff --git a/assets/minecraft/textures/block/red_sandstone.png b/assets/minecraft/textures/block/red_sandstone.png index 871ccc5b..0f8afaff 100644 --- a/assets/minecraft/textures/block/red_sandstone.png +++ b/assets/minecraft/textures/block/red_sandstone.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d3ef1b377d421c3cc853994301fe156276d7625204d500fa76f633ba6f261639 -size 210 +oid sha256:616d883eca1d0bbfcefe6082ae6111b119808d945ff752ac1a0ac00c90add2a5 +size 199 diff --git a/assets/minecraft/textures/block/red_sandstone_top.png b/assets/minecraft/textures/block/red_sandstone_top.png index 5c07945a..64e37cd3 100644 --- a/assets/minecraft/textures/block/red_sandstone_top.png +++ b/assets/minecraft/textures/block/red_sandstone_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8fca62c606d7137bf339c4b692383aa3038fcdb88c0606fa721e1260eca0bda4 -size 184 +oid sha256:ce7a845cac6cd86204774f01a0f868cfbbf361f39def69f120b720a1066ecd2a +size 180 diff --git a/assets/minecraft/textures/block/red_shulker_box.png b/assets/minecraft/textures/block/red_shulker_box.png index 200686ea..4861c544 100644 --- a/assets/minecraft/textures/block/red_shulker_box.png +++ b/assets/minecraft/textures/block/red_shulker_box.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:36ee2f111a354cee9ca1c4d83d687c4b04ae5bd5ad18fae3b3dede8fcf3e40b2 -size 285 +oid sha256:eb7de0293cad2e6a2e7963a4671083ace9e011588a6a60af36b9075bb6709380 +size 282 diff --git a/assets/minecraft/textures/block/red_stained_glass.png b/assets/minecraft/textures/block/red_stained_glass.png index 109982e3..77dd6730 100644 --- a/assets/minecraft/textures/block/red_stained_glass.png +++ b/assets/minecraft/textures/block/red_stained_glass.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bc2b8b14463483715ff4f5bfa43eaba657a41d376435f0c46a265452bc4c543e -size 134 +oid sha256:4520f85fee79972191217d623c8b38522cacf74cb7c71113c0a6240d3b1f2ad2 +size 106 diff --git a/assets/minecraft/textures/block/red_stained_glass_pane_top.png b/assets/minecraft/textures/block/red_stained_glass_pane_top.png index 08dd8d6d..529143bb 100644 --- a/assets/minecraft/textures/block/red_stained_glass_pane_top.png +++ b/assets/minecraft/textures/block/red_stained_glass_pane_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:678140f3d76a408f431b65fdb985ce2594dc10669f50829287002b8ff8d56d8f -size 119 +oid sha256:2da8bf72b780aef0a60ce5051ce92c5d99b58761d8930675caa59793e9917e40 +size 118 diff --git a/assets/minecraft/textures/block/red_tulip.png b/assets/minecraft/textures/block/red_tulip.png index 52f3fbe2..7e550c39 100644 --- a/assets/minecraft/textures/block/red_tulip.png +++ b/assets/minecraft/textures/block/red_tulip.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:312a1f6c6e355909ce5db48880a5debf4d90b0aadf4a14a927992f02f2dd51c2 -size 192 +oid sha256:c82eeb5f5543373ac0f5141810920c1831f6f7c1030b4516688afc1e6eedd915 +size 175 diff --git a/assets/minecraft/textures/block/red_wool.png b/assets/minecraft/textures/block/red_wool.png index 1684fbea..786cbd3e 100644 --- a/assets/minecraft/textures/block/red_wool.png +++ b/assets/minecraft/textures/block/red_wool.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b0ffb8c5e070c8e9c96dfa4a02cd07382ba3bc245c9c6543042ec78156ed7a39 -size 374 +oid sha256:07b48cec9b4610e908025807fb85fa686dd50f17918fa677ce655d28b3ba3464 +size 372 diff --git a/assets/minecraft/textures/block/redstone_block.png b/assets/minecraft/textures/block/redstone_block.png index 0d396445..3ea0494e 100644 --- a/assets/minecraft/textures/block/redstone_block.png +++ b/assets/minecraft/textures/block/redstone_block.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:92c8738669b45a956f4783f3d928ca3d3b99a56546650070b24779428bf50291 -size 174 +oid sha256:104718f1f17c7016eeff145ca59d16a9ab026cad26de9dfba8a7815ccd8f18ed +size 171 diff --git a/assets/minecraft/textures/block/redstone_dust_dot.png b/assets/minecraft/textures/block/redstone_dust_dot.png index d8a2568f..3464433c 100644 --- a/assets/minecraft/textures/block/redstone_dust_dot.png +++ b/assets/minecraft/textures/block/redstone_dust_dot.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2af126f8cbbecee1adcb0f39e1389651b17a8ddfd5f20191181eb2343288a543 -size 126 +oid sha256:74cf4eaccdbfafa71847c4ee90ecee5c439a4944e7f8e22fd9728fa1c5d6e92e +size 113 diff --git a/assets/minecraft/textures/block/redstone_dust_line0.png b/assets/minecraft/textures/block/redstone_dust_line0.png index edb1eaca..1d93d125 100644 --- a/assets/minecraft/textures/block/redstone_dust_line0.png +++ b/assets/minecraft/textures/block/redstone_dust_line0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d20106910b0413f8f4bc0fba0bf0041c88c4530e01bb5ee49a3dae25430c18a -size 125 +oid sha256:a50ece684d8da788fbf97a90cb64586956ca2bd4787ce8a046d9d89e42ebe72a +size 111 diff --git a/assets/minecraft/textures/block/redstone_dust_line1.png b/assets/minecraft/textures/block/redstone_dust_line1.png index b8088e27..a01e64a3 100644 --- a/assets/minecraft/textures/block/redstone_dust_line1.png +++ b/assets/minecraft/textures/block/redstone_dust_line1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:30182562f5e50c56908a9e2d5effa5baa349d4957d2b1362d6b1276501ddc21a -size 130 +oid sha256:0227d3a4e261cf5d317571976c1c77f8a043a82c3ee3d78aebd84008652aa31b +size 116 diff --git a/assets/minecraft/textures/block/redstone_dust_overlay.png b/assets/minecraft/textures/block/redstone_dust_overlay.png index a3008278..0f873fa1 100644 --- a/assets/minecraft/textures/block/redstone_dust_overlay.png +++ b/assets/minecraft/textures/block/redstone_dust_overlay.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8de639b48b4c9290bdda201eba48c5d00ef96a0cd558b391d0e8833da6f6be92 -size 90 +oid sha256:d9ec0ce5813be6332f30b75d214f682e598bb0e9e383420b0d5f3fdcde507759 +size 71 diff --git a/assets/minecraft/textures/block/redstone_lamp.png b/assets/minecraft/textures/block/redstone_lamp.png index a87c7a00..fdaf75aa 100644 --- a/assets/minecraft/textures/block/redstone_lamp.png +++ b/assets/minecraft/textures/block/redstone_lamp.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fdc0015961a6b5cf5ac0cf5c3f4117c70b65ee00cf66066a3ea51029e6d827ac -size 222 +oid sha256:60d43bc037630fdf7a770f31e10a59312609f084fcabe73725030036611de84a +size 202 diff --git a/assets/minecraft/textures/block/redstone_lamp_on.png b/assets/minecraft/textures/block/redstone_lamp_on.png index 3595ba5c..2625f36c 100644 --- a/assets/minecraft/textures/block/redstone_lamp_on.png +++ b/assets/minecraft/textures/block/redstone_lamp_on.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:97be660a3c69fa0d256ca32c10397cedd4ef20e41c328f5219e90fe3c5139c26 -size 196 +oid sha256:7a1179a50639369b828de16d24c37102be44d81d73205a0950e4549f2c53c899 +size 188 diff --git a/assets/minecraft/textures/block/redstone_ore.png b/assets/minecraft/textures/block/redstone_ore.png index fce5ef57..bf946b16 100644 --- a/assets/minecraft/textures/block/redstone_ore.png +++ b/assets/minecraft/textures/block/redstone_ore.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:99239d089f094c96afb8b47d98557851f3eb880e47d4ebc5fd3c79659896b1bf -size 254 +oid sha256:742b6a5bad43ec8875f3861ee713ca32a57a1a257c7fefecf981c0355615248f +size 234 diff --git a/assets/minecraft/textures/block/redstone_torch_off.png b/assets/minecraft/textures/block/redstone_torch_off.png index e7ca5a9f..283eadbd 100644 --- a/assets/minecraft/textures/block/redstone_torch_off.png +++ b/assets/minecraft/textures/block/redstone_torch_off.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b37d7c758987039434f942e8b139e8e5dc6e52e45c7d3f595f9d54a101a3fea1 -size 135 +oid sha256:e20fcc21502da8088e8a834ed88f1f886df6e3e3404e896a3bebbdfe3602079e +size 133 diff --git a/assets/minecraft/textures/block/reinforced_deepslate_bottom.png b/assets/minecraft/textures/block/reinforced_deepslate_bottom.png index da4c58db..0af58409 100644 --- a/assets/minecraft/textures/block/reinforced_deepslate_bottom.png +++ b/assets/minecraft/textures/block/reinforced_deepslate_bottom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:08a261740f68b3a7401984515fbe336e768ac47b7999d5d9d49a695dc2dcbabe -size 222 +oid sha256:868657a91e654afaabbeae46697b8809262111419b46ea249bebff325c9c8c69 +size 211 diff --git a/assets/minecraft/textures/block/reinforced_deepslate_side.png b/assets/minecraft/textures/block/reinforced_deepslate_side.png index b8554bf5..737524f0 100644 --- a/assets/minecraft/textures/block/reinforced_deepslate_side.png +++ b/assets/minecraft/textures/block/reinforced_deepslate_side.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ca1ca98692c0f890698eef8dd5d3d56669cb73bce8ceeb691e97d14219515429 -size 255 +oid sha256:3021e5b9b098ffba1877267a944b9c97043417ac5bca187d3d35719b90bb2791 +size 244 diff --git a/assets/minecraft/textures/block/reinforced_deepslate_top.png b/assets/minecraft/textures/block/reinforced_deepslate_top.png index e804fe75..b17f2711 100644 --- a/assets/minecraft/textures/block/reinforced_deepslate_top.png +++ b/assets/minecraft/textures/block/reinforced_deepslate_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:71a5f33b9dd294d2d5a3721b3b6d6d0aa7f98d3767f61d282453746643c1a2ab -size 235 +oid sha256:17ba9375b52fb0ad97be73ad09b9ca0d274931cd98e4bf5933c6fa5e350e2106 +size 222 diff --git a/assets/minecraft/textures/block/repeater.png b/assets/minecraft/textures/block/repeater.png index 28f93873..7facec7b 100644 --- a/assets/minecraft/textures/block/repeater.png +++ b/assets/minecraft/textures/block/repeater.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2ea7c76bac076935f20fc452601dbae3f5239bdd10e46084f68dda9dd7b223fa -size 222 +oid sha256:cedee3f6b666a167fa390ca9aae54eb2de98282a5fb5b2957ed54a771baaeefa +size 206 diff --git a/assets/minecraft/textures/block/repeater_on.png b/assets/minecraft/textures/block/repeater_on.png index 602dcf47..d08e1036 100644 --- a/assets/minecraft/textures/block/repeater_on.png +++ b/assets/minecraft/textures/block/repeater_on.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4c6bd41c5041cbf1bf12f64c600418da2235c6cfd83cb8f6e617675c308e97ae -size 222 +oid sha256:87349b6ca9b51955939625cfaff4f214ea8120d6ea9395d5405e62962e821274 +size 206 diff --git a/assets/minecraft/textures/block/repeating_command_block_back.png b/assets/minecraft/textures/block/repeating_command_block_back.png index 9f81aa12..aea7aac2 100644 --- a/assets/minecraft/textures/block/repeating_command_block_back.png +++ b/assets/minecraft/textures/block/repeating_command_block_back.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2fabf0b8d21ed967d8b72f654536ef98733ea684f87bc88edf7d0004bff0a71c -size 387 +oid sha256:3bcbc08cc9f4c8684ee947d2ad1c7d2c8fd4f4b6a845408ec9df5a5721afdbad +size 375 diff --git a/assets/minecraft/textures/block/repeating_command_block_conditional.png b/assets/minecraft/textures/block/repeating_command_block_conditional.png index 9d2d05a5..37868f7f 100644 --- a/assets/minecraft/textures/block/repeating_command_block_conditional.png +++ b/assets/minecraft/textures/block/repeating_command_block_conditional.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8e8466bf1e6aebceb71d36bf78ebc668c610582ee81783f68949475ca00c64d7 -size 350 +oid sha256:cbdc604a59c21422ccdd58249f8cae545a0247bf9f18de3ef150647fe799a33a +size 339 diff --git a/assets/minecraft/textures/block/repeating_command_block_front.png b/assets/minecraft/textures/block/repeating_command_block_front.png index 684d65ed..af9d2073 100644 --- a/assets/minecraft/textures/block/repeating_command_block_front.png +++ b/assets/minecraft/textures/block/repeating_command_block_front.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5f26beea142d3fb8288d39e2e1312ee16dfc0c05ff9fa1d616467d4aa7b614c0 -size 347 +oid sha256:b03032b359a99404e89a7516d5ad2a85e0e47985a27b3ae8552ccd2c867f5a78 +size 340 diff --git a/assets/minecraft/textures/block/repeating_command_block_side.png b/assets/minecraft/textures/block/repeating_command_block_side.png index 56236f6b..eba8e136 100644 --- a/assets/minecraft/textures/block/repeating_command_block_side.png +++ b/assets/minecraft/textures/block/repeating_command_block_side.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:58ec7344b93928e6e2b36bfc27f1df94e62fb38c44a700056509a3657cc769ff -size 369 +oid sha256:ac7f2e54f705cfc8e6d007302c3c9b64ede1eb826836647d9500cc192a08509f +size 359 diff --git a/assets/minecraft/textures/block/respawn_anchor_side0.png b/assets/minecraft/textures/block/respawn_anchor_side0.png index 3fd99699..d546cd50 100644 --- a/assets/minecraft/textures/block/respawn_anchor_side0.png +++ b/assets/minecraft/textures/block/respawn_anchor_side0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e58cd2dcd9870e507aadfc556bc96c3de55165ab2528a41ecd715de57e3c4017 -size 263 +oid sha256:5e5c307d492ad92085769d68e50bd01b3cbd7156a9ad94dc801722e2d506ab7f +size 243 diff --git a/assets/minecraft/textures/block/respawn_anchor_side1.png b/assets/minecraft/textures/block/respawn_anchor_side1.png index 44cc073e..a4d94739 100644 --- a/assets/minecraft/textures/block/respawn_anchor_side1.png +++ b/assets/minecraft/textures/block/respawn_anchor_side1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5d78d29113b3d965b620e6afd86c417f5ecb9c08067d7033507a4c1cdca6af43 -size 269 +oid sha256:c90378d01674b98e46f03025dc57decb64e5ab80e149a910984061cf51f46fbb +size 253 diff --git a/assets/minecraft/textures/block/respawn_anchor_side2.png b/assets/minecraft/textures/block/respawn_anchor_side2.png index cec8fd83..71f1a2be 100644 --- a/assets/minecraft/textures/block/respawn_anchor_side2.png +++ b/assets/minecraft/textures/block/respawn_anchor_side2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:73292e86ba5d0236023d7d0cb2b744bad29617d6331ffaa76b1511826e545303 -size 268 +oid sha256:12a569a5495a2060fd371c429dc778a96759ead0faddc453d414ba92e9c110da +size 261 diff --git a/assets/minecraft/textures/block/respawn_anchor_side3.png b/assets/minecraft/textures/block/respawn_anchor_side3.png index a1357f08..6bd80053 100644 --- a/assets/minecraft/textures/block/respawn_anchor_side3.png +++ b/assets/minecraft/textures/block/respawn_anchor_side3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:524b068e3cdebce6784157253f133c176486bf6fe746e382803acb751d97047c -size 270 +oid sha256:36ad0fbd6e264de6ca6d4524e87200a25366b2051d5c0f90ca857a0c27dcaeb2 +size 264 diff --git a/assets/minecraft/textures/block/respawn_anchor_side4.png b/assets/minecraft/textures/block/respawn_anchor_side4.png index c2120d71..30facaf2 100644 --- a/assets/minecraft/textures/block/respawn_anchor_side4.png +++ b/assets/minecraft/textures/block/respawn_anchor_side4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:781846888b7a1ac3284981fd89bb87cec59d0bfd8ab4eddb34d5331e35ac1df1 -size 271 +oid sha256:22448f56ab720797b5f65968dd51e793f7780c9714ec03dbd978bc52fad138ac +size 264 diff --git a/assets/minecraft/textures/block/respawn_anchor_top.png b/assets/minecraft/textures/block/respawn_anchor_top.png index 9a8900f8..88360500 100644 --- a/assets/minecraft/textures/block/respawn_anchor_top.png +++ b/assets/minecraft/textures/block/respawn_anchor_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8304c9714632db1e43998c0b6292f04eca01935cc3a5b3aeafe18f65c3fa259d -size 6155 +oid sha256:627503ba3dd0171c7d26bafbea16df1e42997663f53ae73b332d0e9425bd044b +size 6099 diff --git a/assets/minecraft/textures/block/respawn_anchor_top_off.png b/assets/minecraft/textures/block/respawn_anchor_top_off.png index c530d43c..7e77374c 100644 --- a/assets/minecraft/textures/block/respawn_anchor_top_off.png +++ b/assets/minecraft/textures/block/respawn_anchor_top_off.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:565c78a60f9715aa3dc90600b46ce755fe57110a523606283e67c59cdf5ca4af -size 174 +oid sha256:aaa94e5139a64115f0041a6a9753975c869bc444ad92a988913223250a4df5fe +size 173 diff --git a/assets/minecraft/textures/block/rooted_dirt.png b/assets/minecraft/textures/block/rooted_dirt.png index aa8b36eb..ae567f6f 100644 --- a/assets/minecraft/textures/block/rooted_dirt.png +++ b/assets/minecraft/textures/block/rooted_dirt.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:26cf902a828def31843782e171d638894dc8e408aeae2133d8a1ceb0073e407d -size 228 +oid sha256:3c59420f80c58794b49f822fb9b251779250b759f5c12111fa29f772a635f42b +size 210 diff --git a/assets/minecraft/textures/block/rose_bush_bottom.png b/assets/minecraft/textures/block/rose_bush_bottom.png index 9b9c0fdf..4267359f 100644 --- a/assets/minecraft/textures/block/rose_bush_bottom.png +++ b/assets/minecraft/textures/block/rose_bush_bottom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:72c7b4c03a7db7b2f9fe29aafa556fa08fc3b4d606ba1aff448fdd3d361c18a5 -size 259 +oid sha256:27ac33d0ec7d8b34243905bf048e06a1642f79c1291f026672a54108cb9a2aa1 +size 244 diff --git a/assets/minecraft/textures/block/rose_bush_top.png b/assets/minecraft/textures/block/rose_bush_top.png index 08494de6..f8a10951 100644 --- a/assets/minecraft/textures/block/rose_bush_top.png +++ b/assets/minecraft/textures/block/rose_bush_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:47ffca415b9ea6925adad167ca89836e026ffd7e07ec129f495017c2ec54eecc -size 233 +oid sha256:07b97a1e84394a3d38bc199bb39c61c179c06b0e64bf71e61eff277b03184814 +size 213 diff --git a/assets/minecraft/textures/block/sand.png b/assets/minecraft/textures/block/sand.png index 0909b6db..92d848df 100644 --- a/assets/minecraft/textures/block/sand.png +++ b/assets/minecraft/textures/block/sand.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8875040fbee9e8c40ef1d6472e1548230d9ef1bad32d58e4e2fa857f1ae08027 -size 189 +oid sha256:3be385d7e4402f24327dacbf7557d622e7d0cef4650e582457d144d90476f106 +size 188 diff --git a/assets/minecraft/textures/block/sandstone.png b/assets/minecraft/textures/block/sandstone.png index 633b5cda..cae6e822 100644 --- a/assets/minecraft/textures/block/sandstone.png +++ b/assets/minecraft/textures/block/sandstone.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:532e1da119576e3ca8a0983c173040fb3e932a935aba29aff79deb4c8a26fb1c -size 210 +oid sha256:5ab8fe2fcc44fa6721be20ead4eac049eb257dd1269795ea0d2e6d611f0d51f1 +size 199 diff --git a/assets/minecraft/textures/block/sandstone_top.png b/assets/minecraft/textures/block/sandstone_top.png index 9e941ad9..00b837be 100644 --- a/assets/minecraft/textures/block/sandstone_top.png +++ b/assets/minecraft/textures/block/sandstone_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:321c39b772533abf1b6441d484d05e8e7bf1fa017c97acafcaec9e63781cb40c -size 184 +oid sha256:41a5965dbf8a1505ab7ffd9984a16bad566c907c513d5638d5e8260cb5916646 +size 180 diff --git a/assets/minecraft/textures/block/scaffolding_bottom.png b/assets/minecraft/textures/block/scaffolding_bottom.png index 436abfa3..c64a2b4f 100644 --- a/assets/minecraft/textures/block/scaffolding_bottom.png +++ b/assets/minecraft/textures/block/scaffolding_bottom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e674b2c6077c9ecea964927d3357d17d718b627dca76c2d679de5819c720f637 -size 227 +oid sha256:e907bb9f550a520858471dbb0a27da75a775c55306fb4c3cfe7c15f22034960d +size 186 diff --git a/assets/minecraft/textures/block/scaffolding_side.png b/assets/minecraft/textures/block/scaffolding_side.png index 1ac48d88..32efcbfd 100644 --- a/assets/minecraft/textures/block/scaffolding_side.png +++ b/assets/minecraft/textures/block/scaffolding_side.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:611dced197db88f1c283dc9c9cdeb96734b5b3edb2602affb34eeafdbce10902 -size 230 +oid sha256:4e668a9d420ec32b39ccd26709c7de35efcc2db305c8f619cfc20c6ad7cb2e89 +size 195 diff --git a/assets/minecraft/textures/block/scaffolding_top.png b/assets/minecraft/textures/block/scaffolding_top.png index c8c7e0a0..8b033b31 100644 --- a/assets/minecraft/textures/block/scaffolding_top.png +++ b/assets/minecraft/textures/block/scaffolding_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f326147049f93ebd1952a2fbaad380d73a956d4f37a3923eaa6547e06598b361 -size 267 +oid sha256:f122ecdd7cb1ba88104ec19d999c70e853279f5369c0f28133d566390b4bbd55 +size 253 diff --git a/assets/minecraft/textures/block/sculk.png b/assets/minecraft/textures/block/sculk.png index 7f561f0e..362dccf8 100644 --- a/assets/minecraft/textures/block/sculk.png +++ b/assets/minecraft/textures/block/sculk.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e270724c7dc44cad75543054c6e05b720aa03e204f18c23948f456cb541faad3 -size 266 +oid sha256:cab823d096effc1185d982c4bf1f4e994cc17c22a9df00d5af8adeabc1bc5fcc +size 262 diff --git a/assets/minecraft/textures/block/sculk_catalyst_bottom.png b/assets/minecraft/textures/block/sculk_catalyst_bottom.png index ce7a3027..54890406 100644 --- a/assets/minecraft/textures/block/sculk_catalyst_bottom.png +++ b/assets/minecraft/textures/block/sculk_catalyst_bottom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b33b73d3684f62ec8d1bcea5f731c3a31dece8119ed2a9a7e0c523b78c97306a -size 219 +oid sha256:f2f910b29a4f51eab1bcde8e8abb297d4f7a5bbeef2ab67afaaf473636bbb35e +size 201 diff --git a/assets/minecraft/textures/block/sculk_catalyst_side.png b/assets/minecraft/textures/block/sculk_catalyst_side.png index c335d431..61605296 100644 --- a/assets/minecraft/textures/block/sculk_catalyst_side.png +++ b/assets/minecraft/textures/block/sculk_catalyst_side.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e832544a742ae6898f340d8f09f2f1a807ea99f3a008e6a6cbd272f70f0f2284 -size 246 +oid sha256:302da1ccc07fceef4ca8402dc452978c33e7bf155091c36b0f769c20c14afd68 +size 234 diff --git a/assets/minecraft/textures/block/sculk_catalyst_side_bloom.png b/assets/minecraft/textures/block/sculk_catalyst_side_bloom.png index c6ba5b69..e2b90c75 100644 --- a/assets/minecraft/textures/block/sculk_catalyst_side_bloom.png +++ b/assets/minecraft/textures/block/sculk_catalyst_side_bloom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c410d8e3aabe2583478f76e70e6bf43098c86f6f4761dbdbfde2395b119e6154 -size 339 +oid sha256:8c8de9ecce9ad2c6e4d2a71f61b3da442a759a6ab4f1d575b1dd917845c0e105 +size 322 diff --git a/assets/minecraft/textures/block/sculk_catalyst_top.png b/assets/minecraft/textures/block/sculk_catalyst_top.png index 16dd3270..8791a840 100644 --- a/assets/minecraft/textures/block/sculk_catalyst_top.png +++ b/assets/minecraft/textures/block/sculk_catalyst_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a15d7ce5111611dbfabcca4be5f8668b517eac5215b5c4503ffb3677fc17a279 -size 182 +oid sha256:a283f79f0200dfe18f60bd28141d7d0d74c0e4936ad2893195e5a8c955470e13 +size 179 diff --git a/assets/minecraft/textures/block/sculk_catalyst_top_bloom.png b/assets/minecraft/textures/block/sculk_catalyst_top_bloom.png index f0fd63f2..22333fe2 100644 --- a/assets/minecraft/textures/block/sculk_catalyst_top_bloom.png +++ b/assets/minecraft/textures/block/sculk_catalyst_top_bloom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3f3ad4d54384c1946d14035ea1d871d2345a87bd539a7d14571d10f4b57e01eb -size 535 +oid sha256:2226919e76db080a73f39816b97b65f202ad1c5853f3d22f9635caa859dedbe7 +size 511 diff --git a/assets/minecraft/textures/block/sculk_sensor_bottom.png b/assets/minecraft/textures/block/sculk_sensor_bottom.png index e338df65..1ff74700 100644 --- a/assets/minecraft/textures/block/sculk_sensor_bottom.png +++ b/assets/minecraft/textures/block/sculk_sensor_bottom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:12641cdde3976304fd71eea60522ecfd0b1f035da0e415820ca56e033f294c1d -size 180 +oid sha256:e821dc22009e518e9bc4cce2c4ca81e9a8e45e3d6b3cd5117faad0e611d1ca90 +size 177 diff --git a/assets/minecraft/textures/block/sculk_sensor_side.png b/assets/minecraft/textures/block/sculk_sensor_side.png index 35c5da31..57f77bf0 100644 --- a/assets/minecraft/textures/block/sculk_sensor_side.png +++ b/assets/minecraft/textures/block/sculk_sensor_side.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b99073dbcceddb2ee73cbd901fc98f6d86bcac7b1ca05dcea36540e664698e53 -size 183 +oid sha256:ee21e5e0a3d6ef610a59029e67c491d8961c3eb33897105d4f38ce7cccde533f +size 182 diff --git a/assets/minecraft/textures/block/sculk_sensor_tendril_active.png b/assets/minecraft/textures/block/sculk_sensor_tendril_active.png index a7280199..e003ff78 100644 --- a/assets/minecraft/textures/block/sculk_sensor_tendril_active.png +++ b/assets/minecraft/textures/block/sculk_sensor_tendril_active.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b62bde0f59d4791f5693413ee2902a408636c60298cb2e5af7778983a84f3d57 -size 382 +oid sha256:02be4157a88dc357a7ff54d1db31f4093c2c693c1e274dfe224d12249e252b53 +size 356 diff --git a/assets/minecraft/textures/block/sculk_sensor_tendril_inactive.png b/assets/minecraft/textures/block/sculk_sensor_tendril_inactive.png index ed389a0f..66da3905 100644 --- a/assets/minecraft/textures/block/sculk_sensor_tendril_inactive.png +++ b/assets/minecraft/textures/block/sculk_sensor_tendril_inactive.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:42251092440efa4ed3ac06d21e80611a8c90f49c5c1bf2444fb39e25d0a8b439 -size 323 +oid sha256:82f536e8df30ac17e375df8902d9f9798f843d0ea427daf78b74933db864b679 +size 298 diff --git a/assets/minecraft/textures/block/sculk_sensor_top.png b/assets/minecraft/textures/block/sculk_sensor_top.png index ebbe7c55..7cb413ea 100644 --- a/assets/minecraft/textures/block/sculk_sensor_top.png +++ b/assets/minecraft/textures/block/sculk_sensor_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e0043b6e61d5e3bdb9ad93288dc916a19ae4a39fa447be93b320ff4674c8583e -size 170 +oid sha256:9bcf408a474ff8013f9163c07c247ff9a11ca9292fe4d315a66131267e98eadc +size 160 diff --git a/assets/minecraft/textures/block/sculk_shrieker_bottom.png b/assets/minecraft/textures/block/sculk_shrieker_bottom.png index e338df65..1ff74700 100644 --- a/assets/minecraft/textures/block/sculk_shrieker_bottom.png +++ b/assets/minecraft/textures/block/sculk_shrieker_bottom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:12641cdde3976304fd71eea60522ecfd0b1f035da0e415820ca56e033f294c1d -size 180 +oid sha256:e821dc22009e518e9bc4cce2c4ca81e9a8e45e3d6b3cd5117faad0e611d1ca90 +size 177 diff --git a/assets/minecraft/textures/block/sculk_shrieker_side.png b/assets/minecraft/textures/block/sculk_shrieker_side.png index 97ed3d21..ecbf758f 100644 --- a/assets/minecraft/textures/block/sculk_shrieker_side.png +++ b/assets/minecraft/textures/block/sculk_shrieker_side.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dedc5e34c2e3bcf24bd26a08f64dbebf8ed6d1b3729b243e88437ce50902e7a4 -size 250 +oid sha256:5845cffd70a7722bc5cb15d295d50239767912f93dee8b3d11e3816dbb1f8965 +size 234 diff --git a/assets/minecraft/textures/block/sculk_shrieker_top.png b/assets/minecraft/textures/block/sculk_shrieker_top.png index 285f38c9..551bacb8 100644 --- a/assets/minecraft/textures/block/sculk_shrieker_top.png +++ b/assets/minecraft/textures/block/sculk_shrieker_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:841c642085a3efc35ad85c3bf7a1aacbf14371953df5f8025e904406b5351785 -size 125 +oid sha256:9b175ebf1ffee1a9367f1b91fb59d1fae83d4dac5637c5f74c7539e23cc735d9 +size 124 diff --git a/assets/minecraft/textures/block/sculk_vein.png b/assets/minecraft/textures/block/sculk_vein.png index 53fa80c9..0be0a74c 100644 --- a/assets/minecraft/textures/block/sculk_vein.png +++ b/assets/minecraft/textures/block/sculk_vein.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2166e097e61ea453474bea5a07606ac637f4c95ba0efb0017a523b0a506c15a4 -size 314 +oid sha256:9f8619b29d925dd86b4124499e09a37b81f85bdf3409f50658c5096516db1236 +size 305 diff --git a/assets/minecraft/textures/block/sea_lantern.png b/assets/minecraft/textures/block/sea_lantern.png index 0d35f129..3487ddf7 100644 --- a/assets/minecraft/textures/block/sea_lantern.png +++ b/assets/minecraft/textures/block/sea_lantern.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e6c54c1ecf81210c94e95d629e4d61b8424075425bb574c635504d2e0b96f59c -size 2638 +oid sha256:4211d9c9d541f7b83357643882d0d90d74114c4e5a4f9daf088fc62fec3ace6c +size 2604 diff --git a/assets/minecraft/textures/block/sea_pickle.png b/assets/minecraft/textures/block/sea_pickle.png index cd4952f0..16959b01 100644 --- a/assets/minecraft/textures/block/sea_pickle.png +++ b/assets/minecraft/textures/block/sea_pickle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:84b3c60c2a68629345885bdd82f8f076f5cdb4ff96428e2214d30437926e8bbd -size 263 +oid sha256:dbee5079d086bb3e39e9159c832da90df668b76e1b63e4689a049ead81a2797a +size 237 diff --git a/assets/minecraft/textures/block/seagrass.png b/assets/minecraft/textures/block/seagrass.png index 355f1042..16413b5e 100644 --- a/assets/minecraft/textures/block/seagrass.png +++ b/assets/minecraft/textures/block/seagrass.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:528a31c2f6bdd3755f1e71a106dcfca7782ea7fbf0ab38110a09d1ebb5fb66e7 -size 1252 +oid sha256:637a0e0f446aa1eba3724db3d52eda01e9b6ace5d5c9866c93dc812432b0b8f9 +size 695 diff --git a/assets/minecraft/textures/block/short_dry_grass.png b/assets/minecraft/textures/block/short_dry_grass.png index e8556739..ab36407c 100644 --- a/assets/minecraft/textures/block/short_dry_grass.png +++ b/assets/minecraft/textures/block/short_dry_grass.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e14ad13ebef278a19400829c319ea0f73f742fa806fd4f5edd3eca5588ce1057 -size 155 +oid sha256:cdeac6d9e85ef83a691a659465c5c03638f081a7cf06d38ad1cf803e11eb2a92 +size 154 diff --git a/assets/minecraft/textures/block/short_grass.png b/assets/minecraft/textures/block/short_grass.png index c5854d5f..42e206db 100644 --- a/assets/minecraft/textures/block/short_grass.png +++ b/assets/minecraft/textures/block/short_grass.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ca8502acca569a1e1ac5e69ac296d4ad2e4faa4d179beeb4ece67125cc998ace -size 213 +oid sha256:40e2ad5d034d0ffc58b4c496c0badfa2104e0fc1888fc92c5f9bd79dcd84cb20 +size 201 diff --git a/assets/minecraft/textures/block/shulker_box.png b/assets/minecraft/textures/block/shulker_box.png index 8cff2fe4..123cf727 100644 --- a/assets/minecraft/textures/block/shulker_box.png +++ b/assets/minecraft/textures/block/shulker_box.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:833a89471e5b829eb3cf3878a486405e9d0721fe24a0e5cfb184dda4fdc87b58 -size 1008 +oid sha256:0d34031982c295d11f5c4c0f6b4d931d1de9b9069599454de5da00c45b50191a +size 327 diff --git a/assets/minecraft/textures/block/small_dripleaf_side.png b/assets/minecraft/textures/block/small_dripleaf_side.png index a429a08c..a8f959e1 100644 --- a/assets/minecraft/textures/block/small_dripleaf_side.png +++ b/assets/minecraft/textures/block/small_dripleaf_side.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8bef8a5eaf4ed1074d018454642e571856d94cf76e0ea41fe64c435b3f3d504e -size 81 +oid sha256:ff5a76aba71f53dca1528a776d8eaac19d5188e81481babbbdd1177e15dd7508 +size 80 diff --git a/assets/minecraft/textures/block/small_dripleaf_stem_top.png b/assets/minecraft/textures/block/small_dripleaf_stem_top.png index b89adbb5..90d28cef 100644 --- a/assets/minecraft/textures/block/small_dripleaf_stem_top.png +++ b/assets/minecraft/textures/block/small_dripleaf_stem_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0eaec7d7eee9be1107a6281762c16f0a097711cdf9527363965776e130bafe3f -size 140 +oid sha256:a834da1596a8e423d30280c11ebe1d509cb4323c066178c66ad6cfd654a434a4 +size 138 diff --git a/assets/minecraft/textures/block/smithing_table_bottom.png b/assets/minecraft/textures/block/smithing_table_bottom.png index aaf67af5..4154f41c 100644 --- a/assets/minecraft/textures/block/smithing_table_bottom.png +++ b/assets/minecraft/textures/block/smithing_table_bottom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7d3307b82887f206b8a8fdc2ffb21adcb2de912ba41d6545ccc2addc28c53918 -size 169 +oid sha256:d798dfcfaf39b0cc755bb9c30721c3e20ccccde854b2417cf32a48167178d60c +size 168 diff --git a/assets/minecraft/textures/block/smithing_table_front.png b/assets/minecraft/textures/block/smithing_table_front.png index 060e391b..c6fe5574 100644 --- a/assets/minecraft/textures/block/smithing_table_front.png +++ b/assets/minecraft/textures/block/smithing_table_front.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1ed4462a8bc363e477ba062c1a22218dbb946aef96eaf40aeac1db48f6a82fff -size 262 +oid sha256:f7a5479a3e1d3e3f604ec1b22634736ea952b676fef20e954a9607f15fb13ba0 +size 246 diff --git a/assets/minecraft/textures/block/smithing_table_side.png b/assets/minecraft/textures/block/smithing_table_side.png index d809a3fb..6a5d8ad9 100644 --- a/assets/minecraft/textures/block/smithing_table_side.png +++ b/assets/minecraft/textures/block/smithing_table_side.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:99166723c2dd5d271554003bf987dbf77be6815bd5aa49608bbdd12a07776869 -size 254 +oid sha256:de6b8a0f0da0b27b275371a4fec5f2fbb2aa473ef104a1c5abcc41db4dda5f73 +size 237 diff --git a/assets/minecraft/textures/block/smithing_table_top.png b/assets/minecraft/textures/block/smithing_table_top.png index 16a41924..107d4672 100644 --- a/assets/minecraft/textures/block/smithing_table_top.png +++ b/assets/minecraft/textures/block/smithing_table_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:36749dc61585465ca5eb0a4e5a1977242296315edd15f9171fc172662113204d -size 210 +oid sha256:eb33e51c12200f6af3095d4e039c0692568011b7f5160e35aecd81a598d5e6da +size 188 diff --git a/assets/minecraft/textures/block/smoker_front.png b/assets/minecraft/textures/block/smoker_front.png index 52dafac9..c3fbc4c3 100644 --- a/assets/minecraft/textures/block/smoker_front.png +++ b/assets/minecraft/textures/block/smoker_front.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:70816cd24491ceccc9a0bc0b372df358d9b6870bb35935b907e16cf4326b2339 -size 258 +oid sha256:ce2bec2d026b954529024c4ead234a39932335cf5367ac0a71c380b055150795 +size 256 diff --git a/assets/minecraft/textures/block/smoker_front_on.png b/assets/minecraft/textures/block/smoker_front_on.png index 24c31dd4..f48c5980 100644 --- a/assets/minecraft/textures/block/smoker_front_on.png +++ b/assets/minecraft/textures/block/smoker_front_on.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ce9d165f3e58ccbdaff4df5d6366a8d94b40accfcf1cf482ed9d2c21a2c66575 -size 383 +oid sha256:9509bf23aecb04b857c1aecc3f71dbb79f182f0a8977bba1d9129b949a4bb0d5 +size 380 diff --git a/assets/minecraft/textures/block/smoker_side.png b/assets/minecraft/textures/block/smoker_side.png index 30c02fcf..d52bd95e 100644 --- a/assets/minecraft/textures/block/smoker_side.png +++ b/assets/minecraft/textures/block/smoker_side.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bfddc086c8eefb4df00f5bc609809a90aa4f3a02c81b2adf7290e7ebff0fc3a9 -size 250 +oid sha256:ee07afd0ac7ffa45358d3303a870a8e4db90af1e19c4fdccdefb92890aa9747d +size 234 diff --git a/assets/minecraft/textures/block/smoker_top.png b/assets/minecraft/textures/block/smoker_top.png index 3e25e27b..d209f5ca 100644 --- a/assets/minecraft/textures/block/smoker_top.png +++ b/assets/minecraft/textures/block/smoker_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:77fe8b00fa394d302ad093a5cc80488c18db518611fdfd75932406309c13f949 -size 227 +oid sha256:73a8671ab27cbf6e25f4074e508126da16c8754ff415316787f5dd02150e6e89 +size 216 diff --git a/assets/minecraft/textures/block/smooth_basalt.png b/assets/minecraft/textures/block/smooth_basalt.png index 4f52f290..cd60a2a3 100644 --- a/assets/minecraft/textures/block/smooth_basalt.png +++ b/assets/minecraft/textures/block/smooth_basalt.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:752c92c3db3b88b9989e407b2e5894afecb272b829c6c80df91ba8ab1b587941 -size 200 +oid sha256:f550b8cc280f6cd17fd5c2c060bc8f5d67ccb20a4bf07b4c2c5a35f0ade3e62b +size 195 diff --git a/assets/minecraft/textures/block/smooth_stone.png b/assets/minecraft/textures/block/smooth_stone.png index 92d5dc44..cfd6b71c 100644 --- a/assets/minecraft/textures/block/smooth_stone.png +++ b/assets/minecraft/textures/block/smooth_stone.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:53d5b70ba4b3879b8ec7e931ee5c7250859081b4fea41690fd0261271cdb3623 -size 183 +oid sha256:95e15063a305df75491527a9bb7cbad6e4d98c9d974881f26752ee7f1ef15a9e +size 180 diff --git a/assets/minecraft/textures/block/sniffer_egg_not_cracked_bottom.png b/assets/minecraft/textures/block/sniffer_egg_not_cracked_bottom.png index 1406dba6..2a6682ae 100644 --- a/assets/minecraft/textures/block/sniffer_egg_not_cracked_bottom.png +++ b/assets/minecraft/textures/block/sniffer_egg_not_cracked_bottom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b6a9e38f9230cce895c89a69469bf8e2b37600d87957974a10799ef5b002ba1b -size 194 +oid sha256:ebc4ae75ec9a676e752eda476b99a78e660184bfc2155f911c8c436432e74dc5 +size 185 diff --git a/assets/minecraft/textures/block/sniffer_egg_not_cracked_east.png b/assets/minecraft/textures/block/sniffer_egg_not_cracked_east.png index 4fedf81b..7f2d18b6 100644 --- a/assets/minecraft/textures/block/sniffer_egg_not_cracked_east.png +++ b/assets/minecraft/textures/block/sniffer_egg_not_cracked_east.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7ce6960b6c0efb4fdc5c66764a173a4535298fa9f9af7a273e689156772cb373 -size 234 +oid sha256:31a86423d382041e6dbf22f897b8e4d0855edea77d2183b73330ca7b3bf06674 +size 217 diff --git a/assets/minecraft/textures/block/sniffer_egg_not_cracked_north.png b/assets/minecraft/textures/block/sniffer_egg_not_cracked_north.png index 6595a3f3..925d1fb3 100644 --- a/assets/minecraft/textures/block/sniffer_egg_not_cracked_north.png +++ b/assets/minecraft/textures/block/sniffer_egg_not_cracked_north.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:790c52fa0a863e5c1477ddbc06efca735395fe4442ad9f83112b532b194d4992 -size 259 +oid sha256:9b8ddae1f7b5496e7348dbf125815f8f92d89cd94ee8245a86e1dfb1b5d34b60 +size 242 diff --git a/assets/minecraft/textures/block/sniffer_egg_not_cracked_south.png b/assets/minecraft/textures/block/sniffer_egg_not_cracked_south.png index 2922075d..b5b574b0 100644 --- a/assets/minecraft/textures/block/sniffer_egg_not_cracked_south.png +++ b/assets/minecraft/textures/block/sniffer_egg_not_cracked_south.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d019f83e1ad4b8914bf859d1b576b349d67daaa8d27d6bc60f662af0c7ec462 -size 257 +oid sha256:2c8d38b616a1c343d3f7c5da9bdf6edbadba08f84b71c2301f3faff04e8e7493 +size 239 diff --git a/assets/minecraft/textures/block/sniffer_egg_not_cracked_top.png b/assets/minecraft/textures/block/sniffer_egg_not_cracked_top.png index 815166c5..3cd0c840 100644 --- a/assets/minecraft/textures/block/sniffer_egg_not_cracked_top.png +++ b/assets/minecraft/textures/block/sniffer_egg_not_cracked_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:82f58fa14f9afbaa5625dabfdafe19a55ab66ab1f63c4e02de4b435ff4d7945b -size 207 +oid sha256:3fbba4d9862bb25d064020080266ecbace1892421960f420e8086ce1d842dc7d +size 202 diff --git a/assets/minecraft/textures/block/sniffer_egg_not_cracked_west.png b/assets/minecraft/textures/block/sniffer_egg_not_cracked_west.png index 7236c402..68cbbb4c 100644 --- a/assets/minecraft/textures/block/sniffer_egg_not_cracked_west.png +++ b/assets/minecraft/textures/block/sniffer_egg_not_cracked_west.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:43c4a80b8a2faee0311addb55c6ee3fcf15a3863a012a8f02835a332a4d4a2ef -size 241 +oid sha256:65c40549f825432c1b31419fc0a6b38f313af7b32ff983f4ae5378d5499d4a8c +size 226 diff --git a/assets/minecraft/textures/block/sniffer_egg_slightly_cracked_bottom.png b/assets/minecraft/textures/block/sniffer_egg_slightly_cracked_bottom.png index 42a20ab5..ae4fd088 100644 --- a/assets/minecraft/textures/block/sniffer_egg_slightly_cracked_bottom.png +++ b/assets/minecraft/textures/block/sniffer_egg_slightly_cracked_bottom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:150b26dd04137672017f4aa6dbe60634b3cb40cefe17caef8a75c526aabc4982 -size 209 +oid sha256:7cea37e7e80038c740cebf2658338e33980337f5fa831d053b8415e7ee8ace16 +size 198 diff --git a/assets/minecraft/textures/block/sniffer_egg_slightly_cracked_east.png b/assets/minecraft/textures/block/sniffer_egg_slightly_cracked_east.png index 925f4983..3776db4a 100644 --- a/assets/minecraft/textures/block/sniffer_egg_slightly_cracked_east.png +++ b/assets/minecraft/textures/block/sniffer_egg_slightly_cracked_east.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f6cd2636b44df7df223746b71869e23c2fdbf05c7d8632b6ee66db8479b1e0df -size 259 +oid sha256:492addfb5abc03edd21d974b9a2d3a8562f92eedc5885e2cde01c9fa69843133 +size 244 diff --git a/assets/minecraft/textures/block/sniffer_egg_slightly_cracked_north.png b/assets/minecraft/textures/block/sniffer_egg_slightly_cracked_north.png index 39427f9e..44bc012a 100644 --- a/assets/minecraft/textures/block/sniffer_egg_slightly_cracked_north.png +++ b/assets/minecraft/textures/block/sniffer_egg_slightly_cracked_north.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6e92a2997b9b4aff8e96102b4a4e53596f65800c8b8ceb0d89b2d67fb03a201f -size 285 +oid sha256:6441a37e0fc366f965e7eebc1e5ef54a56d9fea2e753b13e2e4beba810639cff +size 282 diff --git a/assets/minecraft/textures/block/sniffer_egg_slightly_cracked_south.png b/assets/minecraft/textures/block/sniffer_egg_slightly_cracked_south.png index 91adb011..2852cc08 100644 --- a/assets/minecraft/textures/block/sniffer_egg_slightly_cracked_south.png +++ b/assets/minecraft/textures/block/sniffer_egg_slightly_cracked_south.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8927f78198b3b846cfdbffc0fad15844cc73b30ec05ddedfc141c33d40354497 -size 275 +oid sha256:4e798ee1930f841bf32a25fe48da75651e91a7b04ff096e04efdccbbbd710aec +size 271 diff --git a/assets/minecraft/textures/block/sniffer_egg_slightly_cracked_top.png b/assets/minecraft/textures/block/sniffer_egg_slightly_cracked_top.png index 51f02fc8..4a14527a 100644 --- a/assets/minecraft/textures/block/sniffer_egg_slightly_cracked_top.png +++ b/assets/minecraft/textures/block/sniffer_egg_slightly_cracked_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d9eae935ce347f4c3ea0a02c6d905a637715cc2ef1251d6349acff0b501df9fd -size 232 +oid sha256:69c92b878d1ae25761ff2936feac8f804d1e1847ad9926ff7417f7a174b6d0e8 +size 230 diff --git a/assets/minecraft/textures/block/sniffer_egg_slightly_cracked_west.png b/assets/minecraft/textures/block/sniffer_egg_slightly_cracked_west.png index 9ae09b96..fe348de6 100644 --- a/assets/minecraft/textures/block/sniffer_egg_slightly_cracked_west.png +++ b/assets/minecraft/textures/block/sniffer_egg_slightly_cracked_west.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5a802bdfb68410bba89acdedbf32910fe39120f770189beb4728641a9eae63a0 -size 266 +oid sha256:bd71e00fa83ab05ec3eb7e9b2e09f4a13966aedea6a3958953ead952bee751f2 +size 258 diff --git a/assets/minecraft/textures/block/sniffer_egg_very_cracked_bottom.png b/assets/minecraft/textures/block/sniffer_egg_very_cracked_bottom.png index f63f10de..e57641bc 100644 --- a/assets/minecraft/textures/block/sniffer_egg_very_cracked_bottom.png +++ b/assets/minecraft/textures/block/sniffer_egg_very_cracked_bottom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e49bf5aee0aafb476e62ae1c494afb09cd4c0fc29e89cbaa7b528af1b59143b0 -size 211 +oid sha256:92b6c7bb0749bc24ab6a468d49d5f512478b2fd140c913f79362ca693ac640c7 +size 200 diff --git a/assets/minecraft/textures/block/sniffer_egg_very_cracked_east.png b/assets/minecraft/textures/block/sniffer_egg_very_cracked_east.png index e223e72e..f2a0bff3 100644 --- a/assets/minecraft/textures/block/sniffer_egg_very_cracked_east.png +++ b/assets/minecraft/textures/block/sniffer_egg_very_cracked_east.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a581ce3557dfca145840c4e0a74ff6494e3b2510fc58d20d81550f90e7612ead -size 277 +oid sha256:5ad2808d87fbffb1aeebd9de94435ef4c3ca41c3727b8e0d440b0668cde4b3dc +size 276 diff --git a/assets/minecraft/textures/block/sniffer_egg_very_cracked_north.png b/assets/minecraft/textures/block/sniffer_egg_very_cracked_north.png index 82ccde8d..5591ff98 100644 --- a/assets/minecraft/textures/block/sniffer_egg_very_cracked_north.png +++ b/assets/minecraft/textures/block/sniffer_egg_very_cracked_north.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d106e18256b95396e2bd73d658b32f048a34f3f8acadbb1f56fa6a357929d137 -size 305 +oid sha256:d4f8ff54d976538fe2d7390e29a87b0e4d0b0d7e163080d5628a469992fc05c4 +size 303 diff --git a/assets/minecraft/textures/block/sniffer_egg_very_cracked_south.png b/assets/minecraft/textures/block/sniffer_egg_very_cracked_south.png index 50d3e430..d2b31e49 100644 --- a/assets/minecraft/textures/block/sniffer_egg_very_cracked_south.png +++ b/assets/minecraft/textures/block/sniffer_egg_very_cracked_south.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f17aa06dadccac9d27c33493ad475bdf9fb0a927430b11cc9acb1c042f194ef9 -size 290 +oid sha256:fe175640204d0717c857801891e15d3d8ce3f1c1a316b9fcd3d7fd93fc877a16 +size 289 diff --git a/assets/minecraft/textures/block/sniffer_egg_very_cracked_top.png b/assets/minecraft/textures/block/sniffer_egg_very_cracked_top.png index f15b596f..5295a4ae 100644 --- a/assets/minecraft/textures/block/sniffer_egg_very_cracked_top.png +++ b/assets/minecraft/textures/block/sniffer_egg_very_cracked_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b5d5427da782752f7bd02746d1f19206e271233051e3dc804ccd33fa159c367c -size 237 +oid sha256:aba814cfb92aef38550a6b2171d5c03676ef35c7c2ec636ee14591564e826341 +size 236 diff --git a/assets/minecraft/textures/block/snow.png b/assets/minecraft/textures/block/snow.png index 2690eb6b..42ca8f61 100644 --- a/assets/minecraft/textures/block/snow.png +++ b/assets/minecraft/textures/block/snow.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:05201107fc2c60db4dc59f778a9ca7cb6101b2a332da696b33ce4b0cd2a02019 -size 166 +oid sha256:a9ca00fc88b23dce0d8e9ee2677d17e8b760a766dfc96ab4b301112908dc88cf +size 165 diff --git a/assets/minecraft/textures/block/soul_campfire_fire.png b/assets/minecraft/textures/block/soul_campfire_fire.png index 8955cd03..e69de1d5 100644 --- a/assets/minecraft/textures/block/soul_campfire_fire.png +++ b/assets/minecraft/textures/block/soul_campfire_fire.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d07e690ec76dad9aaeb2a0678db494c9a194188363a269e7b67a8d0949aef7fc -size 635 +oid sha256:9d83397f31d9419015a2abbb35b674fcc33364c27a170c66cebccd3e0288ebbf +size 611 diff --git a/assets/minecraft/textures/block/soul_campfire_log_lit.png b/assets/minecraft/textures/block/soul_campfire_log_lit.png index c76ab127..23779882 100644 --- a/assets/minecraft/textures/block/soul_campfire_log_lit.png +++ b/assets/minecraft/textures/block/soul_campfire_log_lit.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6166c83d84c2c56c51c47e46fbdb0e443a322367308c48d20fc6d6596e931be3 -size 519 +oid sha256:9941fb51759a95e6476e900a991b01abc73724151df9e601e737c5b9f68aa5c4 +size 518 diff --git a/assets/minecraft/textures/block/soul_fire_0.png b/assets/minecraft/textures/block/soul_fire_0.png index bb7c1851..0a67c732 100644 --- a/assets/minecraft/textures/block/soul_fire_0.png +++ b/assets/minecraft/textures/block/soul_fire_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5239a385a4eca64b7832a8945f99385240e1d54ccbbe7d27dc0fa443effed790 -size 8056 +oid sha256:1a756cde9d9ca7b0753ce3856bebea12887032abc2f6ee5784f7de5fdcf30e70 +size 7690 diff --git a/assets/minecraft/textures/block/soul_fire_1.png b/assets/minecraft/textures/block/soul_fire_1.png index 9e99ad35..11ffed86 100644 --- a/assets/minecraft/textures/block/soul_fire_1.png +++ b/assets/minecraft/textures/block/soul_fire_1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9c20e1da6955ed4b78653e74dcc6edb19d3b50aa9ed54ada9dc16eaec83ece18 -size 7778 +oid sha256:4274ed846e0ef1acf888ed40bfd20794a859f83032bbdba8c19f3ed871e74a2d +size 7380 diff --git a/assets/minecraft/textures/block/soul_soil.png b/assets/minecraft/textures/block/soul_soil.png index 125455af..f148a774 100644 --- a/assets/minecraft/textures/block/soul_soil.png +++ b/assets/minecraft/textures/block/soul_soil.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d95a270444005f84f5edac1ce1d1efbfae10970d72659623551536149b594090 -size 187 +oid sha256:2bbf204f6eda2570f2ba02e2e0f2fd369b91fec360c488942a8a2ee165a77e5a +size 185 diff --git a/assets/minecraft/textures/block/soul_torch.png b/assets/minecraft/textures/block/soul_torch.png index 837c18c4..4c565f07 100644 --- a/assets/minecraft/textures/block/soul_torch.png +++ b/assets/minecraft/textures/block/soul_torch.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:728b6cf0e86e190af2d9e069f9732686c9c96b03d0fceb6da17696305e6c5cd3 -size 140 +oid sha256:589e4cf9389fe82a6ca24b3246f0fea72cb69c06985705aef3ee208d6cb8207e +size 138 diff --git a/assets/minecraft/textures/block/spawner.png b/assets/minecraft/textures/block/spawner.png index 50f3ce21..29cf4576 100644 --- a/assets/minecraft/textures/block/spawner.png +++ b/assets/minecraft/textures/block/spawner.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d6a4e76379a18bd87f43410a05413496c96064ad713512663dbd24db89f14256 -size 219 +oid sha256:e228d0554328a65f62d2f11054e9b9307a09616ab8b31b70e2483e77bb68b0b4 +size 207 diff --git a/assets/minecraft/textures/block/spore_blossom.png b/assets/minecraft/textures/block/spore_blossom.png index 08749735..ccb8a1a6 100644 --- a/assets/minecraft/textures/block/spore_blossom.png +++ b/assets/minecraft/textures/block/spore_blossom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:59a0f8dda63693e412e736fad763638ab0bdb24ebfc870c26d35a09cb6e33cb0 -size 223 +oid sha256:923bf3b5a8f13e7283916ed9af95828a6d7c25f4b60642051849e62118a38ace +size 200 diff --git a/assets/minecraft/textures/block/spore_blossom_base.png b/assets/minecraft/textures/block/spore_blossom_base.png index e7dd1afe..7c35e460 100644 --- a/assets/minecraft/textures/block/spore_blossom_base.png +++ b/assets/minecraft/textures/block/spore_blossom_base.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3d66b1206cbfd8b4cdc8ab5b843405e1b67536277854e35ef8b332537d451615 -size 200 +oid sha256:b78c4b6fce8a907f0515425377eab7e6f32dd6d828746dc1faf19d29722a5219 +size 196 diff --git a/assets/minecraft/textures/block/spruce_door_top.png b/assets/minecraft/textures/block/spruce_door_top.png index 470358b3..a6ba1d20 100644 --- a/assets/minecraft/textures/block/spruce_door_top.png +++ b/assets/minecraft/textures/block/spruce_door_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:19ad965433bbc5b5654856770b0d4a1c9b2670a7d57e23b4df09339ffa013c36 -size 237 +oid sha256:53be462544fd88a451bba74eb699c113c506773fee0243f2c79983cee66acb7d +size 221 diff --git a/assets/minecraft/textures/block/spruce_leaves.png b/assets/minecraft/textures/block/spruce_leaves.png index 6c4be34b..b4b6e25f 100644 --- a/assets/minecraft/textures/block/spruce_leaves.png +++ b/assets/minecraft/textures/block/spruce_leaves.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f6c193f73cdd1399e94809c0bd7dce0b1b76dcdae1da2088e481dbba714edb2 -size 212 +oid sha256:538a4d679a8677d710cde7a99c44f9dd95d1e117aa42844d1dad1e24ed47fb16 +size 175 diff --git a/assets/minecraft/textures/block/spruce_log.png b/assets/minecraft/textures/block/spruce_log.png index 4d9ff22b..ecbd0aec 100644 --- a/assets/minecraft/textures/block/spruce_log.png +++ b/assets/minecraft/textures/block/spruce_log.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f28e8ce2783a0d14cc6f23904faf6858fba1295290a732735db82b54392574fd -size 193 +oid sha256:a87a55ec454cb682934666bdf864dbd7fab4a561415f76834f3c53bb75bf0ba9 +size 191 diff --git a/assets/minecraft/textures/block/spruce_log_top.png b/assets/minecraft/textures/block/spruce_log_top.png index 5ef53ae8..2224d6fa 100644 --- a/assets/minecraft/textures/block/spruce_log_top.png +++ b/assets/minecraft/textures/block/spruce_log_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b153bde175085ba46e5badacf9d7dd4dc909a75f02118b73b9338685f06c5b42 -size 219 +oid sha256:8583ff5fc439af8bbc108bef5d71e947fb1655734dadd9470478d8d26ca3900b +size 202 diff --git a/assets/minecraft/textures/block/spruce_planks.png b/assets/minecraft/textures/block/spruce_planks.png index 53155539..dabde582 100644 --- a/assets/minecraft/textures/block/spruce_planks.png +++ b/assets/minecraft/textures/block/spruce_planks.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:43ddc665352825876985faaed7e5f7b958f9b8fc3cad56d7bca1c2db7a54949a -size 202 +oid sha256:a1e4cd5b1eb20bc03e8d1f3fdae59034363c3b2dde7f505694e4323222e00e21 +size 195 diff --git a/assets/minecraft/textures/block/spruce_sapling.png b/assets/minecraft/textures/block/spruce_sapling.png index 2798dc7d..08e820f3 100644 --- a/assets/minecraft/textures/block/spruce_sapling.png +++ b/assets/minecraft/textures/block/spruce_sapling.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8559ad02a8a73dc5f9b8bcb51f2eb26ddbb870e99736907a380f2487fe00ff74 -size 190 +oid sha256:280cf713b9f66d16c7acf0eb3c6a25199165eacb5f2d1e2cacce861d4b9aebb4 +size 181 diff --git a/assets/minecraft/textures/block/spruce_trapdoor.png b/assets/minecraft/textures/block/spruce_trapdoor.png index 0f711c19..d3752069 100644 --- a/assets/minecraft/textures/block/spruce_trapdoor.png +++ b/assets/minecraft/textures/block/spruce_trapdoor.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c0efab1e2383a82171322377f1709ca7abb14f77a67e0c9320e329909db3314a -size 209 +oid sha256:b22c847ef0810ba5ed6546de8484ad17bc72ea894a42078ca9221aa3c23d8fdf +size 198 diff --git a/assets/minecraft/textures/block/stone.png b/assets/minecraft/textures/block/stone.png index 2c804da4..49277967 100644 --- a/assets/minecraft/textures/block/stone.png +++ b/assets/minecraft/textures/block/stone.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:33ac70ba8cb701087642a12c5fd29c1ba3006dc4730e9b014ed3a19ce7cdda7b -size 157 +oid sha256:b5e10adc72442bfb257ce7ba0b9bbe36475a0c8cdfec89b80dc9517203ff3e9f +size 151 diff --git a/assets/minecraft/textures/block/stone_bricks.png b/assets/minecraft/textures/block/stone_bricks.png index eb69e446..d554d36b 100644 --- a/assets/minecraft/textures/block/stone_bricks.png +++ b/assets/minecraft/textures/block/stone_bricks.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:33da66239c5586ee712ffa3fab45927cd7d4968cf111829d3049f84152d85953 -size 199 +oid sha256:24415444c9e4815aad4a3a349ecbfc0e027b96be25ac5b7c273c06f16c4fdd2f +size 188 diff --git a/assets/minecraft/textures/block/stonecutter_bottom.png b/assets/minecraft/textures/block/stonecutter_bottom.png index 2b5bb68f..87a3a361 100644 --- a/assets/minecraft/textures/block/stonecutter_bottom.png +++ b/assets/minecraft/textures/block/stonecutter_bottom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:72063879a29e9eefbb055dcc56aee36ee1ad761592ed74e8ffa9023e7d35260e -size 177 +oid sha256:338289c373536af5e90820c69ea8b3f6360545b6444c95b80f36579a11a96b07 +size 166 diff --git a/assets/minecraft/textures/block/stonecutter_saw.png b/assets/minecraft/textures/block/stonecutter_saw.png index f8504cb2..29bde6a7 100644 --- a/assets/minecraft/textures/block/stonecutter_saw.png +++ b/assets/minecraft/textures/block/stonecutter_saw.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5f9db9aeb0faada6e0a1b892bfd5ab8fc3ab98bc00c721f90910e18a29d75b06 -size 229 +oid sha256:9ba79c91f9cdf18b08e1ac50a657a7ecc0349d958195cb821196d5d03c4851fd +size 187 diff --git a/assets/minecraft/textures/block/stonecutter_top.png b/assets/minecraft/textures/block/stonecutter_top.png index 84ac54fb..5ecd79de 100644 --- a/assets/minecraft/textures/block/stonecutter_top.png +++ b/assets/minecraft/textures/block/stonecutter_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a27b1cecdaece1fa26ee35dac950c3d96aa7fe9d86efa5c776fa38facc70012a -size 220 +oid sha256:43c826a5b52ef53c1c1d0d8eba01e53ffaafbf81c98a11cf408c5eba03027a65 +size 205 diff --git a/assets/minecraft/textures/block/stripped_acacia_log_top.png b/assets/minecraft/textures/block/stripped_acacia_log_top.png index f92da6ff..cc1f2f95 100644 --- a/assets/minecraft/textures/block/stripped_acacia_log_top.png +++ b/assets/minecraft/textures/block/stripped_acacia_log_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aa440b5b4807eb5f2c5cbdbcc891798afde45e2ab85df60a2151789b8a387cb7 -size 220 +oid sha256:24546fc58c29c613267977349d87d7a9089dd1e6505c165f249473168fa9bc94 +size 203 diff --git a/assets/minecraft/textures/block/stripped_bamboo_block.png b/assets/minecraft/textures/block/stripped_bamboo_block.png index 5501967e..b20dee61 100644 --- a/assets/minecraft/textures/block/stripped_bamboo_block.png +++ b/assets/minecraft/textures/block/stripped_bamboo_block.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0a079883095ae21f783c3b4a89cddf2cc1f5e5396307ae2053dc620866c6ff00 -size 213 +oid sha256:fb65b3eb17407b34274ecf15b9fcf4cd1d6952bf49507a93e89214fdd51cb81b +size 211 diff --git a/assets/minecraft/textures/block/stripped_bamboo_block_top.png b/assets/minecraft/textures/block/stripped_bamboo_block_top.png index 382fb9f3..d9edaa92 100644 --- a/assets/minecraft/textures/block/stripped_bamboo_block_top.png +++ b/assets/minecraft/textures/block/stripped_bamboo_block_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f8320dea583fbaeac22c06389fc304c583d733123cac2a1fd9176deac560a20e -size 177 +oid sha256:139a1d7b5a0199d8944a0dc7500278576ddcb9d51f77b6966da7751e02722f3f +size 172 diff --git a/assets/minecraft/textures/block/stripped_birch_log.png b/assets/minecraft/textures/block/stripped_birch_log.png index 98d538dd..f0f37bbd 100644 --- a/assets/minecraft/textures/block/stripped_birch_log.png +++ b/assets/minecraft/textures/block/stripped_birch_log.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0bc206de812d495309629a5a727944ee7c737fb72ba0817a6dd3cc440d21cae4 -size 393 +oid sha256:961c85ae822ac1efdd9327337857d0e34d66b2a8c334c58d19e870e853ea65cc +size 392 diff --git a/assets/minecraft/textures/block/stripped_birch_log_top.png b/assets/minecraft/textures/block/stripped_birch_log_top.png index 39871125..f4c0b02b 100644 --- a/assets/minecraft/textures/block/stripped_birch_log_top.png +++ b/assets/minecraft/textures/block/stripped_birch_log_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3012d9f44c4d4174c4bc87736d7d927d1b37704085fe95f40d1a9a27f29bc5f8 -size 216 +oid sha256:a36bb4cf62116b857e74818ae5c102216fff4889ae5d4fedc302ad2c1bf6195e +size 198 diff --git a/assets/minecraft/textures/block/stripped_cherry_log.png b/assets/minecraft/textures/block/stripped_cherry_log.png index 9b193932..dffdbf16 100644 --- a/assets/minecraft/textures/block/stripped_cherry_log.png +++ b/assets/minecraft/textures/block/stripped_cherry_log.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7678a36695cb336de8d190dbf3e21f800b7229b710863ee78abf8ab860617ad8 -size 206 +oid sha256:68535853028b8c8f2d6d02767b43ec4c48c9f018badd9b7b1694162ef1460d7d +size 202 diff --git a/assets/minecraft/textures/block/stripped_cherry_log_top.png b/assets/minecraft/textures/block/stripped_cherry_log_top.png index 545e9cc0..c75c75eb 100644 --- a/assets/minecraft/textures/block/stripped_cherry_log_top.png +++ b/assets/minecraft/textures/block/stripped_cherry_log_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8028c75525634649df575ef447b89538c606b17374cac20e2f44d568642a40fa -size 223 +oid sha256:447108e1786a96c2b773bb51b8de8bcb1a192619718110e23459136baa987a2e +size 206 diff --git a/assets/minecraft/textures/block/stripped_crimson_stem.png b/assets/minecraft/textures/block/stripped_crimson_stem.png index 9bdf39f1..18ee877e 100644 --- a/assets/minecraft/textures/block/stripped_crimson_stem.png +++ b/assets/minecraft/textures/block/stripped_crimson_stem.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e732c737c991b1ae9d095b217796905bf9a30f4e98ab3b1f29363b3be340fe0c -size 210 +oid sha256:9e12f47c45d0c890269f896cd5295f4b0d860ed6482929716dd13897aaa766cd +size 209 diff --git a/assets/minecraft/textures/block/stripped_crimson_stem_top.png b/assets/minecraft/textures/block/stripped_crimson_stem_top.png index fd7d70c5..80cf2607 100644 --- a/assets/minecraft/textures/block/stripped_crimson_stem_top.png +++ b/assets/minecraft/textures/block/stripped_crimson_stem_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9cabe4d1d0cbe68a1d66d7016729c5d59dbfcc0b36ade499309ef3538276f159 -size 201 +oid sha256:32df114dcf2ab3b1fab0e0d58c969fa6e1fb19f69a1f6df833ba8478b58ebb49 +size 197 diff --git a/assets/minecraft/textures/block/stripped_dark_oak_log.png b/assets/minecraft/textures/block/stripped_dark_oak_log.png index a4edd48d..d727838d 100644 --- a/assets/minecraft/textures/block/stripped_dark_oak_log.png +++ b/assets/minecraft/textures/block/stripped_dark_oak_log.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8dd9966dfa366c4874359be81c3d3879558055bedc0b00164cc90d7f37c5b693 -size 230 +oid sha256:23b5b04b273a99c1f645b6a043af11b4d63a07535fe66ebf7e612a623b99d330 +size 213 diff --git a/assets/minecraft/textures/block/stripped_dark_oak_log_top.png b/assets/minecraft/textures/block/stripped_dark_oak_log_top.png index 77c4ab5f..aea4e8f4 100644 --- a/assets/minecraft/textures/block/stripped_dark_oak_log_top.png +++ b/assets/minecraft/textures/block/stripped_dark_oak_log_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:731007f12f82102ca3b85a07ab08a05b86c50de98e4ee331da6d35ba4e892021 -size 232 +oid sha256:4c0c7d44ce80698064b1beaa8b4237faf9ede8169c872bfb37196dd7399e8c71 +size 210 diff --git a/assets/minecraft/textures/block/stripped_jungle_log_top.png b/assets/minecraft/textures/block/stripped_jungle_log_top.png index bfe00d7d..e9149d35 100644 --- a/assets/minecraft/textures/block/stripped_jungle_log_top.png +++ b/assets/minecraft/textures/block/stripped_jungle_log_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4553fc171b061cc319c9b8a35c6d85382248cb67cfad8f15225d17b290768b25 -size 227 +oid sha256:a90b7ebdd79c5853160b6b2d6ab0d9c168bcb74d499ec1758c67806559210285 +size 214 diff --git a/assets/minecraft/textures/block/stripped_mangrove_log.png b/assets/minecraft/textures/block/stripped_mangrove_log.png index 80e4335e..34cf9c0d 100644 --- a/assets/minecraft/textures/block/stripped_mangrove_log.png +++ b/assets/minecraft/textures/block/stripped_mangrove_log.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:73930185ea885258abb501ad7c81fecf3875d4c10d4cdcb2b636e1883057c4f4 -size 196 +oid sha256:e94a8b08b07f82a445037e7c218e2bbd8421e25165013390bbf9c18a5a6955a4 +size 183 diff --git a/assets/minecraft/textures/block/stripped_mangrove_log_top.png b/assets/minecraft/textures/block/stripped_mangrove_log_top.png index 5b55cca5..90beb999 100644 --- a/assets/minecraft/textures/block/stripped_mangrove_log_top.png +++ b/assets/minecraft/textures/block/stripped_mangrove_log_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e03f18b10de7451005144381b37b75b45337af4f83e73361013419e48d1f62dc -size 224 +oid sha256:b5ae856eab41375360900d9c689b69ddf850efb9accb7476e395a04ba0550a94 +size 199 diff --git a/assets/minecraft/textures/block/stripped_oak_log_top.png b/assets/minecraft/textures/block/stripped_oak_log_top.png index 5e0311d3..65915d69 100644 --- a/assets/minecraft/textures/block/stripped_oak_log_top.png +++ b/assets/minecraft/textures/block/stripped_oak_log_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:381cd4df4f9017c253df5edd9510c482729c477ae7b2ec954dbc3e92638d078f -size 225 +oid sha256:00aadf60b3de1d23bbcbb1659b4183b42b74350216c7b45c3c706ba34fd498a7 +size 202 diff --git a/assets/minecraft/textures/block/stripped_pale_oak_log_top.png b/assets/minecraft/textures/block/stripped_pale_oak_log_top.png index 5adbf277..1f031fcf 100644 --- a/assets/minecraft/textures/block/stripped_pale_oak_log_top.png +++ b/assets/minecraft/textures/block/stripped_pale_oak_log_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:98da751ab565233534c8eb0905c9456d4f96e0f02bc09f477bdf07266354271e -size 221 +oid sha256:4818df85bfcd32de0fcf2e6473051675d76154fbc6dd18420ca2920feab25c2e +size 200 diff --git a/assets/minecraft/textures/block/stripped_spruce_log.png b/assets/minecraft/textures/block/stripped_spruce_log.png index b02f9980..f3d3e1df 100644 --- a/assets/minecraft/textures/block/stripped_spruce_log.png +++ b/assets/minecraft/textures/block/stripped_spruce_log.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fa53e3b555ca3a17da2e0e9ffd46cff2d0bc3cd3a5cf10a65a864a16bc7bd509 -size 234 +oid sha256:b5e97d00dedc7a84055babaa079c92d996a25dd9fb675d25536c4f10b2bd687a +size 217 diff --git a/assets/minecraft/textures/block/stripped_spruce_log_top.png b/assets/minecraft/textures/block/stripped_spruce_log_top.png index aacf2124..f1122589 100644 --- a/assets/minecraft/textures/block/stripped_spruce_log_top.png +++ b/assets/minecraft/textures/block/stripped_spruce_log_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d5d7e45d307f28348b652eb552c569bcc5c810dd91908b297c74904bd267cd3 -size 236 +oid sha256:fc982d04823ac257b42e52c71adbe6b2d8e5bd8303b479ecb4fb13aee1441834 +size 213 diff --git a/assets/minecraft/textures/block/stripped_warped_stem.png b/assets/minecraft/textures/block/stripped_warped_stem.png index 2b506963..7c72f15b 100644 --- a/assets/minecraft/textures/block/stripped_warped_stem.png +++ b/assets/minecraft/textures/block/stripped_warped_stem.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d40e604f1a467ffb25b411bf91cb02d95e13881b3e0659dac309a9a65a87f54f -size 210 +oid sha256:aa3407c3004e7b2b051a7bb1e51f38122ac543f6e994227f817157a964d7a15c +size 209 diff --git a/assets/minecraft/textures/block/structure_block_corner.png b/assets/minecraft/textures/block/structure_block_corner.png index 4e3fafb3..e27460cc 100644 --- a/assets/minecraft/textures/block/structure_block_corner.png +++ b/assets/minecraft/textures/block/structure_block_corner.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d969cdc892410e048609cf1e43302a28ed3eb3f72c2f35ff34b5cfe28d907063 -size 235 +oid sha256:1be1e91be76879677f2fc0311c4aa67224af3cdb9cacc077e29b77e61132d69e +size 227 diff --git a/assets/minecraft/textures/block/structure_block_data.png b/assets/minecraft/textures/block/structure_block_data.png index 4b236c80..4f31f63d 100644 --- a/assets/minecraft/textures/block/structure_block_data.png +++ b/assets/minecraft/textures/block/structure_block_data.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:af075a7b21373dab774275a6888302cf86a5e18136f167d0a761c211dbb278e2 -size 194 +oid sha256:97cb2013f2c608230b260730674483464da6d5a58633ba278e19b2e7149dbd10 +size 192 diff --git a/assets/minecraft/textures/block/structure_block_load.png b/assets/minecraft/textures/block/structure_block_load.png index 48a5986c..5eed6c16 100644 --- a/assets/minecraft/textures/block/structure_block_load.png +++ b/assets/minecraft/textures/block/structure_block_load.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:73cfbf5a6cf0747f54450ef97a2304aa3e7eb05d284b4bff60a33c88e8a94eb8 -size 197 +oid sha256:30a65ca75a8064e88f6a476aba320b525d94374eeef63fd301a41fcdd510640d +size 195 diff --git a/assets/minecraft/textures/block/structure_block_save.png b/assets/minecraft/textures/block/structure_block_save.png index a9b241f5..cdc080d7 100644 --- a/assets/minecraft/textures/block/structure_block_save.png +++ b/assets/minecraft/textures/block/structure_block_save.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:01fb63ed6819ef00628d90c947a3d1826a95cb907eb0d962b177a10eef130eaa -size 196 +oid sha256:14baed624b4920e072800c2d27bf8f5f1b81f08a65dab13d9f8f0d382232bf82 +size 195 diff --git a/assets/minecraft/textures/block/sugar_cane.png b/assets/minecraft/textures/block/sugar_cane.png index 80d8ccc0..b3e853ed 100644 --- a/assets/minecraft/textures/block/sugar_cane.png +++ b/assets/minecraft/textures/block/sugar_cane.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:07ff8cc8729ebfd38130efaea7679b3b26f74661adb116b7679e16be66407eb6 -size 186 +oid sha256:2ae5f67fddbe9484960aa1335757e1234c3ba6b41ea0ef5b0a2ec818008b4d88 +size 184 diff --git a/assets/minecraft/textures/block/sunflower_bottom.png b/assets/minecraft/textures/block/sunflower_bottom.png index 97130afa..e1b94e87 100644 --- a/assets/minecraft/textures/block/sunflower_bottom.png +++ b/assets/minecraft/textures/block/sunflower_bottom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1769b0818bf6b2dbd0900379de2257731d7afed71eb7408dc8ab335ef82353c6 -size 171 +oid sha256:3058ec8a6c01613981a5df36f3d08fd162f97f82355f9486c547a9a53f1fe9f0 +size 165 diff --git a/assets/minecraft/textures/block/sunflower_front.png b/assets/minecraft/textures/block/sunflower_front.png index 0437da88..fd610084 100644 --- a/assets/minecraft/textures/block/sunflower_front.png +++ b/assets/minecraft/textures/block/sunflower_front.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c357d4efda4ac8cadad59550f84cd2565aad111973d18af471a853051039ed73 -size 151 +oid sha256:5c68bb4999d1f3763fe19a495006629ab712b94ab2f196d36f33f27695d63b07 +size 150 diff --git a/assets/minecraft/textures/block/suspicious_gravel_1.png b/assets/minecraft/textures/block/suspicious_gravel_1.png index 89e0f536..deb59119 100644 --- a/assets/minecraft/textures/block/suspicious_gravel_1.png +++ b/assets/minecraft/textures/block/suspicious_gravel_1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6a44ecfc918bdc3df5adde15bc2e0c9d8e09ded4eeca7c9270f9241311da2279 -size 236 +oid sha256:cc6973f66256de6a14a20a986d75c145ea60f94da189044b4d42573040f6fb7f +size 214 diff --git a/assets/minecraft/textures/block/suspicious_gravel_2.png b/assets/minecraft/textures/block/suspicious_gravel_2.png index e43a420f..f21ee4d2 100644 --- a/assets/minecraft/textures/block/suspicious_gravel_2.png +++ b/assets/minecraft/textures/block/suspicious_gravel_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c043fb640c328abb964ed6de8f53440ab4560f72168164db6b5c635f14ef4c8e -size 233 +oid sha256:63c96ba34df0a2c9423b5779240ed2cfb99094383b90a36d2e3a3b1aec9d7af9 +size 230 diff --git a/assets/minecraft/textures/block/suspicious_gravel_3.png b/assets/minecraft/textures/block/suspicious_gravel_3.png index 5573a2ba..65113bd0 100644 --- a/assets/minecraft/textures/block/suspicious_gravel_3.png +++ b/assets/minecraft/textures/block/suspicious_gravel_3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e2fc87a88de5cad074f446be91505d39191cfc851cfc25993dfbb8f68d2cd016 -size 234 +oid sha256:509de413a4f514398f2f726632a8aeeb50ec60aa54a2f9a841a08351931e126a +size 212 diff --git a/assets/minecraft/textures/block/suspicious_sand_0.png b/assets/minecraft/textures/block/suspicious_sand_0.png index 0c5615ac..1b1a9ed3 100644 --- a/assets/minecraft/textures/block/suspicious_sand_0.png +++ b/assets/minecraft/textures/block/suspicious_sand_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2da5b96fdf6b179dfdacef3be362e45c1670345ec3343a6e6a30962f958deda6 -size 213 +oid sha256:2320976198b0ff461bc5f4ae03f58e854d7647912733ee52b9a26d7bcdd14ead +size 208 diff --git a/assets/minecraft/textures/block/suspicious_sand_3.png b/assets/minecraft/textures/block/suspicious_sand_3.png index 799f4012..7d2f8e9a 100644 --- a/assets/minecraft/textures/block/suspicious_sand_3.png +++ b/assets/minecraft/textures/block/suspicious_sand_3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:10cd3d4bc729f3060ad6d88f045ae7bf3256a35620b287e7cdaf8e824f1db5b6 -size 221 +oid sha256:93a58b5da9d78688a095e39f7a85857cfc30861a6c191bdbc9a4c30a003745e4 +size 220 diff --git a/assets/minecraft/textures/block/sweet_berry_bush_stage0.png b/assets/minecraft/textures/block/sweet_berry_bush_stage0.png index 17688960..03667c18 100644 --- a/assets/minecraft/textures/block/sweet_berry_bush_stage0.png +++ b/assets/minecraft/textures/block/sweet_berry_bush_stage0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c506bc54408fcb20af237347d95d604630e3e86408656546090489b9472633d1 -size 155 +oid sha256:a3f77c6de3cfb649129580eea8d390801e2717bca2fe45f0f3bb5becfb733ffb +size 154 diff --git a/assets/minecraft/textures/block/sweet_berry_bush_stage1.png b/assets/minecraft/textures/block/sweet_berry_bush_stage1.png index e5ed4f3f..9ea98877 100644 --- a/assets/minecraft/textures/block/sweet_berry_bush_stage1.png +++ b/assets/minecraft/textures/block/sweet_berry_bush_stage1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:892a7923e22fa2ddb80d8371c1fb5d9b3ee7de0dbf1dd20135d2d705fcbd0a5f -size 221 +oid sha256:20055a13c1059cfa27c64461045352f629d72c55b64cfdced5904d2ca12f5af5 +size 201 diff --git a/assets/minecraft/textures/block/sweet_berry_bush_stage2.png b/assets/minecraft/textures/block/sweet_berry_bush_stage2.png index 95a87597..39796c59 100644 --- a/assets/minecraft/textures/block/sweet_berry_bush_stage2.png +++ b/assets/minecraft/textures/block/sweet_berry_bush_stage2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:65a9adbdc2816b1e195abdff8a7f04b3bce8d288a6b66697fe746c35c575fbb9 -size 242 +oid sha256:445b6f1b0b38be4936eae2e8c997386534cc2f94dbcea75f88c6ca6431ac0bc4 +size 219 diff --git a/assets/minecraft/textures/block/sweet_berry_bush_stage3.png b/assets/minecraft/textures/block/sweet_berry_bush_stage3.png index 39322aaf..27f233de 100644 --- a/assets/minecraft/textures/block/sweet_berry_bush_stage3.png +++ b/assets/minecraft/textures/block/sweet_berry_bush_stage3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d7d9bf83464ef649e52c8658e15b080f1abb36928ecdbaf2306a292b5bda5cb1 -size 251 +oid sha256:7b452ae433a8980ac19320772e4d2289c1365eae2d8757c88060ed2002a1d566 +size 234 diff --git a/assets/minecraft/textures/block/tall_dry_grass.png b/assets/minecraft/textures/block/tall_dry_grass.png index fc628165..b376081c 100644 --- a/assets/minecraft/textures/block/tall_dry_grass.png +++ b/assets/minecraft/textures/block/tall_dry_grass.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:720b8a49865f7d2f700a9a30317090cf8f1614790a034b96cb7a1aefe62d9a5d -size 189 +oid sha256:0adc0fd974bce270e5300e2b6908e05b6c2ceb2de93a2ae43c8a945a45dea5cc +size 179 diff --git a/assets/minecraft/textures/block/tall_grass_bottom.png b/assets/minecraft/textures/block/tall_grass_bottom.png index b354cd91..3586f269 100644 --- a/assets/minecraft/textures/block/tall_grass_bottom.png +++ b/assets/minecraft/textures/block/tall_grass_bottom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a35a3aba7a104fa1320c01be91e0c239ee6ea96c99959287ce71c75cd14d20ef -size 204 +oid sha256:30d9b656f406ab5231bc39dfb1c08e6f4b1d275cf242e699a750e358eeed4194 +size 194 diff --git a/assets/minecraft/textures/block/tall_grass_top.png b/assets/minecraft/textures/block/tall_grass_top.png index c262fe12..faef3744 100644 --- a/assets/minecraft/textures/block/tall_grass_top.png +++ b/assets/minecraft/textures/block/tall_grass_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f7468bc83e9f1b952e8647bbfbab4f5c40c71cec4459a463a2c22ce03af2212 -size 185 +oid sha256:16cfd90e32fb04756fd0cfbd652ae358d545a069a9ed22cbb390ec5bf3f17f1a +size 184 diff --git a/assets/minecraft/textures/block/tall_seagrass_bottom.png b/assets/minecraft/textures/block/tall_seagrass_bottom.png index 658662fd..7ef09292 100644 --- a/assets/minecraft/textures/block/tall_seagrass_bottom.png +++ b/assets/minecraft/textures/block/tall_seagrass_bottom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:be513174b16202ded51d89b9389d9519b743a6bf578a812eea0ec732962a97d4 -size 989 +oid sha256:9928cf0433153517cfe3b68e268142d2d9360422991d2e0af5933d04e5bf5646 +size 749 diff --git a/assets/minecraft/textures/block/tall_seagrass_top.png b/assets/minecraft/textures/block/tall_seagrass_top.png index fc7d1528..bd40d285 100644 --- a/assets/minecraft/textures/block/tall_seagrass_top.png +++ b/assets/minecraft/textures/block/tall_seagrass_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d9f3bfb405471c9fbc85ff007a92f32e8a92cbf0de72f23d095f7fa1d188e20 -size 635 +oid sha256:bdb68bb2a0e917b2f2d338d007eb9e713bff9eb3477dc50d8a59b5105455e72a +size 540 diff --git a/assets/minecraft/textures/block/target_side.png b/assets/minecraft/textures/block/target_side.png index 2a7c6e11..2efa8f41 100644 --- a/assets/minecraft/textures/block/target_side.png +++ b/assets/minecraft/textures/block/target_side.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4afeeb8e132c19b03515b2b600df17fd8f6997acf19bd7dd464e7b16c34bc50a -size 227 +oid sha256:58e9e93f74111c7fbfdb4ef0e8aa4cdf44dd2f4db59ac9347a98d14983ad98bb +size 226 diff --git a/assets/minecraft/textures/block/target_top.png b/assets/minecraft/textures/block/target_top.png index 2ed9713b..7c57ca3c 100644 --- a/assets/minecraft/textures/block/target_top.png +++ b/assets/minecraft/textures/block/target_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:98e323a7dc5b52d56bc2c015dea9058c5c2c39324527d262534c539faead43a6 -size 239 +oid sha256:c37931d2c3b5bacecc74d83b1440c9a65fe1dbbdcdb091e921716cb0fe984c9c +size 235 diff --git a/assets/minecraft/textures/block/terracotta.png b/assets/minecraft/textures/block/terracotta.png index 13301952..5dd92e64 100644 --- a/assets/minecraft/textures/block/terracotta.png +++ b/assets/minecraft/textures/block/terracotta.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0070431576a05bab0e0383afafdc4d2c6f46e04dac2c54a90afecc97f759b4fb -size 188 +oid sha256:b2458267eac6b6f35d02990ee3244edf1f43fbe258bd6dfe15189cf2eaf42ae8 +size 181 diff --git a/assets/minecraft/textures/block/test_block_accept.png b/assets/minecraft/textures/block/test_block_accept.png index 0e27a3e0..9da6e709 100644 --- a/assets/minecraft/textures/block/test_block_accept.png +++ b/assets/minecraft/textures/block/test_block_accept.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b5d6a5c2cf864db7b3eccd9816c47d122fc59b10c6bb55cb9432346c8c8a0cb0 -size 253 +oid sha256:4ca113ec8f0af4af5ad0d6130f2c140c5fcf9ce49ccc8bf221d12685452ec62a +size 211 diff --git a/assets/minecraft/textures/block/test_block_fail.png b/assets/minecraft/textures/block/test_block_fail.png index a7a28e38..65fc22e9 100644 --- a/assets/minecraft/textures/block/test_block_fail.png +++ b/assets/minecraft/textures/block/test_block_fail.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:47daec1cdb03a50a5821d068f5649fa07dadc740fef71e9b4d6cf3dd6956f370 -size 253 +oid sha256:c5c894ac433d87ba475a3491d09bf72ab83df1e33beec21cceac71976d080cbd +size 212 diff --git a/assets/minecraft/textures/block/test_block_log.png b/assets/minecraft/textures/block/test_block_log.png index e90fe0dc..39ec8144 100644 --- a/assets/minecraft/textures/block/test_block_log.png +++ b/assets/minecraft/textures/block/test_block_log.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0e719b222e49f642d09d64c2cb2d885b3f0c103f877dae07c59dbbbe4653b13d -size 253 +oid sha256:69f92c32758cec099dbef085a2394bab9a9d6160ff3c2166a54ea091bcf3c054 +size 222 diff --git a/assets/minecraft/textures/block/test_block_start.png b/assets/minecraft/textures/block/test_block_start.png index c83b812f..7093c7f0 100644 --- a/assets/minecraft/textures/block/test_block_start.png +++ b/assets/minecraft/textures/block/test_block_start.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a36d144eabc272bbc6c31a18a656d6561e71836d4587ad04d382a536ca95e162 -size 260 +oid sha256:1ddccddec0488f616975b845a073dfc6616e91b7a24add9abb058cbc0cd06e12 +size 228 diff --git a/assets/minecraft/textures/block/test_instance_block.png b/assets/minecraft/textures/block/test_instance_block.png index 725e2d4e..997805fd 100644 --- a/assets/minecraft/textures/block/test_instance_block.png +++ b/assets/minecraft/textures/block/test_instance_block.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e762c8b71a04f0e4269eb6ababfa9be90086a1d164fc0828619f37469f6a6a77 -size 244 +oid sha256:90fc353ea906b168005ee60fecc603da9d7d94b325a5e690dbcf3d424284ab03 +size 217 diff --git a/assets/minecraft/textures/block/tinted_glass.png b/assets/minecraft/textures/block/tinted_glass.png index 273650e2..19d14e21 100644 --- a/assets/minecraft/textures/block/tinted_glass.png +++ b/assets/minecraft/textures/block/tinted_glass.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:56fc544d8b2e5304a74e88da809faee9d5fafe143612ee3e40b02b27ca373014 -size 181 +oid sha256:f6d7b83baf3a8773338af8089cac7ccf91c66594c2efd472bce541fb9c0cf7c5 +size 167 diff --git a/assets/minecraft/textures/block/tnt_bottom.png b/assets/minecraft/textures/block/tnt_bottom.png index eac333ea..9349fcec 100644 --- a/assets/minecraft/textures/block/tnt_bottom.png +++ b/assets/minecraft/textures/block/tnt_bottom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bb7837ad4d44f165f3fe78d5eec19dc0713e74e9a724f214643c900bc12c3778 -size 105 +oid sha256:5c6bbcbd86c364df0b276663926b0e8a67ea3ab9cdc0fa6f77338dc5bc45656d +size 101 diff --git a/assets/minecraft/textures/block/tnt_side.png b/assets/minecraft/textures/block/tnt_side.png index 91cc9aa3..527e45dc 100644 --- a/assets/minecraft/textures/block/tnt_side.png +++ b/assets/minecraft/textures/block/tnt_side.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:950388eb9f86f9882c11e4ef291c4da8416433d9cac8ce2713abfb322f2ca159 -size 176 +oid sha256:e895862292492528e8e55d675acb886245485639fd16a4c075f6e64c06404541 +size 175 diff --git a/assets/minecraft/textures/block/tnt_top.png b/assets/minecraft/textures/block/tnt_top.png index b6763732..a2d427a7 100644 --- a/assets/minecraft/textures/block/tnt_top.png +++ b/assets/minecraft/textures/block/tnt_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:59b071086ceddf43d8a95dec7441e450781215b89e7998c906224af859b04c25 -size 200 +oid sha256:e5779ad2c41d1b72cc7f8baea7b5c65f920f97a83b808ee3c643f8c45f31ca41 +size 189 diff --git a/assets/minecraft/textures/block/torch.png b/assets/minecraft/textures/block/torch.png index 01e3c72e..3e6ec63f 100644 --- a/assets/minecraft/textures/block/torch.png +++ b/assets/minecraft/textures/block/torch.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:329db8f31720564ca9c6eeb3bafb98bb30a4d277e958e55806720cc01dbf296d -size 138 +oid sha256:1e0a18d6a5f4e839f07b3a7cbe2703f98d7db1c65eb1c96e1e575eec61410e16 +size 137 diff --git a/assets/minecraft/textures/block/torchflower.png b/assets/minecraft/textures/block/torchflower.png index e88ebc4f..5d6b8228 100644 --- a/assets/minecraft/textures/block/torchflower.png +++ b/assets/minecraft/textures/block/torchflower.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9c12f944da72e0596adc4c19cac12a17a10cea3b7e102c17ceeac569933cfd4a -size 233 +oid sha256:e39269a8720a75751ff5f2c1478389c970c1a82da9c4dde83e5aca4319ddd2fa +size 221 diff --git a/assets/minecraft/textures/block/torchflower_crop_stage0.png b/assets/minecraft/textures/block/torchflower_crop_stage0.png index 3a1b709b..6574f624 100644 --- a/assets/minecraft/textures/block/torchflower_crop_stage0.png +++ b/assets/minecraft/textures/block/torchflower_crop_stage0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d4a3e668cfd1ff3e46a2fc1935074c14e4e41f69c6062702c4c8310544950797 -size 132 +oid sha256:18b34552ac4e742d3ffdf0ef5ce0ca4d12e95a518fd7eb7f4ad27924c05884d1 +size 124 diff --git a/assets/minecraft/textures/block/torchflower_crop_stage1.png b/assets/minecraft/textures/block/torchflower_crop_stage1.png index 80f0c08b..5084b3bb 100644 --- a/assets/minecraft/textures/block/torchflower_crop_stage1.png +++ b/assets/minecraft/textures/block/torchflower_crop_stage1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3eaf5ad659219d4a2885143c335ad57df0d8a278e460673e5ee0d6f84c510956 -size 185 +oid sha256:19daa63c16cb65c75204161de06fbbc89e692c677aee0b477cce88cebf4a8264 +size 176 diff --git a/assets/minecraft/textures/block/trial_spawner_side_active.png b/assets/minecraft/textures/block/trial_spawner_side_active.png index e2ab3fab..c49a91a7 100644 --- a/assets/minecraft/textures/block/trial_spawner_side_active.png +++ b/assets/minecraft/textures/block/trial_spawner_side_active.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:50016abbfa65df791601289d61c65f179517ef6c49fba4892a03bcc3b3637069 -size 220 +oid sha256:f7631b4d650c7f159cd6b0f3c9fff352caa7fbf6f05b1c70a1a20ee7cf4f354e +size 212 diff --git a/assets/minecraft/textures/block/trial_spawner_side_active_ominous.png b/assets/minecraft/textures/block/trial_spawner_side_active_ominous.png index e8e38f2c..60443d8e 100644 --- a/assets/minecraft/textures/block/trial_spawner_side_active_ominous.png +++ b/assets/minecraft/textures/block/trial_spawner_side_active_ominous.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:81a9d695fa33bafae1a6f06f58b3bd0874bc0937c287a7bf051046d37141ced2 -size 232 +oid sha256:eb61ce594a7cda6393abc4416086abfd2b1ce780476a96ed38394abd1e3e9557 +size 219 diff --git a/assets/minecraft/textures/block/trial_spawner_side_inactive.png b/assets/minecraft/textures/block/trial_spawner_side_inactive.png index 456e798f..71e85ca1 100644 --- a/assets/minecraft/textures/block/trial_spawner_side_inactive.png +++ b/assets/minecraft/textures/block/trial_spawner_side_inactive.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f36f472474e2944502b22fb8a2ed0453b20b863d6fdb6dbf8d606fa3b2a4f94d -size 220 +oid sha256:d5576055954fdb7b1ae74d10b7d89c754ca67035934eb605ea805d0914ada84b +size 212 diff --git a/assets/minecraft/textures/block/trial_spawner_side_inactive_ominous.png b/assets/minecraft/textures/block/trial_spawner_side_inactive_ominous.png index 582136e5..8fbb0924 100644 --- a/assets/minecraft/textures/block/trial_spawner_side_inactive_ominous.png +++ b/assets/minecraft/textures/block/trial_spawner_side_inactive_ominous.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:81136948c9d99e8b9bf9ed43e173357540695c9ff12c29446f539da9772df9b2 -size 217 +oid sha256:d4959ee2f8702dbb0ae3e778077a56f139cf5df78c48ec2e448d5fd95420035e +size 212 diff --git a/assets/minecraft/textures/block/trial_spawner_top_active.png b/assets/minecraft/textures/block/trial_spawner_top_active.png index bf1c66ab..8ef43842 100644 --- a/assets/minecraft/textures/block/trial_spawner_top_active.png +++ b/assets/minecraft/textures/block/trial_spawner_top_active.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:77e004eef21d66ae14a663cb516eba86929bdbbaf184ed283ade88b86efc5e8e -size 232 +oid sha256:9cebab7d3efc959da46a3ebc4de78abc7aa447f7e2517092e47f3a35faa08e89 +size 209 diff --git a/assets/minecraft/textures/block/trial_spawner_top_active_ominous.png b/assets/minecraft/textures/block/trial_spawner_top_active_ominous.png index f74175be..bc3c8fbf 100644 --- a/assets/minecraft/textures/block/trial_spawner_top_active_ominous.png +++ b/assets/minecraft/textures/block/trial_spawner_top_active_ominous.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:165cc228bc4d655e2e7feadd5fe285a17d7405c1b9b4babef3c7040f139dafdf -size 229 +oid sha256:112910c72c00b67582d264484f42ec7f5470599f7091659980893f29621a6677 +size 210 diff --git a/assets/minecraft/textures/block/trial_spawner_top_ejecting_reward.png b/assets/minecraft/textures/block/trial_spawner_top_ejecting_reward.png index 5a28a91f..63216933 100644 --- a/assets/minecraft/textures/block/trial_spawner_top_ejecting_reward.png +++ b/assets/minecraft/textures/block/trial_spawner_top_ejecting_reward.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a9ec3a5d79a351bf9c3b0f95dcb57764dd1ff54cc729d95a7bbde036ac91da9a -size 230 +oid sha256:7a2611829662611befbec103d62a1399c379cb52e2c40815c14f6770331f5d44 +size 207 diff --git a/assets/minecraft/textures/block/trial_spawner_top_ejecting_reward_ominous.png b/assets/minecraft/textures/block/trial_spawner_top_ejecting_reward_ominous.png index 87af8e87..e5ba7477 100644 --- a/assets/minecraft/textures/block/trial_spawner_top_ejecting_reward_ominous.png +++ b/assets/minecraft/textures/block/trial_spawner_top_ejecting_reward_ominous.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:657a78fb3abb8b6ecd800aa5de05f44f397905b531b0f87c69d136ee26d108df -size 236 +oid sha256:4eb6777fb60a16007b703570e3a9fc33151787588372a4e5ce9f1847a8615d1b +size 208 diff --git a/assets/minecraft/textures/block/trial_spawner_top_inactive.png b/assets/minecraft/textures/block/trial_spawner_top_inactive.png index ddc0113f..d6053bba 100644 --- a/assets/minecraft/textures/block/trial_spawner_top_inactive.png +++ b/assets/minecraft/textures/block/trial_spawner_top_inactive.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0cf8150f5901b0885d4a1ad56ed58dd6e17dcbcd30a8e0df50cfaa46d4f8ab41 -size 222 +oid sha256:c269f43d59b517c61a5b942692d16f8126048a330e1afe8be6ff4f3d9b4add82 +size 205 diff --git a/assets/minecraft/textures/block/trial_spawner_top_inactive_ominous.png b/assets/minecraft/textures/block/trial_spawner_top_inactive_ominous.png index 2440ff91..38137c38 100644 --- a/assets/minecraft/textures/block/trial_spawner_top_inactive_ominous.png +++ b/assets/minecraft/textures/block/trial_spawner_top_inactive_ominous.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ec924e5a1468b98459939736bae195ba83f1bc8594314f6a1e67c12afaa52a82 -size 228 +oid sha256:8c59f41b9e2170fe90d945fc4c386cc520436196b03c760d15f1852d818ee26e +size 213 diff --git a/assets/minecraft/textures/block/tripwire.png b/assets/minecraft/textures/block/tripwire.png index 67c11a71..603acf71 100644 --- a/assets/minecraft/textures/block/tripwire.png +++ b/assets/minecraft/textures/block/tripwire.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:89eaac6c647f95d87a5c9faf16408b101aa40b6dbcf613e2b9d464300cd77fa7 -size 214 +oid sha256:aa7ec035b93045fef6b5f5c72f4854e273e89e3b85b78888815bc94c484cef95 +size 159 diff --git a/assets/minecraft/textures/block/tripwire_hook.png b/assets/minecraft/textures/block/tripwire_hook.png index 5c610532..5a1a7716 100644 --- a/assets/minecraft/textures/block/tripwire_hook.png +++ b/assets/minecraft/textures/block/tripwire_hook.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a3a8cb9d5c9e6e6a248114e71965ecff024bac6d08aedb37ee0613eef8c3b325 -size 176 +oid sha256:f7d360f068deb7f63b9413e2e25c244a07e6e52510c9a7680655a402d34a5347 +size 174 diff --git a/assets/minecraft/textures/block/tube_coral.png b/assets/minecraft/textures/block/tube_coral.png index c23b6019..8b83946b 100644 --- a/assets/minecraft/textures/block/tube_coral.png +++ b/assets/minecraft/textures/block/tube_coral.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cf86f748f18c20217f8216205f4419ad13f15990146cfa59e01d717ff9982bdc -size 216 +oid sha256:74ab77e9461cebe623972b98c1f92d45f31396b8258b41741f2e00dc82c26a40 +size 203 diff --git a/assets/minecraft/textures/block/tube_coral_fan.png b/assets/minecraft/textures/block/tube_coral_fan.png index 6d85acc5..568730b5 100644 --- a/assets/minecraft/textures/block/tube_coral_fan.png +++ b/assets/minecraft/textures/block/tube_coral_fan.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a9e5bcee622f15b84fac93ee8fb0e2abe0f0aec67acc7d487e3a5e03a9b54e55 -size 178 +oid sha256:98ecc6047296ba30d7ac2ff8ed28521e8cf41a8e0fc1e0f5a7e5cad89c4f83fa +size 176 diff --git a/assets/minecraft/textures/block/tuff.png b/assets/minecraft/textures/block/tuff.png index 98129951..ba021a3c 100644 --- a/assets/minecraft/textures/block/tuff.png +++ b/assets/minecraft/textures/block/tuff.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f418841b6de0de42ea5c31c65ddad368c8d721ef172f59cf3b975923413a66ab -size 189 +oid sha256:a9e5466e34449fb0c73de64341e38a6bef1bcb16efba2a387a5ad6700af2cd90 +size 185 diff --git a/assets/minecraft/textures/block/tuff_bricks.png b/assets/minecraft/textures/block/tuff_bricks.png index 73658d39..3254494d 100644 --- a/assets/minecraft/textures/block/tuff_bricks.png +++ b/assets/minecraft/textures/block/tuff_bricks.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:986ec3abddf88ca29c56c59c7e078686c10447f402b4c4bbc6c0d25dda16688e -size 213 +oid sha256:4889db8fab0b3ef4b0cc3ef0d7df469ac3b89233dbeb09fdfecb4f2900b2eaf8 +size 210 diff --git a/assets/minecraft/textures/block/turtle_egg.png b/assets/minecraft/textures/block/turtle_egg.png index eff282fb..b2d933e6 100644 --- a/assets/minecraft/textures/block/turtle_egg.png +++ b/assets/minecraft/textures/block/turtle_egg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a0d34d774c0b6027887e1b2fc1a83a2d243e8bcff44a48fc24e1db2e7c10fb00 -size 306 +oid sha256:8fd62ce800d88beef4d26c09da714593b077e4937cac7de6046a54f448c37663 +size 284 diff --git a/assets/minecraft/textures/block/turtle_egg_slightly_cracked.png b/assets/minecraft/textures/block/turtle_egg_slightly_cracked.png index 00fb00f1..bf6adcaa 100644 --- a/assets/minecraft/textures/block/turtle_egg_slightly_cracked.png +++ b/assets/minecraft/textures/block/turtle_egg_slightly_cracked.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:50eab3be0788c12875b884b471fcf558e498c9c9bbfcececfa20d9ffb98f5069 -size 314 +oid sha256:1ead3d0a6d282dde7cd94e7281076d915a5dc4607c17400855c6300fbddc1215 +size 292 diff --git a/assets/minecraft/textures/block/turtle_egg_very_cracked.png b/assets/minecraft/textures/block/turtle_egg_very_cracked.png index 107c805f..9bb7fd75 100644 --- a/assets/minecraft/textures/block/turtle_egg_very_cracked.png +++ b/assets/minecraft/textures/block/turtle_egg_very_cracked.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9a981c3d8feea020f266aa465f73df66563b3f6ceb0e6f1eaea36d5e3e3001e4 -size 305 +oid sha256:3649b195f728a86ff149a1a6a1f7b534ac3cb2ed3838edcfa8fd0c7adefab8c3 +size 281 diff --git a/assets/minecraft/textures/block/twisting_vines.png b/assets/minecraft/textures/block/twisting_vines.png index f29aea8b..efb6792c 100644 --- a/assets/minecraft/textures/block/twisting_vines.png +++ b/assets/minecraft/textures/block/twisting_vines.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:13fb95404864d8867f1677b3898815fe1561e3cd37dcea43e6bb00f693ed0759 -size 161 +oid sha256:9c757fa27380982489130980a1ded90184c762860d28396ec0e70298e3e36784 +size 157 diff --git a/assets/minecraft/textures/block/twisting_vines_plant.png b/assets/minecraft/textures/block/twisting_vines_plant.png index 05ba8ee4..bd1d5316 100644 --- a/assets/minecraft/textures/block/twisting_vines_plant.png +++ b/assets/minecraft/textures/block/twisting_vines_plant.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8844fdab51adba04b4855f201e8f465afca74bad30d24611255434c96428663a -size 176 +oid sha256:912b2a65846286da106b3076fbe8955c6a72d9700ab02fb7998abadbf4988889 +size 165 diff --git a/assets/minecraft/textures/block/vault_bottom.png b/assets/minecraft/textures/block/vault_bottom.png index 492437eb..532801e7 100644 --- a/assets/minecraft/textures/block/vault_bottom.png +++ b/assets/minecraft/textures/block/vault_bottom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3384fc9017c812107047f90656a35ad30b6fff817896d23c242be7a3b3cdbb52 -size 165 +oid sha256:373e8575746f94b0ec0da6c0ed71c9eaad547998b436cd5854f30ef46202ae23 +size 157 diff --git a/assets/minecraft/textures/block/vault_bottom_ominous.png b/assets/minecraft/textures/block/vault_bottom_ominous.png index 492437eb..532801e7 100644 --- a/assets/minecraft/textures/block/vault_bottom_ominous.png +++ b/assets/minecraft/textures/block/vault_bottom_ominous.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3384fc9017c812107047f90656a35ad30b6fff817896d23c242be7a3b3cdbb52 -size 165 +oid sha256:373e8575746f94b0ec0da6c0ed71c9eaad547998b436cd5854f30ef46202ae23 +size 157 diff --git a/assets/minecraft/textures/block/vault_side_off.png b/assets/minecraft/textures/block/vault_side_off.png index 4d246107..b4e8da45 100644 --- a/assets/minecraft/textures/block/vault_side_off.png +++ b/assets/minecraft/textures/block/vault_side_off.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d9d7ab391c1bede228f31e8b59fddadaf31fb7bffa10abf7e3255e5d7312d0df -size 256 +oid sha256:1b66eacafb1df3fcd57e54aa27924159c16a3e037aa092f56f5558877c0925dc +size 246 diff --git a/assets/minecraft/textures/block/vault_side_off_ominous.png b/assets/minecraft/textures/block/vault_side_off_ominous.png index 4d246107..b4e8da45 100644 --- a/assets/minecraft/textures/block/vault_side_off_ominous.png +++ b/assets/minecraft/textures/block/vault_side_off_ominous.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d9d7ab391c1bede228f31e8b59fddadaf31fb7bffa10abf7e3255e5d7312d0df -size 256 +oid sha256:1b66eacafb1df3fcd57e54aa27924159c16a3e037aa092f56f5558877c0925dc +size 246 diff --git a/assets/minecraft/textures/block/vault_side_on.png b/assets/minecraft/textures/block/vault_side_on.png index a2d7d5a9..bdc22720 100644 --- a/assets/minecraft/textures/block/vault_side_on.png +++ b/assets/minecraft/textures/block/vault_side_on.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:24d634574da687d9b8c1f2633621c3944072b6a68f6af9c9a1e5463b90dfd6cc -size 256 +oid sha256:47b64c8bb1cfc5de566e1d9d2b52550df8e338cc13c57d24f951a6b331af5123 +size 246 diff --git a/assets/minecraft/textures/block/vault_side_on_ominous.png b/assets/minecraft/textures/block/vault_side_on_ominous.png index 5391981d..ea41e056 100644 --- a/assets/minecraft/textures/block/vault_side_on_ominous.png +++ b/assets/minecraft/textures/block/vault_side_on_ominous.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:74f7c5c0b455250462d1d09765d699971da54059f78ecea8e807447771dfe27c -size 256 +oid sha256:81f00d2e14236927662254a249a02fc7649f41caa2c3f70210b2fd2e7fa2e8b3 +size 246 diff --git a/assets/minecraft/textures/block/vault_top.png b/assets/minecraft/textures/block/vault_top.png index 8a168603..4827c89a 100644 --- a/assets/minecraft/textures/block/vault_top.png +++ b/assets/minecraft/textures/block/vault_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c997d8deff3861366011de2cc83c2dd4787898a34ab7f46738f7d02e54e7947b -size 256 +oid sha256:e28eb8d6fa8ba8dd8ab20a2efcb3232d336b147c20e9df37ac079002090a21a1 +size 217 diff --git a/assets/minecraft/textures/block/vault_top_ejecting.png b/assets/minecraft/textures/block/vault_top_ejecting.png index 4c9d646f..437b0f4f 100644 --- a/assets/minecraft/textures/block/vault_top_ejecting.png +++ b/assets/minecraft/textures/block/vault_top_ejecting.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a578fd28242da010515d45b392fa9202fb1e6bf1a9521990d571ff20562b43eb -size 256 +oid sha256:f88627dc9dff17921ee20062fc90a83eaea521475249fab20f21ea89de1843fa +size 238 diff --git a/assets/minecraft/textures/block/vault_top_ejecting_ominous.png b/assets/minecraft/textures/block/vault_top_ejecting_ominous.png index 6a3efa07..217736ed 100644 --- a/assets/minecraft/textures/block/vault_top_ejecting_ominous.png +++ b/assets/minecraft/textures/block/vault_top_ejecting_ominous.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:330f961833bdd137eeb3e2c1e54b2c235d37bf82a93e7d6e1dc726b9d84c752d -size 239 +oid sha256:d3d38a958d7b63fe090972652b89bf70974e3b58cb564e0b18700fc4ca83fdec +size 218 diff --git a/assets/minecraft/textures/block/vault_top_ominous.png b/assets/minecraft/textures/block/vault_top_ominous.png index 21d7043b..baab26d0 100644 --- a/assets/minecraft/textures/block/vault_top_ominous.png +++ b/assets/minecraft/textures/block/vault_top_ominous.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d876b0a299a9e29e6a33f39360277545aee59d44e3b8f1318620a1b10e3e9d91 -size 234 +oid sha256:972d2ecc2c2274b4aba9a9507da035f2e82da6cddf8d66c3905bcb56161bbfb7 +size 217 diff --git a/assets/minecraft/textures/block/verdant_froglight_side.png b/assets/minecraft/textures/block/verdant_froglight_side.png index 6ca6224f..a1a195f7 100644 --- a/assets/minecraft/textures/block/verdant_froglight_side.png +++ b/assets/minecraft/textures/block/verdant_froglight_side.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b8c0d032dd57f1515c51e715884f3e0726f41462d7df06b682514ac1cc9339a8 -size 196 +oid sha256:12b395af9a70e38f47b5657143f18859b51c4db7362900569b68ef0eb1a62da3 +size 184 diff --git a/assets/minecraft/textures/block/verdant_froglight_top.png b/assets/minecraft/textures/block/verdant_froglight_top.png index 9a24b672..001856ff 100644 --- a/assets/minecraft/textures/block/verdant_froglight_top.png +++ b/assets/minecraft/textures/block/verdant_froglight_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e52f93a69b3e48b76948493b681a49c1a8452b5b383e57da5f59f3af76252477 -size 175 +oid sha256:795b5ae88fc8741cf997824d8a782ce23492d579f60838911c782624927f1bed +size 167 diff --git a/assets/minecraft/textures/block/vine.png b/assets/minecraft/textures/block/vine.png index a3733cec..f6383870 100644 --- a/assets/minecraft/textures/block/vine.png +++ b/assets/minecraft/textures/block/vine.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3143861d74df753ccb2556e3dd9c2488e1d7b53a1df94044edd941d61000024f -size 198 +oid sha256:5ca6b688ee8cce05df9d90a8d0f7bb669361ce27dba4a761dcb209819e0d232e +size 167 diff --git a/assets/minecraft/textures/block/warped_door_bottom.png b/assets/minecraft/textures/block/warped_door_bottom.png index 46379ec7..0b0c9b4e 100644 --- a/assets/minecraft/textures/block/warped_door_bottom.png +++ b/assets/minecraft/textures/block/warped_door_bottom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b50a4f4a3d00448c3f193e213d1a407e0fefd56fbb7136bc409bef5025ef65ca -size 245 +oid sha256:921e11c27b58133141ee47b2975f10d6dac7478dda9dafb118c16320d38d79ef +size 225 diff --git a/assets/minecraft/textures/block/warped_door_top.png b/assets/minecraft/textures/block/warped_door_top.png index 8dbb713a..06d992cc 100644 --- a/assets/minecraft/textures/block/warped_door_top.png +++ b/assets/minecraft/textures/block/warped_door_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4206b58ca7016504bd96368476aae5fcd2f6972d7be8fdd0b75ae895949e06f9 -size 247 +oid sha256:b6fa96907b5c871abba269da8876832428acc2e66cf84cc27b9fbf2007e4d5f0 +size 233 diff --git a/assets/minecraft/textures/block/warped_nylium_side.png b/assets/minecraft/textures/block/warped_nylium_side.png index fe2fa660..b592febd 100644 --- a/assets/minecraft/textures/block/warped_nylium_side.png +++ b/assets/minecraft/textures/block/warped_nylium_side.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4e9308fde8c007d9f9927bc5f33f221429bc580f3073b781b4b121a437d48aad -size 260 +oid sha256:287bf42b09a6dd86fde913ffd33a4d783965d2c426e861b9eaced0868b86c93b +size 241 diff --git a/assets/minecraft/textures/block/warped_planks.png b/assets/minecraft/textures/block/warped_planks.png index 8bbb3490..98ad88bb 100644 --- a/assets/minecraft/textures/block/warped_planks.png +++ b/assets/minecraft/textures/block/warped_planks.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:876688efbb4aefe700a8baea0c395b6a09d62c3b8d15a1836739b0273ce80f35 -size 202 +oid sha256:3a7da9c4a54eafaec07b50e474de8695a321401f5e5c1c3b435148056e94c2ea +size 195 diff --git a/assets/minecraft/textures/block/warped_roots.png b/assets/minecraft/textures/block/warped_roots.png index ef05c4e8..3fa6b755 100644 --- a/assets/minecraft/textures/block/warped_roots.png +++ b/assets/minecraft/textures/block/warped_roots.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aa3a0d6dac9de1e0465f2eaa30e31a54ff0ee545b2a4bf9fc130b381006dab20 -size 183 +oid sha256:c0552506988c59484507dcd0dcefeb386bbc1336c0cbc6d356034f84ab082c0c +size 178 diff --git a/assets/minecraft/textures/block/warped_roots_pot.png b/assets/minecraft/textures/block/warped_roots_pot.png index a21403c3..84a6f897 100644 --- a/assets/minecraft/textures/block/warped_roots_pot.png +++ b/assets/minecraft/textures/block/warped_roots_pot.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:601dc2d28527ea8c1cff6601a7b37d178f0ab72c4a4bc8ab8e635e0c8ffe7971 -size 177 +oid sha256:64e6d1490671dcdee904f1297ca87b79c6e39f2df6e1e63b58651ebdd777a8a5 +size 171 diff --git a/assets/minecraft/textures/block/warped_stem_top.png b/assets/minecraft/textures/block/warped_stem_top.png index b7042eb4..6082a312 100644 --- a/assets/minecraft/textures/block/warped_stem_top.png +++ b/assets/minecraft/textures/block/warped_stem_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f45791dc66e19dedd63dac90f575166e49aa157b92d917603d78460b719ec11e -size 245 +oid sha256:38d30522fba32f42fd7e4bfa5c00f388fe83d33c3ee4ac4fc49d9601cab5701d +size 227 diff --git a/assets/minecraft/textures/block/warped_trapdoor.png b/assets/minecraft/textures/block/warped_trapdoor.png index 5f3e1c81..dfcfce93 100644 --- a/assets/minecraft/textures/block/warped_trapdoor.png +++ b/assets/minecraft/textures/block/warped_trapdoor.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c2a5c2a138857ce9008588e69917e48f0c173a60daae0ceb365ff6d4411fa3ee -size 231 +oid sha256:23b02d0bfb47a73c6b8de98520d95f6e598bac2a47ef244c44e2aa122a79c7b1 +size 221 diff --git a/assets/minecraft/textures/block/warped_wart_block.png b/assets/minecraft/textures/block/warped_wart_block.png index 67518cf4..b4961016 100644 --- a/assets/minecraft/textures/block/warped_wart_block.png +++ b/assets/minecraft/textures/block/warped_wart_block.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e9fa4d450fcd7fc535e275640578ab77d9ac8b4c12cf2da1237a82d63a6dea8e -size 181 +oid sha256:111cc8d6f5d3081a5f3db139a023c6be8f0a6d227cc09bb5a822e87a62a6cdfc +size 178 diff --git a/assets/minecraft/textures/block/water_flow.png b/assets/minecraft/textures/block/water_flow.png index ebe000e6..d13b3b4f 100644 --- a/assets/minecraft/textures/block/water_flow.png +++ b/assets/minecraft/textures/block/water_flow.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b53b424a188e5c4d5c586cb053950529cdca3333ecfd8b9587ab3cd3f7886991 -size 3244 +oid sha256:1d1f27fe65b12dea2ec8995f1955f0ac9c5efe60b9bc4322625217c205382981 +size 3162 diff --git a/assets/minecraft/textures/block/water_still.png b/assets/minecraft/textures/block/water_still.png index 4bc725cf..96c774e0 100644 --- a/assets/minecraft/textures/block/water_still.png +++ b/assets/minecraft/textures/block/water_still.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5843e8826507c484dfc15d5d255843d041804bcaa2036ed137320610d7fb9af7 -size 1513 +oid sha256:683df6ad9c23a50b7ce9323a5fe231aa79f94a63c6d750f3cf87a1fd44422551 +size 1481 diff --git a/assets/minecraft/textures/block/weathered_chiseled_copper.png b/assets/minecraft/textures/block/weathered_chiseled_copper.png index 1626e6ff..dfc254cd 100644 --- a/assets/minecraft/textures/block/weathered_chiseled_copper.png +++ b/assets/minecraft/textures/block/weathered_chiseled_copper.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4b666c31decc8bac93ef745f23fde88963e94add7ae6c3ae70a85dfd080f3c6b -size 216 +oid sha256:4dd6b8e7416efa95244df99ea544b8a7d1afde53d5abdbdddc8df532fa9078a1 +size 207 diff --git a/assets/minecraft/textures/block/weathered_copper.png b/assets/minecraft/textures/block/weathered_copper.png index 0aaf6e92..a939899b 100644 --- a/assets/minecraft/textures/block/weathered_copper.png +++ b/assets/minecraft/textures/block/weathered_copper.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:208b464ef219281c1074f14f7c660d0b975cb81f1b0885add90742b04109bab1 -size 220 +oid sha256:c41c28938fb64540576d5f607c87a2446a18bf8b78a388dbc5e147779925062a +size 203 diff --git a/assets/minecraft/textures/block/weathered_copper_bulb.png b/assets/minecraft/textures/block/weathered_copper_bulb.png index f0fdbb35..73ab5187 100644 --- a/assets/minecraft/textures/block/weathered_copper_bulb.png +++ b/assets/minecraft/textures/block/weathered_copper_bulb.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f4a52d9b39b6cf26c594e5c66541bdf97929b125a1ed5046c6e3a52fef1ce5ab -size 243 +oid sha256:d37361784b501cf70ab518a73bea8fdc197edfc4543a4a9b065ba24f91e22b35 +size 214 diff --git a/assets/minecraft/textures/block/weathered_copper_bulb_lit_powered.png b/assets/minecraft/textures/block/weathered_copper_bulb_lit_powered.png index ada9bf5c..b1e7c2ab 100644 --- a/assets/minecraft/textures/block/weathered_copper_bulb_lit_powered.png +++ b/assets/minecraft/textures/block/weathered_copper_bulb_lit_powered.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:173706a15e4699186e5c84dee7c8397c4302003e115ec7578084b92248d1ae8e -size 288 +oid sha256:0112e2eb9ab12a7a69f8ca3a9a2858172f62e921160e5187cad0cedec9c90e39 +size 283 diff --git a/assets/minecraft/textures/block/weathered_copper_bulb_powered.png b/assets/minecraft/textures/block/weathered_copper_bulb_powered.png index b23278c7..1113b1d3 100644 --- a/assets/minecraft/textures/block/weathered_copper_bulb_powered.png +++ b/assets/minecraft/textures/block/weathered_copper_bulb_powered.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1bf77f86d9f5e0460b8b4c01a97a9e14be1a51013b0ca02313787596950c3e18 -size 256 +oid sha256:a8cac86eb680d84ff55e631934f857e4bb924ec770edc58c2ee352163811503a +size 230 diff --git a/assets/minecraft/textures/block/weathered_copper_door_top.png b/assets/minecraft/textures/block/weathered_copper_door_top.png index f6542373..9a2c2cda 100644 --- a/assets/minecraft/textures/block/weathered_copper_door_top.png +++ b/assets/minecraft/textures/block/weathered_copper_door_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:76088be8d4e26c154254abb772fa757aebbb79180cacca654e4082d4e0c2693a -size 255 +oid sha256:4a5de133f06ec4d717e5901f4752dd756d0236cf90e67ccc167ffbc578fbc23f +size 240 diff --git a/assets/minecraft/textures/block/weathered_copper_grate.png b/assets/minecraft/textures/block/weathered_copper_grate.png index dc1b8731..58045afd 100644 --- a/assets/minecraft/textures/block/weathered_copper_grate.png +++ b/assets/minecraft/textures/block/weathered_copper_grate.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:33dbeb9bfb0bd16b7751565942c5ee02c05c3ccff9ca87be925a369142774a7f -size 241 +oid sha256:e563e75517a21184b21bafebc5dd7917e899ead563dfe3da46b8d750df8b36de +size 226 diff --git a/assets/minecraft/textures/block/weathered_copper_trapdoor.png b/assets/minecraft/textures/block/weathered_copper_trapdoor.png index d18647fd..b245e15b 100644 --- a/assets/minecraft/textures/block/weathered_copper_trapdoor.png +++ b/assets/minecraft/textures/block/weathered_copper_trapdoor.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6c4fe45bf1f81fcea8950e4939ccb8a574a8d51d7d2ee4052e06af48fe3485ce -size 244 +oid sha256:12c98b697150ac5bc7fc0be9f37f8eb99d01344a21f2a3a67f9c944e0901bf70 +size 227 diff --git a/assets/minecraft/textures/block/weathered_cut_copper.png b/assets/minecraft/textures/block/weathered_cut_copper.png index 7cba457e..bc2c157e 100644 --- a/assets/minecraft/textures/block/weathered_cut_copper.png +++ b/assets/minecraft/textures/block/weathered_cut_copper.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7a2a80690be9dedc1e49e705c4fad8acad2ac58a19b5db3a712213d0290693c8 -size 223 +oid sha256:7fe4ff5274baa27d40c0170a81d4ae5612e97f71e01a4a9d5d78ad96a5e2ea0c +size 201 diff --git a/assets/minecraft/textures/block/weeping_vines.png b/assets/minecraft/textures/block/weeping_vines.png index 8523683c..d207c02e 100644 --- a/assets/minecraft/textures/block/weeping_vines.png +++ b/assets/minecraft/textures/block/weeping_vines.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a12737e8ce0a7c5751ea07ea969b44eccd60fded03107d939c3f4a39f8dfb261 -size 122 +oid sha256:ba76d2a8ea6171592cacfb9ba85e4125d28d4df9aa8e31aee697d70489af9ee3 +size 120 diff --git a/assets/minecraft/textures/block/weeping_vines_plant.png b/assets/minecraft/textures/block/weeping_vines_plant.png index 7188fd16..f71a0faa 100644 --- a/assets/minecraft/textures/block/weeping_vines_plant.png +++ b/assets/minecraft/textures/block/weeping_vines_plant.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0ccdf16a850cd7f236eaa22e78157d7e5af7ce108ebef6ab5cbc536dbaaef931 -size 210 +oid sha256:f434e87b2cf7d483988684133d1ed4194c197e700ae295e425f22c1cd22602da +size 200 diff --git a/assets/minecraft/textures/block/wheat_stage0.png b/assets/minecraft/textures/block/wheat_stage0.png index 11fed8d7..c5d9370e 100644 --- a/assets/minecraft/textures/block/wheat_stage0.png +++ b/assets/minecraft/textures/block/wheat_stage0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ae5a6cc98ba0314867917833a51416e3493e4918fb73fba112b70e5d014c75a8 -size 150 +oid sha256:bd7aaf9666e414ca277c1aa33f491e48b0c2a0031a095bb7838a6ac3a0fd69cf +size 99 diff --git a/assets/minecraft/textures/block/wheat_stage1.png b/assets/minecraft/textures/block/wheat_stage1.png index 805c048f..75d2772f 100644 --- a/assets/minecraft/textures/block/wheat_stage1.png +++ b/assets/minecraft/textures/block/wheat_stage1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fc01c0896aecbd2fc2feae938bb44dc5ec8a38dd09bae8b1119b84d60d30d3f7 -size 125 +oid sha256:d8936a7633dd4c0e0be59b27c5feeddf70e8d9d17ece920a139edb31c11e4db4 +size 109 diff --git a/assets/minecraft/textures/block/wheat_stage2.png b/assets/minecraft/textures/block/wheat_stage2.png index 8d3cbd66..3a92733a 100644 --- a/assets/minecraft/textures/block/wheat_stage2.png +++ b/assets/minecraft/textures/block/wheat_stage2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c4cfac595f1358725e21b0394b71439c9f2d2e1511ecde12a72137eaf66471e -size 147 +oid sha256:921141204c89497a95a5536d8f9a93b25982e071ef1d21bef201700b95bdc0b5 +size 146 diff --git a/assets/minecraft/textures/block/wheat_stage5.png b/assets/minecraft/textures/block/wheat_stage5.png index 3b8e33d0..f1753537 100644 --- a/assets/minecraft/textures/block/wheat_stage5.png +++ b/assets/minecraft/textures/block/wheat_stage5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4b567ab69eb54164bbeada5c16f82877914f5d18d3290f9aa239dd1936e1075c -size 221 +oid sha256:5e787055f2026ed89824f05c298fcc60ea4601cc956fa2d36855938e8d56f967 +size 208 diff --git a/assets/minecraft/textures/block/wheat_stage6.png b/assets/minecraft/textures/block/wheat_stage6.png index 084db34a..7ce9fe86 100644 --- a/assets/minecraft/textures/block/wheat_stage6.png +++ b/assets/minecraft/textures/block/wheat_stage6.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6e3b0ec2ef00fe515477551964e8a0ce86454036862f4ef72598541b1c380fdb -size 219 +oid sha256:105a5fe7ad8ec6a27f45ae0ef128773837e8aeeaccbf360ffb4d9fb0e4bba29e +size 196 diff --git a/assets/minecraft/textures/block/wheat_stage7.png b/assets/minecraft/textures/block/wheat_stage7.png index f548b603..0969f931 100644 --- a/assets/minecraft/textures/block/wheat_stage7.png +++ b/assets/minecraft/textures/block/wheat_stage7.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3d8c251dd851f06cd019fb02b7f4ab666aa748251c79fb9562c32d2fbb799a0c -size 219 +oid sha256:4227ffd999af30ace7264ae92e50e396a4ecac5479d3c62b5647213acf9c9de6 +size 202 diff --git a/assets/minecraft/textures/block/white_candle.png b/assets/minecraft/textures/block/white_candle.png index acf95e3d..196ae7fd 100644 --- a/assets/minecraft/textures/block/white_candle.png +++ b/assets/minecraft/textures/block/white_candle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e8cdbaff108355f6cf06c2b9f3b4f97b42b177ace395e95cbfde1f287cb35d40 -size 126 +oid sha256:f8292c2b8f061fb084f7c6aa1072d98ea174f187ade97243f0a121d22a4bf20f +size 116 diff --git a/assets/minecraft/textures/block/white_candle_lit.png b/assets/minecraft/textures/block/white_candle_lit.png index 7ab5d575..78132fd8 100644 --- a/assets/minecraft/textures/block/white_candle_lit.png +++ b/assets/minecraft/textures/block/white_candle_lit.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d7961be1472e6889bbd534574fb57c9ffd6bcac03841ff9d692efb7cbdbd2bf -size 139 +oid sha256:e156c9e693f697d765b8c4e77e922241071b086fc145097c8a93b4325189c329 +size 138 diff --git a/assets/minecraft/textures/block/white_concrete.png b/assets/minecraft/textures/block/white_concrete.png index 1f693071..2be58368 100644 --- a/assets/minecraft/textures/block/white_concrete.png +++ b/assets/minecraft/textures/block/white_concrete.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2498f62595e4520d2168b0a446bd5d616bbdeeb41983708f7c12a88e69edd7de -size 182 +oid sha256:cf3300b0ebbdf5859a7ce14ca004d4529a3cd2e0de1c830acf00fb3dec8baea4 +size 177 diff --git a/assets/minecraft/textures/block/white_concrete_powder.png b/assets/minecraft/textures/block/white_concrete_powder.png index 79fc3770..e47c0670 100644 --- a/assets/minecraft/textures/block/white_concrete_powder.png +++ b/assets/minecraft/textures/block/white_concrete_powder.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fd02881ea84a0d44a23038818dc664673991fdce88803e93e455998c3b86bd69 -size 555 +oid sha256:7805b346830ca650ec64033cc1444625b292f99bf9b4e2d747fcbb1f7e30487d +size 550 diff --git a/assets/minecraft/textures/block/white_glazed_terracotta.png b/assets/minecraft/textures/block/white_glazed_terracotta.png index 98229a9c..4f3a379b 100644 --- a/assets/minecraft/textures/block/white_glazed_terracotta.png +++ b/assets/minecraft/textures/block/white_glazed_terracotta.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef7a95224b9c647f4183879d9d262422255b77fd5256b9fcf03ced0a2063cd1b -size 243 +oid sha256:cb1ebf9f3f3e93009ff4cab1b2b2b70d41fd87caa40c71942ae51996d12498b4 +size 231 diff --git a/assets/minecraft/textures/block/white_shulker_box.png b/assets/minecraft/textures/block/white_shulker_box.png index b7b84e3d..7b2a5b8a 100644 --- a/assets/minecraft/textures/block/white_shulker_box.png +++ b/assets/minecraft/textures/block/white_shulker_box.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:163b994d813ca7c14302d7a5cd1672a2edd1d64e0c4437329c7d1248a9d9fb7c -size 277 +oid sha256:c197ce57eafbc69a60e37c99d12d5681f41edb65cb73c08d8f475f80d153d7d4 +size 272 diff --git a/assets/minecraft/textures/block/white_stained_glass.png b/assets/minecraft/textures/block/white_stained_glass.png index 02d76c9d..d4a485ae 100644 --- a/assets/minecraft/textures/block/white_stained_glass.png +++ b/assets/minecraft/textures/block/white_stained_glass.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:696d5d7f921d0e39889c3e051e2cb9b1e740cbf9c1468ab8ff31bde854721693 -size 106 +oid sha256:2d4504957fa123a6e9f35d93e05f94fb053ec213541f01fcecbc0097eaa5df75 +size 100 diff --git a/assets/minecraft/textures/block/white_stained_glass_pane_top.png b/assets/minecraft/textures/block/white_stained_glass_pane_top.png index bca7179b..930de1c2 100644 --- a/assets/minecraft/textures/block/white_stained_glass_pane_top.png +++ b/assets/minecraft/textures/block/white_stained_glass_pane_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:08520aedf945012df41ede10e831a9f6c0173dbf06281e28ab2dcf83013296c2 -size 121 +oid sha256:713189b7085306fb5ba4a1be48f52931a78091084fea09db993f850b2c1212c9 +size 104 diff --git a/assets/minecraft/textures/block/white_terracotta.png b/assets/minecraft/textures/block/white_terracotta.png index cac330ba..b01aaa68 100644 --- a/assets/minecraft/textures/block/white_terracotta.png +++ b/assets/minecraft/textures/block/white_terracotta.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d226054984bbbafb9ab517747c5903f557e546e7aaa2e6c4e725e8ff3ffa4b3 -size 431 +oid sha256:9feeb13f19514ea58a5b6e942df7a8595330e61173f8d0a13c83b78acd1bd62e +size 422 diff --git a/assets/minecraft/textures/block/white_tulip.png b/assets/minecraft/textures/block/white_tulip.png index 307fe9bb..d52692bb 100644 --- a/assets/minecraft/textures/block/white_tulip.png +++ b/assets/minecraft/textures/block/white_tulip.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0814e0d24cc7e725455d4a91198681b401e5c6e6a6a0f764392b489de606ced2 -size 188 +oid sha256:128c49e84a5a486aa79206d04423f7393c4934c0b80447e022ed5c89a03ffd04 +size 168 diff --git a/assets/minecraft/textures/block/white_wool.png b/assets/minecraft/textures/block/white_wool.png index 12e152c1..92543dfd 100644 --- a/assets/minecraft/textures/block/white_wool.png +++ b/assets/minecraft/textures/block/white_wool.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:66688395b5ddc7f413c2e91ffabd33abfc78e0a870ce0111c45d7d09d9b4e100 -size 392 +oid sha256:70c9c9a9901d71ef9a5a89ea2cc4bc0d99ff5e65f733d1467da8b92f746107a5 +size 390 diff --git a/assets/minecraft/textures/block/wildflowers.png b/assets/minecraft/textures/block/wildflowers.png index ed81c2cb..ed5453aa 100644 --- a/assets/minecraft/textures/block/wildflowers.png +++ b/assets/minecraft/textures/block/wildflowers.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:229760ea01b4ed04469c32fe16d04a966ca6e3df9616f4eead5126a6138d2c7f -size 192 +oid sha256:b5105f8ae7b1903b835e4d312898f4f2b57e60bae91bc7a33e7a362c8d909145 +size 187 diff --git a/assets/minecraft/textures/block/wither_rose.png b/assets/minecraft/textures/block/wither_rose.png index 1e2b79a1..71dec87a 100644 --- a/assets/minecraft/textures/block/wither_rose.png +++ b/assets/minecraft/textures/block/wither_rose.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:64aa2adb9b6fcac36f3679c94373558007d337764c66a18095f58783591cd738 -size 182 +oid sha256:08b7c6395603ded11963a7e0bf6dccbb5a366e8843ab615d6fe98f9f3d47a697 +size 171 diff --git a/assets/minecraft/textures/block/yellow_candle.png b/assets/minecraft/textures/block/yellow_candle.png index 40c9fa56..b4841b4d 100644 --- a/assets/minecraft/textures/block/yellow_candle.png +++ b/assets/minecraft/textures/block/yellow_candle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:91c76bc469c6ff09714f9b717e78f8f1fbc7ad27ef1c81a093cb08c04c77abb3 -size 127 +oid sha256:f856343212bf719d2408d6429698149e37c55e0837dff1168e0b24b16d28607b +size 118 diff --git a/assets/minecraft/textures/block/yellow_candle_lit.png b/assets/minecraft/textures/block/yellow_candle_lit.png index 28897c87..2f63d342 100644 --- a/assets/minecraft/textures/block/yellow_candle_lit.png +++ b/assets/minecraft/textures/block/yellow_candle_lit.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:026139b6b3f9c178e89d81c857aff4b4d120dc98a66e922bfc9459da790be228 -size 138 +oid sha256:fbf41b9e6cfdb08beb404d8db16808c7b72230e453910ac9523e3ab77274fdd8 +size 137 diff --git a/assets/minecraft/textures/block/yellow_concrete.png b/assets/minecraft/textures/block/yellow_concrete.png index eda1d0a2..da524a35 100644 --- a/assets/minecraft/textures/block/yellow_concrete.png +++ b/assets/minecraft/textures/block/yellow_concrete.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6d84546da37093e0142702163863bb130dbaa49acd82a4ad0978288fb90cc07a -size 245 +oid sha256:c66ed9653baf4abb311cd41a2acc444fe7139355259e12aed79a511723c69367 +size 227 diff --git a/assets/minecraft/textures/block/yellow_glazed_terracotta.png b/assets/minecraft/textures/block/yellow_glazed_terracotta.png index 6398553b..a8d8489a 100644 --- a/assets/minecraft/textures/block/yellow_glazed_terracotta.png +++ b/assets/minecraft/textures/block/yellow_glazed_terracotta.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:50193c6c177489c25779f0c23e6de35613a85cc90db8512e06c1cb84dec2718f -size 262 +oid sha256:dbdf7b9b4d927163cad8878f985ea15598c397e22d332f37cd0b8099efbbb989 +size 245 diff --git a/assets/minecraft/textures/block/yellow_shulker_box.png b/assets/minecraft/textures/block/yellow_shulker_box.png index f8ff083f..76c42837 100644 --- a/assets/minecraft/textures/block/yellow_shulker_box.png +++ b/assets/minecraft/textures/block/yellow_shulker_box.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bf448037656e4002d5949bd888281f0013b6633b50272e3617340169cf869e86 -size 285 +oid sha256:b07a8565a5508451a36dd314a1d9a1b7b878cd5de3f4d5cefa56ae3c2b374891 +size 282 diff --git a/assets/minecraft/textures/block/yellow_stained_glass_pane_top.png b/assets/minecraft/textures/block/yellow_stained_glass_pane_top.png index 78c027b7..a06f5f9b 100644 --- a/assets/minecraft/textures/block/yellow_stained_glass_pane_top.png +++ b/assets/minecraft/textures/block/yellow_stained_glass_pane_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c93fb666579b43cac1a1b7125b5e8beba993641dc1eda1a61081d160c7adc6ca -size 120 +oid sha256:ae558d8e6ba2986272ed70a1e3f7c5f5a883b57b6ca478d56c0d9255e13a8199 +size 118 diff --git a/assets/minecraft/textures/block/yellow_terracotta.png b/assets/minecraft/textures/block/yellow_terracotta.png index b2b428e2..a260b8d5 100644 --- a/assets/minecraft/textures/block/yellow_terracotta.png +++ b/assets/minecraft/textures/block/yellow_terracotta.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9a58331a3f4f0cc1f0d886510a11c62649b4ac20019e45a23b5ebf443c09e316 -size 469 +oid sha256:7c00bf901f78ad628a06335d47310a6b18c1419243d4150e32cdf01d51bafca6 +size 418 diff --git a/assets/minecraft/textures/block/yellow_wool.png b/assets/minecraft/textures/block/yellow_wool.png index 75faaf94..0b5aa621 100644 --- a/assets/minecraft/textures/block/yellow_wool.png +++ b/assets/minecraft/textures/block/yellow_wool.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:230b85ec19649ccf29d10d314aa68a04bf55f4bc435635144bad17aeb667a2ed -size 400 +oid sha256:cc77805bdc4ccb24d210ec65e304f1c367ae9e9ee0fed404ec99143bf62a2ef2 +size 398 diff --git a/assets/minecraft/textures/colormap/grass.png b/assets/minecraft/textures/colormap/grass.png index 93e82284..8fef3128 100644 --- a/assets/minecraft/textures/colormap/grass.png +++ b/assets/minecraft/textures/colormap/grass.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d55308b1c707bc239b4be80ea81dad927827b9010d62f23f34297a99bc1ea4d6 -size 5984 +oid sha256:6a7da1db5e76cdd74ba5c837afffc1f4ffa32442d7d087f3e1b414e590eb7486 +size 5930 diff --git a/assets/minecraft/textures/entity/allay/allay.png b/assets/minecraft/textures/entity/allay/allay.png index ae9de599..58526dd0 100644 --- a/assets/minecraft/textures/entity/allay/allay.png +++ b/assets/minecraft/textures/entity/allay/allay.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0cf5bbd580b1cf1817452450b88c8cf63a665b9430b65f48659873743c7a09bf -size 409 +oid sha256:214ffeee1d5723302b612fc7a4aaae82792e05280c25ec26371f7c550a74459a +size 408 diff --git a/assets/minecraft/textures/entity/armorstand/wood.png b/assets/minecraft/textures/entity/armorstand/wood.png index ac5e8578..ecd275c5 100644 --- a/assets/minecraft/textures/entity/armorstand/wood.png +++ b/assets/minecraft/textures/entity/armorstand/wood.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f35653a7918d5ee948e1772d7036a275ad5fa594c78afe83d04fcac0d0c99dbf -size 870 +oid sha256:eb0dc8fd65f60560c8945033c589d86093487925f0e86c1fd8dd1c20ce922261 +size 809 diff --git a/assets/minecraft/textures/entity/banner/base.png b/assets/minecraft/textures/entity/banner/base.png index 6889405b..0525c329 100644 --- a/assets/minecraft/textures/entity/banner/base.png +++ b/assets/minecraft/textures/entity/banner/base.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:718c554fdce36cca9ff8ec360cf8c238e268e82b9c294960d7127d27a12d81d5 -size 858 +oid sha256:ee3c0b5e0f0f54275369027901c08915c88c21e7a66c2632766f527e2e62151f +size 825 diff --git a/assets/minecraft/textures/entity/banner/border.png b/assets/minecraft/textures/entity/banner/border.png index 36bbe7ea..09537a3e 100644 --- a/assets/minecraft/textures/entity/banner/border.png +++ b/assets/minecraft/textures/entity/banner/border.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d4b95f6c8a42ebcad526ad903c5d4e2841700cac825ce28a90e5223ab90ebcfe -size 976 +oid sha256:79c03592d464320e25983f251626f6636b75f4a0d19f001c1b24ccc6cdc309f5 +size 636 diff --git a/assets/minecraft/textures/entity/banner/bricks.png b/assets/minecraft/textures/entity/banner/bricks.png index 04b40b5c..17af46e1 100644 --- a/assets/minecraft/textures/entity/banner/bricks.png +++ b/assets/minecraft/textures/entity/banner/bricks.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b1fbb88de345692a740b136eb62cebfb3845de5434b654f9343287422507a19f -size 1331 +oid sha256:9f6eed6b7c57c48521eea7389d4ff9924b1c0603b183bdfd93a7990fa9c7dd80 +size 949 diff --git a/assets/minecraft/textures/entity/banner/circle.png b/assets/minecraft/textures/entity/banner/circle.png index cd4c8004..bb1f9250 100644 --- a/assets/minecraft/textures/entity/banner/circle.png +++ b/assets/minecraft/textures/entity/banner/circle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:08e3a99c05feebe09969e01e3b768d0783b285e8c25c68a8137ba9b190694417 -size 1040 +oid sha256:0ef22f12d8bbafb985f5f8aa50e08748e9360801426523123a68b781376524a4 +size 266 diff --git a/assets/minecraft/textures/entity/banner/creeper.png b/assets/minecraft/textures/entity/banner/creeper.png index c25afeb6..8b405902 100644 --- a/assets/minecraft/textures/entity/banner/creeper.png +++ b/assets/minecraft/textures/entity/banner/creeper.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:06bb1239b9177415efe831a6ff76e53578486780f63e42b1a14207c1b1fd23cf -size 1068 +oid sha256:bf45fa3a5648403195a030275a7650df5b23914d0736ec2e39b13fabfb21bab7 +size 345 diff --git a/assets/minecraft/textures/entity/banner/cross.png b/assets/minecraft/textures/entity/banner/cross.png index f39012a4..fb28b426 100644 --- a/assets/minecraft/textures/entity/banner/cross.png +++ b/assets/minecraft/textures/entity/banner/cross.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:65e44f15bd8148b6cdc8b2b0be3437644115d3d5a39e078b966bafd6e4605245 -size 1221 +oid sha256:cf875100e2e50b991b05abcf27c3118e2026b4cd18a9837674e62a883efa805a +size 754 diff --git a/assets/minecraft/textures/entity/banner/curly_border.png b/assets/minecraft/textures/entity/banner/curly_border.png index d527eaa7..1404b68b 100644 --- a/assets/minecraft/textures/entity/banner/curly_border.png +++ b/assets/minecraft/textures/entity/banner/curly_border.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e0fc07e77c5bed810ee1f2616dba6f3253b09acecff98be1a354bccdff187c65 -size 1226 +oid sha256:895eff8ed70aa012f9321563ff4ad060c921861d5a78c58fbae459cb0359a326 +size 836 diff --git a/assets/minecraft/textures/entity/banner/diagonal_left.png b/assets/minecraft/textures/entity/banner/diagonal_left.png index 072f5f7b..42852774 100644 --- a/assets/minecraft/textures/entity/banner/diagonal_left.png +++ b/assets/minecraft/textures/entity/banner/diagonal_left.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:99019254ede9b8dd20397445836003e8941558d48c151548f355c7fb1481cc0d -size 1033 +oid sha256:cd0cd3ab15553ab20df9973bb4e26595a053d3c39062228fd76b5211702955e2 +size 664 diff --git a/assets/minecraft/textures/entity/banner/diagonal_right.png b/assets/minecraft/textures/entity/banner/diagonal_right.png index 030b50fe..bdd0c7aa 100644 --- a/assets/minecraft/textures/entity/banner/diagonal_right.png +++ b/assets/minecraft/textures/entity/banner/diagonal_right.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:644d9c461f73e98516b6aead03036399cec7a68d65419d8f4d1b5d60d4874142 -size 1030 +oid sha256:81eda9d1e36573512c958ffc7cc3adf16ac1f299822cc91e305294dcb14ad0ab +size 646 diff --git a/assets/minecraft/textures/entity/banner/diagonal_up_left.png b/assets/minecraft/textures/entity/banner/diagonal_up_left.png index 1cb9648a..0b6c892b 100644 --- a/assets/minecraft/textures/entity/banner/diagonal_up_left.png +++ b/assets/minecraft/textures/entity/banner/diagonal_up_left.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:49aa26303e46f51c86c63a135cbb94ce3a16f7fa264c965e4954732b83ff9735 -size 1041 +oid sha256:2f2c4f4de9e5e93169f3382bd0b032a33325e80f2d650df645b399689315fc38 +size 714 diff --git a/assets/minecraft/textures/entity/banner/diagonal_up_right.png b/assets/minecraft/textures/entity/banner/diagonal_up_right.png index 9921059b..da919e08 100644 --- a/assets/minecraft/textures/entity/banner/diagonal_up_right.png +++ b/assets/minecraft/textures/entity/banner/diagonal_up_right.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:78f2d14ec4d1ad95dc1b7d7ec336e7195873be41d95619537001792e0fc83233 -size 1036 +oid sha256:f7eeb424baefad4f46b6c1e12e4a1f55ef3b4d3950dcd16e2b627215f93a2f6b +size 701 diff --git a/assets/minecraft/textures/entity/banner/flower.png b/assets/minecraft/textures/entity/banner/flower.png index e46fb119..6608ae85 100644 --- a/assets/minecraft/textures/entity/banner/flower.png +++ b/assets/minecraft/textures/entity/banner/flower.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:911d6cb5a1287dcb7ecdf11cae8b068daaeb915c1e5c3b026e4c166c9add60f1 -size 1200 +oid sha256:75509c57d8c3a0f54e05a528b6d78cd1cb0b90824deff87d2a77be73e5a1ba7a +size 483 diff --git a/assets/minecraft/textures/entity/banner/globe.png b/assets/minecraft/textures/entity/banner/globe.png index 141e2d8f..aaa54d53 100644 --- a/assets/minecraft/textures/entity/banner/globe.png +++ b/assets/minecraft/textures/entity/banner/globe.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:96b60ceb6c1d8bc4845713547d7562e98cffc52a8ab274a112ad2b29da0fb484 -size 1122 +oid sha256:d0f2e381e978a91188df7d42d7af6ce214846f27b4c638eb18d46ab53d41f981 +size 423 diff --git a/assets/minecraft/textures/entity/banner/gradient.png b/assets/minecraft/textures/entity/banner/gradient.png index ece275af..06cc8437 100644 --- a/assets/minecraft/textures/entity/banner/gradient.png +++ b/assets/minecraft/textures/entity/banner/gradient.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c93ebaa3884ad7da67a1d45fe28a0d7f5108c824485b46e2730c27ee017bd6cc -size 1401 +oid sha256:6a1eabaceb47452274116db737e71a36d3c1077393e494c028301f042cc167c6 +size 1297 diff --git a/assets/minecraft/textures/entity/banner/gradient_up.png b/assets/minecraft/textures/entity/banner/gradient_up.png index 82f25df4..cc08ac7f 100644 --- a/assets/minecraft/textures/entity/banner/gradient_up.png +++ b/assets/minecraft/textures/entity/banner/gradient_up.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:40c1eb7a5beeed4cd9179f5aa2d19996448f7f8d563f9aadbe4c700ba3e59b7f -size 1405 +oid sha256:8c1ae3abc4eb8051e2cd1dbef122b5b9f48a4f08e8e4d13f900d8e1474303eb1 +size 1311 diff --git a/assets/minecraft/textures/entity/banner/half_horizontal.png b/assets/minecraft/textures/entity/banner/half_horizontal.png index d216c39b..6b9491df 100644 --- a/assets/minecraft/textures/entity/banner/half_horizontal.png +++ b/assets/minecraft/textures/entity/banner/half_horizontal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9140c09d38c9fc9372003ba3c135391542f5b11a0eadc97aab311bd9843b29d8 -size 960 +oid sha256:06d219e8b54db5e51b23627acde0883f5a7774a22f24e0dcb02542f11b334872 +size 537 diff --git a/assets/minecraft/textures/entity/banner/half_horizontal_bottom.png b/assets/minecraft/textures/entity/banner/half_horizontal_bottom.png index 96c47f92..35d4d263 100644 --- a/assets/minecraft/textures/entity/banner/half_horizontal_bottom.png +++ b/assets/minecraft/textures/entity/banner/half_horizontal_bottom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5657face7c7b1478a7f8b74a2e4df0ccf47dcea6377929d81abc8c1c18137ace -size 964 +oid sha256:61e8cce97c8d56890d7a43ce0181c65dde76a5d6e8e6baa10edfaff348d6c011 +size 583 diff --git a/assets/minecraft/textures/entity/banner/half_vertical.png b/assets/minecraft/textures/entity/banner/half_vertical.png index f1977f83..78cfa175 100644 --- a/assets/minecraft/textures/entity/banner/half_vertical.png +++ b/assets/minecraft/textures/entity/banner/half_vertical.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:427dd02fa2b45c3793db38bf6392d6eeb81774df9bd00450a34d92f0f21402aa -size 961 +oid sha256:b1ec2284480f473982585808b509ad5383d9adac85d53962061a5eb87a9646a1 +size 618 diff --git a/assets/minecraft/textures/entity/banner/half_vertical_right.png b/assets/minecraft/textures/entity/banner/half_vertical_right.png index b4bcd6d9..80f47ede 100644 --- a/assets/minecraft/textures/entity/banner/half_vertical_right.png +++ b/assets/minecraft/textures/entity/banner/half_vertical_right.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e89134c75946dcd66b8e6d192fac740bae1cbb271b975a1ad150e6214f8f69fa -size 954 +oid sha256:0171dbb917630e83eccd79e605300fdd53ea272ae00e04fa2f81920758a54045 +size 577 diff --git a/assets/minecraft/textures/entity/banner/mojang.png b/assets/minecraft/textures/entity/banner/mojang.png index e3ed8f5a..76712f41 100644 --- a/assets/minecraft/textures/entity/banner/mojang.png +++ b/assets/minecraft/textures/entity/banner/mojang.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a56fd5e3ff9f4bc2d9233967ac5a83f3626b15ead93fb810a98b39d0dfab9a0a -size 1124 +oid sha256:3be145625f7c0278f9bfdbc5c520604aeb1f5be5f2d7a3f1435c3a5d129d9596 +size 361 diff --git a/assets/minecraft/textures/entity/banner/rhombus.png b/assets/minecraft/textures/entity/banner/rhombus.png index f1f1a9be..d422e5c7 100644 --- a/assets/minecraft/textures/entity/banner/rhombus.png +++ b/assets/minecraft/textures/entity/banner/rhombus.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6937d42d5855288194e75a962e5fa03a93a32b0e7015fbc5ee12769e0b1813b6 -size 1046 +oid sha256:f3d6f4dc7b7c1c3ac28ec1bbe008a3a4376cf3be2320738f1fcdf39b7ab9ced8 +size 382 diff --git a/assets/minecraft/textures/entity/banner/skull.png b/assets/minecraft/textures/entity/banner/skull.png index 7d6e1b8d..97ab752f 100644 --- a/assets/minecraft/textures/entity/banner/skull.png +++ b/assets/minecraft/textures/entity/banner/skull.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6cc42d8b1b2cdaf37ce74ee24a8f9176d99f6b69709af81fa7a7199c64719ec9 -size 1201 +oid sha256:41123324c51dbe01fed416b60f76019ab0118f480f771a929e31e548eff5e4b8 +size 437 diff --git a/assets/minecraft/textures/entity/banner/small_stripes.png b/assets/minecraft/textures/entity/banner/small_stripes.png index 583abc7f..3846aafd 100644 --- a/assets/minecraft/textures/entity/banner/small_stripes.png +++ b/assets/minecraft/textures/entity/banner/small_stripes.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c9a9e313c0655ad14f2657d1f349dcfa7ad84f8d42656ac225f23d02437eee49 -size 1015 +oid sha256:cf09fb2075ed18024a2350d05a4484136c51551711023dffa389b0d5f1750254 +size 678 diff --git a/assets/minecraft/textures/entity/banner/square_bottom_left.png b/assets/minecraft/textures/entity/banner/square_bottom_left.png index aa43c58d..1a787e81 100644 --- a/assets/minecraft/textures/entity/banner/square_bottom_left.png +++ b/assets/minecraft/textures/entity/banner/square_bottom_left.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2af13e4478264fe32ba7604205f8b8d4f30a5eec1ed245227a76d8d7f18abd72 -size 964 +oid sha256:3822704b6e72c4c6a73f104da75c2d818738a6161c156da58f59cda1d23d7c47 +size 318 diff --git a/assets/minecraft/textures/entity/banner/square_bottom_right.png b/assets/minecraft/textures/entity/banner/square_bottom_right.png index 65abea48..3810b1bd 100644 --- a/assets/minecraft/textures/entity/banner/square_bottom_right.png +++ b/assets/minecraft/textures/entity/banner/square_bottom_right.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f1e198b571a11eb8a10efabf3d27da7719049af27cda3c388366f40cb91a4a25 -size 957 +oid sha256:3da6fc80fac8402d75f1b29da313d3d131eb16ab1cfd5acb371c57a5e8f073fe +size 320 diff --git a/assets/minecraft/textures/entity/banner/square_top_left.png b/assets/minecraft/textures/entity/banner/square_top_left.png index 763100e8..ef30c6e4 100644 --- a/assets/minecraft/textures/entity/banner/square_top_left.png +++ b/assets/minecraft/textures/entity/banner/square_top_left.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fabc0a7709e9d8bdb3edb2daa0ddbef7490a4f1bf5f6bb71d961738d060d9f8e -size 980 +oid sha256:f4ba5bb6d0b53dc3d01ee55264291cf34621eba92afc137963b22afc933e70d6 +size 292 diff --git a/assets/minecraft/textures/entity/banner/square_top_right.png b/assets/minecraft/textures/entity/banner/square_top_right.png index 17c3f3bf..6d2d900c 100644 --- a/assets/minecraft/textures/entity/banner/square_top_right.png +++ b/assets/minecraft/textures/entity/banner/square_top_right.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:badc5adc26b424816b1fc1cd1eadc7d6e7a5e6879d8b837eebec6f0b36005936 -size 965 +oid sha256:3ecff2fec6a59fea68bc50b14cf4e1246bd9f9647414861b21b284a63e5f3fef +size 294 diff --git a/assets/minecraft/textures/entity/banner/straight_cross.png b/assets/minecraft/textures/entity/banner/straight_cross.png index 1430f5b3..4d5b2bcb 100644 --- a/assets/minecraft/textures/entity/banner/straight_cross.png +++ b/assets/minecraft/textures/entity/banner/straight_cross.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4aaddff6304be773afda19df337020b37c3c9055e3aad60aacd5c530313cc557 -size 1007 +oid sha256:4a26be7a1a9b463647e137d3a851ec7c107b7978b62817a5bd1cdc2f3e880f97 +size 426 diff --git a/assets/minecraft/textures/entity/banner/stripe_bottom.png b/assets/minecraft/textures/entity/banner/stripe_bottom.png index d6d55ee9..268a431b 100644 --- a/assets/minecraft/textures/entity/banner/stripe_bottom.png +++ b/assets/minecraft/textures/entity/banner/stripe_bottom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:299d76e4900f73ff0e23df260d8e4b94f41a283d58cf846a040ae6d5b184f0be -size 953 +oid sha256:bcc2c1d21d61217b77118804ccc72eb0c15fe0053106df3a3ea2f031273809be +size 475 diff --git a/assets/minecraft/textures/entity/banner/stripe_center.png b/assets/minecraft/textures/entity/banner/stripe_center.png index fc398599..28c83a56 100644 --- a/assets/minecraft/textures/entity/banner/stripe_center.png +++ b/assets/minecraft/textures/entity/banner/stripe_center.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:76265a35c724582b1645836d15a9b478067915f8e47935d7102c5cda256692ee -size 966 +oid sha256:4bf8dab0f57cd3d7d4818170289306388d8b68f1d5e075d5fa2f8973ffe65105 +size 419 diff --git a/assets/minecraft/textures/entity/banner/stripe_downleft.png b/assets/minecraft/textures/entity/banner/stripe_downleft.png index ab9ac17e..5f458e78 100644 --- a/assets/minecraft/textures/entity/banner/stripe_downleft.png +++ b/assets/minecraft/textures/entity/banner/stripe_downleft.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c5a686ddb9f4608cfbfb3259cd06ddf53c89b55d812dd9f33355408d5b9a55d2 -size 1094 +oid sha256:8c6525294069f504b9735c257b6780ac69101c79f47ae755d6337dd58a3fa289 +size 570 diff --git a/assets/minecraft/textures/entity/banner/stripe_downright.png b/assets/minecraft/textures/entity/banner/stripe_downright.png index 8182204b..3864a100 100644 --- a/assets/minecraft/textures/entity/banner/stripe_downright.png +++ b/assets/minecraft/textures/entity/banner/stripe_downright.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c570f7ba52387544e761b35006d9597a74811843111da533ec70f0c2afd35434 -size 1094 +oid sha256:a4ff5dc4df8e267fd52963499a41616817b78b83f47274251bf4d8048eafeb38 +size 574 diff --git a/assets/minecraft/textures/entity/banner/stripe_left.png b/assets/minecraft/textures/entity/banner/stripe_left.png index cbbeb907..9384dd68 100644 --- a/assets/minecraft/textures/entity/banner/stripe_left.png +++ b/assets/minecraft/textures/entity/banner/stripe_left.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:158a50a946e6e9d054c854b2c58b4be713ae2c74ab5fa8cd5518ff1747da58e9 -size 957 +oid sha256:3ae032ae9d08e64c3fef70708be5bdcb01cde68145fc34be9d3a2ee1dc008579 +size 474 diff --git a/assets/minecraft/textures/entity/banner/stripe_middle.png b/assets/minecraft/textures/entity/banner/stripe_middle.png index 7abd07cf..a300bf25 100644 --- a/assets/minecraft/textures/entity/banner/stripe_middle.png +++ b/assets/minecraft/textures/entity/banner/stripe_middle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7598730f2bc3bdadec03a0a7b55fe4b8ec1ad0faf05e5fed275784f636a3da59 -size 954 +oid sha256:d6fbba923514fa62ae912ab11cdf44f871aee6968c3b1134d692a475ab65cbff +size 230 diff --git a/assets/minecraft/textures/entity/banner/stripe_right.png b/assets/minecraft/textures/entity/banner/stripe_right.png index 2c58a8bc..a2f59892 100644 --- a/assets/minecraft/textures/entity/banner/stripe_right.png +++ b/assets/minecraft/textures/entity/banner/stripe_right.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dab06bae3b2cdedaaf395aeb19df329e8e1143e2f0b57b808f121e2f69fa7db6 -size 961 +oid sha256:06a6ac514dc82843e8b91d6c37676c2b065eca6438971991955f276daa72ce54 +size 449 diff --git a/assets/minecraft/textures/entity/banner/stripe_top.png b/assets/minecraft/textures/entity/banner/stripe_top.png index 9bf385ad..dbe3b1e1 100644 --- a/assets/minecraft/textures/entity/banner/stripe_top.png +++ b/assets/minecraft/textures/entity/banner/stripe_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f2a0488b15aff78ed187d83578f22534f4e2b4c051d65500a61d8a1e7f0df2ce -size 951 +oid sha256:74bc00b15f17816fb21a775aabdc95945eb990433e0f6e1db00649d409b2906f +size 413 diff --git a/assets/minecraft/textures/entity/banner/triangle_bottom.png b/assets/minecraft/textures/entity/banner/triangle_bottom.png index e69c1b93..1539c429 100644 --- a/assets/minecraft/textures/entity/banner/triangle_bottom.png +++ b/assets/minecraft/textures/entity/banner/triangle_bottom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f3d8b4350c50b4dcc904a29b2cb318e504d2def6dd7ae2196658f0a1d0e48082 -size 1147 +oid sha256:30a7231731f8963997369d6d5162f2f15b990aaeb8d15ca6fc9c02c903266b04 +size 661 diff --git a/assets/minecraft/textures/entity/banner/triangle_top.png b/assets/minecraft/textures/entity/banner/triangle_top.png index 8c459694..c6972923 100644 --- a/assets/minecraft/textures/entity/banner/triangle_top.png +++ b/assets/minecraft/textures/entity/banner/triangle_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:62461a61dca0480c1d3c978a9438a08bd1f531bb0690fd9698bd192e83da1e74 -size 1076 +oid sha256:a85b822599e91053b9bbd92b1fe752d7bac8ecee38d7e9a865452998e7a938bf +size 465 diff --git a/assets/minecraft/textures/entity/banner/triangles_bottom.png b/assets/minecraft/textures/entity/banner/triangles_bottom.png index 453b815c..bcd2e08a 100644 --- a/assets/minecraft/textures/entity/banner/triangles_bottom.png +++ b/assets/minecraft/textures/entity/banner/triangles_bottom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:412044d7b91d2130b5b6511d12c05abbace9c4e370314ab34d24cefd48c9edf7 -size 1016 +oid sha256:71900cfd393cb00eb5d8b3b6e7bd4265c75a94d5e1931edc1f2119de0d854ea2 +size 359 diff --git a/assets/minecraft/textures/entity/banner/triangles_top.png b/assets/minecraft/textures/entity/banner/triangles_top.png index b4ba48f7..77cf1a2d 100644 --- a/assets/minecraft/textures/entity/banner/triangles_top.png +++ b/assets/minecraft/textures/entity/banner/triangles_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5245494f5a5ea332973eecc94ad8584175da79d2826ebef6ec77b69c009aa54b -size 1050 +oid sha256:f1c380cc614629e77f5008891c039328bd43cac62979e16ab26be492c9a7f9ee +size 312 diff --git a/assets/minecraft/textures/entity/banner_base.png b/assets/minecraft/textures/entity/banner_base.png index dab5cfd7..45f73565 100644 --- a/assets/minecraft/textures/entity/banner_base.png +++ b/assets/minecraft/textures/entity/banner_base.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3fba59dea17594d35da93b73b88fad7b57112f16ec902e4240791b39a47a9f56 -size 1168 +oid sha256:d5a92d84ed9a0c794eef7521f05a4525dcaf6eddaffa92353a1402213ace01a5 +size 1086 diff --git a/assets/minecraft/textures/entity/bat.png b/assets/minecraft/textures/entity/bat.png index 11d6321c..03eb99fe 100644 --- a/assets/minecraft/textures/entity/bat.png +++ b/assets/minecraft/textures/entity/bat.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e3281349dd9e9d39ca8cfbefd138e689e18d3327fb862070ea43909070c6241a -size 349 +oid sha256:6d13496ffff10bb9302825f0ba1845051f1d99246d873248a9686066ebdb8174 +size 329 diff --git a/assets/minecraft/textures/entity/bed/black.png b/assets/minecraft/textures/entity/bed/black.png index 7931400c..a8fccd19 100644 --- a/assets/minecraft/textures/entity/bed/black.png +++ b/assets/minecraft/textures/entity/bed/black.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3bb3e4144e08bc84f5f53403ba225179bff35787b21aa83afe7b104f4364ccb0 -size 853 +oid sha256:c7fc23c4fc2788dd882e31d32e145c09d163f1d02ff5439995953bf4721eea59 +size 778 diff --git a/assets/minecraft/textures/entity/bed/blue.png b/assets/minecraft/textures/entity/bed/blue.png index 881b6520..0f18b72c 100644 --- a/assets/minecraft/textures/entity/bed/blue.png +++ b/assets/minecraft/textures/entity/bed/blue.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:26089516016fcaa55c6e27b9e4dcc5349b35f4e83b87db45fa3c3abb9dfafc88 -size 892 +oid sha256:9945ef486a1a2adbc2c1d477ac322b6b6dd32caf074bbc7048495203dd909564 +size 760 diff --git a/assets/minecraft/textures/entity/bed/brown.png b/assets/minecraft/textures/entity/bed/brown.png index 87c14593..17f37aa8 100644 --- a/assets/minecraft/textures/entity/bed/brown.png +++ b/assets/minecraft/textures/entity/bed/brown.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c2dfd98749cfeaf1a780ba9a2d77476618cd0b2b7cf38dcc764810ed831789b2 -size 886 +oid sha256:bd1e8dd05eae8e978ad323dd12026d88434db47c8864fe172008dd7e89494ce6 +size 778 diff --git a/assets/minecraft/textures/entity/bed/cyan.png b/assets/minecraft/textures/entity/bed/cyan.png index 69b99196..fd8e1725 100644 --- a/assets/minecraft/textures/entity/bed/cyan.png +++ b/assets/minecraft/textures/entity/bed/cyan.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e33f356cc4b618b0243c6148ba4f3ad1c03df61e92bbf32270f6fbc754d653d5 -size 886 +oid sha256:0597e0fbe9783ecb4e366c42ed1fdf872d956dfba7c112e4d7cd7fff9c489949 +size 778 diff --git a/assets/minecraft/textures/entity/bed/gray.png b/assets/minecraft/textures/entity/bed/gray.png index 2779c96f..0d0b21be 100644 --- a/assets/minecraft/textures/entity/bed/gray.png +++ b/assets/minecraft/textures/entity/bed/gray.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:82dbc024d2cce67428eb2fa3081e7ed8085d3bb5a905016dfa13f20d1c943db9 -size 886 +oid sha256:89ca410585038c0dab6f45f91bda1cdfbb556e70d375373781a8cc9f703a1709 +size 778 diff --git a/assets/minecraft/textures/entity/bed/green.png b/assets/minecraft/textures/entity/bed/green.png index 7fe6ac4a..b36a4944 100644 --- a/assets/minecraft/textures/entity/bed/green.png +++ b/assets/minecraft/textures/entity/bed/green.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4aeac7fce60222f6a77abcf33843a393ac2861d4801a41b0261bc803a7054036 -size 884 +oid sha256:6bc62a61c5a5b316bcb8fc12f02d98960b623f532453633c2619a17c613d1700 +size 777 diff --git a/assets/minecraft/textures/entity/bed/light_blue.png b/assets/minecraft/textures/entity/bed/light_blue.png index 618e4ff1..36b44403 100644 --- a/assets/minecraft/textures/entity/bed/light_blue.png +++ b/assets/minecraft/textures/entity/bed/light_blue.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f1ab1cbdfddd3ee1059f77e64aea38d7d067a2a8e83b4cebfb3f374872847cf -size 885 +oid sha256:a7c255a0dabfaff1e6a02142f0a10487829e52ffa13b9c10c05ff19d155593b8 +size 778 diff --git a/assets/minecraft/textures/entity/bed/light_gray.png b/assets/minecraft/textures/entity/bed/light_gray.png index f0529a8d..1b7c0746 100644 --- a/assets/minecraft/textures/entity/bed/light_gray.png +++ b/assets/minecraft/textures/entity/bed/light_gray.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cabefddb62025b6c5188b322f30b1b36ac97813faa58bec720736bbc2d29b66e -size 882 +oid sha256:4b89bf57a5b1f12b48253be28d20137c82b7f10bb51a2e7a0ecf6ace70182f9c +size 778 diff --git a/assets/minecraft/textures/entity/bed/lime.png b/assets/minecraft/textures/entity/bed/lime.png index e58ef669..a8e60ab3 100644 --- a/assets/minecraft/textures/entity/bed/lime.png +++ b/assets/minecraft/textures/entity/bed/lime.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d125b081f8a161d27e1a9c9bb733587da93033a28712f78385d175b30ac2b905 -size 885 +oid sha256:11674975203749c2a6f829a84aa6693635bf037c175c615767a1dd68373b2ccb +size 778 diff --git a/assets/minecraft/textures/entity/bed/magenta.png b/assets/minecraft/textures/entity/bed/magenta.png index 40bd38a8..7131264a 100644 --- a/assets/minecraft/textures/entity/bed/magenta.png +++ b/assets/minecraft/textures/entity/bed/magenta.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:621d9981c618c8a2cac22fecb7e47e049f7637c26cca8e331317cc775974b177 -size 886 +oid sha256:193055c7c5185f8e3de9311127e81d85b1704abb772a6f381735341b73d61218 +size 778 diff --git a/assets/minecraft/textures/entity/bed/orange.png b/assets/minecraft/textures/entity/bed/orange.png index 25b347ec..5a2e2069 100644 --- a/assets/minecraft/textures/entity/bed/orange.png +++ b/assets/minecraft/textures/entity/bed/orange.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:73cd6d06066aaa6f69688f6e79d18e9625a7e2f42e3eef8d4fe73117cb24d667 -size 885 +oid sha256:6146802c41c2719324a79039d64577c9db95130ea5cfe98cc19576849f36b5e3 +size 778 diff --git a/assets/minecraft/textures/entity/bed/pink.png b/assets/minecraft/textures/entity/bed/pink.png index f315805e..b6ac618b 100644 --- a/assets/minecraft/textures/entity/bed/pink.png +++ b/assets/minecraft/textures/entity/bed/pink.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:64ab18ef5a78dd12df58b1ccf16d3e317e3fefefac080c39cf7163e1b5f660c7 -size 885 +oid sha256:95419fad7030acfea70ed50fa92c1cbf2a4f1b4b5d46fc2a59f70e26fdc5c073 +size 778 diff --git a/assets/minecraft/textures/entity/bed/purple.png b/assets/minecraft/textures/entity/bed/purple.png index d13afed9..19225fdc 100644 --- a/assets/minecraft/textures/entity/bed/purple.png +++ b/assets/minecraft/textures/entity/bed/purple.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:68d028b8f2fc61c00ef38affe53eaaf298742b0c6b5e2951e0540c0c64508ab4 -size 879 +oid sha256:bfb41f0b837e9eeab6dfe629169e9d5bff6e05d428b1fc3476b64fc0ac131027 +size 778 diff --git a/assets/minecraft/textures/entity/bed/red.png b/assets/minecraft/textures/entity/bed/red.png index d6a12ce9..683eb825 100644 --- a/assets/minecraft/textures/entity/bed/red.png +++ b/assets/minecraft/textures/entity/bed/red.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f2ec7ee54e7cea9d8d38105b77eb6c2003653131e409e3d3857065ba7554e1e -size 907 +oid sha256:5ba40b3f414166bfc04960792a0d1c42a1da865d66173de1accb12f0353896d3 +size 783 diff --git a/assets/minecraft/textures/entity/bed/white.png b/assets/minecraft/textures/entity/bed/white.png index cefa8fab..98b072b0 100644 --- a/assets/minecraft/textures/entity/bed/white.png +++ b/assets/minecraft/textures/entity/bed/white.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f4d83452753d887b349f2e9391165dac8b18a051e1d07b0c97c0f0d1318a247 -size 828 +oid sha256:1766cde4551a3d91f38628dafe0c76fbb6bf2bc3a8301e715b4a2d149cff980e +size 788 diff --git a/assets/minecraft/textures/entity/bed/yellow.png b/assets/minecraft/textures/entity/bed/yellow.png index be6f76ee..46b26427 100644 --- a/assets/minecraft/textures/entity/bed/yellow.png +++ b/assets/minecraft/textures/entity/bed/yellow.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1408a2aaa7055f0b6d6f89ace6c8bd279f22bf1456726d47fea1eec5134afe8a -size 872 +oid sha256:029ece878b462a3e40cadafa9413ae5dc0011ae132f9a080d608b2e189815ba7 +size 777 diff --git a/assets/minecraft/textures/entity/bee/bee_stinger.png b/assets/minecraft/textures/entity/bee/bee_stinger.png index ebf51be9..c293c9a1 100644 --- a/assets/minecraft/textures/entity/bee/bee_stinger.png +++ b/assets/minecraft/textures/entity/bee/bee_stinger.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3e45639f5b47203584dffdc69f0d2faf7567287e28c7f25ca003c1050971102f -size 101 +oid sha256:208459e57258c89154caf59014513c057478d416ad10207e7b5e8e99b02c8e63 +size 80 diff --git a/assets/minecraft/textures/entity/bell/bell_body.png b/assets/minecraft/textures/entity/bell/bell_body.png index 2698de7e..4c54b753 100644 --- a/assets/minecraft/textures/entity/bell/bell_body.png +++ b/assets/minecraft/textures/entity/bell/bell_body.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aed36f7f00f7fad294a13e2f349fd5b1a68960a50131a6194db68695168124af -size 329 +oid sha256:5e9f858c01847a8153602dc226699b26b5f06d21f925c38d06585916c76aef87 +size 261 diff --git a/assets/minecraft/textures/entity/boat/acacia.png b/assets/minecraft/textures/entity/boat/acacia.png index a43f773d..53785b11 100644 --- a/assets/minecraft/textures/entity/boat/acacia.png +++ b/assets/minecraft/textures/entity/boat/acacia.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f22fb6b9ed4fc0d26f7e704568eacaef89af4f66d83563c6cbc9347c348d7d14 -size 1084 +oid sha256:ba0c0720f6993575ce379bfa4c3229d7b85ec73c6f38d96ffec37d1770cfd558 +size 1057 diff --git a/assets/minecraft/textures/entity/boat/birch.png b/assets/minecraft/textures/entity/boat/birch.png index 95919495..a726ed65 100644 --- a/assets/minecraft/textures/entity/boat/birch.png +++ b/assets/minecraft/textures/entity/boat/birch.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:831897c66a16d32e1ab97e03535b33692cff271959d65b9c002e73c1bcd6c20c -size 1084 +oid sha256:90e112de4e107a4fb2c2de3926e8872751c3d50edd60618c40bb380d6593207e +size 1057 diff --git a/assets/minecraft/textures/entity/boat/cherry.png b/assets/minecraft/textures/entity/boat/cherry.png index d2949d84..09a8e960 100644 --- a/assets/minecraft/textures/entity/boat/cherry.png +++ b/assets/minecraft/textures/entity/boat/cherry.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:404b7914b03aea98f7b9e6cc17edab19742f28d5d88bf55e679beccf720d6cc0 -size 1084 +oid sha256:1621592f4cb165cdc7c1c1bb3ff16ccc294db7a26edd8563504165da092db02e +size 1057 diff --git a/assets/minecraft/textures/entity/boat/dark_oak.png b/assets/minecraft/textures/entity/boat/dark_oak.png index 8636093c..5a79de90 100644 --- a/assets/minecraft/textures/entity/boat/dark_oak.png +++ b/assets/minecraft/textures/entity/boat/dark_oak.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f033b0c0f681d7627cf84b9e72936cfcb9bb1194ae75473b1a21ff4329fd24aa -size 1084 +oid sha256:ed6fd2067aae3454e7b7349fbaeecc5d51c1c02ba64a6f23c251ea41e9e9df3f +size 1057 diff --git a/assets/minecraft/textures/entity/boat/jungle.png b/assets/minecraft/textures/entity/boat/jungle.png index d4a385c5..4f279423 100644 --- a/assets/minecraft/textures/entity/boat/jungle.png +++ b/assets/minecraft/textures/entity/boat/jungle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7eec39b035f0ae036f67b73c291adcab05bcf7e78e33f660278a1342721f1907 -size 1117 +oid sha256:d86ca4c35b124e72eb5cf1dab925a2626e15f8bc72d98fa4ce2a7436fbb0b9d0 +size 1073 diff --git a/assets/minecraft/textures/entity/boat/mangrove.png b/assets/minecraft/textures/entity/boat/mangrove.png index cfa7a780..4ddefe3d 100644 --- a/assets/minecraft/textures/entity/boat/mangrove.png +++ b/assets/minecraft/textures/entity/boat/mangrove.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:165dd0e51b2ef53c6d7cc866b66d2fba6e7fd950a9547662e9f95d05ce037faf -size 1084 +oid sha256:8c3375e7018b72fd3131a48f8a8922e47152d7a1799f46fcb96c1fefa74f0814 +size 1057 diff --git a/assets/minecraft/textures/entity/boat/oak.png b/assets/minecraft/textures/entity/boat/oak.png index bda22f39..fb58d5aa 100644 --- a/assets/minecraft/textures/entity/boat/oak.png +++ b/assets/minecraft/textures/entity/boat/oak.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5a6376463476293f06cea363b37864cade05d62b84403a75624b4206f70c9c70 -size 1084 +oid sha256:784673132d846fd5fe9f89d9cc5a8e4e9475611826fc69407ee4f21c9a969253 +size 1057 diff --git a/assets/minecraft/textures/entity/boat/spruce.png b/assets/minecraft/textures/entity/boat/spruce.png index a596dc08..a767200e 100644 --- a/assets/minecraft/textures/entity/boat/spruce.png +++ b/assets/minecraft/textures/entity/boat/spruce.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e090be0ddd60494017e2c4b57d1c1f3c52ec3652cd9b1add81e4b92a7a4c09ea -size 1084 +oid sha256:43bd4ed4789f1645dfb3f7aa32ee61b0ac3d9e94e8c575a4213f787c8943eb6e +size 1057 diff --git a/assets/minecraft/textures/entity/breeze/breeze_eyes.png b/assets/minecraft/textures/entity/breeze/breeze_eyes.png index 5220c7e5..0942d120 100644 --- a/assets/minecraft/textures/entity/breeze/breeze_eyes.png +++ b/assets/minecraft/textures/entity/breeze/breeze_eyes.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:495c6d6af939e5de3fb231bb91993bc32091095ac0e828b1e184d52338193a66 -size 141 +oid sha256:aa546385c5bb35e1d51520ba1430ea88f8a5e60ab326218e8cc6cfe70bf555c2 +size 139 diff --git a/assets/minecraft/textures/entity/camel/camel.png b/assets/minecraft/textures/entity/camel/camel.png index 86550d5b..a2b48783 100644 --- a/assets/minecraft/textures/entity/camel/camel.png +++ b/assets/minecraft/textures/entity/camel/camel.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c8364d5bb6b667c3e4fe8364aea1d707dcb93c93b9d45c942e619b3130a3451a -size 1752 +oid sha256:ed1df87688a74254685a84f642ee32dd85dc008a2f2e7cb294ac051431e9d536 +size 1651 diff --git a/assets/minecraft/textures/entity/cat/all_black.png b/assets/minecraft/textures/entity/cat/all_black.png index f1770e12..08a1841e 100644 --- a/assets/minecraft/textures/entity/cat/all_black.png +++ b/assets/minecraft/textures/entity/cat/all_black.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fa929be2ffb41e2f31fd37f43da0d26b01cfbce11a6ec7c7c4fbe3a01926b53d -size 570 +oid sha256:8f296d4342da5cbc6e20b8afd757d9d378ebef49f62066ec55f5e852f27dcea4 +size 402 diff --git a/assets/minecraft/textures/entity/cat/black.png b/assets/minecraft/textures/entity/cat/black.png index d5184580..1cf8a425 100644 --- a/assets/minecraft/textures/entity/cat/black.png +++ b/assets/minecraft/textures/entity/cat/black.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9e8801fd9478753875c3fe90559a6865f921d4fc2a4511b919b4240364b84966 -size 514 +oid sha256:1b298eab71782f9712443120ef127e58b9bb32c3e9862b155e61fa1f91d94adb +size 310 diff --git a/assets/minecraft/textures/entity/cat/british_shorthair.png b/assets/minecraft/textures/entity/cat/british_shorthair.png index 5b58b069..042dadb3 100644 --- a/assets/minecraft/textures/entity/cat/british_shorthair.png +++ b/assets/minecraft/textures/entity/cat/british_shorthair.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5efb692d991067bff8a21e0b9385af296c518594064edd8f0fa0208279028a05 -size 557 +oid sha256:e53e8ab8db2cf3f872322e3816366afc2648bc0b299efa55f35c4c13d59e8428 +size 401 diff --git a/assets/minecraft/textures/entity/cat/calico.png b/assets/minecraft/textures/entity/cat/calico.png index ec18f398..ff98854b 100644 --- a/assets/minecraft/textures/entity/cat/calico.png +++ b/assets/minecraft/textures/entity/cat/calico.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:edac39b948b4a869b5c927da3fb3426b603f5cf5d2a83c4aac45f73ae8dad390 -size 651 +oid sha256:bd86e74497c6ef71a47d3f462e0df3624919cb5aeed6b0a224c2a27c8f054492 +size 525 diff --git a/assets/minecraft/textures/entity/cat/cat_collar.png b/assets/minecraft/textures/entity/cat/cat_collar.png index eab62980..4ea12874 100644 --- a/assets/minecraft/textures/entity/cat/cat_collar.png +++ b/assets/minecraft/textures/entity/cat/cat_collar.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4c3c875515a2f990cc1c68b560ee17c7114926345b0d6b3808e9df5bd6c33ea2 -size 127 +oid sha256:3dc29901d7d7f8e17c803c0a5c6eb3b75d2d12b13284bca543648ae94a4e1660 +size 110 diff --git a/assets/minecraft/textures/entity/cat/jellie.png b/assets/minecraft/textures/entity/cat/jellie.png index 8ba6ed13..3fcc1502 100644 --- a/assets/minecraft/textures/entity/cat/jellie.png +++ b/assets/minecraft/textures/entity/cat/jellie.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fd0dc1114f07299fda40c6230ba066e79e3110c496bc74f49e95cae8078cddee -size 692 +oid sha256:8423eb3a9ce2e51464ff22854df98740bd65339b0ed2fb7edc2bc9c9ab330b9c +size 548 diff --git a/assets/minecraft/textures/entity/cat/ocelot.png b/assets/minecraft/textures/entity/cat/ocelot.png index 8c63e998..1341deb7 100644 --- a/assets/minecraft/textures/entity/cat/ocelot.png +++ b/assets/minecraft/textures/entity/cat/ocelot.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:96e8f5fbe5b482a4bdf9aa50a63572b4c2fb73a2d5249e1ff4947266acc2d4e9 -size 565 +oid sha256:3f39e74ae611571df7746a740d7693ef3a6d32785a0e2b3eee713a08d258289e +size 544 diff --git a/assets/minecraft/textures/entity/cat/persian.png b/assets/minecraft/textures/entity/cat/persian.png index ce1a534e..074c4cee 100644 --- a/assets/minecraft/textures/entity/cat/persian.png +++ b/assets/minecraft/textures/entity/cat/persian.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7ee1a836f2cb3bdefdcebc6e0ad9556c8d67e53156f8f5aadcbc54b5c67511d9 -size 540 +oid sha256:4104180ea8e142d85e85e987b05a8b9008469c019413d2f23e4aa5c7c3cb1d21 +size 378 diff --git a/assets/minecraft/textures/entity/cat/ragdoll.png b/assets/minecraft/textures/entity/cat/ragdoll.png index 66ea6bc2..4208d534 100644 --- a/assets/minecraft/textures/entity/cat/ragdoll.png +++ b/assets/minecraft/textures/entity/cat/ragdoll.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2f5f4ac35d38072fd7db81ea1dd9bb7590a23702ac4cbd57475c65b191f6e5d6 -size 591 +oid sha256:eba73118214924940e4883ec3ff9ec08a4cb2894eca4be7ff9105fc64e04d7a7 +size 413 diff --git a/assets/minecraft/textures/entity/cat/red.png b/assets/minecraft/textures/entity/cat/red.png index 7f4f82b8..2119c68b 100644 --- a/assets/minecraft/textures/entity/cat/red.png +++ b/assets/minecraft/textures/entity/cat/red.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5ee41a3b8cd1dc01af5875abd38d39bfef5a8c48f4709beab8be7e554d9f5a51 -size 819 +oid sha256:48d78eecc9bb6edd06954d57ef251fed3bfbd62d9f4bf24849a7e8b730789336 +size 563 diff --git a/assets/minecraft/textures/entity/cat/siamese.png b/assets/minecraft/textures/entity/cat/siamese.png index 5aaea1cf..4a02517b 100644 --- a/assets/minecraft/textures/entity/cat/siamese.png +++ b/assets/minecraft/textures/entity/cat/siamese.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9f5923dc8d87e1fdc46b3cb40548474ee7e1347ec0b02436933c652d8a50ee55 -size 630 +oid sha256:8a804c16fa22a35c9848b29cb59aa7529aa630aab3a371a10b46fd295db24ba1 +size 440 diff --git a/assets/minecraft/textures/entity/cat/tabby.png b/assets/minecraft/textures/entity/cat/tabby.png index 6358b76b..0acde086 100644 --- a/assets/minecraft/textures/entity/cat/tabby.png +++ b/assets/minecraft/textures/entity/cat/tabby.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a44a5f57d70f3ddff12b0ba55e67949e22abaae6379f6a37f3bbd3ee806a6a12 -size 681 +oid sha256:3a5871aefc771c1f2d83854d928857617382a3f5bf3d6af11c0193f30052c170 +size 530 diff --git a/assets/minecraft/textures/entity/cat/white.png b/assets/minecraft/textures/entity/cat/white.png index ce7da3f7..6a1e1761 100644 --- a/assets/minecraft/textures/entity/cat/white.png +++ b/assets/minecraft/textures/entity/cat/white.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1bf5677b026a67571e6e9cf8b39740010110db042505540328d3ab15c028fa9e -size 572 +oid sha256:e9fe0fdd8793887ea3f790e89c5db67d51708394fbb04f4459964097b60eed07 +size 405 diff --git a/assets/minecraft/textures/entity/chest/christmas_left.png b/assets/minecraft/textures/entity/chest/christmas_left.png index cccedb9b..032cb864 100644 --- a/assets/minecraft/textures/entity/chest/christmas_left.png +++ b/assets/minecraft/textures/entity/chest/christmas_left.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dc683ae21eb9545ec0b02c8b89b6b4770987836e9b9b929f4462f9eee738ae42 -size 1093 +oid sha256:8c9f027860c468433233e7d8471a6e74be236352add9a9f8acfae71e10277ff4 +size 1070 diff --git a/assets/minecraft/textures/entity/chest/christmas_right.png b/assets/minecraft/textures/entity/chest/christmas_right.png index 429494f6..49aeb433 100644 --- a/assets/minecraft/textures/entity/chest/christmas_right.png +++ b/assets/minecraft/textures/entity/chest/christmas_right.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:418c8055913be19438f320d32dca6dec554c6f8aa16553abf85f57ac1563f80b -size 1074 +oid sha256:134bb6a88a2331348b8da54a59972bc167efd7ab8682ecdefecc5b0c7fae519a +size 1050 diff --git a/assets/minecraft/textures/entity/chest/normal.png b/assets/minecraft/textures/entity/chest/normal.png index 169a936a..180357e6 100644 --- a/assets/minecraft/textures/entity/chest/normal.png +++ b/assets/minecraft/textures/entity/chest/normal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8603c2a1b21497835eda0b48c4d6271f5ae179e9407724b4c340053b8fd5e1e3 -size 840 +oid sha256:ab478534503430192b224ea4d5e1e87b6820198925bb7a7b4bd32f2a8a55c801 +size 811 diff --git a/assets/minecraft/textures/entity/chest/normal_left.png b/assets/minecraft/textures/entity/chest/normal_left.png index a7d97a0e..367b1afa 100644 --- a/assets/minecraft/textures/entity/chest/normal_left.png +++ b/assets/minecraft/textures/entity/chest/normal_left.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3ba7f3c64ccc095cc6fc739a1bdce1fa61e6f63e73b311a0d8c4855e27107493 -size 840 +oid sha256:960e43983efb31c1722c721f345705fe7e7c399ca4947567a98d499cab4ade55 +size 838 diff --git a/assets/minecraft/textures/entity/chest/normal_right.png b/assets/minecraft/textures/entity/chest/normal_right.png index 5d3700bc..6e245c21 100644 --- a/assets/minecraft/textures/entity/chest/normal_right.png +++ b/assets/minecraft/textures/entity/chest/normal_right.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:46e150f7baed240113a007f63760f4b0bfb24603a13cfacf22fe6745e54b16b9 -size 874 +oid sha256:d544bd2261941059eaabd9b002b5b6ca3208f78d75c40084ff5a4a7c673b8348 +size 873 diff --git a/assets/minecraft/textures/entity/chest/trapped.png b/assets/minecraft/textures/entity/chest/trapped.png index 3b212a55..cf3f5b85 100644 --- a/assets/minecraft/textures/entity/chest/trapped.png +++ b/assets/minecraft/textures/entity/chest/trapped.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f549821e36db97ed72aef81fe7adaed8bbd733f5869e1d4b342429032a7602b8 -size 905 +oid sha256:795716c8c9ce5a06c10776ec20ed20642282376ebecc39699a5b5ff409b2dc64 +size 903 diff --git a/assets/minecraft/textures/entity/chest/trapped_left.png b/assets/minecraft/textures/entity/chest/trapped_left.png index 8b718f10..6e3fcca0 100644 --- a/assets/minecraft/textures/entity/chest/trapped_left.png +++ b/assets/minecraft/textures/entity/chest/trapped_left.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:621005f6185cf72a998b82bdcb26974b0805323dd5ca58c43a5b6cee4193d596 -size 872 +oid sha256:a0608c4a780bda5fe64494dc2524a9f87b4dbae22769af38bf778de7bcc59ddc +size 869 diff --git a/assets/minecraft/textures/entity/chest/trapped_right.png b/assets/minecraft/textures/entity/chest/trapped_right.png index 906693cd..cbe0a36c 100644 --- a/assets/minecraft/textures/entity/chest/trapped_right.png +++ b/assets/minecraft/textures/entity/chest/trapped_right.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef8cab609e3b3f4e7b59eb03dd9f8eac35d57ee28df3d2593d1ff3850c743978 -size 908 +oid sha256:d1063a46cb97cb267a9fbf4090916fce4ac1e9de169c553bbb39146872eb32e0 +size 902 diff --git a/assets/minecraft/textures/entity/chest_boat/acacia.png b/assets/minecraft/textures/entity/chest_boat/acacia.png index 04cd49d9..90ca0687 100644 --- a/assets/minecraft/textures/entity/chest_boat/acacia.png +++ b/assets/minecraft/textures/entity/chest_boat/acacia.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ff9831abe562d97145f6ab990c3b7f82798819a09436cd5300e0ea99fbf8a71a -size 1975 +oid sha256:5c1d45ccd33b05113ce33c2a1647fb1be084762f29f2cecd3895d75a0e34db0d +size 1853 diff --git a/assets/minecraft/textures/entity/chest_boat/bamboo.png b/assets/minecraft/textures/entity/chest_boat/bamboo.png index 28f740b4..7f94c351 100644 --- a/assets/minecraft/textures/entity/chest_boat/bamboo.png +++ b/assets/minecraft/textures/entity/chest_boat/bamboo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6c1c20eb97ea68409b29dd1add04572982d63c6f88b32af96b4c19fb6fe4aec1 -size 1566 +oid sha256:694cc738b84d94b68de51b7317230cb39920e82102f42e785cb1fd2e464bc4b6 +size 1512 diff --git a/assets/minecraft/textures/entity/chest_boat/birch.png b/assets/minecraft/textures/entity/chest_boat/birch.png index ebae3dc5..b6087392 100644 --- a/assets/minecraft/textures/entity/chest_boat/birch.png +++ b/assets/minecraft/textures/entity/chest_boat/birch.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0d72be9360d72c3443a27200e1951e6c5bcda060dbd59246f38717113bd16eb1 -size 1927 +oid sha256:1173a6d59de7bcbf1731c8d1002329fee62c64133bf1518757dc498087aa3cea +size 1851 diff --git a/assets/minecraft/textures/entity/chest_boat/cherry.png b/assets/minecraft/textures/entity/chest_boat/cherry.png index 8a387e73..5ba0542a 100644 --- a/assets/minecraft/textures/entity/chest_boat/cherry.png +++ b/assets/minecraft/textures/entity/chest_boat/cherry.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6d6ed9d65b2c674c34d57d9f71e8cdd7226be63c2c9b880455d7d1eb141c6930 -size 1974 +oid sha256:4c9380f7267212ddc7e2f8365631cb074c3caa1362c771b3306bee993b3bf38f +size 1851 diff --git a/assets/minecraft/textures/entity/chest_boat/dark_oak.png b/assets/minecraft/textures/entity/chest_boat/dark_oak.png index 380487e2..752b1710 100644 --- a/assets/minecraft/textures/entity/chest_boat/dark_oak.png +++ b/assets/minecraft/textures/entity/chest_boat/dark_oak.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ae333470c7839dd2d9b390e91eaa9221095d5656183dacae52fc5095b6843190 -size 1974 +oid sha256:a75f3190593639443893ef6cfcf184806c0179e002743afffed6be1fcaee16cf +size 1852 diff --git a/assets/minecraft/textures/entity/chest_boat/jungle.png b/assets/minecraft/textures/entity/chest_boat/jungle.png index 0810a8dd..6f5acc1d 100644 --- a/assets/minecraft/textures/entity/chest_boat/jungle.png +++ b/assets/minecraft/textures/entity/chest_boat/jungle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f306f3e1a3aea46252acc9fea7c5917d06c833b4f50f4cd29a3e3f5f17062969 -size 1987 +oid sha256:05c69e7f31f035edb49c908fc4c325c1f25241c4ee96684173d6bc2f266ff5ed +size 1852 diff --git a/assets/minecraft/textures/entity/chest_boat/mangrove.png b/assets/minecraft/textures/entity/chest_boat/mangrove.png index 336f72b6..b7e14546 100644 --- a/assets/minecraft/textures/entity/chest_boat/mangrove.png +++ b/assets/minecraft/textures/entity/chest_boat/mangrove.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:05ebad520c5f411ce1e1a52e816660a5fca66b69edbc6b255e959b6046a2617b -size 1974 +oid sha256:a26a625082fa43dad43d8796c32ba3e80c7c6700277030a56f4176c9f1afb693 +size 1852 diff --git a/assets/minecraft/textures/entity/chest_boat/oak.png b/assets/minecraft/textures/entity/chest_boat/oak.png index d54bf2d6..00e4760d 100644 --- a/assets/minecraft/textures/entity/chest_boat/oak.png +++ b/assets/minecraft/textures/entity/chest_boat/oak.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e5fbd18d2c160b99dbe1be8e897388bd0d976e9e7d48220df2322ef82a219e65 -size 1974 +oid sha256:83ec5ce1098be728b173ba464b6934fbbece3b9d4a9a6fafd5389c4ab546a96e +size 1852 diff --git a/assets/minecraft/textures/entity/chest_boat/pale_oak.png b/assets/minecraft/textures/entity/chest_boat/pale_oak.png index 2faf9eba..eb7f309f 100644 --- a/assets/minecraft/textures/entity/chest_boat/pale_oak.png +++ b/assets/minecraft/textures/entity/chest_boat/pale_oak.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:74b77ebfb5c78e97771c825f5b9af6230a3647ec495f3649b0fca41deff6c0d3 -size 1927 +oid sha256:fe2dc53d7168a7ad83dbb076d47c4017e182c26465d52e5111dbe8a944e757b3 +size 1851 diff --git a/assets/minecraft/textures/entity/chest_boat/spruce.png b/assets/minecraft/textures/entity/chest_boat/spruce.png index ee5621c0..faf3bb12 100644 --- a/assets/minecraft/textures/entity/chest_boat/spruce.png +++ b/assets/minecraft/textures/entity/chest_boat/spruce.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b11d0ab74678e8a63f5c59aedb5982e8bfe21de03fed8ad388a7aa21918ad33f -size 1974 +oid sha256:d9a5e787be2935ade6b21fb81d8955a4100772d8868e19c0899baed1d9ff6bd1 +size 1852 diff --git a/assets/minecraft/textures/entity/chicken/cold_chicken.png b/assets/minecraft/textures/entity/chicken/cold_chicken.png index 32772094..2bb9cd45 100644 --- a/assets/minecraft/textures/entity/chicken/cold_chicken.png +++ b/assets/minecraft/textures/entity/chicken/cold_chicken.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bc5c80b547f5a1c0b70ef19c51543f5fb02853e4d45cdfca9407dd925bb50761 -size 502 +oid sha256:105197488637c8d999f1bbf7b99a88a31aa51da9aed5cc1d94604eb640a19aae +size 501 diff --git a/assets/minecraft/textures/entity/chicken/warm_chicken.png b/assets/minecraft/textures/entity/chicken/warm_chicken.png index aea49bc7..2cb95fe7 100644 --- a/assets/minecraft/textures/entity/chicken/warm_chicken.png +++ b/assets/minecraft/textures/entity/chicken/warm_chicken.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5643d6df418294ee65c5f1d7970927fd563d855c2ab534723fee946b69273f0b -size 414 +oid sha256:15f8e82ab8534bc52d328ecb6b522202ba914c43e5250bb698f5380a0648a3e3 +size 400 diff --git a/assets/minecraft/textures/entity/conduit/base.png b/assets/minecraft/textures/entity/conduit/base.png index 07ca7f7f..a67e5b20 100644 --- a/assets/minecraft/textures/entity/conduit/base.png +++ b/assets/minecraft/textures/entity/conduit/base.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:437ab3a3921b47c717233817afb6d09ba5e7a1050fdcc0133c29363015e909e6 -size 258 +oid sha256:52c0370563e72ae9251c3ee28c9a4a02ea193dd961f54f68de13475bdcbb3fe6 +size 233 diff --git a/assets/minecraft/textures/entity/conduit/break_particle.png b/assets/minecraft/textures/entity/conduit/break_particle.png index 9d2588fe..133a9302 100644 --- a/assets/minecraft/textures/entity/conduit/break_particle.png +++ b/assets/minecraft/textures/entity/conduit/break_particle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:63c97527a4d9539d180593eeb90ea82ef8fee46e409e09d18c2d3f4d2bf8a8f3 -size 205 +oid sha256:53587c945f4d94c5196753efb18e3e5c9ffb7bc19a4d9329a96fa811b6565221 +size 201 diff --git a/assets/minecraft/textures/entity/conduit/cage.png b/assets/minecraft/textures/entity/conduit/cage.png index 25bba3b7..7ea7ed40 100644 --- a/assets/minecraft/textures/entity/conduit/cage.png +++ b/assets/minecraft/textures/entity/conduit/cage.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6d5ce74bd1de832150a55db4c76916996b6880a73c3354661bbfbe33f8ae9b5f -size 372 +oid sha256:293501f8011c3ebbd59aed04b4580dba9514be125339648c45f15dadef30f437 +size 250 diff --git a/assets/minecraft/textures/entity/conduit/open_eye.png b/assets/minecraft/textures/entity/conduit/open_eye.png index fbb7a649..e3d4e62e 100644 --- a/assets/minecraft/textures/entity/conduit/open_eye.png +++ b/assets/minecraft/textures/entity/conduit/open_eye.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ac7202ae34958f1e2d6e22ff91705e49d85f2adbbbd9f93028abd818aaf75842 -size 195 +oid sha256:1608239a38143171429a2fb78d79d9c77f3e3d712b0450af2ace7796ce1f3ad2 +size 176 diff --git a/assets/minecraft/textures/entity/cow/brown_mooshroom.png b/assets/minecraft/textures/entity/cow/brown_mooshroom.png index c8918932..0869864b 100644 --- a/assets/minecraft/textures/entity/cow/brown_mooshroom.png +++ b/assets/minecraft/textures/entity/cow/brown_mooshroom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4dd50e641d3c8132c6b0d7575ff4db4f3c2d9e1db9d5442414d91a9dcd924ae2 -size 829 +oid sha256:91eb558117ebb6ca079d8fa4a45c6175681479f87832eb3a9842511d6e3c07cc +size 741 diff --git a/assets/minecraft/textures/entity/cow/cold_cow.png b/assets/minecraft/textures/entity/cow/cold_cow.png index 3c6957ad..dbabab02 100644 --- a/assets/minecraft/textures/entity/cow/cold_cow.png +++ b/assets/minecraft/textures/entity/cow/cold_cow.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:45282919f7b5b2b1f074a2036882e8d34d55c72ae2ecb313ad949ba6d750abc8 -size 977 +oid sha256:0a1f91a11bbc2b5e189d57b6b11911ace748d9c8d9e3e20e1b7f6d2ee25461e2 +size 976 diff --git a/assets/minecraft/textures/entity/cow/temperate_cow.png b/assets/minecraft/textures/entity/cow/temperate_cow.png index d0d597bf..dbce362b 100644 --- a/assets/minecraft/textures/entity/cow/temperate_cow.png +++ b/assets/minecraft/textures/entity/cow/temperate_cow.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:def74de776f7f28bd199dfc765bd0fabda18ce0339e70355f52d2dce42b0f93a -size 933 +oid sha256:5106c2676c70d64b2af4bc0792cb4adfa75cf587d05cc370ee7c6ca01465efdc +size 793 diff --git a/assets/minecraft/textures/entity/cow/warm_cow.png b/assets/minecraft/textures/entity/cow/warm_cow.png index e6d1d3d4..f2034770 100644 --- a/assets/minecraft/textures/entity/cow/warm_cow.png +++ b/assets/minecraft/textures/entity/cow/warm_cow.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d64a17aecc2d0dd37b5367ca89e5163ea70788052a3c00992bd6fc021f569ca0 -size 709 +oid sha256:8fd3561cb5f2291d85a36c0ace65b670937332862977af40091ec1f3f61987a1 +size 691 diff --git a/assets/minecraft/textures/entity/creeper/creeper.png b/assets/minecraft/textures/entity/creeper/creeper.png index 9c5c1f47..c57990e5 100644 --- a/assets/minecraft/textures/entity/creeper/creeper.png +++ b/assets/minecraft/textures/entity/creeper/creeper.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a98947a543623cedca72016e06aa24dc34807251ff8e2433be158c86a977c9e9 -size 2835 +oid sha256:e5f1cbe223f6838049e4632b250cad7b70c1d30e9717ad7bfe32912731887283 +size 2832 diff --git a/assets/minecraft/textures/entity/creeper/creeper_armor.png b/assets/minecraft/textures/entity/creeper/creeper_armor.png index c0fedd78..aa1c38ee 100644 --- a/assets/minecraft/textures/entity/creeper/creeper_armor.png +++ b/assets/minecraft/textures/entity/creeper/creeper_armor.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6aeb93bfc947d6ccf1e4dd101ff34fdffa276328a8c2514dd5298eb733dbca98 -size 1932 +oid sha256:de81c6f0075c20a487403acf38e6cdbcafc240a2cb7a66a4890917a5bb3df4cd +size 1295 diff --git a/assets/minecraft/textures/entity/decorated_pot/angler_pottery_pattern.png b/assets/minecraft/textures/entity/decorated_pot/angler_pottery_pattern.png index 99033b57..2bb6abcb 100644 --- a/assets/minecraft/textures/entity/decorated_pot/angler_pottery_pattern.png +++ b/assets/minecraft/textures/entity/decorated_pot/angler_pottery_pattern.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b2edd1fe6c95bb7b393cf095f362e3df2f1ad1cd8868fad88a11533dd77c60c1 -size 270 +oid sha256:166fc98c53b4dea30495c48842fa29ba48533f9e71f99fe3b5e92dd9ce345409 +size 239 diff --git a/assets/minecraft/textures/entity/decorated_pot/archer_pottery_pattern.png b/assets/minecraft/textures/entity/decorated_pot/archer_pottery_pattern.png index 44c1b4fe..9f69402b 100644 --- a/assets/minecraft/textures/entity/decorated_pot/archer_pottery_pattern.png +++ b/assets/minecraft/textures/entity/decorated_pot/archer_pottery_pattern.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fc51d7f0148cde5ca104cd6eff4de38aeebeb844458806f31b35cf34b7af15b1 -size 271 +oid sha256:fa884ebf83d73f0848599dd163ba13b2331edc77785b0e957e7eebc1e0f49032 +size 247 diff --git a/assets/minecraft/textures/entity/decorated_pot/arms_up_pottery_pattern.png b/assets/minecraft/textures/entity/decorated_pot/arms_up_pottery_pattern.png index 15215393..258e44cf 100644 --- a/assets/minecraft/textures/entity/decorated_pot/arms_up_pottery_pattern.png +++ b/assets/minecraft/textures/entity/decorated_pot/arms_up_pottery_pattern.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c9d624def73793df72d7b553e7dafe6d1a506cb5c2fa1d4e217a659b97d38e8d -size 256 +oid sha256:021c1281650399a98a6a45534c83220925cf9adc86d133df7949323af8e44980 +size 229 diff --git a/assets/minecraft/textures/entity/decorated_pot/blade_pottery_pattern.png b/assets/minecraft/textures/entity/decorated_pot/blade_pottery_pattern.png index 53ac0066..0343b636 100644 --- a/assets/minecraft/textures/entity/decorated_pot/blade_pottery_pattern.png +++ b/assets/minecraft/textures/entity/decorated_pot/blade_pottery_pattern.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:179b253c96bacfc762c69df226178dbcca5944936a387ff479b92835e944c352 -size 259 +oid sha256:5f0fb6e25762ae49199c81205ef2b69559fdd3b4ca96e875894315d22d1c71ee +size 235 diff --git a/assets/minecraft/textures/entity/decorated_pot/brewer_pottery_pattern.png b/assets/minecraft/textures/entity/decorated_pot/brewer_pottery_pattern.png index f44f3b63..ae1d6264 100644 --- a/assets/minecraft/textures/entity/decorated_pot/brewer_pottery_pattern.png +++ b/assets/minecraft/textures/entity/decorated_pot/brewer_pottery_pattern.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c7c551c88963048ca7ab68b11fdcd5cb0d85e89e4c34b0f25666fe1f063dcd48 -size 267 +oid sha256:cdeae76f1ff7a6acd8cf3868d3c000c611f62811dcd60318643e8ece40a8f67c +size 239 diff --git a/assets/minecraft/textures/entity/decorated_pot/burn_pottery_pattern.png b/assets/minecraft/textures/entity/decorated_pot/burn_pottery_pattern.png index d17b1e24..e3cdf47d 100644 --- a/assets/minecraft/textures/entity/decorated_pot/burn_pottery_pattern.png +++ b/assets/minecraft/textures/entity/decorated_pot/burn_pottery_pattern.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e844d1d4e31009a14bc3ca4dab84f02cb94d1963b6ac1fa084db67c8d2a6c144 -size 264 +oid sha256:fb5cb7a40244281161ca3c46dd70d5cc422eb509b79655a5907f728004973452 +size 237 diff --git a/assets/minecraft/textures/entity/decorated_pot/danger_pottery_pattern.png b/assets/minecraft/textures/entity/decorated_pot/danger_pottery_pattern.png index f33f29dd..1cbabcce 100644 --- a/assets/minecraft/textures/entity/decorated_pot/danger_pottery_pattern.png +++ b/assets/minecraft/textures/entity/decorated_pot/danger_pottery_pattern.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1fffeafab7e4a116ab44faf74bcc37c083974fd03eb92f5e41ad98a97f4cae22 -size 263 +oid sha256:86677ecb741fa23f6aad4d680208ff5cf0b6210907d87bb560f7db201c231a64 +size 238 diff --git a/assets/minecraft/textures/entity/decorated_pot/decorated_pot_side.png b/assets/minecraft/textures/entity/decorated_pot/decorated_pot_side.png index 94b0b664..95eb2be3 100644 --- a/assets/minecraft/textures/entity/decorated_pot/decorated_pot_side.png +++ b/assets/minecraft/textures/entity/decorated_pot/decorated_pot_side.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:06484ec7b3220d0587bd1bac0ee9e9c68f3e281df34ab1dcc76fe889ff62e938 -size 186 +oid sha256:d4dc9a7f182f3873cea1000f7f163911c296d7ad309aa2b63c2b6b403ac19d92 +size 182 diff --git a/assets/minecraft/textures/entity/decorated_pot/explorer_pottery_pattern.png b/assets/minecraft/textures/entity/decorated_pot/explorer_pottery_pattern.png index 16ed93f2..041806c4 100644 --- a/assets/minecraft/textures/entity/decorated_pot/explorer_pottery_pattern.png +++ b/assets/minecraft/textures/entity/decorated_pot/explorer_pottery_pattern.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:68d31ea86e12e72bdf034c3aae82873c66b603526d5c51325a0669557b5618ec -size 265 +oid sha256:15bfca9ab5d17a4404a7423ecb1f7c1ba06300c19a55787662088b0c04b43598 +size 236 diff --git a/assets/minecraft/textures/entity/decorated_pot/flow_pottery_pattern.png b/assets/minecraft/textures/entity/decorated_pot/flow_pottery_pattern.png index 25a47371..9a7e2245 100644 --- a/assets/minecraft/textures/entity/decorated_pot/flow_pottery_pattern.png +++ b/assets/minecraft/textures/entity/decorated_pot/flow_pottery_pattern.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ca72f8a8a5d27a30fa69ec5de684d11ad174cda497a4b129732df7d1c4064db6 -size 263 +oid sha256:015df5142240ccb5d7704e19640c69efef9efab7e7708fa600f8c2001a073b64 +size 235 diff --git a/assets/minecraft/textures/entity/decorated_pot/friend_pottery_pattern.png b/assets/minecraft/textures/entity/decorated_pot/friend_pottery_pattern.png index d6d25b9f..f92359d3 100644 --- a/assets/minecraft/textures/entity/decorated_pot/friend_pottery_pattern.png +++ b/assets/minecraft/textures/entity/decorated_pot/friend_pottery_pattern.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:55efdae10a750bca9856a3cc326ba06dca62c7fc2facf4699f36ea3d3f385e5c -size 266 +oid sha256:6afa847b491b7a920eae26d6871c9be22649255ea8d1ca0db51480c3657a1510 +size 236 diff --git a/assets/minecraft/textures/entity/decorated_pot/guster_pottery_pattern.png b/assets/minecraft/textures/entity/decorated_pot/guster_pottery_pattern.png index 9b3b3ee5..41f64677 100644 --- a/assets/minecraft/textures/entity/decorated_pot/guster_pottery_pattern.png +++ b/assets/minecraft/textures/entity/decorated_pot/guster_pottery_pattern.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:56ce727c0fa698fcc7c973448f0828739702de95247e099e02b3cf7078a8d342 -size 266 +oid sha256:1834f1e8aa7faf2a49f51f3835d13d4cd28608f9abe788a2bbf706374cddda03 +size 234 diff --git a/assets/minecraft/textures/entity/decorated_pot/heart_pottery_pattern.png b/assets/minecraft/textures/entity/decorated_pot/heart_pottery_pattern.png index cdff1db4..90c66664 100644 --- a/assets/minecraft/textures/entity/decorated_pot/heart_pottery_pattern.png +++ b/assets/minecraft/textures/entity/decorated_pot/heart_pottery_pattern.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:43b2185fae5b7e64995a4cc770aaae88bfebc87615a0750a66cd9227aecb6ff5 -size 263 +oid sha256:cf9fab18b492e053622ab7d243fb1f40109384021d753b78c63dd7f75b9d2d24 +size 237 diff --git a/assets/minecraft/textures/entity/decorated_pot/heartbreak_pottery_pattern.png b/assets/minecraft/textures/entity/decorated_pot/heartbreak_pottery_pattern.png index 51214bab..c3c62811 100644 --- a/assets/minecraft/textures/entity/decorated_pot/heartbreak_pottery_pattern.png +++ b/assets/minecraft/textures/entity/decorated_pot/heartbreak_pottery_pattern.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f58acedd739aac2f1b6ed01029fbd023fb2bcb83863f97f5378adc62cfa7c69 -size 265 +oid sha256:3315c87202f9a0b83120f8ee5d5219c418f5d52725bbf056498d0ed60fcdbf35 +size 241 diff --git a/assets/minecraft/textures/entity/decorated_pot/howl_pottery_pattern.png b/assets/minecraft/textures/entity/decorated_pot/howl_pottery_pattern.png index 70094780..94227614 100644 --- a/assets/minecraft/textures/entity/decorated_pot/howl_pottery_pattern.png +++ b/assets/minecraft/textures/entity/decorated_pot/howl_pottery_pattern.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d02ff5df66303494287fa96364ac9e9a9faa664920435d76bf04aaf85ddb2963 -size 272 +oid sha256:420696167bcb1fb6c84cbca91164901f4a679f1285ec37e0c8214907192b123b +size 238 diff --git a/assets/minecraft/textures/entity/decorated_pot/miner_pottery_pattern.png b/assets/minecraft/textures/entity/decorated_pot/miner_pottery_pattern.png index 990673e2..fae39747 100644 --- a/assets/minecraft/textures/entity/decorated_pot/miner_pottery_pattern.png +++ b/assets/minecraft/textures/entity/decorated_pot/miner_pottery_pattern.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7aa37d0b3e69eecf00600f8a674b2a77f669141f04af5b56129c07a3a0fc60b1 -size 264 +oid sha256:b98279cd960e61c8adeb804eedbebbaf0471f35f3fe50e8e3fc6a5f239ec1b0f +size 237 diff --git a/assets/minecraft/textures/entity/decorated_pot/mourner_pottery_pattern.png b/assets/minecraft/textures/entity/decorated_pot/mourner_pottery_pattern.png index 862e5f9f..cdf19236 100644 --- a/assets/minecraft/textures/entity/decorated_pot/mourner_pottery_pattern.png +++ b/assets/minecraft/textures/entity/decorated_pot/mourner_pottery_pattern.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7b6401320b77a0e1f3915e860a680023bc4ffa0d3b7b0cd13434eb1a3f39ef96 -size 263 +oid sha256:bb234f0a8f0cca8b983a5a9937a132ce18c20896125c1c990f84937f03c4dc50 +size 237 diff --git a/assets/minecraft/textures/entity/decorated_pot/plenty_pottery_pattern.png b/assets/minecraft/textures/entity/decorated_pot/plenty_pottery_pattern.png index c0e641f5..f0cb0545 100644 --- a/assets/minecraft/textures/entity/decorated_pot/plenty_pottery_pattern.png +++ b/assets/minecraft/textures/entity/decorated_pot/plenty_pottery_pattern.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ddb06f6d69ac0c01729a79e577c2e339e7d86ff7a4600155dfcc37ccd9249e14 -size 258 +oid sha256:fe3eca33b1a4c7011831a12851ccafc9f7f65f7ba965ce4f67b73cbc90025bd2 +size 230 diff --git a/assets/minecraft/textures/entity/decorated_pot/prize_pottery_pattern.png b/assets/minecraft/textures/entity/decorated_pot/prize_pottery_pattern.png index 42ee3c74..f5a04563 100644 --- a/assets/minecraft/textures/entity/decorated_pot/prize_pottery_pattern.png +++ b/assets/minecraft/textures/entity/decorated_pot/prize_pottery_pattern.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5bce465215b07f280b4ae643934d50a175494ae11d11e212cd46fe8b03248893 -size 273 +oid sha256:255af88ef75054695d97089dbd1584dc3d82a663817e811b1dbeaf43579d2316 +size 245 diff --git a/assets/minecraft/textures/entity/decorated_pot/scrape_pottery_pattern.png b/assets/minecraft/textures/entity/decorated_pot/scrape_pottery_pattern.png index d6107317..1f53632e 100644 --- a/assets/minecraft/textures/entity/decorated_pot/scrape_pottery_pattern.png +++ b/assets/minecraft/textures/entity/decorated_pot/scrape_pottery_pattern.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9c664930de1be4b97e1c41574a26deaf25945d33ec4fd6c46af3db3bc9729552 -size 260 +oid sha256:a890222917eaaf854b1347e30b3f9414e2b7bde050437232eafd0f9626bfeb34 +size 239 diff --git a/assets/minecraft/textures/entity/decorated_pot/sheaf_pottery_pattern.png b/assets/minecraft/textures/entity/decorated_pot/sheaf_pottery_pattern.png index 9bab5123..ee23d730 100644 --- a/assets/minecraft/textures/entity/decorated_pot/sheaf_pottery_pattern.png +++ b/assets/minecraft/textures/entity/decorated_pot/sheaf_pottery_pattern.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c7ab10f677976406a74f543b8dde64e25970a3acecbe53b477fad70c8dbfd582 -size 255 +oid sha256:d30eecb3e8fd7be5a0a1838b7e172b6c8b2944a563c093dbbaaa830bf0920b89 +size 229 diff --git a/assets/minecraft/textures/entity/decorated_pot/shelter_pottery_pattern.png b/assets/minecraft/textures/entity/decorated_pot/shelter_pottery_pattern.png index 5cff2655..161d306e 100644 --- a/assets/minecraft/textures/entity/decorated_pot/shelter_pottery_pattern.png +++ b/assets/minecraft/textures/entity/decorated_pot/shelter_pottery_pattern.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:20241087538d5a37f8731a7658d283a8141acecb55f938a55199db4ecdd7156e -size 265 +oid sha256:987defbde266b3b0037ef8a8c24f5d6a014f7087edfaa8a8232f4182d18ca888 +size 236 diff --git a/assets/minecraft/textures/entity/decorated_pot/skull_pottery_pattern.png b/assets/minecraft/textures/entity/decorated_pot/skull_pottery_pattern.png index adc09a62..0c577494 100644 --- a/assets/minecraft/textures/entity/decorated_pot/skull_pottery_pattern.png +++ b/assets/minecraft/textures/entity/decorated_pot/skull_pottery_pattern.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:79aced62d9c82881ba9749e2e32e27ad7830b00db218c0a4b8ae275f9b969154 -size 262 +oid sha256:04e7cc7765f15ce5c0efd501c0611cd011dcc8ca60ddd85137ab289b788d28dc +size 234 diff --git a/assets/minecraft/textures/entity/decorated_pot/snort_pottery_pattern.png b/assets/minecraft/textures/entity/decorated_pot/snort_pottery_pattern.png index b529ab01..c2c5f7e4 100644 --- a/assets/minecraft/textures/entity/decorated_pot/snort_pottery_pattern.png +++ b/assets/minecraft/textures/entity/decorated_pot/snort_pottery_pattern.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cae5749b8d9928f2eb7ccebbc3c546dee4ebbe3fa43584dc6d866b51b6063a51 -size 272 +oid sha256:273d9d6d8457517640b871f6831534d7c31dc7cc57e78be5c1e4c13ba4ab07b2 +size 243 diff --git a/assets/minecraft/textures/entity/dolphin.png b/assets/minecraft/textures/entity/dolphin.png index d5e80504..4f2c7fde 100644 --- a/assets/minecraft/textures/entity/dolphin.png +++ b/assets/minecraft/textures/entity/dolphin.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2ff9511e10803b98cd4e81d16699d2ca24286d629d24385e70a6204a39f68ef9 -size 612 +oid sha256:3120b2aba9c71e85e47f470117e8d0115d4cfc6fc18f11bb483256c14a90addb +size 550 diff --git a/assets/minecraft/textures/entity/enchanting_table_book.png b/assets/minecraft/textures/entity/enchanting_table_book.png index c7318e4d..0da2921b 100644 --- a/assets/minecraft/textures/entity/enchanting_table_book.png +++ b/assets/minecraft/textures/entity/enchanting_table_book.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:efcc111150f0f3c7d0b8e88a8d430dbeeb04618300034ea2180fa0d0257a24f2 -size 322 +oid sha256:8ea11fb9590b0d6e7858ad20adcc196c832af4466601764d6e290d611b0959a0 +size 305 diff --git a/assets/minecraft/textures/entity/end_crystal/end_crystal_beam.png b/assets/minecraft/textures/entity/end_crystal/end_crystal_beam.png index ab19e778..00701e4a 100644 --- a/assets/minecraft/textures/entity/end_crystal/end_crystal_beam.png +++ b/assets/minecraft/textures/entity/end_crystal/end_crystal_beam.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c4cb47de529950a977a5c41f100a337e2655adb3050a0bf4697eacca5e4e637 -size 1014 +oid sha256:314e5d35de8f8c0ebb2fe2cf044199ecdaf5841ed0ff6da393fcf1e0c23fbee2 +size 991 diff --git a/assets/minecraft/textures/entity/end_gateway_beam.png b/assets/minecraft/textures/entity/end_gateway_beam.png index 2d35a420..d1300875 100644 --- a/assets/minecraft/textures/entity/end_gateway_beam.png +++ b/assets/minecraft/textures/entity/end_gateway_beam.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7311fd004a2848fd9d89cf2089c05a2334ac533f3ac2cdcafabc104c1cd40809 -size 214 +oid sha256:557fd1926de359d5cfde9cfd2f72e6c42539220e9d1206a43842859910c37ddc +size 196 diff --git a/assets/minecraft/textures/entity/end_portal.png b/assets/minecraft/textures/entity/end_portal.png index b2f8bd68..ab9b3e62 100644 --- a/assets/minecraft/textures/entity/end_portal.png +++ b/assets/minecraft/textures/entity/end_portal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:194d52c9deb9bcc4270462b7dbc5591ef60e47ac6342cdf4f1cb86c61a262bde -size 9751 +oid sha256:af82f34eea41a02dbb2824425fe9606f6cc629a94a5434395ed2a7cbd608d143 +size 8989 diff --git a/assets/minecraft/textures/entity/enderdragon/dragon.png b/assets/minecraft/textures/entity/enderdragon/dragon.png index c4012c90..a11b0d3f 100644 --- a/assets/minecraft/textures/entity/enderdragon/dragon.png +++ b/assets/minecraft/textures/entity/enderdragon/dragon.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a7d5bc7b373bfee01a5ec721914fd9f584dde5f7977303c63e857c48f99c42bf -size 4555 +oid sha256:6133c12916bb6e4bfdc35389d52e79763d934bae827de90d66fdce2199f9d2f9 +size 4534 diff --git a/assets/minecraft/textures/entity/enderdragon/dragon_exploding.png b/assets/minecraft/textures/entity/enderdragon/dragon_exploding.png index 72be8bdb..629f4831 100644 --- a/assets/minecraft/textures/entity/enderdragon/dragon_exploding.png +++ b/assets/minecraft/textures/entity/enderdragon/dragon_exploding.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:21e2ca963a73c2260c83a9e6029de6d29d1260543f1ad146b4047cb2589deb4d -size 29674 +oid sha256:d105fa82965961a1b9579d6dfc32c7b83858b8323b6cb1fc1abbb5b6837ff4af +size 24505 diff --git a/assets/minecraft/textures/entity/enderdragon/dragon_fireball.png b/assets/minecraft/textures/entity/enderdragon/dragon_fireball.png index 1c69d666..5c002e79 100644 --- a/assets/minecraft/textures/entity/enderdragon/dragon_fireball.png +++ b/assets/minecraft/textures/entity/enderdragon/dragon_fireball.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:63f62c8932daba31c601eb76669cf6fdf4c0e424c417f9ea87c518b1db9c0892 -size 203 +oid sha256:537e30e45accf1e9a7f0c50830a9e3b2086cbe718fb52676845461bae3d5700f +size 202 diff --git a/assets/minecraft/textures/entity/enderman/enderman_eyes.png b/assets/minecraft/textures/entity/enderman/enderman_eyes.png index 81c7b55f..52ada8d4 100644 --- a/assets/minecraft/textures/entity/enderman/enderman_eyes.png +++ b/assets/minecraft/textures/entity/enderman/enderman_eyes.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:da9b3ab2eea2011c5cafbd7d99f33e0a70ba72bcf43254fb98a24972c02ec19c -size 109 +oid sha256:f6fc9f458102d8cbe33e2895a725e4348026b02dde9deff460fe657ef79f9674 +size 106 diff --git a/assets/minecraft/textures/entity/endermite.png b/assets/minecraft/textures/entity/endermite.png index 0fc0d874..710ec219 100644 --- a/assets/minecraft/textures/entity/endermite.png +++ b/assets/minecraft/textures/entity/endermite.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cd4019184a39419b3a93ebe2feb363ee45baabe0b73648a6e5e167e984558b9a -size 896 +oid sha256:6e9d9fcd55bac4656af16733405b8c6c11ad65426331a52de27c483adb2e1b16 +size 505 diff --git a/assets/minecraft/textures/entity/equipment/camel_saddle/saddle.png b/assets/minecraft/textures/entity/equipment/camel_saddle/saddle.png index 25c00ae9..b62fcc5e 100644 --- a/assets/minecraft/textures/entity/equipment/camel_saddle/saddle.png +++ b/assets/minecraft/textures/entity/equipment/camel_saddle/saddle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e779d363b44eb73c4f3f3a27520b7f26a2cb2d1512aeb0f371f58fd3c82491bb -size 587 +oid sha256:602b36d9d75962a8a9df9efc64b8f24f3c32e3626087094a6fb8570f6ba4ee4e +size 585 diff --git a/assets/minecraft/textures/entity/equipment/happy_ghast_body/black_harness.png b/assets/minecraft/textures/entity/equipment/happy_ghast_body/black_harness.png new file mode 100644 index 00000000..580ce91e --- /dev/null +++ b/assets/minecraft/textures/entity/equipment/happy_ghast_body/black_harness.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e7ea2524ea6c1cfbadc8d239b1b0ab9304aec9ac2f5bb8a0a472e4cef7c4b6ea +size 1279 diff --git a/assets/minecraft/textures/entity/equipment/happy_ghast_body/blue_harness.png b/assets/minecraft/textures/entity/equipment/happy_ghast_body/blue_harness.png new file mode 100644 index 00000000..760f2ec3 --- /dev/null +++ b/assets/minecraft/textures/entity/equipment/happy_ghast_body/blue_harness.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2161331a7436d008527bb3ae83953a4573ae782aa5d41310cbdba2231d46b6fa +size 1279 diff --git a/assets/minecraft/textures/entity/equipment/happy_ghast_body/brown_harness.png b/assets/minecraft/textures/entity/equipment/happy_ghast_body/brown_harness.png new file mode 100644 index 00000000..dff6a6db --- /dev/null +++ b/assets/minecraft/textures/entity/equipment/happy_ghast_body/brown_harness.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:386fd2dbf317a2f988d896ba78ccef4ee9fc49633034774c9665de0ebe5e2d38 +size 1279 diff --git a/assets/minecraft/textures/entity/equipment/happy_ghast_body/cyan_harness.png b/assets/minecraft/textures/entity/equipment/happy_ghast_body/cyan_harness.png new file mode 100644 index 00000000..28e31cd8 --- /dev/null +++ b/assets/minecraft/textures/entity/equipment/happy_ghast_body/cyan_harness.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4cd8991a8021ca85ce5ce9302bff3d997c8601238dadf798e0d38d6cf2cea2af +size 1279 diff --git a/assets/minecraft/textures/entity/equipment/happy_ghast_body/gray_harness.png b/assets/minecraft/textures/entity/equipment/happy_ghast_body/gray_harness.png new file mode 100644 index 00000000..c93894af --- /dev/null +++ b/assets/minecraft/textures/entity/equipment/happy_ghast_body/gray_harness.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:36ca2aabde0d825f7f316fc9280e90dadf599531e0b431afc0c51de1fff3b131 +size 1279 diff --git a/assets/minecraft/textures/entity/equipment/happy_ghast_body/green_harness.png b/assets/minecraft/textures/entity/equipment/happy_ghast_body/green_harness.png new file mode 100644 index 00000000..79ba58c2 --- /dev/null +++ b/assets/minecraft/textures/entity/equipment/happy_ghast_body/green_harness.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6b297171df371225639df67a0f462ca401e038f538dfd9023649023eff991388 +size 1279 diff --git a/assets/minecraft/textures/entity/equipment/happy_ghast_body/light_blue_harness.png b/assets/minecraft/textures/entity/equipment/happy_ghast_body/light_blue_harness.png new file mode 100644 index 00000000..2e2617a5 --- /dev/null +++ b/assets/minecraft/textures/entity/equipment/happy_ghast_body/light_blue_harness.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:38ab04006a2d89645aa41847f678723c8c8a7c0835d33dd5b99ed8ebc715a390 +size 1279 diff --git a/assets/minecraft/textures/entity/equipment/happy_ghast_body/light_gray_harness.png b/assets/minecraft/textures/entity/equipment/happy_ghast_body/light_gray_harness.png new file mode 100644 index 00000000..35710386 --- /dev/null +++ b/assets/minecraft/textures/entity/equipment/happy_ghast_body/light_gray_harness.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5a73d30a15389897161abf5f6b21d98ed1a69ea3d1be7057b2dde38e10979045 +size 1279 diff --git a/assets/minecraft/textures/entity/equipment/happy_ghast_body/lime_harness.png b/assets/minecraft/textures/entity/equipment/happy_ghast_body/lime_harness.png new file mode 100644 index 00000000..d1080c86 --- /dev/null +++ b/assets/minecraft/textures/entity/equipment/happy_ghast_body/lime_harness.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:db3227b47ceb79e378693a7f01788a0af596d60d273bb40f071ad10e3eca60e2 +size 1279 diff --git a/assets/minecraft/textures/entity/equipment/happy_ghast_body/magenta_harness.png b/assets/minecraft/textures/entity/equipment/happy_ghast_body/magenta_harness.png new file mode 100644 index 00000000..457dcdde --- /dev/null +++ b/assets/minecraft/textures/entity/equipment/happy_ghast_body/magenta_harness.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5a15b1cac72e378419b5a734dbe26c74ba1091eb87079eb9a5dfa7cd452d5b05 +size 1279 diff --git a/assets/minecraft/textures/entity/equipment/happy_ghast_body/orange_harness.png b/assets/minecraft/textures/entity/equipment/happy_ghast_body/orange_harness.png new file mode 100644 index 00000000..6976f380 --- /dev/null +++ b/assets/minecraft/textures/entity/equipment/happy_ghast_body/orange_harness.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a4a035b324911ce21da0145a22e70574cc40c62e945ae09cbe6f2a7447dcb6d6 +size 1279 diff --git a/assets/minecraft/textures/entity/equipment/happy_ghast_body/pink_harness.png b/assets/minecraft/textures/entity/equipment/happy_ghast_body/pink_harness.png new file mode 100644 index 00000000..1b28b1cc --- /dev/null +++ b/assets/minecraft/textures/entity/equipment/happy_ghast_body/pink_harness.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:953501f33d57afe1f1ffb3a7ee14580b1d83f806ac56c8cc4e9e76e6a964b744 +size 1279 diff --git a/assets/minecraft/textures/entity/equipment/happy_ghast_body/purple_harness.png b/assets/minecraft/textures/entity/equipment/happy_ghast_body/purple_harness.png new file mode 100644 index 00000000..2a060122 --- /dev/null +++ b/assets/minecraft/textures/entity/equipment/happy_ghast_body/purple_harness.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:358373ee8ef3ff75ab649c788312e1fe2311416ee288809ce3bda054fe80c4b5 +size 1279 diff --git a/assets/minecraft/textures/entity/equipment/happy_ghast_body/red_harness.png b/assets/minecraft/textures/entity/equipment/happy_ghast_body/red_harness.png new file mode 100644 index 00000000..c079be8f --- /dev/null +++ b/assets/minecraft/textures/entity/equipment/happy_ghast_body/red_harness.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1a43ab5f38d9ef41e7221b237a555f12d76bc3f49415366c5dd747dcee9aa174 +size 1279 diff --git a/assets/minecraft/textures/entity/equipment/happy_ghast_body/white_harness.png b/assets/minecraft/textures/entity/equipment/happy_ghast_body/white_harness.png new file mode 100644 index 00000000..0c9f29c0 --- /dev/null +++ b/assets/minecraft/textures/entity/equipment/happy_ghast_body/white_harness.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0718e991a42718816b65ec55f85f57deea8bc0fa2aba7e834e682117a2623353 +size 1290 diff --git a/assets/minecraft/textures/entity/equipment/happy_ghast_body/yellow_harness.png b/assets/minecraft/textures/entity/equipment/happy_ghast_body/yellow_harness.png new file mode 100644 index 00000000..0af65118 --- /dev/null +++ b/assets/minecraft/textures/entity/equipment/happy_ghast_body/yellow_harness.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:56d2f7b28ae382ca4b4d2e881417b238f9bcd227d5e11fddd1bc748b0fb2336a +size 1334 diff --git a/assets/minecraft/textures/entity/equipment/horse_body/diamond.png b/assets/minecraft/textures/entity/equipment/horse_body/diamond.png index 357cfc72..60b969a5 100644 --- a/assets/minecraft/textures/entity/equipment/horse_body/diamond.png +++ b/assets/minecraft/textures/entity/equipment/horse_body/diamond.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4e0cd48f6e6fcffcbbfb961d14d09e251f4ad15ba78315542122e515afc3deb5 -size 1257 +oid sha256:c420adf95b92c348e2c1e0a31dd2dd68a4597df8c2125075aa800a66f3e1ee76 +size 731 diff --git a/assets/minecraft/textures/entity/equipment/horse_body/gold.png b/assets/minecraft/textures/entity/equipment/horse_body/gold.png index c7c1e97f..6f238228 100644 --- a/assets/minecraft/textures/entity/equipment/horse_body/gold.png +++ b/assets/minecraft/textures/entity/equipment/horse_body/gold.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:57bb612a9551a22f1b8fb7e64621fe12beb08298fa207493590717a90b888f43 -size 1190 +oid sha256:96abd6b1a1f09030472e3d0bf675f61840abf4cc4b0cb9ad4f39836252bc7fa9 +size 709 diff --git a/assets/minecraft/textures/entity/equipment/horse_body/iron.png b/assets/minecraft/textures/entity/equipment/horse_body/iron.png index eb2d8afd..95fab19d 100644 --- a/assets/minecraft/textures/entity/equipment/horse_body/iron.png +++ b/assets/minecraft/textures/entity/equipment/horse_body/iron.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:83bff457e055c729c3e918ed1208cbeab66f72ef7c315e4297a6829632a0b01a -size 888 +oid sha256:3151bb0f29c6cc45f609cd3f635f78b166bc3164e5d9dfeb7cdcba441ebbb13e +size 768 diff --git a/assets/minecraft/textures/entity/equipment/horse_body/leather.png b/assets/minecraft/textures/entity/equipment/horse_body/leather.png index 62807a17..2e074e00 100644 --- a/assets/minecraft/textures/entity/equipment/horse_body/leather.png +++ b/assets/minecraft/textures/entity/equipment/horse_body/leather.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:33d7bc1d1d609aadd012273ab0acbcf5b88fa112c370eccce898e275f74700ff -size 839 +oid sha256:468e0f17dd2f2f1b7ae7c5f7d09f53c4271bbcf6e22dc341c17960fb87b24b2b +size 811 diff --git a/assets/minecraft/textures/entity/equipment/humanoid/chainmail.png b/assets/minecraft/textures/entity/equipment/humanoid/chainmail.png index b045d5ba..a1de1824 100644 --- a/assets/minecraft/textures/entity/equipment/humanoid/chainmail.png +++ b/assets/minecraft/textures/entity/equipment/humanoid/chainmail.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c35a5adbdee47f27c5f91928e9a84b225264131ac43062cc0e7946038733fd99 -size 258 +oid sha256:37bb25e8d2e7925648c9de188a80bfd7b35df1c464344bd280fd1b42a01520a6 +size 251 diff --git a/assets/minecraft/textures/entity/equipment/humanoid/diamond.png b/assets/minecraft/textures/entity/equipment/humanoid/diamond.png index 42dd0aee..14109bf5 100644 --- a/assets/minecraft/textures/entity/equipment/humanoid/diamond.png +++ b/assets/minecraft/textures/entity/equipment/humanoid/diamond.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:68b43393d01db814bd2e9311bc2a5d3be5bb5294e9d557c60cc59c0ed9878e8a -size 448 +oid sha256:3831697bd3f65cd10cc7725e338c4456d3cd30e0f1d3c07394010ebaec8d09f0 +size 438 diff --git a/assets/minecraft/textures/entity/equipment/humanoid/leather_overlay.png b/assets/minecraft/textures/entity/equipment/humanoid/leather_overlay.png index 3469862d..60cc8a89 100644 --- a/assets/minecraft/textures/entity/equipment/humanoid/leather_overlay.png +++ b/assets/minecraft/textures/entity/equipment/humanoid/leather_overlay.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:45f68c68cf1106e35d34cd2a35fc5f46d685ec6a10331b50b3bab47c7db6304c -size 172 +oid sha256:32004944be2ba0203c9bf67cffc65ff3afa08ac5a22fe1bc797d1a950905b258 +size 170 diff --git a/assets/minecraft/textures/entity/equipment/humanoid/turtle_scute.png b/assets/minecraft/textures/entity/equipment/humanoid/turtle_scute.png index 9a549892..dd05de9c 100644 --- a/assets/minecraft/textures/entity/equipment/humanoid/turtle_scute.png +++ b/assets/minecraft/textures/entity/equipment/humanoid/turtle_scute.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:57f096b65570480f0b0203d6e123df3ccfc88aa08e428ebe1b7df831aaf8c3be -size 278 +oid sha256:59ffbebe4969ec93eaeb8b7eb374569a104ee3fd20dac74613524c6e07a08a9e +size 253 diff --git a/assets/minecraft/textures/entity/equipment/humanoid_leggings/netherite.png b/assets/minecraft/textures/entity/equipment/humanoid_leggings/netherite.png index 3856ebc2..018836fa 100644 --- a/assets/minecraft/textures/entity/equipment/humanoid_leggings/netherite.png +++ b/assets/minecraft/textures/entity/equipment/humanoid_leggings/netherite.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:49b55a02eae5dee8c182f52b84060705b72a5fae3e3c624fbbd19b0225510407 -size 264 +oid sha256:745964d6b6ba6452eb38506cb6c8ad4147c8ed7f6b49f4569d247e4fd597e93f +size 258 diff --git a/assets/minecraft/textures/entity/equipment/llama_body/brown.png b/assets/minecraft/textures/entity/equipment/llama_body/brown.png index 776e8fb9..b1fe7a20 100644 --- a/assets/minecraft/textures/entity/equipment/llama_body/brown.png +++ b/assets/minecraft/textures/entity/equipment/llama_body/brown.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c5d489b7c42497f6bde72738763820b337300f48daf932039fd7400c50bac989 -size 473 +oid sha256:2064066f90e96e32fb550fa59e77b0e7267069ad982bf51cb770e6f7db9caf2b +size 466 diff --git a/assets/minecraft/textures/entity/equipment/llama_body/cyan.png b/assets/minecraft/textures/entity/equipment/llama_body/cyan.png index 566709cc..4bee7a05 100644 --- a/assets/minecraft/textures/entity/equipment/llama_body/cyan.png +++ b/assets/minecraft/textures/entity/equipment/llama_body/cyan.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8554d52c51558ba3a3ac92772b8172943327eb7cffd6f24d4483d4297fbafb48 -size 577 +oid sha256:428d63c8d1c77c37d5817c61754012aef3cbd36212639028c84b53e2c6866b6f +size 570 diff --git a/assets/minecraft/textures/entity/equipment/llama_body/gray.png b/assets/minecraft/textures/entity/equipment/llama_body/gray.png index df31ab44..05806391 100644 --- a/assets/minecraft/textures/entity/equipment/llama_body/gray.png +++ b/assets/minecraft/textures/entity/equipment/llama_body/gray.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:903ee966f72beb2b4df6ff5ca9de090be94d2fe0949ab4c39b327e544b4ed994 -size 358 +oid sha256:f1186713c6379ccd166e6236e4b21389e1c7cdf0d28eb053c8f761666ffa3786 +size 349 diff --git a/assets/minecraft/textures/entity/equipment/llama_body/green.png b/assets/minecraft/textures/entity/equipment/llama_body/green.png index 678a284d..08259261 100644 --- a/assets/minecraft/textures/entity/equipment/llama_body/green.png +++ b/assets/minecraft/textures/entity/equipment/llama_body/green.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f22c45875d483e353aebf5ad43a226b9b1887f0c32fc72c7af804c58839616b7 -size 447 +oid sha256:12b1b4cb09914acbb33e66e3a752085b3388ef6a0acaab56eb1ac41316d1e005 +size 418 diff --git a/assets/minecraft/textures/entity/equipment/llama_body/light_blue.png b/assets/minecraft/textures/entity/equipment/llama_body/light_blue.png index 56c8f293..66b96609 100644 --- a/assets/minecraft/textures/entity/equipment/llama_body/light_blue.png +++ b/assets/minecraft/textures/entity/equipment/llama_body/light_blue.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:21bfbd74e3139b7c8bc964610c64055375ee2a63fcff3f4c674120d1994d8483 -size 489 +oid sha256:6af620aebac74fd0f8d054bdad0da7e62e55372490d7b7c3037ca42eece7e4c9 +size 482 diff --git a/assets/minecraft/textures/entity/equipment/llama_body/light_gray.png b/assets/minecraft/textures/entity/equipment/llama_body/light_gray.png index e5891d15..4173dc41 100644 --- a/assets/minecraft/textures/entity/equipment/llama_body/light_gray.png +++ b/assets/minecraft/textures/entity/equipment/llama_body/light_gray.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:69d01c270fced696c90109a872399176edea10800c3f15b253a76c93772f4e32 -size 688 +oid sha256:711dd12b0c0eb63e1cb5c40907830ba54d1324325e1112371dc139093e07bac6 +size 671 diff --git a/assets/minecraft/textures/entity/equipment/llama_body/lime.png b/assets/minecraft/textures/entity/equipment/llama_body/lime.png index 893b08b1..849a8035 100644 --- a/assets/minecraft/textures/entity/equipment/llama_body/lime.png +++ b/assets/minecraft/textures/entity/equipment/llama_body/lime.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:82be2da882aa1bad609d0ef2e16dbc08866d18bec1fcf24b63cb364236a7aff3 -size 506 +oid sha256:9c4f5931feed61e62fec4b59fe6a304b42f6582b1b9c53d120fd8ed1892069ff +size 497 diff --git a/assets/minecraft/textures/entity/equipment/llama_body/magenta.png b/assets/minecraft/textures/entity/equipment/llama_body/magenta.png index 1f8122e8..ce8d5ba8 100644 --- a/assets/minecraft/textures/entity/equipment/llama_body/magenta.png +++ b/assets/minecraft/textures/entity/equipment/llama_body/magenta.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f39b0982105c4463e6462e8f46b0e1331b48c33b4bb9689bce66dba01594249d -size 577 +oid sha256:a2e3013eef7e5471315eb244df0cee5f3be07cf175b71d66617f8bd729da90bf +size 565 diff --git a/assets/minecraft/textures/entity/equipment/llama_body/orange.png b/assets/minecraft/textures/entity/equipment/llama_body/orange.png index 6fde3a9c..add84c2d 100644 --- a/assets/minecraft/textures/entity/equipment/llama_body/orange.png +++ b/assets/minecraft/textures/entity/equipment/llama_body/orange.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c88e0bcbfa863e751d151f4ea581f4f64d68e1aeeba55b53e45b42a2fb36262c -size 612 +oid sha256:c506ab18371d1224a58d446953508b15e10867feed185db2413204deda5d7202 +size 600 diff --git a/assets/minecraft/textures/entity/equipment/llama_body/pink.png b/assets/minecraft/textures/entity/equipment/llama_body/pink.png index 6a0b1df6..046811b7 100644 --- a/assets/minecraft/textures/entity/equipment/llama_body/pink.png +++ b/assets/minecraft/textures/entity/equipment/llama_body/pink.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:943e664799bb295c2be264d599e58f2f305bbb01f156ce6dd92ddabc577cb27c -size 498 +oid sha256:fbf146946e406f2fa85966fbc0cc83e8c23367ca16ce7ff791b28b7898170987 +size 491 diff --git a/assets/minecraft/textures/entity/equipment/llama_body/purple.png b/assets/minecraft/textures/entity/equipment/llama_body/purple.png index 4d373f68..e613fab4 100644 --- a/assets/minecraft/textures/entity/equipment/llama_body/purple.png +++ b/assets/minecraft/textures/entity/equipment/llama_body/purple.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:125b7abe05651af261a2ef1a35fa6050424f65bbfa2bce4d847af5b5ceb11e74 -size 433 +oid sha256:0e0ff1cfd049b881bb759ec228f0eea4bf820095a00171f4c2dec6f8110cd61e +size 401 diff --git a/assets/minecraft/textures/entity/equipment/llama_body/red.png b/assets/minecraft/textures/entity/equipment/llama_body/red.png index 4755b994..09322684 100644 --- a/assets/minecraft/textures/entity/equipment/llama_body/red.png +++ b/assets/minecraft/textures/entity/equipment/llama_body/red.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:736ee42d1aee990168722bad27bd62feab85c691fd28214f8992cb8ff00c4c65 -size 479 +oid sha256:399f45119299e662e0cb057445903f11eb48e102f3de5e7553efc6bb1acb2980 +size 473 diff --git a/assets/minecraft/textures/entity/equipment/llama_body/trader_llama.png b/assets/minecraft/textures/entity/equipment/llama_body/trader_llama.png index a4875f82..af356aca 100644 --- a/assets/minecraft/textures/entity/equipment/llama_body/trader_llama.png +++ b/assets/minecraft/textures/entity/equipment/llama_body/trader_llama.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:72b60c7a736ee26a643b36d9ede8c84bdc2ec7c958b257bf8caad5fb5a5c8744 -size 335 +oid sha256:8c867932552f61332a4e66ce671d6e9dd1b497ede717e18dfa9f987388b512e0 +size 322 diff --git a/assets/minecraft/textures/entity/equipment/llama_body/white.png b/assets/minecraft/textures/entity/equipment/llama_body/white.png index aa7bee8e..6d4cf2d1 100644 --- a/assets/minecraft/textures/entity/equipment/llama_body/white.png +++ b/assets/minecraft/textures/entity/equipment/llama_body/white.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3c3999a7a3a90e6e4e5058a5fe9c533b9f4533da0f8822ef3f023d0af9f849cd -size 536 +oid sha256:9b8045a7f246c90e898e462abd6ce6b48ed8d593b83e4f045f806ef5332a39cc +size 529 diff --git a/assets/minecraft/textures/entity/equipment/llama_body/yellow.png b/assets/minecraft/textures/entity/equipment/llama_body/yellow.png index 6b01fdfe..5a756d2d 100644 --- a/assets/minecraft/textures/entity/equipment/llama_body/yellow.png +++ b/assets/minecraft/textures/entity/equipment/llama_body/yellow.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7a8d2b626132162320940e1bf63f519b58f2d8d9a26284d589047e45977b8a12 -size 746 +oid sha256:266cb77f9d3625d55f1a55b4d1158512a89a50b1dcb35a6ec6a50e17d2a4a57b +size 726 diff --git a/assets/minecraft/textures/entity/equipment/strider_saddle/saddle.png b/assets/minecraft/textures/entity/equipment/strider_saddle/saddle.png index 6135d278..ed220230 100644 --- a/assets/minecraft/textures/entity/equipment/strider_saddle/saddle.png +++ b/assets/minecraft/textures/entity/equipment/strider_saddle/saddle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f91e96254173c1bbf055479207d9406d96e47f8da9fe67ca5fc4813bc522daf4 -size 315 +oid sha256:a65af752fe0716b71568b1c6a9bc28cd703433d9d558a2b38c28d8f4e8b255bf +size 279 diff --git a/assets/minecraft/textures/entity/equipment/wings/elytra.png b/assets/minecraft/textures/entity/equipment/wings/elytra.png index 116005b5..410323cc 100644 --- a/assets/minecraft/textures/entity/equipment/wings/elytra.png +++ b/assets/minecraft/textures/entity/equipment/wings/elytra.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f6388d0ff4d871329aa6d0b713cdbfb48781c55da1e055d156f6681d63018f2 -size 276 +oid sha256:6adbbc0f7d39cd233083f672a6624141d3de47885efdd1f387d50e92c75eeb2d +size 269 diff --git a/assets/minecraft/textures/entity/equipment/wolf_body/armadillo_scute.png b/assets/minecraft/textures/entity/equipment/wolf_body/armadillo_scute.png index 735037fe..e09d7713 100644 --- a/assets/minecraft/textures/entity/equipment/wolf_body/armadillo_scute.png +++ b/assets/minecraft/textures/entity/equipment/wolf_body/armadillo_scute.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4bc867f98ec5cab2b98566977335c04b69382db5355db278482aa1e0fa44a175 -size 417 +oid sha256:fc9bae652a2653fe063f4deb7ea0897477d1978647522e7b18d534ace3804368 +size 389 diff --git a/assets/minecraft/textures/entity/equipment/wolf_body/armadillo_scute_overlay.png b/assets/minecraft/textures/entity/equipment/wolf_body/armadillo_scute_overlay.png index aa751356..4df09322 100644 --- a/assets/minecraft/textures/entity/equipment/wolf_body/armadillo_scute_overlay.png +++ b/assets/minecraft/textures/entity/equipment/wolf_body/armadillo_scute_overlay.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d47180cb3bb54263ca737f41646adcd877c432ef08cf506ee87f19b8d0d59397 -size 242 +oid sha256:4b2ce46f0e7c0a6d901d05103f0eea26d5722d5468fb1236c8cdf65dd8eeddb3 +size 214 diff --git a/assets/minecraft/textures/entity/experience_orb.png b/assets/minecraft/textures/entity/experience_orb.png index 8c27da91..3641c00c 100644 --- a/assets/minecraft/textures/entity/experience_orb.png +++ b/assets/minecraft/textures/entity/experience_orb.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9a708e3fdb4e74a540e2e7df41111edf591aab9965c4e2e8ff8c943b7e0fb1f3 -size 474 +oid sha256:fe55d3823ae0f2c8114e051ae26a38d48808abc31a514401047ed08862ac8ec0 +size 415 diff --git a/assets/minecraft/textures/entity/fish/cod.png b/assets/minecraft/textures/entity/fish/cod.png index e00487e4..b0bad423 100644 --- a/assets/minecraft/textures/entity/fish/cod.png +++ b/assets/minecraft/textures/entity/fish/cod.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4ba0d2d3fc0ee46e4c310b0a9ed9891ed64a3c3263ad562a33d985be18b07345 -size 274 +oid sha256:02eb65ffd0a9e1744222c094746e0b0a65f84ed0188ac3e4b78a2e37cd41788a +size 243 diff --git a/assets/minecraft/textures/entity/fish/pufferfish.png b/assets/minecraft/textures/entity/fish/pufferfish.png index ec6351be..fee22f4e 100644 --- a/assets/minecraft/textures/entity/fish/pufferfish.png +++ b/assets/minecraft/textures/entity/fish/pufferfish.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:67977a7c6fbfb69fcd52842ce261cd60ca5ecb627e7d832c47eee4ffd94bd789 -size 535 +oid sha256:9403593783cb7b074569c7f977c210ac8cb5b967bd0ad0027e9b44c371d942f1 +size 490 diff --git a/assets/minecraft/textures/entity/fish/salmon.png b/assets/minecraft/textures/entity/fish/salmon.png index 9ca0e789..f4a4ee10 100644 --- a/assets/minecraft/textures/entity/fish/salmon.png +++ b/assets/minecraft/textures/entity/fish/salmon.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4e273b660cd2833e24dc177aa9b782324a0fe0c8250369b7e27780b3c4d7ddd0 -size 486 +oid sha256:de7105cfa87d6845196a3f424e3c3aa811408fb7e2ca806c2d3c583b29b8d5b4 +size 485 diff --git a/assets/minecraft/textures/entity/fish/tropical_a.png b/assets/minecraft/textures/entity/fish/tropical_a.png index 3d2b337b..ba6c8d39 100644 --- a/assets/minecraft/textures/entity/fish/tropical_a.png +++ b/assets/minecraft/textures/entity/fish/tropical_a.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:81110230ed25e72c7d310d0cc72c00f4777786e76a67025932afcf092b34d4bd -size 180 +oid sha256:8039af1f96db7edb991657984be187364ed2bad7bfa7748780ec697106e02c09 +size 159 diff --git a/assets/minecraft/textures/entity/fish/tropical_a_pattern_4.png b/assets/minecraft/textures/entity/fish/tropical_a_pattern_4.png index 3df81f61..8fc2f914 100644 --- a/assets/minecraft/textures/entity/fish/tropical_a_pattern_4.png +++ b/assets/minecraft/textures/entity/fish/tropical_a_pattern_4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f23f43a865bcc805c2597b0aecc3a017571b134cbc7c188836c25e5013793ef0 -size 151 +oid sha256:1b26f5b0a5e2f8923c45d65e8c4f13956317f01846538365c5e2e025251b64b6 +size 148 diff --git a/assets/minecraft/textures/entity/fish/tropical_a_pattern_6.png b/assets/minecraft/textures/entity/fish/tropical_a_pattern_6.png index 3498d8ae..3dd019e2 100644 --- a/assets/minecraft/textures/entity/fish/tropical_a_pattern_6.png +++ b/assets/minecraft/textures/entity/fish/tropical_a_pattern_6.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a412bbc294921fe7d163b50fc1f57c830f2246464f372d9583f45879e59d16f6 -size 152 +oid sha256:fa1d5fe7881ff1f1b96a16ff62c97582fad113049f1fa0f2b6413952b6038a5e +size 149 diff --git a/assets/minecraft/textures/entity/fish/tropical_b.png b/assets/minecraft/textures/entity/fish/tropical_b.png index 2e3d385e..04270398 100644 --- a/assets/minecraft/textures/entity/fish/tropical_b.png +++ b/assets/minecraft/textures/entity/fish/tropical_b.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3691a0e3f3247b37b55673312818066629d36e2c33ac7b452431c0b36a9f2d00 -size 218 +oid sha256:152794eb34ba2bb81bcbaa8e0be193481655aef93cfd7d268b8bff1ae428b6fa +size 195 diff --git a/assets/minecraft/textures/entity/fish/tropical_b_pattern_1.png b/assets/minecraft/textures/entity/fish/tropical_b_pattern_1.png index d63bdc08..3c4e882f 100644 --- a/assets/minecraft/textures/entity/fish/tropical_b_pattern_1.png +++ b/assets/minecraft/textures/entity/fish/tropical_b_pattern_1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:012e00a09ac340cf3532ad2d7ffbeac4d3a683c9d1baa03299f72e94256c49e8 -size 170 +oid sha256:e8e3fbfa8a21be1faac4ac132b68ea36f50036930f170fd1f8062027280af932 +size 166 diff --git a/assets/minecraft/textures/entity/fish/tropical_b_pattern_3.png b/assets/minecraft/textures/entity/fish/tropical_b_pattern_3.png index e276ea73..03e4544e 100644 --- a/assets/minecraft/textures/entity/fish/tropical_b_pattern_3.png +++ b/assets/minecraft/textures/entity/fish/tropical_b_pattern_3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2b59c6d785a5a4d8ef7972b2de04e38b9e858936a1f10f903740210ebfb64634 -size 174 +oid sha256:79399b7742c31ad5cbd72c82c339856c774a074cb847c517505ec8845e570afd +size 171 diff --git a/assets/minecraft/textures/entity/fish/tropical_b_pattern_6.png b/assets/minecraft/textures/entity/fish/tropical_b_pattern_6.png index 095aaeb9..6173e732 100644 --- a/assets/minecraft/textures/entity/fish/tropical_b_pattern_6.png +++ b/assets/minecraft/textures/entity/fish/tropical_b_pattern_6.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bd0fd1a6acec35c98b381669fb7d4c092ba33ce6095ddda7893820cfee3d223f -size 168 +oid sha256:9a442db8ece0a79501782632e42439e29ee0f6b79b7c4c74d9be700dd1c376f3 +size 165 diff --git a/assets/minecraft/textures/entity/fishing_hook.png b/assets/minecraft/textures/entity/fishing_hook.png index 31a523f4..4f8b8ad9 100644 --- a/assets/minecraft/textures/entity/fishing_hook.png +++ b/assets/minecraft/textures/entity/fishing_hook.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f4c642d2f12aa8ee7e7c9acbc1b197cf8209a91d9e69acdff1bba4b3193cd785 -size 125 +oid sha256:a8bacaf2db7aa48ad3264ee6f33787efb71e02b8cf04bc281aa2f98bb02ab75c +size 107 diff --git a/assets/minecraft/textures/entity/fox/fox.png b/assets/minecraft/textures/entity/fox/fox.png index f48fa264..f734fa99 100644 --- a/assets/minecraft/textures/entity/fox/fox.png +++ b/assets/minecraft/textures/entity/fox/fox.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:417aaa17f7dfc3457022cdb767a8bf93445319923393c0b9f8922e325c643532 -size 526 +oid sha256:f998f8e0f04d1eb9f9304f658271757efc9285501e43308319a3c3085a15557d +size 453 diff --git a/assets/minecraft/textures/entity/fox/fox_sleep.png b/assets/minecraft/textures/entity/fox/fox_sleep.png index 5264f11f..f27953b1 100644 --- a/assets/minecraft/textures/entity/fox/fox_sleep.png +++ b/assets/minecraft/textures/entity/fox/fox_sleep.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d1e2fb30f087b29e7cc672c7e3258c79baf16f5697310c481e2d6b8bc359c79 -size 529 +oid sha256:69a847bdee8c7237a6cfc7b52984f2a93b5f2b2892754361971b3a7766c5283b +size 454 diff --git a/assets/minecraft/textures/entity/fox/snow_fox.png b/assets/minecraft/textures/entity/fox/snow_fox.png index 945d91ff..a604fd19 100644 --- a/assets/minecraft/textures/entity/fox/snow_fox.png +++ b/assets/minecraft/textures/entity/fox/snow_fox.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ec8df55639e0f724573e5ebb83310747c0ab99cf3210b244dc381a6534e655d8 -size 515 +oid sha256:23e6563aa43bbeb7052f0ac71d5b75bd9d3729c7afb4fba38acaf234002bd226 +size 484 diff --git a/assets/minecraft/textures/entity/fox/snow_fox_sleep.png b/assets/minecraft/textures/entity/fox/snow_fox_sleep.png index c8785c77..33806bf4 100644 --- a/assets/minecraft/textures/entity/fox/snow_fox_sleep.png +++ b/assets/minecraft/textures/entity/fox/snow_fox_sleep.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3cd97c03982a957c035cc9fb1171a3884fcc67a6813eab8db955cf61c0ee8dab -size 516 +oid sha256:34bc4458c832b0267052e45fc7b2ce618eb51f4414e255a4bc0c0067a09675c8 +size 485 diff --git a/assets/minecraft/textures/entity/frog/warm_frog.png b/assets/minecraft/textures/entity/frog/warm_frog.png index d1fbb9b1..cc315216 100644 --- a/assets/minecraft/textures/entity/frog/warm_frog.png +++ b/assets/minecraft/textures/entity/frog/warm_frog.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:014dc8ef45f098e7182d15a27969e175d88816d3584fd7b61c6cd6bc09f348b6 -size 561 +oid sha256:94bddca081e4669ae4d495ed838665d41f5847a33b8546adae1972dab80a9c2b +size 534 diff --git a/assets/minecraft/textures/entity/ghast/ghast.png b/assets/minecraft/textures/entity/ghast/ghast.png index 27904d67..0112c34d 100644 --- a/assets/minecraft/textures/entity/ghast/ghast.png +++ b/assets/minecraft/textures/entity/ghast/ghast.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d64b740f378d404e5e34edda367cb4d2e86313b9ea9754f1c7e90ef0e56ea5a9 -size 506 +oid sha256:50bb277c7bd76b95501845b30d4245bd51c8169e86b819edf47627efe104bd4a +size 1045 diff --git a/assets/minecraft/textures/entity/ghast/ghast_shooting.png b/assets/minecraft/textures/entity/ghast/ghast_shooting.png index 0622c8d6..405f34ad 100644 --- a/assets/minecraft/textures/entity/ghast/ghast_shooting.png +++ b/assets/minecraft/textures/entity/ghast/ghast_shooting.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:822fe8a84f05772343e1186ddfa5cf1f5152e83fcb188214032c8d76e4ce7456 -size 561 +oid sha256:dc8e796a7df956f6cd559ec739c01c4c550776a297b18ba5162614ba7046ac56 +size 1188 diff --git a/assets/minecraft/textures/entity/ghast/happy_ghast.png b/assets/minecraft/textures/entity/ghast/happy_ghast.png new file mode 100644 index 00000000..ad0b0e66 --- /dev/null +++ b/assets/minecraft/textures/entity/ghast/happy_ghast.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fec23a33694cee117d7f63e42dde5d3fcb9a9ba3a08699105dda58cdf3f8ae97 +size 1077 diff --git a/assets/minecraft/textures/entity/ghast/happy_ghast_baby.png b/assets/minecraft/textures/entity/ghast/happy_ghast_baby.png new file mode 100644 index 00000000..21268bbf --- /dev/null +++ b/assets/minecraft/textures/entity/ghast/happy_ghast_baby.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:859021621965f9024957eda69519ec4ce50ef8891bcacbff910c1ebf0c8f2e16 +size 804 diff --git a/assets/minecraft/textures/entity/ghast/happy_ghast_ropes.png b/assets/minecraft/textures/entity/ghast/happy_ghast_ropes.png new file mode 100644 index 00000000..6f957cc5 --- /dev/null +++ b/assets/minecraft/textures/entity/ghast/happy_ghast_ropes.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2eb612547240c8ded82466dc8aa19a685b7a910f3eb22e3c8f1fe084871e0cda +size 555 diff --git a/assets/minecraft/textures/entity/goat/goat.png b/assets/minecraft/textures/entity/goat/goat.png index 42733e2c..33cdcbc9 100644 --- a/assets/minecraft/textures/entity/goat/goat.png +++ b/assets/minecraft/textures/entity/goat/goat.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9ea8a5129b13f9a275975004cf8a3a392600c7f2a8232a6731c53a7ad42eb231 -size 1044 +oid sha256:f6a9cf9283aed6862515c9c8d3f5c223e590415429fec94f9cc5c14adfc857ee +size 966 diff --git a/assets/minecraft/textures/entity/guardian.png b/assets/minecraft/textures/entity/guardian.png index e1c8fc69..d795e6b3 100644 --- a/assets/minecraft/textures/entity/guardian.png +++ b/assets/minecraft/textures/entity/guardian.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5e739df96ef9a3c13b0be0878fc2b17ea04ddb3fd3b1e844cf04e032abcc2e41 -size 1114 +oid sha256:c380cd88ced49e0496d293b9527dc49dce4946a358aea9eff588f4756732053d +size 1016 diff --git a/assets/minecraft/textures/entity/guardian_beam.png b/assets/minecraft/textures/entity/guardian_beam.png index df9bdabb..b6381fa9 100644 --- a/assets/minecraft/textures/entity/guardian_beam.png +++ b/assets/minecraft/textures/entity/guardian_beam.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b64459ca6b401bbe92210fe5e9580aea7a33b36b54f0cb0949437e0e04bd7029 -size 660 +oid sha256:408a473ce3ed9130e4229ffef4817d4ae8888fc0b268f33c479073578d0d9a90 +size 246 diff --git a/assets/minecraft/textures/entity/guardian_elder.png b/assets/minecraft/textures/entity/guardian_elder.png index 03d74677..5779217a 100644 --- a/assets/minecraft/textures/entity/guardian_elder.png +++ b/assets/minecraft/textures/entity/guardian_elder.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:748e70ae6efdd4ded9eabc0570c887dd51dbb763f0b01674dc3f31d01983f0ef -size 1088 +oid sha256:6aa3da2530a53c4c9d1a63ada991773e56260090d57bee5aad643f73fc11739a +size 965 diff --git a/assets/minecraft/textures/entity/hoglin/hoglin.png b/assets/minecraft/textures/entity/hoglin/hoglin.png index 880f498c..75348291 100644 --- a/assets/minecraft/textures/entity/hoglin/hoglin.png +++ b/assets/minecraft/textures/entity/hoglin/hoglin.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3e3f5316ee2e70ebec68ca381f49b964ebe090c6e15faaf21eed8f5997ba5e1f -size 1714 +oid sha256:6cdc76cc3f9c5510d5f3a28ea52b55c8c7418815fa09dc8ad50a58925590da11 +size 1700 diff --git a/assets/minecraft/textures/entity/hoglin/zoglin.png b/assets/minecraft/textures/entity/hoglin/zoglin.png index 21191e24..18202daf 100644 --- a/assets/minecraft/textures/entity/hoglin/zoglin.png +++ b/assets/minecraft/textures/entity/hoglin/zoglin.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a494ee0a4ffa8976ae34544ba9084158214214c2eb990428d268b044775bf00b -size 2157 +oid sha256:c9362df5e8e7e52f46f32433a94123a96d2c9bf4fef3c628f06f402c90588f76 +size 2086 diff --git a/assets/minecraft/textures/entity/horse/donkey.png b/assets/minecraft/textures/entity/horse/donkey.png index 6cf9d9f9..8660f30c 100644 --- a/assets/minecraft/textures/entity/horse/donkey.png +++ b/assets/minecraft/textures/entity/horse/donkey.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d834e6a98697f8b7c2a78ad1f648aa91696f6bec1b653a1edb918f13bbc666ca -size 1194 +oid sha256:2d9870bd03682bcc5f980f83094aa78fdb59d8c099c466030fae7fefb570039a +size 1155 diff --git a/assets/minecraft/textures/entity/horse/horse_brown.png b/assets/minecraft/textures/entity/horse/horse_brown.png index 14db5854..3873884a 100644 --- a/assets/minecraft/textures/entity/horse/horse_brown.png +++ b/assets/minecraft/textures/entity/horse/horse_brown.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3930cbd4620439e8f83c674f1729f49ec4f21205de5205a96d90bcf86e092830 -size 998 +oid sha256:5d2cf500dea09acc4e7fb996fc402735caf57f62b747d9ed62ea6b204b91a549 +size 911 diff --git a/assets/minecraft/textures/entity/horse/horse_chestnut.png b/assets/minecraft/textures/entity/horse/horse_chestnut.png index 2a63e12b..312bf955 100644 --- a/assets/minecraft/textures/entity/horse/horse_chestnut.png +++ b/assets/minecraft/textures/entity/horse/horse_chestnut.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8fac7f1ae4212dca54f21a1795b239a4f6dcbe2d487b956bfc2e653393194ecd -size 1059 +oid sha256:1f212b36bf3a6d744f1065b46e1992f2f1fcc1d1992b07b47de7daac8c76268f +size 951 diff --git a/assets/minecraft/textures/entity/horse/horse_creamy.png b/assets/minecraft/textures/entity/horse/horse_creamy.png index e194fec1..6213ff09 100644 --- a/assets/minecraft/textures/entity/horse/horse_creamy.png +++ b/assets/minecraft/textures/entity/horse/horse_creamy.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:109260e147deb23bb1867d32dee6ceda6c419ad06ca0319a09598b500ed167ff -size 1116 +oid sha256:a73b52ba4ee268e338c5600ffc7c08537c5c4990c81ef69afe01ed9b4ef5d5a1 +size 1023 diff --git a/assets/minecraft/textures/entity/horse/horse_markings_blackdots.png b/assets/minecraft/textures/entity/horse/horse_markings_blackdots.png index 6a1b5513..21837ab7 100644 --- a/assets/minecraft/textures/entity/horse/horse_markings_blackdots.png +++ b/assets/minecraft/textures/entity/horse/horse_markings_blackdots.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e3d45c5459c57c98ba7fd8500784ff8d11d29462a9178f7f2b8d6c11b2cdc18c -size 1781 +oid sha256:d625f343fb4b685b4bb96cbe8904dd09d85e1ce2881a22bade2f97b747c2f7b1 +size 1472 diff --git a/assets/minecraft/textures/entity/horse/horse_markings_white.png b/assets/minecraft/textures/entity/horse/horse_markings_white.png index a73cff1e..96a7f045 100644 --- a/assets/minecraft/textures/entity/horse/horse_markings_white.png +++ b/assets/minecraft/textures/entity/horse/horse_markings_white.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:654e5f2f39ecee5264e5be591f6f62ba9dc09290a3a05cc4c2533e40b2237f90 -size 212 +oid sha256:b92ceca37b47c98245e8b56c49883b5093ca64adb699858ee1106848ea590fb3 +size 166 diff --git a/assets/minecraft/textures/entity/horse/horse_markings_whitedots.png b/assets/minecraft/textures/entity/horse/horse_markings_whitedots.png index 21ed1b07..c5133c7f 100644 --- a/assets/minecraft/textures/entity/horse/horse_markings_whitedots.png +++ b/assets/minecraft/textures/entity/horse/horse_markings_whitedots.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7cd78f27b695c51fca3c1143d0c24dd03d43a39efda60e4fb4c91659dc75eee4 -size 1311 +oid sha256:3b9ce9c68686260d61e2089fac66461d2c85c71386d5767be98e8d18220eaa54 +size 559 diff --git a/assets/minecraft/textures/entity/horse/horse_markings_whitefield.png b/assets/minecraft/textures/entity/horse/horse_markings_whitefield.png index a7df7e89..8488e639 100644 --- a/assets/minecraft/textures/entity/horse/horse_markings_whitefield.png +++ b/assets/minecraft/textures/entity/horse/horse_markings_whitefield.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b59e16988e84ea42eb96b913c0b803700e2c39a54a3da596f29180f7ee4ebd01 -size 1411 +oid sha256:1d06d88d6d7908215858c7a6188f61dc571bd81be7a21cd180f3f5794a595a04 +size 585 diff --git a/assets/minecraft/textures/entity/horse/horse_skeleton.png b/assets/minecraft/textures/entity/horse/horse_skeleton.png index f31d914e..0483e663 100644 --- a/assets/minecraft/textures/entity/horse/horse_skeleton.png +++ b/assets/minecraft/textures/entity/horse/horse_skeleton.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6603d27caae633947f6a0a0b8311e9659752f7343b0f97727ca10fa63693bd3d -size 762 +oid sha256:355545a452030177be6e4b3799f7e19402405460b29c08121351049793ad9ae5 +size 759 diff --git a/assets/minecraft/textures/entity/horse/horse_zombie.png b/assets/minecraft/textures/entity/horse/horse_zombie.png index a6feb1fd..0cd89d25 100644 --- a/assets/minecraft/textures/entity/horse/horse_zombie.png +++ b/assets/minecraft/textures/entity/horse/horse_zombie.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1417f923875027f42720c4116a2d1d81ea1d16fc44efede100853d5cca9ecc7a -size 1116 +oid sha256:1f56a91d98d632b04cfeea2ef503f7eb3216010fa2c443bad54efeed325f6b67 +size 1113 diff --git a/assets/minecraft/textures/entity/horse/mule.png b/assets/minecraft/textures/entity/horse/mule.png index f31af875..6f18c150 100644 --- a/assets/minecraft/textures/entity/horse/mule.png +++ b/assets/minecraft/textures/entity/horse/mule.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4b868118075c0a93621a48c68f438dff87f3911f6932442eb7fc99e588852da4 -size 1181 +oid sha256:f5533759eb7f51e437e9156d378efedd45ecaa6045933979eefcbe4f4b3e82ff +size 1141 diff --git a/assets/minecraft/textures/entity/illager/evoker.png b/assets/minecraft/textures/entity/illager/evoker.png index 4bde8c5e..b118ba24 100644 --- a/assets/minecraft/textures/entity/illager/evoker.png +++ b/assets/minecraft/textures/entity/illager/evoker.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:baad89a4314f42e237b5e217739f77679e25db09cbe9b3b71df93c3e207f5404 -size 828 +oid sha256:34c0b8e60888982bbfb187ebd99e1b0ae70252235c6246ca767ff450c4211435 +size 714 diff --git a/assets/minecraft/textures/entity/illager/evoker_fangs.png b/assets/minecraft/textures/entity/illager/evoker_fangs.png index 69332a59..f25c3c50 100644 --- a/assets/minecraft/textures/entity/illager/evoker_fangs.png +++ b/assets/minecraft/textures/entity/illager/evoker_fangs.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8cede786b18b861b0630a4608e56fdd296931b5a01234be7cbd0bb4d877e5d89 -size 448 +oid sha256:ba286aa7aa1413368bc3ae2a9a9b2ba49c270d7c7ab6b51408a9ccfe21c7bbfc +size 391 diff --git a/assets/minecraft/textures/entity/illager/illusioner.png b/assets/minecraft/textures/entity/illager/illusioner.png index b3dea545..0bd269c9 100644 --- a/assets/minecraft/textures/entity/illager/illusioner.png +++ b/assets/minecraft/textures/entity/illager/illusioner.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3e5e5cdbe90df681aea13af202c520ac289b826f859345688b3a5589784b33c6 -size 1205 +oid sha256:f43b9eecec0f7c846f673297c5ceff16b091359c589b8646abf82c5308bbfa75 +size 1019 diff --git a/assets/minecraft/textures/entity/illager/pillager.png b/assets/minecraft/textures/entity/illager/pillager.png index a125d556..14528141 100644 --- a/assets/minecraft/textures/entity/illager/pillager.png +++ b/assets/minecraft/textures/entity/illager/pillager.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d0caa8ff640eaa502d4641ed857b927d6a58e150fd2e7721f97a4619dfd68c1c -size 785 +oid sha256:3ab515ec1aff8db061bb887d80b4757e673b66e22259be3643ea252da83bb963 +size 761 diff --git a/assets/minecraft/textures/entity/illager/ravager.png b/assets/minecraft/textures/entity/illager/ravager.png index 805cda3b..3be1b01d 100644 --- a/assets/minecraft/textures/entity/illager/ravager.png +++ b/assets/minecraft/textures/entity/illager/ravager.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6a8ed064088ae0607611ab50b6d20f7f29c90c9d742961349e1c9ea3b865bbac -size 2421 +oid sha256:31dde5d0678b781babb511a4aae38980316935d9aa8f4073e07551a44b8638cc +size 2285 diff --git a/assets/minecraft/textures/entity/illager/vex.png b/assets/minecraft/textures/entity/illager/vex.png index 4d040d8b..3a376566 100644 --- a/assets/minecraft/textures/entity/illager/vex.png +++ b/assets/minecraft/textures/entity/illager/vex.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:db0d832a644c4c6f06cc24bc751ed3e6b1db3284ea7ccbedea648d483cc486b6 -size 382 +oid sha256:692f8906bf07f01aba5e628489542d794fb9d993f44cf3f37942a7c2eeb46e74 +size 363 diff --git a/assets/minecraft/textures/entity/iron_golem/iron_golem.png b/assets/minecraft/textures/entity/iron_golem/iron_golem.png index 56b0ed9a..9eaae0f8 100644 --- a/assets/minecraft/textures/entity/iron_golem/iron_golem.png +++ b/assets/minecraft/textures/entity/iron_golem/iron_golem.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:381bdfed52c5b82fcad3fb0090c5e8c093adf6c335cb4b0e5f68d7ac8c05ab07 -size 1924 +oid sha256:37b8337e08ce66f82218b332fc6059795389f3d59836cfb3108d458190e20416 +size 1923 diff --git a/assets/minecraft/textures/entity/iron_golem/iron_golem_crackiness_high.png b/assets/minecraft/textures/entity/iron_golem/iron_golem_crackiness_high.png index ec75bbf7..60828e55 100644 --- a/assets/minecraft/textures/entity/iron_golem/iron_golem_crackiness_high.png +++ b/assets/minecraft/textures/entity/iron_golem/iron_golem_crackiness_high.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:271ce45038ad849ebdd1492c8eeee03a6377c1e624b57544ef0a4ff7201975bd -size 944 +oid sha256:17c47555e853fee0b8dad387e9bc6997405815bf21bc7d927e8e5c06eb61dc5c +size 940 diff --git a/assets/minecraft/textures/entity/iron_golem/iron_golem_crackiness_low.png b/assets/minecraft/textures/entity/iron_golem/iron_golem_crackiness_low.png index fb068270..7f4137c9 100644 --- a/assets/minecraft/textures/entity/iron_golem/iron_golem_crackiness_low.png +++ b/assets/minecraft/textures/entity/iron_golem/iron_golem_crackiness_low.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3c13863d11fc11ffb473aed48fc6056903913deeb03be3ed6dde5e63cee25231 -size 991 +oid sha256:dc8831ac7e7353c547ff9bcb9791e61da610350ac504b28aca637bda8d9f76e3 +size 987 diff --git a/assets/minecraft/textures/entity/iron_golem/iron_golem_crackiness_medium.png b/assets/minecraft/textures/entity/iron_golem/iron_golem_crackiness_medium.png index e7e1d2b7..e7b0eb6a 100644 --- a/assets/minecraft/textures/entity/iron_golem/iron_golem_crackiness_medium.png +++ b/assets/minecraft/textures/entity/iron_golem/iron_golem_crackiness_medium.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cbfe9c843017fbd1432ea7d3c72a5ca53a9be0cf6bef14aaee2cc9fcc8c1b8ce -size 1157 +oid sha256:9c093768025987dc381b15f82ad831dcb3c7d8f8a23b6e11b9fd2200e1e6b642 +size 1145 diff --git a/assets/minecraft/textures/entity/lead_knot.png b/assets/minecraft/textures/entity/lead_knot.png index 6934773f..322b1ab1 100644 --- a/assets/minecraft/textures/entity/lead_knot.png +++ b/assets/minecraft/textures/entity/lead_knot.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fa1cd565f596024766847e353d4225567bbf99717fa064e696ce77410491d300 -size 361 +oid sha256:97f4927cdd793ff172903fbd8b5db57fa605c811a8efa760646fd1b9268bee25 +size 286 diff --git a/assets/minecraft/textures/entity/llama/brown.png b/assets/minecraft/textures/entity/llama/brown.png index 62517fc0..68367564 100644 --- a/assets/minecraft/textures/entity/llama/brown.png +++ b/assets/minecraft/textures/entity/llama/brown.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:25b1eea671fef05ffc02479ed36b2aaf27b31105144cec53c1d4bbd9ecd38f85 -size 1205 +oid sha256:10434eff51a2c76ac3273a882960bb89341e46a32d206a21285e6df3c0e7fc2e +size 1129 diff --git a/assets/minecraft/textures/entity/llama/creamy.png b/assets/minecraft/textures/entity/llama/creamy.png index d3f979d9..94afdc7e 100644 --- a/assets/minecraft/textures/entity/llama/creamy.png +++ b/assets/minecraft/textures/entity/llama/creamy.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3fc197a08628e657ec4021ee8d2b93b11e62fe20b17ac31fa8d5e2114adfa664 -size 1055 +oid sha256:aac32865d593a03dd39ce2b874176ef88969f5addc64c57761979b2b1bc441ab +size 1045 diff --git a/assets/minecraft/textures/entity/llama/white.png b/assets/minecraft/textures/entity/llama/white.png index 7e1074af..cd179dab 100644 --- a/assets/minecraft/textures/entity/llama/white.png +++ b/assets/minecraft/textures/entity/llama/white.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:710626e2e2d768641fd88ca910fa784722de6bca90a727c2dd433099462a2113 -size 1127 +oid sha256:ee9a1ba6b8d16f0e9c393a4df1bfddfb13a10c66c871a7aceb2b25e809416ecc +size 1079 diff --git a/assets/minecraft/textures/entity/panda/aggressive_panda.png b/assets/minecraft/textures/entity/panda/aggressive_panda.png index 91dc0e94..9b371ab8 100644 --- a/assets/minecraft/textures/entity/panda/aggressive_panda.png +++ b/assets/minecraft/textures/entity/panda/aggressive_panda.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:53bb4e1cc5c15ff61191ee8787a6f2e5c8458208ed8511d845f42a2a6bf2e02b -size 862 +oid sha256:5a323166c75c83c21e3bc1a24ada620051c7add5cedc56b86ac5ef10c6ee4928 +size 804 diff --git a/assets/minecraft/textures/entity/panda/brown_panda.png b/assets/minecraft/textures/entity/panda/brown_panda.png index 28d70eff..f8a993ae 100644 --- a/assets/minecraft/textures/entity/panda/brown_panda.png +++ b/assets/minecraft/textures/entity/panda/brown_panda.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d2a2c46e07cfe395f8b97c53c6810feed4f2fba6c3652afd50bc726a77c37bc -size 855 +oid sha256:629c61a0ecc80959f3029d263d1b0187d19f7d4e9121b61110384bbbd3647ecf +size 795 diff --git a/assets/minecraft/textures/entity/panda/lazy_panda.png b/assets/minecraft/textures/entity/panda/lazy_panda.png index 353f45bb..12c0b337 100644 --- a/assets/minecraft/textures/entity/panda/lazy_panda.png +++ b/assets/minecraft/textures/entity/panda/lazy_panda.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:97beecebebf3e934fc27be4691450337ff36a1f4899ea9fdc0f03c34dfa2dead -size 857 +oid sha256:c3d82e46e03234f28cf8402fc1c6ad11b1030e0c41b33c54100e353f43686fdb +size 794 diff --git a/assets/minecraft/textures/entity/panda/panda.png b/assets/minecraft/textures/entity/panda/panda.png index 1c3068ba..f08fa1c1 100644 --- a/assets/minecraft/textures/entity/panda/panda.png +++ b/assets/minecraft/textures/entity/panda/panda.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f830d6d3480a0178f4cd2438f5efabec84124fa69f09e9e5645fcc69a972df8a -size 858 +oid sha256:b9efb801433539cd0af600a4653441468895127a8b1807705bb2e9b7e166d2ed +size 795 diff --git a/assets/minecraft/textures/entity/panda/playful_panda.png b/assets/minecraft/textures/entity/panda/playful_panda.png index e6b2c24f..3e39c5b4 100644 --- a/assets/minecraft/textures/entity/panda/playful_panda.png +++ b/assets/minecraft/textures/entity/panda/playful_panda.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1c7b2553bd4b7ac4af1d87c65ed39d598e5eaa92a96fb3a49549c7f47616f102 -size 871 +oid sha256:0119315cf44d87869edcd9e16b49cc801abdec65637d050421ea866a5a5593ba +size 804 diff --git a/assets/minecraft/textures/entity/panda/weak_panda.png b/assets/minecraft/textures/entity/panda/weak_panda.png index caea3d8c..6603fd26 100644 --- a/assets/minecraft/textures/entity/panda/weak_panda.png +++ b/assets/minecraft/textures/entity/panda/weak_panda.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6dcdd532d1780ef28c4f7de88aa35aa8c8f8de01b6aee7a935ac07bebb5facb0 -size 886 +oid sha256:20a451228476d06cc7e114b15724e89c88f0bcf9a75779be93c5fb6f4753e06d +size 821 diff --git a/assets/minecraft/textures/entity/panda/worried_panda.png b/assets/minecraft/textures/entity/panda/worried_panda.png index 24fc874e..56c3bce2 100644 --- a/assets/minecraft/textures/entity/panda/worried_panda.png +++ b/assets/minecraft/textures/entity/panda/worried_panda.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e3f1af4e35d7489932253f8dbf9d61b1a7e743ccf353200386bf45a64978b734 -size 861 +oid sha256:b13f36c779fbe18c84fb67358424cf4bdc730350dba76d94680e55e85cd69afa +size 795 diff --git a/assets/minecraft/textures/entity/parrot/parrot_blue.png b/assets/minecraft/textures/entity/parrot/parrot_blue.png index 32bd2040..c9569385 100644 --- a/assets/minecraft/textures/entity/parrot/parrot_blue.png +++ b/assets/minecraft/textures/entity/parrot/parrot_blue.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ab702146af40f5069244b39c41b3f7942830f5aac6845330a041542c3df6663c -size 549 +oid sha256:1cf9ec8ad1f8c4ae39949ca6373107f06494066555340b30a51b85e1e4f6a629 +size 535 diff --git a/assets/minecraft/textures/entity/parrot/parrot_green.png b/assets/minecraft/textures/entity/parrot/parrot_green.png index 8684ab09..a9e32b85 100644 --- a/assets/minecraft/textures/entity/parrot/parrot_green.png +++ b/assets/minecraft/textures/entity/parrot/parrot_green.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b485723f6fc8c98eaab5e0f0da56321d762693f270941ece44253a00f16d4c8c -size 491 +oid sha256:3f713e3a98034f3317bdffdeffd301b694f072d1890bab1baa13d059f3a2bdde +size 481 diff --git a/assets/minecraft/textures/entity/parrot/parrot_grey.png b/assets/minecraft/textures/entity/parrot/parrot_grey.png index ece74aca..b6abbc94 100644 --- a/assets/minecraft/textures/entity/parrot/parrot_grey.png +++ b/assets/minecraft/textures/entity/parrot/parrot_grey.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cd08ca42d82acbf71f080699ecc1e4a0c03d45503fd76c99710ea39f94f57a71 -size 355 +oid sha256:2fcb8f4c1768cea18678575f868fbe806f3650e32ac51cfad55193dca309ebca +size 342 diff --git a/assets/minecraft/textures/entity/parrot/parrot_red_blue.png b/assets/minecraft/textures/entity/parrot/parrot_red_blue.png index 945e0880..5c68b680 100644 --- a/assets/minecraft/textures/entity/parrot/parrot_red_blue.png +++ b/assets/minecraft/textures/entity/parrot/parrot_red_blue.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ec1855098de64da0f65ca65ee5d546ac17ed05adeb607ce4e4a32e4dacfe48b7 -size 630 +oid sha256:bfa26f4550285a6747e925342fd8a673be24d24c62b73af3ce64f3ac62ee325e +size 622 diff --git a/assets/minecraft/textures/entity/parrot/parrot_yellow_blue.png b/assets/minecraft/textures/entity/parrot/parrot_yellow_blue.png index 4602380c..884ca2f8 100644 --- a/assets/minecraft/textures/entity/parrot/parrot_yellow_blue.png +++ b/assets/minecraft/textures/entity/parrot/parrot_yellow_blue.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ee0dbf02eab57aebaeaab5143d5efc47ff9ff1b613c9050cef54969005818c2f -size 606 +oid sha256:568e68926b9db2859ce4d950f1d84874124413840ff72fc2887c76a2778e94dc +size 596 diff --git a/assets/minecraft/textures/entity/phantom.png b/assets/minecraft/textures/entity/phantom.png index d9d9ae15..29f54644 100644 --- a/assets/minecraft/textures/entity/phantom.png +++ b/assets/minecraft/textures/entity/phantom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:085d1106c0a2a94c72e16b9115fdb1820d0b0ea7e2b42ffb369fbd857b67e118 -size 672 +oid sha256:97fe36ce3dcf0ec7a1a32c59379e51a959e3963e85dd43b74751d22a2fa607fa +size 639 diff --git a/assets/minecraft/textures/entity/piglin/piglin_brute.png b/assets/minecraft/textures/entity/piglin/piglin_brute.png index a70eb785..f5dabe4a 100644 --- a/assets/minecraft/textures/entity/piglin/piglin_brute.png +++ b/assets/minecraft/textures/entity/piglin/piglin_brute.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d14fe8f62449f4eb36a67f57691faa659dbff39e1573e8c9e4161e0e833a21bc -size 1132 +oid sha256:6c93d3cc51c8ef44895db795a58a5c365200537dfee44d8b73deeb889a0678c2 +size 1131 diff --git a/assets/minecraft/textures/entity/player/slim/ari.png b/assets/minecraft/textures/entity/player/slim/ari.png index d0ceaee0..05e95ea7 100644 --- a/assets/minecraft/textures/entity/player/slim/ari.png +++ b/assets/minecraft/textures/entity/player/slim/ari.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ecf2491fbf5d7c800ef3b65afefb42b1c50246d1ca416c22e4815b59dc6d44ab -size 854 +oid sha256:448bda6817fa3894632cc11751f3f080dde917b2ad1679ed106f107984289560 +size 850 diff --git a/assets/minecraft/textures/entity/player/slim/kai.png b/assets/minecraft/textures/entity/player/slim/kai.png index a6ec2031..0c854964 100644 --- a/assets/minecraft/textures/entity/player/slim/kai.png +++ b/assets/minecraft/textures/entity/player/slim/kai.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d238ff07273d18222255094ba5b91ea72a515c70e1a886bfd4b6b5746338265b -size 1203 +oid sha256:00b90f287beba1068032ee973f8b890394a6999f9f1b6ce5db7e58ca47384760 +size 1093 diff --git a/assets/minecraft/textures/entity/player/slim/noor.png b/assets/minecraft/textures/entity/player/slim/noor.png index 0e102fd9..10ed648c 100644 --- a/assets/minecraft/textures/entity/player/slim/noor.png +++ b/assets/minecraft/textures/entity/player/slim/noor.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f83b72e1d0174a6d4b31bdaf11b775acdea8912ec7e28c59436c5237f9ca2d97 -size 824 +oid sha256:09f9306ed924b1adbb97837d4ca8d09d7057731a26cdecd2076bc8601f752589 +size 823 diff --git a/assets/minecraft/textures/entity/player/slim/steve.png b/assets/minecraft/textures/entity/player/slim/steve.png index fb740948..737f3ca4 100644 --- a/assets/minecraft/textures/entity/player/slim/steve.png +++ b/assets/minecraft/textures/entity/player/slim/steve.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f0bab3bb71c2ae97723274c7e5a76c74f483eeb7ace0805d6f5a7e9eca4c4855 -size 907 +oid sha256:1ff866cb8418b18d0052089cff27dfb90f8fc9727a8cea83e0e876819b58ce19 +size 838 diff --git a/assets/minecraft/textures/entity/player/wide/ari.png b/assets/minecraft/textures/entity/player/wide/ari.png index 576be619..d3465b5c 100644 --- a/assets/minecraft/textures/entity/player/wide/ari.png +++ b/assets/minecraft/textures/entity/player/wide/ari.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bf0d0c2e81350637a7f5f631a27c71630b2475666017dee1a9e54a17a8021295 -size 860 +oid sha256:b77bfca4ff607c1d72ad26867549fb7f0a9317c0811424a189d72cd0d47ca32a +size 859 diff --git a/assets/minecraft/textures/entity/player/wide/efe.png b/assets/minecraft/textures/entity/player/wide/efe.png index 94802d12..2ba5a998 100644 --- a/assets/minecraft/textures/entity/player/wide/efe.png +++ b/assets/minecraft/textures/entity/player/wide/efe.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2479c24630848047299bd47503484926a8485675bf28961afb543a2222fd2d53 -size 970 +oid sha256:6e2e2d07136d057997b62ed5a256a577a7678d6f0ef05a7a402cb5096a11143d +size 969 diff --git a/assets/minecraft/textures/entity/player/wide/kai.png b/assets/minecraft/textures/entity/player/wide/kai.png index 7f3da90f..fafe4f07 100644 --- a/assets/minecraft/textures/entity/player/wide/kai.png +++ b/assets/minecraft/textures/entity/player/wide/kai.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ae2f5f23c83a01761242f264eeb0b7e2e13bff0409c5191f7a97ecb608afab2f -size 1216 +oid sha256:f5b3af3440257759f074ae07b630a65195d7222241dc7af1189b954cf7fc3f76 +size 1101 diff --git a/assets/minecraft/textures/entity/player/wide/makena.png b/assets/minecraft/textures/entity/player/wide/makena.png index 689e757d..82628cb1 100644 --- a/assets/minecraft/textures/entity/player/wide/makena.png +++ b/assets/minecraft/textures/entity/player/wide/makena.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:25975682150b80a37fae76b73b7b93113ec0c11f423ac57a5442e219a2677ac9 -size 1064 +oid sha256:e58a664738d0073c348265052ab60a0ebf15f271a1b6aaeec0e47c027bc7cd0e +size 1063 diff --git a/assets/minecraft/textures/entity/player/wide/steve.png b/assets/minecraft/textures/entity/player/wide/steve.png index 4ee221e1..ca00d6e5 100644 --- a/assets/minecraft/textures/entity/player/wide/steve.png +++ b/assets/minecraft/textures/entity/player/wide/steve.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d876e0c88f4b3de71040966ed94a614f315b888592b520b993399fd2738418d0 -size 920 +oid sha256:06628f9cef88520da742ab280a01677ce17c99717f964ed89ed791673121094c +size 848 diff --git a/assets/minecraft/textures/entity/player/wide/zuri.png b/assets/minecraft/textures/entity/player/wide/zuri.png index df2d0287..b4cfe855 100644 --- a/assets/minecraft/textures/entity/player/wide/zuri.png +++ b/assets/minecraft/textures/entity/player/wide/zuri.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:573a2738cfcfd4a636e4b34cbf7f3702f230440133699c504ad26d3424ebf419 -size 895 +oid sha256:adc7f1b62cdf791096493d14c3edc8b36fd940e4bf10093fc48f461b0f0a3dba +size 890 diff --git a/assets/minecraft/textures/entity/projectiles/arrow.png b/assets/minecraft/textures/entity/projectiles/arrow.png index 61006abc..fa7c0c9b 100644 --- a/assets/minecraft/textures/entity/projectiles/arrow.png +++ b/assets/minecraft/textures/entity/projectiles/arrow.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4208c5d953ebaa8451c502275309759363592fbf21e3896854babc2c569874fa -size 189 +oid sha256:4020078eead4776e857ca87090cdfff68261fdfab3c542807685f23007e39f67 +size 186 diff --git a/assets/minecraft/textures/entity/projectiles/spectral_arrow.png b/assets/minecraft/textures/entity/projectiles/spectral_arrow.png index 6e003438..213c8e01 100644 --- a/assets/minecraft/textures/entity/projectiles/spectral_arrow.png +++ b/assets/minecraft/textures/entity/projectiles/spectral_arrow.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4cd81c03e8e3229b646e334a70301dfeda7d92307261510da0f3e1c97c995e01 -size 170 +oid sha256:3592d251073ac544b5e773976a644b99dab3afd73c83cbd78866b01a04fe2dee +size 169 diff --git a/assets/minecraft/textures/entity/projectiles/tipped_arrow.png b/assets/minecraft/textures/entity/projectiles/tipped_arrow.png index 6f0a24f9..fa7c0c9b 100644 --- a/assets/minecraft/textures/entity/projectiles/tipped_arrow.png +++ b/assets/minecraft/textures/entity/projectiles/tipped_arrow.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:98db9e24851f1cb3ab8bf67a7858d0b7765f58eb4bec7276d60233ee5a53af68 -size 189 +oid sha256:4020078eead4776e857ca87090cdfff68261fdfab3c542807685f23007e39f67 +size 186 diff --git a/assets/minecraft/textures/entity/projectiles/wind_charge.png b/assets/minecraft/textures/entity/projectiles/wind_charge.png index 39b9085a..4557df26 100644 --- a/assets/minecraft/textures/entity/projectiles/wind_charge.png +++ b/assets/minecraft/textures/entity/projectiles/wind_charge.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f7bef44ee741e83540f538c442cf1f72e9c4123c5bd8d02a67c160263417ff3b -size 210 +oid sha256:4b59f107806baca53736ca8bea66d3a1bc3bc035686ad8b25d16fd8559e66c5c +size 205 diff --git a/assets/minecraft/textures/entity/rabbit/caerbannog.png b/assets/minecraft/textures/entity/rabbit/caerbannog.png index babe75c0..3b40e9aa 100644 --- a/assets/minecraft/textures/entity/rabbit/caerbannog.png +++ b/assets/minecraft/textures/entity/rabbit/caerbannog.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8a18f35cc0d05984bab98c38357c9329f2731a39ce40255082a7764f13f3c913 -size 530 +oid sha256:fdf447e3fbe4da222b4bf5c76a4bef36dfad99e55d08f49e5123812c5a70646a +size 513 diff --git a/assets/minecraft/textures/entity/rabbit/gold.png b/assets/minecraft/textures/entity/rabbit/gold.png index c685655a..26870cf0 100644 --- a/assets/minecraft/textures/entity/rabbit/gold.png +++ b/assets/minecraft/textures/entity/rabbit/gold.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f42896eec3530993ce93cdd63f76326ed30297411f7a836224dd5aecaf696f5b -size 524 +oid sha256:b5d5afb187609e288d6d7bc31e890996a88caaf09b4bcf59a6ccfa292f5f3055 +size 519 diff --git a/assets/minecraft/textures/entity/rabbit/salt.png b/assets/minecraft/textures/entity/rabbit/salt.png index 122178ba..f68304dc 100644 --- a/assets/minecraft/textures/entity/rabbit/salt.png +++ b/assets/minecraft/textures/entity/rabbit/salt.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:323978f633010ffb17327aa5cf7bef7d658a3b061853d24cbd9719c00813dce7 -size 593 +oid sha256:424cd80360ee74ef4b118bd51e8d97f4a2b3b1b4b1fcf65748c5b6f9ebd46dc7 +size 588 diff --git a/assets/minecraft/textures/entity/rabbit/toast.png b/assets/minecraft/textures/entity/rabbit/toast.png index ca8efba7..60a1763c 100644 --- a/assets/minecraft/textures/entity/rabbit/toast.png +++ b/assets/minecraft/textures/entity/rabbit/toast.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d45db69ee2f57c2306ecd28b8d8e18aa019fe893d7b0e2b09180352c0efb7f7 -size 605 +oid sha256:5bbcca7b3b5e6556c42732d332b1c72531913d2dea6686990304bb9b862d0876 +size 598 diff --git a/assets/minecraft/textures/entity/rabbit/white.png b/assets/minecraft/textures/entity/rabbit/white.png index f3ba089d..25cf4b5f 100644 --- a/assets/minecraft/textures/entity/rabbit/white.png +++ b/assets/minecraft/textures/entity/rabbit/white.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:057910bce1d91794c2cf0994f95d720e27453d9b5b1e163997f210ff56b5f42b -size 527 +oid sha256:7be57c246af401d139aceb2d94a4e3fdf090198f4413e911f0616ee59bcb725d +size 512 diff --git a/assets/minecraft/textures/entity/rabbit/white_splotched.png b/assets/minecraft/textures/entity/rabbit/white_splotched.png index dc04366d..2d01849a 100644 --- a/assets/minecraft/textures/entity/rabbit/white_splotched.png +++ b/assets/minecraft/textures/entity/rabbit/white_splotched.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d8f69ad356c5d7c67bf666858ea27a07aeaf7928a773e2e1c3630a4211dff35f -size 636 +oid sha256:66642e840fc6442b766a078ea1bbf2fd5e67f43e38af3a64160db6a9e20e7784 +size 625 diff --git a/assets/minecraft/textures/entity/sheep/sheep.png b/assets/minecraft/textures/entity/sheep/sheep.png index 5cd2eded..9c06b16a 100644 --- a/assets/minecraft/textures/entity/sheep/sheep.png +++ b/assets/minecraft/textures/entity/sheep/sheep.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a2a0c932e5cce63fb47e61731d35a99423a74c536bbed6555b04bfef3e241080 -size 665 +oid sha256:5356607cc2b8979f00d2aafd31bdfcbbff792a6eebd6206d44733ad63ad303f9 +size 603 diff --git a/assets/minecraft/textures/entity/sheep/sheep_wool_undercoat.png b/assets/minecraft/textures/entity/sheep/sheep_wool_undercoat.png index e64865b7..7792994f 100644 --- a/assets/minecraft/textures/entity/sheep/sheep_wool_undercoat.png +++ b/assets/minecraft/textures/entity/sheep/sheep_wool_undercoat.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c954e67d69eace6cb1ffe431fda7591264f1b7c32bc2925b44ba606851e0b8b5 -size 414 +oid sha256:579f3e6d76f3651c94b1b4d9e8d8a0d9abd1be7ea7edf6223b15c76b69a95b42 +size 403 diff --git a/assets/minecraft/textures/entity/shield/base.png b/assets/minecraft/textures/entity/shield/base.png index 34a2a674..80f42d8e 100644 --- a/assets/minecraft/textures/entity/shield/base.png +++ b/assets/minecraft/textures/entity/shield/base.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:27bb84832139e41e87723fb9b49ede472527624ca0cdcc1f0b237abb589af027 -size 166 +oid sha256:f035c12b8f1f38d37a3057f9f85b67ea96ac83813c19d3d47dddb3a4a4c22c96 +size 158 diff --git a/assets/minecraft/textures/entity/shield/border.png b/assets/minecraft/textures/entity/shield/border.png index 3944a68d..d39e911e 100644 --- a/assets/minecraft/textures/entity/shield/border.png +++ b/assets/minecraft/textures/entity/shield/border.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c6fc04c177177035bf207d2bb941e45f5fd0220d07ca534aac5899c95ee6e511 -size 164 +oid sha256:958b27dc4266510369852fcc161a241911ce1f7389ca62f6d46082b88db50005 +size 141 diff --git a/assets/minecraft/textures/entity/shield/bricks.png b/assets/minecraft/textures/entity/shield/bricks.png index 4c779f60..d6c1ff45 100644 --- a/assets/minecraft/textures/entity/shield/bricks.png +++ b/assets/minecraft/textures/entity/shield/bricks.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0c5da55fb98400d68a26569ae4a79003900c78504186f4665ca7123d9e60d6a3 -size 207 +oid sha256:efbb4282bf5508e9f9c101ff28d199a6a66475b63b96a76b06b3c62236769150 +size 168 diff --git a/assets/minecraft/textures/entity/shield/circle.png b/assets/minecraft/textures/entity/shield/circle.png index f258af08..9ed699f1 100644 --- a/assets/minecraft/textures/entity/shield/circle.png +++ b/assets/minecraft/textures/entity/shield/circle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:39b318231122e42a1b02f2d157a0a7e32c4b79f6bae17f1fd61c24b9eba6e72c -size 187 +oid sha256:d388ca0294e1a841adb1a5636cf999d7bfac2fcadbb0de66e7600f164568e931 +size 116 diff --git a/assets/minecraft/textures/entity/shield/creeper.png b/assets/minecraft/textures/entity/shield/creeper.png index 7aa027ff..d70c777e 100644 --- a/assets/minecraft/textures/entity/shield/creeper.png +++ b/assets/minecraft/textures/entity/shield/creeper.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ff0f67445f01c3bdfbcb570bf39fb91fce774015f6a7ee30b382a59acd254363 -size 181 +oid sha256:a2aa58c0c2004a9bae65632f02a66afa01e4bcd570d9c11881307755941a0d78 +size 117 diff --git a/assets/minecraft/textures/entity/shield/cross.png b/assets/minecraft/textures/entity/shield/cross.png index 9b297579..ef00e528 100644 --- a/assets/minecraft/textures/entity/shield/cross.png +++ b/assets/minecraft/textures/entity/shield/cross.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef19789a2dfce8da3edca25fff530775a012567051f28c4f541677214ee12cbf -size 192 +oid sha256:4fdae382609a6f82e0ad5ad4c7603b4288cab8c760d94dbc40f101219ce3eca6 +size 150 diff --git a/assets/minecraft/textures/entity/shield/curly_border.png b/assets/minecraft/textures/entity/shield/curly_border.png index 45be7329..75429068 100644 --- a/assets/minecraft/textures/entity/shield/curly_border.png +++ b/assets/minecraft/textures/entity/shield/curly_border.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:943984794f9d6288c3b29aababe375f57338b4d0647ee6b8a39ff0c639ddd566 -size 190 +oid sha256:89902d65a14d125a11a563170c081071df08dbfd4cd8fc0546ea70c9df371272 +size 179 diff --git a/assets/minecraft/textures/entity/shield/diagonal_left.png b/assets/minecraft/textures/entity/shield/diagonal_left.png index 47e5fd07..0a08c5ba 100644 --- a/assets/minecraft/textures/entity/shield/diagonal_left.png +++ b/assets/minecraft/textures/entity/shield/diagonal_left.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e3cbba155a3707137d658ecf9e61a30d610fb2ae7665fb37490c2a8c05c46bd -size 196 +oid sha256:e53322c97759abce36c94cacbe999f6d5cef90ac28cdb9c6690dcba8e1c1c4a7 +size 162 diff --git a/assets/minecraft/textures/entity/shield/diagonal_right.png b/assets/minecraft/textures/entity/shield/diagonal_right.png index ef539011..966a066a 100644 --- a/assets/minecraft/textures/entity/shield/diagonal_right.png +++ b/assets/minecraft/textures/entity/shield/diagonal_right.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ba8fef04f8dafae40d8983f483c42c9e9cb74997e11f0130080de5f7e011254a -size 187 +oid sha256:da0b632f847885f4cc20ba6953bdb7364130130ba33706f3248069b663287389 +size 161 diff --git a/assets/minecraft/textures/entity/shield/diagonal_up_left.png b/assets/minecraft/textures/entity/shield/diagonal_up_left.png index 0d2be4de..04fa4faf 100644 --- a/assets/minecraft/textures/entity/shield/diagonal_up_left.png +++ b/assets/minecraft/textures/entity/shield/diagonal_up_left.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3dbab1a0d24e12ea6ef0a11d85dc90a4b87bf010de94e6568ab508a4a9be2add -size 187 +oid sha256:c1687b5e5aed79879b535b81cd545c8555a0abab791b8c9c8dfd869db5002e18 +size 164 diff --git a/assets/minecraft/textures/entity/shield/diagonal_up_right.png b/assets/minecraft/textures/entity/shield/diagonal_up_right.png index a82c8388..caad3112 100644 --- a/assets/minecraft/textures/entity/shield/diagonal_up_right.png +++ b/assets/minecraft/textures/entity/shield/diagonal_up_right.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e9d9c41c900926081498cbc1b2464b6f6b422def9dfe4de9e7a4eab929249ae7 -size 197 +oid sha256:ef8a7d75cd32a25fdcfa949c554a6a9cceb0030271c0c096d05178e4d7ca70bc +size 175 diff --git a/assets/minecraft/textures/entity/shield/flow.png b/assets/minecraft/textures/entity/shield/flow.png index 678b2982..f1b89174 100644 --- a/assets/minecraft/textures/entity/shield/flow.png +++ b/assets/minecraft/textures/entity/shield/flow.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:06ccfc07ecc70c6595eaa2ca3657f937dfb1317ac1f056cfffd39dba3185bfdd -size 173 +oid sha256:799e2c9b5d7a04545b188fb12af540ab1f998db8d460e45c546f82810ec994ee +size 154 diff --git a/assets/minecraft/textures/entity/shield/flower.png b/assets/minecraft/textures/entity/shield/flower.png index 36bcf65f..1fa510a5 100644 --- a/assets/minecraft/textures/entity/shield/flower.png +++ b/assets/minecraft/textures/entity/shield/flower.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aef231757d0622ad298d6a619eb990378db5583700bf1ecc8be7c9bcc69028ae -size 193 +oid sha256:478e44a361d4e5ef76b9a1d2930cff1f32aac281cbad46ff5d4071cbaeae5a7f +size 122 diff --git a/assets/minecraft/textures/entity/shield/globe.png b/assets/minecraft/textures/entity/shield/globe.png index 6a2a4971..92958178 100644 --- a/assets/minecraft/textures/entity/shield/globe.png +++ b/assets/minecraft/textures/entity/shield/globe.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:09c689d58962a0525990127cf9a38a8345425e1466e0e2d384b39f37b6901f81 -size 206 +oid sha256:ec2b3ccdc5a1cf91e27c42135be952f9e430920ae8fe664106913c9522c587b6 +size 137 diff --git a/assets/minecraft/textures/entity/shield/gradient.png b/assets/minecraft/textures/entity/shield/gradient.png index 5f90bca3..a3f2e2f1 100644 --- a/assets/minecraft/textures/entity/shield/gradient.png +++ b/assets/minecraft/textures/entity/shield/gradient.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8947914b914de7456d147e8921ba0f753fb830558afd2d4ae9944137da31ad3e -size 300 +oid sha256:ace5c4224e339725c6a6702cc788ce14c144c38cf13c2b292ec2ff24854adac9 +size 280 diff --git a/assets/minecraft/textures/entity/shield/gradient_up.png b/assets/minecraft/textures/entity/shield/gradient_up.png index 169781db..a8439beb 100644 --- a/assets/minecraft/textures/entity/shield/gradient_up.png +++ b/assets/minecraft/textures/entity/shield/gradient_up.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aeeffafde197651111128ca54960e80e454baf92cbe1fc9b9a3880ee8a4d9e7f -size 300 +oid sha256:a7d7c789c64e40f51e2afe45dbbf09b5b724d27d344c5baae99777bfe85b0051 +size 278 diff --git a/assets/minecraft/textures/entity/shield/guster.png b/assets/minecraft/textures/entity/shield/guster.png index d7e9bcc3..858541e0 100644 --- a/assets/minecraft/textures/entity/shield/guster.png +++ b/assets/minecraft/textures/entity/shield/guster.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2dc7ef488f7a9808cd8f2a29d4739833ae79a604514b440914ea84ced81d5b55 -size 153 +oid sha256:2c0c2cb5b24cfcf6f3d8d4ce08bf56fb879859630cefe651dc86192933d8d890 +size 137 diff --git a/assets/minecraft/textures/entity/shield/half_horizontal.png b/assets/minecraft/textures/entity/shield/half_horizontal.png index c1d143bb..756794e0 100644 --- a/assets/minecraft/textures/entity/shield/half_horizontal.png +++ b/assets/minecraft/textures/entity/shield/half_horizontal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:92fbb7a59e2c7a7ff802225c0a93cf06e3171257012fb4bf80b796d4b45ab772 -size 163 +oid sha256:21e30e04b84142318bec1c63d137eda5101b5f4316441f4613322b02e27a7940 +size 129 diff --git a/assets/minecraft/textures/entity/shield/half_horizontal_bottom.png b/assets/minecraft/textures/entity/shield/half_horizontal_bottom.png index 28f46aee..a0e32584 100644 --- a/assets/minecraft/textures/entity/shield/half_horizontal_bottom.png +++ b/assets/minecraft/textures/entity/shield/half_horizontal_bottom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5d8e78452426ac942d09878f1394d4dea7e67c5495963e2199d9d210dc8c16c3 -size 165 +oid sha256:a65c03c182ce8229f306007df4dd010ea878621b217c7590119c1ec83c2cc329 +size 143 diff --git a/assets/minecraft/textures/entity/shield/half_vertical.png b/assets/minecraft/textures/entity/shield/half_vertical.png index 09186b35..d0cd4dbe 100644 --- a/assets/minecraft/textures/entity/shield/half_vertical.png +++ b/assets/minecraft/textures/entity/shield/half_vertical.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f70d71b6c11ca8e5221ebc0526852205b95b3efa34f55ce702597e48711db6ed -size 170 +oid sha256:3681b185f55a41c2bdcdc265b7dbd4495b83c73c397ba73d4796ece0c1fc5a59 +size 136 diff --git a/assets/minecraft/textures/entity/shield/half_vertical_right.png b/assets/minecraft/textures/entity/shield/half_vertical_right.png index 112ef5fa..90b472ae 100644 --- a/assets/minecraft/textures/entity/shield/half_vertical_right.png +++ b/assets/minecraft/textures/entity/shield/half_vertical_right.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:61477a4c520cdb6c10e395fb7e63afdb82b16197a8cc629b0b1c613fb29ab2c7 -size 169 +oid sha256:25d84e9abe1a061515e85def3c2fff0c2b49824fd910bd72d4ff322f6d381710 +size 134 diff --git a/assets/minecraft/textures/entity/shield/mojang.png b/assets/minecraft/textures/entity/shield/mojang.png index 5474c4e5..933f871e 100644 --- a/assets/minecraft/textures/entity/shield/mojang.png +++ b/assets/minecraft/textures/entity/shield/mojang.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f24aa65bd4a9cf5ba8fd8119764248e8f4de681af6a13533e608258fb82a31da -size 201 +oid sha256:2b30896d6ecd59a4dca996c9f0f77cc3da7c04ab91b93e254940477aad47b864 +size 134 diff --git a/assets/minecraft/textures/entity/shield/piglin.png b/assets/minecraft/textures/entity/shield/piglin.png index df798251..906109f8 100644 --- a/assets/minecraft/textures/entity/shield/piglin.png +++ b/assets/minecraft/textures/entity/shield/piglin.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3b0f5f516370963baa2f3ba942971005d0e0c2d4031a54639aaeb2bacd0bfb1d -size 118 +oid sha256:0cc9ba541ca882b15c3b433c6317f2002414bc2444b4fd11d9ef4484846c63b5 +size 101 diff --git a/assets/minecraft/textures/entity/shield/rhombus.png b/assets/minecraft/textures/entity/shield/rhombus.png index 7e34bb19..a50722da 100644 --- a/assets/minecraft/textures/entity/shield/rhombus.png +++ b/assets/minecraft/textures/entity/shield/rhombus.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0ed6fcaefc62bc178adb87b645589360fdb3345b082b653cf48e5fd0d27012f4 -size 193 +oid sha256:4b0e868eb15b55bd237080a762b62873bb7f987ebc80f464f5c08fff665fce07 +size 126 diff --git a/assets/minecraft/textures/entity/shield/skull.png b/assets/minecraft/textures/entity/shield/skull.png index 12150ff3..e51c84a7 100644 --- a/assets/minecraft/textures/entity/shield/skull.png +++ b/assets/minecraft/textures/entity/shield/skull.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d31b03057c31345220282e6006327524ba7577198e5e4ac72e2dfd9f9b10f8cd -size 224 +oid sha256:5717ccee41a7e36edd1ad5cc5989b2fef191af6b70d5d31752975f1a53883ced +size 153 diff --git a/assets/minecraft/textures/entity/shield/small_stripes.png b/assets/minecraft/textures/entity/shield/small_stripes.png index f744d257..36bd0622 100644 --- a/assets/minecraft/textures/entity/shield/small_stripes.png +++ b/assets/minecraft/textures/entity/shield/small_stripes.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a73eefb80083fa3357e5197fcab20c216b9075fccaa00c60f4c539a622ec6158 -size 167 +oid sha256:7887090ee234c2a7537e7519bdb123f5622293a78c19037ebaa471372451100c +size 145 diff --git a/assets/minecraft/textures/entity/shield/square_bottom_left.png b/assets/minecraft/textures/entity/shield/square_bottom_left.png index 24c4ae68..0d32c684 100644 --- a/assets/minecraft/textures/entity/shield/square_bottom_left.png +++ b/assets/minecraft/textures/entity/shield/square_bottom_left.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6967183f3ecabddf956c5f2de09fe2947a9da4d1df235f02b7327e30a90e8199 -size 178 +oid sha256:6397c9c3e511e8d6e7212c7207439629b6affde4e6c971b57eda1213b4f8a6fb +size 130 diff --git a/assets/minecraft/textures/entity/shield/square_bottom_right.png b/assets/minecraft/textures/entity/shield/square_bottom_right.png index e83de6f5..2568d166 100644 --- a/assets/minecraft/textures/entity/shield/square_bottom_right.png +++ b/assets/minecraft/textures/entity/shield/square_bottom_right.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5e44fcf95c4817b9e7f7a16701044634143944eb3cd4cdf132a52e0b1326493e -size 182 +oid sha256:1199743ef366ffe58cef10957d2c7172d9f741165a7cbcee7335b2e70b33c0ce +size 128 diff --git a/assets/minecraft/textures/entity/shield/square_top_left.png b/assets/minecraft/textures/entity/shield/square_top_left.png index 5ecfa4d2..6bfec706 100644 --- a/assets/minecraft/textures/entity/shield/square_top_left.png +++ b/assets/minecraft/textures/entity/shield/square_top_left.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:47cdaaf7127d871e530ee6354eb8283161cbb437c570f0870b86b612c72ffa9a -size 181 +oid sha256:8bfa5fe5d5688dfdf3468e8684db067b1d9157f915502a5542393753fd9f885e +size 120 diff --git a/assets/minecraft/textures/entity/shield/square_top_right.png b/assets/minecraft/textures/entity/shield/square_top_right.png index a7a6db76..1e84a845 100644 --- a/assets/minecraft/textures/entity/shield/square_top_right.png +++ b/assets/minecraft/textures/entity/shield/square_top_right.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:45fcb4b60b5206254e1937a96a0a7bcd393a92562b7a0c76c4eccc6b5d5b2946 -size 184 +oid sha256:0d3921a9deb894a8892d76fc600bc7c8e75b9ff3d77e77bc67fb75beed654cc4 +size 124 diff --git a/assets/minecraft/textures/entity/shield/straight_cross.png b/assets/minecraft/textures/entity/shield/straight_cross.png index f4e6393a..6e54c7b4 100644 --- a/assets/minecraft/textures/entity/shield/straight_cross.png +++ b/assets/minecraft/textures/entity/shield/straight_cross.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:07edaa137b75297c2586938b2d23c6ca743b4ac72f880c3e2a8740305ea210d9 -size 181 +oid sha256:c8fac83b08f2f6cead720799fae364f16b7c3bbbae74505c7a46e02f3b3856c5 +size 127 diff --git a/assets/minecraft/textures/entity/shield/stripe_bottom.png b/assets/minecraft/textures/entity/shield/stripe_bottom.png index 4ac167e2..26a7dcad 100644 --- a/assets/minecraft/textures/entity/shield/stripe_bottom.png +++ b/assets/minecraft/textures/entity/shield/stripe_bottom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e9d3b6e2374230aba71d5d27565ce911c437e9b344c7047eaeafe04b63922020 -size 170 +oid sha256:4ce821f369553ba635a5fb1c1e1c0ab82689bebb915f099a6cf72f7fdaa71154 +size 142 diff --git a/assets/minecraft/textures/entity/shield/stripe_center.png b/assets/minecraft/textures/entity/shield/stripe_center.png index bc6fd9e6..74e3e061 100644 --- a/assets/minecraft/textures/entity/shield/stripe_center.png +++ b/assets/minecraft/textures/entity/shield/stripe_center.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d4d0142d23a3aca18183926e8cb9745a3874477b73ae706123072af8fe58581b -size 175 +oid sha256:8347256cd087497be7d3a3ddc7309ebe4a436672c9b0296a22071b2d0a2b2da5 +size 128 diff --git a/assets/minecraft/textures/entity/shield/stripe_downleft.png b/assets/minecraft/textures/entity/shield/stripe_downleft.png index 8317ccd9..20a1fa9b 100644 --- a/assets/minecraft/textures/entity/shield/stripe_downleft.png +++ b/assets/minecraft/textures/entity/shield/stripe_downleft.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6e7ad875cc8ccc100caa29088b156d33b26d9fee3ab24bc453dee9bb10a974ea -size 198 +oid sha256:6cb21850d46a7626b789947e765c78be558b6e622189e89249167a37891a773d +size 136 diff --git a/assets/minecraft/textures/entity/shield/stripe_downright.png b/assets/minecraft/textures/entity/shield/stripe_downright.png index 6a926121..69b6a9e4 100644 --- a/assets/minecraft/textures/entity/shield/stripe_downright.png +++ b/assets/minecraft/textures/entity/shield/stripe_downright.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:00d86c2ec94f1218661544b021c716425fcffde13492220a16c8b794fe333394 -size 189 +oid sha256:da24c0a350b43fcc7d82c52f74f5bf1e5bf1b6a3f19a0c1e350d5d8f2190bd84 +size 133 diff --git a/assets/minecraft/textures/entity/shield/stripe_left.png b/assets/minecraft/textures/entity/shield/stripe_left.png index d8a272b2..ac51043b 100644 --- a/assets/minecraft/textures/entity/shield/stripe_left.png +++ b/assets/minecraft/textures/entity/shield/stripe_left.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ab13e004b679322b93a3d6e19ce880eb93b7c48332b4e6bc8d58e0c3bf23f535 -size 175 +oid sha256:70e73033ad6e5f5ca5a75f7367a589327f0361173dbc3f08b3aa44f02468f753 +size 139 diff --git a/assets/minecraft/textures/entity/shield/stripe_middle.png b/assets/minecraft/textures/entity/shield/stripe_middle.png index 5641614c..b8ca8df7 100644 --- a/assets/minecraft/textures/entity/shield/stripe_middle.png +++ b/assets/minecraft/textures/entity/shield/stripe_middle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:746c5653c3c619d99ea3e93a10510169ac652caa750e3b591c934429d2c363c4 -size 180 +oid sha256:9a549ba8b69bea819cde9cd24a4b9294cde5efb5bec3b15c4ac05105fc202948 +size 117 diff --git a/assets/minecraft/textures/entity/shield/stripe_right.png b/assets/minecraft/textures/entity/shield/stripe_right.png index f8b1c295..3a07e85e 100644 --- a/assets/minecraft/textures/entity/shield/stripe_right.png +++ b/assets/minecraft/textures/entity/shield/stripe_right.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3826b4f02ffdf8e0e3cfa59c5bd360bc1ba9712afb7c72b115e9e65208abaf44 -size 173 +oid sha256:b06d837cd60c03e714bb28674d00d829059e9b3ae5fdfc72f2b1bf04e3eca81a +size 136 diff --git a/assets/minecraft/textures/entity/shield/stripe_top.png b/assets/minecraft/textures/entity/shield/stripe_top.png index 409473d3..7a575443 100644 --- a/assets/minecraft/textures/entity/shield/stripe_top.png +++ b/assets/minecraft/textures/entity/shield/stripe_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7ee8cc81cefd5213c9a1fb03e415af68c93737ecdffb36b362e426bd6fd35b8e -size 168 +oid sha256:ab341fec83ca675a69c19a39625fd404fbcb040023cebf40d9aeb4483a4c0c32 +size 130 diff --git a/assets/minecraft/textures/entity/shield/triangle_bottom.png b/assets/minecraft/textures/entity/shield/triangle_bottom.png index e35766b0..3aaae424 100644 --- a/assets/minecraft/textures/entity/shield/triangle_bottom.png +++ b/assets/minecraft/textures/entity/shield/triangle_bottom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:27a5cb8bbc949e3dac06b9cc55d090ae4f1c476fdd8f47fc83cc6ff3f362b822 -size 187 +oid sha256:9a1ca4b3b1d5ea80120ad23e49e78151ef89e12b9f4bcd9bdb70c6bd88cd7e1d +size 149 diff --git a/assets/minecraft/textures/entity/shield/triangle_top.png b/assets/minecraft/textures/entity/shield/triangle_top.png index 913e1572..38fb62dc 100644 --- a/assets/minecraft/textures/entity/shield/triangle_top.png +++ b/assets/minecraft/textures/entity/shield/triangle_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:613a47e22bf71db520194c5c58514a0bddce4b43f4a579d0bd72f3abbc8bd591 -size 183 +oid sha256:688f0d424e93efab85973fc0cc25ddd328afc74696dc670995f31bf72a30eff2 +size 142 diff --git a/assets/minecraft/textures/entity/shield/triangles_bottom.png b/assets/minecraft/textures/entity/shield/triangles_bottom.png index 92197e1b..3ab982b9 100644 --- a/assets/minecraft/textures/entity/shield/triangles_bottom.png +++ b/assets/minecraft/textures/entity/shield/triangles_bottom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1e3d8231849ff43de1ee488d0794e810245a9aaf849fb9ac10ab90a5f355c182 -size 184 +oid sha256:eb4593770eaf09739a817cac7477ea25b37e7d513431e5965f097e3f4f4208c6 +size 136 diff --git a/assets/minecraft/textures/entity/shield/triangles_top.png b/assets/minecraft/textures/entity/shield/triangles_top.png index a161e6cb..08721685 100644 --- a/assets/minecraft/textures/entity/shield/triangles_top.png +++ b/assets/minecraft/textures/entity/shield/triangles_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4d502f813c8b8460f3efc62121183636adcdb83feba81a2675213f39f18c17e6 -size 179 +oid sha256:508828679b9638794d603c449e791811a06bdb06360b307c9d28773402083694 +size 129 diff --git a/assets/minecraft/textures/entity/shield_base.png b/assets/minecraft/textures/entity/shield_base.png index f0448f67..cde77688 100644 --- a/assets/minecraft/textures/entity/shield_base.png +++ b/assets/minecraft/textures/entity/shield_base.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bcaa12353fec79542459ad2161081f61919a358887eb4ffc8b7c021aee869edd -size 547 +oid sha256:dbd277c354e8411a37180e076e4514349d0d402c2bdea73500298b748146aa9f +size 393 diff --git a/assets/minecraft/textures/entity/shield_base_nopattern.png b/assets/minecraft/textures/entity/shield_base_nopattern.png index bda90413..14883075 100644 --- a/assets/minecraft/textures/entity/shield_base_nopattern.png +++ b/assets/minecraft/textures/entity/shield_base_nopattern.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c7bf1836060d647130d60dda3a3a3fb91f7c8f5a4fc96dc675493ecc9fcd6a8d -size 605 +oid sha256:08aa1d4f2eebb31f657f34dfa969c801990500800eb4956ee3eb6dce73e54787 +size 411 diff --git a/assets/minecraft/textures/entity/shulker/shulker.png b/assets/minecraft/textures/entity/shulker/shulker.png index 041daefa..ec1febb0 100644 --- a/assets/minecraft/textures/entity/shulker/shulker.png +++ b/assets/minecraft/textures/entity/shulker/shulker.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:17801bf0cacc73e7f21027d222818cac87a620bf6517a5d7974e618943b6d831 -size 1442 +oid sha256:0d89ea9689d831b3af581da2994de5fcd95b377413d7f1f0ca01a8be60c9c4f0 +size 1414 diff --git a/assets/minecraft/textures/entity/shulker/shulker_black.png b/assets/minecraft/textures/entity/shulker/shulker_black.png index 79217fa1..fcffb6c3 100644 --- a/assets/minecraft/textures/entity/shulker/shulker_black.png +++ b/assets/minecraft/textures/entity/shulker/shulker_black.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b85c32d7339c9b59dbd88dbf4fddcdd5452c781700fb8307b04d30d3634252a9 -size 1031 +oid sha256:a7f9019bd3faadd696b25b8bdfc9f10c96358e4bf513bed7225c6d9db5737473 +size 977 diff --git a/assets/minecraft/textures/entity/shulker/shulker_blue.png b/assets/minecraft/textures/entity/shulker/shulker_blue.png index 10007ae3..514ef4fa 100644 --- a/assets/minecraft/textures/entity/shulker/shulker_blue.png +++ b/assets/minecraft/textures/entity/shulker/shulker_blue.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dd15914f78d0db5f2b8124db6da716c08eb140f5e8c52b1e0298d0e3c1860c8b -size 1115 +oid sha256:bad411efa16534b1c2750906d3e226e97abea3108cb23520ca0fff75610d3d22 +size 1065 diff --git a/assets/minecraft/textures/entity/shulker/shulker_brown.png b/assets/minecraft/textures/entity/shulker/shulker_brown.png index 6b69935f..b3dde288 100644 --- a/assets/minecraft/textures/entity/shulker/shulker_brown.png +++ b/assets/minecraft/textures/entity/shulker/shulker_brown.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dbfc96329515be56862b7fbb0aad920490f1b55de8fea92650a4403849bf858b -size 1147 +oid sha256:a3b113cab9c00a0737de9a8c7e5e09a6b16f56ac3124f1c00847a23902a8d358 +size 1093 diff --git a/assets/minecraft/textures/entity/shulker/shulker_cyan.png b/assets/minecraft/textures/entity/shulker/shulker_cyan.png index 3af46eba..66d9a841 100644 --- a/assets/minecraft/textures/entity/shulker/shulker_cyan.png +++ b/assets/minecraft/textures/entity/shulker/shulker_cyan.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f810559397a3d189200862c83d08ed509372392273eb1e16517479c153feb8f1 -size 1114 +oid sha256:a09486ff0c866ee1802ca57d38ea218c772b5c1d2ab1d4e7d7031932c37209e4 +size 1062 diff --git a/assets/minecraft/textures/entity/shulker/shulker_gray.png b/assets/minecraft/textures/entity/shulker/shulker_gray.png index 59a63d6b..4990de19 100644 --- a/assets/minecraft/textures/entity/shulker/shulker_gray.png +++ b/assets/minecraft/textures/entity/shulker/shulker_gray.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:903fba428da8daa9af2abdcb858e11630ddd9f0dc9d5ee2f17f60809427689e2 -size 1096 +oid sha256:1d9b4b7b76f2ad3701d6ed14e855e6d5e4dcaa6c3c279df3c7ab53182a3eda99 +size 1046 diff --git a/assets/minecraft/textures/entity/shulker/shulker_green.png b/assets/minecraft/textures/entity/shulker/shulker_green.png index 3d7796aa..4714e582 100644 --- a/assets/minecraft/textures/entity/shulker/shulker_green.png +++ b/assets/minecraft/textures/entity/shulker/shulker_green.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef105d5c6c7aa0e6f6685d01c2831a1e456638f849542d2c9724801b2de08e9d -size 1106 +oid sha256:ad18d2547e591a976b7c53ac787df282222e00898224dcb5e32fe6235214b805 +size 1052 diff --git a/assets/minecraft/textures/entity/shulker/shulker_light_blue.png b/assets/minecraft/textures/entity/shulker/shulker_light_blue.png index c26fe693..346976e1 100644 --- a/assets/minecraft/textures/entity/shulker/shulker_light_blue.png +++ b/assets/minecraft/textures/entity/shulker/shulker_light_blue.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:91434b604c7620ffb2253e18410e87de5361a6f9fa3785a4e87b6a882460a2b8 -size 1110 +oid sha256:023d01ef26bca5cba9a3a36926ddcbe39e61268baaa1ad1622898215b388afb0 +size 1060 diff --git a/assets/minecraft/textures/entity/shulker/shulker_light_gray.png b/assets/minecraft/textures/entity/shulker/shulker_light_gray.png index dc61a81e..49b7d53d 100644 --- a/assets/minecraft/textures/entity/shulker/shulker_light_gray.png +++ b/assets/minecraft/textures/entity/shulker/shulker_light_gray.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:52e2e998e9279b4358c1053c823f0996561a7c89f9cfc77aedb591be403c9a84 -size 1106 +oid sha256:25d5bba1a4a54efea9aaf4e4569a6fe425626b643aef4c33e18553cffdf5b86d +size 1054 diff --git a/assets/minecraft/textures/entity/shulker/shulker_lime.png b/assets/minecraft/textures/entity/shulker/shulker_lime.png index 3c29e96b..a4688e10 100644 --- a/assets/minecraft/textures/entity/shulker/shulker_lime.png +++ b/assets/minecraft/textures/entity/shulker/shulker_lime.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b1d6c267bd2a88fbebd30754054dc02ff5cc8ac47a71d5559e41b88b5fafb0b5 -size 1160 +oid sha256:a378cd2942ed96826a6c7d97c4ee69222b9cb67454cf0add6d9755d15687fd31 +size 1107 diff --git a/assets/minecraft/textures/entity/shulker/shulker_magenta.png b/assets/minecraft/textures/entity/shulker/shulker_magenta.png index 54e87645..96b964be 100644 --- a/assets/minecraft/textures/entity/shulker/shulker_magenta.png +++ b/assets/minecraft/textures/entity/shulker/shulker_magenta.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ceddabfda82060f82bc7e4251e2f8c80c4930a2f0c60a77c7003245e8d67c449 -size 1143 +oid sha256:7c63df6af91dcfdfc7d187c9e0e2aedd5172089089d227dbd2f6ae537bf6ee07 +size 1094 diff --git a/assets/minecraft/textures/entity/shulker/shulker_orange.png b/assets/minecraft/textures/entity/shulker/shulker_orange.png index c0ab66f8..c85921bc 100644 --- a/assets/minecraft/textures/entity/shulker/shulker_orange.png +++ b/assets/minecraft/textures/entity/shulker/shulker_orange.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:782f0f84a7cb73724c2965088ea934010fed7a7202f81a97419d8d75e13c0e4d -size 1179 +oid sha256:21b1edb0931f97fdfc82ea170bfb262e5f1c6ef4f5a9cf168558023d1c42d922 +size 1126 diff --git a/assets/minecraft/textures/entity/shulker/shulker_pink.png b/assets/minecraft/textures/entity/shulker/shulker_pink.png index 40f5bdd4..f7ff9f16 100644 --- a/assets/minecraft/textures/entity/shulker/shulker_pink.png +++ b/assets/minecraft/textures/entity/shulker/shulker_pink.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5083db83d28a2bcc6591b01813cca20f22fd0d7b4e7b2bc05ef3e01b15cc4611 -size 1165 +oid sha256:ed64c6cd9dec19d3a927aa2f92822ecf612961dff7550a8e16844f53dc886fff +size 1108 diff --git a/assets/minecraft/textures/entity/shulker/shulker_purple.png b/assets/minecraft/textures/entity/shulker/shulker_purple.png index c239b469..158576ad 100644 --- a/assets/minecraft/textures/entity/shulker/shulker_purple.png +++ b/assets/minecraft/textures/entity/shulker/shulker_purple.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fd8a7e250cbe9871f1912551501f7c7cb1f738c43bf8a83b3d3247975d0b8258 -size 1111 +oid sha256:e336cf08d637af3fe0e5095a7ad20bf9bed5325e653828729a84b1d2178944aa +size 1056 diff --git a/assets/minecraft/textures/entity/shulker/shulker_red.png b/assets/minecraft/textures/entity/shulker/shulker_red.png index da8b39a7..f6e67ae0 100644 --- a/assets/minecraft/textures/entity/shulker/shulker_red.png +++ b/assets/minecraft/textures/entity/shulker/shulker_red.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b7fdd15b0be78d10e9e724baf822d79db68ef05fcfb9e6280b3a1ce2759b2f4a -size 1148 +oid sha256:0f1d7361cbd936ce2b7381bbf04ec4e44d40f63361a5f658f5a704f37087fb9b +size 1099 diff --git a/assets/minecraft/textures/entity/shulker/shulker_white.png b/assets/minecraft/textures/entity/shulker/shulker_white.png index 4b7bee9b..d9481d0f 100644 --- a/assets/minecraft/textures/entity/shulker/shulker_white.png +++ b/assets/minecraft/textures/entity/shulker/shulker_white.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0deb132034460f3c877082465c13d6ff77f7f7cb296baf72012458b236e4cadd -size 1134 +oid sha256:f2dabd1e837010ead60f7f9519d049746b6272cdbc97b7bd68c08f24373c4b42 +size 1085 diff --git a/assets/minecraft/textures/entity/shulker/shulker_yellow.png b/assets/minecraft/textures/entity/shulker/shulker_yellow.png index f2ce85f3..4a035f04 100644 --- a/assets/minecraft/textures/entity/shulker/shulker_yellow.png +++ b/assets/minecraft/textures/entity/shulker/shulker_yellow.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d0ae69233a35d843c1c3f6223cafcb20151d94f995ebf520d0895b698ce565d0 -size 1175 +oid sha256:e826d6a54052a32f59602d97cbb595b8ca764810b25f5365e1335c6bde0206ad +size 1121 diff --git a/assets/minecraft/textures/entity/shulker/spark.png b/assets/minecraft/textures/entity/shulker/spark.png index 4f4a0e9c..14ede7e3 100644 --- a/assets/minecraft/textures/entity/shulker/spark.png +++ b/assets/minecraft/textures/entity/shulker/spark.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4fdd3540a71b92f776b6250c9aa0674d503ad9a30c9e2b9e55e5ca0eae58d28a -size 582 +oid sha256:90d6ab4ad046acf4a2d541760543ab033f38b3f239a2495999390e6899c2aa22 +size 517 diff --git a/assets/minecraft/textures/entity/signs/crimson.png b/assets/minecraft/textures/entity/signs/crimson.png index cd333258..276d66c6 100644 --- a/assets/minecraft/textures/entity/signs/crimson.png +++ b/assets/minecraft/textures/entity/signs/crimson.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c0fd5b6af92b642d3fa3b5314d1959485a74c24d666620ce39d866c84cadf44e -size 512 +oid sha256:42642e4e55f796b60591805f3059e90da201f0f7d5f835e3cd44e617ac6cf6c1 +size 510 diff --git a/assets/minecraft/textures/entity/silverfish.png b/assets/minecraft/textures/entity/silverfish.png index e358294d..014c629f 100644 --- a/assets/minecraft/textures/entity/silverfish.png +++ b/assets/minecraft/textures/entity/silverfish.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:57b486d8b68a130217123c5a9fd92c43c84ec34ff6c2cc44d5ca97fd0bbacbc2 -size 939 +oid sha256:be4837e2c8bd3b0bf1d9631c15fdfd8dee85882b84772bf7649438ea90c6ff83 +size 730 diff --git a/assets/minecraft/textures/entity/skeleton/bogged.png b/assets/minecraft/textures/entity/skeleton/bogged.png index 33d1f397..ad48af8d 100644 --- a/assets/minecraft/textures/entity/skeleton/bogged.png +++ b/assets/minecraft/textures/entity/skeleton/bogged.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ca3b2f30c6ba53b0c6f88a37e6527e65b11e2c3ab453331d8d1dbefcf065f39f -size 820 +oid sha256:1097acbb1baeb1ff9cdb323bd925b077d10fbc42ccbcb9bd1233e9f1791a3a79 +size 817 diff --git a/assets/minecraft/textures/entity/skeleton/skeleton.png b/assets/minecraft/textures/entity/skeleton/skeleton.png index 01dee9df..8a081518 100644 --- a/assets/minecraft/textures/entity/skeleton/skeleton.png +++ b/assets/minecraft/textures/entity/skeleton/skeleton.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:66524aa68d4e94fd3117df9b6e40cb48da5526e24a7f079c2c4852bca0d1c20e -size 518 +oid sha256:854dd39acb1d8852db3b9e5d3d2bdc032070e37f421b53661ff48d0c1ddf290a +size 477 diff --git a/assets/minecraft/textures/entity/skeleton/stray.png b/assets/minecraft/textures/entity/skeleton/stray.png index 38316b41..5858c1ed 100644 --- a/assets/minecraft/textures/entity/skeleton/stray.png +++ b/assets/minecraft/textures/entity/skeleton/stray.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:75ab5d481962e25846ce0a83f5b80718f5b8a140066f2818b0f30ecdd7371c5d -size 439 +oid sha256:d2f050b01ac0eb319d208db00f53081e2b87ce909be0468802d0ad5ba960b0e1 +size 430 diff --git a/assets/minecraft/textures/entity/skeleton/stray_overlay.png b/assets/minecraft/textures/entity/skeleton/stray_overlay.png index be951340..f50a9f7a 100644 --- a/assets/minecraft/textures/entity/skeleton/stray_overlay.png +++ b/assets/minecraft/textures/entity/skeleton/stray_overlay.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:feb0b28b90d11b9c7967a6f4438baff575cd07affb8fc99762f39d52d4e71136 -size 718 +oid sha256:0014fbd0fda580f5d3bf97c2bfd761f2ff3d07da50a3d52766c74b0ce8c35823 +size 439 diff --git a/assets/minecraft/textures/entity/skeleton/wither_skeleton.png b/assets/minecraft/textures/entity/skeleton/wither_skeleton.png index 165e4d88..1e664e35 100644 --- a/assets/minecraft/textures/entity/skeleton/wither_skeleton.png +++ b/assets/minecraft/textures/entity/skeleton/wither_skeleton.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:96e57241fa2f1414619eee8074991534ac83b6239b33875ce1fbc7e4b86f60a7 -size 565 +oid sha256:0be837feee8359ee76df0bc4ba6f423053e5683f9c7d6d553a255fe14f2b8e1d +size 496 diff --git a/assets/minecraft/textures/entity/slime/magmacube.png b/assets/minecraft/textures/entity/slime/magmacube.png index 2962d9d8..967384de 100644 --- a/assets/minecraft/textures/entity/slime/magmacube.png +++ b/assets/minecraft/textures/entity/slime/magmacube.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5a094598401348a086c7e2c17d749cd5b903b09259f96959e7937fcd0cac6968 -size 732 +oid sha256:a45640114edf6384b6b9e395b8ef57d7e1293ba7a54312f5b07c4ec3a69d689e +size 728 diff --git a/assets/minecraft/textures/entity/sniffer/sniffer.png b/assets/minecraft/textures/entity/sniffer/sniffer.png index 6b6da409..d3c36d8b 100644 --- a/assets/minecraft/textures/entity/sniffer/sniffer.png +++ b/assets/minecraft/textures/entity/sniffer/sniffer.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1b6acaeec330778c78a6e560a71373d7d6ec11116e293e8ef9cf81fb9e7c209e -size 3790 +oid sha256:b872b9cb84fd1c7bead83010f1f46f36274505cee257e78d1ee20ca19aa86017 +size 3604 diff --git a/assets/minecraft/textures/entity/spider_eyes.png b/assets/minecraft/textures/entity/spider_eyes.png index ed249d45..4e25a462 100644 --- a/assets/minecraft/textures/entity/spider_eyes.png +++ b/assets/minecraft/textures/entity/spider_eyes.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f3127b6ba40f01e1734be57c481d23d42591bc16b09355cdb11bfb8f655a2464 -size 132 +oid sha256:45bc67083660ea8257b65c849dc1bb457be7ec56ad8fe8951adc9cb221f52ecd +size 130 diff --git a/assets/minecraft/textures/entity/squid/glow_squid.png b/assets/minecraft/textures/entity/squid/glow_squid.png index dff2663f..f1fba35f 100644 --- a/assets/minecraft/textures/entity/squid/glow_squid.png +++ b/assets/minecraft/textures/entity/squid/glow_squid.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a5b837dc765b92865b6a90617329b872497648c7f503a760ebe6f6df7f86ab15 -size 709 +oid sha256:a21cf4555433f8de3f9d074ee1d7389786d5852141024f6a07094db47e319f01 +size 616 diff --git a/assets/minecraft/textures/entity/squid/squid.png b/assets/minecraft/textures/entity/squid/squid.png index 706a0d7c..32fa4a04 100644 --- a/assets/minecraft/textures/entity/squid/squid.png +++ b/assets/minecraft/textures/entity/squid/squid.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f470d0ac2ebbb38861855f1cf40f799138bb2f6c495c53c8d6edfc569944c1ae -size 408 +oid sha256:a95f135fa980a0d712d1c6b1f09327ed829ade41acf37a05695bfe4018d80fbc +size 394 diff --git a/assets/minecraft/textures/entity/strider/strider.png b/assets/minecraft/textures/entity/strider/strider.png index dc463379..b9860f19 100644 --- a/assets/minecraft/textures/entity/strider/strider.png +++ b/assets/minecraft/textures/entity/strider/strider.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7d7e1dfe5c52bddcd007ee85007cb06275fd07fb84ecb6d8e624fd9b10eeec72 -size 1081 +oid sha256:5dabf87f0a7200e36334e5a7cd592e2a2bd54d670d36a1d17994bd55b7c86a2b +size 1006 diff --git a/assets/minecraft/textures/entity/strider/strider_cold.png b/assets/minecraft/textures/entity/strider/strider_cold.png index 843c45e6..516b1b64 100644 --- a/assets/minecraft/textures/entity/strider/strider_cold.png +++ b/assets/minecraft/textures/entity/strider/strider_cold.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e852521de141a9134186757a8406bd5f3e4c47ba7cac99af85bd13c3fe54b0cb -size 1167 +oid sha256:674e1884593dbb63357132b62169ec5ca889c090fe1f2814e3928c3ca3824238 +size 1095 diff --git a/assets/minecraft/textures/entity/trident.png b/assets/minecraft/textures/entity/trident.png index c8183988..89899006 100644 --- a/assets/minecraft/textures/entity/trident.png +++ b/assets/minecraft/textures/entity/trident.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cee14236960dae0960c0d0d14e4f61cf2cade3c160887b532d5d8a9e9e6ef530 -size 278 +oid sha256:ff8283330d39aa436b43308dde31cb6990f9c776a70be460a7d25fb69aa3e25c +size 258 diff --git a/assets/minecraft/textures/entity/trident_riptide.png b/assets/minecraft/textures/entity/trident_riptide.png index 35eb3d9d..1697483e 100644 --- a/assets/minecraft/textures/entity/trident_riptide.png +++ b/assets/minecraft/textures/entity/trident_riptide.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8b0867d7fd7791f3ebe2bbd2f9637249542e91f5e1c0f99e059293127011bbe3 -size 261 +oid sha256:e3cb4d02b65deb2a2ddf6bc05eb6f5a88407a4645851491480d1846987413aba +size 182 diff --git a/assets/minecraft/textures/entity/turtle/big_sea_turtle.png b/assets/minecraft/textures/entity/turtle/big_sea_turtle.png index 0228d26c..1517d270 100644 --- a/assets/minecraft/textures/entity/turtle/big_sea_turtle.png +++ b/assets/minecraft/textures/entity/turtle/big_sea_turtle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fa434644eb95ba5ffb2780475a238e787acf2a714adb5f7b8f9df6597b07c477 -size 1205 +oid sha256:10fcf86d6f8e8a1ddcc7d9199809ac7bfe1f8d3125ee3f6799d98b0e2db86cd9 +size 1140 diff --git a/assets/minecraft/textures/entity/villager/profession/armorer.png b/assets/minecraft/textures/entity/villager/profession/armorer.png index 37b81a4e..9a4e40fc 100644 --- a/assets/minecraft/textures/entity/villager/profession/armorer.png +++ b/assets/minecraft/textures/entity/villager/profession/armorer.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f3126ad0ff497103cd75a2b79dda22accd0261abf2817bc32d245200e21d6cfc -size 790 +oid sha256:e8f45d444efd0fb1f4bf9acbc74582cf429f312456375c4b15b8dd5c715869f2 +size 757 diff --git a/assets/minecraft/textures/entity/villager/profession/butcher.png b/assets/minecraft/textures/entity/villager/profession/butcher.png index 133d874c..93450e9e 100644 --- a/assets/minecraft/textures/entity/villager/profession/butcher.png +++ b/assets/minecraft/textures/entity/villager/profession/butcher.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c6d5137fecc564cb441a972178d1585332851ec9f8efca24b4f25483a61db964 -size 665 +oid sha256:396909284395e4e681a6edc89ba517277fd26945f85168751f35765a9c866609 +size 434 diff --git a/assets/minecraft/textures/entity/villager/profession/cleric.png b/assets/minecraft/textures/entity/villager/profession/cleric.png index 30bc1de3..fa36dd35 100644 --- a/assets/minecraft/textures/entity/villager/profession/cleric.png +++ b/assets/minecraft/textures/entity/villager/profession/cleric.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0ab536de4adb5b74d8463893444c761a90cc17cff20c50746db3a995a402fb08 -size 414 +oid sha256:f81e4975f2aadf3dcd5ddae21ee513d5d7499a2efc8167495f25b433f568b5e5 +size 391 diff --git a/assets/minecraft/textures/entity/villager/profession/farmer.png b/assets/minecraft/textures/entity/villager/profession/farmer.png index 4ecb5991..50fd7ff0 100644 --- a/assets/minecraft/textures/entity/villager/profession/farmer.png +++ b/assets/minecraft/textures/entity/villager/profession/farmer.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c4270c8900d731ca64e3db74ff8f90072c1dc53439f0379a8493f6a89e9c8f82 -size 773 +oid sha256:092d5af345fe4e889d14bef43306bcca8f59871e8d4a958f6973ebb9c5baaa63 +size 497 diff --git a/assets/minecraft/textures/entity/villager/profession/fletcher.png b/assets/minecraft/textures/entity/villager/profession/fletcher.png index 6804acd9..adef1bbf 100644 --- a/assets/minecraft/textures/entity/villager/profession/fletcher.png +++ b/assets/minecraft/textures/entity/villager/profession/fletcher.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d984b04a263bab0e6370fa19ad5ff285b6334373cd92007ff74680de0ec2633f -size 597 +oid sha256:7f6d7c57b3ca85ef97db0edb4bea5ec0c47fdee9c4bab7242241a34e2d1c6d38 +size 417 diff --git a/assets/minecraft/textures/entity/villager/profession/leatherworker.png b/assets/minecraft/textures/entity/villager/profession/leatherworker.png index f87f855d..a27dc7be 100644 --- a/assets/minecraft/textures/entity/villager/profession/leatherworker.png +++ b/assets/minecraft/textures/entity/villager/profession/leatherworker.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2a432126dfc107b4320fac784b941213752c9b61cc2f1dd8b2eea1d6f1f62d4c -size 489 +oid sha256:d303fc825c8c398ca1f24719c248061c31d65d99d09f9a4b5e31c1f74c3c6352 +size 350 diff --git a/assets/minecraft/textures/entity/villager/profession/librarian.png b/assets/minecraft/textures/entity/villager/profession/librarian.png index e834fa53..b71f8f16 100644 --- a/assets/minecraft/textures/entity/villager/profession/librarian.png +++ b/assets/minecraft/textures/entity/villager/profession/librarian.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3144e846ddf68623d3d3cbf54828813e5d573892d382f68190849ce1b2ff665f -size 470 +oid sha256:d9b3ec9c9477339f597d8876960ca08bde9300672f0fc0e168ca3cc795ef5554 +size 412 diff --git a/assets/minecraft/textures/entity/villager/profession/shepherd.png b/assets/minecraft/textures/entity/villager/profession/shepherd.png index b5664679..cd2a65aa 100644 --- a/assets/minecraft/textures/entity/villager/profession/shepherd.png +++ b/assets/minecraft/textures/entity/villager/profession/shepherd.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3639f16cc2c3813c6941d85fdc18bac3e9f8c7aedd4fbad4d385894d9de788ee -size 612 +oid sha256:05de02d5d17696f70ca4ec72489bf6482e5781fbe012092ea8963cc391684422 +size 492 diff --git a/assets/minecraft/textures/entity/villager/profession/toolsmith.png b/assets/minecraft/textures/entity/villager/profession/toolsmith.png index ee797b8d..b5938a5f 100644 --- a/assets/minecraft/textures/entity/villager/profession/toolsmith.png +++ b/assets/minecraft/textures/entity/villager/profession/toolsmith.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e18f9cf8d105b084d7baaad8967c108b8372682e1e3756516b90230d571fc23e -size 756 +oid sha256:2daa7b66410985c4387ff25a64b49db54746d2cef2ef6352baee011bbd948f26 +size 539 diff --git a/assets/minecraft/textures/entity/villager/profession/weaponsmith.png b/assets/minecraft/textures/entity/villager/profession/weaponsmith.png index 57753782..f0706aca 100644 --- a/assets/minecraft/textures/entity/villager/profession/weaponsmith.png +++ b/assets/minecraft/textures/entity/villager/profession/weaponsmith.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:433c84e59254a15e9664c09409adf5cc7edf0a744fa8fca07f8c11f3286e1841 -size 1004 +oid sha256:051f9e8dc98a557cbaf0865cf24af45218432031e87f06ae9104e3fed2c65c13 +size 668 diff --git a/assets/minecraft/textures/entity/villager/profession_level/diamond.png b/assets/minecraft/textures/entity/villager/profession_level/diamond.png index b2196834..fac9e91d 100644 --- a/assets/minecraft/textures/entity/villager/profession_level/diamond.png +++ b/assets/minecraft/textures/entity/villager/profession_level/diamond.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9294d842fff92c0c3d48b53f9990e7cae53eb123440e023c62f022b6bbbd199a -size 132 +oid sha256:6f587703d5e6ee9cf3f35313f13efef3c87805f25f4bc007afccfbb6fa8d47cc +size 130 diff --git a/assets/minecraft/textures/entity/villager/profession_level/emerald.png b/assets/minecraft/textures/entity/villager/profession_level/emerald.png index c40b9f43..65596847 100644 --- a/assets/minecraft/textures/entity/villager/profession_level/emerald.png +++ b/assets/minecraft/textures/entity/villager/profession_level/emerald.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b58b86f5b3737d40db3a04a20f3fb933e05479129e744d022c62e3844caa09bb -size 135 +oid sha256:6c98eed75c025d078fecadcaf9bcf14d45fb75f4f3edcf1473698606142d72f1 +size 133 diff --git a/assets/minecraft/textures/entity/villager/profession_level/gold.png b/assets/minecraft/textures/entity/villager/profession_level/gold.png index e7344a14..1396f52d 100644 --- a/assets/minecraft/textures/entity/villager/profession_level/gold.png +++ b/assets/minecraft/textures/entity/villager/profession_level/gold.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fa3a8332d780318d0298eb4d54ef72f7066931f1561c15552a514c589bd31159 -size 132 +oid sha256:c3d2623164d7dcbf2ff3a66b437273e8a4dd71730480a1087280a4375377cdd7 +size 127 diff --git a/assets/minecraft/textures/entity/villager/type/plains.png b/assets/minecraft/textures/entity/villager/type/plains.png index b0cce716..90967b70 100644 --- a/assets/minecraft/textures/entity/villager/type/plains.png +++ b/assets/minecraft/textures/entity/villager/type/plains.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a55cbe4c976f52a3fc6b39cd1823fa3b7c71e85512fffce1650e24692e3c5c5a -size 779 +oid sha256:54ea90f039d36436afb94bdb56a4a332746d3390a483db9765e3f651c53b619d +size 686 diff --git a/assets/minecraft/textures/entity/villager/type/savanna.png b/assets/minecraft/textures/entity/villager/type/savanna.png index 8864c515..6ac7d340 100644 --- a/assets/minecraft/textures/entity/villager/type/savanna.png +++ b/assets/minecraft/textures/entity/villager/type/savanna.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:634e7945d75f6b7e98bff581a6afe5f5f7ee0d4f736a00578bf3a8f1ade57578 -size 869 +oid sha256:4032a76d4f12bcf118d3a296b5b09e0fd469b8a7f673ade854c4e2ad923b9efa +size 817 diff --git a/assets/minecraft/textures/entity/villager/type/swamp.png b/assets/minecraft/textures/entity/villager/type/swamp.png index b4ad18ab..a1b8034d 100644 --- a/assets/minecraft/textures/entity/villager/type/swamp.png +++ b/assets/minecraft/textures/entity/villager/type/swamp.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d56426f82bb9ae4e92de9d207933c1b555a5f38157bb85392725f3ea285f1eb1 -size 922 +oid sha256:2d2ef9cc4084198da06fe3a1de604f035d3d737e37b9e672acbf9bf69b7359c1 +size 907 diff --git a/assets/minecraft/textures/entity/villager/villager.png b/assets/minecraft/textures/entity/villager/villager.png index 4e1d05a8..af9c5af8 100644 --- a/assets/minecraft/textures/entity/villager/villager.png +++ b/assets/minecraft/textures/entity/villager/villager.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dca7cc3e7184572764faac9f4e517efbb47c0b0783ffa0c561a99afc7e3b77b9 -size 841 +oid sha256:ac6a775858c742fecd5dd18e8f99f308701650e770d30da97773daab92b6f5bd +size 700 diff --git a/assets/minecraft/textures/entity/warden/warden.png b/assets/minecraft/textures/entity/warden/warden.png index 77f99d1d..e52622e2 100644 --- a/assets/minecraft/textures/entity/warden/warden.png +++ b/assets/minecraft/textures/entity/warden/warden.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:244f0c7c645afc0b480deb07cb4bf1e37494ca865008853a02e45f40705d459c -size 1773 +oid sha256:399a48b649b629555749c3c348fb4bd47d0e88ba28a5bda8738725825b40006c +size 1771 diff --git a/assets/minecraft/textures/entity/warden/warden_pulsating_spots_1.png b/assets/minecraft/textures/entity/warden/warden_pulsating_spots_1.png index 6d5a98f9..509d034d 100644 --- a/assets/minecraft/textures/entity/warden/warden_pulsating_spots_1.png +++ b/assets/minecraft/textures/entity/warden/warden_pulsating_spots_1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7ecffda2459dfdfcf19938b3f87ce72580c36de1537227d1120df531606a5477 -size 207 +oid sha256:d795d76c5760e61586d6798a5f35cceaeb7dc50721b12f3530c30e9846f069fd +size 199 diff --git a/assets/minecraft/textures/entity/warden/warden_pulsating_spots_2.png b/assets/minecraft/textures/entity/warden/warden_pulsating_spots_2.png index ae774453..ea6b0aa4 100644 --- a/assets/minecraft/textures/entity/warden/warden_pulsating_spots_2.png +++ b/assets/minecraft/textures/entity/warden/warden_pulsating_spots_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cbcfd65c15c36a880c0513a4a5f12e95f35db7b7f907beba70bc8613ed8a81a4 -size 199 +oid sha256:d90d9a1b6fc516e6346b72e3b258bff9f2faffa50efc46a5da66539666cd3d9e +size 198 diff --git a/assets/minecraft/textures/entity/witch.png b/assets/minecraft/textures/entity/witch.png index 93dc4f0e..c34f4eb6 100644 --- a/assets/minecraft/textures/entity/witch.png +++ b/assets/minecraft/textures/entity/witch.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d42d8dd0f1dbafcce3535304180b0f6d22c6277cb551cf190aaa54e18ef5282a -size 1092 +oid sha256:c22f075ec24a49d3b2f108432c098d7d4b52e266b1b6da6aa5de6cda5cf01af4 +size 994 diff --git a/assets/minecraft/textures/entity/wither/wither.png b/assets/minecraft/textures/entity/wither/wither.png index c1365a81..9491e583 100644 --- a/assets/minecraft/textures/entity/wither/wither.png +++ b/assets/minecraft/textures/entity/wither/wither.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3ce19a51b824f38dfc8a3040eb2204bda59054bcf2ee43275f620c81e4faa47a -size 780 +oid sha256:586c375f7baacd8183951c2947238703c62a7666c423e596624fa665e3cb019e +size 696 diff --git a/assets/minecraft/textures/entity/wither/wither_armor.png b/assets/minecraft/textures/entity/wither/wither_armor.png index 3800181e..c6442ac2 100644 --- a/assets/minecraft/textures/entity/wither/wither_armor.png +++ b/assets/minecraft/textures/entity/wither/wither_armor.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:166617e03d668cbee0509139f9b8274a621a07a10769d1665ca212618ff2462b -size 2161 +oid sha256:60840cba227a57cacdddc337ad93f45e3304da1cebde22dec0346886e5bdda9f +size 482 diff --git a/assets/minecraft/textures/entity/wither/wither_invulnerable.png b/assets/minecraft/textures/entity/wither/wither_invulnerable.png index c3e1e2f7..d1f85e19 100644 --- a/assets/minecraft/textures/entity/wither/wither_invulnerable.png +++ b/assets/minecraft/textures/entity/wither/wither_invulnerable.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:90054e2c9f22a7aa096b105bb55acb7c4946d30a5ff8bb26d12b04aeb8c9ec03 -size 782 +oid sha256:67d666cfbef7ac6989d34b75d38ceabc3d91b996f776c916096c97709358151e +size 695 diff --git a/assets/minecraft/textures/entity/wolf/wolf.png b/assets/minecraft/textures/entity/wolf/wolf.png index a5f19f0a..6feb0197 100644 --- a/assets/minecraft/textures/entity/wolf/wolf.png +++ b/assets/minecraft/textures/entity/wolf/wolf.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b4b32521f2b6baf0f73a9d279b191e9638203a56246bc3e06ad52c4cfdde6f5d -size 1154 +oid sha256:381814ae7e143fbfefad4a5465453b47002434d2c312d10339c48dbbf4270902 +size 659 diff --git a/assets/minecraft/textures/entity/wolf/wolf_angry.png b/assets/minecraft/textures/entity/wolf/wolf_angry.png index 958d53a9..32cae95b 100644 --- a/assets/minecraft/textures/entity/wolf/wolf_angry.png +++ b/assets/minecraft/textures/entity/wolf/wolf_angry.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a2c4f1c2a55683ff278596d8e3087231e72a1fd4401d3bcadc9f365f70a153d7 -size 1341 +oid sha256:677fe3866f165122bccadc6cc78e2e0b58bd929dd13d8db0a415374468940612 +size 691 diff --git a/assets/minecraft/textures/entity/wolf/wolf_armor_crackiness_high.png b/assets/minecraft/textures/entity/wolf/wolf_armor_crackiness_high.png index fc7a9305..15b008bc 100644 --- a/assets/minecraft/textures/entity/wolf/wolf_armor_crackiness_high.png +++ b/assets/minecraft/textures/entity/wolf/wolf_armor_crackiness_high.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:928901fbe1d47a62705ba8e358c5329a6e83bc24b810692015c93b22ddb09213 -size 261 +oid sha256:4df05ed2f0d4818fbabf5747f883d8aa7ccd49e6e8b0b799d7581ab73a068381 +size 231 diff --git a/assets/minecraft/textures/entity/wolf/wolf_armor_crackiness_low.png b/assets/minecraft/textures/entity/wolf/wolf_armor_crackiness_low.png index 1bb391ff..ad616f0a 100644 --- a/assets/minecraft/textures/entity/wolf/wolf_armor_crackiness_low.png +++ b/assets/minecraft/textures/entity/wolf/wolf_armor_crackiness_low.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9a134f3f763bbca8143ef18f4ea8f2d57ac8b031332e8ce7dee741a4aa6f3ed6 -size 171 +oid sha256:cae7fd163d145136d2a49b84106f76860e502c2ebc1b40ebface21150a3dd196 +size 138 diff --git a/assets/minecraft/textures/entity/wolf/wolf_armor_crackiness_medium.png b/assets/minecraft/textures/entity/wolf/wolf_armor_crackiness_medium.png index 6b107c44..c754c8f8 100644 --- a/assets/minecraft/textures/entity/wolf/wolf_armor_crackiness_medium.png +++ b/assets/minecraft/textures/entity/wolf/wolf_armor_crackiness_medium.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:06d97d1d25ad516796ab5bf7ae40b88b6df070980d7fe1bbae240a090fcf61f1 -size 214 +oid sha256:bd8936423fe32c0a334649a1c757d484bcd64a45dc5d4960dfdd2abea39c50d9 +size 178 diff --git a/assets/minecraft/textures/entity/wolf/wolf_ashen.png b/assets/minecraft/textures/entity/wolf/wolf_ashen.png index 6bc5fe4f..07dfebf7 100644 --- a/assets/minecraft/textures/entity/wolf/wolf_ashen.png +++ b/assets/minecraft/textures/entity/wolf/wolf_ashen.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c9b5b20dd0755138dd4232b708bcf21c4d8c73b6c446149362f60457be3b89a5 -size 1043 +oid sha256:7dc9c36e6c0087486de7faf5af21b240dc400ece57f7211565c76bb786db87f6 +size 648 diff --git a/assets/minecraft/textures/entity/wolf/wolf_ashen_angry.png b/assets/minecraft/textures/entity/wolf/wolf_ashen_angry.png index 816e5118..e0ab25b5 100644 --- a/assets/minecraft/textures/entity/wolf/wolf_ashen_angry.png +++ b/assets/minecraft/textures/entity/wolf/wolf_ashen_angry.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0167a78f7460e0f3e4e22f0baa010db99b5f76b55f8810d9724bc150b109db5e -size 1059 +oid sha256:d971cba9e50c1676b291ae1d6d84e4a4252d4bd97b6fd014a87ce45b52c8869c +size 655 diff --git a/assets/minecraft/textures/entity/wolf/wolf_ashen_tame.png b/assets/minecraft/textures/entity/wolf/wolf_ashen_tame.png index 49489d40..2c647982 100644 --- a/assets/minecraft/textures/entity/wolf/wolf_ashen_tame.png +++ b/assets/minecraft/textures/entity/wolf/wolf_ashen_tame.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:722dbbf6bb7e8e8bd03f3088a862083d4ff8ccae739b5ed894fdb4e8f53f7a5c -size 1042 +oid sha256:18ba745df61fc7890c2eda622f5b217f1808fee9e596c2a0465d606410fd43f0 +size 652 diff --git a/assets/minecraft/textures/entity/wolf/wolf_black.png b/assets/minecraft/textures/entity/wolf/wolf_black.png index e0e6c7d8..5b67deb9 100644 --- a/assets/minecraft/textures/entity/wolf/wolf_black.png +++ b/assets/minecraft/textures/entity/wolf/wolf_black.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:63c01e42662e9ea1171ea5bd02ecda296c066805e3587809e61c1c4b6fa73d2c -size 944 +oid sha256:804c2449d99f74e94cfdb19b2e9492cbb085c57db0e299ac7d6d3762934efa47 +size 552 diff --git a/assets/minecraft/textures/entity/wolf/wolf_black_angry.png b/assets/minecraft/textures/entity/wolf/wolf_black_angry.png index be24f90c..246652ef 100644 --- a/assets/minecraft/textures/entity/wolf/wolf_black_angry.png +++ b/assets/minecraft/textures/entity/wolf/wolf_black_angry.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4ea9440db5071644c35eb0eca9a7b27773970e821c7e5b08238b1e80cbbc9e23 -size 955 +oid sha256:9ab2982b28485aca6743200ae139ea0bebdcd71cf3262f577a4e48c5a1f13daa +size 565 diff --git a/assets/minecraft/textures/entity/wolf/wolf_black_tame.png b/assets/minecraft/textures/entity/wolf/wolf_black_tame.png index 456f70da..8915b73a 100644 --- a/assets/minecraft/textures/entity/wolf/wolf_black_tame.png +++ b/assets/minecraft/textures/entity/wolf/wolf_black_tame.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8da9d9568db8e731b411c5640951e03b1b9f5da47bddfab02aa6de1810b96b7f -size 949 +oid sha256:993f0d43302414f15824b3b2894597e6cbcb7a9c9374e7ee34acc90a9e2d4d87 +size 554 diff --git a/assets/minecraft/textures/entity/wolf/wolf_chestnut.png b/assets/minecraft/textures/entity/wolf/wolf_chestnut.png index a688d3a6..8ca44bc4 100644 --- a/assets/minecraft/textures/entity/wolf/wolf_chestnut.png +++ b/assets/minecraft/textures/entity/wolf/wolf_chestnut.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:616ba3ec7acf5c4a567b8c53b9569d3349810a1d7ed75a31f23bcbf470c4c19f -size 1054 +oid sha256:57401ed6149302260ac76b2b68b38874024ab51d31da6d544013a68999e443db +size 724 diff --git a/assets/minecraft/textures/entity/wolf/wolf_chestnut_angry.png b/assets/minecraft/textures/entity/wolf/wolf_chestnut_angry.png index 5a6237d6..7822d9a5 100644 --- a/assets/minecraft/textures/entity/wolf/wolf_chestnut_angry.png +++ b/assets/minecraft/textures/entity/wolf/wolf_chestnut_angry.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:684372191b0ceb56101f33ac7da04f1c9b755b8e4ba6cde6fdec514d6cdb08e9 -size 1062 +oid sha256:a2086989ac15cd9b531638c79fd25808a4590d7a6f625aa6275ef05c2e4744eb +size 731 diff --git a/assets/minecraft/textures/entity/wolf/wolf_chestnut_tame.png b/assets/minecraft/textures/entity/wolf/wolf_chestnut_tame.png index 01a58c6b..a2bd82b4 100644 --- a/assets/minecraft/textures/entity/wolf/wolf_chestnut_tame.png +++ b/assets/minecraft/textures/entity/wolf/wolf_chestnut_tame.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e18c863cb0fd5e272075cd8b3f1a52dead156a268ac5f5e7604001b063f7f828 -size 1054 +oid sha256:cf5c2b96ad95c02d9fc0e1fb3751d956136bc79bec88ef229283c3bff5a58388 +size 728 diff --git a/assets/minecraft/textures/entity/wolf/wolf_collar.png b/assets/minecraft/textures/entity/wolf/wolf_collar.png index 921b1f73..891e3b1f 100644 --- a/assets/minecraft/textures/entity/wolf/wolf_collar.png +++ b/assets/minecraft/textures/entity/wolf/wolf_collar.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a5791b414c8217f7568bff652a745ea3ff1f6ba26058214733865c8d56fe3572 -size 314 +oid sha256:96e4315dc319cc1c67c418e5212e29bfac1af50f812ab2f961b1ed4ad9100ee7 +size 144 diff --git a/assets/minecraft/textures/entity/wolf/wolf_rusty.png b/assets/minecraft/textures/entity/wolf/wolf_rusty.png index 97e2bb69..56505280 100644 --- a/assets/minecraft/textures/entity/wolf/wolf_rusty.png +++ b/assets/minecraft/textures/entity/wolf/wolf_rusty.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e3729d840e6e273df45aa58566cc26624ee6fc2285ffbea9242be63042410ac2 -size 1125 +oid sha256:b017ba30426b83aab7c6915d591ea94d836469523e9e7c3eae6408931a8e368e +size 711 diff --git a/assets/minecraft/textures/entity/wolf/wolf_rusty_angry.png b/assets/minecraft/textures/entity/wolf/wolf_rusty_angry.png index fb29a2e7..ab0a0918 100644 --- a/assets/minecraft/textures/entity/wolf/wolf_rusty_angry.png +++ b/assets/minecraft/textures/entity/wolf/wolf_rusty_angry.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a86fbdf450cad526457e651ec7ba0ab924fd64fbf757b16e4cfec98a8de2070a -size 1145 +oid sha256:c5f7bf9b4611285bc1314759e9fc396ceb13a69646844b373c5345c972a24c59 +size 725 diff --git a/assets/minecraft/textures/entity/wolf/wolf_rusty_tame.png b/assets/minecraft/textures/entity/wolf/wolf_rusty_tame.png index 4d43bde5..bf84e65b 100644 --- a/assets/minecraft/textures/entity/wolf/wolf_rusty_tame.png +++ b/assets/minecraft/textures/entity/wolf/wolf_rusty_tame.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a6f6d9429cea49d2ffdee9aae4fae2e7e4fc088bacdc1206c8301fbe6d476d0e -size 1124 +oid sha256:3a64eee04ab17ae26dec5612871b2c0cbc579aed25953331d6eedad4390b18f3 +size 714 diff --git a/assets/minecraft/textures/entity/wolf/wolf_snowy.png b/assets/minecraft/textures/entity/wolf/wolf_snowy.png index 3eb81e2b..13d17263 100644 --- a/assets/minecraft/textures/entity/wolf/wolf_snowy.png +++ b/assets/minecraft/textures/entity/wolf/wolf_snowy.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c590e515229b2061f0f4feb11143ef21388fb560e0f7cfa72911dbf0c48b5cc -size 937 +oid sha256:26013f01def0700a0597e72c5740cfbe79f836b6405758b7d58d4dce024b6598 +size 604 diff --git a/assets/minecraft/textures/entity/wolf/wolf_snowy_angry.png b/assets/minecraft/textures/entity/wolf/wolf_snowy_angry.png index 1cd3105d..6aa18837 100644 --- a/assets/minecraft/textures/entity/wolf/wolf_snowy_angry.png +++ b/assets/minecraft/textures/entity/wolf/wolf_snowy_angry.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9a23a588e8fd4c1fdc98dee8b50e605ba42fd1934d798398a1c7841ad6149abe -size 932 +oid sha256:1645f563b0cb3d300811d01f61337f4812c327c4c1b5522f77deb31003eac736 +size 605 diff --git a/assets/minecraft/textures/entity/wolf/wolf_snowy_tame.png b/assets/minecraft/textures/entity/wolf/wolf_snowy_tame.png index 3eee7b79..9b5a551d 100644 --- a/assets/minecraft/textures/entity/wolf/wolf_snowy_tame.png +++ b/assets/minecraft/textures/entity/wolf/wolf_snowy_tame.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:27cf0706728b4c4112537a29c8953a72bb648c41ab30c21ce1db876ebbd82a52 -size 939 +oid sha256:038519ebd5fa065a0ad2dee9883dfa2624269d1c56c8f29de1edef0a5b1acdf5 +size 605 diff --git a/assets/minecraft/textures/entity/wolf/wolf_spotted_angry.png b/assets/minecraft/textures/entity/wolf/wolf_spotted_angry.png index 4574fdca..5eea09ce 100644 --- a/assets/minecraft/textures/entity/wolf/wolf_spotted_angry.png +++ b/assets/minecraft/textures/entity/wolf/wolf_spotted_angry.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:baad6da9474136c99539aefcc14d8ebeb64198ea966598b1d40c35bf0f81063f -size 835 +oid sha256:48ce3a89e7f87b494c864375feb847efd0d6e172ac2a3535f31714bf159b0ccd +size 833 diff --git a/assets/minecraft/textures/entity/wolf/wolf_spotted_tame.png b/assets/minecraft/textures/entity/wolf/wolf_spotted_tame.png index bf5ecdab..bea294ab 100644 --- a/assets/minecraft/textures/entity/wolf/wolf_spotted_tame.png +++ b/assets/minecraft/textures/entity/wolf/wolf_spotted_tame.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f38540bf4acc642b12da893027b4347f6247377857c9ba312db6820c367e27e -size 826 +oid sha256:ac30119175d9b874df66fdd46579fb1e9db38b4ade128d218ff303873cb8d8a3 +size 824 diff --git a/assets/minecraft/textures/entity/wolf/wolf_striped.png b/assets/minecraft/textures/entity/wolf/wolf_striped.png index 900a689c..2a5d9e13 100644 --- a/assets/minecraft/textures/entity/wolf/wolf_striped.png +++ b/assets/minecraft/textures/entity/wolf/wolf_striped.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7752e6a5fe9ba9def629fda1d7f161c95ecba5124672c363a76039e028933d0d -size 1067 +oid sha256:f6cf4af5ffe52da6643e1b1f7681da7dda2a37f4f4897190c96bd9307d98c2ef +size 704 diff --git a/assets/minecraft/textures/entity/wolf/wolf_striped_angry.png b/assets/minecraft/textures/entity/wolf/wolf_striped_angry.png index 9d5fa921..36cfd422 100644 --- a/assets/minecraft/textures/entity/wolf/wolf_striped_angry.png +++ b/assets/minecraft/textures/entity/wolf/wolf_striped_angry.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:df959cb83e64589894c2f968503dd02f05d5de30740d50df88f75879f904f898 -size 1075 +oid sha256:feec9ee9f24332110ddc7cf0a0f00c5ec6b21aaf47e29653141057e16511a7c2 +size 712 diff --git a/assets/minecraft/textures/entity/wolf/wolf_striped_tame.png b/assets/minecraft/textures/entity/wolf/wolf_striped_tame.png index a371df19..7991f7f6 100644 --- a/assets/minecraft/textures/entity/wolf/wolf_striped_tame.png +++ b/assets/minecraft/textures/entity/wolf/wolf_striped_tame.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6c51053b21ed8d4299e61b74ec9e233ee023c74972374d0820e3222fb0530f54 -size 1067 +oid sha256:0d247c7f20b422e38321722548697437a60d3a59545ae5f1173b14404c2861fe +size 705 diff --git a/assets/minecraft/textures/entity/wolf/wolf_tame.png b/assets/minecraft/textures/entity/wolf/wolf_tame.png index 9e3ff3f6..5431f69c 100644 --- a/assets/minecraft/textures/entity/wolf/wolf_tame.png +++ b/assets/minecraft/textures/entity/wolf/wolf_tame.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d56a902771a9cb21b432205a98237d41c5be4870c4298c0d7d5ad4af8ba3540b -size 1288 +oid sha256:472ee2954bb5bb6e9bdc039b292bedf39ded986d2babbf380f88af4f5f492943 +size 660 diff --git a/assets/minecraft/textures/entity/wolf/wolf_woods.png b/assets/minecraft/textures/entity/wolf/wolf_woods.png index 710eca0d..9d94fd9d 100644 --- a/assets/minecraft/textures/entity/wolf/wolf_woods.png +++ b/assets/minecraft/textures/entity/wolf/wolf_woods.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8386ece8efad370b8caa769caf75cb3a95c53fe60dd8f96ab3308847624d6f0d -size 1161 +oid sha256:16e0ba3ba052605e5adc7a7267353636b265b79d2ee96c02bbf771afcb100846 +size 764 diff --git a/assets/minecraft/textures/entity/wolf/wolf_woods_angry.png b/assets/minecraft/textures/entity/wolf/wolf_woods_angry.png index d1a4f5e7..d4a25e92 100644 --- a/assets/minecraft/textures/entity/wolf/wolf_woods_angry.png +++ b/assets/minecraft/textures/entity/wolf/wolf_woods_angry.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:34a4d448152ec2b08efd129ae37e4f8017580076786fccefe175635b15912b12 -size 1185 +oid sha256:e7440cac1d589c8fa70c162d16c26c4ae8e2f47f0896913469d47b226b69cabf +size 774 diff --git a/assets/minecraft/textures/entity/wolf/wolf_woods_tame.png b/assets/minecraft/textures/entity/wolf/wolf_woods_tame.png index dea22c15..0073dd25 100644 --- a/assets/minecraft/textures/entity/wolf/wolf_woods_tame.png +++ b/assets/minecraft/textures/entity/wolf/wolf_woods_tame.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b71a321ae552407d64cd3435e6749dab0ca801f7ca51e3157128ae19a568a9a0 -size 1161 +oid sha256:ef23960c62097df30c3d9b1ed81cf757187bb4986e0d8b7128d8f7f5dd96c386 +size 764 diff --git a/assets/minecraft/textures/entity/zombie/drowned.png b/assets/minecraft/textures/entity/zombie/drowned.png index cfb92328..7166a4ef 100644 --- a/assets/minecraft/textures/entity/zombie/drowned.png +++ b/assets/minecraft/textures/entity/zombie/drowned.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c0553689bf1cdef2eca01f88cc7fcd1ccee47f702ba320ad5dfa6619c34fb778 -size 453 +oid sha256:82b1692ebb65db35caa2afde8341deee602180e880658aae87210e90b7d9a6d5 +size 426 diff --git a/assets/minecraft/textures/entity/zombie/drowned_outer_layer.png b/assets/minecraft/textures/entity/zombie/drowned_outer_layer.png index 612bb879..c71d7550 100644 --- a/assets/minecraft/textures/entity/zombie/drowned_outer_layer.png +++ b/assets/minecraft/textures/entity/zombie/drowned_outer_layer.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c493c87f6a01f5a53cc86250ff3d1ce488c3014e2ee9adf5b5290e20ee6bf3d4 -size 938 +oid sha256:802a3e46c44ae5117b29162fecb284556c9fe244fa20e8781a27ca766dab7ab6 +size 914 diff --git a/assets/minecraft/textures/entity/zombie/husk.png b/assets/minecraft/textures/entity/zombie/husk.png index 9dbe467f..df6775f0 100644 --- a/assets/minecraft/textures/entity/zombie/husk.png +++ b/assets/minecraft/textures/entity/zombie/husk.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0a4249ec6ba5aac74c5128c6753386c56abd451216da5396beab7c65e99c0181 -size 759 +oid sha256:317492552dc374f62fe1e7743fdd20a453e6e22b3816a2f7e14963b36c063621 +size 757 diff --git a/assets/minecraft/textures/entity/zombie/zombie.png b/assets/minecraft/textures/entity/zombie/zombie.png index 90493a9a..fade883f 100644 --- a/assets/minecraft/textures/entity/zombie/zombie.png +++ b/assets/minecraft/textures/entity/zombie/zombie.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1c879744424077ab6f7d8b13b015dfc9d5e0efee6c70696de5c2ee588f4f563a -size 774 +oid sha256:1b88eea9b63889c2c3399773f887af375defc3aad0e7a375adc84249da54cbbd +size 700 diff --git a/assets/minecraft/textures/entity/zombie_villager/profession/butcher.png b/assets/minecraft/textures/entity/zombie_villager/profession/butcher.png index 133d874c..93450e9e 100644 --- a/assets/minecraft/textures/entity/zombie_villager/profession/butcher.png +++ b/assets/minecraft/textures/entity/zombie_villager/profession/butcher.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c6d5137fecc564cb441a972178d1585332851ec9f8efca24b4f25483a61db964 -size 665 +oid sha256:396909284395e4e681a6edc89ba517277fd26945f85168751f35765a9c866609 +size 434 diff --git a/assets/minecraft/textures/entity/zombie_villager/profession/cleric.png b/assets/minecraft/textures/entity/zombie_villager/profession/cleric.png index 30bc1de3..fa36dd35 100644 --- a/assets/minecraft/textures/entity/zombie_villager/profession/cleric.png +++ b/assets/minecraft/textures/entity/zombie_villager/profession/cleric.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0ab536de4adb5b74d8463893444c761a90cc17cff20c50746db3a995a402fb08 -size 414 +oid sha256:f81e4975f2aadf3dcd5ddae21ee513d5d7499a2efc8167495f25b433f568b5e5 +size 391 diff --git a/assets/minecraft/textures/entity/zombie_villager/profession/farmer.png b/assets/minecraft/textures/entity/zombie_villager/profession/farmer.png index 4ecb5991..50fd7ff0 100644 --- a/assets/minecraft/textures/entity/zombie_villager/profession/farmer.png +++ b/assets/minecraft/textures/entity/zombie_villager/profession/farmer.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c4270c8900d731ca64e3db74ff8f90072c1dc53439f0379a8493f6a89e9c8f82 -size 773 +oid sha256:092d5af345fe4e889d14bef43306bcca8f59871e8d4a958f6973ebb9c5baaa63 +size 497 diff --git a/assets/minecraft/textures/entity/zombie_villager/profession/fletcher.png b/assets/minecraft/textures/entity/zombie_villager/profession/fletcher.png index 6804acd9..adef1bbf 100644 --- a/assets/minecraft/textures/entity/zombie_villager/profession/fletcher.png +++ b/assets/minecraft/textures/entity/zombie_villager/profession/fletcher.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d984b04a263bab0e6370fa19ad5ff285b6334373cd92007ff74680de0ec2633f -size 597 +oid sha256:7f6d7c57b3ca85ef97db0edb4bea5ec0c47fdee9c4bab7242241a34e2d1c6d38 +size 417 diff --git a/assets/minecraft/textures/entity/zombie_villager/profession/leatherworker.png b/assets/minecraft/textures/entity/zombie_villager/profession/leatherworker.png index f87f855d..a27dc7be 100644 --- a/assets/minecraft/textures/entity/zombie_villager/profession/leatherworker.png +++ b/assets/minecraft/textures/entity/zombie_villager/profession/leatherworker.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2a432126dfc107b4320fac784b941213752c9b61cc2f1dd8b2eea1d6f1f62d4c -size 489 +oid sha256:d303fc825c8c398ca1f24719c248061c31d65d99d09f9a4b5e31c1f74c3c6352 +size 350 diff --git a/assets/minecraft/textures/entity/zombie_villager/profession/librarian.png b/assets/minecraft/textures/entity/zombie_villager/profession/librarian.png index e834fa53..b71f8f16 100644 --- a/assets/minecraft/textures/entity/zombie_villager/profession/librarian.png +++ b/assets/minecraft/textures/entity/zombie_villager/profession/librarian.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3144e846ddf68623d3d3cbf54828813e5d573892d382f68190849ce1b2ff665f -size 470 +oid sha256:d9b3ec9c9477339f597d8876960ca08bde9300672f0fc0e168ca3cc795ef5554 +size 412 diff --git a/assets/minecraft/textures/entity/zombie_villager/profession/nitwit.png b/assets/minecraft/textures/entity/zombie_villager/profession/nitwit.png index d23a1f45..2ff6c919 100644 --- a/assets/minecraft/textures/entity/zombie_villager/profession/nitwit.png +++ b/assets/minecraft/textures/entity/zombie_villager/profession/nitwit.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bb5999e28730fab8477a8524b43528ee4b0ff5e04a5fc658aaedc193ae9d7efa -size 415 +oid sha256:497d6c22bb85aee419ae275a902cdb181038bd319505ab60e28a746c6dad8e5a +size 386 diff --git a/assets/minecraft/textures/entity/zombie_villager/profession/shepherd.png b/assets/minecraft/textures/entity/zombie_villager/profession/shepherd.png index b5664679..cd2a65aa 100644 --- a/assets/minecraft/textures/entity/zombie_villager/profession/shepherd.png +++ b/assets/minecraft/textures/entity/zombie_villager/profession/shepherd.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3639f16cc2c3813c6941d85fdc18bac3e9f8c7aedd4fbad4d385894d9de788ee -size 612 +oid sha256:05de02d5d17696f70ca4ec72489bf6482e5781fbe012092ea8963cc391684422 +size 492 diff --git a/assets/minecraft/textures/entity/zombie_villager/profession/toolsmith.png b/assets/minecraft/textures/entity/zombie_villager/profession/toolsmith.png index ee797b8d..b5938a5f 100644 --- a/assets/minecraft/textures/entity/zombie_villager/profession/toolsmith.png +++ b/assets/minecraft/textures/entity/zombie_villager/profession/toolsmith.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e18f9cf8d105b084d7baaad8967c108b8372682e1e3756516b90230d571fc23e -size 756 +oid sha256:2daa7b66410985c4387ff25a64b49db54746d2cef2ef6352baee011bbd948f26 +size 539 diff --git a/assets/minecraft/textures/entity/zombie_villager/profession/weaponsmith.png b/assets/minecraft/textures/entity/zombie_villager/profession/weaponsmith.png index 1b36f03d..e53efe6e 100644 --- a/assets/minecraft/textures/entity/zombie_villager/profession/weaponsmith.png +++ b/assets/minecraft/textures/entity/zombie_villager/profession/weaponsmith.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6b79ad4c4b5a22c4e70b39805fe66000f210ed6cc08707d94669ae4f41c29b3d -size 671 +oid sha256:3bb1baa043cb7bfe1f451d4ac8af19e547f5a7e4a1feab82d149ff97c38e5fe2 +size 667 diff --git a/assets/minecraft/textures/entity/zombie_villager/profession_level/diamond.png b/assets/minecraft/textures/entity/zombie_villager/profession_level/diamond.png index b2196834..fac9e91d 100644 --- a/assets/minecraft/textures/entity/zombie_villager/profession_level/diamond.png +++ b/assets/minecraft/textures/entity/zombie_villager/profession_level/diamond.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9294d842fff92c0c3d48b53f9990e7cae53eb123440e023c62f022b6bbbd199a -size 132 +oid sha256:6f587703d5e6ee9cf3f35313f13efef3c87805f25f4bc007afccfbb6fa8d47cc +size 130 diff --git a/assets/minecraft/textures/entity/zombie_villager/profession_level/emerald.png b/assets/minecraft/textures/entity/zombie_villager/profession_level/emerald.png index c40b9f43..65596847 100644 --- a/assets/minecraft/textures/entity/zombie_villager/profession_level/emerald.png +++ b/assets/minecraft/textures/entity/zombie_villager/profession_level/emerald.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b58b86f5b3737d40db3a04a20f3fb933e05479129e744d022c62e3844caa09bb -size 135 +oid sha256:6c98eed75c025d078fecadcaf9bcf14d45fb75f4f3edcf1473698606142d72f1 +size 133 diff --git a/assets/minecraft/textures/entity/zombie_villager/profession_level/gold.png b/assets/minecraft/textures/entity/zombie_villager/profession_level/gold.png index e7344a14..1396f52d 100644 --- a/assets/minecraft/textures/entity/zombie_villager/profession_level/gold.png +++ b/assets/minecraft/textures/entity/zombie_villager/profession_level/gold.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fa3a8332d780318d0298eb4d54ef72f7066931f1561c15552a514c589bd31159 -size 132 +oid sha256:c3d2623164d7dcbf2ff3a66b437273e8a4dd71730480a1087280a4375377cdd7 +size 127 diff --git a/assets/minecraft/textures/entity/zombie_villager/type/desert.png b/assets/minecraft/textures/entity/zombie_villager/type/desert.png index d233431b..06411fe0 100644 --- a/assets/minecraft/textures/entity/zombie_villager/type/desert.png +++ b/assets/minecraft/textures/entity/zombie_villager/type/desert.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f95e55efa8680a85a070cee0dbf25ea1219f5f0385c398255f4ea02977c8af07 -size 927 +oid sha256:423bf7933df18897f0d22f253b95edc07bb217e2a93516d64437f9adf5bc93cd +size 818 diff --git a/assets/minecraft/textures/entity/zombie_villager/type/plains.png b/assets/minecraft/textures/entity/zombie_villager/type/plains.png index d8c6580e..78e05da4 100644 --- a/assets/minecraft/textures/entity/zombie_villager/type/plains.png +++ b/assets/minecraft/textures/entity/zombie_villager/type/plains.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d71284b924ec0f445b717936f9032fb0f0c4049afecc6b60c9fbd3ff53f4c87f -size 747 +oid sha256:6704fc6e6028bea4ebcbf767be11acfd62af4b4f84782a4c7dbdde269dc0571f +size 674 diff --git a/assets/minecraft/textures/entity/zombie_villager/type/swamp.png b/assets/minecraft/textures/entity/zombie_villager/type/swamp.png index cdec4a63..b6c12929 100644 --- a/assets/minecraft/textures/entity/zombie_villager/type/swamp.png +++ b/assets/minecraft/textures/entity/zombie_villager/type/swamp.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f33e843fdc10030220fe211dbd1b2b927fcf5d2205b0d8643602ad72bd7c49ab -size 1101 +oid sha256:a965ccd295ae3e886ec73f5fbda9520ca532c7b5b72fde2e8f57e4067d28a3ec +size 780 diff --git a/assets/minecraft/textures/entity/zombie_villager/zombie_villager.png b/assets/minecraft/textures/entity/zombie_villager/zombie_villager.png index 4e52713d..e27454f3 100644 --- a/assets/minecraft/textures/entity/zombie_villager/zombie_villager.png +++ b/assets/minecraft/textures/entity/zombie_villager/zombie_villager.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a57cdcc4f592591574e1e2217d1b9007f7093f82bb19cb6a7a40421026df1ff7 -size 1076 +oid sha256:5a6a0f6f3ebecdbdf25de91714db9de85f9c4cc1946aaf593f5b0acf555f6ee0 +size 962 diff --git a/assets/minecraft/textures/environment/clouds.png b/assets/minecraft/textures/environment/clouds.png index bf771c71..98b6966a 100644 --- a/assets/minecraft/textures/environment/clouds.png +++ b/assets/minecraft/textures/environment/clouds.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:18b72300292efa39f15f0f0e9b77f339b9c9237d054cf8141681ad25f047374f -size 4757 +oid sha256:b325500d7272b79136aa3626ad181ff204db14ef2c712a7b29cd18187105db71 +size 3976 diff --git a/assets/minecraft/textures/environment/end_sky.png b/assets/minecraft/textures/environment/end_sky.png index 57647f39..50f3bddb 100644 --- a/assets/minecraft/textures/environment/end_sky.png +++ b/assets/minecraft/textures/environment/end_sky.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:82f7401e7b0d8250ccef4abedd9babf8863f076be7961eda6da545e7fca93c1f -size 12513 +oid sha256:4e3ac7408ad60efc9be391172f09436a1bfe2e0c278dab24665d47e7ff75f61e +size 12378 diff --git a/assets/minecraft/textures/environment/moon_phases.png b/assets/minecraft/textures/environment/moon_phases.png index 4cd83d54..7cbbc292 100644 --- a/assets/minecraft/textures/environment/moon_phases.png +++ b/assets/minecraft/textures/environment/moon_phases.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8e9f0b66bc475f54c37e06f9a13215975263f35d0f030928fe552434211197ef -size 835 +oid sha256:ee7dd05f343f801a5055d38a789071ef7b0952173646d92a5ac1e997970df848 +size 834 diff --git a/assets/minecraft/textures/environment/rain.png b/assets/minecraft/textures/environment/rain.png index 96821a9e..5f79644e 100644 --- a/assets/minecraft/textures/environment/rain.png +++ b/assets/minecraft/textures/environment/rain.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d45116fd626c00d6e45fe35cc747900385ef1b051627751049566977772f3f84 -size 1761 +oid sha256:9e41305a96bf5ca6c092abd490ec697488189a7bca7c9d9eda00c49ddc1da2c7 +size 1745 diff --git a/assets/minecraft/textures/environment/snow.png b/assets/minecraft/textures/environment/snow.png index 2775ee4f..cc0d6de7 100644 --- a/assets/minecraft/textures/environment/snow.png +++ b/assets/minecraft/textures/environment/snow.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c52b4a8f924a856118f747ccd0dedce2f2f3f7a01bc9e388f7c2ea26c831cf2 -size 277 +oid sha256:7d1215c25ee937f3298a4c96265494253bd86c8a55a4a21719ed438449a08d8b +size 256 diff --git a/assets/minecraft/textures/font/nonlatin_european.png b/assets/minecraft/textures/font/nonlatin_european.png index 12468fdd..01235dbf 100644 --- a/assets/minecraft/textures/font/nonlatin_european.png +++ b/assets/minecraft/textures/font/nonlatin_european.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d9f7367c97aef7146a08d14398e7431d214eea813b8a52f3c27bc87677d33eb5 -size 4879 +oid sha256:21e91bd394e0790da5db58c99d6f89712977930d6f746fb298824f73c47e7027 +size 4867 diff --git a/assets/minecraft/textures/gui/advancements/backgrounds/husbandry.png b/assets/minecraft/textures/gui/advancements/backgrounds/husbandry.png index 1a5be57e..1ce7d07b 100644 --- a/assets/minecraft/textures/gui/advancements/backgrounds/husbandry.png +++ b/assets/minecraft/textures/gui/advancements/backgrounds/husbandry.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:324fa08c758ea228711d312b6cabec69c5494646173f28b4047372a310573cad -size 186 +oid sha256:bce8e5bdaccdcb5d76e2f5a2b6b6449d7b056566bbeee7769795255b6c187b15 +size 185 diff --git a/assets/minecraft/textures/gui/advancements/backgrounds/stone.png b/assets/minecraft/textures/gui/advancements/backgrounds/stone.png index a442e97c..49277967 100644 --- a/assets/minecraft/textures/gui/advancements/backgrounds/stone.png +++ b/assets/minecraft/textures/gui/advancements/backgrounds/stone.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a21cf913ad64be5129385c9efc9c70972ad2dd486f156300d7234f05ca91b03d -size 171 +oid sha256:b5e10adc72442bfb257ce7ba0b9bbe36475a0c8cdfec89b80dc9517203ff3e9f +size 151 diff --git a/assets/minecraft/textures/gui/advancements/window.png b/assets/minecraft/textures/gui/advancements/window.png index 98302475..4bdca808 100644 --- a/assets/minecraft/textures/gui/advancements/window.png +++ b/assets/minecraft/textures/gui/advancements/window.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3ebcf086c611f6f67255d72c6d7a7359ff662d49c82e33d5527309f32f83531f -size 771 +oid sha256:77f75dd84a2e56d4cb3de5a9232e3002369e9489cc63ee3a9f2103eb3555a835 +size 747 diff --git a/assets/minecraft/textures/gui/book.png b/assets/minecraft/textures/gui/book.png index 340298e8..85a59b9e 100644 --- a/assets/minecraft/textures/gui/book.png +++ b/assets/minecraft/textures/gui/book.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d4b1788be10f3b02eee0387e7be62cd1e04e08888660c89446ab70bf7934aef -size 5299 +oid sha256:e4bd1f3a0cd72a51a84e151cb49ec5788fdf1b25f0616731c27d2361c7439ccd +size 5258 diff --git a/assets/minecraft/textures/gui/container/beacon.png b/assets/minecraft/textures/gui/container/beacon.png index 208ebf9d..8c412f46 100644 --- a/assets/minecraft/textures/gui/container/beacon.png +++ b/assets/minecraft/textures/gui/container/beacon.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fb6101bbc27fc2c672c415486a8c08f32e1b1292c073ae4f586775bdb1816c19 -size 805 +oid sha256:374f144c0850fc254227b85b052ec65535f4ca1dda0eae169201cca44908d657 +size 803 diff --git a/assets/minecraft/textures/gui/container/crafter.png b/assets/minecraft/textures/gui/container/crafter.png index 19333f07..69485fd2 100644 --- a/assets/minecraft/textures/gui/container/crafter.png +++ b/assets/minecraft/textures/gui/container/crafter.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bce2e1f2e197c29606ecd2cbdfebc6c5d6835f5a7843cb8b174637d18dbf9932 -size 991 +oid sha256:9b81b51a0b5047bf637045efa25bcb2b363919a5af21a31d5b65714cf049e7cf +size 416 diff --git a/assets/minecraft/textures/gui/container/creative_inventory/tab_inventory.png b/assets/minecraft/textures/gui/container/creative_inventory/tab_inventory.png index 88163381..d62ab57b 100644 --- a/assets/minecraft/textures/gui/container/creative_inventory/tab_inventory.png +++ b/assets/minecraft/textures/gui/container/creative_inventory/tab_inventory.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:31223b2c46c34d101bd80e8313973a7d4a1f60dbb7f62ff74bc70fecd616bb07 -size 468 +oid sha256:aa64813e86df1ec631a2f22186019d1a8a0cfe7a052d3259ab25fd26e5493cfe +size 456 diff --git a/assets/minecraft/textures/gui/container/creative_inventory/tab_item_search.png b/assets/minecraft/textures/gui/container/creative_inventory/tab_item_search.png index 9eb523dc..8fabb4a4 100644 --- a/assets/minecraft/textures/gui/container/creative_inventory/tab_item_search.png +++ b/assets/minecraft/textures/gui/container/creative_inventory/tab_item_search.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8baacf48273e3146cbf59081b63d3e8b83a30ee4d3cd6d37257fce4ca9886b12 -size 348 +oid sha256:5beb338993747a964b0a8a8d30f0b3b964dbfab09c7fd0d2ef470b863a3fccca +size 339 diff --git a/assets/minecraft/textures/gui/container/creative_inventory/tab_items.png b/assets/minecraft/textures/gui/container/creative_inventory/tab_items.png index 75d5977b..17bec853 100644 --- a/assets/minecraft/textures/gui/container/creative_inventory/tab_items.png +++ b/assets/minecraft/textures/gui/container/creative_inventory/tab_items.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cf45ab0dc4b81f675b119ca565d7268bff4018c89fa2d34e22e603a94ddec026 -size 332 +oid sha256:c47d5210d497ac69f0639fbcebfeea0e906b74c83712b6167f7848af8699ec48 +size 321 diff --git a/assets/minecraft/textures/gui/container/smithing.png b/assets/minecraft/textures/gui/container/smithing.png index 9bdbddf6..835ba42c 100644 --- a/assets/minecraft/textures/gui/container/smithing.png +++ b/assets/minecraft/textures/gui/container/smithing.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a3c828e32f48278a058f667816ae160fffff447b20eab6af0f5aec6732ad3841 -size 618 +oid sha256:343edda1007fd4ee7e860bed406578cfdc58f6c9f5d014fee25714b564742e52 +size 611 diff --git a/assets/minecraft/textures/gui/footer_separator.png b/assets/minecraft/textures/gui/footer_separator.png index ae96901e..653f12d2 100644 --- a/assets/minecraft/textures/gui/footer_separator.png +++ b/assets/minecraft/textures/gui/footer_separator.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d094e814973e333b673d050c2c0a686d5a0d54462c0bc3e2d582c2443adf5776 -size 101 +oid sha256:31d9ea715f2974218ae0a1ded741edb0889b4515933754c54912c9f275ba6ff3 +size 74 diff --git a/assets/minecraft/textures/gui/hanging_signs/acacia.png b/assets/minecraft/textures/gui/hanging_signs/acacia.png index 3e44b5aa..7ab5e3e6 100644 --- a/assets/minecraft/textures/gui/hanging_signs/acacia.png +++ b/assets/minecraft/textures/gui/hanging_signs/acacia.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0aaeae594107f41d3d754d70969f8038f7a09110d25d26c5aaea781950b5a87c -size 232 +oid sha256:70c273be2738ab66abd1dc3932151e45cac99367aae520322b25f4fc7c454651 +size 217 diff --git a/assets/minecraft/textures/gui/hanging_signs/bamboo.png b/assets/minecraft/textures/gui/hanging_signs/bamboo.png index cdd55335..d8225cc7 100644 --- a/assets/minecraft/textures/gui/hanging_signs/bamboo.png +++ b/assets/minecraft/textures/gui/hanging_signs/bamboo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7dc7ce66918ee9bc90eb563750a5787f7088f0c777a59fcd2d07fbf4d5592a29 -size 244 +oid sha256:d5d18154080b572fca5c1404f0324d5f8d3f09be64718ad1ae660ac480567264 +size 235 diff --git a/assets/minecraft/textures/gui/hanging_signs/birch.png b/assets/minecraft/textures/gui/hanging_signs/birch.png index bb3c35cd..94119f7b 100644 --- a/assets/minecraft/textures/gui/hanging_signs/birch.png +++ b/assets/minecraft/textures/gui/hanging_signs/birch.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3e30ad78a9a48c3ebd849bc1fe29f287dc61690bc74eea3714850e9009fccdc4 -size 239 +oid sha256:3cf838dfbb1832eb28f8fb13d25c0878db443888ded8e126d09486fb5ddbcfdf +size 222 diff --git a/assets/minecraft/textures/gui/hanging_signs/cherry.png b/assets/minecraft/textures/gui/hanging_signs/cherry.png index 0d782fd1..91adc455 100644 --- a/assets/minecraft/textures/gui/hanging_signs/cherry.png +++ b/assets/minecraft/textures/gui/hanging_signs/cherry.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0195db2fe3fea82153081150298a528c7b1678236b73988a097fba243a306699 -size 224 +oid sha256:895f5f730332785f418d6450d1e608c48337e90f207416091ccb581eaaa9f626 +size 207 diff --git a/assets/minecraft/textures/gui/hanging_signs/crimson.png b/assets/minecraft/textures/gui/hanging_signs/crimson.png index 730423f4..fcd8c7e6 100644 --- a/assets/minecraft/textures/gui/hanging_signs/crimson.png +++ b/assets/minecraft/textures/gui/hanging_signs/crimson.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:99e3c12d05bfcd5e972d46207fdea08b560900be2c8cd2d5414948a880ac7b40 -size 235 +oid sha256:af61cc02a9bed6ba6d2edf933eca8317571a4e6cf0d2264d4409a700c2dec235 +size 218 diff --git a/assets/minecraft/textures/gui/hanging_signs/dark_oak.png b/assets/minecraft/textures/gui/hanging_signs/dark_oak.png index 6f5b0b8b..c088f659 100644 --- a/assets/minecraft/textures/gui/hanging_signs/dark_oak.png +++ b/assets/minecraft/textures/gui/hanging_signs/dark_oak.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:19acad8f40bbd332512507ee126c1b3bb5ed25badbd767036ea2d8569bbb5a40 -size 240 +oid sha256:8808981e8de472f7498195ca595969bc7c6eb6bfab7f4afc13dcb218bec7d02a +size 221 diff --git a/assets/minecraft/textures/gui/hanging_signs/jungle.png b/assets/minecraft/textures/gui/hanging_signs/jungle.png index 28398423..513595b8 100644 --- a/assets/minecraft/textures/gui/hanging_signs/jungle.png +++ b/assets/minecraft/textures/gui/hanging_signs/jungle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fd353cc1a351357f2b36a81ffb62200f1d8741e682d849ed15370cec61f6a78b -size 242 +oid sha256:74ad81fb0ef8e3c1c34d95632d8f47d14ef81f2f395c6b251a4a569e5154fc38 +size 228 diff --git a/assets/minecraft/textures/gui/hanging_signs/mangrove.png b/assets/minecraft/textures/gui/hanging_signs/mangrove.png index 21ba8bc6..c20ee315 100644 --- a/assets/minecraft/textures/gui/hanging_signs/mangrove.png +++ b/assets/minecraft/textures/gui/hanging_signs/mangrove.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:af6404c7df148acfc9cbadf1436cc4d21158b7de3c88c9c2618fd0b841fbbe00 -size 224 +oid sha256:399754808e85323e342fab3ac411e40c124c82a5a6c95e2c4c1657ca18ee91cb +size 207 diff --git a/assets/minecraft/textures/gui/hanging_signs/oak.png b/assets/minecraft/textures/gui/hanging_signs/oak.png index b6997965..c267fedd 100644 --- a/assets/minecraft/textures/gui/hanging_signs/oak.png +++ b/assets/minecraft/textures/gui/hanging_signs/oak.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:862cc01490325689ab5a8129125868d8499f3d3856450392d55420022b2ab5f0 -size 225 +oid sha256:020af878a515e82e1eceed09741f14d9eb9160dc601f0253a2892768dcbcca44 +size 213 diff --git a/assets/minecraft/textures/gui/hanging_signs/pale_oak.png b/assets/minecraft/textures/gui/hanging_signs/pale_oak.png index 7b39904e..27c5225d 100644 --- a/assets/minecraft/textures/gui/hanging_signs/pale_oak.png +++ b/assets/minecraft/textures/gui/hanging_signs/pale_oak.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ccaf0caffffba1ee8f920fa12dfb34bd6e2ff5986836cb5e8e7aee021447a230 -size 222 +oid sha256:1d559259e08db3c6ac217a23e11fbfd72be56361935aaee0985f27f4f0c2334a +size 206 diff --git a/assets/minecraft/textures/gui/hanging_signs/spruce.png b/assets/minecraft/textures/gui/hanging_signs/spruce.png index 3e2740f1..268d8a7f 100644 --- a/assets/minecraft/textures/gui/hanging_signs/spruce.png +++ b/assets/minecraft/textures/gui/hanging_signs/spruce.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:79d7ef1ca0385d16e9c8ca0047e2f35b129e526afe387ecc833a85bfbea372c5 -size 236 +oid sha256:543e1e657e5f2265c55b95723a90f74bf93d4681f392ba3b15f7478b4093a619 +size 220 diff --git a/assets/minecraft/textures/gui/hanging_signs/warped.png b/assets/minecraft/textures/gui/hanging_signs/warped.png index fde764d2..25448b49 100644 --- a/assets/minecraft/textures/gui/hanging_signs/warped.png +++ b/assets/minecraft/textures/gui/hanging_signs/warped.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:be12c6eae77b0ec363e937ec943a8d7b33f2408d715bf84067c0580002995378 -size 236 +oid sha256:ed4485f9e6c294176c1463a5c748ffd9dce4bd9903b306aa66165542d1b079bf +size 219 diff --git a/assets/minecraft/textures/gui/header_separator.png b/assets/minecraft/textures/gui/header_separator.png index f896bab6..f8d893aa 100644 --- a/assets/minecraft/textures/gui/header_separator.png +++ b/assets/minecraft/textures/gui/header_separator.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:31e331cfa74884bb12d17dd4decdfa4210c130c0d60e9fd924d62badc7d02604 -size 107 +oid sha256:5f7074d9a35e6a06b3cbba879532ac92b2a66ef6a15888e59dae9c5ae0795931 +size 75 diff --git a/assets/minecraft/textures/gui/inworld_footer_separator.png b/assets/minecraft/textures/gui/inworld_footer_separator.png index ae96901e..653f12d2 100644 --- a/assets/minecraft/textures/gui/inworld_footer_separator.png +++ b/assets/minecraft/textures/gui/inworld_footer_separator.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d094e814973e333b673d050c2c0a686d5a0d54462c0bc3e2d582c2443adf5776 -size 101 +oid sha256:31d9ea715f2974218ae0a1ded741edb0889b4515933754c54912c9f275ba6ff3 +size 74 diff --git a/assets/minecraft/textures/gui/inworld_header_separator.png b/assets/minecraft/textures/gui/inworld_header_separator.png index f896bab6..f8d893aa 100644 --- a/assets/minecraft/textures/gui/inworld_header_separator.png +++ b/assets/minecraft/textures/gui/inworld_header_separator.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:31e331cfa74884bb12d17dd4decdfa4210c130c0d60e9fd924d62badc7d02604 -size 107 +oid sha256:5f7074d9a35e6a06b3cbba879532ac92b2a66ef6a15888e59dae9c5ae0795931 +size 75 diff --git a/assets/minecraft/textures/gui/inworld_menu_background.png b/assets/minecraft/textures/gui/inworld_menu_background.png index d01380d3..4f2610cc 100644 --- a/assets/minecraft/textures/gui/inworld_menu_background.png +++ b/assets/minecraft/textures/gui/inworld_menu_background.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3b44f6dda604241691860485f3d94a02a0ac13fcb0f31a9264ef5c52737dfad6 -size 96 +oid sha256:515f7821d6bea28de86e607f6a53011e658d00a121179bb980719f39ac62df51 +size 74 diff --git a/assets/minecraft/textures/gui/inworld_menu_list_background.png b/assets/minecraft/textures/gui/inworld_menu_list_background.png index d11fbba7..7ffb5c2e 100644 --- a/assets/minecraft/textures/gui/inworld_menu_list_background.png +++ b/assets/minecraft/textures/gui/inworld_menu_list_background.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f37467f09c7253c31a567def884c4ff08d4467b2b5669d3b02c059653454b518 -size 96 +oid sha256:3fda6347ee8ba0508ba2a83a0cb6c8f02a34403e91713d6881338b4399782110 +size 74 diff --git a/assets/minecraft/textures/gui/menu_background.png b/assets/minecraft/textures/gui/menu_background.png index d01380d3..4f2610cc 100644 --- a/assets/minecraft/textures/gui/menu_background.png +++ b/assets/minecraft/textures/gui/menu_background.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3b44f6dda604241691860485f3d94a02a0ac13fcb0f31a9264ef5c52737dfad6 -size 96 +oid sha256:515f7821d6bea28de86e607f6a53011e658d00a121179bb980719f39ac62df51 +size 74 diff --git a/assets/minecraft/textures/gui/menu_list_background.png b/assets/minecraft/textures/gui/menu_list_background.png index d11fbba7..7ffb5c2e 100644 --- a/assets/minecraft/textures/gui/menu_list_background.png +++ b/assets/minecraft/textures/gui/menu_list_background.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f37467f09c7253c31a567def884c4ff08d4467b2b5669d3b02c059653454b518 -size 96 +oid sha256:3fda6347ee8ba0508ba2a83a0cb6c8f02a34403e91713d6881338b4399782110 +size 74 diff --git a/assets/minecraft/textures/gui/realms/adventure.png b/assets/minecraft/textures/gui/realms/adventure.png index cce9171b..a7e821e8 100644 --- a/assets/minecraft/textures/gui/realms/adventure.png +++ b/assets/minecraft/textures/gui/realms/adventure.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0519e308558858a8b069c4cb2d21efa228e7e3f33adaeee1e4cc793828496131 -size 124523 +oid sha256:fa11d089c56a97ec86401c311459a9957972dbf6342530dcf50a72e90c238133 +size 124488 diff --git a/assets/minecraft/textures/gui/realms/empty_frame.png b/assets/minecraft/textures/gui/realms/empty_frame.png index 48a6b7d9..269bef1d 100644 --- a/assets/minecraft/textures/gui/realms/empty_frame.png +++ b/assets/minecraft/textures/gui/realms/empty_frame.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e874fb641d2e21ab364169b5e963ea1bafb34134c798c7d5b1113808a2f3a1fc -size 197 +oid sha256:e7aecab8d6c0232cca689a79a604daf60ae4cf79690861d1a07881980d34e097 +size 196 diff --git a/assets/minecraft/textures/gui/realms/experience.png b/assets/minecraft/textures/gui/realms/experience.png index fc240aea..34546b3c 100644 --- a/assets/minecraft/textures/gui/realms/experience.png +++ b/assets/minecraft/textures/gui/realms/experience.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:44c544ea4a5d89a7613fcc59ccdfa6ea7780194c4d8ec713364d57c2e59b5e9d -size 109087 +oid sha256:3ab39bf6e5bf9c1bdef38f61a62bffa2cbe02fb50ec75bb9b5b33d8418ebfb45 +size 108968 diff --git a/assets/minecraft/textures/gui/realms/new_world.png b/assets/minecraft/textures/gui/realms/new_world.png index dc5993f8..738403cb 100644 --- a/assets/minecraft/textures/gui/realms/new_world.png +++ b/assets/minecraft/textures/gui/realms/new_world.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:37e66277ea43e1913b0937c6687525efed8793c81167679724f90d024527d591 -size 61720 +oid sha256:7884e22d640576161408aa854eb0d56f9f7000e9f57d796a3583af7c8eed86fe +size 61705 diff --git a/assets/minecraft/textures/gui/realms/no_realms.png b/assets/minecraft/textures/gui/realms/no_realms.png index d81d5a38..694e420f 100644 --- a/assets/minecraft/textures/gui/realms/no_realms.png +++ b/assets/minecraft/textures/gui/realms/no_realms.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:75c22ae01eb0ab56fab119e4e5f6d8f920db5090f68fc88d5da6f6ea5871f019 -size 331 +oid sha256:11309119ce7b9d53440ba83ad09a636a10e21495078cca5b1be04ab5b0dafd9e +size 328 diff --git a/assets/minecraft/textures/gui/realms/upload.png b/assets/minecraft/textures/gui/realms/upload.png index f05a93de..b7be7763 100644 --- a/assets/minecraft/textures/gui/realms/upload.png +++ b/assets/minecraft/textures/gui/realms/upload.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:42b4bee523f3bc032bd3c7d96135f26cff258d69979ee85253edb4c982b1be12 -size 116445 +oid sha256:e67b651c34cc0a34447ac178bbaa2fb8158b39ab907edf2fe550130fbd0d0b9d +size 116361 diff --git a/assets/minecraft/textures/gui/sprites/advancements/box_obtained.png b/assets/minecraft/textures/gui/sprites/advancements/box_obtained.png index c4c1e3ef..39c4892b 100644 --- a/assets/minecraft/textures/gui/sprites/advancements/box_obtained.png +++ b/assets/minecraft/textures/gui/sprites/advancements/box_obtained.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b9d8df6fa2c972c526561a2a1e1aa63ac8798e60dbf201cd0e4a3174ffc57782 -size 172 +oid sha256:0485f3aeeba5d55c379f67e49e0920fc05ba29cb2bfc7699cfc4c15e96feffb2 +size 157 diff --git a/assets/minecraft/textures/gui/sprites/advancements/box_unobtained.png b/assets/minecraft/textures/gui/sprites/advancements/box_unobtained.png index ec0111f2..06735aea 100644 --- a/assets/minecraft/textures/gui/sprites/advancements/box_unobtained.png +++ b/assets/minecraft/textures/gui/sprites/advancements/box_unobtained.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6742d63943d68b2646c61de4e599ecfe57c0d3857ef9cc2d90e5a15f7a54f1c0 -size 179 +oid sha256:78e48137ea0f3f6f544c55342c2e8213121e315ff716a69ae1db908151e502ed +size 157 diff --git a/assets/minecraft/textures/gui/sprites/advancements/challenge_frame_obtained.png b/assets/minecraft/textures/gui/sprites/advancements/challenge_frame_obtained.png index 8fa3d81a..b52f3728 100644 --- a/assets/minecraft/textures/gui/sprites/advancements/challenge_frame_obtained.png +++ b/assets/minecraft/textures/gui/sprites/advancements/challenge_frame_obtained.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:77443069e9ecf2faa9a245e0a21a2b68c9b14f72111fa7519b733d06d868bad4 -size 222 +oid sha256:06dc86718cab0d8bb9a6cece17039c747987a175a86c8fecbb954420fe3195c7 +size 192 diff --git a/assets/minecraft/textures/gui/sprites/advancements/challenge_frame_unobtained.png b/assets/minecraft/textures/gui/sprites/advancements/challenge_frame_unobtained.png index 2fb1a6e8..63fcd05f 100644 --- a/assets/minecraft/textures/gui/sprites/advancements/challenge_frame_unobtained.png +++ b/assets/minecraft/textures/gui/sprites/advancements/challenge_frame_unobtained.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:afebbac452ee8bddb9d47cd4d0dc220d17cf0177e6f5a41273e28dc54e526d05 -size 212 +oid sha256:ce44c61263b5762fa7813ea522e144fa10a2283901567df59ca5ccf4c70eb445 +size 162 diff --git a/assets/minecraft/textures/gui/sprites/advancements/goal_frame_obtained.png b/assets/minecraft/textures/gui/sprites/advancements/goal_frame_obtained.png index 786fb9d8..497863d6 100644 --- a/assets/minecraft/textures/gui/sprites/advancements/goal_frame_obtained.png +++ b/assets/minecraft/textures/gui/sprites/advancements/goal_frame_obtained.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5389c9209dafc7e227ee50111fdb4a20fadb32a1c9bf9f4f99acbb4368adac65 -size 216 +oid sha256:4b51568cf8b5b54be69d4b389e67ff27e4bccc72be9f2de72efef1d607f05b07 +size 158 diff --git a/assets/minecraft/textures/gui/sprites/advancements/goal_frame_unobtained.png b/assets/minecraft/textures/gui/sprites/advancements/goal_frame_unobtained.png index 00503029..f93babde 100644 --- a/assets/minecraft/textures/gui/sprites/advancements/goal_frame_unobtained.png +++ b/assets/minecraft/textures/gui/sprites/advancements/goal_frame_unobtained.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bb90098fa8f8bf75254ee434c4c6a3beee84a0589164c6493fec02547021737e -size 222 +oid sha256:2ad74cfff4a4870f72f4b9f4354527478c77fe63a33fac5fda818092002961ab +size 133 diff --git a/assets/minecraft/textures/gui/sprites/advancements/tab_above_left.png b/assets/minecraft/textures/gui/sprites/advancements/tab_above_left.png index a8beac04..41fa775b 100644 --- a/assets/minecraft/textures/gui/sprites/advancements/tab_above_left.png +++ b/assets/minecraft/textures/gui/sprites/advancements/tab_above_left.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:07d03d9206d5e7c49f19bbbb4a9706ed4efdb4f5d450ec41b77b8499a43d2c4d -size 135 +oid sha256:7e399040c0cc6e37a8aa78bcffab94e38d089a83f2d3c6c4c1d05cecfdb931f5 +size 112 diff --git a/assets/minecraft/textures/gui/sprites/advancements/tab_above_left_selected.png b/assets/minecraft/textures/gui/sprites/advancements/tab_above_left_selected.png index b155ecdb..e8f6dc58 100644 --- a/assets/minecraft/textures/gui/sprites/advancements/tab_above_left_selected.png +++ b/assets/minecraft/textures/gui/sprites/advancements/tab_above_left_selected.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a851d757eecf0477da74a41b9aeeacb7bf7eaac1663d8bc4b557ee2a6d98c598 -size 126 +oid sha256:f9429b84c201f004d979f88e0a515fbff056aca2127ba7668473aafb7ee0ef46 +size 114 diff --git a/assets/minecraft/textures/gui/sprites/advancements/tab_above_middle.png b/assets/minecraft/textures/gui/sprites/advancements/tab_above_middle.png index e91bd735..3cf5993f 100644 --- a/assets/minecraft/textures/gui/sprites/advancements/tab_above_middle.png +++ b/assets/minecraft/textures/gui/sprites/advancements/tab_above_middle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3c73e7de0b5ee866aa51bc88fbde8d2912196823d1e38ad6c75d4529d72247ff -size 130 +oid sha256:27068af7a44e8adc3bb9968fc097a72e1847e66cecd2dfb7558fc37298c3a858 +size 109 diff --git a/assets/minecraft/textures/gui/sprites/advancements/tab_above_middle_selected.png b/assets/minecraft/textures/gui/sprites/advancements/tab_above_middle_selected.png index 239ab78e..3b230c6e 100644 --- a/assets/minecraft/textures/gui/sprites/advancements/tab_above_middle_selected.png +++ b/assets/minecraft/textures/gui/sprites/advancements/tab_above_middle_selected.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e58898033d6e0f9b13deac81c3f74c112e4efd1eb8c86f5ea87e011d6c79042e -size 130 +oid sha256:c458b14af40c9b23bdf169ae4be4b973c7535aa6784d0eda9d3ee37a4fea9a14 +size 116 diff --git a/assets/minecraft/textures/gui/sprites/advancements/tab_above_right.png b/assets/minecraft/textures/gui/sprites/advancements/tab_above_right.png index 21a029b2..ce0e6e92 100644 --- a/assets/minecraft/textures/gui/sprites/advancements/tab_above_right.png +++ b/assets/minecraft/textures/gui/sprites/advancements/tab_above_right.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c1d20667a30e1ee18e3bf65dc6df0f4b974582f4c9aad126383a837806e60b6 -size 138 +oid sha256:c8f6056228548231df089059889ec50e7ec75f80e2c49ccd1e1256038463ff54 +size 117 diff --git a/assets/minecraft/textures/gui/sprites/advancements/tab_above_right_selected.png b/assets/minecraft/textures/gui/sprites/advancements/tab_above_right_selected.png index c6e3127e..b89e16e6 100644 --- a/assets/minecraft/textures/gui/sprites/advancements/tab_above_right_selected.png +++ b/assets/minecraft/textures/gui/sprites/advancements/tab_above_right_selected.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8591013402c6395c91cedf1376ac11f8411cf0e43acf16c8641e3245cc197fe5 -size 126 +oid sha256:8ec3bfe44a36a0b2358398eed9a555fb1daeef8d6c10014fa627a6fe9c91e791 +size 114 diff --git a/assets/minecraft/textures/gui/sprites/advancements/tab_below_left.png b/assets/minecraft/textures/gui/sprites/advancements/tab_below_left.png index 2d07d7df..9399f8f1 100644 --- a/assets/minecraft/textures/gui/sprites/advancements/tab_below_left.png +++ b/assets/minecraft/textures/gui/sprites/advancements/tab_below_left.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:121ff9bc4d68995c3faa5762268120cb563be1631d3bcb67e8f2ea204eea9886 -size 148 +oid sha256:088c4e1ac6519cf54f826d179c4ec558390fabb0bc77201a46ebc327fd4aa228 +size 115 diff --git a/assets/minecraft/textures/gui/sprites/advancements/tab_below_left_selected.png b/assets/minecraft/textures/gui/sprites/advancements/tab_below_left_selected.png index 0441d574..c05b1192 100644 --- a/assets/minecraft/textures/gui/sprites/advancements/tab_below_left_selected.png +++ b/assets/minecraft/textures/gui/sprites/advancements/tab_below_left_selected.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dfe8a01722e898d83100a704815892f3c6c807af36eab987410cb37fd0ade8aa -size 132 +oid sha256:8ea0359242565be20ca26384cfb8a6a0173eea96c6cc7205ef4b3d001d77dbcf +size 111 diff --git a/assets/minecraft/textures/gui/sprites/advancements/tab_below_middle.png b/assets/minecraft/textures/gui/sprites/advancements/tab_below_middle.png index 99f08ec4..c05c03ae 100644 --- a/assets/minecraft/textures/gui/sprites/advancements/tab_below_middle.png +++ b/assets/minecraft/textures/gui/sprites/advancements/tab_below_middle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a3912c967d0cdbcdc1203e3a7a3e5d8d7bdb3c20bf1f4cd1d1565858fed47481 -size 160 +oid sha256:eee5ef6116e66527909fc8c8c846b9ee649fda54b2d77467dbc977273d338e11 +size 111 diff --git a/assets/minecraft/textures/gui/sprites/advancements/tab_below_middle_selected.png b/assets/minecraft/textures/gui/sprites/advancements/tab_below_middle_selected.png index eb8ae7ff..f1c4a028 100644 --- a/assets/minecraft/textures/gui/sprites/advancements/tab_below_middle_selected.png +++ b/assets/minecraft/textures/gui/sprites/advancements/tab_below_middle_selected.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:67c5f98447c58d89b166af2e92865bba1cb498aa34e7a04daee9cf4475a0303e -size 139 +oid sha256:99cc8a80de7e255e39279fd5ab3fbf9140adcb7aa37c6d84c29b4cc6a83b177c +size 116 diff --git a/assets/minecraft/textures/gui/sprites/advancements/tab_below_right.png b/assets/minecraft/textures/gui/sprites/advancements/tab_below_right.png index dde9e9ea..5645dfe7 100644 --- a/assets/minecraft/textures/gui/sprites/advancements/tab_below_right.png +++ b/assets/minecraft/textures/gui/sprites/advancements/tab_below_right.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3ca94ad413637a8524988b90e999be80acc7e0bc0d31d5d2a32688d4cd4bcc6c -size 162 +oid sha256:067e43c01b04b369de93590322fe56fa48c090fd8ad288ecad375599393e53b4 +size 113 diff --git a/assets/minecraft/textures/gui/sprites/advancements/tab_below_right_selected.png b/assets/minecraft/textures/gui/sprites/advancements/tab_below_right_selected.png index a3474658..abca3a3b 100644 --- a/assets/minecraft/textures/gui/sprites/advancements/tab_below_right_selected.png +++ b/assets/minecraft/textures/gui/sprites/advancements/tab_below_right_selected.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fc035914676098900e972e1aa86c87bacd15c98c460a46b9ccdf0b703d3023de -size 152 +oid sha256:35efc7ad060e22141f7734d0ac7873c8486fd842bfa75d79c1e66c34482ae8c6 +size 114 diff --git a/assets/minecraft/textures/gui/sprites/advancements/tab_left_bottom.png b/assets/minecraft/textures/gui/sprites/advancements/tab_left_bottom.png index 46e7f9f3..dd75089b 100644 --- a/assets/minecraft/textures/gui/sprites/advancements/tab_left_bottom.png +++ b/assets/minecraft/textures/gui/sprites/advancements/tab_left_bottom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bd60fdde8311d533f343e98076d8e7099602beeb52197d8c5614c7efeb69e872 -size 163 +oid sha256:b15926890b97120d132580ef2bf1122c434ee8e900ebb94bf23bd361f299332b +size 118 diff --git a/assets/minecraft/textures/gui/sprites/advancements/tab_left_bottom_selected.png b/assets/minecraft/textures/gui/sprites/advancements/tab_left_bottom_selected.png index 95f1c013..973dc083 100644 --- a/assets/minecraft/textures/gui/sprites/advancements/tab_left_bottom_selected.png +++ b/assets/minecraft/textures/gui/sprites/advancements/tab_left_bottom_selected.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:637ff3f6fb315ccb2f5abd8f91c6acc0276a0ca5f14b183b5fc4debc4fda9e1e -size 134 +oid sha256:58c704d8529cc54f2cc246227b7714940d8aeee60ca287c34e7ade0641698cab +size 114 diff --git a/assets/minecraft/textures/gui/sprites/advancements/tab_left_middle.png b/assets/minecraft/textures/gui/sprites/advancements/tab_left_middle.png index 46e7f9f3..dd75089b 100644 --- a/assets/minecraft/textures/gui/sprites/advancements/tab_left_middle.png +++ b/assets/minecraft/textures/gui/sprites/advancements/tab_left_middle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bd60fdde8311d533f343e98076d8e7099602beeb52197d8c5614c7efeb69e872 -size 163 +oid sha256:b15926890b97120d132580ef2bf1122c434ee8e900ebb94bf23bd361f299332b +size 118 diff --git a/assets/minecraft/textures/gui/sprites/advancements/tab_left_middle_selected.png b/assets/minecraft/textures/gui/sprites/advancements/tab_left_middle_selected.png index 2b4e1346..4919cc8c 100644 --- a/assets/minecraft/textures/gui/sprites/advancements/tab_left_middle_selected.png +++ b/assets/minecraft/textures/gui/sprites/advancements/tab_left_middle_selected.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:651f6dad068013a3763a48f83e4f836b7194d906c263b43fb48eb4be456920bd -size 137 +oid sha256:4568f0fab2cd9b207cc6df0e32fd4f074bbda686fa46f3bafab0c0c42b443f88 +size 120 diff --git a/assets/minecraft/textures/gui/sprites/advancements/tab_left_top.png b/assets/minecraft/textures/gui/sprites/advancements/tab_left_top.png index 46e7f9f3..dd75089b 100644 --- a/assets/minecraft/textures/gui/sprites/advancements/tab_left_top.png +++ b/assets/minecraft/textures/gui/sprites/advancements/tab_left_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bd60fdde8311d533f343e98076d8e7099602beeb52197d8c5614c7efeb69e872 -size 163 +oid sha256:b15926890b97120d132580ef2bf1122c434ee8e900ebb94bf23bd361f299332b +size 118 diff --git a/assets/minecraft/textures/gui/sprites/advancements/tab_left_top_selected.png b/assets/minecraft/textures/gui/sprites/advancements/tab_left_top_selected.png index cc41e6d2..00aef3e0 100644 --- a/assets/minecraft/textures/gui/sprites/advancements/tab_left_top_selected.png +++ b/assets/minecraft/textures/gui/sprites/advancements/tab_left_top_selected.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:61a19cddf856cb8da2a757e6c8cb52823f018a253d0472d10994f4884ce3ac7b -size 135 +oid sha256:815283df72683a08654b6808f5798e17f0e6595a5f8ff66243c94b85361af2a3 +size 117 diff --git a/assets/minecraft/textures/gui/sprites/advancements/tab_right_bottom.png b/assets/minecraft/textures/gui/sprites/advancements/tab_right_bottom.png index 40ee47fd..66a01107 100644 --- a/assets/minecraft/textures/gui/sprites/advancements/tab_right_bottom.png +++ b/assets/minecraft/textures/gui/sprites/advancements/tab_right_bottom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c63891452a851559b48b569c478c85b14bb6ac130c491cd4c5d2e4c215951120 -size 166 +oid sha256:b25e5c79583a883675331e1160a24d71f773bda1424b6ae333ea984173e2c814 +size 118 diff --git a/assets/minecraft/textures/gui/sprites/advancements/tab_right_bottom_selected.png b/assets/minecraft/textures/gui/sprites/advancements/tab_right_bottom_selected.png index f0ba9152..5d4401c0 100644 --- a/assets/minecraft/textures/gui/sprites/advancements/tab_right_bottom_selected.png +++ b/assets/minecraft/textures/gui/sprites/advancements/tab_right_bottom_selected.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cbf6620d6d1842165912820e2babfa3b360582ad5753f04fcffec4742367ebbe -size 142 +oid sha256:28142120de97592ca07258f522c4c456b8d581ee512f01d1d121380a8d7adecf +size 119 diff --git a/assets/minecraft/textures/gui/sprites/advancements/tab_right_middle.png b/assets/minecraft/textures/gui/sprites/advancements/tab_right_middle.png index 40ee47fd..66a01107 100644 --- a/assets/minecraft/textures/gui/sprites/advancements/tab_right_middle.png +++ b/assets/minecraft/textures/gui/sprites/advancements/tab_right_middle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c63891452a851559b48b569c478c85b14bb6ac130c491cd4c5d2e4c215951120 -size 166 +oid sha256:b25e5c79583a883675331e1160a24d71f773bda1424b6ae333ea984173e2c814 +size 118 diff --git a/assets/minecraft/textures/gui/sprites/advancements/tab_right_middle_selected.png b/assets/minecraft/textures/gui/sprites/advancements/tab_right_middle_selected.png index 59834e61..a6eeae7a 100644 --- a/assets/minecraft/textures/gui/sprites/advancements/tab_right_middle_selected.png +++ b/assets/minecraft/textures/gui/sprites/advancements/tab_right_middle_selected.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d1ca14cd60553785ac703d8c8fedb682fd0e1fc43b0cc1ce915888c99d0221e4 -size 142 +oid sha256:880e4a327f9100c9c6e00f4d5cf88839cef01fefc3c6f532fa2a90d91ac40765 +size 120 diff --git a/assets/minecraft/textures/gui/sprites/advancements/tab_right_top.png b/assets/minecraft/textures/gui/sprites/advancements/tab_right_top.png index 40ee47fd..66a01107 100644 --- a/assets/minecraft/textures/gui/sprites/advancements/tab_right_top.png +++ b/assets/minecraft/textures/gui/sprites/advancements/tab_right_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c63891452a851559b48b569c478c85b14bb6ac130c491cd4c5d2e4c215951120 -size 166 +oid sha256:b25e5c79583a883675331e1160a24d71f773bda1424b6ae333ea984173e2c814 +size 118 diff --git a/assets/minecraft/textures/gui/sprites/advancements/tab_right_top_selected.png b/assets/minecraft/textures/gui/sprites/advancements/tab_right_top_selected.png index 1e1714d5..b6157c68 100644 --- a/assets/minecraft/textures/gui/sprites/advancements/tab_right_top_selected.png +++ b/assets/minecraft/textures/gui/sprites/advancements/tab_right_top_selected.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:304c1c22e9ee07c7673737da325f7dba7a7e42d848dd7832893258c74edea757 -size 142 +oid sha256:7fe43206e9d46612e4699553a72db5454c332e2447c2b39324a6967529993868 +size 115 diff --git a/assets/minecraft/textures/gui/sprites/advancements/task_frame_obtained.png b/assets/minecraft/textures/gui/sprites/advancements/task_frame_obtained.png index d6f0df60..8878ccda 100644 --- a/assets/minecraft/textures/gui/sprites/advancements/task_frame_obtained.png +++ b/assets/minecraft/textures/gui/sprites/advancements/task_frame_obtained.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c4ac927bccfdf91185beec71d6dc5c326beed0fd2adc7cd6aa3c12eba44ff6f2 -size 162 +oid sha256:0072935998b17c55d55882f0e11e8954576725bd3e3b691d4e20284ac0bbf104 +size 125 diff --git a/assets/minecraft/textures/gui/sprites/advancements/task_frame_unobtained.png b/assets/minecraft/textures/gui/sprites/advancements/task_frame_unobtained.png index 1bcf90fa..f4ae1244 100644 --- a/assets/minecraft/textures/gui/sprites/advancements/task_frame_unobtained.png +++ b/assets/minecraft/textures/gui/sprites/advancements/task_frame_unobtained.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:56a500f1f36f4ffef959cf33f1a849bf75052be9bab77ea9a6abbd0bd01e4719 -size 162 +oid sha256:6b8bb754a197bd4f61811f64a5bbabf703658882d812278e43317c7769d1c4df +size 106 diff --git a/assets/minecraft/textures/gui/sprites/advancements/title_box.png b/assets/minecraft/textures/gui/sprites/advancements/title_box.png index 90f5c3bf..536be761 100644 --- a/assets/minecraft/textures/gui/sprites/advancements/title_box.png +++ b/assets/minecraft/textures/gui/sprites/advancements/title_box.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b355968043d520df662f0a34423207c11b0d2eccd4f6a62dcd0a6056f8f4d4a2 -size 158 +oid sha256:58be918ba09dbb6d5ad3e0a84f2270c63c412624da64cc937a50f8669f991399 +size 139 diff --git a/assets/minecraft/textures/gui/sprites/boss_bar/blue_progress.png b/assets/minecraft/textures/gui/sprites/boss_bar/blue_progress.png index 27c16c9a..983af6e8 100644 --- a/assets/minecraft/textures/gui/sprites/boss_bar/blue_progress.png +++ b/assets/minecraft/textures/gui/sprites/boss_bar/blue_progress.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cb3905271ad4bd091ba05c6386f76add89c9bc857b882a912e28c7fc92941826 -size 162 +oid sha256:591d8a435860f20fde1f5199ff687e8475e2369ea0cfe3ca0f3317b8f3c80fec +size 157 diff --git a/assets/minecraft/textures/gui/sprites/boss_bar/green_progress.png b/assets/minecraft/textures/gui/sprites/boss_bar/green_progress.png index 822a597a..bf87f9d6 100644 --- a/assets/minecraft/textures/gui/sprites/boss_bar/green_progress.png +++ b/assets/minecraft/textures/gui/sprites/boss_bar/green_progress.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2cb9629c27bd949a7845addb9cf069eba20eaedafdc0888562b6c1ad8b774acd -size 162 +oid sha256:6ede411c17c758826091a58030a377d7e4f630d43050addc1665d2f23ab418f8 +size 156 diff --git a/assets/minecraft/textures/gui/sprites/boss_bar/notched_10_background.png b/assets/minecraft/textures/gui/sprites/boss_bar/notched_10_background.png index 0649c52f..c0446e4c 100644 --- a/assets/minecraft/textures/gui/sprites/boss_bar/notched_10_background.png +++ b/assets/minecraft/textures/gui/sprites/boss_bar/notched_10_background.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:20fc303b23df3ec0767769a523e6a82b2d63bbe9e1ff77687858e68af24d5744 -size 162 +oid sha256:956a05421a316c0c4d9b4e59e47116f478b42451fd1c0c415a1332763099e965 +size 116 diff --git a/assets/minecraft/textures/gui/sprites/boss_bar/notched_10_progress.png b/assets/minecraft/textures/gui/sprites/boss_bar/notched_10_progress.png index 901ecce4..c0446e4c 100644 --- a/assets/minecraft/textures/gui/sprites/boss_bar/notched_10_progress.png +++ b/assets/minecraft/textures/gui/sprites/boss_bar/notched_10_progress.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:00f11e18f773ce714093e0425206eb091c72732bf8a700497498f928d5d06ac4 -size 157 +oid sha256:956a05421a316c0c4d9b4e59e47116f478b42451fd1c0c415a1332763099e965 +size 116 diff --git a/assets/minecraft/textures/gui/sprites/boss_bar/notched_12_background.png b/assets/minecraft/textures/gui/sprites/boss_bar/notched_12_background.png index 0b17e375..73e87760 100644 --- a/assets/minecraft/textures/gui/sprites/boss_bar/notched_12_background.png +++ b/assets/minecraft/textures/gui/sprites/boss_bar/notched_12_background.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:87a974ba3e92105a405ec659852eeed7457d4a09df5b76ba359b3307b989d9aa -size 142 +oid sha256:772493b4e270c7d99db4b82f468673b28196efb33c7b9f23eab1497423e7ea98 +size 111 diff --git a/assets/minecraft/textures/gui/sprites/boss_bar/notched_12_progress.png b/assets/minecraft/textures/gui/sprites/boss_bar/notched_12_progress.png index 07a64768..73e87760 100644 --- a/assets/minecraft/textures/gui/sprites/boss_bar/notched_12_progress.png +++ b/assets/minecraft/textures/gui/sprites/boss_bar/notched_12_progress.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d0c30c6b9141c439d14ce964a3171abddcc3177dbadde2bb83496ee7826923f -size 147 +oid sha256:772493b4e270c7d99db4b82f468673b28196efb33c7b9f23eab1497423e7ea98 +size 111 diff --git a/assets/minecraft/textures/gui/sprites/boss_bar/notched_20_background.png b/assets/minecraft/textures/gui/sprites/boss_bar/notched_20_background.png index 295b2e77..27f7692b 100644 --- a/assets/minecraft/textures/gui/sprites/boss_bar/notched_20_background.png +++ b/assets/minecraft/textures/gui/sprites/boss_bar/notched_20_background.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a3785855f9f68d31fc349d23aac07aea0f88b74dca2a0190e00a97894572d01d -size 154 +oid sha256:4b6dd7fc8b820b22987113acef448c091a4349f4e1c3768926073eea8feb437e +size 105 diff --git a/assets/minecraft/textures/gui/sprites/boss_bar/notched_20_progress.png b/assets/minecraft/textures/gui/sprites/boss_bar/notched_20_progress.png index e681c84c..27f7692b 100644 --- a/assets/minecraft/textures/gui/sprites/boss_bar/notched_20_progress.png +++ b/assets/minecraft/textures/gui/sprites/boss_bar/notched_20_progress.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9fc70606e96dd4385c7f0b8959fe0d3471ae044ffd54449d7864f04298ec8b79 -size 131 +oid sha256:4b6dd7fc8b820b22987113acef448c091a4349f4e1c3768926073eea8feb437e +size 105 diff --git a/assets/minecraft/textures/gui/sprites/boss_bar/notched_6_background.png b/assets/minecraft/textures/gui/sprites/boss_bar/notched_6_background.png index 4be56ef1..3f1d8fae 100644 --- a/assets/minecraft/textures/gui/sprites/boss_bar/notched_6_background.png +++ b/assets/minecraft/textures/gui/sprites/boss_bar/notched_6_background.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aff9f9efc62706678965b0630d129dfca87fa30f55fa89ac4af96eca5661898f -size 149 +oid sha256:a60ab5e58397854717da087a92d5430945ca94317ef4a9af2c3fbae9370fd0a5 +size 116 diff --git a/assets/minecraft/textures/gui/sprites/boss_bar/notched_6_progress.png b/assets/minecraft/textures/gui/sprites/boss_bar/notched_6_progress.png index 8bb68df9..3f1d8fae 100644 --- a/assets/minecraft/textures/gui/sprites/boss_bar/notched_6_progress.png +++ b/assets/minecraft/textures/gui/sprites/boss_bar/notched_6_progress.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:677bd50430f98c1de81d1241dea54431afdc6df436f205c245ef87b8d342c90d -size 197 +oid sha256:a60ab5e58397854717da087a92d5430945ca94317ef4a9af2c3fbae9370fd0a5 +size 116 diff --git a/assets/minecraft/textures/gui/sprites/boss_bar/red_progress.png b/assets/minecraft/textures/gui/sprites/boss_bar/red_progress.png index abeeac8b..ac56e431 100644 --- a/assets/minecraft/textures/gui/sprites/boss_bar/red_progress.png +++ b/assets/minecraft/textures/gui/sprites/boss_bar/red_progress.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:15f9215c4c9264b12a634de0b042d95767641d28c1cbb3f50394ceb7f2f39d06 -size 162 +oid sha256:44aa24023569d830ae0727d0d5b6984164409562f4e3f9712f4d2687b929d8c5 +size 157 diff --git a/assets/minecraft/textures/gui/sprites/boss_bar/white_background.png b/assets/minecraft/textures/gui/sprites/boss_bar/white_background.png index 45f0ccc4..bf7497f8 100644 --- a/assets/minecraft/textures/gui/sprites/boss_bar/white_background.png +++ b/assets/minecraft/textures/gui/sprites/boss_bar/white_background.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b5b084f43cb950f54a8f97ba1dc7ca6134254bdb93f2aceebaa7e43bd53269c1 -size 137 +oid sha256:77f9e2aea3c5c83a24d3575709e895447828c74f366d0b28ebb0636bf779f2ef +size 112 diff --git a/assets/minecraft/textures/gui/sprites/boss_bar/white_progress.png b/assets/minecraft/textures/gui/sprites/boss_bar/white_progress.png index a6d1d50c..c66c54f9 100644 --- a/assets/minecraft/textures/gui/sprites/boss_bar/white_progress.png +++ b/assets/minecraft/textures/gui/sprites/boss_bar/white_progress.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:176a5465e2a4700b60368d7f552ac25ca607288d987cc3403c1da1678ff46f9e -size 162 +oid sha256:a4277608051d611add9d6a5be4a6a699cb8a6432b9ab7b7969163b46291ce073 +size 124 diff --git a/assets/minecraft/textures/gui/sprites/boss_bar/yellow_progress.png b/assets/minecraft/textures/gui/sprites/boss_bar/yellow_progress.png index 6e73a22b..a81ba5ad 100644 --- a/assets/minecraft/textures/gui/sprites/boss_bar/yellow_progress.png +++ b/assets/minecraft/textures/gui/sprites/boss_bar/yellow_progress.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:77682214369138c9c5304a094b29a963d98120d0d6185a025bfa7aaaf9380f15 -size 162 +oid sha256:46c9280d5fa25daa7c052ea0b9811b9444271586fe535cff9653f53e4b0b530c +size 158 diff --git a/assets/minecraft/textures/gui/sprites/container/anvil/error.png b/assets/minecraft/textures/gui/sprites/container/anvil/error.png index b5387b80..a1c79fc9 100644 --- a/assets/minecraft/textures/gui/sprites/container/anvil/error.png +++ b/assets/minecraft/textures/gui/sprites/container/anvil/error.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3b6e01a20b2eddb4412baa1752eb06130ecbb33ceb55739c0015bdf8953671cb -size 158 +oid sha256:2230c045290ecbfaaa445919ce7586810f66a4bcd192635e7d21d5f91d4fa0b9 +size 157 diff --git a/assets/minecraft/textures/gui/sprites/container/beacon/button.png b/assets/minecraft/textures/gui/sprites/container/beacon/button.png index a19dc83b..f5e06f9b 100644 --- a/assets/minecraft/textures/gui/sprites/container/beacon/button.png +++ b/assets/minecraft/textures/gui/sprites/container/beacon/button.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b645f8fccb96f560ea13beb93983a87bf34c737a82056c72712e37cf7ddffd10 -size 102 +oid sha256:a1233dfc02251f123dc3fe13313ff96ae6612f976642c5549b19efcb63d79389 +size 84 diff --git a/assets/minecraft/textures/gui/sprites/container/beacon/button_disabled.png b/assets/minecraft/textures/gui/sprites/container/beacon/button_disabled.png index 4ab80e0f..c5eceb2b 100644 --- a/assets/minecraft/textures/gui/sprites/container/beacon/button_disabled.png +++ b/assets/minecraft/textures/gui/sprites/container/beacon/button_disabled.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f6013671a685021f1bdc89e1f7211f6d2a98a952c691129a5600f276552abc98 -size 102 +oid sha256:6cc9119bc05ab1747ea8a8e55a58a62de41e2c7d4c76f1826c63e39a55e8b13e +size 84 diff --git a/assets/minecraft/textures/gui/sprites/container/beacon/button_highlighted.png b/assets/minecraft/textures/gui/sprites/container/beacon/button_highlighted.png index cd1c7010..840046dc 100644 --- a/assets/minecraft/textures/gui/sprites/container/beacon/button_highlighted.png +++ b/assets/minecraft/textures/gui/sprites/container/beacon/button_highlighted.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7cb633ba02f70b4c2d0b81120bb83de18ddf53a3bf9cc3a02215da5d2e388ab1 -size 102 +oid sha256:faac05a0b1186161af4add54e860271d7a71b57c167fbfd55ebf86de7479258a +size 97 diff --git a/assets/minecraft/textures/gui/sprites/container/beacon/button_selected.png b/assets/minecraft/textures/gui/sprites/container/beacon/button_selected.png index 6a15b01a..efb64f74 100644 --- a/assets/minecraft/textures/gui/sprites/container/beacon/button_selected.png +++ b/assets/minecraft/textures/gui/sprites/container/beacon/button_selected.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0390537b979b9571da62f2099c3e276fc9c66bc6925816b0b5f8ac97740e9cdc -size 102 +oid sha256:6063c14f59a38b39f3ea4682e9dde7885daf89762f42e32f52daedd42920cd18 +size 84 diff --git a/assets/minecraft/textures/gui/sprites/container/beacon/cancel.png b/assets/minecraft/textures/gui/sprites/container/beacon/cancel.png index b3948319..f7830022 100644 --- a/assets/minecraft/textures/gui/sprites/container/beacon/cancel.png +++ b/assets/minecraft/textures/gui/sprites/container/beacon/cancel.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f4487bc09fe5a715c5d5213f31933b965f78a46dc034e44a8dcdbef96f55dce8 -size 163 +oid sha256:5a91fc0fe27db925538a49c9424a7e6e809a5300673d7cb286c6865bc9cf1722 +size 148 diff --git a/assets/minecraft/textures/gui/sprites/container/beacon/confirm.png b/assets/minecraft/textures/gui/sprites/container/beacon/confirm.png index bf5042cf..dae1618e 100644 --- a/assets/minecraft/textures/gui/sprites/container/beacon/confirm.png +++ b/assets/minecraft/textures/gui/sprites/container/beacon/confirm.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e9e71cd9f86e5a3ab3358a535497b0c923a0b9bf65f2d50d8ff7a0d97b67764e -size 150 +oid sha256:03f4aacf933e2b6cbdfe884d476761fff00698f868f4f8b836ca69e27de41fc3 +size 139 diff --git a/assets/minecraft/textures/gui/sprites/container/blast_furnace/burn_progress.png b/assets/minecraft/textures/gui/sprites/container/blast_furnace/burn_progress.png index 39e83c3b..30c8a115 100644 --- a/assets/minecraft/textures/gui/sprites/container/blast_furnace/burn_progress.png +++ b/assets/minecraft/textures/gui/sprites/container/blast_furnace/burn_progress.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9e042d39afe20bbdd4a0cfbb66be1c24f30327d460a48042d3a38cba7851c018 -size 143 +oid sha256:e26aac6002403fdd838b6a0c829808a991d32ba2c4d3603f2c4e2f7ee5a4d969 +size 119 diff --git a/assets/minecraft/textures/gui/sprites/container/blast_furnace/lit_progress.png b/assets/minecraft/textures/gui/sprites/container/blast_furnace/lit_progress.png index 457b9311..a69614c9 100644 --- a/assets/minecraft/textures/gui/sprites/container/blast_furnace/lit_progress.png +++ b/assets/minecraft/textures/gui/sprites/container/blast_furnace/lit_progress.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:32f69838e8fbf0b980ec3f8b205d0ddb5f477fcf6202feddbd1b6a0b4524b6eb -size 175 +oid sha256:36a83a892fe65c55296ac01f63374425ecd42aaba3670b61767c88795a5732e3 +size 170 diff --git a/assets/minecraft/textures/gui/sprites/container/brewing_stand/brew_progress.png b/assets/minecraft/textures/gui/sprites/container/brewing_stand/brew_progress.png index 34414fc6..aa076ea1 100644 --- a/assets/minecraft/textures/gui/sprites/container/brewing_stand/brew_progress.png +++ b/assets/minecraft/textures/gui/sprites/container/brewing_stand/brew_progress.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9f20e2965d9af7202a3e92483f53c1617c49505828358bd517e39954f09caf69 -size 101 +oid sha256:56a4c8251dd52725127f7ff71d6f4be3bc69fba08ed7da86553b436c90929b76 +size 96 diff --git a/assets/minecraft/textures/gui/sprites/container/brewing_stand/bubbles.png b/assets/minecraft/textures/gui/sprites/container/brewing_stand/bubbles.png index d92cb066..f9295456 100644 --- a/assets/minecraft/textures/gui/sprites/container/brewing_stand/bubbles.png +++ b/assets/minecraft/textures/gui/sprites/container/brewing_stand/bubbles.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:43b4aa9edc97e7fbd31cba8322fbe67769ab3f00e18ac239dbe0f08d7732509c -size 154 +oid sha256:a0c4a6d12f4952ec603a4f6918aace60630b4b98647c2b8b2fd32d8a9c1c7c3e +size 145 diff --git a/assets/minecraft/textures/gui/sprites/container/brewing_stand/fuel_length.png b/assets/minecraft/textures/gui/sprites/container/brewing_stand/fuel_length.png index 9cb2eec9..4fc55f7c 100644 --- a/assets/minecraft/textures/gui/sprites/container/brewing_stand/fuel_length.png +++ b/assets/minecraft/textures/gui/sprites/container/brewing_stand/fuel_length.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1fe417e8197b14831d37063ee42fbdec87c0b28ac8f42e933e39a72b3eea8418 -size 170 +oid sha256:d1c38c3e9255ccbe2ddd44299376f46bb5a9b5a0b33027ab8eddf1cb517b62dc +size 164 diff --git a/assets/minecraft/textures/gui/sprites/container/bundle/bundle_progressbar_border.png b/assets/minecraft/textures/gui/sprites/container/bundle/bundle_progressbar_border.png index 5af0f00a..45b83b64 100644 --- a/assets/minecraft/textures/gui/sprites/container/bundle/bundle_progressbar_border.png +++ b/assets/minecraft/textures/gui/sprites/container/bundle/bundle_progressbar_border.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b6dbede505e3063eaffbde3a7819feaa19132808ebbb9ed703db57f9ebafbcf4 -size 112 +oid sha256:b036e9d53f96f93e591d97ec2c1f7c551887b91c9e64913afc4f04d62a645552 +size 89 diff --git a/assets/minecraft/textures/gui/sprites/container/bundle/bundle_progressbar_fill.png b/assets/minecraft/textures/gui/sprites/container/bundle/bundle_progressbar_fill.png index 5e571fb2..5d5a1517 100644 --- a/assets/minecraft/textures/gui/sprites/container/bundle/bundle_progressbar_fill.png +++ b/assets/minecraft/textures/gui/sprites/container/bundle/bundle_progressbar_fill.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:10cfb8174fadadd84cb4ef0842ed0386cd506efce40c159b5df7665b5040d628 -size 94 +oid sha256:e668bc423acd15dfc846d655aa94c029d96f4b660787a95cb03e5a07732a1e63 +size 81 diff --git a/assets/minecraft/textures/gui/sprites/container/bundle/bundle_progressbar_full.png b/assets/minecraft/textures/gui/sprites/container/bundle/bundle_progressbar_full.png index b424e0e3..7f8271c4 100644 --- a/assets/minecraft/textures/gui/sprites/container/bundle/bundle_progressbar_full.png +++ b/assets/minecraft/textures/gui/sprites/container/bundle/bundle_progressbar_full.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7076a7a034067d7dfff4d74f92c413251e8bbc4897cbc484c234b66b044660d4 -size 94 +oid sha256:2caf2175649fed5fc989bcfd2c6609d61e8346f5ca9bd213279c0f90786ab7de +size 81 diff --git a/assets/minecraft/textures/gui/sprites/container/bundle/slot_background.png b/assets/minecraft/textures/gui/sprites/container/bundle/slot_background.png index 81699bcd..e22ccd2e 100644 --- a/assets/minecraft/textures/gui/sprites/container/bundle/slot_background.png +++ b/assets/minecraft/textures/gui/sprites/container/bundle/slot_background.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f3d867c9e19e0bfb049b42e9fac35983c5375d3bb7b7801baa755e297215b20d -size 113 +oid sha256:6db0248819f6f1ad9a8c1adeac8df0f165262f36c9dbc5bd32110b5d5429dc44 +size 101 diff --git a/assets/minecraft/textures/gui/sprites/container/bundle/slot_highlight_back.png b/assets/minecraft/textures/gui/sprites/container/bundle/slot_highlight_back.png index 0f3e3021..61521cfc 100644 --- a/assets/minecraft/textures/gui/sprites/container/bundle/slot_highlight_back.png +++ b/assets/minecraft/textures/gui/sprites/container/bundle/slot_highlight_back.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5890dbb32cf2a55d6bc62dd56e6afc6c8d6ce2f3e6df579c5fd7ec35374cc67e -size 114 +oid sha256:2b3f92787fec7c692bd004ac6da24181b109f708fc9656b6168c93bcff9f228a +size 88 diff --git a/assets/minecraft/textures/gui/sprites/container/bundle/slot_highlight_front.png b/assets/minecraft/textures/gui/sprites/container/bundle/slot_highlight_front.png index ca0e3ff6..ffbf2e11 100644 --- a/assets/minecraft/textures/gui/sprites/container/bundle/slot_highlight_front.png +++ b/assets/minecraft/textures/gui/sprites/container/bundle/slot_highlight_front.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:534acc950a68d207ac99f20b681c0d40225d46df24a68a5500beb3c7c7655c4a -size 114 +oid sha256:c7a4ed756226870b85a3f4d070707f9d76689123683149b53c203530883ea2da +size 88 diff --git a/assets/minecraft/textures/gui/sprites/container/cartography_table/duplicated_map.png b/assets/minecraft/textures/gui/sprites/container/cartography_table/duplicated_map.png index ad6e2b01..ea449c18 100644 --- a/assets/minecraft/textures/gui/sprites/container/cartography_table/duplicated_map.png +++ b/assets/minecraft/textures/gui/sprites/container/cartography_table/duplicated_map.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f1d51915e33eeb50b5afbe3f51108bbf8752379d8ab42ab303040555be26387c -size 294 +oid sha256:c7888fcd633f457b6962fe6d634168bd3d4936d951a7dc42f2df7e429d75f627 +size 283 diff --git a/assets/minecraft/textures/gui/sprites/container/cartography_table/error.png b/assets/minecraft/textures/gui/sprites/container/cartography_table/error.png index b5387b80..a1c79fc9 100644 --- a/assets/minecraft/textures/gui/sprites/container/cartography_table/error.png +++ b/assets/minecraft/textures/gui/sprites/container/cartography_table/error.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3b6e01a20b2eddb4412baa1752eb06130ecbb33ceb55739c0015bdf8953671cb -size 158 +oid sha256:2230c045290ecbfaaa445919ce7586810f66a4bcd192635e7d21d5f91d4fa0b9 +size 157 diff --git a/assets/minecraft/textures/gui/sprites/container/cartography_table/locked.png b/assets/minecraft/textures/gui/sprites/container/cartography_table/locked.png index d918fc5f..b7937196 100644 --- a/assets/minecraft/textures/gui/sprites/container/cartography_table/locked.png +++ b/assets/minecraft/textures/gui/sprites/container/cartography_table/locked.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:216bd42fad35ffc19ae2dbc2cd1926b3533462d214e17b27b1796da0b3737419 -size 240 +oid sha256:b043d8d8aee209206c9e680d07f0068f0ee8bd60a901aac44a2fc354216d5222 +size 179 diff --git a/assets/minecraft/textures/gui/sprites/container/cartography_table/map.png b/assets/minecraft/textures/gui/sprites/container/cartography_table/map.png index 7996b90a..9ca17d4d 100644 --- a/assets/minecraft/textures/gui/sprites/container/cartography_table/map.png +++ b/assets/minecraft/textures/gui/sprites/container/cartography_table/map.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:50124a95e7f0553e597d2a63361dc0c13a1f2eb9e22ba7d7754e7be0c2783fbc -size 361 +oid sha256:9b932f57bb45079bbfb81cb2045d9f13eb2a5b35d9f62a9fbb1902be0ed5c112 +size 357 diff --git a/assets/minecraft/textures/gui/sprites/container/cartography_table/scaled_map.png b/assets/minecraft/textures/gui/sprites/container/cartography_table/scaled_map.png index a5a960a7..a22ea36f 100644 --- a/assets/minecraft/textures/gui/sprites/container/cartography_table/scaled_map.png +++ b/assets/minecraft/textures/gui/sprites/container/cartography_table/scaled_map.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a35688f02ffc3b37398920d48d4dbd57190167aef7b536a5d1ab3a2614a1ef6b -size 426 +oid sha256:bba7df2b4340e499ffab58541a93c88612107b8f77c23fac089d4eefa9783540 +size 424 diff --git a/assets/minecraft/textures/gui/sprites/container/crafter/disabled_slot.png b/assets/minecraft/textures/gui/sprites/container/crafter/disabled_slot.png index 6aaa7c77..2f52d15e 100644 --- a/assets/minecraft/textures/gui/sprites/container/crafter/disabled_slot.png +++ b/assets/minecraft/textures/gui/sprites/container/crafter/disabled_slot.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eef09c4de04fedfcbdb928202ad1ba2f6dfc093b5474b384c11bc4d8b62d52ac -size 102 +oid sha256:fb367d3e3b2b52282a1694f1096a3008558442321edf29a03ddb8e5eff43c10c +size 83 diff --git a/assets/minecraft/textures/gui/sprites/container/crafter/powered_redstone.png b/assets/minecraft/textures/gui/sprites/container/crafter/powered_redstone.png index 84823e21..36b49c77 100644 --- a/assets/minecraft/textures/gui/sprites/container/crafter/powered_redstone.png +++ b/assets/minecraft/textures/gui/sprites/container/crafter/powered_redstone.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f05cb40d15fb3c8332d606a34d04589e3e28c56f511d4397776cdc199214fef -size 157 +oid sha256:c6c15461701a449aacfc4f5e4f700e97afbf84ebf3520174f761408bc4faa58f +size 140 diff --git a/assets/minecraft/textures/gui/sprites/container/crafter/unpowered_redstone.png b/assets/minecraft/textures/gui/sprites/container/crafter/unpowered_redstone.png index 9e858cc5..5db66c9d 100644 --- a/assets/minecraft/textures/gui/sprites/container/crafter/unpowered_redstone.png +++ b/assets/minecraft/textures/gui/sprites/container/crafter/unpowered_redstone.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e5c5b952c1f66d8a9c30fe6b25be0e3e96081c5440ef93b800be1c1cb9fbdadf -size 158 +oid sha256:63cff463e56bfd457b5e95d016a5f7884646ad81d71a069ef4b8354e888ca71b +size 128 diff --git a/assets/minecraft/textures/gui/sprites/container/creative_inventory/scroller.png b/assets/minecraft/textures/gui/sprites/container/creative_inventory/scroller.png index 9d725e70..562e6654 100644 --- a/assets/minecraft/textures/gui/sprites/container/creative_inventory/scroller.png +++ b/assets/minecraft/textures/gui/sprites/container/creative_inventory/scroller.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f582df4794ef839c60922ab5476f425576f0e30e2d47d8f4a470a47ec0a95ff8 -size 106 +oid sha256:bbd2e9c7a41c5b2c9b95933c2115a12a46657ad114495632e13daaa9b25a13e6 +size 87 diff --git a/assets/minecraft/textures/gui/sprites/container/creative_inventory/scroller_disabled.png b/assets/minecraft/textures/gui/sprites/container/creative_inventory/scroller_disabled.png index 4eec792a..2a146a71 100644 --- a/assets/minecraft/textures/gui/sprites/container/creative_inventory/scroller_disabled.png +++ b/assets/minecraft/textures/gui/sprites/container/creative_inventory/scroller_disabled.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0fcdf9319df0266676ff2ca84b97cbbf1878d6a121f530431337d8639dadafcd -size 103 +oid sha256:75924aba42ca1b957893359e29b28b97b664189639ea920d6dbf96c568966f07 +size 87 diff --git a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_selected_1.png b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_selected_1.png index c2168cd6..2cef79a2 100644 --- a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_selected_1.png +++ b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_selected_1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fc59d3afb55ebe83b653cc3cd9fc522e06cbfe5acedee92063c274149e7520f6 -size 139 +oid sha256:02b5bb1807e65eb1a0c98a34ab7252e5033b6ea4276a5de993f239cab28c3505 +size 110 diff --git a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_selected_2.png b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_selected_2.png index cd4196e8..3cd1e3e0 100644 --- a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_selected_2.png +++ b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_selected_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d18715f47344d105c32875ba096f6c61b42e3f130804e919e6e860c3d592564 -size 145 +oid sha256:fd16ed172b37f650594eecd8bb80e63a5b3b2938265f7a3f778e932e135f95d9 +size 113 diff --git a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_selected_3.png b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_selected_3.png index cd4196e8..3cd1e3e0 100644 --- a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_selected_3.png +++ b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_selected_3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d18715f47344d105c32875ba096f6c61b42e3f130804e919e6e860c3d592564 -size 145 +oid sha256:fd16ed172b37f650594eecd8bb80e63a5b3b2938265f7a3f778e932e135f95d9 +size 113 diff --git a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_selected_4.png b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_selected_4.png index cd4196e8..3cd1e3e0 100644 --- a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_selected_4.png +++ b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_selected_4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d18715f47344d105c32875ba096f6c61b42e3f130804e919e6e860c3d592564 -size 145 +oid sha256:fd16ed172b37f650594eecd8bb80e63a5b3b2938265f7a3f778e932e135f95d9 +size 113 diff --git a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_selected_5.png b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_selected_5.png index cd4196e8..3cd1e3e0 100644 --- a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_selected_5.png +++ b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_selected_5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d18715f47344d105c32875ba096f6c61b42e3f130804e919e6e860c3d592564 -size 145 +oid sha256:fd16ed172b37f650594eecd8bb80e63a5b3b2938265f7a3f778e932e135f95d9 +size 113 diff --git a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_selected_6.png b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_selected_6.png index cd4196e8..3cd1e3e0 100644 --- a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_selected_6.png +++ b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_selected_6.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d18715f47344d105c32875ba096f6c61b42e3f130804e919e6e860c3d592564 -size 145 +oid sha256:fd16ed172b37f650594eecd8bb80e63a5b3b2938265f7a3f778e932e135f95d9 +size 113 diff --git a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_selected_7.png b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_selected_7.png index e151413d..e473a097 100644 --- a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_selected_7.png +++ b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_selected_7.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:628c7a286f841eb61318fb163611d979f761de51245325885dbfb1967147c164 -size 141 +oid sha256:1e6766cb53b40d5e205c2ab21a057c14ae10561c41e2d19fa7945a65fffcb32f +size 113 diff --git a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_unselected_1.png b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_unselected_1.png index 2f84a9ce..19ba41c1 100644 --- a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_unselected_1.png +++ b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_unselected_1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2efa1c9ef17e96549ce290652a5867bef08bd01440ff86bfd237fbcbf59d5b05 -size 146 +oid sha256:77683b58578d11e79ed1c540ab1e5091901d1047f935dd9bfb49393b358a264c +size 106 diff --git a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_unselected_2.png b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_unselected_2.png index 2f84a9ce..19ba41c1 100644 --- a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_unselected_2.png +++ b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_unselected_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2efa1c9ef17e96549ce290652a5867bef08bd01440ff86bfd237fbcbf59d5b05 -size 146 +oid sha256:77683b58578d11e79ed1c540ab1e5091901d1047f935dd9bfb49393b358a264c +size 106 diff --git a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_unselected_3.png b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_unselected_3.png index 2f84a9ce..19ba41c1 100644 --- a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_unselected_3.png +++ b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_unselected_3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2efa1c9ef17e96549ce290652a5867bef08bd01440ff86bfd237fbcbf59d5b05 -size 146 +oid sha256:77683b58578d11e79ed1c540ab1e5091901d1047f935dd9bfb49393b358a264c +size 106 diff --git a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_unselected_4.png b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_unselected_4.png index 2f84a9ce..19ba41c1 100644 --- a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_unselected_4.png +++ b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_unselected_4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2efa1c9ef17e96549ce290652a5867bef08bd01440ff86bfd237fbcbf59d5b05 -size 146 +oid sha256:77683b58578d11e79ed1c540ab1e5091901d1047f935dd9bfb49393b358a264c +size 106 diff --git a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_unselected_5.png b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_unselected_5.png index 2f84a9ce..19ba41c1 100644 --- a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_unselected_5.png +++ b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_unselected_5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2efa1c9ef17e96549ce290652a5867bef08bd01440ff86bfd237fbcbf59d5b05 -size 146 +oid sha256:77683b58578d11e79ed1c540ab1e5091901d1047f935dd9bfb49393b358a264c +size 106 diff --git a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_unselected_6.png b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_unselected_6.png index 2f84a9ce..19ba41c1 100644 --- a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_unselected_6.png +++ b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_unselected_6.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2efa1c9ef17e96549ce290652a5867bef08bd01440ff86bfd237fbcbf59d5b05 -size 146 +oid sha256:77683b58578d11e79ed1c540ab1e5091901d1047f935dd9bfb49393b358a264c +size 106 diff --git a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_unselected_7.png b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_unselected_7.png index 2f84a9ce..19ba41c1 100644 --- a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_unselected_7.png +++ b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_bottom_unselected_7.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2efa1c9ef17e96549ce290652a5867bef08bd01440ff86bfd237fbcbf59d5b05 -size 146 +oid sha256:77683b58578d11e79ed1c540ab1e5091901d1047f935dd9bfb49393b358a264c +size 106 diff --git a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_selected_1.png b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_selected_1.png index 46776bf0..a910c37d 100644 --- a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_selected_1.png +++ b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_selected_1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ea11e5bdb7367ae5b12c2671ab0e043b4cdeea39b76621626a4176f9e6027b23 -size 154 +oid sha256:a42984c5b9fa520a59f15002f070d72e3812575c5e491ee537e39d9d8eb124b4 +size 114 diff --git a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_selected_2.png b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_selected_2.png index 11312cc3..2843c5c8 100644 --- a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_selected_2.png +++ b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_selected_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:efccd1c21428187c11f4d75efc07795eb93cb16a41b05aec0371874347069f28 -size 147 +oid sha256:94b4c0c5310a811946ab6042940a3926e197c7396669afa8a2abd5d44d06ac30 +size 115 diff --git a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_selected_3.png b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_selected_3.png index 11312cc3..2843c5c8 100644 --- a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_selected_3.png +++ b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_selected_3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:efccd1c21428187c11f4d75efc07795eb93cb16a41b05aec0371874347069f28 -size 147 +oid sha256:94b4c0c5310a811946ab6042940a3926e197c7396669afa8a2abd5d44d06ac30 +size 115 diff --git a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_selected_4.png b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_selected_4.png index 11312cc3..2843c5c8 100644 --- a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_selected_4.png +++ b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_selected_4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:efccd1c21428187c11f4d75efc07795eb93cb16a41b05aec0371874347069f28 -size 147 +oid sha256:94b4c0c5310a811946ab6042940a3926e197c7396669afa8a2abd5d44d06ac30 +size 115 diff --git a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_selected_5.png b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_selected_5.png index 11312cc3..2843c5c8 100644 --- a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_selected_5.png +++ b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_selected_5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:efccd1c21428187c11f4d75efc07795eb93cb16a41b05aec0371874347069f28 -size 147 +oid sha256:94b4c0c5310a811946ab6042940a3926e197c7396669afa8a2abd5d44d06ac30 +size 115 diff --git a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_selected_6.png b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_selected_6.png index 11312cc3..2843c5c8 100644 --- a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_selected_6.png +++ b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_selected_6.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:efccd1c21428187c11f4d75efc07795eb93cb16a41b05aec0371874347069f28 -size 147 +oid sha256:94b4c0c5310a811946ab6042940a3926e197c7396669afa8a2abd5d44d06ac30 +size 115 diff --git a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_selected_7.png b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_selected_7.png index 58a1386e..b7c02d0c 100644 --- a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_selected_7.png +++ b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_selected_7.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:62533c75a1959e116d09b675182000f00e72ba5d93282c1b385cdcd6c49ac2e2 -size 152 +oid sha256:f7804e815df99b3e91617970b326c041fa753542da1b36b8f05f73d4bdf4e5f3 +size 114 diff --git a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_unselected_1.png b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_unselected_1.png index 0bc26912..a0f3b8c4 100644 --- a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_unselected_1.png +++ b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_unselected_1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:45878f87713a95e9e383d9ee443ef81c8dcc1acadd76eb6c71693c9458761cfa -size 138 +oid sha256:74a911839ae62153cd636b5e400a852424eec744132dfc7bf556387e6fd75644 +size 106 diff --git a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_unselected_2.png b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_unselected_2.png index 0bc26912..a0f3b8c4 100644 --- a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_unselected_2.png +++ b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_unselected_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:45878f87713a95e9e383d9ee443ef81c8dcc1acadd76eb6c71693c9458761cfa -size 138 +oid sha256:74a911839ae62153cd636b5e400a852424eec744132dfc7bf556387e6fd75644 +size 106 diff --git a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_unselected_3.png b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_unselected_3.png index 0bc26912..a0f3b8c4 100644 --- a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_unselected_3.png +++ b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_unselected_3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:45878f87713a95e9e383d9ee443ef81c8dcc1acadd76eb6c71693c9458761cfa -size 138 +oid sha256:74a911839ae62153cd636b5e400a852424eec744132dfc7bf556387e6fd75644 +size 106 diff --git a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_unselected_4.png b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_unselected_4.png index 0bc26912..a0f3b8c4 100644 --- a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_unselected_4.png +++ b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_unselected_4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:45878f87713a95e9e383d9ee443ef81c8dcc1acadd76eb6c71693c9458761cfa -size 138 +oid sha256:74a911839ae62153cd636b5e400a852424eec744132dfc7bf556387e6fd75644 +size 106 diff --git a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_unselected_5.png b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_unselected_5.png index 0bc26912..a0f3b8c4 100644 --- a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_unselected_5.png +++ b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_unselected_5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:45878f87713a95e9e383d9ee443ef81c8dcc1acadd76eb6c71693c9458761cfa -size 138 +oid sha256:74a911839ae62153cd636b5e400a852424eec744132dfc7bf556387e6fd75644 +size 106 diff --git a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_unselected_6.png b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_unselected_6.png index 0bc26912..a0f3b8c4 100644 --- a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_unselected_6.png +++ b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_unselected_6.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:45878f87713a95e9e383d9ee443ef81c8dcc1acadd76eb6c71693c9458761cfa -size 138 +oid sha256:74a911839ae62153cd636b5e400a852424eec744132dfc7bf556387e6fd75644 +size 106 diff --git a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_unselected_7.png b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_unselected_7.png index 0bc26912..a0f3b8c4 100644 --- a/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_unselected_7.png +++ b/assets/minecraft/textures/gui/sprites/container/creative_inventory/tab_top_unselected_7.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:45878f87713a95e9e383d9ee443ef81c8dcc1acadd76eb6c71693c9458761cfa -size 138 +oid sha256:74a911839ae62153cd636b5e400a852424eec744132dfc7bf556387e6fd75644 +size 106 diff --git a/assets/minecraft/textures/gui/sprites/container/enchanting_table/level_1.png b/assets/minecraft/textures/gui/sprites/container/enchanting_table/level_1.png index f4f19e0d..25130415 100644 --- a/assets/minecraft/textures/gui/sprites/container/enchanting_table/level_1.png +++ b/assets/minecraft/textures/gui/sprites/container/enchanting_table/level_1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9e803b636672c7281cebc637a80e4a7dfa3fe4cb9c207018e8bd283ff1f69376 -size 212 +oid sha256:165bbeffbfc52596b46b87673f15955d7692fc710d80ceab6a0aa699de93cdae +size 190 diff --git a/assets/minecraft/textures/gui/sprites/container/enchanting_table/level_1_disabled.png b/assets/minecraft/textures/gui/sprites/container/enchanting_table/level_1_disabled.png index 63b8584a..936fdd2c 100644 --- a/assets/minecraft/textures/gui/sprites/container/enchanting_table/level_1_disabled.png +++ b/assets/minecraft/textures/gui/sprites/container/enchanting_table/level_1_disabled.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c8580cb8becd3601fc5a254c36c3ba2d62b53d77742ed72f555793aa5ca1625a -size 206 +oid sha256:88e2b0ed20a38193d7bf1cb95502760190b17f2464b1c7c5e2b9f00a935173bf +size 181 diff --git a/assets/minecraft/textures/gui/sprites/container/enchanting_table/level_2.png b/assets/minecraft/textures/gui/sprites/container/enchanting_table/level_2.png index 2f92ab7a..23a19709 100644 --- a/assets/minecraft/textures/gui/sprites/container/enchanting_table/level_2.png +++ b/assets/minecraft/textures/gui/sprites/container/enchanting_table/level_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e4d7d4f92dc3a76e9c1cdc7d741ee322fb38678c04dd9f66be415db84052c54 -size 231 +oid sha256:0bc6f16ee720c6c254cde12020478a877c450065ce6f2c023a6cff528325c761 +size 206 diff --git a/assets/minecraft/textures/gui/sprites/container/enchanting_table/level_2_disabled.png b/assets/minecraft/textures/gui/sprites/container/enchanting_table/level_2_disabled.png index 646cfb0e..4609e408 100644 --- a/assets/minecraft/textures/gui/sprites/container/enchanting_table/level_2_disabled.png +++ b/assets/minecraft/textures/gui/sprites/container/enchanting_table/level_2_disabled.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:11d4bd79029c54486a9a6d8d72cf1c336d989d3a33384c8730ae824c68e10e34 -size 218 +oid sha256:012d1fb32c3d8560154ce57257242017e4540de2a0a9840df55d82ca63361fdf +size 194 diff --git a/assets/minecraft/textures/gui/sprites/container/enchanting_table/level_3.png b/assets/minecraft/textures/gui/sprites/container/enchanting_table/level_3.png index c6b89ac4..4a3ff509 100644 --- a/assets/minecraft/textures/gui/sprites/container/enchanting_table/level_3.png +++ b/assets/minecraft/textures/gui/sprites/container/enchanting_table/level_3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:793ad69acb1fa9292e9d3eb08683d73820bb0fc2c124471c9e5a390db9809c7a -size 225 +oid sha256:b440d3276d3d8202fa7f463238909ed26f83cab55bb8d38dd13e646f196cea09 +size 208 diff --git a/assets/minecraft/textures/gui/sprites/container/enchanting_table/level_3_disabled.png b/assets/minecraft/textures/gui/sprites/container/enchanting_table/level_3_disabled.png index c6c37007..7036335d 100644 --- a/assets/minecraft/textures/gui/sprites/container/enchanting_table/level_3_disabled.png +++ b/assets/minecraft/textures/gui/sprites/container/enchanting_table/level_3_disabled.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c5635bf4575d9736dc4636a5d2c515b829b4ce3b8507088d4d174c980c11f526 -size 225 +oid sha256:655f17de53d46b8725afeae7c9cea2110198226ae3025fbb7cff961f4d7b9243 +size 199 diff --git a/assets/minecraft/textures/gui/sprites/container/furnace/burn_progress.png b/assets/minecraft/textures/gui/sprites/container/furnace/burn_progress.png index 39e83c3b..30c8a115 100644 --- a/assets/minecraft/textures/gui/sprites/container/furnace/burn_progress.png +++ b/assets/minecraft/textures/gui/sprites/container/furnace/burn_progress.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9e042d39afe20bbdd4a0cfbb66be1c24f30327d460a48042d3a38cba7851c018 -size 143 +oid sha256:e26aac6002403fdd838b6a0c829808a991d32ba2c4d3603f2c4e2f7ee5a4d969 +size 119 diff --git a/assets/minecraft/textures/gui/sprites/container/furnace/lit_progress.png b/assets/minecraft/textures/gui/sprites/container/furnace/lit_progress.png index 457b9311..a69614c9 100644 --- a/assets/minecraft/textures/gui/sprites/container/furnace/lit_progress.png +++ b/assets/minecraft/textures/gui/sprites/container/furnace/lit_progress.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:32f69838e8fbf0b980ec3f8b205d0ddb5f477fcf6202feddbd1b6a0b4524b6eb -size 175 +oid sha256:36a83a892fe65c55296ac01f63374425ecd42aaba3670b61767c88795a5732e3 +size 170 diff --git a/assets/minecraft/textures/gui/sprites/container/grindstone/error.png b/assets/minecraft/textures/gui/sprites/container/grindstone/error.png index b5387b80..a1c79fc9 100644 --- a/assets/minecraft/textures/gui/sprites/container/grindstone/error.png +++ b/assets/minecraft/textures/gui/sprites/container/grindstone/error.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3b6e01a20b2eddb4412baa1752eb06130ecbb33ceb55739c0015bdf8953671cb -size 158 +oid sha256:2230c045290ecbfaaa445919ce7586810f66a4bcd192635e7d21d5f91d4fa0b9 +size 157 diff --git a/assets/minecraft/textures/gui/sprites/container/horse/chest_slots.png b/assets/minecraft/textures/gui/sprites/container/horse/chest_slots.png index 910b27da..968d3e27 100644 --- a/assets/minecraft/textures/gui/sprites/container/horse/chest_slots.png +++ b/assets/minecraft/textures/gui/sprites/container/horse/chest_slots.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5c11f680af4a3db380c07da9d4edea2967d18948bc8322b07202dbf6d8aecde1 -size 128 +oid sha256:a2752c96963af3d17f6d8bd9e74ee4a6db0414c28581c47b4443b36e51089a32 +size 122 diff --git a/assets/minecraft/textures/gui/sprites/container/inventory/effect_background_large.png b/assets/minecraft/textures/gui/sprites/container/inventory/effect_background_large.png index 6c4f31d5..b3a838af 100644 --- a/assets/minecraft/textures/gui/sprites/container/inventory/effect_background_large.png +++ b/assets/minecraft/textures/gui/sprites/container/inventory/effect_background_large.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a1390b2799f799775763b87c7e1196e47082ee4421d038187e579199d04e3a3e -size 167 +oid sha256:e7fefa2801677f5ed44f8e2a1f3f8fbd34a328cd7d54874cc7de344b02bc7fe5 +size 142 diff --git a/assets/minecraft/textures/gui/sprites/container/inventory/effect_background_small.png b/assets/minecraft/textures/gui/sprites/container/inventory/effect_background_small.png index f0b32ecf..8e3142bd 100644 --- a/assets/minecraft/textures/gui/sprites/container/inventory/effect_background_small.png +++ b/assets/minecraft/textures/gui/sprites/container/inventory/effect_background_small.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e1b56204b93f918ea251b3ea4b9c9d9190777bf883647045adf15763ea7e85ba -size 146 +oid sha256:4e4ab88458c072c28dc8c3d5c703e9993f9be6d54bfb6ef61406342c2fc13352 +size 119 diff --git a/assets/minecraft/textures/gui/sprites/container/loom/error.png b/assets/minecraft/textures/gui/sprites/container/loom/error.png index bd530239..16246d98 100644 --- a/assets/minecraft/textures/gui/sprites/container/loom/error.png +++ b/assets/minecraft/textures/gui/sprites/container/loom/error.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2f3cf6b658c1c219fc0e2c21b8e9660cd6f27452926708d2bc2d8466beb6e31a -size 96 +oid sha256:77469bad6a9931ead3a3db4c78b73a8c517be346c58739e3b985eeb7df0d24bc +size 76 diff --git a/assets/minecraft/textures/gui/sprites/container/loom/pattern.png b/assets/minecraft/textures/gui/sprites/container/loom/pattern.png index 9faf36d3..a232d7e5 100644 --- a/assets/minecraft/textures/gui/sprites/container/loom/pattern.png +++ b/assets/minecraft/textures/gui/sprites/container/loom/pattern.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:70734a04ea015555c4dd3162ea6733198df5c9cc2111c6da37194a127d760983 -size 121 +oid sha256:651d0b79cfc5afa36a6084870cbdf53d584ef0da410e4ac556fd64e2b2976fb2 +size 116 diff --git a/assets/minecraft/textures/gui/sprites/container/loom/pattern_highlighted.png b/assets/minecraft/textures/gui/sprites/container/loom/pattern_highlighted.png index dce3d93f..b91cd7e9 100644 --- a/assets/minecraft/textures/gui/sprites/container/loom/pattern_highlighted.png +++ b/assets/minecraft/textures/gui/sprites/container/loom/pattern_highlighted.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f569262dbb4806b9a5e26ef56252f0f17a601a3415f603893f03411e47d725af -size 123 +oid sha256:df7afb5e9db9c1e802a9aa775d53d780d2dc553a2c1cabcaba110695613f292f +size 112 diff --git a/assets/minecraft/textures/gui/sprites/container/loom/pattern_selected.png b/assets/minecraft/textures/gui/sprites/container/loom/pattern_selected.png index 7269d259..b13d2634 100644 --- a/assets/minecraft/textures/gui/sprites/container/loom/pattern_selected.png +++ b/assets/minecraft/textures/gui/sprites/container/loom/pattern_selected.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0053bf01e614754b46ed4baac2f86b05386300b2e228449476ca607fa274400a -size 97 +oid sha256:518692a5023a36af06fd56e9c9597970eba95b8fae4a12efdfe79438d67477dc +size 89 diff --git a/assets/minecraft/textures/gui/sprites/container/loom/scroller.png b/assets/minecraft/textures/gui/sprites/container/loom/scroller.png index 9483b6a9..562e6654 100644 --- a/assets/minecraft/textures/gui/sprites/container/loom/scroller.png +++ b/assets/minecraft/textures/gui/sprites/container/loom/scroller.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:030c6b1f5abda55c41df364574fb268ebccfe706ee16c8c64cade5b2fb8f2122 -size 89 +oid sha256:bbd2e9c7a41c5b2c9b95933c2115a12a46657ad114495632e13daaa9b25a13e6 +size 87 diff --git a/assets/minecraft/textures/gui/sprites/container/loom/scroller_disabled.png b/assets/minecraft/textures/gui/sprites/container/loom/scroller_disabled.png index 0e9f02c2..2a146a71 100644 --- a/assets/minecraft/textures/gui/sprites/container/loom/scroller_disabled.png +++ b/assets/minecraft/textures/gui/sprites/container/loom/scroller_disabled.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bef8e56662ef4c93e8a019f886d78dfbcfdff4c4a6f975300d3d53fd4c5c6ac0 -size 89 +oid sha256:75924aba42ca1b957893359e29b28b97b664189639ea920d6dbf96c568966f07 +size 87 diff --git a/assets/minecraft/textures/gui/sprites/container/slot.png b/assets/minecraft/textures/gui/sprites/container/slot.png index 828caf0c..a731d651 100644 --- a/assets/minecraft/textures/gui/sprites/container/slot.png +++ b/assets/minecraft/textures/gui/sprites/container/slot.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:623e083f6471d0329a3c5802568f5bb538b3bcca88c0bc24eaae6557da7d5b13 -size 108 +oid sha256:11d26999221149d67619689e11fef2367b47ca2e8ac7c7fe9817846268da7f80 +size 83 diff --git a/assets/minecraft/textures/gui/sprites/container/slot/amethyst_shard.png b/assets/minecraft/textures/gui/sprites/container/slot/amethyst_shard.png index 20dd70eb..0d1cd51c 100644 --- a/assets/minecraft/textures/gui/sprites/container/slot/amethyst_shard.png +++ b/assets/minecraft/textures/gui/sprites/container/slot/amethyst_shard.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f43a7b9b1fd38df30147d51b54bf8ded9448f944da882a6669e2013fbfc2092b -size 118 +oid sha256:f2e652ed13fa8eb262502ba403d428389c3e57bd63e7f103913f24036b8b4ecc +size 107 diff --git a/assets/minecraft/textures/gui/sprites/container/slot/axe.png b/assets/minecraft/textures/gui/sprites/container/slot/axe.png index 8649417f..36d619c6 100644 --- a/assets/minecraft/textures/gui/sprites/container/slot/axe.png +++ b/assets/minecraft/textures/gui/sprites/container/slot/axe.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9825041edfe0ef2fcad7e2bed3f9aabeb131064640b7e78ad658659320fdb0a9 -size 115 +oid sha256:5d707d4e4548e3070b47c2e9eefbb774b2357839768af1007105ce14efbd1a2b +size 105 diff --git a/assets/minecraft/textures/gui/sprites/container/slot/banner.png b/assets/minecraft/textures/gui/sprites/container/slot/banner.png index bec783eb..7588b9cf 100644 --- a/assets/minecraft/textures/gui/sprites/container/slot/banner.png +++ b/assets/minecraft/textures/gui/sprites/container/slot/banner.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:30d33905125d25ad15415ebb29ca3cf323fb9eb13d603926b352ecf2f83e53d3 -size 116 +oid sha256:172fdf839ad3d6460d03bdd1e89f5db47f502c4c4a4fb4b5ca69641993f088bc +size 88 diff --git a/assets/minecraft/textures/gui/sprites/container/slot/banner_pattern.png b/assets/minecraft/textures/gui/sprites/container/slot/banner_pattern.png index 31a0e8d2..45c3c09f 100644 --- a/assets/minecraft/textures/gui/sprites/container/slot/banner_pattern.png +++ b/assets/minecraft/textures/gui/sprites/container/slot/banner_pattern.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:40fca99325e8d73cca483885f734d711cefbfd3b3c5751ac8bf809b3c131eb85 -size 129 +oid sha256:d6ef62be0f512b0aa6ee17d2b24e30bfda87c1f066aebbafe95fd7e2d4925f55 +size 108 diff --git a/assets/minecraft/textures/gui/sprites/container/slot/boots.png b/assets/minecraft/textures/gui/sprites/container/slot/boots.png index 04bcc4df..33174b07 100644 --- a/assets/minecraft/textures/gui/sprites/container/slot/boots.png +++ b/assets/minecraft/textures/gui/sprites/container/slot/boots.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4e5451daea3959cd76675ef5e30a160d5081fe519881a37ab44bc79e3314abd3 -size 111 +oid sha256:7d4967767e5ffd42393a3b30b78c709bfd6969a7c63c402d0d3bb6c00d1b9fb8 +size 103 diff --git a/assets/minecraft/textures/gui/sprites/container/slot/brewing_fuel.png b/assets/minecraft/textures/gui/sprites/container/slot/brewing_fuel.png index 9977e193..b32ea43e 100644 --- a/assets/minecraft/textures/gui/sprites/container/slot/brewing_fuel.png +++ b/assets/minecraft/textures/gui/sprites/container/slot/brewing_fuel.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2ec2392bf047df85ce09209d01229345b5125b057d8bc0a4aabc3274843ab347 -size 138 +oid sha256:6157d2d6e2496fb06c1d80cf6b82859db409325d33dfb52d54be05d6b2269c23 +size 125 diff --git a/assets/minecraft/textures/gui/sprites/container/slot/chestplate.png b/assets/minecraft/textures/gui/sprites/container/slot/chestplate.png index 9d4ab18d..32a85a90 100644 --- a/assets/minecraft/textures/gui/sprites/container/slot/chestplate.png +++ b/assets/minecraft/textures/gui/sprites/container/slot/chestplate.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:32999c2c895f504c258d6c4d7962c6652b0400c7be457beb5d7f3373c7f742a5 -size 112 +oid sha256:860a923eab93c718bf2ec6091c07fbe4a11cebb66e0e45f40aae355d51912931 +size 104 diff --git a/assets/minecraft/textures/gui/sprites/container/slot/diamond.png b/assets/minecraft/textures/gui/sprites/container/slot/diamond.png index 0bc926e8..8d6a4902 100644 --- a/assets/minecraft/textures/gui/sprites/container/slot/diamond.png +++ b/assets/minecraft/textures/gui/sprites/container/slot/diamond.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:666aed3f61b083e77a96b2b247871fb59ba1289131acbaaeb6f928e04bbbf78d -size 131 +oid sha256:3dc063346f907d552d0b519d0dd79bab3ff74d94b281c2f4e0c42c720d40d62b +size 120 diff --git a/assets/minecraft/textures/gui/sprites/container/slot/dye.png b/assets/minecraft/textures/gui/sprites/container/slot/dye.png index d948f23a..d4c04c6d 100644 --- a/assets/minecraft/textures/gui/sprites/container/slot/dye.png +++ b/assets/minecraft/textures/gui/sprites/container/slot/dye.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:656833a0804ccb512a76144417c4abeafd81f40be1b156bc4174d36bf3fa1add -size 132 +oid sha256:baf2cf2be196defb1062e512a4de4e38fca232a85ea9038dec6f09efee116800 +size 119 diff --git a/assets/minecraft/textures/gui/sprites/container/slot/emerald.png b/assets/minecraft/textures/gui/sprites/container/slot/emerald.png index 951c6a59..2eb81416 100644 --- a/assets/minecraft/textures/gui/sprites/container/slot/emerald.png +++ b/assets/minecraft/textures/gui/sprites/container/slot/emerald.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:474441042fe329e9fc663de1f2ed2e5809dd139d015c5366bfdaf282b960a809 -size 116 +oid sha256:1ed85c9c0989d323d8e2716831ab8a35476e0ac275f2145a1f2ab785c9f9a30f +size 115 diff --git a/assets/minecraft/textures/gui/sprites/container/slot/helmet.png b/assets/minecraft/textures/gui/sprites/container/slot/helmet.png index 7b22a2c8..e7f47978 100644 --- a/assets/minecraft/textures/gui/sprites/container/slot/helmet.png +++ b/assets/minecraft/textures/gui/sprites/container/slot/helmet.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:028ded51c843dd2f1b3f78f058f3ccd08b51c68303aed3b11e52361bf1da2d15 -size 110 +oid sha256:89a177ae2cf845f60882d84682b112549cab67268245a5194a6f37286c65c4be +size 108 diff --git a/assets/minecraft/textures/gui/sprites/container/slot/hoe.png b/assets/minecraft/textures/gui/sprites/container/slot/hoe.png index 1997b195..2235a897 100644 --- a/assets/minecraft/textures/gui/sprites/container/slot/hoe.png +++ b/assets/minecraft/textures/gui/sprites/container/slot/hoe.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7780062edef0a8e342788c74c10247bff93ea212d0dd29bf416c374937fdcfaf -size 106 +oid sha256:2833b87759120752e8974d686e0562da17c6a4f90593dc922854e4d185604208 +size 96 diff --git a/assets/minecraft/textures/gui/sprites/container/slot/horse_armor.png b/assets/minecraft/textures/gui/sprites/container/slot/horse_armor.png index fe802190..a5b38521 100644 --- a/assets/minecraft/textures/gui/sprites/container/slot/horse_armor.png +++ b/assets/minecraft/textures/gui/sprites/container/slot/horse_armor.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f99614e412f61c01067e9f88cb0bbad918371bd9ca5e8b59651d1d3a6819574e -size 128 +oid sha256:a007885d33bd111e3d276ee7a49563cf8a8613fc4b97a7b99121493c10e51f78 +size 103 diff --git a/assets/minecraft/textures/gui/sprites/container/slot/ingot.png b/assets/minecraft/textures/gui/sprites/container/slot/ingot.png index b2c10423..8222bb39 100644 --- a/assets/minecraft/textures/gui/sprites/container/slot/ingot.png +++ b/assets/minecraft/textures/gui/sprites/container/slot/ingot.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ec2cf8b89714883dabfaf18149f8150822faee667ad14999dbfa0263371f306f -size 134 +oid sha256:1e7e879707ce1ca2bd366edf34b26aecebda2f7be6253ac13156605598eef534 +size 125 diff --git a/assets/minecraft/textures/gui/sprites/container/slot/lapis_lazuli.png b/assets/minecraft/textures/gui/sprites/container/slot/lapis_lazuli.png index f6309666..5a589593 100644 --- a/assets/minecraft/textures/gui/sprites/container/slot/lapis_lazuli.png +++ b/assets/minecraft/textures/gui/sprites/container/slot/lapis_lazuli.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0de189c826446c95f5be9c0ebdb38b44a21a880ef9d44776d91173538065b1f7 -size 119 +oid sha256:c1aa53e3938358ef9a478814a9ef5554ac0e0c1cd46ba7d7ad2e17d992c2266a +size 116 diff --git a/assets/minecraft/textures/gui/sprites/container/slot/leggings.png b/assets/minecraft/textures/gui/sprites/container/slot/leggings.png index ccbfb071..31f4a0a6 100644 --- a/assets/minecraft/textures/gui/sprites/container/slot/leggings.png +++ b/assets/minecraft/textures/gui/sprites/container/slot/leggings.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fd37c770ff3b230294d72fe14fcefc5c7572166eee96098f9a9ba209e1a40ddf -size 102 +oid sha256:cbc02665ca5b98da6102390d44581675b811d0f8861277a632d898616ae61823 +size 93 diff --git a/assets/minecraft/textures/gui/sprites/container/slot/llama_armor.png b/assets/minecraft/textures/gui/sprites/container/slot/llama_armor.png index cc749581..0fa3fd1c 100644 --- a/assets/minecraft/textures/gui/sprites/container/slot/llama_armor.png +++ b/assets/minecraft/textures/gui/sprites/container/slot/llama_armor.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f1f335294feb44045a170b6e4bf55456adbed29c4a92c68516b396c54a766044 -size 118 +oid sha256:59a2cfeb9aa25092a0f8798f7a9fb3aaafaf28078fcb69e28a64adfd7a7c21d8 +size 92 diff --git a/assets/minecraft/textures/gui/sprites/container/slot/pickaxe.png b/assets/minecraft/textures/gui/sprites/container/slot/pickaxe.png index 9bf2fc8e..6362f4f8 100644 --- a/assets/minecraft/textures/gui/sprites/container/slot/pickaxe.png +++ b/assets/minecraft/textures/gui/sprites/container/slot/pickaxe.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2e23d45adcaaa25d975b7065930fb7cdc787fd3f9c9a8368991b526e020bea77 -size 126 +oid sha256:391ea8d3643d698cf9e45529cc6ff497f33dde7f9c4b09252012a6e8f429587e +size 115 diff --git a/assets/minecraft/textures/gui/sprites/container/slot/potion.png b/assets/minecraft/textures/gui/sprites/container/slot/potion.png index d3ee1255..df1b7f43 100644 --- a/assets/minecraft/textures/gui/sprites/container/slot/potion.png +++ b/assets/minecraft/textures/gui/sprites/container/slot/potion.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bbcc06031d8038d1343ea43c07d8f2958c551f6e3a63b7d56e64281d5a3056be -size 134 +oid sha256:aac9ddb71fad948bbf7ee37af5ba46b039cf5cef387bddd3e148d47c08aa9cc3 +size 107 diff --git a/assets/minecraft/textures/gui/sprites/container/slot/quartz.png b/assets/minecraft/textures/gui/sprites/container/slot/quartz.png index e16890e3..68ed1763 100644 --- a/assets/minecraft/textures/gui/sprites/container/slot/quartz.png +++ b/assets/minecraft/textures/gui/sprites/container/slot/quartz.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6b3da7a6056517e86bcc4089fdb0aa0a40f22918094a982769c4414bac1f941c -size 143 +oid sha256:632eb1f22b7272b6b8669d1f008b5c7edfa61ffa2e4c3ff2940574a3e2ebc66a +size 130 diff --git a/assets/minecraft/textures/gui/sprites/container/slot/redstone_dust.png b/assets/minecraft/textures/gui/sprites/container/slot/redstone_dust.png index 6fea89ff..2a749e63 100644 --- a/assets/minecraft/textures/gui/sprites/container/slot/redstone_dust.png +++ b/assets/minecraft/textures/gui/sprites/container/slot/redstone_dust.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6e05972bd159c71886e16584ecfeb495468f94a408ff7bab6855d46b7b5c5f76 -size 125 +oid sha256:76f9145cb48bc588c3d9850fb1bade980ec98dd15f52a603646f6e0d873bf743 +size 116 diff --git a/assets/minecraft/textures/gui/sprites/container/slot/saddle.png b/assets/minecraft/textures/gui/sprites/container/slot/saddle.png index 7cdbb512..edf10fd1 100644 --- a/assets/minecraft/textures/gui/sprites/container/slot/saddle.png +++ b/assets/minecraft/textures/gui/sprites/container/slot/saddle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8a20887f79c63f89705b0752c85370811cd9cf3a8f1befd919a199523844f11d -size 132 +oid sha256:cf1db75a2434b645fa07cf4d974200be40cf6abc8dd3da8b392f415806b3cb6d +size 117 diff --git a/assets/minecraft/textures/gui/sprites/container/slot/shield.png b/assets/minecraft/textures/gui/sprites/container/slot/shield.png index c016f709..bc4e8c8c 100644 --- a/assets/minecraft/textures/gui/sprites/container/slot/shield.png +++ b/assets/minecraft/textures/gui/sprites/container/slot/shield.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ea0a9a662bbd54cdc0c56014e64012f3c024a2476a23f898da379515bd045d56 -size 169 +oid sha256:28ce8e78588484af09201ceb0999193391511a6a039bf5f650084e7219138c7b +size 112 diff --git a/assets/minecraft/textures/gui/sprites/container/slot/shovel.png b/assets/minecraft/textures/gui/sprites/container/slot/shovel.png index a61117ab..f18039a8 100644 --- a/assets/minecraft/textures/gui/sprites/container/slot/shovel.png +++ b/assets/minecraft/textures/gui/sprites/container/slot/shovel.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cfa1523a9a7741588626f98b2a9f0644614b3eb29a7375fd4d4fbf9307a9963e -size 110 +oid sha256:64a1036a18b52f48a56dcfbc9d6e5ec92f2ee2915b36ed35cb112d0acb7e867c +size 102 diff --git a/assets/minecraft/textures/gui/sprites/container/slot/smithing_template_armor_trim.png b/assets/minecraft/textures/gui/sprites/container/slot/smithing_template_armor_trim.png index d01d3903..2be6863b 100644 --- a/assets/minecraft/textures/gui/sprites/container/slot/smithing_template_armor_trim.png +++ b/assets/minecraft/textures/gui/sprites/container/slot/smithing_template_armor_trim.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4dd483e76f16d2c38d91876200f3ae5910ef05b651c90393d68ade788e34134a -size 133 +oid sha256:875f4bb2ec53c656ad536d737ae57e4967132a02f363d8897f37f71fa052210a +size 124 diff --git a/assets/minecraft/textures/gui/sprites/container/slot/smithing_template_netherite_upgrade.png b/assets/minecraft/textures/gui/sprites/container/slot/smithing_template_netherite_upgrade.png index db6191ad..1cf33a3b 100644 --- a/assets/minecraft/textures/gui/sprites/container/slot/smithing_template_netherite_upgrade.png +++ b/assets/minecraft/textures/gui/sprites/container/slot/smithing_template_netherite_upgrade.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:63da1fccd4a8ea0a941227f5fdee26c96d0ad20bc86cda1dd7198465224fb1bf -size 97 +oid sha256:2e0528dbb4a0bf5ebc98352e7d41e910b89e8ff79b9f5ca4c0350e6310ac957f +size 90 diff --git a/assets/minecraft/textures/gui/sprites/container/slot/sword.png b/assets/minecraft/textures/gui/sprites/container/slot/sword.png index 01134f0f..eeccd8a6 100644 --- a/assets/minecraft/textures/gui/sprites/container/slot/sword.png +++ b/assets/minecraft/textures/gui/sprites/container/slot/sword.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4b404f64420bd476fd1143641183750fb4aba62033af231e874e5bf383207ab7 -size 128 +oid sha256:79ae12986a6c68785134959a521302546420cab537baddde4dbca2eb3ec28a4a +size 116 diff --git a/assets/minecraft/textures/gui/sprites/container/slot_highlight_back.png b/assets/minecraft/textures/gui/sprites/container/slot_highlight_back.png index a6060dd4..4eff5191 100644 --- a/assets/minecraft/textures/gui/sprites/container/slot_highlight_back.png +++ b/assets/minecraft/textures/gui/sprites/container/slot_highlight_back.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:05c9829a17371e03ccfd78c881cc96472dbe7b44bb8c1c3e375ab8713aa72118 -size 107 +oid sha256:6e844a8cf0ae479e3c3846b6e9a004ac805e937bf9889b4f605bba270b3b47f7 +size 82 diff --git a/assets/minecraft/textures/gui/sprites/container/slot_highlight_front.png b/assets/minecraft/textures/gui/sprites/container/slot_highlight_front.png index 16c50790..552b499f 100644 --- a/assets/minecraft/textures/gui/sprites/container/slot_highlight_front.png +++ b/assets/minecraft/textures/gui/sprites/container/slot_highlight_front.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5320308b875335b0d9a872f84dc5d2294d09ca84917f7c9dd28ee10e4d655bb9 -size 107 +oid sha256:7612266799b7c7bdec2a9ef562fd1c0ec7ae28c048d3e0f7ed5e08a2cc2ced26 +size 82 diff --git a/assets/minecraft/textures/gui/sprites/container/smithing/error.png b/assets/minecraft/textures/gui/sprites/container/smithing/error.png index b5387b80..a1c79fc9 100644 --- a/assets/minecraft/textures/gui/sprites/container/smithing/error.png +++ b/assets/minecraft/textures/gui/sprites/container/smithing/error.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3b6e01a20b2eddb4412baa1752eb06130ecbb33ceb55739c0015bdf8953671cb -size 158 +oid sha256:2230c045290ecbfaaa445919ce7586810f66a4bcd192635e7d21d5f91d4fa0b9 +size 157 diff --git a/assets/minecraft/textures/gui/sprites/container/smoker/burn_progress.png b/assets/minecraft/textures/gui/sprites/container/smoker/burn_progress.png index 39e83c3b..30c8a115 100644 --- a/assets/minecraft/textures/gui/sprites/container/smoker/burn_progress.png +++ b/assets/minecraft/textures/gui/sprites/container/smoker/burn_progress.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9e042d39afe20bbdd4a0cfbb66be1c24f30327d460a48042d3a38cba7851c018 -size 143 +oid sha256:e26aac6002403fdd838b6a0c829808a991d32ba2c4d3603f2c4e2f7ee5a4d969 +size 119 diff --git a/assets/minecraft/textures/gui/sprites/container/smoker/lit_progress.png b/assets/minecraft/textures/gui/sprites/container/smoker/lit_progress.png index 457b9311..a69614c9 100644 --- a/assets/minecraft/textures/gui/sprites/container/smoker/lit_progress.png +++ b/assets/minecraft/textures/gui/sprites/container/smoker/lit_progress.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:32f69838e8fbf0b980ec3f8b205d0ddb5f477fcf6202feddbd1b6a0b4524b6eb -size 175 +oid sha256:36a83a892fe65c55296ac01f63374425ecd42aaba3670b61767c88795a5732e3 +size 170 diff --git a/assets/minecraft/textures/gui/sprites/container/stonecutter/recipe.png b/assets/minecraft/textures/gui/sprites/container/stonecutter/recipe.png index ed312e4b..d5567228 100644 --- a/assets/minecraft/textures/gui/sprites/container/stonecutter/recipe.png +++ b/assets/minecraft/textures/gui/sprites/container/stonecutter/recipe.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d1d0c0c09a5374ac0ed2c852c331af76614c697b517516574aa52adadd5525d4 -size 97 +oid sha256:642b32beccb33bdf6afede388988ed12029d20ee85827858108f417a4801c825 +size 92 diff --git a/assets/minecraft/textures/gui/sprites/container/stonecutter/recipe_highlighted.png b/assets/minecraft/textures/gui/sprites/container/stonecutter/recipe_highlighted.png index a43a5d26..d0234092 100644 --- a/assets/minecraft/textures/gui/sprites/container/stonecutter/recipe_highlighted.png +++ b/assets/minecraft/textures/gui/sprites/container/stonecutter/recipe_highlighted.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c6eae561f519f965560df73391ea87e2eb4381bbb037308f5335e3b707d81225 -size 97 +oid sha256:014f37d70f38ca3cb925273cace6f79263dd93b64a744dd5cbb25e79555fe9a2 +size 92 diff --git a/assets/minecraft/textures/gui/sprites/container/stonecutter/recipe_selected.png b/assets/minecraft/textures/gui/sprites/container/stonecutter/recipe_selected.png index ad03eb21..aa46934b 100644 --- a/assets/minecraft/textures/gui/sprites/container/stonecutter/recipe_selected.png +++ b/assets/minecraft/textures/gui/sprites/container/stonecutter/recipe_selected.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:459ad625166108c3c79628c26ff340b57fa88ba7e19a6105ded36743fac8f5bb -size 97 +oid sha256:d8760f9f1908166a71ecb576a58e0d7e5352ae35fd9e0bc49f7f457a5713242b +size 92 diff --git a/assets/minecraft/textures/gui/sprites/container/stonecutter/scroller.png b/assets/minecraft/textures/gui/sprites/container/stonecutter/scroller.png index 9483b6a9..562e6654 100644 --- a/assets/minecraft/textures/gui/sprites/container/stonecutter/scroller.png +++ b/assets/minecraft/textures/gui/sprites/container/stonecutter/scroller.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:030c6b1f5abda55c41df364574fb268ebccfe706ee16c8c64cade5b2fb8f2122 -size 89 +oid sha256:bbd2e9c7a41c5b2c9b95933c2115a12a46657ad114495632e13daaa9b25a13e6 +size 87 diff --git a/assets/minecraft/textures/gui/sprites/container/stonecutter/scroller_disabled.png b/assets/minecraft/textures/gui/sprites/container/stonecutter/scroller_disabled.png index 0e9f02c2..2a146a71 100644 --- a/assets/minecraft/textures/gui/sprites/container/stonecutter/scroller_disabled.png +++ b/assets/minecraft/textures/gui/sprites/container/stonecutter/scroller_disabled.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bef8e56662ef4c93e8a019f886d78dfbcfdff4c4a6f975300d3d53fd4c5c6ac0 -size 89 +oid sha256:75924aba42ca1b957893359e29b28b97b664189639ea920d6dbf96c568966f07 +size 87 diff --git a/assets/minecraft/textures/gui/sprites/container/villager/discount_strikethrough.png b/assets/minecraft/textures/gui/sprites/container/villager/discount_strikethrough.png index b745f32f..c15b52e9 100644 --- a/assets/minecraft/textures/gui/sprites/container/villager/discount_strikethrough.png +++ b/assets/minecraft/textures/gui/sprites/container/villager/discount_strikethrough.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cda0a45e8300a5111626f5411e347803fb246ed7d1c5a3b4c780b05d5992bb09 -size 107 +oid sha256:bd3870fa8c26653aeb5d64b955667c19f128c77bda81b6ba91ba7f148377db58 +size 80 diff --git a/assets/minecraft/textures/gui/sprites/container/villager/experience_bar_current.png b/assets/minecraft/textures/gui/sprites/container/villager/experience_bar_current.png index 24554a6d..df00ecc6 100644 --- a/assets/minecraft/textures/gui/sprites/container/villager/experience_bar_current.png +++ b/assets/minecraft/textures/gui/sprites/container/villager/experience_bar_current.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:afe12bf293ac03745541aeebaca78d9e25c6832f13ef529c756f6e1486a78fbf -size 145 +oid sha256:de9f32abb95e7ca08185a606c68b99fdd46d8088b52037a7e471413394a0803f +size 132 diff --git a/assets/minecraft/textures/gui/sprites/container/villager/experience_bar_result.png b/assets/minecraft/textures/gui/sprites/container/villager/experience_bar_result.png index 2b841b24..d5741d12 100644 --- a/assets/minecraft/textures/gui/sprites/container/villager/experience_bar_result.png +++ b/assets/minecraft/textures/gui/sprites/container/villager/experience_bar_result.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:95ac49ec5259cb1bd35bfd5d74a5b9e8a2746b338a982fbf6772940f915a2e83 -size 151 +oid sha256:61ea68da92a91236b3c28e19a02b44f2431eb6b381fda2fc1b7554b4fe426f21 +size 143 diff --git a/assets/minecraft/textures/gui/sprites/container/villager/out_of_stock.png b/assets/minecraft/textures/gui/sprites/container/villager/out_of_stock.png index 2aa70839..cf294b6d 100644 --- a/assets/minecraft/textures/gui/sprites/container/villager/out_of_stock.png +++ b/assets/minecraft/textures/gui/sprites/container/villager/out_of_stock.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a0675919293e3f0680db6f0c46e356b66fca296d21969c021ff2c7dd9254bfc0 -size 156 +oid sha256:61a4cb2d45222607602afa0bf0bb70e85c2e44963bc77d728f93d404a6bdd42b +size 155 diff --git a/assets/minecraft/textures/gui/sprites/container/villager/scroller.png b/assets/minecraft/textures/gui/sprites/container/villager/scroller.png index ec79f0c9..62ff9cbd 100644 --- a/assets/minecraft/textures/gui/sprites/container/villager/scroller.png +++ b/assets/minecraft/textures/gui/sprites/container/villager/scroller.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5f434e19c0b583e3e0a3bf3b8b77f5da24a82adddb238d5266cd563a6ff21876 -size 102 +oid sha256:06ad70542490cab80c6b0d697eda886fa9b55cf44f26f71e88fea35b0364d8bb +size 89 diff --git a/assets/minecraft/textures/gui/sprites/container/villager/scroller_disabled.png b/assets/minecraft/textures/gui/sprites/container/villager/scroller_disabled.png index 67217915..30ba41d2 100644 --- a/assets/minecraft/textures/gui/sprites/container/villager/scroller_disabled.png +++ b/assets/minecraft/textures/gui/sprites/container/villager/scroller_disabled.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b49ed5965197e2cbb64adcfb63d19e9e969566a01385f18eec1fde4076a37136 -size 99 +oid sha256:6f458336105265fc6159f0fe2b70e5a9d8bd02d043eeabb24e5f87945230e993 +size 87 diff --git a/assets/minecraft/textures/gui/sprites/container/villager/trade_arrow.png b/assets/minecraft/textures/gui/sprites/container/villager/trade_arrow.png index 66ddfc2e..62c0d308 100644 --- a/assets/minecraft/textures/gui/sprites/container/villager/trade_arrow.png +++ b/assets/minecraft/textures/gui/sprites/container/villager/trade_arrow.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ae7c9210e3081c2c2978e9245ffad1dd34798fef13fd91698fc1b74981924f3a -size 118 +oid sha256:3e7ddc36fda56a9fd08b710cbe6362f22e45df526ee25342c6b110f4ed93ef32 +size 95 diff --git a/assets/minecraft/textures/gui/sprites/container/villager/trade_arrow_out_of_stock.png b/assets/minecraft/textures/gui/sprites/container/villager/trade_arrow_out_of_stock.png index e2ee1ec2..6d6b6ad8 100644 --- a/assets/minecraft/textures/gui/sprites/container/villager/trade_arrow_out_of_stock.png +++ b/assets/minecraft/textures/gui/sprites/container/villager/trade_arrow_out_of_stock.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aa54547fa7bd252f9d93d8edefba5c7608cd1203013e42a7280af4573cc95100 -size 129 +oid sha256:c8a65c3b8106e14750f047b77b3aed3dec18ae2f0cb2be7d28237fc1fbe0657a +size 122 diff --git a/assets/minecraft/textures/gui/sprites/dialog/warning_button.png b/assets/minecraft/textures/gui/sprites/dialog/warning_button.png new file mode 100644 index 00000000..fb83a15e --- /dev/null +++ b/assets/minecraft/textures/gui/sprites/dialog/warning_button.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bbac00c5727109fa3c2ac8afe47f899c57df9dde98593a919057efc24c717f0e +size 379 diff --git a/assets/minecraft/textures/gui/sprites/dialog/warning_button_disabled.png b/assets/minecraft/textures/gui/sprites/dialog/warning_button_disabled.png new file mode 100644 index 00000000..be4e76ec --- /dev/null +++ b/assets/minecraft/textures/gui/sprites/dialog/warning_button_disabled.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f347e38fdb5bba7e26096270ad3e9b60dc87c0f69b799d0e724dcf2d3e35e619 +size 221 diff --git a/assets/minecraft/textures/gui/sprites/dialog/warning_button_highlighted.png b/assets/minecraft/textures/gui/sprites/dialog/warning_button_highlighted.png new file mode 100644 index 00000000..4922cd5f --- /dev/null +++ b/assets/minecraft/textures/gui/sprites/dialog/warning_button_highlighted.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1a7be6d807fd501339103462826ffab4d1af75dfefd2d6319b86062118536b96 +size 378 diff --git a/assets/minecraft/textures/gui/sprites/hud/air_bursting.png b/assets/minecraft/textures/gui/sprites/hud/air_bursting.png index ccfd70ce..744430c4 100644 --- a/assets/minecraft/textures/gui/sprites/hud/air_bursting.png +++ b/assets/minecraft/textures/gui/sprites/hud/air_bursting.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c6c994513b8e47ee10b649762ba2e59cd19d0a7d248699a2682e04e934676c77 -size 119 +oid sha256:978ad5fce45188e7d8be712211893c2326ad49d037c55b80a1156a62783e7bf7 +size 109 diff --git a/assets/minecraft/textures/gui/sprites/hud/air_empty.png b/assets/minecraft/textures/gui/sprites/hud/air_empty.png index 52510797..d0cf65a0 100644 --- a/assets/minecraft/textures/gui/sprites/hud/air_empty.png +++ b/assets/minecraft/textures/gui/sprites/hud/air_empty.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:15a130e1bc9a7fcea69345961f0a395d678752c050350f83428c469c370bd2a1 -size 121 +oid sha256:58a2fa9ff759687e9cc6916e92e22273623cbc01ac89ddfd6ba8f329bce1913c +size 96 diff --git a/assets/minecraft/textures/gui/sprites/hud/armor_empty.png b/assets/minecraft/textures/gui/sprites/hud/armor_empty.png index 804bcc1d..46faf24d 100644 --- a/assets/minecraft/textures/gui/sprites/hud/armor_empty.png +++ b/assets/minecraft/textures/gui/sprites/hud/armor_empty.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e143eb0329a9b31b3b51b0a86a15bf2ebd19543ac12652aa79696bf255e9835b -size 108 +oid sha256:24a63ea307d0dcb46ecdce478d5ba3a168a440dbb8d51ed976e9bb0c4d2395d8 +size 100 diff --git a/assets/minecraft/textures/gui/sprites/hud/armor_full.png b/assets/minecraft/textures/gui/sprites/hud/armor_full.png index b98be05d..f08b541a 100644 --- a/assets/minecraft/textures/gui/sprites/hud/armor_full.png +++ b/assets/minecraft/textures/gui/sprites/hud/armor_full.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:780e586728abc78037331bac5ac8abeb1788c4ea3f906f0a7d45053dba6d796a -size 123 +oid sha256:c597732ea51f36099214344e02d2a6621b85d98c526b42aa9a2ba9c1a137a8da +size 122 diff --git a/assets/minecraft/textures/gui/sprites/hud/crosshair.png b/assets/minecraft/textures/gui/sprites/hud/crosshair.png index 1c3855a2..36da278b 100644 --- a/assets/minecraft/textures/gui/sprites/hud/crosshair.png +++ b/assets/minecraft/textures/gui/sprites/hud/crosshair.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:464fdb2bb0e20333e3dd26ebb18560448c759f5cb50b746ff65ba60fd4bf649e -size 95 +oid sha256:5dc5e55cd66df2f27fefbd98bb97770844b0d2c24aaada16fe271b35b071e65e +size 81 diff --git a/assets/minecraft/textures/gui/sprites/hud/crosshair_attack_indicator_background.png b/assets/minecraft/textures/gui/sprites/hud/crosshair_attack_indicator_background.png index e587d006..e6a1942c 100644 --- a/assets/minecraft/textures/gui/sprites/hud/crosshair_attack_indicator_background.png +++ b/assets/minecraft/textures/gui/sprites/hud/crosshair_attack_indicator_background.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9b7568a9f326cb5b6081e843c6c80e2cd932a100422db6995f6d84778466c258 -size 88 +oid sha256:704c61c0e5da542acd9c46ee65249bf824e7e3114748b4ff594abdada3d4ca77 +size 86 diff --git a/assets/minecraft/textures/gui/sprites/hud/crosshair_attack_indicator_full.png b/assets/minecraft/textures/gui/sprites/hud/crosshair_attack_indicator_full.png index e3e42281..09414492 100644 --- a/assets/minecraft/textures/gui/sprites/hud/crosshair_attack_indicator_full.png +++ b/assets/minecraft/textures/gui/sprites/hud/crosshair_attack_indicator_full.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ab772c14819b3f3e55465b67ebc0e27699b16144f90091d167c47d8bd9c9b1b1 -size 186 +oid sha256:cba4930bc4aaa6c965e6e3bdd1f75aea3e394229e6902c97714d0bc142983b4c +size 120 diff --git a/assets/minecraft/textures/gui/sprites/hud/crosshair_attack_indicator_progress.png b/assets/minecraft/textures/gui/sprites/hud/crosshair_attack_indicator_progress.png index a4ac0bc7..3ef12e79 100644 --- a/assets/minecraft/textures/gui/sprites/hud/crosshair_attack_indicator_progress.png +++ b/assets/minecraft/textures/gui/sprites/hud/crosshair_attack_indicator_progress.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a9685123440676828801734e5551beff77fb8020a20270c4eb284bdd95d6e5a1 -size 118 +oid sha256:522a88a3a7f23dde40dbeae99f302977babfa7756eb0f185cda2a0c0eee85742 +size 103 diff --git a/assets/minecraft/textures/gui/sprites/hud/effect_background.png b/assets/minecraft/textures/gui/sprites/hud/effect_background.png index 45a4dad9..b6f6d39b 100644 --- a/assets/minecraft/textures/gui/sprites/hud/effect_background.png +++ b/assets/minecraft/textures/gui/sprites/hud/effect_background.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fa92806c83c00f8469fc38a742e78224b77199237d573b695bacae6d9b736809 -size 132 +oid sha256:d3af5654fbe5d2d1b0f32a69d93eb83b62b59a4185f60aad411faa507e57c8d4 +size 106 diff --git a/assets/minecraft/textures/gui/sprites/hud/effect_background_ambient.png b/assets/minecraft/textures/gui/sprites/hud/effect_background_ambient.png index d4f12d7a..c4f434df 100644 --- a/assets/minecraft/textures/gui/sprites/hud/effect_background_ambient.png +++ b/assets/minecraft/textures/gui/sprites/hud/effect_background_ambient.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:489610537486291a5702822b20ad64592429e6d7c51be30b3071d6ebc983e84b -size 132 +oid sha256:d6a726643bf403c53982ab705f77b144209509492d8704466a2bcb6833b09f31 +size 123 diff --git a/assets/minecraft/textures/gui/sprites/hud/experience_bar_background.png b/assets/minecraft/textures/gui/sprites/hud/experience_bar_background.png index a0c0fde0..02ddfe6a 100644 --- a/assets/minecraft/textures/gui/sprites/hud/experience_bar_background.png +++ b/assets/minecraft/textures/gui/sprites/hud/experience_bar_background.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1a465d395131f10fff6695fd7ca3243ef5fd2cccb0a496581a8c1d84c358a6d6 -size 167 +oid sha256:0ea991d9e971547d901f7adcfd6af8f6692c39e4e4ed620b2844c2ebeccb9d71 +size 165 diff --git a/assets/minecraft/textures/gui/sprites/hud/food_empty.png b/assets/minecraft/textures/gui/sprites/hud/food_empty.png index fc36864e..5e487ffe 100644 --- a/assets/minecraft/textures/gui/sprites/hud/food_empty.png +++ b/assets/minecraft/textures/gui/sprites/hud/food_empty.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:82c8ae2e6e347ae784d8ca7587617ccde2d67f832a6c5a2995fb0052f0a45e60 -size 113 +oid sha256:9bfe8453330b83a1de5339dd35060fda9fd0b93b02d357b4db551189289c699a +size 99 diff --git a/assets/minecraft/textures/gui/sprites/hud/food_empty_hunger.png b/assets/minecraft/textures/gui/sprites/hud/food_empty_hunger.png index 3a8d0c1d..aa19aad4 100644 --- a/assets/minecraft/textures/gui/sprites/hud/food_empty_hunger.png +++ b/assets/minecraft/textures/gui/sprites/hud/food_empty_hunger.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:75dab6bf1ef4f3e441e82990dd089a977d9c7095ee068464edbd27809c560e31 -size 114 +oid sha256:a08413cb7382dca564e8bb7118b7b9f9b13b424fd6dd43b8879cb48fce81069c +size 109 diff --git a/assets/minecraft/textures/gui/sprites/hud/food_full.png b/assets/minecraft/textures/gui/sprites/hud/food_full.png index dad622ed..36c371dd 100644 --- a/assets/minecraft/textures/gui/sprites/hud/food_full.png +++ b/assets/minecraft/textures/gui/sprites/hud/food_full.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cebb09f462a4022d2f839cb52536f495d4284bea63305349a79c1ea9bfb66917 -size 138 +oid sha256:0ac83b16e7c7c7cd100cbfde07202a6f6df2d805fe35a8a95e003b2d525a760b +size 131 diff --git a/assets/minecraft/textures/gui/sprites/hud/food_full_hunger.png b/assets/minecraft/textures/gui/sprites/hud/food_full_hunger.png index 793a3593..12f1dbd8 100644 --- a/assets/minecraft/textures/gui/sprites/hud/food_full_hunger.png +++ b/assets/minecraft/textures/gui/sprites/hud/food_full_hunger.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d1dda72e37dd6435a6cba588c77202bb919c8a058d210798dcada232e9227b87 -size 146 +oid sha256:f7a91153e0741f676fbe779e45a040046c62de232763ef8133658fcc2a79d373 +size 140 diff --git a/assets/minecraft/textures/gui/sprites/hud/food_half.png b/assets/minecraft/textures/gui/sprites/hud/food_half.png index 6aa52913..da6bd278 100644 --- a/assets/minecraft/textures/gui/sprites/hud/food_half.png +++ b/assets/minecraft/textures/gui/sprites/hud/food_half.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bb06c436664246a5d1389979639b53e4e01205f50e0af2a580b84b3398182d36 -size 132 +oid sha256:5086cedf18b8b1a66b7df126e3be6589ae281d29ebe3eda785c0fb966c5a19de +size 128 diff --git a/assets/minecraft/textures/gui/sprites/hud/food_half_hunger.png b/assets/minecraft/textures/gui/sprites/hud/food_half_hunger.png index 4833dde6..67adee08 100644 --- a/assets/minecraft/textures/gui/sprites/hud/food_half_hunger.png +++ b/assets/minecraft/textures/gui/sprites/hud/food_half_hunger.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef2f5e406435850cf1a8f99cbba5856c4ce12390ad396d3207c6295df9159f17 -size 132 +oid sha256:d9cbb8dcfb8a58bff72c9e5460937c17f8a4ab97df78ddd86af1ca6946637d0e +size 124 diff --git a/assets/minecraft/textures/gui/sprites/hud/heart/absorbing_full.png b/assets/minecraft/textures/gui/sprites/hud/heart/absorbing_full.png index fc011bfc..6ab06b0b 100644 --- a/assets/minecraft/textures/gui/sprites/hud/heart/absorbing_full.png +++ b/assets/minecraft/textures/gui/sprites/hud/heart/absorbing_full.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b052942e6992f2d5554d092245004c29c7ed81473174cc48394c0f02c3b8632b -size 115 +oid sha256:4afb2035139c659ff7ed2fbf16bb4c4cc12158c664e422cbb964d4c926f40844 +size 109 diff --git a/assets/minecraft/textures/gui/sprites/hud/heart/absorbing_full_blinking.png b/assets/minecraft/textures/gui/sprites/hud/heart/absorbing_full_blinking.png index fc011bfc..6ab06b0b 100644 --- a/assets/minecraft/textures/gui/sprites/hud/heart/absorbing_full_blinking.png +++ b/assets/minecraft/textures/gui/sprites/hud/heart/absorbing_full_blinking.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b052942e6992f2d5554d092245004c29c7ed81473174cc48394c0f02c3b8632b -size 115 +oid sha256:4afb2035139c659ff7ed2fbf16bb4c4cc12158c664e422cbb964d4c926f40844 +size 109 diff --git a/assets/minecraft/textures/gui/sprites/hud/heart/absorbing_half.png b/assets/minecraft/textures/gui/sprites/hud/heart/absorbing_half.png index 53369b7b..5d657709 100644 --- a/assets/minecraft/textures/gui/sprites/hud/heart/absorbing_half.png +++ b/assets/minecraft/textures/gui/sprites/hud/heart/absorbing_half.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:590f3fe3d3f69bffe1feed59c37ee41d40705c735f4fab70c69177bfc0fdc800 -size 114 +oid sha256:ab37c9a7b3ded346b5ab125a6a87045ff6b599a8e1f1796290aae344d8f6189b +size 103 diff --git a/assets/minecraft/textures/gui/sprites/hud/heart/absorbing_half_blinking.png b/assets/minecraft/textures/gui/sprites/hud/heart/absorbing_half_blinking.png index 53369b7b..5d657709 100644 --- a/assets/minecraft/textures/gui/sprites/hud/heart/absorbing_half_blinking.png +++ b/assets/minecraft/textures/gui/sprites/hud/heart/absorbing_half_blinking.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:590f3fe3d3f69bffe1feed59c37ee41d40705c735f4fab70c69177bfc0fdc800 -size 114 +oid sha256:ab37c9a7b3ded346b5ab125a6a87045ff6b599a8e1f1796290aae344d8f6189b +size 103 diff --git a/assets/minecraft/textures/gui/sprites/hud/heart/absorbing_hardcore_full.png b/assets/minecraft/textures/gui/sprites/hud/heart/absorbing_hardcore_full.png index acc1425d..2ffbabed 100644 --- a/assets/minecraft/textures/gui/sprites/hud/heart/absorbing_hardcore_full.png +++ b/assets/minecraft/textures/gui/sprites/hud/heart/absorbing_hardcore_full.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:87f933192ba8b2853bf5427ea7f0c91a2c6ef45930fe892825b62dbee62943e8 -size 125 +oid sha256:aa4a51a65cf6fd6b76dbc040f68b7a90ee70b8b23298d2628a8e0a2ea54d924d +size 121 diff --git a/assets/minecraft/textures/gui/sprites/hud/heart/absorbing_hardcore_full_blinking.png b/assets/minecraft/textures/gui/sprites/hud/heart/absorbing_hardcore_full_blinking.png index acc1425d..2ffbabed 100644 --- a/assets/minecraft/textures/gui/sprites/hud/heart/absorbing_hardcore_full_blinking.png +++ b/assets/minecraft/textures/gui/sprites/hud/heart/absorbing_hardcore_full_blinking.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:87f933192ba8b2853bf5427ea7f0c91a2c6ef45930fe892825b62dbee62943e8 -size 125 +oid sha256:aa4a51a65cf6fd6b76dbc040f68b7a90ee70b8b23298d2628a8e0a2ea54d924d +size 121 diff --git a/assets/minecraft/textures/gui/sprites/hud/heart/absorbing_hardcore_half.png b/assets/minecraft/textures/gui/sprites/hud/heart/absorbing_hardcore_half.png index ecc5297b..aef6cc60 100644 --- a/assets/minecraft/textures/gui/sprites/hud/heart/absorbing_hardcore_half.png +++ b/assets/minecraft/textures/gui/sprites/hud/heart/absorbing_hardcore_half.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2fec5f11beffad903472cfcb00383d813010e5d52ce2d692fc2cf99fbdafac24 -size 126 +oid sha256:f88b24663f7c14e58490e1a8a60f44339f05c284fb89dbbf6da6bd9890291e06 +size 115 diff --git a/assets/minecraft/textures/gui/sprites/hud/heart/absorbing_hardcore_half_blinking.png b/assets/minecraft/textures/gui/sprites/hud/heart/absorbing_hardcore_half_blinking.png index ecc5297b..aef6cc60 100644 --- a/assets/minecraft/textures/gui/sprites/hud/heart/absorbing_hardcore_half_blinking.png +++ b/assets/minecraft/textures/gui/sprites/hud/heart/absorbing_hardcore_half_blinking.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2fec5f11beffad903472cfcb00383d813010e5d52ce2d692fc2cf99fbdafac24 -size 126 +oid sha256:f88b24663f7c14e58490e1a8a60f44339f05c284fb89dbbf6da6bd9890291e06 +size 115 diff --git a/assets/minecraft/textures/gui/sprites/hud/heart/container.png b/assets/minecraft/textures/gui/sprites/hud/heart/container.png index 7481ad26..492ffc26 100644 --- a/assets/minecraft/textures/gui/sprites/hud/heart/container.png +++ b/assets/minecraft/textures/gui/sprites/hud/heart/container.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5dad1a14187bf035d1cd56a5477f162e8f3baadeccadcc20e11f58db5a26ac0f -size 108 +oid sha256:b92355b32f566dd5ec209dcf6f25ddd239fdf967a70af42308ef9607aab3b194 +size 98 diff --git a/assets/minecraft/textures/gui/sprites/hud/heart/container_blinking.png b/assets/minecraft/textures/gui/sprites/hud/heart/container_blinking.png index 60dc0db1..dbf33053 100644 --- a/assets/minecraft/textures/gui/sprites/hud/heart/container_blinking.png +++ b/assets/minecraft/textures/gui/sprites/hud/heart/container_blinking.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:74b1b66fdb25190ebfbef0ffc9e152f6cfa85faa07c0284e2578c031b8e0fdca -size 110 +oid sha256:1b1094514a73d8673110595050003fff6a7da1d33e6457ceeae004634c2c0963 +size 98 diff --git a/assets/minecraft/textures/gui/sprites/hud/heart/container_hardcore.png b/assets/minecraft/textures/gui/sprites/hud/heart/container_hardcore.png index 7481ad26..492ffc26 100644 --- a/assets/minecraft/textures/gui/sprites/hud/heart/container_hardcore.png +++ b/assets/minecraft/textures/gui/sprites/hud/heart/container_hardcore.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5dad1a14187bf035d1cd56a5477f162e8f3baadeccadcc20e11f58db5a26ac0f -size 108 +oid sha256:b92355b32f566dd5ec209dcf6f25ddd239fdf967a70af42308ef9607aab3b194 +size 98 diff --git a/assets/minecraft/textures/gui/sprites/hud/heart/container_hardcore_blinking.png b/assets/minecraft/textures/gui/sprites/hud/heart/container_hardcore_blinking.png index 60dc0db1..dbf33053 100644 --- a/assets/minecraft/textures/gui/sprites/hud/heart/container_hardcore_blinking.png +++ b/assets/minecraft/textures/gui/sprites/hud/heart/container_hardcore_blinking.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:74b1b66fdb25190ebfbef0ffc9e152f6cfa85faa07c0284e2578c031b8e0fdca -size 110 +oid sha256:1b1094514a73d8673110595050003fff6a7da1d33e6457ceeae004634c2c0963 +size 98 diff --git a/assets/minecraft/textures/gui/sprites/hud/heart/frozen_full.png b/assets/minecraft/textures/gui/sprites/hud/heart/frozen_full.png index acb31559..509bde4d 100644 --- a/assets/minecraft/textures/gui/sprites/hud/heart/frozen_full.png +++ b/assets/minecraft/textures/gui/sprites/hud/heart/frozen_full.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:efb703a07dc47d1ff9764b4663f2af4869d327be4fd83a842c9377fa271922d6 -size 165 +oid sha256:66a22e5a9c1be724078bf6392970917ce74548a75242cb9a8694a8cc788893ed +size 141 diff --git a/assets/minecraft/textures/gui/sprites/hud/heart/frozen_full_blinking.png b/assets/minecraft/textures/gui/sprites/hud/heart/frozen_full_blinking.png index acb31559..509bde4d 100644 --- a/assets/minecraft/textures/gui/sprites/hud/heart/frozen_full_blinking.png +++ b/assets/minecraft/textures/gui/sprites/hud/heart/frozen_full_blinking.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:efb703a07dc47d1ff9764b4663f2af4869d327be4fd83a842c9377fa271922d6 -size 165 +oid sha256:66a22e5a9c1be724078bf6392970917ce74548a75242cb9a8694a8cc788893ed +size 141 diff --git a/assets/minecraft/textures/gui/sprites/hud/heart/frozen_half.png b/assets/minecraft/textures/gui/sprites/hud/heart/frozen_half.png index 8d14932b..e95032bb 100644 --- a/assets/minecraft/textures/gui/sprites/hud/heart/frozen_half.png +++ b/assets/minecraft/textures/gui/sprites/hud/heart/frozen_half.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2ccdcfc1efe27665a8609637d2b5decba12b27a549ea99adbef8f52ece752804 -size 152 +oid sha256:dda4ed21c8f12f4c5f28fea52d19fda8e09451adbb568bdc5aa4b4243cad9795 +size 127 diff --git a/assets/minecraft/textures/gui/sprites/hud/heart/frozen_half_blinking.png b/assets/minecraft/textures/gui/sprites/hud/heart/frozen_half_blinking.png index 8d14932b..e95032bb 100644 --- a/assets/minecraft/textures/gui/sprites/hud/heart/frozen_half_blinking.png +++ b/assets/minecraft/textures/gui/sprites/hud/heart/frozen_half_blinking.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2ccdcfc1efe27665a8609637d2b5decba12b27a549ea99adbef8f52ece752804 -size 152 +oid sha256:dda4ed21c8f12f4c5f28fea52d19fda8e09451adbb568bdc5aa4b4243cad9795 +size 127 diff --git a/assets/minecraft/textures/gui/sprites/hud/heart/frozen_hardcore_full.png b/assets/minecraft/textures/gui/sprites/hud/heart/frozen_hardcore_full.png index 8e3cf6a2..df974368 100644 --- a/assets/minecraft/textures/gui/sprites/hud/heart/frozen_hardcore_full.png +++ b/assets/minecraft/textures/gui/sprites/hud/heart/frozen_hardcore_full.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5ae9afbf874857676453d986b8fc43223e0850f155f5abad3420a3b722725359 -size 165 +oid sha256:8b6d31ee17b3eacbbfe69a6c8cf165d5efee9af12aae763a073818bfcc47d2fd +size 146 diff --git a/assets/minecraft/textures/gui/sprites/hud/heart/frozen_hardcore_full_blinking.png b/assets/minecraft/textures/gui/sprites/hud/heart/frozen_hardcore_full_blinking.png index 8e3cf6a2..df974368 100644 --- a/assets/minecraft/textures/gui/sprites/hud/heart/frozen_hardcore_full_blinking.png +++ b/assets/minecraft/textures/gui/sprites/hud/heart/frozen_hardcore_full_blinking.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5ae9afbf874857676453d986b8fc43223e0850f155f5abad3420a3b722725359 -size 165 +oid sha256:8b6d31ee17b3eacbbfe69a6c8cf165d5efee9af12aae763a073818bfcc47d2fd +size 146 diff --git a/assets/minecraft/textures/gui/sprites/hud/heart/frozen_hardcore_half.png b/assets/minecraft/textures/gui/sprites/hud/heart/frozen_hardcore_half.png index 156fc4d8..fd9f54f4 100644 --- a/assets/minecraft/textures/gui/sprites/hud/heart/frozen_hardcore_half.png +++ b/assets/minecraft/textures/gui/sprites/hud/heart/frozen_hardcore_half.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2b62a03ce585775e9e9d7ea17f9fbc21ba2b8fb40c162a95043307b2d4a8a90e -size 152 +oid sha256:55448c040468dab90f48e03392e90b7f4f635109349c1524619babeb875177ac +size 131 diff --git a/assets/minecraft/textures/gui/sprites/hud/heart/frozen_hardcore_half_blinking.png b/assets/minecraft/textures/gui/sprites/hud/heart/frozen_hardcore_half_blinking.png index 156fc4d8..fd9f54f4 100644 --- a/assets/minecraft/textures/gui/sprites/hud/heart/frozen_hardcore_half_blinking.png +++ b/assets/minecraft/textures/gui/sprites/hud/heart/frozen_hardcore_half_blinking.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2b62a03ce585775e9e9d7ea17f9fbc21ba2b8fb40c162a95043307b2d4a8a90e -size 152 +oid sha256:55448c040468dab90f48e03392e90b7f4f635109349c1524619babeb875177ac +size 131 diff --git a/assets/minecraft/textures/gui/sprites/hud/heart/full.png b/assets/minecraft/textures/gui/sprites/hud/heart/full.png index ea03e9f5..a47cbe33 100644 --- a/assets/minecraft/textures/gui/sprites/hud/heart/full.png +++ b/assets/minecraft/textures/gui/sprites/hud/heart/full.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fbc682e09ae677d82fb9bd638eae2fef0e75d3dcb2f556ec9d693fc1ba1321c9 -size 114 +oid sha256:acb11da7611dc8239d4da2fe500cca2fe88a2c4facccf42fa7207c0e9dba4a16 +size 107 diff --git a/assets/minecraft/textures/gui/sprites/hud/heart/full_blinking.png b/assets/minecraft/textures/gui/sprites/hud/heart/full_blinking.png index f973a149..7a958c4f 100644 --- a/assets/minecraft/textures/gui/sprites/hud/heart/full_blinking.png +++ b/assets/minecraft/textures/gui/sprites/hud/heart/full_blinking.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f450a0431f1fdd2d1c9388eefac6307b4848b26e5140deca1ef1c03d1be6f1f4 -size 114 +oid sha256:d43889d4c676a6e2498b0510bf4f77c0050b792884952c67475f4bff097a498b +size 107 diff --git a/assets/minecraft/textures/gui/sprites/hud/heart/half.png b/assets/minecraft/textures/gui/sprites/hud/heart/half.png index 6e19602e..6146994b 100644 --- a/assets/minecraft/textures/gui/sprites/hud/heart/half.png +++ b/assets/minecraft/textures/gui/sprites/hud/heart/half.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f6095a2446c8eb94e82e632a57a7376fe36cfca6fc4915445be02c2d6dec8443 -size 113 +oid sha256:98d1fca665a309879c19c06b0658ba5407520f13a02d4bf7321b060534491efc +size 102 diff --git a/assets/minecraft/textures/gui/sprites/hud/heart/half_blinking.png b/assets/minecraft/textures/gui/sprites/hud/heart/half_blinking.png index 9828e24b..b117a9c2 100644 --- a/assets/minecraft/textures/gui/sprites/hud/heart/half_blinking.png +++ b/assets/minecraft/textures/gui/sprites/hud/heart/half_blinking.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:01bc8fa62e29fb388a72e4f5ea8e318928b0a61980e5c76b0cbf1f8887da8d8a -size 113 +oid sha256:f63cf9331c3087e5e403b96e2456721cbbbc4be05b86c3443b863efda40b6c88 +size 102 diff --git a/assets/minecraft/textures/gui/sprites/hud/heart/hardcore_full.png b/assets/minecraft/textures/gui/sprites/hud/heart/hardcore_full.png index 33831130..7b8de883 100644 --- a/assets/minecraft/textures/gui/sprites/hud/heart/hardcore_full.png +++ b/assets/minecraft/textures/gui/sprites/hud/heart/hardcore_full.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c1a71e7223cff1ba986ba115ff0f315fd3af468d8ef235b880f3d061e78f8cf3 -size 120 +oid sha256:0a7788d62fb70523880ca26120add4fb397a35ea70e7deca036c8fc2afcbada7 +size 116 diff --git a/assets/minecraft/textures/gui/sprites/hud/heart/hardcore_full_blinking.png b/assets/minecraft/textures/gui/sprites/hud/heart/hardcore_full_blinking.png index 837147c3..93de8dce 100644 --- a/assets/minecraft/textures/gui/sprites/hud/heart/hardcore_full_blinking.png +++ b/assets/minecraft/textures/gui/sprites/hud/heart/hardcore_full_blinking.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:81eb87a5b0f86fb9d99b6212538f985369f2d990a39ee058326c70014c3f4af1 -size 120 +oid sha256:d66cf76e587d7bbd435d05d4c8a4f3835a90dbfdd63a5e825066e0cf2de53d52 +size 116 diff --git a/assets/minecraft/textures/gui/sprites/hud/heart/hardcore_half.png b/assets/minecraft/textures/gui/sprites/hud/heart/hardcore_half.png index 2bf37276..bb1ca290 100644 --- a/assets/minecraft/textures/gui/sprites/hud/heart/hardcore_half.png +++ b/assets/minecraft/textures/gui/sprites/hud/heart/hardcore_half.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c8e12d1b2389b4f82fcadbe1bfabcbe354f33bd763737606124a1c4d236c1ae -size 119 +oid sha256:92dd5fe2e4b355b627cf1340a569923d3cd5d6c3c7963e60e6abee207a1abed5 +size 106 diff --git a/assets/minecraft/textures/gui/sprites/hud/heart/hardcore_half_blinking.png b/assets/minecraft/textures/gui/sprites/hud/heart/hardcore_half_blinking.png index abdaf591..fedd0d0a 100644 --- a/assets/minecraft/textures/gui/sprites/hud/heart/hardcore_half_blinking.png +++ b/assets/minecraft/textures/gui/sprites/hud/heart/hardcore_half_blinking.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1218a53c316255f751a38e7de0f9a84b5b97b3dcb164732d2902b598ac83d28d -size 119 +oid sha256:380da417eeefbaccf0f9f9bf03efd6d2ae713567ddcd47dfbf2c7298d0c2203b +size 107 diff --git a/assets/minecraft/textures/gui/sprites/hud/heart/poisoned_full.png b/assets/minecraft/textures/gui/sprites/hud/heart/poisoned_full.png index 33fb9814..b8ffae07 100644 --- a/assets/minecraft/textures/gui/sprites/hud/heart/poisoned_full.png +++ b/assets/minecraft/textures/gui/sprites/hud/heart/poisoned_full.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ddf5f87cc68e5ea7a34e5ffc6f73508ab5d2b157b7944af2c1005c872562a90a -size 125 +oid sha256:5c47760c8770cbed12392e65fdd2a3acd33836a6a8275f6abd4ce9f56ac01e9f +size 122 diff --git a/assets/minecraft/textures/gui/sprites/hud/heart/poisoned_full_blinking.png b/assets/minecraft/textures/gui/sprites/hud/heart/poisoned_full_blinking.png index 41922376..8b0c2278 100644 --- a/assets/minecraft/textures/gui/sprites/hud/heart/poisoned_full_blinking.png +++ b/assets/minecraft/textures/gui/sprites/hud/heart/poisoned_full_blinking.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f171cc405ad7a4c8ac03434153dcc27b010c0af34a5fcdb25e3960305b149749 -size 117 +oid sha256:bb427c5811d0eaa255f124076e4609333f8301cd5c7094fb344c5480cbb4a995 +size 112 diff --git a/assets/minecraft/textures/gui/sprites/hud/heart/poisoned_half.png b/assets/minecraft/textures/gui/sprites/hud/heart/poisoned_half.png index 7adc2f96..c3b0ecf9 100644 --- a/assets/minecraft/textures/gui/sprites/hud/heart/poisoned_half.png +++ b/assets/minecraft/textures/gui/sprites/hud/heart/poisoned_half.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4a37cb1b9ea296bebf20ae6b85bdcc27fd7768627b1bd00857f6f02a0ddc858f -size 124 +oid sha256:7e0d0118a3e3a3d4a11dc1b65a4c66af0abdded95d227e3e2fbd97364b4c7ca6 +size 113 diff --git a/assets/minecraft/textures/gui/sprites/hud/heart/poisoned_half_blinking.png b/assets/minecraft/textures/gui/sprites/hud/heart/poisoned_half_blinking.png index be771d89..a0571b1a 100644 --- a/assets/minecraft/textures/gui/sprites/hud/heart/poisoned_half_blinking.png +++ b/assets/minecraft/textures/gui/sprites/hud/heart/poisoned_half_blinking.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c69e12ed0091efe83064066afb447d1c28950f02b8f466a1280b2c06eba0789b -size 116 +oid sha256:0b90d19c270047be3b1d502c3f2def99f5899ef430ed6bfff45cc35911e75076 +size 105 diff --git a/assets/minecraft/textures/gui/sprites/hud/heart/poisoned_hardcore_full.png b/assets/minecraft/textures/gui/sprites/hud/heart/poisoned_hardcore_full.png index 1f2215dc..d9886e7a 100644 --- a/assets/minecraft/textures/gui/sprites/hud/heart/poisoned_hardcore_full.png +++ b/assets/minecraft/textures/gui/sprites/hud/heart/poisoned_hardcore_full.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dceec5104566103b7a9be28e4280f797f3b034533f51cf8a1d265ce3ad905d54 -size 128 +oid sha256:8900928082f3ca73c312b8bc78357f283d4101f7dc147f563a09a3ad4c3b8937 +size 125 diff --git a/assets/minecraft/textures/gui/sprites/hud/heart/poisoned_hardcore_full_blinking.png b/assets/minecraft/textures/gui/sprites/hud/heart/poisoned_hardcore_full_blinking.png index 84c9b8ae..ad467c92 100644 --- a/assets/minecraft/textures/gui/sprites/hud/heart/poisoned_hardcore_full_blinking.png +++ b/assets/minecraft/textures/gui/sprites/hud/heart/poisoned_hardcore_full_blinking.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ac8233d547f594874e59fad8429534807e692dd116455dc52498208dbf692cb5 -size 122 +oid sha256:354b9975971caf7f3ac28162b4ced0adc9edf9c11e82797bc13e4d9c5bc566bb +size 118 diff --git a/assets/minecraft/textures/gui/sprites/hud/heart/poisoned_hardcore_half.png b/assets/minecraft/textures/gui/sprites/hud/heart/poisoned_hardcore_half.png index b8b1754f..8ed441b3 100644 --- a/assets/minecraft/textures/gui/sprites/hud/heart/poisoned_hardcore_half.png +++ b/assets/minecraft/textures/gui/sprites/hud/heart/poisoned_hardcore_half.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dc360115ee6ce335a2038c4b2711341267e5e32aaaf12e94abd556974d604c1a -size 122 +oid sha256:a3462b71265ef37c0bacff741d106c23f341696ab922049933aaa7751e24c33d +size 112 diff --git a/assets/minecraft/textures/gui/sprites/hud/heart/poisoned_hardcore_half_blinking.png b/assets/minecraft/textures/gui/sprites/hud/heart/poisoned_hardcore_half_blinking.png index a3ec1ba4..9cc1c1ae 100644 --- a/assets/minecraft/textures/gui/sprites/hud/heart/poisoned_hardcore_half_blinking.png +++ b/assets/minecraft/textures/gui/sprites/hud/heart/poisoned_hardcore_half_blinking.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4108e4b5f5ac75e6c80a858e312aab70febe8b52756ef0b57d03cb1811bfaafb -size 121 +oid sha256:b705fe0b9811ded037b08d4a639710e8829a03d373b5e86087323c811f9654e3 +size 108 diff --git a/assets/minecraft/textures/gui/sprites/hud/heart/vehicle_container.png b/assets/minecraft/textures/gui/sprites/hud/heart/vehicle_container.png index f0122cb2..492ffc26 100644 --- a/assets/minecraft/textures/gui/sprites/hud/heart/vehicle_container.png +++ b/assets/minecraft/textures/gui/sprites/hud/heart/vehicle_container.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f412f066a7fe3fc851e0d90fde04bb76faa5059d6fc52aa244bcd021b1f66c54 -size 129 +oid sha256:b92355b32f566dd5ec209dcf6f25ddd239fdf967a70af42308ef9607aab3b194 +size 98 diff --git a/assets/minecraft/textures/gui/sprites/hud/heart/vehicle_full.png b/assets/minecraft/textures/gui/sprites/hud/heart/vehicle_full.png index 4ac2f0a4..90ecb140 100644 --- a/assets/minecraft/textures/gui/sprites/hud/heart/vehicle_full.png +++ b/assets/minecraft/textures/gui/sprites/hud/heart/vehicle_full.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b9f3bbe1967be4b7bdfc22451fe7bd36af7194cc631d0c0f744c9fb9154501c4 -size 132 +oid sha256:7d676dd277663d3d87bdbe52632235946e484301fb47b6f8b27633d2d4efe1e3 +size 130 diff --git a/assets/minecraft/textures/gui/sprites/hud/heart/vehicle_half.png b/assets/minecraft/textures/gui/sprites/hud/heart/vehicle_half.png index e121fb93..677979d2 100644 --- a/assets/minecraft/textures/gui/sprites/hud/heart/vehicle_half.png +++ b/assets/minecraft/textures/gui/sprites/hud/heart/vehicle_half.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:78a6d04fa5067ed62ce78e610de8f0468699df1b8aa20fb2b368e42d15d01a47 -size 137 +oid sha256:e2171726715fba71f86b6fee9714ec8e3e3c08e75beda62bf411b1d363363ae9 +size 116 diff --git a/assets/minecraft/textures/gui/sprites/hud/heart/withered_full.png b/assets/minecraft/textures/gui/sprites/hud/heart/withered_full.png index 99326555..eaf7ae2c 100644 --- a/assets/minecraft/textures/gui/sprites/hud/heart/withered_full.png +++ b/assets/minecraft/textures/gui/sprites/hud/heart/withered_full.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f05f52e7daef34dd4a2034d1dbb79fa2ef1da03cbb74862fa8738c6817918641 -size 143 +oid sha256:5c5475bdb3a917b6414c1a1ea6400c1f00bdc1e5906d6781d6abbb9411747fa6 +size 140 diff --git a/assets/minecraft/textures/gui/sprites/hud/heart/withered_full_blinking.png b/assets/minecraft/textures/gui/sprites/hud/heart/withered_full_blinking.png index 95fb3569..729dd5ca 100644 --- a/assets/minecraft/textures/gui/sprites/hud/heart/withered_full_blinking.png +++ b/assets/minecraft/textures/gui/sprites/hud/heart/withered_full_blinking.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6663d0fa2ef887ee36d70fd072816fafabf010dfa685c6f0d4656ea582985e83 -size 125 +oid sha256:8d8f5c897fdd6e3f6e9ca1b7c4e55abbf3af9437ea24d094b80ce9e134a1b27d +size 120 diff --git a/assets/minecraft/textures/gui/sprites/hud/heart/withered_half.png b/assets/minecraft/textures/gui/sprites/hud/heart/withered_half.png index 2cacbbad..f2156daa 100644 --- a/assets/minecraft/textures/gui/sprites/hud/heart/withered_half.png +++ b/assets/minecraft/textures/gui/sprites/hud/heart/withered_half.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2d2448d52158bf0e4db9d8baa9285bf2ca419f7d297cbd16bc740d31c5931c57 -size 132 +oid sha256:a368bc604caa0aab258d1f9d4313db6031c5462361c41578dd718fae3f677a76 +size 121 diff --git a/assets/minecraft/textures/gui/sprites/hud/heart/withered_half_blinking.png b/assets/minecraft/textures/gui/sprites/hud/heart/withered_half_blinking.png index dc8638e0..3f7ff9df 100644 --- a/assets/minecraft/textures/gui/sprites/hud/heart/withered_half_blinking.png +++ b/assets/minecraft/textures/gui/sprites/hud/heart/withered_half_blinking.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cb9f72fdf9752749fd9a61509ac33011d10cc748c0140f8b38e3220963980356 -size 122 +oid sha256:758ee154d7879a64c6903e0a0ecb9dd068ca16aef225a9ca8055f68d79ff8e17 +size 111 diff --git a/assets/minecraft/textures/gui/sprites/hud/heart/withered_hardcore_full.png b/assets/minecraft/textures/gui/sprites/hud/heart/withered_hardcore_full.png index a3258f6f..10f050d8 100644 --- a/assets/minecraft/textures/gui/sprites/hud/heart/withered_hardcore_full.png +++ b/assets/minecraft/textures/gui/sprites/hud/heart/withered_hardcore_full.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f1d9755e2ba33c8d280f98d9ad8600cf7de00938175548a9fd04e59b8d2582c3 -size 151 +oid sha256:a6b4b53b39e85e5758b3ed99e4303f4f7f24d530e0f27510daa5b6c456ab725d +size 147 diff --git a/assets/minecraft/textures/gui/sprites/hud/heart/withered_hardcore_full_blinking.png b/assets/minecraft/textures/gui/sprites/hud/heart/withered_hardcore_full_blinking.png index 7eecfe0e..475929fd 100644 --- a/assets/minecraft/textures/gui/sprites/hud/heart/withered_hardcore_full_blinking.png +++ b/assets/minecraft/textures/gui/sprites/hud/heart/withered_hardcore_full_blinking.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:66483bc93dbc492e9747e1f5618d4623e37ceb7ed59bf446e9f2068662e0daaa -size 135 +oid sha256:0fd9f717cbad4111e10c0f848af41e7e66c92d3225fd2ef0b0df48fdf397306c +size 132 diff --git a/assets/minecraft/textures/gui/sprites/hud/heart/withered_hardcore_half.png b/assets/minecraft/textures/gui/sprites/hud/heart/withered_hardcore_half.png index 6a3ec906..57865b2b 100644 --- a/assets/minecraft/textures/gui/sprites/hud/heart/withered_hardcore_half.png +++ b/assets/minecraft/textures/gui/sprites/hud/heart/withered_hardcore_half.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f0bee32da5997dcb3bcbbbb8b91ad459881429b863568bb3c7e0ef211679ecc8 -size 139 +oid sha256:3e069dcbca3a61492c6480a60c985f21ce39bf851ad870f69f8612689e2efd6b +size 128 diff --git a/assets/minecraft/textures/gui/sprites/hud/heart/withered_hardcore_half_blinking.png b/assets/minecraft/textures/gui/sprites/hud/heart/withered_hardcore_half_blinking.png index 70df0017..cf5d0df9 100644 --- a/assets/minecraft/textures/gui/sprites/hud/heart/withered_hardcore_half_blinking.png +++ b/assets/minecraft/textures/gui/sprites/hud/heart/withered_hardcore_half_blinking.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:37cbbef0842f9311b902db54519d8856ab32ab180373a03e4104a7a9649a6c19 -size 132 +oid sha256:c9bf1f18f28aad32777dacd1b38ff93263592648bd0a7b9cc2e6633597c625a7 +size 121 diff --git a/assets/minecraft/textures/gui/sprites/hud/hotbar_attack_indicator_background.png b/assets/minecraft/textures/gui/sprites/hud/hotbar_attack_indicator_background.png index 46d13ad4..79df4c88 100644 --- a/assets/minecraft/textures/gui/sprites/hud/hotbar_attack_indicator_background.png +++ b/assets/minecraft/textures/gui/sprites/hud/hotbar_attack_indicator_background.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:88a103a6da7e6459fa7fc84d8e4501d089669c4d62ed56c43449765b58f6cbee -size 229 +oid sha256:2d03c7d66db1445e711048ca5b2d4d10a23217a6f018fc76b0be0ed203257089 +size 124 diff --git a/assets/minecraft/textures/gui/sprites/hud/hotbar_attack_indicator_progress.png b/assets/minecraft/textures/gui/sprites/hud/hotbar_attack_indicator_progress.png index b93e52b6..54161c7d 100644 --- a/assets/minecraft/textures/gui/sprites/hud/hotbar_attack_indicator_progress.png +++ b/assets/minecraft/textures/gui/sprites/hud/hotbar_attack_indicator_progress.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7ed1075bceb9b98403def6025b96f074cb0e8dd8c21cc45068ea70acee8416df -size 217 +oid sha256:e26bd5377b44dd0c6e31f7781fdcb536b6d3457f674f89dfb9276dcc7ca1efe8 +size 208 diff --git a/assets/minecraft/textures/gui/sprites/hud/hotbar_offhand_right.png b/assets/minecraft/textures/gui/sprites/hud/hotbar_offhand_right.png index d19f2ee2..90f26b31 100644 --- a/assets/minecraft/textures/gui/sprites/hud/hotbar_offhand_right.png +++ b/assets/minecraft/textures/gui/sprites/hud/hotbar_offhand_right.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:93060f7d0d86530eb629ec918dee64515f14ac7aa96c654bddc53ad1ed1f3fac -size 1026 +oid sha256:8c72431a342a1768ac86eea8ff6462ff6cd8561655d8f84d348bd9bd104dbe52 +size 917 diff --git a/assets/minecraft/textures/gui/sprites/hud/locator_bar_arrow_down.png b/assets/minecraft/textures/gui/sprites/hud/locator_bar_arrow_down.png new file mode 100644 index 00000000..76759c27 --- /dev/null +++ b/assets/minecraft/textures/gui/sprites/hud/locator_bar_arrow_down.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4cfd69e1d30ffe6ffb4302823aa31b37d42e6dc25d37c300cdc58278bbf1901b +size 85 diff --git a/assets/minecraft/textures/gui/sprites/hud/locator_bar_arrow_down.png.mcmeta b/assets/minecraft/textures/gui/sprites/hud/locator_bar_arrow_down.png.mcmeta new file mode 100644 index 00000000..46a2bb64 --- /dev/null +++ b/assets/minecraft/textures/gui/sprites/hud/locator_bar_arrow_down.png.mcmeta @@ -0,0 +1,15 @@ +{ + "animation": { + "frames": [ + { + "index": 0, + "time": 10 + }, + { + "index": 1, + "time": 4 + } + ], + "height": 5 + } +} diff --git a/assets/minecraft/textures/gui/sprites/hud/locator_bar_arrow_up.png b/assets/minecraft/textures/gui/sprites/hud/locator_bar_arrow_up.png new file mode 100644 index 00000000..8986248e --- /dev/null +++ b/assets/minecraft/textures/gui/sprites/hud/locator_bar_arrow_up.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cf533804a926eabbec1fc9d53f3bbcc9416c6cc44c6c61ac1474a57bf8ea5fe4 +size 86 diff --git a/assets/minecraft/textures/gui/sprites/hud/locator_bar_arrow_up.png.mcmeta b/assets/minecraft/textures/gui/sprites/hud/locator_bar_arrow_up.png.mcmeta new file mode 100644 index 00000000..46a2bb64 --- /dev/null +++ b/assets/minecraft/textures/gui/sprites/hud/locator_bar_arrow_up.png.mcmeta @@ -0,0 +1,15 @@ +{ + "animation": { + "frames": [ + { + "index": 0, + "time": 10 + }, + { + "index": 1, + "time": 4 + } + ], + "height": 5 + } +} diff --git a/assets/minecraft/textures/gui/sprites/hud/locator_bar_background.png b/assets/minecraft/textures/gui/sprites/hud/locator_bar_background.png new file mode 100644 index 00000000..2b6efbf1 --- /dev/null +++ b/assets/minecraft/textures/gui/sprites/hud/locator_bar_background.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ad77cdfb1738ca5db355831977f799e4d42f278710ba27e6780e8b077a3d76b8 +size 183 diff --git a/assets/minecraft/textures/gui/sprites/hud/locator_bar_background.png.mcmeta b/assets/minecraft/textures/gui/sprites/hud/locator_bar_background.png.mcmeta new file mode 100644 index 00000000..f1e01ce2 --- /dev/null +++ b/assets/minecraft/textures/gui/sprites/hud/locator_bar_background.png.mcmeta @@ -0,0 +1,15 @@ +{ + "gui": { + "scaling": { + "type": "nine_slice", + "width": 12, + "height": 5, + "border": { + "left": 5, + "right": 5, + "top": 1, + "bottom": 1 + } + } + } +} diff --git a/assets/minecraft/textures/gui/sprites/hud/locator_bar_dot/bowtie.png b/assets/minecraft/textures/gui/sprites/hud/locator_bar_dot/bowtie.png new file mode 100644 index 00000000..9e700dd6 --- /dev/null +++ b/assets/minecraft/textures/gui/sprites/hud/locator_bar_dot/bowtie.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0b6529251a02ec0e5e968abd1c42244ce300a3cc68ac645e895fbe5d758fea47 +size 116 diff --git a/assets/minecraft/textures/gui/sprites/hud/locator_bar_dot/default_0.png b/assets/minecraft/textures/gui/sprites/hud/locator_bar_dot/default_0.png new file mode 100644 index 00000000..a3f46c6f --- /dev/null +++ b/assets/minecraft/textures/gui/sprites/hud/locator_bar_dot/default_0.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ab0e90c3742ccfd63705536c24d4fb7c4608f5473e8cb351b0d13e24eef9438e +size 106 diff --git a/assets/minecraft/textures/gui/sprites/hud/locator_bar_dot/default_1.png b/assets/minecraft/textures/gui/sprites/hud/locator_bar_dot/default_1.png new file mode 100644 index 00000000..227def7c --- /dev/null +++ b/assets/minecraft/textures/gui/sprites/hud/locator_bar_dot/default_1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:38bfb8d44f9532d3004d397d3b141aeaa24cb0291181c08c63c1d66d4932d9db +size 95 diff --git a/assets/minecraft/textures/gui/sprites/hud/locator_bar_dot/default_2.png b/assets/minecraft/textures/gui/sprites/hud/locator_bar_dot/default_2.png new file mode 100644 index 00000000..4ed7e00c --- /dev/null +++ b/assets/minecraft/textures/gui/sprites/hud/locator_bar_dot/default_2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3b2ed25621261052dfafef778e108e8ec056dc9fde702af03555a49b295e3a6d +size 82 diff --git a/assets/minecraft/textures/gui/sprites/hud/locator_bar_dot/default_3.png b/assets/minecraft/textures/gui/sprites/hud/locator_bar_dot/default_3.png new file mode 100644 index 00000000..24bf0612 --- /dev/null +++ b/assets/minecraft/textures/gui/sprites/hud/locator_bar_dot/default_3.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4fe7975fc5d2ffc612afa4fe3f35a42ccf269f6b77c8ea093ae38f859b2f4f3b +size 88 diff --git a/assets/minecraft/textures/gui/sprites/icon/accessibility.png b/assets/minecraft/textures/gui/sprites/icon/accessibility.png index be8d513f..aa15ede3 100644 --- a/assets/minecraft/textures/gui/sprites/icon/accessibility.png +++ b/assets/minecraft/textures/gui/sprites/icon/accessibility.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:283e131a45b0358eabfe533abc2d2509a3f986f0b4309fb5506c9237a19e78b5 -size 178 +oid sha256:6d5ba8e9745440d31c2eab00a819975c056271f132f5c901e85d5350b3b95db5 +size 143 diff --git a/assets/minecraft/textures/gui/sprites/icon/chat_modified.png b/assets/minecraft/textures/gui/sprites/icon/chat_modified.png index 88985512..bb2bee3e 100644 --- a/assets/minecraft/textures/gui/sprites/icon/chat_modified.png +++ b/assets/minecraft/textures/gui/sprites/icon/chat_modified.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5fa1b5b75f7a26c5c7d4f8f4bd3c766f70833c6abeec9302c5d21ea8faa9b5ec -size 143 +oid sha256:29d279abc8272b997a3b21bd69922baea486dea68361ea3f445b8c262c837d9c +size 117 diff --git a/assets/minecraft/textures/gui/sprites/icon/checkmark.png b/assets/minecraft/textures/gui/sprites/icon/checkmark.png index 4a48eb7c..d629f2e7 100644 --- a/assets/minecraft/textures/gui/sprites/icon/checkmark.png +++ b/assets/minecraft/textures/gui/sprites/icon/checkmark.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:072a638d70bb3d7b9d8b82d86b9d76081847838550612da6a4dbaed2a1350643 -size 145 +oid sha256:06d09162aa3f2145f3c31f817a65cf4ef78eca561d4832fd17a078096afdd3db +size 126 diff --git a/assets/minecraft/textures/gui/sprites/icon/draft_report.png b/assets/minecraft/textures/gui/sprites/icon/draft_report.png index 88debbc2..6e3663e4 100644 --- a/assets/minecraft/textures/gui/sprites/icon/draft_report.png +++ b/assets/minecraft/textures/gui/sprites/icon/draft_report.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d9ab8fb9acd12018e46e5dcd9c0f9b78c90dd23d2b8a4747081fd2a282df64ff -size 174 +oid sha256:aad88d37f77f5a1eaf202f1c11c858e24801d25a1c047c9060a0f91cc1f33872 +size 167 diff --git a/assets/minecraft/textures/gui/sprites/icon/info.png b/assets/minecraft/textures/gui/sprites/icon/info.png index 9df21ae7..a16836ac 100644 --- a/assets/minecraft/textures/gui/sprites/icon/info.png +++ b/assets/minecraft/textures/gui/sprites/icon/info.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8a58d506c9fb1c347ab5c4894e8b797d1f8318328dfdcc8dafa7ef4a4e350de1 -size 141 +oid sha256:b3d732885e04004530bc066a08e9112cb735d3a6b7a822cf17782c98d997f370 +size 127 diff --git a/assets/minecraft/textures/gui/sprites/icon/invite.png b/assets/minecraft/textures/gui/sprites/icon/invite.png index a97712c3..e4330c4f 100644 --- a/assets/minecraft/textures/gui/sprites/icon/invite.png +++ b/assets/minecraft/textures/gui/sprites/icon/invite.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7a09e64f21c295c7c7da579ec2276b0d3bae131612a2d429dc7939e6fe7e6acc -size 150 +oid sha256:b8fffccc180617b40e3a91fd7338358255c61782bb4f9f4aeebb23d70c04392a +size 144 diff --git a/assets/minecraft/textures/gui/sprites/icon/link.png b/assets/minecraft/textures/gui/sprites/icon/link.png index 1eeeb9aa..493eb05b 100644 --- a/assets/minecraft/textures/gui/sprites/icon/link.png +++ b/assets/minecraft/textures/gui/sprites/icon/link.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7797433591cd7b915378bb6f6e83f685d4df24f6d7c2eb4008d1937964ee4122 -size 150 +oid sha256:b48a304d7d13b21cf53d4d78ccacf2d6cc7b89afafc9818099caabf7dc393aad +size 136 diff --git a/assets/minecraft/textures/gui/sprites/icon/link_highlighted.png b/assets/minecraft/textures/gui/sprites/icon/link_highlighted.png index 72b9c3c5..80a0b04a 100644 --- a/assets/minecraft/textures/gui/sprites/icon/link_highlighted.png +++ b/assets/minecraft/textures/gui/sprites/icon/link_highlighted.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5b7c459bafa259f42363a55868218631327918249a58c9f4be2237e0c0a6cb18 -size 150 +oid sha256:92e45ff5a6ddf1a801408f729c37728720d922010fe151fe59de1ce10334bf99 +size 136 diff --git a/assets/minecraft/textures/gui/sprites/icon/music_notes.png b/assets/minecraft/textures/gui/sprites/icon/music_notes.png new file mode 100644 index 00000000..995ec449 --- /dev/null +++ b/assets/minecraft/textures/gui/sprites/icon/music_notes.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:767b4ab3be586e31a9557485c0fc4a5e6b8fba87e7a4383c4713e597ae868942 +size 531 diff --git a/assets/minecraft/textures/gui/sprites/icon/music_notes.png.mcmeta b/assets/minecraft/textures/gui/sprites/icon/music_notes.png.mcmeta new file mode 100644 index 00000000..36578bcc --- /dev/null +++ b/assets/minecraft/textures/gui/sprites/icon/music_notes.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/assets/minecraft/textures/gui/sprites/icon/new_realm.png b/assets/minecraft/textures/gui/sprites/icon/new_realm.png index d79909df..021f203a 100644 --- a/assets/minecraft/textures/gui/sprites/icon/new_realm.png +++ b/assets/minecraft/textures/gui/sprites/icon/new_realm.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7df4a11c751ee2051cfd74d3cea476d386930d7ca3883f3aad40aef49574937a -size 316 +oid sha256:016dcc2cbb142d1f696d1cb22c2826e0db943de4e19e46673ad0810c84092472 +size 299 diff --git a/assets/minecraft/textures/gui/sprites/icon/news.png b/assets/minecraft/textures/gui/sprites/icon/news.png index 876cbefe..725b9efa 100644 --- a/assets/minecraft/textures/gui/sprites/icon/news.png +++ b/assets/minecraft/textures/gui/sprites/icon/news.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:59cf4de138c8efb5538f5c4909e4ed2955825b2706e5519fe74ac09372190b00 -size 175 +oid sha256:f521fb00ea8a561758fc2bfe363f0bc4e04748533fdad89151fe7508fb089fab +size 124 diff --git a/assets/minecraft/textures/gui/sprites/icon/ping_1.png b/assets/minecraft/textures/gui/sprites/icon/ping_1.png index f4dce3c1..ba0a666d 100644 --- a/assets/minecraft/textures/gui/sprites/icon/ping_1.png +++ b/assets/minecraft/textures/gui/sprites/icon/ping_1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cf16ebf324d8406a091ab79ef5aac90ebf206885529631b4ca5f8dc33565d2bc -size 115 +oid sha256:851ee65c7987666409906797bcaf16f1c1f8c938ebf4ae2db4507878bb48862f +size 108 diff --git a/assets/minecraft/textures/gui/sprites/icon/ping_2.png b/assets/minecraft/textures/gui/sprites/icon/ping_2.png index b0d73c5e..6fab2fcd 100644 --- a/assets/minecraft/textures/gui/sprites/icon/ping_2.png +++ b/assets/minecraft/textures/gui/sprites/icon/ping_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a0a8ae2c4d169362f4509c4a9e6539b49a26723ff5bef470579a9c1db60e7d45 -size 119 +oid sha256:cd8e2ebba5d3d285dff9df3aa1317456df1f33b457ccc4370ee9d5ada6a71c36 +size 112 diff --git a/assets/minecraft/textures/gui/sprites/icon/ping_3.png b/assets/minecraft/textures/gui/sprites/icon/ping_3.png index 3ff6dcb9..edec2f92 100644 --- a/assets/minecraft/textures/gui/sprites/icon/ping_3.png +++ b/assets/minecraft/textures/gui/sprites/icon/ping_3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3d4986b310a1a750abcdd417413394d57c9a4aad757463585cbaf83d4568a2c6 -size 119 +oid sha256:e01d368b901d03169b195acd5151f898ad9a0be94746a5f0e09c6bb5ba3e041f +size 112 diff --git a/assets/minecraft/textures/gui/sprites/icon/ping_4.png b/assets/minecraft/textures/gui/sprites/icon/ping_4.png index 1ff26ef1..4557592a 100644 --- a/assets/minecraft/textures/gui/sprites/icon/ping_4.png +++ b/assets/minecraft/textures/gui/sprites/icon/ping_4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:132df1226895674d485b6d7fdd4f65fdd25706200ea7bbdf0561e2385be118b7 -size 117 +oid sha256:2c306a300b3a04a5289b6f63581c5f8ed3ade4b455761cf4cf5645c3e5ee305a +size 112 diff --git a/assets/minecraft/textures/gui/sprites/icon/ping_5.png b/assets/minecraft/textures/gui/sprites/icon/ping_5.png index 0b1cc9ed..7bf525d9 100644 --- a/assets/minecraft/textures/gui/sprites/icon/ping_5.png +++ b/assets/minecraft/textures/gui/sprites/icon/ping_5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2cf7bc87a1f04389f4dfbd376a00b64d28f7ed37f13df5d33c051137425cc1e6 -size 105 +oid sha256:714065a9c4acd0477455db96e931e0d0a41025acbffc2130b250885d5e02a436 +size 98 diff --git a/assets/minecraft/textures/gui/sprites/icon/ping_unknown.png b/assets/minecraft/textures/gui/sprites/icon/ping_unknown.png index 74fde4e2..285c93a6 100644 --- a/assets/minecraft/textures/gui/sprites/icon/ping_unknown.png +++ b/assets/minecraft/textures/gui/sprites/icon/ping_unknown.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fd0c11f37addf1956d2ed5eeb84a72ee4f3b79a841d426905d6637fe7f6954fe -size 143 +oid sha256:4640519836bdcb1781ea026a26bd4f2c55e46b5f923e8069ac10d4df73289da9 +size 141 diff --git a/assets/minecraft/textures/gui/sprites/icon/search.png b/assets/minecraft/textures/gui/sprites/icon/search.png index a837fe5f..7d40e8e7 100644 --- a/assets/minecraft/textures/gui/sprites/icon/search.png +++ b/assets/minecraft/textures/gui/sprites/icon/search.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7be0ff7ab3088e1b3bcdfa3feff9a79c9965e0a395ca97f3dfe3b558e321a386 -size 182 +oid sha256:c3e27020baba359cb74a5c340b377986d08e0d17259a723183bc5049e192b898 +size 178 diff --git a/assets/minecraft/textures/gui/sprites/icon/trial_available.png b/assets/minecraft/textures/gui/sprites/icon/trial_available.png index e0da02b4..aeede673 100644 --- a/assets/minecraft/textures/gui/sprites/icon/trial_available.png +++ b/assets/minecraft/textures/gui/sprites/icon/trial_available.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4699c7e8f6921e02bbcac4c255b12cc5bca8373657b6a02f084ff6f913afe7d3 -size 192 +oid sha256:703906c3d15b828808e919f4d57792623af70c2b916bff09d496ca0bcb523a09 +size 191 diff --git a/assets/minecraft/textures/gui/sprites/icon/unseen_notification.png b/assets/minecraft/textures/gui/sprites/icon/unseen_notification.png index 27e6178e..5df09714 100644 --- a/assets/minecraft/textures/gui/sprites/icon/unseen_notification.png +++ b/assets/minecraft/textures/gui/sprites/icon/unseen_notification.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:afe71e9d4a1d7375dd81a9d0ecef4d82e7a44783117b626269b972c365182856 -size 95 +oid sha256:5dd9dab0830d4447366a5c50cbdfad91b908e6c73e967fc3d2c068ba02eeb440 +size 94 diff --git a/assets/minecraft/textures/gui/sprites/icon/video_link.png b/assets/minecraft/textures/gui/sprites/icon/video_link.png index 95d8e08c..1933c530 100644 --- a/assets/minecraft/textures/gui/sprites/icon/video_link.png +++ b/assets/minecraft/textures/gui/sprites/icon/video_link.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:821bd681f589f0a93a31e14765b5529f75f6ab1a21c426f273814b2fc48a9e07 -size 163 +oid sha256:2b63dc3e4cb4fa4edda0d26702f375c142adb247f036ada337065f7e98758d0c +size 136 diff --git a/assets/minecraft/textures/gui/sprites/icon/video_link_highlighted.png b/assets/minecraft/textures/gui/sprites/icon/video_link_highlighted.png index 714e39bf..d803e4a1 100644 --- a/assets/minecraft/textures/gui/sprites/icon/video_link_highlighted.png +++ b/assets/minecraft/textures/gui/sprites/icon/video_link_highlighted.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b8023c5a9cba680155d3e32bde9a582653fb3f4c716ffd9b794a538236083ea0 -size 165 +oid sha256:7e343b4b4a82835966b1566ff127bcf5caaf1c2381d22006446567ba55631a29 +size 138 diff --git a/assets/minecraft/textures/gui/sprites/notification/1.png b/assets/minecraft/textures/gui/sprites/notification/1.png index 29cd57e3..6c953fa4 100644 --- a/assets/minecraft/textures/gui/sprites/notification/1.png +++ b/assets/minecraft/textures/gui/sprites/notification/1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:156b06ea247b52ddda156edd2bf03470376aa26bd37d92fee4ce0ffa3d44366f -size 140 +oid sha256:d6ea84cab27d2e58eebc93ea69677105c50a271b166f16366566a2badf71212e +size 137 diff --git a/assets/minecraft/textures/gui/sprites/notification/2.png b/assets/minecraft/textures/gui/sprites/notification/2.png index 0982ed46..e745fd5a 100644 --- a/assets/minecraft/textures/gui/sprites/notification/2.png +++ b/assets/minecraft/textures/gui/sprites/notification/2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ee89e352f448deab1f82ec9a9eb1dd995f247662a707e42ed21be4e0cd1e5ca3 -size 144 +oid sha256:ba5b0f37d0b129b297f1eb698544947b0a559c31e9767905c02eaca66de7ba1a +size 142 diff --git a/assets/minecraft/textures/gui/sprites/notification/3.png b/assets/minecraft/textures/gui/sprites/notification/3.png index 74df45f7..c17b6a2b 100644 --- a/assets/minecraft/textures/gui/sprites/notification/3.png +++ b/assets/minecraft/textures/gui/sprites/notification/3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:59143042f3dbeebe9e81c228a1b7bb2e164518dddb01b8a1f5c9564b961db54d -size 143 +oid sha256:bf1e5ba04af14b4bc46bcdece938e0de8237ed2111ceea53595847e88cf8e585 +size 141 diff --git a/assets/minecraft/textures/gui/sprites/notification/4.png b/assets/minecraft/textures/gui/sprites/notification/4.png index 3f1b866c..c6356561 100644 --- a/assets/minecraft/textures/gui/sprites/notification/4.png +++ b/assets/minecraft/textures/gui/sprites/notification/4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fb59f718777ec7b97d67534313eb348b9baf41c25e8a063f9a602c501e45dffc -size 151 +oid sha256:ee3d8298ab3837554d20c5e1a1c40f0fd26e6f5f7e3fa4e18f4a936832cdd54d +size 148 diff --git a/assets/minecraft/textures/gui/sprites/notification/5.png b/assets/minecraft/textures/gui/sprites/notification/5.png index d4cc2595..da6e2254 100644 --- a/assets/minecraft/textures/gui/sprites/notification/5.png +++ b/assets/minecraft/textures/gui/sprites/notification/5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:26742fb315b498c976c67c69b76ca097de7a9767e81e81c15bd60fd60d450800 -size 147 +oid sha256:2b1321d2232795ef18abda9046d5c366d3d10e5d65a3623560509ae2c0a8d8b9 +size 145 diff --git a/assets/minecraft/textures/gui/sprites/notification/more.png b/assets/minecraft/textures/gui/sprites/notification/more.png index c3d216a1..68827d7a 100644 --- a/assets/minecraft/textures/gui/sprites/notification/more.png +++ b/assets/minecraft/textures/gui/sprites/notification/more.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b7f0326f38b221d1522f50a0875efffd70fa6fb41843670fb0ad39e16b831bd9 -size 142 +oid sha256:1e4dd34daf869ff762c690a7caebb8667d74c50753980310468bc8123fd5fb40 +size 127 diff --git a/assets/minecraft/textures/gui/sprites/pending_invite/accept.png b/assets/minecraft/textures/gui/sprites/pending_invite/accept.png index 30de4076..7e4102b3 100644 --- a/assets/minecraft/textures/gui/sprites/pending_invite/accept.png +++ b/assets/minecraft/textures/gui/sprites/pending_invite/accept.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a0084cfc7f8e697b1777bb4a98656afccab24c4788c303f783a464018b173f43 -size 151 +oid sha256:319076082d2cabcb54c9f5d6bb04a7664495fb1b82d3a2cac42810761ed4152c +size 149 diff --git a/assets/minecraft/textures/gui/sprites/pending_invite/accept_highlighted.png b/assets/minecraft/textures/gui/sprites/pending_invite/accept_highlighted.png index b6e80170..81aef162 100644 --- a/assets/minecraft/textures/gui/sprites/pending_invite/accept_highlighted.png +++ b/assets/minecraft/textures/gui/sprites/pending_invite/accept_highlighted.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8aa2e1b25cae10726945d9f5513001d8350855fc37dba66ff8c029d2d38fc1ee -size 172 +oid sha256:f2509f612fd5b97768d402743c733c16a5c3508e13bc41a9b28357b6c19dff07 +size 149 diff --git a/assets/minecraft/textures/gui/sprites/pending_invite/reject.png b/assets/minecraft/textures/gui/sprites/pending_invite/reject.png index 77bcd33d..66df5600 100644 --- a/assets/minecraft/textures/gui/sprites/pending_invite/reject.png +++ b/assets/minecraft/textures/gui/sprites/pending_invite/reject.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ab64e3bc7c05184368e1635a9b49339bc6124495a205378b58e91d1f8c1fd28a -size 163 +oid sha256:c0d6135f213266fb7f440d7afc9d4dbb849ad4863a76d8e808b1dd283906faab +size 146 diff --git a/assets/minecraft/textures/gui/sprites/pending_invite/reject_highlighted.png b/assets/minecraft/textures/gui/sprites/pending_invite/reject_highlighted.png index 56e05bd7..ae8a6c5f 100644 --- a/assets/minecraft/textures/gui/sprites/pending_invite/reject_highlighted.png +++ b/assets/minecraft/textures/gui/sprites/pending_invite/reject_highlighted.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8f6bb3cd1b3f7f6689f4321a5ca534042e825d286d3aa81c99b522b99cd2960e -size 181 +oid sha256:33d98bd8ac11903649d8ca8297997feca4eaa409b9350021939ab3bffe8f2d67 +size 146 diff --git a/assets/minecraft/textures/gui/sprites/player_list/make_operator.png b/assets/minecraft/textures/gui/sprites/player_list/make_operator.png index 70fcd44a..72257792 100644 --- a/assets/minecraft/textures/gui/sprites/player_list/make_operator.png +++ b/assets/minecraft/textures/gui/sprites/player_list/make_operator.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fd942ed6bdafa7b8d20b8bcfa553ea6f9c55ed00d41448cf833c1cfe9e3865cb -size 140 +oid sha256:26fcbc8dcf9a616c5ea5eaa50db025e87ae782e437f6571c0324c482f725623c +size 134 diff --git a/assets/minecraft/textures/gui/sprites/player_list/remove_operator.png b/assets/minecraft/textures/gui/sprites/player_list/remove_operator.png index 72b5f258..fce39802 100644 --- a/assets/minecraft/textures/gui/sprites/player_list/remove_operator.png +++ b/assets/minecraft/textures/gui/sprites/player_list/remove_operator.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dee724bbb66d8d33c553aab93c3c1412c60d9d6ff1f46f1820b61f7774db67de -size 203 +oid sha256:bd08d3643899f39c3adab2d146097bc0b30ae3f8ec8a710feff106efc226ef0a +size 201 diff --git a/assets/minecraft/textures/gui/sprites/player_list/remove_player.png b/assets/minecraft/textures/gui/sprites/player_list/remove_player.png index 5e406dce..f54d39f4 100644 --- a/assets/minecraft/textures/gui/sprites/player_list/remove_player.png +++ b/assets/minecraft/textures/gui/sprites/player_list/remove_player.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cbbdcd6ff0020a97c553dd8945936a7335d7fe1ed66e3cc8cf6e61e77fcd38f1 -size 114 +oid sha256:8312d684fd343f7ac7e0f6ed692557794dae3a1ea4fdf541e192d160811c12c9 +size 108 diff --git a/assets/minecraft/textures/gui/sprites/popup/background.png b/assets/minecraft/textures/gui/sprites/popup/background.png index 420912c8..644c105a 100644 --- a/assets/minecraft/textures/gui/sprites/popup/background.png +++ b/assets/minecraft/textures/gui/sprites/popup/background.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f4049b562c89c30161e2bc83991bf73a2e91f44110b8647643e734c2fb59f331 -size 587 +oid sha256:380160151f20a64ae14c13e7e26f496d7c28f105fa958950fe6c3c1434727ed9 +size 182 diff --git a/assets/minecraft/textures/gui/sprites/realm_status/closed.png b/assets/minecraft/textures/gui/sprites/realm_status/closed.png index 7c78802a..9091d9c5 100644 --- a/assets/minecraft/textures/gui/sprites/realm_status/closed.png +++ b/assets/minecraft/textures/gui/sprites/realm_status/closed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:70a8274aec72dd81a2435f23e012224b8685a53be2afd82c0ab13c554550e0fb -size 517 +oid sha256:bd7e6f193104ce787f7ab69f09c70dd12833e53fd30c2eab989d93cd45fb05d7 +size 467 diff --git a/assets/minecraft/textures/gui/sprites/realm_status/expired.png b/assets/minecraft/textures/gui/sprites/realm_status/expired.png index e5008689..beb12fc0 100644 --- a/assets/minecraft/textures/gui/sprites/realm_status/expired.png +++ b/assets/minecraft/textures/gui/sprites/realm_status/expired.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a149f2958138a91e79c1d921f9d18b5de3a015cdc72b00869a88923b42e446b3 -size 403 +oid sha256:a9103c28fb13b675c8678d5f4cc05995eeb13ea1ff88011c45214a65f2f82883 +size 359 diff --git a/assets/minecraft/textures/gui/sprites/realm_status/expires_soon.png b/assets/minecraft/textures/gui/sprites/realm_status/expires_soon.png index 80399705..8a8846a6 100644 --- a/assets/minecraft/textures/gui/sprites/realm_status/expires_soon.png +++ b/assets/minecraft/textures/gui/sprites/realm_status/expires_soon.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:de4550860e3deb73657087d9118adbdca8af84f369693a04973a11c337c2f52e -size 810 +oid sha256:29b8def2197d01e16e52e91724feb28759b62aa65b80ded68519d144b9becfb6 +size 603 diff --git a/assets/minecraft/textures/gui/sprites/realm_status/open.png b/assets/minecraft/textures/gui/sprites/realm_status/open.png index b9d6b1d9..7f59be8e 100644 --- a/assets/minecraft/textures/gui/sprites/realm_status/open.png +++ b/assets/minecraft/textures/gui/sprites/realm_status/open.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:80cee8abf7874eedb1fdf53bd17111f1d78c26d76c556bc03d1cde5b92ffdb4e -size 513 +oid sha256:7167f05d640a9cf81eb1ad5f806c74291ec9e820efa310e25a38f2afbd10d280 +size 465 diff --git a/assets/minecraft/textures/gui/sprites/recipe_book/button.png b/assets/minecraft/textures/gui/sprites/recipe_book/button.png index 23025397..745030cf 100644 --- a/assets/minecraft/textures/gui/sprites/recipe_book/button.png +++ b/assets/minecraft/textures/gui/sprites/recipe_book/button.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d22722ad654652ce997f63abe1a164a6655246376e4b70022f58d99a8a8044e -size 268 +oid sha256:a07e122e8af446135c38fb21cfbbc4bfc94da443ff5257b6e8f9c15b542393b1 +size 247 diff --git a/assets/minecraft/textures/gui/sprites/recipe_book/button_highlighted.png b/assets/minecraft/textures/gui/sprites/recipe_book/button_highlighted.png index a700a9a1..f5ce1b75 100644 --- a/assets/minecraft/textures/gui/sprites/recipe_book/button_highlighted.png +++ b/assets/minecraft/textures/gui/sprites/recipe_book/button_highlighted.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5b5f2d5fd630635327728c32cd7bcf8b9ade47a78566da8f7d58ebb1f93096f1 -size 267 +oid sha256:a7c238109b5be7b2d441c4dd8d7ab10b85657262bf6e0c6cae6d236c68c4ad50 +size 246 diff --git a/assets/minecraft/textures/gui/sprites/recipe_book/crafting_overlay.png b/assets/minecraft/textures/gui/sprites/recipe_book/crafting_overlay.png index e0aff790..f4f39621 100644 --- a/assets/minecraft/textures/gui/sprites/recipe_book/crafting_overlay.png +++ b/assets/minecraft/textures/gui/sprites/recipe_book/crafting_overlay.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:be1e7e1f51eadd80cfc48bd9b888c3ff07b36897704faa6140aa274fb4b9b0e7 -size 155 +oid sha256:e6b49ce4fad4f567ab4cbf344c6e7c35a0d5228cdee6b7fd6ed4b708d239bd22 +size 118 diff --git a/assets/minecraft/textures/gui/sprites/recipe_book/crafting_overlay_disabled.png b/assets/minecraft/textures/gui/sprites/recipe_book/crafting_overlay_disabled.png index c367c881..4cfa89c9 100644 --- a/assets/minecraft/textures/gui/sprites/recipe_book/crafting_overlay_disabled.png +++ b/assets/minecraft/textures/gui/sprites/recipe_book/crafting_overlay_disabled.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c40bc44f23e8e09f517d03851fb8099723884093d9cecc11e58f262960c7196e -size 154 +oid sha256:e681996804199ce33b19a8e2ee3c0ed83c4e38c066ce781afd4aa8d3b17dc1fb +size 133 diff --git a/assets/minecraft/textures/gui/sprites/recipe_book/crafting_overlay_disabled_highlighted.png b/assets/minecraft/textures/gui/sprites/recipe_book/crafting_overlay_disabled_highlighted.png index 2d91dc76..125c0ca3 100644 --- a/assets/minecraft/textures/gui/sprites/recipe_book/crafting_overlay_disabled_highlighted.png +++ b/assets/minecraft/textures/gui/sprites/recipe_book/crafting_overlay_disabled_highlighted.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:738bf116721cc1e75d6b003e61ad8ec5b34f22f28fe83ff10cb53a06aa4fd793 -size 154 +oid sha256:d2d6499954aa1ecb7ac62990886752fa257338a2f94c3256be9db55bfb933354 +size 138 diff --git a/assets/minecraft/textures/gui/sprites/recipe_book/crafting_overlay_highlighted.png b/assets/minecraft/textures/gui/sprites/recipe_book/crafting_overlay_highlighted.png index 7a3d60e4..45bc86bd 100644 --- a/assets/minecraft/textures/gui/sprites/recipe_book/crafting_overlay_highlighted.png +++ b/assets/minecraft/textures/gui/sprites/recipe_book/crafting_overlay_highlighted.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b6c9219a872f50ecc8a266f1f6260d86df4d837feff3391022c1ab263e2386b3 -size 154 +oid sha256:9f9d452b0530c5e07cf7f835a94bb662b4473566e3d87bb123d49e3720c30898 +size 140 diff --git a/assets/minecraft/textures/gui/sprites/recipe_book/filter_disabled.png b/assets/minecraft/textures/gui/sprites/recipe_book/filter_disabled.png index 2684ec85..2855bf1d 100644 --- a/assets/minecraft/textures/gui/sprites/recipe_book/filter_disabled.png +++ b/assets/minecraft/textures/gui/sprites/recipe_book/filter_disabled.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5b41af5fab2f4696acaeb3277a448d298beec34c9bac7341bc1d664bcff39138 -size 221 +oid sha256:f97a7a6e5bd015a153b0590d4503ecf3d6b34e0c47b6091fb84b22fd29656a45 +size 206 diff --git a/assets/minecraft/textures/gui/sprites/recipe_book/filter_disabled_highlighted.png b/assets/minecraft/textures/gui/sprites/recipe_book/filter_disabled_highlighted.png index 37abf89e..c95325bd 100644 --- a/assets/minecraft/textures/gui/sprites/recipe_book/filter_disabled_highlighted.png +++ b/assets/minecraft/textures/gui/sprites/recipe_book/filter_disabled_highlighted.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1b97829ac66b8d0345803e302e56db704ad76cdd6bb0df911000182afe07f036 -size 226 +oid sha256:fc1eab4e798fb76f26f536fbd8d70d4887678c03739193093348b02b4b9a9fd4 +size 210 diff --git a/assets/minecraft/textures/gui/sprites/recipe_book/filter_enabled.png b/assets/minecraft/textures/gui/sprites/recipe_book/filter_enabled.png index 9bbc2ab6..0da5fe47 100644 --- a/assets/minecraft/textures/gui/sprites/recipe_book/filter_enabled.png +++ b/assets/minecraft/textures/gui/sprites/recipe_book/filter_enabled.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aac1c654aba31f3a3472ba46ce177e71c01ce44ce5929abc7fc11f94457408b7 -size 222 +oid sha256:d826e4c69ea1684df85b7374791f2cf1dc549b20bf96a9abf8deefb6e872584b +size 208 diff --git a/assets/minecraft/textures/gui/sprites/recipe_book/filter_enabled_highlighted.png b/assets/minecraft/textures/gui/sprites/recipe_book/filter_enabled_highlighted.png index f27560a9..738e48ac 100644 --- a/assets/minecraft/textures/gui/sprites/recipe_book/filter_enabled_highlighted.png +++ b/assets/minecraft/textures/gui/sprites/recipe_book/filter_enabled_highlighted.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:978fc3aae58bbbf75479f3e3a47e4a300fe2ae4cc7d5ef82df7b77bf6583391d -size 222 +oid sha256:0b2a76bdc90402c0a93035f708419c2292b48d8c057a0ff1204eba73f10a36da +size 207 diff --git a/assets/minecraft/textures/gui/sprites/recipe_book/furnace_filter_disabled.png b/assets/minecraft/textures/gui/sprites/recipe_book/furnace_filter_disabled.png index 22a2e4fb..05f210ed 100644 --- a/assets/minecraft/textures/gui/sprites/recipe_book/furnace_filter_disabled.png +++ b/assets/minecraft/textures/gui/sprites/recipe_book/furnace_filter_disabled.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d400d93939a0aedada05f10a9639269e8a1ce07a57b430c1adcbcb5a47c634b0 -size 237 +oid sha256:c523b890a6fb7083f302adb5ab69c94094649942e3f092127a6500b003eaf7da +size 225 diff --git a/assets/minecraft/textures/gui/sprites/recipe_book/furnace_filter_disabled_highlighted.png b/assets/minecraft/textures/gui/sprites/recipe_book/furnace_filter_disabled_highlighted.png index d31b47f9..6aebaa20 100644 --- a/assets/minecraft/textures/gui/sprites/recipe_book/furnace_filter_disabled_highlighted.png +++ b/assets/minecraft/textures/gui/sprites/recipe_book/furnace_filter_disabled_highlighted.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:02fe2d87d5e589cf17396064eee762dcf19a422abd53d87407c377874e63f5e9 -size 242 +oid sha256:7b91dc3b29515d5ff5cdfa13f923e51bedcc6d91294e2441e9bddf683f107c6f +size 228 diff --git a/assets/minecraft/textures/gui/sprites/recipe_book/furnace_filter_enabled.png b/assets/minecraft/textures/gui/sprites/recipe_book/furnace_filter_enabled.png index e491c760..4ed26d62 100644 --- a/assets/minecraft/textures/gui/sprites/recipe_book/furnace_filter_enabled.png +++ b/assets/minecraft/textures/gui/sprites/recipe_book/furnace_filter_enabled.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:433ae817ab3044852348995dcfc35a7cc9141b728ded2020767398cb0f0e81ff -size 243 +oid sha256:47ace25802640faf07ff87b5d85c8bbc489ed54928a9fc3af385aa83ad6222d2 +size 228 diff --git a/assets/minecraft/textures/gui/sprites/recipe_book/furnace_filter_enabled_highlighted.png b/assets/minecraft/textures/gui/sprites/recipe_book/furnace_filter_enabled_highlighted.png index 2f31e019..4f50507a 100644 --- a/assets/minecraft/textures/gui/sprites/recipe_book/furnace_filter_enabled_highlighted.png +++ b/assets/minecraft/textures/gui/sprites/recipe_book/furnace_filter_enabled_highlighted.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fdad378619fed44cdbf12b2b7e9e077864fa7d3ace43405d597073a32e1fe108 -size 244 +oid sha256:015d2f9db1e0a0e12190e514a08b1234b58bca2eb4d98eb19d39b94d0087e49b +size 228 diff --git a/assets/minecraft/textures/gui/sprites/recipe_book/furnace_overlay.png b/assets/minecraft/textures/gui/sprites/recipe_book/furnace_overlay.png index 23603622..881d7716 100644 --- a/assets/minecraft/textures/gui/sprites/recipe_book/furnace_overlay.png +++ b/assets/minecraft/textures/gui/sprites/recipe_book/furnace_overlay.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2512f4035ec5f52c1266a5468572bee659db6de7042bdd4e020067238b6052b1 -size 160 +oid sha256:3c132df5c9a0d70f666787d5bad392833bcf2217a65a4ca2fa4407498c9424ef +size 119 diff --git a/assets/minecraft/textures/gui/sprites/recipe_book/furnace_overlay_disabled.png b/assets/minecraft/textures/gui/sprites/recipe_book/furnace_overlay_disabled.png index d09ea7a9..a42c0cb5 100644 --- a/assets/minecraft/textures/gui/sprites/recipe_book/furnace_overlay_disabled.png +++ b/assets/minecraft/textures/gui/sprites/recipe_book/furnace_overlay_disabled.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:26b88957483aa22602a28da5caa39d68f1c7966a7d0a2a5e0f0a28ffaf3a98e5 -size 157 +oid sha256:23b85157490ada8f52ff6644766693da20dfea60f38e538a2c9a00114132b631 +size 135 diff --git a/assets/minecraft/textures/gui/sprites/recipe_book/furnace_overlay_disabled_highlighted.png b/assets/minecraft/textures/gui/sprites/recipe_book/furnace_overlay_disabled_highlighted.png index 2a4ed893..8cdecb6e 100644 --- a/assets/minecraft/textures/gui/sprites/recipe_book/furnace_overlay_disabled_highlighted.png +++ b/assets/minecraft/textures/gui/sprites/recipe_book/furnace_overlay_disabled_highlighted.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6cbe61f478c791cd4ef5f75473c269c19ca01a078663ca60e1b99d7753e38bba -size 157 +oid sha256:c2bcb67b1fee44916f81dfa075262c4de76ca7d0f06ff49d34f9a48324dcb2c8 +size 139 diff --git a/assets/minecraft/textures/gui/sprites/recipe_book/furnace_overlay_highlighted.png b/assets/minecraft/textures/gui/sprites/recipe_book/furnace_overlay_highlighted.png index ed88b16f..74411bba 100644 --- a/assets/minecraft/textures/gui/sprites/recipe_book/furnace_overlay_highlighted.png +++ b/assets/minecraft/textures/gui/sprites/recipe_book/furnace_overlay_highlighted.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:151afedc6740f8ea467682f821dcaac2fc85e3d36aaf835b5d50d478a991a9ab -size 157 +oid sha256:ae65ca7874f342ec77941f548fc8e10306f0cb8b97e2a9d351c064d55b4a9d79 +size 142 diff --git a/assets/minecraft/textures/gui/sprites/recipe_book/overlay_recipe.png b/assets/minecraft/textures/gui/sprites/recipe_book/overlay_recipe.png index debde6f0..1acd2c86 100644 --- a/assets/minecraft/textures/gui/sprites/recipe_book/overlay_recipe.png +++ b/assets/minecraft/textures/gui/sprites/recipe_book/overlay_recipe.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:97ba86977df504dcdf7532099e12a7f8845d94d54c4b25780b3bad2a0e5bdaca -size 152 +oid sha256:92110cf9e2b01e9af7bc7b4b8a46469905c2ca0cc09820db3339a97770506bc5 +size 122 diff --git a/assets/minecraft/textures/gui/sprites/recipe_book/page_backward.png b/assets/minecraft/textures/gui/sprites/recipe_book/page_backward.png index 3a0fccd5..a4663c4e 100644 --- a/assets/minecraft/textures/gui/sprites/recipe_book/page_backward.png +++ b/assets/minecraft/textures/gui/sprites/recipe_book/page_backward.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f7d53724e98a485189425ecb0d6632e897dfcf671e714f864d3615340ff00eb -size 159 +oid sha256:ce4ba6bdb92724b875a274a7891a0fa6dfae0ff6a4a8fdeb70073b139507746d +size 120 diff --git a/assets/minecraft/textures/gui/sprites/recipe_book/page_backward_highlighted.png b/assets/minecraft/textures/gui/sprites/recipe_book/page_backward_highlighted.png index 2505e275..cfdbb0ec 100644 --- a/assets/minecraft/textures/gui/sprites/recipe_book/page_backward_highlighted.png +++ b/assets/minecraft/textures/gui/sprites/recipe_book/page_backward_highlighted.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c42aebdc7cc28e61d143578d1a0bbdcb9b49e27faff9ccc79ccf32ba5d8481a7 -size 159 +oid sha256:a67eaa0463286e686bbb35e731c2bccf8a022289fb853e1986ddb18cddef1111 +size 149 diff --git a/assets/minecraft/textures/gui/sprites/recipe_book/page_forward.png b/assets/minecraft/textures/gui/sprites/recipe_book/page_forward.png index 83fbcab4..9873aa5c 100644 --- a/assets/minecraft/textures/gui/sprites/recipe_book/page_forward.png +++ b/assets/minecraft/textures/gui/sprites/recipe_book/page_forward.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:11eef4e53998473b372fe723002882fde3035b0e99f1ace3542528f4d57c8c1d -size 157 +oid sha256:e1f0ab65888eaf07bf6a9f0c38a39a86b2b22e85dbb88cf289098bdee8132cb9 +size 124 diff --git a/assets/minecraft/textures/gui/sprites/recipe_book/page_forward_highlighted.png b/assets/minecraft/textures/gui/sprites/recipe_book/page_forward_highlighted.png index a778c831..fe2adc9b 100644 --- a/assets/minecraft/textures/gui/sprites/recipe_book/page_forward_highlighted.png +++ b/assets/minecraft/textures/gui/sprites/recipe_book/page_forward_highlighted.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fe1af4f26df3c9afb5a29ffdb2e4d76154e11d1370e59d464e0a02f18e5a00c9 -size 159 +oid sha256:5270a3c828afefa52284c25cc00eb5c211f5ce3ac881906876461ffe407579af +size 147 diff --git a/assets/minecraft/textures/gui/sprites/recipe_book/slot_craftable.png b/assets/minecraft/textures/gui/sprites/recipe_book/slot_craftable.png index 6147f577..8c13e7ec 100644 --- a/assets/minecraft/textures/gui/sprites/recipe_book/slot_craftable.png +++ b/assets/minecraft/textures/gui/sprites/recipe_book/slot_craftable.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7f4de2a9a87374d516ae1e7f74c01a5e4386a8875ecfc9e6b257b1ba195f7fad -size 142 +oid sha256:4310b974e53d8e84a5fe760161bb53219bcc2856a57131bfaf655f10eb8907fc +size 109 diff --git a/assets/minecraft/textures/gui/sprites/recipe_book/slot_many_craftable.png b/assets/minecraft/textures/gui/sprites/recipe_book/slot_many_craftable.png index f252ee25..7475f02c 100644 --- a/assets/minecraft/textures/gui/sprites/recipe_book/slot_many_craftable.png +++ b/assets/minecraft/textures/gui/sprites/recipe_book/slot_many_craftable.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eba794e0e4ade5fb6c5960ccdfeff3d4b738c75a3a51b505f9a14ace6421d5f8 -size 139 +oid sha256:24d312620d9ad4d2ad924843310596bac87df9b5faba17e3501168920bb71526 +size 106 diff --git a/assets/minecraft/textures/gui/sprites/recipe_book/slot_many_uncraftable.png b/assets/minecraft/textures/gui/sprites/recipe_book/slot_many_uncraftable.png index 29d17be8..16238781 100644 --- a/assets/minecraft/textures/gui/sprites/recipe_book/slot_many_uncraftable.png +++ b/assets/minecraft/textures/gui/sprites/recipe_book/slot_many_uncraftable.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:52b38e8264d6e48882c1f9f92e2d021c96b2e31ae2645c6bf394fb2c52dcecd9 -size 141 +oid sha256:3a16fab5d52b59ce7ce33fac59d60ff5903403d1a16443e32f6a7ea42487905f +size 127 diff --git a/assets/minecraft/textures/gui/sprites/recipe_book/slot_uncraftable.png b/assets/minecraft/textures/gui/sprites/recipe_book/slot_uncraftable.png index 29d17be8..16238781 100644 --- a/assets/minecraft/textures/gui/sprites/recipe_book/slot_uncraftable.png +++ b/assets/minecraft/textures/gui/sprites/recipe_book/slot_uncraftable.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:52b38e8264d6e48882c1f9f92e2d021c96b2e31ae2645c6bf394fb2c52dcecd9 -size 141 +oid sha256:3a16fab5d52b59ce7ce33fac59d60ff5903403d1a16443e32f6a7ea42487905f +size 127 diff --git a/assets/minecraft/textures/gui/sprites/recipe_book/tab.png b/assets/minecraft/textures/gui/sprites/recipe_book/tab.png index 1dc77ba2..6597201c 100644 --- a/assets/minecraft/textures/gui/sprites/recipe_book/tab.png +++ b/assets/minecraft/textures/gui/sprites/recipe_book/tab.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fa84b7de42bd7bd0540ba8c37c0ae5d62757dcf271e6d94f2daae3dc7f5dca28 -size 143 +oid sha256:dfc5aa25aea88ebe81308d41cd44f8722305195e407813b78c704a86d6fb9d78 +size 111 diff --git a/assets/minecraft/textures/gui/sprites/recipe_book/tab_selected.png b/assets/minecraft/textures/gui/sprites/recipe_book/tab_selected.png index 4a7d4e5f..79fb165f 100644 --- a/assets/minecraft/textures/gui/sprites/recipe_book/tab_selected.png +++ b/assets/minecraft/textures/gui/sprites/recipe_book/tab_selected.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fe1c6207876601b3ab8081c7e2b33591e143b3f5d1e42fd255755f62f11bc9c5 -size 144 +oid sha256:3044288ef5fc8f67dc70514398d35986bfafd729e53cd75fcf9710f8472ee399 +size 111 diff --git a/assets/minecraft/textures/gui/sprites/server_list/incompatible.png b/assets/minecraft/textures/gui/sprites/server_list/incompatible.png index 74fde4e2..285c93a6 100644 --- a/assets/minecraft/textures/gui/sprites/server_list/incompatible.png +++ b/assets/minecraft/textures/gui/sprites/server_list/incompatible.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fd0c11f37addf1956d2ed5eeb84a72ee4f3b79a841d426905d6637fe7f6954fe -size 143 +oid sha256:4640519836bdcb1781ea026a26bd4f2c55e46b5f923e8069ac10d4df73289da9 +size 141 diff --git a/assets/minecraft/textures/gui/sprites/server_list/join.png b/assets/minecraft/textures/gui/sprites/server_list/join.png index 56f20317..ea2008c7 100644 --- a/assets/minecraft/textures/gui/sprites/server_list/join.png +++ b/assets/minecraft/textures/gui/sprites/server_list/join.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:64062e626a6ec2db36483b8fdf043c8eed1cb2d6af8e3d0c8aa465992cbfb9bb -size 179 +oid sha256:0f73d364bd4f887c5003f49300dd245cc106632d541d487a5425994ff2262de8 +size 133 diff --git a/assets/minecraft/textures/gui/sprites/server_list/join_highlighted.png b/assets/minecraft/textures/gui/sprites/server_list/join_highlighted.png index bc4c00d0..9d3c615c 100644 --- a/assets/minecraft/textures/gui/sprites/server_list/join_highlighted.png +++ b/assets/minecraft/textures/gui/sprites/server_list/join_highlighted.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:929c71f6ed1cfc198c888abf2429d313b7b022d163b8e306d8ba3b524daf0d7b -size 187 +oid sha256:82ceac95238932911df632a59dc8539b160b7eaee6acd3af1873b806444052ab +size 155 diff --git a/assets/minecraft/textures/gui/sprites/server_list/move_down.png b/assets/minecraft/textures/gui/sprites/server_list/move_down.png index 2aab373e..4fcd63cf 100644 --- a/assets/minecraft/textures/gui/sprites/server_list/move_down.png +++ b/assets/minecraft/textures/gui/sprites/server_list/move_down.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a680c288103fda6cb7c50207b7b771ebdf5227e99ffc520e18f0808524d2c34b -size 149 +oid sha256:190baa48157135e2b05f3cf6f3dfd2d473b411502b6781435903e5f2c87dcad5 +size 130 diff --git a/assets/minecraft/textures/gui/sprites/server_list/move_down_highlighted.png b/assets/minecraft/textures/gui/sprites/server_list/move_down_highlighted.png index fc10a38c..0e7cfc13 100644 --- a/assets/minecraft/textures/gui/sprites/server_list/move_down_highlighted.png +++ b/assets/minecraft/textures/gui/sprites/server_list/move_down_highlighted.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eab5d555fd97c18feffc85e4ca208e43bf258a6e391d144449c8ad8b970c8f17 -size 180 +oid sha256:d3d1a8fb8960dd671d560a1e25e8b589759aafdeac00288c1a8734c452ef3224 +size 138 diff --git a/assets/minecraft/textures/gui/sprites/server_list/move_up.png b/assets/minecraft/textures/gui/sprites/server_list/move_up.png index 780ec5f7..fccff0e9 100644 --- a/assets/minecraft/textures/gui/sprites/server_list/move_up.png +++ b/assets/minecraft/textures/gui/sprites/server_list/move_up.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2e13b676f3890dec1638bd0151f92aefea9746e598d245e0ef3b302987d9cb36 -size 164 +oid sha256:530da22ecd13edad658c8340f3f33d8037c5f7ba5e83dc85dec44b219608f377 +size 132 diff --git a/assets/minecraft/textures/gui/sprites/server_list/move_up_highlighted.png b/assets/minecraft/textures/gui/sprites/server_list/move_up_highlighted.png index bf62f91d..bab154db 100644 --- a/assets/minecraft/textures/gui/sprites/server_list/move_up_highlighted.png +++ b/assets/minecraft/textures/gui/sprites/server_list/move_up_highlighted.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a5833b61fe2f67c82cbb12ce60c80b07f2f6a7ad7831de84fabd0347b45bd3d1 -size 167 +oid sha256:4d27eadc9e67ac25612ff82abd989e32f29e014ae962d702dabbb2550c709d8e +size 138 diff --git a/assets/minecraft/textures/gui/sprites/server_list/ping_1.png b/assets/minecraft/textures/gui/sprites/server_list/ping_1.png index f4dce3c1..ba0a666d 100644 --- a/assets/minecraft/textures/gui/sprites/server_list/ping_1.png +++ b/assets/minecraft/textures/gui/sprites/server_list/ping_1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cf16ebf324d8406a091ab79ef5aac90ebf206885529631b4ca5f8dc33565d2bc -size 115 +oid sha256:851ee65c7987666409906797bcaf16f1c1f8c938ebf4ae2db4507878bb48862f +size 108 diff --git a/assets/minecraft/textures/gui/sprites/server_list/ping_2.png b/assets/minecraft/textures/gui/sprites/server_list/ping_2.png index b0d73c5e..6fab2fcd 100644 --- a/assets/minecraft/textures/gui/sprites/server_list/ping_2.png +++ b/assets/minecraft/textures/gui/sprites/server_list/ping_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a0a8ae2c4d169362f4509c4a9e6539b49a26723ff5bef470579a9c1db60e7d45 -size 119 +oid sha256:cd8e2ebba5d3d285dff9df3aa1317456df1f33b457ccc4370ee9d5ada6a71c36 +size 112 diff --git a/assets/minecraft/textures/gui/sprites/server_list/ping_3.png b/assets/minecraft/textures/gui/sprites/server_list/ping_3.png index 3ff6dcb9..edec2f92 100644 --- a/assets/minecraft/textures/gui/sprites/server_list/ping_3.png +++ b/assets/minecraft/textures/gui/sprites/server_list/ping_3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3d4986b310a1a750abcdd417413394d57c9a4aad757463585cbaf83d4568a2c6 -size 119 +oid sha256:e01d368b901d03169b195acd5151f898ad9a0be94746a5f0e09c6bb5ba3e041f +size 112 diff --git a/assets/minecraft/textures/gui/sprites/server_list/ping_4.png b/assets/minecraft/textures/gui/sprites/server_list/ping_4.png index 1ff26ef1..4557592a 100644 --- a/assets/minecraft/textures/gui/sprites/server_list/ping_4.png +++ b/assets/minecraft/textures/gui/sprites/server_list/ping_4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:132df1226895674d485b6d7fdd4f65fdd25706200ea7bbdf0561e2385be118b7 -size 117 +oid sha256:2c306a300b3a04a5289b6f63581c5f8ed3ade4b455761cf4cf5645c3e5ee305a +size 112 diff --git a/assets/minecraft/textures/gui/sprites/server_list/ping_5.png b/assets/minecraft/textures/gui/sprites/server_list/ping_5.png index 0b1cc9ed..7bf525d9 100644 --- a/assets/minecraft/textures/gui/sprites/server_list/ping_5.png +++ b/assets/minecraft/textures/gui/sprites/server_list/ping_5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2cf7bc87a1f04389f4dfbd376a00b64d28f7ed37f13df5d33c051137425cc1e6 -size 105 +oid sha256:714065a9c4acd0477455db96e931e0d0a41025acbffc2130b250885d5e02a436 +size 98 diff --git a/assets/minecraft/textures/gui/sprites/server_list/pinging_1.png b/assets/minecraft/textures/gui/sprites/server_list/pinging_1.png index 047d452d..a936b387 100644 --- a/assets/minecraft/textures/gui/sprites/server_list/pinging_1.png +++ b/assets/minecraft/textures/gui/sprites/server_list/pinging_1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:256c40cf69079ce4151cc7e305b7cd691e6b1e256ddf1519a9b5261693e1653f -size 115 +oid sha256:9df2d1a0a50674cdad4ad53d6258b2c7c4f9544f7478157fc13b88daf16c99ca +size 108 diff --git a/assets/minecraft/textures/gui/sprites/server_list/pinging_2.png b/assets/minecraft/textures/gui/sprites/server_list/pinging_2.png index f860d1c4..e2dc1d69 100644 --- a/assets/minecraft/textures/gui/sprites/server_list/pinging_2.png +++ b/assets/minecraft/textures/gui/sprites/server_list/pinging_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4a598781af2d6f765eb1fa0315bdacb592ebeee702c7738da09ebf3f23565c08 -size 119 +oid sha256:c5d9cc3c13455144fa21b619746185d81f1539771526d46dd1f3625f98af8c70 +size 111 diff --git a/assets/minecraft/textures/gui/sprites/server_list/pinging_3.png b/assets/minecraft/textures/gui/sprites/server_list/pinging_3.png index ec8c1eda..80e47d22 100644 --- a/assets/minecraft/textures/gui/sprites/server_list/pinging_3.png +++ b/assets/minecraft/textures/gui/sprites/server_list/pinging_3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0d1b38f8f8d8bb10e2d1bcc5dbb37ce217d25280b593d3fe8020e4867d3d7a77 -size 120 +oid sha256:c2c16e47577c5adfabecc6a7efc29c3f02aabf0c1d79c0408602959cb985a5d6 +size 113 diff --git a/assets/minecraft/textures/gui/sprites/server_list/pinging_4.png b/assets/minecraft/textures/gui/sprites/server_list/pinging_4.png index 48f5a3b4..01018b18 100644 --- a/assets/minecraft/textures/gui/sprites/server_list/pinging_4.png +++ b/assets/minecraft/textures/gui/sprites/server_list/pinging_4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6f36c4decdbe02f0a3500ce5c6216be6462c35625c48ea16f710489ad5688946 -size 121 +oid sha256:b73b9be87ffeb90e22d59578166b56eb6c3f314949b8332418bfa727d195a30b +size 116 diff --git a/assets/minecraft/textures/gui/sprites/server_list/pinging_5.png b/assets/minecraft/textures/gui/sprites/server_list/pinging_5.png index 9c719876..c4b55cbb 100644 --- a/assets/minecraft/textures/gui/sprites/server_list/pinging_5.png +++ b/assets/minecraft/textures/gui/sprites/server_list/pinging_5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7d9f58ce264bcd48119b25679b2fe76e8ab79026a0a16b8259b9261f846d4828 -size 117 +oid sha256:33d2373c118201881f9a403c7ac1ce1e99216a5c072775aa54b5884bf6cf0d93 +size 111 diff --git a/assets/minecraft/textures/gui/sprites/server_list/unreachable.png b/assets/minecraft/textures/gui/sprites/server_list/unreachable.png index 74fde4e2..285c93a6 100644 --- a/assets/minecraft/textures/gui/sprites/server_list/unreachable.png +++ b/assets/minecraft/textures/gui/sprites/server_list/unreachable.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fd0c11f37addf1956d2ed5eeb84a72ee4f3b79a841d426905d6637fe7f6954fe -size 143 +oid sha256:4640519836bdcb1781ea026a26bd4f2c55e46b5f923e8069ac10d4df73289da9 +size 141 diff --git a/assets/minecraft/textures/gui/sprites/social_interactions/background.png b/assets/minecraft/textures/gui/sprites/social_interactions/background.png index b2a3865d..6eaa8470 100644 --- a/assets/minecraft/textures/gui/sprites/social_interactions/background.png +++ b/assets/minecraft/textures/gui/sprites/social_interactions/background.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ab788b3f3a1520ea68e8a02f296d9b85bf9cc926ca7fbccbdd28d97b92ce0ca6 -size 200 +oid sha256:00b2651c657509aaf007419b781021ea3c3dc486f914549629b883df0a7eef7c +size 173 diff --git a/assets/minecraft/textures/gui/sprites/social_interactions/report_button.png b/assets/minecraft/textures/gui/sprites/social_interactions/report_button.png index f18ee487..fb83a15e 100644 --- a/assets/minecraft/textures/gui/sprites/social_interactions/report_button.png +++ b/assets/minecraft/textures/gui/sprites/social_interactions/report_button.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:265a2ade863e67d66cb2174bbbf21883b46244e084209aa89f915a2c1411df07 -size 380 +oid sha256:bbac00c5727109fa3c2ac8afe47f899c57df9dde98593a919057efc24c717f0e +size 379 diff --git a/assets/minecraft/textures/gui/sprites/social_interactions/report_button_disabled.png b/assets/minecraft/textures/gui/sprites/social_interactions/report_button_disabled.png index a4e91800..be4e76ec 100644 --- a/assets/minecraft/textures/gui/sprites/social_interactions/report_button_disabled.png +++ b/assets/minecraft/textures/gui/sprites/social_interactions/report_button_disabled.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c1921b8a8732b2ba0b9d68eeafc2163e14413abe4ae91a6657357b7049dd5ea4 -size 288 +oid sha256:f347e38fdb5bba7e26096270ad3e9b60dc87c0f69b799d0e724dcf2d3e35e619 +size 221 diff --git a/assets/minecraft/textures/gui/sprites/social_interactions/report_button_highlighted.png b/assets/minecraft/textures/gui/sprites/social_interactions/report_button_highlighted.png index 64337ed5..4922cd5f 100644 --- a/assets/minecraft/textures/gui/sprites/social_interactions/report_button_highlighted.png +++ b/assets/minecraft/textures/gui/sprites/social_interactions/report_button_highlighted.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:48c869a9293d819d491a66e9fa7fe9b25cc9b61e5728a8899af733f93ec98387 -size 379 +oid sha256:1a7be6d807fd501339103462826ffab4d1af75dfefd2d6319b86062118536b96 +size 378 diff --git a/assets/minecraft/textures/gui/sprites/spectator/close.png b/assets/minecraft/textures/gui/sprites/spectator/close.png index 4c3488dd..99cb3020 100644 --- a/assets/minecraft/textures/gui/sprites/spectator/close.png +++ b/assets/minecraft/textures/gui/sprites/spectator/close.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:26200d68dc94a93f99f0047ea3e6f92afb459f55725dd120978f5bb5d3a9104d -size 188 +oid sha256:3ae1bcd65e153ae20536032fca3872e7374b535e99220b04b04c5db8736ef999 +size 174 diff --git a/assets/minecraft/textures/gui/sprites/spectator/scroll_left.png b/assets/minecraft/textures/gui/sprites/spectator/scroll_left.png index 9bbc9b14..b2aaf956 100644 --- a/assets/minecraft/textures/gui/sprites/spectator/scroll_left.png +++ b/assets/minecraft/textures/gui/sprites/spectator/scroll_left.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:48a6c72a8b5e2f45b4698224ff68226186c428b1456a0bb8129761b098c7061c -size 120 +oid sha256:8303cec1f7c1a8f9c8eea9428ff75bbd73954b05de015a18e9d2c265edfe759d +size 113 diff --git a/assets/minecraft/textures/gui/sprites/spectator/scroll_right.png b/assets/minecraft/textures/gui/sprites/spectator/scroll_right.png index 2a056599..b33b7ece 100644 --- a/assets/minecraft/textures/gui/sprites/spectator/scroll_right.png +++ b/assets/minecraft/textures/gui/sprites/spectator/scroll_right.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d37b28319363d7da5f5b61b79c213a6269c0c3e60c18d72d77f25edf9cb34bb5 -size 119 +oid sha256:bdb9c1af524df8a7cf244a2d65c114112054ff6e48599c546e2877ed2b292ab8 +size 109 diff --git a/assets/minecraft/textures/gui/sprites/spectator/teleport_to_player.png b/assets/minecraft/textures/gui/sprites/spectator/teleport_to_player.png index 7fea60bf..57c75c9b 100644 --- a/assets/minecraft/textures/gui/sprites/spectator/teleport_to_player.png +++ b/assets/minecraft/textures/gui/sprites/spectator/teleport_to_player.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8dec8c205e9d434be9cc4c6ef2bb6ed331462656c89f4f26bd94d27a1d9cab9a -size 487 +oid sha256:415c0294741ba3b1e1320ca7801a8b32a56ad3b83c5cb6d09f036d4aedfa9204 +size 444 diff --git a/assets/minecraft/textures/gui/sprites/spectator/teleport_to_team.png b/assets/minecraft/textures/gui/sprites/spectator/teleport_to_team.png index 43d61be9..1022b59c 100644 --- a/assets/minecraft/textures/gui/sprites/spectator/teleport_to_team.png +++ b/assets/minecraft/textures/gui/sprites/spectator/teleport_to_team.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ba4d97f565d83a96fbd1355ba12871f32437e6aba335a3f2f0b1578304662e8c -size 478 +oid sha256:9cce6b6895ed41504adfcf00e380c113613c26de07accdb96b342738d8416c7b +size 447 diff --git a/assets/minecraft/textures/gui/sprites/statistics/block_mined.png b/assets/minecraft/textures/gui/sprites/statistics/block_mined.png index e70a729e..753a3f85 100644 --- a/assets/minecraft/textures/gui/sprites/statistics/block_mined.png +++ b/assets/minecraft/textures/gui/sprites/statistics/block_mined.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aaac93d820bf13cb3dfbc295a1e3e18e0509629948a4adf661f8ca3508918207 -size 180 +oid sha256:42b848bb54e6a1638a3d3aafdf00f37934786f029ffa0240865d73a6ad503c41 +size 178 diff --git a/assets/minecraft/textures/gui/sprites/statistics/header.png b/assets/minecraft/textures/gui/sprites/statistics/header.png index 3bfb5d1a..84a18417 100644 --- a/assets/minecraft/textures/gui/sprites/statistics/header.png +++ b/assets/minecraft/textures/gui/sprites/statistics/header.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:01d56ba532d1cf49824948ae806104f66700a54409c0571638dd20cf56cfaaaa -size 108 +oid sha256:086363651ec5e58fda17ab424b1740d24d7bc9ee60ed0c1153cb176f9218f279 +size 83 diff --git a/assets/minecraft/textures/gui/sprites/statistics/item_crafted.png b/assets/minecraft/textures/gui/sprites/statistics/item_crafted.png index d8fda261..548e015d 100644 --- a/assets/minecraft/textures/gui/sprites/statistics/item_crafted.png +++ b/assets/minecraft/textures/gui/sprites/statistics/item_crafted.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d044acdd346a5823c4eacbeead2a585348d31241cdf7c48ebdade3fc6c255206 -size 199 +oid sha256:104b9e76bc928aa5ab15acc63cf45b83829568c2aac1abf56b1be9ba9dfc7f4f +size 182 diff --git a/assets/minecraft/textures/gui/sprites/statistics/item_dropped.png b/assets/minecraft/textures/gui/sprites/statistics/item_dropped.png index 81252af9..ef8bdc40 100644 --- a/assets/minecraft/textures/gui/sprites/statistics/item_dropped.png +++ b/assets/minecraft/textures/gui/sprites/statistics/item_dropped.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7453f0fd76d3076ae5ee1c713033898da193593bd8006e70a8e53a80ae385797 -size 269 +oid sha256:463abbe8b2e8653775776107233971abcd599f31d60e6074f1bb7b3a7ff8ad66 +size 257 diff --git a/assets/minecraft/textures/gui/sprites/statistics/item_picked_up.png b/assets/minecraft/textures/gui/sprites/statistics/item_picked_up.png index 97ea106f..72ac1c31 100644 --- a/assets/minecraft/textures/gui/sprites/statistics/item_picked_up.png +++ b/assets/minecraft/textures/gui/sprites/statistics/item_picked_up.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2455161a0aa1ca7d0daf49de6e0e5efcc55c7061538b83e4a43fede256213ab0 -size 195 +oid sha256:673852b2ed4eda8373646672dc868f54c15b624f9a4d48ea6a4d0549c5fe5560 +size 187 diff --git a/assets/minecraft/textures/gui/sprites/statistics/item_used.png b/assets/minecraft/textures/gui/sprites/statistics/item_used.png index 06f01a12..c68b8c1f 100644 --- a/assets/minecraft/textures/gui/sprites/statistics/item_used.png +++ b/assets/minecraft/textures/gui/sprites/statistics/item_used.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:caf9f3aef911d5c327767e37848d09a2854ded24d7390d4ce9c3d14c0fd9b0d4 -size 359 +oid sha256:23aeb3068a64eb70fdbeb2d011b8c65fcd8dabf5a49852f848f347639f18b313 +size 343 diff --git a/assets/minecraft/textures/gui/sprites/statistics/sort_down.png b/assets/minecraft/textures/gui/sprites/statistics/sort_down.png index 61feceab..91f7a5b6 100644 --- a/assets/minecraft/textures/gui/sprites/statistics/sort_down.png +++ b/assets/minecraft/textures/gui/sprites/statistics/sort_down.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:81fa7d2e9da67952cc83153efa7ebb4408e0551cc1e253881364397c3ce28511 -size 144 +oid sha256:6e2b7a9d0c73feb7092694d76054f6de9032489a8957183b8b1dd1b458ef1bdc +size 102 diff --git a/assets/minecraft/textures/gui/sprites/statistics/sort_up.png b/assets/minecraft/textures/gui/sprites/statistics/sort_up.png index a8e9ff99..626e18b4 100644 --- a/assets/minecraft/textures/gui/sprites/statistics/sort_up.png +++ b/assets/minecraft/textures/gui/sprites/statistics/sort_up.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9798119120b1044afbd99b5c34e674c004980a90dee4917c85a6030b8f80bb1f -size 140 +oid sha256:c21ce210315d1c10b12ad3d720fe6f5b81f06b3772fe98b6df491789bfb54e97 +size 103 diff --git a/assets/minecraft/textures/gui/sprites/toast/mouse.png b/assets/minecraft/textures/gui/sprites/toast/mouse.png index 7e186bc6..db37f90f 100644 --- a/assets/minecraft/textures/gui/sprites/toast/mouse.png +++ b/assets/minecraft/textures/gui/sprites/toast/mouse.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fedd06dab0b59e0ba2954fdc5acf70aaf4b464f1f346d331df8ceae49d7709d4 -size 196 +oid sha256:da3f9f3f0cc8facccda56aea32e2408a4e6c71d451ab9186745a274f185e8dd9 +size 158 diff --git a/assets/minecraft/textures/gui/sprites/toast/now_playing.png b/assets/minecraft/textures/gui/sprites/toast/now_playing.png new file mode 100644 index 00000000..34e35426 --- /dev/null +++ b/assets/minecraft/textures/gui/sprites/toast/now_playing.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:62c49ad1f62995709a8980adcaeffd2b9b75d638fd8230619b764c7da81bee1c +size 158 diff --git a/assets/minecraft/textures/gui/sprites/toast/now_playing.png.mcmeta b/assets/minecraft/textures/gui/sprites/toast/now_playing.png.mcmeta new file mode 100644 index 00000000..73bde8db --- /dev/null +++ b/assets/minecraft/textures/gui/sprites/toast/now_playing.png.mcmeta @@ -0,0 +1,10 @@ +{ + "gui": { + "scaling": { + "type": "nine_slice", + "width": 160, + "height": 32, + "border": 4 + } + } +} diff --git a/assets/minecraft/textures/gui/sprites/toast/recipe_book.png b/assets/minecraft/textures/gui/sprites/toast/recipe_book.png index faf058cf..40ca4641 100644 --- a/assets/minecraft/textures/gui/sprites/toast/recipe_book.png +++ b/assets/minecraft/textures/gui/sprites/toast/recipe_book.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6591374aa8b8784cbeb003cf78ce9270e11dff9c19b0e8aaa123ab8c79a3bb80 -size 213 +oid sha256:c6bd85133131c999c0222336c41510ef7975bd3282e73d1292a4f18cfb268b92 +size 200 diff --git a/assets/minecraft/textures/gui/sprites/toast/right_click.png b/assets/minecraft/textures/gui/sprites/toast/right_click.png index 7dc7b81f..144bff65 100644 --- a/assets/minecraft/textures/gui/sprites/toast/right_click.png +++ b/assets/minecraft/textures/gui/sprites/toast/right_click.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:893a06d5345cbf43576b5a28f8d0cbe1a1d24d030c1be9ea8b7f241771d714a4 -size 206 +oid sha256:eb4614612fb448f03b6e2638c16a546da61523aab2599f4f02b39cbc34246c73 +size 190 diff --git a/assets/minecraft/textures/gui/sprites/toast/social_interactions.png b/assets/minecraft/textures/gui/sprites/toast/social_interactions.png index 3145fd0a..a66a3ab0 100644 --- a/assets/minecraft/textures/gui/sprites/toast/social_interactions.png +++ b/assets/minecraft/textures/gui/sprites/toast/social_interactions.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7fb1843cd3cb389f8a3d25ead94907d780a2dccc072990c37eb409b22fc30dcf -size 176 +oid sha256:4dd6a02f76a8580a5880b2565e48db690be350bfbd305c7db9392c7cdf948520 +size 164 diff --git a/assets/minecraft/textures/gui/sprites/tooltip/background.png b/assets/minecraft/textures/gui/sprites/tooltip/background.png index 6c5417a2..c9b46b5a 100644 --- a/assets/minecraft/textures/gui/sprites/tooltip/background.png +++ b/assets/minecraft/textures/gui/sprites/tooltip/background.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:844aa8f558db719d252114b4712ad5977d4c088e7e0df8fc9ed93706bfe4e0c4 -size 128 +oid sha256:b3b7fdcec719bd1ad2dfc655d79d61aff57aaed7065874e1e8235b32039434a4 +size 126 diff --git a/assets/minecraft/textures/gui/sprites/tooltip/frame.png b/assets/minecraft/textures/gui/sprites/tooltip/frame.png index 81395bc5..d3b84738 100644 --- a/assets/minecraft/textures/gui/sprites/tooltip/frame.png +++ b/assets/minecraft/textures/gui/sprites/tooltip/frame.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b9be0c1336e35fa59a8e5b4f01ebe2ff417f682a776c2e5560bee195e619f151 -size 592 +oid sha256:8cd60f7b1dc3f43335a8c97ee50d24f937e958ea9ba36634aae492eccd871ad5 +size 542 diff --git a/assets/minecraft/textures/gui/sprites/transferable_list/unselect.png b/assets/minecraft/textures/gui/sprites/transferable_list/unselect.png index 0145f22c..4a231cf8 100644 --- a/assets/minecraft/textures/gui/sprites/transferable_list/unselect.png +++ b/assets/minecraft/textures/gui/sprites/transferable_list/unselect.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:26acbc34ae778e503661394ce33c861d36f9d32d7ee83616b492a827614da4b5 -size 152 +oid sha256:7f6a0e77aaa95b99613f9c51fa01f225f510a92c380b6398d5023224de401bcc +size 127 diff --git a/assets/minecraft/textures/gui/sprites/widget/button_disabled.png b/assets/minecraft/textures/gui/sprites/widget/button_disabled.png index 69afcb04..5f0e2ae1 100644 --- a/assets/minecraft/textures/gui/sprites/widget/button_disabled.png +++ b/assets/minecraft/textures/gui/sprites/widget/button_disabled.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4895acd147454771fd6a61ad294dfc12e13ff15d6018da26c9fa0e884fd9c14e -size 1158 +oid sha256:19866c723b986b57300a5248f6255ceb0e464faf673f73fdcf4158da1195c250 +size 1142 diff --git a/assets/minecraft/textures/gui/sprites/widget/checkbox.png b/assets/minecraft/textures/gui/sprites/widget/checkbox.png index 5a658d88..acc9682f 100644 --- a/assets/minecraft/textures/gui/sprites/widget/checkbox.png +++ b/assets/minecraft/textures/gui/sprites/widget/checkbox.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c5e3b1c1df7b8d0f83eb2d138e5929454e03645f928bf35ae892b070a34764da -size 268 +oid sha256:122aa9b71056547c555ebf80797dcc5bfe98573e467be227475faac54c03555c +size 205 diff --git a/assets/minecraft/textures/gui/sprites/widget/checkbox_highlighted.png b/assets/minecraft/textures/gui/sprites/widget/checkbox_highlighted.png index 2443ed1c..25e6dd17 100644 --- a/assets/minecraft/textures/gui/sprites/widget/checkbox_highlighted.png +++ b/assets/minecraft/textures/gui/sprites/widget/checkbox_highlighted.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9347518e236d477e8b54e269f00eba6f41734729e3329afe3097a04d5241c1f2 -size 273 +oid sha256:a2d73ca5171d598cd7247f511a53e87a5d237cd1828103b25b8c3683a64bc025 +size 213 diff --git a/assets/minecraft/textures/gui/sprites/widget/checkbox_selected.png b/assets/minecraft/textures/gui/sprites/widget/checkbox_selected.png index 5be11a25..3e32d427 100644 --- a/assets/minecraft/textures/gui/sprites/widget/checkbox_selected.png +++ b/assets/minecraft/textures/gui/sprites/widget/checkbox_selected.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b41fa09a9086848dd2ec891161d4bb9702f123554b66ea953988c0e0952fd4d1 -size 289 +oid sha256:1c02f4aa8887cba07e27bc935837fb47b3d61503d448326d520c86588ac1261b +size 217 diff --git a/assets/minecraft/textures/gui/sprites/widget/checkbox_selected_highlighted.png b/assets/minecraft/textures/gui/sprites/widget/checkbox_selected_highlighted.png index 7f3455b2..96ba7f91 100644 --- a/assets/minecraft/textures/gui/sprites/widget/checkbox_selected_highlighted.png +++ b/assets/minecraft/textures/gui/sprites/widget/checkbox_selected_highlighted.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:43a0ced476b334e96734c0063fa129733de71a0c54abb78fae4d9f8943ec1101 -size 285 +oid sha256:90c7112d3618e00a774fcbb80c67910ecc767d64f0861a37f91c67a74f2c6269 +size 224 diff --git a/assets/minecraft/textures/gui/sprites/widget/cross_button.png b/assets/minecraft/textures/gui/sprites/widget/cross_button.png index 789f0b6e..8e8b720a 100644 --- a/assets/minecraft/textures/gui/sprites/widget/cross_button.png +++ b/assets/minecraft/textures/gui/sprites/widget/cross_button.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:16fb982ed77c2958ff4bc1cd803b3529194059f135c241fcedd11fc0937498a2 -size 146 +oid sha256:1fd65ad9a193b362dbf5f9d4d2a88f2c1a76064719143f0adce6fbc3b156cc5d +size 130 diff --git a/assets/minecraft/textures/gui/sprites/widget/cross_button_highlighted.png b/assets/minecraft/textures/gui/sprites/widget/cross_button_highlighted.png index 18bea6f2..d5f305d2 100644 --- a/assets/minecraft/textures/gui/sprites/widget/cross_button_highlighted.png +++ b/assets/minecraft/textures/gui/sprites/widget/cross_button_highlighted.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3aa295d02f175dca6bda8c0f0d10d664da626ee1fb270958fd12bb0f453aaf9b -size 146 +oid sha256:40850f76e64275f0194e3ec6a6db14e56ad315ff35755c2c1cdd4c8468c84a7e +size 142 diff --git a/assets/minecraft/textures/gui/sprites/widget/page_backward.png b/assets/minecraft/textures/gui/sprites/widget/page_backward.png index 69ec81d2..65288cb4 100644 --- a/assets/minecraft/textures/gui/sprites/widget/page_backward.png +++ b/assets/minecraft/textures/gui/sprites/widget/page_backward.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b10e336b0386e1b6943f3c6b6fc514b6f960a3389cc5dc7535217fc6ccabb6c6 -size 196 +oid sha256:2a50fd5b069a8e45966de711d4df8726dc23d9c47045436759643aaff0bf5ac6 +size 186 diff --git a/assets/minecraft/textures/gui/sprites/widget/page_backward_highlighted.png b/assets/minecraft/textures/gui/sprites/widget/page_backward_highlighted.png index 1ab638a5..5fb1a864 100644 --- a/assets/minecraft/textures/gui/sprites/widget/page_backward_highlighted.png +++ b/assets/minecraft/textures/gui/sprites/widget/page_backward_highlighted.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:837d74730e86c63d0cea138cda4c3665615c08d3ccccae13976179861f129b01 -size 212 +oid sha256:0b1d26ef3820d5de3b10f77bce3c9ef131532898b045f5d7922c4b7405c2322f +size 186 diff --git a/assets/minecraft/textures/gui/sprites/widget/page_forward.png b/assets/minecraft/textures/gui/sprites/widget/page_forward.png index 39eddb22..483aed00 100644 --- a/assets/minecraft/textures/gui/sprites/widget/page_forward.png +++ b/assets/minecraft/textures/gui/sprites/widget/page_forward.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:696a12013a94687f555f1d07feec6fa77ee32f25a77e36002538aea58f355a7b -size 196 +oid sha256:65e4965504932d04c0e332f8c660b32e217ec38539d4c07c3adb4de13eba12e2 +size 184 diff --git a/assets/minecraft/textures/gui/sprites/widget/page_forward_highlighted.png b/assets/minecraft/textures/gui/sprites/widget/page_forward_highlighted.png index c11d0b85..5bb37085 100644 --- a/assets/minecraft/textures/gui/sprites/widget/page_forward_highlighted.png +++ b/assets/minecraft/textures/gui/sprites/widget/page_forward_highlighted.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2f6564c9ae9562d46449d1207c161d57b4cb55dfdab427bd87b58c5bf6c4c86c -size 214 +oid sha256:e739e73c2d61d97b4bb6dce21bef4b2be9fc7972e91b2d2dcdd398af9f12353d +size 184 diff --git a/assets/minecraft/textures/gui/sprites/widget/scroller.png b/assets/minecraft/textures/gui/sprites/widget/scroller.png index 036dda93..f42f945f 100644 --- a/assets/minecraft/textures/gui/sprites/widget/scroller.png +++ b/assets/minecraft/textures/gui/sprites/widget/scroller.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f26b07ccfbabad7ee2338914945f8677bc1b256314961753c79eca281df55f5c -size 89 +oid sha256:597fe534e56c7028ff948a57d30ac6e9ca4073da8df1b0c51d002bdac8f24acc +size 75 diff --git a/assets/minecraft/textures/gui/sprites/widget/slider.png b/assets/minecraft/textures/gui/sprites/widget/slider.png index 69afcb04..5f0e2ae1 100644 --- a/assets/minecraft/textures/gui/sprites/widget/slider.png +++ b/assets/minecraft/textures/gui/sprites/widget/slider.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4895acd147454771fd6a61ad294dfc12e13ff15d6018da26c9fa0e884fd9c14e -size 1158 +oid sha256:19866c723b986b57300a5248f6255ceb0e464faf673f73fdcf4158da1195c250 +size 1142 diff --git a/assets/minecraft/textures/gui/sprites/widget/slider_handle.png b/assets/minecraft/textures/gui/sprites/widget/slider_handle.png index 9f16db4d..2ec53787 100644 --- a/assets/minecraft/textures/gui/sprites/widget/slider_handle.png +++ b/assets/minecraft/textures/gui/sprites/widget/slider_handle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9e9f72ccb8eb7886db92ac8e8dab1bf21ef09451bfcbafaf822fe0dafa54719d -size 242 +oid sha256:f2517ca7604176f2f6b669bf54988af811b03f66bd0369b9964d0318b064d70d +size 156 diff --git a/assets/minecraft/textures/gui/sprites/widget/slider_handle_highlighted.png b/assets/minecraft/textures/gui/sprites/widget/slider_handle_highlighted.png index 45f0412f..2dd21668 100644 --- a/assets/minecraft/textures/gui/sprites/widget/slider_handle_highlighted.png +++ b/assets/minecraft/textures/gui/sprites/widget/slider_handle_highlighted.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2cd50ead04a0bda16b782723ffc1a2469817d556b462107baf19c657e52bd1ca -size 237 +oid sha256:4993928f1426f89f540e221abef79f4086d0a57d14b663bcc008fb0c80ebde74 +size 159 diff --git a/assets/minecraft/textures/gui/sprites/widget/slot_frame.png b/assets/minecraft/textures/gui/sprites/widget/slot_frame.png index 7cfa009e..5650573b 100644 --- a/assets/minecraft/textures/gui/sprites/widget/slot_frame.png +++ b/assets/minecraft/textures/gui/sprites/widget/slot_frame.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:961410a267fd130430cb41c5c164ae05e38a3b1ce68b5e5bd75510cff15e2502 -size 788 +oid sha256:918cb908b0afaa7524f59f2276e5deb2b14b7a406a2a5930efd8de5baa250b6e +size 767 diff --git a/assets/minecraft/textures/gui/sprites/widget/tab.png b/assets/minecraft/textures/gui/sprites/widget/tab.png index ac8114f9..f45816fe 100644 --- a/assets/minecraft/textures/gui/sprites/widget/tab.png +++ b/assets/minecraft/textures/gui/sprites/widget/tab.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8af09a0fe601ff38e65f55ef643bd9201eceaf29ca34019deeaae7d8b7f80c59 -size 134 +oid sha256:d3e61e68a6849d1d9fa00de0338346f8f9e91f1ea54c8198a9eeafd7833f9688 +size 124 diff --git a/assets/minecraft/textures/gui/sprites/widget/tab_highlighted.png b/assets/minecraft/textures/gui/sprites/widget/tab_highlighted.png index 48414bdc..c6e6c8b4 100644 --- a/assets/minecraft/textures/gui/sprites/widget/tab_highlighted.png +++ b/assets/minecraft/textures/gui/sprites/widget/tab_highlighted.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ada5d0e572e91aefdd431c5a03bc110830cfedaca50ff30cbb9ca46de43721f7 -size 144 +oid sha256:a261ba6d5ab7124410698722476a83fb041655d1da77332b34e7c7ecbcda9ae9 +size 126 diff --git a/assets/minecraft/textures/gui/sprites/widget/tab_selected.png b/assets/minecraft/textures/gui/sprites/widget/tab_selected.png index 791c93d4..f137ff81 100644 --- a/assets/minecraft/textures/gui/sprites/widget/tab_selected.png +++ b/assets/minecraft/textures/gui/sprites/widget/tab_selected.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0415703f215ab71edbe7136793345f3ab76d0806d0b21569a2166378bec7ead8 -size 131 +oid sha256:179f4f8e69f7cf56bf3fafb4c5fd053fc45b26d8829451a7f2648687309a7a7e +size 127 diff --git a/assets/minecraft/textures/gui/sprites/widget/tab_selected_highlighted.png b/assets/minecraft/textures/gui/sprites/widget/tab_selected_highlighted.png index a6137dee..f6a74025 100644 --- a/assets/minecraft/textures/gui/sprites/widget/tab_selected_highlighted.png +++ b/assets/minecraft/textures/gui/sprites/widget/tab_selected_highlighted.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:108c0c5bb49c53181b3bc7545a71e93710312f102f1e26fbb9c1cf40a5b87628 -size 137 +oid sha256:8890dbbce7f85e9e8c344dad8f3c4c0882911635543c6f4686f43595819e71c9 +size 126 diff --git a/assets/minecraft/textures/gui/sprites/world_list/error.png b/assets/minecraft/textures/gui/sprites/world_list/error.png index 01a0961e..370dd7d7 100644 --- a/assets/minecraft/textures/gui/sprites/world_list/error.png +++ b/assets/minecraft/textures/gui/sprites/world_list/error.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7ed54555d3d9f13ecc848614457a92e5a95897fd5c826d1a573e3645043577cc -size 148 +oid sha256:f5aace634705175c63fe50c4a0038737a0712748453e4f5171c467ed713236aa +size 108 diff --git a/assets/minecraft/textures/gui/sprites/world_list/error_highlighted.png b/assets/minecraft/textures/gui/sprites/world_list/error_highlighted.png index 27d11bde..37d1ac9f 100644 --- a/assets/minecraft/textures/gui/sprites/world_list/error_highlighted.png +++ b/assets/minecraft/textures/gui/sprites/world_list/error_highlighted.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:44a379bf50ef7a09ea53ce0b1a7bc79022d70f7125d4dbf8e40bf5e78fc70013 -size 139 +oid sha256:2c023c338f0b62e92fce664c2a1384a1a9af5311fe7e74e2cfd18590b99aeb2c +size 127 diff --git a/assets/minecraft/textures/gui/sprites/world_list/join.png b/assets/minecraft/textures/gui/sprites/world_list/join.png index f21805d3..292f6ed1 100644 --- a/assets/minecraft/textures/gui/sprites/world_list/join.png +++ b/assets/minecraft/textures/gui/sprites/world_list/join.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8dc78f00e0245d2cdb0a4ad3b78da22e7e9923b0e203e635dbe6e984dd55d5fd -size 162 +oid sha256:35aca9a89d1139686022e28899d728e2c19af62c3885e772a6e9a9cd93430ec4 +size 133 diff --git a/assets/minecraft/textures/gui/sprites/world_list/join_highlighted.png b/assets/minecraft/textures/gui/sprites/world_list/join_highlighted.png index 5affb017..a8fde364 100644 --- a/assets/minecraft/textures/gui/sprites/world_list/join_highlighted.png +++ b/assets/minecraft/textures/gui/sprites/world_list/join_highlighted.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:54a4da2f439a7c1e8957e5a562b42a46af47044a2928168b049e7ddeb45ef889 -size 166 +oid sha256:1530c129f8bef96eae97f80513fb87f020106612a3ba3df23def5cb976d0acea +size 154 diff --git a/assets/minecraft/textures/gui/sprites/world_list/marked_join.png b/assets/minecraft/textures/gui/sprites/world_list/marked_join.png index 8507663e..ea2008c7 100644 --- a/assets/minecraft/textures/gui/sprites/world_list/marked_join.png +++ b/assets/minecraft/textures/gui/sprites/world_list/marked_join.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7ab4768f182fe1082947811b4934e0e0f7b831f29e260f106e3239f70e260f5a -size 162 +oid sha256:0f73d364bd4f887c5003f49300dd245cc106632d541d487a5425994ff2262de8 +size 133 diff --git a/assets/minecraft/textures/gui/sprites/world_list/marked_join_highlighted.png b/assets/minecraft/textures/gui/sprites/world_list/marked_join_highlighted.png index 8fb0376c..9d3c615c 100644 --- a/assets/minecraft/textures/gui/sprites/world_list/marked_join_highlighted.png +++ b/assets/minecraft/textures/gui/sprites/world_list/marked_join_highlighted.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:64e291e787a4dd538b643cb9e71321d999186c24fa9fab8590cfc422f30826ef -size 167 +oid sha256:82ceac95238932911df632a59dc8539b160b7eaee6acd3af1873b806444052ab +size 155 diff --git a/assets/minecraft/textures/gui/sprites/world_list/warning.png b/assets/minecraft/textures/gui/sprites/world_list/warning.png index d3b71b6a..370dd7d7 100644 --- a/assets/minecraft/textures/gui/sprites/world_list/warning.png +++ b/assets/minecraft/textures/gui/sprites/world_list/warning.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1edb7867851049e7ecfb7b367b3116abf5e3591a6b6872274a17d3cd77d2f357 -size 149 +oid sha256:f5aace634705175c63fe50c4a0038737a0712748453e4f5171c467ed713236aa +size 108 diff --git a/assets/minecraft/textures/gui/sprites/world_list/warning_highlighted.png b/assets/minecraft/textures/gui/sprites/world_list/warning_highlighted.png index 8e80993c..f94b759c 100644 --- a/assets/minecraft/textures/gui/sprites/world_list/warning_highlighted.png +++ b/assets/minecraft/textures/gui/sprites/world_list/warning_highlighted.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0c7dac7d47a8f4c60ec4a32ba9341fc2cb634db44a9fb599fd752466e9749322 -size 138 +oid sha256:fea98abb50112c9a34af1208dd2d0ea58c2c8605d8c1686773a6fafd254e067b +size 126 diff --git a/assets/minecraft/textures/gui/tab_header_background.png b/assets/minecraft/textures/gui/tab_header_background.png index 4630b206..0f873fa1 100644 --- a/assets/minecraft/textures/gui/tab_header_background.png +++ b/assets/minecraft/textures/gui/tab_header_background.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d4a0b7eeaec1e04eac1073d1f9aef9da4b22c96948a90ee2dd75052fa3b71425 -size 99 +oid sha256:d9ec0ce5813be6332f30b75d214f682e598bb0e9e383420b0d5f3fdcde507759 +size 71 diff --git a/assets/minecraft/textures/gui/title/edition.png b/assets/minecraft/textures/gui/title/edition.png index 82058153..cd4a435c 100644 --- a/assets/minecraft/textures/gui/title/edition.png +++ b/assets/minecraft/textures/gui/title/edition.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6d31f07c305a4e7e418fa758c368f1adfd0cc58f205ae9b3685bd4149be27273 -size 10797 +oid sha256:c3ae995bb9fab322cfe1a3432ce9085a931ae25ddb4fd3475ea3840f75909c98 +size 10775 diff --git a/assets/minecraft/textures/gui/title/edition.png.mcmeta b/assets/minecraft/textures/gui/title/edition.png.mcmeta deleted file mode 100644 index e38a5ad3..00000000 --- a/assets/minecraft/textures/gui/title/edition.png.mcmeta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "texture": { - "blur": true - } -} diff --git a/assets/minecraft/textures/gui/title/minceraft.png.mcmeta b/assets/minecraft/textures/gui/title/minceraft.png.mcmeta deleted file mode 100644 index e38a5ad3..00000000 --- a/assets/minecraft/textures/gui/title/minceraft.png.mcmeta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "texture": { - "blur": true - } -} diff --git a/assets/minecraft/textures/gui/title/minecraft.png.mcmeta b/assets/minecraft/textures/gui/title/minecraft.png.mcmeta deleted file mode 100644 index e38a5ad3..00000000 --- a/assets/minecraft/textures/gui/title/minecraft.png.mcmeta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "texture": { - "blur": true - } -} diff --git a/assets/minecraft/textures/gui/title/realms.png.mcmeta b/assets/minecraft/textures/gui/title/realms.png.mcmeta deleted file mode 100644 index e38a5ad3..00000000 --- a/assets/minecraft/textures/gui/title/realms.png.mcmeta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "texture": { - "blur": true - } -} diff --git a/assets/minecraft/textures/item/acacia_boat.png b/assets/minecraft/textures/item/acacia_boat.png index 38d6c703..c664f571 100644 --- a/assets/minecraft/textures/item/acacia_boat.png +++ b/assets/minecraft/textures/item/acacia_boat.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3525abfa30b50a63f13bfca5d06fb580557bdc6c737528bd37c89d70cb3155ba -size 316 +oid sha256:c056cc31a461403171b46796a62e457b324f53a6ca4ed915c15cc77bbca71165 +size 215 diff --git a/assets/minecraft/textures/item/acacia_chest_boat.png b/assets/minecraft/textures/item/acacia_chest_boat.png index 0278753f..0c2525eb 100644 --- a/assets/minecraft/textures/item/acacia_chest_boat.png +++ b/assets/minecraft/textures/item/acacia_chest_boat.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a6edca2fa5af032a2ad086f051254db946766746cb218dbb4b1351e60a89cbfd -size 357 +oid sha256:72f2ad968d96ef79f9f63dbd77ee65dc8e90a3fc011e1ec649f5efacfde2e976 +size 260 diff --git a/assets/minecraft/textures/item/acacia_door.png b/assets/minecraft/textures/item/acacia_door.png index c0de3bab..a13b7648 100644 --- a/assets/minecraft/textures/item/acacia_door.png +++ b/assets/minecraft/textures/item/acacia_door.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3485712a108b504685662d1e6c7208a865f3cd8497b9c2d66939d62de78fb76c -size 135 +oid sha256:abf4483d5ec9957a2f9d4be71b436ff903f1c08810b28333309be1318d49cdb5 +size 118 diff --git a/assets/minecraft/textures/item/acacia_hanging_sign.png b/assets/minecraft/textures/item/acacia_hanging_sign.png index 7befe030..e0087632 100644 --- a/assets/minecraft/textures/item/acacia_hanging_sign.png +++ b/assets/minecraft/textures/item/acacia_hanging_sign.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b2b7009e21e88cb314b3ad20e6bdf309936aad5468f0d7c838da4ae18ff9cfa2 -size 227 +oid sha256:3e42fac03e3816203dabff58108ae9e3a6d4b200d74d2b51d727bec6a6b33ab1 +size 214 diff --git a/assets/minecraft/textures/item/allay_spawn_egg.png b/assets/minecraft/textures/item/allay_spawn_egg.png index b5e468b2..716fc857 100644 --- a/assets/minecraft/textures/item/allay_spawn_egg.png +++ b/assets/minecraft/textures/item/allay_spawn_egg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f4534adf0c917e2542c56a10315e10eb77e3362a95700858b445278392e9b532 -size 237 +oid sha256:81003c07bee6a9fc6019c6a3004c6727cbaa7cf7febdebda3a86a2e46634ec51 +size 220 diff --git a/assets/minecraft/textures/item/amethyst_shard.png b/assets/minecraft/textures/item/amethyst_shard.png index 9c90ccde..5d9dd814 100644 --- a/assets/minecraft/textures/item/amethyst_shard.png +++ b/assets/minecraft/textures/item/amethyst_shard.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:24fa75f6b75202d890019ec7a901d525918cfacd3e8c0e6cb0580c7b7933b363 -size 184 +oid sha256:dc64feb12d553ec59b819534ae57b46e99ac95a3ab61cb71de317a5d7b857584 +size 183 diff --git a/assets/minecraft/textures/item/angler_pottery_sherd.png b/assets/minecraft/textures/item/angler_pottery_sherd.png index d4f4acb3..1672ba45 100644 --- a/assets/minecraft/textures/item/angler_pottery_sherd.png +++ b/assets/minecraft/textures/item/angler_pottery_sherd.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5a0f40b7d8ffd6dbc65c4c5c9b1cfef148db253c5c5a7cad43183ade4abf386f -size 219 +oid sha256:202ed76580d7f743f6e77ac8199b3622e9c7a49d0f869a72d0109adc2b0a7407 +size 205 diff --git a/assets/minecraft/textures/item/apple.png b/assets/minecraft/textures/item/apple.png index e309652a..3a74591a 100644 --- a/assets/minecraft/textures/item/apple.png +++ b/assets/minecraft/textures/item/apple.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9b1aef1aaa41229dbe2bc97657b8650527b14cc20a6236e823f1682c4d44c5a2 -size 207 +oid sha256:e6a57182db6029fff6d02fc774780fcec9f506b74226985445c91e5e7df5d9bb +size 203 diff --git a/assets/minecraft/textures/item/archer_pottery_sherd.png b/assets/minecraft/textures/item/archer_pottery_sherd.png index 6da893d9..83691422 100644 --- a/assets/minecraft/textures/item/archer_pottery_sherd.png +++ b/assets/minecraft/textures/item/archer_pottery_sherd.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5515e81c9d45ac1bbba2f8742ee1bbe9f186ea0203f39e857f28f6ea871811b7 -size 220 +oid sha256:f212436b4674f964b55a84be901d85a85da29de86c9cd539646c6ea049fb7607 +size 204 diff --git a/assets/minecraft/textures/item/armor_stand.png b/assets/minecraft/textures/item/armor_stand.png index af9e5ecb..26a403e3 100644 --- a/assets/minecraft/textures/item/armor_stand.png +++ b/assets/minecraft/textures/item/armor_stand.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:26951d80bfbbdd1a7e232056832955adf8a2465982515a91e9510436705308de -size 188 +oid sha256:54d95c69cf2bb9e566c6a013c8258bd44e998de5d0578fc79acb8d16b38b1c8a +size 184 diff --git a/assets/minecraft/textures/item/arms_up_pottery_sherd.png b/assets/minecraft/textures/item/arms_up_pottery_sherd.png index f64153b8..bfe760d7 100644 --- a/assets/minecraft/textures/item/arms_up_pottery_sherd.png +++ b/assets/minecraft/textures/item/arms_up_pottery_sherd.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c3f2237e0951a7c68a9e4de796f473e512c5e5b8458f51ccb37a1108faca7284 -size 219 +oid sha256:19e2e7456da4fb3f5d9b98584916773418a1be3d1e8928617b9515e46c91d62b +size 206 diff --git a/assets/minecraft/textures/item/arrow.png b/assets/minecraft/textures/item/arrow.png index c6d1cb7b..4706fd95 100644 --- a/assets/minecraft/textures/item/arrow.png +++ b/assets/minecraft/textures/item/arrow.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9dfc345c4ae71a7bab003d3d15f420376910162a000a99832e9ca63a51bc85dd -size 148 +oid sha256:fe76b2e0c79e09ddd037111cfc1d0510e1e13f2c2ff71bbf23e9c48b98d9030c +size 145 diff --git a/assets/minecraft/textures/item/axolotl_spawn_egg.png b/assets/minecraft/textures/item/axolotl_spawn_egg.png index 04def43f..66596438 100644 --- a/assets/minecraft/textures/item/axolotl_spawn_egg.png +++ b/assets/minecraft/textures/item/axolotl_spawn_egg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a643dfe68e94abe248a3e85625d3326cdf498c1cf90090fb2bec4106d6ce4185 -size 208 +oid sha256:74978ed5294b16c7f81b3892bb69bea665831b6b80f37018eb38600d91fa3010 +size 200 diff --git a/assets/minecraft/textures/item/baked_potato.png b/assets/minecraft/textures/item/baked_potato.png index 9d39d6f0..c02586c0 100644 --- a/assets/minecraft/textures/item/baked_potato.png +++ b/assets/minecraft/textures/item/baked_potato.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4e6d249c28c5cabbf056adbc6cba072488b0be27c502186e55b4c507d7672233 -size 207 +oid sha256:86733249e16a46d804270ce27b88f60270513e70e65336a3e59fa1fd5a12e275 +size 205 diff --git a/assets/minecraft/textures/item/bamboo.png b/assets/minecraft/textures/item/bamboo.png index f81791c0..6de481fa 100644 --- a/assets/minecraft/textures/item/bamboo.png +++ b/assets/minecraft/textures/item/bamboo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5ad5fd1000276bc88dfff9a7b0b5edc142654e040d7da49e394b1a7ffed2a6e5 -size 203 +oid sha256:83252d1d0dbe5ac3912cd8be5add648dd0fa8ecddfb666f094dbf7fd03b8d055 +size 166 diff --git a/assets/minecraft/textures/item/bamboo_door.png b/assets/minecraft/textures/item/bamboo_door.png index 7e0e9318..b81ecdb8 100644 --- a/assets/minecraft/textures/item/bamboo_door.png +++ b/assets/minecraft/textures/item/bamboo_door.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:560d8dcec322eac348274a5420218ef038e0f5a4efea3246b1ac77d9d9a48c05 -size 218 +oid sha256:da38c41a61c5241de7e1390efa4cb74cd3e2905ac7bdc18ef4ef6c2e723e2b53 +size 214 diff --git a/assets/minecraft/textures/item/bamboo_hanging_sign.png b/assets/minecraft/textures/item/bamboo_hanging_sign.png index c2b07688..9e8908dd 100644 --- a/assets/minecraft/textures/item/bamboo_hanging_sign.png +++ b/assets/minecraft/textures/item/bamboo_hanging_sign.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c21d83f9425409f317c32576f9e9d930de3e0071f9dc7ffe752589402c00cbd3 -size 248 +oid sha256:8840ec9ca17aeb38eb35beb18f9b442468fe685dccb287852a83002f2fd25620 +size 238 diff --git a/assets/minecraft/textures/item/bamboo_sign.png b/assets/minecraft/textures/item/bamboo_sign.png index a370a2e9..c4965bc5 100644 --- a/assets/minecraft/textures/item/bamboo_sign.png +++ b/assets/minecraft/textures/item/bamboo_sign.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:22f270d7a51dc23326d9f7d626150ee6b3ee049c4cc7b964bd34d88b13393874 -size 223 +oid sha256:13f0c116e296be4e5307c11d14ce4ce9a34941e6511ee3ae267002ddfa55feb5 +size 222 diff --git a/assets/minecraft/textures/item/barrier.png b/assets/minecraft/textures/item/barrier.png index c554cec0..661a6dc4 100644 --- a/assets/minecraft/textures/item/barrier.png +++ b/assets/minecraft/textures/item/barrier.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e6f1c3f50634b55c0c91ad5d685c0aaf47a1b0811c7f8feb13ec656caebc1929 -size 157 +oid sha256:8bb6746dd101a2707889dfbb7eec835b5db85620ef09d860129f2a9be18bd686 +size 149 diff --git a/assets/minecraft/textures/item/bat_spawn_egg.png b/assets/minecraft/textures/item/bat_spawn_egg.png index cbfdba47..32922a28 100644 --- a/assets/minecraft/textures/item/bat_spawn_egg.png +++ b/assets/minecraft/textures/item/bat_spawn_egg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:77de7634170e355513940358ccb6ae56a3866ff85a8476d7539082a8c6854d53 -size 231 +oid sha256:91010312974505425a7448a9533af2c273aa49976a838f983239e15d9000caa0 +size 224 diff --git a/assets/minecraft/textures/item/bee_spawn_egg.png b/assets/minecraft/textures/item/bee_spawn_egg.png index 25019e4d..3c3bc64c 100644 --- a/assets/minecraft/textures/item/bee_spawn_egg.png +++ b/assets/minecraft/textures/item/bee_spawn_egg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:98adc405bbddfdf313fc464010163e20fac69805df7f8990893a624b8858a08b -size 223 +oid sha256:743d789e3d979f057ab6c4e3058f570ca5533fb51e8a2ee495d87839023c03fd +size 221 diff --git a/assets/minecraft/textures/item/beef.png b/assets/minecraft/textures/item/beef.png index d4905192..fb61def3 100644 --- a/assets/minecraft/textures/item/beef.png +++ b/assets/minecraft/textures/item/beef.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:98f27d8f378ac36b9d9f4d738106d9e4864f2faad5a2122270372e5b177a7241 -size 196 +oid sha256:deea9f36cc1171007ab69e928daea66582dfc5051de7ccd2e181af25285c45da +size 195 diff --git a/assets/minecraft/textures/item/birch_boat.png b/assets/minecraft/textures/item/birch_boat.png index 9f2a0e4e..65c52557 100644 --- a/assets/minecraft/textures/item/birch_boat.png +++ b/assets/minecraft/textures/item/birch_boat.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2dcea361b321691db0a60158274c9b863bff781107ec5466971ec804e1cdd9cb -size 323 +oid sha256:216b5f17363ee4680c5a49c6e3fa5dcee889eab8121cd2231ad94b6da2ca8b83 +size 215 diff --git a/assets/minecraft/textures/item/birch_chest_boat.png b/assets/minecraft/textures/item/birch_chest_boat.png index 64e853dc..fec27d45 100644 --- a/assets/minecraft/textures/item/birch_chest_boat.png +++ b/assets/minecraft/textures/item/birch_chest_boat.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5743b1ed6d866570a2ab1fc881870700428dbd2cb2e3a16a86e3b7d03a6c9a0d -size 365 +oid sha256:c4dfefab5f3f974d1a5cb19852a6eb898c751fa7c668441dd763c50c968a665f +size 260 diff --git a/assets/minecraft/textures/item/birch_door.png b/assets/minecraft/textures/item/birch_door.png index aed40a23..645ceacd 100644 --- a/assets/minecraft/textures/item/birch_door.png +++ b/assets/minecraft/textures/item/birch_door.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d1783183b481b7fcf47abbac0d007d26f47c40893465e4f17a5d65a75d2e61a9 -size 161 +oid sha256:2f0f94d2d726708c2c08c7ca0351a26d3a23efe5b98903d9b9ef9ccaee4458be +size 148 diff --git a/assets/minecraft/textures/item/birch_hanging_sign.png b/assets/minecraft/textures/item/birch_hanging_sign.png index c5c208e0..5bd02eff 100644 --- a/assets/minecraft/textures/item/birch_hanging_sign.png +++ b/assets/minecraft/textures/item/birch_hanging_sign.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:151b7f78e9bae0a2ce3214add23ed536e9c170a3556debfb9b93bcb295f6df81 -size 229 +oid sha256:2462faf53b3d883809675d28c2b51f1498c22fcc28451ea66d4d29444a7643cb +size 216 diff --git a/assets/minecraft/textures/item/birch_sign.png b/assets/minecraft/textures/item/birch_sign.png index 04c0ee7b..aab3ce0b 100644 --- a/assets/minecraft/textures/item/birch_sign.png +++ b/assets/minecraft/textures/item/birch_sign.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:05912dd398f62f405f9f2e80e7b8bfe9d8cf053ab6d87645cd1df82948938e2d -size 217 +oid sha256:4c36e1538deddb2307942d2fe11ed68dbb97d2e1bd56fb4b7dd26048726fee6e +size 215 diff --git a/assets/minecraft/textures/item/black_bundle.png b/assets/minecraft/textures/item/black_bundle.png index 340acbf1..cb88a7f3 100644 --- a/assets/minecraft/textures/item/black_bundle.png +++ b/assets/minecraft/textures/item/black_bundle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef3ddfb9fff7659e911d2ae08507f0f375952c5c2f35eafad24ebb61e66f01ec -size 206 +oid sha256:3eb2db9f6c4bb86fe1ac302e675f21818495677ae2d0fad3a1e63b195e4ef3bb +size 203 diff --git a/assets/minecraft/textures/item/black_bundle_open_back.png b/assets/minecraft/textures/item/black_bundle_open_back.png index 1ca1c9e8..d26bdf5f 100644 --- a/assets/minecraft/textures/item/black_bundle_open_back.png +++ b/assets/minecraft/textures/item/black_bundle_open_back.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:41457dcdf16b33e60a2fabbd44e5204f696c4b154d57d56297e6a65d8b38f338 -size 152 +oid sha256:997022501784acf7fce0bb51f665775e4007a6b09418d6b2afbaee2682d54e98 +size 138 diff --git a/assets/minecraft/textures/item/black_bundle_open_front.png b/assets/minecraft/textures/item/black_bundle_open_front.png index 931b56e9..7f816678 100644 --- a/assets/minecraft/textures/item/black_bundle_open_front.png +++ b/assets/minecraft/textures/item/black_bundle_open_front.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ae590e3c3bd621f55b6a8ca24ee6fc62f974ee385e1460fe1bd8b43bac8ecccf -size 191 +oid sha256:09d1dbb7df7c8307ccd349a757d91524f59cee632dca40555f6b0fd7a5559a49 +size 190 diff --git a/assets/minecraft/textures/item/black_candle.png b/assets/minecraft/textures/item/black_candle.png index 0c33cf85..53edd453 100644 --- a/assets/minecraft/textures/item/black_candle.png +++ b/assets/minecraft/textures/item/black_candle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ac5f0c3dac32c69ce253f14ec6ab7e4637fc35d858f55afd48ed3668ecf21f9e -size 183 +oid sha256:fb59735a021e6fb91f5899bb361f3165c48614a76bb239cc03b4a335f4fe75f6 +size 179 diff --git a/assets/minecraft/textures/item/black_dye.png b/assets/minecraft/textures/item/black_dye.png index 37b2a4da..28c20edf 100644 --- a/assets/minecraft/textures/item/black_dye.png +++ b/assets/minecraft/textures/item/black_dye.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8e393b186cccb6c2925ff5d9ca390dcad66d40c7a63807840c4600b7838d3268 -size 174 +oid sha256:38e08a746759f4eef8afdd302944fab634ec3d93004d0eb5598ffdc3d0106997 +size 170 diff --git a/assets/minecraft/textures/item/black_harness.png b/assets/minecraft/textures/item/black_harness.png new file mode 100644 index 00000000..cf547b3c --- /dev/null +++ b/assets/minecraft/textures/item/black_harness.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6c0b8406e27682559f1369d78f3d1b5798a110854fca82063d04fb57ec8a090d +size 254 diff --git a/assets/minecraft/textures/item/blade_pottery_sherd.png b/assets/minecraft/textures/item/blade_pottery_sherd.png index b20369b0..4bbca3ab 100644 --- a/assets/minecraft/textures/item/blade_pottery_sherd.png +++ b/assets/minecraft/textures/item/blade_pottery_sherd.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f9a296a5ae19f12ba3cb5988ca7ec4815d27d090eb022890d703caacd1d9714e -size 218 +oid sha256:2cabf98660e173d155a62052f974f5f153fffb5db4d96d0bb32c1bcfc1d51b65 +size 201 diff --git a/assets/minecraft/textures/item/blaze_powder.png b/assets/minecraft/textures/item/blaze_powder.png index 70f2b73d..77ecfdc2 100644 --- a/assets/minecraft/textures/item/blaze_powder.png +++ b/assets/minecraft/textures/item/blaze_powder.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:be1d8c93bbff955c94c194bb944b200d884d30fcc7e221fff739881d6ed5eca2 -size 278 +oid sha256:b2be09a066cf44cb126744fc25625fba75d3c3c33893c80cda4303ea9e432e7b +size 262 diff --git a/assets/minecraft/textures/item/blaze_rod.png b/assets/minecraft/textures/item/blaze_rod.png index 7fc48ade..95ea6908 100644 --- a/assets/minecraft/textures/item/blaze_rod.png +++ b/assets/minecraft/textures/item/blaze_rod.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d402755c56b25d84ce73ba1f064252844b2ee9b2f6e3d17566450687a26d9c81 -size 168 +oid sha256:c00637afed86e5ea5273e7591abe285ef493949860915b645f52123e7c935f52 +size 167 diff --git a/assets/minecraft/textures/item/blaze_spawn_egg.png b/assets/minecraft/textures/item/blaze_spawn_egg.png index 4fb409ea..38cdcc20 100644 --- a/assets/minecraft/textures/item/blaze_spawn_egg.png +++ b/assets/minecraft/textures/item/blaze_spawn_egg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6b58eea7f036473fb503bf5645bcd562b2cd4e10367080aca3fb4f97ba3c6604 -size 248 +oid sha256:4a0fd167c25057cafad876332fb5ab42c6ce113bb228d0e1cfee72c59a580bc9 +size 227 diff --git a/assets/minecraft/textures/item/blue_bundle.png b/assets/minecraft/textures/item/blue_bundle.png index 05db8589..34b9cd89 100644 --- a/assets/minecraft/textures/item/blue_bundle.png +++ b/assets/minecraft/textures/item/blue_bundle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:36cedd32aff0de7f2e0a6a19d4776fa4e977a9adeefe1d247273f477759d9c5c -size 206 +oid sha256:7865989ea201e23d9175a6b3b86c33704bd03bb48897c5d8fe3bd685090e48cd +size 203 diff --git a/assets/minecraft/textures/item/blue_bundle_open_back.png b/assets/minecraft/textures/item/blue_bundle_open_back.png index 8c0496c1..601b11f0 100644 --- a/assets/minecraft/textures/item/blue_bundle_open_back.png +++ b/assets/minecraft/textures/item/blue_bundle_open_back.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:31c41d76bf47cb1771b6a54ef6e3e0ad0892fdee8b2292bf8214de9667e03948 -size 152 +oid sha256:1ea06a75860d308568df992c9bb6fd4555a3192a02ece203829f5554b535886f +size 139 diff --git a/assets/minecraft/textures/item/blue_bundle_open_front.png b/assets/minecraft/textures/item/blue_bundle_open_front.png index 5a455683..7ed07fc2 100644 --- a/assets/minecraft/textures/item/blue_bundle_open_front.png +++ b/assets/minecraft/textures/item/blue_bundle_open_front.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dbf0b75202fa0748bd6e0a3f53a5a07d37bc9f20b8b72ad747c48ed3e68dc7f3 -size 191 +oid sha256:5e712d018c0578b5417ffaa9f4b1b4e055576be53c8e63c087e4cdd94f54eb78 +size 190 diff --git a/assets/minecraft/textures/item/blue_candle.png b/assets/minecraft/textures/item/blue_candle.png index 942a1865..b81d7b5f 100644 --- a/assets/minecraft/textures/item/blue_candle.png +++ b/assets/minecraft/textures/item/blue_candle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e2f724365d93e64129e903795552527df2ca90f3b8fe094d0d81160b91624da0 -size 183 +oid sha256:8150054b5029f02151fadf4d59f0f895fe1bd2f19834c5d85e30b6960bc7cf16 +size 179 diff --git a/assets/minecraft/textures/item/blue_egg.png b/assets/minecraft/textures/item/blue_egg.png index bb9a6b1f..02fd0b5d 100644 --- a/assets/minecraft/textures/item/blue_egg.png +++ b/assets/minecraft/textures/item/blue_egg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:513e1b9d7e57d9ffdd0a053f3ccf617dc9cab0dbd2f4956a83ba81b118b4dfcb -size 176 +oid sha256:a80bfa8c909172659b32557fdb539d81eb717ba5f5fdce69dd758465d221f955 +size 171 diff --git a/assets/minecraft/textures/item/blue_harness.png b/assets/minecraft/textures/item/blue_harness.png new file mode 100644 index 00000000..22b3a7f1 --- /dev/null +++ b/assets/minecraft/textures/item/blue_harness.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:288444d40118dd1a6f9c150dd32309c08de502071ef916e457d1e7a0252594e9 +size 254 diff --git a/assets/minecraft/textures/item/bolt_armor_trim_smithing_template.png b/assets/minecraft/textures/item/bolt_armor_trim_smithing_template.png index ded4cdcf..072ddbc4 100644 --- a/assets/minecraft/textures/item/bolt_armor_trim_smithing_template.png +++ b/assets/minecraft/textures/item/bolt_armor_trim_smithing_template.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f7ce45de2cd328299f046318d7d17b3d434ae5de3a4646c0c3fc7796931dc392 -size 240 +oid sha256:3be9d06528ecac6ca211895a0a06225bcd8dd9e144f443b8d8906751fade31b8 +size 225 diff --git a/assets/minecraft/textures/item/bone.png b/assets/minecraft/textures/item/bone.png index 4180ebeb..357e3187 100644 --- a/assets/minecraft/textures/item/bone.png +++ b/assets/minecraft/textures/item/bone.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f5f2a37e7466f2983c00550874a2a94d2d006eae52b0e73acb722fadeb9bdb3b -size 164 +oid sha256:acc1fb127f3f1139e51e748ee8b259eebac8f1ad369b33bd9643246ee96ae62d +size 159 diff --git a/assets/minecraft/textures/item/bone_meal.png b/assets/minecraft/textures/item/bone_meal.png index 117310f2..040b10ef 100644 --- a/assets/minecraft/textures/item/bone_meal.png +++ b/assets/minecraft/textures/item/bone_meal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:368d1923a31d7488a6ab84a3a081bb69d4eff76aefa06b4c0c2fa6502b8d809f -size 212 +oid sha256:4e21db8e08b29e36e3cdd950bd5eb2901fabadc1f6d0b976a96e569660ba8fa2 +size 198 diff --git a/assets/minecraft/textures/item/book.png b/assets/minecraft/textures/item/book.png index f6abfce2..c837bf98 100644 --- a/assets/minecraft/textures/item/book.png +++ b/assets/minecraft/textures/item/book.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e9f710d62e16776df7e5bf05dcaa187d40cc1428f4fd18644e3ff67062f9fff2 -size 203 +oid sha256:8b851a52e2a5d81fa925774f0df30040bc86411c8c86d3d69495486adcd2a046 +size 198 diff --git a/assets/minecraft/textures/item/bordure_indented_banner_pattern.png b/assets/minecraft/textures/item/bordure_indented_banner_pattern.png index 168a9851..06f54353 100644 --- a/assets/minecraft/textures/item/bordure_indented_banner_pattern.png +++ b/assets/minecraft/textures/item/bordure_indented_banner_pattern.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0c3000745e674c0b85462a176fcdfdd7fb4313828bd2716f8ab6b8cebe72bcc9 -size 205 +oid sha256:f4e1f47265b8bd9bb8377eff22b4734bd3da4310266c365853a12bac2ea14567 +size 194 diff --git a/assets/minecraft/textures/item/bow.png b/assets/minecraft/textures/item/bow.png index 407003a3..1731c77f 100644 --- a/assets/minecraft/textures/item/bow.png +++ b/assets/minecraft/textures/item/bow.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6f62b5a5eac576af20f1ddd79e69df37b19a036691aa26b7523753f995e3dd8d -size 163 +oid sha256:1e2cb18545e4ed9286e1120686c3f835d6619b8bd853970f1011163b68426a54 +size 160 diff --git a/assets/minecraft/textures/item/bow_pulling_0.png b/assets/minecraft/textures/item/bow_pulling_0.png index 5353701a..8225c269 100644 --- a/assets/minecraft/textures/item/bow_pulling_0.png +++ b/assets/minecraft/textures/item/bow_pulling_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2b74f847291e4faf72b584d56347d77fca6cb0aa538b3a36d3e426caee656e85 -size 209 +oid sha256:6ddd0fa3bccd38fd6d6cae5139354f2371b942a6e6d5131182a60cc07a4cc9aa +size 198 diff --git a/assets/minecraft/textures/item/bow_pulling_1.png b/assets/minecraft/textures/item/bow_pulling_1.png index 17c098ff..354d0266 100644 --- a/assets/minecraft/textures/item/bow_pulling_1.png +++ b/assets/minecraft/textures/item/bow_pulling_1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:503a22646cda89117bc881cd75b9d14124eb37d12813ebd1a2e71ff53ff60828 -size 209 +oid sha256:0e791b2a6dbda98be5309dd97efcef2f111b426eaf06080411f5ed18cc42f6d6 +size 202 diff --git a/assets/minecraft/textures/item/bow_pulling_2.png b/assets/minecraft/textures/item/bow_pulling_2.png index b61f08f4..d6cdb3f3 100644 --- a/assets/minecraft/textures/item/bow_pulling_2.png +++ b/assets/minecraft/textures/item/bow_pulling_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:778090baec36ae4eb2071b0eab425c18f0ded8316b23100842b7c818119d93ea -size 203 +oid sha256:4c1c286346283a7422b9da30473da7bb71434cb190dd351daa9eb121275b3bb4 +size 197 diff --git a/assets/minecraft/textures/item/bread.png b/assets/minecraft/textures/item/bread.png index cf9b5b69..dc8276df 100644 --- a/assets/minecraft/textures/item/bread.png +++ b/assets/minecraft/textures/item/bread.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e0e4a9fcb8bd4b85820ee3aa7ea83b66f08687cd907a8d38cc98281b41fac1d -size 201 +oid sha256:eba8a9967e4dd84247f01f630b9817efcf25f7b203a6b81a1b4bf42164a06f7a +size 190 diff --git a/assets/minecraft/textures/item/breeze_rod.png b/assets/minecraft/textures/item/breeze_rod.png index c6c8650b..184aee9d 100644 --- a/assets/minecraft/textures/item/breeze_rod.png +++ b/assets/minecraft/textures/item/breeze_rod.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8277c1fd201f30a69f8bb3529d6077ce8132fe2d8e5063de9063f0b91d431162 -size 163 +oid sha256:8f4c69b812818b3364fa61cfda9659faf4395c20291cb8593f0da60ed7daecec +size 145 diff --git a/assets/minecraft/textures/item/breeze_spawn_egg.png b/assets/minecraft/textures/item/breeze_spawn_egg.png index 28db48ad..35c2d836 100644 --- a/assets/minecraft/textures/item/breeze_spawn_egg.png +++ b/assets/minecraft/textures/item/breeze_spawn_egg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0bcdca3c772bbaf014e26813017a940666456b4037d39c11a7921bb8f4d0d803 -size 250 +oid sha256:5a8bd74d6932fca4d10fb87a7ac95e20c63e26824c3aff8b2ac14bee1b64637a +size 243 diff --git a/assets/minecraft/textures/item/brewer_pottery_sherd.png b/assets/minecraft/textures/item/brewer_pottery_sherd.png index c1bc908c..4d1d5eab 100644 --- a/assets/minecraft/textures/item/brewer_pottery_sherd.png +++ b/assets/minecraft/textures/item/brewer_pottery_sherd.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e724686a564a7c733b69d5d7cbe1ed3b3caf24ee14f0ccecafaf24a6e0ef2422 -size 219 +oid sha256:b04e557dd87e625dc0ce455421f3585370fe4347be47c00b54e5b1ad19988a1c +size 204 diff --git a/assets/minecraft/textures/item/brick.png b/assets/minecraft/textures/item/brick.png index d248644c..945139fd 100644 --- a/assets/minecraft/textures/item/brick.png +++ b/assets/minecraft/textures/item/brick.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0c052c23230ff95ec48959b3ee23e88d9b95b04fd4f9b3429da6a585e6e95c81 -size 191 +oid sha256:e99b08880e41cc4e0de8f29b3f9332b7e498aefe67dc540e06ec77990c2b1fee +size 178 diff --git a/assets/minecraft/textures/item/brown_bundle.png b/assets/minecraft/textures/item/brown_bundle.png index d526175f..f8e3ee7c 100644 --- a/assets/minecraft/textures/item/brown_bundle.png +++ b/assets/minecraft/textures/item/brown_bundle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ec0101aa75abf005da275d6a17ea2f4957ff4b0ab52ce0d0dc3c38da913dc2e2 -size 217 +oid sha256:0074f1501253e43cea261086144fe036ee9b9fbf966313252fa59b7878a70d84 +size 203 diff --git a/assets/minecraft/textures/item/brown_bundle_open_back.png b/assets/minecraft/textures/item/brown_bundle_open_back.png index 57b4fece..cc9fd1fd 100644 --- a/assets/minecraft/textures/item/brown_bundle_open_back.png +++ b/assets/minecraft/textures/item/brown_bundle_open_back.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:43bf977f35ddb370230c4b2d5d5ac38c0b80667ebe0ef0763329a25dfa34cbab -size 162 +oid sha256:a782403bac3cc3d0bff7dcbad4f0488d71b5654473ec726289767ac3d75a73d6 +size 139 diff --git a/assets/minecraft/textures/item/brown_bundle_open_front.png b/assets/minecraft/textures/item/brown_bundle_open_front.png index 7de1e69b..aaa6467b 100644 --- a/assets/minecraft/textures/item/brown_bundle_open_front.png +++ b/assets/minecraft/textures/item/brown_bundle_open_front.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:80ed4f57815b2e9d802bc1e8b02b5d18268b997f1d503810b153ee5076944899 -size 191 +oid sha256:cc7268b25fd3152b3120a227d07e9925731a4f1d8e4b22fb3de479af24354eba +size 189 diff --git a/assets/minecraft/textures/item/brown_candle.png b/assets/minecraft/textures/item/brown_candle.png index 9b2876a8..862af5ff 100644 --- a/assets/minecraft/textures/item/brown_candle.png +++ b/assets/minecraft/textures/item/brown_candle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1ac281b3e9ffd3a8a724b506c2a6a64b5e3031bc0f5b905d2615adea117ceebb -size 183 +oid sha256:2823e19a004f823af774eefa1f082cbdf3e71470a668707b011c506bcffd44d1 +size 179 diff --git a/assets/minecraft/textures/item/brown_dye.png b/assets/minecraft/textures/item/brown_dye.png index a5613b21..fa882c9f 100644 --- a/assets/minecraft/textures/item/brown_dye.png +++ b/assets/minecraft/textures/item/brown_dye.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:52854c4bf12e03b5d4f34df5e9094690d5076d735ab8d168b980da7bdc5491ed -size 171 +oid sha256:becd025da5894a0c9d2db9ad2e3977d4477d0e18c56a5ccbb301c4dc0076835a +size 165 diff --git a/assets/minecraft/textures/item/brown_egg.png b/assets/minecraft/textures/item/brown_egg.png index ff12fdc4..a47a27ed 100644 --- a/assets/minecraft/textures/item/brown_egg.png +++ b/assets/minecraft/textures/item/brown_egg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0e8b89d49ae64f218cfe5266954791694b1c8c0a29aefa1dd1692c0303ac4ee6 -size 176 +oid sha256:b6ccdee55569af913a2ab2918efe405492eb0ce456e95f8f03e04b8c7b55f576 +size 173 diff --git a/assets/minecraft/textures/item/brown_harness.png b/assets/minecraft/textures/item/brown_harness.png new file mode 100644 index 00000000..2fed1a49 --- /dev/null +++ b/assets/minecraft/textures/item/brown_harness.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ee9f942e660d47c453ab01bb5a7a7e0923cca6bab18499426d6fc6d268cebf93 +size 254 diff --git a/assets/minecraft/textures/item/bucket.png b/assets/minecraft/textures/item/bucket.png index 27e70067..b04acab3 100644 --- a/assets/minecraft/textures/item/bucket.png +++ b/assets/minecraft/textures/item/bucket.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3f14980d6d2dea8d547e44104a55a51d62bee71bd45f16068113b279b3d2d042 -size 194 +oid sha256:88f6f49f55ce73099194fca0aa17d4f4e955b4586d6b9a884e1fb5f4596b3cfb +size 164 diff --git a/assets/minecraft/textures/item/bundle.png b/assets/minecraft/textures/item/bundle.png index 5169779c..14d68c1e 100644 --- a/assets/minecraft/textures/item/bundle.png +++ b/assets/minecraft/textures/item/bundle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0eb1ea87436ddbe11abea3511632c6d777eb0d1bf24db4f592268d77b2523e9c -size 206 +oid sha256:f6802172a7d95792766bc41b23861ef625601c3d57dff54f51a2045b24aac50c +size 203 diff --git a/assets/minecraft/textures/item/bundle_open_back.png b/assets/minecraft/textures/item/bundle_open_back.png index 207106f0..d2e319ff 100644 --- a/assets/minecraft/textures/item/bundle_open_back.png +++ b/assets/minecraft/textures/item/bundle_open_back.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c5e43b183b499622a1ed70f229ffb0aee6e06eabbf4549ba274307dd02144d1e -size 152 +oid sha256:4d09bcd7ca5fdbb1a70b5128beafcb5bb9267a03d992322f4616bdad5d265d29 +size 138 diff --git a/assets/minecraft/textures/item/bundle_open_front.png b/assets/minecraft/textures/item/bundle_open_front.png index eea6f5fb..580012b3 100644 --- a/assets/minecraft/textures/item/bundle_open_front.png +++ b/assets/minecraft/textures/item/bundle_open_front.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2bb8c49f0f0285724de85ae1795f98a7963aa6e9058c3172107393405841d9f9 -size 191 +oid sha256:bf51bff86d8174e671b3bba916b458b2d473a99b0b2d4760b30aa3d5969dd1b1 +size 190 diff --git a/assets/minecraft/textures/item/burn_pottery_sherd.png b/assets/minecraft/textures/item/burn_pottery_sherd.png index 9b096390..a202c96d 100644 --- a/assets/minecraft/textures/item/burn_pottery_sherd.png +++ b/assets/minecraft/textures/item/burn_pottery_sherd.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:42c3d06f9ca5a60425c5901b4981ae344b0468597ac15b7cc5966f55985b0243 -size 218 +oid sha256:87a390369da59819722bef32a96608f789f9cad954020d335ddffb44ded84449 +size 204 diff --git a/assets/minecraft/textures/item/camel_spawn_egg.png b/assets/minecraft/textures/item/camel_spawn_egg.png index 8e0c453f..15bae29e 100644 --- a/assets/minecraft/textures/item/camel_spawn_egg.png +++ b/assets/minecraft/textures/item/camel_spawn_egg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:26bb0ae9cb7c27fe284c676f1c78baa5be0c58a66bd73df35061706c74b0bc23 -size 254 +oid sha256:6d8e81ca8456eaef198816fc9ef76329d20e0d7b41f8a13e2ed4509acf315013 +size 235 diff --git a/assets/minecraft/textures/item/candle.png b/assets/minecraft/textures/item/candle.png index e6000651..92619f0e 100644 --- a/assets/minecraft/textures/item/candle.png +++ b/assets/minecraft/textures/item/candle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c1a4bd460d8e2c878fd65ec4f806d2a45e21423a5195e3be5c1f10a0433243f0 -size 183 +oid sha256:821aebde0377d33c5184ca886d25353d5e079067f66c7b01559df4b98b00bd16 +size 179 diff --git a/assets/minecraft/textures/item/carrot.png b/assets/minecraft/textures/item/carrot.png index fddc4b9a..a9c0e29a 100644 --- a/assets/minecraft/textures/item/carrot.png +++ b/assets/minecraft/textures/item/carrot.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:113a62e7fbee7d2874268f62c7ca5db3dc9b1dc538f7ff5aaa0fae5a4f1f3e0d -size 204 +oid sha256:a433ecc4dbc28cf1751299ea518df0a5dd4b34e714d3015c77b9d193ec4c8a24 +size 201 diff --git a/assets/minecraft/textures/item/cave_spider_spawn_egg.png b/assets/minecraft/textures/item/cave_spider_spawn_egg.png index 290dea5a..5492e0cb 100644 --- a/assets/minecraft/textures/item/cave_spider_spawn_egg.png +++ b/assets/minecraft/textures/item/cave_spider_spawn_egg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:feee12d692d516ac3c1a9ac8deebccd9a5c6d7acb4be7db34742c157dc796b56 -size 229 +oid sha256:deb9210ca1b20e1f0ec0b173469df56cc194d285df8f86d417632e0b8587814c +size 219 diff --git a/assets/minecraft/textures/item/chain.png b/assets/minecraft/textures/item/chain.png index d4eafdf1..b1d9bbb8 100644 --- a/assets/minecraft/textures/item/chain.png +++ b/assets/minecraft/textures/item/chain.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a2cfaf24d4442a9f3401b6df9ee3d30e33f39dd455786eaed3963d617f7869d9 -size 118 +oid sha256:e5e0fee6cc772e68c50d1421ece0f4f44732e37657fd0758c5ce6f6979aa4fce +size 115 diff --git a/assets/minecraft/textures/item/chainmail_boots.png b/assets/minecraft/textures/item/chainmail_boots.png index 042268e4..d05b23e1 100644 --- a/assets/minecraft/textures/item/chainmail_boots.png +++ b/assets/minecraft/textures/item/chainmail_boots.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:061be8e65b0e28df352a8da03d28d587dfa73cfd5f795af4833d4463e3213811 -size 172 +oid sha256:6654836128ea56e52897682dee878abd41faeb41dc4b3583d64898a94808582e +size 149 diff --git a/assets/minecraft/textures/item/chainmail_chestplate.png b/assets/minecraft/textures/item/chainmail_chestplate.png index 8183419d..c3cba04a 100644 --- a/assets/minecraft/textures/item/chainmail_chestplate.png +++ b/assets/minecraft/textures/item/chainmail_chestplate.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fa35055fc557527bd4f63d696fef640f505f28073964afd2fcc5757dcef36ccc -size 200 +oid sha256:370b25ad9b5fc3ebb121c66334670220d30c50f29c2ab0cedc655b3655cd4f23 +size 165 diff --git a/assets/minecraft/textures/item/chainmail_helmet.png b/assets/minecraft/textures/item/chainmail_helmet.png index 11e49ea1..d89cdd04 100644 --- a/assets/minecraft/textures/item/chainmail_helmet.png +++ b/assets/minecraft/textures/item/chainmail_helmet.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:43ff24a39061e9ac1143254e803877331587479a2398c801a7d4be7329c918a3 -size 152 +oid sha256:8bf5412805be8f39a2b8c0cb1654a6aee7aab22a6f4c9fbc2b81049f85095f3c +size 135 diff --git a/assets/minecraft/textures/item/chainmail_leggings.png b/assets/minecraft/textures/item/chainmail_leggings.png index a7dbbb61..77fe34ac 100644 --- a/assets/minecraft/textures/item/chainmail_leggings.png +++ b/assets/minecraft/textures/item/chainmail_leggings.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6836097d33aa0d542b4f1f29874bc09297244a5a6dce4221d68c8a4493202150 -size 170 +oid sha256:ba5063ff8e0b858caf24728af80a6648e2a4e3d0d53aceef87f915fbc7561390 +size 148 diff --git a/assets/minecraft/textures/item/charcoal.png b/assets/minecraft/textures/item/charcoal.png index d45cb79c..041e2203 100644 --- a/assets/minecraft/textures/item/charcoal.png +++ b/assets/minecraft/textures/item/charcoal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8694dbb742b7aeea35fda24643f078a3624e083109a3968431f944ff3c178473 -size 215 +oid sha256:add27cf65866f5c0a6f2c5751182033bc7a59d0ea9ea5dfd7909d5d87443b1c8 +size 206 diff --git a/assets/minecraft/textures/item/cherry_boat.png b/assets/minecraft/textures/item/cherry_boat.png index 7ef21ea1..0e9c59dd 100644 --- a/assets/minecraft/textures/item/cherry_boat.png +++ b/assets/minecraft/textures/item/cherry_boat.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c6c57418a56fc0e4db8da4b13359c543264db25d841344f12df0cfcc8170b8b1 -size 229 +oid sha256:fd90587677cf6dc160ba0849810cc54e4c9b3d708b6f4164aee01a7fe7938347 +size 219 diff --git a/assets/minecraft/textures/item/cherry_door.png b/assets/minecraft/textures/item/cherry_door.png index b5e223b7..ca449e6b 100644 --- a/assets/minecraft/textures/item/cherry_door.png +++ b/assets/minecraft/textures/item/cherry_door.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4d3fe558ab63d5d04a13b072cc8143e45acfc2da88126b59ffa59b84bfa20710 -size 216 +oid sha256:64175b065653327b27b86458d8e52d33860e09d41fe97e691c0fd8e98caf4941 +size 214 diff --git a/assets/minecraft/textures/item/cherry_hanging_sign.png b/assets/minecraft/textures/item/cherry_hanging_sign.png index fde21916..e0f4eb08 100644 --- a/assets/minecraft/textures/item/cherry_hanging_sign.png +++ b/assets/minecraft/textures/item/cherry_hanging_sign.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a6d8b335c5160fd9e60060f725f921a60f164474a424d03bd7786d3336da17a3 -size 224 +oid sha256:e766ab93a67306b0d6d47e175451631cc9198a9a099265d9f444ff845fb72a6f +size 212 diff --git a/assets/minecraft/textures/item/cherry_sign.png b/assets/minecraft/textures/item/cherry_sign.png index 3bba57ec..dd9216d4 100644 --- a/assets/minecraft/textures/item/cherry_sign.png +++ b/assets/minecraft/textures/item/cherry_sign.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e4c0e0ba0b285d4dc8a8768b82553fda702159d48e4b83cbf71d65f0b61f188e -size 212 +oid sha256:cfcb26e332e0e8b48d761369d0b9a372728c097d6ffe55b668dbab38c9a31759 +size 209 diff --git a/assets/minecraft/textures/item/chicken.png b/assets/minecraft/textures/item/chicken.png index 6d2104b9..cafb1fd4 100644 --- a/assets/minecraft/textures/item/chicken.png +++ b/assets/minecraft/textures/item/chicken.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6890b9bf843e7d328e967f7cf9d2e55123faa4131e205dd2ce87fe3dcd977f9f -size 210 +oid sha256:bd671cdb48d100ff5c88b93bac4dd537d1b40fd5b4c1c80c7f39f935a24badfd +size 209 diff --git a/assets/minecraft/textures/item/clock_00.png b/assets/minecraft/textures/item/clock_00.png index 27f6f151..0b010296 100644 --- a/assets/minecraft/textures/item/clock_00.png +++ b/assets/minecraft/textures/item/clock_00.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:52652043a299f6d27da9229f1ccadd64e94018e6126c0bb2cbdf283bec114d87 -size 252 +oid sha256:b79cde84fe80cd376f3848efe3f98b5c187ae0c5e78cb222fd21207e11447fd3 +size 228 diff --git a/assets/minecraft/textures/item/clock_01.png b/assets/minecraft/textures/item/clock_01.png index 557af922..de407549 100644 --- a/assets/minecraft/textures/item/clock_01.png +++ b/assets/minecraft/textures/item/clock_01.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:afef4167763a2fce3a45e65c58b0cbe04d6cdfbf1487a2c04b3d944c61c4e80e -size 252 +oid sha256:5fe343bd5bde897f51d05563fde34deb96c6e4533122f4df8960d0130de83675 +size 227 diff --git a/assets/minecraft/textures/item/clock_02.png b/assets/minecraft/textures/item/clock_02.png index e695b105..c5e91ec8 100644 --- a/assets/minecraft/textures/item/clock_02.png +++ b/assets/minecraft/textures/item/clock_02.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:30e116914e1ef89882be6e620f24ebbb8c0adab69e0a1ad48698501cd6753635 -size 257 +oid sha256:d85671c5bdc3c744e5d493bdac0a511782705644d4966dc227c0a9ade1e1ff42 +size 231 diff --git a/assets/minecraft/textures/item/clock_03.png b/assets/minecraft/textures/item/clock_03.png index ba848d19..fbb44eef 100644 --- a/assets/minecraft/textures/item/clock_03.png +++ b/assets/minecraft/textures/item/clock_03.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:84a8675c022254b279d16504f7932740b5d1d56ba0c3c7fef8ab65ff1b9f9520 -size 260 +oid sha256:e190a8946c3536904cbb09fb005b3c3019eaf35f0cc45999d847a68e14be58ea +size 236 diff --git a/assets/minecraft/textures/item/clock_04.png b/assets/minecraft/textures/item/clock_04.png index b90d1e07..2f7b88df 100644 --- a/assets/minecraft/textures/item/clock_04.png +++ b/assets/minecraft/textures/item/clock_04.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b94701e1a96bfacb0d2d6754e310a726fb7756818812e237dbc0e6b24bb4217e -size 256 +oid sha256:31c1714e31fc0a5555389c8ae048da0e1ce9807eb14a56bac31b4371b9b3d39c +size 230 diff --git a/assets/minecraft/textures/item/clock_05.png b/assets/minecraft/textures/item/clock_05.png index 86c5ac9c..72c67446 100644 --- a/assets/minecraft/textures/item/clock_05.png +++ b/assets/minecraft/textures/item/clock_05.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:530ccffe33c60e4047b68b002d91ded3e218f4b13666c389593a6a656505489c -size 261 +oid sha256:f0a799bcfdd076e69508b53e8a32005fba5c7b84ff8a0077c5fa2f7345f2c28d +size 235 diff --git a/assets/minecraft/textures/item/clock_06.png b/assets/minecraft/textures/item/clock_06.png index c1185e38..28d5c444 100644 --- a/assets/minecraft/textures/item/clock_06.png +++ b/assets/minecraft/textures/item/clock_06.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:958e114c94f0ab75f94755d63de14acfe5ea57953bd897f28dd36f47f8c0838d -size 255 +oid sha256:08b04f2ee72c2bd3fbbe52c9a193c790d555eacdf28d0868d28cd959e81459fc +size 231 diff --git a/assets/minecraft/textures/item/clock_07.png b/assets/minecraft/textures/item/clock_07.png index 6b26a220..fc7f39bc 100644 --- a/assets/minecraft/textures/item/clock_07.png +++ b/assets/minecraft/textures/item/clock_07.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1894f6b1b8507c880313416ae87a70343d03593786fb7bf82954aa95319e7d86 -size 264 +oid sha256:9dbd39a6d8ed1490fa7edf41a2c3f21f11931aec3ec49d984f2431f99146b35e +size 240 diff --git a/assets/minecraft/textures/item/clock_08.png b/assets/minecraft/textures/item/clock_08.png index e36930b3..a7a39f1e 100644 --- a/assets/minecraft/textures/item/clock_08.png +++ b/assets/minecraft/textures/item/clock_08.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:30d3d0ad7eef8000a3f8a58ba193aaef7d43bad90af707536f7c1bfd88032e5b -size 264 +oid sha256:e0f92137b83e9d232cd9cae2cf1ec4933b03564e505239617e1938ddb2450e84 +size 241 diff --git a/assets/minecraft/textures/item/clock_09.png b/assets/minecraft/textures/item/clock_09.png index f13d97aa..47a3cdd4 100644 --- a/assets/minecraft/textures/item/clock_09.png +++ b/assets/minecraft/textures/item/clock_09.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:41069cd9ee3df243a303c143928d0f1b79449d4a913c55913d54c131a509e336 -size 263 +oid sha256:4476baee54145f5a71c5b75078218590d202306d688ca8f9b40623346b308777 +size 238 diff --git a/assets/minecraft/textures/item/clock_10.png b/assets/minecraft/textures/item/clock_10.png index fb60ea42..50d0f5c4 100644 --- a/assets/minecraft/textures/item/clock_10.png +++ b/assets/minecraft/textures/item/clock_10.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:244a9357695db153e59144d54af26495979a89ccb6c3f58dec33b8179c9a826b -size 263 +oid sha256:5eb7ca5da3fdee2cebb08e00a491b917de899980f513cacfff21c4fe74617930 +size 237 diff --git a/assets/minecraft/textures/item/clock_22.png b/assets/minecraft/textures/item/clock_22.png index 183868f0..41aacc7c 100644 --- a/assets/minecraft/textures/item/clock_22.png +++ b/assets/minecraft/textures/item/clock_22.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:507c7439802312831dfb7ad9ba3a0067a6fe489bc5637f10dd6e88e265c6fdc8 -size 262 +oid sha256:83be25dce4a07b148d55efab519243247ee202bc213e985a619b6c7f37bbcc5b +size 238 diff --git a/assets/minecraft/textures/item/clock_23.png b/assets/minecraft/textures/item/clock_23.png index ae827f7a..28e47037 100644 --- a/assets/minecraft/textures/item/clock_23.png +++ b/assets/minecraft/textures/item/clock_23.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:735c1a461c461f3ee9fd745cb336f45e957ebf30491fedb3e4baa5c35c9707dc -size 262 +oid sha256:d395a4382cb629a879a866761b7a77a23df55cd4767bbdcbf41cc4e69542be9b +size 239 diff --git a/assets/minecraft/textures/item/clock_24.png b/assets/minecraft/textures/item/clock_24.png index 9d2a85a1..7dd21f4d 100644 --- a/assets/minecraft/textures/item/clock_24.png +++ b/assets/minecraft/textures/item/clock_24.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2660854e48a34b05c85142d022e93bb1fad27735705ae0ca5a8d53d136c7eda5 -size 262 +oid sha256:339d94691c7441fa8f7cc9a6fda32e6fba2ea4534604dec257cf4930776fc648 +size 240 diff --git a/assets/minecraft/textures/item/clock_25.png b/assets/minecraft/textures/item/clock_25.png index 5e72475d..c67baaab 100644 --- a/assets/minecraft/textures/item/clock_25.png +++ b/assets/minecraft/textures/item/clock_25.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:587ce6b78341d04f7f62403262490997f931ed4b69dcbc88570bdd7605bae125 -size 262 +oid sha256:f3117fdbec956176c21d2d9ce38dbac781cd6e0115c47df2c75c291b025638ae +size 239 diff --git a/assets/minecraft/textures/item/clock_26.png b/assets/minecraft/textures/item/clock_26.png index 6b4e5fa0..ecfc7524 100644 --- a/assets/minecraft/textures/item/clock_26.png +++ b/assets/minecraft/textures/item/clock_26.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4306ef0b6a2158bc32d6b43e8ab60fa22663936681f4167de5bfc8506b871ae7 -size 259 +oid sha256:0af1a31240cfb08c330ef0893bb43dd6c8b954b90c2d8807010c6369b4a3cac8 +size 235 diff --git a/assets/minecraft/textures/item/clock_27.png b/assets/minecraft/textures/item/clock_27.png index 164231cd..22a44519 100644 --- a/assets/minecraft/textures/item/clock_27.png +++ b/assets/minecraft/textures/item/clock_27.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7314da488d3a33ef4d08fd39b5ce69d2df391aa8a01eaefcd689b4a01629527e -size 260 +oid sha256:c45a2708c591f8b554d74aa748bf44eb5f6ee80f953b64aad268bf615a6e0c2f +size 236 diff --git a/assets/minecraft/textures/item/clock_28.png b/assets/minecraft/textures/item/clock_28.png index 996badc3..5b19dc2a 100644 --- a/assets/minecraft/textures/item/clock_28.png +++ b/assets/minecraft/textures/item/clock_28.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:55bb268a9a2f0d234f2dcdfb80bc26a11e4d918124d568afb82e1d90877f7388 -size 257 +oid sha256:16377d650c80eeae5dd5e7541d62da0e891cca144e2cacba374b2a2fb036515c +size 231 diff --git a/assets/minecraft/textures/item/clock_29.png b/assets/minecraft/textures/item/clock_29.png index 3d65b1bc..30e775fb 100644 --- a/assets/minecraft/textures/item/clock_29.png +++ b/assets/minecraft/textures/item/clock_29.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4ba13422b676f30491dbbc31bf33e534c65519839976f53bf3ce8ed1d02a4255 -size 259 +oid sha256:94c11112959373ced6ca5d03a51e130c842a585ed1704636274c4ab9ac9be9ea +size 237 diff --git a/assets/minecraft/textures/item/clock_30.png b/assets/minecraft/textures/item/clock_30.png index a2ba4d80..1cf61758 100644 --- a/assets/minecraft/textures/item/clock_30.png +++ b/assets/minecraft/textures/item/clock_30.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:65b13cfa8d1fc53cfec37c58fe30d3e80a366e3d9d57068d2b6102caaed3f9f7 -size 261 +oid sha256:0437cf1a230b975fa9ba1c12336ab7bb1885f96d4ee669e48b47f6e05d0f83ca +size 237 diff --git a/assets/minecraft/textures/item/clock_31.png b/assets/minecraft/textures/item/clock_31.png index acbc4557..a28e41ab 100644 --- a/assets/minecraft/textures/item/clock_31.png +++ b/assets/minecraft/textures/item/clock_31.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6440da211b672cf224e37421b6dd641c8b614ee21cd25664efd0fbdde2cffb63 -size 256 +oid sha256:0bacb0a166f7f066fc2b481e146b20696f76d1d95a2be963fe520ccacc2b4e88 +size 230 diff --git a/assets/minecraft/textures/item/clock_32.png b/assets/minecraft/textures/item/clock_32.png index a264e102..3a7f6c2d 100644 --- a/assets/minecraft/textures/item/clock_32.png +++ b/assets/minecraft/textures/item/clock_32.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b3a7a625bc99e27a1b03962bf321412223a661887127ba10c1d620b3deb2b324 -size 256 +oid sha256:b50f5ef6f5343e0377800cf174b7ec3b1e8050471583060e859fc72900ca77ec +size 230 diff --git a/assets/minecraft/textures/item/clock_33.png b/assets/minecraft/textures/item/clock_33.png index 3d9e35a4..1e4f7909 100644 --- a/assets/minecraft/textures/item/clock_33.png +++ b/assets/minecraft/textures/item/clock_33.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5121a5793906776a6dca0edfe78f7bdf5cb4aa606d44db6f29dc5822659aca69 -size 256 +oid sha256:2ecccae5a06a468432b2d47d0956a101301da4c3a47c8b6eb75d87da6fa9edee +size 230 diff --git a/assets/minecraft/textures/item/clock_34.png b/assets/minecraft/textures/item/clock_34.png index a7c0d928..8e06c7c7 100644 --- a/assets/minecraft/textures/item/clock_34.png +++ b/assets/minecraft/textures/item/clock_34.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f35ec1fd0ee6019486086a156a446eddb5441e8392b27969abad383d2c1f6f58 -size 254 +oid sha256:1079fc9d814644af2dc3c0fdfa54dc10c9a44d94e3a931e4398a32f2de582bd9 +size 230 diff --git a/assets/minecraft/textures/item/clock_35.png b/assets/minecraft/textures/item/clock_35.png index c6cdccbf..13f320a0 100644 --- a/assets/minecraft/textures/item/clock_35.png +++ b/assets/minecraft/textures/item/clock_35.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d5ff9e5aca90cd01f85745b98135c1da2eb2233ba125902c6ddeeaaff6b4c600 -size 257 +oid sha256:df11c83cd013f6d304e3a91ed34f5951f5b3bce92c2c2af18e560cf35d93ecaa +size 235 diff --git a/assets/minecraft/textures/item/clock_36.png b/assets/minecraft/textures/item/clock_36.png index 7b2364f7..9989b1b2 100644 --- a/assets/minecraft/textures/item/clock_36.png +++ b/assets/minecraft/textures/item/clock_36.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f343afcfa742f738a723e7e5b87c8c46a6d8e13277e8c529446566d5f78a823 -size 256 +oid sha256:622d2f74142a23abcee184f9c90280254d788bf87876c181423c2c02307a1587 +size 231 diff --git a/assets/minecraft/textures/item/clock_37.png b/assets/minecraft/textures/item/clock_37.png index 6d1e0fe4..87b2e9ed 100644 --- a/assets/minecraft/textures/item/clock_37.png +++ b/assets/minecraft/textures/item/clock_37.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a52a1d9efc185643c9e1a3e604bf5777c420a7663542cab7578a7ec75090b4ad -size 259 +oid sha256:80256357a27dd5ed701cc56a6daea275b35999d70f9ac6110272b972be9f42b3 +size 235 diff --git a/assets/minecraft/textures/item/clock_38.png b/assets/minecraft/textures/item/clock_38.png index 7437ea0c..d94121a1 100644 --- a/assets/minecraft/textures/item/clock_38.png +++ b/assets/minecraft/textures/item/clock_38.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7895a95d6efcc987c7adfc6352a708eb3cd0f33a141b0ec1800cec1c8cc063d9 -size 256 +oid sha256:33c6bfc2b6057c88c45b84a3bcf132c2e33ac2bac219456870963ec25e321bce +size 231 diff --git a/assets/minecraft/textures/item/clock_39.png b/assets/minecraft/textures/item/clock_39.png index 55b12de1..2a95130c 100644 --- a/assets/minecraft/textures/item/clock_39.png +++ b/assets/minecraft/textures/item/clock_39.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:90776f008770d6570cfd71aa570dafcef2c8580867730f3ba9b555b152ababe3 -size 262 +oid sha256:a2eeedead0edf0df6ee02c7ba651ad78ea0693ada63a6502080c4b6c7491572d +size 239 diff --git a/assets/minecraft/textures/item/clock_40.png b/assets/minecraft/textures/item/clock_40.png index 003ea697..d8b4d9fe 100644 --- a/assets/minecraft/textures/item/clock_40.png +++ b/assets/minecraft/textures/item/clock_40.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:17b34109ff93c360b6858f7492519563b92d2c3be092fa233660ff92b1986533 -size 261 +oid sha256:118d640501bcd8df0c905a131449f5254440b9f1aa281bf7874016d5b94f353b +size 237 diff --git a/assets/minecraft/textures/item/clock_41.png b/assets/minecraft/textures/item/clock_41.png index 5840758a..6b3ab679 100644 --- a/assets/minecraft/textures/item/clock_41.png +++ b/assets/minecraft/textures/item/clock_41.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a41f975aedbd3bbbb26f3d300d426d415f41e356d6c8cc7db5dc8dec0f26f60f -size 260 +oid sha256:7dddb238d6b0ee724250483442fd1f1a021e7479753e676f85804a1152a74efc +size 240 diff --git a/assets/minecraft/textures/item/clock_42.png b/assets/minecraft/textures/item/clock_42.png index aaccdadc..cbd0999e 100644 --- a/assets/minecraft/textures/item/clock_42.png +++ b/assets/minecraft/textures/item/clock_42.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:215877fb90d18f46066a7f208a304635297cc94e110a9ef30b8452e6009e042c -size 260 +oid sha256:584e4e90f2dbf2cd72c12a2475b89b2ca32610cccd9da2ce78fc0b3fc134a179 +size 238 diff --git a/assets/minecraft/textures/item/clock_44.png b/assets/minecraft/textures/item/clock_44.png index 0a9b19f9..89e783d5 100644 --- a/assets/minecraft/textures/item/clock_44.png +++ b/assets/minecraft/textures/item/clock_44.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c5a12d13fb867fd906bb3c3b6881bc49e82313d24a9f0c3c5f47146652e11c22 -size 244 +oid sha256:4c0a7c0691816a78c1ecddae316c57d1fc833ff4e54dfa3545e320a0dce3af47 +size 243 diff --git a/assets/minecraft/textures/item/clock_47.png b/assets/minecraft/textures/item/clock_47.png index 2a446d9a..087a3275 100644 --- a/assets/minecraft/textures/item/clock_47.png +++ b/assets/minecraft/textures/item/clock_47.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e02f2d2c022e97bbd5c3faba6ef35e8bd4da3a59530102c01a42c4694eb96e8f -size 263 +oid sha256:bb2d7b9e96f5fdad08eadade1748d01c67adcbe71cfde3565f59c10334e0e46c +size 242 diff --git a/assets/minecraft/textures/item/clock_48.png b/assets/minecraft/textures/item/clock_48.png index 987a02cf..1f6bfecf 100644 --- a/assets/minecraft/textures/item/clock_48.png +++ b/assets/minecraft/textures/item/clock_48.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bcedb370f9c12a85c72d589364ba36d486da4bc0321c82381f0d5852276dee27 -size 263 +oid sha256:d193ab689bf48771144100a91bf8c2e72f85a945f1febb256d2c6a9976733633 +size 243 diff --git a/assets/minecraft/textures/item/clock_49.png b/assets/minecraft/textures/item/clock_49.png index 5ea14272..0e55451d 100644 --- a/assets/minecraft/textures/item/clock_49.png +++ b/assets/minecraft/textures/item/clock_49.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a907290370de477acc51d987175fcb7f57c74411ccf8460bcc91d70af0fdbd9a -size 260 +oid sha256:4a2ff1ffa42aa378ef7acd8eddee4821bfb035207a55e7a2a9fdf0a750ef80c5 +size 241 diff --git a/assets/minecraft/textures/item/clock_50.png b/assets/minecraft/textures/item/clock_50.png index d9e2359e..531f9c9c 100644 --- a/assets/minecraft/textures/item/clock_50.png +++ b/assets/minecraft/textures/item/clock_50.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6a7a7d13d42a22109b3481a7f5a485e34ded193419f539abbc3b3e924517729a -size 260 +oid sha256:983c078b14bd13b501b61b88b425e847c994492948f7e4d15c96c201a4d6e042 +size 239 diff --git a/assets/minecraft/textures/item/clock_51.png b/assets/minecraft/textures/item/clock_51.png index c7f13801..11187f07 100644 --- a/assets/minecraft/textures/item/clock_51.png +++ b/assets/minecraft/textures/item/clock_51.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a7dfa7507863ed4c9b56c77891510fc9d9e7e1053d43290f69175539e9659a62 -size 262 +oid sha256:1c0f361e6cbef12ccf9938523aab5ed472de956b2fd5fd2198b18caabb1b78f4 +size 240 diff --git a/assets/minecraft/textures/item/clock_52.png b/assets/minecraft/textures/item/clock_52.png index 9f456740..c890092f 100644 --- a/assets/minecraft/textures/item/clock_52.png +++ b/assets/minecraft/textures/item/clock_52.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:98a27cc542509bb26c9e0942b3d36193d638d720ca48344d73b3f5e79fb87dd0 -size 260 +oid sha256:69733dd2e5f3826188d236fdaeb6d888b8d0faa2cc176e146afe9e1177bfbe4a +size 239 diff --git a/assets/minecraft/textures/item/clock_53.png b/assets/minecraft/textures/item/clock_53.png index 7b69f0b8..450ef8de 100644 --- a/assets/minecraft/textures/item/clock_53.png +++ b/assets/minecraft/textures/item/clock_53.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:741e809f6d683ab7461d53a31d3878bd4db7caf9579360a4190abffed88ca00f -size 259 +oid sha256:889bc162c30926e72a96849bd3e5f4dd400897a6bf8eea2afcb09e9d51d5a8d1 +size 237 diff --git a/assets/minecraft/textures/item/clock_54.png b/assets/minecraft/textures/item/clock_54.png index 3dbd453c..cc792592 100644 --- a/assets/minecraft/textures/item/clock_54.png +++ b/assets/minecraft/textures/item/clock_54.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a494fdbe0c521416b33265e29906b0d71ecbced89e2ec68cad0f946e99d2ef20 -size 262 +oid sha256:88c87b071d2bc29dfe1a490436783ddb3faae4df6da8f6867fa2c0a602cb7f36 +size 239 diff --git a/assets/minecraft/textures/item/clock_55.png b/assets/minecraft/textures/item/clock_55.png index b9213339..8cce442b 100644 --- a/assets/minecraft/textures/item/clock_55.png +++ b/assets/minecraft/textures/item/clock_55.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cac200c22731fa695cfbd69ccf5eb31394e20f34414ec2b67fa13991c3447b3b -size 261 +oid sha256:bad21c772aa8183708f5b051c84bc705a1800349b66add9205256f3cfc0e46ce +size 238 diff --git a/assets/minecraft/textures/item/clock_56.png b/assets/minecraft/textures/item/clock_56.png index 250e9abf..c665e35f 100644 --- a/assets/minecraft/textures/item/clock_56.png +++ b/assets/minecraft/textures/item/clock_56.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:82390807103025360b6e7216a69e8b885edd4bf038950d74fc361fc8305ee392 -size 262 +oid sha256:89bf0fd24b71ac3c03df5f68441fb7826bb6b3293177a6ba3d80c98c73c616b3 +size 240 diff --git a/assets/minecraft/textures/item/clock_57.png b/assets/minecraft/textures/item/clock_57.png index 82ab766c..0f515b9c 100644 --- a/assets/minecraft/textures/item/clock_57.png +++ b/assets/minecraft/textures/item/clock_57.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c71f1e64cfb45b8be908609b8a6f07fb76d0f65fc38f4b46ec90770dd4fa0f5 -size 262 +oid sha256:d940dbe4d684bd6eedab8c9513712b94d3ca3a4670b91eeec4ca13ff08d122da +size 240 diff --git a/assets/minecraft/textures/item/clock_58.png b/assets/minecraft/textures/item/clock_58.png index fcf7bd08..3f009f0c 100644 --- a/assets/minecraft/textures/item/clock_58.png +++ b/assets/minecraft/textures/item/clock_58.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f6ba02877bab5c72835ea6fca4879bf169d7068f6a6c82dc97110b6ddd016130 -size 257 +oid sha256:9246e66bdfd66981d1ca9b268364118f3c3028f6526c55d59f7ceea9d60d1e2e +size 235 diff --git a/assets/minecraft/textures/item/clock_59.png b/assets/minecraft/textures/item/clock_59.png index 55479fa2..d52cf63b 100644 --- a/assets/minecraft/textures/item/clock_59.png +++ b/assets/minecraft/textures/item/clock_59.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d5a12085e2c9dcc2346dfa9e8ccbc654e2ee2e8c8377581e8831ea50b2801844 -size 260 +oid sha256:c2774c34d3be215361ffc057ac68ebaed7ce29a205597ab3cb1a8348a11cf7f9 +size 235 diff --git a/assets/minecraft/textures/item/clock_60.png b/assets/minecraft/textures/item/clock_60.png index f8f47b22..58820cb1 100644 --- a/assets/minecraft/textures/item/clock_60.png +++ b/assets/minecraft/textures/item/clock_60.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:262896921032d5aaf58101cd47e2404c5a0e44831b75cd6d6dbdadfd534b1c2e -size 256 +oid sha256:faf1e42029632f8050e72bb68ece996e67af65ba174d7d876e80e58794422a3a +size 231 diff --git a/assets/minecraft/textures/item/clock_61.png b/assets/minecraft/textures/item/clock_61.png index ad6b0cf0..b234e06c 100644 --- a/assets/minecraft/textures/item/clock_61.png +++ b/assets/minecraft/textures/item/clock_61.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dad6491d8027acd75b3c0ebd9ce8c12d9c879fce0336f316527c5ccda9b9b539 -size 263 +oid sha256:74fe205a6925e402dc523f101cb3bda7a287c312a0b89f6a89204d10c1974d1f +size 237 diff --git a/assets/minecraft/textures/item/clock_62.png b/assets/minecraft/textures/item/clock_62.png index 410136f5..6517ac1b 100644 --- a/assets/minecraft/textures/item/clock_62.png +++ b/assets/minecraft/textures/item/clock_62.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:928fe1973639f301da5364db41bbf925434379555d15f89437659be4b356ecd9 -size 263 +oid sha256:6e289bd7260b0e7297e967b400338aefd6e044e14620ce1863b2ae2e0d3378b0 +size 237 diff --git a/assets/minecraft/textures/item/clock_63.png b/assets/minecraft/textures/item/clock_63.png index c6a655ad..a0d059a1 100644 --- a/assets/minecraft/textures/item/clock_63.png +++ b/assets/minecraft/textures/item/clock_63.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:be70a584ebee3c4ac5be64ab9cec6d9424915a7a6fecb102a530151869f402cb -size 252 +oid sha256:dc709f6ec0f6aaed97849436c451d7af0ce788844a299baf61100eeff98c17ca +size 227 diff --git a/assets/minecraft/textures/item/cocoa_beans.png b/assets/minecraft/textures/item/cocoa_beans.png index 6741ed02..eb31edd5 100644 --- a/assets/minecraft/textures/item/cocoa_beans.png +++ b/assets/minecraft/textures/item/cocoa_beans.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1cd4831a3e4d153b94c594478c85a242803df409acaac9ac1792e854caa4a1dd -size 167 +oid sha256:4a307b814d60baf9ca1142dbb81607e97a35197f7a09e9db779e52b6a9c4627b +size 166 diff --git a/assets/minecraft/textures/item/cod.png b/assets/minecraft/textures/item/cod.png index c57cf79c..20aeaeb1 100644 --- a/assets/minecraft/textures/item/cod.png +++ b/assets/minecraft/textures/item/cod.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5a4cddbf3f573fb1d63b0d9cbc3c5166287a07ad8f4cf84ac44c83ce28cf5911 -size 283 +oid sha256:ee121c23bd0fb88a622c214a75ae0da9d302fa4488a3b090a2e9f22273e65d91 +size 178 diff --git a/assets/minecraft/textures/item/cod_bucket.png b/assets/minecraft/textures/item/cod_bucket.png index a844ffac..0a11b816 100644 --- a/assets/minecraft/textures/item/cod_bucket.png +++ b/assets/minecraft/textures/item/cod_bucket.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:60a9756845d96feae0fffa668046c2bbdb3400bb140c7ab138c3178435b80800 -size 271 +oid sha256:a24f1177e61ed8c4e3ab667913c658db542f8d99f3a97d758f724cafb51c0615 +size 230 diff --git a/assets/minecraft/textures/item/cod_spawn_egg.png b/assets/minecraft/textures/item/cod_spawn_egg.png index 12aa81c7..743e1839 100644 --- a/assets/minecraft/textures/item/cod_spawn_egg.png +++ b/assets/minecraft/textures/item/cod_spawn_egg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:29a94226feabdad20e65369b2290e9fc2016c3b9897b2f0ebecce918a3ea959f -size 219 +oid sha256:3331026416fa3d5460fae3a3c47d02ee87a181a461e8547dfb2c701c544f735d +size 216 diff --git a/assets/minecraft/textures/item/compass_00.png b/assets/minecraft/textures/item/compass_00.png index 1ceb3620..41029316 100644 --- a/assets/minecraft/textures/item/compass_00.png +++ b/assets/minecraft/textures/item/compass_00.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f39dc942808fb5fe37d3307eb22320523ead9bd38c808b54d516f20e20c9ae2 -size 219 +oid sha256:4b1899c7d50f377d75297120dfbb66f2699cc8dfc8b1ad8d8ed9d075c1a9b402 +size 208 diff --git a/assets/minecraft/textures/item/compass_01.png b/assets/minecraft/textures/item/compass_01.png index 7c0a3bb9..dcc2a918 100644 --- a/assets/minecraft/textures/item/compass_01.png +++ b/assets/minecraft/textures/item/compass_01.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:02e83364e869c14639e3bc2b403ed792ac8fc3442a0016bad8d073b9ad4c82c1 -size 218 +oid sha256:d0e1a0bb2f652699ad1b9f918373393cfdae684f4a94098b3a8945ae02adfeeb +size 209 diff --git a/assets/minecraft/textures/item/compass_02.png b/assets/minecraft/textures/item/compass_02.png index f4055685..e9d80f1e 100644 --- a/assets/minecraft/textures/item/compass_02.png +++ b/assets/minecraft/textures/item/compass_02.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:34a981d2e66cf4183f7bcd238be86bc56abfeb6352babcc5fc445fb8b85650b9 -size 218 +oid sha256:70f7fbb07645eccb87c7a9b38b3cf4b49b2db5421db46b4edd741800b12c92d2 +size 208 diff --git a/assets/minecraft/textures/item/compass_03.png b/assets/minecraft/textures/item/compass_03.png index 2b4cd266..18d9e316 100644 --- a/assets/minecraft/textures/item/compass_03.png +++ b/assets/minecraft/textures/item/compass_03.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c06d618a816221f275ba28f648884f5e9f5fdffb25d7b50bd4a48014eefd022 -size 217 +oid sha256:1a306708a67075f4cd84dd269144168183c8038c2a8b8fba9ff0ae97a2f79203 +size 209 diff --git a/assets/minecraft/textures/item/compass_04.png b/assets/minecraft/textures/item/compass_04.png index bb4b4174..522fd33d 100644 --- a/assets/minecraft/textures/item/compass_04.png +++ b/assets/minecraft/textures/item/compass_04.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:23ca1f5f2844b63849da831cd83b8f7c7d9708ecc2eabcced533cfc3424bd280 -size 219 +oid sha256:a67c92bdbbc1907002cacda2d06f623814681943128a9213eccb60ee93497255 +size 211 diff --git a/assets/minecraft/textures/item/compass_05.png b/assets/minecraft/textures/item/compass_05.png index 286729b9..74bf3677 100644 --- a/assets/minecraft/textures/item/compass_05.png +++ b/assets/minecraft/textures/item/compass_05.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8efcb36f3ee12fe9183e8e9443b7fb964b1b9289487209cea9101ca42f6f97c1 -size 221 +oid sha256:68a8a965cad7076fa935df5952a157902a2458777b3c5bd69bb0232a07e0f329 +size 212 diff --git a/assets/minecraft/textures/item/compass_06.png b/assets/minecraft/textures/item/compass_06.png index cdc8e8e5..9b5df71b 100644 --- a/assets/minecraft/textures/item/compass_06.png +++ b/assets/minecraft/textures/item/compass_06.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:487d2e3d82d0936c4d3839331c135162deb2605718b6208fd493f948a7a0fbea -size 221 +oid sha256:c3bf1c7fd5486691156b88bd000fd8555c5bc03e75334ef4f3e0425319f46b3e +size 211 diff --git a/assets/minecraft/textures/item/compass_07.png b/assets/minecraft/textures/item/compass_07.png index 05c027cf..3889cd57 100644 --- a/assets/minecraft/textures/item/compass_07.png +++ b/assets/minecraft/textures/item/compass_07.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e75668ef23c762f0d5d90bba041d04e40cd2bff1ef8efd69998f988fcb7d95c4 -size 219 +oid sha256:7b188d5fa08a73f9e8d7b390029236489ed7e377c603e70221fe2de4474547de +size 210 diff --git a/assets/minecraft/textures/item/compass_08.png b/assets/minecraft/textures/item/compass_08.png index 69ece576..40d092a7 100644 --- a/assets/minecraft/textures/item/compass_08.png +++ b/assets/minecraft/textures/item/compass_08.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f84bfdf5ba52fdc154bf42127751eb782ce7e7b72939267e54b98ec4a03504be -size 213 +oid sha256:40b603d3084e9b8900ca060ef4089b0f8e072d31bf51e56922ff6b9f55537206 +size 205 diff --git a/assets/minecraft/textures/item/compass_09.png b/assets/minecraft/textures/item/compass_09.png index 05c027cf..3889cd57 100644 --- a/assets/minecraft/textures/item/compass_09.png +++ b/assets/minecraft/textures/item/compass_09.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e75668ef23c762f0d5d90bba041d04e40cd2bff1ef8efd69998f988fcb7d95c4 -size 219 +oid sha256:7b188d5fa08a73f9e8d7b390029236489ed7e377c603e70221fe2de4474547de +size 210 diff --git a/assets/minecraft/textures/item/compass_10.png b/assets/minecraft/textures/item/compass_10.png index 7865828f..ebe175dd 100644 --- a/assets/minecraft/textures/item/compass_10.png +++ b/assets/minecraft/textures/item/compass_10.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:df7dec6112662cc3b695282f6c5599ea9552632e1687a8537230f18d9f815a65 -size 222 +oid sha256:c4001b8aa508ba914f4f9d9ee7498569172d3dc68dae5bebd927eb212efe8ea2 +size 213 diff --git a/assets/minecraft/textures/item/compass_11.png b/assets/minecraft/textures/item/compass_11.png index 544e504c..986705db 100644 --- a/assets/minecraft/textures/item/compass_11.png +++ b/assets/minecraft/textures/item/compass_11.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:189ead17c5f71f1728c499b847fb329991c15e29a71d2aa3f9a2148079b82a76 -size 219 +oid sha256:8450a704b1cff6c4b6f390fe2d6e3162709be8f970b968ad4dd56561cb9366b4 +size 210 diff --git a/assets/minecraft/textures/item/compass_12.png b/assets/minecraft/textures/item/compass_12.png index 9ab68530..881835bf 100644 --- a/assets/minecraft/textures/item/compass_12.png +++ b/assets/minecraft/textures/item/compass_12.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bfa0fe1112cfd203a759ee69bf08cf628ebd29b17492104f843f42eaf6df34eb -size 222 +oid sha256:b513404a2d8c886b97ea9d5bfa07ea00b4f7d631e5a616bc166c72e54e290ee2 +size 211 diff --git a/assets/minecraft/textures/item/compass_13.png b/assets/minecraft/textures/item/compass_13.png index 1d9cab6a..5425476d 100644 --- a/assets/minecraft/textures/item/compass_13.png +++ b/assets/minecraft/textures/item/compass_13.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b9cd8dd5852fde2ec5221d41b353764537150288c7418b72805cd7fc53b89a6e -size 219 +oid sha256:db2062cfe7613ec164560773b02305b2b58f3f1b8b39d8acef8b444752e5bbda +size 210 diff --git a/assets/minecraft/textures/item/compass_14.png b/assets/minecraft/textures/item/compass_14.png index 749f1c9a..d00c4e13 100644 --- a/assets/minecraft/textures/item/compass_14.png +++ b/assets/minecraft/textures/item/compass_14.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:13004e3e11f7d02705ff691b5e6e266352ad3f0400481d82af364cd225781a23 -size 214 +oid sha256:a76e20d3d288d900ae10e8f1fa9e0635f229bc2cce960fb69e0273ab774a9c67 +size 204 diff --git a/assets/minecraft/textures/item/compass_15.png b/assets/minecraft/textures/item/compass_15.png index f0761fb3..63431c9d 100644 --- a/assets/minecraft/textures/item/compass_15.png +++ b/assets/minecraft/textures/item/compass_15.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:44bebd9d11da014713546fa4d663dcff25c65f6e44a89684feef135eb6d7212a -size 213 +oid sha256:b8e4daa89dad5d692b4c68b94533ffaf5e702ebc50940126bdcf9aedb8d26401 +size 204 diff --git a/assets/minecraft/textures/item/compass_16.png b/assets/minecraft/textures/item/compass_16.png index 5afa60e6..b8d2aebc 100644 --- a/assets/minecraft/textures/item/compass_16.png +++ b/assets/minecraft/textures/item/compass_16.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b14eabd82b84a1273057baac58cff50279329e15260b16b711e5a49ffdc56a4 -size 212 +oid sha256:f0c1a41cc50cf5e2a3e2bc0477ab063c682cc8498e41ab0b643b4719e8d80ea8 +size 205 diff --git a/assets/minecraft/textures/item/compass_17.png b/assets/minecraft/textures/item/compass_17.png index dc1f3f14..a0abd15b 100644 --- a/assets/minecraft/textures/item/compass_17.png +++ b/assets/minecraft/textures/item/compass_17.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e87bd9eef4703925e8b4f441bd8a124ffb5e1c275111830d37f9cc128099398 -size 213 +oid sha256:57baab9b6927a12b84b03147c49a8f68d39fb8dd3d7f1b74770a2a4b4dc0290a +size 204 diff --git a/assets/minecraft/textures/item/compass_18.png b/assets/minecraft/textures/item/compass_18.png index 3fcaf4d1..392e28e0 100644 --- a/assets/minecraft/textures/item/compass_18.png +++ b/assets/minecraft/textures/item/compass_18.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cb58831610e3216635c7a1ef6a1066ecf47719ac59f50adcef3f3e46800d69a1 -size 214 +oid sha256:5de98aca53119baa855fa246e11685861c644b60a303b9df766f6dbd10963caa +size 205 diff --git a/assets/minecraft/textures/item/compass_19.png b/assets/minecraft/textures/item/compass_19.png index 63d7e525..e15cef7a 100644 --- a/assets/minecraft/textures/item/compass_19.png +++ b/assets/minecraft/textures/item/compass_19.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:25d5ffc167fcda14f54df94ab9491b7e6136cc4f103a39418e9be78d8bcd14e9 -size 219 +oid sha256:3b49fae3af56d09269a27e292e1157218c866811990bf51ea8593bd87a932d65 +size 210 diff --git a/assets/minecraft/textures/item/compass_20.png b/assets/minecraft/textures/item/compass_20.png index 364c2c83..77ddd417 100644 --- a/assets/minecraft/textures/item/compass_20.png +++ b/assets/minecraft/textures/item/compass_20.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aacbf11e878771892dadc4aeda81ee88cccd04fd33779b78cc1fa3a16e0df168 -size 221 +oid sha256:9a2ad792a01478de547a4bb5206b633b003ba9438fed53c239033e806a65b33f +size 210 diff --git a/assets/minecraft/textures/item/compass_21.png b/assets/minecraft/textures/item/compass_21.png index 4a8d7c4c..662b4fce 100644 --- a/assets/minecraft/textures/item/compass_21.png +++ b/assets/minecraft/textures/item/compass_21.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f057205d91c2071d0f6d44110c8cafe05c35446f0a53d2c888fa1524c71e3aa4 -size 220 +oid sha256:fc70e15e825b99025fb86352020e0136170ca171eb4018903160f6ba8777f37a +size 212 diff --git a/assets/minecraft/textures/item/compass_22.png b/assets/minecraft/textures/item/compass_22.png index 89396553..a9e4a904 100644 --- a/assets/minecraft/textures/item/compass_22.png +++ b/assets/minecraft/textures/item/compass_22.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3dcf22a2c4a878b276859d8b25dec920d705af6d542941c9e3aae3bca7945d7c -size 224 +oid sha256:671512734f0e7b434158405369d30d53c83bc94d56544f26b06a96fea4b8dbea +size 213 diff --git a/assets/minecraft/textures/item/compass_23.png b/assets/minecraft/textures/item/compass_23.png index 694623b8..8231ff1c 100644 --- a/assets/minecraft/textures/item/compass_23.png +++ b/assets/minecraft/textures/item/compass_23.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b0db834e8214efbcc5dae73fb805a8654968b661fcdcded4bc3b766cbe0f2e09 -size 214 +oid sha256:689dfeea5499602c36558cceeeb21c9fa01e8d3d292d4cc09a73de53089a3cd5 +size 206 diff --git a/assets/minecraft/textures/item/compass_24.png b/assets/minecraft/textures/item/compass_24.png index 694623b8..8231ff1c 100644 --- a/assets/minecraft/textures/item/compass_24.png +++ b/assets/minecraft/textures/item/compass_24.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b0db834e8214efbcc5dae73fb805a8654968b661fcdcded4bc3b766cbe0f2e09 -size 214 +oid sha256:689dfeea5499602c36558cceeeb21c9fa01e8d3d292d4cc09a73de53089a3cd5 +size 206 diff --git a/assets/minecraft/textures/item/compass_25.png b/assets/minecraft/textures/item/compass_25.png index 694623b8..8231ff1c 100644 --- a/assets/minecraft/textures/item/compass_25.png +++ b/assets/minecraft/textures/item/compass_25.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b0db834e8214efbcc5dae73fb805a8654968b661fcdcded4bc3b766cbe0f2e09 -size 214 +oid sha256:689dfeea5499602c36558cceeeb21c9fa01e8d3d292d4cc09a73de53089a3cd5 +size 206 diff --git a/assets/minecraft/textures/item/compass_26.png b/assets/minecraft/textures/item/compass_26.png index 8915f1f5..17dac705 100644 --- a/assets/minecraft/textures/item/compass_26.png +++ b/assets/minecraft/textures/item/compass_26.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0ef6afcda915a31076604840ec8df43128a1b1bb3a9cbc32eb542e5a1c8c4011 -size 221 +oid sha256:8e9ab3949b5d52741e235b506a941164510c09a0883e49b4490f37e74fe85645 +size 211 diff --git a/assets/minecraft/textures/item/compass_27.png b/assets/minecraft/textures/item/compass_27.png index 7b4c5304..3bd3e258 100644 --- a/assets/minecraft/textures/item/compass_27.png +++ b/assets/minecraft/textures/item/compass_27.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1812ccab59745e1e16903211683c0aaba8ad2d3df9d12c2c44c4be8ca67ee9d7 -size 220 +oid sha256:0bb536a62d143e01603c332cf2076b12a8d21b16313c24ad90e1f8a592846dca +size 210 diff --git a/assets/minecraft/textures/item/compass_28.png b/assets/minecraft/textures/item/compass_28.png index 7b4c5304..3bd3e258 100644 --- a/assets/minecraft/textures/item/compass_28.png +++ b/assets/minecraft/textures/item/compass_28.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1812ccab59745e1e16903211683c0aaba8ad2d3df9d12c2c44c4be8ca67ee9d7 -size 220 +oid sha256:0bb536a62d143e01603c332cf2076b12a8d21b16313c24ad90e1f8a592846dca +size 210 diff --git a/assets/minecraft/textures/item/compass_29.png b/assets/minecraft/textures/item/compass_29.png index 27a22779..052f0dee 100644 --- a/assets/minecraft/textures/item/compass_29.png +++ b/assets/minecraft/textures/item/compass_29.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:62d7c0d308ad4f6ff7e9ba0c45aa36f877e01389cd62bd3ecdcb414be00f6895 -size 215 +oid sha256:004a3515130af7ca1f4bc27a457e6f7135e244f05c96a0671f9beac6a4c3c312 +size 207 diff --git a/assets/minecraft/textures/item/compass_30.png b/assets/minecraft/textures/item/compass_30.png index 801e2cd0..f725d96f 100644 --- a/assets/minecraft/textures/item/compass_30.png +++ b/assets/minecraft/textures/item/compass_30.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6ae93a016cf2eccd7925dc7893deb50ef13dce69eaf015cbdab5ec38812bc8dd -size 219 +oid sha256:b8cf34f39ce4b64f14db8f807ae1117c0e1a15163d81fe831645086d5ba859fe +size 207 diff --git a/assets/minecraft/textures/item/compass_31.png b/assets/minecraft/textures/item/compass_31.png index 0332d62a..39c20ab1 100644 --- a/assets/minecraft/textures/item/compass_31.png +++ b/assets/minecraft/textures/item/compass_31.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:db2222487f8461305ca38781124100fe717c1189c934c24d2bf95136f0a3d869 -size 219 +oid sha256:b2d60f5e4ff7d7185061ccb9077d6826c656c8d198d5fd6da7e3b2f47a5adcf4 +size 208 diff --git a/assets/minecraft/textures/item/cooked_chicken.png b/assets/minecraft/textures/item/cooked_chicken.png index 4a3dcc51..e51438f2 100644 --- a/assets/minecraft/textures/item/cooked_chicken.png +++ b/assets/minecraft/textures/item/cooked_chicken.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:911707b878314681b6a983b32fa012202be22939b1317f5b6ad4f618bea826b2 -size 210 +oid sha256:5711fd7b41f75c7243671e9dfeec48a964b5325065f6e8d32d7606914937d46d +size 209 diff --git a/assets/minecraft/textures/item/cooked_cod.png b/assets/minecraft/textures/item/cooked_cod.png index 7e826c6e..15ac4929 100644 --- a/assets/minecraft/textures/item/cooked_cod.png +++ b/assets/minecraft/textures/item/cooked_cod.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5c591167262e2b5bb05d84617be5db8adbceb246388e258c136ac7d46133a8cb -size 244 +oid sha256:e43c4d493357d7d1970d121c7140b68c4a95e48708310548bd256bb2e5525b9d +size 187 diff --git a/assets/minecraft/textures/item/cooked_mutton.png b/assets/minecraft/textures/item/cooked_mutton.png index bb4ff99f..6ec956d8 100644 --- a/assets/minecraft/textures/item/cooked_mutton.png +++ b/assets/minecraft/textures/item/cooked_mutton.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8c9ddaab0daf05699e9800b3dd75d22487e2ad66d539a60dedfdfe843eb06114 -size 199 +oid sha256:223e60521903506895acda457b80ceb450e6386b6756947b1e216fb89bf3a92d +size 196 diff --git a/assets/minecraft/textures/item/cooked_rabbit.png b/assets/minecraft/textures/item/cooked_rabbit.png index 23ba2e17..dc5ccd08 100644 --- a/assets/minecraft/textures/item/cooked_rabbit.png +++ b/assets/minecraft/textures/item/cooked_rabbit.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9f01a76e8e4eed5962314f6debc3d05e2c4446c423aca55c344363661b232537 -size 211 +oid sha256:322a105e6ab3753d01bf4cf056799d3548480172525a57739bc056df623b9848 +size 200 diff --git a/assets/minecraft/textures/item/cooked_salmon.png b/assets/minecraft/textures/item/cooked_salmon.png index 93c15abe..f846c690 100644 --- a/assets/minecraft/textures/item/cooked_salmon.png +++ b/assets/minecraft/textures/item/cooked_salmon.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dbe6e74aecc817c5c4adb9ad892d27fb783d0286769bd2a0b55790cebb66a1da -size 347 +oid sha256:bcb93019da783a9778a584216ca53bede27eb8e22d454b82234d7c0669b9a14e +size 215 diff --git a/assets/minecraft/textures/item/cookie.png b/assets/minecraft/textures/item/cookie.png index b0c80de6..790800a7 100644 --- a/assets/minecraft/textures/item/cookie.png +++ b/assets/minecraft/textures/item/cookie.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:63d05ecf76d302e188d44d556207218686814f808a33ad443a69ba73604d6324 -size 207 +oid sha256:7b715b6be7328c6c08e6205ec84e74558780b65be911d1de35316e29484d376f +size 196 diff --git a/assets/minecraft/textures/item/copper_door.png b/assets/minecraft/textures/item/copper_door.png index e21f8344..9296a149 100644 --- a/assets/minecraft/textures/item/copper_door.png +++ b/assets/minecraft/textures/item/copper_door.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:99576336880b0e4e828c2df49fe8101ae74e21ed8b6548bd22ea59b2ef5188be -size 175 +oid sha256:c0b07dfdd0f154f29c7c5d0afcf36c53b8fea65778ec61ff86b39a7cb3feffc3 +size 174 diff --git a/assets/minecraft/textures/item/copper_ingot.png b/assets/minecraft/textures/item/copper_ingot.png index d79a02da..3cb5ead2 100644 --- a/assets/minecraft/textures/item/copper_ingot.png +++ b/assets/minecraft/textures/item/copper_ingot.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ebccaba00d1623ef8acce3768e104bf54c8ee157d92ba7c969d7100830414875 -size 204 +oid sha256:209e43de9b82ba4d5320c2c7c71fbc91fafee7efbc80c75aca48dbcf0c963227 +size 196 diff --git a/assets/minecraft/textures/item/cow_spawn_egg.png b/assets/minecraft/textures/item/cow_spawn_egg.png index 37fa3a4c..f6f5c728 100644 --- a/assets/minecraft/textures/item/cow_spawn_egg.png +++ b/assets/minecraft/textures/item/cow_spawn_egg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dfedb3c84c51e23eba0d9dabd5030271af51b0a438373987c0ff5beddc90b58c -size 261 +oid sha256:6f5c40c7fe462d26422f530c600d200efef9122a9f1e8c580ace2fc15fe1e979 +size 244 diff --git a/assets/minecraft/textures/item/creaking_spawn_egg.png b/assets/minecraft/textures/item/creaking_spawn_egg.png index a8e3cfcc..63a23563 100644 --- a/assets/minecraft/textures/item/creaking_spawn_egg.png +++ b/assets/minecraft/textures/item/creaking_spawn_egg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1994cc7868d542f46e4c3ac1d01af6d3de5931786b2870fad3ab2ef7d4f0019c -size 258 +oid sha256:a53a2a9b4fd3b91ae103e1f36fe8d0a1e03e85b5d1c55cbbd1c9cb87e4d9639a +size 243 diff --git a/assets/minecraft/textures/item/creeper_banner_pattern.png b/assets/minecraft/textures/item/creeper_banner_pattern.png index 4d3a2cf5..2013fcd8 100644 --- a/assets/minecraft/textures/item/creeper_banner_pattern.png +++ b/assets/minecraft/textures/item/creeper_banner_pattern.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d0d81b5b752d1555cdf3e243d9bd61a9e662e82ccdab42067ba78698fb26dee -size 210 +oid sha256:10e3cd4159c5919703f43f0c06bc1d02009d24d53b6f57f6129549bc208702c5 +size 200 diff --git a/assets/minecraft/textures/item/crimson_door.png b/assets/minecraft/textures/item/crimson_door.png index 6098f9c9..826851b5 100644 --- a/assets/minecraft/textures/item/crimson_door.png +++ b/assets/minecraft/textures/item/crimson_door.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:82134803d9116380ed67fb2f6010e8faa5da40faecadf9d0570ebb7f1755b8f0 -size 140 +oid sha256:986bee8c774cfec2afb50a2175a7375834f421c6e11c2124f7a3a639d1306eb0 +size 139 diff --git a/assets/minecraft/textures/item/crimson_hanging_sign.png b/assets/minecraft/textures/item/crimson_hanging_sign.png index dc2946de..6d0d4120 100644 --- a/assets/minecraft/textures/item/crimson_hanging_sign.png +++ b/assets/minecraft/textures/item/crimson_hanging_sign.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bf86c0b95527bcb4bd65ba69c7deb6974a9dcdbf0dd1e8c2a79b12ffb7a93722 -size 229 +oid sha256:354123b00924f38fceb6764902eadb9a71a82d9bbf245cafb00adeee8967ffdc +size 216 diff --git a/assets/minecraft/textures/item/crimson_sign.png b/assets/minecraft/textures/item/crimson_sign.png index b7d1e9fb..eba29dff 100644 --- a/assets/minecraft/textures/item/crimson_sign.png +++ b/assets/minecraft/textures/item/crimson_sign.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3a7d54373e64652d951b312a97e9ed195342fdd699d6b929d96556f699c95599 -size 204 +oid sha256:331666ebda27675dd62de10019e9cfd943c07d55171461a771666f2bbe9c10c7 +size 202 diff --git a/assets/minecraft/textures/item/crossbow_arrow.png b/assets/minecraft/textures/item/crossbow_arrow.png index 96eb5453..2c17acfb 100644 --- a/assets/minecraft/textures/item/crossbow_arrow.png +++ b/assets/minecraft/textures/item/crossbow_arrow.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f33edfaadd4dfc05e885a84a1e38df2a222477847f404b97246511aca0550aa0 -size 316 +oid sha256:7f7f3e60edfee7ad1f437f0542c7ad5d6e54e0ae67e902e0c44a5290c57ae349 +size 251 diff --git a/assets/minecraft/textures/item/crossbow_firework.png b/assets/minecraft/textures/item/crossbow_firework.png index 436c1f9e..d79d5446 100644 --- a/assets/minecraft/textures/item/crossbow_firework.png +++ b/assets/minecraft/textures/item/crossbow_firework.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3baa2ca59e51795c11c08413a33c2c3174ac6fa91ecad742d92490a3afe6a9bd -size 338 +oid sha256:69e83e2821f7edd90fe4ccea253364d61b7d6f6ae235295575f4c415bc280f0d +size 282 diff --git a/assets/minecraft/textures/item/crossbow_pulling_0.png b/assets/minecraft/textures/item/crossbow_pulling_0.png index 8c7e13ee..daf466ca 100644 --- a/assets/minecraft/textures/item/crossbow_pulling_0.png +++ b/assets/minecraft/textures/item/crossbow_pulling_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e598e107632359e8e159236f2131310382a753ed228e048c7e18b9582c760644 -size 305 +oid sha256:3b44562422ec284a40e134e951dcfa91b275e1c975fbddeb518b7d91aba3620d +size 229 diff --git a/assets/minecraft/textures/item/crossbow_pulling_1.png b/assets/minecraft/textures/item/crossbow_pulling_1.png index 11ad293f..f9d3a268 100644 --- a/assets/minecraft/textures/item/crossbow_pulling_1.png +++ b/assets/minecraft/textures/item/crossbow_pulling_1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bb88f1f5ccd125106421fc7085dba231c4621866074a0a00a33eab296bf32956 -size 305 +oid sha256:869652b27cc01ef3979b6e434994ecd37ec73b69b32283567869b27dcf6f563d +size 230 diff --git a/assets/minecraft/textures/item/crossbow_pulling_2.png b/assets/minecraft/textures/item/crossbow_pulling_2.png index 53c2ac99..1595aca7 100644 --- a/assets/minecraft/textures/item/crossbow_pulling_2.png +++ b/assets/minecraft/textures/item/crossbow_pulling_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cb02abd9a65a77d1f8a6a6c9052b29a2de6dd77e2c7e68258b1346aac21c22c3 -size 296 +oid sha256:acbb870797ea4aa2f448893018328c6a99d9dc5e8d878e87ba9a7faf9a48abb7 +size 227 diff --git a/assets/minecraft/textures/item/crossbow_standby.png b/assets/minecraft/textures/item/crossbow_standby.png index 939833f1..de9209f6 100644 --- a/assets/minecraft/textures/item/crossbow_standby.png +++ b/assets/minecraft/textures/item/crossbow_standby.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d80198aab62618c015e419ca10123a311a4a2bdac3a1803c275dece6c25f9ad9 -size 297 +oid sha256:6ea28ffcdf20314406cfaddcf9c1684523ff27211a482e6a709c2bd4543bb468 +size 228 diff --git a/assets/minecraft/textures/item/cyan_bundle.png b/assets/minecraft/textures/item/cyan_bundle.png index 52df2a13..a3092570 100644 --- a/assets/minecraft/textures/item/cyan_bundle.png +++ b/assets/minecraft/textures/item/cyan_bundle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0e628d59b7e160fe5d1c1d74dc9914df4c4433343fe964aca459ae5ee4120ff2 -size 206 +oid sha256:c723ab5b4c3d8e4cbb48206b80b980c96e8e93b3606f78a4377361dc1dc11770 +size 203 diff --git a/assets/minecraft/textures/item/cyan_bundle_open_back.png b/assets/minecraft/textures/item/cyan_bundle_open_back.png index c81df8f3..96b12fbc 100644 --- a/assets/minecraft/textures/item/cyan_bundle_open_back.png +++ b/assets/minecraft/textures/item/cyan_bundle_open_back.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6a7f4e0b28c1f0f890b682828902803842698c54a4311179909820f1f1cc8fb6 -size 152 +oid sha256:39ec186cb19ba49b7716276df2e562a35f1e614c1f0d1dfb28bdac7e8eeea47b +size 138 diff --git a/assets/minecraft/textures/item/cyan_candle.png b/assets/minecraft/textures/item/cyan_candle.png index b91bad84..1ee2103f 100644 --- a/assets/minecraft/textures/item/cyan_candle.png +++ b/assets/minecraft/textures/item/cyan_candle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e95edf2ccbac4a25dd6b10290254632f6d9523a5e4472753dd433015480a5007 -size 183 +oid sha256:30598c7fe3ba3e3323d5d86f5539440b257dc41989641315fd2da4930cfb53fa +size 179 diff --git a/assets/minecraft/textures/item/cyan_harness.png b/assets/minecraft/textures/item/cyan_harness.png new file mode 100644 index 00000000..808d6c4e --- /dev/null +++ b/assets/minecraft/textures/item/cyan_harness.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:42ae944c0c16fbba3000478e3e8bcd91c994bc6cf7eb988a1338b9a4d40341c6 +size 254 diff --git a/assets/minecraft/textures/item/danger_pottery_sherd.png b/assets/minecraft/textures/item/danger_pottery_sherd.png index e4dbaf12..c68c3b59 100644 --- a/assets/minecraft/textures/item/danger_pottery_sherd.png +++ b/assets/minecraft/textures/item/danger_pottery_sherd.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a237007a10821ccb6b4d6fc70c8833f9d6550ea6f5e8849870ae4a9f78fdc442 -size 217 +oid sha256:365f586bb456d5637dfabef64bf058c4e9eabf5e02e0984049c00a7f72a73467 +size 205 diff --git a/assets/minecraft/textures/item/dark_oak_boat.png b/assets/minecraft/textures/item/dark_oak_boat.png index 8d4e8407..b29ece33 100644 --- a/assets/minecraft/textures/item/dark_oak_boat.png +++ b/assets/minecraft/textures/item/dark_oak_boat.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:893750e19804b188374ec8bdb85f523cafe03cb85cfcb54a2c09aa649815bb55 -size 332 +oid sha256:205c5e2cf0eaafebc9026bb34ec45401db8cf80c8e193bff9201a70e2efea349 +size 215 diff --git a/assets/minecraft/textures/item/dark_oak_chest_boat.png b/assets/minecraft/textures/item/dark_oak_chest_boat.png index 17cf62b7..526f2933 100644 --- a/assets/minecraft/textures/item/dark_oak_chest_boat.png +++ b/assets/minecraft/textures/item/dark_oak_chest_boat.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:434abaa22c643cc76f62583c50581b8cbed3b61576483c0af5573e9e5068366c -size 376 +oid sha256:178d5fb2b651052bd7b08c4d3893ae7b88fcdd6a6f3ef36fbd45ce412e4ab4f9 +size 260 diff --git a/assets/minecraft/textures/item/dark_oak_door.png b/assets/minecraft/textures/item/dark_oak_door.png index a361f357..ea3cd489 100644 --- a/assets/minecraft/textures/item/dark_oak_door.png +++ b/assets/minecraft/textures/item/dark_oak_door.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:93f1299b4eca622e727eead32b81281d994094fcd43522cd8bc4835e9a0d7df5 -size 148 +oid sha256:7ce5517ae862a4892fadadeef9b5b38fe1c800b364d4e72a883a8205b594fc9c +size 131 diff --git a/assets/minecraft/textures/item/dark_oak_hanging_sign.png b/assets/minecraft/textures/item/dark_oak_hanging_sign.png index 823c4c24..4ffd5be3 100644 --- a/assets/minecraft/textures/item/dark_oak_hanging_sign.png +++ b/assets/minecraft/textures/item/dark_oak_hanging_sign.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f574f77aa62447a0eb57892c8d113355625468097a6e10fef2d3349dc4245d8a -size 229 +oid sha256:ecf3e5e983c43a8074afedbfd75d6c3a779be4bbdac5e9df7defd02732a9c8b9 +size 218 diff --git a/assets/minecraft/textures/item/diamond.png b/assets/minecraft/textures/item/diamond.png index 885ff3f5..4fd42d14 100644 --- a/assets/minecraft/textures/item/diamond.png +++ b/assets/minecraft/textures/item/diamond.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b27b081fde6a794dfb52d37f4ab2a86931ce127323f786a27cea41d2dbe913a2 -size 208 +oid sha256:fd11635ec666c3febb9e6dd6d3ec49cdfb4d16a2a1d595ebd10e56b302417d08 +size 207 diff --git a/assets/minecraft/textures/item/diamond_axe.png b/assets/minecraft/textures/item/diamond_axe.png index 1e36eb4f..d6f97268 100644 --- a/assets/minecraft/textures/item/diamond_axe.png +++ b/assets/minecraft/textures/item/diamond_axe.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a3350a81dbc6bb3817c9c35ac09b74bc6985a785911ac81307009d8afd88440e -size 179 +oid sha256:c40234807156fa36f370037f93939c397be76672c2d55b20fb3026d04df97155 +size 178 diff --git a/assets/minecraft/textures/item/diamond_leggings.png b/assets/minecraft/textures/item/diamond_leggings.png index 23a59050..353f2178 100644 --- a/assets/minecraft/textures/item/diamond_leggings.png +++ b/assets/minecraft/textures/item/diamond_leggings.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f9c9bbe693d71f5b14b6c8e20fa9263108881edd2af55bd946f268f59c9f9053 -size 178 +oid sha256:08ba1f85219d7fa96dca3cc7024ec5edea25d484d5874e712a6faa4fe15eb757 +size 177 diff --git a/assets/minecraft/textures/item/diamond_pickaxe.png b/assets/minecraft/textures/item/diamond_pickaxe.png index 5ace4960..5671b83f 100644 --- a/assets/minecraft/textures/item/diamond_pickaxe.png +++ b/assets/minecraft/textures/item/diamond_pickaxe.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7672c209d0c66c43d297b3d04513c9e789d03f5ea6ff1e564a4dbc1fd78a5c88 -size 182 +oid sha256:dfec8e1467b335133521a42c8fde0f124ba7b5c45c0a84fba789736df4f92325 +size 181 diff --git a/assets/minecraft/textures/item/disc_fragment_5.png b/assets/minecraft/textures/item/disc_fragment_5.png index 8ad8ad41..544435e3 100644 --- a/assets/minecraft/textures/item/disc_fragment_5.png +++ b/assets/minecraft/textures/item/disc_fragment_5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4718cd0adf3516d611f3078bc1c965d4b8a9e5b69ee41c49bfd49b85b264478c -size 142 +oid sha256:93c61b57900abd821145efdf9150e328cbc4fb077a8a8c42dd462f1dd4da2c59 +size 140 diff --git a/assets/minecraft/textures/item/dolphin_spawn_egg.png b/assets/minecraft/textures/item/dolphin_spawn_egg.png index f361b818..fd07ed1c 100644 --- a/assets/minecraft/textures/item/dolphin_spawn_egg.png +++ b/assets/minecraft/textures/item/dolphin_spawn_egg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:034a57dc91d7feb43c94178be6c2a4779be2920155d51e920ef04aa9c25c8489 -size 251 +oid sha256:b6c3e395c942acd7486decf3ffcda54ee65f8d66b43e86638b2e9a502c6c7d73 +size 241 diff --git a/assets/minecraft/textures/item/donkey_spawn_egg.png b/assets/minecraft/textures/item/donkey_spawn_egg.png index 9d063f8b..1c72a8b3 100644 --- a/assets/minecraft/textures/item/donkey_spawn_egg.png +++ b/assets/minecraft/textures/item/donkey_spawn_egg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e1d4b8d3aacd6a9605fc7f0fbd4159ebd21a816b99725bdae010d7aaceb6188a -size 267 +oid sha256:e4a1f1507f20f8620c4865df4dba7244955bd2a8e987bcebd5e1e1bff7c8922b +size 255 diff --git a/assets/minecraft/textures/item/dried_kelp.png b/assets/minecraft/textures/item/dried_kelp.png index 0170fde8..aba50633 100644 --- a/assets/minecraft/textures/item/dried_kelp.png +++ b/assets/minecraft/textures/item/dried_kelp.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0ad7fd2bea0a736be8185f150cd95d34c61b8f0aa5c4f320d3fee0fd61ddb157 -size 235 +oid sha256:1c55c9ce599ad41b9682bb220ea7e025778eb76eb2ef0f74e2acccdc9b7d6729 +size 188 diff --git a/assets/minecraft/textures/item/dune_armor_trim_smithing_template.png b/assets/minecraft/textures/item/dune_armor_trim_smithing_template.png index c52fc324..fbe8403d 100644 --- a/assets/minecraft/textures/item/dune_armor_trim_smithing_template.png +++ b/assets/minecraft/textures/item/dune_armor_trim_smithing_template.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f0718568a092135db38e6b251bdee711077bd09a8190762effa12c057b18cb9d -size 239 +oid sha256:0e1dbe9ead91836dd0ac57990946971ee23fdfae9a93ea901778ce7592b01b3c +size 224 diff --git a/assets/minecraft/textures/item/echo_shard.png b/assets/minecraft/textures/item/echo_shard.png index ba57d970..e947b84a 100644 --- a/assets/minecraft/textures/item/echo_shard.png +++ b/assets/minecraft/textures/item/echo_shard.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e7cb2e26fbb10be5911c7bfc6a6773c48b0ec1395cd8478de6e118f043d9097 -size 192 +oid sha256:b3e83222b685c598ca67af8b64095c9738c1215499cee4780884a3a6039d07d7 +size 180 diff --git a/assets/minecraft/textures/item/elder_guardian_spawn_egg.png b/assets/minecraft/textures/item/elder_guardian_spawn_egg.png index 959f3b29..c669e622 100644 --- a/assets/minecraft/textures/item/elder_guardian_spawn_egg.png +++ b/assets/minecraft/textures/item/elder_guardian_spawn_egg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:543c855aabb79164e05fc78cdf19e2fd3ce81003144f078ce82e20cfcf4b7c1d -size 268 +oid sha256:7235534d20e0eb19d0954e43adbd8bdc5c9d999999a930378a6c7b64b30bb3ba +size 257 diff --git a/assets/minecraft/textures/item/elytra.png b/assets/minecraft/textures/item/elytra.png index f3c420b1..f4603460 100644 --- a/assets/minecraft/textures/item/elytra.png +++ b/assets/minecraft/textures/item/elytra.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:53e5a899bf9e52733b15ef7a7719a045666fb975db77f0e435c411603eb15ded -size 208 +oid sha256:7a83137eea9fd1e1eb75906cb573a277a90cc0796e2aa2a04d0605abc5b21717 +size 199 diff --git a/assets/minecraft/textures/item/elytra_broken.png b/assets/minecraft/textures/item/elytra_broken.png index 396737fb..7365f333 100644 --- a/assets/minecraft/textures/item/elytra_broken.png +++ b/assets/minecraft/textures/item/elytra_broken.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6105ce63b29b6ad8e15bae9fc9bc9056adcbf55ea13ba00e879af59492455500 -size 197 +oid sha256:d4106ec11670ccb95c8ec14669482f05dc638c85b57b04819120c7de0654ef18 +size 191 diff --git a/assets/minecraft/textures/item/end_crystal.png b/assets/minecraft/textures/item/end_crystal.png index 6a88220b..7c1411fb 100644 --- a/assets/minecraft/textures/item/end_crystal.png +++ b/assets/minecraft/textures/item/end_crystal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1a75f035d740b3f4f269bbdddfa4cca59c406a43b6c6212bafadbb26db34afd3 -size 226 +oid sha256:e91e697f2ec866835bf63fc4062bf69cc396c8048e1141b5c7dcb5de1a238d73 +size 219 diff --git a/assets/minecraft/textures/item/ender_dragon_spawn_egg.png b/assets/minecraft/textures/item/ender_dragon_spawn_egg.png index b5e847b9..dc556e77 100644 --- a/assets/minecraft/textures/item/ender_dragon_spawn_egg.png +++ b/assets/minecraft/textures/item/ender_dragon_spawn_egg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8ee2291325ee273642a6114ecab2f92562d156f730b981bb0c600d7c52358cd2 -size 269 +oid sha256:0e192bb6ddc2631e97f260d42d78372c435470c9bcc69af31e2edb3fa6ff427a +size 250 diff --git a/assets/minecraft/textures/item/ender_eye.png b/assets/minecraft/textures/item/ender_eye.png index 882afad0..f947883e 100644 --- a/assets/minecraft/textures/item/ender_eye.png +++ b/assets/minecraft/textures/item/ender_eye.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cb9003416a29bdd869a494467a01dba3403b221b88fe3e0a0dc41906d5d49afa -size 214 +oid sha256:95843c3a2fc9bf92359f304617cc9a3905d955796c53dd3c8f6958a04dff3c82 +size 213 diff --git a/assets/minecraft/textures/item/enderman_spawn_egg.png b/assets/minecraft/textures/item/enderman_spawn_egg.png index 56631136..c5f78ed6 100644 --- a/assets/minecraft/textures/item/enderman_spawn_egg.png +++ b/assets/minecraft/textures/item/enderman_spawn_egg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:60d0fea60abea2aab1d9c6670153699586d63c77a336212768299e1f5aa36ef2 -size 258 +oid sha256:550a8c570cedba0fb960fd282c80150dcddb692f51bf37fc9bdb47c6a31a87e9 +size 249 diff --git a/assets/minecraft/textures/item/evoker_spawn_egg.png b/assets/minecraft/textures/item/evoker_spawn_egg.png index 030fa476..85914afc 100644 --- a/assets/minecraft/textures/item/evoker_spawn_egg.png +++ b/assets/minecraft/textures/item/evoker_spawn_egg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:222b6972c64970ebf1e3afa749d8bf24e17b0f5331512f348d3a585fbf331a95 -size 258 +oid sha256:af6b7264dea1fd6f3d7d8ecabfdf53ef80e148071dabcc1d20e724450315eccc +size 257 diff --git a/assets/minecraft/textures/item/explorer_pottery_sherd.png b/assets/minecraft/textures/item/explorer_pottery_sherd.png index 8a33405c..d8e54223 100644 --- a/assets/minecraft/textures/item/explorer_pottery_sherd.png +++ b/assets/minecraft/textures/item/explorer_pottery_sherd.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:461b7488b88b42347fd2fca1a04c065694d01e9b28ff7136804b799b4131bcaf -size 219 +oid sha256:29ac8c5ce084c7d8263141c2e87b7ecc0acbb458d986485ec8ea6ba39a5b20a7 +size 205 diff --git a/assets/minecraft/textures/item/eye_armor_trim_smithing_template.png b/assets/minecraft/textures/item/eye_armor_trim_smithing_template.png index 30baf5e5..afac10e9 100644 --- a/assets/minecraft/textures/item/eye_armor_trim_smithing_template.png +++ b/assets/minecraft/textures/item/eye_armor_trim_smithing_template.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:882f4c3fe65df013c844e62d6d365c47a6078a13298f9dd01334baed40aa55a8 -size 227 +oid sha256:d67898485423f7efaa73ccd1648c2d183103574d973e7810d761073c6ac691a0 +size 211 diff --git a/assets/minecraft/textures/item/feather.png b/assets/minecraft/textures/item/feather.png index d7af81e5..a5cb1eec 100644 --- a/assets/minecraft/textures/item/feather.png +++ b/assets/minecraft/textures/item/feather.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:56513599c70b5da268ebf37e3245ef1f0fc9645a8b654aedd69069ec2f757513 -size 152 +oid sha256:36e6f12de8ddabd5c1f58c2b99feb2be4f1a13a46a74525e68a06a3e7cf88cd1 +size 135 diff --git a/assets/minecraft/textures/item/field_masoned_banner_pattern.png b/assets/minecraft/textures/item/field_masoned_banner_pattern.png index e43d51e9..e2bcc212 100644 --- a/assets/minecraft/textures/item/field_masoned_banner_pattern.png +++ b/assets/minecraft/textures/item/field_masoned_banner_pattern.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0f7f419f7a0183d209b93687fbfc7bc3b9501da48d70d18d9666c7d37dd8253f -size 214 +oid sha256:50a5a11af0e49dd32dac8be3c14edc4526f4f1f40e94b0d655344bc94e7ca8c1 +size 199 diff --git a/assets/minecraft/textures/item/filled_map.png b/assets/minecraft/textures/item/filled_map.png index f1a30f29..78f64786 100644 --- a/assets/minecraft/textures/item/filled_map.png +++ b/assets/minecraft/textures/item/filled_map.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:22e0f1856b995aa6a3f71525bba330ec31e739506d5565f52c05a0c60f93db42 -size 177 +oid sha256:775de76489d62f6934eb4f2216de51501b108e1e1e4a34de90d0edb1f1f5513e +size 173 diff --git a/assets/minecraft/textures/item/filled_map_markings.png b/assets/minecraft/textures/item/filled_map_markings.png index 00e5a9f5..b52035fb 100644 --- a/assets/minecraft/textures/item/filled_map_markings.png +++ b/assets/minecraft/textures/item/filled_map_markings.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e01cc208da72f12dc8b1cc30548874d3e984e8ca813e38f893ad092140ca3b0 -size 137 +oid sha256:1499750d9aa5e9677f10d55da6ce5338d6aa32ce571279798ef6c851bf48a36f +size 107 diff --git a/assets/minecraft/textures/item/fire_charge.png b/assets/minecraft/textures/item/fire_charge.png index c48ace30..ebc62a27 100644 --- a/assets/minecraft/textures/item/fire_charge.png +++ b/assets/minecraft/textures/item/fire_charge.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d175f39053b128f2677135dfe3f8f83f949cfab3d40e7ce48aa7eae170692e34 -size 206 +oid sha256:cf15c4301ec96a22813f17b11e43a2d047e8b65067c7513a76107fef7a485ad2 +size 205 diff --git a/assets/minecraft/textures/item/firefly_bush.png b/assets/minecraft/textures/item/firefly_bush.png index f9b9015f..00db1403 100644 --- a/assets/minecraft/textures/item/firefly_bush.png +++ b/assets/minecraft/textures/item/firefly_bush.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f3b6d7188b43667e73c290eaf0f3e692edc6dc13249d92008f4a0ec1348ef239 -size 227 +oid sha256:471b9bb3d30f794d5e38bb61391844a15361de3721b980f80c367c404d422d27 +size 225 diff --git a/assets/minecraft/textures/item/firework_rocket.png b/assets/minecraft/textures/item/firework_rocket.png index 5cdcbcd5..61cb84b1 100644 --- a/assets/minecraft/textures/item/firework_rocket.png +++ b/assets/minecraft/textures/item/firework_rocket.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fea5f8fdf3a1517edbc7006d327fe09b8567a0e4c2e76f8aeb8aeac68eabf786 -size 165 +oid sha256:661a46e05516554d8ab2df91bd34dfa18dec1728e77a2d369270c429dedc208b +size 164 diff --git a/assets/minecraft/textures/item/firework_star.png b/assets/minecraft/textures/item/firework_star.png index 51bb2f10..f487de51 100644 --- a/assets/minecraft/textures/item/firework_star.png +++ b/assets/minecraft/textures/item/firework_star.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1cf03410f1a94f9426b402c1f2518c23c5c8f9d0d5f3d33f108406734507eef9 -size 198 +oid sha256:98af88f32a97937c118fa8a9b4aea5cd91f70202f65850b62855096e4a12831a +size 151 diff --git a/assets/minecraft/textures/item/firework_star_overlay.png b/assets/minecraft/textures/item/firework_star_overlay.png index d2783b02..7a4fa69b 100644 --- a/assets/minecraft/textures/item/firework_star_overlay.png +++ b/assets/minecraft/textures/item/firework_star_overlay.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7f29ef3537fba500cd42ffa874fa40077940dd79062b8e0b845fc43662120a55 -size 225 +oid sha256:44276ac2d91a3411b0236f4ec1a91b1ce42883418e03d3add149adf0236e240c +size 122 diff --git a/assets/minecraft/textures/item/fishing_rod_cast.png b/assets/minecraft/textures/item/fishing_rod_cast.png index ee8e5d79..e14788e6 100644 --- a/assets/minecraft/textures/item/fishing_rod_cast.png +++ b/assets/minecraft/textures/item/fishing_rod_cast.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:503554123725458a5a3386b4b6751cad91f1f9393ad1031b214a9e5752f94ccf -size 150 +oid sha256:98917738534b798318fde244e0e755bb6a7c07ee8a0d08edce9c7d1bef710b70 +size 149 diff --git a/assets/minecraft/textures/item/flint.png b/assets/minecraft/textures/item/flint.png index 2b38eb69..edabeb29 100644 --- a/assets/minecraft/textures/item/flint.png +++ b/assets/minecraft/textures/item/flint.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ba7c3c7a261bfcbc2f1d8c67b808d8bce73ff8f7445aa76d8dc62a7f28198fc0 -size 197 +oid sha256:6a37210c4ec517b2274f3a3bbdd6862fc0fa7b08c5c1d001e835b110408ff414 +size 187 diff --git a/assets/minecraft/textures/item/flint_and_steel.png b/assets/minecraft/textures/item/flint_and_steel.png index 7cbe786a..cba1b871 100644 --- a/assets/minecraft/textures/item/flint_and_steel.png +++ b/assets/minecraft/textures/item/flint_and_steel.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5731c0064733dbd0e30c7033927a218341ca043b1a2240f8714428b0b554203c -size 213 +oid sha256:cdbc36ffa84370d0ec6cd3d09d0b2d51b4efce411537aeb1619137b3ba723c5e +size 168 diff --git a/assets/minecraft/textures/item/flow_armor_trim_smithing_template.png b/assets/minecraft/textures/item/flow_armor_trim_smithing_template.png index 7341784b..e1926c24 100644 --- a/assets/minecraft/textures/item/flow_armor_trim_smithing_template.png +++ b/assets/minecraft/textures/item/flow_armor_trim_smithing_template.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c237d749ccdfa6286060a6a1f5a1a3e852e4fb607fa14a0afd5bd0a568321790 -size 251 +oid sha256:c73b51669534e8d9b40fb48ce0632e1cf277db20811ac64004856733a533ae67 +size 210 diff --git a/assets/minecraft/textures/item/flow_banner_pattern.png b/assets/minecraft/textures/item/flow_banner_pattern.png index ed107e0d..7b9b04a4 100644 --- a/assets/minecraft/textures/item/flow_banner_pattern.png +++ b/assets/minecraft/textures/item/flow_banner_pattern.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:820ad28d20423b757456cad1bf94eda8daf30026ad733d565f5ffc93ec4b9d9b -size 212 +oid sha256:ad54add9d72437c08ad29df4ed91f35e506faa9df28262f57b1704f311ca5244 +size 200 diff --git a/assets/minecraft/textures/item/flow_pottery_sherd.png b/assets/minecraft/textures/item/flow_pottery_sherd.png index 78641b89..e0ecfe1b 100644 --- a/assets/minecraft/textures/item/flow_pottery_sherd.png +++ b/assets/minecraft/textures/item/flow_pottery_sherd.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9e1f4444ee985eb2dfd6a516117828c9c20317b697f4385160981ff059d779aa -size 220 +oid sha256:e37fb5b6acab6642ce6ce05de4d822be13c2a28a881f8170fd598f39795ceed8 +size 209 diff --git a/assets/minecraft/textures/item/flower_banner_pattern.png b/assets/minecraft/textures/item/flower_banner_pattern.png index 9d8d4395..a48bb706 100644 --- a/assets/minecraft/textures/item/flower_banner_pattern.png +++ b/assets/minecraft/textures/item/flower_banner_pattern.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6854cdd8bfe3ca73bf56b8cc82b75ee8104b726a4856161f2dcabb2196943f05 -size 218 +oid sha256:05b0fbd7237d5cea5cff24241b7b7ad81bd1c75b7a2aa042e676440ee7617bec +size 200 diff --git a/assets/minecraft/textures/item/flower_pot.png b/assets/minecraft/textures/item/flower_pot.png index ed7ff7b5..4a5acec6 100644 --- a/assets/minecraft/textures/item/flower_pot.png +++ b/assets/minecraft/textures/item/flower_pot.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b6e2be923c5d1fdd29fed01f53aa3bcda1248859ff713dc0b94dc09f9b9529f -size 219 +oid sha256:5954b304bdaec6fdde257ef65e802e6bb66c3a01024fdce93aab28c32b22c39e +size 217 diff --git a/assets/minecraft/textures/item/friend_pottery_sherd.png b/assets/minecraft/textures/item/friend_pottery_sherd.png index 2611bc8f..865982d0 100644 --- a/assets/minecraft/textures/item/friend_pottery_sherd.png +++ b/assets/minecraft/textures/item/friend_pottery_sherd.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f442e85265e258235175495690cb2512385064849844b7e70559a1e42d8ff33e -size 218 +oid sha256:2e87a1933d68e3ab5d7ccd4c02107b54491ccbc2bde49225a445b8370b6f431f +size 204 diff --git a/assets/minecraft/textures/item/frog_spawn_egg.png b/assets/minecraft/textures/item/frog_spawn_egg.png index c6e5d976..daf73a21 100644 --- a/assets/minecraft/textures/item/frog_spawn_egg.png +++ b/assets/minecraft/textures/item/frog_spawn_egg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3cec76cd48e6285d3c12de129e29fed43914d1aaf3258bc1aa33de1d55266aa1 -size 204 +oid sha256:23962914851db6e2f7f346e80bf412d8f6e1435e6cd54b73dd5ccbec1a50eccf +size 200 diff --git a/assets/minecraft/textures/item/ghast_spawn_egg.png b/assets/minecraft/textures/item/ghast_spawn_egg.png index 09fb58a7..6c2593fa 100644 --- a/assets/minecraft/textures/item/ghast_spawn_egg.png +++ b/assets/minecraft/textures/item/ghast_spawn_egg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:445b71f617703d755b4b78639014f29ed8acc845834791d239a1138d1082e2db -size 207 +oid sha256:bde96f5d5a5af12c18cafcb4ae99e0e0733f0588091ae2c0be73f510a2e67e91 +size 193 diff --git a/assets/minecraft/textures/item/globe_banner_pattern.png b/assets/minecraft/textures/item/globe_banner_pattern.png index 9d17402a..529ccc7a 100644 --- a/assets/minecraft/textures/item/globe_banner_pattern.png +++ b/assets/minecraft/textures/item/globe_banner_pattern.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8c3ed69b58e17e0ab1ffd62dd714bafaa06b181425c7c46e13a1350a8122cfec -size 214 +oid sha256:8147b5e9f8ed24dd9fb5692d6fcad914f6f9970f2c00f46b87058e6c7fc920f0 +size 203 diff --git a/assets/minecraft/textures/item/glow_berries.png b/assets/minecraft/textures/item/glow_berries.png index dfafd789..2d57ac25 100644 --- a/assets/minecraft/textures/item/glow_berries.png +++ b/assets/minecraft/textures/item/glow_berries.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:430f3e4445a9263dc76877b42ab7a9c7790dd0cb3e647cc79e2a8cd21cd98bb2 -size 230 +oid sha256:3a0a4e33d4edca3c72f460583ba5db51e17e77d6f4010790e98b7fb380c15d31 +size 229 diff --git a/assets/minecraft/textures/item/glow_ink_sac.png b/assets/minecraft/textures/item/glow_ink_sac.png index b37940af..50742675 100644 --- a/assets/minecraft/textures/item/glow_ink_sac.png +++ b/assets/minecraft/textures/item/glow_ink_sac.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9a6cd1ac90b81180f33c5d357c140d1ff6cceb5793af33eaeac9b21ee3bf2580 -size 179 +oid sha256:cfa8f698ead3aa09aa720bf7a292f84d4a374269a461a72153df9deeee8577fb +size 178 diff --git a/assets/minecraft/textures/item/goat_horn.png b/assets/minecraft/textures/item/goat_horn.png index 7f751d98..17156041 100644 --- a/assets/minecraft/textures/item/goat_horn.png +++ b/assets/minecraft/textures/item/goat_horn.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0c2b09ff61fb0cfe36ea21b025a07fda539aac71f248ba45ddfd7d1aaeecb1f1 -size 199 +oid sha256:4c321ab00ae30b559708855142ce1fb3bafd424d90a3c60f9da9116890a696c3 +size 196 diff --git a/assets/minecraft/textures/item/goat_spawn_egg.png b/assets/minecraft/textures/item/goat_spawn_egg.png index bcf7d017..1105b04b 100644 --- a/assets/minecraft/textures/item/goat_spawn_egg.png +++ b/assets/minecraft/textures/item/goat_spawn_egg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dfff74c1d086f7d9a8abcedbe12558711c1971e7f80ded59a83eeefb3e7daec0 -size 242 +oid sha256:bc833e171493dc09761affb87d0116447a7a15df38023d4575266b942aeb5c55 +size 232 diff --git a/assets/minecraft/textures/item/gold_ingot.png b/assets/minecraft/textures/item/gold_ingot.png index 70598c29..f779bb61 100644 --- a/assets/minecraft/textures/item/gold_ingot.png +++ b/assets/minecraft/textures/item/gold_ingot.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b4e38d8476c35fafd18dba27ab2ec0304cedc7296ca170fd723afae5a08b2a2d -size 199 +oid sha256:e4c1e2ea6d1fa70299163ebff573b4bfda1ef09099bedc4b5789c598f0a65738 +size 187 diff --git a/assets/minecraft/textures/item/golden_apple.png b/assets/minecraft/textures/item/golden_apple.png index 62919769..989ea9e0 100644 --- a/assets/minecraft/textures/item/golden_apple.png +++ b/assets/minecraft/textures/item/golden_apple.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:de0de35dfe21f5644a9de5b8c46c1154e004c1454e60100ed61e3d3aec8cb972 -size 204 +oid sha256:a5880840585b9e8bf3e50e8002500d81204028215e341500d30ac31c8f0e96d6 +size 200 diff --git a/assets/minecraft/textures/item/golden_axe.png b/assets/minecraft/textures/item/golden_axe.png index 91ad2d4c..7066af17 100644 --- a/assets/minecraft/textures/item/golden_axe.png +++ b/assets/minecraft/textures/item/golden_axe.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e709211f89ef1d4dd05eea8ea4a9b48ca323fc57c8390ceead92923f0f065a46 -size 179 +oid sha256:10fd193bd09d53ed497ccf3e60e3aa06c504dd580d40a03bacaa03ac71b2d80b +size 178 diff --git a/assets/minecraft/textures/item/golden_carrot.png b/assets/minecraft/textures/item/golden_carrot.png index 30e33995..2a8cee45 100644 --- a/assets/minecraft/textures/item/golden_carrot.png +++ b/assets/minecraft/textures/item/golden_carrot.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:45a268364038d628e05d74be2f09a7e85e21236e2f7474f1d32d7d5021476f8f -size 204 +oid sha256:8f96f1f3eda35e077b0077b58a0f3b1dea5757cf2404faa37a9a4314a5728246 +size 201 diff --git a/assets/minecraft/textures/item/golden_chestplate.png b/assets/minecraft/textures/item/golden_chestplate.png index 2794b535..0a59b29a 100644 --- a/assets/minecraft/textures/item/golden_chestplate.png +++ b/assets/minecraft/textures/item/golden_chestplate.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4e4de9bb73504c717a0f067eba682336da1c637f3eeea0c313f15d125f588417 -size 203 +oid sha256:e4d749843d2a20d3c6b90023b84fbc222a80b069dd7675fc85642a2884f9f2a8 +size 189 diff --git a/assets/minecraft/textures/item/golden_pickaxe.png b/assets/minecraft/textures/item/golden_pickaxe.png index 293bddcc..e26ef519 100644 --- a/assets/minecraft/textures/item/golden_pickaxe.png +++ b/assets/minecraft/textures/item/golden_pickaxe.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:55c30dae711177820b2ebf82027083ed1bd1ac0b02144f83eae009e0ef50f540 -size 181 +oid sha256:d4ae65e1b351ed9b960b625501ab193324c773cf43d7663a6ca61dbb637fa9b0 +size 180 diff --git a/assets/minecraft/textures/item/golden_sword.png b/assets/minecraft/textures/item/golden_sword.png index 472aa11c..ae74ec5f 100644 --- a/assets/minecraft/textures/item/golden_sword.png +++ b/assets/minecraft/textures/item/golden_sword.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ec9c723ff0d81cf7254ec59819a4179c65a15edcc9148bddea569e54791b25da -size 196 +oid sha256:fe02861c6a870269a16432a867b67e09cf8a417a56d060e053c921ffaf4aa988 +size 194 diff --git a/assets/minecraft/textures/item/gray_bundle.png b/assets/minecraft/textures/item/gray_bundle.png index 0a7692bb..f7ed0483 100644 --- a/assets/minecraft/textures/item/gray_bundle.png +++ b/assets/minecraft/textures/item/gray_bundle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4d8dbcbd1c095a4e07ddd7749a492f17b853aebe6447a3b97b4acb2644dd07b1 -size 206 +oid sha256:e473fae9384e284849ea5c1b5271905e379ef30cf8a91a77136724a99b74be61 +size 203 diff --git a/assets/minecraft/textures/item/gray_bundle_open_back.png b/assets/minecraft/textures/item/gray_bundle_open_back.png index 01b8e9ea..4370bb25 100644 --- a/assets/minecraft/textures/item/gray_bundle_open_back.png +++ b/assets/minecraft/textures/item/gray_bundle_open_back.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bc1c3f78ae85056217f569e3d0ef688727d75785d33f9e3337dd4cf1d029f248 -size 152 +oid sha256:651b9309f5977cf03100fb204442f3ce5ff4811ba82f3ac6ba1b94a9e3fa33ef +size 138 diff --git a/assets/minecraft/textures/item/gray_bundle_open_front.png b/assets/minecraft/textures/item/gray_bundle_open_front.png index dc5c1828..121e9abe 100644 --- a/assets/minecraft/textures/item/gray_bundle_open_front.png +++ b/assets/minecraft/textures/item/gray_bundle_open_front.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1af2cf1f5142ff63929a5f29bbabc50ebf52272f77e452b56df2d17550fd621e -size 191 +oid sha256:64101bcf30de0c9062409b487572c62d5a654808372054cee58fa013453b48c4 +size 190 diff --git a/assets/minecraft/textures/item/gray_candle.png b/assets/minecraft/textures/item/gray_candle.png index 3968c62f..4c99b247 100644 --- a/assets/minecraft/textures/item/gray_candle.png +++ b/assets/minecraft/textures/item/gray_candle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2cf3956d284d30d41cb06538444d80ea0779df6de1435e8023da619f66424925 -size 183 +oid sha256:47b38b5382dbf897a7ec1716898a97f55e03d6ec49f59ca725e6c3efcf4b494e +size 179 diff --git a/assets/minecraft/textures/item/gray_harness.png b/assets/minecraft/textures/item/gray_harness.png new file mode 100644 index 00000000..8869d96c --- /dev/null +++ b/assets/minecraft/textures/item/gray_harness.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d39f88cdbeace24adbcecc575bc354ebaf0bc5a80e869ad5c2c2de05ba4a67f +size 254 diff --git a/assets/minecraft/textures/item/green_bundle.png b/assets/minecraft/textures/item/green_bundle.png index c8d337c9..1d39c31b 100644 --- a/assets/minecraft/textures/item/green_bundle.png +++ b/assets/minecraft/textures/item/green_bundle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d00437a3e22c321e918189f61a72a18334be50d001da914a06cd2b1f1302e0d7 -size 206 +oid sha256:1343698778d29e3b4ad637792c47087ee371fb53e8995bf95f5df2aaa2793b99 +size 203 diff --git a/assets/minecraft/textures/item/green_bundle_open_back.png b/assets/minecraft/textures/item/green_bundle_open_back.png index 361f770c..cd598a11 100644 --- a/assets/minecraft/textures/item/green_bundle_open_back.png +++ b/assets/minecraft/textures/item/green_bundle_open_back.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d8c0841f1bb97b7904d951fdb2f7890b12564a2d9bc279fce390ef43503fd4e4 -size 152 +oid sha256:634e126e343db134c30e630675257f19819f9a17912f1967a2030546a339e095 +size 138 diff --git a/assets/minecraft/textures/item/green_candle.png b/assets/minecraft/textures/item/green_candle.png index 8b2fcb18..70aff1e2 100644 --- a/assets/minecraft/textures/item/green_candle.png +++ b/assets/minecraft/textures/item/green_candle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:00545c4dcb5c2de74626268e2ef729f1e4d419eae47aede77673974f6da1a4cf -size 183 +oid sha256:f6c0ca8fff8e0329152f7143bf34fb3f4700eecf73c654461ccd6a8d6e37c618 +size 179 diff --git a/assets/minecraft/textures/item/green_dye.png b/assets/minecraft/textures/item/green_dye.png index 12d09c8b..4ae40bf6 100644 --- a/assets/minecraft/textures/item/green_dye.png +++ b/assets/minecraft/textures/item/green_dye.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4941250888212437bc3fc6f34d6f2913d59b8f34d86692772104f8cad0959a7c -size 189 +oid sha256:ed18769b69f7d561e51a2908771610a2f2db036d06272cad3a0fd4e669dd5e2d +size 175 diff --git a/assets/minecraft/textures/item/green_harness.png b/assets/minecraft/textures/item/green_harness.png new file mode 100644 index 00000000..cfb580fe --- /dev/null +++ b/assets/minecraft/textures/item/green_harness.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d749f55bfb6817bc68ba5b3d6dc453c8c1e390b03832706606e89c3acb39705 +size 254 diff --git a/assets/minecraft/textures/item/gunpowder.png b/assets/minecraft/textures/item/gunpowder.png index 15d59d65..c6a5057d 100644 --- a/assets/minecraft/textures/item/gunpowder.png +++ b/assets/minecraft/textures/item/gunpowder.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e23356d9ff24102af4d9ffb48e319d73f235f8bdca8da92fa3a26cef791d33e1 -size 179 +oid sha256:9551e2f663c9d7291991f9c922daf68ed26adb99de9c8ef5173f24f0c8693585 +size 151 diff --git a/assets/minecraft/textures/item/guster_banner_pattern.png b/assets/minecraft/textures/item/guster_banner_pattern.png index acb1506d..bf09f63a 100644 --- a/assets/minecraft/textures/item/guster_banner_pattern.png +++ b/assets/minecraft/textures/item/guster_banner_pattern.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bf6945f97f00abef4f08c79dbe6e0b9d7515eddc27c374f5a397ac8a3d89a702 -size 207 +oid sha256:ac10c115fe89891d64ae2cd3e768e3e6dcfa1a54c9b8143c3336e653ad0559f1 +size 199 diff --git a/assets/minecraft/textures/item/guster_pottery_sherd.png b/assets/minecraft/textures/item/guster_pottery_sherd.png index 8d1578fd..1eb29604 100644 --- a/assets/minecraft/textures/item/guster_pottery_sherd.png +++ b/assets/minecraft/textures/item/guster_pottery_sherd.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:28a1e45fec0a58301fc28c2f3877a4b1cab9f1608c42c2ff459b0453894835d8 -size 220 +oid sha256:6662f9a158b82b35ece7acfd506b52a1ab914e68404380da67b65127eafbb61a +size 207 diff --git a/assets/minecraft/textures/item/happy_ghast_spawn_egg.png b/assets/minecraft/textures/item/happy_ghast_spawn_egg.png new file mode 100644 index 00000000..98599247 --- /dev/null +++ b/assets/minecraft/textures/item/happy_ghast_spawn_egg.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1844ac8aa0faaa3ddd578fc51348891f670c23fceb0aeadee9d9807853a3f51c +size 199 diff --git a/assets/minecraft/textures/item/heart_of_the_sea.png b/assets/minecraft/textures/item/heart_of_the_sea.png index 436be236..289e5f28 100644 --- a/assets/minecraft/textures/item/heart_of_the_sea.png +++ b/assets/minecraft/textures/item/heart_of_the_sea.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eccdfefac9d189d388c2c3ab319ba46231ffd784e230205daea6c30719c3211a -size 212 +oid sha256:70b8bb218671dad4d28a9ac91d310501741e5069dd14dac08bbab04f3f445b86 +size 198 diff --git a/assets/minecraft/textures/item/heart_pottery_sherd.png b/assets/minecraft/textures/item/heart_pottery_sherd.png index 0af1af5f..d2dafa49 100644 --- a/assets/minecraft/textures/item/heart_pottery_sherd.png +++ b/assets/minecraft/textures/item/heart_pottery_sherd.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:db2a10f07122cfbc30e2d705b01eb6e6fefcc5b32ff1130e267dfd281401e3fd -size 220 +oid sha256:63105e17ad910dc4e70ce6f8e5fda828b684f0dbb37b77c5cad41078e6bbe337 +size 203 diff --git a/assets/minecraft/textures/item/heartbreak_pottery_sherd.png b/assets/minecraft/textures/item/heartbreak_pottery_sherd.png index 43de8c54..0334474a 100644 --- a/assets/minecraft/textures/item/heartbreak_pottery_sherd.png +++ b/assets/minecraft/textures/item/heartbreak_pottery_sherd.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:52ae504b1e67460c6d51632bd7ff90a09a691d23761f39eeb556b92f45ed6ec7 -size 221 +oid sha256:568b4b7ea4452582d8e773b70521baf224d28add897d7308b72494689f0f6257 +size 206 diff --git a/assets/minecraft/textures/item/honey_bottle.png b/assets/minecraft/textures/item/honey_bottle.png index 92f423a6..c71f50a1 100644 --- a/assets/minecraft/textures/item/honey_bottle.png +++ b/assets/minecraft/textures/item/honey_bottle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c41e02d9398446543c77a4a50678715d6182004e8f170c6b5c12d84578fe5d98 -size 236 +oid sha256:299b5884e46622fa116bb7badd7db1243147fd89383e5dbb957092e0d7207c38 +size 194 diff --git a/assets/minecraft/textures/item/honeycomb.png b/assets/minecraft/textures/item/honeycomb.png index 3818fe41..9ff2cad2 100644 --- a/assets/minecraft/textures/item/honeycomb.png +++ b/assets/minecraft/textures/item/honeycomb.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0cb13b7ba902f79a6fd055b810e9d367a73c2fa29e2d5090bb35fa082e02504d -size 199 +oid sha256:7269673c9fcd376a74f37aaa1dd68820ed424944873506464690ec86cee40ffe +size 187 diff --git a/assets/minecraft/textures/item/hopper.png b/assets/minecraft/textures/item/hopper.png index 6b8d6d01..11ee3f68 100644 --- a/assets/minecraft/textures/item/hopper.png +++ b/assets/minecraft/textures/item/hopper.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2a64b02c225bacc39b1d2f7fe8745805a652f16dfb10ad20800b69fafa410900 -size 198 +oid sha256:6a4c36e7a9e8b4f59ff3d7de17d9708045715ab85cdc4b60534d3f643a4c5791 +size 191 diff --git a/assets/minecraft/textures/item/hopper_minecart.png b/assets/minecraft/textures/item/hopper_minecart.png index f8c346ea..759ccf4f 100644 --- a/assets/minecraft/textures/item/hopper_minecart.png +++ b/assets/minecraft/textures/item/hopper_minecart.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:15efe0439b50514898da93a2c87dcbf35b2d83db2a08ad51d9617ec4a6844602 -size 246 +oid sha256:7fc6e38a6aafedcf19f30b93c4c1344e61525f792aeb16c7ff56f31c72b94c71 +size 234 diff --git a/assets/minecraft/textures/item/host_armor_trim_smithing_template.png b/assets/minecraft/textures/item/host_armor_trim_smithing_template.png index f2b9ead3..55a838aa 100644 --- a/assets/minecraft/textures/item/host_armor_trim_smithing_template.png +++ b/assets/minecraft/textures/item/host_armor_trim_smithing_template.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0fb14d288b66c15c2a1243e59652a1ed33199d9ebfd30feea0204084cec2163a -size 256 +oid sha256:d843982f31bdb10c0e717753f739eb45f8d58c238741b767c2a5dcd7e0e58616 +size 203 diff --git a/assets/minecraft/textures/item/howl_pottery_sherd.png b/assets/minecraft/textures/item/howl_pottery_sherd.png index 2d78809d..a259f3fd 100644 --- a/assets/minecraft/textures/item/howl_pottery_sherd.png +++ b/assets/minecraft/textures/item/howl_pottery_sherd.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4bc3320dadb29e536501cb5a98a510a41f53d9deda70ad212a95a1938c019b5e -size 219 +oid sha256:1412e0d4c17cfcc79a9cdbd33151baf55a50dbe1204af4da40ba0441c3d56f6f +size 203 diff --git a/assets/minecraft/textures/item/iron_boots.png b/assets/minecraft/textures/item/iron_boots.png index 2629b757..72a40a35 100644 --- a/assets/minecraft/textures/item/iron_boots.png +++ b/assets/minecraft/textures/item/iron_boots.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e4a500c023d7a54a63810b97187de55503960298a225bd64f68e18253e408a14 -size 167 +oid sha256:95712e011d6ff507e261fdd6cfc350eaad4861c495c114aaa357dd055ba374e8 +size 143 diff --git a/assets/minecraft/textures/item/iron_chestplate.png b/assets/minecraft/textures/item/iron_chestplate.png index 2d154da1..dd67390e 100644 --- a/assets/minecraft/textures/item/iron_chestplate.png +++ b/assets/minecraft/textures/item/iron_chestplate.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:028d1a738128c5622471a9d1b94f00b49a696e7c4fac3dfccd07272e50021f71 -size 197 +oid sha256:b1b467d1c98efda1c2bd31c5a32fadc884b424b3d08f3b010d9053a1e0f0609a +size 161 diff --git a/assets/minecraft/textures/item/iron_door.png b/assets/minecraft/textures/item/iron_door.png index 2b4f5b52..fa02a9b5 100644 --- a/assets/minecraft/textures/item/iron_door.png +++ b/assets/minecraft/textures/item/iron_door.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f8d15cc3eba6a45a56e9b16d36035ba8b84679a95d6994d5b14711b28aad8b03 -size 153 +oid sha256:11dc3fd0a1bb90f7dd4f7a8ee4e14ba7ad2a7187c00bb7a7daf239f995035379 +size 127 diff --git a/assets/minecraft/textures/item/iron_helmet.png b/assets/minecraft/textures/item/iron_helmet.png index e0de48af..942d5661 100644 --- a/assets/minecraft/textures/item/iron_helmet.png +++ b/assets/minecraft/textures/item/iron_helmet.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:db530074cf0a2b1e6d6958f66536625764f47e00e3c1cc9f558586c24a5cf9dc -size 157 +oid sha256:bc80d67ae51da4d0142461d42454f1bab174dbde235be46149e01b142f6a44e4 +size 134 diff --git a/assets/minecraft/textures/item/iron_ingot.png b/assets/minecraft/textures/item/iron_ingot.png index a2ae0a49..af9ce65a 100644 --- a/assets/minecraft/textures/item/iron_ingot.png +++ b/assets/minecraft/textures/item/iron_ingot.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4625aa2c32c74bd6796c7ba8e7ee6300db8d2f24fb38c9d9324a63b262a44391 -size 189 +oid sha256:ca67b14f685bfe1972addf6b44692dab601fe8d27464a30aa8e65f16f716cab2 +size 157 diff --git a/assets/minecraft/textures/item/iron_leggings.png b/assets/minecraft/textures/item/iron_leggings.png index 793eab0a..91461aa4 100644 --- a/assets/minecraft/textures/item/iron_leggings.png +++ b/assets/minecraft/textures/item/iron_leggings.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:64fee8e18c943e5131041b6cd560c33e2d512f3a56f99cbc4a1c545479ccba2c -size 172 +oid sha256:90704bcce246f0b5f552a218366e1c7fc22d5b99c0a75fc107af9b9a92bef806 +size 151 diff --git a/assets/minecraft/textures/item/iron_nugget.png b/assets/minecraft/textures/item/iron_nugget.png index 4aa00620..79281966 100644 --- a/assets/minecraft/textures/item/iron_nugget.png +++ b/assets/minecraft/textures/item/iron_nugget.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c9647153bb90c1ba20e2405707cc872d32284674a0086e19e8dc82fbccdfc775 -size 175 +oid sha256:b652969782255d294f42b09fabb2bd4066e9366b86615e9e886bd603750d83a3 +size 150 diff --git a/assets/minecraft/textures/item/iron_pickaxe.png b/assets/minecraft/textures/item/iron_pickaxe.png index adecbd0b..d5742bec 100644 --- a/assets/minecraft/textures/item/iron_pickaxe.png +++ b/assets/minecraft/textures/item/iron_pickaxe.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b211a9b920d8f22ce5451780855155644d14ca7b85ab16d31f9c0b572cdda7ee -size 182 +oid sha256:5d55017888833783f613632dead4c0fc19e9026e96e10417e65468569d55749b +size 181 diff --git a/assets/minecraft/textures/item/iron_shovel.png b/assets/minecraft/textures/item/iron_shovel.png index 7c1820f4..6d02183a 100644 --- a/assets/minecraft/textures/item/iron_shovel.png +++ b/assets/minecraft/textures/item/iron_shovel.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c9d36d59ec53ebc631bd24930f62087c316eef39bd237d8bb69cb2bb629dfae5 -size 155 +oid sha256:432a399180f3af76ab368f5399950caae1a879fdc6a03c01cd9f765d249a8900 +size 153 diff --git a/assets/minecraft/textures/item/iron_sword.png b/assets/minecraft/textures/item/iron_sword.png index 4c262e1a..cd943d75 100644 --- a/assets/minecraft/textures/item/iron_sword.png +++ b/assets/minecraft/textures/item/iron_sword.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ed1fa2f83955583e70a19791455d13989e8bd93b1d7240e775a57141022bed6b -size 196 +oid sha256:455f2c306a9ddc1da19b04603ae0047211e2f4e4817b105573fcdc29b3c6945f +size 194 diff --git a/assets/minecraft/textures/item/item_frame.png b/assets/minecraft/textures/item/item_frame.png index 0c5027e2..32f07a75 100644 --- a/assets/minecraft/textures/item/item_frame.png +++ b/assets/minecraft/textures/item/item_frame.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c6d184fc54077cbcf8fff93077933c7b0452f4329d0424022d36bf168681274a -size 256 +oid sha256:af00b6cbefe21d968bd607da62ac349286c6fc4b58ae8c50855fc6bb201eaa3d +size 245 diff --git a/assets/minecraft/textures/item/jungle_boat.png b/assets/minecraft/textures/item/jungle_boat.png index 2bcf7555..1d11d05f 100644 --- a/assets/minecraft/textures/item/jungle_boat.png +++ b/assets/minecraft/textures/item/jungle_boat.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:76d52b67b29ee6b0001294f8852ee79d1cb42e176ce56b75acc3d213e5d9f362 -size 328 +oid sha256:1b07f4cad60900706e4f30388b05696cd9ec6e7e6251681cbc916dc7a33e7bc7 +size 215 diff --git a/assets/minecraft/textures/item/jungle_chest_boat.png b/assets/minecraft/textures/item/jungle_chest_boat.png index d67fcaff..dfde967c 100644 --- a/assets/minecraft/textures/item/jungle_chest_boat.png +++ b/assets/minecraft/textures/item/jungle_chest_boat.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ea8b37152d9ec35037e6f4817c7f50b85a41830a7318a3216241aa44fb6830f6 -size 370 +oid sha256:b869d73a8bd82fcda5d348e85c5721c2f79724a201642c6821509b4d7bcf28d8 +size 260 diff --git a/assets/minecraft/textures/item/jungle_door.png b/assets/minecraft/textures/item/jungle_door.png index 7b72272e..b6254cc7 100644 --- a/assets/minecraft/textures/item/jungle_door.png +++ b/assets/minecraft/textures/item/jungle_door.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:97733a0c679e40617e83bf09046d5a603f2177f44f141c6d5b2d9323a4a69391 -size 175 +oid sha256:d438372d6162bb61f32f70c22e6faf07b5812b53dae559ff426913d10485dc8c +size 164 diff --git a/assets/minecraft/textures/item/jungle_hanging_sign.png b/assets/minecraft/textures/item/jungle_hanging_sign.png index 368bb6e4..e2421c9c 100644 --- a/assets/minecraft/textures/item/jungle_hanging_sign.png +++ b/assets/minecraft/textures/item/jungle_hanging_sign.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:62cff1bf77b4bc3bf5d4574c6d71972b65740b15f1578d0465baac3e3f6135e1 -size 230 +oid sha256:bdc8ec64593bfee5ca8d632c5242727fd6b9abe91d1962d40f7e1d67e0362645 +size 216 diff --git a/assets/minecraft/textures/item/jungle_sign.png b/assets/minecraft/textures/item/jungle_sign.png index 89473a7a..144b67c8 100644 --- a/assets/minecraft/textures/item/jungle_sign.png +++ b/assets/minecraft/textures/item/jungle_sign.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5f6f3f949e9b928a5bad9a307fc10cc4ace470ef17fd55c4cc97123619bf1c55 -size 221 +oid sha256:a533c4b720340af7cec61d5855da92aa8e70f53e2f485b48d595388d348c00e7 +size 219 diff --git a/assets/minecraft/textures/item/kelp.png b/assets/minecraft/textures/item/kelp.png index 2829cf65..1f8628c7 100644 --- a/assets/minecraft/textures/item/kelp.png +++ b/assets/minecraft/textures/item/kelp.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f1f2e2024b930082dc5f6c406ec704e3309a9e15c67b122aa9563bbdebc6f286 -size 188 +oid sha256:540338940ea3a543cbab924b7a0257b080626f9a30835d8581f0f2426cc5f418 +size 178 diff --git a/assets/minecraft/textures/item/knowledge_book.png b/assets/minecraft/textures/item/knowledge_book.png index 80a9460c..ae34b96a 100644 --- a/assets/minecraft/textures/item/knowledge_book.png +++ b/assets/minecraft/textures/item/knowledge_book.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c8c0f038320864de7b1921b9fc9d7e768d2371dd622d7fbff1bdeabf54f052c0 -size 211 +oid sha256:3af4beb1037dfbbf3719b0d6a3f9e6d5b154bd790a1e0e1e01b44948a63931ea +size 199 diff --git a/assets/minecraft/textures/item/lapis_lazuli.png b/assets/minecraft/textures/item/lapis_lazuli.png index 6eed9a22..170559d1 100644 --- a/assets/minecraft/textures/item/lapis_lazuli.png +++ b/assets/minecraft/textures/item/lapis_lazuli.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:261b626e66fc29d6a28990ac36c74a04afa2e1d03daff00c5f3b3e5a79463a14 -size 188 +oid sha256:3ce971e3c35c395011cc13f6f7e9664d35ab75e4c68c2d48b79629a047d9cf2e +size 181 diff --git a/assets/minecraft/textures/item/lava_bucket.png b/assets/minecraft/textures/item/lava_bucket.png index 5381b4e2..9638222a 100644 --- a/assets/minecraft/textures/item/lava_bucket.png +++ b/assets/minecraft/textures/item/lava_bucket.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:88093ce03b421a9504d42b79f2bee3a4d3ffcf3652bea3b5602cda8c86cfab2c -size 218 +oid sha256:bd3528401d4bba44e196480194a1becb47a33974df2202d464922cd412183b1a +size 213 diff --git a/assets/minecraft/textures/item/lead.png b/assets/minecraft/textures/item/lead.png index c6c62ad9..c9482e3d 100644 --- a/assets/minecraft/textures/item/lead.png +++ b/assets/minecraft/textures/item/lead.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8970ef231b71a4aec68b56d77d4bab27d69fdeb59e4a5faa6c837c3ccc9f87a5 -size 187 +oid sha256:ca67fdfe63b9dd4c6aaf2c9c57ab00e762f9dbf870fc38d76ae704b193eeabc7 +size 183 diff --git a/assets/minecraft/textures/item/leaf_litter.png b/assets/minecraft/textures/item/leaf_litter.png index fdba83e9..f58b588b 100644 --- a/assets/minecraft/textures/item/leaf_litter.png +++ b/assets/minecraft/textures/item/leaf_litter.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c205b6f8698b961fc54e4fa4df6d42a813840cd7fc07ff033a3f5ea65e534a8c -size 273 +oid sha256:1111b0952e1a68118d8095950d759d7e91a802481f55ce30caa65081ba8750d9 +size 264 diff --git a/assets/minecraft/textures/item/leather.png b/assets/minecraft/textures/item/leather.png index 73e93d40..dac437ff 100644 --- a/assets/minecraft/textures/item/leather.png +++ b/assets/minecraft/textures/item/leather.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7af3f49400e6a71b9695ee304fb8398c50f52204d361ccdd7517e52aeefb5054 -size 196 +oid sha256:0b1b32a23061afbd4771ececb9d1c1a1ba255b7591ffc3e55a2b3c5affc05577 +size 191 diff --git a/assets/minecraft/textures/item/leather_boots.png b/assets/minecraft/textures/item/leather_boots.png index 7ee6aac0..71463bb9 100644 --- a/assets/minecraft/textures/item/leather_boots.png +++ b/assets/minecraft/textures/item/leather_boots.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d54ca10f90b72004436fd9a6aa8d136a692f89f505056ae47d8395137b46637c -size 129 +oid sha256:07532cb30e92c0233fdcbfa2f12e5b962e8b03f51c551a470c8a73a9059350ef +size 110 diff --git a/assets/minecraft/textures/item/leather_chestplate.png b/assets/minecraft/textures/item/leather_chestplate.png index 1e6308d9..1195bc69 100644 --- a/assets/minecraft/textures/item/leather_chestplate.png +++ b/assets/minecraft/textures/item/leather_chestplate.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bf5990a680964167f9e9eb3d1a362750cef1f0bcd115caec88434e23e90cf0b8 -size 201 +oid sha256:250864686470fa649637984cb3d36d8b333c920d6ee64383f87feaa3784a9891 +size 166 diff --git a/assets/minecraft/textures/item/leather_chestplate_overlay.png b/assets/minecraft/textures/item/leather_chestplate_overlay.png index 20798dbd..0f873fa1 100644 --- a/assets/minecraft/textures/item/leather_chestplate_overlay.png +++ b/assets/minecraft/textures/item/leather_chestplate_overlay.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eec51b2266af48812f347de3b41d10c16205fe602ef0b02efb52af190365edea -size 74 +oid sha256:d9ec0ce5813be6332f30b75d214f682e598bb0e9e383420b0d5f3fdcde507759 +size 71 diff --git a/assets/minecraft/textures/item/leather_helmet.png b/assets/minecraft/textures/item/leather_helmet.png index ad362d17..d902688f 100644 --- a/assets/minecraft/textures/item/leather_helmet.png +++ b/assets/minecraft/textures/item/leather_helmet.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fb5c1283c5ad8e2d32ad4154e12f759a94d0431f36ecca49b3da84ffc050cd7c -size 151 +oid sha256:01d560cdf69ba9777ddc9e96b90520f9e8356a15206151dcd1ce6a89b1efcb4d +size 131 diff --git a/assets/minecraft/textures/item/leather_helmet_overlay.png b/assets/minecraft/textures/item/leather_helmet_overlay.png index fe0faee6..9d5c814c 100644 --- a/assets/minecraft/textures/item/leather_helmet_overlay.png +++ b/assets/minecraft/textures/item/leather_helmet_overlay.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5ece5fc6b1b2423953c42de058c9641dd6eacd50027f9226cac2e20f8e7add4c -size 114 +oid sha256:bd636b5c4d5e7819c8a50d6499a1e55ef9ae6f43abc096f4801d31ea692a7346 +size 113 diff --git a/assets/minecraft/textures/item/leather_leggings.png b/assets/minecraft/textures/item/leather_leggings.png index 97967ef7..2594c284 100644 --- a/assets/minecraft/textures/item/leather_leggings.png +++ b/assets/minecraft/textures/item/leather_leggings.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5fe9d39042279e71ed6279e430401f46a571c519768717631c5683d3b6f65536 -size 161 +oid sha256:66f9f2afc398c38071d5f58bc24b069c4459fa3e87789bc108c5cab2406db47c +size 141 diff --git a/assets/minecraft/textures/item/light.png b/assets/minecraft/textures/item/light.png index 812a0f9f..5ddc4ede 100644 --- a/assets/minecraft/textures/item/light.png +++ b/assets/minecraft/textures/item/light.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:370c367c9d913ac608b43462806d85c3910844f888fcf66db7aa6e0a35bc31f8 -size 127 +oid sha256:a3a2b2bc7d9763629c5145c7557b7f9a2d8dd2b5fe69b18c1031df2aefc6bde8 +size 125 diff --git a/assets/minecraft/textures/item/light_00.png b/assets/minecraft/textures/item/light_00.png index 5fc0e58e..3d3c81a4 100644 --- a/assets/minecraft/textures/item/light_00.png +++ b/assets/minecraft/textures/item/light_00.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:17840374387d307a2c3e2338dfd4d70c1551ed06cd95e656212517f942db3ff8 -size 200 +oid sha256:858e9ad82005ecc04f8ba20b0ec76661d436174e09df31469935d490829e215a +size 187 diff --git a/assets/minecraft/textures/item/light_01.png b/assets/minecraft/textures/item/light_01.png index 1d89bc7e..979a6d41 100644 --- a/assets/minecraft/textures/item/light_01.png +++ b/assets/minecraft/textures/item/light_01.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ecd57f7faec8f87ddb4c51a5d3b09e5b78e31c8a86a1427f529e1687b23b76c8 -size 206 +oid sha256:2427c220d3d9782aa26ced2e7b0135620b47a629c47b057a98ce61216579c226 +size 193 diff --git a/assets/minecraft/textures/item/light_02.png b/assets/minecraft/textures/item/light_02.png index ccd17294..bdbe1306 100644 --- a/assets/minecraft/textures/item/light_02.png +++ b/assets/minecraft/textures/item/light_02.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:27903977df1b41792f73912ccec1b924aa12d442f9ed33630f9ce685fd9f2e71 -size 211 +oid sha256:bc3f3eab1bcc9fbc3a38e556455f8c07a46e3fea3f4cb8c95cee92aa94cfb405 +size 193 diff --git a/assets/minecraft/textures/item/light_03.png b/assets/minecraft/textures/item/light_03.png index e2fc5867..87ed73f0 100644 --- a/assets/minecraft/textures/item/light_03.png +++ b/assets/minecraft/textures/item/light_03.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:17afe283d4e96e95e315b6eb6f02fcaacccd724e9e927b82283a0453ae642e09 -size 213 +oid sha256:d4fe72d37431d11a0be07ea2bfcdd3d82d38185111ffbe3b4b2e7e0ad0c6a8a4 +size 194 diff --git a/assets/minecraft/textures/item/light_04.png b/assets/minecraft/textures/item/light_04.png index 676fc2e5..5c0d865f 100644 --- a/assets/minecraft/textures/item/light_04.png +++ b/assets/minecraft/textures/item/light_04.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c4b037d497b1620b36305eb6e4bf885d583c87f4ac78ff114bf0894dda08ae3b -size 210 +oid sha256:2d522976ae3647cd9d005065b8c9bbead119acd63867f045cb5a607faf3c6f73 +size 195 diff --git a/assets/minecraft/textures/item/light_05.png b/assets/minecraft/textures/item/light_05.png index 6bde3a6a..8889593e 100644 --- a/assets/minecraft/textures/item/light_05.png +++ b/assets/minecraft/textures/item/light_05.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5efc97fb894d2e23b2731a9ec34fe38b4ed72916f8339f1f67fda190aea9e9d2 -size 206 +oid sha256:2d7e1208d8807917ba03c8c3cd2e624ba25bf4fa3576329303b5d9122c48319b +size 205 diff --git a/assets/minecraft/textures/item/light_06.png b/assets/minecraft/textures/item/light_06.png index b542fa3a..cc49f7ac 100644 --- a/assets/minecraft/textures/item/light_06.png +++ b/assets/minecraft/textures/item/light_06.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:43a7c7d3a5484bb6c78096db3e61f447d5581da66fa70a3be2711b151447b388 -size 207 +oid sha256:0aa4f75ab647b797f80a2de6f329e6942baf9826fe2a68ca58cae9fdf4a9458f +size 204 diff --git a/assets/minecraft/textures/item/light_07.png b/assets/minecraft/textures/item/light_07.png index cb3ce17e..4f9df98f 100644 --- a/assets/minecraft/textures/item/light_07.png +++ b/assets/minecraft/textures/item/light_07.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:85a97f20123968ff8bbc78a84478fd83e1ec7473b4c9b5f677940e9531be6597 -size 219 +oid sha256:0dabca796d28e1a38a609879fc69cf3c0ea23808b5d11c60ce9bdad58238eaa8 +size 218 diff --git a/assets/minecraft/textures/item/light_08.png b/assets/minecraft/textures/item/light_08.png index 4602baa2..e92aeff9 100644 --- a/assets/minecraft/textures/item/light_08.png +++ b/assets/minecraft/textures/item/light_08.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2b7a212fd90180a471b4b9fa7b643cf25b2342b25823c4227c91643acba8e23d -size 217 +oid sha256:26ed7c688ac7834cf8bb4f6880fb53c71f4c7e1db4fd79a4acf3a48c5b5658c5 +size 216 diff --git a/assets/minecraft/textures/item/light_09.png b/assets/minecraft/textures/item/light_09.png index 9e4e140f..edbc4a05 100644 --- a/assets/minecraft/textures/item/light_09.png +++ b/assets/minecraft/textures/item/light_09.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b7b0c8c1a9df897cf7c54a0dcd98765976624bd07235f8569adb1a5e8c8352b7 -size 219 +oid sha256:09af9725f0d73ef4c792e4bf5625f2eb12c65935e2ff38f2b9f79444a918b1d2 +size 218 diff --git a/assets/minecraft/textures/item/light_11.png b/assets/minecraft/textures/item/light_11.png index e54742d6..1fff9e5b 100644 --- a/assets/minecraft/textures/item/light_11.png +++ b/assets/minecraft/textures/item/light_11.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cebb00c280045487637b79e6a22573c631add00d071e1bb308d268e803943d5e -size 224 +oid sha256:1ad58d069752cb097b59be3938f3d02ebe795da9754761008025fb528cb74d73 +size 223 diff --git a/assets/minecraft/textures/item/light_14.png b/assets/minecraft/textures/item/light_14.png index 381bd3d7..c452f2c8 100644 --- a/assets/minecraft/textures/item/light_14.png +++ b/assets/minecraft/textures/item/light_14.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e9ebafd67611cd50431cc9850d685f9bb53c47f010409dcaed78656184e8786e -size 201 +oid sha256:3134b18ec2de72c7e6e1663cad0c141d07e31f0161d536a6d9138273c890be35 +size 193 diff --git a/assets/minecraft/textures/item/light_15.png b/assets/minecraft/textures/item/light_15.png index 6508772a..21115e7b 100644 --- a/assets/minecraft/textures/item/light_15.png +++ b/assets/minecraft/textures/item/light_15.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:181864aa81a28e5b411bad8a4687ad41b67129f535bd8ddfffd56cfa1542f064 -size 189 +oid sha256:2f77248333e28f32c7b6976015f46bad15ef7abba41af0d04dac21cdf332a5cb +size 186 diff --git a/assets/minecraft/textures/item/light_blue_bundle.png b/assets/minecraft/textures/item/light_blue_bundle.png index b8ac2f24..80052bf9 100644 --- a/assets/minecraft/textures/item/light_blue_bundle.png +++ b/assets/minecraft/textures/item/light_blue_bundle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dca45d59594a5dd411dd7554b43bda1b83ca146a42787748b8524746ad460308 -size 206 +oid sha256:e9d787149d79eabaea2e021dfbcfb64a5a7badd5a8ca8b9b7943f552244047ce +size 203 diff --git a/assets/minecraft/textures/item/light_blue_bundle_open_back.png b/assets/minecraft/textures/item/light_blue_bundle_open_back.png index 66c909fd..68ad9176 100644 --- a/assets/minecraft/textures/item/light_blue_bundle_open_back.png +++ b/assets/minecraft/textures/item/light_blue_bundle_open_back.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8380309c69e919377d296188f71b30cfb6f143bfb2d197c6e0e09e0fc2865d5a -size 152 +oid sha256:a47d2ec61f6cfa3e01fe2fdd71a9ed13f2bb2c0070062eba8e1e051ec1467d99 +size 139 diff --git a/assets/minecraft/textures/item/light_blue_bundle_open_front.png b/assets/minecraft/textures/item/light_blue_bundle_open_front.png index e0618174..23ddf2d7 100644 --- a/assets/minecraft/textures/item/light_blue_bundle_open_front.png +++ b/assets/minecraft/textures/item/light_blue_bundle_open_front.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7b1439dcbde6706414fc557f16c233d2fd228bc8a994ff799c8e49a3a45ee2c8 -size 191 +oid sha256:b7575c9af1694b6537ea1610d5e9c847a36428cf8292aef2ca36a5b65cc8edb7 +size 189 diff --git a/assets/minecraft/textures/item/light_blue_candle.png b/assets/minecraft/textures/item/light_blue_candle.png index aac04585..26f7ae48 100644 --- a/assets/minecraft/textures/item/light_blue_candle.png +++ b/assets/minecraft/textures/item/light_blue_candle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:db48b456e66f1fd672939be7c97ee8c9d02d18aa314ff0d41b56d330f0f3dc6f -size 183 +oid sha256:7a086974ad8bd1a208e860f8fb572ece9a31fb000ca36ef01305270b6c23985c +size 179 diff --git a/assets/minecraft/textures/item/light_blue_harness.png b/assets/minecraft/textures/item/light_blue_harness.png new file mode 100644 index 00000000..a9b36995 --- /dev/null +++ b/assets/minecraft/textures/item/light_blue_harness.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:92a65f25b87ab295f80948b0217f173ef738b05c765387548c2044d6bc6a24ee +size 254 diff --git a/assets/minecraft/textures/item/light_gray_bundle.png b/assets/minecraft/textures/item/light_gray_bundle.png index adf504ba..53796c18 100644 --- a/assets/minecraft/textures/item/light_gray_bundle.png +++ b/assets/minecraft/textures/item/light_gray_bundle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:819c143038f07967ce82a0c55f91e74f6afc15589fe896ecce2820eddfd14046 -size 206 +oid sha256:83426bf7d2dfb5dcdb757c513c7a0c68442085b5b0ce480fd1412344d674dc4e +size 203 diff --git a/assets/minecraft/textures/item/light_gray_bundle_open_back.png b/assets/minecraft/textures/item/light_gray_bundle_open_back.png index d24eb9ee..15d0c8d0 100644 --- a/assets/minecraft/textures/item/light_gray_bundle_open_back.png +++ b/assets/minecraft/textures/item/light_gray_bundle_open_back.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:be1f298bb2ebfb2cd063d6dd531ca64c0f07fb1db233f7bc798b9846c491ada8 -size 152 +oid sha256:91504833e0d037e57d9d6e7ac945f4ac9c5e16316d5281eb5a33b60907146620 +size 139 diff --git a/assets/minecraft/textures/item/light_gray_bundle_open_front.png b/assets/minecraft/textures/item/light_gray_bundle_open_front.png index cf3070b7..a7d21aa3 100644 --- a/assets/minecraft/textures/item/light_gray_bundle_open_front.png +++ b/assets/minecraft/textures/item/light_gray_bundle_open_front.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2f3a75457158ae841815cb0a61e490753bed15c0bd72c251266269ef6b721c9c -size 191 +oid sha256:7e4395a9b1c40122bee45d7c2ed3334a3b5b6166f3fa6d2f67a71be632afe907 +size 187 diff --git a/assets/minecraft/textures/item/light_gray_candle.png b/assets/minecraft/textures/item/light_gray_candle.png index a255d876..d671b5ec 100644 --- a/assets/minecraft/textures/item/light_gray_candle.png +++ b/assets/minecraft/textures/item/light_gray_candle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e979820b4178f737dfd600e3e7d6e0e10cf99191c52740914caea8810b33e895 -size 183 +oid sha256:ac8dafbee23c5bb7a4c257055b95ff612e1ed82f1d91818f4e2cd1aa8deed639 +size 179 diff --git a/assets/minecraft/textures/item/light_gray_harness.png b/assets/minecraft/textures/item/light_gray_harness.png new file mode 100644 index 00000000..05dea766 --- /dev/null +++ b/assets/minecraft/textures/item/light_gray_harness.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be93304ba97a780616bad260d1aa524003764c76d28929e33ab2dc5f98c4bee8 +size 254 diff --git a/assets/minecraft/textures/item/lime_bundle.png b/assets/minecraft/textures/item/lime_bundle.png index d720d515..a9341d92 100644 --- a/assets/minecraft/textures/item/lime_bundle.png +++ b/assets/minecraft/textures/item/lime_bundle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5b2a2b78c6c95d1c9ef031dcd6b4cac6c48469b275ce5bbe94c0487cd7271a59 -size 206 +oid sha256:0e42db045ffdc2fa28b2b93f0e41000dd86bbc02661728804a66a08cadab31ac +size 203 diff --git a/assets/minecraft/textures/item/lime_bundle_open_back.png b/assets/minecraft/textures/item/lime_bundle_open_back.png index 566833a1..0a57eefb 100644 --- a/assets/minecraft/textures/item/lime_bundle_open_back.png +++ b/assets/minecraft/textures/item/lime_bundle_open_back.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f37fe4c89075a1bf94468eb6c76d91f3fc43ce455e86b5de8c3bdc3e3338e2af -size 152 +oid sha256:7b41f568b3106fe4443277c0ccb86e18d4bfafbb4345f6695d13b1d585b20883 +size 139 diff --git a/assets/minecraft/textures/item/lime_bundle_open_front.png b/assets/minecraft/textures/item/lime_bundle_open_front.png index c1b2acad..7257c309 100644 --- a/assets/minecraft/textures/item/lime_bundle_open_front.png +++ b/assets/minecraft/textures/item/lime_bundle_open_front.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c8256856787785f41f9b6fdbe1a7135a985ff3d6ad8971db4077ea605a95115b -size 191 +oid sha256:71fe016893ca7f16b3c3a68d074b125f931136cf5323a2bebb92bae37d669dfd +size 189 diff --git a/assets/minecraft/textures/item/lime_candle.png b/assets/minecraft/textures/item/lime_candle.png index d170054c..cfcd4928 100644 --- a/assets/minecraft/textures/item/lime_candle.png +++ b/assets/minecraft/textures/item/lime_candle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a6cb7ec69a79793053b915f10dd643b77069f1e637ed2a4fcb16a441113b4a41 -size 183 +oid sha256:7f2fdbf0f38eca5757aa982f45482f20a77e953253eec76109c9265429180798 +size 179 diff --git a/assets/minecraft/textures/item/lime_harness.png b/assets/minecraft/textures/item/lime_harness.png new file mode 100644 index 00000000..30b1a15e --- /dev/null +++ b/assets/minecraft/textures/item/lime_harness.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:13bf3075522ed1c01e5ca2f0c4b1d2e280f22cfa98ca7a8d2746b67ab0c271bf +size 254 diff --git a/assets/minecraft/textures/item/lingering_potion.png b/assets/minecraft/textures/item/lingering_potion.png index 89ca0423..e9093876 100644 --- a/assets/minecraft/textures/item/lingering_potion.png +++ b/assets/minecraft/textures/item/lingering_potion.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:72e9deef65219b6b49745997c9adbca810ea70f9f54662fc44810f33bac198c0 -size 141 +oid sha256:fdd0d7eb5a01bdf8c804b8b22174d15793aeaefd9dd0a430b6f9997140d85d1f +size 138 diff --git a/assets/minecraft/textures/item/llama_spawn_egg.png b/assets/minecraft/textures/item/llama_spawn_egg.png index b2d51923..3499cb74 100644 --- a/assets/minecraft/textures/item/llama_spawn_egg.png +++ b/assets/minecraft/textures/item/llama_spawn_egg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6e1eb88d7ad03ee8664e2d7f1be3fc45f12f21eb84b4296a8dd7c74f3a50f14e -size 223 +oid sha256:1a95f6a4c577146dba8d0b6380e194595509d92d111608c06f70b7cfc47628b3 +size 211 diff --git a/assets/minecraft/textures/item/mace.png b/assets/minecraft/textures/item/mace.png index c8c67082..b6ba7fea 100644 --- a/assets/minecraft/textures/item/mace.png +++ b/assets/minecraft/textures/item/mace.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:24df4103c5aca3109b55af831878f2c22e804b5d2774b801146beae0bbebafe9 -size 307 +oid sha256:389119cde42a517b1bb217a9baa216285babfa9f3d8718e05b8b98a5349a45b1 +size 200 diff --git a/assets/minecraft/textures/item/magenta_bundle.png b/assets/minecraft/textures/item/magenta_bundle.png index 1de2ada8..4f594445 100644 --- a/assets/minecraft/textures/item/magenta_bundle.png +++ b/assets/minecraft/textures/item/magenta_bundle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f87f8f55777172430dcc97214ffd5eddd78110e89edc4153e7fca1540857e770 -size 206 +oid sha256:57feb00ed0dc1acb102f72c7a887533d44a288715487ad8e5a8f3c941147a669 +size 203 diff --git a/assets/minecraft/textures/item/magenta_bundle_open_back.png b/assets/minecraft/textures/item/magenta_bundle_open_back.png index ebb8916a..c1a549c2 100644 --- a/assets/minecraft/textures/item/magenta_bundle_open_back.png +++ b/assets/minecraft/textures/item/magenta_bundle_open_back.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:53c0a5b8d19d107d7089ec138eff4c567f1eef357807db34f40752fede51eb36 -size 152 +oid sha256:bbac60d1dbf93a4160b40857663b80f9089f953347225e4996ae661fc3c3511d +size 139 diff --git a/assets/minecraft/textures/item/magenta_candle.png b/assets/minecraft/textures/item/magenta_candle.png index 648efcc5..4e3c3e13 100644 --- a/assets/minecraft/textures/item/magenta_candle.png +++ b/assets/minecraft/textures/item/magenta_candle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5e9f46bdc9a9c09603436998f7af08bf95a692707b66337abf65280378b5adef -size 183 +oid sha256:11ecaa930b01f7c19bca513a304f2b80464ea77dbf11fdef7b2cb00257c26c12 +size 179 diff --git a/assets/minecraft/textures/item/magenta_harness.png b/assets/minecraft/textures/item/magenta_harness.png new file mode 100644 index 00000000..84be67ca --- /dev/null +++ b/assets/minecraft/textures/item/magenta_harness.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a97dfcaeb4107a7fc32d6a6288f0412ccb115bab4ea706aade8ee2fb3eb2b5c +size 254 diff --git a/assets/minecraft/textures/item/magma_cream.png b/assets/minecraft/textures/item/magma_cream.png index 0d260c9f..c213a08e 100644 --- a/assets/minecraft/textures/item/magma_cream.png +++ b/assets/minecraft/textures/item/magma_cream.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:44267c1a9d5f25de1eb040da77e3b97f696b16dc29565a6a3514433ee042bea7 -size 214 +oid sha256:d4c8d794b47d414060539069e1b3c8260b92e0e1e042f81390d05012d8e6e843 +size 213 diff --git a/assets/minecraft/textures/item/magma_cube_spawn_egg.png b/assets/minecraft/textures/item/magma_cube_spawn_egg.png index b9050c8d..54b71a40 100644 --- a/assets/minecraft/textures/item/magma_cube_spawn_egg.png +++ b/assets/minecraft/textures/item/magma_cube_spawn_egg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2213be1fe21507a22d5ab580fb1da9ab70c2f63c9a35fdc824bea802165578cf -size 265 +oid sha256:4ce682868818aa173bff02b284223d04bfcfba51193132b3b725104bee7b6f69 +size 257 diff --git a/assets/minecraft/textures/item/mangrove_boat.png b/assets/minecraft/textures/item/mangrove_boat.png index bdc15459..360bef1e 100644 --- a/assets/minecraft/textures/item/mangrove_boat.png +++ b/assets/minecraft/textures/item/mangrove_boat.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:65638b91d147070748d73048fe8314ee3a3b2363359a51836c6416c585d3d6b7 -size 316 +oid sha256:076314932ac18148c8405f8718250bcb9b4d3d1fb3674974ecb9a009e8f55263 +size 215 diff --git a/assets/minecraft/textures/item/mangrove_chest_boat.png b/assets/minecraft/textures/item/mangrove_chest_boat.png index 9c38e664..19119095 100644 --- a/assets/minecraft/textures/item/mangrove_chest_boat.png +++ b/assets/minecraft/textures/item/mangrove_chest_boat.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:be232a0f8c69a1df75b95d82540a4c143ef5970170bb7852888d00ae105347fd -size 357 +oid sha256:9b687ab4023f92cde4706f6a1d34ced13b8d16e14d5c57fbdb7cc853774b7ed0 +size 260 diff --git a/assets/minecraft/textures/item/mangrove_door.png b/assets/minecraft/textures/item/mangrove_door.png index cb3e36b4..6e3fff95 100644 --- a/assets/minecraft/textures/item/mangrove_door.png +++ b/assets/minecraft/textures/item/mangrove_door.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a02f1ef30ebba169f956fbbb62c7403a362577670320aa612aed2e6e30363d77 -size 198 +oid sha256:610d2a26da4ba82014cd11381f941fbfbe81c038292a5155d2bd8e658746d223 +size 194 diff --git a/assets/minecraft/textures/item/mangrove_hanging_sign.png b/assets/minecraft/textures/item/mangrove_hanging_sign.png index 58e63ada..5172f085 100644 --- a/assets/minecraft/textures/item/mangrove_hanging_sign.png +++ b/assets/minecraft/textures/item/mangrove_hanging_sign.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:81956827580645d3a91f6eb9d0484ed0ebf00255e465f024009ced0d7a94128c -size 229 +oid sha256:e63622340f9b3a5026fb81c8512580daaf1b7181dc91dbe7aaa0ec198fc47640 +size 216 diff --git a/assets/minecraft/textures/item/mangrove_sign.png b/assets/minecraft/textures/item/mangrove_sign.png index 156babe1..af6764c3 100644 --- a/assets/minecraft/textures/item/mangrove_sign.png +++ b/assets/minecraft/textures/item/mangrove_sign.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f36bc79138776de7edc623154e01d881bfdd442165821cc2e2d2de5f987532e -size 211 +oid sha256:e753f179f8c24b1ed3d7ab0956f07118ac04f8f00856718cda53d219fd0fa029 +size 210 diff --git a/assets/minecraft/textures/item/map.png b/assets/minecraft/textures/item/map.png index f1a30f29..78f64786 100644 --- a/assets/minecraft/textures/item/map.png +++ b/assets/minecraft/textures/item/map.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:22e0f1856b995aa6a3f71525bba330ec31e739506d5565f52c05a0c60f93db42 -size 177 +oid sha256:775de76489d62f6934eb4f2216de51501b108e1e1e4a34de90d0edb1f1f5513e +size 173 diff --git a/assets/minecraft/textures/item/melon_seeds.png b/assets/minecraft/textures/item/melon_seeds.png index ee956862..0c14a16a 100644 --- a/assets/minecraft/textures/item/melon_seeds.png +++ b/assets/minecraft/textures/item/melon_seeds.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f3c109b065740bfeb12f6676761bfe49c9ed025ce3c17c895fda826ed76c29c -size 146 +oid sha256:139f68219db8fc91343179813e93ff056fcccb70038a33c6efa874547c18f7e6 +size 140 diff --git a/assets/minecraft/textures/item/milk_bucket.png b/assets/minecraft/textures/item/milk_bucket.png index a618018e..55ec4a8e 100644 --- a/assets/minecraft/textures/item/milk_bucket.png +++ b/assets/minecraft/textures/item/milk_bucket.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4fe54fe49384a16fead5dec458363eb6656660cde88e53eb1c4adbee3c88a6a1 -size 206 +oid sha256:49d007b30e73847f66ce2d594ef137d82c3268f6903ed12740eccb4dee7986e9 +size 201 diff --git a/assets/minecraft/textures/item/minecart.png b/assets/minecraft/textures/item/minecart.png index 7083dc6f..d33211b1 100644 --- a/assets/minecraft/textures/item/minecart.png +++ b/assets/minecraft/textures/item/minecart.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a8fa31ba5b4bcc83e0ac1a6d88b1c3965fa1a4bf41943116a7b825ff62c62155 -size 226 +oid sha256:3f747009754ec30eb68ebdc02386ddd5eff7ecb1b268c8dfb69a178789e175a8 +size 217 diff --git a/assets/minecraft/textures/item/miner_pottery_sherd.png b/assets/minecraft/textures/item/miner_pottery_sherd.png index d2534eac..9ff5233b 100644 --- a/assets/minecraft/textures/item/miner_pottery_sherd.png +++ b/assets/minecraft/textures/item/miner_pottery_sherd.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8dc45c8b37b1d01364e3c324da663d1e06074e9bc3f00e26bf5bf8655ba7e135 -size 221 +oid sha256:a940f1474fbb2ab020d8f2a6b3a11718fd2bee65a4f169dfeece08b002b26919 +size 205 diff --git a/assets/minecraft/textures/item/mojang_banner_pattern.png b/assets/minecraft/textures/item/mojang_banner_pattern.png index c0ec8a13..c3f1bce8 100644 --- a/assets/minecraft/textures/item/mojang_banner_pattern.png +++ b/assets/minecraft/textures/item/mojang_banner_pattern.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:92759f2618d9cb3beb98c266a0563ed7586428a78f6bf3a8d61e09325d0e632d -size 216 +oid sha256:92687681d87b7b566fc3c236d6edcfa4c457605463f27407d293dffeb75e82ca +size 201 diff --git a/assets/minecraft/textures/item/mooshroom_spawn_egg.png b/assets/minecraft/textures/item/mooshroom_spawn_egg.png index 42c2b1a1..61960224 100644 --- a/assets/minecraft/textures/item/mooshroom_spawn_egg.png +++ b/assets/minecraft/textures/item/mooshroom_spawn_egg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3c7f03cce335163fe3e39e02218398659970d1a6a4aeba73e9c7d1d993987899 -size 268 +oid sha256:d33e63c84de7a91df984a5cd41862a68a8be0d0c1ff7df4787f3615eb0eab153 +size 237 diff --git a/assets/minecraft/textures/item/mourner_pottery_sherd.png b/assets/minecraft/textures/item/mourner_pottery_sherd.png index 04148ce2..ad452728 100644 --- a/assets/minecraft/textures/item/mourner_pottery_sherd.png +++ b/assets/minecraft/textures/item/mourner_pottery_sherd.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c0ec736731f01f9c0c58704153c32ec5a5e9e53229f472f332e74ad53665b86b -size 216 +oid sha256:d4218e4693351432fb61aae15d223842938ca8ef759fa63d4f2de2721b29fabb +size 208 diff --git a/assets/minecraft/textures/item/music_disc_11.png b/assets/minecraft/textures/item/music_disc_11.png index 723a1a08..1b085409 100644 --- a/assets/minecraft/textures/item/music_disc_11.png +++ b/assets/minecraft/textures/item/music_disc_11.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c48c2a257f08d2af34387e66c7398a54230d95430752827046603a8f34b56ff8 -size 198 +oid sha256:3d8a624730faf60f8239a3acdb13229fe329370ec14c5e3833cd95cde92ec67a +size 164 diff --git a/assets/minecraft/textures/item/music_disc_13.png b/assets/minecraft/textures/item/music_disc_13.png index 480354c1..b5af20e4 100644 --- a/assets/minecraft/textures/item/music_disc_13.png +++ b/assets/minecraft/textures/item/music_disc_13.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6a7812f3816dfe9a602664c3a8a021a6a072401ee49023c535f78a78a5dcc11e -size 177 +oid sha256:50d9208cb762dc5da0250390f283f7811779838d4b25a1fbc098688a6b8c9ea8 +size 168 diff --git a/assets/minecraft/textures/item/music_disc_5.png b/assets/minecraft/textures/item/music_disc_5.png index 11ccab12..934e26c4 100644 --- a/assets/minecraft/textures/item/music_disc_5.png +++ b/assets/minecraft/textures/item/music_disc_5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bca0bdead47cc99cd3bd6b9fc833413e7f14d5d0c0f58b9f24790a700e1016fc -size 210 +oid sha256:dfe02740b4bbd84d74976a6729f6a2fea3a51195e37300e7e334bb57541e905b +size 204 diff --git a/assets/minecraft/textures/item/music_disc_blocks.png b/assets/minecraft/textures/item/music_disc_blocks.png index 5797a2ca..868def10 100644 --- a/assets/minecraft/textures/item/music_disc_blocks.png +++ b/assets/minecraft/textures/item/music_disc_blocks.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:987b92573f1d06388cd82843b6ef4bb89d22cc75a3327a63cbbf15e0f51dcae3 -size 179 +oid sha256:f634b0b132f9767ebb4573422d5c0b2f5f8b24b2b9cb269f6ad42e3a779a65ce +size 170 diff --git a/assets/minecraft/textures/item/music_disc_cat.png b/assets/minecraft/textures/item/music_disc_cat.png index ad541b43..7b9ecc37 100644 --- a/assets/minecraft/textures/item/music_disc_cat.png +++ b/assets/minecraft/textures/item/music_disc_cat.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f95b6849639929d68145fca425e1e9c0d0d5377b20d664095e119b66c4cdf533 -size 185 +oid sha256:5d49e915323ebefcddcad6e07a1d35dbac1be22b5505e62b70ca3c2d124fa031 +size 181 diff --git a/assets/minecraft/textures/item/music_disc_creator.png b/assets/minecraft/textures/item/music_disc_creator.png index f9c256b6..967bf0f0 100644 --- a/assets/minecraft/textures/item/music_disc_creator.png +++ b/assets/minecraft/textures/item/music_disc_creator.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2a9a7ea151f2c26bd7aa38589c443829bebfa870ba7a5ba6da203f13a15a5611 -size 215 +oid sha256:31ab614fd365cf4ce68555b87f129bce9ea76efd9db15b351027fff24e28e919 +size 208 diff --git a/assets/minecraft/textures/item/music_disc_creator_music_box.png b/assets/minecraft/textures/item/music_disc_creator_music_box.png index c7f0710d..bb704aca 100644 --- a/assets/minecraft/textures/item/music_disc_creator_music_box.png +++ b/assets/minecraft/textures/item/music_disc_creator_music_box.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1a9d7a036f3a28f6beb8f5cd695f7b64c1ff51d2b9c89768d0230f8e3035dd53 -size 208 +oid sha256:c2d6685d438077a6a1a97e6d4b6c5636d5d02b3b7f7915168f3e089a547bbe21 +size 200 diff --git a/assets/minecraft/textures/item/music_disc_far.png b/assets/minecraft/textures/item/music_disc_far.png index b6cc5d86..9ba181dc 100644 --- a/assets/minecraft/textures/item/music_disc_far.png +++ b/assets/minecraft/textures/item/music_disc_far.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c52c4349e002c0ab45e9181980c3cf88107baa3ebabb3be94ad667c9f9700997 -size 181 +oid sha256:68b445dfeb45d8169cda153315de37f07c3810e2d9084a81e2138912635c7f1d +size 172 diff --git a/assets/minecraft/textures/item/music_disc_mall.png b/assets/minecraft/textures/item/music_disc_mall.png index a53cee11..d7c07c0f 100644 --- a/assets/minecraft/textures/item/music_disc_mall.png +++ b/assets/minecraft/textures/item/music_disc_mall.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6655cc4a7a20ba17d5c39751198f07e808e1322c24d9fad0a86fdb6518586671 -size 184 +oid sha256:082875b3ce6b37d5e2feeded2eaed403b09c50ed36a5f617986ee916b638cadc +size 181 diff --git a/assets/minecraft/textures/item/music_disc_mellohi.png b/assets/minecraft/textures/item/music_disc_mellohi.png index fe826de4..f51f86b4 100644 --- a/assets/minecraft/textures/item/music_disc_mellohi.png +++ b/assets/minecraft/textures/item/music_disc_mellohi.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1e364edc710e4ddeb98baa71be3955fb720b229a9a47fcf7931509e5b07656d6 -size 180 +oid sha256:f6b8f28582b3743220e3e520b7970ba1871c6efebad65568862505fa42c0d0a1 +size 171 diff --git a/assets/minecraft/textures/item/music_disc_pigstep.png b/assets/minecraft/textures/item/music_disc_pigstep.png index 86524ca0..f071965b 100644 --- a/assets/minecraft/textures/item/music_disc_pigstep.png +++ b/assets/minecraft/textures/item/music_disc_pigstep.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3dabb1e54e372b537eb3913b1df4acef70c9295314b1578086236ae73e005cdf -size 204 +oid sha256:98886e49d1ae427cd9473666aa3d03b0c7ffea7fa7e0a1f470535626b826727c +size 197 diff --git a/assets/minecraft/textures/item/music_disc_relic.png b/assets/minecraft/textures/item/music_disc_relic.png index 982146b2..c64d997b 100644 --- a/assets/minecraft/textures/item/music_disc_relic.png +++ b/assets/minecraft/textures/item/music_disc_relic.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9701356f62f010bc4dc77a71e1a3fa3162c7103728f748821d644479260ffd76 -size 217 +oid sha256:810f070625d68519633c3df87e4b70f07079859e77075cc4ed793193c7a4ffc1 +size 210 diff --git a/assets/minecraft/textures/item/music_disc_stal.png b/assets/minecraft/textures/item/music_disc_stal.png index 05c053a9..136fc6eb 100644 --- a/assets/minecraft/textures/item/music_disc_stal.png +++ b/assets/minecraft/textures/item/music_disc_stal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:16292f6e7b3496eb7715fbdb670be8db622127878fddaec1a63d7c065b94b486 -size 175 +oid sha256:fc53299cd348b770061f5d176d3ce0abecd4538918cdd39c5270e12331e33b1e +size 146 diff --git a/assets/minecraft/textures/item/music_disc_strad.png b/assets/minecraft/textures/item/music_disc_strad.png index 8d58610d..633a85b5 100644 --- a/assets/minecraft/textures/item/music_disc_strad.png +++ b/assets/minecraft/textures/item/music_disc_strad.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ffdaf237eff3d3109a7240447ff39b1bd0300afdda6b735e238f49a539aa79f4 -size 173 +oid sha256:f652d18e15548eb02a5f1902fe3fc2c05abf25e8204c6838d2ade8810aabe7de +size 151 diff --git a/assets/minecraft/textures/item/music_disc_tears.png b/assets/minecraft/textures/item/music_disc_tears.png new file mode 100644 index 00000000..8dad9518 --- /dev/null +++ b/assets/minecraft/textures/item/music_disc_tears.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4c5260602df183509f2d019d184dbba18795dfc2193efaaf861d5bc8dfe27ce3 +size 185 diff --git a/assets/minecraft/textures/item/music_disc_wait.png b/assets/minecraft/textures/item/music_disc_wait.png index 17688549..871d82d7 100644 --- a/assets/minecraft/textures/item/music_disc_wait.png +++ b/assets/minecraft/textures/item/music_disc_wait.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a52a5c40793d7aef3d38ca78007f68be093675ce4b49f262bffa138a245d294c -size 192 +oid sha256:84c72c91fe162ac226058003795eef61a2a71da6aa1b92af056c1900816e9ae6 +size 189 diff --git a/assets/minecraft/textures/item/music_disc_ward.png b/assets/minecraft/textures/item/music_disc_ward.png index a66a9b1b..2d4a1e49 100644 --- a/assets/minecraft/textures/item/music_disc_ward.png +++ b/assets/minecraft/textures/item/music_disc_ward.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3f77fbe1c7f043d73fc5d41867ebef9827d165c6021d9e2ab235788f16d58d12 -size 185 +oid sha256:a31f029e83770a912b719f7b19592bd6aa3b65e3e8086fa709655e8329784bd4 +size 184 diff --git a/assets/minecraft/textures/item/mutton.png b/assets/minecraft/textures/item/mutton.png index 0751bbb5..c8518239 100644 --- a/assets/minecraft/textures/item/mutton.png +++ b/assets/minecraft/textures/item/mutton.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:082ccc0c35d70a0048161b3ebe87d760d72a70d5637263f2f229052c304e9db3 -size 199 +oid sha256:ad166756d1129abdea0e51bbd608fe4ea227730d9b4eff79878b9e47ec89b31c +size 196 diff --git a/assets/minecraft/textures/item/name_tag.png b/assets/minecraft/textures/item/name_tag.png index 1f24f460..ba9a6c43 100644 --- a/assets/minecraft/textures/item/name_tag.png +++ b/assets/minecraft/textures/item/name_tag.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:320018673e5a4ed4246aa0599439a97c91df74dcb966d904e83b3589f496b0d9 -size 209 +oid sha256:27d4af791458a11eb1777e2f77273659769fc3c26c200790f437e0424afee2b7 +size 201 diff --git a/assets/minecraft/textures/item/nautilus_shell.png b/assets/minecraft/textures/item/nautilus_shell.png index 41d8fca4..c8864b85 100644 --- a/assets/minecraft/textures/item/nautilus_shell.png +++ b/assets/minecraft/textures/item/nautilus_shell.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ffb92d9a596e7942f3348719c1784181e05a1d4d17615f73942ca7fbd3db8125 -size 229 +oid sha256:3ca606193807d2a75554f6c13be7129dbbbe87ac70975dc68620c7b561ec7229 +size 222 diff --git a/assets/minecraft/textures/item/nether_brick.png b/assets/minecraft/textures/item/nether_brick.png index 41e23f42..a193a210 100644 --- a/assets/minecraft/textures/item/nether_brick.png +++ b/assets/minecraft/textures/item/nether_brick.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1360739ad28212d8102eda9e9067e853faa753cc07a5c49ec46cb8ce5094259f -size 199 +oid sha256:ff509e5985967a99b8ef92d528ae5fdbae96e7c4d2fdb094d76f153d5cd01c6d +size 194 diff --git a/assets/minecraft/textures/item/nether_sprouts.png b/assets/minecraft/textures/item/nether_sprouts.png index 3ab54aa7..128b877c 100644 --- a/assets/minecraft/textures/item/nether_sprouts.png +++ b/assets/minecraft/textures/item/nether_sprouts.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b93ef7874b08844e9a5b38e747980225e9cdcc2356394453acde89c1b33df70 -size 158 +oid sha256:781b07edaadb4e733c7c882bf5abdc14eb16efa841eb5f0e1990284b23e2e267 +size 129 diff --git a/assets/minecraft/textures/item/nether_wart.png b/assets/minecraft/textures/item/nether_wart.png index 8024e661..84ba95c0 100644 --- a/assets/minecraft/textures/item/nether_wart.png +++ b/assets/minecraft/textures/item/nether_wart.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e24b389b30a345c77ff46a4724857414cf22ea48b682b6a24e3e7b3ac782c19b -size 151 +oid sha256:61436f1bb905846373f57ea7ada16c4c853295bcc8bb51a8d37126455e28d547 +size 150 diff --git a/assets/minecraft/textures/item/netherite_boots.png b/assets/minecraft/textures/item/netherite_boots.png index bf470ca7..5ca29ba0 100644 --- a/assets/minecraft/textures/item/netherite_boots.png +++ b/assets/minecraft/textures/item/netherite_boots.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:165f358064a52c31bccc0d60475f58ed9e07e8cc8f8e6d7476d605a743c87869 -size 173 +oid sha256:dfbad96ceeaf4439404d4f92ce59450ef2d3cc52a75f18d64ccc823ea5a69ebd +size 171 diff --git a/assets/minecraft/textures/item/netherite_chestplate.png b/assets/minecraft/textures/item/netherite_chestplate.png index 7514bdaa..6b33646c 100644 --- a/assets/minecraft/textures/item/netherite_chestplate.png +++ b/assets/minecraft/textures/item/netherite_chestplate.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2a8be1d0598d7e9e0f26340dfb8df695e47e9bdbba65b13970f17b45c29f7160 -size 217 +oid sha256:259fb539d007cf5a9491fdacdf45cefed9347f26be5a8c048bb76123f71bcee5 +size 216 diff --git a/assets/minecraft/textures/item/netherite_helmet.png b/assets/minecraft/textures/item/netherite_helmet.png index c0b9e7b4..7d2876d1 100644 --- a/assets/minecraft/textures/item/netherite_helmet.png +++ b/assets/minecraft/textures/item/netherite_helmet.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:79117a0656e4cd53950ad25aaa073991db83e65be3363de5c1f899b959912d61 -size 162 +oid sha256:41f5ede49f87b366a6243ed443a1b7bf9565dfe408ef3a654db2c47754ca87d1 +size 161 diff --git a/assets/minecraft/textures/item/netherite_hoe.png b/assets/minecraft/textures/item/netherite_hoe.png index 26ad0a7b..12e0facd 100644 --- a/assets/minecraft/textures/item/netherite_hoe.png +++ b/assets/minecraft/textures/item/netherite_hoe.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d0ce0f1fd989c8ce408b9db865ada6b89bcb4632aa0b5ca595096fe7b74961fd -size 167 +oid sha256:7a9f6a8951c784c0b62c30f6c5551f569d3e990eb7fe07b49ebceb645a1ad70e +size 165 diff --git a/assets/minecraft/textures/item/netherite_ingot.png b/assets/minecraft/textures/item/netherite_ingot.png index fef8c597..e02c5b76 100644 --- a/assets/minecraft/textures/item/netherite_ingot.png +++ b/assets/minecraft/textures/item/netherite_ingot.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:21418e66ca43961e91fb8cfba645a4364ca340426bca82f073d140f202dfe28b -size 214 +oid sha256:9327df3242759aa2cbb5b54d8b240170ad33a5c190b302fd5b317ee4ec78b319 +size 208 diff --git a/assets/minecraft/textures/item/netherite_scrap.png b/assets/minecraft/textures/item/netherite_scrap.png index f56ca646..ae53254b 100644 --- a/assets/minecraft/textures/item/netherite_scrap.png +++ b/assets/minecraft/textures/item/netherite_scrap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f3a32f64996eaa7859b0239c7a01dd9f00331f8cb062915e9c3f5be3f1c82f23 -size 201 +oid sha256:d748057ebae9070c708b1c1227517ed713293a1fe9371718d0aa407885e53192 +size 189 diff --git a/assets/minecraft/textures/item/netherite_shovel.png b/assets/minecraft/textures/item/netherite_shovel.png index f165c0aa..a4abe3d8 100644 --- a/assets/minecraft/textures/item/netherite_shovel.png +++ b/assets/minecraft/textures/item/netherite_shovel.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:53bdac629511db4ef375325f069e84cf9eecec7a08585b7f82477e66bfe9bd9b -size 161 +oid sha256:17cd2d73c1cccc793956c78c390c7c57d1b4034bcfde7ece370e8df861af2907 +size 160 diff --git a/assets/minecraft/textures/item/netherite_sword.png b/assets/minecraft/textures/item/netherite_sword.png index 0916777c..915ad89e 100644 --- a/assets/minecraft/textures/item/netherite_sword.png +++ b/assets/minecraft/textures/item/netherite_sword.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:78e0508b06b69bd8eddf06188b7c490b92778d0d036b9238ee9d6b562788fafc -size 209 +oid sha256:8f1584739b0c4e9aa09f901bdfc9251a0a6fa1e0172b8c2a5a869e9fbaf25906 +size 203 diff --git a/assets/minecraft/textures/item/netherite_upgrade_smithing_template.png b/assets/minecraft/textures/item/netherite_upgrade_smithing_template.png index 19f6d9a3..c6012f16 100644 --- a/assets/minecraft/textures/item/netherite_upgrade_smithing_template.png +++ b/assets/minecraft/textures/item/netherite_upgrade_smithing_template.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:46bd7c36167f30b6634bf60cf187cd13ca424dfc4b43ccf62aa6e97bde93d6af -size 206 +oid sha256:c87c27232353eb8841c92ffa584534c4d32e521d68363da07c95ea9a8edacd01 +size 197 diff --git a/assets/minecraft/textures/item/oak_boat.png b/assets/minecraft/textures/item/oak_boat.png index aa77e38e..f75d2adf 100644 --- a/assets/minecraft/textures/item/oak_boat.png +++ b/assets/minecraft/textures/item/oak_boat.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6f80c4ba265f5fce50c37ee19901dec90001891382d759b51ecf5d6fc9b382ca -size 338 +oid sha256:7ea5445b3ae6af56f82abeb89d5fc6a462ab8eee711a2ae1b4ec272ff54544b6 +size 215 diff --git a/assets/minecraft/textures/item/oak_chest_boat.png b/assets/minecraft/textures/item/oak_chest_boat.png index 66ef167d..9c868b5b 100644 --- a/assets/minecraft/textures/item/oak_chest_boat.png +++ b/assets/minecraft/textures/item/oak_chest_boat.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d82d9014a2c1879f2b927c46da8702653c16f032d3da333ba1282a255b49d8a6 -size 379 +oid sha256:14ab9322bb62c0fa2ddf9c33508bbc5d502ceb5fec1a1a1b3135d8f4fa2fa463 +size 260 diff --git a/assets/minecraft/textures/item/oak_door.png b/assets/minecraft/textures/item/oak_door.png index eb5fa4a4..5d95a019 100644 --- a/assets/minecraft/textures/item/oak_door.png +++ b/assets/minecraft/textures/item/oak_door.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bd9eb83ab91cb4415585a03aab1666a01df0057c26d26db559f533f5ad2ed87d -size 154 +oid sha256:db0b4f8a456b2ead1b9d029c0db7546ba20ec68b665b0b9e7b8b5a3b1d43a1ea +size 136 diff --git a/assets/minecraft/textures/item/oak_hanging_sign.png b/assets/minecraft/textures/item/oak_hanging_sign.png index 8451fe59..4aa7588b 100644 --- a/assets/minecraft/textures/item/oak_hanging_sign.png +++ b/assets/minecraft/textures/item/oak_hanging_sign.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2429510a94c8d3e58b9bcd74e859b0512cffcd02e49cfbf0f07d59bf4b91c39b -size 223 +oid sha256:b94aec61be01e497cb7ec944af3b1f7e09b7bce6326a02228b183387bb79f8ac +size 210 diff --git a/assets/minecraft/textures/item/ominous_trial_key.png b/assets/minecraft/textures/item/ominous_trial_key.png index 4b89a6fb..ab576848 100644 --- a/assets/minecraft/textures/item/ominous_trial_key.png +++ b/assets/minecraft/textures/item/ominous_trial_key.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:94469f6ebd96d0ba8b06b4685b57b4b197c612b951e2ed1d09d5386d256dbddf -size 244 +oid sha256:831b518ae013b1bdd0494bbe2d930df268fc16b2154165d5d90ba821aecd5015 +size 238 diff --git a/assets/minecraft/textures/item/orange_bundle.png b/assets/minecraft/textures/item/orange_bundle.png index 7f824dfc..8d5dcad2 100644 --- a/assets/minecraft/textures/item/orange_bundle.png +++ b/assets/minecraft/textures/item/orange_bundle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9060d023b68352c73660f1278b4adb7c7ad9b37c608dba2c765e7e05b9730d82 -size 206 +oid sha256:b0a06f9d0adb7a558228f6e417c3981bf6cd42f7afe16ae60dea20a6db87e482 +size 203 diff --git a/assets/minecraft/textures/item/orange_bundle_open_back.png b/assets/minecraft/textures/item/orange_bundle_open_back.png index 3ff36f93..7a253611 100644 --- a/assets/minecraft/textures/item/orange_bundle_open_back.png +++ b/assets/minecraft/textures/item/orange_bundle_open_back.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:79959b4409ff0f2845287bc18ec02e4bf417d010c323eb33342c19a6889a77ad -size 152 +oid sha256:9f45572ccfc156e704b6d47a1fbb567cd50ab31f100ecee283e22549560aac22 +size 139 diff --git a/assets/minecraft/textures/item/orange_bundle_open_front.png b/assets/minecraft/textures/item/orange_bundle_open_front.png index 9279806d..b0d705b0 100644 --- a/assets/minecraft/textures/item/orange_bundle_open_front.png +++ b/assets/minecraft/textures/item/orange_bundle_open_front.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:30881cee8f71ea67ffdaafa7f855fac6f7ba1366fca106f465c9ce055331ff06 -size 191 +oid sha256:5803927f5a9c261cf72765f2046bc3f573f8ab688896a9093937f460cbb1d1bf +size 187 diff --git a/assets/minecraft/textures/item/orange_candle.png b/assets/minecraft/textures/item/orange_candle.png index 255d0794..76f2f06b 100644 --- a/assets/minecraft/textures/item/orange_candle.png +++ b/assets/minecraft/textures/item/orange_candle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:61f1090861f20da4ffbba577713dcfc0ab1b63b84d068e1cd9e1dfe71f1fb222 -size 183 +oid sha256:48a11c48ef65f9c291a7d25e1b5b8a1ef1f6d500bba84a0c6086be0d97b8d4f1 +size 179 diff --git a/assets/minecraft/textures/item/orange_dye.png b/assets/minecraft/textures/item/orange_dye.png index 83692e40..9ed4467c 100644 --- a/assets/minecraft/textures/item/orange_dye.png +++ b/assets/minecraft/textures/item/orange_dye.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2e16a54776496533b06ff747d21937cc14938e000a103ee94ef82e07d6af3aa3 -size 183 +oid sha256:452518d1e639b933627c202bf1e250a4475bcc8747b3ab6fa5e509f831fc348c +size 176 diff --git a/assets/minecraft/textures/item/orange_harness.png b/assets/minecraft/textures/item/orange_harness.png new file mode 100644 index 00000000..6c5e0c50 --- /dev/null +++ b/assets/minecraft/textures/item/orange_harness.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bda5b8f342d5bdbd7bd17ae14f95a56a385fa31afc9937cf7bb05d6c24f1b168 +size 254 diff --git a/assets/minecraft/textures/item/pale_oak_boat.png b/assets/minecraft/textures/item/pale_oak_boat.png index effec5aa..ae6442d9 100644 --- a/assets/minecraft/textures/item/pale_oak_boat.png +++ b/assets/minecraft/textures/item/pale_oak_boat.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:de24915de8ad288bfc9133aaf06452406c6ba466fa72f617c2ac60dac3a8c88b +oid sha256:381fa9c43c89703040b920f7f7fb8531f543c1f42d5a8c66571e8219907f2f68 size 215 diff --git a/assets/minecraft/textures/item/pale_oak_chest_boat.png b/assets/minecraft/textures/item/pale_oak_chest_boat.png index 805c061a..165ebf70 100644 --- a/assets/minecraft/textures/item/pale_oak_chest_boat.png +++ b/assets/minecraft/textures/item/pale_oak_chest_boat.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3af7da2a2fa9791c4f723752db809791546bbde9e5f7aebfd8d0d234bf4d5bcc -size 256 +oid sha256:3a6bbeb6f190a47003a95597aabe162a9fc63d7af7a1ae7bfbf864a7a6b91820 +size 260 diff --git a/assets/minecraft/textures/item/panda_spawn_egg.png b/assets/minecraft/textures/item/panda_spawn_egg.png index fe11a05e..14f097a3 100644 --- a/assets/minecraft/textures/item/panda_spawn_egg.png +++ b/assets/minecraft/textures/item/panda_spawn_egg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:75a6f6c61e1f3792127a2275b11aa5a4c90beeace2ec3137ee9f1db15158e4e9 -size 267 +oid sha256:93a77306246d26c303a96bebd3a949e14f978e8686a31818ec66be160c899926 +size 238 diff --git a/assets/minecraft/textures/item/paper.png b/assets/minecraft/textures/item/paper.png index 1ca31b62..17075cf8 100644 --- a/assets/minecraft/textures/item/paper.png +++ b/assets/minecraft/textures/item/paper.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8ffee002bbc339552eb4d6be5948eb4eb66d016c19e7bbc55bc1cd4a575cc44a -size 176 +oid sha256:046228bbea6334f90e915ea62c6b4050016a6b1aa575734d630a10688d9b11e7 +size 173 diff --git a/assets/minecraft/textures/item/phantom_membrane.png b/assets/minecraft/textures/item/phantom_membrane.png index 02624e13..c19fa2de 100644 --- a/assets/minecraft/textures/item/phantom_membrane.png +++ b/assets/minecraft/textures/item/phantom_membrane.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:22cce2d80b03834599e9fd3ad155a978056b5f1f3d55dbdaf88c29b6b13778e5 -size 258 +oid sha256:278576989e6e9ab11a001355db7a7b15959cbff193120dee1288e86e417157d7 +size 210 diff --git a/assets/minecraft/textures/item/phantom_spawn_egg.png b/assets/minecraft/textures/item/phantom_spawn_egg.png index 5fe086bc..6de36cb9 100644 --- a/assets/minecraft/textures/item/phantom_spawn_egg.png +++ b/assets/minecraft/textures/item/phantom_spawn_egg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7a8df3e4dc448442cb12e6cc49a5fe7f0a980dc0b51241987a34cd431537b613 -size 233 +oid sha256:04cfd11f37710f399560c5ceb567ed0b47ec9b23005801e3694529607098bb0d +size 231 diff --git a/assets/minecraft/textures/item/pig_spawn_egg.png b/assets/minecraft/textures/item/pig_spawn_egg.png index 6d9b2ea2..0cbf86a0 100644 --- a/assets/minecraft/textures/item/pig_spawn_egg.png +++ b/assets/minecraft/textures/item/pig_spawn_egg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5ae86040bb313c13e2545bb2611cdf8ea40d4ed2b447c88a4396e170ac74acfa -size 201 +oid sha256:4a019a20b34dc315fedbcd73a728082583b078f96ce997b61885a39eda6e3e1c +size 193 diff --git a/assets/minecraft/textures/item/piglin_banner_pattern.png b/assets/minecraft/textures/item/piglin_banner_pattern.png index 9a96bd0c..a976fa43 100644 --- a/assets/minecraft/textures/item/piglin_banner_pattern.png +++ b/assets/minecraft/textures/item/piglin_banner_pattern.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2f426f4631bcbcb1b834b088c797e574847bf5599900b6334be5583bfd9206ae -size 210 +oid sha256:09f379750be601fe6bdba8080483e17d831b1799c2708e6460c57300f9ba4320 +size 201 diff --git a/assets/minecraft/textures/item/pink_bundle.png b/assets/minecraft/textures/item/pink_bundle.png index 3960ec7b..3ab2e887 100644 --- a/assets/minecraft/textures/item/pink_bundle.png +++ b/assets/minecraft/textures/item/pink_bundle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f984d17c518981ab7b9f55c9d82cda4b415bd138938cf667d7030422c071b18d -size 206 +oid sha256:fac786219b227f467c8c207e0b9b1a83ec510ce268411920fe580b8907bc56a9 +size 203 diff --git a/assets/minecraft/textures/item/pink_bundle_open_back.png b/assets/minecraft/textures/item/pink_bundle_open_back.png index 45557c0a..18394882 100644 --- a/assets/minecraft/textures/item/pink_bundle_open_back.png +++ b/assets/minecraft/textures/item/pink_bundle_open_back.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:603d7dbcee8a5c94afddce8d50c769940c7f345a17ab1129a26773ca5830f736 -size 151 +oid sha256:219e76fbb812f1dceb15ffcd4ec5766b5eed1c1561785d7a203515d700fefa06 +size 139 diff --git a/assets/minecraft/textures/item/pink_bundle_open_front.png b/assets/minecraft/textures/item/pink_bundle_open_front.png index f9ad5882..6908002b 100644 --- a/assets/minecraft/textures/item/pink_bundle_open_front.png +++ b/assets/minecraft/textures/item/pink_bundle_open_front.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:be151e35deca8dfb49dac84ba080ab7643442dd2c04a67ed262f07f28447f611 -size 191 +oid sha256:17bba3215287e700d3d164abd142ea024c5c5393931555732be234f32518646d +size 187 diff --git a/assets/minecraft/textures/item/pink_candle.png b/assets/minecraft/textures/item/pink_candle.png index c5a36fe1..9e95489b 100644 --- a/assets/minecraft/textures/item/pink_candle.png +++ b/assets/minecraft/textures/item/pink_candle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0a07119765c3be309d6b78c7ee44bedf6b7110acfac6ec8877524859689de967 -size 183 +oid sha256:916bd8e12eea74b5eaa1863b8201ab4ee9087ed63e54f2f973e1dd1d48698c57 +size 179 diff --git a/assets/minecraft/textures/item/pink_harness.png b/assets/minecraft/textures/item/pink_harness.png new file mode 100644 index 00000000..80b8bbe3 --- /dev/null +++ b/assets/minecraft/textures/item/pink_harness.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:85b290c9c04d69f0d49e43a181be4e411dd66461a89e13373d33cf30af294f61 +size 254 diff --git a/assets/minecraft/textures/item/pink_petals.png b/assets/minecraft/textures/item/pink_petals.png index 24e852b9..94d4cff3 100644 --- a/assets/minecraft/textures/item/pink_petals.png +++ b/assets/minecraft/textures/item/pink_petals.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:69e00f27c10698b29f77dfc635fd0178b77c508f7ee9d71eebfd6745f12731d7 -size 220 +oid sha256:68d7bf775e60358c96fc1982b5cf77d6a127c2b9ec56cde921b6667df1e25bb2 +size 209 diff --git a/assets/minecraft/textures/item/pitcher_plant.png b/assets/minecraft/textures/item/pitcher_plant.png index 0ecc01f7..d99e72fa 100644 --- a/assets/minecraft/textures/item/pitcher_plant.png +++ b/assets/minecraft/textures/item/pitcher_plant.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:83ad6694eba708bd07080d316b5043c16ef2aaee62dae9831493ebdef5712a28 -size 213 +oid sha256:0a69b2e2d7cd5ab41c8eefd317aafb6ff8f24d5aebfa9acc184d0c7930e90669 +size 206 diff --git a/assets/minecraft/textures/item/pitcher_pod.png b/assets/minecraft/textures/item/pitcher_pod.png index f8b5a18a..5cc206a4 100644 --- a/assets/minecraft/textures/item/pitcher_pod.png +++ b/assets/minecraft/textures/item/pitcher_pod.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c699ecf50ea32e19b6c0d844063192f835395dac4f18e0d7c35c77743cd04361 -size 204 +oid sha256:a60543ab8cdf6357b8e1ca3d3f684630f6527140d7e9935651350ccca274dc14 +size 199 diff --git a/assets/minecraft/textures/item/plenty_pottery_sherd.png b/assets/minecraft/textures/item/plenty_pottery_sherd.png index cbe501f1..b082f6e2 100644 --- a/assets/minecraft/textures/item/plenty_pottery_sherd.png +++ b/assets/minecraft/textures/item/plenty_pottery_sherd.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:45464a00e1d4df3407eb39bc88d124d8c8a1ff809fd17ab228c102569e6b175e -size 221 +oid sha256:fd3d72ee34c9bdd5f7691922bfbb0c881ca7679b853c7134f4eb129a9c3d5e00 +size 204 diff --git a/assets/minecraft/textures/item/pointed_dripstone.png b/assets/minecraft/textures/item/pointed_dripstone.png index 5eb7a98c..09237318 100644 --- a/assets/minecraft/textures/item/pointed_dripstone.png +++ b/assets/minecraft/textures/item/pointed_dripstone.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1eb702f35753117f7ed1df67dac6a5fc00887eb7ea0fb3e700ad96758decb217 -size 156 +oid sha256:4a82a25c9e5739e106dc4e25cc956275c7ec8da0c32b01d200aa18e3de68e717 +size 154 diff --git a/assets/minecraft/textures/item/poisonous_potato.png b/assets/minecraft/textures/item/poisonous_potato.png index 877ff5fe..b0aaf8c4 100644 --- a/assets/minecraft/textures/item/poisonous_potato.png +++ b/assets/minecraft/textures/item/poisonous_potato.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:156c983a90ddc0948299c2bdbcdf150e38a8956bd7ca6c80606fad6cb6d0c6d6 -size 210 +oid sha256:071d0c0d86d87c51d155792834d724b815ec5c08c2a2a11280d8fa8ee1506523 +size 209 diff --git a/assets/minecraft/textures/item/polar_bear_spawn_egg.png b/assets/minecraft/textures/item/polar_bear_spawn_egg.png index e63d0792..af243945 100644 --- a/assets/minecraft/textures/item/polar_bear_spawn_egg.png +++ b/assets/minecraft/textures/item/polar_bear_spawn_egg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:09b559f500c3239a54a8a7a03ec91e54c638adf248927186124b7aaebde3161c -size 224 +oid sha256:e7a5392294fcd7f3496c2df65ffad646413d65fede1ffe0ec562f44af9ab7989 +size 207 diff --git a/assets/minecraft/textures/item/popped_chorus_fruit.png b/assets/minecraft/textures/item/popped_chorus_fruit.png index d0520ffa..0a729a61 100644 --- a/assets/minecraft/textures/item/popped_chorus_fruit.png +++ b/assets/minecraft/textures/item/popped_chorus_fruit.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e66d830a23e61e760493ff105782f8a9f83d4c7c9951bae9c5fc9ff7862f290f -size 209 +oid sha256:0c968a0de06fd108c37e20adb98964d0db60431ea8c5e7e57cbdf1ecce946b59 +size 196 diff --git a/assets/minecraft/textures/item/porkchop.png b/assets/minecraft/textures/item/porkchop.png index 7c1d3eff..b7bd3042 100644 --- a/assets/minecraft/textures/item/porkchop.png +++ b/assets/minecraft/textures/item/porkchop.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:375ba1f30e95366a5566c31b4b177fc9892d326cf9b53fe05cb5b7073170cb47 -size 202 +oid sha256:cce5dcbdeb6d445d3024180bc88afa5d8ad22ea025947e8bf687ffcdbb0ec9ae +size 200 diff --git a/assets/minecraft/textures/item/potato.png b/assets/minecraft/textures/item/potato.png index 936f4ae1..39ddfa86 100644 --- a/assets/minecraft/textures/item/potato.png +++ b/assets/minecraft/textures/item/potato.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a1262dfc5ef931f6708dcdf06a294d76de82ea05d7c0ff068636961f665f5a32 -size 189 +oid sha256:d230597b0d91c857936370089ef7da12a8f0b4b3e84207b92c9b48e92798507f +size 188 diff --git a/assets/minecraft/textures/item/potion_overlay.png b/assets/minecraft/textures/item/potion_overlay.png index 4f69cde7..b1af4e76 100644 --- a/assets/minecraft/textures/item/potion_overlay.png +++ b/assets/minecraft/textures/item/potion_overlay.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a734ecf66d6a09767592c6b38c453854290d47c987ea122712bad37dca9683e9 -size 144 +oid sha256:606f372ad8b832a8659c54adb5da0ace0bcc74b471b84211076197cb3c557043 +size 124 diff --git a/assets/minecraft/textures/item/powder_snow_bucket.png b/assets/minecraft/textures/item/powder_snow_bucket.png index af9dfa81..856f0f34 100644 --- a/assets/minecraft/textures/item/powder_snow_bucket.png +++ b/assets/minecraft/textures/item/powder_snow_bucket.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:98de3a4c069701d380c2952889ad4d737ea822c353a828e941009f0ed952e48d -size 226 +oid sha256:fbc193fbecdf2d90d520ad14a27843919caeac2f783ad3cd483347f7822cb8ed +size 214 diff --git a/assets/minecraft/textures/item/prismarine_crystals.png b/assets/minecraft/textures/item/prismarine_crystals.png index d202b28b..4f0e3c16 100644 --- a/assets/minecraft/textures/item/prismarine_crystals.png +++ b/assets/minecraft/textures/item/prismarine_crystals.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f55ed6efe0d9c40609a3e06da7928346d4779009c6382a979aa5bfb039c78f06 -size 173 +oid sha256:f54d54e1fe0886c6a942f8416b7083902630889e6043be4c0fce19f31f4d9452 +size 168 diff --git a/assets/minecraft/textures/item/prismarine_shard.png b/assets/minecraft/textures/item/prismarine_shard.png index 03840d75..7473bf42 100644 --- a/assets/minecraft/textures/item/prismarine_shard.png +++ b/assets/minecraft/textures/item/prismarine_shard.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:592fae36549fcc7cd28e49f9670cb8831265eccb4131d9a1cc13a8f06a306f60 -size 192 +oid sha256:b5974f3ca3d0c239f1edcfa9d26459320c5728a645caf5246bd98a70c9f9eae9 +size 191 diff --git a/assets/minecraft/textures/item/prize_pottery_sherd.png b/assets/minecraft/textures/item/prize_pottery_sherd.png index 7f80330f..7dbcebb5 100644 --- a/assets/minecraft/textures/item/prize_pottery_sherd.png +++ b/assets/minecraft/textures/item/prize_pottery_sherd.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3642fe41946789c75bd9bbf99be1fa476433ac417050e0c14f5a1c5c0d9760a6 -size 219 +oid sha256:861aeebc41f9e8a4c473a526270ff6ba10c2c0cf8ca22b8f92ff095ffe81a6c2 +size 206 diff --git a/assets/minecraft/textures/item/pufferfish.png b/assets/minecraft/textures/item/pufferfish.png index 7accbae4..64b1af64 100644 --- a/assets/minecraft/textures/item/pufferfish.png +++ b/assets/minecraft/textures/item/pufferfish.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8232f4b384ad5fb1cd2bd14a928664f4d0b5ba0a560c48771b8cf8f24ea03b1a -size 422 +oid sha256:13be1214a5998df30b1996f5b797959d2442cc2711932f71c7213e95d398a7af +size 255 diff --git a/assets/minecraft/textures/item/pufferfish_bucket.png b/assets/minecraft/textures/item/pufferfish_bucket.png index bc8214b1..d3be1432 100644 --- a/assets/minecraft/textures/item/pufferfish_bucket.png +++ b/assets/minecraft/textures/item/pufferfish_bucket.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:612e42cbef2b7fa7cd57b572fb60d0a5b924169d2755faa9e66e9d265dbb0221 -size 333 +oid sha256:77d6f79f8df89396a62dc0720b20ee5e3ec45113d9788a2eb4d2a3d6f572ac7d +size 279 diff --git a/assets/minecraft/textures/item/pumpkin_pie.png b/assets/minecraft/textures/item/pumpkin_pie.png index 8e07aca9..f3ba923d 100644 --- a/assets/minecraft/textures/item/pumpkin_pie.png +++ b/assets/minecraft/textures/item/pumpkin_pie.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9ce526e905a3c07cb06d592da56fe125b6d5125fc3c2d3cf57044e68af590620 -size 217 +oid sha256:0824fa8edbeb5466f55a770cc7e45b7b4e599298fd9017e46b25ecd88c78cb72 +size 211 diff --git a/assets/minecraft/textures/item/pumpkin_seeds.png b/assets/minecraft/textures/item/pumpkin_seeds.png index 8dad130a..33c70b80 100644 --- a/assets/minecraft/textures/item/pumpkin_seeds.png +++ b/assets/minecraft/textures/item/pumpkin_seeds.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aa771dd485c9876f2707f6a3387a4cf0fcd8d7b24df678255f7af09afdd9be53 -size 130 +oid sha256:49bdf20eb2bc2944ac5105c62aec590aed6b4186d5df9b78928617e55fd5f99f +size 128 diff --git a/assets/minecraft/textures/item/purple_bundle.png b/assets/minecraft/textures/item/purple_bundle.png index 1ae90add..a155eade 100644 --- a/assets/minecraft/textures/item/purple_bundle.png +++ b/assets/minecraft/textures/item/purple_bundle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e93e223a65f1cf5dede2284b1734413e39dfd5edd3df9fbd437d715bf065ac22 -size 206 +oid sha256:c7f786e2e8e2e6555ebd93e418bf89052c467b8d847b51c757833ef56b63232c +size 203 diff --git a/assets/minecraft/textures/item/purple_bundle_open_back.png b/assets/minecraft/textures/item/purple_bundle_open_back.png index cf49c5b3..fe0f165d 100644 --- a/assets/minecraft/textures/item/purple_bundle_open_back.png +++ b/assets/minecraft/textures/item/purple_bundle_open_back.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:53b3efbed87c18eb4234911c69458e113dcfedd5e1d154c1bd734e5a67802be6 -size 152 +oid sha256:4e2bdb36e96b8cf5527b78a6e2a27cff3afe5584fd92db65075ece430269dec9 +size 139 diff --git a/assets/minecraft/textures/item/purple_candle.png b/assets/minecraft/textures/item/purple_candle.png index fc3c41c8..30127ba1 100644 --- a/assets/minecraft/textures/item/purple_candle.png +++ b/assets/minecraft/textures/item/purple_candle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:60d538698c2e353e25b50cac25f0973f50cae969da0fc8d1d34ade8fb6d51ccf -size 183 +oid sha256:e44b816f0647107f80837ec083d50c5966bcc4bd435e19716dd283c50333cbf6 +size 179 diff --git a/assets/minecraft/textures/item/purple_harness.png b/assets/minecraft/textures/item/purple_harness.png new file mode 100644 index 00000000..49a3e11c --- /dev/null +++ b/assets/minecraft/textures/item/purple_harness.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:836a94ba33da576585d2d9585e816afdb18acaa370a1f53f5e0d737d23127ac6 +size 254 diff --git a/assets/minecraft/textures/item/quartz.png b/assets/minecraft/textures/item/quartz.png index e21293ad..b8f0b10d 100644 --- a/assets/minecraft/textures/item/quartz.png +++ b/assets/minecraft/textures/item/quartz.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a7907753e1d8cc6646b503b6a32eb61efc13486f556588e2d5a94e1cb2f0fb39 -size 230 +oid sha256:b1f19d61fb1eaa8a821e3688a059cf37cd539f2d3fef34103741d2a0b773276d +size 223 diff --git a/assets/minecraft/textures/item/rabbit.png b/assets/minecraft/textures/item/rabbit.png index 3b1995df..6fd5632e 100644 --- a/assets/minecraft/textures/item/rabbit.png +++ b/assets/minecraft/textures/item/rabbit.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4a492c398089adaa9e910e793b45c9b750779508cad83156aba3ea24d838b10b -size 211 +oid sha256:5dbc024048ce041ad75790eae49357f5fea075e1ab80644ee208e2556820facf +size 201 diff --git a/assets/minecraft/textures/item/rabbit_foot.png b/assets/minecraft/textures/item/rabbit_foot.png index 3bbfbcda..c208ac6a 100644 --- a/assets/minecraft/textures/item/rabbit_foot.png +++ b/assets/minecraft/textures/item/rabbit_foot.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9ec269c445f8c7bfd2c4ec26f6dab1e5c0cb78e1bfac7e26a67c1d7a6199d218 -size 169 +oid sha256:61e6b1dfeeb0e86627bc61c7773a2dadd9f93677bebc2e5d2d4fe2467adafa8a +size 168 diff --git a/assets/minecraft/textures/item/rabbit_hide.png b/assets/minecraft/textures/item/rabbit_hide.png index df6fcd22..2de5e0c8 100644 --- a/assets/minecraft/textures/item/rabbit_hide.png +++ b/assets/minecraft/textures/item/rabbit_hide.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:286b30c43aff496611e206c15a45d127828f909c1f346571162f9656b231acbf -size 192 +oid sha256:ec80888f1693470ee990bdc1c641945c100c88cf9a1055595e66b6656addef6d +size 182 diff --git a/assets/minecraft/textures/item/rabbit_spawn_egg.png b/assets/minecraft/textures/item/rabbit_spawn_egg.png index 549343bc..1bd56e39 100644 --- a/assets/minecraft/textures/item/rabbit_spawn_egg.png +++ b/assets/minecraft/textures/item/rabbit_spawn_egg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:497f068d34ce25c3ae31500726053f4c3f459156798501d8aa4e636175651603 -size 219 +oid sha256:a4727030597670dbbdce66d9cf3db6bbc2f6a0ef9090abdb8f97fa4e8d3bac65 +size 210 diff --git a/assets/minecraft/textures/item/rabbit_stew.png b/assets/minecraft/textures/item/rabbit_stew.png index 2486e70f..6ff2d7b4 100644 --- a/assets/minecraft/textures/item/rabbit_stew.png +++ b/assets/minecraft/textures/item/rabbit_stew.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:777cdb318f89224f4f685ebfc9c5b60e1feddfb5686444151467d425d0427f1b -size 221 +oid sha256:88b94362f30cab1d6336a0d6a72853d39b2ebe308f3c4f7dc3b6a29f9099c2dd +size 220 diff --git a/assets/minecraft/textures/item/raiser_armor_trim_smithing_template.png b/assets/minecraft/textures/item/raiser_armor_trim_smithing_template.png index 9c6939d2..f3a0e4e2 100644 --- a/assets/minecraft/textures/item/raiser_armor_trim_smithing_template.png +++ b/assets/minecraft/textures/item/raiser_armor_trim_smithing_template.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8456cb434adda2c7aece441df8b4a308c6658785a08da8a3489609997b37cf6d -size 227 +oid sha256:ceee92197e32f7c8a47824ec45a9dedd71f183ec51d554dd6e92380f10d9ae40 +size 215 diff --git a/assets/minecraft/textures/item/ravager_spawn_egg.png b/assets/minecraft/textures/item/ravager_spawn_egg.png index 911c4013..4a0afc22 100644 --- a/assets/minecraft/textures/item/ravager_spawn_egg.png +++ b/assets/minecraft/textures/item/ravager_spawn_egg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b67c0d1215504411d3546bd411f956407d41028543afac46a06abb991d3ee5c2 -size 276 +oid sha256:665adfba4873b695433ec9f2347fac24ef91856fb0e125a1794e58707f746568 +size 254 diff --git a/assets/minecraft/textures/item/raw_copper.png b/assets/minecraft/textures/item/raw_copper.png index 7a994327..42d6685e 100644 --- a/assets/minecraft/textures/item/raw_copper.png +++ b/assets/minecraft/textures/item/raw_copper.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2cdb294f66fda088faf7e606a8412993d01120e29ea3f440d800111fc9b9313a -size 259 +oid sha256:e4b577d03357792bcb9292ab0c36a9851a3976ec5fbed6c30ed7861cf180768d +size 257 diff --git a/assets/minecraft/textures/item/raw_gold.png b/assets/minecraft/textures/item/raw_gold.png index 897a66e5..618b374d 100644 --- a/assets/minecraft/textures/item/raw_gold.png +++ b/assets/minecraft/textures/item/raw_gold.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1cd44c35178953ca5791e2a059e9c12e97519d554064f171b1d55f79fb2a407d -size 218 +oid sha256:e2204171fc4722b7b4d2d6fb190792da644310c8d56b38d16e240f8d3649e32c +size 203 diff --git a/assets/minecraft/textures/item/raw_iron.png b/assets/minecraft/textures/item/raw_iron.png index b5820971..6755a580 100644 --- a/assets/minecraft/textures/item/raw_iron.png +++ b/assets/minecraft/textures/item/raw_iron.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5ac9321000afa9b49215970326fde0eb88bb7de518a8974d4e8ec38373c49ae6 -size 224 +oid sha256:b30921d99f902d2b0d6e8e7a1a08bc7638daf9807157f04156cb01cf981c692c +size 210 diff --git a/assets/minecraft/textures/item/recovery_compass_00.png b/assets/minecraft/textures/item/recovery_compass_00.png index 385858e5..f59ebe17 100644 --- a/assets/minecraft/textures/item/recovery_compass_00.png +++ b/assets/minecraft/textures/item/recovery_compass_00.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5520cdef5d6303c9683fea30bd3eee10b556d624e64a70a373a0eeddce2fb796 -size 258 +oid sha256:d8d464c77eac897648f4cca86032fb320065d242f3b7344e91a1330b235e992d +size 241 diff --git a/assets/minecraft/textures/item/recovery_compass_01.png b/assets/minecraft/textures/item/recovery_compass_01.png index 9cf50935..a56f5983 100644 --- a/assets/minecraft/textures/item/recovery_compass_01.png +++ b/assets/minecraft/textures/item/recovery_compass_01.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c4fdca1ab372ef6a04bdcc550c0b2153a2c0b1bb9e06d56f064456ef9a9598d1 -size 258 +oid sha256:00ae406356a3a19c5f17187321451a9385b00a8fe14201b950f856f5a7d9a447 +size 241 diff --git a/assets/minecraft/textures/item/recovery_compass_02.png b/assets/minecraft/textures/item/recovery_compass_02.png index f93b8100..2b52fb26 100644 --- a/assets/minecraft/textures/item/recovery_compass_02.png +++ b/assets/minecraft/textures/item/recovery_compass_02.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6f58f3304b3bf5b922a41e4125b77dfb631398674a32c6c5b7b44533511d048e -size 258 +oid sha256:a15730f4e08b42503e2e9c9879c05216d804e618ea23fce0962f7d012d852360 +size 241 diff --git a/assets/minecraft/textures/item/recovery_compass_03.png b/assets/minecraft/textures/item/recovery_compass_03.png index d9499c67..50f6278a 100644 --- a/assets/minecraft/textures/item/recovery_compass_03.png +++ b/assets/minecraft/textures/item/recovery_compass_03.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bca7872dc35d97d074eeac9a916b946f1779511dbd76e88be6d2ccf3052c74a5 -size 258 +oid sha256:c3adc9a47d0aa3002cbcc5d9588b4e3b943de9d1ef8d84ecc449d87a7fff06de +size 242 diff --git a/assets/minecraft/textures/item/recovery_compass_04.png b/assets/minecraft/textures/item/recovery_compass_04.png index 5688aa13..e084c73c 100644 --- a/assets/minecraft/textures/item/recovery_compass_04.png +++ b/assets/minecraft/textures/item/recovery_compass_04.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:32e6cf85be626843df5cadcae13d97553f26a8eea3b602ff414492873e3977db -size 259 +oid sha256:1709b365f0960caa1a292f0638e5b76b1297763113aa48bb63d56469407b014e +size 243 diff --git a/assets/minecraft/textures/item/recovery_compass_05.png b/assets/minecraft/textures/item/recovery_compass_05.png index b58dfb3e..62c80660 100644 --- a/assets/minecraft/textures/item/recovery_compass_05.png +++ b/assets/minecraft/textures/item/recovery_compass_05.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:98b6c567faa4d2fe7acd93bafc86e42d98117d6fae5db88a9f02bfa1cc3359cd -size 259 +oid sha256:43be266c99c679a3c1d05d16b1cb75f9711134917e16da0280c8f56acac0a3dd +size 244 diff --git a/assets/minecraft/textures/item/recovery_compass_06.png b/assets/minecraft/textures/item/recovery_compass_06.png index 4229657b..6ee24d89 100644 --- a/assets/minecraft/textures/item/recovery_compass_06.png +++ b/assets/minecraft/textures/item/recovery_compass_06.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:29c0f6f3d2a170f518f14970b35f7174094acd97bee9f2bf54b334724b8d3dbd -size 258 +oid sha256:f8106d035ddf4d6ccf06e4cd4d94b2023de56e310df7ef1ec0d5c0c5cee8e866 +size 243 diff --git a/assets/minecraft/textures/item/recovery_compass_07.png b/assets/minecraft/textures/item/recovery_compass_07.png index f34f617a..cb04559f 100644 --- a/assets/minecraft/textures/item/recovery_compass_07.png +++ b/assets/minecraft/textures/item/recovery_compass_07.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f782e6f888beff15acb42920060c01250a98baf7fb4e424bf2c9ed7b48ad2841 -size 259 +oid sha256:7e75e978e8acd6e3810572aa174a90a75080a6ecbab56ac544db58c01f99a1d4 +size 241 diff --git a/assets/minecraft/textures/item/recovery_compass_08.png b/assets/minecraft/textures/item/recovery_compass_08.png index 880bbbda..4e0f691e 100644 --- a/assets/minecraft/textures/item/recovery_compass_08.png +++ b/assets/minecraft/textures/item/recovery_compass_08.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d95a9d25f14aefa7bfb1614dfd54af0f71e14618eeddfcd34f893260f367884b -size 254 +oid sha256:8a76493d7f68ef114584c163bd46e07e50980463ee30680c1333bcf3638631b0 +size 237 diff --git a/assets/minecraft/textures/item/recovery_compass_09.png b/assets/minecraft/textures/item/recovery_compass_09.png index f34f617a..cb04559f 100644 --- a/assets/minecraft/textures/item/recovery_compass_09.png +++ b/assets/minecraft/textures/item/recovery_compass_09.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f782e6f888beff15acb42920060c01250a98baf7fb4e424bf2c9ed7b48ad2841 -size 259 +oid sha256:7e75e978e8acd6e3810572aa174a90a75080a6ecbab56ac544db58c01f99a1d4 +size 241 diff --git a/assets/minecraft/textures/item/recovery_compass_10.png b/assets/minecraft/textures/item/recovery_compass_10.png index 3a20326f..79d11ec7 100644 --- a/assets/minecraft/textures/item/recovery_compass_10.png +++ b/assets/minecraft/textures/item/recovery_compass_10.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:93ec970049f5c620fbd278fa73aaec4b39456b9e9f348aa4abdd0a414965cfc2 -size 258 +oid sha256:d2efcd21ee8a9fb2133c58cdfed9439490ef743b53c37db2ba7e2182370b82f1 +size 244 diff --git a/assets/minecraft/textures/item/recovery_compass_11.png b/assets/minecraft/textures/item/recovery_compass_11.png index 3b337bda..3b972353 100644 --- a/assets/minecraft/textures/item/recovery_compass_11.png +++ b/assets/minecraft/textures/item/recovery_compass_11.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e93093d15775b160daffddbf69f071b46763a2123ec4dfeb75c7e94c026d1f23 -size 259 +oid sha256:cab4c64c1eeec4c0aefdb2414edadb34e794e724a83477440e5a38149b6b6255 +size 243 diff --git a/assets/minecraft/textures/item/recovery_compass_12.png b/assets/minecraft/textures/item/recovery_compass_12.png index 6ad12d86..8d7ca32c 100644 --- a/assets/minecraft/textures/item/recovery_compass_12.png +++ b/assets/minecraft/textures/item/recovery_compass_12.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6cf8f4f700462dfb0a56a104b2385a5f96c40755f4a1f75c1821171fca631dc4 -size 258 +oid sha256:69f40d07d7cc27e2fa2aa8fb7f61356ec3c615d989fbe33de7c8fdb2b721c08a +size 245 diff --git a/assets/minecraft/textures/item/recovery_compass_13.png b/assets/minecraft/textures/item/recovery_compass_13.png index 07869b13..9d2f2158 100644 --- a/assets/minecraft/textures/item/recovery_compass_13.png +++ b/assets/minecraft/textures/item/recovery_compass_13.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:72f77bf4696232cf9ca2cddceb6a2326b7a1336f127b5f7ff76533be35f1c9a4 -size 258 +oid sha256:f2c09bdad4a92e30aaf50d06052245dcf2ea16545db25de662da251a337750eb +size 244 diff --git a/assets/minecraft/textures/item/recovery_compass_14.png b/assets/minecraft/textures/item/recovery_compass_14.png index fdaf0204..cfa10d20 100644 --- a/assets/minecraft/textures/item/recovery_compass_14.png +++ b/assets/minecraft/textures/item/recovery_compass_14.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f3578f5ff7f69b8e9a40e9a239f01f1d2b9d6c21ceabf3799d17edaa6536483 -size 254 +oid sha256:07ba3a0fef5c973b4cf6c8b7bbdea9900da131ad9904f67b7f9ddd269289b8e0 +size 239 diff --git a/assets/minecraft/textures/item/recovery_compass_15.png b/assets/minecraft/textures/item/recovery_compass_15.png index 3aa54f17..09131e4a 100644 --- a/assets/minecraft/textures/item/recovery_compass_15.png +++ b/assets/minecraft/textures/item/recovery_compass_15.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e651b7a54ae975a9880051140909fa0971f919a2f44fcf7892f42e8bc6981719 -size 254 +oid sha256:a74d43bb43ae66f0434663ab16dd5cd180bc6704532d1942b92178637d09fa72 +size 239 diff --git a/assets/minecraft/textures/item/recovery_compass_16.png b/assets/minecraft/textures/item/recovery_compass_16.png index 7f10c42c..12bfabf6 100644 --- a/assets/minecraft/textures/item/recovery_compass_16.png +++ b/assets/minecraft/textures/item/recovery_compass_16.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bbd324b55c2eed05e8f1aa5a33907990e58743b3ba205e01bd1f3e117d2944a6 -size 254 +oid sha256:21a2e477bfa1174d64365b9027caf85fa55473a9b68951af5397bd99280ab35d +size 238 diff --git a/assets/minecraft/textures/item/recovery_compass_17.png b/assets/minecraft/textures/item/recovery_compass_17.png index 152aca79..1b2d331b 100644 --- a/assets/minecraft/textures/item/recovery_compass_17.png +++ b/assets/minecraft/textures/item/recovery_compass_17.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5f3e9763e72a1330a344dec1954c8b37fac38f8f4dc5b2058fed22b4c064039f -size 254 +oid sha256:7607946be120b9037b5139bb47df7014c73d4a389fcb520f45227ec70562f50c +size 238 diff --git a/assets/minecraft/textures/item/recovery_compass_18.png b/assets/minecraft/textures/item/recovery_compass_18.png index cc2b2eb5..338f0749 100644 --- a/assets/minecraft/textures/item/recovery_compass_18.png +++ b/assets/minecraft/textures/item/recovery_compass_18.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:26dbc84fe61ce14c6e761487afe497292abd641df795e26a6698f055235a29bd -size 253 +oid sha256:3dcedca0b9c8fe2bea2de33aa5b76ae5d40174fb9c9435ba9e9e5097770bb823 +size 238 diff --git a/assets/minecraft/textures/item/recovery_compass_19.png b/assets/minecraft/textures/item/recovery_compass_19.png index 30a06ec1..5fd5baf4 100644 --- a/assets/minecraft/textures/item/recovery_compass_19.png +++ b/assets/minecraft/textures/item/recovery_compass_19.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3bf945188673b686f79aba71810c0bb3c9c0164f0fe0b429827aa44903db7472 -size 258 +oid sha256:9cb8f810c927ba40783f1515239bdea0835281b901a6c312918a6f260884d866 +size 241 diff --git a/assets/minecraft/textures/item/recovery_compass_20.png b/assets/minecraft/textures/item/recovery_compass_20.png index 69c3efcd..69ee8910 100644 --- a/assets/minecraft/textures/item/recovery_compass_20.png +++ b/assets/minecraft/textures/item/recovery_compass_20.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e60b678d4f3b6acb354118bedef66d2355d172acea39503e8cb7234538a52edf -size 259 +oid sha256:b61f79d41b9e4c1804a020b0c0ab1da19214c3051cd495934eb8409d0c0ff9db +size 243 diff --git a/assets/minecraft/textures/item/recovery_compass_21.png b/assets/minecraft/textures/item/recovery_compass_21.png index c4aa553c..c310807a 100644 --- a/assets/minecraft/textures/item/recovery_compass_21.png +++ b/assets/minecraft/textures/item/recovery_compass_21.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f6e37e6ebabb0444e802b0168f0edbe779687a79f7aa3ba60b8c3d3a57440510 -size 259 +oid sha256:288960effbd118fc269d9eada2ef92d09f5dd1d4f59e29feb3c6ea1087503765 +size 243 diff --git a/assets/minecraft/textures/item/recovery_compass_22.png b/assets/minecraft/textures/item/recovery_compass_22.png index de960ccf..5020a50f 100644 --- a/assets/minecraft/textures/item/recovery_compass_22.png +++ b/assets/minecraft/textures/item/recovery_compass_22.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6f371303561107181147f141ca80f6e1e6bb55e385efcdf9133c7abb5b72669d -size 258 +oid sha256:f5ff8ab1588aeaf7f8af4571fa6f47713e4f36bc398e4dd370646df13bb8b042 +size 244 diff --git a/assets/minecraft/textures/item/recovery_compass_23.png b/assets/minecraft/textures/item/recovery_compass_23.png index f3f775da..7813ec20 100644 --- a/assets/minecraft/textures/item/recovery_compass_23.png +++ b/assets/minecraft/textures/item/recovery_compass_23.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4df2bfd225ea6bb7ae403fb72d4af92fded557b6eec0d7909e0e699534291d54 -size 259 +oid sha256:ff4be1f19c67d803f14ef29e35c902595af596afc2ed4816e02f87436b428c47 +size 243 diff --git a/assets/minecraft/textures/item/recovery_compass_24.png b/assets/minecraft/textures/item/recovery_compass_24.png index 344cde82..0aa6caab 100644 --- a/assets/minecraft/textures/item/recovery_compass_24.png +++ b/assets/minecraft/textures/item/recovery_compass_24.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:05ae761aacf5e8e8a1d7ff7eafe903890235cf3a4f05470c7a73cc14d0fc7b45 -size 254 +oid sha256:cfaba955d9322bd670a23ad11c04e1495de37d1ebe91a23062acb0f504673e9a +size 239 diff --git a/assets/minecraft/textures/item/recovery_compass_25.png b/assets/minecraft/textures/item/recovery_compass_25.png index f3f775da..7813ec20 100644 --- a/assets/minecraft/textures/item/recovery_compass_25.png +++ b/assets/minecraft/textures/item/recovery_compass_25.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4df2bfd225ea6bb7ae403fb72d4af92fded557b6eec0d7909e0e699534291d54 -size 259 +oid sha256:ff4be1f19c67d803f14ef29e35c902595af596afc2ed4816e02f87436b428c47 +size 243 diff --git a/assets/minecraft/textures/item/recovery_compass_26.png b/assets/minecraft/textures/item/recovery_compass_26.png index 8c8624a6..cfff4e29 100644 --- a/assets/minecraft/textures/item/recovery_compass_26.png +++ b/assets/minecraft/textures/item/recovery_compass_26.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f1fab2482ba88725a06f0ff4e88c54fb69db15213a69c25995bb341cc5c1e9d7 -size 258 +oid sha256:17874445943c684e2bca10ff0a66169c8aa88098c38e029fc4a6f74f69c417f3 +size 243 diff --git a/assets/minecraft/textures/item/recovery_compass_27.png b/assets/minecraft/textures/item/recovery_compass_27.png index a1b70183..2797706b 100644 --- a/assets/minecraft/textures/item/recovery_compass_27.png +++ b/assets/minecraft/textures/item/recovery_compass_27.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e36f528804c4f4debd065c07dd9830bc26e0ba9401d4b3531cbbc59e18697d3f -size 258 +oid sha256:4fa5a8b1c69066bb770c45a8cc0ce83858b6a259d9de3e7601d51dbe3c86a645 +size 243 diff --git a/assets/minecraft/textures/item/recovery_compass_28.png b/assets/minecraft/textures/item/recovery_compass_28.png index a1b70183..2797706b 100644 --- a/assets/minecraft/textures/item/recovery_compass_28.png +++ b/assets/minecraft/textures/item/recovery_compass_28.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e36f528804c4f4debd065c07dd9830bc26e0ba9401d4b3531cbbc59e18697d3f -size 258 +oid sha256:4fa5a8b1c69066bb770c45a8cc0ce83858b6a259d9de3e7601d51dbe3c86a645 +size 243 diff --git a/assets/minecraft/textures/item/recovery_compass_29.png b/assets/minecraft/textures/item/recovery_compass_29.png index 6705689e..720139b7 100644 --- a/assets/minecraft/textures/item/recovery_compass_29.png +++ b/assets/minecraft/textures/item/recovery_compass_29.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:896f7be31915f106fb7718f3bce1b562daa47e5359974f27c37c4fb608e39057 -size 254 +oid sha256:0a01b13c703bdb93ba2c8985983cc4afa67cc4299511ae0872e0fb60dc11648a +size 237 diff --git a/assets/minecraft/textures/item/recovery_compass_30.png b/assets/minecraft/textures/item/recovery_compass_30.png index e7ce6804..b68e3350 100644 --- a/assets/minecraft/textures/item/recovery_compass_30.png +++ b/assets/minecraft/textures/item/recovery_compass_30.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c39424986b09df424ba0c9946e22cd51cfc1c75027e17bc5cb9d71efecc23566 -size 258 +oid sha256:9ecb7b2e5f534fbea62b03809401f4367d99c80c8e1a41d5d57f57ba9884ce6e +size 241 diff --git a/assets/minecraft/textures/item/recovery_compass_31.png b/assets/minecraft/textures/item/recovery_compass_31.png index fc3260ea..b2b04599 100644 --- a/assets/minecraft/textures/item/recovery_compass_31.png +++ b/assets/minecraft/textures/item/recovery_compass_31.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:290bcef42bdbd111b96b4c64ee369eaa8f0e0c860af19cade6e46d895c0bea38 -size 258 +oid sha256:5723c25ab8d99d97d85f04cb71ba82347b19b7d4362050d62654b7a5945b8235 +size 241 diff --git a/assets/minecraft/textures/item/red_bundle.png b/assets/minecraft/textures/item/red_bundle.png index 30f04cee..d3f0c98b 100644 --- a/assets/minecraft/textures/item/red_bundle.png +++ b/assets/minecraft/textures/item/red_bundle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c48d53d0c92b681736889bd80b8dbfbdc330bfc234ce8fc5e77ef86bd1337ab7 -size 217 +oid sha256:2d8a2d48a3dbb4206d9f17e9b89ce09e7104cf44b24ff60029fadf3141ac5b52 +size 203 diff --git a/assets/minecraft/textures/item/red_bundle_open_back.png b/assets/minecraft/textures/item/red_bundle_open_back.png index 2024a404..b5918f72 100644 --- a/assets/minecraft/textures/item/red_bundle_open_back.png +++ b/assets/minecraft/textures/item/red_bundle_open_back.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a9f31af9e04aadc46768a7c18cf81824ccf247248c8c0c842292dd101e1c0057 -size 162 +oid sha256:641a62317b9831aae7262e8802972c052bf43604729a4e1afe0067a176ef47c5 +size 139 diff --git a/assets/minecraft/textures/item/red_candle.png b/assets/minecraft/textures/item/red_candle.png index aec3d8dd..0a9c93e4 100644 --- a/assets/minecraft/textures/item/red_candle.png +++ b/assets/minecraft/textures/item/red_candle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:58ef71a4da62b46ea2b396547ee0a6352395fa53352d963619893c60ee7d7857 -size 183 +oid sha256:eee55919b2db33701e599eacd56626b0746b018ee68cb14950c499524308f0fe +size 179 diff --git a/assets/minecraft/textures/item/red_dye.png b/assets/minecraft/textures/item/red_dye.png index d6409092..2ea16a80 100644 --- a/assets/minecraft/textures/item/red_dye.png +++ b/assets/minecraft/textures/item/red_dye.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b35a1e3297e33a20548e0ab45098576706f543776a575cabd1128df2cf77e47a -size 184 +oid sha256:633ddf9f472276c587f3a761a2b8afacd70648d0e77070dbd176a0a905ab91ad +size 183 diff --git a/assets/minecraft/textures/item/red_harness.png b/assets/minecraft/textures/item/red_harness.png new file mode 100644 index 00000000..a9e7022e --- /dev/null +++ b/assets/minecraft/textures/item/red_harness.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fb2c2cfb346ad22bc0a26551d8c12c543dc7e9256811100584340a6a5259983e +size 254 diff --git a/assets/minecraft/textures/item/repeater.png b/assets/minecraft/textures/item/repeater.png index 3960792f..d86c40d4 100644 --- a/assets/minecraft/textures/item/repeater.png +++ b/assets/minecraft/textures/item/repeater.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8159510efca23ee914da39cf35d1c3288fa7236a5bed23356358341044675dd7 -size 188 +oid sha256:d2a06fb81b5fff5e7164778519f79e3ce4d1001d9534a11120d4d4fe52312faf +size 187 diff --git a/assets/minecraft/textures/item/rib_armor_trim_smithing_template.png b/assets/minecraft/textures/item/rib_armor_trim_smithing_template.png index 7433d052..a8e5815f 100644 --- a/assets/minecraft/textures/item/rib_armor_trim_smithing_template.png +++ b/assets/minecraft/textures/item/rib_armor_trim_smithing_template.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3c51d04be4c2303044474335cbcb49076b05bfd44604b7870a01f71b7acd82b3 -size 237 +oid sha256:8496640ebac4dd0b71aa853a0b12c48f5e91faf77ed89fceae069b436805bff2 +size 227 diff --git a/assets/minecraft/textures/item/rotten_flesh.png b/assets/minecraft/textures/item/rotten_flesh.png index d3cd2690..ac5896ef 100644 --- a/assets/minecraft/textures/item/rotten_flesh.png +++ b/assets/minecraft/textures/item/rotten_flesh.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a35be717a47b544790c8595fe214f9794689fa8fe6eac27926c42dec4e6f8936 -size 212 +oid sha256:9168edab9a9063ee23340fedd2bbf31f85aed2bd42c3fedf527dba24629d48e8 +size 211 diff --git a/assets/minecraft/textures/item/salmon.png b/assets/minecraft/textures/item/salmon.png index d33f631c..6625df3b 100644 --- a/assets/minecraft/textures/item/salmon.png +++ b/assets/minecraft/textures/item/salmon.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f841d55cfd55f26e5508f42753357576d77e70ef10f04e81f1cabaf3c9c39b21 -size 346 +oid sha256:36048e9c2ecc1f0a95eff45086734a038df311db65a560cb794eee50144a3600 +size 215 diff --git a/assets/minecraft/textures/item/salmon_bucket.png b/assets/minecraft/textures/item/salmon_bucket.png index d09b46e4..74676845 100644 --- a/assets/minecraft/textures/item/salmon_bucket.png +++ b/assets/minecraft/textures/item/salmon_bucket.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c8cd369818dccf98b51342f956da2c34aaf1c2d8026933cf929f35517988088a -size 300 +oid sha256:8243c10ac3ac25fb5b869ed276c9468dbcbd20802dc793dc21d8fc143010896a +size 250 diff --git a/assets/minecraft/textures/item/scrape_pottery_sherd.png b/assets/minecraft/textures/item/scrape_pottery_sherd.png index 355601dd..d4d8fdda 100644 --- a/assets/minecraft/textures/item/scrape_pottery_sherd.png +++ b/assets/minecraft/textures/item/scrape_pottery_sherd.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ddb5188fc76965327ce7da57b7d588c19862477d2e1f91ef8c6034b92defc994 -size 223 +oid sha256:d5406f16a152c8ef4f131f89900104fc639443aa50498e94d99b63601358a2c4 +size 208 diff --git a/assets/minecraft/textures/item/sea_pickle.png b/assets/minecraft/textures/item/sea_pickle.png index 979072e9..c4fe9b37 100644 --- a/assets/minecraft/textures/item/sea_pickle.png +++ b/assets/minecraft/textures/item/sea_pickle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5f5a681758744d1e470d131bcea881061f8169ebffb131a5e95c33fc261def3a -size 182 +oid sha256:eea33aecfbb07dee04721fdbba6e19befe3ec42d427603566883d75b12026cc6 +size 169 diff --git a/assets/minecraft/textures/item/seagrass.png b/assets/minecraft/textures/item/seagrass.png index 36cb5c51..e3c9b95b 100644 --- a/assets/minecraft/textures/item/seagrass.png +++ b/assets/minecraft/textures/item/seagrass.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:848a770cbb41c99a20ecdd810f8fa09e6e63767aa459b11ffaf0008940e8f42e -size 241 +oid sha256:a6df433a2f14abbd8c107de50dcfe4588f78f8b84a1b443868e6280bd73eec66 +size 177 diff --git a/assets/minecraft/textures/item/sentry_armor_trim_smithing_template.png b/assets/minecraft/textures/item/sentry_armor_trim_smithing_template.png index d394760e..25031f81 100644 --- a/assets/minecraft/textures/item/sentry_armor_trim_smithing_template.png +++ b/assets/minecraft/textures/item/sentry_armor_trim_smithing_template.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4e61011b955a7d074baee896cff01e970185156d31a66380d15b51e1b9987f79 -size 222 +oid sha256:400480c06d0e8d14b8a856f91d000d4eee0408d431562a36667f978ded46c506 +size 207 diff --git a/assets/minecraft/textures/item/shaper_armor_trim_smithing_template.png b/assets/minecraft/textures/item/shaper_armor_trim_smithing_template.png index 87a3f309..596298bf 100644 --- a/assets/minecraft/textures/item/shaper_armor_trim_smithing_template.png +++ b/assets/minecraft/textures/item/shaper_armor_trim_smithing_template.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:56c4f3f28c58a2103414a3bb8e2e38721038b4a10bab82e65c09bcb95194f021 -size 220 +oid sha256:26d24ab9b5051860cb785068b10cc0677fcfc4befcae3f0ef779d58850c984cb +size 208 diff --git a/assets/minecraft/textures/item/sheaf_pottery_sherd.png b/assets/minecraft/textures/item/sheaf_pottery_sherd.png index 15a740dd..1e5c544c 100644 --- a/assets/minecraft/textures/item/sheaf_pottery_sherd.png +++ b/assets/minecraft/textures/item/sheaf_pottery_sherd.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a5017110bd3a4ae8d4879091855f933b60c15a8b70b8fb8061ac46c0458f1768 -size 219 +oid sha256:6176f160ca839071d3f0569eb4d2ea6d2217735bf5df69975ec0c5eb6408d934 +size 207 diff --git a/assets/minecraft/textures/item/shears.png b/assets/minecraft/textures/item/shears.png index f7a3c324..8b22190a 100644 --- a/assets/minecraft/textures/item/shears.png +++ b/assets/minecraft/textures/item/shears.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:63be8d8865a04be4109aaae4fbb5d5b94c573e0f9f52ba79b444660eefce33d8 -size 189 +oid sha256:a9570cdb8be3b5c96d4be6b832cd17ab9cfdf731ce213b25e31199940091c56d +size 181 diff --git a/assets/minecraft/textures/item/sheep_spawn_egg.png b/assets/minecraft/textures/item/sheep_spawn_egg.png index ba16547b..d34ef622 100644 --- a/assets/minecraft/textures/item/sheep_spawn_egg.png +++ b/assets/minecraft/textures/item/sheep_spawn_egg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:00489967e2c351927b5b9f77fb7cbc1a1e0bc5681556c612ef21a1de0b731bf3 -size 232 +oid sha256:1ef632fa4fe3acb1d994d50899e473eeae9e290492194d4fee988c1f76ce10f2 +size 226 diff --git a/assets/minecraft/textures/item/shelter_pottery_sherd.png b/assets/minecraft/textures/item/shelter_pottery_sherd.png index ee865b74..40dab0ee 100644 --- a/assets/minecraft/textures/item/shelter_pottery_sherd.png +++ b/assets/minecraft/textures/item/shelter_pottery_sherd.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:96df93a56fc3028058af3acf85e4224351ce28750ba5a29a7574573f90001479 -size 221 +oid sha256:ea155fede2c26e8f8132bfb2621b26067b9b1e67a0b6f5080400498354b1b1b3 +size 204 diff --git a/assets/minecraft/textures/item/shulker_shell.png b/assets/minecraft/textures/item/shulker_shell.png index b75a46f9..1bfb16fa 100644 --- a/assets/minecraft/textures/item/shulker_shell.png +++ b/assets/minecraft/textures/item/shulker_shell.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9bd7050049b60759cca653e641077b30f343dc395ae944057a6bf37563ff6b62 -size 201 +oid sha256:b39fa843deb1dbd9774e2d39c80f6ae602f2945e2129e2c0c86741b8d4e1be63 +size 188 diff --git a/assets/minecraft/textures/item/shulker_spawn_egg.png b/assets/minecraft/textures/item/shulker_spawn_egg.png index 7158be28..4a8ee23c 100644 --- a/assets/minecraft/textures/item/shulker_spawn_egg.png +++ b/assets/minecraft/textures/item/shulker_spawn_egg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:64bac5108a8304b3d2b1a965802bf47db3d9d2e6c5039e54c8879c2d630ef50c -size 213 +oid sha256:78477bfa8d321eb346a94ed29a2932251ac8ddf24066eb7691bd5e9b790e5730 +size 206 diff --git a/assets/minecraft/textures/item/skeleton_horse_spawn_egg.png b/assets/minecraft/textures/item/skeleton_horse_spawn_egg.png index 891063c2..121cb8e4 100644 --- a/assets/minecraft/textures/item/skeleton_horse_spawn_egg.png +++ b/assets/minecraft/textures/item/skeleton_horse_spawn_egg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0477a9e8747eaf64a481e6ea529a10b635dbb0c8306c16e3d096cb5ac375ca02 -size 231 +oid sha256:60dc65621f5540adac6345e0c00885f5899273cc69158b375e76ff5e5650b487 +size 215 diff --git a/assets/minecraft/textures/item/skeleton_spawn_egg.png b/assets/minecraft/textures/item/skeleton_spawn_egg.png index 04ae1120..32af6f38 100644 --- a/assets/minecraft/textures/item/skeleton_spawn_egg.png +++ b/assets/minecraft/textures/item/skeleton_spawn_egg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b5075baf4259864f65699f1b363b95300ec70ef9254fb163f1a368a7ee52a736 -size 209 +oid sha256:ae5ec5d13450066dcf72b57ca6022b009a09d7be32ab4c19868bba10aaafd3aa +size 199 diff --git a/assets/minecraft/textures/item/skull_banner_pattern.png b/assets/minecraft/textures/item/skull_banner_pattern.png index 05446182..f1e0c095 100644 --- a/assets/minecraft/textures/item/skull_banner_pattern.png +++ b/assets/minecraft/textures/item/skull_banner_pattern.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c7b94cfb03cb2a27104f3fefe1d88a67d9fb59540537994d22452dcad71cf96c -size 213 +oid sha256:baf2c744e9cdd8ac4125c9cba1413d31d116fbedc48eb0e3e83024275899a8d6 +size 200 diff --git a/assets/minecraft/textures/item/skull_pottery_sherd.png b/assets/minecraft/textures/item/skull_pottery_sherd.png index 9f0d4f59..38b2d6cf 100644 --- a/assets/minecraft/textures/item/skull_pottery_sherd.png +++ b/assets/minecraft/textures/item/skull_pottery_sherd.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:84350485e96668b0f3fa2a34074bb636713870e4301c4c287e294d556f445856 -size 219 +oid sha256:0c049d37ab60565bf8b9cf819d0a862bd0ddd355c975c7cfa0929a0c55f274cf +size 205 diff --git a/assets/minecraft/textures/item/slime_spawn_egg.png b/assets/minecraft/textures/item/slime_spawn_egg.png index dbdd7852..e345f31f 100644 --- a/assets/minecraft/textures/item/slime_spawn_egg.png +++ b/assets/minecraft/textures/item/slime_spawn_egg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cd4a8f63547d62633f251f4611bef9fead987e0e3308b465db0474c0856552e9 -size 208 +oid sha256:b79a42999ce15266bb4973a4476ea492ec079985dd108171c25d15b6e6e4c4f5 +size 197 diff --git a/assets/minecraft/textures/item/sniffer_egg.png b/assets/minecraft/textures/item/sniffer_egg.png index 3934e3b6..0e532f42 100644 --- a/assets/minecraft/textures/item/sniffer_egg.png +++ b/assets/minecraft/textures/item/sniffer_egg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:308e19a96a65f9aef92fe66576f5b1db1e36f7be07c10cffe382c9e3942e5888 -size 292 +oid sha256:b78f568bc8f0bf3dd96fddd1c8f9d7e104e30ffe76aa357089cc2b9cf07de9ec +size 211 diff --git a/assets/minecraft/textures/item/snort_pottery_sherd.png b/assets/minecraft/textures/item/snort_pottery_sherd.png index f59494c5..91e74a38 100644 --- a/assets/minecraft/textures/item/snort_pottery_sherd.png +++ b/assets/minecraft/textures/item/snort_pottery_sherd.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef30ca5439274efbfc271f131d3d02ba0aa3489f0ec1b96e6f9c83432403db4f -size 217 +oid sha256:917336a64687369bed207d8ca003ba7f2b6ab178241dae33c582cdd65daead42 +size 201 diff --git a/assets/minecraft/textures/item/snout_armor_trim_smithing_template.png b/assets/minecraft/textures/item/snout_armor_trim_smithing_template.png index 74b75f1c..a137c5e7 100644 --- a/assets/minecraft/textures/item/snout_armor_trim_smithing_template.png +++ b/assets/minecraft/textures/item/snout_armor_trim_smithing_template.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2d9ae276442dee4543c53037e5d2912b50357b9668483dbd5cb9c94a9bc31865 -size 224 +oid sha256:6449281ddb889ac3c21038fa1d4cf11f8ea5a600677bd5d6699c7d592f9b3f1b +size 208 diff --git a/assets/minecraft/textures/item/snowball.png b/assets/minecraft/textures/item/snowball.png index 18324bba..e19cd66f 100644 --- a/assets/minecraft/textures/item/snowball.png +++ b/assets/minecraft/textures/item/snowball.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4e4dff01a4935f58ad5a3f80700b4b85062baa0b395736b2e53e189107673d81 -size 189 +oid sha256:4174e71270f6565b8a86483986c570dabe14227312d6bb4222082350b150bdb6 +size 183 diff --git a/assets/minecraft/textures/item/soul_campfire.png b/assets/minecraft/textures/item/soul_campfire.png index 9111bf31..66ea5f1d 100644 --- a/assets/minecraft/textures/item/soul_campfire.png +++ b/assets/minecraft/textures/item/soul_campfire.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:899f7865bdd2306c9d08f2ff1b3523ada8d5c8dc29fe0e83cd5e76f1e06657c3 -size 242 +oid sha256:6fc5354fd71fbc8863153e9501a6db8ca957e039e082010ad1c490b2965d0c21 +size 236 diff --git a/assets/minecraft/textures/item/spider_spawn_egg.png b/assets/minecraft/textures/item/spider_spawn_egg.png index df445c5a..d35550af 100644 --- a/assets/minecraft/textures/item/spider_spawn_egg.png +++ b/assets/minecraft/textures/item/spider_spawn_egg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:45a01717c134362db5a2bbd8e25bf12480453a2849ceeb24d3d815687df4f996 -size 236 +oid sha256:307bfe5f1740313b1ecb15eccdd391da8ca0be3fd31322bb0ca6679f877022ff +size 223 diff --git a/assets/minecraft/textures/item/spire_armor_trim_smithing_template.png b/assets/minecraft/textures/item/spire_armor_trim_smithing_template.png index 83862ad7..519de84b 100644 --- a/assets/minecraft/textures/item/spire_armor_trim_smithing_template.png +++ b/assets/minecraft/textures/item/spire_armor_trim_smithing_template.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ce79d4b4b5900de87234029e3453e0dc3cef1dd855ffc666fc77194ae098cb8a -size 235 +oid sha256:47a002bd8abfb4cbd19fc25bf983ab8db6f91a341dc8ba3b2117851d4dc7f43e +size 209 diff --git a/assets/minecraft/textures/item/splash_potion.png b/assets/minecraft/textures/item/splash_potion.png index 642a77e1..dc22bdad 100644 --- a/assets/minecraft/textures/item/splash_potion.png +++ b/assets/minecraft/textures/item/splash_potion.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:08d9ddee495bb4a042a1a2c8a743cb51e2758116a1d784650863a9fb31532ba4 -size 152 +oid sha256:5c93f8d12921efe653b0c04f693baa1a4a5fd0d02e763fca8a97ad27d74f0b81 +size 150 diff --git a/assets/minecraft/textures/item/spruce_boat.png b/assets/minecraft/textures/item/spruce_boat.png index b9e07ba1..876f5a51 100644 --- a/assets/minecraft/textures/item/spruce_boat.png +++ b/assets/minecraft/textures/item/spruce_boat.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:32e8790f3623bbaf1d2cd1fa2687efeaea796d874a59be03e3110dda8e303b78 -size 345 +oid sha256:477a8c14aaf93584b181615f899c102a50ff65f77b0aa81c857d5784e3a2b99e +size 215 diff --git a/assets/minecraft/textures/item/spruce_chest_boat.png b/assets/minecraft/textures/item/spruce_chest_boat.png index 1910de22..29ad27a1 100644 --- a/assets/minecraft/textures/item/spruce_chest_boat.png +++ b/assets/minecraft/textures/item/spruce_chest_boat.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3c6cf4d532a5996f720a3cda01710a486cb7f2b918013aeca60be655d47115fd -size 373 +oid sha256:8e81b3e3d64e87d3f57728e156d37c6b5ad6f0eeb0622d268fc8045a2f5af5ba +size 256 diff --git a/assets/minecraft/textures/item/spruce_door.png b/assets/minecraft/textures/item/spruce_door.png index 7b914efc..7dec03e0 100644 --- a/assets/minecraft/textures/item/spruce_door.png +++ b/assets/minecraft/textures/item/spruce_door.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:78d18e131005cff7ef1f080fb6a85808603f0b62e486dfbdd6d499fe76ac8fae -size 145 +oid sha256:d8b67cfb500c581f2b2aef184037e027457c76a82b7ad38c3818bb5f72d85eb4 +size 129 diff --git a/assets/minecraft/textures/item/spruce_hanging_sign.png b/assets/minecraft/textures/item/spruce_hanging_sign.png index 273937c2..6b40fb82 100644 --- a/assets/minecraft/textures/item/spruce_hanging_sign.png +++ b/assets/minecraft/textures/item/spruce_hanging_sign.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4b38ddc11440fec7ddea7a7594d393703ecbdacc78a8e8736d1c1b4ad6898e1e -size 229 +oid sha256:61d113e2d0e987b55a39ea05ffc1670248cd1160307fb4188ec1693bb01e3238 +size 216 diff --git a/assets/minecraft/textures/item/spyglass.png b/assets/minecraft/textures/item/spyglass.png index f286565c..6fa744c5 100644 --- a/assets/minecraft/textures/item/spyglass.png +++ b/assets/minecraft/textures/item/spyglass.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b09e9b9046db1935cd9c35a2e4e3b7763485ec3effbc5077ebeaec1c28513b43 -size 211 +oid sha256:8c068d097c8e9693eff9bdf1b9fdc9910e7b6365d3d60594ee14005732e91423 +size 206 diff --git a/assets/minecraft/textures/item/spyglass_model.png b/assets/minecraft/textures/item/spyglass_model.png index 8bed9848..e6280106 100644 --- a/assets/minecraft/textures/item/spyglass_model.png +++ b/assets/minecraft/textures/item/spyglass_model.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ea13f6ca8eb8f96ab8879ee393c6d00581b6b54731b0163054ac1f9e321e6fe9 -size 195 +oid sha256:e31d09f7ba5598ef85f2f7dd6bd9bdd8f9ae78842e7e247e1d865ff3f8894f12 +size 146 diff --git a/assets/minecraft/textures/item/squid_spawn_egg.png b/assets/minecraft/textures/item/squid_spawn_egg.png index 6a828f3a..f3e5a7c2 100644 --- a/assets/minecraft/textures/item/squid_spawn_egg.png +++ b/assets/minecraft/textures/item/squid_spawn_egg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a4b9b3a5f2f5504e42b85a99e3d4e74820934d83a85d7af25b208c27251b8c55 -size 240 +oid sha256:572db27e4561625af62ec1882cbb501c3da3441782f036cf1b1ce455c691c1d3 +size 239 diff --git a/assets/minecraft/textures/item/stick.png b/assets/minecraft/textures/item/stick.png index adcf7612..98aae978 100644 --- a/assets/minecraft/textures/item/stick.png +++ b/assets/minecraft/textures/item/stick.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2b5a6b7202fcd3a45663ccf249fe87de076e8c735e0b6ab8a3bf2a812332b4ff -size 136 +oid sha256:da5ede0e54715247de78567df5212a114d0b8a1af183e286fa69cc6af5993711 +size 105 diff --git a/assets/minecraft/textures/item/stone_axe.png b/assets/minecraft/textures/item/stone_axe.png index 23f5526b..a4e9f4a2 100644 --- a/assets/minecraft/textures/item/stone_axe.png +++ b/assets/minecraft/textures/item/stone_axe.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:229e55952e8cbaa7d1c62264334e261ef697df5ebbd9943f17bfdefd36858b7f -size 179 +oid sha256:907180316ed8fce73d54a42d915fb68e094dbff21a1790404925f3d3f15ef408 +size 178 diff --git a/assets/minecraft/textures/item/stone_pickaxe.png b/assets/minecraft/textures/item/stone_pickaxe.png index 7da80988..d1d84890 100644 --- a/assets/minecraft/textures/item/stone_pickaxe.png +++ b/assets/minecraft/textures/item/stone_pickaxe.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bc08f9de56c707b3b1aa9993be8a359d3367874c4666ada936f5544535d68d39 -size 182 +oid sha256:b71fe5f52b753c6de7f4c1ff8897cb7e254d54d6b6e14606c16f684df024370f +size 181 diff --git a/assets/minecraft/textures/item/stone_shovel.png b/assets/minecraft/textures/item/stone_shovel.png index b99df2e5..84902fb2 100644 --- a/assets/minecraft/textures/item/stone_shovel.png +++ b/assets/minecraft/textures/item/stone_shovel.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9103e4f0cb21eda73b84435ad8b481605f15a0a7b01c234885bf1776643de9ed -size 158 +oid sha256:a58528efe40da0ce83d724779f84ebad08b71d4c2f04f460f9a5eb78551642e0 +size 156 diff --git a/assets/minecraft/textures/item/stone_sword.png b/assets/minecraft/textures/item/stone_sword.png index df5b1b1a..d5cf3730 100644 --- a/assets/minecraft/textures/item/stone_sword.png +++ b/assets/minecraft/textures/item/stone_sword.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:07aecbf30be9ccac9f4dec994f3cf75384596e9c1308ff75ba2dd1f73c990851 -size 191 +oid sha256:44fe7d80120c30eb678ea605bdc4b1bf8b6475e287703a0403d9a5bd7bedf982 +size 190 diff --git a/assets/minecraft/textures/item/stray_spawn_egg.png b/assets/minecraft/textures/item/stray_spawn_egg.png index 078dc51c..32ac610f 100644 --- a/assets/minecraft/textures/item/stray_spawn_egg.png +++ b/assets/minecraft/textures/item/stray_spawn_egg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d5e3fdcff2fe213baec93e4aed9974fcfc746c396ff3da90bab8e07d6f7f037 -size 240 +oid sha256:9023050ca4a5fab105adc26e712b1ae3f758f4b73698e728e05a0b218ff8b406 +size 239 diff --git a/assets/minecraft/textures/item/strider_spawn_egg.png b/assets/minecraft/textures/item/strider_spawn_egg.png index 8bb37804..a661ec17 100644 --- a/assets/minecraft/textures/item/strider_spawn_egg.png +++ b/assets/minecraft/textures/item/strider_spawn_egg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f65f8a015fe2b2380c44dfc328ea666674359602516ad04f4129d5c222cffc6d -size 265 +oid sha256:0d5a2ca3fbace22b783bda1fb0a16ed81699194d9a93c1e3154035de9c2d0718 +size 252 diff --git a/assets/minecraft/textures/item/string.png b/assets/minecraft/textures/item/string.png index 471abd3b..96936d43 100644 --- a/assets/minecraft/textures/item/string.png +++ b/assets/minecraft/textures/item/string.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ded6537ee0356cfd3a0024fccd1a7ee478b58279a0bace73b689cc62369d26da -size 166 +oid sha256:c7dac2dd79ae85bd35b2c933b17ac22256ec4cd79c1916b8ef0fc20642247957 +size 163 diff --git a/assets/minecraft/textures/item/structure_void.png b/assets/minecraft/textures/item/structure_void.png index 52d9fbce..393e64b2 100644 --- a/assets/minecraft/textures/item/structure_void.png +++ b/assets/minecraft/textures/item/structure_void.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7c68adaf07505c84fc2031dec4417fc27658bda0dcdcc39fcc5f7a6af8802df6 -size 191 +oid sha256:aea08f14c16e0c35382eab5b660c51e6cac42a38d62aaa0a6754103d0c131550 +size 180 diff --git a/assets/minecraft/textures/item/sugar.png b/assets/minecraft/textures/item/sugar.png index c5b41991..811071f3 100644 --- a/assets/minecraft/textures/item/sugar.png +++ b/assets/minecraft/textures/item/sugar.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:978323ef2f75967c503f533cd55fcac6a2733cb2c2f9d19857c6a49bb4a1c4c6 -size 171 +oid sha256:8fd584956fcf4b3252706051f7f0c93e808cdb0e391b42dff130c6ae4e5d18ae +size 167 diff --git a/assets/minecraft/textures/item/sugar_cane.png b/assets/minecraft/textures/item/sugar_cane.png index 112204d5..8bb4c566 100644 --- a/assets/minecraft/textures/item/sugar_cane.png +++ b/assets/minecraft/textures/item/sugar_cane.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dad3d43c986de5936e676d5335c679143900717069e6012ae7cd58c79c8964ec -size 185 +oid sha256:c4d268c910568b900e8fb961041dce056e6f9fe1d2e4fab99764579c38a1f966 +size 184 diff --git a/assets/minecraft/textures/item/sweet_berries.png b/assets/minecraft/textures/item/sweet_berries.png index f4655fd7..5a329261 100644 --- a/assets/minecraft/textures/item/sweet_berries.png +++ b/assets/minecraft/textures/item/sweet_berries.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:df3d2e43e671dd16d2b101e5e2273330e1bcae0bfe36cac5e8db68ce6ce7fc88 -size 204 +oid sha256:eca8f2ed6069b0312031aa215ffea05c0d63575b5768c99308d7694b6c491093 +size 202 diff --git a/assets/minecraft/textures/item/tide_armor_trim_smithing_template.png b/assets/minecraft/textures/item/tide_armor_trim_smithing_template.png index 13018f97..19eeb224 100644 --- a/assets/minecraft/textures/item/tide_armor_trim_smithing_template.png +++ b/assets/minecraft/textures/item/tide_armor_trim_smithing_template.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b8250f183a1750a8f53a6046ec148864b537481c8fd4a43de27a1378693cef4 -size 234 +oid sha256:e0299ffa3cb6ed49bccc42d83dbda8c9a65ce19586d97ea283b4f84be1706da7 +size 221 diff --git a/assets/minecraft/textures/item/tipped_arrow_base.png b/assets/minecraft/textures/item/tipped_arrow_base.png index 2c29e1db..49e58e48 100644 --- a/assets/minecraft/textures/item/tipped_arrow_base.png +++ b/assets/minecraft/textures/item/tipped_arrow_base.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:351ce843de15f759bd30f62de7843b100db113bee7ea97a697e0c4f02d87e0f3 -size 155 +oid sha256:d46f09767a3265996c027fe8c5744e1e8e974c5aad4a9141e843e2581521762e +size 111 diff --git a/assets/minecraft/textures/item/tipped_arrow_head.png b/assets/minecraft/textures/item/tipped_arrow_head.png index b3631a88..2f55423f 100644 --- a/assets/minecraft/textures/item/tipped_arrow_head.png +++ b/assets/minecraft/textures/item/tipped_arrow_head.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:848f5d47558cf681b17133bc98ee82ad0d4a620bd18206b2d21ecff084248e8b -size 154 +oid sha256:cfdf28d75a8beb8812e7e844bb973a48799fc614873c1984e976eba4b74c9904 +size 132 diff --git a/assets/minecraft/textures/item/torchflower_seeds.png b/assets/minecraft/textures/item/torchflower_seeds.png index bb80b429..ae698533 100644 --- a/assets/minecraft/textures/item/torchflower_seeds.png +++ b/assets/minecraft/textures/item/torchflower_seeds.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e8d7bc03ded956fdd21f227d3fe3a9b2c02c0a4e422a3f7876c297e1d397af6e -size 211 +oid sha256:0ab6b4f87745b7e186dec735435b2c29f39ee97ad46737fb54ddc413587ef7fc +size 199 diff --git a/assets/minecraft/textures/item/totem_of_undying.png b/assets/minecraft/textures/item/totem_of_undying.png index c85c4900..1d47d1ba 100644 --- a/assets/minecraft/textures/item/totem_of_undying.png +++ b/assets/minecraft/textures/item/totem_of_undying.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2ee3ccdd17f0b9acb13bac37b3b9d4db6eac72aa350a2b1ab9cc587e2f02514a -size 214 +oid sha256:5b713e2f41ddb310b024751a66a6ecc80714e4874070b77e2f0905a74788b565 +size 205 diff --git a/assets/minecraft/textures/item/trader_llama_spawn_egg.png b/assets/minecraft/textures/item/trader_llama_spawn_egg.png index eb90a953..9a24d4e4 100644 --- a/assets/minecraft/textures/item/trader_llama_spawn_egg.png +++ b/assets/minecraft/textures/item/trader_llama_spawn_egg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:56b5a3c8d90225012bc7e67fb2d4c76d38e5c6735992f09969bf4e2e33f13d05 -size 262 +oid sha256:e01ae0658ce9812581e11a7c226d23cfe8ce2c858bde9f0462dd189d683c432f +size 251 diff --git a/assets/minecraft/textures/item/tropical_fish.png b/assets/minecraft/textures/item/tropical_fish.png index 6eae346d..fcdb9147 100644 --- a/assets/minecraft/textures/item/tropical_fish.png +++ b/assets/minecraft/textures/item/tropical_fish.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4a3e4a537d5ab774f35d13f573233b2750695d20434f513bf58411ba99699e03 -size 294 +oid sha256:5bac57a75a250059b2ce03d3196c8f7c7baad8cf2522ee2779fb537c261f3cd1 +size 197 diff --git a/assets/minecraft/textures/item/tropical_fish_bucket.png b/assets/minecraft/textures/item/tropical_fish_bucket.png index 6ff57ee3..5a37274d 100644 --- a/assets/minecraft/textures/item/tropical_fish_bucket.png +++ b/assets/minecraft/textures/item/tropical_fish_bucket.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9e67feb45333ba78436057bf36865ae128b7511ce74a726c57d70db7689bf7ee -size 275 +oid sha256:aa145a5684eba13d7d39c4489bc3c1832c50552e29033e7dbf58e7f83c7f8cca +size 243 diff --git a/assets/minecraft/textures/item/tropical_fish_spawn_egg.png b/assets/minecraft/textures/item/tropical_fish_spawn_egg.png index 537ba46c..698b7967 100644 --- a/assets/minecraft/textures/item/tropical_fish_spawn_egg.png +++ b/assets/minecraft/textures/item/tropical_fish_spawn_egg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c0093fe3958eb7ee063b66d0b3cdc609fc2569d98743e63cb2710ad5af3c0fc8 -size 255 +oid sha256:867d8af2af0faae40d56003001de55a6aa5a0d1e4b4d6bb9cdcbc205bd50c3f5 +size 254 diff --git a/assets/minecraft/textures/item/turtle_egg.png b/assets/minecraft/textures/item/turtle_egg.png index 5cc0bbca..e046bb2b 100644 --- a/assets/minecraft/textures/item/turtle_egg.png +++ b/assets/minecraft/textures/item/turtle_egg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f8cd323e03510a89a9bc7b1852bd37eb3523a84b6db85eb0f6919e2a0efd23b4 -size 215 +oid sha256:91f69bd2bf900dc7ce0e36358d2574f4f332feca46cea5abff78de4cc56db48b +size 214 diff --git a/assets/minecraft/textures/item/turtle_scute.png b/assets/minecraft/textures/item/turtle_scute.png index 1626ffc1..f9ed6041 100644 --- a/assets/minecraft/textures/item/turtle_scute.png +++ b/assets/minecraft/textures/item/turtle_scute.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:275d1687a34a26c4481dda54f10436745197d6465ee10faab648daff88abb7c9 -size 137 +oid sha256:5cf5adf9a5e1ec9ae263208cc00cc95ef24b770713de66e65b6bdc9cd90159f0 +size 135 diff --git a/assets/minecraft/textures/item/turtle_spawn_egg.png b/assets/minecraft/textures/item/turtle_spawn_egg.png index 29c2f70b..107566dd 100644 --- a/assets/minecraft/textures/item/turtle_spawn_egg.png +++ b/assets/minecraft/textures/item/turtle_spawn_egg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6c99f416648419cc5109c29b06bc6ea48f5e6b1782d26cb71c3305c22538c96b -size 234 +oid sha256:483c78ed38c9121bb61a4718bd95e8f84df52ce6ff0ca5b9ae8e37b868e84a75 +size 228 diff --git a/assets/minecraft/textures/item/vex_armor_trim_smithing_template.png b/assets/minecraft/textures/item/vex_armor_trim_smithing_template.png index c7aca967..bf54417a 100644 --- a/assets/minecraft/textures/item/vex_armor_trim_smithing_template.png +++ b/assets/minecraft/textures/item/vex_armor_trim_smithing_template.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5a6340eb66bf8834e44e73494fb60b8bba2fe58d40595fb434bd25f6c272a311 -size 227 +oid sha256:662a02aa9d1df4fdc684b1c62f1b68d57732c6564fe61ba6bcdf03d3531c4aaa +size 213 diff --git a/assets/minecraft/textures/item/vex_spawn_egg.png b/assets/minecraft/textures/item/vex_spawn_egg.png index d35b6826..cae197ed 100644 --- a/assets/minecraft/textures/item/vex_spawn_egg.png +++ b/assets/minecraft/textures/item/vex_spawn_egg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:811472304ac3fd3c44fb4e0071f1c6a0829103666428416c88e448231bcad64c -size 243 +oid sha256:6e46640f7bb125e03c3d85b2bd0373d1be9718f3d7327e02fbcd0c041f7f0309 +size 229 diff --git a/assets/minecraft/textures/item/villager_spawn_egg.png b/assets/minecraft/textures/item/villager_spawn_egg.png index 450b01bb..6f5e899b 100644 --- a/assets/minecraft/textures/item/villager_spawn_egg.png +++ b/assets/minecraft/textures/item/villager_spawn_egg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b5f5efd1d6c8e4c4ab577a2586eaac4cf95c47fe053da03bf26a8573749718cb -size 228 +oid sha256:34c2a41eed6f1ee5238038a42c8255844cab5992aa07f01d2096a276468c2ed7 +size 221 diff --git a/assets/minecraft/textures/item/ward_armor_trim_smithing_template.png b/assets/minecraft/textures/item/ward_armor_trim_smithing_template.png index 1621209c..87d0d2db 100644 --- a/assets/minecraft/textures/item/ward_armor_trim_smithing_template.png +++ b/assets/minecraft/textures/item/ward_armor_trim_smithing_template.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f9104816e1c012df03e70c1dbaed2247711bbd3db4d9d52614e5827308f5113f -size 232 +oid sha256:1161bd8e9a3724b4f4ce7bc343173dce79b63390f46592e73b4fdd3836c617eb +size 218 diff --git a/assets/minecraft/textures/item/warped_door.png b/assets/minecraft/textures/item/warped_door.png index 5701b0e6..29f3e240 100644 --- a/assets/minecraft/textures/item/warped_door.png +++ b/assets/minecraft/textures/item/warped_door.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:01b5e1ba7f6c7b1887219bc85c8d7e5a12f724a377d7903e9ab1e71bcf54bea3 -size 196 +oid sha256:697e00387793ed81ea95f25ebb74d94913c6151948e98b08fc6b968b130b466c +size 192 diff --git a/assets/minecraft/textures/item/warped_hanging_sign.png b/assets/minecraft/textures/item/warped_hanging_sign.png index 41144634..5d103bc7 100644 --- a/assets/minecraft/textures/item/warped_hanging_sign.png +++ b/assets/minecraft/textures/item/warped_hanging_sign.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:69d1642d3fa5d289c418c747a64858137ff5cc42d6ebe68f49c5fa3f0200e744 -size 229 +oid sha256:660d08397af81cf4ffd4ec264abe6c980197aa07f9dba0206f9257af030def8a +size 216 diff --git a/assets/minecraft/textures/item/warped_sign.png b/assets/minecraft/textures/item/warped_sign.png index 5c26deca..30ca14e8 100644 --- a/assets/minecraft/textures/item/warped_sign.png +++ b/assets/minecraft/textures/item/warped_sign.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3f1e878ff3209f52564710f1305a786057080d6f035ae0d4df4c3709e6a1e9d5 -size 218 +oid sha256:943e5b0b01d7b2bee7ccdd854b054ef679b2019014f3405650117f4fc3496e6e +size 216 diff --git a/assets/minecraft/textures/item/water_bucket.png b/assets/minecraft/textures/item/water_bucket.png index 66e86f12..48e7b4a7 100644 --- a/assets/minecraft/textures/item/water_bucket.png +++ b/assets/minecraft/textures/item/water_bucket.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0efb2f243397e7d82a9a9e97b6e8fc39fc6c7972bf86b9b6ed97e7101b79c0a1 -size 219 +oid sha256:7da2d23c69392bda3c9dd617b7942035bbd03ea348a0ff05ad461a51854f68af +size 215 diff --git a/assets/minecraft/textures/item/wayfinder_armor_trim_smithing_template.png b/assets/minecraft/textures/item/wayfinder_armor_trim_smithing_template.png index 5d58071f..4d7fea83 100644 --- a/assets/minecraft/textures/item/wayfinder_armor_trim_smithing_template.png +++ b/assets/minecraft/textures/item/wayfinder_armor_trim_smithing_template.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:30a10755b5b52ed4b203d5e3541ff7a5f98128f42a2881db6de0c4fb4f5dfd4d -size 232 +oid sha256:210b9124417ff71d2db7a095580738cc7b399d8170d406eeda151cd1b707c10d +size 216 diff --git a/assets/minecraft/textures/item/wheat.png b/assets/minecraft/textures/item/wheat.png index 7fdc8b8a..6b4c2423 100644 --- a/assets/minecraft/textures/item/wheat.png +++ b/assets/minecraft/textures/item/wheat.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9ed5d3338d238528fa04c9fd86bd1e5f87a194576eed3f5e6bb86dcf18470039 -size 205 +oid sha256:4bede9ae2a07763c8c0bbd8f80008fc2fa8908b1fe703cb912782a91656fffdd +size 191 diff --git a/assets/minecraft/textures/item/wheat_seeds.png b/assets/minecraft/textures/item/wheat_seeds.png index 1caa6997..85ab30fa 100644 --- a/assets/minecraft/textures/item/wheat_seeds.png +++ b/assets/minecraft/textures/item/wheat_seeds.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3239486bef9ea883e438c068cb97c24f1a38924b54b3c2e6209f792fc222c8d3 -size 142 +oid sha256:20f699b7280e39f5d8d58315a5d2659ad67dcf90e4dbdd91aa479fa2dd0e1786 +size 138 diff --git a/assets/minecraft/textures/item/white_bundle.png b/assets/minecraft/textures/item/white_bundle.png index f33780a0..8058d265 100644 --- a/assets/minecraft/textures/item/white_bundle.png +++ b/assets/minecraft/textures/item/white_bundle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:78b0e0a6a2d02ccd1d37b9d7d48f37e27ffb469c57787499940369cfd781d28a -size 206 +oid sha256:4d796b37aace6bb84ae8eb3d4eb2ff86ef4caa27782a5b6c336426b5e7524e0b +size 203 diff --git a/assets/minecraft/textures/item/white_bundle_open_back.png b/assets/minecraft/textures/item/white_bundle_open_back.png index efa220a2..9cd83070 100644 --- a/assets/minecraft/textures/item/white_bundle_open_back.png +++ b/assets/minecraft/textures/item/white_bundle_open_back.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:504a83a3a33d0fc7f90981d02ac9c5d4cdfcb7be0cc329b50b5c63d5e16995e9 -size 152 +oid sha256:9abf6dae844cff9a3c4ec3f826e5c1c3276812702a67def7f72a50992c9a9296 +size 140 diff --git a/assets/minecraft/textures/item/white_bundle_open_front.png b/assets/minecraft/textures/item/white_bundle_open_front.png index 4c40fb81..41c4105c 100644 --- a/assets/minecraft/textures/item/white_bundle_open_front.png +++ b/assets/minecraft/textures/item/white_bundle_open_front.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b4eaa82b3d1489e80305bac817f40d3fedaf48e3a56ea2f4b679fa091d9cc380 -size 191 +oid sha256:9e05ac9c63d237ac725994fd1d725f3027d8a282ee7b6b8c4916d6b694d244c9 +size 186 diff --git a/assets/minecraft/textures/item/white_candle.png b/assets/minecraft/textures/item/white_candle.png index ff2c19f8..0304aa47 100644 --- a/assets/minecraft/textures/item/white_candle.png +++ b/assets/minecraft/textures/item/white_candle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7c833a997c6554ecd71383321ca597a967d37e72065268ec007bb3ccfa1185bd -size 175 +oid sha256:6bf75a4de00fe230f3977e0bc7142f2d602e3c1d36b9936f0c3db3c29aadf2ac +size 171 diff --git a/assets/minecraft/textures/item/white_dye.png b/assets/minecraft/textures/item/white_dye.png index 8a087c0a..9e897533 100644 --- a/assets/minecraft/textures/item/white_dye.png +++ b/assets/minecraft/textures/item/white_dye.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1191b13408bafef582401d3c09d99466aca38c288407533c2163ef8f2f98a085 -size 186 +oid sha256:73b100ae622db1e1b35ba957c12a1b9d992e90ae7f71b35d34813993ee812e0f +size 177 diff --git a/assets/minecraft/textures/item/white_harness.png b/assets/minecraft/textures/item/white_harness.png new file mode 100644 index 00000000..4a8f451e --- /dev/null +++ b/assets/minecraft/textures/item/white_harness.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c6a1ed4261d806d10d3e95b6a964a54ed218c721ef39c62f216f53d4d9251fa0 +size 252 diff --git a/assets/minecraft/textures/item/wild_armor_trim_smithing_template.png b/assets/minecraft/textures/item/wild_armor_trim_smithing_template.png index edf7e987..68b96b21 100644 --- a/assets/minecraft/textures/item/wild_armor_trim_smithing_template.png +++ b/assets/minecraft/textures/item/wild_armor_trim_smithing_template.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2010ca36a33a420c0d56620ea10efed45e792b5c293c247050030b3204d97468 -size 258 +oid sha256:77088dc73e0573818ad7f4aa22ff9e8b08470881a0ebb98503d5917942512343 +size 252 diff --git a/assets/minecraft/textures/item/wildflowers.png b/assets/minecraft/textures/item/wildflowers.png index 6e4669ea..ebcc6889 100644 --- a/assets/minecraft/textures/item/wildflowers.png +++ b/assets/minecraft/textures/item/wildflowers.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e5082cc0923298aa031aac59c6238dbb1b1e80160949c89f6b92236575b3987a -size 201 +oid sha256:1f87d03cc998cbc0dfb81c208deb1308d472f7f4cd48e995c064a0aa2adc0f38 +size 192 diff --git a/assets/minecraft/textures/item/wither_skeleton_spawn_egg.png b/assets/minecraft/textures/item/wither_skeleton_spawn_egg.png index ef5f0c3c..3c1d3158 100644 --- a/assets/minecraft/textures/item/wither_skeleton_spawn_egg.png +++ b/assets/minecraft/textures/item/wither_skeleton_spawn_egg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9b3b161c33007dd26220b8be6dcec9b7b13a5b6b98c2f6c52af72e5400d6ccfb -size 216 +oid sha256:4048680de9ac26a375b95898a8a84334bca4fc41cbba41c500725e990b74ae4d +size 207 diff --git a/assets/minecraft/textures/item/wither_spawn_egg.png b/assets/minecraft/textures/item/wither_spawn_egg.png index 8a16e0e6..21584495 100644 --- a/assets/minecraft/textures/item/wither_spawn_egg.png +++ b/assets/minecraft/textures/item/wither_spawn_egg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4c33dba205369d447ef224d6fa520f998b0188acc721ba70b493eb85031170a5 -size 233 +oid sha256:cd74678ac0584857099c74669ef8bf80810798bf8086e76eb40ec182bdac60a4 +size 223 diff --git a/assets/minecraft/textures/item/wolf_armor.png b/assets/minecraft/textures/item/wolf_armor.png index cff3450c..f8ce596b 100644 --- a/assets/minecraft/textures/item/wolf_armor.png +++ b/assets/minecraft/textures/item/wolf_armor.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:18e3bf6afe2bcddc5c0cd4742e8e99c4f78cd50cc69bbb4c1396fcc37c5d2063 -size 194 +oid sha256:d05abc9df9f6e82c166ad50e9aa234b092950cfaf1b5fb05b0127450bb442d6f +size 190 diff --git a/assets/minecraft/textures/item/wolf_armor_overlay.png b/assets/minecraft/textures/item/wolf_armor_overlay.png index 80c92fc4..da0222e9 100644 --- a/assets/minecraft/textures/item/wolf_armor_overlay.png +++ b/assets/minecraft/textures/item/wolf_armor_overlay.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:21c5fc3aa9ce68b1faa062b7b04c60efe2cba00c2ac657c7fa2feeed299079d8 -size 146 +oid sha256:1aaea2f08f45101572f103d92271d94569c41b9d12102d33b79e04fe23a75bf1 +size 119 diff --git a/assets/minecraft/textures/item/wolf_spawn_egg.png b/assets/minecraft/textures/item/wolf_spawn_egg.png index 883230e6..0e607cfc 100644 --- a/assets/minecraft/textures/item/wolf_spawn_egg.png +++ b/assets/minecraft/textures/item/wolf_spawn_egg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e11bf54810132fec84e45511a3567dd97e029c1bb655d6c5e5ba77945c49129b -size 241 +oid sha256:c85a0e7b5df5c32cc5057da138fe5a2b2107620831295f9e38b71f0de7ed9d38 +size 236 diff --git a/assets/minecraft/textures/item/wooden_axe.png b/assets/minecraft/textures/item/wooden_axe.png index 26364a56..9e1bbcbe 100644 --- a/assets/minecraft/textures/item/wooden_axe.png +++ b/assets/minecraft/textures/item/wooden_axe.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:37fb06dccb8e1d49563203d8c67156ac06d58aa6350b037926a8709b0014fba2 -size 179 +oid sha256:af0435458427c5729da68d8d22cc18542863f966453134a4b444ee90846c1fdd +size 178 diff --git a/assets/minecraft/textures/item/wooden_pickaxe.png b/assets/minecraft/textures/item/wooden_pickaxe.png index 1b501c3b..b5cbece9 100644 --- a/assets/minecraft/textures/item/wooden_pickaxe.png +++ b/assets/minecraft/textures/item/wooden_pickaxe.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a6c2a1de2d8bf88516e5c1cd438d392e9f1dc4fc3e283ecabc838848cc4440a5 -size 175 +oid sha256:c3ed9101c5f4f94a04c78e4d17f1a61a14e19737124ea56a1927b8f93aee68c2 +size 174 diff --git a/assets/minecraft/textures/item/wooden_shovel.png b/assets/minecraft/textures/item/wooden_shovel.png index b6683b9a..d61275ea 100644 --- a/assets/minecraft/textures/item/wooden_shovel.png +++ b/assets/minecraft/textures/item/wooden_shovel.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:224aaee15532a88fde2589b749efe503009cbc57509303d6a1e5ce04922932bd -size 158 +oid sha256:fcdb26e1d22b166d8837771707a064a8144b54684ac43974bbf6d6c981d13908 +size 156 diff --git a/assets/minecraft/textures/item/wooden_sword.png b/assets/minecraft/textures/item/wooden_sword.png index 3f0e33e1..7ee7243b 100644 --- a/assets/minecraft/textures/item/wooden_sword.png +++ b/assets/minecraft/textures/item/wooden_sword.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:24f9533ddf93bf052174f53a4bd2d3ccd1d6f3ca25077f3d0e04063f01128da3 -size 191 +oid sha256:8165dd48d392632563bfea87b2707371d2804031f1dcafcdee3a88a42a476cfc +size 190 diff --git a/assets/minecraft/textures/item/writable_book.png b/assets/minecraft/textures/item/writable_book.png index d7ecc121..a48bdd77 100644 --- a/assets/minecraft/textures/item/writable_book.png +++ b/assets/minecraft/textures/item/writable_book.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:181b670aafb03287849957ee882863c3924a2aaa826f3f44ab94bea906c54228 -size 247 +oid sha256:58f744ca5a13652cf76b6866dbfc6465361d7d62e672285916010c36fa6fbad1 +size 241 diff --git a/assets/minecraft/textures/item/written_book.png b/assets/minecraft/textures/item/written_book.png index 5cf0d603..d82ff4a2 100644 --- a/assets/minecraft/textures/item/written_book.png +++ b/assets/minecraft/textures/item/written_book.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fd6a75bb4c32a9c291cb3a1b72aab5193c0480359723f70115a9c9930c2d0c26 -size 211 +oid sha256:8de9612f80a0a0727a6167453087f66d4bec700b0e4c03d6b6b1817034c935ba +size 199 diff --git a/assets/minecraft/textures/item/yellow_bundle.png b/assets/minecraft/textures/item/yellow_bundle.png index 401b90a8..0d78d30f 100644 --- a/assets/minecraft/textures/item/yellow_bundle.png +++ b/assets/minecraft/textures/item/yellow_bundle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:67157916f9fecaea5a9f67a1ed51200d9103f10a76584811ce1616c30e8e0ae3 -size 206 +oid sha256:233ad401d1ba8f4b8aaf627a2c37935bb2119e242f7c3409dacb710a1799f983 +size 203 diff --git a/assets/minecraft/textures/item/yellow_bundle_open_back.png b/assets/minecraft/textures/item/yellow_bundle_open_back.png index 825ff926..ba953855 100644 --- a/assets/minecraft/textures/item/yellow_bundle_open_back.png +++ b/assets/minecraft/textures/item/yellow_bundle_open_back.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d5bfcf02e90e6dac96579721b2721e6bda304cd9bbf356d9eed536a08b93f4b -size 152 +oid sha256:550cdd17ee0f5892d890c00b9a5e46cbbd135a2bda3d56ed543edabf4b11af7a +size 139 diff --git a/assets/minecraft/textures/item/yellow_bundle_open_front.png b/assets/minecraft/textures/item/yellow_bundle_open_front.png index 650097f9..ec7619c1 100644 --- a/assets/minecraft/textures/item/yellow_bundle_open_front.png +++ b/assets/minecraft/textures/item/yellow_bundle_open_front.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3008f402c8beff4c2fa8eb53f8779fc88d170206e1843aefa5732be3f98caf6b -size 191 +oid sha256:6df7c61ef7787803ac3240cc25370b4138cbcc2d621d8ff061d045d5b627b11f +size 187 diff --git a/assets/minecraft/textures/item/yellow_candle.png b/assets/minecraft/textures/item/yellow_candle.png index 9fc4ba94..c8c0b3ba 100644 --- a/assets/minecraft/textures/item/yellow_candle.png +++ b/assets/minecraft/textures/item/yellow_candle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b2603fd6d882f003b5d8f6ff278d5a206216cf20f7c5064cef71a09e1f2a941f -size 183 +oid sha256:5d0a90ebf42acd274e00fabd381535f3c2dce2aea3ebf8d4d0929191ccee88c8 +size 179 diff --git a/assets/minecraft/textures/item/yellow_dye.png b/assets/minecraft/textures/item/yellow_dye.png index 824fba0c..3c7aa0e8 100644 --- a/assets/minecraft/textures/item/yellow_dye.png +++ b/assets/minecraft/textures/item/yellow_dye.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:da330cb33b0fceb4710eed3cdeecdad158e62d7b3a3524947652345f88d0429f -size 185 +oid sha256:c6e1bd730a6e537273f7f8b31d2db58c1d12c79daf0254aa6e7fac26fc39a231 +size 182 diff --git a/assets/minecraft/textures/item/yellow_harness.png b/assets/minecraft/textures/item/yellow_harness.png new file mode 100644 index 00000000..c381be26 --- /dev/null +++ b/assets/minecraft/textures/item/yellow_harness.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d82bdc6a80d567ee1b8660d124aa7fa0adbef5a624a80f2e83c294eaba5d8b3c +size 254 diff --git a/assets/minecraft/textures/item/zoglin_spawn_egg.png b/assets/minecraft/textures/item/zoglin_spawn_egg.png index e560e6f1..ed31dfdd 100644 --- a/assets/minecraft/textures/item/zoglin_spawn_egg.png +++ b/assets/minecraft/textures/item/zoglin_spawn_egg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bba948f53316aa2d24d54d736e611e796bc968c48da72c5890e0f86addff410c -size 337 +oid sha256:c64a209c644f540987c1581c7e41343c90ea5ad76e08075ea7d5bdcea224dd9c +size 335 diff --git a/assets/minecraft/textures/item/zombie_horse_spawn_egg.png b/assets/minecraft/textures/item/zombie_horse_spawn_egg.png index d7039361..8bce5f9d 100644 --- a/assets/minecraft/textures/item/zombie_horse_spawn_egg.png +++ b/assets/minecraft/textures/item/zombie_horse_spawn_egg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:954e802a6a177f9fb22a7c54b0824ea05080e8a0b621fd3768a8a3dc35966074 -size 259 +oid sha256:ddfd16b4832ad512e45e2fa9c546618c3f05edb589075c3749267994e5decb71 +size 240 diff --git a/assets/minecraft/textures/item/zombie_villager_spawn_egg.png b/assets/minecraft/textures/item/zombie_villager_spawn_egg.png index b00eb576..adcffc88 100644 --- a/assets/minecraft/textures/item/zombie_villager_spawn_egg.png +++ b/assets/minecraft/textures/item/zombie_villager_spawn_egg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:88906bcece7e0c8e2a3132149e3775a4928a213aa22a592df3b9cc91aed93981 -size 235 +oid sha256:e45eea42e4245519cb9bbe07a3d586e862ea1f8729af36878b5080656cf8b878 +size 231 diff --git a/assets/minecraft/textures/map/decorations/black_banner.png b/assets/minecraft/textures/map/decorations/black_banner.png index 4f4918c4..b63536b6 100644 --- a/assets/minecraft/textures/map/decorations/black_banner.png +++ b/assets/minecraft/textures/map/decorations/black_banner.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1c04c842786373c56b1cf78496be7c9ac5a6e066e9eb9d5e76d91f7ec1321b71 -size 111 +oid sha256:16040950ace65a68ca7b2c2b7d6384f706f7884079a964b5ba03ebc61cd370ee +size 88 diff --git a/assets/minecraft/textures/map/decorations/blue_banner.png b/assets/minecraft/textures/map/decorations/blue_banner.png index b0b63f9a..68bb1bc4 100644 --- a/assets/minecraft/textures/map/decorations/blue_banner.png +++ b/assets/minecraft/textures/map/decorations/blue_banner.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2b083eca05bc576e071665654d4bb0c076b9d90bae97c513f055aaa64e252a99 -size 111 +oid sha256:efe9ca192c73c9ce717ea0edae72f51dda134d4c81dfecae54747808d08c30f6 +size 88 diff --git a/assets/minecraft/textures/map/decorations/blue_marker.png b/assets/minecraft/textures/map/decorations/blue_marker.png index 6430703a..2c511e41 100644 --- a/assets/minecraft/textures/map/decorations/blue_marker.png +++ b/assets/minecraft/textures/map/decorations/blue_marker.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1db139d43c5a4ab2a71b3f1d70536c07cc46e15af6113bd91071c1b3054324bc -size 135 +oid sha256:faae9541318f01250b1ebd4fde3663972a6f3893b90799e431ecf33a4f76ea21 +size 103 diff --git a/assets/minecraft/textures/map/decorations/brown_banner.png b/assets/minecraft/textures/map/decorations/brown_banner.png index 60808ebf..c26a9ef6 100644 --- a/assets/minecraft/textures/map/decorations/brown_banner.png +++ b/assets/minecraft/textures/map/decorations/brown_banner.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:818fa4652145bdef5b1e14481098f431c0a8c40007830bd66e155e18b1fe3f3b -size 111 +oid sha256:eabcdb42e5e56426b8dc952fe025c8cee12617ca5e12e017c440b12cd98cc1c2 +size 88 diff --git a/assets/minecraft/textures/map/decorations/cyan_banner.png b/assets/minecraft/textures/map/decorations/cyan_banner.png index f1306c53..f49e3efd 100644 --- a/assets/minecraft/textures/map/decorations/cyan_banner.png +++ b/assets/minecraft/textures/map/decorations/cyan_banner.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0db7cc638857ec7439feb38402c7efeb926425fc9737d2fa913189aa5e513d42 -size 111 +oid sha256:dcdad84cf91f233f6da589605a91ad5b759b77c90d6c12baf06ce4a451ace08d +size 88 diff --git a/assets/minecraft/textures/map/decorations/desert_village.png b/assets/minecraft/textures/map/decorations/desert_village.png index cef05deb..ebacc50a 100644 --- a/assets/minecraft/textures/map/decorations/desert_village.png +++ b/assets/minecraft/textures/map/decorations/desert_village.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c66e2bad7deb7ef9615120711329faf4f3243242dad3fcf3155485f248a8cbfc -size 131 +oid sha256:17908e830f68e28a104c419351ea4a65fa6c7e55e52e60a6ed741ae73ebc30f1 +size 105 diff --git a/assets/minecraft/textures/map/decorations/frame.png b/assets/minecraft/textures/map/decorations/frame.png index 6ae4457e..e6e68c01 100644 --- a/assets/minecraft/textures/map/decorations/frame.png +++ b/assets/minecraft/textures/map/decorations/frame.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:accd477a1f81d4c8180a5808536b812ac68c11ef1bad0f306235c6155b552d19 -size 135 +oid sha256:a8142aa043f580c34b026a1951fb08f293cda375ae673cd3620236320b2f8f88 +size 100 diff --git a/assets/minecraft/textures/map/decorations/gray_banner.png b/assets/minecraft/textures/map/decorations/gray_banner.png index 3aeeb8b3..d30ff4f5 100644 --- a/assets/minecraft/textures/map/decorations/gray_banner.png +++ b/assets/minecraft/textures/map/decorations/gray_banner.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:57c6e63d26da798dbde4d39c0a4dfd8cf93914e0e59a2e463abdccd12caa6912 -size 111 +oid sha256:31da89ded608e2b6667a03a459f5dc7c68821875ed9bfab70a798f2f9a33e318 +size 88 diff --git a/assets/minecraft/textures/map/decorations/green_banner.png b/assets/minecraft/textures/map/decorations/green_banner.png index cea5cdf2..43770974 100644 --- a/assets/minecraft/textures/map/decorations/green_banner.png +++ b/assets/minecraft/textures/map/decorations/green_banner.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6248b54f54cbb296adc0497c6d2bbe7f79af22cb6b33d54e2843d99d2a2fa2ee -size 111 +oid sha256:8b1935d164d9feab586a99ec0fae34980c6554eb8aafab3e8d38791dcdeade14 +size 88 diff --git a/assets/minecraft/textures/map/decorations/jungle_temple.png b/assets/minecraft/textures/map/decorations/jungle_temple.png index c17dc1bb..4c5a90c7 100644 --- a/assets/minecraft/textures/map/decorations/jungle_temple.png +++ b/assets/minecraft/textures/map/decorations/jungle_temple.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b93277c5ce960ed84eb8e3778689fd962972d2f4f3f2dfa0ecd77c1f8f5035fc -size 149 +oid sha256:5129e30e950697521396e8aa09f72c4807e024914c15cf3c58c4ac74a774c936 +size 132 diff --git a/assets/minecraft/textures/map/decorations/light_blue_banner.png b/assets/minecraft/textures/map/decorations/light_blue_banner.png index c2fd4040..89e27156 100644 --- a/assets/minecraft/textures/map/decorations/light_blue_banner.png +++ b/assets/minecraft/textures/map/decorations/light_blue_banner.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ddc7b580c2fbf4af6b046a42f5c869c2756ee5d9f8ac6ae7f8fd93341e124bad -size 111 +oid sha256:78f99072f95a8aebd31035eb6c106277ac81c9c09e26eb2fd1c06cf03aab5f6b +size 88 diff --git a/assets/minecraft/textures/map/decorations/light_gray_banner.png b/assets/minecraft/textures/map/decorations/light_gray_banner.png index 4db40dae..877cc1c5 100644 --- a/assets/minecraft/textures/map/decorations/light_gray_banner.png +++ b/assets/minecraft/textures/map/decorations/light_gray_banner.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4a3ff735b9e79ce40aaf42bbc2d68e547ff78411d65b580a69c288faa2cd0419 -size 111 +oid sha256:f297275e8019b3896e8d858afe81c59a28ae1effad7797aa3bb73c4821462208 +size 88 diff --git a/assets/minecraft/textures/map/decorations/lime_banner.png b/assets/minecraft/textures/map/decorations/lime_banner.png index 5f06cf4d..8a81e3fc 100644 --- a/assets/minecraft/textures/map/decorations/lime_banner.png +++ b/assets/minecraft/textures/map/decorations/lime_banner.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cf21e7daec58d90b035ad4a7cbfcfcfb3333450a8e63baaacab6b2c465aaeb1f -size 111 +oid sha256:de41cf64539d50a57c42c0b825e4e287d6b0599c7e752f959acf57852c7c0648 +size 88 diff --git a/assets/minecraft/textures/map/decorations/magenta_banner.png b/assets/minecraft/textures/map/decorations/magenta_banner.png index 335e2f92..defc815e 100644 --- a/assets/minecraft/textures/map/decorations/magenta_banner.png +++ b/assets/minecraft/textures/map/decorations/magenta_banner.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f92c5d30bcd344f04857c6df93347d5b5ad5dd699894e7360cbd0c15e108fcac -size 111 +oid sha256:778d4f14ee2179bbf72421388fe76a2171aacbe1b6af411c0628674eeb414840 +size 88 diff --git a/assets/minecraft/textures/map/decorations/ocean_monument.png b/assets/minecraft/textures/map/decorations/ocean_monument.png index 455555e4..f0ac9bb0 100644 --- a/assets/minecraft/textures/map/decorations/ocean_monument.png +++ b/assets/minecraft/textures/map/decorations/ocean_monument.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3b6db6c48b4cc89fb02859eb2a8ab96c530c2adcaf9874d1c029491bd3bd666d -size 143 +oid sha256:9243905f0d2cda86e7ad6d7558478981cc058125ea22b367593b89db7f62cf3c +size 128 diff --git a/assets/minecraft/textures/map/decorations/orange_banner.png b/assets/minecraft/textures/map/decorations/orange_banner.png index 2abe2871..c2cbf1ec 100644 --- a/assets/minecraft/textures/map/decorations/orange_banner.png +++ b/assets/minecraft/textures/map/decorations/orange_banner.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:09320e04f5f61369be0b107be6db752ccc26f8eac8715e78f33e62a5dc3300fb -size 111 +oid sha256:9f47c3b0e746c2d07c06f54f453a2d9688ce5c31bffdd7c613ba1d4b7f81048f +size 88 diff --git a/assets/minecraft/textures/map/decorations/pink_banner.png b/assets/minecraft/textures/map/decorations/pink_banner.png index 2d784a48..21c10d3e 100644 --- a/assets/minecraft/textures/map/decorations/pink_banner.png +++ b/assets/minecraft/textures/map/decorations/pink_banner.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:07785c4018513b1aad4361a708e26f36016a03398434e1bf6f3eddb95b7c3e6d -size 111 +oid sha256:8849625e9cbce147d1078e7780b66d7415dfe928e94303da87bfc4606d371ad0 +size 88 diff --git a/assets/minecraft/textures/map/decorations/plains_village.png b/assets/minecraft/textures/map/decorations/plains_village.png index 6b4194df..080ef3c7 100644 --- a/assets/minecraft/textures/map/decorations/plains_village.png +++ b/assets/minecraft/textures/map/decorations/plains_village.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a342e0473ac023c862b98bb6047b8bba762a0f6649b6397068cce97d25a8cf06 -size 156 +oid sha256:328b0ab3150a798de59bc6f6b5c3ec0adf3309025736399e9a0a35260cc932ff +size 126 diff --git a/assets/minecraft/textures/map/decorations/player.png b/assets/minecraft/textures/map/decorations/player.png index d80539f4..ed2ea97b 100644 --- a/assets/minecraft/textures/map/decorations/player.png +++ b/assets/minecraft/textures/map/decorations/player.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4837ed9f00e31020dfbe4a90fa456c549b274b7ab3b7f5a2e6e8c2ca6f7575b8 -size 135 +oid sha256:6cef16c9f7ecfc6e9d66cc1035c402f7883d6db697598a399fd5ea45ba0f776c +size 94 diff --git a/assets/minecraft/textures/map/decorations/player_off_limits.png b/assets/minecraft/textures/map/decorations/player_off_limits.png index 4537bb2b..46be7b4f 100644 --- a/assets/minecraft/textures/map/decorations/player_off_limits.png +++ b/assets/minecraft/textures/map/decorations/player_off_limits.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cda441bc032a69b33c8bea33c4f6bd337699d75890b3deaf818c3edc3e7bf14e -size 117 +oid sha256:a6f5b6ebd9b42647a319c81be543e1c4882ba076cec7050f1237af696708e3da +size 84 diff --git a/assets/minecraft/textures/map/decorations/player_off_map.png b/assets/minecraft/textures/map/decorations/player_off_map.png index f1d1d11f..8fb4833d 100644 --- a/assets/minecraft/textures/map/decorations/player_off_map.png +++ b/assets/minecraft/textures/map/decorations/player_off_map.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6c02caa4b9cb02517bf332a241fabfc56e70fdd42ff153c97c33596058455b6b -size 130 +oid sha256:af9e853ca0e34cf8845333f92e952b7b886f40927e1796ad3c2fb4a3abacf3b0 +size 93 diff --git a/assets/minecraft/textures/map/decorations/purple_banner.png b/assets/minecraft/textures/map/decorations/purple_banner.png index fd2d5017..bf1f808b 100644 --- a/assets/minecraft/textures/map/decorations/purple_banner.png +++ b/assets/minecraft/textures/map/decorations/purple_banner.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c592ada531d4efa3c1667364dd86fa694d95b7e932765d368b076721c65a0d25 -size 111 +oid sha256:b61313af7d1cff1480adbca998694fb755a9bd5d99efe0483ad24dbaef77f6f4 +size 88 diff --git a/assets/minecraft/textures/map/decorations/red_banner.png b/assets/minecraft/textures/map/decorations/red_banner.png index b38c8b4f..35358c67 100644 --- a/assets/minecraft/textures/map/decorations/red_banner.png +++ b/assets/minecraft/textures/map/decorations/red_banner.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:57709f41b96cd58895fb190b4bdde84f069b63b3158d93107938992120b4fc8f -size 111 +oid sha256:3858c5be5016c6a05d43eaa02189e8ba6e02f1d3807076d14e3d72c02192a56e +size 88 diff --git a/assets/minecraft/textures/map/decorations/red_marker.png b/assets/minecraft/textures/map/decorations/red_marker.png index ed3a5b80..efa3e146 100644 --- a/assets/minecraft/textures/map/decorations/red_marker.png +++ b/assets/minecraft/textures/map/decorations/red_marker.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c37b7d8d0070651ed2038f1436ea3af1df4b713db776e1bad20fa772eee448f3 -size 135 +oid sha256:b3113c1cca6dd335393a80e467d163b96cdb03cbe3a3f7436fc44928beb2279c +size 103 diff --git a/assets/minecraft/textures/map/decorations/red_x.png b/assets/minecraft/textures/map/decorations/red_x.png index 6f1bf5e6..10a580b0 100644 --- a/assets/minecraft/textures/map/decorations/red_x.png +++ b/assets/minecraft/textures/map/decorations/red_x.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e5ea3a64848b18b5d7ba5f4b96152d43f1c6c593dfd0bc5f3df7ed8c21babca8 -size 140 +oid sha256:6d97bdd5f37786dc079462747746b0ae0a75031b1e61ca6716a436ec64cbd108 +size 123 diff --git a/assets/minecraft/textures/map/decorations/savanna_village.png b/assets/minecraft/textures/map/decorations/savanna_village.png index 5e665645..e7cafb48 100644 --- a/assets/minecraft/textures/map/decorations/savanna_village.png +++ b/assets/minecraft/textures/map/decorations/savanna_village.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f1b1f5e48fed8583988003d68f762a2e2fef3de303277a58a8fc02da4ed84e1 -size 149 +oid sha256:1dd37738ad3b20d2ab3db20f3230d78683b715b3174a68b64b8d047997ed56c7 +size 118 diff --git a/assets/minecraft/textures/map/decorations/snowy_village.png b/assets/minecraft/textures/map/decorations/snowy_village.png index a48fc133..c466f095 100644 --- a/assets/minecraft/textures/map/decorations/snowy_village.png +++ b/assets/minecraft/textures/map/decorations/snowy_village.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:99be24a0ec2fb88db681cd35ddf0ea6b95ebfbda6fbe2e5465de1fffbabe3139 -size 138 +oid sha256:093286d5aa7d651bbfdd910d7e90f31554cde013059bc9c2eba0405176adbeda +size 109 diff --git a/assets/minecraft/textures/map/decorations/swamp_hut.png b/assets/minecraft/textures/map/decorations/swamp_hut.png index e972961d..d7237f45 100644 --- a/assets/minecraft/textures/map/decorations/swamp_hut.png +++ b/assets/minecraft/textures/map/decorations/swamp_hut.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:de0b77b9b6d9d139890f7247ac73a1765531a5852433956e4febeabf73513e51 -size 147 +oid sha256:6f5f9e7529519bdb5ed04308104cd5a552c8b4605649755dc2eec41ce6670ded +size 123 diff --git a/assets/minecraft/textures/map/decorations/taiga_village.png b/assets/minecraft/textures/map/decorations/taiga_village.png index e8c51c3e..869e6edf 100644 --- a/assets/minecraft/textures/map/decorations/taiga_village.png +++ b/assets/minecraft/textures/map/decorations/taiga_village.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7479912abf832ca7ffb2c6cdd2aee41260fca500b251f6274d0f13e7989e75c5 -size 142 +oid sha256:483caafc0279957b709c7ececdbab1064c7ea19a64016a43c9b20cfbbf1cd33a +size 116 diff --git a/assets/minecraft/textures/map/decorations/target_point.png b/assets/minecraft/textures/map/decorations/target_point.png index 6289c428..a0edaf97 100644 --- a/assets/minecraft/textures/map/decorations/target_point.png +++ b/assets/minecraft/textures/map/decorations/target_point.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:70a9e23af0ff0032006da05fd4df4592ba01823dc649f1a61ce9f33c6cffd737 -size 139 +oid sha256:a8f0b67433bcb892e953a7c905a7f49dc0e955f4d9534c6b56bc8f4e6de06f86 +size 114 diff --git a/assets/minecraft/textures/map/decorations/target_x.png b/assets/minecraft/textures/map/decorations/target_x.png index eb501397..9fea9839 100644 --- a/assets/minecraft/textures/map/decorations/target_x.png +++ b/assets/minecraft/textures/map/decorations/target_x.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8bffb011886c270dbe21aac513552afbe75446180f0ee3cf5d0bf65ecebfb891 -size 133 +oid sha256:deaa52358d84ec12c5cf7f5fbfb20116443de7681f79b9fe4696e3994260c2f1 +size 99 diff --git a/assets/minecraft/textures/map/decorations/trial_chambers.png b/assets/minecraft/textures/map/decorations/trial_chambers.png index 97ff9b55..159557da 100644 --- a/assets/minecraft/textures/map/decorations/trial_chambers.png +++ b/assets/minecraft/textures/map/decorations/trial_chambers.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:43c5e55362b3c6d069bfa815ba335312d7fab23ed647542e0563d6110ca88b66 -size 145 +oid sha256:a9001ae6f4e9552308ad9fac5ca0f9cff0ef73d499c1df7d8ecb9bacfa9f5107 +size 117 diff --git a/assets/minecraft/textures/map/decorations/white_banner.png b/assets/minecraft/textures/map/decorations/white_banner.png index 549460ad..e2391896 100644 --- a/assets/minecraft/textures/map/decorations/white_banner.png +++ b/assets/minecraft/textures/map/decorations/white_banner.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:44a04ae96f519d4f1a950de9706814bff9b16ab29197ca5f8a8c358e592a8755 -size 111 +oid sha256:e8c7a9e1bdc9e352c7d0e4d1f442bdfdd3b4915a501f53bf083364d7d7d15b9a +size 85 diff --git a/assets/minecraft/textures/map/decorations/woodland_mansion.png b/assets/minecraft/textures/map/decorations/woodland_mansion.png index b71a646e..f681f1ab 100644 --- a/assets/minecraft/textures/map/decorations/woodland_mansion.png +++ b/assets/minecraft/textures/map/decorations/woodland_mansion.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:05b3a2b5d0f4fdb5ea1c9ad096d4849ca046ef7713c8bcbab396538030ac05de -size 157 +oid sha256:43b59399949f1686b3e1a5e6acbae418c205e224ddc6077a08d2cbe1a8bc2350 +size 123 diff --git a/assets/minecraft/textures/map/decorations/yellow_banner.png b/assets/minecraft/textures/map/decorations/yellow_banner.png index beab9f8d..4176e530 100644 --- a/assets/minecraft/textures/map/decorations/yellow_banner.png +++ b/assets/minecraft/textures/map/decorations/yellow_banner.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:35fbdf2cc91225798508acd8e89d6d6eac35fa6cfd3fb3bc3a0e4c0dfe760bc8 -size 111 +oid sha256:dc247bf722cbe30097f34e397ac88609c34a32cc3526d5885a3200141f126567 +size 88 diff --git a/assets/minecraft/textures/misc/credits_vignette.png b/assets/minecraft/textures/misc/credits_vignette.png index afe7cdfc..53871810 100644 --- a/assets/minecraft/textures/misc/credits_vignette.png +++ b/assets/minecraft/textures/misc/credits_vignette.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1ebfdb9eb3eefbb3ca160e9f36eb4e7b5047f5f66a0611e724680e5442423f3b -size 7037 +oid sha256:97759529c22694f13884cc55661c0a4ce0d25eb81a1fa97188ab406297b98c64 +size 5054 diff --git a/assets/minecraft/textures/misc/forcefield.png b/assets/minecraft/textures/misc/forcefield.png index 6061f6e2..bccf521d 100644 --- a/assets/minecraft/textures/misc/forcefield.png +++ b/assets/minecraft/textures/misc/forcefield.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:20c1e65e8d8c7bb3791eb2f1908b9997c8d6cf7a6ab88214a6d62385172d790d -size 134 +oid sha256:1a7d3254b5bab1f903556ec9070cefaaa82f1fce5bf3a330af8f95de27afbacf +size 104 diff --git a/assets/minecraft/textures/misc/nausea.png b/assets/minecraft/textures/misc/nausea.png index d893a87d..6ad138be 100644 --- a/assets/minecraft/textures/misc/nausea.png +++ b/assets/minecraft/textures/misc/nausea.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fe750044ec6898f81406e1398aa9a95ac6f10bfde1c369245ec65da72d968d30 -size 12936 +oid sha256:b76c1e100e6d39246dfc74421d8982c342a37dfa1c55989197c370c1416f5744 +size 12935 diff --git a/assets/minecraft/textures/misc/powder_snow_outline.png b/assets/minecraft/textures/misc/powder_snow_outline.png index db3a9fa4..092dec5d 100644 --- a/assets/minecraft/textures/misc/powder_snow_outline.png +++ b/assets/minecraft/textures/misc/powder_snow_outline.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:59658a24ed04dfbfa95ad0e3436a226cfeafc479d0b2adaa921efa3f31443d15 -size 5764 +oid sha256:105139f2de0d23926454dd6edbba12bcb4a5a23f2ec4d0fc04efe540a9527a1a +size 1647 diff --git a/assets/minecraft/textures/misc/pumpkinblur.png b/assets/minecraft/textures/misc/pumpkinblur.png index 7619b469..fd68276c 100644 --- a/assets/minecraft/textures/misc/pumpkinblur.png +++ b/assets/minecraft/textures/misc/pumpkinblur.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a26402169cc58d50dd5c0eecd9db2488edd5a72452749589fd51fbd7e3feca4d -size 9483 +oid sha256:6b906d96e639212521f1508e4ec61c184c76f3d8264c5c4eba207ae1fd1a16ca +size 9469 diff --git a/assets/minecraft/textures/misc/shadow.png b/assets/minecraft/textures/misc/shadow.png index 2e2ec838..ddfa68eb 100644 --- a/assets/minecraft/textures/misc/shadow.png +++ b/assets/minecraft/textures/misc/shadow.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aafa10c4257e8e70f2213fac2e885f8f9e37fb14fcc5585ea900baafd66f43ad -size 550 +oid sha256:193525c33a894170af6a16852efaa00c4cdd55045e0db0da2d6c864f615ce757 +size 473 diff --git a/assets/minecraft/textures/misc/spyglass_scope.png b/assets/minecraft/textures/misc/spyglass_scope.png index a5cc3985..8ca5a7aa 100644 --- a/assets/minecraft/textures/misc/spyglass_scope.png +++ b/assets/minecraft/textures/misc/spyglass_scope.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:736552955005a663aeab6142825e7a57be8c135687bf57a170f6c44911610192 -size 590 +oid sha256:647803f6eff585a5764476a0dd36675df9db98edd63e1d03c4a93db714c27e39 +size 583 diff --git a/assets/minecraft/textures/misc/underwater.png b/assets/minecraft/textures/misc/underwater.png index 5755f872..c91dcf56 100644 --- a/assets/minecraft/textures/misc/underwater.png +++ b/assets/minecraft/textures/misc/underwater.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e118e221737316502f255e9e17d9389f7105504cc409085003a0adf783fc74dd -size 179 +oid sha256:0bb4f1a2da430fc4285d14dad52a674bf393a2eb9f8a805825a723181d331605 +size 178 diff --git a/assets/minecraft/textures/misc/unknown_server.png b/assets/minecraft/textures/misc/unknown_server.png index 6758ee2b..d82f76ef 100644 --- a/assets/minecraft/textures/misc/unknown_server.png +++ b/assets/minecraft/textures/misc/unknown_server.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f43ef0d47bb59e2d986e33c2a6f5805c4851b1ed34d9c1bf47f0040f370ecd54 -size 6857 +oid sha256:b0b745c4573737e150db7b880fc01321a9e1f96180622b2c6200ea3944961690 +size 6848 diff --git a/assets/minecraft/textures/misc/vignette.png b/assets/minecraft/textures/misc/vignette.png index afe7cdfc..53871810 100644 --- a/assets/minecraft/textures/misc/vignette.png +++ b/assets/minecraft/textures/misc/vignette.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1ebfdb9eb3eefbb3ca160e9f36eb4e7b5047f5f66a0611e724680e5442423f3b -size 7037 +oid sha256:97759529c22694f13884cc55661c0a4ce0d25eb81a1fa97188ab406297b98c64 +size 5054 diff --git a/assets/minecraft/textures/misc/white.png b/assets/minecraft/textures/misc/white.png index 0c87a0ed..8cd97063 100644 --- a/assets/minecraft/textures/misc/white.png +++ b/assets/minecraft/textures/misc/white.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0fca5efa844f575a75ce4fcb3445d438d9cfe31bea21d241f82fcfb80d0bac0b -size 72 +oid sha256:8c43da77c4e644d665ce81a1d6f7d01d0338b5ffd3d0f9a902a7ac468dcc3221 +size 69 diff --git a/assets/minecraft/textures/mob_effect/absorption.png b/assets/minecraft/textures/mob_effect/absorption.png index dd992d0a..cf8ee9b4 100644 --- a/assets/minecraft/textures/mob_effect/absorption.png +++ b/assets/minecraft/textures/mob_effect/absorption.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9da320bca432d1f7f45bcdb3b1642c26ea5c7fd3208b458888441ca8f4a92d47 -size 464 +oid sha256:db5d2c4bfe063b8a9028e5038c75462a58d2b5473bede52ba12b91604d243168 +size 247 diff --git a/assets/minecraft/textures/mob_effect/blindness.png b/assets/minecraft/textures/mob_effect/blindness.png index 7ff3e485..5f70aec2 100644 --- a/assets/minecraft/textures/mob_effect/blindness.png +++ b/assets/minecraft/textures/mob_effect/blindness.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:710231af41145fe5637bad43b44d35e3586116f37af350220bb403b74b32e951 -size 337 +oid sha256:e6614709d980df628fda8b8703229b0e256b81fbf6d15b38a72c864cbf35a54c +size 230 diff --git a/assets/minecraft/textures/mob_effect/conduit_power.png b/assets/minecraft/textures/mob_effect/conduit_power.png index 8061b813..ccfc163a 100644 --- a/assets/minecraft/textures/mob_effect/conduit_power.png +++ b/assets/minecraft/textures/mob_effect/conduit_power.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:932c2da1f729954144486e35661c756959ebddd64e66bc599c424451682df65b -size 252 +oid sha256:ec9216ac8f1b6dbdb62731d28a93d47bf5b93c139305cadb3c48c18ae2d76304 +size 240 diff --git a/assets/minecraft/textures/mob_effect/darkness.png b/assets/minecraft/textures/mob_effect/darkness.png index ac2d6728..39ad838d 100644 --- a/assets/minecraft/textures/mob_effect/darkness.png +++ b/assets/minecraft/textures/mob_effect/darkness.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a4e38c8302886f5cf9dd4895e3db38acea5c9cb7596568e728bcbfc7a5c3c35b -size 195 +oid sha256:06c656022a52e72dca3dc3dea721c21f2d65aa0d618127a9995f4d751cefc775 +size 191 diff --git a/assets/minecraft/textures/mob_effect/dolphins_grace.png b/assets/minecraft/textures/mob_effect/dolphins_grace.png index d7c0e145..d854e4e4 100644 --- a/assets/minecraft/textures/mob_effect/dolphins_grace.png +++ b/assets/minecraft/textures/mob_effect/dolphins_grace.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7769a1c1b3b88df0d3bce3dc1bebbab2c168cc7c136708ff47fcab692596d155 -size 205 +oid sha256:7b346976b32630fb6505aef9e549fcbdc1e5934d4485ea42862f4070187012a9 +size 194 diff --git a/assets/minecraft/textures/mob_effect/fire_resistance.png b/assets/minecraft/textures/mob_effect/fire_resistance.png index 1796939f..643ea29e 100644 --- a/assets/minecraft/textures/mob_effect/fire_resistance.png +++ b/assets/minecraft/textures/mob_effect/fire_resistance.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cee9ba396dada44be8ef3898c9138616e96d6a86b55a1f2add79cc4af063ed15 -size 333 +oid sha256:df4d3bded7518b70b50e80e5e87545f62c9b287729067b2f12892bd28acfaf36 +size 246 diff --git a/assets/minecraft/textures/mob_effect/glowing.png b/assets/minecraft/textures/mob_effect/glowing.png index 08be893b..be2c1b4e 100644 --- a/assets/minecraft/textures/mob_effect/glowing.png +++ b/assets/minecraft/textures/mob_effect/glowing.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:118627a3e48f5119f893b7b6abe3aadddb339db91736924266ec4baf4706f044 -size 293 +oid sha256:99a3ebdb6109368148a64f22d6985a49446c4a8b46e09bfebff5bab7174759b2 +size 212 diff --git a/assets/minecraft/textures/mob_effect/haste.png b/assets/minecraft/textures/mob_effect/haste.png index 80cca5d4..75827583 100644 --- a/assets/minecraft/textures/mob_effect/haste.png +++ b/assets/minecraft/textures/mob_effect/haste.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b74dea51205d93bb9b04c21dfdf30707ffd61f0ab4d33245aefceecbfe328ba2 -size 222 +oid sha256:a60bfc0cbe80713de63b4cfea69a0cd9640475e12da661cea495dad6592903b8 +size 210 diff --git a/assets/minecraft/textures/mob_effect/health_boost.png b/assets/minecraft/textures/mob_effect/health_boost.png index 55e41df1..5832f7a6 100644 --- a/assets/minecraft/textures/mob_effect/health_boost.png +++ b/assets/minecraft/textures/mob_effect/health_boost.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9b689d9bba214c903acf975fe88cb2dfb3130de72eb02327c580bf743ca98885 -size 304 +oid sha256:f6084cd02161f3b5b535b8926b475315abaa901af7c693f6416b2008097b3742 +size 205 diff --git a/assets/minecraft/textures/mob_effect/hero_of_the_village.png b/assets/minecraft/textures/mob_effect/hero_of_the_village.png index 06005f82..5912aa2d 100644 --- a/assets/minecraft/textures/mob_effect/hero_of_the_village.png +++ b/assets/minecraft/textures/mob_effect/hero_of_the_village.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1b39f5d4ad5dffee35ba54b098888a6f280de8f792cb8a6055372c7d6949e71d -size 238 +oid sha256:06119e021c9e48668c8e04638719f458fa59b96b635260add4eae1b00de6dc24 +size 226 diff --git a/assets/minecraft/textures/mob_effect/hunger.png b/assets/minecraft/textures/mob_effect/hunger.png index 52c58ca1..57b26e06 100644 --- a/assets/minecraft/textures/mob_effect/hunger.png +++ b/assets/minecraft/textures/mob_effect/hunger.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c8a43881c8a0a571354bdfab4b67b2f2791ca9d39119ecc8e634cdecfc1c059d -size 311 +oid sha256:4ccba7e988b5efd1fc6cf515217d033880c7d94ff65881d385530188c1e230a9 +size 201 diff --git a/assets/minecraft/textures/mob_effect/infested.png b/assets/minecraft/textures/mob_effect/infested.png index 006c9f83..ed781a46 100644 --- a/assets/minecraft/textures/mob_effect/infested.png +++ b/assets/minecraft/textures/mob_effect/infested.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:716c0c6a8a5dc1a6e54e640fee58b2b30f28953412ec2d4951412f288502a6a2 -size 262 +oid sha256:86c54da9bb7031dc59626211eef11ef49b2d9ff2db3b75847f88d3a48fe39f7a +size 246 diff --git a/assets/minecraft/textures/mob_effect/instant_damage.png b/assets/minecraft/textures/mob_effect/instant_damage.png index e1bae7cb..68d662c7 100644 --- a/assets/minecraft/textures/mob_effect/instant_damage.png +++ b/assets/minecraft/textures/mob_effect/instant_damage.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:14b2ce9074bc783003644a7f664d2aa1805fa960fe95960e2624209a3471255e -size 186 +oid sha256:3d06cc78a6c70f0aa84c3b950956e9d7de22f4b2737d408fa32250194b6db705 +size 162 diff --git a/assets/minecraft/textures/mob_effect/instant_health.png b/assets/minecraft/textures/mob_effect/instant_health.png index 1b60038f..dbfb492d 100644 --- a/assets/minecraft/textures/mob_effect/instant_health.png +++ b/assets/minecraft/textures/mob_effect/instant_health.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3f2194931fbf14387039520b3d29d4b31df0f630a3fcd5f23b928c215e042bbe -size 191 +oid sha256:894dbf3ac64235b33398c8f610eeffa0365d1d960bf603040faccc48fd73a775 +size 169 diff --git a/assets/minecraft/textures/mob_effect/invisibility.png b/assets/minecraft/textures/mob_effect/invisibility.png index 84162402..9e7395e0 100644 --- a/assets/minecraft/textures/mob_effect/invisibility.png +++ b/assets/minecraft/textures/mob_effect/invisibility.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f74509eea6eaa42218d49cd7763197e6613f85aa74f6cda597f7e8d9866330b5 -size 224 +oid sha256:897145a88521f1a91abf9ea24142c2bf20a3197df5c0e8f37100bc72c9d167a9 +size 214 diff --git a/assets/minecraft/textures/mob_effect/jump_boost.png b/assets/minecraft/textures/mob_effect/jump_boost.png index ee07d4cf..a983f629 100644 --- a/assets/minecraft/textures/mob_effect/jump_boost.png +++ b/assets/minecraft/textures/mob_effect/jump_boost.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:41388fafc2a7fe57f5932a4faac0d7ce6c930b7ce47ac26235daa18cd5aef4f0 -size 280 +oid sha256:1cf0ac29efe62031e0f4690192edf5113333cbe25123dd314e1b5e48987ec78e +size 179 diff --git a/assets/minecraft/textures/mob_effect/levitation.png b/assets/minecraft/textures/mob_effect/levitation.png index 9435d0b6..41fb0ede 100644 --- a/assets/minecraft/textures/mob_effect/levitation.png +++ b/assets/minecraft/textures/mob_effect/levitation.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d8667b0cbafa4106da094969c1f75cbdbbd87a47ed04042c5741265d206421a -size 285 +oid sha256:2ca40af418c5613043c0af127da49dc2be5cd630eb3c34fe5379721e0801fe58 +size 187 diff --git a/assets/minecraft/textures/mob_effect/luck.png b/assets/minecraft/textures/mob_effect/luck.png index 92b12f05..3a13eff7 100644 --- a/assets/minecraft/textures/mob_effect/luck.png +++ b/assets/minecraft/textures/mob_effect/luck.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6289a3a1c99042f5b98cc7f635ac1a4c1d313e88de71667690452fb9095d0b18 -size 196 +oid sha256:30a242e3432fb0ce3f680bcfe4d085d3f94738c18da06d65319fe89a207c6da3 +size 191 diff --git a/assets/minecraft/textures/mob_effect/mining_fatigue.png b/assets/minecraft/textures/mob_effect/mining_fatigue.png index 2cedf129..e0a1e790 100644 --- a/assets/minecraft/textures/mob_effect/mining_fatigue.png +++ b/assets/minecraft/textures/mob_effect/mining_fatigue.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c16e4a454f6be63aca317f3c36c11a62c58c4dd0ddab0aecef8f0f4afc05ec83 -size 193 +oid sha256:5a40d5e5e5e94cb450aa6e7b4df99459e700a118e4dd8893606adc6b5065c4f6 +size 181 diff --git a/assets/minecraft/textures/mob_effect/nausea.png b/assets/minecraft/textures/mob_effect/nausea.png index c359a1cc..6906b6c9 100644 --- a/assets/minecraft/textures/mob_effect/nausea.png +++ b/assets/minecraft/textures/mob_effect/nausea.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b4bd529e0a3330a3565f3e3cfad68c7bcf34475f632b1a2e1cdf7ab6adba25cf -size 395 +oid sha256:e046e4d9a0501fa1ea34e6800ffc9e06276b85c95f1d6ea1b136e7235d09162f +size 169 diff --git a/assets/minecraft/textures/mob_effect/night_vision.png b/assets/minecraft/textures/mob_effect/night_vision.png index bc6aa855..ab7098f6 100644 --- a/assets/minecraft/textures/mob_effect/night_vision.png +++ b/assets/minecraft/textures/mob_effect/night_vision.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1becf03263afbea3aa8615f9bdba5af86f8e73577c430e8a25d6c4fcbfc9d0b3 -size 276 +oid sha256:b040a6aa0f74ab87714a14ce37bc22e890d228d6e3e662538717d4979dc566b1 +size 191 diff --git a/assets/minecraft/textures/mob_effect/oozing.png b/assets/minecraft/textures/mob_effect/oozing.png index e1437fe1..b0e02e9c 100644 --- a/assets/minecraft/textures/mob_effect/oozing.png +++ b/assets/minecraft/textures/mob_effect/oozing.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:63105b842b31ebf75a77813400df788071c15f763d872fe496f8f50d0cf6b345 -size 211 +oid sha256:8385b7a910e5788e5b5498fcf66548e3aa5b59d092c8e1c42bf59de7e563ab9c +size 194 diff --git a/assets/minecraft/textures/mob_effect/poison.png b/assets/minecraft/textures/mob_effect/poison.png index c5d8940c..51caba67 100644 --- a/assets/minecraft/textures/mob_effect/poison.png +++ b/assets/minecraft/textures/mob_effect/poison.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9645e52d3ba82d4aea34eb57e6852a0c1d54478b3ef2c28e9670408f55c268e4 -size 189 +oid sha256:e7aa674d2236999b5c50a0001ddaf71f12b5177830b1451b7a9ee85b0d4ce919 +size 185 diff --git a/assets/minecraft/textures/mob_effect/raid_omen.png b/assets/minecraft/textures/mob_effect/raid_omen.png index 4bd7d5d1..7aa7bf54 100644 --- a/assets/minecraft/textures/mob_effect/raid_omen.png +++ b/assets/minecraft/textures/mob_effect/raid_omen.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e9b243fd5d75adbe141198c16788af3b4bdd361316b96dd321756d34c3707791 -size 332 +oid sha256:8634e02132c1f85c92b85666059440ced03fac00a09f2b624da8a77382a2b310 +size 331 diff --git a/assets/minecraft/textures/mob_effect/regeneration.png b/assets/minecraft/textures/mob_effect/regeneration.png index 5c031b13..13491193 100644 --- a/assets/minecraft/textures/mob_effect/regeneration.png +++ b/assets/minecraft/textures/mob_effect/regeneration.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:09bd2e8e8669322ab4a2b57ddf17a9a4518d074da6c0033d5e7b2a6c25ee2d30 -size 198 +oid sha256:e70573cce87561ccdbdb1bf6bc71d2ecf119460b9bdaf5f59a404ac06d9ce0b6 +size 188 diff --git a/assets/minecraft/textures/mob_effect/resistance.png b/assets/minecraft/textures/mob_effect/resistance.png index 8f676e93..57b52a0a 100644 --- a/assets/minecraft/textures/mob_effect/resistance.png +++ b/assets/minecraft/textures/mob_effect/resistance.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:815dec530cf9a76a46c9741c568212ed87ee42373da1a43b37a6e050d3aa0e44 -size 297 +oid sha256:a094882b7554439b1fd2cd9238047c3bef91d34f1d2a339993977ff1263a97ac +size 218 diff --git a/assets/minecraft/textures/mob_effect/saturation.png b/assets/minecraft/textures/mob_effect/saturation.png index 68be99bc..c9a412a0 100644 --- a/assets/minecraft/textures/mob_effect/saturation.png +++ b/assets/minecraft/textures/mob_effect/saturation.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:03c1fb7bbefc54cc3298e863ee6eaa0d72e4a8d80a80e43b8db22a941773c2b0 -size 331 +oid sha256:cfa8a74654dcefdfdf12a50841e9b14fb2e554f1b57bb71f56586b550281157c +size 229 diff --git a/assets/minecraft/textures/mob_effect/slow_falling.png b/assets/minecraft/textures/mob_effect/slow_falling.png index 6de8a685..eaa941ce 100644 --- a/assets/minecraft/textures/mob_effect/slow_falling.png +++ b/assets/minecraft/textures/mob_effect/slow_falling.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:af08549911d8a5d3f1b2c9b4680fb3205c32ee8815a3d403de82cd91a94c5ca1 -size 198 +oid sha256:fa34050a443d8ffa7b7e76b9ce14be933fd278c5666adaf021e922361c909fbb +size 177 diff --git a/assets/minecraft/textures/mob_effect/speed.png b/assets/minecraft/textures/mob_effect/speed.png index bf1e4084..e085e35d 100644 --- a/assets/minecraft/textures/mob_effect/speed.png +++ b/assets/minecraft/textures/mob_effect/speed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ba388036b839b85b04f300aaf81cbf73c452f43ecc4becdfb7296535962086a9 -size 239 +oid sha256:3745e2979516481b70ecbc8b016817003cbd0f6bc4d49498ee66a9480816617c +size 230 diff --git a/assets/minecraft/textures/mob_effect/strength.png b/assets/minecraft/textures/mob_effect/strength.png index f6557c0e..50fbeadb 100644 --- a/assets/minecraft/textures/mob_effect/strength.png +++ b/assets/minecraft/textures/mob_effect/strength.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2f12f31477ec7e241212924f564816de737eb639e18139297960248852f21a4f -size 217 +oid sha256:6aa0bfb48dc95b3f6bb296b0c6e204d4721721a441a7513a12d504a92f723f93 +size 211 diff --git a/assets/minecraft/textures/mob_effect/trial_omen.png b/assets/minecraft/textures/mob_effect/trial_omen.png index 3d9adf82..671aee3c 100644 --- a/assets/minecraft/textures/mob_effect/trial_omen.png +++ b/assets/minecraft/textures/mob_effect/trial_omen.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6de4961462dd57b48d528ac128ad45680aa60362554f0b48281334f5027137e3 -size 228 +oid sha256:a2eefd2003b119f859c7c0782f67397f261931347bf75f194648228fd179a1cd +size 219 diff --git a/assets/minecraft/textures/mob_effect/unluck.png b/assets/minecraft/textures/mob_effect/unluck.png index 8447fdd4..250d94d4 100644 --- a/assets/minecraft/textures/mob_effect/unluck.png +++ b/assets/minecraft/textures/mob_effect/unluck.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:52155fb42b22b131419c8473a027aa9b1560d06cc2f08f36080ac89ef9173349 -size 195 +oid sha256:24bdd6489e99d4f74a1e26296bccb22c626b1629062da521da4710905dc232c1 +size 187 diff --git a/assets/minecraft/textures/mob_effect/water_breathing.png b/assets/minecraft/textures/mob_effect/water_breathing.png index d4f42f3b..dbfcc1df 100644 --- a/assets/minecraft/textures/mob_effect/water_breathing.png +++ b/assets/minecraft/textures/mob_effect/water_breathing.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aca71bb909882ea11faeaf2c89713efc0b2ef446ac0eca7d237dd54a1aaba5be -size 318 +oid sha256:e0c085901b4004fa02e41c00fd97ec3f409dc03513b1651185440f24119ae95a +size 162 diff --git a/assets/minecraft/textures/mob_effect/weakness.png b/assets/minecraft/textures/mob_effect/weakness.png index 5ebcfbee..ef74ab53 100644 --- a/assets/minecraft/textures/mob_effect/weakness.png +++ b/assets/minecraft/textures/mob_effect/weakness.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c28c388a57e7afb888c94505e05c9ffb7aa5efe8f67eab37b3ee727d4c27866 -size 196 +oid sha256:ddb3f6aaca3b57b21e6973ed27c724e35a31eafc17c0c1aca5bc332505d846c8 +size 194 diff --git a/assets/minecraft/textures/mob_effect/weaving.png b/assets/minecraft/textures/mob_effect/weaving.png index 8734ca93..bfe85ae2 100644 --- a/assets/minecraft/textures/mob_effect/weaving.png +++ b/assets/minecraft/textures/mob_effect/weaving.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e2057a70dd027941e5c4e883869ccc431e93ff444cc0955fa20702222c48ec48 -size 255 +oid sha256:1ce5f0c61c2b21074d7e797f9c6fcea0b2fd455e2cd2eb11023cb0db58aa4e1a +size 237 diff --git a/assets/minecraft/textures/mob_effect/wind_charged.png b/assets/minecraft/textures/mob_effect/wind_charged.png index 3a687e25..1bd5664c 100644 --- a/assets/minecraft/textures/mob_effect/wind_charged.png +++ b/assets/minecraft/textures/mob_effect/wind_charged.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9dad3486243f91b2de54814820565ffd3d2e73bda00aefb4ef7798975fe90d38 -size 225 +oid sha256:8fb3358ab8357a9c487dfc1830cbcbbf2bbadf9883c1ce88a28b9aa7e5d24514 +size 215 diff --git a/assets/minecraft/textures/mob_effect/wither.png b/assets/minecraft/textures/mob_effect/wither.png index 5605b63a..25b7688f 100644 --- a/assets/minecraft/textures/mob_effect/wither.png +++ b/assets/minecraft/textures/mob_effect/wither.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c19851eec31e86d6cf05fcae91101580ad189c9dcf0582d77ac3680458f5e1ad -size 370 +oid sha256:6150072c253936bd6b89b31fe825d1505446ea14afa8ec7b78e2a1a1cc01f938 +size 208 diff --git a/assets/minecraft/textures/painting/alban.png b/assets/minecraft/textures/painting/alban.png index 84b13029..b6e7cee1 100644 --- a/assets/minecraft/textures/painting/alban.png +++ b/assets/minecraft/textures/painting/alban.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d51c8975962d5e242d1b214db434924faced35e1546dbb367a9a27e0668fdc59 -size 811 +oid sha256:7d8856e75e4096aa33d8708d88f0171da442377d4ca6ae3b8b13300d546d707a +size 731 diff --git a/assets/minecraft/textures/painting/aztec.png b/assets/minecraft/textures/painting/aztec.png index 2bd1483c..52ca4a78 100644 --- a/assets/minecraft/textures/painting/aztec.png +++ b/assets/minecraft/textures/painting/aztec.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:649cc5784e693406f99bef3484f8a84713b2c3e5764f1a78cc9b20e56242e634 -size 851 +oid sha256:eb70b00c323802668e846e22a46cfbafbaa086ca04d82f939679d2c71119a672 +size 764 diff --git a/assets/minecraft/textures/painting/aztec2.png b/assets/minecraft/textures/painting/aztec2.png index 85c55884..950055a4 100644 --- a/assets/minecraft/textures/painting/aztec2.png +++ b/assets/minecraft/textures/painting/aztec2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9b46e7c729b05f96609b830b2a7f524223b54b5e0fb20ffdc9bc4e94bd9fba05 -size 819 +oid sha256:e9a0e16f830ae21d7a4b57f09cce0571d481db92b901c064f9f58c8c5389bf93 +size 741 diff --git a/assets/minecraft/textures/painting/backyard.png b/assets/minecraft/textures/painting/backyard.png index a7868785..55247b48 100644 --- a/assets/minecraft/textures/painting/backyard.png +++ b/assets/minecraft/textures/painting/backyard.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fc6e90d1f32ab060da04bdcc0dc3ac628a9b764c22a502adb90157b9cf0cb3b3 -size 6980 +oid sha256:8db58fd3a56e6fb1a51130f3855bcb60c99743e628a8effe4ff7f6dde4bd8702 +size 6978 diff --git a/assets/minecraft/textures/painting/bomb.png b/assets/minecraft/textures/painting/bomb.png index 25fe36e2..1e517c1f 100644 --- a/assets/minecraft/textures/painting/bomb.png +++ b/assets/minecraft/textures/painting/bomb.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:beaa4cb8ddf6fa35291cda154469b891b82b989d351358fa85ca25cf59c993ff -size 841 +oid sha256:52b8335ea883ba0d88aeb4d502b69e6dd6cdeec732a45e67b5603467f0d9a72f +size 763 diff --git a/assets/minecraft/textures/painting/bouquet.png b/assets/minecraft/textures/painting/bouquet.png index 02ffbdad..63f08c62 100644 --- a/assets/minecraft/textures/painting/bouquet.png +++ b/assets/minecraft/textures/painting/bouquet.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4446454030e8871f377975f09d30eb746e6c405929e998783d25f7b49754bce5 -size 4768 +oid sha256:065b36057fa54a4aba67647a69bbb4227294ee926077e182a0323ba5765257d8 +size 4767 diff --git a/assets/minecraft/textures/painting/burning_skull.png b/assets/minecraft/textures/painting/burning_skull.png index dcb83d4f..497799dd 100644 --- a/assets/minecraft/textures/painting/burning_skull.png +++ b/assets/minecraft/textures/painting/burning_skull.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d594edc7d38ab29ca2349eaa6e4211204110ac5e4ef86f027bbda21ca04de4cb -size 4136 +oid sha256:861f1bd6d0ac9cb959a50da3c5e37c84f783ce5a237646f22d89410e6945f658 +size 4135 diff --git a/assets/minecraft/textures/painting/cavebird.png b/assets/minecraft/textures/painting/cavebird.png index eed27bd4..f1c7ea47 100644 --- a/assets/minecraft/textures/painting/cavebird.png +++ b/assets/minecraft/textures/painting/cavebird.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a5959a2287de9cf27a0cf460901eaf2e824ab745e8e0db6f46974d402825c0db -size 5679 +oid sha256:04765eb6f6b46524ebaa0ce773ed8b542906cf027c4e6d4d6b30ad17ecd5f601 +size 5673 diff --git a/assets/minecraft/textures/painting/changing.png b/assets/minecraft/textures/painting/changing.png index 5833c5ef..3ba76c6e 100644 --- a/assets/minecraft/textures/painting/changing.png +++ b/assets/minecraft/textures/painting/changing.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:72e8ad65fefae59ef207a4000db061229f46232ad49b24a7245e4a532dc6facc -size 4797 +oid sha256:76deb1c9358335d1f726f58191ffdcb5f1ce50ab7b2baf29af23305e6e45aefd +size 4789 diff --git a/assets/minecraft/textures/painting/donkey_kong.png b/assets/minecraft/textures/painting/donkey_kong.png index 6a3ec530..16459104 100644 --- a/assets/minecraft/textures/painting/donkey_kong.png +++ b/assets/minecraft/textures/painting/donkey_kong.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:697e8da37f4da959dd90ba88f71989ad3c6616f1c265f959d6fa45c397a3744e -size 5737 +oid sha256:c0ff33a9defd4a29a0f5dfa51462aef2bda46614bf4c737fe2f3853fd4ee8b08 +size 5732 diff --git a/assets/minecraft/textures/painting/earth.png b/assets/minecraft/textures/painting/earth.png index 4c26b432..89f163e3 100644 --- a/assets/minecraft/textures/painting/earth.png +++ b/assets/minecraft/textures/painting/earth.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5705b639f92f20d1130a3a8c7def34fec6a7ed87e548e6c90981e50302640cce -size 303 +oid sha256:e40a50068e10d46649f9e31226ab7a82e9b1777b0765b58cdce805d49fce5578 +size 296 diff --git a/assets/minecraft/textures/painting/fern.png b/assets/minecraft/textures/painting/fern.png index 9b8ff64d..3aeaf151 100644 --- a/assets/minecraft/textures/painting/fern.png +++ b/assets/minecraft/textures/painting/fern.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2f20978dd850eb8c277f2d21b319d7af18787e068fea53ac0011e44b9e7a3d06 -size 5115 +oid sha256:964a674a9c858bd1aff7d54d0728433146a58844f709564bf7fa65f5b49b8659 +size 5099 diff --git a/assets/minecraft/textures/painting/finding.png b/assets/minecraft/textures/painting/finding.png index 341449e1..9f67dd6b 100644 --- a/assets/minecraft/textures/painting/finding.png +++ b/assets/minecraft/textures/painting/finding.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:44405e3a1b9bf4e225a0f16452f7e8db94db95cc38f445e74603875fdc437656 -size 5121 +oid sha256:46fd6f1de1e75ec02508c69ca53f5f87bf9c76a8a866a6a98f2250b5d7c41bb4 +size 5114 diff --git a/assets/minecraft/textures/painting/fire.png b/assets/minecraft/textures/painting/fire.png index 7fc04861..f73171ed 100644 --- a/assets/minecraft/textures/painting/fire.png +++ b/assets/minecraft/textures/painting/fire.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e7b2cb02fcf6ed65d9ed3c363864162dc2035d1ffa42dad57593a67be57762d3 -size 332 +oid sha256:45fe459c906c80bdd371a1bb529dcd7e7a23dcdbc93e9f9fcd9a75bd31892d0a +size 321 diff --git a/assets/minecraft/textures/painting/graham.png b/assets/minecraft/textures/painting/graham.png index c24ee111..533858ed 100644 --- a/assets/minecraft/textures/painting/graham.png +++ b/assets/minecraft/textures/painting/graham.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7aea7436b312db0eba45fbd2c975d150139838c8f0bb1338be569fcff83bab4e -size 1109 +oid sha256:4a60935838775632b603ae6b4d5b6e75ee3cd79628a71f8169ff6ebb63542b73 +size 1102 diff --git a/assets/minecraft/textures/painting/kebab.png b/assets/minecraft/textures/painting/kebab.png index 57e55e0a..0334bee6 100644 --- a/assets/minecraft/textures/painting/kebab.png +++ b/assets/minecraft/textures/painting/kebab.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c12fb6d5767fc545b43a5adca103a0e0374260bc7e62a403fb66235ec6825f93 -size 900 +oid sha256:d96dac7c7703cdfbb052631d4eacc9d6d5bc2aab713d90fbff0fd5cec249585c +size 808 diff --git a/assets/minecraft/textures/painting/owlemons.png b/assets/minecraft/textures/painting/owlemons.png index cde5f7ee..3cd268c5 100644 --- a/assets/minecraft/textures/painting/owlemons.png +++ b/assets/minecraft/textures/painting/owlemons.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:78b1debf8fd9384cbdb513af7fbf2995f1b1fcb23652087a1630ee115a6d2d6d -size 4947 +oid sha256:72d7efe528590c0039da3417ac5c975f75ae17438f9b64c8f2b5733848dbdb59 +size 4939 diff --git a/assets/minecraft/textures/painting/passage.png b/assets/minecraft/textures/painting/passage.png index fe201f6f..50818052 100644 --- a/assets/minecraft/textures/painting/passage.png +++ b/assets/minecraft/textures/painting/passage.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:58353288d7de6f46ab99f86dd17739d0e95104b4237a5a695d8739519995d5fd -size 5263 +oid sha256:3dc054b5acd0cc0efdba271e0b0b62c94269bb31c48e515d4cd05d21d9325d45 +size 5262 diff --git a/assets/minecraft/textures/painting/pigscene.png b/assets/minecraft/textures/painting/pigscene.png index 775a122f..974b6d53 100644 --- a/assets/minecraft/textures/painting/pigscene.png +++ b/assets/minecraft/textures/painting/pigscene.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0629610f454848b2d571c6e29276ad4a64e28ef70cce93f4025692cfd9027166 -size 8300 +oid sha256:8549a9e71ae8cad416cfaeb3fda08b978d0568f1d6e90276029d0426dcaa5651 +size 8298 diff --git a/assets/minecraft/textures/painting/plant.png b/assets/minecraft/textures/painting/plant.png index ff86514f..d3581ddc 100644 --- a/assets/minecraft/textures/painting/plant.png +++ b/assets/minecraft/textures/painting/plant.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1498ce654b314a37d398b5e165066ec2ba29de601e9586ddce38fa7e4294f86c -size 779 +oid sha256:5c11a4e0c0345ff60dbbeb1be031dca87f3baf318164058bde514a69cf2e6aba +size 707 diff --git a/assets/minecraft/textures/painting/pointer.png b/assets/minecraft/textures/painting/pointer.png index f0addc63..0d93faca 100644 --- a/assets/minecraft/textures/painting/pointer.png +++ b/assets/minecraft/textures/painting/pointer.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4d9cf0de3d421fcbb98cc9391383d0061b2bb026a24f3f80e787cb2575d20ac0 -size 8397 +oid sha256:977d3daccba7b570e6ad8430c9f4ee9e5cdf61caf1a032ab5ba943b2d9608c6d +size 8363 diff --git a/assets/minecraft/textures/painting/pond.png b/assets/minecraft/textures/painting/pond.png index a01c5fde..7d5a3101 100644 --- a/assets/minecraft/textures/painting/pond.png +++ b/assets/minecraft/textures/painting/pond.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:73d64be2e6be3bd99a92c2c9eead28682a145d9999f2c787ee3db21887bcba4a -size 6789 +oid sha256:8613f2d32baa43aa9d6264cbb88846bbcfc51a9954f8e2b688614d5ef76dc58b +size 6778 diff --git a/assets/minecraft/textures/painting/sunflowers.png b/assets/minecraft/textures/painting/sunflowers.png index 8b47005b..423cbb65 100644 --- a/assets/minecraft/textures/painting/sunflowers.png +++ b/assets/minecraft/textures/painting/sunflowers.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:06dcf211d713efbcd65b925426da0a940d410d3b63fbdaa1238460f4c864d817 -size 5619 +oid sha256:496c8a11e7c2df4a9843d0fe68741ee9b8444000d6caa6e082bf702bdc2b3f8b +size 5602 diff --git a/assets/minecraft/textures/painting/sunset.png b/assets/minecraft/textures/painting/sunset.png index 45bfe6ba..f3c70ac4 100644 --- a/assets/minecraft/textures/painting/sunset.png +++ b/assets/minecraft/textures/painting/sunset.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:02a33efaf95d7c8865f4558bcc6351c368086b8e18e934c441681fde16a9252a -size 982 +oid sha256:74f6a018973872f91dae1ed0996b869ea9689f5e773bd07cd370b814e3212fc1 +size 978 diff --git a/assets/minecraft/textures/painting/tides.png b/assets/minecraft/textures/painting/tides.png index 9cfc0fa2..ae952ef4 100644 --- a/assets/minecraft/textures/painting/tides.png +++ b/assets/minecraft/textures/painting/tides.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:27d889d0f07f5f75d9f5f474c5850d8c56606277c615ca5902dcde094b62dcd5 -size 5401 +oid sha256:b009720a055ebbc266bdc0ee850bde5f2470d16f88954a545d923ec0fd330224 +size 5395 diff --git a/assets/minecraft/textures/painting/void.png b/assets/minecraft/textures/painting/void.png index 20beee8d..697b22c3 100644 --- a/assets/minecraft/textures/painting/void.png +++ b/assets/minecraft/textures/painting/void.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cd7b971de76eb72ace3b86d5a7c45d7ca1b604757fa229a1e6da97db413564ad -size 2561 +oid sha256:07ba1eaca4598663df9d7ac333ed0aa1d9686a1d29a2f4d72c5b86312640d3e9 +size 2560 diff --git a/assets/minecraft/textures/painting/wasteland.png b/assets/minecraft/textures/painting/wasteland.png index c5c70386..c96dd621 100644 --- a/assets/minecraft/textures/painting/wasteland.png +++ b/assets/minecraft/textures/painting/wasteland.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e311293c4ffa1c003f342131fbd1994a6aac496895ae210033877c8d54f4cc0f -size 736 +oid sha256:1caf5b8d378daef20a6aee820fc278ee637131038d020abc01717edd8b80cddb +size 664 diff --git a/assets/minecraft/textures/painting/water.png b/assets/minecraft/textures/painting/water.png index 91bdbc37..e98abe3f 100644 --- a/assets/minecraft/textures/painting/water.png +++ b/assets/minecraft/textures/painting/water.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:28c90e364c03f5315a5031ea628bc7866c5fd9e4dbe92ec07013cbf38e96a368 -size 290 +oid sha256:d8e539ba06ed71a6d2564b0db9164179fcfa3fdb71548bf3a67a2830a6e30d0b +size 273 diff --git a/assets/minecraft/textures/painting/wind.png b/assets/minecraft/textures/painting/wind.png index d13059b3..0de91a3b 100644 --- a/assets/minecraft/textures/painting/wind.png +++ b/assets/minecraft/textures/painting/wind.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5aba0ea6017a8106f3d34e861b003949d732c2d908e77cbb3578139013cf0a5d -size 340 +oid sha256:40d95a02aaa750aab979f2bc1e830bca9d5ea0e1b97699660d0e0d6c8304353c +size 319 diff --git a/assets/minecraft/textures/particle/big_smoke_0.png b/assets/minecraft/textures/particle/big_smoke_0.png index 692fb81c..2c7800dd 100644 --- a/assets/minecraft/textures/particle/big_smoke_0.png +++ b/assets/minecraft/textures/particle/big_smoke_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:63aa3ca69541f98a80ab52284cff1839a4025898ee6c6a79687a8522eb545fa0 -size 130 +oid sha256:6e67610bdc45b6b4d6d3898d9714012415221820f67c943b2849c0e9a713c7fb +size 113 diff --git a/assets/minecraft/textures/particle/big_smoke_1.png b/assets/minecraft/textures/particle/big_smoke_1.png index 126f9e92..1ac434c4 100644 --- a/assets/minecraft/textures/particle/big_smoke_1.png +++ b/assets/minecraft/textures/particle/big_smoke_1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f7f5f5aa871ff7959558d0d1d80d56cbff6163be83f707c55c12870a80a4e952 -size 138 +oid sha256:5d655afb158c1bc21e52a784e8fb1c94042d315f4ac39a318c78fdda1b1e17f7 +size 121 diff --git a/assets/minecraft/textures/particle/big_smoke_10.png b/assets/minecraft/textures/particle/big_smoke_10.png index 6f41e587..d61f7382 100644 --- a/assets/minecraft/textures/particle/big_smoke_10.png +++ b/assets/minecraft/textures/particle/big_smoke_10.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fa2dc05d9aee0e79b9e62e0a624eb335aec3bd61953a00507aa2a9adb4b12f9e -size 123 +oid sha256:74b928c7a86e24f3b53366219ffcacc8b3351ae904e75ddffc3d95e9e660ab86 +size 108 diff --git a/assets/minecraft/textures/particle/big_smoke_11.png b/assets/minecraft/textures/particle/big_smoke_11.png index 11c62267..1c1cf8af 100644 --- a/assets/minecraft/textures/particle/big_smoke_11.png +++ b/assets/minecraft/textures/particle/big_smoke_11.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:98df52dd16724172fdc57fef18106830ef6d01a69513ba68d4f94ba140c71945 -size 101 +oid sha256:c9967b752ead9a8dee6b8b80ad09e63352171183876ee056a8204db8864ec96e +size 84 diff --git a/assets/minecraft/textures/particle/big_smoke_2.png b/assets/minecraft/textures/particle/big_smoke_2.png index c8a5557e..f526cd4d 100644 --- a/assets/minecraft/textures/particle/big_smoke_2.png +++ b/assets/minecraft/textures/particle/big_smoke_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1e2a462c3d128377cf478b6e37e78a717dfcd043f0005f35d429528bb4414d70 -size 153 +oid sha256:213aa54eebb7288e78dfb95e3c4f129f0b0b24b8f33603dc3f4ad7771090c60f +size 151 diff --git a/assets/minecraft/textures/particle/big_smoke_3.png b/assets/minecraft/textures/particle/big_smoke_3.png index a8e0b311..3ff7d7f0 100644 --- a/assets/minecraft/textures/particle/big_smoke_3.png +++ b/assets/minecraft/textures/particle/big_smoke_3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b162c82cf8d1fd4c1399e454a9cc7c4aedc54762cde080ed4c26653b5b9e366f -size 154 +oid sha256:e16b7558efc9232463de35ff62d4fd89fa997413133a400de5052d1b37e8b36e +size 151 diff --git a/assets/minecraft/textures/particle/big_smoke_4.png b/assets/minecraft/textures/particle/big_smoke_4.png index 27cbefda..0fcf4d9e 100644 --- a/assets/minecraft/textures/particle/big_smoke_4.png +++ b/assets/minecraft/textures/particle/big_smoke_4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cfd2b1141ed4db10a5ab135a358699f690dcd679003ef0a6ff8ea3d466bcc65a -size 163 +oid sha256:1770088929c6a3c8a2069d1c7eaed938f0d71b590385d69691e399bbbdc8c451 +size 160 diff --git a/assets/minecraft/textures/particle/big_smoke_5.png b/assets/minecraft/textures/particle/big_smoke_5.png index 791d40b8..0c3cad06 100644 --- a/assets/minecraft/textures/particle/big_smoke_5.png +++ b/assets/minecraft/textures/particle/big_smoke_5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:042923c4ba59d0d7176304ec69eee7bc8a2331339cbf26c9824bc83ee4d80414 -size 151 +oid sha256:a932d7be1b0437dca1d2e920237e3073a63b2644ce277d4e395d318fd889f392 +size 141 diff --git a/assets/minecraft/textures/particle/big_smoke_6.png b/assets/minecraft/textures/particle/big_smoke_6.png index fc4d0d15..ebacf492 100644 --- a/assets/minecraft/textures/particle/big_smoke_6.png +++ b/assets/minecraft/textures/particle/big_smoke_6.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:26911240fbc87edda633506b87345e9c389da903a2ea9e9f64e0b38f5ad76ef2 -size 147 +oid sha256:b7e3d85e7e6251a275cc97083d1327ae76c0c332b55c49593c94c48310617a9b +size 145 diff --git a/assets/minecraft/textures/particle/big_smoke_7.png b/assets/minecraft/textures/particle/big_smoke_7.png index 5c602f36..3fff636a 100644 --- a/assets/minecraft/textures/particle/big_smoke_7.png +++ b/assets/minecraft/textures/particle/big_smoke_7.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0375a72714c3fa733b81091d4c55307de6d2b1d6b9bd241bc8add530a4185d17 -size 148 +oid sha256:86aed57da99598cdf3cbaf72bc15ed03ea510a39024a62cc35aad2740ea46908 +size 134 diff --git a/assets/minecraft/textures/particle/big_smoke_8.png b/assets/minecraft/textures/particle/big_smoke_8.png index e6a92193..cec51b11 100644 --- a/assets/minecraft/textures/particle/big_smoke_8.png +++ b/assets/minecraft/textures/particle/big_smoke_8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ac8c4d515f4f6f4ab78e9f8e2bb9f68fe910b861f9cdc11b8f8f05e6facd00f5 -size 134 +oid sha256:179d993d638e713e33e632bdb32b32b4a48f3287bd03b00d0b27cadc98f69fdf +size 123 diff --git a/assets/minecraft/textures/particle/big_smoke_9.png b/assets/minecraft/textures/particle/big_smoke_9.png index 0239f25c..59067839 100644 --- a/assets/minecraft/textures/particle/big_smoke_9.png +++ b/assets/minecraft/textures/particle/big_smoke_9.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3acc7952070efc26aa5579230dea1856e5fe9ab6e753a58f5341d4f79b7fd9b5 -size 128 +oid sha256:1b1fd514fe9efccd7cc89c5631f91cd1ad75ef8b7fa2693dcffa3b3b16a7c138 +size 112 diff --git a/assets/minecraft/textures/particle/bubble.png b/assets/minecraft/textures/particle/bubble.png index f1c0838d..1da81093 100644 --- a/assets/minecraft/textures/particle/bubble.png +++ b/assets/minecraft/textures/particle/bubble.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c6ca7be955a2444083d979cb87e4b84ee526be8353d309bf62ed9bf755847a99 -size 125 +oid sha256:d105782c0712c42642ffff21dccff4830986a467733734391f7eb07d0b54344f +size 110 diff --git a/assets/minecraft/textures/particle/bubble_pop_0.png b/assets/minecraft/textures/particle/bubble_pop_0.png index 19ba2ef3..eec37d47 100644 --- a/assets/minecraft/textures/particle/bubble_pop_0.png +++ b/assets/minecraft/textures/particle/bubble_pop_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3b0bf85d792dc17e3b8e5b7cb7eccfd63653d383563af0aa44d591d68138f886 -size 125 +oid sha256:755c4fe02276c14cfe3f5008463eddd3f47e315446d5dacf63ec43a9bcb1bc20 +size 108 diff --git a/assets/minecraft/textures/particle/bubble_pop_1.png b/assets/minecraft/textures/particle/bubble_pop_1.png index b58e5e02..88f8da69 100644 --- a/assets/minecraft/textures/particle/bubble_pop_1.png +++ b/assets/minecraft/textures/particle/bubble_pop_1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a3b345abae270d12a6034750703d1bf5d4aa02156ad1381cc6bfa5cf9f4b596e -size 126 +oid sha256:9829c5dc7a5a4c8ceb161d97f92e8f7b5d43f7ac6b3d5658db4cdd13d9ae7044 +size 109 diff --git a/assets/minecraft/textures/particle/bubble_pop_2.png b/assets/minecraft/textures/particle/bubble_pop_2.png index 9973faab..0ffa097c 100644 --- a/assets/minecraft/textures/particle/bubble_pop_2.png +++ b/assets/minecraft/textures/particle/bubble_pop_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1fbac21e24eef44e507747e840c9877f78d30679ae93ea834163e814f3e9ac68 -size 117 +oid sha256:a8d38e12648d7448e32b2568d58d908dd3e8727ed54861fc650380f5e650fded +size 99 diff --git a/assets/minecraft/textures/particle/bubble_pop_3.png b/assets/minecraft/textures/particle/bubble_pop_3.png index ae417f37..44038f62 100644 --- a/assets/minecraft/textures/particle/bubble_pop_3.png +++ b/assets/minecraft/textures/particle/bubble_pop_3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:825c0fe3df9ee4c85662927b74710e8d6e1913914226438e37b0cfbad87dcdc7 -size 101 +oid sha256:6f6cead36426e9bef05bb6ac90361a17f23300ada7f34bb48e6dc793751b8f73 +size 84 diff --git a/assets/minecraft/textures/particle/bubble_pop_4.png b/assets/minecraft/textures/particle/bubble_pop_4.png index 30721e09..beb991ed 100644 --- a/assets/minecraft/textures/particle/bubble_pop_4.png +++ b/assets/minecraft/textures/particle/bubble_pop_4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:544b65053fa66e04d4299083245012fbf4e26328e38d77e54cc63fa20dafb052 -size 100 +oid sha256:22b9b72caa214d76004e2140db29fc62918dd8302e8a51ca3b01c9a9665d2dc4 +size 83 diff --git a/assets/minecraft/textures/particle/cherry_0.png b/assets/minecraft/textures/particle/cherry_0.png index 7dad9c99..211d39a3 100644 --- a/assets/minecraft/textures/particle/cherry_0.png +++ b/assets/minecraft/textures/particle/cherry_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bb5848ad1cbf567ca206f5af3bfbd3921782a21e87ad17edbfecb5aa7f6899ea -size 108 +oid sha256:7f9bec452ae7f94d6382d088a1ec1cd78eb8da88f0aa45a40477be036ae1895b +size 84 diff --git a/assets/minecraft/textures/particle/cherry_1.png b/assets/minecraft/textures/particle/cherry_1.png index b70c2482..9c0432bd 100644 --- a/assets/minecraft/textures/particle/cherry_1.png +++ b/assets/minecraft/textures/particle/cherry_1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6903109683901e8c695381b3b77df0079bfe579a6edb133658e2a0c2e63c3ac0 -size 108 +oid sha256:51fb2d79b64046d6f145fd5fd2e5925e13fb33155dde0c6dfabea791f2a2ddbd +size 84 diff --git a/assets/minecraft/textures/particle/cherry_10.png b/assets/minecraft/textures/particle/cherry_10.png index 10220bdc..b376cca6 100644 --- a/assets/minecraft/textures/particle/cherry_10.png +++ b/assets/minecraft/textures/particle/cherry_10.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:376bc2caa7539e4578296371a5af1361a4e21129a0e041b1af63ea90a11e1e05 -size 108 +oid sha256:c53e1c9a8dcaa0bf4b007707163c2f8289a5a6759fb11776c1c34415d52e17b9 +size 82 diff --git a/assets/minecraft/textures/particle/cherry_11.png b/assets/minecraft/textures/particle/cherry_11.png index 9e80a7a2..c28c600b 100644 --- a/assets/minecraft/textures/particle/cherry_11.png +++ b/assets/minecraft/textures/particle/cherry_11.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e7f9c07a44060db290c886223e3b0e09833980aa64678bb7b616567e0853cce6 -size 108 +oid sha256:fa6427035e82eb35e5d42ba680d3b1ab32f765c3ffe76b0711465a3407461b0a +size 82 diff --git a/assets/minecraft/textures/particle/cherry_2.png b/assets/minecraft/textures/particle/cherry_2.png index ad4625f1..d092f70b 100644 --- a/assets/minecraft/textures/particle/cherry_2.png +++ b/assets/minecraft/textures/particle/cherry_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:86c35a92ed1b3c99304a1434d1993b282d04959cb3eab2cdf08f6a8e1ee5c45f -size 108 +oid sha256:484cc947c45a1ac3780e10e689f59a26bc404a549b0d265df1aacaf6528c2db6 +size 84 diff --git a/assets/minecraft/textures/particle/cherry_3.png b/assets/minecraft/textures/particle/cherry_3.png index 3e012d8e..6819fe75 100644 --- a/assets/minecraft/textures/particle/cherry_3.png +++ b/assets/minecraft/textures/particle/cherry_3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:41cc89ae29b48ac042f6da2f7732960f1237aaeb178a7ffca7861a5fa9ed6571 -size 108 +oid sha256:2a67aaa4747cab7b5442054c15315aead2e78a08606b2a4a489adc6bb97185dd +size 84 diff --git a/assets/minecraft/textures/particle/cherry_4.png b/assets/minecraft/textures/particle/cherry_4.png index 3ee42efa..f5d9413e 100644 --- a/assets/minecraft/textures/particle/cherry_4.png +++ b/assets/minecraft/textures/particle/cherry_4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:959368df772d9b00843b0f32c6b982d867c06bf8bee8c9b163d3c8859046e901 -size 108 +oid sha256:6e6a816e9b12c034f4c6fa81fdfc87850d014b0d5233e9674132b6db21a6399a +size 84 diff --git a/assets/minecraft/textures/particle/cherry_5.png b/assets/minecraft/textures/particle/cherry_5.png index 7c6baf63..48469477 100644 --- a/assets/minecraft/textures/particle/cherry_5.png +++ b/assets/minecraft/textures/particle/cherry_5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8226a78ec6ee5f229730bc7f6428544e1c79ff231c062ba5d6c016c9b370371a -size 108 +oid sha256:f199f632e96c7a13d13a6c8294652415e72f9847887d9608edbe46b7af93c370 +size 84 diff --git a/assets/minecraft/textures/particle/cherry_6.png b/assets/minecraft/textures/particle/cherry_6.png index 30669199..98e9d393 100644 --- a/assets/minecraft/textures/particle/cherry_6.png +++ b/assets/minecraft/textures/particle/cherry_6.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:07c94e06129b5cde278dee04bd2784ef094d4ff16df2f8f99ae20554078facfc -size 108 +oid sha256:f1fc6f04191948f24aeda12c87715c8fedc3a791f2e487f41c3ef8003237d484 +size 82 diff --git a/assets/minecraft/textures/particle/cherry_7.png b/assets/minecraft/textures/particle/cherry_7.png index f0122bb4..9aefb3e5 100644 --- a/assets/minecraft/textures/particle/cherry_7.png +++ b/assets/minecraft/textures/particle/cherry_7.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:16eeb6a5917b16e418932088a9e35e92dafff1a29cf48bd2bdf683aba6526d7c -size 108 +oid sha256:42a30656038a2b9462a4aed0c5562609ae0c87b0b2b900f038c54da9d6119727 +size 81 diff --git a/assets/minecraft/textures/particle/cherry_8.png b/assets/minecraft/textures/particle/cherry_8.png index cb43ab15..71a7ba2d 100644 --- a/assets/minecraft/textures/particle/cherry_8.png +++ b/assets/minecraft/textures/particle/cherry_8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d25c98a7bba7db9708ced530c91f6b8fbb47bc539a8a69cc21346b975439b580 -size 108 +oid sha256:84f0ce65efb038ae00cb2ef6ef98d61731aa010ef99d58f0232812fa5755ae12 +size 82 diff --git a/assets/minecraft/textures/particle/cherry_9.png b/assets/minecraft/textures/particle/cherry_9.png index 81c9f46d..1ed4e041 100644 --- a/assets/minecraft/textures/particle/cherry_9.png +++ b/assets/minecraft/textures/particle/cherry_9.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fdc3a73d198e2ca4084a8b815a0a530005fbb4c7342bc559adbf6b570fcafaa5 -size 108 +oid sha256:121c3c8157276b7bf7b5c0c846c2adcbe6c11566d323651b6ec9f49b676747af +size 82 diff --git a/assets/minecraft/textures/particle/critical_hit.png b/assets/minecraft/textures/particle/critical_hit.png index d46d4368..7bffa846 100644 --- a/assets/minecraft/textures/particle/critical_hit.png +++ b/assets/minecraft/textures/particle/critical_hit.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a7c036fd1b4c73856e3a7d638b56c1cbd047a2b18c504923ad7d5ae07046d908 -size 117 +oid sha256:4238f9aa94da3ae811f06614f82ef2863dc77191f6bb4f1a0029480e8eac9300 +size 96 diff --git a/assets/minecraft/textures/particle/damage.png b/assets/minecraft/textures/particle/damage.png index 9f68cd83..e9993b8d 100644 --- a/assets/minecraft/textures/particle/damage.png +++ b/assets/minecraft/textures/particle/damage.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b90f5b80b15144c2ccae58164635cca4dff02e2486df4d828081857fd0cc0157 -size 137 +oid sha256:159183c6f609a1430dfc5bc0ec021e3b49f2969bb7bf40df7996a36543ddc989 +size 119 diff --git a/assets/minecraft/textures/particle/drip_fall.png b/assets/minecraft/textures/particle/drip_fall.png index 13107b87..ffb168a9 100644 --- a/assets/minecraft/textures/particle/drip_fall.png +++ b/assets/minecraft/textures/particle/drip_fall.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c11c99ec5baf43cb5383f5cf3c15342811c6f5017bdeacff05fdb84e16f0b3c5 -size 84 +oid sha256:f5b32d10c07382d6a09b1286f21d2bbf5611d302920a5d2325aa3662fd1c0ed0 +size 79 diff --git a/assets/minecraft/textures/particle/drip_hang.png b/assets/minecraft/textures/particle/drip_hang.png index ab933394..bb89243d 100644 --- a/assets/minecraft/textures/particle/drip_hang.png +++ b/assets/minecraft/textures/particle/drip_hang.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d67fb0307c72bceb469aa45eacfbdf339633ceb388dd19ffc376890dc9d4c074 -size 85 +oid sha256:4fc5aaee4a1582fdf47898435224f3991aaf416e8100f95e166431e8f619f3bd +size 79 diff --git a/assets/minecraft/textures/particle/drip_land.png b/assets/minecraft/textures/particle/drip_land.png index 26286ad1..94760aa8 100644 --- a/assets/minecraft/textures/particle/drip_land.png +++ b/assets/minecraft/textures/particle/drip_land.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:42bb6b49b71e15957d64527db255e83840e5c0459d3464037d8eaaf34371b581 -size 82 +oid sha256:ae69dca1e73da404adee26564834e3932ccacbceae5cbfaa5e314ccc3f9a2bf8 +size 75 diff --git a/assets/minecraft/textures/particle/effect_0.png b/assets/minecraft/textures/particle/effect_0.png index a5497962..e0af468f 100644 --- a/assets/minecraft/textures/particle/effect_0.png +++ b/assets/minecraft/textures/particle/effect_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fb18cbd3b8e4e668f5bc65f38c39b597b967173fffe966ced48f656a7b8ea34e -size 81 +oid sha256:c6d3ac6afcc08fe14c78923560170e87a2416928a067aca447173eab6127d47f +size 77 diff --git a/assets/minecraft/textures/particle/effect_1.png b/assets/minecraft/textures/particle/effect_1.png index 4cc45f5a..1122e79c 100644 --- a/assets/minecraft/textures/particle/effect_1.png +++ b/assets/minecraft/textures/particle/effect_1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:97ddb3ea126da1e4cd6c570fccf1420badaccf3ebbf801ce36248a2e6188a627 -size 89 +oid sha256:ae5d566d495262e51e396f96d5800a174626fcc005b8c733436fda5042964d97 +size 83 diff --git a/assets/minecraft/textures/particle/effect_2.png b/assets/minecraft/textures/particle/effect_2.png index 7f28daa8..cafe08ae 100644 --- a/assets/minecraft/textures/particle/effect_2.png +++ b/assets/minecraft/textures/particle/effect_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b62f4b6973b1448b89c873538811e34f109ba7b9b06b76cbcd3f5566e413bb47 -size 119 +oid sha256:ca5bebdd585b6b891582a2049be1f216b9bdbe265bb55bb7fb58d9c86626fc14 +size 92 diff --git a/assets/minecraft/textures/particle/effect_3.png b/assets/minecraft/textures/particle/effect_3.png index b113a58a..493ccea1 100644 --- a/assets/minecraft/textures/particle/effect_3.png +++ b/assets/minecraft/textures/particle/effect_3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fbb82778517c7129bdeced7cc5a0fc7fc28b466cb11e75a006a0c391bff45589 -size 130 +oid sha256:c0212e1c94f0d553f962d699fa46f95f70580d7cbfc511c073c1ec8f8e8ba41c +size 102 diff --git a/assets/minecraft/textures/particle/effect_4.png b/assets/minecraft/textures/particle/effect_4.png index 613c43e8..cb2c897b 100644 --- a/assets/minecraft/textures/particle/effect_4.png +++ b/assets/minecraft/textures/particle/effect_4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f2b2f70777a92867e56c5c340cc517fd2b71115d3bd4aa3a885ef2b56ae99e32 -size 128 +oid sha256:25b5f9da9e3ed3be83a76e8dca5eca06c8f3f64106cc453d460fa85a24b7b3ba +size 100 diff --git a/assets/minecraft/textures/particle/effect_5.png b/assets/minecraft/textures/particle/effect_5.png index f2adfafe..868191bf 100644 --- a/assets/minecraft/textures/particle/effect_5.png +++ b/assets/minecraft/textures/particle/effect_5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3aba220472d6f3285241daf0605b4fae35a1f5f895d1b90a83decd0128273a50 -size 127 +oid sha256:858a3830bf53f32b9b143dbe74d3ac956a84ad92dc6d77cb400c7989da4959c1 +size 100 diff --git a/assets/minecraft/textures/particle/effect_6.png b/assets/minecraft/textures/particle/effect_6.png index 8d8d6ace..000b921b 100644 --- a/assets/minecraft/textures/particle/effect_6.png +++ b/assets/minecraft/textures/particle/effect_6.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d2ae53914ad37cb62939a1f1fa26481028f5ff30c8d023e3346829bae037aa02 -size 131 +oid sha256:c4d5d8faccf27eedd60a35271368fbb99db1ca18a624eb47cefe8a94c41c0022 +size 103 diff --git a/assets/minecraft/textures/particle/effect_7.png b/assets/minecraft/textures/particle/effect_7.png index 50c2864c..70ae67ea 100644 --- a/assets/minecraft/textures/particle/effect_7.png +++ b/assets/minecraft/textures/particle/effect_7.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8520ec5989b996551c1ba5dfb887307c5530457f7922f9f230332666c2f9bd69 -size 125 +oid sha256:ab126a1430e6c1829aca8d204e2cd49ead4409ba837b20fcce4c8b554a0f16ad +size 100 diff --git a/assets/minecraft/textures/particle/enchanted_hit.png b/assets/minecraft/textures/particle/enchanted_hit.png index 299bb47c..1e432fab 100644 --- a/assets/minecraft/textures/particle/enchanted_hit.png +++ b/assets/minecraft/textures/particle/enchanted_hit.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d36bb0f1d537eadc3c572642a6c998cf350ddf41cb938b4f97a0f1f22105a6ba -size 130 +oid sha256:83b93581a3ae68cc4a593fba6172596fa388e33dd0751fef1c5d5f85dc98ad38 +size 102 diff --git a/assets/minecraft/textures/particle/explosion_0.png b/assets/minecraft/textures/particle/explosion_0.png index 94c45db4..271476cf 100644 --- a/assets/minecraft/textures/particle/explosion_0.png +++ b/assets/minecraft/textures/particle/explosion_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3e2ca80f6accdcf50f580df2e8777ada3279ea9b6c74c28028e1bb2d2edb9140 -size 112 +oid sha256:a866f2dd2a7589a2b9b3f813735647ddf03596ebab84883a581edb6b1615adce +size 92 diff --git a/assets/minecraft/textures/particle/explosion_1.png b/assets/minecraft/textures/particle/explosion_1.png index 26ebe8a3..08699e03 100644 --- a/assets/minecraft/textures/particle/explosion_1.png +++ b/assets/minecraft/textures/particle/explosion_1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:06b235749d132ff1ff4e946341c4eb56deb09feaa5f49cbb430383b0bbe4f292 -size 119 +oid sha256:812129f9bb825fe79cc7673d10b0b7338ad2087ef638689e5836ebbe5b3cfef3 +size 98 diff --git a/assets/minecraft/textures/particle/explosion_10.png b/assets/minecraft/textures/particle/explosion_10.png index 9502deb8..edae0cf6 100644 --- a/assets/minecraft/textures/particle/explosion_10.png +++ b/assets/minecraft/textures/particle/explosion_10.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e166b8ab4d3821dae540daaa8cfb073b44966a87383e26c64a8ca9750301468d -size 172 +oid sha256:d70c078693d08db702468335f7b0b3ac6e102e052654981b16d0dc8fff7a7e59 +size 143 diff --git a/assets/minecraft/textures/particle/explosion_11.png b/assets/minecraft/textures/particle/explosion_11.png index a518376f..639e981e 100644 --- a/assets/minecraft/textures/particle/explosion_11.png +++ b/assets/minecraft/textures/particle/explosion_11.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4be5b0241d6091fd8da22221173251811e9765813d55c39283ec65ffb5a512b4 -size 176 +oid sha256:63f51a1d9125323949ec86d3423fa8914ac6a0cdd37c8532a3217f8df9cab147 +size 146 diff --git a/assets/minecraft/textures/particle/explosion_12.png b/assets/minecraft/textures/particle/explosion_12.png index 0ec273b6..1f9588a2 100644 --- a/assets/minecraft/textures/particle/explosion_12.png +++ b/assets/minecraft/textures/particle/explosion_12.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1e6ff0498e6b03548fdaaa5be79784c62a5ee0c15920cc46be4a9fa38ef946fe -size 177 +oid sha256:3bd75dd62da503ea3eac66bb9c23666a9bd9bdd97a299b25e4003dee47fbd9fe +size 146 diff --git a/assets/minecraft/textures/particle/explosion_13.png b/assets/minecraft/textures/particle/explosion_13.png index 1b1da50d..958dc5bb 100644 --- a/assets/minecraft/textures/particle/explosion_13.png +++ b/assets/minecraft/textures/particle/explosion_13.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:30235f3ab1ca0c28b2b203adc733d552df55cde8fe331400f25a564237d88327 -size 169 +oid sha256:7f58b47c1b47ab767c5ca220d8ef2ef53347789993fc1a546e16a60917608855 +size 137 diff --git a/assets/minecraft/textures/particle/explosion_14.png b/assets/minecraft/textures/particle/explosion_14.png index 8a871577..bf023972 100644 --- a/assets/minecraft/textures/particle/explosion_14.png +++ b/assets/minecraft/textures/particle/explosion_14.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:89ab701df00d106141803f9f839a463d0023bf3aa9998ab4f74eaebecef9b6c8 -size 144 +oid sha256:e63a58b50a0520cd066f0675de973ff484f2513d9b47c0b01d4e1499c74c7dbf +size 123 diff --git a/assets/minecraft/textures/particle/explosion_15.png b/assets/minecraft/textures/particle/explosion_15.png index aafbaa05..fa99d469 100644 --- a/assets/minecraft/textures/particle/explosion_15.png +++ b/assets/minecraft/textures/particle/explosion_15.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:94d0bbc38b84298316831ea5da745747699036261a57d354cefd9fe755289a19 -size 123 +oid sha256:b69b08e62197fb8d1387439f24c5d723fc0dabe8b62e2b0502106806c47722ae +size 105 diff --git a/assets/minecraft/textures/particle/explosion_2.png b/assets/minecraft/textures/particle/explosion_2.png index 1a444730..59ed36d3 100644 --- a/assets/minecraft/textures/particle/explosion_2.png +++ b/assets/minecraft/textures/particle/explosion_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:59d5544b399a134628fb650cbd40236b3fce87184c8184b0e363bf6f0e61c159 -size 118 +oid sha256:acb8bc2f23ba613ac921733f7f684d2aed7b3ec49b06398a1156d6097b12b29d +size 98 diff --git a/assets/minecraft/textures/particle/explosion_3.png b/assets/minecraft/textures/particle/explosion_3.png index 87428d4c..f24b8a94 100644 --- a/assets/minecraft/textures/particle/explosion_3.png +++ b/assets/minecraft/textures/particle/explosion_3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef8ff4cd588bd67765db9d409220706c4730cea00570d51f5fcd26fd77a3557f -size 125 +oid sha256:9f7c5726b0645f660e8f26bc5437c17908f8b0470cd02b401a4b152c9d80980c +size 105 diff --git a/assets/minecraft/textures/particle/explosion_4.png b/assets/minecraft/textures/particle/explosion_4.png index fcbfca43..826ca91d 100644 --- a/assets/minecraft/textures/particle/explosion_4.png +++ b/assets/minecraft/textures/particle/explosion_4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dfdf936f13d93ace338f4ab287d5cf9a47f8c14df70a916c52412c4d26de41a6 -size 134 +oid sha256:2101114aed66f1f25812fcb419416c60f22bb249b4034b4034957769add69158 +size 110 diff --git a/assets/minecraft/textures/particle/explosion_5.png b/assets/minecraft/textures/particle/explosion_5.png index 45b41a5e..c425bc72 100644 --- a/assets/minecraft/textures/particle/explosion_5.png +++ b/assets/minecraft/textures/particle/explosion_5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:42a75efcb1b91104cb2e89ad6cc69670f0ad60b856c818887e2e629ff9d032e8 -size 133 +oid sha256:88f1b038924db665f411c176c6b8afe1b7e0fe897f432dcafb22f1d95fb1d6f5 +size 111 diff --git a/assets/minecraft/textures/particle/explosion_6.png b/assets/minecraft/textures/particle/explosion_6.png index b5352a02..88a336c4 100644 --- a/assets/minecraft/textures/particle/explosion_6.png +++ b/assets/minecraft/textures/particle/explosion_6.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b6a40db64a88e925c10f3e36b38bbe40c06a1370ee3d09258455fa8c9af28b6c -size 148 +oid sha256:0bd08d58f42fc1824250013294d355d6d564f64946e9111d45833a57be5510fc +size 127 diff --git a/assets/minecraft/textures/particle/explosion_7.png b/assets/minecraft/textures/particle/explosion_7.png index 5624dfcd..49102100 100644 --- a/assets/minecraft/textures/particle/explosion_7.png +++ b/assets/minecraft/textures/particle/explosion_7.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3a41ac85c7f7a4b123e78074b7bfb57d2686ff902298f17ecd875d6265b7c253 -size 154 +oid sha256:5e0530a2676ac9e6b22b1fba636b8e2677105425e7c651ec346165732dcb7230 +size 132 diff --git a/assets/minecraft/textures/particle/explosion_8.png b/assets/minecraft/textures/particle/explosion_8.png index 8a81d375..d08dc842 100644 --- a/assets/minecraft/textures/particle/explosion_8.png +++ b/assets/minecraft/textures/particle/explosion_8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1b1683dc3e20b5680b31b5ab7a1c5ea96984a7e885a03f0c82ea57d3bc0fae25 -size 161 +oid sha256:7068773dc258ae8bad83e278de1c02180f41986901a52ad722b725caf6c5eeb3 +size 142 diff --git a/assets/minecraft/textures/particle/explosion_9.png b/assets/minecraft/textures/particle/explosion_9.png index 224081b5..c5a31fb7 100644 --- a/assets/minecraft/textures/particle/explosion_9.png +++ b/assets/minecraft/textures/particle/explosion_9.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3dbf49687edcb58dea2f10de63981cdfdcfc90f0522cca22a1cafd90afa094d1 -size 173 +oid sha256:321e290169bfd347e73f51e0185e098e3067f75039ee2042a303f267675666f2 +size 145 diff --git a/assets/minecraft/textures/particle/flame.png b/assets/minecraft/textures/particle/flame.png index 3423711d..d1b2a03a 100644 --- a/assets/minecraft/textures/particle/flame.png +++ b/assets/minecraft/textures/particle/flame.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2f2efacac134ce943d142d3a40e43f87e80e1e32d7137645bb1268618505e4a7 -size 124 +oid sha256:beb1b1fa93b5809b906c850fcba2cdfa65e0166fe510ed592a0510a1585c4991 +size 107 diff --git a/assets/minecraft/textures/particle/flash.png b/assets/minecraft/textures/particle/flash.png index 6aa03903..9c9a6470 100644 --- a/assets/minecraft/textures/particle/flash.png +++ b/assets/minecraft/textures/particle/flash.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6db2b97a3256b9fe9f49dc96f083a3465375eea99b3b5e353e5f9a40f81ed3e7 -size 932 +oid sha256:fb43dd3a354fb84f31b00a1d286a4dcd8beeb5daba75986ca1a5d18594500f30 +size 774 diff --git a/assets/minecraft/textures/particle/generic_0.png b/assets/minecraft/textures/particle/generic_0.png index 7b3ea6d2..1c48eaf5 100644 --- a/assets/minecraft/textures/particle/generic_0.png +++ b/assets/minecraft/textures/particle/generic_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:040799acfd2e753632cef5642ab07e0182a973cc990cbfcb6bf7d201f10cfa03 -size 74 +oid sha256:cc642b3241937f32251e59b50637bcd4a175ef8ad78191d1a9c141f8611003c8 +size 72 diff --git a/assets/minecraft/textures/particle/generic_1.png b/assets/minecraft/textures/particle/generic_1.png index 9f774f41..18c59021 100644 --- a/assets/minecraft/textures/particle/generic_1.png +++ b/assets/minecraft/textures/particle/generic_1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:85fb6789e97a9385e823a6da6f6fbdd376c6e8165a449e8f1613ef34592afb2e -size 76 +oid sha256:7648440152e5ed2594379df9e834eb5da66bd68accfa81d104c7d3c99256ebc8 +size 74 diff --git a/assets/minecraft/textures/particle/generic_2.png b/assets/minecraft/textures/particle/generic_2.png index 926d5dcb..5223f436 100644 --- a/assets/minecraft/textures/particle/generic_2.png +++ b/assets/minecraft/textures/particle/generic_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b685389739d5add8d9240511f15b60e3365262c9e557b80fc3bf352dc30564a2 -size 96 +oid sha256:527f27fa5735a5a7b3331a4622bb0981a0e123579a5482373e576600c8a70390 +size 78 diff --git a/assets/minecraft/textures/particle/generic_3.png b/assets/minecraft/textures/particle/generic_3.png index dd6ffa80..ac4a58a6 100644 --- a/assets/minecraft/textures/particle/generic_3.png +++ b/assets/minecraft/textures/particle/generic_3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0988037438acb1dab7e583e6e17dbdc0d47c51721d237ea628311fc7ae3e355a -size 100 +oid sha256:bb0e707ef151550130cdf47c4f47956e5b8109c19f1bc8ac12a108638ea2c733 +size 81 diff --git a/assets/minecraft/textures/particle/generic_4.png b/assets/minecraft/textures/particle/generic_4.png index 02258e53..e505c330 100644 --- a/assets/minecraft/textures/particle/generic_4.png +++ b/assets/minecraft/textures/particle/generic_4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2cacbc3e1b3297b34997fdb46aa35bbc3597d4f1a608f7412aa843a22bfb4a28 -size 103 +oid sha256:5eb8b95300a6c91bf202ebf90d6e7222782f63dc3f4d036889ab60fe7e98ce24 +size 83 diff --git a/assets/minecraft/textures/particle/generic_5.png b/assets/minecraft/textures/particle/generic_5.png index cd298655..eee1323b 100644 --- a/assets/minecraft/textures/particle/generic_5.png +++ b/assets/minecraft/textures/particle/generic_5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ea3bb652d7604349517ceb17061b0007578ff70f86e1adc5e823da767a315fcf -size 104 +oid sha256:0684cc85cabd8f53d065bdc008acb79cda18fb6c5ea051d9f07a67dcddf393c7 +size 85 diff --git a/assets/minecraft/textures/particle/generic_6.png b/assets/minecraft/textures/particle/generic_6.png index e4d639ae..392b64c4 100644 --- a/assets/minecraft/textures/particle/generic_6.png +++ b/assets/minecraft/textures/particle/generic_6.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d0bce47b910d93d60de34deca732abeeea2dcdf0d2ed16bf8881f1f2ee92442 -size 109 +oid sha256:b72b1a12d3c5f20e19e62ff4721fbfa93300ae70ad3c9d800f426e0d4b8ecce3 +size 88 diff --git a/assets/minecraft/textures/particle/generic_7.png b/assets/minecraft/textures/particle/generic_7.png index 18b454ee..7c7b31e5 100644 --- a/assets/minecraft/textures/particle/generic_7.png +++ b/assets/minecraft/textures/particle/generic_7.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:858a9804aef73be823a616e0faf518ee425421a20ffbb68f2a686ac76c017ca3 -size 112 +oid sha256:dd5e66ada1b88f564eadc1a62bec3f22b132f53eef1ac1b895f3990eda42d561 +size 95 diff --git a/assets/minecraft/textures/particle/glint.png b/assets/minecraft/textures/particle/glint.png index 1d3ba70b..b7bace18 100644 --- a/assets/minecraft/textures/particle/glint.png +++ b/assets/minecraft/textures/particle/glint.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:20fb7225d8009a20f1ac9504beb8558f0a4500184bb763618f2ccf63ba839ce6 -size 125 +oid sha256:7d931715101093be704bf25017c19f45aa68e8066b2556f79c1763fe6440ed5e +size 107 diff --git a/assets/minecraft/textures/particle/glitter_0.png b/assets/minecraft/textures/particle/glitter_0.png index 7b3ea6d2..1c48eaf5 100644 --- a/assets/minecraft/textures/particle/glitter_0.png +++ b/assets/minecraft/textures/particle/glitter_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:040799acfd2e753632cef5642ab07e0182a973cc990cbfcb6bf7d201f10cfa03 -size 74 +oid sha256:cc642b3241937f32251e59b50637bcd4a175ef8ad78191d1a9c141f8611003c8 +size 72 diff --git a/assets/minecraft/textures/particle/glitter_1.png b/assets/minecraft/textures/particle/glitter_1.png index e49530f8..74c958a3 100644 --- a/assets/minecraft/textures/particle/glitter_1.png +++ b/assets/minecraft/textures/particle/glitter_1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f17bbd1d9228b4bac64d38da7ae61862a905cbf3de4f3cd6817d7abe98a4868b -size 95 +oid sha256:161116a4cb3ff7c3a9cf5a355eb1613471b38bcc562d953cd098c36565f9917e +size 78 diff --git a/assets/minecraft/textures/particle/glitter_2.png b/assets/minecraft/textures/particle/glitter_2.png index 8691fa1f..6871db61 100644 --- a/assets/minecraft/textures/particle/glitter_2.png +++ b/assets/minecraft/textures/particle/glitter_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:253f85ce7564667cb5c105febb30ad7c6323583ab4c90c6e80f01478a55fbf78 -size 76 +oid sha256:edded81b6870610592559891309889eb40a1a5293a6508116c408ce685244ab4 +size 75 diff --git a/assets/minecraft/textures/particle/glitter_3.png b/assets/minecraft/textures/particle/glitter_3.png index 3ded70b4..56438cb3 100644 --- a/assets/minecraft/textures/particle/glitter_3.png +++ b/assets/minecraft/textures/particle/glitter_3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:149597debfac58e4f5dc1b2bbd99316fd8499063aa5b0318f81d30a851e4e6df -size 100 +oid sha256:89e3aed6a132a08d67401b4ba5dca210dbb28b18478f595047d036de2f8b92f2 +size 82 diff --git a/assets/minecraft/textures/particle/glitter_4.png b/assets/minecraft/textures/particle/glitter_4.png index 2261bb1e..2fe37f17 100644 --- a/assets/minecraft/textures/particle/glitter_4.png +++ b/assets/minecraft/textures/particle/glitter_4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b40a1e4fdc9c252446ee700d579a22371a5a03d7014d356a5c7c3ff0165d42e5 -size 98 +oid sha256:dd5df04e1c340623bc6717718d62ca51af0d2814491915305ef4f0e1dd482de7 +size 80 diff --git a/assets/minecraft/textures/particle/glitter_5.png b/assets/minecraft/textures/particle/glitter_5.png index aa77abab..3acf8cf8 100644 --- a/assets/minecraft/textures/particle/glitter_5.png +++ b/assets/minecraft/textures/particle/glitter_5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4d43f83c26d7351ed0746e063fbb7f4f59e19ad2af953dbb0e0b3936120efeae -size 105 +oid sha256:03060cc9d4e227c8ff49ca0e952b749fc0af2ef87b7d8db6f319749b50fb3351 +size 85 diff --git a/assets/minecraft/textures/particle/glitter_6.png b/assets/minecraft/textures/particle/glitter_6.png index 2261bb1e..2fe37f17 100644 --- a/assets/minecraft/textures/particle/glitter_6.png +++ b/assets/minecraft/textures/particle/glitter_6.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b40a1e4fdc9c252446ee700d579a22371a5a03d7014d356a5c7c3ff0165d42e5 -size 98 +oid sha256:dd5df04e1c340623bc6717718d62ca51af0d2814491915305ef4f0e1dd482de7 +size 80 diff --git a/assets/minecraft/textures/particle/glitter_7.png b/assets/minecraft/textures/particle/glitter_7.png index aa77abab..3acf8cf8 100644 --- a/assets/minecraft/textures/particle/glitter_7.png +++ b/assets/minecraft/textures/particle/glitter_7.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4d43f83c26d7351ed0746e063fbb7f4f59e19ad2af953dbb0e0b3936120efeae -size 105 +oid sha256:03060cc9d4e227c8ff49ca0e952b749fc0af2ef87b7d8db6f319749b50fb3351 +size 85 diff --git a/assets/minecraft/textures/particle/glow.png b/assets/minecraft/textures/particle/glow.png index 120211d6..ff868c09 100644 --- a/assets/minecraft/textures/particle/glow.png +++ b/assets/minecraft/textures/particle/glow.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f760f23b12dccf8e304a9fea1cdc049f63b54339d0e745faf2e5b1eca1efdade -size 170 +oid sha256:007aaf71634c78812c38b939fa91aa1fe725bd8bb383348811bfda3b11a617d6 +size 112 diff --git a/assets/minecraft/textures/particle/goldheart_0.png b/assets/minecraft/textures/particle/goldheart_0.png index 8413f499..ad1bedf1 100644 --- a/assets/minecraft/textures/particle/goldheart_0.png +++ b/assets/minecraft/textures/particle/goldheart_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:24f9fd6b23a25af77db1fe1c9493fb178ac73258ce3cad80e8d83634c596c3ce -size 93 +oid sha256:1533269aeb724ecefc0fd0f33f7a9976385228705bfa702a74d8f8dbd071bb39 +size 92 diff --git a/assets/minecraft/textures/particle/goldheart_1.png b/assets/minecraft/textures/particle/goldheart_1.png index f78e384c..2d124bd9 100644 --- a/assets/minecraft/textures/particle/goldheart_1.png +++ b/assets/minecraft/textures/particle/goldheart_1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3a1cdda6b5c844494f829a21395aa921e96bab0c636137a7e4cc11934cf083f3 -size 109 +oid sha256:2d31a7644c639a13c19b70ef4ef8113bf3d59dca89ab8a7e5cc4535068961879 +size 108 diff --git a/assets/minecraft/textures/particle/goldheart_2.png b/assets/minecraft/textures/particle/goldheart_2.png index 3ba2c51e..33d7983b 100644 --- a/assets/minecraft/textures/particle/goldheart_2.png +++ b/assets/minecraft/textures/particle/goldheart_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d52483be166b8f21151cc81e1662c894cd963df5b2ba86f26bc4ac327d32d07a -size 125 +oid sha256:98a5310332d4d95f0bd70cc0eff4849f1d787f58ce8c6ac2baef39d4e3684801 +size 123 diff --git a/assets/minecraft/textures/particle/gust_0.png b/assets/minecraft/textures/particle/gust_0.png index 8d9393ac..a05a1e13 100644 --- a/assets/minecraft/textures/particle/gust_0.png +++ b/assets/minecraft/textures/particle/gust_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fd15ae9592c1acff7658ff8e6f26553ef8f5ee6a44dddd7707265cacd639aef1 -size 119 +oid sha256:0a703013566736b60c8c09e9cf7037c8362e058fc5deea55c2e146f5d6bc02c2 +size 99 diff --git a/assets/minecraft/textures/particle/gust_1.png b/assets/minecraft/textures/particle/gust_1.png index 2e173a7f..c678828a 100644 --- a/assets/minecraft/textures/particle/gust_1.png +++ b/assets/minecraft/textures/particle/gust_1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:16bc7328831080d65b917e0c08451d4221d50c8e97197bf3314835df10c57f7a -size 168 +oid sha256:1aafaf7df05c03319e68359e04f60aeb390960c609ab734b1c6fde5b9fbe9687 +size 144 diff --git a/assets/minecraft/textures/particle/gust_10.png b/assets/minecraft/textures/particle/gust_10.png index 8218c823..025ef914 100644 --- a/assets/minecraft/textures/particle/gust_10.png +++ b/assets/minecraft/textures/particle/gust_10.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4ceb4302bf9db9b92bdb0aa0ef682b8258476a0a2c5f3fcf38453ab22419929f -size 148 +oid sha256:1095d4ec636cb1ea86da596cf8c530a172da263b078ab4b2fa3d30489b8dbeaa +size 117 diff --git a/assets/minecraft/textures/particle/gust_11.png b/assets/minecraft/textures/particle/gust_11.png index f00577ce..b69dfbde 100644 --- a/assets/minecraft/textures/particle/gust_11.png +++ b/assets/minecraft/textures/particle/gust_11.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:97df14601928d0a32d6d99b4c7a6e6d4f454012dec9da1c90ff9e610626a279b -size 109 +oid sha256:35e4f9f2c77f0b9417cdbcca8b2c8b4a486c09ef6651a1525227336203e8ea0b +size 88 diff --git a/assets/minecraft/textures/particle/gust_2.png b/assets/minecraft/textures/particle/gust_2.png index 2083c020..297b1a8a 100644 --- a/assets/minecraft/textures/particle/gust_2.png +++ b/assets/minecraft/textures/particle/gust_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aa17e6149fff6b04d8798d88fadc61e94b84f9346b6e3b9c136a252651a2e012 -size 186 +oid sha256:5f384940aaeefc433c5f9c5c9e49a96d18aebba5929a3bf827a101400f696d18 +size 161 diff --git a/assets/minecraft/textures/particle/gust_3.png b/assets/minecraft/textures/particle/gust_3.png index d6c4c1eb..730cd22f 100644 --- a/assets/minecraft/textures/particle/gust_3.png +++ b/assets/minecraft/textures/particle/gust_3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e693e0602f4bcb8960b89d038d2b7490cd3b2832d1fd2650479703d0348ae905 -size 177 +oid sha256:33a4a8e2225d2d097ed4a35c446bf012cdae1a310056e2629f7fa498a99efa70 +size 157 diff --git a/assets/minecraft/textures/particle/gust_4.png b/assets/minecraft/textures/particle/gust_4.png index 3eaf440e..0794d8fa 100644 --- a/assets/minecraft/textures/particle/gust_4.png +++ b/assets/minecraft/textures/particle/gust_4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5c3adc9bbe036196a2d013b107872e73a58fceed25f3719b6b12e28a07474bdf -size 128 +oid sha256:15e69ba6f8aac0f5a9f6bdb6a3f34770252aa831b7cef6cc0ba45ee58bdf5234 +size 110 diff --git a/assets/minecraft/textures/particle/gust_5.png b/assets/minecraft/textures/particle/gust_5.png index 2283665c..8ae16b0a 100644 --- a/assets/minecraft/textures/particle/gust_5.png +++ b/assets/minecraft/textures/particle/gust_5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5268a2cb2d77d74ff78015e5cf83339066b72b1fa39b5f40a552bda491db3a1b -size 150 +oid sha256:7c4dbd24d5781bbc086d1b0e4f6b6ba3eaadb01f3932a92f6d21914287d06240 +size 126 diff --git a/assets/minecraft/textures/particle/gust_6.png b/assets/minecraft/textures/particle/gust_6.png index 30ab8ca9..742c04f9 100644 --- a/assets/minecraft/textures/particle/gust_6.png +++ b/assets/minecraft/textures/particle/gust_6.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aa961f8b52ca932930d3f65cca0a3d7ea09043f35c7cd72efac6ba33031e6242 -size 177 +oid sha256:94f03a9f465220e3ff716ffdc98cbed7d49ebdf25fcf6370f939869c0e799251 +size 157 diff --git a/assets/minecraft/textures/particle/gust_7.png b/assets/minecraft/textures/particle/gust_7.png index c9d3e53f..d5d78462 100644 --- a/assets/minecraft/textures/particle/gust_7.png +++ b/assets/minecraft/textures/particle/gust_7.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0a726f13c026e641147ee7206c1235f855cb4eae8c6087bcbc99d0c191d27943 -size 205 +oid sha256:a871cbce4855a3ab41141211cc4b2bcf25c41cde434ede51066c71f211717c0c +size 172 diff --git a/assets/minecraft/textures/particle/gust_8.png b/assets/minecraft/textures/particle/gust_8.png index 1888516e..35c3cfb1 100644 --- a/assets/minecraft/textures/particle/gust_8.png +++ b/assets/minecraft/textures/particle/gust_8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e2da965b7510a1e2868ee60480c37923100bcddd397819a6fb1795d7f5e8271d -size 218 +oid sha256:fb82e27b8f85b518ef106d36dd7e60882e2227aaa7f007f78424e030dd8781b9 +size 181 diff --git a/assets/minecraft/textures/particle/gust_9.png b/assets/minecraft/textures/particle/gust_9.png index f2255895..8b7d308f 100644 --- a/assets/minecraft/textures/particle/gust_9.png +++ b/assets/minecraft/textures/particle/gust_9.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2b0c00d1566587e951265c419a11c637b3326f6e57b4bb6cf6baa27b32f0c546 -size 208 +oid sha256:79fdb40afe3dfec8c126edfbcf7d50a6858c549bc5f001434f44e520fdee84c2 +size 164 diff --git a/assets/minecraft/textures/particle/heart.png b/assets/minecraft/textures/particle/heart.png index c4aff6f1..e5ef4455 100644 --- a/assets/minecraft/textures/particle/heart.png +++ b/assets/minecraft/textures/particle/heart.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:351e76662421bfd9285429847568b93046cd26100acc3f53550c663234bbde7b -size 139 +oid sha256:eb9c9376bd97b623aaba23fcd37fdfe921eb0890b563dec5fedb1df805ad9fcf +size 121 diff --git a/assets/minecraft/textures/particle/infested.png b/assets/minecraft/textures/particle/infested.png index 3b94bcf3..c96a3fb3 100644 --- a/assets/minecraft/textures/particle/infested.png +++ b/assets/minecraft/textures/particle/infested.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:40a8530dce3b7715cf92a71141111f28029dbcfb92e15429d9cdeb843694de16 -size 103 +oid sha256:69bdba2d2da3850aea6e57086f44817c69a07776cde2591dc57c52dbfebc2580 +size 83 diff --git a/assets/minecraft/textures/particle/lava.png b/assets/minecraft/textures/particle/lava.png index 3ec76a5f..43b0f34c 100644 --- a/assets/minecraft/textures/particle/lava.png +++ b/assets/minecraft/textures/particle/lava.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2a01d0a53de286c7acb0417183c492424b278050687d4573d218226ad3b7392f -size 115 +oid sha256:fb663d71584c81761b453d37035cdc732375bff89a19635ada93348a7cd4d5e4 +size 98 diff --git a/assets/minecraft/textures/particle/leaf_0.png b/assets/minecraft/textures/particle/leaf_0.png index 9aeeaeb7..7d20ec5c 100644 --- a/assets/minecraft/textures/particle/leaf_0.png +++ b/assets/minecraft/textures/particle/leaf_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9b12e8934f96e2eb37a173f378621bdff9039d5a0f4c06ce52e051a53b87708d -size 90 +oid sha256:c831ef696700887205c34cfa5b78dc629b8c8e364bb9871ac4842720eb2f4bea +size 87 diff --git a/assets/minecraft/textures/particle/leaf_1.png b/assets/minecraft/textures/particle/leaf_1.png index 6e48b512..8d0121bf 100644 --- a/assets/minecraft/textures/particle/leaf_1.png +++ b/assets/minecraft/textures/particle/leaf_1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:32196809dad8e56155d211470301bdf37381171278e990ee436e2e7d5f3a9ef6 -size 92 +oid sha256:3ca2c5e74cf3e20f3042dedf40c358282fcac752dba476de539127df49192862 +size 85 diff --git a/assets/minecraft/textures/particle/leaf_10.png b/assets/minecraft/textures/particle/leaf_10.png index 1fc5d7bc..b8a59038 100644 --- a/assets/minecraft/textures/particle/leaf_10.png +++ b/assets/minecraft/textures/particle/leaf_10.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8886f315a6e9bb5dc75f590c4856d59a3c00ce27b34b9960f80f36381606710a -size 94 +oid sha256:0b8e74c2211072c020ed57cc71ea730c26fb46a83cbb8c7736280eda63d863eb +size 88 diff --git a/assets/minecraft/textures/particle/leaf_11.png b/assets/minecraft/textures/particle/leaf_11.png index b319100f..77373b3a 100644 --- a/assets/minecraft/textures/particle/leaf_11.png +++ b/assets/minecraft/textures/particle/leaf_11.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ceea23d422ae250074ff19506d17a1162a9364142961b6225da524a7345319b9 -size 93 +oid sha256:397296ef558d43058abf210f5cf5a02a0a521ed99c45635d7ea00e6135d54fd5 +size 90 diff --git a/assets/minecraft/textures/particle/leaf_2.png b/assets/minecraft/textures/particle/leaf_2.png index b8abf967..d87cf7e2 100644 --- a/assets/minecraft/textures/particle/leaf_2.png +++ b/assets/minecraft/textures/particle/leaf_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a233a2f58755d28eb64f6e0a43d1a68ac4ef45932d6425c06019e422b4fbd8ff -size 94 +oid sha256:cbde19abf7bb9217cf03e73b6bc349cc0c93f2b68c8ba382ac11a79945481bff +size 88 diff --git a/assets/minecraft/textures/particle/leaf_3.png b/assets/minecraft/textures/particle/leaf_3.png index db0b41f6..fac86b0e 100644 --- a/assets/minecraft/textures/particle/leaf_3.png +++ b/assets/minecraft/textures/particle/leaf_3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:852122041345064c49c2ca49100f8e18f6578c1e6bbc8624267c779ddb9ee950 -size 93 +oid sha256:447917846ed17b62c25014155dec0ae6877ee6aaad70fa07e7d182acd047227b +size 90 diff --git a/assets/minecraft/textures/particle/leaf_4.png b/assets/minecraft/textures/particle/leaf_4.png index 38534a0e..b5657b2c 100644 --- a/assets/minecraft/textures/particle/leaf_4.png +++ b/assets/minecraft/textures/particle/leaf_4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:20fea4ec7d5e6d2f96b8be1256b0cfe0d3b965cbdbe76da6b0fbeccd0fa1eddd -size 90 +oid sha256:8af0b96ddb75fee6bcd555580cddfa5e8c7f1aa2baa342f189596616b7245787 +size 87 diff --git a/assets/minecraft/textures/particle/leaf_5.png b/assets/minecraft/textures/particle/leaf_5.png index a34c773c..7d240679 100644 --- a/assets/minecraft/textures/particle/leaf_5.png +++ b/assets/minecraft/textures/particle/leaf_5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:673031686a603b9f3a769006fecad747e06729e66f2eb8ee87212053d5c37860 -size 92 +oid sha256:e6c96b746ffe77565fe4cb95121ca389f79e16355a4549258dd014d1a25a3eea +size 85 diff --git a/assets/minecraft/textures/particle/leaf_6.png b/assets/minecraft/textures/particle/leaf_6.png index 2e065738..e5767728 100644 --- a/assets/minecraft/textures/particle/leaf_6.png +++ b/assets/minecraft/textures/particle/leaf_6.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b69f4a6473226248c010b4dad63e7d036bb59a140ee18f614b843e655e725bbf -size 94 +oid sha256:7ac74fec0366f24eb51a781b2d3db713b24e19bc30a41ee535084af2370d15af +size 88 diff --git a/assets/minecraft/textures/particle/leaf_7.png b/assets/minecraft/textures/particle/leaf_7.png index 6e80e038..3716ba59 100644 --- a/assets/minecraft/textures/particle/leaf_7.png +++ b/assets/minecraft/textures/particle/leaf_7.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3b4084542edd97aacd8d48d4ba31a20258bb8610faaf956f64b3d6137eb3c75c -size 93 +oid sha256:c7d6c374950004ecb9dc278ec775fa4b8a8357ecdae5c5a3860b7f9bee402372 +size 90 diff --git a/assets/minecraft/textures/particle/leaf_8.png b/assets/minecraft/textures/particle/leaf_8.png index 51ab25cb..67ef5582 100644 --- a/assets/minecraft/textures/particle/leaf_8.png +++ b/assets/minecraft/textures/particle/leaf_8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f53ff0892ec2f42a3e035ca43aa2289283895f23b0d6523f0c12dc1e7da65896 -size 90 +oid sha256:afc61d3ccc9447ada5039b32b63db7469feb73e8c0777b19a3cf82ec862ab181 +size 87 diff --git a/assets/minecraft/textures/particle/leaf_9.png b/assets/minecraft/textures/particle/leaf_9.png index d45ee348..cfc74baa 100644 --- a/assets/minecraft/textures/particle/leaf_9.png +++ b/assets/minecraft/textures/particle/leaf_9.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ba90e27854b52f3ae0a3b41b69a3e0f3e15e5a17e8aedbcdbd2379334677cfa1 -size 92 +oid sha256:dc30cafe372af740efd1889055707aa5d73f04030f957884ab68ba0ee448cdc8 +size 85 diff --git a/assets/minecraft/textures/particle/nautilus.png b/assets/minecraft/textures/particle/nautilus.png index 95034de8..159d37f7 100644 --- a/assets/minecraft/textures/particle/nautilus.png +++ b/assets/minecraft/textures/particle/nautilus.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9638a2628eb96e35a03327038fd2feec4f6c31114545d849c98473db2f73a29b -size 143 +oid sha256:48c32a718c0c8ba64ee7d8a1bd8a684d9602a2d5f03d361a21c8ea4c9a1343d7 +size 126 diff --git a/assets/minecraft/textures/particle/note.png b/assets/minecraft/textures/particle/note.png index 2c26ae74..fec72e9c 100644 --- a/assets/minecraft/textures/particle/note.png +++ b/assets/minecraft/textures/particle/note.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c27d235f5a4ece974a6bc7c95dd7ce3541ccd67963eb6df72cdba58217740e9f -size 132 +oid sha256:b8f4ebd36470e5a4a269dbef2827b35d011d3d8903844557fdca4ab7d5f5e85c +size 101 diff --git a/assets/minecraft/textures/particle/ominous_spawning.png b/assets/minecraft/textures/particle/ominous_spawning.png index dabfa263..1ff9ee68 100644 --- a/assets/minecraft/textures/particle/ominous_spawning.png +++ b/assets/minecraft/textures/particle/ominous_spawning.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5a3fece265679137ee12d2595421b8252c1e17c7d52e7b1e017248f1890ad0e0 -size 108 +oid sha256:3c27a17dd8abdf405d3c8c90e65daeae875a13948972ae7146bdf39394698b12 +size 76 diff --git a/assets/minecraft/textures/particle/raid_omen.png b/assets/minecraft/textures/particle/raid_omen.png index f5dd47ba..06bf0487 100644 --- a/assets/minecraft/textures/particle/raid_omen.png +++ b/assets/minecraft/textures/particle/raid_omen.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:333e6c776963ab737b5f874c60aba6df04b9feb926b797b24942d26b2bbde1cd -size 113 +oid sha256:3e2d815ab8bc252983b07a71081d301ffef11562b5b0e763138e09e3cfac38f7 +size 93 diff --git a/assets/minecraft/textures/particle/sculk_charge_0.png b/assets/minecraft/textures/particle/sculk_charge_0.png index 143a97a6..6e6b4fe0 100644 --- a/assets/minecraft/textures/particle/sculk_charge_0.png +++ b/assets/minecraft/textures/particle/sculk_charge_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f614c40b647a6eaa962a922a9681d1b1474712df6b4521af2fe1cf9a755be82f -size 84 +oid sha256:6ef0d988d785db31571c5ac07529f3b6f7bafc8adfb722764734026df289a500 +size 83 diff --git a/assets/minecraft/textures/particle/sculk_charge_1.png b/assets/minecraft/textures/particle/sculk_charge_1.png index 6798e684..d98e3afb 100644 --- a/assets/minecraft/textures/particle/sculk_charge_1.png +++ b/assets/minecraft/textures/particle/sculk_charge_1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b479f91a07b891ec8b0f3869b7415909c25bbe45a0eee8be0f9877609a88d9df -size 104 +oid sha256:97153ec20d662eecddef138b63a1c2b0c893159fe65c2d9723fef3fb8c53fddb +size 103 diff --git a/assets/minecraft/textures/particle/sculk_charge_2.png b/assets/minecraft/textures/particle/sculk_charge_2.png index e8e4607b..d42f2c41 100644 --- a/assets/minecraft/textures/particle/sculk_charge_2.png +++ b/assets/minecraft/textures/particle/sculk_charge_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c451e2ac8385936de799fb2c0e89282b07e131aa89bbd157811bd7396a04ed04 -size 118 +oid sha256:077fd415ebf9f3bb585555db39f06ce392fbef240d3ac176b48c6f692446cc66 +size 116 diff --git a/assets/minecraft/textures/particle/sculk_charge_3.png b/assets/minecraft/textures/particle/sculk_charge_3.png index 2feee060..b8608d8b 100644 --- a/assets/minecraft/textures/particle/sculk_charge_3.png +++ b/assets/minecraft/textures/particle/sculk_charge_3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5e352b7e274a65f4fea8d22e64cf250d1a6fd7f7e3cd5378739494abf72fb79d -size 128 +oid sha256:80723051201f948b11b193635c9de25d691e55ea856e77adca997108f9691e09 +size 125 diff --git a/assets/minecraft/textures/particle/sculk_charge_4.png b/assets/minecraft/textures/particle/sculk_charge_4.png index 4a1ac762..fc30d69d 100644 --- a/assets/minecraft/textures/particle/sculk_charge_4.png +++ b/assets/minecraft/textures/particle/sculk_charge_4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ad69076f0ce2cc9851c698ebf84f5e19352f2e6a438077955b2fb3baba0b405c -size 117 +oid sha256:9a87a4c43759a0b7655ed301b7d8eb86d41adef73c559e542fd63e538e8e1ea5 +size 116 diff --git a/assets/minecraft/textures/particle/sculk_charge_5.png b/assets/minecraft/textures/particle/sculk_charge_5.png index 7470a965..2fe02a4a 100644 --- a/assets/minecraft/textures/particle/sculk_charge_5.png +++ b/assets/minecraft/textures/particle/sculk_charge_5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1bf27e22cac6c564321a72693a20d98b1b82536e54499c9539fa59c8c4f6eca1 -size 119 +oid sha256:fa768eddca5a35ac90e10fb75273e0b74ca66ecddd96030e8c6e7df9c32e8147 +size 118 diff --git a/assets/minecraft/textures/particle/sculk_charge_pop_0.png b/assets/minecraft/textures/particle/sculk_charge_pop_0.png index 5bec8a5a..85bb808b 100644 --- a/assets/minecraft/textures/particle/sculk_charge_pop_0.png +++ b/assets/minecraft/textures/particle/sculk_charge_pop_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b402d3f68d6d1c0eb9ad943752f6a3fdff04528724553a2922d6a75796a15c9b -size 128 +oid sha256:bdf3287e96501a22a7a49a1a60022f544e8a66795ea432b4f5e13c05854f0256 +size 127 diff --git a/assets/minecraft/textures/particle/sculk_charge_pop_2.png b/assets/minecraft/textures/particle/sculk_charge_pop_2.png index 4b6b3983..e294b867 100644 --- a/assets/minecraft/textures/particle/sculk_charge_pop_2.png +++ b/assets/minecraft/textures/particle/sculk_charge_pop_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:25c865ff51c2dcd54b8d168b0f3637b1ed0178285645234c18b14de6b487ae6d -size 111 +oid sha256:c7ecaca1b1d8599ac85527696e70906a6216b95aefd3d5778f6dca11d5a80a31 +size 108 diff --git a/assets/minecraft/textures/particle/sculk_charge_pop_3.png b/assets/minecraft/textures/particle/sculk_charge_pop_3.png index d8a38020..1375b9f6 100644 --- a/assets/minecraft/textures/particle/sculk_charge_pop_3.png +++ b/assets/minecraft/textures/particle/sculk_charge_pop_3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:601ace46ca320a5a631b34a4830c29900a326e1ef799c26544a45dbefa9160fe -size 88 +oid sha256:0a41f5288d125c658b452e4b2c61463a732a9b7883f0a7fbbd34290bb6254e5d +size 87 diff --git a/assets/minecraft/textures/particle/sculk_soul_2.png b/assets/minecraft/textures/particle/sculk_soul_2.png index 3d3c2964..0543604e 100644 --- a/assets/minecraft/textures/particle/sculk_soul_2.png +++ b/assets/minecraft/textures/particle/sculk_soul_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e0bda6838e186501dafdfc7da8f8fc729ad6c0a3a6c6cfbfe66e9bda7fcd9fc5 -size 145 +oid sha256:ff285178bfad92b1416d312d4c078bedb0e539cfbba767e7fe0274b668437894 +size 142 diff --git a/assets/minecraft/textures/particle/sculk_soul_4.png b/assets/minecraft/textures/particle/sculk_soul_4.png index 57e65f60..39bcfc27 100644 --- a/assets/minecraft/textures/particle/sculk_soul_4.png +++ b/assets/minecraft/textures/particle/sculk_soul_4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cc63833ccf0b28618a35b5cf196e2c5e2d4ed65219a9b98646d29eefaff0b4b2 -size 147 +oid sha256:4644d2ed2a07e090e953ee65670d49f94d3014b957edb0b07d071cfdba9e0db5 +size 145 diff --git a/assets/minecraft/textures/particle/sculk_soul_5.png b/assets/minecraft/textures/particle/sculk_soul_5.png index 07a19cf3..92682ab2 100644 --- a/assets/minecraft/textures/particle/sculk_soul_5.png +++ b/assets/minecraft/textures/particle/sculk_soul_5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8a91022784bc7e046959cafb534b4c572eb14a924abf4163957c8fe83d217b02 -size 146 +oid sha256:36e5d32285d97371a2a393e0771f436add4675de4103ec75365d35401b4c4c5d +size 144 diff --git a/assets/minecraft/textures/particle/sculk_soul_6.png b/assets/minecraft/textures/particle/sculk_soul_6.png index 9cc4d90f..eeee784d 100644 --- a/assets/minecraft/textures/particle/sculk_soul_6.png +++ b/assets/minecraft/textures/particle/sculk_soul_6.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8ff7822f19d171848beaf894c8a8e1368c50da06eb203554a622f1cdf0234737 -size 163 +oid sha256:5fd99fda8f060da321097d1da6355d8996dc611d3c1864dc060b3470b8e3ba6a +size 162 diff --git a/assets/minecraft/textures/particle/sculk_soul_8.png b/assets/minecraft/textures/particle/sculk_soul_8.png index 3bfca413..3e3efdff 100644 --- a/assets/minecraft/textures/particle/sculk_soul_8.png +++ b/assets/minecraft/textures/particle/sculk_soul_8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b52f32d5e13925176fd8450a2f0c6cbd6d0932d04cf939ba4961532d6f37262e -size 135 +oid sha256:49b661a911da7bfea5b26b3ee130f9ac6d7f944092308348d572757d052d7bd2 +size 133 diff --git a/assets/minecraft/textures/particle/sculk_soul_9.png b/assets/minecraft/textures/particle/sculk_soul_9.png index d5616987..97354bb4 100644 --- a/assets/minecraft/textures/particle/sculk_soul_9.png +++ b/assets/minecraft/textures/particle/sculk_soul_9.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:890242f4c6217e3cd55b601ecbc6b99c21eea0278803d61e1ff35d90a2db9962 -size 123 +oid sha256:117bde2f1702a42b99f54db9f662268aae6ab57b56f6456c455d264fa12592c3 +size 120 diff --git a/assets/minecraft/textures/particle/sga_a.png b/assets/minecraft/textures/particle/sga_a.png index a51ca5ca..6547552c 100644 --- a/assets/minecraft/textures/particle/sga_a.png +++ b/assets/minecraft/textures/particle/sga_a.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2131ba99951a14f5648c691dabdc0a947d932148be409315b0873d5c25bb2b74 -size 103 +oid sha256:f2c96c8a425d80e04df13c4dd6eab4daf951558dad3d3eac36f05dc2dee3d04a +size 84 diff --git a/assets/minecraft/textures/particle/sga_b.png b/assets/minecraft/textures/particle/sga_b.png index 5e7c3469..1cd5bf45 100644 --- a/assets/minecraft/textures/particle/sga_b.png +++ b/assets/minecraft/textures/particle/sga_b.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:af12d8e3a1e6f79b2320ebe5c5182b65bf89fe23be51ae0fd9e5353cd857c360 -size 100 +oid sha256:a65b6c7858fb47ce55ebaa136c8256e55d8d72392ee846ec6f2a00a2a45a2592 +size 81 diff --git a/assets/minecraft/textures/particle/sga_c.png b/assets/minecraft/textures/particle/sga_c.png index f07ce285..95560321 100644 --- a/assets/minecraft/textures/particle/sga_c.png +++ b/assets/minecraft/textures/particle/sga_c.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d73a2b71146a3481c8857685d3528520e773c4e4a90afae01b520152c7ac5ff -size 97 +oid sha256:f30470aefdbb27a51f9039574c60dc5cab927906cc948e5099ab1a403237b4aa +size 79 diff --git a/assets/minecraft/textures/particle/sga_d.png b/assets/minecraft/textures/particle/sga_d.png index f12f12e3..0c661da8 100644 --- a/assets/minecraft/textures/particle/sga_d.png +++ b/assets/minecraft/textures/particle/sga_d.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c4f4c3f69b85ffd57749f266d580c2a1bde6fbf8759194ab6a7f39932b9eb803 -size 81 +oid sha256:4a105e2a1242cce3cbb12f8ca9aaa8fb48528e6606cb252383a57a2eb310f13c +size 79 diff --git a/assets/minecraft/textures/particle/sga_e.png b/assets/minecraft/textures/particle/sga_e.png index 0f02048d..4b44b9f2 100644 --- a/assets/minecraft/textures/particle/sga_e.png +++ b/assets/minecraft/textures/particle/sga_e.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d2a5bcb6ef7b52d6898e3388f8cff3871232ae07349c49eeaaee8d80b8a4759c -size 100 +oid sha256:2a04a1b6a17e8e9720ffc9dc08a746028163eb7b7ff13a2d313df75776f9612d +size 81 diff --git a/assets/minecraft/textures/particle/sga_f.png b/assets/minecraft/textures/particle/sga_f.png index d3fce61c..ba1340ca 100644 --- a/assets/minecraft/textures/particle/sga_f.png +++ b/assets/minecraft/textures/particle/sga_f.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3d507dbf50cc069ab7e60d64f512bea6b77a1029f2fd622dc597b72029e734e3 -size 77 +oid sha256:a0aea2f182ac0e93450b8f5b133fc16895e7cecbf3e128a8f42633143a044c0e +size 76 diff --git a/assets/minecraft/textures/particle/sga_g.png b/assets/minecraft/textures/particle/sga_g.png index 56073056..e86d2c82 100644 --- a/assets/minecraft/textures/particle/sga_g.png +++ b/assets/minecraft/textures/particle/sga_g.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aca664933d84399e98291abbb7e257895ecca3818db42876c6d1d2493c984031 -size 101 +oid sha256:b698f1a25c536583612d59410cfb8dbea5077384134afdc63f31c313b2406768 +size 81 diff --git a/assets/minecraft/textures/particle/sga_h.png b/assets/minecraft/textures/particle/sga_h.png index cdb68873..68c72cca 100644 --- a/assets/minecraft/textures/particle/sga_h.png +++ b/assets/minecraft/textures/particle/sga_h.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b14d78c9d7b11a7524eafbed28bfd4e37d99820c813cfd2aa2f6921c16c66f3 -size 97 +oid sha256:55bf601f41a2ebea9f1949eef5fe35ccba806278c773036ffa9b3af7253ff995 +size 79 diff --git a/assets/minecraft/textures/particle/sga_i.png b/assets/minecraft/textures/particle/sga_i.png index 0471846a..fb0ed98e 100644 --- a/assets/minecraft/textures/particle/sga_i.png +++ b/assets/minecraft/textures/particle/sga_i.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8e357b1d0fd2be9b1006f35545873811689f197a227ad926e295c14a04da759c -size 94 +oid sha256:6551d808b355f8ed9ffa81f80faeb89423b3c0006963855bfab1435883586659 +size 77 diff --git a/assets/minecraft/textures/particle/sga_j.png b/assets/minecraft/textures/particle/sga_j.png index 50d43823..728fdda7 100644 --- a/assets/minecraft/textures/particle/sga_j.png +++ b/assets/minecraft/textures/particle/sga_j.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c8a9a99ee684bfc16ab940e2b59ec032b040c775b8cee69eee35c6fd53fc44d3 -size 96 +oid sha256:606f6ee43750153b8818ee428a9d78a1ddec1de88d047a678e0d6584953a86c3 +size 79 diff --git a/assets/minecraft/textures/particle/sga_k.png b/assets/minecraft/textures/particle/sga_k.png index 052b75e4..aa8d3373 100644 --- a/assets/minecraft/textures/particle/sga_k.png +++ b/assets/minecraft/textures/particle/sga_k.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7a83db633fb0807dc3f053078d4354033d7b09c839290071797d7b71be39fd72 -size 102 +oid sha256:cedfb0e710e78a7b14ba303cf17337b26105d755ce6edbe0816d4e81317dd881 +size 83 diff --git a/assets/minecraft/textures/particle/sga_l.png b/assets/minecraft/textures/particle/sga_l.png index 86f61b09..172923b2 100644 --- a/assets/minecraft/textures/particle/sga_l.png +++ b/assets/minecraft/textures/particle/sga_l.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0193bb83a0c87989dd14124ff4721fe05e11f2f75f7048f81ef2d7a7d752e7c7 -size 101 +oid sha256:1f2a2470cb6dc0308fad904f52e2ccf375bb699ddacf102d5c456021d74d6718 +size 82 diff --git a/assets/minecraft/textures/particle/sga_m.png b/assets/minecraft/textures/particle/sga_m.png index ab947a03..2b666ec5 100644 --- a/assets/minecraft/textures/particle/sga_m.png +++ b/assets/minecraft/textures/particle/sga_m.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6c8ea682eedc3eeb489884817913cdd8f2efa6c9d534a345cb0723649571aeeb -size 99 +oid sha256:4516f4bc991466801b0c6b515a7b9e50c6eca70e86c210509649de0aa559637c +size 80 diff --git a/assets/minecraft/textures/particle/sga_n.png b/assets/minecraft/textures/particle/sga_n.png index 986721e5..7b416bd5 100644 --- a/assets/minecraft/textures/particle/sga_n.png +++ b/assets/minecraft/textures/particle/sga_n.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b2522acdcd66c4a403bb9f11cc70923ebe5276dba187a29b31d9b78ff8834b5b -size 103 +oid sha256:3de8d5c0d29cf8ab95796ccddfe4946f019be76b61aee8e3ada8ea653f425b16 +size 85 diff --git a/assets/minecraft/textures/particle/sga_o.png b/assets/minecraft/textures/particle/sga_o.png index 25a96510..e60c8404 100644 --- a/assets/minecraft/textures/particle/sga_o.png +++ b/assets/minecraft/textures/particle/sga_o.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:08c8a147bd4bc9be137f0b4f35c022eae89a425284f583ea27dd97ae370c0f55 -size 80 +oid sha256:267bc562775a5681e5c9f48b92dcc67efafd4f080df3ee29ce9203e2fff35a9d +size 79 diff --git a/assets/minecraft/textures/particle/sga_p.png b/assets/minecraft/textures/particle/sga_p.png index 430a7dae..695bde6d 100644 --- a/assets/minecraft/textures/particle/sga_p.png +++ b/assets/minecraft/textures/particle/sga_p.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:62d0aa71aeaff588cfb083e77b448056d2de01415cf26a33c9e7b4f0d30a7d22 -size 103 +oid sha256:85f3dd42860e541464cbd793f59fe58f8f20d7d5f7091f31c829fe03fd8908db +size 84 diff --git a/assets/minecraft/textures/particle/sga_q.png b/assets/minecraft/textures/particle/sga_q.png index 7dce5b4e..8ef5ea13 100644 --- a/assets/minecraft/textures/particle/sga_q.png +++ b/assets/minecraft/textures/particle/sga_q.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e37eaa8abc07fcf52a9bd7a58e21c13a5f8cd269af4c5181c2849ea832161960 -size 102 +oid sha256:dc9779e9daf2932df32fe8b0ee195f5d92cb80f76467baf440925ee0d70b8a70 +size 84 diff --git a/assets/minecraft/textures/particle/sga_r.png b/assets/minecraft/textures/particle/sga_r.png index 8db9f391..e2bc07f1 100644 --- a/assets/minecraft/textures/particle/sga_r.png +++ b/assets/minecraft/textures/particle/sga_r.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:22b6613688ba502f95db0406e268ac9c01e8ffbc6b12ab9019b6e10da9784c07 -size 94 +oid sha256:e33ed4ab7ed566e052307933a90ba706f45eda8e86a000fb5b9053da17a32bbf +size 76 diff --git a/assets/minecraft/textures/particle/sga_s.png b/assets/minecraft/textures/particle/sga_s.png index 8dc5cbe6..ebc7c0e2 100644 --- a/assets/minecraft/textures/particle/sga_s.png +++ b/assets/minecraft/textures/particle/sga_s.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:23ee01c5514cb555174e8a20321900b9e0e56eeddc1175c2337000ab0e44ee8f -size 95 +oid sha256:9d70856a97d34eeeead864d2dcf586693fc4717da843ea3fae939e04350b1ae7 +size 78 diff --git a/assets/minecraft/textures/particle/sga_t.png b/assets/minecraft/textures/particle/sga_t.png index 472b0856..20f6ff0e 100644 --- a/assets/minecraft/textures/particle/sga_t.png +++ b/assets/minecraft/textures/particle/sga_t.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fd229e3b4d2799f2de4815f3671e81e497b6998dd278c044f4763743390a9f1c -size 78 +oid sha256:04b03345417159710f4607210cc95d9ab190a2d71bed7e51673a909d104ad59b +size 77 diff --git a/assets/minecraft/textures/particle/sga_u.png b/assets/minecraft/textures/particle/sga_u.png index 4a51331e..3dcfa575 100644 --- a/assets/minecraft/textures/particle/sga_u.png +++ b/assets/minecraft/textures/particle/sga_u.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d59a9c4199056fb42addb569c5074809f56b75bc144e6beff22c4ee371be1dd -size 80 +oid sha256:9cb5a45456bc914f94f65a643c2048ab59248306def765b32c56a8620508f38b +size 78 diff --git a/assets/minecraft/textures/particle/sga_v.png b/assets/minecraft/textures/particle/sga_v.png index fba40c41..b3781d23 100644 --- a/assets/minecraft/textures/particle/sga_v.png +++ b/assets/minecraft/textures/particle/sga_v.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:658d82b03f3d3cd336cb16445c37a2a71159d7fac57064b5e75a652a65b81e7e -size 100 +oid sha256:f895bf2819649b0bf9d918fdb595cec425152d058a69ef9d8131ae7a631a2128 +size 81 diff --git a/assets/minecraft/textures/particle/sga_w.png b/assets/minecraft/textures/particle/sga_w.png index ce844b6b..f62d700b 100644 --- a/assets/minecraft/textures/particle/sga_w.png +++ b/assets/minecraft/textures/particle/sga_w.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b645726e52bcdd85087bedd08646c24f70801e62834cd82008ac58711bf82139 -size 79 +oid sha256:d03e880427919814457f8f6128fc006d44c17bcef472ba58abd4c7fba18f7a21 +size 76 diff --git a/assets/minecraft/textures/particle/sga_x.png b/assets/minecraft/textures/particle/sga_x.png index 5f92d89a..e7057dff 100644 --- a/assets/minecraft/textures/particle/sga_x.png +++ b/assets/minecraft/textures/particle/sga_x.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9f04170350f14dad95e2ed5270b5f0fb491796c15413b2c826879882b2660737 -size 99 +oid sha256:6facb0e25f49179566a0a22b192d20dd4f48dff35de4c44da5eebeef93ed21ce +size 81 diff --git a/assets/minecraft/textures/particle/sga_y.png b/assets/minecraft/textures/particle/sga_y.png index 5341f996..50831204 100644 --- a/assets/minecraft/textures/particle/sga_y.png +++ b/assets/minecraft/textures/particle/sga_y.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:319423b2fbebced9f93a9356e64255defea595f885f8c321951641c2ce093bf9 -size 95 +oid sha256:ca0b4f29ad2052cfab276b099a746d0f62db51434b06c94a78c2cce12587e7b1 +size 77 diff --git a/assets/minecraft/textures/particle/sga_z.png b/assets/minecraft/textures/particle/sga_z.png index 40985b44..c07d888d 100644 --- a/assets/minecraft/textures/particle/sga_z.png +++ b/assets/minecraft/textures/particle/sga_z.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c58b4b30a181af72afc3b025697de9823441e643ab6f8b191127006cdbe1efad -size 102 +oid sha256:6f5687e9177b96fd61d317d126cba39498704b0d690e5d56fe4a94ae6b245b90 +size 83 diff --git a/assets/minecraft/textures/particle/small_gust_0.png b/assets/minecraft/textures/particle/small_gust_0.png index 053c6e41..a53fac52 100644 --- a/assets/minecraft/textures/particle/small_gust_0.png +++ b/assets/minecraft/textures/particle/small_gust_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fbbdc9ac8f2fa56f4bed59acea50181603b1d81cc67f4561629f2bb3aa707b41 -size 108 +oid sha256:7c92f5206033ee99033a83d181f5867f87e30da327463234398180d6da35385c +size 86 diff --git a/assets/minecraft/textures/particle/small_gust_1.png b/assets/minecraft/textures/particle/small_gust_1.png index ccaf1747..1b4e113f 100644 --- a/assets/minecraft/textures/particle/small_gust_1.png +++ b/assets/minecraft/textures/particle/small_gust_1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6f4e096639bea274f6e078889717aabb7fd314ad1bbeb9c4dc17ede9708aac4d -size 105 +oid sha256:452e07cfdac7bf312c7b9588fd97d120948727b036b09e12f52a91b31d5cba5f +size 85 diff --git a/assets/minecraft/textures/particle/small_gust_2.png b/assets/minecraft/textures/particle/small_gust_2.png index 179171b0..a912723c 100644 --- a/assets/minecraft/textures/particle/small_gust_2.png +++ b/assets/minecraft/textures/particle/small_gust_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:284d060a04efe633293e9a70f132c4863d1cbcbcfe3b8c5a87e3fe4dddabe8c0 -size 117 +oid sha256:9b2a21f4523819cc2d462e798d2a65e662ccc653c4fb02f26932355c377e74d9 +size 89 diff --git a/assets/minecraft/textures/particle/small_gust_3.png b/assets/minecraft/textures/particle/small_gust_3.png index ab9fdb6b..c9aad5c7 100644 --- a/assets/minecraft/textures/particle/small_gust_3.png +++ b/assets/minecraft/textures/particle/small_gust_3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0dac1603c5e679bf7871e07e0784fce288208b97b03e2b3bccc8ea4b0f37ceb0 -size 133 +oid sha256:71286a4133fa927c16d5643409d2d410faac42dab0c98a365f8e0b720620d851 +size 97 diff --git a/assets/minecraft/textures/particle/small_gust_4.png b/assets/minecraft/textures/particle/small_gust_4.png index ef06e2b9..1fcf0fe8 100644 --- a/assets/minecraft/textures/particle/small_gust_4.png +++ b/assets/minecraft/textures/particle/small_gust_4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6e856d91ddfbe132cebe2d4948f602c10c6f8254d3c4b46b2eba585ebd075a7d -size 141 +oid sha256:0b936a485ba2118bc0596552ebc5c330a87d65ae156140f2ef5be14e1b8d4fd0 +size 99 diff --git a/assets/minecraft/textures/particle/small_gust_5.png b/assets/minecraft/textures/particle/small_gust_5.png index 62e8b679..974944d7 100644 --- a/assets/minecraft/textures/particle/small_gust_5.png +++ b/assets/minecraft/textures/particle/small_gust_5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e54ddfec78dad6191aa1fb7575f23e69b088be88ce3e2447bff6756864514455 -size 123 +oid sha256:aefbd690279a7d0cce6d63038376d0ca1bad80090af783dd82c5603e6202dea9 +size 95 diff --git a/assets/minecraft/textures/particle/small_gust_6.png b/assets/minecraft/textures/particle/small_gust_6.png index 257eef66..027596ca 100644 --- a/assets/minecraft/textures/particle/small_gust_6.png +++ b/assets/minecraft/textures/particle/small_gust_6.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:676909921ce007de4dce6261d59ce0a50314766028e9ecd951c3923f7184aa20 -size 97 +oid sha256:5a5af57237deefc069c2232b583140d079430caab08612abffa93090c4f73e3e +size 79 diff --git a/assets/minecraft/textures/particle/sonic_boom_0.png b/assets/minecraft/textures/particle/sonic_boom_0.png index fc9fa7ba..57a2bcbc 100644 --- a/assets/minecraft/textures/particle/sonic_boom_0.png +++ b/assets/minecraft/textures/particle/sonic_boom_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d23a02bf1bea74e56cb33954c554ca48b315da676460b166e35eff26f1295fa3 -size 203 +oid sha256:de40659e1252478c688b4b6663b94ecf7b75fac43dd6a961924d5d988c7d4b5c +size 129 diff --git a/assets/minecraft/textures/particle/sonic_boom_1.png b/assets/minecraft/textures/particle/sonic_boom_1.png index e59fb2ef..eb74cd35 100644 --- a/assets/minecraft/textures/particle/sonic_boom_1.png +++ b/assets/minecraft/textures/particle/sonic_boom_1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f2e4750fc87a0e0ab6232e047983394525b88a8b8c3a2076475f7739e82d510e -size 198 +oid sha256:e34a02416d515d2bd2c2cbbf3306e7973e1af7dad56146feb5d3e01cf41cc966 +size 144 diff --git a/assets/minecraft/textures/particle/sonic_boom_10.png b/assets/minecraft/textures/particle/sonic_boom_10.png index 5f07a4b8..76a3be67 100644 --- a/assets/minecraft/textures/particle/sonic_boom_10.png +++ b/assets/minecraft/textures/particle/sonic_boom_10.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:24a8a9d8bbfb6c5bd9c2b5f27528bceab176d65acf847a25dbc742360748263d -size 315 +oid sha256:38d6213b1badb90cf162ca56c5d53d78d90eeb47d02fb579aa691c7fdfbf6dbb +size 202 diff --git a/assets/minecraft/textures/particle/sonic_boom_11.png b/assets/minecraft/textures/particle/sonic_boom_11.png index 09a704cf..b65f12d0 100644 --- a/assets/minecraft/textures/particle/sonic_boom_11.png +++ b/assets/minecraft/textures/particle/sonic_boom_11.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8cb90962096622d452514db241bdd42c7eaa472cff7fb816023504da80b8efa5 -size 236 +oid sha256:70a52b6772b70a1775c4bd85f496bcc94d209c83ed677c4e9874b57d68ed7acd +size 170 diff --git a/assets/minecraft/textures/particle/sonic_boom_12.png b/assets/minecraft/textures/particle/sonic_boom_12.png index 12e778bc..e20028ea 100644 --- a/assets/minecraft/textures/particle/sonic_boom_12.png +++ b/assets/minecraft/textures/particle/sonic_boom_12.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:caeaba4d93be0e17ab6185b50f89ba9833796d4291fbabb9b68599247aa36bb9 -size 237 +oid sha256:4c2b318cbeb29fa490c727def0d4ebee041dcf34a15634afee010278fd8708bf +size 166 diff --git a/assets/minecraft/textures/particle/sonic_boom_13.png b/assets/minecraft/textures/particle/sonic_boom_13.png index e448fcc6..6caf314d 100644 --- a/assets/minecraft/textures/particle/sonic_boom_13.png +++ b/assets/minecraft/textures/particle/sonic_boom_13.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e2435f6ceb617e7562802284566b817a3037153403ac2a83aaa6e85d2331ae6a -size 279 +oid sha256:6c87d4690dfa8bb2d94297745869a44dca9f7eba4b6098ad818e7f2742b94dba +size 181 diff --git a/assets/minecraft/textures/particle/sonic_boom_14.png b/assets/minecraft/textures/particle/sonic_boom_14.png index f0b0c64e..552caf4a 100644 --- a/assets/minecraft/textures/particle/sonic_boom_14.png +++ b/assets/minecraft/textures/particle/sonic_boom_14.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:35b774c95f699e3113ce18990b210f86b6de344bc7b5aa06a0f2972528de5246 -size 208 +oid sha256:f4a6a4567c97acaa6851ca29b765966376de2e8a32ecdc5e33ae7cb32459dacf +size 146 diff --git a/assets/minecraft/textures/particle/sonic_boom_15.png b/assets/minecraft/textures/particle/sonic_boom_15.png index 2f3a344e..15dbc5b9 100644 --- a/assets/minecraft/textures/particle/sonic_boom_15.png +++ b/assets/minecraft/textures/particle/sonic_boom_15.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6378189538d0afaddafe35496ad6eb0570b3a7a005f8f51556cdd5b25d320513 -size 179 +oid sha256:75b91be27ed3cb241eb5a1fd1cdcd91e9f8f73ea54d6e18c92cab17cfe8ce1ed +size 122 diff --git a/assets/minecraft/textures/particle/sonic_boom_2.png b/assets/minecraft/textures/particle/sonic_boom_2.png index 710fdea2..98135575 100644 --- a/assets/minecraft/textures/particle/sonic_boom_2.png +++ b/assets/minecraft/textures/particle/sonic_boom_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:61530aa860a23756004651b586fe1bf5cefbd0d52a469aaba46cd6d8f0eebf9f -size 191 +oid sha256:bbad0d95c67e9a5dd67831b661db007103b0bac5a5fa658a947e1f4f69fdb23f +size 138 diff --git a/assets/minecraft/textures/particle/sonic_boom_3.png b/assets/minecraft/textures/particle/sonic_boom_3.png index f5555500..a2290e64 100644 --- a/assets/minecraft/textures/particle/sonic_boom_3.png +++ b/assets/minecraft/textures/particle/sonic_boom_3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f5dbd00407774f8bc8ba8b0024d900c83075876c9a98269c56026100a9015cb6 -size 164 +oid sha256:5a426e4a36bcb99356ed79dd19c6d91459f33e9da3d543a699c977f7aa60bb1e +size 128 diff --git a/assets/minecraft/textures/particle/sonic_boom_4.png b/assets/minecraft/textures/particle/sonic_boom_4.png index 2258dc22..00e062ef 100644 --- a/assets/minecraft/textures/particle/sonic_boom_4.png +++ b/assets/minecraft/textures/particle/sonic_boom_4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aef3d3db88f5f08f47090359c05b24d640f32f5aa4dc592a704cfccb594bcbe2 -size 172 +oid sha256:80138bc593dcb9989c2242913bcc20b197d1b5411eb10ef35462473adbee1474 +size 132 diff --git a/assets/minecraft/textures/particle/sonic_boom_5.png b/assets/minecraft/textures/particle/sonic_boom_5.png index cad0d103..2db040e6 100644 --- a/assets/minecraft/textures/particle/sonic_boom_5.png +++ b/assets/minecraft/textures/particle/sonic_boom_5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:93df7460da540f01583c006954ba93965ba7402c330d52239084a8a8e71ddb18 -size 154 +oid sha256:d2bcc9c995d55c3b6230fd1b0f474eb87da743d5b961807bc0aac462a78066bb +size 124 diff --git a/assets/minecraft/textures/particle/sonic_boom_6.png b/assets/minecraft/textures/particle/sonic_boom_6.png index 7ab1144a..24d7154e 100644 --- a/assets/minecraft/textures/particle/sonic_boom_6.png +++ b/assets/minecraft/textures/particle/sonic_boom_6.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ced06e6c7a2cb5ab19c37c123feef4ac0a5263f79068341ae85fa8ab37868297 -size 111 +oid sha256:fc3e4c749aea8e2e9fff1b4979184e205bab75be732c905aa6bad051cfb18720 +size 105 diff --git a/assets/minecraft/textures/particle/sonic_boom_7.png b/assets/minecraft/textures/particle/sonic_boom_7.png index 105b955b..c3199b34 100644 --- a/assets/minecraft/textures/particle/sonic_boom_7.png +++ b/assets/minecraft/textures/particle/sonic_boom_7.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5bbb7cd7e69e01f390198872e1486cb92d1f2d086a343848284af2393c4303ee -size 122 +oid sha256:d7ed5d4c5e1a4b3bb0652493e16e1a1ebfb188cf67769066f2f3909fc6826b6a +size 101 diff --git a/assets/minecraft/textures/particle/sonic_boom_8.png b/assets/minecraft/textures/particle/sonic_boom_8.png index 6de11f14..5755b794 100644 --- a/assets/minecraft/textures/particle/sonic_boom_8.png +++ b/assets/minecraft/textures/particle/sonic_boom_8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:610e976d1ba44edc41d03ffe0d2a4df15911a35dc349fac35bf6d9fa028cb96e -size 166 +oid sha256:ea7a4dead2eb234ac0990bfa63453e129bb33ccc5691582f23fc8a874ef97216 +size 145 diff --git a/assets/minecraft/textures/particle/sonic_boom_9.png b/assets/minecraft/textures/particle/sonic_boom_9.png index 7254fc21..3dd05855 100644 --- a/assets/minecraft/textures/particle/sonic_boom_9.png +++ b/assets/minecraft/textures/particle/sonic_boom_9.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ed5bde663c4618e24ecbba98a9d4b9d187900aec5b14a7ecd78912129346ea5e -size 234 +oid sha256:544c94885d0a7b17da04e09bf08449aad9916938594b11924bc7c70822acfc61 +size 189 diff --git a/assets/minecraft/textures/particle/soul_2.png b/assets/minecraft/textures/particle/soul_2.png index aa6c6d02..d96921b3 100644 --- a/assets/minecraft/textures/particle/soul_2.png +++ b/assets/minecraft/textures/particle/soul_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b145e220a43bb9b3c80d6b199be916ee058113cc16af94d0fb2228f918c1c062 -size 149 +oid sha256:32467b6c3e5ba7a94f276dfca4fe83e54ff6068ca403d94ed4444ab44db92925 +size 144 diff --git a/assets/minecraft/textures/particle/soul_5.png b/assets/minecraft/textures/particle/soul_5.png index 395e7374..85712339 100644 --- a/assets/minecraft/textures/particle/soul_5.png +++ b/assets/minecraft/textures/particle/soul_5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:89f0451036dcdc23222103b998668f1c14a88a05b11a4769a01d710119af1bcd -size 148 +oid sha256:ea614924e7a7a6e9a2893d47959dc2922b7a80d2c9e5f1586157d2e48f6ff2b0 +size 146 diff --git a/assets/minecraft/textures/particle/soul_fire_flame.png b/assets/minecraft/textures/particle/soul_fire_flame.png index 15f2cc45..2cffaf2f 100644 --- a/assets/minecraft/textures/particle/soul_fire_flame.png +++ b/assets/minecraft/textures/particle/soul_fire_flame.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e5eb0f6508ed5dee56df19da63ace387b43abd118fff33e92ec3c94dff0fbd72 -size 127 +oid sha256:3f234d85a4b494436dfdf8abf35d0e23e1c4c4fc630bea606b5fcd5c02ae66b0 +size 110 diff --git a/assets/minecraft/textures/particle/spark_0.png b/assets/minecraft/textures/particle/spark_0.png index 210fc8f3..ea363b46 100644 --- a/assets/minecraft/textures/particle/spark_0.png +++ b/assets/minecraft/textures/particle/spark_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:683d658fee68ad73d507efd7018bc87e570e38c6a6ca7f4a7a4e85c432a340de -size 80 +oid sha256:be91dc02f3de33dd060b4d2d4e4987bd0853c4721b8db94c86f72e8d111ed9d9 +size 78 diff --git a/assets/minecraft/textures/particle/spark_1.png b/assets/minecraft/textures/particle/spark_1.png index f062195f..346cb4c5 100644 --- a/assets/minecraft/textures/particle/spark_1.png +++ b/assets/minecraft/textures/particle/spark_1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b69253471906f5adb443b724d89579d34a46fc2c5dd37c1ad1146e2ae8ca9bb1 -size 104 +oid sha256:35dae570734d89e8d5c5ea6beacc61014da7b51103f3692ec89684f8f5b09078 +size 85 diff --git a/assets/minecraft/textures/particle/spark_2.png b/assets/minecraft/textures/particle/spark_2.png index 0fe18de2..a045f8e2 100644 --- a/assets/minecraft/textures/particle/spark_2.png +++ b/assets/minecraft/textures/particle/spark_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2ebcaa2486b0de8f4fef2caf7400deb5f61e5d6aba430716538d92275f507192 -size 112 +oid sha256:159017b370afa4e9cdca2fe4c95cb650d13b3743baa43ed49ca750564a83a3b8 +size 90 diff --git a/assets/minecraft/textures/particle/spark_3.png b/assets/minecraft/textures/particle/spark_3.png index 3683b34d..31869fe4 100644 --- a/assets/minecraft/textures/particle/spark_3.png +++ b/assets/minecraft/textures/particle/spark_3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:336bbd8bf661eb032917113e9dbf0ac04653aef202a5b397d5df15f7feb3b460 -size 112 +oid sha256:05a3815096149e8f65ed07957cbcc9abf607675393021b998a8e87d5d9bdac8b +size 91 diff --git a/assets/minecraft/textures/particle/spark_4.png b/assets/minecraft/textures/particle/spark_4.png index 09019b0b..67b8d59e 100644 --- a/assets/minecraft/textures/particle/spark_4.png +++ b/assets/minecraft/textures/particle/spark_4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cf9ab0778ff604422b3f6663d66afff001dbf75c453c58bb773a6004af381ff6 -size 121 +oid sha256:0b381533495f88ff21da0f99f3afd86c3608f9b181a3500fd4543abea97c7e52 +size 97 diff --git a/assets/minecraft/textures/particle/spark_5.png b/assets/minecraft/textures/particle/spark_5.png index 7e02d21c..2233f3c7 100644 --- a/assets/minecraft/textures/particle/spark_5.png +++ b/assets/minecraft/textures/particle/spark_5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aaa694f62b5474cf8001692b567270b3a6f860c41acb5242e3e95cab154326c6 -size 118 +oid sha256:f9d042e733a39e386d199dbd90e7578f545fe09efd15ab5b1b5d3037b738af97 +size 96 diff --git a/assets/minecraft/textures/particle/spark_6.png b/assets/minecraft/textures/particle/spark_6.png index b7182457..56e03201 100644 --- a/assets/minecraft/textures/particle/spark_6.png +++ b/assets/minecraft/textures/particle/spark_6.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e6dd439db2474db73a3d6dc5a1496af033e1058f02b0d8738205c469c505d9b9 -size 115 +oid sha256:dd4fd77518077dd6ca227c5499b3aa57c02a998cbe632245cf7680b254a5150b +size 94 diff --git a/assets/minecraft/textures/particle/spark_7.png b/assets/minecraft/textures/particle/spark_7.png index 7e02d21c..2233f3c7 100644 --- a/assets/minecraft/textures/particle/spark_7.png +++ b/assets/minecraft/textures/particle/spark_7.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aaa694f62b5474cf8001692b567270b3a6f860c41acb5242e3e95cab154326c6 -size 118 +oid sha256:f9d042e733a39e386d199dbd90e7578f545fe09efd15ab5b1b5d3037b738af97 +size 96 diff --git a/assets/minecraft/textures/particle/spell_0.png b/assets/minecraft/textures/particle/spell_0.png index 210fc8f3..ea363b46 100644 --- a/assets/minecraft/textures/particle/spell_0.png +++ b/assets/minecraft/textures/particle/spell_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:683d658fee68ad73d507efd7018bc87e570e38c6a6ca7f4a7a4e85c432a340de -size 80 +oid sha256:be91dc02f3de33dd060b4d2d4e4987bd0853c4721b8db94c86f72e8d111ed9d9 +size 78 diff --git a/assets/minecraft/textures/particle/spell_1.png b/assets/minecraft/textures/particle/spell_1.png index 80d3dd4b..1a66e7ea 100644 --- a/assets/minecraft/textures/particle/spell_1.png +++ b/assets/minecraft/textures/particle/spell_1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9c766cd39ec5a2e4b74ef1f828fdd87439e9ef64b1776c5ac30ec2134c9d5279 -size 104 +oid sha256:1b11ebc707b11d7a7bb96407eaba7443168b952b3e35f918e4f846d0e8c9d203 +size 85 diff --git a/assets/minecraft/textures/particle/spell_2.png b/assets/minecraft/textures/particle/spell_2.png index 5c8beb3d..45b359b6 100644 --- a/assets/minecraft/textures/particle/spell_2.png +++ b/assets/minecraft/textures/particle/spell_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:deeb534a177b53f17ae8dc3172030544e6ef1ca009bb6722d3b2d3f866b40ca5 -size 112 +oid sha256:37f4b07c696242018250862a7545aafe6b76fcf3c2f72b09cba8d1192f414694 +size 90 diff --git a/assets/minecraft/textures/particle/spell_3.png b/assets/minecraft/textures/particle/spell_3.png index 06b04dad..5bd855d1 100644 --- a/assets/minecraft/textures/particle/spell_3.png +++ b/assets/minecraft/textures/particle/spell_3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1c5657bc4a1c75ec57aa88b464720b00152cd2f7895fceed3a4ceee432338da0 -size 113 +oid sha256:16805cc63ac153337df46c39ef60df569bb3cba363a95102db90110bd8bd2a39 +size 94 diff --git a/assets/minecraft/textures/particle/spell_4.png b/assets/minecraft/textures/particle/spell_4.png index ae28f13e..c77984ae 100644 --- a/assets/minecraft/textures/particle/spell_4.png +++ b/assets/minecraft/textures/particle/spell_4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b83c7fb13fd8a5ba7883f852e5983760722b2b11b870986f77d52edbd624d0bd -size 115 +oid sha256:e012a8a6b33e9082cfc378c4dcfdcd96a1bf6417903ff7a55997376130ca9d5b +size 94 diff --git a/assets/minecraft/textures/particle/spell_5.png b/assets/minecraft/textures/particle/spell_5.png index ae28f13e..c77984ae 100644 --- a/assets/minecraft/textures/particle/spell_5.png +++ b/assets/minecraft/textures/particle/spell_5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b83c7fb13fd8a5ba7883f852e5983760722b2b11b870986f77d52edbd624d0bd -size 115 +oid sha256:e012a8a6b33e9082cfc378c4dcfdcd96a1bf6417903ff7a55997376130ca9d5b +size 94 diff --git a/assets/minecraft/textures/particle/spell_6.png b/assets/minecraft/textures/particle/spell_6.png index ae28f13e..c77984ae 100644 --- a/assets/minecraft/textures/particle/spell_6.png +++ b/assets/minecraft/textures/particle/spell_6.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b83c7fb13fd8a5ba7883f852e5983760722b2b11b870986f77d52edbd624d0bd -size 115 +oid sha256:e012a8a6b33e9082cfc378c4dcfdcd96a1bf6417903ff7a55997376130ca9d5b +size 94 diff --git a/assets/minecraft/textures/particle/spell_7.png b/assets/minecraft/textures/particle/spell_7.png index ae28f13e..c77984ae 100644 --- a/assets/minecraft/textures/particle/spell_7.png +++ b/assets/minecraft/textures/particle/spell_7.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b83c7fb13fd8a5ba7883f852e5983760722b2b11b870986f77d52edbd624d0bd -size 115 +oid sha256:e012a8a6b33e9082cfc378c4dcfdcd96a1bf6417903ff7a55997376130ca9d5b +size 94 diff --git a/assets/minecraft/textures/particle/sweep_0.png b/assets/minecraft/textures/particle/sweep_0.png index 3a99c289..b924b12f 100644 --- a/assets/minecraft/textures/particle/sweep_0.png +++ b/assets/minecraft/textures/particle/sweep_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d21c7a8dcbc06a86c91d7968f4fb634457c07a746aae600a7b758e2133c2af3 -size 143 +oid sha256:956cef6c5c72d5909bfc212679a6139defe9aeec4f7aa5ab1469323006564a74 +size 108 diff --git a/assets/minecraft/textures/particle/sweep_1.png b/assets/minecraft/textures/particle/sweep_1.png index 478c3d23..d5d2ebcc 100644 --- a/assets/minecraft/textures/particle/sweep_1.png +++ b/assets/minecraft/textures/particle/sweep_1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c6eb3094258cb9562bd8448cee08201a916979784ae5fe04e506a4841f9ec75e -size 158 +oid sha256:983e908a67833142459ef3edd5f1c81245e0b11052d3c68c241a8b1704774da4 +size 121 diff --git a/assets/minecraft/textures/particle/sweep_2.png b/assets/minecraft/textures/particle/sweep_2.png index 591ae943..ce8c674b 100644 --- a/assets/minecraft/textures/particle/sweep_2.png +++ b/assets/minecraft/textures/particle/sweep_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cc6d970d3a82a99d0755f956d7112486d57aac9995823093650db47b96bd97f0 -size 165 +oid sha256:a424fdc2fa2670d13efb6c0b5ebe761c2c19b54b8913b0fcbca4f3e7404d507e +size 125 diff --git a/assets/minecraft/textures/particle/sweep_3.png b/assets/minecraft/textures/particle/sweep_3.png index bbe3f1f9..d7a7ba57 100644 --- a/assets/minecraft/textures/particle/sweep_3.png +++ b/assets/minecraft/textures/particle/sweep_3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a9749adeaff4568477bd002a12072f47e06a6c47af6234cbbd0c0054124c2025 -size 174 +oid sha256:6823596672715447fc298dd612496385019352489b4bf18ed0eef8cb9867adb4 +size 134 diff --git a/assets/minecraft/textures/particle/sweep_4.png b/assets/minecraft/textures/particle/sweep_4.png index d1dec9bd..3624f912 100644 --- a/assets/minecraft/textures/particle/sweep_4.png +++ b/assets/minecraft/textures/particle/sweep_4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8c835a099c0d339ebcf110fcae8bb9ffe9cb25bb9b5aa5e52e21aaf2a59d3bfa -size 169 +oid sha256:cdd863af03b9ecbceff9249437a07893d54fa5ec2ec83b74413224f687e5332c +size 124 diff --git a/assets/minecraft/textures/particle/sweep_5.png b/assets/minecraft/textures/particle/sweep_5.png index ef34cedb..a7e59dbb 100644 --- a/assets/minecraft/textures/particle/sweep_5.png +++ b/assets/minecraft/textures/particle/sweep_5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2cf22f5cb6d651b16b7f27da59cee5d5d228c0a5e9c3d0b1b721a132047714e6 -size 156 +oid sha256:70a36495affa84b7f84d8ea247de5d18e0c11405188708aa0fce522802cbf307 +size 119 diff --git a/assets/minecraft/textures/particle/sweep_6.png b/assets/minecraft/textures/particle/sweep_6.png index 3c77cdd8..a53edbc9 100644 --- a/assets/minecraft/textures/particle/sweep_6.png +++ b/assets/minecraft/textures/particle/sweep_6.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:53472936c0993ea7f167fe974cdf99d4c2c0d4ec22b5e59eb44f5e54699aceee -size 149 +oid sha256:9ef559212f8ded56a3d86e96e9f23364755cead18227aa96b660b145bdd2f783 +size 112 diff --git a/assets/minecraft/textures/particle/sweep_7.png b/assets/minecraft/textures/particle/sweep_7.png index bef03ffe..19317472 100644 --- a/assets/minecraft/textures/particle/sweep_7.png +++ b/assets/minecraft/textures/particle/sweep_7.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9076a1cd0f920c1eb39e1fa8a3c2b5ffaea428498d27e9b1013b7abab17c7110 -size 134 +oid sha256:1dd3f1550c011c6cad2a8377586cbfce7af03126ce0536083abc4e44f5df46c2 +size 101 diff --git a/assets/minecraft/textures/particle/trial_omen.png b/assets/minecraft/textures/particle/trial_omen.png index bf6fea82..ffac1407 100644 --- a/assets/minecraft/textures/particle/trial_omen.png +++ b/assets/minecraft/textures/particle/trial_omen.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e4526bf5902de1c30c2ea2b64de659914958f0a48429951d0f00bbdbce3efd17 -size 113 +oid sha256:96cd963cde26f29a541c9827026a289223c396110dc3fe5aa87ff5d9bba84cd6 +size 93 diff --git a/assets/minecraft/textures/particle/trial_spawner_detection_0.png b/assets/minecraft/textures/particle/trial_spawner_detection_0.png index 3eaddd2e..e9a3f792 100644 --- a/assets/minecraft/textures/particle/trial_spawner_detection_0.png +++ b/assets/minecraft/textures/particle/trial_spawner_detection_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0a20e8f7d0b0604c5b516d68ada79d3543c37f52dd2550660a9dabd1b3614615 -size 87 +oid sha256:d34b323506acbf59fa757084cdecb66d5654da3cdf2b4681e69813a4356115ba +size 86 diff --git a/assets/minecraft/textures/particle/trial_spawner_detection_1.png b/assets/minecraft/textures/particle/trial_spawner_detection_1.png index da26877b..5c1916dc 100644 --- a/assets/minecraft/textures/particle/trial_spawner_detection_1.png +++ b/assets/minecraft/textures/particle/trial_spawner_detection_1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3eeddc5d4bc7737c5c39d9d80f1a79589d4328c40c945d427497d0f6f7873061 -size 89 +oid sha256:b5eb58879a20d0c714994daa366ce38de5a25371f3c81d4426e5ae1c36167e7a +size 88 diff --git a/assets/minecraft/textures/particle/trial_spawner_detection_2.png b/assets/minecraft/textures/particle/trial_spawner_detection_2.png index 45f147c9..ae3651aa 100644 --- a/assets/minecraft/textures/particle/trial_spawner_detection_2.png +++ b/assets/minecraft/textures/particle/trial_spawner_detection_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:48eb7e2110e22af4bf20f8124193913528ddcb8e4db2a46dd78559f885723d2c -size 88 +oid sha256:193741d66ccb96cd44d581b8e61bf295fbea69748e6c1675f5f66817d012d4ce +size 87 diff --git a/assets/minecraft/textures/particle/trial_spawner_detection_ominous_0.png b/assets/minecraft/textures/particle/trial_spawner_detection_ominous_0.png index 0a20721f..f8fce4b7 100644 --- a/assets/minecraft/textures/particle/trial_spawner_detection_ominous_0.png +++ b/assets/minecraft/textures/particle/trial_spawner_detection_ominous_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5408777ef597b5f2408b5feb7f77c9e82e8be041c529e4128a9691e83f4666e3 -size 87 +oid sha256:eba07da2a72b3c42e60176f71c92ef2b8548952349f1256f95a1dd5f466efddd +size 86 diff --git a/assets/minecraft/textures/particle/trial_spawner_detection_ominous_1.png b/assets/minecraft/textures/particle/trial_spawner_detection_ominous_1.png index e63dd864..c79d7646 100644 --- a/assets/minecraft/textures/particle/trial_spawner_detection_ominous_1.png +++ b/assets/minecraft/textures/particle/trial_spawner_detection_ominous_1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3b4440be014548fe0741c60155f450c373933c20a45430eb540dcae1c94c8c54 -size 89 +oid sha256:9ea8ab93e663a34a7c5ea867c250b7cd8f779c56f463b9e6b6888fdc5ac3b776 +size 88 diff --git a/assets/minecraft/textures/particle/trial_spawner_detection_ominous_2.png b/assets/minecraft/textures/particle/trial_spawner_detection_ominous_2.png index 96652865..f7a98ce8 100644 --- a/assets/minecraft/textures/particle/trial_spawner_detection_ominous_2.png +++ b/assets/minecraft/textures/particle/trial_spawner_detection_ominous_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fabd54c583279d480952d30b4a7f6440cac86fa3d8ca8295fda93f5c160520f2 -size 88 +oid sha256:fbd28580353766aad64e43d37c9ab1e32be6397aa97016b8900ea32ab324ce6f +size 87 diff --git a/assets/minecraft/textures/particle/vault_connection.png b/assets/minecraft/textures/particle/vault_connection.png index d6cd457b..5acccf04 100644 --- a/assets/minecraft/textures/particle/vault_connection.png +++ b/assets/minecraft/textures/particle/vault_connection.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:51a83223135eece68afbf31b379e9d3cffe82711d29b4aa1bfcfba23ef050792 -size 79 +oid sha256:da3bbbe0270679ba25e183aec337731ef4e67c4b0220bfc234a6d55c21a1fdee +size 78 diff --git a/assets/minecraft/textures/trims/color_palettes/trim_palette.png b/assets/minecraft/textures/trims/color_palettes/trim_palette.png index 1fe59b0c..6b96e633 100644 --- a/assets/minecraft/textures/trims/color_palettes/trim_palette.png +++ b/assets/minecraft/textures/trims/color_palettes/trim_palette.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:777f9755df5dbcbe43561dc6c88466edcfa9284a0ba1f7bdc7e0186e6d16a857 -size 69 +oid sha256:1069cb41c31eded2ef641e0d82fb6f0f1d8bdb7e5d06b3f6a06be87af6df36d7 +size 68 diff --git a/assets/minecraft/textures/trims/entity/humanoid/coast.png b/assets/minecraft/textures/trims/entity/humanoid/coast.png index 121e6ed0..02733002 100644 --- a/assets/minecraft/textures/trims/entity/humanoid/coast.png +++ b/assets/minecraft/textures/trims/entity/humanoid/coast.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d1d27474d1b91aa74dc9afdf645fbfd5d0032349a235c3f2051c5a1726a17791 -size 188 +oid sha256:256610b7bc1f172672c2744deaecf528918299fead7da69bc7c87e3a57fdedf3 +size 166 diff --git a/assets/minecraft/textures/trims/entity/humanoid/dune.png b/assets/minecraft/textures/trims/entity/humanoid/dune.png index 19e0484e..4197542d 100644 --- a/assets/minecraft/textures/trims/entity/humanoid/dune.png +++ b/assets/minecraft/textures/trims/entity/humanoid/dune.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0d06b11bd73894d0e00d30de8ec23d65bbc11ec88bc8d97b28ab243ff6177308 -size 219 +oid sha256:5e353ff342c004fa2f677c5c7d2842cbf76a60e2d698a2df13cd702235900b35 +size 218 diff --git a/assets/minecraft/textures/trims/entity/humanoid/eye.png b/assets/minecraft/textures/trims/entity/humanoid/eye.png index e0e4e092..08555c75 100644 --- a/assets/minecraft/textures/trims/entity/humanoid/eye.png +++ b/assets/minecraft/textures/trims/entity/humanoid/eye.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e0edcf5f5d4a2f3aaf771232b25ef1014cf786b28b75e51e6b963ba91a53f1aa -size 207 +oid sha256:8b60759a5b16e34bf32f979b8bed79e27c3372c3188257e0dbce6227f8764270 +size 181 diff --git a/assets/minecraft/textures/trims/entity/humanoid/flow.png b/assets/minecraft/textures/trims/entity/humanoid/flow.png index d2ba27ed..ea8429e7 100644 --- a/assets/minecraft/textures/trims/entity/humanoid/flow.png +++ b/assets/minecraft/textures/trims/entity/humanoid/flow.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e4f63eacda4c19b8b74d97d93f2035378ab85c86245c222d3c8d68c25c8624eb -size 248 +oid sha256:e8bf4938cc97f1cf6220585f4cec0a9df4eff99c66191abb37100b3768cdeff4 +size 247 diff --git a/assets/minecraft/textures/trims/entity/humanoid/host.png b/assets/minecraft/textures/trims/entity/humanoid/host.png index 4be77472..5e9f9240 100644 --- a/assets/minecraft/textures/trims/entity/humanoid/host.png +++ b/assets/minecraft/textures/trims/entity/humanoid/host.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8b503c66d051623f52c4eb4346f101a07758733acaa92f0726ee55184a0c05e5 -size 190 +oid sha256:97f0270f76ab0950d5f1c64c9e279db84262c5406472d59b7fd45e849d569464 +size 177 diff --git a/assets/minecraft/textures/trims/entity/humanoid/raiser.png b/assets/minecraft/textures/trims/entity/humanoid/raiser.png index 93231944..419a45ed 100644 --- a/assets/minecraft/textures/trims/entity/humanoid/raiser.png +++ b/assets/minecraft/textures/trims/entity/humanoid/raiser.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:538e88a33a2bfcbb9a7d9840abefec5a4b20e33ef1f870db0218ec754cce6c6f -size 215 +oid sha256:84462a6154d78cce9d04335b8102de17518908fb2e1d20d01ed835c929aabfae +size 192 diff --git a/assets/minecraft/textures/trims/entity/humanoid/rib.png b/assets/minecraft/textures/trims/entity/humanoid/rib.png index 2ddbb51b..e9efd474 100644 --- a/assets/minecraft/textures/trims/entity/humanoid/rib.png +++ b/assets/minecraft/textures/trims/entity/humanoid/rib.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:86ded13bb98c3b7a61f4c7169e24d7b021cfe6b0de3cf68cf6d00e5058b030ee -size 164 +oid sha256:c6ca8fb75fee405ae4ab2a6026b9edd369bb53c53024958f581ce1e586a28f4b +size 163 diff --git a/assets/minecraft/textures/trims/entity/humanoid/sentry.png b/assets/minecraft/textures/trims/entity/humanoid/sentry.png index 25a51430..cba723e3 100644 --- a/assets/minecraft/textures/trims/entity/humanoid/sentry.png +++ b/assets/minecraft/textures/trims/entity/humanoid/sentry.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:03c0b2d9163d01bf4f3a064e3fbd40c8360337adeee0ea3bc84ac4982b770c1d -size 196 +oid sha256:bac252b0f9d43abda8b7799cb23dba4641595f9e925374d509cf635773dc17c9 +size 170 diff --git a/assets/minecraft/textures/trims/entity/humanoid/shaper.png b/assets/minecraft/textures/trims/entity/humanoid/shaper.png index 23fcf528..b8bf2a4d 100644 --- a/assets/minecraft/textures/trims/entity/humanoid/shaper.png +++ b/assets/minecraft/textures/trims/entity/humanoid/shaper.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0086c981f684d2edfa7acab376da5959819380079bb2d959c075d29aa566076a -size 191 +oid sha256:69e6607ca15fc3b699743f51a59639d31f3c0a6e59de629b697ab0742ff7a6cb +size 169 diff --git a/assets/minecraft/textures/trims/entity/humanoid/silence.png b/assets/minecraft/textures/trims/entity/humanoid/silence.png index 1149bf6d..23e91c48 100644 --- a/assets/minecraft/textures/trims/entity/humanoid/silence.png +++ b/assets/minecraft/textures/trims/entity/humanoid/silence.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8c52623d518a37be64890b314f717b92bbdda42dcf5050869c1dca43d86ec1a6 -size 405 +oid sha256:33b5ed1c2e184cc252e99f287db28475c439dde17a0d924bfc4ce009209a2739 +size 401 diff --git a/assets/minecraft/textures/trims/entity/humanoid/snout.png b/assets/minecraft/textures/trims/entity/humanoid/snout.png index b840f03d..57b12446 100644 --- a/assets/minecraft/textures/trims/entity/humanoid/snout.png +++ b/assets/minecraft/textures/trims/entity/humanoid/snout.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:51b543b15f7287e87a65dfc25275082676b96d0c3602211d345a0de67d162168 -size 225 +oid sha256:5b566cd9cb7700b97916795cdf95c3865914b82c67f98965d94e09fa2fffa3ab +size 195 diff --git a/assets/minecraft/textures/trims/entity/humanoid/spire.png b/assets/minecraft/textures/trims/entity/humanoid/spire.png index 2a2681ca..4c6ab988 100644 --- a/assets/minecraft/textures/trims/entity/humanoid/spire.png +++ b/assets/minecraft/textures/trims/entity/humanoid/spire.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5633f8fd5001fa9709b76666c203564e6602e4c0782e978bbce62bc0766fbdf0 -size 212 +oid sha256:172936f8d07b703910bd8d6785c26de31694c287f35a95dfd2b340058814c8c6 +size 208 diff --git a/assets/minecraft/textures/trims/entity/humanoid/tide.png b/assets/minecraft/textures/trims/entity/humanoid/tide.png index 83a1fc1b..d66da27a 100644 --- a/assets/minecraft/textures/trims/entity/humanoid/tide.png +++ b/assets/minecraft/textures/trims/entity/humanoid/tide.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eb6702320213e9ef077c0a10ba958a689e7ec6f7675fd2e0f9186ad658516203 -size 226 +oid sha256:94b84e8cdf436d7a5d2b9b05eddec580a44bf4f33ab0fd1e9109acb4ad167400 +size 196 diff --git a/assets/minecraft/textures/trims/entity/humanoid/vex.png b/assets/minecraft/textures/trims/entity/humanoid/vex.png index 12900c79..2cd3ce7a 100644 --- a/assets/minecraft/textures/trims/entity/humanoid/vex.png +++ b/assets/minecraft/textures/trims/entity/humanoid/vex.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:01864e050819e1f861030cc1c62391b6ba477cc2809edb604d6b546012564169 -size 217 +oid sha256:d5063b977fd6af54e946a4bce626bbea6a5bd4b83fb96ba9131a41fd799e8d99 +size 187 diff --git a/assets/minecraft/textures/trims/entity/humanoid/ward.png b/assets/minecraft/textures/trims/entity/humanoid/ward.png index 742a48fb..40329150 100644 --- a/assets/minecraft/textures/trims/entity/humanoid/ward.png +++ b/assets/minecraft/textures/trims/entity/humanoid/ward.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6667027cc37c9ec0b45b918d3c1bcdf1fea7f2b09b044473e07ca2d00629cc5b -size 231 +oid sha256:f2fcd9e42995d2a62b95857d46c79b6393e3d9d5f4ba703a4634c6771943c072 +size 204 diff --git a/assets/minecraft/textures/trims/entity/humanoid/wild.png b/assets/minecraft/textures/trims/entity/humanoid/wild.png index 789e2e43..6606c9a7 100644 --- a/assets/minecraft/textures/trims/entity/humanoid/wild.png +++ b/assets/minecraft/textures/trims/entity/humanoid/wild.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bdeb8c6013efed945a30d22df4c555ce1f2c658c6bee59bb67fd8131c2c63364 -size 213 +oid sha256:5327378fdc4d69eaa4a7e2ce1af11184488adabd4dbdce22aab5af47bdceb5c4 +size 207 diff --git a/assets/minecraft/textures/trims/entity/humanoid_leggings/bolt.png b/assets/minecraft/textures/trims/entity/humanoid_leggings/bolt.png index 5e9791c4..c0c078ad 100644 --- a/assets/minecraft/textures/trims/entity/humanoid_leggings/bolt.png +++ b/assets/minecraft/textures/trims/entity/humanoid_leggings/bolt.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4597aca661bc21b87497815c2f274e922a7a18eaf235904c24a4b995d63f90df -size 187 +oid sha256:81136821f0f7f42a608026d632930e34ded4479f74183152c21ebd60538683a6 +size 166 diff --git a/assets/minecraft/textures/trims/entity/humanoid_leggings/coast.png b/assets/minecraft/textures/trims/entity/humanoid_leggings/coast.png index 69050f48..3e39c3f6 100644 --- a/assets/minecraft/textures/trims/entity/humanoid_leggings/coast.png +++ b/assets/minecraft/textures/trims/entity/humanoid_leggings/coast.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0aaaf216f7b7d98e5b9615178faa3c157b23c30fb7dc3b7a4b080c88a91ee1b9 -size 148 +oid sha256:54dc0cc7f05711badfc1cda80e52513eee9ccd731d394a04a21d73074c758c2e +size 134 diff --git a/assets/minecraft/textures/trims/entity/humanoid_leggings/dune.png b/assets/minecraft/textures/trims/entity/humanoid_leggings/dune.png index 1ef4b64e..48b3594e 100644 --- a/assets/minecraft/textures/trims/entity/humanoid_leggings/dune.png +++ b/assets/minecraft/textures/trims/entity/humanoid_leggings/dune.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a0b6cf64476669e543f64ae31fc71fd51a8843995a10384d9918aa1afaf3548c -size 144 +oid sha256:81bcc389af1914c4ace0ef7007f2efc3f32568ad80c21006ca7c0de178531a46 +size 142 diff --git a/assets/minecraft/textures/trims/entity/humanoid_leggings/eye.png b/assets/minecraft/textures/trims/entity/humanoid_leggings/eye.png index b44e2b1c..d0bd19b7 100644 --- a/assets/minecraft/textures/trims/entity/humanoid_leggings/eye.png +++ b/assets/minecraft/textures/trims/entity/humanoid_leggings/eye.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a4c0f19184d68c66bd8e76a14fae4744fc7705fbe07daf5f2a56026c21f83f89 -size 165 +oid sha256:fdba6856a4f9532d33925e431beeaea9083e4b01b1904da252dec2798534af53 +size 141 diff --git a/assets/minecraft/textures/trims/entity/humanoid_leggings/flow.png b/assets/minecraft/textures/trims/entity/humanoid_leggings/flow.png index 2d2c7f83..700756cd 100644 --- a/assets/minecraft/textures/trims/entity/humanoid_leggings/flow.png +++ b/assets/minecraft/textures/trims/entity/humanoid_leggings/flow.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:792b8dcec7205316162b49a2c3c40870906de5bc2b0b374afaf5dd76a1231a8b -size 147 +oid sha256:8bbb86fcf97ffe030334f369323506e7f9aab84e76e46519f1989367cca59807 +size 144 diff --git a/assets/minecraft/textures/trims/entity/humanoid_leggings/host.png b/assets/minecraft/textures/trims/entity/humanoid_leggings/host.png index 0d4169de..5ad95c87 100644 --- a/assets/minecraft/textures/trims/entity/humanoid_leggings/host.png +++ b/assets/minecraft/textures/trims/entity/humanoid_leggings/host.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d95294a8a2cc8d10c10d3dcdf799822c3e6a2b5c4458ea43550b4699c2e8aece -size 155 +oid sha256:c7bbf69a98d59995ce4f894e60b0b1239571fd08ca9e458fa0e50ce29bdb0ab1 +size 140 diff --git a/assets/minecraft/textures/trims/entity/humanoid_leggings/raiser.png b/assets/minecraft/textures/trims/entity/humanoid_leggings/raiser.png index 609ddda6..e4c3e8d5 100644 --- a/assets/minecraft/textures/trims/entity/humanoid_leggings/raiser.png +++ b/assets/minecraft/textures/trims/entity/humanoid_leggings/raiser.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d682e5eca93d7b2a747ac8d0f7339b78664325904b99d003d0dcad593113fcf -size 159 +oid sha256:87e96c1d67e756eb06c50f4e2746455953b00a053a64ff7b3a33e9dd5b15bf09 +size 138 diff --git a/assets/minecraft/textures/trims/entity/humanoid_leggings/rib.png b/assets/minecraft/textures/trims/entity/humanoid_leggings/rib.png index aaa7e845..6894e3d2 100644 --- a/assets/minecraft/textures/trims/entity/humanoid_leggings/rib.png +++ b/assets/minecraft/textures/trims/entity/humanoid_leggings/rib.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ac8203b1793758068116a48c60fc24a77e49c9b2da3ed97550cb2d2953a1b4aa -size 124 +oid sha256:51d5455485c50cbe770ab33f6d8f9776ab1de905a368a39654d38b5f4e9fcee7 +size 119 diff --git a/assets/minecraft/textures/trims/entity/humanoid_leggings/sentry.png b/assets/minecraft/textures/trims/entity/humanoid_leggings/sentry.png index 042cf4a6..170c9edf 100644 --- a/assets/minecraft/textures/trims/entity/humanoid_leggings/sentry.png +++ b/assets/minecraft/textures/trims/entity/humanoid_leggings/sentry.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d9ab58a6ab0b8760a784ae7f11384528e27682410b4650b36a5a7763015a74f7 -size 140 +oid sha256:94a14c7b60aebb9c0b8257cc4ebf84f0e00cd8da50011efcdf8fd1f3f752244c +size 126 diff --git a/assets/minecraft/textures/trims/entity/humanoid_leggings/shaper.png b/assets/minecraft/textures/trims/entity/humanoid_leggings/shaper.png index a0a25c14..869f4795 100644 --- a/assets/minecraft/textures/trims/entity/humanoid_leggings/shaper.png +++ b/assets/minecraft/textures/trims/entity/humanoid_leggings/shaper.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:176a756acd8e9cce09039600c7b2d1f602b33a05d3f3b8e0149c185001f104d5 -size 153 +oid sha256:58a76b9642b0603860f7031a354ed35b6ba968fa1e584b37af7ad3115151fcf2 +size 130 diff --git a/assets/minecraft/textures/trims/entity/humanoid_leggings/silence.png b/assets/minecraft/textures/trims/entity/humanoid_leggings/silence.png index 297be0bd..7cc52af5 100644 --- a/assets/minecraft/textures/trims/entity/humanoid_leggings/silence.png +++ b/assets/minecraft/textures/trims/entity/humanoid_leggings/silence.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a6ddb38dedf7d4383895eac7e56ced9045160c657b7ffb33d6c403282b09a1f2 -size 249 +oid sha256:fb1535b0389581e98609a8a5b395e3018ee94b564dd9589e59e09a8381b69525 +size 243 diff --git a/assets/minecraft/textures/trims/entity/humanoid_leggings/snout.png b/assets/minecraft/textures/trims/entity/humanoid_leggings/snout.png index 7aa7150d..6bed551e 100644 --- a/assets/minecraft/textures/trims/entity/humanoid_leggings/snout.png +++ b/assets/minecraft/textures/trims/entity/humanoid_leggings/snout.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e2dfde8e8f836ed4d3e92c731024dd4d3636e6191dc7007a4db82e516f7800f -size 148 +oid sha256:3cfb6f08b7e7086632db15c78bda8c5d7b5479f2e50b9dd64e79d73929b09662 +size 133 diff --git a/assets/minecraft/textures/trims/entity/humanoid_leggings/spire.png b/assets/minecraft/textures/trims/entity/humanoid_leggings/spire.png index c684078b..8a8dff8f 100644 --- a/assets/minecraft/textures/trims/entity/humanoid_leggings/spire.png +++ b/assets/minecraft/textures/trims/entity/humanoid_leggings/spire.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cf63917b724473b14754ba20809a1410cf8dbdca3c46ed3d5a81b950fce81a91 -size 166 +oid sha256:455ba765dd014ca1d411d145c18c09c3f055c5361bfca0d2dd2de60afe57287a +size 139 diff --git a/assets/minecraft/textures/trims/entity/humanoid_leggings/tide.png b/assets/minecraft/textures/trims/entity/humanoid_leggings/tide.png index 8ca67447..5219c41b 100644 --- a/assets/minecraft/textures/trims/entity/humanoid_leggings/tide.png +++ b/assets/minecraft/textures/trims/entity/humanoid_leggings/tide.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4bfbe9f118907ad356dd8b83246e64b7332cd8d3cc87be3753dfae46aa3bf572 -size 179 +oid sha256:ef45119b3159a440e0d71d7dc4dda59e71523f4122eb089dbec2cec6c51980ac +size 149 diff --git a/assets/minecraft/textures/trims/entity/humanoid_leggings/vex.png b/assets/minecraft/textures/trims/entity/humanoid_leggings/vex.png index 45d49593..c17a7929 100644 --- a/assets/minecraft/textures/trims/entity/humanoid_leggings/vex.png +++ b/assets/minecraft/textures/trims/entity/humanoid_leggings/vex.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:82df8e7b4ab40a8a498988b48cfed4798a6c6d85e9de603cc304acfd725120f6 -size 131 +oid sha256:e82001ad94ce45ed63df238153260950adb35bf451cf1739b1c4ada834a17093 +size 120 diff --git a/assets/minecraft/textures/trims/entity/humanoid_leggings/ward.png b/assets/minecraft/textures/trims/entity/humanoid_leggings/ward.png index db4219cc..c08aa7f0 100644 --- a/assets/minecraft/textures/trims/entity/humanoid_leggings/ward.png +++ b/assets/minecraft/textures/trims/entity/humanoid_leggings/ward.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d18172b7e82dad9690a457e4b7103f2e206a434fa03156b6e7ec19c0e1c1118d -size 171 +oid sha256:1387199f3f810491253841f905cb81140a7d2a7fbff49a02442ae2dd5a130356 +size 150 diff --git a/assets/minecraft/textures/trims/entity/humanoid_leggings/wayfinder.png b/assets/minecraft/textures/trims/entity/humanoid_leggings/wayfinder.png index 9429eb49..adb34004 100644 --- a/assets/minecraft/textures/trims/entity/humanoid_leggings/wayfinder.png +++ b/assets/minecraft/textures/trims/entity/humanoid_leggings/wayfinder.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eced414b6522e706cb3ad01b0ea430b3bb2e866aa487c134577e5a38327d8e25 -size 174 +oid sha256:81b92e33a3bcdbe91344be8c63790847ee19e329c2135245a1f15b548cda41dc +size 148 diff --git a/assets/minecraft/textures/trims/entity/humanoid_leggings/wild.png b/assets/minecraft/textures/trims/entity/humanoid_leggings/wild.png index 81e60716..7c788cb5 100644 --- a/assets/minecraft/textures/trims/entity/humanoid_leggings/wild.png +++ b/assets/minecraft/textures/trims/entity/humanoid_leggings/wild.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:71a714f737f4101da7710743585cbf86dbea4995f5acc252554a0384cf833888 -size 155 +oid sha256:a6f2773c1ac999df0d1cb59fac0782a30d83293ad42d5ffea3d8c663fb14882c +size 137 diff --git a/assets/minecraft/textures/trims/items/boots_trim.png b/assets/minecraft/textures/trims/items/boots_trim.png index 2b3ec4d4..4510939f 100644 --- a/assets/minecraft/textures/trims/items/boots_trim.png +++ b/assets/minecraft/textures/trims/items/boots_trim.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dbd4412ccef75b1198f89673f91af91e1f38553153e605a069872d517a61f7f5 -size 112 +oid sha256:fc885b50bb668dffdc2740e728a2ce54cf4b612d4f667ca78cbcddff2383b551 +size 98 diff --git a/assets/minecraft/textures/trims/items/chestplate_trim.png b/assets/minecraft/textures/trims/items/chestplate_trim.png index b5c07cb4..4125e5ca 100644 --- a/assets/minecraft/textures/trims/items/chestplate_trim.png +++ b/assets/minecraft/textures/trims/items/chestplate_trim.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3fe7af89fdab35cd44462ab45c67ee8ae141a0ac7a8163a8d126c7d04e11fad9 -size 144 +oid sha256:541e132cbc58e17abc81ca69285abd2787fce37b76072159d65a74b36487d7f1 +size 115 diff --git a/assets/minecraft/textures/trims/items/helmet_trim.png b/assets/minecraft/textures/trims/items/helmet_trim.png index 75adc85b..f064577b 100644 --- a/assets/minecraft/textures/trims/items/helmet_trim.png +++ b/assets/minecraft/textures/trims/items/helmet_trim.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:39298bbd23e049bd4e637e2954d4ffd85548e4ef7f0adf2b6ee71aa802d8a287 -size 105 +oid sha256:23479723453c6893b41c6a372e8418a78041517ce60965feae834b3a6c288caa +size 98 diff --git a/assets/minecraft/textures/trims/items/leggings_trim.png b/assets/minecraft/textures/trims/items/leggings_trim.png index e9ab833b..06805c47 100644 --- a/assets/minecraft/textures/trims/items/leggings_trim.png +++ b/assets/minecraft/textures/trims/items/leggings_trim.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9e90ef9e3f03d550dc5ea1e2f969489df463ce4e6967da808921393951bfb062 -size 100 +oid sha256:ed825e740e78001376ec6c991383c63432169ba55017dc330d63875608ca9ff4 +size 90 diff --git a/assets/minecraft/waypoint_style/bowtie.json b/assets/minecraft/waypoint_style/bowtie.json new file mode 100644 index 00000000..6d861c20 --- /dev/null +++ b/assets/minecraft/waypoint_style/bowtie.json @@ -0,0 +1,10 @@ +{ + "near_distance": 64, + "sprites": [ + "minecraft:bowtie", + "minecraft:default_0", + "minecraft:default_1", + "minecraft:default_2", + "minecraft:default_3" + ] +} \ No newline at end of file diff --git a/assets/minecraft/waypoint_style/default.json b/assets/minecraft/waypoint_style/default.json new file mode 100644 index 00000000..519a6a6a --- /dev/null +++ b/assets/minecraft/waypoint_style/default.json @@ -0,0 +1,8 @@ +{ + "sprites": [ + "minecraft:default_0", + "minecraft:default_1", + "minecraft:default_2", + "minecraft:default_3" + ] +} \ No newline at end of file diff --git a/com/mojang/blaze3d/TracyFrameCapture.java b/com/mojang/blaze3d/TracyFrameCapture.java index a230141e..f8bd7083 100644 --- a/com/mojang/blaze3d/TracyFrameCapture.java +++ b/com/mojang/blaze3d/TracyFrameCapture.java @@ -1,13 +1,13 @@ package com.mojang.blaze3d; -import com.mojang.blaze3d.buffers.BufferType; -import com.mojang.blaze3d.buffers.BufferUsage; import com.mojang.blaze3d.buffers.GpuBuffer; import com.mojang.blaze3d.pipeline.RenderTarget; import com.mojang.blaze3d.systems.CommandEncoder; +import com.mojang.blaze3d.systems.GpuDevice; import com.mojang.blaze3d.systems.RenderPass; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.textures.GpuTexture; +import com.mojang.blaze3d.textures.GpuTextureView; import com.mojang.blaze3d.textures.TextureFormat; import com.mojang.blaze3d.vertex.VertexFormat; import com.mojang.jtracy.TracyClient; @@ -15,7 +15,6 @@ import java.util.OptionalInt; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.renderer.RenderPipelines; -import org.jetbrains.annotations.Nullable; @Environment(EnvType.CLIENT) public class TracyFrameCapture implements AutoCloseable { @@ -26,14 +25,22 @@ public class TracyFrameCapture implements AutoCloseable { private int targetHeight; private int width; private int height; - @Nullable private GpuTexture frameBuffer; - @Nullable + private GpuTextureView frameBufferView; private GpuBuffer pixelbuffer; private int lastCaptureDelay; private boolean capturedThisFrame; private TracyFrameCapture.Status status = TracyFrameCapture.Status.WAITING_FOR_CAPTURE; + public TracyFrameCapture() { + this.width = 320; + this.height = 180; + GpuDevice gpuDevice = RenderSystem.getDevice(); + this.frameBuffer = gpuDevice.createTexture("Tracy Frame Capture", 10, TextureFormat.RGBA8, this.width, this.height, 1, 1); + this.frameBufferView = gpuDevice.createTextureView(this.frameBuffer); + this.pixelbuffer = gpuDevice.createBuffer(() -> "Tracy Frame Capture buffer", 9, this.width * this.height * 4); + } + private void resize(int width, int height) { float f = (float)width / height; if (width > 320) { @@ -51,26 +58,18 @@ public class TracyFrameCapture implements AutoCloseable { if (this.width != width || this.height != height) { this.width = width; this.height = height; - if (this.frameBuffer != null) { - this.frameBuffer.close(); - } - - this.frameBuffer = RenderSystem.getDevice().createTexture("Tracy Frame Capture", TextureFormat.RGBA8, width, height, 1); - if (this.pixelbuffer != null) { - this.pixelbuffer.close(); - } - - this.pixelbuffer = RenderSystem.getDevice() - .createBuffer(() -> "Tracy Frame Capture buffer", BufferType.PIXEL_PACK, BufferUsage.STREAM_READ, width * height * 4); + GpuDevice gpuDevice = RenderSystem.getDevice(); + this.frameBuffer.close(); + this.frameBuffer = gpuDevice.createTexture("Tracy Frame Capture", 10, TextureFormat.RGBA8, width, height, 1, 1); + this.frameBufferView.close(); + this.frameBufferView = gpuDevice.createTextureView(this.frameBuffer); + this.pixelbuffer.close(); + this.pixelbuffer = gpuDevice.createBuffer(() -> "Tracy Frame Capture buffer", 9, width * height * 4); } } public void capture(RenderTarget renderTarget) { - if (this.status == TracyFrameCapture.Status.WAITING_FOR_CAPTURE - && !this.capturedThisFrame - && renderTarget.getColorTexture() != null - && this.pixelbuffer != null - && this.frameBuffer != null) { + if (this.status == TracyFrameCapture.Status.WAITING_FOR_CAPTURE && !this.capturedThisFrame && renderTarget.getColorTexture() != null) { this.capturedThisFrame = true; if (renderTarget.width != this.targetWidth || renderTarget.height != this.targetHeight) { this.targetWidth = renderTarget.width; @@ -83,12 +82,12 @@ public class TracyFrameCapture implements AutoCloseable { RenderSystem.AutoStorageIndexBuffer autoStorageIndexBuffer = RenderSystem.getSequentialBuffer(VertexFormat.Mode.QUADS); GpuBuffer gpuBuffer = autoStorageIndexBuffer.getBuffer(6); - try (RenderPass renderPass = RenderSystem.getDevice().createCommandEncoder().createRenderPass(this.frameBuffer, OptionalInt.empty())) { + try (RenderPass renderPass = RenderSystem.getDevice().createCommandEncoder().createRenderPass(() -> "Tracy blit", this.frameBufferView, OptionalInt.empty())) { renderPass.setPipeline(RenderPipelines.TRACY_BLIT); renderPass.setVertexBuffer(0, RenderSystem.getQuadVertexBuffer()); renderPass.setIndexBuffer(gpuBuffer, autoStorageIndexBuffer.type()); - renderPass.bindSampler("InSampler", renderTarget.getColorTexture()); - renderPass.drawIndexed(0, 6); + renderPass.bindSampler("InSampler", renderTarget.getColorTextureView()); + renderPass.drawIndexed(0, 0, 6, 1); } commandEncoder.copyTextureToBuffer(this.frameBuffer, this.pixelbuffer, 0, () -> this.status = TracyFrameCapture.Status.WAITING_FOR_UPLOAD, 0); @@ -97,11 +96,11 @@ public class TracyFrameCapture implements AutoCloseable { } public void upload() { - if (this.status == TracyFrameCapture.Status.WAITING_FOR_UPLOAD && this.pixelbuffer != null) { + if (this.status == TracyFrameCapture.Status.WAITING_FOR_UPLOAD) { this.status = TracyFrameCapture.Status.WAITING_FOR_CAPTURE; - try (GpuBuffer.ReadView readView = RenderSystem.getDevice().createCommandEncoder().readBuffer(this.pixelbuffer)) { - TracyClient.frameImage(readView.data(), this.width, this.height, this.lastCaptureDelay, true); + try (GpuBuffer.MappedView mappedView = RenderSystem.getDevice().createCommandEncoder().mapBuffer(this.pixelbuffer, true, false)) { + TracyClient.frameImage(mappedView.data(), this.width, this.height, this.lastCaptureDelay, true); } } } @@ -113,13 +112,9 @@ public class TracyFrameCapture implements AutoCloseable { } public void close() { - if (this.frameBuffer != null) { - this.frameBuffer.close(); - } - - if (this.pixelbuffer != null) { - this.pixelbuffer.close(); - } + this.frameBuffer.close(); + this.frameBufferView.close(); + this.pixelbuffer.close(); } @Environment(EnvType.CLIENT) diff --git a/com/mojang/blaze3d/buffers/BufferType.java b/com/mojang/blaze3d/buffers/BufferType.java deleted file mode 100644 index 34539b9e..00000000 --- a/com/mojang/blaze3d/buffers/BufferType.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.mojang.blaze3d.buffers; - -import com.mojang.blaze3d.DontObfuscate; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; - -@Environment(EnvType.CLIENT) -@DontObfuscate -public enum BufferType { - VERTICES, - INDICES, - PIXEL_PACK, - COPY_READ, - COPY_WRITE, - PIXEL_UNPACK, - UNIFORM; -} diff --git a/com/mojang/blaze3d/buffers/BufferUsage.java b/com/mojang/blaze3d/buffers/BufferUsage.java deleted file mode 100644 index db4d1de6..00000000 --- a/com/mojang/blaze3d/buffers/BufferUsage.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.mojang.blaze3d.buffers; - -import com.mojang.blaze3d.DontObfuscate; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; - -@Environment(EnvType.CLIENT) -@DontObfuscate -public enum BufferUsage { - DYNAMIC_WRITE(false, true), - STATIC_WRITE(false, true), - STREAM_WRITE(false, true), - STATIC_READ(true, false), - DYNAMIC_READ(true, false), - STREAM_READ(true, false), - DYNAMIC_COPY(false, false), - STATIC_COPY(false, false), - STREAM_COPY(false, false); - - final boolean readable; - final boolean writable; - - private BufferUsage(final boolean bl, final boolean bl2) { - this.readable = bl; - this.writable = bl2; - } - - public boolean isReadable() { - return this.readable; - } - - public boolean isWritable() { - return this.writable; - } -} diff --git a/com/mojang/blaze3d/buffers/GpuBuffer.java b/com/mojang/blaze3d/buffers/GpuBuffer.java index ab22827a..fef1fc92 100644 --- a/com/mojang/blaze3d/buffers/GpuBuffer.java +++ b/com/mojang/blaze3d/buffers/GpuBuffer.java @@ -8,25 +8,28 @@ import net.fabricmc.api.Environment; @Environment(EnvType.CLIENT) @DontObfuscate public abstract class GpuBuffer implements AutoCloseable { - private final BufferType type; - private final BufferUsage usage; + public static final int USAGE_MAP_READ = 1; + public static final int USAGE_MAP_WRITE = 2; + public static final int USAGE_HINT_CLIENT_STORAGE = 4; + public static final int USAGE_COPY_DST = 8; + public static final int USAGE_COPY_SRC = 16; + public static final int USAGE_VERTEX = 32; + public static final int USAGE_INDEX = 64; + public static final int USAGE_UNIFORM = 128; + public static final int USAGE_UNIFORM_TEXEL_BUFFER = 256; + private final int usage; public int size; - public GpuBuffer(BufferType bufferType, BufferUsage bufferUsage, int i) { - this.type = bufferType; - this.size = i; - this.usage = bufferUsage; + public GpuBuffer(int i, int j) { + this.size = j; + this.usage = i; } public int size() { return this.size; } - public BufferType type() { - return this.type; - } - - public BufferUsage usage() { + public int usage() { return this.usage; } @@ -34,9 +37,21 @@ public abstract class GpuBuffer implements AutoCloseable { public abstract void close(); + public GpuBufferSlice slice(int i, int j) { + if (i >= 0 && j >= 0 && i + j <= this.size) { + return new GpuBufferSlice(this, i, j); + } else { + throw new IllegalArgumentException("Offset of " + i + " and length " + j + " would put new slice outside buffer's range (of 0," + j + ")"); + } + } + + public GpuBufferSlice slice() { + return new GpuBufferSlice(this, 0, this.size); + } + @Environment(EnvType.CLIENT) @DontObfuscate - public interface ReadView extends AutoCloseable { + public interface MappedView extends AutoCloseable { ByteBuffer data(); void close(); diff --git a/com/mojang/blaze3d/buffers/GpuBufferSlice.java b/com/mojang/blaze3d/buffers/GpuBufferSlice.java new file mode 100644 index 00000000..fe7106ce --- /dev/null +++ b/com/mojang/blaze3d/buffers/GpuBufferSlice.java @@ -0,0 +1,17 @@ +package com.mojang.blaze3d.buffers; + +import com.mojang.blaze3d.DontObfuscate; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; + +@Environment(EnvType.CLIENT) +@DontObfuscate +public record GpuBufferSlice(GpuBuffer buffer, int offset, int length) { + public GpuBufferSlice slice(int i, int j) { + if (i >= 0 && j >= 0 && i + j < this.length) { + return new GpuBufferSlice(this.buffer, this.offset + i, j); + } else { + throw new IllegalArgumentException("Offset of " + i + " and length " + j + " would put new slice outside existing slice's range (of " + i + "," + j + ")"); + } + } +} diff --git a/com/mojang/blaze3d/buffers/GpuFence.java b/com/mojang/blaze3d/buffers/GpuFence.java index 708688ba..ed4e0f11 100644 --- a/com/mojang/blaze3d/buffers/GpuFence.java +++ b/com/mojang/blaze3d/buffers/GpuFence.java @@ -1,34 +1,13 @@ package com.mojang.blaze3d.buffers; import com.mojang.blaze3d.DontObfuscate; -import com.mojang.blaze3d.opengl.GlStateManager; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @Environment(EnvType.CLIENT) @DontObfuscate -public class GpuFence implements AutoCloseable { - private long handle = GlStateManager._glFenceSync(37143, 0); +public interface GpuFence extends AutoCloseable { + void close(); - public void close() { - if (this.handle != 0L) { - GlStateManager._glDeleteSync(this.handle); - this.handle = 0L; - } - } - - public boolean awaitCompletion(long l) { - if (this.handle == 0L) { - return true; - } else { - int i = GlStateManager._glClientWaitSync(this.handle, 0, l); - if (i == 37147) { - return false; - } else if (i == 37149) { - throw new IllegalStateException("Failed to complete gpu fence"); - } else { - return true; - } - } - } + boolean awaitCompletion(long l); } diff --git a/com/mojang/blaze3d/buffers/Std140Builder.java b/com/mojang/blaze3d/buffers/Std140Builder.java new file mode 100644 index 00000000..8ece7e94 --- /dev/null +++ b/com/mojang/blaze3d/buffers/Std140Builder.java @@ -0,0 +1,156 @@ +package com.mojang.blaze3d.buffers; + +import com.mojang.blaze3d.DontObfuscate; +import java.nio.ByteBuffer; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.util.Mth; +import org.joml.Matrix4fc; +import org.joml.Vector2fc; +import org.joml.Vector2ic; +import org.joml.Vector3fc; +import org.joml.Vector3ic; +import org.joml.Vector4fc; +import org.joml.Vector4ic; +import org.lwjgl.system.MemoryStack; + +@Environment(EnvType.CLIENT) +@DontObfuscate +public class Std140Builder { + private final ByteBuffer buffer; + private final int start; + + private Std140Builder(ByteBuffer byteBuffer) { + this.buffer = byteBuffer; + this.start = byteBuffer.position(); + } + + public static Std140Builder intoBuffer(ByteBuffer byteBuffer) { + return new Std140Builder(byteBuffer); + } + + public static Std140Builder onStack(MemoryStack memoryStack, int i) { + return new Std140Builder(memoryStack.malloc(i)); + } + + public ByteBuffer get() { + return this.buffer.flip(); + } + + public Std140Builder align(int i) { + int j = this.buffer.position(); + this.buffer.position(this.start + Mth.roundToward(j - this.start, i)); + return this; + } + + public Std140Builder putFloat(float f) { + this.align(4); + this.buffer.putFloat(f); + return this; + } + + public Std140Builder putInt(int i) { + this.align(4); + this.buffer.putInt(i); + return this; + } + + public Std140Builder putVec2(float f, float g) { + this.align(8); + this.buffer.putFloat(f); + this.buffer.putFloat(g); + return this; + } + + public Std140Builder putVec2(Vector2fc vector2fc) { + this.align(8); + vector2fc.get(this.buffer); + this.buffer.position(this.buffer.position() + 8); + return this; + } + + public Std140Builder putIVec2(int i, int j) { + this.align(8); + this.buffer.putInt(i); + this.buffer.putInt(j); + return this; + } + + public Std140Builder putIVec2(Vector2ic vector2ic) { + this.align(8); + vector2ic.get(this.buffer); + this.buffer.position(this.buffer.position() + 8); + return this; + } + + public Std140Builder putVec3(float f, float g, float h) { + this.align(16); + this.buffer.putFloat(f); + this.buffer.putFloat(g); + this.buffer.putFloat(h); + this.buffer.position(this.buffer.position() + 4); + return this; + } + + public Std140Builder putVec3(Vector3fc vector3fc) { + this.align(16); + vector3fc.get(this.buffer); + this.buffer.position(this.buffer.position() + 16); + return this; + } + + public Std140Builder putIVec3(int i, int j, int k) { + this.align(16); + this.buffer.putInt(i); + this.buffer.putInt(j); + this.buffer.putInt(k); + this.buffer.position(this.buffer.position() + 4); + return this; + } + + public Std140Builder putIVec3(Vector3ic vector3ic) { + this.align(16); + vector3ic.get(this.buffer); + this.buffer.position(this.buffer.position() + 16); + return this; + } + + public Std140Builder putVec4(float f, float g, float h, float i) { + this.align(16); + this.buffer.putFloat(f); + this.buffer.putFloat(g); + this.buffer.putFloat(h); + this.buffer.putFloat(i); + return this; + } + + public Std140Builder putVec4(Vector4fc vector4fc) { + this.align(16); + vector4fc.get(this.buffer); + this.buffer.position(this.buffer.position() + 16); + return this; + } + + public Std140Builder putIVec4(int i, int j, int k, int l) { + this.align(16); + this.buffer.putInt(i); + this.buffer.putInt(j); + this.buffer.putInt(k); + this.buffer.putInt(l); + return this; + } + + public Std140Builder putIVec4(Vector4ic vector4ic) { + this.align(16); + vector4ic.get(this.buffer); + this.buffer.position(this.buffer.position() + 16); + return this; + } + + public Std140Builder putMat4f(Matrix4fc matrix4fc) { + this.align(16); + matrix4fc.get(this.buffer); + this.buffer.position(this.buffer.position() + 64); + return this; + } +} diff --git a/com/mojang/blaze3d/buffers/Std140SizeCalculator.java b/com/mojang/blaze3d/buffers/Std140SizeCalculator.java new file mode 100644 index 00000000..9dfd30c7 --- /dev/null +++ b/com/mojang/blaze3d/buffers/Std140SizeCalculator.java @@ -0,0 +1,75 @@ +package com.mojang.blaze3d.buffers; + +import com.mojang.blaze3d.DontObfuscate; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.util.Mth; + +@Environment(EnvType.CLIENT) +@DontObfuscate +public class Std140SizeCalculator { + private int size; + + public int get() { + return this.size; + } + + public Std140SizeCalculator align(int i) { + this.size = Mth.roundToward(this.size, i); + return this; + } + + public Std140SizeCalculator putFloat() { + this.align(4); + this.size += 4; + return this; + } + + public Std140SizeCalculator putInt() { + this.align(4); + this.size += 4; + return this; + } + + public Std140SizeCalculator putVec2() { + this.align(8); + this.size += 8; + return this; + } + + public Std140SizeCalculator putIVec2() { + this.align(8); + this.size += 8; + return this; + } + + public Std140SizeCalculator putVec3() { + this.align(16); + this.size += 16; + return this; + } + + public Std140SizeCalculator putIVec3() { + this.align(16); + this.size += 16; + return this; + } + + public Std140SizeCalculator putVec4() { + this.align(16); + this.size += 16; + return this; + } + + public Std140SizeCalculator putIVec4() { + this.align(16); + this.size += 16; + return this; + } + + public Std140SizeCalculator putMat4f() { + this.align(16); + this.size += 64; + return this; + } +} diff --git a/com/mojang/blaze3d/font/TrueTypeGlyphProvider.java b/com/mojang/blaze3d/font/TrueTypeGlyphProvider.java index 1d42c730..62709144 100644 --- a/com/mojang/blaze3d/font/TrueTypeGlyphProvider.java +++ b/com/mojang/blaze3d/font/TrueTypeGlyphProvider.java @@ -1,6 +1,8 @@ package com.mojang.blaze3d.font; -import com.mojang.blaze3d.font.TrueTypeGlyphProvider.Glyph.1; +import com.mojang.blaze3d.platform.NativeImage; +import com.mojang.blaze3d.systems.RenderSystem; +import com.mojang.blaze3d.textures.GpuTexture; import it.unimi.dsi.fastutil.ints.IntArraySet; import it.unimi.dsi.fastutil.ints.IntSet; import java.nio.ByteBuffer; @@ -159,7 +161,48 @@ public class TrueTypeGlyphProvider implements GlyphProvider { @Override public BakedGlyph bake(Function function) { - return (BakedGlyph)function.apply(new 1(this)); + return (BakedGlyph)function.apply(new SheetGlyphInfo() { + @Override + public int getPixelWidth() { + return Glyph.this.width; + } + + @Override + public int getPixelHeight() { + return Glyph.this.height; + } + + @Override + public float getOversample() { + return TrueTypeGlyphProvider.this.oversample; + } + + @Override + public float getBearingLeft() { + return Glyph.this.bearingX; + } + + @Override + public float getBearingTop() { + return Glyph.this.bearingY; + } + + @Override + public void upload(int x, int y, GpuTexture texture) { + FT_Face fT_Face = TrueTypeGlyphProvider.this.validateFontOpen(); + + try (NativeImage nativeImage = new NativeImage(NativeImage.Format.LUMINANCE, Glyph.this.width, Glyph.this.height, false)) { + if (nativeImage.copyFromFont(fT_Face, Glyph.this.index)) { + RenderSystem.getDevice().createCommandEncoder().writeToTexture(texture, nativeImage, 0, 0, x, y, Glyph.this.width, Glyph.this.height, 0, 0); + } + } + } + + @Override + public boolean isColored() { + return false; + } + }); } } diff --git a/com/mojang/blaze3d/framegraph/FrameGraphBuilder.java b/com/mojang/blaze3d/framegraph/FrameGraphBuilder.java index f2ef17f0..6df5f3c5 100644 --- a/com/mojang/blaze3d/framegraph/FrameGraphBuilder.java +++ b/com/mojang/blaze3d/framegraph/FrameGraphBuilder.java @@ -1,6 +1,5 @@ package com.mojang.blaze3d.framegraph; -import com.mojang.blaze3d.framegraph.FrameGraphBuilder.Inspector.1; import com.mojang.blaze3d.resource.GraphicsResourceAllocator; import com.mojang.blaze3d.resource.ResourceDescriptor; import com.mojang.blaze3d.resource.ResourceHandle; @@ -213,7 +212,7 @@ public class FrameGraphBuilder { @Environment(EnvType.CLIENT) public interface Inspector { - FrameGraphBuilder.Inspector NONE = new 1(); + FrameGraphBuilder.Inspector NONE = new FrameGraphBuilder.Inspector() {}; default void acquireResource(String name) { } diff --git a/com/mojang/blaze3d/opengl/AbstractUniform.java b/com/mojang/blaze3d/opengl/AbstractUniform.java deleted file mode 100644 index 2328e30c..00000000 --- a/com/mojang/blaze3d/opengl/AbstractUniform.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.mojang.blaze3d.opengl; - -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import org.joml.Matrix4f; -import org.joml.Vector3f; -import org.joml.Vector4f; - -@Environment(EnvType.CLIENT) -public class AbstractUniform { - public void set(float value) { - } - - public void set(float value1, float value2) { - } - - public void set(float value1, float value2, float value3) { - } - - public void set(float value1, float value2, float value3, float value4) { - } - - public void set(int value) { - } - - public void set(int value1, int value2) { - } - - public void set(int value1, int value2, int value3) { - } - - public void set(int value1, int value2, int value3, int value4) { - } - - public void set(float[] values) { - } - - public void set(int[] values) { - } - - public void set(Vector3f values) { - } - - public void set(Vector4f values) { - } - - public void set(Matrix4f values) { - } -} diff --git a/com/mojang/blaze3d/opengl/BufferStorage.java b/com/mojang/blaze3d/opengl/BufferStorage.java new file mode 100644 index 00000000..b9dc9fc3 --- /dev/null +++ b/com/mojang/blaze3d/opengl/BufferStorage.java @@ -0,0 +1,115 @@ +package com.mojang.blaze3d.opengl; + +import java.nio.ByteBuffer; +import java.util.Set; +import java.util.function.Supplier; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import org.jetbrains.annotations.Nullable; +import org.lwjgl.opengl.GLCapabilities; +import org.lwjgl.system.MemoryUtil; + +@Environment(EnvType.CLIENT) +public abstract class BufferStorage { + public static BufferStorage create(GLCapabilities capabilities, Set enabledExtensions) { + if (capabilities.GL_ARB_buffer_storage && GlDevice.USE_GL_ARB_buffer_storage) { + enabledExtensions.add("GL_ARB_buffer_storage"); + return new BufferStorage.Immutable(); + } else { + return new BufferStorage.Mutable(); + } + } + + public abstract GlBuffer createBuffer(DirectStateAccess directStateAccess, @Nullable Supplier label, int usage, int size); + + public abstract GlBuffer createBuffer(DirectStateAccess directStateAccess, @Nullable Supplier label, int usage, ByteBuffer data); + + public abstract GlBuffer.GlMappedView mapBuffer(DirectStateAccess directStateAccess, GlBuffer buffer, int offset, int size, int usage); + + @Environment(EnvType.CLIENT) + static class Immutable extends BufferStorage { + @Override + public GlBuffer createBuffer(DirectStateAccess directStateAccess, @Nullable Supplier label, int usage, int size) { + int i = directStateAccess.createBuffer(); + directStateAccess.bufferStorage(i, size, GlConst.bufferUsageToGlFlag(usage)); + ByteBuffer byteBuffer = this.tryMapBufferPersistent(directStateAccess, usage, i, size); + return new GlBuffer(label, directStateAccess, usage, size, i, byteBuffer); + } + + @Override + public GlBuffer createBuffer(DirectStateAccess directStateAccess, @Nullable Supplier label, int usage, ByteBuffer data) { + int i = directStateAccess.createBuffer(); + int j = data.remaining(); + directStateAccess.bufferStorage(i, data, GlConst.bufferUsageToGlFlag(usage)); + ByteBuffer byteBuffer = this.tryMapBufferPersistent(directStateAccess, usage, i, j); + return new GlBuffer(label, directStateAccess, usage, j, i, byteBuffer); + } + + @Nullable + private ByteBuffer tryMapBufferPersistent(DirectStateAccess directStateAccess, int usage, int handle, int size) { + int i = 0; + if ((usage & 1) != 0) { + i |= 1; + } + + if ((usage & 2) != 0) { + i |= 18; + } + + ByteBuffer byteBuffer; + if (i != 0) { + GlStateManager.clearGlErrors(); + byteBuffer = directStateAccess.mapBufferRange(handle, 0, size, i | 64); + if (byteBuffer == null) { + throw new IllegalStateException("Can't persistently map buffer, opengl error " + GlStateManager._getError()); + } + } else { + byteBuffer = null; + } + + return byteBuffer; + } + + @Override + public GlBuffer.GlMappedView mapBuffer(DirectStateAccess directStateAccess, GlBuffer buffer, int offset, int size, int usage) { + if (buffer.persistentBuffer == null) { + throw new IllegalStateException("Somehow trying to map an unmappable buffer"); + } else { + return new GlBuffer.GlMappedView(() -> { + if ((usage & 2) != 0) { + directStateAccess.flushMappedBufferRange(buffer.handle, offset, size); + } + }, buffer, MemoryUtil.memSlice(buffer.persistentBuffer, offset, size)); + } + } + } + + @Environment(EnvType.CLIENT) + static class Mutable extends BufferStorage { + @Override + public GlBuffer createBuffer(DirectStateAccess directStateAccess, @Nullable Supplier label, int usage, int size) { + int i = directStateAccess.createBuffer(); + directStateAccess.bufferData(i, size, GlConst.bufferUsageToGlEnum(usage)); + return new GlBuffer(label, directStateAccess, usage, size, i, null); + } + + @Override + public GlBuffer createBuffer(DirectStateAccess directStateAccess, @Nullable Supplier label, int usage, ByteBuffer data) { + int i = directStateAccess.createBuffer(); + int j = data.remaining(); + directStateAccess.bufferData(i, data, GlConst.bufferUsageToGlEnum(usage)); + return new GlBuffer(label, directStateAccess, usage, j, i, null); + } + + @Override + public GlBuffer.GlMappedView mapBuffer(DirectStateAccess directStateAccess, GlBuffer buffer, int offset, int size, int usage) { + GlStateManager.clearGlErrors(); + ByteBuffer byteBuffer = directStateAccess.mapBufferRange(buffer.handle, offset, size, usage); + if (byteBuffer == null) { + throw new IllegalStateException("Can't map buffer, opengl error " + GlStateManager._getError()); + } else { + return new GlBuffer.GlMappedView(() -> directStateAccess.unmapBuffer(buffer.handle), buffer, byteBuffer); + } + } + } +} diff --git a/com/mojang/blaze3d/opengl/DirectStateAccess.java b/com/mojang/blaze3d/opengl/DirectStateAccess.java index a9982e63..845b8bb0 100644 --- a/com/mojang/blaze3d/opengl/DirectStateAccess.java +++ b/com/mojang/blaze3d/opengl/DirectStateAccess.java @@ -1,9 +1,13 @@ package com.mojang.blaze3d.opengl; +import java.nio.ByteBuffer; import java.util.Set; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; +import org.jetbrains.annotations.Nullable; +import org.lwjgl.opengl.ARBBufferStorage; import org.lwjgl.opengl.ARBDirectStateAccess; +import org.lwjgl.opengl.GL30; import org.lwjgl.opengl.GLCapabilities; @Environment(EnvType.CLIENT) @@ -17,6 +21,23 @@ public abstract class DirectStateAccess { } } + abstract int createBuffer(); + + abstract void bufferData(int buffer, long size, int usage); + + abstract void bufferData(int buffer, ByteBuffer data, int usage); + + abstract void bufferSubData(int buffer, int offset, ByteBuffer data); + + abstract void bufferStorage(int buffer, long size, int usage); + + abstract void bufferStorage(int buffer, ByteBuffer data, int usage); + + @Nullable + abstract ByteBuffer mapBufferRange(int buffer, int offset, int length, int access); + + abstract void unmapBuffer(int buffer); + abstract int createFrameBufferObject(); abstract void bindFrameBufferTextures(int frameBuffer, int colorTexture, int depthTexture, int level, int target); @@ -25,8 +46,51 @@ public abstract class DirectStateAccess { int readFrameBuffer, int drawFrameBuffer, int srcX0, int srcY0, int srcX1, int srcY1, int destX0, int destY0, int destX1, int destY1, int mask, int filter ); + abstract void flushMappedBufferRange(int buffer, int offset, int length); + @Environment(EnvType.CLIENT) static class Core extends DirectStateAccess { + @Override + int createBuffer() { + return ARBDirectStateAccess.glCreateBuffers(); + } + + @Override + void bufferData(int buffer, long size, int usage) { + ARBDirectStateAccess.glNamedBufferData(buffer, size, usage); + } + + @Override + void bufferData(int buffer, ByteBuffer data, int usage) { + ARBDirectStateAccess.glNamedBufferData(buffer, data, usage); + } + + @Override + void bufferSubData(int buffer, int offset, ByteBuffer data) { + ARBDirectStateAccess.glNamedBufferSubData(buffer, (long)offset, data); + } + + @Override + void bufferStorage(int buffer, long size, int usage) { + ARBDirectStateAccess.glNamedBufferStorage(buffer, size, usage); + } + + @Override + void bufferStorage(int buffer, ByteBuffer data, int usage) { + ARBDirectStateAccess.glNamedBufferStorage(buffer, data, usage); + } + + @Nullable + @Override + ByteBuffer mapBufferRange(int buffer, int offset, int length, int access) { + return ARBDirectStateAccess.glMapNamedBufferRange(buffer, offset, length, access); + } + + @Override + void unmapBuffer(int buffer) { + ARBDirectStateAccess.glUnmapNamedBuffer(buffer); + } + @Override public int createFrameBufferObject() { return ARBDirectStateAccess.glCreateFramebuffers(); @@ -47,10 +111,78 @@ public abstract class DirectStateAccess { ) { ARBDirectStateAccess.glBlitNamedFramebuffer(readFrameBuffer, drawFrameBuffer, srcX0, srcY0, srcX1, srcY1, destX0, destY0, destX1, destY1, mask, filter); } + + @Override + void flushMappedBufferRange(int buffer, int offset, int length) { + ARBDirectStateAccess.glFlushMappedNamedBufferRange(buffer, offset, length); + } } @Environment(EnvType.CLIENT) static class Emulated extends DirectStateAccess { + @Override + int createBuffer() { + return GlStateManager._glGenBuffers(); + } + + @Override + void bufferData(int buffer, long size, int usage) { + GlStateManager._glBindBuffer(36663, buffer); + GlStateManager._glBufferData(36663, size, GlConst.bufferUsageToGlEnum(usage)); + GlStateManager._glBindBuffer(36663, 0); + } + + @Override + void bufferData(int buffer, ByteBuffer data, int usage) { + GlStateManager._glBindBuffer(36663, buffer); + GlStateManager._glBufferData(36663, data, GlConst.bufferUsageToGlEnum(usage)); + GlStateManager._glBindBuffer(36663, 0); + } + + @Override + void bufferSubData(int buffer, int offset, ByteBuffer data) { + GlStateManager._glBindBuffer(36663, buffer); + GlStateManager._glBufferSubData(36663, offset, data); + GlStateManager._glBindBuffer(36663, 0); + } + + @Override + void bufferStorage(int buffer, long size, int usage) { + GlStateManager._glBindBuffer(36663, buffer); + ARBBufferStorage.glBufferStorage(36663, size, usage); + GlStateManager._glBindBuffer(36663, 0); + } + + @Override + void bufferStorage(int buffer, ByteBuffer data, int usage) { + GlStateManager._glBindBuffer(36663, buffer); + ARBBufferStorage.glBufferStorage(36663, data, usage); + GlStateManager._glBindBuffer(36663, 0); + } + + @Nullable + @Override + ByteBuffer mapBufferRange(int buffer, int offset, int length, int access) { + GlStateManager._glBindBuffer(36663, buffer); + ByteBuffer byteBuffer = GlStateManager._glMapBufferRange(36663, offset, length, access); + GlStateManager._glBindBuffer(36663, 0); + return byteBuffer; + } + + @Override + void unmapBuffer(int buffer) { + GlStateManager._glBindBuffer(36663, buffer); + GlStateManager._glUnmapBuffer(36663); + GlStateManager._glBindBuffer(36663, 0); + } + + @Override + void flushMappedBufferRange(int buffer, int offset, int length) { + GlStateManager._glBindBuffer(36663, buffer); + GL30.glFlushMappedBufferRange(36663, offset, length); + GlStateManager._glBindBuffer(36663, 0); + } + @Override public int createFrameBufferObject() { return GlStateManager.glGenFramebuffers(); diff --git a/com/mojang/blaze3d/opengl/GlBuffer.java b/com/mojang/blaze3d/opengl/GlBuffer.java index 9eb4c848..4f8e6d60 100644 --- a/com/mojang/blaze3d/opengl/GlBuffer.java +++ b/com/mojang/blaze3d/opengl/GlBuffer.java @@ -1,7 +1,5 @@ package com.mojang.blaze3d.opengl; -import com.mojang.blaze3d.buffers.BufferType; -import com.mojang.blaze3d.buffers.BufferUsage; import com.mojang.blaze3d.buffers.GpuBuffer; import com.mojang.jtracy.MemoryPool; import com.mojang.jtracy.TracyClient; @@ -15,29 +13,20 @@ import org.jetbrains.annotations.Nullable; public class GlBuffer extends GpuBuffer { protected static final MemoryPool MEMORY_POOl = TracyClient.createMemoryPool("GPU Buffers"); protected boolean closed; - protected boolean initialized = false; @Nullable protected final Supplier label; + private final DirectStateAccess dsa; protected final int handle; + @Nullable + protected ByteBuffer persistentBuffer; - protected GlBuffer(GlDebugLabel debugLabel, @Nullable Supplier label, BufferType type, BufferUsage usage, int size, int handle) { - super(type, usage, size); + protected GlBuffer(@Nullable Supplier label, DirectStateAccess dsa, int usage, int size, int handle, @Nullable ByteBuffer persistentBuffer) { + super(usage, size); this.label = label; + this.dsa = dsa; this.handle = handle; - if (usage.isReadable()) { - GlStateManager._glBindBuffer(GlConst.toGl(type), handle); - GlStateManager._glBufferData(GlConst.toGl(type), size, GlConst.toGl(usage)); - MEMORY_POOl.malloc(handle, size); - this.initialized = true; - debugLabel.applyLabel(this); - } - } - - protected void ensureBufferExists() { - if (!this.initialized) { - GlStateManager._glBindBuffer(GlConst.toGl(this.type()), this.handle); - GlStateManager._glBindBuffer(GlConst.toGl(this.type()), 0); - } + this.persistentBuffer = persistentBuffer; + MEMORY_POOl.malloc(handle, size); } @Override @@ -49,20 +38,26 @@ public class GlBuffer extends GpuBuffer { public void close() { if (!this.closed) { this.closed = true; - GlStateManager._glDeleteBuffers(this.handle); - if (this.initialized) { - MEMORY_POOl.free(this.handle); + if (this.persistentBuffer != null) { + this.dsa.unmapBuffer(this.handle); + this.persistentBuffer = null; } + + GlStateManager._glDeleteBuffers(this.handle); + MEMORY_POOl.free(this.handle); } } @Environment(EnvType.CLIENT) - public static class ReadView implements GpuBuffer.ReadView { - private final int target; + public static class GlMappedView implements GpuBuffer.MappedView { + private final Runnable unmap; + private final GlBuffer buffer; private final ByteBuffer data; + private boolean closed; - protected ReadView(int target, ByteBuffer data) { - this.target = target; + protected GlMappedView(Runnable unmap, GlBuffer buffer, ByteBuffer data) { + this.unmap = unmap; + this.buffer = buffer; this.data = data; } @@ -73,7 +68,10 @@ public class GlBuffer extends GpuBuffer { @Override public void close() { - GlStateManager._glUnmapBuffer(this.target); + if (!this.closed) { + this.closed = true; + this.unmap.run(); + } } } } diff --git a/com/mojang/blaze3d/opengl/GlCommandEncoder.java b/com/mojang/blaze3d/opengl/GlCommandEncoder.java index e8c1ccd5..7ab66786 100644 --- a/com/mojang/blaze3d/opengl/GlCommandEncoder.java +++ b/com/mojang/blaze3d/opengl/GlCommandEncoder.java @@ -1,31 +1,38 @@ package com.mojang.blaze3d.opengl; -import com.mojang.blaze3d.buffers.BufferType; import com.mojang.blaze3d.buffers.GpuBuffer; +import com.mojang.blaze3d.buffers.GpuBufferSlice; +import com.mojang.blaze3d.buffers.GpuFence; import com.mojang.blaze3d.pipeline.BlendFunction; import com.mojang.blaze3d.pipeline.RenderPipeline; import com.mojang.blaze3d.platform.DepthTestFunction; import com.mojang.blaze3d.platform.NativeImage; -import com.mojang.blaze3d.platform.Window; +import com.mojang.blaze3d.shaders.UniformType; import com.mojang.blaze3d.systems.CommandEncoder; import com.mojang.blaze3d.systems.RenderPass; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.textures.GpuTexture; +import com.mojang.blaze3d.textures.GpuTextureView; +import com.mojang.blaze3d.textures.TextureFormat; import com.mojang.blaze3d.vertex.VertexFormat; import com.mojang.logging.LogUtils; -import it.unimi.dsi.fastutil.ints.IntList; import java.nio.ByteBuffer; import java.nio.IntBuffer; import java.util.Collection; +import java.util.Collections; import java.util.OptionalDouble; import java.util.OptionalInt; -import java.util.function.Consumer; +import java.util.Map.Entry; +import java.util.function.BiConsumer; +import java.util.function.Supplier; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.minecraft.client.Minecraft; import net.minecraft.util.ARGB; import org.jetbrains.annotations.Nullable; import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL11C; +import org.lwjgl.opengl.GL31; +import org.lwjgl.opengl.GL32; import org.slf4j.Logger; @Environment(EnvType.CLIENT) @@ -47,26 +54,45 @@ public class GlCommandEncoder implements CommandEncoder { } @Override - public RenderPass createRenderPass(GpuTexture gpuTexture, OptionalInt optionalInt) { - return this.createRenderPass(gpuTexture, optionalInt, null, OptionalDouble.empty()); + public RenderPass createRenderPass(Supplier supplier, GpuTextureView gpuTextureView, OptionalInt optionalInt) { + return this.createRenderPass(supplier, gpuTextureView, optionalInt, null, OptionalDouble.empty()); } @Override - public RenderPass createRenderPass(GpuTexture gpuTexture, OptionalInt optionalInt, @Nullable GpuTexture gpuTexture2, OptionalDouble optionalDouble) { + public RenderPass createRenderPass( + Supplier supplier, GpuTextureView gpuTextureView, OptionalInt optionalInt, @Nullable GpuTextureView gpuTextureView2, OptionalDouble optionalDouble + ) { if (this.inRenderPass) { throw new IllegalStateException("Close the existing render pass before creating a new one!"); } else { - if (optionalDouble.isPresent() && gpuTexture2 == null) { + if (optionalDouble.isPresent() && gpuTextureView2 == null) { LOGGER.warn("Depth clear value was provided but no depth texture is being used"); } - if (gpuTexture.isClosed()) { + if (gpuTextureView.isClosed()) { throw new IllegalStateException("Color texture is closed"); - } else if (gpuTexture2 != null && gpuTexture2.isClosed()) { - throw new IllegalStateException("Depth texture is closed"); + } else if ((gpuTextureView.texture().usage() & 8) == 0) { + throw new IllegalStateException("Color texture must have USAGE_RENDER_ATTACHMENT"); + } else if (gpuTextureView.texture().getDepthOrLayers() > 1) { + throw new UnsupportedOperationException("Textures with multiple depths or layers are not yet supported as an attachment"); } else { + if (gpuTextureView2 != null) { + if (gpuTextureView2.isClosed()) { + throw new IllegalStateException("Depth texture is closed"); + } + + if ((gpuTextureView2.texture().usage() & 8) == 0) { + throw new IllegalStateException("Depth texture must have USAGE_RENDER_ATTACHMENT"); + } + + if (gpuTextureView2.texture().getDepthOrLayers() > 1) { + throw new UnsupportedOperationException("Textures with multiple depths or layers are not yet supported as an attachment"); + } + } + this.inRenderPass = true; - int i = ((GlTexture)gpuTexture).getFbo(this.device.directStateAccess(), gpuTexture2); + this.device.debugLabels().pushDebugGroup(supplier); + int i = ((GlTexture)gpuTextureView.texture()).getFbo(this.device.directStateAccess(), gpuTextureView2 == null ? null : gpuTextureView2.texture()); GlStateManager._glBindFramebuffer(36160, i); int j = 0; if (optionalInt.isPresent()) { @@ -75,7 +101,7 @@ public class GlCommandEncoder implements CommandEncoder { j |= 16384; } - if (gpuTexture2 != null && optionalDouble.isPresent()) { + if (gpuTextureView2 != null && optionalDouble.isPresent()) { GL11.glClearDepth(optionalDouble.getAsDouble()); j |= 256; } @@ -87,9 +113,9 @@ public class GlCommandEncoder implements CommandEncoder { GlStateManager._clear(j); } - GlStateManager._viewport(0, 0, gpuTexture.getWidth(0), gpuTexture.getHeight(0)); + GlStateManager._viewport(0, 0, gpuTextureView.getWidth(0), gpuTextureView.getHeight(0)); this.lastPipeline = null; - return new GlRenderPass(this, gpuTexture2 != null); + return new GlRenderPass(this, gpuTextureView2 != null); } } } @@ -98,11 +124,8 @@ public class GlCommandEncoder implements CommandEncoder { public void clearColorTexture(GpuTexture gpuTexture, int i) { if (this.inRenderPass) { throw new IllegalStateException("Close the existing render pass before creating a new one!"); - } else if (!gpuTexture.getFormat().hasColorAspect()) { - throw new IllegalStateException("Trying to clear a non-color texture as color"); - } else if (gpuTexture.isClosed()) { - throw new IllegalStateException("Color texture is closed"); } else { + this.verifyColorTexture(gpuTexture); this.device.directStateAccess().bindFrameBufferTextures(this.drawFbo, ((GlTexture)gpuTexture).id, 0, 0, 36160); GL11.glClearColor(ARGB.redFloat(i), ARGB.greenFloat(i), ARGB.blueFloat(i), ARGB.alphaFloat(i)); GlStateManager._disableScissorTest(); @@ -117,15 +140,9 @@ public class GlCommandEncoder implements CommandEncoder { public void clearColorAndDepthTextures(GpuTexture gpuTexture, int i, GpuTexture gpuTexture2, double d) { if (this.inRenderPass) { throw new IllegalStateException("Close the existing render pass before creating a new one!"); - } else if (!gpuTexture.getFormat().hasColorAspect()) { - throw new IllegalStateException("Trying to clear a non-color texture as color"); - } else if (!gpuTexture2.getFormat().hasDepthAspect()) { - throw new IllegalStateException("Trying to clear a non-depth texture as depth"); - } else if (gpuTexture.isClosed()) { - throw new IllegalStateException("Color texture is closed"); - } else if (gpuTexture2.isClosed()) { - throw new IllegalStateException("Depth texture is closed"); } else { + this.verifyColorTexture(gpuTexture); + this.verifyDepthTexture(gpuTexture2); int j = ((GlTexture)gpuTexture).getFbo(this.device.directStateAccess(), gpuTexture2); GlStateManager._glBindFramebuffer(36160, j); GlStateManager._disableScissorTest(); @@ -138,15 +155,49 @@ public class GlCommandEncoder implements CommandEncoder { } } + @Override + public void clearColorAndDepthTextures(GpuTexture gpuTexture, int i, GpuTexture gpuTexture2, double d, int j, int k, int l, int m) { + if (this.inRenderPass) { + throw new IllegalStateException("Close the existing render pass before creating a new one!"); + } else { + this.verifyColorTexture(gpuTexture); + this.verifyDepthTexture(gpuTexture2); + this.verifyRegion(gpuTexture, j, k, l, m); + int n = ((GlTexture)gpuTexture).getFbo(this.device.directStateAccess(), gpuTexture2); + GlStateManager._glBindFramebuffer(36160, n); + GlStateManager._scissorBox(j, k, l, m); + GlStateManager._enableScissorTest(); + GL11.glClearDepth(d); + GL11.glClearColor(ARGB.redFloat(i), ARGB.greenFloat(i), ARGB.blueFloat(i), ARGB.alphaFloat(i)); + GlStateManager._depthMask(true); + GlStateManager._colorMask(true, true, true, true); + GlStateManager._clear(16640); + GlStateManager._glBindFramebuffer(36160, 0); + } + } + + private void verifyRegion(GpuTexture texture, int regionX, int regionY, int regionWidth, int regionHeight) { + if (regionX < 0 || regionX >= texture.getWidth(0)) { + throw new IllegalArgumentException("regionX should not be outside of the texture"); + } else if (regionY < 0 || regionY >= texture.getHeight(0)) { + throw new IllegalArgumentException("regionY should not be outside of the texture"); + } else if (regionWidth <= 0) { + throw new IllegalArgumentException("regionWidth should be greater than 0"); + } else if (regionX + regionWidth > texture.getWidth(0)) { + throw new IllegalArgumentException("regionWidth + regionX should be less than the texture width"); + } else if (regionHeight <= 0) { + throw new IllegalArgumentException("regionHeight should be greater than 0"); + } else if (regionY + regionHeight > texture.getHeight(0)) { + throw new IllegalArgumentException("regionWidth + regionX should be less than the texture height"); + } + } + @Override public void clearDepthTexture(GpuTexture gpuTexture, double d) { if (this.inRenderPass) { throw new IllegalStateException("Close the existing render pass before creating a new one!"); - } else if (!gpuTexture.getFormat().hasDepthAspect()) { - throw new IllegalStateException("Trying to clear a non-depth texture as depth"); - } else if (gpuTexture.isClosed()) { - throw new IllegalStateException("Depth texture is closed"); } else { + this.verifyDepthTexture(gpuTexture); this.device.directStateAccess().bindFrameBufferTextures(this.drawFbo, 0, ((GlTexture)gpuTexture).id, 0, 36160); GL11.glDrawBuffer(0); GL11.glClearDepth(d); @@ -159,71 +210,103 @@ public class GlCommandEncoder implements CommandEncoder { } } + private void verifyColorTexture(GpuTexture texture) { + if (!texture.getFormat().hasColorAspect()) { + throw new IllegalStateException("Trying to clear a non-color texture as color"); + } else if (texture.isClosed()) { + throw new IllegalStateException("Color texture is closed"); + } else if ((texture.usage() & 8) == 0) { + throw new IllegalStateException("Color texture must have USAGE_RENDER_ATTACHMENT"); + } else if (texture.getDepthOrLayers() > 1) { + throw new UnsupportedOperationException("Clearing a texture with multiple layers or depths is not yet supported"); + } + } + + private void verifyDepthTexture(GpuTexture texture) { + if (!texture.getFormat().hasDepthAspect()) { + throw new IllegalStateException("Trying to clear a non-depth texture as depth"); + } else if (texture.isClosed()) { + throw new IllegalStateException("Depth texture is closed"); + } else if ((texture.usage() & 8) == 0) { + throw new IllegalStateException("Depth texture must have USAGE_RENDER_ATTACHMENT"); + } else if (texture.getDepthOrLayers() > 1) { + throw new UnsupportedOperationException("Clearing a texture with multiple layers or depths is not yet supported"); + } + } + @Override - public void writeToBuffer(GpuBuffer gpuBuffer, ByteBuffer byteBuffer, int i) { + public void writeToBuffer(GpuBufferSlice gpuBufferSlice, ByteBuffer byteBuffer) { if (this.inRenderPass) { throw new IllegalStateException("Close the existing render pass before performing additional commands"); } else { - GlBuffer glBuffer = (GlBuffer)gpuBuffer; + GlBuffer glBuffer = (GlBuffer)gpuBufferSlice.buffer(); if (glBuffer.closed) { throw new IllegalStateException("Buffer already closed"); - } else if (!glBuffer.usage().isWritable()) { - throw new IllegalStateException("Buffer is not writable"); + } else if ((glBuffer.usage() & 8) == 0) { + throw new IllegalStateException("Buffer needs USAGE_COPY_DST to be a destination for a copy"); } else { - int j = byteBuffer.remaining(); - if (j + i > glBuffer.size) { + int i = byteBuffer.remaining(); + if (i > gpuBufferSlice.length()) { throw new IllegalArgumentException( - "Cannot write more data than this buffer can hold (attempting to write " + j + " bytes at offset " + i + " to " + glBuffer.size + " size buffer)" + "Cannot write more data than the slice allows (attempting to write " + i + " bytes into a slice of length " + gpuBufferSlice.length() + ")" + ); + } else if (gpuBufferSlice.length() + gpuBufferSlice.offset() > glBuffer.size) { + throw new IllegalArgumentException( + "Cannot write more data than this buffer can hold (attempting to write " + + i + + " bytes at offset " + + gpuBufferSlice.offset() + + " to " + + glBuffer.size + + " size buffer)" ); } else { - GlStateManager._glBindBuffer(GlConst.toGl(glBuffer.type()), glBuffer.handle); - if (glBuffer.initialized) { - GlStateManager._glBufferSubData(GlConst.toGl(glBuffer.type()), i, byteBuffer); - } else if (i == 0 && j == glBuffer.size) { - GlStateManager._glBufferData(GlConst.toGl(glBuffer.type()), byteBuffer, GlConst.toGl(glBuffer.usage())); - GlBuffer.MEMORY_POOl.malloc(glBuffer.handle, glBuffer.size); - glBuffer.initialized = true; - this.device.debugLabels().applyLabel(glBuffer); - } else { - GlStateManager._glBufferData(GlConst.toGl(glBuffer.type()), glBuffer.size, GlConst.toGl(glBuffer.usage())); - GlStateManager._glBufferSubData(GlConst.toGl(glBuffer.type()), i, byteBuffer); - GlBuffer.MEMORY_POOl.malloc(glBuffer.handle, glBuffer.size); - glBuffer.initialized = true; - this.device.debugLabels().applyLabel(glBuffer); - } + this.device.directStateAccess().bufferSubData(glBuffer.handle, gpuBufferSlice.offset(), byteBuffer); } } } } @Override - public GpuBuffer.ReadView readBuffer(GpuBuffer gpuBuffer) { - return this.readBuffer(gpuBuffer, 0, gpuBuffer.size()); + public GpuBuffer.MappedView mapBuffer(GpuBuffer gpuBuffer, boolean bl, boolean bl2) { + return this.mapBuffer(gpuBuffer.slice(), bl, bl2); } @Override - public GpuBuffer.ReadView readBuffer(GpuBuffer gpuBuffer, int i, int j) { + public GpuBuffer.MappedView mapBuffer(GpuBufferSlice gpuBufferSlice, boolean bl, boolean bl2) { if (this.inRenderPass) { throw new IllegalStateException("Close the existing render pass before performing additional commands"); } else { - GlBuffer glBuffer = (GlBuffer)gpuBuffer; + GlBuffer glBuffer = (GlBuffer)gpuBufferSlice.buffer(); if (glBuffer.closed) { throw new IllegalStateException("Buffer already closed"); - } else if (!glBuffer.usage().isReadable()) { + } else if (!bl && !bl2) { + throw new IllegalArgumentException("At least read or write must be true"); + } else if (bl && (glBuffer.usage() & 1) == 0) { throw new IllegalStateException("Buffer is not readable"); - } else if (i + j > glBuffer.size) { + } else if (bl2 && (glBuffer.usage() & 2) == 0) { + throw new IllegalStateException("Buffer is not writable"); + } else if (gpuBufferSlice.offset() + gpuBufferSlice.length() > glBuffer.size) { throw new IllegalArgumentException( - "Cannot read more data than this buffer can hold (attempting to read " + j + " bytes at offset " + i + " from " + glBuffer.size + " size buffer)" + "Cannot map more data than this buffer can hold (attempting to map " + + gpuBufferSlice.length() + + " bytes at offset " + + gpuBufferSlice.offset() + + " from " + + glBuffer.size + + " size buffer)" ); } else { - GlStateManager.clearGlErrors(); - GlStateManager._glBindBuffer(GlConst.toGl(glBuffer.type()), glBuffer.handle); - ByteBuffer byteBuffer = GlStateManager._glMapBufferRange(GlConst.toGl(glBuffer.type()), i, j, 1); - if (byteBuffer == null) { - throw new IllegalStateException("Can't read buffer, opengl error " + GlStateManager._getError()); - } else { - return new GlBuffer.ReadView(GlConst.toGl(glBuffer.type()), byteBuffer); + int i = 0; + if (bl) { + i |= 1; } + + if (bl2) { + i |= 34; + } + + return this.device.getBufferStorage().mapBuffer(this.device.directStateAccess(), glBuffer, gpuBufferSlice.offset(), gpuBufferSlice.length(), i); } } } @@ -238,44 +321,58 @@ public class GlCommandEncoder implements CommandEncoder { ); } else if (gpuTexture.isClosed()) { throw new IllegalStateException("Destination texture is closed"); + } else if ((gpuTexture.usage() & 1) == 0) { + throw new IllegalStateException("Color texture must have USAGE_COPY_DST to be a destination for a write"); } else { - this.writeToTexture(gpuTexture, nativeImage, 0, 0, 0, i, j, 0, 0); + this.writeToTexture(gpuTexture, nativeImage, 0, 0, 0, 0, i, j, 0, 0); } } @Override - public void writeToTexture(GpuTexture gpuTexture, NativeImage nativeImage, int i, int j, int k, int l, int m, int n, int o) { + public void writeToTexture(GpuTexture gpuTexture, NativeImage nativeImage, int i, int j, int k, int l, int m, int n, int o, int p) { if (this.inRenderPass) { throw new IllegalStateException("Close the existing render pass before performing additional commands"); } else if (i >= 0 && i < gpuTexture.getMipLevels()) { - if (n + l > nativeImage.getWidth() || o + m > nativeImage.getHeight()) { + if (o + m > nativeImage.getWidth() || p + n > nativeImage.getHeight()) { throw new IllegalArgumentException( "Copy source (" + nativeImage.getWidth() + "x" + nativeImage.getHeight() + ") is not large enough to read a rectangle of " - + l - + "x" + m - + " from " - + n + "x" + + n + + " from " + o + + "x" + + p ); - } else if (j + l > gpuTexture.getWidth(i) || k + m > gpuTexture.getHeight(i)) { + } else if (k + m > gpuTexture.getWidth(i) || l + n > gpuTexture.getHeight(i)) { throw new IllegalArgumentException( - "Dest texture (" + l + "x" + m + ") is not large enough to write a rectangle of " + l + "x" + m + " at " + j + "x" + k + " (at mip level " + i + ")" + "Dest texture (" + m + "x" + n + ") is not large enough to write a rectangle of " + m + "x" + n + " at " + k + "x" + l + " (at mip level " + i + ")" ); } else if (gpuTexture.isClosed()) { throw new IllegalStateException("Destination texture is closed"); + } else if ((gpuTexture.usage() & 1) == 0) { + throw new IllegalStateException("Color texture must have USAGE_COPY_DST to be a destination for a write"); + } else if (j >= gpuTexture.getDepthOrLayers()) { + throw new UnsupportedOperationException("Depth or layer is out of range, must be >= 0 and < " + gpuTexture.getDepthOrLayers()); } else { - GlStateManager._bindTexture(((GlTexture)gpuTexture).id); + int q; + if ((gpuTexture.usage() & 16) != 0) { + q = GlConst.CUBEMAP_TARGETS[j % 6]; + GL11.glBindTexture(34067, ((GlTexture)gpuTexture).id); + } else { + q = 3553; + GlStateManager._bindTexture(((GlTexture)gpuTexture).id); + } + GlStateManager._pixelStore(3314, nativeImage.getWidth()); - GlStateManager._pixelStore(3316, n); - GlStateManager._pixelStore(3315, o); + GlStateManager._pixelStore(3316, o); + GlStateManager._pixelStore(3315, p); GlStateManager._pixelStore(3317, nativeImage.format().components()); - GlStateManager._texSubImage2D(3553, i, j, k, l, m, GlConst.toGl(nativeImage.format()), 5121, nativeImage.getPointer()); + GlStateManager._texSubImage2D(q, i, k, l, m, n, GlConst.toGl(nativeImage.format()), 5121, nativeImage.getPointer()); } } else { throw new IllegalArgumentException("Invalid mipLevel " + i + ", must be >= 0 and < " + gpuTexture.getMipLevels()); @@ -283,38 +380,50 @@ public class GlCommandEncoder implements CommandEncoder { } @Override - public void writeToTexture(GpuTexture gpuTexture, IntBuffer intBuffer, NativeImage.Format format, int i, int j, int k, int l, int m) { + public void writeToTexture(GpuTexture gpuTexture, IntBuffer intBuffer, NativeImage.Format format, int i, int j, int k, int l, int m, int n) { if (this.inRenderPass) { throw new IllegalStateException("Close the existing render pass before performing additional commands"); } else if (i >= 0 && i < gpuTexture.getMipLevels()) { - if (l * m > intBuffer.remaining()) { + if (m * n > intBuffer.remaining()) { throw new IllegalArgumentException( - "Copy would overrun the source buffer (remaining length of " + intBuffer.remaining() + ", but copy is " + l + "x" + m + ")" + "Copy would overrun the source buffer (remaining length of " + intBuffer.remaining() + ", but copy is " + m + "x" + n + ")" ); - } else if (j + l > gpuTexture.getWidth(i) || k + m > gpuTexture.getHeight(i)) { + } else if (k + m > gpuTexture.getWidth(i) || l + n > gpuTexture.getHeight(i)) { throw new IllegalArgumentException( "Dest texture (" + gpuTexture.getWidth(i) + "x" + gpuTexture.getHeight(i) + ") is not large enough to write a rectangle of " - + l - + "x" + m - + " at " - + j + "x" + + n + + " at " + k + + "x" + + l ); } else if (gpuTexture.isClosed()) { throw new IllegalStateException("Destination texture is closed"); + } else if ((gpuTexture.usage() & 1) == 0) { + throw new IllegalStateException("Color texture must have USAGE_COPY_DST to be a destination for a write"); + } else if (j >= gpuTexture.getDepthOrLayers()) { + throw new UnsupportedOperationException("Depth or layer is out of range, must be >= 0 and < " + gpuTexture.getDepthOrLayers()); } else { - GlStateManager._bindTexture(((GlTexture)gpuTexture).id); - GlStateManager._pixelStore(3314, l); + int o; + if ((gpuTexture.usage() & 16) != 0) { + o = GlConst.CUBEMAP_TARGETS[j % 6]; + GL11.glBindTexture(34067, ((GlTexture)gpuTexture).id); + } else { + o = 3553; + GlStateManager._bindTexture(((GlTexture)gpuTexture).id); + } + + GlStateManager._pixelStore(3314, m); GlStateManager._pixelStore(3316, 0); GlStateManager._pixelStore(3315, 0); GlStateManager._pixelStore(3317, format.components()); - GlStateManager._texSubImage2D(3553, i, j, k, l, m, GlConst.toGl(format), 5121, intBuffer); + GlStateManager._texSubImage2D(o, i, k, l, m, n, GlConst.toGl(format), 5121, intBuffer); } } else { throw new IllegalArgumentException("Invalid mipLevel, must be >= 0 and < " + gpuTexture.getMipLevels()); @@ -348,8 +457,10 @@ public class GlCommandEncoder implements CommandEncoder { + " bytes each) starting from offset " + i ); - } else if (gpuBuffer.type() != BufferType.PIXEL_PACK) { - throw new IllegalArgumentException("Buffer of type " + gpuBuffer.type() + " cannot be used to retrieve a texture"); + } else if ((gpuTexture.usage() & 2) == 0) { + throw new IllegalArgumentException("Texture needs USAGE_COPY_SRC to be a source for a copy"); + } else if ((gpuBuffer.usage() & 8) == 0) { + throw new IllegalArgumentException("Buffer needs USAGE_COPY_DST to be a destination for a copy"); } else if (k + m > gpuTexture.getWidth(j) || l + n > gpuTexture.getHeight(j)) { throw new IllegalArgumentException( "Copy source texture (" @@ -369,16 +480,18 @@ public class GlCommandEncoder implements CommandEncoder { throw new IllegalStateException("Source texture is closed"); } else if (gpuBuffer.isClosed()) { throw new IllegalStateException("Destination buffer is closed"); + } else if (gpuTexture.getDepthOrLayers() > 1) { + throw new UnsupportedOperationException("Textures with multiple depths or layers are not yet supported for copying"); } else { GlStateManager.clearGlErrors(); this.device.directStateAccess().bindFrameBufferTextures(this.readFbo, ((GlTexture)gpuTexture).glId(), 0, j, 36008); - GlStateManager._glBindBuffer(GlConst.toGl(gpuBuffer.type()), ((GlBuffer)gpuBuffer).handle); + GlStateManager._glBindBuffer(35051, ((GlBuffer)gpuBuffer).handle); GlStateManager._pixelStore(3330, m); GlStateManager._readPixels(k, l, m, n, GlConst.toGlExternalId(gpuTexture.getFormat()), GlConst.toGlType(gpuTexture.getFormat()), i); RenderSystem.queueFencedTask(runnable); GlStateManager._glFramebufferTexture2D(36008, 36064, 3553, 0, j); GlStateManager._glBindFramebuffer(36008, 0); - GlStateManager._glBindBuffer(GlConst.toGl(gpuBuffer.type()), 0); + GlStateManager._glBindBuffer(35051, 0); int o = GlStateManager._getError(); if (o != 0) { throw new IllegalStateException("Couldn't perform copyTobuffer for texture " + gpuTexture.getLabel() + ": GL error " + o); @@ -428,6 +541,14 @@ public class GlCommandEncoder implements CommandEncoder { throw new IllegalStateException("Source texture is closed"); } else if (gpuTexture2.isClosed()) { throw new IllegalStateException("Destination texture is closed"); + } else if ((gpuTexture.usage() & 2) == 0) { + throw new IllegalArgumentException("Texture needs USAGE_COPY_SRC to be a source for a copy"); + } else if ((gpuTexture2.usage() & 1) == 0) { + throw new IllegalArgumentException("Texture needs USAGE_COPY_DST to be a destination for a copy"); + } else if (gpuTexture.getDepthOrLayers() > 1) { + throw new UnsupportedOperationException("Textures with multiple depths or layers are not yet supported for copying"); + } else if (gpuTexture2.getDepthOrLayers() > 1) { + throw new UnsupportedOperationException("Textures with multiple depths or layers are not yet supported for copying"); } else { GlStateManager.clearGlErrors(); GlStateManager._disableScissorTest(); @@ -450,34 +571,52 @@ public class GlCommandEncoder implements CommandEncoder { } @Override - public void presentTexture(GpuTexture gpuTexture) { + public void presentTexture(GpuTextureView gpuTextureView) { if (this.inRenderPass) { throw new IllegalStateException("Close the existing render pass before performing additional commands"); - } else if (!gpuTexture.getFormat().hasColorAspect()) { + } else if (!gpuTextureView.texture().getFormat().hasColorAspect()) { throw new IllegalStateException("Cannot present a non-color texture!"); + } else if ((gpuTextureView.texture().usage() & 8) == 0) { + throw new IllegalStateException("Color texture must have USAGE_RENDER_ATTACHMENT to presented to the screen"); + } else if (gpuTextureView.texture().getDepthOrLayers() > 1) { + throw new UnsupportedOperationException("Textures with multiple depths or layers are not yet supported for presentation"); } else { GlStateManager._disableScissorTest(); - GlStateManager._viewport(0, 0, gpuTexture.getWidth(0), gpuTexture.getHeight(0)); + GlStateManager._viewport(0, 0, gpuTextureView.getWidth(0), gpuTextureView.getHeight(0)); GlStateManager._depthMask(true); GlStateManager._colorMask(true, true, true, true); - this.device.directStateAccess().bindFrameBufferTextures(this.drawFbo, ((GlTexture)gpuTexture).glId(), 0, 0, 0); + this.device.directStateAccess().bindFrameBufferTextures(this.drawFbo, ((GlTexture)gpuTextureView.texture()).glId(), 0, 0, 0); this.device .directStateAccess() .blitFrameBuffers( - this.drawFbo, 0, 0, 0, gpuTexture.getWidth(0), gpuTexture.getHeight(0), 0, 0, gpuTexture.getWidth(0), gpuTexture.getHeight(0), 16384, 9728 + this.drawFbo, 0, 0, 0, gpuTextureView.getWidth(0), gpuTextureView.getHeight(0), 0, 0, gpuTextureView.getWidth(0), gpuTextureView.getHeight(0), 16384, 9728 ); } } - protected void executeDrawMultiple( - GlRenderPass renderPass, Collection draws, @Nullable GpuBuffer buffer, @Nullable VertexFormat.IndexType indexType + @Override + public GpuFence createFence() { + if (this.inRenderPass) { + throw new IllegalStateException("Close the existing render pass before performing additional commands"); + } else { + return new GlFence(); + } + } + + protected void executeDrawMultiple( + GlRenderPass renderPass, + Collection> draws, + @Nullable GpuBuffer buffer, + @Nullable VertexFormat.IndexType indexType, + Collection uniforms, + T data ) { - if (this.trySetup(renderPass)) { + if (this.trySetup(renderPass, uniforms)) { if (indexType == null) { indexType = VertexFormat.IndexType.SHORT; } - for (RenderPass.Draw draw : draws) { + for (RenderPass.Draw draw : draws) { VertexFormat.IndexType indexType2 = draw.indexType() == null ? indexType : draw.indexType(); renderPass.setIndexBuffer(draw.indexBuffer() == null ? buffer : draw.indexBuffer(), indexType2); renderPass.setVertexBuffer(draw.slot(), draw.vertexBuffer()); @@ -499,24 +638,22 @@ public class GlCommandEncoder implements CommandEncoder { } } - Consumer consumer = draw.uniformUploaderConsumer(); - if (consumer != null) { - consumer.accept((RenderPass.UniformUploader)(string, fs) -> { - Uniform uniform = renderPass.pipeline.program().getUniform(string); - if (uniform != null) { - uniform.set(fs); - uniform.upload(); + BiConsumer biConsumer = draw.uniformUploaderConsumer(); + if (biConsumer != null) { + biConsumer.accept(data, (RenderPass.UniformUploader)(string, gpuBufferSlice) -> { + if (renderPass.pipeline.program().getUniform(string) instanceof Uniform.Ubo(int i)) { + GL32.glBindBufferRange(35345, i, ((GlBuffer)gpuBufferSlice.buffer()).handle, gpuBufferSlice.offset(), gpuBufferSlice.length()); } }); } - this.drawFromBuffers(renderPass, draw.firstIndex(), draw.indexCount(), indexType2, renderPass.pipeline); + this.drawFromBuffers(renderPass, 0, draw.firstIndex(), draw.indexCount(), indexType2, renderPass.pipeline, 1); } } } - protected void executeDraw(GlRenderPass renderPass, int firstIndex, int indexCount, @Nullable VertexFormat.IndexType indexType) { - if (this.trySetup(renderPass)) { + protected void executeDraw(GlRenderPass renderPass, int firstIndex, int index, int indexCount, @Nullable VertexFormat.IndexType indexType, int primCount) { + if (this.trySetup(renderPass, Collections.emptyList())) { if (GlRenderPass.VALIDATION) { if (indexType != null) { if (renderPass.indexBuffer == null) { @@ -526,6 +663,10 @@ public class GlCommandEncoder implements CommandEncoder { if (renderPass.indexBuffer.isClosed()) { throw new IllegalStateException("Index buffer has been closed!"); } + + if ((renderPass.indexBuffer.usage() & 64) == 0) { + throw new IllegalStateException("Index buffer must have GpuBuffer.USAGE_INDEX!"); + } } if (renderPass.vertexBuffers[0] == null) { @@ -535,23 +676,47 @@ public class GlCommandEncoder implements CommandEncoder { if (renderPass.vertexBuffers[0].isClosed()) { throw new IllegalStateException("Vertex buffer at slot 0 has been closed!"); } + + if ((renderPass.vertexBuffers[0].usage() & 32) == 0) { + throw new IllegalStateException("Vertex buffer must have GpuBuffer.USAGE_VERTEX!"); + } } - this.drawFromBuffers(renderPass, firstIndex, indexCount, indexType, renderPass.pipeline); + this.drawFromBuffers(renderPass, firstIndex, index, indexCount, indexType, renderPass.pipeline, primCount); } } - private void drawFromBuffers(GlRenderPass renderPass, int firstIndex, int indexCount, @Nullable VertexFormat.IndexType indexType, GlRenderPipeline pipeline) { + private void drawFromBuffers( + GlRenderPass renderPass, int firstIndex, int index, int indexCount, @Nullable VertexFormat.IndexType indexType, GlRenderPipeline pipeline, int primCount + ) { this.device.vertexArrayCache().bindVertexArray(pipeline.info().getVertexFormat(), (GlBuffer)renderPass.vertexBuffers[0]); if (indexType != null) { GlStateManager._glBindBuffer(34963, ((GlBuffer)renderPass.indexBuffer).handle); - GlStateManager._drawElements(GlConst.toGl(pipeline.info().getVertexFormatMode()), indexCount, GlConst.toGl(indexType), (long)firstIndex * indexType.bytes); + if (primCount > 1) { + if (firstIndex > 0) { + GL32.glDrawElementsInstancedBaseVertex( + GlConst.toGl(pipeline.info().getVertexFormatMode()), indexCount, GlConst.toGl(indexType), (long)index * indexType.bytes, primCount, firstIndex + ); + } else { + GL31.glDrawElementsInstanced( + GlConst.toGl(pipeline.info().getVertexFormatMode()), indexCount, GlConst.toGl(indexType), (long)index * indexType.bytes, primCount + ); + } + } else if (firstIndex > 0) { + GL32.glDrawElementsBaseVertex( + GlConst.toGl(pipeline.info().getVertexFormatMode()), indexCount, GlConst.toGl(indexType), (long)index * indexType.bytes, firstIndex + ); + } else { + GlStateManager._drawElements(GlConst.toGl(pipeline.info().getVertexFormatMode()), indexCount, GlConst.toGl(indexType), (long)index * indexType.bytes); + } + } else if (primCount > 1) { + GL31.glDrawArraysInstanced(GlConst.toGl(pipeline.info().getVertexFormatMode()), firstIndex, indexCount, primCount); } else { GlStateManager._drawArrays(GlConst.toGl(pipeline.info().getVertexFormatMode()), firstIndex, indexCount); } } - private boolean trySetup(GlRenderPass renderPass) { + private boolean trySetup(GlRenderPass renderPass, Collection uniforms) { if (GlRenderPass.VALIDATION) { if (renderPass.pipeline == null) { throw new IllegalStateException("Can't draw without a render pipeline"); @@ -562,19 +727,49 @@ public class GlCommandEncoder implements CommandEncoder { } for (RenderPipeline.UniformDescription uniformDescription : renderPass.pipeline.info().getUniforms()) { - Object object = renderPass.uniforms.get(uniformDescription.name()); - if (object == null && !GlProgram.BUILT_IN_UNIFORMS.contains(uniformDescription.name())) { - throw new IllegalStateException("Missing uniform " + uniformDescription.name() + " (should be " + uniformDescription.type() + ")"); + GpuBufferSlice gpuBufferSlice = (GpuBufferSlice)renderPass.uniforms.get(uniformDescription.name()); + if (!uniforms.contains(uniformDescription.name())) { + if (gpuBufferSlice == null) { + throw new IllegalStateException("Missing uniform " + uniformDescription.name() + " (should be " + uniformDescription.type() + ")"); + } + + if (uniformDescription.type() == UniformType.UNIFORM_BUFFER) { + if (gpuBufferSlice.buffer().isClosed()) { + throw new IllegalStateException("Uniform buffer " + uniformDescription.name() + " is already closed"); + } + + if ((gpuBufferSlice.buffer().usage() & 128) == 0) { + throw new IllegalStateException("Uniform buffer " + uniformDescription.name() + " must have GpuBuffer.USAGE_UNIFORM"); + } + } + + if (uniformDescription.type() == UniformType.TEXEL_BUFFER) { + if (gpuBufferSlice.offset() != 0 || gpuBufferSlice.length() != gpuBufferSlice.buffer().size()) { + throw new IllegalStateException("Uniform texel buffers do not support a slice of a buffer, must be entire buffer"); + } + + if (uniformDescription.textureFormat() == null) { + throw new IllegalStateException("Invalid uniform texel buffer " + uniformDescription.name() + " (missing a texture format)"); + } + } } } - for (String string : renderPass.pipeline.program().getSamplers()) { - if (!renderPass.samplers.containsKey(string)) { - throw new IllegalStateException("Missing sampler " + string); - } + for (Entry entry : renderPass.pipeline.program().getUniforms().entrySet()) { + if (entry.getValue() instanceof Uniform.Sampler) { + String string = (String)entry.getKey(); + GlTextureView glTextureView = (GlTextureView)renderPass.samplers.get(string); + if (glTextureView == null) { + throw new IllegalStateException("Missing sampler " + string); + } - if (((GpuTexture)renderPass.samplers.get(string)).isClosed()) { - throw new IllegalStateException("Sampler " + string + " has been closed!"); + if (glTextureView.isClosed()) { + throw new IllegalStateException("Sampler " + string + " (" + glTextureView.texture().getLabel() + ") has been closed!"); + } + + if ((glTextureView.texture().usage() & 4) == 0) { + throw new IllegalStateException("Sampler " + string + " (" + glTextureView.texture().getLabel() + ") must have USAGE_TEXTURE_BINDING!"); + } } } @@ -587,21 +782,6 @@ public class GlCommandEncoder implements CommandEncoder { RenderPipeline renderPipeline = renderPass.pipeline.info(); GlProgram glProgram = renderPass.pipeline.program(); - - for (Uniform uniform : glProgram.getUniforms()) { - if (renderPass.dirtyUniforms.contains(uniform.getName())) { - Object object2 = renderPass.uniforms.get(uniform.getName()); - if (object2 instanceof int[]) { - glProgram.safeGetUniform(uniform.getName()).set((int[])object2); - } else if (object2 instanceof float[]) { - glProgram.safeGetUniform(uniform.getName()).set((float[])object2); - } else if (object2 != null) { - throw new IllegalStateException("Unknown uniform type - expected " + uniform.getType() + ", found " + object2); - } - } - } - - renderPass.dirtyUniforms.clear(); this.applyPipelineState(renderPipeline); boolean bl = this.lastProgram != glProgram; if (bl) { @@ -609,41 +789,65 @@ public class GlCommandEncoder implements CommandEncoder { this.lastProgram = glProgram; } - IntList intList = glProgram.getSamplerLocations(); + for (Entry entry2 : glProgram.getUniforms().entrySet()) { + String string2 = (String)entry2.getKey(); + boolean bl2 = renderPass.dirtyUniforms.contains(string2); + switch ((Uniform)entry2.getValue()) { + case Uniform.Ubo(int var61): + int var39 = var61; + if (bl2) { + GpuBufferSlice gpuBufferSlice2 = (GpuBufferSlice)renderPass.uniforms.get(string2); + GL32.glBindBufferRange(35345, var39, ((GlBuffer)gpuBufferSlice2.buffer()).handle, gpuBufferSlice2.offset(), gpuBufferSlice2.length()); + } + break; + case Uniform.Utb(int var41, int var42, TextureFormat var43, int var59): + int var44 = var59; + if (bl || bl2) { + GlStateManager._glUniform1i(var41, var42); + } - for (int i = 0; i < glProgram.getSamplers().size(); i++) { - String string2 = (String)glProgram.getSamplers().get(i); - GlTexture glTexture = (GlTexture)renderPass.samplers.get(string2); - if (glTexture != null) { - if (bl || renderPass.dirtySamplers.contains(string2)) { - int j = intList.getInt(i); - Uniform.uploadInteger(j, i); - GlStateManager._activeTexture(33984 + i); - } + GlStateManager._activeTexture(33984 + var42); + GL11C.glBindTexture(35882, var44); + if (bl2) { + GpuBufferSlice gpuBufferSlice3 = (GpuBufferSlice)renderPass.uniforms.get(string2); + GL31.glTexBuffer(35882, GlConst.toGlInternalId(var43), ((GlBuffer)gpuBufferSlice3.buffer()).handle); + } + break; + case Uniform.Sampler(int glTextureView2, int var51): + int var46 = var51; + GlTextureView glTextureView2x = (GlTextureView)renderPass.samplers.get(string2); + if (glTextureView2x == null) { + break; + } - GlStateManager._bindTexture(glTexture.glId()); - glTexture.flushModeChanges(); + if (bl || bl2) { + GlStateManager._glUniform1i(glTextureView2, var46); + } + + GlStateManager._activeTexture(33984 + var46); + GlTexture glTexture = glTextureView2x.texture(); + int o; + if ((glTexture.usage() & 16) != 0) { + o = 34067; + GL11.glBindTexture(34067, glTexture.id); + } else { + o = 3553; + GlStateManager._bindTexture(glTexture.id); + } + + GlStateManager._texParameter(o, 33084, glTextureView2x.baseMipLevel()); + GlStateManager._texParameter(o, 33085, glTextureView2x.baseMipLevel() + glTextureView2x.mipLevels() - 1); + glTexture.flushModeChanges(o); + break; + default: + throw new MatchException(null, null); } } - Window window = Minecraft.getInstance() == null ? null : Minecraft.getInstance().getWindow(); - glProgram.setDefaultUniforms( - renderPipeline.getVertexFormatMode(), - RenderSystem.getModelViewMatrix(), - RenderSystem.getProjectionMatrix(), - window == null ? 0.0F : window.getWidth(), - window == null ? 0.0F : window.getHeight() - ); - - for (Uniform uniform2 : glProgram.getUniforms()) { - uniform2.upload(); - } - - if (renderPass.scissorState.isEnabled()) { + renderPass.dirtyUniforms.clear(); + if (renderPass.isScissorEnabled()) { GlStateManager._enableScissorTest(); - GlStateManager._scissorBox( - renderPass.scissorState.getX(), renderPass.scissorState.getY(), renderPass.scissorState.getWidth(), renderPass.scissorState.getHeight() - ); + GlStateManager._scissorBox(renderPass.getScissorX(), renderPass.getScissorY(), renderPass.getScissorWidth(), renderPass.getScissorHeight()); } else { GlStateManager._disableScissorTest(); } @@ -704,6 +908,7 @@ public class GlCommandEncoder implements CommandEncoder { public void finishRenderPass() { this.inRenderPass = false; GlStateManager._glBindFramebuffer(36160, 0); + this.device.debugLabels().popDebugGroup(); } protected GlDevice getDevice() { diff --git a/com/mojang/blaze3d/opengl/GlConst.java b/com/mojang/blaze3d/opengl/GlConst.java index 9b49f085..b291ad81 100644 --- a/com/mojang/blaze3d/opengl/GlConst.java +++ b/com/mojang/blaze3d/opengl/GlConst.java @@ -1,8 +1,6 @@ package com.mojang.blaze3d.opengl; import com.mojang.blaze3d.DontObfuscate; -import com.mojang.blaze3d.buffers.BufferType; -import com.mojang.blaze3d.buffers.BufferUsage; import com.mojang.blaze3d.platform.DepthTestFunction; import com.mojang.blaze3d.platform.DestFactor; import com.mojang.blaze3d.platform.NativeImage; @@ -31,7 +29,9 @@ public class GlConst { public static final int GL_TRIANGLES = 4; public static final int GL_WRITE_ONLY = 35001; public static final int GL_READ_ONLY = 35000; + public static final int GL_READ_WRITE = 35002; public static final int GL_MAP_READ_BIT = 1; + public static final int GL_MAP_WRITE_BIT = 2; public static final int GL_EQUAL = 514; public static final int GL_LEQUAL = 515; public static final int GL_LESS = 513; @@ -105,6 +105,7 @@ public class GlConst { public static final int GL_PACK_ROW_LENGTH = 3330; public static final int GL_MAX_TEXTURE_SIZE = 3379; public static final int GL_TEXTURE_2D = 3553; + public static final int[] CUBEMAP_TARGETS = new int[]{34069, 34070, 34071, 34072, 34073, 34074}; public static final int GL_DEPTH_COMPONENT = 6402; public static final int GL_DEPTH_COMPONENT32 = 33191; public static final int GL_FRAMEBUFFER = 36160; @@ -196,18 +197,6 @@ public class GlConst { }; } - public static int toGl(BufferType bufferType) { - return switch (bufferType) { - case VERTICES -> 34962; - case INDICES -> 34963; - case PIXEL_PACK -> 35051; - case COPY_READ -> 36662; - case COPY_WRITE -> 36663; - case PIXEL_UNPACK -> 35052; - case UNIFORM -> 35345; - }; - } - public static int toGl(VertexFormat.Mode mode) { return switch (mode) { case LINES -> 4; @@ -237,20 +226,6 @@ public class GlConst { }; } - public static int toGl(BufferUsage bufferUsage) { - return switch (bufferUsage) { - case DYNAMIC_WRITE -> 35048; - case STATIC_WRITE -> 35044; - case STREAM_WRITE -> 35040; - case STATIC_READ -> 35045; - case DYNAMIC_READ -> 35049; - case STREAM_READ -> 35041; - case DYNAMIC_COPY -> 35050; - case STATIC_COPY -> 35046; - case STREAM_COPY -> 35042; - }; - } - public static int toGl(AddressMode addressMode) { return switch (addressMode) { case REPEAT -> 10497; @@ -274,6 +249,7 @@ public class GlConst { return switch (textureFormat) { case RGBA8 -> 32856; case RED8 -> 33321; + case RED8I -> 33329; case DEPTH32 -> 33191; }; } @@ -282,6 +258,7 @@ public class GlConst { return switch (textureFormat) { case RGBA8 -> 6408; case RED8 -> 6403; + case RED8I -> 6403; case DEPTH32 -> 6402; }; } @@ -290,6 +267,7 @@ public class GlConst { return switch (textureFormat) { case RGBA8 -> 5121; case RED8 -> 5121; + case RED8I -> 5121; case DEPTH32 -> 5126; }; } @@ -300,4 +278,36 @@ public class GlConst { case FRAGMENT -> 35632; }; } + + public static int bufferUsageToGlFlag(int i) { + int j = 0; + if ((i & 1) != 0) { + j |= 65; + } + + if ((i & 2) != 0) { + j |= 66; + } + + if ((i & 8) != 0) { + j |= 256; + } + + if ((i & 4) != 0) { + j |= 512; + } + + return j; + } + + public static int bufferUsageToGlEnum(int i) { + boolean bl = (i & 4) != 0; + if ((i & 2) != 0) { + return bl ? 35040 : 35044; + } else if ((i & 1) != 0) { + return bl ? 35041 : 35045; + } else { + return 35044; + } + } } diff --git a/com/mojang/blaze3d/opengl/GlDebug.java b/com/mojang/blaze3d/opengl/GlDebug.java index 89392c74..473ee2f4 100644 --- a/com/mojang/blaze3d/opengl/GlDebug.java +++ b/com/mojang/blaze3d/opengl/GlDebug.java @@ -120,8 +120,8 @@ public class GlDebug { } @Nullable - public static GlDebug enableDebugCallback(int vebosity, boolean sychronous, Set enabledExtensions) { - if (vebosity <= 0) { + public static GlDebug enableDebugCallback(int verbosity, boolean synchronous, Set enabledExtensions) { + if (verbosity <= 0) { return null; } else { GLCapabilities gLCapabilities = GL.getCapabilities(); @@ -129,12 +129,12 @@ public class GlDebug { GlDebug glDebug = new GlDebug(); enabledExtensions.add("GL_KHR_debug"); GL11.glEnable(37600); - if (sychronous) { + if (synchronous) { GL11.glEnable(33346); } for (int i = 0; i < DEBUG_LEVELS.size(); i++) { - boolean bl = i < vebosity; + boolean bl = i < verbosity; KHRDebug.glDebugMessageControl(4352, 4352, (Integer)DEBUG_LEVELS.get(i), (int[])null, bl); } @@ -143,12 +143,12 @@ public class GlDebug { } else if (gLCapabilities.GL_ARB_debug_output && GlDevice.USE_GL_ARB_debug_output) { GlDebug glDebug = new GlDebug(); enabledExtensions.add("GL_ARB_debug_output"); - if (sychronous) { + if (synchronous) { GL11.glEnable(33346); } for (int i = 0; i < DEBUG_LEVELS_ARB.size(); i++) { - boolean bl = i < vebosity; + boolean bl = i < verbosity; ARBDebugOutput.glDebugMessageControlARB(4352, 4352, (Integer)DEBUG_LEVELS_ARB.get(i), (int[])null, bl); } diff --git a/com/mojang/blaze3d/opengl/GlDebugLabel.java b/com/mojang/blaze3d/opengl/GlDebugLabel.java index 40f09f58..d6690de8 100644 --- a/com/mojang/blaze3d/opengl/GlDebugLabel.java +++ b/com/mojang/blaze3d/opengl/GlDebugLabel.java @@ -31,6 +31,12 @@ public abstract class GlDebugLabel { public void applyLabel(VertexArrayCache.VertexArray vertexArray) { } + public void pushDebugGroup(Supplier label) { + } + + public void popDebugGroup() { + } + public static GlDebugLabel create(GLCapabilities capabilities, boolean renderDebugLabels, Set enabledExtensions) { if (renderDebugLabels) { if (capabilities.GL_KHR_debug && GlDevice.USE_GL_KHR_debug) { @@ -59,7 +65,6 @@ public abstract class GlDebugLabel { @Override public void applyLabel(GlBuffer buffer) { - buffer.ensureBufferExists(); Supplier supplier = buffer.label; if (supplier != null) { KHRDebug.glObjectLabel(33504, buffer.handle, StringUtil.truncateStringIfNecessary((String)supplier.get(), this.maxLabelLength, true)); @@ -86,6 +91,16 @@ public abstract class GlDebugLabel { KHRDebug.glObjectLabel(32884, vertexArray.id, StringUtil.truncateStringIfNecessary(vertexArray.format.toString(), this.maxLabelLength, true)); } + @Override + public void pushDebugGroup(Supplier label) { + KHRDebug.glPushDebugGroup(33354, 0, (CharSequence)label.get()); + } + + @Override + public void popDebugGroup() { + KHRDebug.glPopDebugGroup(); + } + @Override public boolean exists() { return true; @@ -100,7 +115,6 @@ public abstract class GlDebugLabel { static class Ext extends GlDebugLabel { @Override public void applyLabel(GlBuffer buffer) { - buffer.ensureBufferExists(); Supplier supplier = buffer.label; if (supplier != null) { EXTDebugLabel.glLabelObjectEXT(37201, buffer.handle, StringUtil.truncateStringIfNecessary((String)supplier.get(), 256, true)); diff --git a/com/mojang/blaze3d/opengl/GlDevice.java b/com/mojang/blaze3d/opengl/GlDevice.java index 9f04dcb6..5b80de87 100644 --- a/com/mojang/blaze3d/opengl/GlDevice.java +++ b/com/mojang/blaze3d/opengl/GlDevice.java @@ -1,8 +1,6 @@ package com.mojang.blaze3d.opengl; import com.mojang.blaze3d.GpuOutOfMemoryException; -import com.mojang.blaze3d.buffers.BufferType; -import com.mojang.blaze3d.buffers.BufferUsage; import com.mojang.blaze3d.buffers.GpuBuffer; import com.mojang.blaze3d.pipeline.RenderPipeline; import com.mojang.blaze3d.preprocessor.GlslPreprocessor; @@ -10,6 +8,7 @@ import com.mojang.blaze3d.shaders.ShaderType; import com.mojang.blaze3d.systems.CommandEncoder; import com.mojang.blaze3d.systems.GpuDevice; import com.mojang.blaze3d.textures.GpuTexture; +import com.mojang.blaze3d.textures.GpuTextureView; import com.mojang.blaze3d.textures.TextureFormat; import com.mojang.logging.LogUtils; import java.nio.ByteBuffer; @@ -32,6 +31,7 @@ import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.Nullable; import org.lwjgl.glfw.GLFW; import org.lwjgl.opengl.GL; +import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GLCapabilities; import org.slf4j.Logger; @@ -43,6 +43,7 @@ public class GlDevice implements GpuDevice { protected static boolean USE_GL_EXT_debug_label = true; protected static boolean USE_GL_ARB_debug_output = true; protected static boolean USE_GL_ARB_direct_state_access = true; + protected static boolean USE_GL_ARB_buffer_storage = true; private final CommandEncoder encoder; @Nullable private final GlDebug debugLog; @@ -53,7 +54,9 @@ public class GlDevice implements GpuDevice { private final Map pipelineCache = new IdentityHashMap(); private final Map shaderCache = new HashMap(); private final VertexArrayCache vertexArrayCache; + private final BufferStorage bufferStorage; private final Set enabledExtensions = new HashSet(); + private final int uniformOffsetAlignment; public GlDevice( long window, int debugVerbosity, boolean synchronous, BiFunction defaultShaderSource, boolean renderDebugLabels @@ -65,10 +68,13 @@ public class GlDevice implements GpuDevice { this.debugLog = GlDebug.enableDebugCallback(debugVerbosity, synchronous, this.enabledExtensions); this.debugLabels = GlDebugLabel.create(gLCapabilities, renderDebugLabels, this.enabledExtensions); this.vertexArrayCache = VertexArrayCache.create(gLCapabilities, this.debugLabels, this.enabledExtensions); + this.bufferStorage = BufferStorage.create(gLCapabilities, this.enabledExtensions); this.directStateAccess = DirectStateAccess.create(gLCapabilities, this.enabledExtensions); this.maxSupportedTextureSize = i; this.defaultShaderSource = defaultShaderSource; this.encoder = new GlCommandEncoder(this); + this.uniformOffsetAlignment = GL11.glGetInteger(35380); + GL11.glEnable(34895); } public GlDebugLabel debugLabels() { @@ -81,42 +87,79 @@ public class GlDevice implements GpuDevice { } @Override - public GpuTexture createTexture(@Nullable Supplier supplier, TextureFormat textureFormat, int i, int j, int k) { - return this.createTexture(this.debugLabels.exists() && supplier != null ? (String)supplier.get() : null, textureFormat, i, j, k); + public GpuTexture createTexture(@Nullable Supplier supplier, int i, TextureFormat textureFormat, int j, int k, int l, int m) { + return this.createTexture(this.debugLabels.exists() && supplier != null ? (String)supplier.get() : null, i, textureFormat, j, k, l, m); } @Override - public GpuTexture createTexture(@Nullable String string, TextureFormat textureFormat, int i, int j, int k) { - if (k < 1) { + public GpuTexture createTexture(@Nullable String string, int i, TextureFormat textureFormat, int j, int k, int l, int m) { + if (m < 1) { throw new IllegalArgumentException("mipLevels must be at least 1"); + } else if (l < 1) { + throw new IllegalArgumentException("depthOrLayers must be at least 1"); } else { + boolean bl = (i & 16) != 0; + if (bl) { + if (j != k) { + throw new IllegalArgumentException("Cubemap compatible textures must be square, but size is " + j + "x" + k); + } + + if (l % 6 != 0) { + throw new IllegalArgumentException("Cubemap compatible textures must have a layer count with a multiple of 6, was " + l); + } + + if (l > 6) { + throw new UnsupportedOperationException("Array textures are not yet supported"); + } + } else if (l > 1) { + throw new UnsupportedOperationException("Array or 3D textures are not yet supported"); + } + GlStateManager.clearGlErrors(); - int l = GlStateManager._genTexture(); + int n = GlStateManager._genTexture(); if (string == null) { - string = String.valueOf(l); + string = String.valueOf(n); } - GlStateManager._bindTexture(l); - GlStateManager._texParameter(3553, 33085, k - 1); - GlStateManager._texParameter(3553, 33082, 0); - GlStateManager._texParameter(3553, 33083, k - 1); - if (textureFormat.hasDepthAspect()) { - GlStateManager._texParameter(3553, 34892, 0); - } - - for (int m = 0; m < k; m++) { - GlStateManager._texImage2D( - 3553, m, GlConst.toGlInternalId(textureFormat), i >> m, j >> m, 0, GlConst.toGlExternalId(textureFormat), GlConst.toGlType(textureFormat), null - ); - } - - int m = GlStateManager._getError(); - if (m == 1285) { - throw new GpuOutOfMemoryException("Could not allocate texture of " + i + "x" + j + " for " + string); - } else if (m != 0) { - throw new IllegalStateException("OpenGL error " + m); + int o; + if (bl) { + GL11.glBindTexture(34067, n); + o = 34067; } else { - GlTexture glTexture = new GlTexture(string, textureFormat, i, j, k, l); + GlStateManager._bindTexture(n); + o = 3553; + } + + GlStateManager._texParameter(o, 33085, m - 1); + GlStateManager._texParameter(o, 33082, 0); + GlStateManager._texParameter(o, 33083, m - 1); + if (textureFormat.hasDepthAspect()) { + GlStateManager._texParameter(o, 34892, 0); + } + + if (bl) { + for (int p : GlConst.CUBEMAP_TARGETS) { + for (int q = 0; q < m; q++) { + GlStateManager._texImage2D( + p, q, GlConst.toGlInternalId(textureFormat), j >> q, k >> q, 0, GlConst.toGlExternalId(textureFormat), GlConst.toGlType(textureFormat), null + ); + } + } + } else { + for (int r = 0; r < m; r++) { + GlStateManager._texImage2D( + o, r, GlConst.toGlInternalId(textureFormat), j >> r, k >> r, 0, GlConst.toGlExternalId(textureFormat), GlConst.toGlType(textureFormat), null + ); + } + } + + int r = GlStateManager._getError(); + if (r == 1285) { + throw new GpuOutOfMemoryException("Could not allocate texture of " + j + "x" + k + " for " + string); + } else if (r != 0) { + throw new IllegalStateException("OpenGL error " + r); + } else { + GlTexture glTexture = new GlTexture(i, string, textureFormat, j, k, l, m, n); this.debugLabels.applyLabel(glTexture); return glTexture; } @@ -124,22 +167,59 @@ public class GlDevice implements GpuDevice { } @Override - public GpuBuffer createBuffer(@Nullable Supplier supplier, BufferType bufferType, BufferUsage bufferUsage, int i) { - if (i <= 0) { - throw new IllegalArgumentException("Buffer size must be greater than zero"); + public GpuTextureView createTextureView(GpuTexture gpuTexture) { + return this.createTextureView(gpuTexture, 0, gpuTexture.getMipLevels()); + } + + @Override + public GpuTextureView createTextureView(GpuTexture gpuTexture, int i, int j) { + if (gpuTexture.isClosed()) { + throw new IllegalArgumentException("Can't create texture view with closed texture"); + } else if (i >= 0 && i + j <= gpuTexture.getMipLevels()) { + return new GlTextureView((GlTexture)gpuTexture, i, j); } else { - return new GlBuffer(this.debugLabels, supplier, bufferType, bufferUsage, i, GlStateManager._glGenBuffers()); + throw new IllegalArgumentException( + j + " mip levels starting from " + i + " would be out of range for texture with only " + gpuTexture.getMipLevels() + " mip levels" + ); } } @Override - public GpuBuffer createBuffer(@Nullable Supplier supplier, BufferType bufferType, BufferUsage bufferUsage, ByteBuffer byteBuffer) { + public GpuBuffer createBuffer(@Nullable Supplier supplier, int i, int j) { + if (j <= 0) { + throw new IllegalArgumentException("Buffer size must be greater than zero"); + } else { + GlStateManager.clearGlErrors(); + GlBuffer glBuffer = this.bufferStorage.createBuffer(this.directStateAccess, supplier, i, j); + int k = GlStateManager._getError(); + if (k == 1285) { + throw new GpuOutOfMemoryException("Could not allocate buffer of " + j + " for " + supplier); + } else if (k != 0) { + throw new IllegalStateException("OpenGL error " + k); + } else { + this.debugLabels.applyLabel(glBuffer); + return glBuffer; + } + } + } + + @Override + public GpuBuffer createBuffer(@Nullable Supplier supplier, int i, ByteBuffer byteBuffer) { if (!byteBuffer.hasRemaining()) { throw new IllegalArgumentException("Buffer source must not be empty"); } else { - GlBuffer glBuffer = new GlBuffer(this.debugLabels, supplier, bufferType, bufferUsage, byteBuffer.remaining(), GlStateManager._glGenBuffers()); - this.encoder.writeToBuffer(glBuffer, byteBuffer, 0); - return glBuffer; + GlStateManager.clearGlErrors(); + long l = byteBuffer.remaining(); + GlBuffer glBuffer = this.bufferStorage.createBuffer(this.directStateAccess, supplier, i, byteBuffer); + int j = GlStateManager._getError(); + if (j == 1285) { + throw new GpuOutOfMemoryException("Could not allocate buffer of " + l + " for " + supplier); + } else if (j != 0) { + throw new IllegalStateException("OpenGL error " + j); + } else { + this.debugLabels.applyLabel(glBuffer); + return glBuffer; + } } } @@ -201,6 +281,11 @@ public class GlDevice implements GpuDevice { return this.maxSupportedTextureSize; } + @Override + public int getUniformOffsetAlignment() { + return this.uniformOffsetAlignment; + } + @Override public void clearPipelineCache() { for (GlRenderPipeline glRenderPipeline : this.pipelineCache.values()) { @@ -246,9 +331,9 @@ public class GlDevice implements GpuDevice { .computeIfAbsent(shaderCompilationKey, shaderCompilationKey2 -> this.compileShader(shaderCompilationKey, shaderSource)); } - public GlRenderPipeline precompilePipeline(RenderPipeline renderPipeline, @Nullable BiFunction biFunction) { - BiFunction biFunction2 = biFunction == null ? this.defaultShaderSource : biFunction; - return (GlRenderPipeline)this.pipelineCache.computeIfAbsent(renderPipeline, renderPipeline2 -> this.compilePipeline(renderPipeline, biFunction2)); + public GlRenderPipeline precompilePipeline(RenderPipeline renderPipeline, @Nullable BiFunction shaderSource) { + BiFunction biFunction = shaderSource == null ? this.defaultShaderSource : shaderSource; + return (GlRenderPipeline)this.pipelineCache.computeIfAbsent(renderPipeline, renderPipeline2 -> this.compilePipeline(renderPipeline, biFunction)); } private GlShaderModule compileShader(GlDevice.ShaderCompilationKey key, BiFunction shaderSource) { @@ -301,6 +386,10 @@ public class GlDevice implements GpuDevice { return this.vertexArrayCache; } + public BufferStorage getBufferStorage() { + return this.bufferStorage; + } + @Environment(EnvType.CLIENT) record ShaderCompilationKey(ResourceLocation id, ShaderType type, ShaderDefines defines) { diff --git a/com/mojang/blaze3d/opengl/GlFence.java b/com/mojang/blaze3d/opengl/GlFence.java new file mode 100644 index 00000000..5bf9850f --- /dev/null +++ b/com/mojang/blaze3d/opengl/GlFence.java @@ -0,0 +1,34 @@ +package com.mojang.blaze3d.opengl; + +import com.mojang.blaze3d.buffers.GpuFence; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; + +@Environment(EnvType.CLIENT) +public class GlFence implements GpuFence { + private long handle = GlStateManager._glFenceSync(37143, 0); + + @Override + public void close() { + if (this.handle != 0L) { + GlStateManager._glDeleteSync(this.handle); + this.handle = 0L; + } + } + + @Override + public boolean awaitCompletion(long l) { + if (this.handle == 0L) { + return true; + } else { + int i = GlStateManager._glClientWaitSync(this.handle, 0, l); + if (i == 37147) { + return false; + } else if (i == 37149) { + throw new IllegalStateException("Failed to complete gpu fence"); + } else { + return true; + } + } + } +} diff --git a/com/mojang/blaze3d/opengl/GlProgram.java b/com/mojang/blaze3d/opengl/GlProgram.java index 26b9b501..db9c6009 100644 --- a/com/mojang/blaze3d/opengl/GlProgram.java +++ b/com/mojang/blaze3d/opengl/GlProgram.java @@ -2,92 +2,31 @@ package com.mojang.blaze3d.opengl; import com.google.common.collect.Sets; import com.mojang.blaze3d.pipeline.RenderPipeline; -import com.mojang.blaze3d.shaders.UniformType; import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.textures.GpuTexture; +import com.mojang.blaze3d.textures.TextureFormat; import com.mojang.blaze3d.vertex.VertexFormat; import com.mojang.logging.LogUtils; -import it.unimi.dsi.fastutil.ints.IntArrayList; -import it.unimi.dsi.fastutil.ints.IntList; -import it.unimi.dsi.fastutil.objects.Object2ObjectMap; -import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; -import java.nio.IntBuffer; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Set; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.minecraft.client.renderer.FogParameters; import net.minecraft.client.renderer.ShaderManager; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.VisibleForTesting; -import org.joml.Matrix4f; -import org.joml.Vector3f; -import org.lwjgl.opengl.GL20; -import org.lwjgl.system.MemoryStack; +import org.lwjgl.opengl.GL31; import org.slf4j.Logger; @Environment(EnvType.CLIENT) public class GlProgram implements AutoCloseable { private static final Logger LOGGER = LogUtils.getLogger(); - public static Set BUILT_IN_UNIFORMS = Sets.newHashSet( - "ModelViewMat", - "ProjMat", - "TextureMat", - "ScreenSize", - "ColorModulator", - "Light0_Direction", - "Light1_Direction", - "GlintAlpha", - "FogStart", - "FogEnd", - "FogColor", - "FogShape", - "LineWidth", - "GameTime", - "ModelOffset" - ); + public static Set BUILT_IN_UNIFORMS = Sets.newHashSet("Projection", "Lighting", "Fog", "Globals"); public static GlProgram INVALID_PROGRAM = new GlProgram(-1, "invalid"); - private static final AbstractUniform DUMMY_UNIFORM = new AbstractUniform(); - private final List samplers = new ArrayList(); - private final Object2ObjectMap samplerTextures = new Object2ObjectOpenHashMap<>(); - private final IntList samplerLocations = new IntArrayList(); - private final List uniforms = new ArrayList(); private final Map uniformsByName = new HashMap(); private final int programId; private final String debugLabel; - @Nullable - public Uniform MODEL_VIEW_MATRIX; - @Nullable - public Uniform PROJECTION_MATRIX; - @Nullable - public Uniform TEXTURE_MATRIX; - @Nullable - public Uniform SCREEN_SIZE; - @Nullable - public Uniform COLOR_MODULATOR; - @Nullable - public Uniform LIGHT0_DIRECTION; - @Nullable - public Uniform LIGHT1_DIRECTION; - @Nullable - public Uniform GLINT_ALPHA; - @Nullable - public Uniform FOG_START; - @Nullable - public Uniform FOG_END; - @Nullable - public Uniform FOG_COLOR; - @Nullable - public Uniform FOG_SHAPE; - @Nullable - public Uniform LINE_WIDTH; - @Nullable - public Uniform GAME_TIME; - @Nullable - public Uniform MODEL_OFFSET; private GlProgram(int programId, String debugLabel) { this.programId = programId; @@ -122,178 +61,78 @@ public class GlProgram implements AutoCloseable { } public void setupUniforms(List uniforms, List samplers) { - RenderSystem.assertOnRenderThread(); + int i = 0; + int j = 0; for (RenderPipeline.UniformDescription uniformDescription : uniforms) { String string = uniformDescription.name(); - int i = Uniform.glGetUniformLocation(this.programId, string); - if (i != -1) { - Uniform uniform = this.createUniform(uniformDescription); - uniform.setLocation(i); - this.uniforms.add(uniform); + + Object var10000_1 = switch (uniformDescription.type()) { + case UNIFORM_BUFFER -> { + int k = GL31.glGetUniformBlockIndex(this.programId, string); + if (k == -1) { + yield null; + } else { + int l = i++; + GL31.glUniformBlockBinding(this.programId, k, l); + yield new Uniform.Ubo(l); + } + } + case TEXEL_BUFFER -> { + int k = GlStateManager._glGetUniformLocation(this.programId, string); + if (k == -1) { + LOGGER.warn("{} shader program does not use utb {} defined in the pipeline. This might be a bug.", this.debugLabel, string); + yield null; + } else { + int l = j++; + yield new Uniform.Utb(k, l, (TextureFormat)Objects.requireNonNull(uniformDescription.textureFormat())); + } + } + }; + + Uniform uniform = (Uniform)var10000; + if (uniform != null) { this.uniformsByName.put(string, uniform); } } for (String string2 : samplers) { - int j = Uniform.glGetUniformLocation(this.programId, string2); - if (j == -1) { + int m = GlStateManager._glGetUniformLocation(this.programId, string2); + if (m == -1) { LOGGER.warn("{} shader program does not use sampler {} defined in the pipeline. This might be a bug.", this.debugLabel, string2); } else { - this.samplers.add(string2); - this.samplerLocations.add(j); + int n = j++; + this.uniformsByName.put(string2, new Uniform.Sampler(m, n)); } } - int k = GlStateManager.glGetProgrami(this.programId, 35718); + int o = GlStateManager.glGetProgrami(this.programId, 35382); - try (MemoryStack memoryStack = MemoryStack.stackPush()) { - IntBuffer intBuffer = memoryStack.mallocInt(1); - IntBuffer intBuffer2 = memoryStack.mallocInt(1); - - for (int l = 0; l < k; l++) { - String string3 = GL20.glGetActiveUniform(this.programId, l, intBuffer, intBuffer2); - UniformType uniformType = getTypeFromGl(intBuffer2.get(0)); - if (!this.uniformsByName.containsKey(string3) && !samplers.contains(string3)) { - if (uniformType != null) { - LOGGER.info("Found unknown but potentially supported uniform {} in {}", string3, this.debugLabel); - Uniform uniform2 = new Uniform(string3, uniformType); - uniform2.setLocation(l); - this.uniforms.add(uniform2); - this.uniformsByName.put(string3, uniform2); - } else { - LOGGER.warn("Found unknown and unsupported uniform {} in {}", string3, this.debugLabel); - } + for (int p = 0; p < o; p++) { + String string = GL31.glGetActiveUniformBlockName(this.programId, p); + if (!this.uniformsByName.containsKey(string)) { + if (!samplers.contains(string) && BUILT_IN_UNIFORMS.contains(string)) { + int n = i++; + GL31.glUniformBlockBinding(this.programId, p, n); + this.uniformsByName.put(string, new Uniform.Ubo(n)); + } else { + LOGGER.warn("Found unknown and unsupported uniform {} in {}", string, this.debugLabel); } } } - - this.MODEL_VIEW_MATRIX = this.getUniform("ModelViewMat"); - this.PROJECTION_MATRIX = this.getUniform("ProjMat"); - this.TEXTURE_MATRIX = this.getUniform("TextureMat"); - this.SCREEN_SIZE = this.getUniform("ScreenSize"); - this.COLOR_MODULATOR = this.getUniform("ColorModulator"); - this.LIGHT0_DIRECTION = this.getUniform("Light0_Direction"); - this.LIGHT1_DIRECTION = this.getUniform("Light1_Direction"); - this.GLINT_ALPHA = this.getUniform("GlintAlpha"); - this.FOG_START = this.getUniform("FogStart"); - this.FOG_END = this.getUniform("FogEnd"); - this.FOG_COLOR = this.getUniform("FogColor"); - this.FOG_SHAPE = this.getUniform("FogShape"); - this.LINE_WIDTH = this.getUniform("LineWidth"); - this.GAME_TIME = this.getUniform("GameTime"); - this.MODEL_OFFSET = this.getUniform("ModelOffset"); - } - - private Uniform createUniform(RenderPipeline.UniformDescription description) { - return new Uniform(description.name(), description.type()); } public void close() { - this.uniforms.forEach(Uniform::close); + this.uniformsByName.values().forEach(Uniform::close); GlStateManager.glDeleteProgram(this.programId); } - public void clear() { - RenderSystem.assertOnRenderThread(); - GlStateManager._glUseProgram(0); - int i = GlStateManager._getActiveTexture(); - - for (int j = 0; j < this.samplerLocations.size(); j++) { - String string = (String)this.samplers.get(j); - if (!this.samplerTextures.containsKey(string)) { - GlStateManager._activeTexture(33984 + j); - GlStateManager._bindTexture(0); - } - } - - GlStateManager._activeTexture(i); - } - @Nullable public Uniform getUniform(String name) { RenderSystem.assertOnRenderThread(); return (Uniform)this.uniformsByName.get(name); } - public AbstractUniform safeGetUniform(String name) { - Uniform uniform = this.getUniform(name); - return (AbstractUniform)(uniform == null ? DUMMY_UNIFORM : uniform); - } - - public void bindSampler(String name, @Nullable GpuTexture texture) { - this.samplerTextures.put(name, texture); - } - - public void setDefaultUniforms(VertexFormat.Mode mode, Matrix4f modelViewMatrix, Matrix4f projectionMatrix, float screenWidth, float screenHeight) { - for (int i = 0; i < 12; i++) { - GpuTexture gpuTexture = RenderSystem.getShaderTexture(i); - this.bindSampler("Sampler" + i, gpuTexture); - } - - if (this.MODEL_VIEW_MATRIX != null) { - this.MODEL_VIEW_MATRIX.set(modelViewMatrix); - } - - if (this.PROJECTION_MATRIX != null) { - this.PROJECTION_MATRIX.set(projectionMatrix); - } - - if (this.COLOR_MODULATOR != null) { - this.COLOR_MODULATOR.set(RenderSystem.getShaderColor()); - } - - if (this.GLINT_ALPHA != null) { - this.GLINT_ALPHA.set(RenderSystem.getShaderGlintAlpha()); - } - - FogParameters fogParameters = RenderSystem.getShaderFog(); - if (this.FOG_START != null) { - this.FOG_START.set(fogParameters.start()); - } - - if (this.FOG_END != null) { - this.FOG_END.set(fogParameters.end()); - } - - if (this.FOG_COLOR != null) { - this.FOG_COLOR.set(fogParameters.red(), fogParameters.green(), fogParameters.blue(), fogParameters.alpha()); - } - - if (this.FOG_SHAPE != null) { - this.FOG_SHAPE.set(fogParameters.shape().getIndex()); - } - - if (this.TEXTURE_MATRIX != null) { - this.TEXTURE_MATRIX.set(RenderSystem.getTextureMatrix()); - } - - if (this.GAME_TIME != null) { - this.GAME_TIME.set(RenderSystem.getShaderGameTime()); - } - - if (this.MODEL_OFFSET != null) { - this.MODEL_OFFSET.set(RenderSystem.getModelOffset()); - } - - if (this.SCREEN_SIZE != null) { - this.SCREEN_SIZE.set(screenWidth, screenHeight); - } - - if (this.LINE_WIDTH != null && (mode == VertexFormat.Mode.LINES || mode == VertexFormat.Mode.LINE_STRIP)) { - this.LINE_WIDTH.set(RenderSystem.getShaderLineWidth()); - } - - Vector3f[] vector3fs = RenderSystem.getShaderLights(); - if (this.LIGHT0_DIRECTION != null) { - this.LIGHT0_DIRECTION.set(vector3fs[0]); - } - - if (this.LIGHT1_DIRECTION != null) { - this.LIGHT1_DIRECTION.set(vector3fs[1]); - } - } - @VisibleForTesting public int getProgramId() { return this.programId; @@ -307,29 +146,7 @@ public class GlProgram implements AutoCloseable { return this.debugLabel; } - public IntList getSamplerLocations() { - return this.samplerLocations; - } - - public List getSamplers() { - return this.samplers; - } - - public List getUniforms() { - return this.uniforms; - } - - @Nullable - private static UniformType getTypeFromGl(int type) { - return switch (type) { - case 5124 -> UniformType.INT; - case 5126 -> UniformType.FLOAT; - case 35664 -> UniformType.VEC2; - case 35665 -> UniformType.VEC3; - case 35666 -> UniformType.VEC4; - case 35668 -> UniformType.IVEC3; - case 35676 -> UniformType.MATRIX4X4; - default -> null; - }; + public Map getUniforms() { + return this.uniformsByName; } } diff --git a/com/mojang/blaze3d/opengl/GlRenderPass.java b/com/mojang/blaze3d/opengl/GlRenderPass.java index b98c6067..a557e0ec 100644 --- a/com/mojang/blaze3d/opengl/GlRenderPass.java +++ b/com/mojang/blaze3d/opengl/GlRenderPass.java @@ -1,20 +1,21 @@ package com.mojang.blaze3d.opengl; import com.mojang.blaze3d.buffers.GpuBuffer; +import com.mojang.blaze3d.buffers.GpuBufferSlice; import com.mojang.blaze3d.pipeline.RenderPipeline; import com.mojang.blaze3d.systems.RenderPass; import com.mojang.blaze3d.systems.ScissorState; -import com.mojang.blaze3d.textures.GpuTexture; +import com.mojang.blaze3d.textures.GpuTextureView; import com.mojang.blaze3d.vertex.VertexFormat; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.Set; +import java.util.function.Supplier; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.SharedConstants; import org.jetbrains.annotations.Nullable; -import org.joml.Matrix4f; @Environment(EnvType.CLIENT) public class GlRenderPass implements RenderPass { @@ -29,11 +30,11 @@ public class GlRenderPass implements RenderPass { @Nullable protected GpuBuffer indexBuffer; protected VertexFormat.IndexType indexType = VertexFormat.IndexType.INT; - protected final ScissorState scissorState = new ScissorState(); - protected final HashMap uniforms = new HashMap(); - protected final HashMap samplers = new HashMap(); + private final ScissorState scissorState = new ScissorState(); + protected final HashMap uniforms = new HashMap(); + protected final HashMap samplers = new HashMap(); protected final Set dirtyUniforms = new HashSet(); - protected final Set dirtySamplers = new HashSet(); + protected int pushedDebugGroups; public GlRenderPass(GlCommandEncoder encoder, boolean hasDepthTexture) { this.encoder = encoder; @@ -44,43 +45,64 @@ public class GlRenderPass implements RenderPass { return this.hasDepthTexture; } + @Override + public void pushDebugGroup(Supplier supplier) { + if (this.closed) { + throw new IllegalStateException("Can't use a closed render pass"); + } else { + this.pushedDebugGroups++; + this.encoder.getDevice().debugLabels().pushDebugGroup(supplier); + } + } + + @Override + public void popDebugGroup() { + if (this.closed) { + throw new IllegalStateException("Can't use a closed render pass"); + } else if (this.pushedDebugGroups == 0) { + throw new IllegalStateException("Can't pop more debug groups than was pushed!"); + } else { + this.pushedDebugGroups--; + this.encoder.getDevice().debugLabels().popDebugGroup(); + } + } + @Override public void setPipeline(RenderPipeline renderPipeline) { if (this.pipeline == null || this.pipeline.info() != renderPipeline) { this.dirtyUniforms.addAll(this.uniforms.keySet()); - this.dirtySamplers.addAll(this.samplers.keySet()); + this.dirtyUniforms.addAll(this.samplers.keySet()); } this.pipeline = this.encoder.getDevice().getOrCompilePipeline(renderPipeline); } @Override - public void bindSampler(String string, GpuTexture gpuTexture) { - this.samplers.put(string, gpuTexture); - this.dirtySamplers.add(string); - } + public void bindSampler(String string, @Nullable GpuTextureView gpuTextureView) { + if (gpuTextureView == null) { + this.samplers.remove(string); + } else { + this.samplers.put(string, gpuTextureView); + } - @Override - public void setUniform(String string, int... is) { - this.uniforms.put(string, is); this.dirtyUniforms.add(string); } @Override - public void setUniform(String string, float... fs) { - this.uniforms.put(string, fs); + public void setUniform(String string, GpuBuffer gpuBuffer) { + this.uniforms.put(string, gpuBuffer.slice()); this.dirtyUniforms.add(string); } @Override - public void setUniform(String string, Matrix4f matrix4f) { - this.uniforms.put(string, matrix4f.get(new float[16])); - this.dirtyUniforms.add(string); - } - - @Override - public void enableScissor(ScissorState scissorState) { - this.scissorState.copyFrom(scissorState); + public void setUniform(String string, GpuBufferSlice gpuBufferSlice) { + int i = this.encoder.getDevice().getUniformOffsetAlignment(); + if (gpuBufferSlice.offset() % i > 0) { + throw new IllegalArgumentException("Uniform buffer offset must be aligned to " + i); + } else { + this.uniforms.put(string, gpuBufferSlice); + this.dirtyUniforms.add(string); + } } @Override @@ -93,6 +115,26 @@ public class GlRenderPass implements RenderPass { this.scissorState.disable(); } + public boolean isScissorEnabled() { + return this.scissorState.enabled(); + } + + public int getScissorX() { + return this.scissorState.x(); + } + + public int getScissorY() { + return this.scissorState.y(); + } + + public int getScissorWidth() { + return this.scissorState.width(); + } + + public int getScissorHeight() { + return this.scissorState.height(); + } + @Override public void setVertexBuffer(int i, GpuBuffer gpuBuffer) { if (i >= 0 && i < 1) { @@ -109,20 +151,26 @@ public class GlRenderPass implements RenderPass { } @Override - public void drawIndexed(int i, int j) { + public void drawIndexed(int i, int j, int k, int l) { if (this.closed) { throw new IllegalStateException("Can't use a closed render pass"); } else { - this.encoder.executeDraw(this, i, j, this.indexType); + this.encoder.executeDraw(this, i, j, k, this.indexType, l); } } @Override - public void drawMultipleIndexed(Collection collection, @Nullable GpuBuffer gpuBuffer, @Nullable VertexFormat.IndexType indexType) { + public void drawMultipleIndexed( + Collection> collection, + @Nullable GpuBuffer gpuBuffer, + @Nullable VertexFormat.IndexType indexType, + Collection collection2, + T object + ) { if (this.closed) { throw new IllegalStateException("Can't use a closed render pass"); } else { - this.encoder.executeDrawMultiple(this, collection, gpuBuffer, indexType); + this.encoder.executeDrawMultiple(this, collection, gpuBuffer, indexType, collection2, object); } } @@ -131,13 +179,17 @@ public class GlRenderPass implements RenderPass { if (this.closed) { throw new IllegalStateException("Can't use a closed render pass"); } else { - this.encoder.executeDraw(this, i, j, null); + this.encoder.executeDraw(this, i, 0, j, null, 1); } } @Override public void close() { if (!this.closed) { + if (this.pushedDebugGroups > 0) { + throw new IllegalStateException("Render pass had debug groups left open!"); + } + this.closed = true; this.encoder.finishRenderPass(); } diff --git a/com/mojang/blaze3d/opengl/GlRenderPipeline.java b/com/mojang/blaze3d/opengl/GlRenderPipeline.java index 7db5639a..0e01c5cf 100644 --- a/com/mojang/blaze3d/opengl/GlRenderPipeline.java +++ b/com/mojang/blaze3d/opengl/GlRenderPipeline.java @@ -7,11 +7,6 @@ import net.fabricmc.api.Environment; @Environment(EnvType.CLIENT) public record GlRenderPipeline(RenderPipeline info, GlProgram program) implements CompiledRenderPipeline { - @Override - public boolean containsUniform(String string) { - return this.program.getUniform(string) != null; - } - @Override public boolean isValid() { return this.program != GlProgram.INVALID_PROGRAM; diff --git a/com/mojang/blaze3d/opengl/GlStateManager.java b/com/mojang/blaze3d/opengl/GlStateManager.java index f53ba0d8..709e1381 100644 --- a/com/mojang/blaze3d/opengl/GlStateManager.java +++ b/com/mojang/blaze3d/opengl/GlStateManager.java @@ -23,7 +23,6 @@ import org.lwjgl.opengl.GL20; import org.lwjgl.opengl.GL20C; import org.lwjgl.opengl.GL30; import org.lwjgl.opengl.GL32; -import org.lwjgl.opengl.GL32C; import org.lwjgl.system.MemoryStack; import org.lwjgl.system.MemoryUtil; @@ -278,12 +277,6 @@ public class GlStateManager { public static void _glDeleteBuffers(int i) { RenderSystem.assertOnRenderThread(); - if (ON_LINUX) { - GL32C.glBindBuffer(34962, i); - GL32C.glBufferData(34962, 0L, 35048); - GL32C.glBindBuffer(34962, 0); - } - numBuffers--; PLOT_BUFFERS.setValue(numBuffers); GL15.glDeleteBuffers(i); diff --git a/com/mojang/blaze3d/opengl/GlTexture.java b/com/mojang/blaze3d/opengl/GlTexture.java index 0135c300..19a58a3a 100644 --- a/com/mojang/blaze3d/opengl/GlTexture.java +++ b/com/mojang/blaze3d/opengl/GlTexture.java @@ -18,9 +18,10 @@ public class GlTexture extends GpuTexture { private final Int2IntMap fboCache = new Int2IntOpenHashMap(); protected boolean closed; protected boolean modesDirty = true; + private int views; - protected GlTexture(String label, TextureFormat format, int width, int height, int mipLevels, int id) { - super(label, format, width, height, mipLevels); + protected GlTexture(int usage, String label, TextureFormat format, int width, int height, int depthOrLayers, int mipLevels, int id) { + super(usage, label, format, width, height, depthOrLayers, mipLevels); this.id = id; } @@ -28,16 +29,22 @@ public class GlTexture extends GpuTexture { public void close() { if (!this.closed) { this.closed = true; - GlStateManager._deleteTexture(this.id); - IntIterator var1 = this.fboCache.values().iterator(); - - while (var1.hasNext()) { - int i = (Integer)var1.next(); - GlStateManager._glDeleteFramebuffers(i); + if (this.views == 0) { + this.destroyImmediately(); } } } + private void destroyImmediately() { + GlStateManager._deleteTexture(this.id); + IntIterator var1 = this.fboCache.values().iterator(); + + while (var1.hasNext()) { + int i = (Integer)var1.next(); + GlStateManager._glDeleteFramebuffers(i); + } + } + @Override public boolean isClosed() { return this.closed; @@ -52,24 +59,24 @@ public class GlTexture extends GpuTexture { })); } - public void flushModeChanges() { + public void flushModeChanges(int target) { if (this.modesDirty) { - GlStateManager._texParameter(3553, 10242, GlConst.toGl(this.addressModeU)); - GlStateManager._texParameter(3553, 10243, GlConst.toGl(this.addressModeV)); + GlStateManager._texParameter(target, 10242, GlConst.toGl(this.addressModeU)); + GlStateManager._texParameter(target, 10243, GlConst.toGl(this.addressModeV)); switch (this.minFilter) { case NEAREST: - GlStateManager._texParameter(3553, 10241, this.useMipmaps ? 9986 : 9728); + GlStateManager._texParameter(target, 10241, this.useMipmaps ? 9986 : 9728); break; case LINEAR: - GlStateManager._texParameter(3553, 10241, this.useMipmaps ? 9987 : 9729); + GlStateManager._texParameter(target, 10241, this.useMipmaps ? 9987 : 9729); } switch (this.magFilter) { case NEAREST: - GlStateManager._texParameter(3553, 10240, 9728); + GlStateManager._texParameter(target, 10240, 9728); break; case LINEAR: - GlStateManager._texParameter(3553, 10240, 9729); + GlStateManager._texParameter(target, 10240, 9729); } this.modesDirty = false; @@ -91,4 +98,21 @@ public class GlTexture extends GpuTexture { super.setTextureFilter(filterMode, filterMode2, bl); this.modesDirty = true; } + + @Override + public void setUseMipmaps(boolean bl) { + super.setUseMipmaps(bl); + this.modesDirty = true; + } + + public void addViews() { + this.views++; + } + + public void removeViews() { + this.views--; + if (this.closed && this.views == 0) { + this.destroyImmediately(); + } + } } diff --git a/com/mojang/blaze3d/opengl/GlTextureView.java b/com/mojang/blaze3d/opengl/GlTextureView.java new file mode 100644 index 00000000..adb6d3e9 --- /dev/null +++ b/com/mojang/blaze3d/opengl/GlTextureView.java @@ -0,0 +1,32 @@ +package com.mojang.blaze3d.opengl; + +import com.mojang.blaze3d.textures.GpuTextureView; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; + +@Environment(EnvType.CLIENT) +public class GlTextureView extends GpuTextureView { + private boolean closed; + + protected GlTextureView(GlTexture texture, int baseMipLevel, int mipLevels) { + super(texture, baseMipLevel, mipLevels); + texture.addViews(); + } + + @Override + public boolean isClosed() { + return this.closed; + } + + @Override + public void close() { + if (!this.closed) { + this.closed = true; + this.texture().removeViews(); + } + } + + public GlTexture texture() { + return (GlTexture)super.texture(); + } +} diff --git a/com/mojang/blaze3d/opengl/Uniform.java b/com/mojang/blaze3d/opengl/Uniform.java index f7e8c25f..aea87d00 100644 --- a/com/mojang/blaze3d/opengl/Uniform.java +++ b/com/mojang/blaze3d/opengl/Uniform.java @@ -1,189 +1,31 @@ package com.mojang.blaze3d.opengl; -import com.mojang.blaze3d.shaders.UniformType; -import com.mojang.logging.LogUtils; -import java.nio.FloatBuffer; -import java.nio.IntBuffer; +import com.mojang.blaze3d.textures.TextureFormat; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import org.joml.Matrix4f; -import org.joml.Vector3f; -import org.lwjgl.system.MemoryUtil; -import org.slf4j.Logger; @Environment(EnvType.CLIENT) -public class Uniform extends AbstractUniform implements AutoCloseable { - private static final Logger LOGGER = LogUtils.getLogger(); - private int location; - private final UniformType type; - private final IntBuffer intValues; - private final FloatBuffer floatValues; - private final String name; - private boolean dirty; +public sealed interface Uniform extends AutoCloseable permits Uniform.Ubo, Uniform.Utb, Uniform.Sampler { + default void close() { + } - public Uniform(String name, UniformType type) { - this.name = name; - this.type = type; - if (type.isIntStorage()) { - this.intValues = MemoryUtil.memAllocInt(type.count()); - this.floatValues = null; - } else { - this.intValues = null; - this.floatValues = MemoryUtil.memAllocFloat(type.count()); + @Environment(EnvType.CLIENT) + public record Sampler(int location, int samplerIndex) implements Uniform { + } + + @Environment(EnvType.CLIENT) + public record Ubo(int blockBinding) implements Uniform { + } + + @Environment(EnvType.CLIENT) + public record Utb(int location, int samplerIndex, TextureFormat format, int texture) implements Uniform { + public Utb(int location, int samplerIndex, TextureFormat format) { + this(location, samplerIndex, format, GlStateManager._genTexture()); } - this.location = -1; - } - - public static int glGetUniformLocation(int program, CharSequence name) { - return GlStateManager._glGetUniformLocation(program, name); - } - - public static void uploadInteger(int location, int value) { - GlStateManager._glUniform1i(location, value); - } - - public void close() { - if (this.intValues != null) { - MemoryUtil.memFree(this.intValues); - } - - if (this.floatValues != null) { - MemoryUtil.memFree(this.floatValues); - } - } - - public void setLocation(int location) { - this.location = location; - } - - public String getName() { - return this.name; - } - - public UniformType getType() { - return this.type; - } - - @Override - public final void set(float value) { - this.floatValues.position(0); - this.floatValues.put(0, value); - this.dirty = true; - } - - @Override - public final void set(float value1, float value2) { - this.floatValues.position(0); - this.floatValues.put(0, value1); - this.floatValues.put(1, value2); - this.dirty = true; - } - - @Override - public final void set(float value1, float value2, float value3) { - this.floatValues.position(0); - this.floatValues.put(0, value1); - this.floatValues.put(1, value2); - this.floatValues.put(2, value3); - this.dirty = true; - } - - @Override - public final void set(Vector3f values) { - this.floatValues.position(0); - values.get(this.floatValues); - this.dirty = true; - } - - @Override - public final void set(float value1, float value2, float value3, float value4) { - this.floatValues.position(0); - this.floatValues.put(value1); - this.floatValues.put(value2); - this.floatValues.put(value3); - this.floatValues.put(value4); - this.floatValues.flip(); - this.dirty = true; - } - - @Override - public final void set(int value) { - this.intValues.position(0); - this.intValues.put(0, value); - this.dirty = true; - } - - @Override - public final void set(int value1, int value2, int value3) { - this.intValues.position(0); - this.intValues.put(0, value1); - this.intValues.put(1, value2); - this.intValues.put(2, value3); - this.dirty = true; - } - - @Override - public final void set(float[] values) { - if (values.length < this.type.count()) { - LOGGER.warn("Uniform.set called with a too-small value array (expected {}, got {}). Ignoring.", this.type.count(), values.length); - } else { - this.floatValues.position(0); - this.floatValues.put(values); - this.floatValues.position(0); - this.dirty = true; - } - } - - @Override - public final void set(int[] values) { - if (values.length < this.type.count()) { - LOGGER.warn("Uniform.set called with a too-small value array (expected {}, got {}). Ignoring.", this.type.count(), values.length); - } else { - this.intValues.position(0); - this.intValues.put(values); - this.intValues.position(0); - this.dirty = true; - } - } - - @Override - public final void set(Matrix4f values) { - this.floatValues.position(0); - values.get(this.floatValues); - this.dirty = true; - } - - public void upload() { - if (this.dirty) { - if (this.type.isIntStorage()) { - switch (this.type) { - case INT: - GlStateManager._glUniform1(this.location, this.intValues); - break; - case IVEC3: - GlStateManager._glUniform3(this.location, this.intValues); - } - } else { - switch (this.type) { - case FLOAT: - GlStateManager._glUniform1(this.location, this.floatValues); - break; - case VEC2: - GlStateManager._glUniform2(this.location, this.floatValues); - break; - case VEC3: - GlStateManager._glUniform3(this.location, this.floatValues); - break; - case VEC4: - GlStateManager._glUniform4(this.location, this.floatValues); - break; - case MATRIX4X4: - GlStateManager._glUniformMatrix4(this.location, this.floatValues); - } - } - - this.dirty = false; + @Override + public void close() { + GlStateManager._deleteTexture(this.texture); } } } diff --git a/com/mojang/blaze3d/opengl/VertexArrayCache.java b/com/mojang/blaze3d/opengl/VertexArrayCache.java index f7c25b9c..1e679b6e 100644 --- a/com/mojang/blaze3d/opengl/VertexArrayCache.java +++ b/com/mojang/blaze3d/opengl/VertexArrayCache.java @@ -68,16 +68,6 @@ public abstract class VertexArrayCache { switch (vertexFormatElement.usage()) { case POSITION: case GENERIC: - GlStateManager._vertexAttribPointer( - j, vertexFormatElement.count(), GlConst.toGl(vertexFormatElement.type()), false, i, vertexFormat.getOffset(vertexFormatElement) - ); - break; - case NORMAL: - case COLOR: - GlStateManager._vertexAttribPointer( - j, vertexFormatElement.count(), GlConst.toGl(vertexFormatElement.type()), true, i, vertexFormat.getOffset(vertexFormatElement) - ); - break; case UV: if (vertexFormatElement.type() == VertexFormatElement.Type.FLOAT) { GlStateManager._vertexAttribPointer( @@ -88,6 +78,12 @@ public abstract class VertexArrayCache { j, vertexFormatElement.count(), GlConst.toGl(vertexFormatElement.type()), i, vertexFormat.getOffset(vertexFormatElement) ); } + break; + case NORMAL: + case COLOR: + GlStateManager._vertexAttribPointer( + j, vertexFormatElement.count(), GlConst.toGl(vertexFormatElement.type()), true, i, vertexFormat.getOffset(vertexFormatElement) + ); } } } @@ -97,9 +93,16 @@ public abstract class VertexArrayCache { static class Separate extends VertexArrayCache { private final Map cache = new HashMap(); private final GlDebugLabel debugLabels; + private final boolean needsMesaWorkaround; public Separate(GlDebugLabel debugLabels) { this.debugLabels = debugLabels; + if ("Mesa".equals(GlStateManager._getString(7936))) { + String string = GlStateManager._getString(7938); + this.needsMesaWorkaround = string.contains("25.0.0") || string.contains("25.0.1") || string.contains("25.0.2"); + } else { + this.needsMesaWorkaround = false; + } } @Override @@ -117,16 +120,6 @@ public abstract class VertexArrayCache { switch (vertexFormatElement.usage()) { case POSITION: case GENERIC: - ARBVertexAttribBinding.glVertexAttribFormat( - j, vertexFormatElement.count(), GlConst.toGl(vertexFormatElement.type()), false, format.getOffset(vertexFormatElement) - ); - break; - case NORMAL: - case COLOR: - ARBVertexAttribBinding.glVertexAttribFormat( - j, vertexFormatElement.count(), GlConst.toGl(vertexFormatElement.type()), true, format.getOffset(vertexFormatElement) - ); - break; case UV: if (vertexFormatElement.type() == VertexFormatElement.Type.FLOAT) { ARBVertexAttribBinding.glVertexAttribFormat( @@ -137,6 +130,12 @@ public abstract class VertexArrayCache { j, vertexFormatElement.count(), GlConst.toGl(vertexFormatElement.type()), format.getOffset(vertexFormatElement) ); } + break; + case NORMAL: + case COLOR: + ARBVertexAttribBinding.glVertexAttribFormat( + j, vertexFormatElement.count(), GlConst.toGl(vertexFormatElement.type()), true, format.getOffset(vertexFormatElement) + ); } ARBVertexAttribBinding.glVertexAttribBinding(j, 0); @@ -148,7 +147,7 @@ public abstract class VertexArrayCache { } else { GlStateManager._glBindVertexArray(vertexArray.id); if (vertexArray.lastVertexBuffer != buffer) { - if (vertexArray.lastVertexBuffer != null && vertexArray.lastVertexBuffer.handle == buffer.handle) { + if (this.needsMesaWorkaround && vertexArray.lastVertexBuffer != null && vertexArray.lastVertexBuffer.handle == buffer.handle) { ARBVertexAttribBinding.glBindVertexBuffer(0, 0, 0L, 0); } diff --git a/com/mojang/blaze3d/pipeline/BlendFunction.java b/com/mojang/blaze3d/pipeline/BlendFunction.java index a8b7ccbd..bca767d4 100644 --- a/com/mojang/blaze3d/pipeline/BlendFunction.java +++ b/com/mojang/blaze3d/pipeline/BlendFunction.java @@ -15,8 +15,10 @@ public record BlendFunction(SourceFactor sourceColor, DestFactor destColor, Sour public static final BlendFunction TRANSLUCENT = new BlendFunction( SourceFactor.SRC_ALPHA, DestFactor.ONE_MINUS_SRC_ALPHA, SourceFactor.ONE, DestFactor.ONE_MINUS_SRC_ALPHA ); + public static final BlendFunction TRANSLUCENT_PREMULTIPLIED_ALPHA = new BlendFunction( + SourceFactor.ONE, DestFactor.ONE_MINUS_SRC_ALPHA, SourceFactor.ONE, DestFactor.ONE_MINUS_SRC_ALPHA + ); public static final BlendFunction ADDITIVE = new BlendFunction(SourceFactor.ONE, DestFactor.ONE); - public static final BlendFunction PANORAMA = new BlendFunction(SourceFactor.SRC_ALPHA, DestFactor.ONE_MINUS_SRC_ALPHA, SourceFactor.ONE, DestFactor.ZERO); public static final BlendFunction ENTITY_OUTLINE_BLIT = new BlendFunction( SourceFactor.SRC_ALPHA, DestFactor.ONE_MINUS_SRC_ALPHA, SourceFactor.ZERO, DestFactor.ONE ); diff --git a/com/mojang/blaze3d/pipeline/CompiledRenderPipeline.java b/com/mojang/blaze3d/pipeline/CompiledRenderPipeline.java index 1b3861c0..4d121bd1 100644 --- a/com/mojang/blaze3d/pipeline/CompiledRenderPipeline.java +++ b/com/mojang/blaze3d/pipeline/CompiledRenderPipeline.java @@ -7,7 +7,5 @@ import net.fabricmc.api.Environment; @Environment(EnvType.CLIENT) @DontObfuscate public interface CompiledRenderPipeline { - boolean containsUniform(String string); - boolean isValid(); } diff --git a/com/mojang/blaze3d/pipeline/MainTarget.java b/com/mojang/blaze3d/pipeline/MainTarget.java index d5a77a23..d3d5e3fe 100644 --- a/com/mojang/blaze3d/pipeline/MainTarget.java +++ b/com/mojang/blaze3d/pipeline/MainTarget.java @@ -49,14 +49,26 @@ public class MainTarget extends RenderTarget { this.colorTexture = null; } + if (this.colorTextureView != null) { + this.colorTextureView.close(); + this.colorTextureView = null; + } + if (this.depthTexture != null) { this.depthTexture.close(); this.depthTexture = null; } + if (this.depthTextureView != null) { + this.depthTextureView.close(); + this.depthTextureView = null; + } + this.colorTexture = this.allocateColorAttachment(dimension); this.depthTexture = this.allocateDepthAttachment(dimension); if (this.colorTexture != null && this.depthTexture != null) { + this.colorTextureView = RenderSystem.getDevice().createTextureView(this.colorTexture); + this.depthTextureView = RenderSystem.getDevice().createTextureView(this.depthTexture); return dimension; } } @@ -73,7 +85,7 @@ public class MainTarget extends RenderTarget { @Nullable private GpuTexture allocateColorAttachment(MainTarget.Dimension dimension) { try { - return RenderSystem.getDevice().createTexture(() -> this.label + " / Color", TextureFormat.RGBA8, dimension.width, dimension.height, 1); + return RenderSystem.getDevice().createTexture(() -> this.label + " / Color", 15, TextureFormat.RGBA8, dimension.width, dimension.height, 1, 1); } catch (GpuOutOfMemoryException var3) { return null; } @@ -82,7 +94,7 @@ public class MainTarget extends RenderTarget { @Nullable private GpuTexture allocateDepthAttachment(MainTarget.Dimension dimension) { try { - return RenderSystem.getDevice().createTexture(() -> this.label + " / Depth", TextureFormat.DEPTH32, dimension.width, dimension.height, 1); + return RenderSystem.getDevice().createTexture(() -> this.label + " / Depth", 15, TextureFormat.DEPTH32, dimension.width, dimension.height, 1, 1); } catch (GpuOutOfMemoryException var3) { return null; } diff --git a/com/mojang/blaze3d/pipeline/RenderPipeline.java b/com/mojang/blaze3d/pipeline/RenderPipeline.java index a5ca7f89..ac8719e9 100644 --- a/com/mojang/blaze3d/pipeline/RenderPipeline.java +++ b/com/mojang/blaze3d/pipeline/RenderPipeline.java @@ -5,6 +5,7 @@ import com.mojang.blaze3d.platform.DepthTestFunction; import com.mojang.blaze3d.platform.LogicOp; import com.mojang.blaze3d.platform.PolygonMode; import com.mojang.blaze3d.shaders.UniformType; +import com.mojang.blaze3d.textures.TextureFormat; import com.mojang.blaze3d.vertex.VertexFormat; import java.util.ArrayList; import java.util.Collection; @@ -16,6 +17,7 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.renderer.ShaderDefines; import net.minecraft.resources.ResourceLocation; +import org.jetbrains.annotations.Nullable; @Environment(EnvType.CLIENT) @DontObfuscate @@ -38,6 +40,8 @@ public class RenderPipeline { private final VertexFormat.Mode vertexFormatMode; private final float depthBiasScaleFactor; private final float depthBiasConstant; + private final int sortKey; + private static int sortKeySeed; protected RenderPipeline( ResourceLocation resourceLocation, @@ -57,7 +61,8 @@ public class RenderPipeline { VertexFormat vertexFormat, VertexFormat.Mode mode, float f, - float g + float g, + int i ) { this.location = resourceLocation; this.vertexShader = resourceLocation2; @@ -77,6 +82,15 @@ public class RenderPipeline { this.vertexFormatMode = mode; this.depthBiasScaleFactor = f; this.depthBiasConstant = g; + this.sortKey = i; + } + + public int getSortKey() { + return this.sortKey; + } + + public static void updateSortKeySeed() { + sortKeySeed = Math.round(100000.0F * (float)Math.random()); } public String toString() { @@ -172,6 +186,7 @@ public class RenderPipeline { @Environment(EnvType.CLIENT) @DontObfuscate public static class Builder { + private static int nextPipelineSortKey; private Optional location = Optional.empty(); private Optional fragmentShader = Optional.empty(); private Optional vertexShader = Optional.empty(); @@ -265,8 +280,25 @@ public class RenderPipeline { this.uniforms = Optional.of(new ArrayList()); } - ((List)this.uniforms.get()).add(new RenderPipeline.UniformDescription(string, uniformType)); - return this; + if (uniformType == UniformType.TEXEL_BUFFER) { + throw new IllegalArgumentException("Cannot use texel buffer without specifying texture format"); + } else { + ((List)this.uniforms.get()).add(new RenderPipeline.UniformDescription(string, uniformType)); + return this; + } + } + + public RenderPipeline.Builder withUniform(String string, UniformType uniformType, TextureFormat textureFormat) { + if (this.uniforms.isEmpty()) { + this.uniforms = Optional.of(new ArrayList()); + } + + if (uniformType != UniformType.TEXEL_BUFFER) { + throw new IllegalArgumentException("Only texel buffer can specify texture format"); + } else { + ((List)this.uniforms.get()).add(new RenderPipeline.UniformDescription(string, textureFormat)); + return this; + } } public RenderPipeline.Builder withDepthTestFunction(DepthTestFunction depthTestFunction) { @@ -454,7 +486,8 @@ public class RenderPipeline { (VertexFormat)this.vertexFormat.get(), (VertexFormat.Mode)this.vertexFormatMode.get(), this.depthBiasScaleFactor, - this.depthBiasConstant + this.depthBiasConstant, + nextPipelineSortKey++ ); } } @@ -483,6 +516,16 @@ public class RenderPipeline { @Environment(EnvType.CLIENT) @DontObfuscate - public record UniformDescription(String name, UniformType type) { + public record UniformDescription(String name, UniformType type, @Nullable TextureFormat textureFormat) { + public UniformDescription(String string, UniformType uniformType) { + this(string, uniformType, null); + if (uniformType == UniformType.TEXEL_BUFFER) { + throw new IllegalArgumentException("Texel buffer needs a texture format"); + } + } + + public UniformDescription(String string, TextureFormat textureFormat) { + this(string, UniformType.TEXEL_BUFFER, textureFormat); + } } } diff --git a/com/mojang/blaze3d/pipeline/RenderTarget.java b/com/mojang/blaze3d/pipeline/RenderTarget.java index 585d1347..7dac7d3e 100644 --- a/com/mojang/blaze3d/pipeline/RenderTarget.java +++ b/com/mojang/blaze3d/pipeline/RenderTarget.java @@ -1,11 +1,13 @@ package com.mojang.blaze3d.pipeline; import com.mojang.blaze3d.buffers.GpuBuffer; +import com.mojang.blaze3d.systems.GpuDevice; import com.mojang.blaze3d.systems.RenderPass; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.textures.AddressMode; import com.mojang.blaze3d.textures.FilterMode; import com.mojang.blaze3d.textures.GpuTexture; +import com.mojang.blaze3d.textures.GpuTextureView; import com.mojang.blaze3d.textures.TextureFormat; import com.mojang.blaze3d.vertex.VertexFormat; import java.util.OptionalInt; @@ -26,7 +28,11 @@ public abstract class RenderTarget { @Nullable protected GpuTexture colorTexture; @Nullable + protected GpuTextureView colorTextureView; + @Nullable protected GpuTexture depthTexture; + @Nullable + protected GpuTextureView depthTextureView; public FilterMode filterMode; public RenderTarget(@Nullable String name, boolean useDepth) { @@ -47,10 +53,20 @@ public abstract class RenderTarget { this.depthTexture = null; } + if (this.depthTextureView != null) { + this.depthTextureView.close(); + this.depthTextureView = null; + } + if (this.colorTexture != null) { this.colorTexture.close(); this.colorTexture = null; } + + if (this.colorTextureView != null) { + this.colorTextureView.close(); + this.colorTextureView = null; + } } public void copyDepthFrom(RenderTarget otherTarget) { @@ -66,19 +82,22 @@ public abstract class RenderTarget { public void createBuffers(int width, int height) { RenderSystem.assertOnRenderThread(); - int i = RenderSystem.getDevice().getMaxTextureSize(); + GpuDevice gpuDevice = RenderSystem.getDevice(); + int i = gpuDevice.getMaxTextureSize(); if (width > 0 && width <= i && height > 0 && height <= i) { this.viewWidth = width; this.viewHeight = height; this.width = width; this.height = height; if (this.useDepth) { - this.depthTexture = RenderSystem.getDevice().createTexture(() -> this.label + " / Depth", TextureFormat.DEPTH32, width, height, 1); + this.depthTexture = gpuDevice.createTexture(() -> this.label + " / Depth", 15, TextureFormat.DEPTH32, width, height, 1, 1); + this.depthTextureView = gpuDevice.createTextureView(this.depthTexture); this.depthTexture.setTextureFilter(FilterMode.NEAREST, false); this.depthTexture.setAddressMode(AddressMode.CLAMP_TO_EDGE); } - this.colorTexture = RenderSystem.getDevice().createTexture(() -> this.label + " / Color", TextureFormat.RGBA8, width, height, 1); + this.colorTexture = gpuDevice.createTexture(() -> this.label + " / Color", 15, TextureFormat.RGBA8, width, height, 1, 1); + this.colorTextureView = gpuDevice.createTextureView(this.colorTexture); this.colorTexture.setAddressMode(AddressMode.CLAMP_TO_EDGE); this.setFilterMode(FilterMode.NEAREST, true); } else { @@ -105,22 +124,23 @@ public abstract class RenderTarget { if (this.colorTexture == null) { throw new IllegalStateException("Can't blit to screen, color texture doesn't exist yet"); } else { - RenderSystem.getDevice().createCommandEncoder().presentTexture(this.colorTexture); + RenderSystem.getDevice().createCommandEncoder().presentTexture(this.colorTextureView); } } - public void blitAndBlendToTexture(GpuTexture texture) { + public void blitAndBlendToTexture(GpuTextureView textureView) { RenderSystem.assertOnRenderThread(); RenderSystem.AutoStorageIndexBuffer autoStorageIndexBuffer = RenderSystem.getSequentialBuffer(VertexFormat.Mode.QUADS); GpuBuffer gpuBuffer = autoStorageIndexBuffer.getBuffer(6); GpuBuffer gpuBuffer2 = RenderSystem.getQuadVertexBuffer(); - try (RenderPass renderPass = RenderSystem.getDevice().createCommandEncoder().createRenderPass(texture, OptionalInt.empty())) { + try (RenderPass renderPass = RenderSystem.getDevice().createCommandEncoder().createRenderPass(() -> "Blit render target", textureView, OptionalInt.empty())) { renderPass.setPipeline(RenderPipelines.ENTITY_OUTLINE_BLIT); + RenderSystem.bindDefaultUniforms(renderPass); renderPass.setVertexBuffer(0, gpuBuffer2); renderPass.setIndexBuffer(gpuBuffer, autoStorageIndexBuffer.type()); - renderPass.bindSampler("InSampler", this.colorTexture); - renderPass.drawIndexed(0, 6); + renderPass.bindSampler("InSampler", this.colorTextureView); + renderPass.drawIndexed(0, 0, 6, 1); } } @@ -129,8 +149,18 @@ public abstract class RenderTarget { return this.colorTexture; } + @Nullable + public GpuTextureView getColorTextureView() { + return this.colorTextureView; + } + @Nullable public GpuTexture getDepthTexture() { return this.depthTexture; } + + @Nullable + public GpuTextureView getDepthTextureView() { + return this.depthTextureView; + } } diff --git a/com/mojang/blaze3d/platform/Lighting.java b/com/mojang/blaze3d/platform/Lighting.java index 0738d552..64af1cdd 100644 --- a/com/mojang/blaze3d/platform/Lighting.java +++ b/com/mojang/blaze3d/platform/Lighting.java @@ -1,41 +1,83 @@ package com.mojang.blaze3d.platform; +import com.mojang.blaze3d.buffers.GpuBuffer; +import com.mojang.blaze3d.buffers.Std140Builder; +import com.mojang.blaze3d.buffers.Std140SizeCalculator; +import com.mojang.blaze3d.systems.GpuDevice; import com.mojang.blaze3d.systems.RenderSystem; +import java.nio.ByteBuffer; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import org.joml.Quaternionf; +import net.minecraft.util.Mth; +import org.joml.Matrix4f; import org.joml.Vector3f; +import org.lwjgl.system.MemoryStack; @Environment(EnvType.CLIENT) -public class Lighting { +public class Lighting implements AutoCloseable { private static final Vector3f DIFFUSE_LIGHT_0 = new Vector3f(0.2F, 1.0F, -0.7F).normalize(); private static final Vector3f DIFFUSE_LIGHT_1 = new Vector3f(-0.2F, 1.0F, 0.7F).normalize(); private static final Vector3f NETHER_DIFFUSE_LIGHT_0 = new Vector3f(0.2F, 1.0F, -0.7F).normalize(); private static final Vector3f NETHER_DIFFUSE_LIGHT_1 = new Vector3f(-0.2F, -1.0F, 0.7F).normalize(); private static final Vector3f INVENTORY_DIFFUSE_LIGHT_0 = new Vector3f(0.2F, -1.0F, 1.0F).normalize(); private static final Vector3f INVENTORY_DIFFUSE_LIGHT_1 = new Vector3f(-0.2F, -1.0F, 0.0F).normalize(); + public static final int UBO_SIZE = new Std140SizeCalculator().putVec3().putVec3().get(); + private final GpuBuffer buffer; + private final int paddedSize; - public static void setupNetherLevel() { - RenderSystem.setupLevelDiffuseLighting(NETHER_DIFFUSE_LIGHT_0, NETHER_DIFFUSE_LIGHT_1); + public Lighting() { + GpuDevice gpuDevice = RenderSystem.getDevice(); + this.paddedSize = Mth.roundToward(UBO_SIZE, gpuDevice.getUniformOffsetAlignment()); + this.buffer = gpuDevice.createBuffer(() -> "Lighting UBO", 136, this.paddedSize * Lighting.Entry.values().length); + Matrix4f matrix4f = new Matrix4f().rotationY((float) (-Math.PI / 8)).rotateX((float) (Math.PI * 3.0 / 4.0)); + this.updateBuffer( + Lighting.Entry.ITEMS_FLAT, matrix4f.transformDirection(DIFFUSE_LIGHT_0, new Vector3f()), matrix4f.transformDirection(DIFFUSE_LIGHT_1, new Vector3f()) + ); + Matrix4f matrix4f2 = new Matrix4f() + .scaling(1.0F, -1.0F, 1.0F) + .rotateYXZ(1.0821041F, 3.2375858F, 0.0F) + .rotateYXZ((float) (-Math.PI / 8), (float) (Math.PI * 3.0 / 4.0), 0.0F); + this.updateBuffer( + Lighting.Entry.ITEMS_3D, matrix4f2.transformDirection(DIFFUSE_LIGHT_0, new Vector3f()), matrix4f2.transformDirection(DIFFUSE_LIGHT_1, new Vector3f()) + ); + this.updateBuffer(Lighting.Entry.ENTITY_IN_UI, INVENTORY_DIFFUSE_LIGHT_0, INVENTORY_DIFFUSE_LIGHT_1); + Matrix4f matrix4f3 = new Matrix4f(); + this.updateBuffer( + Lighting.Entry.PLAYER_SKIN, + matrix4f3.transformDirection(INVENTORY_DIFFUSE_LIGHT_0, new Vector3f()), + matrix4f3.transformDirection(INVENTORY_DIFFUSE_LIGHT_1, new Vector3f()) + ); } - public static void setupLevel() { - RenderSystem.setupLevelDiffuseLighting(DIFFUSE_LIGHT_0, DIFFUSE_LIGHT_1); + public void updateLevel(boolean nether) { + if (nether) { + this.updateBuffer(Lighting.Entry.LEVEL, NETHER_DIFFUSE_LIGHT_0, NETHER_DIFFUSE_LIGHT_1); + } else { + this.updateBuffer(Lighting.Entry.LEVEL, DIFFUSE_LIGHT_0, DIFFUSE_LIGHT_1); + } } - public static void setupForFlatItems() { - RenderSystem.setupGuiFlatDiffuseLighting(DIFFUSE_LIGHT_0, DIFFUSE_LIGHT_1); + private void updateBuffer(Lighting.Entry entry, Vector3f light0, Vector3f light1) { + try (MemoryStack memoryStack = MemoryStack.stackPush()) { + ByteBuffer byteBuffer = Std140Builder.onStack(memoryStack, UBO_SIZE).putVec3(light0).putVec3(light1).get(); + RenderSystem.getDevice().createCommandEncoder().writeToBuffer(this.buffer.slice(entry.ordinal() * this.paddedSize, this.paddedSize), byteBuffer); + } } - public static void setupFor3DItems() { - RenderSystem.setupGui3DDiffuseLighting(DIFFUSE_LIGHT_0, DIFFUSE_LIGHT_1); + public void setupFor(Lighting.Entry entry) { + RenderSystem.setShaderLights(this.buffer.slice(entry.ordinal() * this.paddedSize, UBO_SIZE)); } - public static void setupForEntityInInventory() { - RenderSystem.setShaderLights(INVENTORY_DIFFUSE_LIGHT_0, INVENTORY_DIFFUSE_LIGHT_1); + public void close() { + this.buffer.close(); } - public static void setupForEntityInInventory(Quaternionf quaternion) { - RenderSystem.setShaderLights(quaternion.transform(INVENTORY_DIFFUSE_LIGHT_0, new Vector3f()), quaternion.transform(INVENTORY_DIFFUSE_LIGHT_1, new Vector3f())); + @Environment(EnvType.CLIENT) + public static enum Entry { + LEVEL, + ITEMS_FLAT, + ITEMS_3D, + ENTITY_IN_UI, + PLAYER_SKIN; } } diff --git a/com/mojang/blaze3d/platform/TextureUtil.java b/com/mojang/blaze3d/platform/TextureUtil.java index 1d5b8cf7..8787ef3b 100644 --- a/com/mojang/blaze3d/platform/TextureUtil.java +++ b/com/mojang/blaze3d/platform/TextureUtil.java @@ -1,8 +1,6 @@ package com.mojang.blaze3d.platform; import com.mojang.blaze3d.DontObfuscate; -import com.mojang.blaze3d.buffers.BufferType; -import com.mojang.blaze3d.buffers.BufferUsage; import com.mojang.blaze3d.buffers.GpuBuffer; import com.mojang.blaze3d.systems.CommandEncoder; import com.mojang.blaze3d.systems.RenderSystem; @@ -61,10 +59,10 @@ public class TextureUtil { j += gpuTexture.getFormat().pixelSize() * gpuTexture.getWidth(k) * gpuTexture.getHeight(k); } - GpuBuffer gpuBuffer = RenderSystem.getDevice().createBuffer(() -> "Texture output buffer", BufferType.PIXEL_PACK, BufferUsage.STATIC_READ, j); + GpuBuffer gpuBuffer = RenderSystem.getDevice().createBuffer(() -> "Texture output buffer", 9, j); CommandEncoder commandEncoder = RenderSystem.getDevice().createCommandEncoder(); Runnable runnable = () -> { - try (GpuBuffer.ReadView readView = commandEncoder.readBuffer(gpuBuffer)) { + try (GpuBuffer.MappedView mappedView = commandEncoder.mapBuffer(gpuBuffer, true, false)) { int jx = 0; for (int k = 0; k <= i; k++) { @@ -74,7 +72,7 @@ public class TextureUtil { try (NativeImage nativeImage = new NativeImage(lx, mx, false)) { for (int n = 0; n < mx; n++) { for (int o = 0; o < lx; o++) { - int p = readView.data().getInt(jx + (o + n * lx) * gpuTexture.getFormat().pixelSize()); + int p = mappedView.data().getInt(jx + (o + n * lx) * gpuTexture.getFormat().pixelSize()); nativeImage.setPixelABGR(o, n, intUnaryOperator.applyAsInt(p)); } } diff --git a/com/mojang/blaze3d/platform/Window.java b/com/mojang/blaze3d/platform/Window.java index 4b59d992..fb9a2d00 100644 --- a/com/mojang/blaze3d/platform/Window.java +++ b/com/mojang/blaze3d/platform/Window.java @@ -56,7 +56,7 @@ public final class Window implements AutoCloseable { private int framebufferHeight; private int guiScaledWidth; private int guiScaledHeight; - private double guiScale; + private int guiScale; private String errorSection = ""; private boolean dirty; private boolean vsync; @@ -405,12 +405,13 @@ public final class Window implements AutoCloseable { return i; } - public void setGuiScale(double scaleFactor) { - this.guiScale = scaleFactor; - int i = (int)(this.framebufferWidth / scaleFactor); - this.guiScaledWidth = this.framebufferWidth / scaleFactor > i ? i + 1 : i; - int j = (int)(this.framebufferHeight / scaleFactor); - this.guiScaledHeight = this.framebufferHeight / scaleFactor > j ? j + 1 : j; + public void setGuiScale(int guiScale) { + this.guiScale = guiScale; + double d = guiScale; + int i = (int)(this.framebufferWidth / d); + this.guiScaledWidth = this.framebufferWidth / d > i ? i + 1 : i; + int j = (int)(this.framebufferHeight / d); + this.guiScaledHeight = this.framebufferHeight / d > j ? j + 1 : j; } public void setTitle(String title) { @@ -472,7 +473,7 @@ public final class Window implements AutoCloseable { return this.y; } - public double getGuiScale() { + public int getGuiScale() { return this.guiScale; } diff --git a/com/mojang/blaze3d/shaders/FogShape.java b/com/mojang/blaze3d/shaders/FogShape.java deleted file mode 100644 index bd94aa7d..00000000 --- a/com/mojang/blaze3d/shaders/FogShape.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.mojang.blaze3d.shaders; - -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; - -@Environment(EnvType.CLIENT) -public enum FogShape { - SPHERE(0), - CYLINDER(1); - - private final int index; - - private FogShape(final int index) { - this.index = index; - } - - public int getIndex() { - return this.index; - } -} diff --git a/com/mojang/blaze3d/shaders/UniformType.java b/com/mojang/blaze3d/shaders/UniformType.java index 130cf961..b1d754cc 100644 --- a/com/mojang/blaze3d/shaders/UniformType.java +++ b/com/mojang/blaze3d/shaders/UniformType.java @@ -2,41 +2,15 @@ package com.mojang.blaze3d.shaders; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.minecraft.util.StringRepresentable; @Environment(EnvType.CLIENT) -public enum UniformType implements StringRepresentable { - INT(1, "int"), - IVEC3(3, "ivec3"), - FLOAT(1, "float"), - VEC2(2, "vec2"), - VEC3(3, "vec3"), - VEC4(4, "vec4"), - MATRIX4X4(16, "matrix4x4"); +public enum UniformType { + UNIFORM_BUFFER("ubo"), + TEXEL_BUFFER("utb"); - public static final StringRepresentable.EnumCodec CODEC = StringRepresentable.fromEnum(UniformType::values); - final int count; final String name; - private UniformType(final int count, final String name) { - this.count = count; + private UniformType(final String name) { this.name = name; } - - public int count() { - return this.count; - } - - public boolean isIntStorage() { - return this == INT || this == IVEC3; - } - - @Override - public String getSerializedName() { - return this.name; - } - - public int getCount() { - return this.count; - } } diff --git a/com/mojang/blaze3d/systems/CommandEncoder.java b/com/mojang/blaze3d/systems/CommandEncoder.java index 9461ad0d..c5fbc5ba 100644 --- a/com/mojang/blaze3d/systems/CommandEncoder.java +++ b/com/mojang/blaze3d/systems/CommandEncoder.java @@ -2,12 +2,16 @@ package com.mojang.blaze3d.systems; import com.mojang.blaze3d.DontObfuscate; import com.mojang.blaze3d.buffers.GpuBuffer; +import com.mojang.blaze3d.buffers.GpuBufferSlice; +import com.mojang.blaze3d.buffers.GpuFence; import com.mojang.blaze3d.platform.NativeImage; import com.mojang.blaze3d.textures.GpuTexture; +import com.mojang.blaze3d.textures.GpuTextureView; import java.nio.ByteBuffer; import java.nio.IntBuffer; import java.util.OptionalDouble; import java.util.OptionalInt; +import java.util.function.Supplier; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import org.jetbrains.annotations.Nullable; @@ -15,27 +19,31 @@ import org.jetbrains.annotations.Nullable; @Environment(EnvType.CLIENT) @DontObfuscate public interface CommandEncoder { - RenderPass createRenderPass(GpuTexture gpuTexture, OptionalInt optionalInt); + RenderPass createRenderPass(Supplier supplier, GpuTextureView gpuTextureView, OptionalInt optionalInt); - RenderPass createRenderPass(GpuTexture gpuTexture, OptionalInt optionalInt, @Nullable GpuTexture gpuTexture2, OptionalDouble optionalDouble); + RenderPass createRenderPass( + Supplier supplier, GpuTextureView gpuTextureView, OptionalInt optionalInt, @Nullable GpuTextureView gpuTextureView2, OptionalDouble optionalDouble + ); void clearColorTexture(GpuTexture gpuTexture, int i); void clearColorAndDepthTextures(GpuTexture gpuTexture, int i, GpuTexture gpuTexture2, double d); + void clearColorAndDepthTextures(GpuTexture gpuTexture, int i, GpuTexture gpuTexture2, double d, int j, int k, int l, int m); + void clearDepthTexture(GpuTexture gpuTexture, double d); - void writeToBuffer(GpuBuffer gpuBuffer, ByteBuffer byteBuffer, int i); + void writeToBuffer(GpuBufferSlice gpuBufferSlice, ByteBuffer byteBuffer); - GpuBuffer.ReadView readBuffer(GpuBuffer gpuBuffer); + GpuBuffer.MappedView mapBuffer(GpuBuffer gpuBuffer, boolean bl, boolean bl2); - GpuBuffer.ReadView readBuffer(GpuBuffer gpuBuffer, int i, int j); + GpuBuffer.MappedView mapBuffer(GpuBufferSlice gpuBufferSlice, boolean bl, boolean bl2); void writeToTexture(GpuTexture gpuTexture, NativeImage nativeImage); - void writeToTexture(GpuTexture gpuTexture, NativeImage nativeImage, int i, int j, int k, int l, int m, int n, int o); + void writeToTexture(GpuTexture gpuTexture, NativeImage nativeImage, int i, int j, int k, int l, int m, int n, int o, int p); - void writeToTexture(GpuTexture gpuTexture, IntBuffer intBuffer, NativeImage.Format format, int i, int j, int k, int l, int m); + void writeToTexture(GpuTexture gpuTexture, IntBuffer intBuffer, NativeImage.Format format, int i, int j, int k, int l, int m, int n); void copyTextureToBuffer(GpuTexture gpuTexture, GpuBuffer gpuBuffer, int i, Runnable runnable, int j); @@ -43,5 +51,7 @@ public interface CommandEncoder { void copyTextureToTexture(GpuTexture gpuTexture, GpuTexture gpuTexture2, int i, int j, int k, int l, int m, int n, int o); - void presentTexture(GpuTexture gpuTexture); + void presentTexture(GpuTextureView gpuTextureView); + + GpuFence createFence(); } diff --git a/com/mojang/blaze3d/systems/GpuDevice.java b/com/mojang/blaze3d/systems/GpuDevice.java index b4263729..ec4d5150 100644 --- a/com/mojang/blaze3d/systems/GpuDevice.java +++ b/com/mojang/blaze3d/systems/GpuDevice.java @@ -1,13 +1,12 @@ package com.mojang.blaze3d.systems; import com.mojang.blaze3d.DontObfuscate; -import com.mojang.blaze3d.buffers.BufferType; -import com.mojang.blaze3d.buffers.BufferUsage; import com.mojang.blaze3d.buffers.GpuBuffer; import com.mojang.blaze3d.pipeline.CompiledRenderPipeline; import com.mojang.blaze3d.pipeline.RenderPipeline; import com.mojang.blaze3d.shaders.ShaderType; import com.mojang.blaze3d.textures.GpuTexture; +import com.mojang.blaze3d.textures.GpuTextureView; import com.mojang.blaze3d.textures.TextureFormat; import java.nio.ByteBuffer; import java.util.List; @@ -23,13 +22,17 @@ import org.jetbrains.annotations.Nullable; public interface GpuDevice { CommandEncoder createCommandEncoder(); - GpuTexture createTexture(@Nullable Supplier supplier, TextureFormat textureFormat, int i, int j, int k); + GpuTexture createTexture(@Nullable Supplier supplier, int i, TextureFormat textureFormat, int j, int k, int l, int m); - GpuTexture createTexture(@Nullable String string, TextureFormat textureFormat, int i, int j, int k); + GpuTexture createTexture(@Nullable String string, int i, TextureFormat textureFormat, int j, int k, int l, int m); - GpuBuffer createBuffer(@Nullable Supplier supplier, BufferType bufferType, BufferUsage bufferUsage, int i); + GpuTextureView createTextureView(GpuTexture gpuTexture); - GpuBuffer createBuffer(@Nullable Supplier supplier, BufferType bufferType, BufferUsage bufferUsage, ByteBuffer byteBuffer); + GpuTextureView createTextureView(GpuTexture gpuTexture, int i, int j); + + GpuBuffer createBuffer(@Nullable Supplier supplier, int i, int j); + + GpuBuffer createBuffer(@Nullable Supplier supplier, int i, ByteBuffer byteBuffer); String getImplementationInformation(); @@ -47,6 +50,8 @@ public interface GpuDevice { int getMaxTextureSize(); + int getUniformOffsetAlignment(); + default CompiledRenderPipeline precompilePipeline(RenderPipeline renderPipeline) { return this.precompilePipeline(renderPipeline, null); } diff --git a/com/mojang/blaze3d/systems/RenderPass.java b/com/mojang/blaze3d/systems/RenderPass.java index 66877a1c..2131bcac 100644 --- a/com/mojang/blaze3d/systems/RenderPass.java +++ b/com/mojang/blaze3d/systems/RenderPass.java @@ -2,30 +2,31 @@ package com.mojang.blaze3d.systems; import com.mojang.blaze3d.DontObfuscate; import com.mojang.blaze3d.buffers.GpuBuffer; +import com.mojang.blaze3d.buffers.GpuBufferSlice; import com.mojang.blaze3d.pipeline.RenderPipeline; -import com.mojang.blaze3d.textures.GpuTexture; +import com.mojang.blaze3d.textures.GpuTextureView; import com.mojang.blaze3d.vertex.VertexFormat; import java.util.Collection; -import java.util.function.Consumer; +import java.util.function.BiConsumer; +import java.util.function.Supplier; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import org.jetbrains.annotations.Nullable; -import org.joml.Matrix4f; @Environment(EnvType.CLIENT) @DontObfuscate public interface RenderPass extends AutoCloseable { + void pushDebugGroup(Supplier supplier); + + void popDebugGroup(); + void setPipeline(RenderPipeline renderPipeline); - void bindSampler(String string, GpuTexture gpuTexture); + void bindSampler(String string, @Nullable GpuTextureView gpuTextureView); - void setUniform(String string, int... is); + void setUniform(String string, GpuBuffer gpuBuffer); - void setUniform(String string, float... fs); - - void setUniform(String string, Matrix4f matrix4f); - - void enableScissor(ScissorState scissorState); + void setUniform(String string, GpuBufferSlice gpuBufferSlice); void enableScissor(int i, int j, int k, int l); @@ -35,23 +36,29 @@ public interface RenderPass extends AutoCloseable { void setIndexBuffer(GpuBuffer gpuBuffer, VertexFormat.IndexType indexType); - void drawIndexed(int i, int j); + void drawIndexed(int i, int j, int k, int l); - void drawMultipleIndexed(Collection collection, @Nullable GpuBuffer gpuBuffer, @Nullable VertexFormat.IndexType indexType); + void drawMultipleIndexed( + Collection> collection, + @Nullable GpuBuffer gpuBuffer, + @Nullable VertexFormat.IndexType indexType, + Collection collection2, + T object + ); void draw(int i, int j); void close(); @Environment(EnvType.CLIENT) - public record Draw( + public record Draw( int slot, GpuBuffer vertexBuffer, @Nullable GpuBuffer indexBuffer, @Nullable VertexFormat.IndexType indexType, int firstIndex, int indexCount, - @Nullable Consumer uniformUploaderConsumer + @Nullable BiConsumer uniformUploaderConsumer ) { public Draw(int slot, GpuBuffer vertexBuffer, GpuBuffer indexBuffer, VertexFormat.IndexType indexType, int firstIndex, int indexCount) { this(slot, vertexBuffer, indexBuffer, indexType, firstIndex, indexCount, null); @@ -60,6 +67,6 @@ public interface RenderPass extends AutoCloseable { @Environment(EnvType.CLIENT) public interface UniformUploader { - void upload(String string, float... fs); + void upload(String string, GpuBufferSlice gpuBufferSlice); } } diff --git a/com/mojang/blaze3d/systems/RenderSystem.java b/com/mojang/blaze3d/systems/RenderSystem.java index 0e81ea35..b00c16bd 100644 --- a/com/mojang/blaze3d/systems/RenderSystem.java +++ b/com/mojang/blaze3d/systems/RenderSystem.java @@ -3,15 +3,14 @@ package com.mojang.blaze3d.systems; import com.mojang.blaze3d.DontObfuscate; import com.mojang.blaze3d.ProjectionType; import com.mojang.blaze3d.TracyFrameCapture; -import com.mojang.blaze3d.buffers.BufferType; -import com.mojang.blaze3d.buffers.BufferUsage; import com.mojang.blaze3d.buffers.GpuBuffer; +import com.mojang.blaze3d.buffers.GpuBufferSlice; import com.mojang.blaze3d.buffers.GpuFence; +import com.mojang.blaze3d.buffers.Std140SizeCalculator; import com.mojang.blaze3d.opengl.GlDevice; import com.mojang.blaze3d.platform.GLX; import com.mojang.blaze3d.shaders.ShaderType; -import com.mojang.blaze3d.systems.RenderSystem.AutoStorageIndexBuffer.IndexGenerator; -import com.mojang.blaze3d.textures.GpuTexture; +import com.mojang.blaze3d.textures.GpuTextureView; import com.mojang.blaze3d.vertex.BufferBuilder; import com.mojang.blaze3d.vertex.ByteBufferBuilder; import com.mojang.blaze3d.vertex.DefaultVertexFormat; @@ -28,11 +27,12 @@ import java.util.function.IntConsumer; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.Util; -import net.minecraft.client.renderer.FogParameters; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.DynamicUniforms; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.ArrayListDeque; import net.minecraft.util.Mth; -import net.minecraft.util.TimeSource.NanoTimeSource; +import net.minecraft.util.TimeSource; import org.jetbrains.annotations.Nullable; import org.joml.Matrix4f; import org.joml.Matrix4fStack; @@ -45,9 +45,9 @@ import org.slf4j.Logger; @Environment(EnvType.CLIENT) @DontObfuscate public class RenderSystem { - public static final ScissorState SCISSOR_STATE = new ScissorState(); static final Logger LOGGER = LogUtils.getLogger(); public static final int MINIMUM_ATLAS_TEXTURE_SIZE = 1024; + public static final int PROJECTION_MATRIX_UBO_SIZE = new Std140SizeCalculator().putMat4f().get(); @Nullable private static Thread renderThread; @Nullable @@ -70,19 +70,20 @@ public class RenderSystem { intConsumer.accept(i + 2); intConsumer.accept(i + 1); }); - private static Matrix4f projectionMatrix = new Matrix4f(); - private static Matrix4f savedProjectionMatrix = new Matrix4f(); private static ProjectionType projectionType = ProjectionType.PERSPECTIVE; private static ProjectionType savedProjectionType = ProjectionType.PERSPECTIVE; private static final Matrix4fStack modelViewStack = new Matrix4fStack(16); private static Matrix4f textureMatrix = new Matrix4f(); public static final int TEXTURE_COUNT = 12; - private static final GpuTexture[] shaderTextures = new GpuTexture[12]; - private static final float[] shaderColor = new float[]{1.0F, 1.0F, 1.0F, 1.0F}; - private static float shaderGlintAlpha = 1.0F; - private static FogParameters shaderFog = FogParameters.NO_FOG; - private static final Vector3f[] shaderLightDirections = new Vector3f[2]; - private static float shaderGameTime; + private static final GpuTextureView[] shaderTextures = new GpuTextureView[12]; + @Nullable + private static GpuBufferSlice shaderFog = null; + @Nullable + private static GpuBufferSlice shaderLightDirections; + @Nullable + private static GpuBufferSlice projectionMatrixBuffer; + @Nullable + private static GpuBufferSlice savedProjectionMatrixBuffer; private static final Vector3f modelOffset = new Vector3f(); private static float shaderLineWidth = 1.0F; private static String apiDescription = "Unknown"; @@ -91,6 +92,15 @@ public class RenderSystem { @Nullable private static GpuBuffer QUAD_VERTEX_BUFFER; private static final ArrayListDeque PENDING_FENCES = new ArrayListDeque<>(); + @Nullable + public static GpuTextureView outputColorTextureOverride; + @Nullable + public static GpuTextureView outputDepthTextureOverride; + @Nullable + private static GpuBuffer globalSettingsUniform; + @Nullable + private static DynamicUniforms dynamicUniforms; + private static ScissorState scissorStateForRenderTypeDraws = new ScissorState(); public static void initRenderThread() { if (renderThread != null) { @@ -133,6 +143,8 @@ public class RenderSystem { tracyFrameCapture.endFrame(); } + dynamicUniforms.reset(); + Minecraft.getInstance().levelRenderer.endFrame(); pollEvents(); } @@ -147,61 +159,24 @@ public class RenderSystem { lastDrawTime = e; } - public static void enableScissor(int i, int j, int k, int l) { - SCISSOR_STATE.enable(i, j, k, l); + public static void setShaderFog(GpuBufferSlice gpuBufferSlice) { + shaderFog = gpuBufferSlice; } - public static void disableScissor() { - SCISSOR_STATE.disable(); - } - - public static void setShaderFog(FogParameters fogParameters) { - assertOnRenderThread(); - shaderFog = fogParameters; - } - - public static FogParameters getShaderFog() { - assertOnRenderThread(); + @Nullable + public static GpuBufferSlice getShaderFog() { return shaderFog; } - public static void setShaderGlintAlpha(double d) { - setShaderGlintAlpha((float)d); + public static void setShaderLights(GpuBufferSlice gpuBufferSlice) { + shaderLightDirections = gpuBufferSlice; } - public static void setShaderGlintAlpha(float f) { - assertOnRenderThread(); - shaderGlintAlpha = f; - } - - public static float getShaderGlintAlpha() { - assertOnRenderThread(); - return shaderGlintAlpha; - } - - public static void setShaderLights(Vector3f vector3f, Vector3f vector3f2) { - assertOnRenderThread(); - shaderLightDirections[0] = vector3f; - shaderLightDirections[1] = vector3f2; - } - - public static Vector3f[] getShaderLights() { + @Nullable + public static GpuBufferSlice getShaderLights() { return shaderLightDirections; } - public static void setShaderColor(float f, float g, float h, float i) { - assertOnRenderThread(); - shaderColor[0] = f; - shaderColor[1] = g; - shaderColor[2] = h; - shaderColor[3] = i; - } - - public static float[] getShaderColor() { - assertOnRenderThread(); - return shaderColor; - } - public static void lineWidth(float f) { assertOnRenderThread(); shaderLineWidth = f; @@ -212,6 +187,18 @@ public class RenderSystem { return shaderLineWidth; } + public static void enableScissorForRenderTypeDraws(int i, int j, int k, int l) { + scissorStateForRenderTypeDraws.enable(i, j, k, l); + } + + public static void disableScissorForRenderTypeDraws() { + scissorStateForRenderTypeDraws.disable(); + } + + public static ScissorState getScissorStateForRenderTypeDraws() { + return scissorStateForRenderTypeDraws; + } + public static String getBackendDescription() { return String.format(Locale.ROOT, "LWJGL version %s", GLX._getLWJGLVersion()); } @@ -220,15 +207,16 @@ public class RenderSystem { return apiDescription; } - public static NanoTimeSource initBackendSystem() { + public static TimeSource.NanoTimeSource initBackendSystem() { return GLX._initGlfw()::getAsLong; } public static void initRenderer(long l, int i, boolean bl, BiFunction biFunction, boolean bl2) { DEVICE = new GlDevice(l, i, bl, biFunction, bl2); apiDescription = getDevice().getImplementationInformation(); + dynamicUniforms = new DynamicUniforms(); - try (ByteBufferBuilder byteBufferBuilder = new ByteBufferBuilder(DefaultVertexFormat.POSITION.getVertexSize() * 4)) { + try (ByteBufferBuilder byteBufferBuilder = ByteBufferBuilder.exactlySized(DefaultVertexFormat.POSITION.getVertexSize() * 4)) { BufferBuilder bufferBuilder = new BufferBuilder(byteBufferBuilder, VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION); bufferBuilder.addVertex(0.0F, 0.0F, 0.0F); bufferBuilder.addVertex(1.0F, 0.0F, 0.0F); @@ -236,7 +224,7 @@ public class RenderSystem { bufferBuilder.addVertex(0.0F, 1.0F, 0.0F); try (MeshData meshData = bufferBuilder.buildOrThrow()) { - QUAD_VERTEX_BUFFER = getDevice().createBuffer(() -> "Quad", BufferType.VERTICES, BufferUsage.STATIC_WRITE, meshData.vertexBuffer()); + QUAD_VERTEX_BUFFER = getDevice().createBuffer(() -> "Quad", 32, meshData.vertexBuffer()); } } } @@ -246,15 +234,13 @@ public class RenderSystem { } public static void setupDefaultState() { - projectionMatrix.identity(); - savedProjectionMatrix.identity(); modelViewStack.clear(); textureMatrix.identity(); } - public static void setupOverlayColor(@Nullable GpuTexture gpuTexture) { + public static void setupOverlayColor(@Nullable GpuTextureView gpuTextureView) { assertOnRenderThread(); - setShaderTexture(1, gpuTexture); + setShaderTexture(1, gpuTextureView); } public static void teardownOverlayColor() { @@ -262,42 +248,22 @@ public class RenderSystem { setShaderTexture(1, null); } - public static void setupLevelDiffuseLighting(Vector3f vector3f, Vector3f vector3f2) { - assertOnRenderThread(); - setShaderLights(vector3f, vector3f2); - } - - public static void setupGuiFlatDiffuseLighting(Vector3f vector3f, Vector3f vector3f2) { - assertOnRenderThread(); - Matrix4f matrix4f = new Matrix4f().rotationY((float) (-Math.PI / 8)).rotateX((float) (Math.PI * 3.0 / 4.0)); - setShaderLights(matrix4f.transformDirection(vector3f, new Vector3f()), matrix4f.transformDirection(vector3f2, new Vector3f())); - } - - public static void setupGui3DDiffuseLighting(Vector3f vector3f, Vector3f vector3f2) { - assertOnRenderThread(); - Matrix4f matrix4f = new Matrix4f() - .scaling(1.0F, -1.0F, 1.0F) - .rotateYXZ(1.0821041F, 3.2375858F, 0.0F) - .rotateYXZ((float) (-Math.PI / 8), (float) (Math.PI * 3.0 / 4.0), 0.0F); - setShaderLights(matrix4f.transformDirection(vector3f, new Vector3f()), matrix4f.transformDirection(vector3f2, new Vector3f())); - } - - public static void setShaderTexture(int i, @Nullable GpuTexture gpuTexture) { + public static void setShaderTexture(int i, @Nullable GpuTextureView gpuTextureView) { assertOnRenderThread(); if (i >= 0 && i < shaderTextures.length) { - shaderTextures[i] = gpuTexture; + shaderTextures[i] = gpuTextureView; } } @Nullable - public static GpuTexture getShaderTexture(int i) { + public static GpuTextureView getShaderTexture(int i) { assertOnRenderThread(); return i >= 0 && i < shaderTextures.length ? shaderTextures[i] : null; } - public static void setProjectionMatrix(Matrix4f matrix4f, ProjectionType projectionType) { + public static void setProjectionMatrix(GpuBufferSlice gpuBufferSlice, ProjectionType projectionType) { assertOnRenderThread(); - projectionMatrix = new Matrix4f(matrix4f); + projectionMatrixBuffer = gpuBufferSlice; RenderSystem.projectionType = projectionType; } @@ -313,19 +279,20 @@ public class RenderSystem { public static void backupProjectionMatrix() { assertOnRenderThread(); - savedProjectionMatrix = projectionMatrix; + savedProjectionMatrixBuffer = projectionMatrixBuffer; savedProjectionType = projectionType; } public static void restoreProjectionMatrix() { assertOnRenderThread(); - projectionMatrix = savedProjectionMatrix; + projectionMatrixBuffer = savedProjectionMatrixBuffer; projectionType = savedProjectionType; } - public static Matrix4f getProjectionMatrix() { + @Nullable + public static GpuBufferSlice getProjectionMatrixBuffer() { assertOnRenderThread(); - return projectionMatrix; + return projectionMatrixBuffer; } public static Matrix4f getModelViewMatrix() { @@ -353,14 +320,13 @@ public class RenderSystem { }; } - public static void setShaderGameTime(long l, float f) { - assertOnRenderThread(); - shaderGameTime = ((float)(l % 24000L) + f) / 24000.0F; + public static void setGlobalSettingsUniform(GpuBuffer gpuBuffer) { + globalSettingsUniform = gpuBuffer; } - public static float getShaderGameTime() { - assertOnRenderThread(); - return shaderGameTime; + @Nullable + public static GpuBuffer getGlobalSettingsUniform() { + return globalSettingsUniform; } public static ProjectionType getProjectionType() { @@ -392,7 +358,7 @@ public class RenderSystem { } public static void queueFencedTask(Runnable runnable) { - PENDING_FENCES.addLast(new RenderSystem.GpuAsyncTask(runnable, new GpuFence())); + PENDING_FENCES.addLast(new RenderSystem.GpuAsyncTask(runnable, getDevice().createCommandEncoder().createFence())); } public static void executePendingTasks() { @@ -424,17 +390,47 @@ public class RenderSystem { return DEVICE; } + public static DynamicUniforms getDynamicUniforms() { + if (dynamicUniforms == null) { + throw new IllegalStateException("Can't getDynamicUniforms() before device was initialized"); + } else { + return dynamicUniforms; + } + } + + public static void bindDefaultUniforms(RenderPass renderPass) { + GpuBufferSlice gpuBufferSlice = getProjectionMatrixBuffer(); + if (gpuBufferSlice != null) { + renderPass.setUniform("Projection", gpuBufferSlice); + } + + GpuBufferSlice gpuBufferSlice2 = getShaderFog(); + if (gpuBufferSlice2 != null) { + renderPass.setUniform("Fog", gpuBufferSlice2); + } + + GpuBuffer gpuBuffer = getGlobalSettingsUniform(); + if (gpuBuffer != null) { + renderPass.setUniform("Globals", gpuBuffer); + } + + GpuBufferSlice gpuBufferSlice3 = getShaderLights(); + if (gpuBufferSlice3 != null) { + renderPass.setUniform("Lighting", gpuBufferSlice3); + } + } + @Environment(EnvType.CLIENT) public static final class AutoStorageIndexBuffer { private final int vertexStride; private final int indexStride; - private final IndexGenerator generator; + private final RenderSystem.AutoStorageIndexBuffer.IndexGenerator generator; @Nullable private GpuBuffer buffer; private VertexFormat.IndexType type = VertexFormat.IndexType.SHORT; private int indexCount; - AutoStorageIndexBuffer(int vertexStride, int indexStride, IndexGenerator generator) { + AutoStorageIndexBuffer(int vertexStride, int indexStride, RenderSystem.AutoStorageIndexBuffer.IndexGenerator generator) { this.vertexStride = vertexStride; this.indexStride = indexStride; this.generator = generator; @@ -472,7 +468,7 @@ public class RenderSystem { this.buffer.close(); } - this.buffer = RenderSystem.getDevice().createBuffer(() -> "Auto Storage index buffer", BufferType.INDICES, BufferUsage.DYNAMIC_WRITE, byteBuffer); + this.buffer = RenderSystem.getDevice().createBuffer(() -> "Auto Storage index buffer", 64, byteBuffer); } finally { MemoryUtil.memFree(byteBuffer); } @@ -494,6 +490,11 @@ public class RenderSystem { public VertexFormat.IndexType type() { return this.type; } + + @Environment(EnvType.CLIENT) + interface IndexGenerator { + void accept(it.unimi.dsi.fastutil.ints.IntConsumer intConsumer, int i); + } } @Environment(EnvType.CLIENT) diff --git a/com/mojang/blaze3d/systems/ScissorState.java b/com/mojang/blaze3d/systems/ScissorState.java index 05c0127f..c4ab3424 100644 --- a/com/mojang/blaze3d/systems/ScissorState.java +++ b/com/mojang/blaze3d/systems/ScissorState.java @@ -1,11 +1,9 @@ package com.mojang.blaze3d.systems; -import com.mojang.blaze3d.DontObfuscate; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @Environment(EnvType.CLIENT) -@DontObfuscate public class ScissorState { private boolean enabled; private int x; @@ -13,43 +11,35 @@ public class ScissorState { private int width; private int height; - public void enable(int i, int j, int k, int l) { + public void enable(int x, int y, int width, int height) { this.enabled = true; - this.x = i; - this.y = j; - this.width = k; - this.height = l; + this.x = x; + this.y = y; + this.width = width; + this.height = height; } public void disable() { this.enabled = false; } - public boolean isEnabled() { + public boolean enabled() { return this.enabled; } - public int getX() { + public int x() { return this.x; } - public int getY() { + public int y() { return this.y; } - public int getWidth() { + public int width() { return this.width; } - public int getHeight() { + public int height() { return this.height; } - - public void copyFrom(ScissorState scissorState) { - this.enabled = scissorState.enabled; - this.x = scissorState.x; - this.y = scissorState.y; - this.width = scissorState.width; - this.height = scissorState.height; - } } diff --git a/com/mojang/blaze3d/textures/GpuTexture.java b/com/mojang/blaze3d/textures/GpuTexture.java index fc4c75f8..05841e1c 100644 --- a/com/mojang/blaze3d/textures/GpuTexture.java +++ b/com/mojang/blaze3d/textures/GpuTexture.java @@ -7,10 +7,17 @@ import net.fabricmc.api.Environment; @Environment(EnvType.CLIENT) @DontObfuscate public abstract class GpuTexture implements AutoCloseable { + public static final int USAGE_COPY_DST = 1; + public static final int USAGE_COPY_SRC = 2; + public static final int USAGE_TEXTURE_BINDING = 4; + public static final int USAGE_RENDER_ATTACHMENT = 8; + public static final int USAGE_CUBEMAP_COMPATIBLE = 16; private final TextureFormat format; private final int width; private final int height; + private final int depthOrLayers; private final int mipLevels; + private final int usage; private final String label; protected AddressMode addressModeU = AddressMode.REPEAT; protected AddressMode addressModeV = AddressMode.REPEAT; @@ -18,12 +25,14 @@ public abstract class GpuTexture implements AutoCloseable { protected FilterMode magFilter = FilterMode.LINEAR; protected boolean useMipmaps = true; - public GpuTexture(String string, TextureFormat textureFormat, int i, int j, int k) { + public GpuTexture(int i, String string, TextureFormat textureFormat, int j, int k, int l, int m) { + this.usage = i; this.label = string; this.format = textureFormat; - this.width = i; - this.height = j; - this.mipLevels = k; + this.width = j; + this.height = k; + this.depthOrLayers = l; + this.mipLevels = m; } public int getWidth(int i) { @@ -34,6 +43,10 @@ public abstract class GpuTexture implements AutoCloseable { return this.height >> i; } + public int getDepthOrLayers() { + return this.depthOrLayers; + } + public int getMipLevels() { return this.mipLevels; } @@ -42,6 +55,10 @@ public abstract class GpuTexture implements AutoCloseable { return this.format; } + public int usage() { + return this.usage; + } + public void setAddressMode(AddressMode addressMode) { this.setAddressMode(addressMode, addressMode); } @@ -58,6 +75,10 @@ public abstract class GpuTexture implements AutoCloseable { public void setTextureFilter(FilterMode filterMode, FilterMode filterMode2, boolean bl) { this.minFilter = filterMode; this.magFilter = filterMode2; + this.setUseMipmaps(bl); + } + + public void setUseMipmaps(boolean bl) { this.useMipmaps = bl; } diff --git a/com/mojang/blaze3d/textures/GpuTextureView.java b/com/mojang/blaze3d/textures/GpuTextureView.java new file mode 100644 index 00000000..6f8a4c97 --- /dev/null +++ b/com/mojang/blaze3d/textures/GpuTextureView.java @@ -0,0 +1,43 @@ +package com.mojang.blaze3d.textures; + +import com.mojang.blaze3d.DontObfuscate; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; + +@Environment(EnvType.CLIENT) +@DontObfuscate +public abstract class GpuTextureView implements AutoCloseable { + private final GpuTexture texture; + private final int baseMipLevel; + private final int mipLevels; + + public GpuTextureView(GpuTexture gpuTexture, int i, int j) { + this.texture = gpuTexture; + this.baseMipLevel = i; + this.mipLevels = j; + } + + public abstract void close(); + + public GpuTexture texture() { + return this.texture; + } + + public int baseMipLevel() { + return this.baseMipLevel; + } + + public int mipLevels() { + return this.mipLevels; + } + + public int getWidth(int i) { + return this.texture.getWidth(i + this.baseMipLevel); + } + + public int getHeight(int i) { + return this.texture.getHeight(i + this.baseMipLevel); + } + + public abstract boolean isClosed(); +} diff --git a/com/mojang/blaze3d/textures/TextureFormat.java b/com/mojang/blaze3d/textures/TextureFormat.java index bbd7722b..74133482 100644 --- a/com/mojang/blaze3d/textures/TextureFormat.java +++ b/com/mojang/blaze3d/textures/TextureFormat.java @@ -9,6 +9,7 @@ import net.fabricmc.api.Environment; public enum TextureFormat { RGBA8(4), RED8(1), + RED8I(1), DEPTH32(4); private final int pixelSize; diff --git a/com/mojang/blaze3d/vertex/BufferBuilder.java b/com/mojang/blaze3d/vertex/BufferBuilder.java index 805dbf09..57d1128e 100644 --- a/com/mojang/blaze3d/vertex/BufferBuilder.java +++ b/com/mojang/blaze3d/vertex/BufferBuilder.java @@ -1,7 +1,5 @@ package com.mojang.blaze3d.vertex; -import com.mojang.blaze3d.vertex.ByteBufferBuilder.Result; -import com.mojang.blaze3d.vertex.MeshData.DrawState; import java.nio.ByteOrder; import java.util.stream.Collectors; import net.fabricmc.api.EnvType; @@ -13,6 +11,7 @@ import org.lwjgl.system.MemoryUtil; @Environment(EnvType.CLIENT) public class BufferBuilder implements VertexConsumer { + private static final int MAX_VERTEX_COUNT = 16777215; private static final long NOT_BUILDING = -1L; private static final long UNKNOWN_ELEMENT = -1L; private static final boolean IS_LITTLE_ENDIAN = ByteOrder.nativeOrder() == ByteOrder.LITTLE_ENDIAN; @@ -76,13 +75,13 @@ public class BufferBuilder implements VertexConsumer { if (this.vertices == 0) { return null; } else { - Result result = this.buffer.build(); + ByteBufferBuilder.Result result = this.buffer.build(); if (result == null) { return null; } else { int i = this.mode.indexCount(this.vertices); VertexFormat.IndexType indexType = VertexFormat.IndexType.least(this.vertices); - return new MeshData(result, new DrawState(this.format, this.vertices, i, this.mode, indexType)); + return new MeshData(result, new MeshData.DrawState(this.format, this.vertices, i, this.mode, indexType)); } } } @@ -90,10 +89,14 @@ public class BufferBuilder implements VertexConsumer { private long beginVertex() { this.ensureBuilding(); this.endLastVertex(); - this.vertices++; - long l = this.buffer.reserve(this.vertexSize); - this.vertexPointer = l; - return l; + if (this.vertices >= 16777215) { + throw new IllegalStateException("Trying to write too many vertices (>16777215) into BufferBuilder"); + } else { + this.vertices++; + long l = this.buffer.reserve(this.vertexSize); + this.vertexPointer = l; + return l; + } } private long beginElement(VertexFormatElement element) { diff --git a/com/mojang/blaze3d/vertex/ByteBufferBuilder.java b/com/mojang/blaze3d/vertex/ByteBufferBuilder.java index b0874f15..e741657d 100644 --- a/com/mojang/blaze3d/vertex/ByteBufferBuilder.java +++ b/com/mojang/blaze3d/vertex/ByteBufferBuilder.java @@ -6,6 +6,7 @@ import com.mojang.logging.LogUtils; import java.nio.ByteBuffer; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; +import net.minecraft.util.Mth; import org.jetbrains.annotations.Nullable; import org.lwjgl.system.MemoryUtil; import org.lwjgl.system.MemoryUtil.MemoryAllocator; @@ -16,17 +17,20 @@ public class ByteBufferBuilder implements AutoCloseable { private static final MemoryPool MEMORY_POOL = TracyClient.createMemoryPool("ByteBufferBuilder"); private static final Logger LOGGER = LogUtils.getLogger(); private static final MemoryAllocator ALLOCATOR = MemoryUtil.getAllocator(false); + private static final long DEFAULT_MAX_CAPACITY = 4294967295L; private static final int MAX_GROWTH_SIZE = 2097152; private static final int BUFFER_FREED_GENERATION = -1; long pointer; - private int capacity; - private int writeOffset; - private int nextResultOffset; + private long capacity; + private final long maxCapacity; + private long writeOffset; + private long nextResultOffset; private int resultCount; private int generation; - public ByteBufferBuilder(int capacity) { + public ByteBufferBuilder(int capacity, long maxCapacity) { this.capacity = capacity; + this.maxCapacity = maxCapacity; this.pointer = ALLOCATOR.malloc(capacity); MEMORY_POOL.malloc(this.pointer, capacity); if (this.pointer == 0L) { @@ -34,26 +38,38 @@ public class ByteBufferBuilder implements AutoCloseable { } } - public long reserve(int bytes) { - int i = this.writeOffset; - int j = i + bytes; - this.ensureCapacity(j); - this.writeOffset = j; - return this.pointer + i; + public ByteBufferBuilder(int capacity) { + this(capacity, 4294967295L); } - private void ensureCapacity(int size) { - if (size > this.capacity) { - int i = Math.min(this.capacity, 2097152); - int j = Math.max(this.capacity + i, size); - this.resize(j); + public static ByteBufferBuilder exactlySized(int size) { + return new ByteBufferBuilder(size, size); + } + + public long reserve(int bytes) { + long l = this.writeOffset; + long m = Math.addExact(l, bytes); + this.ensureCapacity(m); + this.writeOffset = m; + return Math.addExact(this.pointer, l); + } + + private void ensureCapacity(long capacity) { + if (capacity > this.capacity) { + if (capacity > this.maxCapacity) { + throw new IllegalArgumentException("Maximum capacity of ByteBufferBuilder (" + this.maxCapacity + ") exceeded, required " + capacity); + } + + long l = Math.min(this.capacity, 2097152L); + long m = Mth.clamp(this.capacity + l, capacity, this.maxCapacity); + this.resize(m); } } - private void resize(int newSize) { + private void resize(long newSize) { MEMORY_POOL.free(this.pointer); this.pointer = ALLOCATOR.realloc(this.pointer, newSize); - MEMORY_POOL.malloc(this.pointer, newSize); + MEMORY_POOL.malloc(this.pointer, (int)Math.min(newSize, 2147483647L)); LOGGER.debug("Needed to grow BufferBuilder buffer: Old size {} bytes, new size {} bytes.", this.capacity, newSize); if (this.pointer == 0L) { throw new OutOfMemoryError("Failed to resize buffer from " + this.capacity + " bytes to " + newSize + " bytes"); @@ -65,14 +81,16 @@ public class ByteBufferBuilder implements AutoCloseable { @Nullable public ByteBufferBuilder.Result build() { this.checkOpen(); - int i = this.nextResultOffset; - int j = this.writeOffset - i; - if (j == 0) { + long l = this.nextResultOffset; + long m = this.writeOffset - l; + if (m == 0L) { return null; + } else if (m > 2147483647L) { + throw new IllegalStateException("Cannot build buffer larger than 2147483647 bytes (was " + m + ")"); } else { this.nextResultOffset = this.writeOffset; this.resultCount++; - return new ByteBufferBuilder.Result(i, j, this.generation); + return new ByteBufferBuilder.Result(l, (int)m, this.generation); } } @@ -103,13 +121,13 @@ public class ByteBufferBuilder implements AutoCloseable { } private void discardResults() { - int i = this.writeOffset - this.nextResultOffset; - if (i > 0) { - MemoryUtil.memCopy(this.pointer + this.nextResultOffset, this.pointer, i); + long l = this.writeOffset - this.nextResultOffset; + if (l > 0L) { + MemoryUtil.memCopy(this.pointer + this.nextResultOffset, this.pointer, l); } - this.writeOffset = i; - this.nextResultOffset = 0; + this.writeOffset = l; + this.nextResultOffset = 0L; this.generation++; } @@ -130,12 +148,12 @@ public class ByteBufferBuilder implements AutoCloseable { @Environment(EnvType.CLIENT) public class Result implements AutoCloseable { - private final int offset; + private final long offset; private final int capacity; private final int generation; private boolean closed; - Result(final int offset, final int capacity, final int generation) { + Result(final long offset, final int capacity, final int generation) { this.offset = offset; this.capacity = capacity; this.generation = generation; diff --git a/com/mojang/blaze3d/vertex/DefaultVertexFormat.java b/com/mojang/blaze3d/vertex/DefaultVertexFormat.java index 56d4a443..5ba1e2a4 100644 --- a/com/mojang/blaze3d/vertex/DefaultVertexFormat.java +++ b/com/mojang/blaze3d/vertex/DefaultVertexFormat.java @@ -6,6 +6,7 @@ import net.fabricmc.api.Environment; @Environment(EnvType.CLIENT) public class DefaultVertexFormat { public static final VertexFormat BLIT_SCREEN = VertexFormat.builder().add("Position", VertexFormatElement.POSITION).build(); + public static final VertexFormat EMPTY = VertexFormat.builder().build(); public static final VertexFormat BLOCK = VertexFormat.builder() .add("Position", VertexFormatElement.POSITION) .add("Color", VertexFormatElement.COLOR) diff --git a/com/mojang/blaze3d/vertex/VertexConsumer.java b/com/mojang/blaze3d/vertex/VertexConsumer.java index f8593b83..fa5a2dda 100644 --- a/com/mojang/blaze3d/vertex/VertexConsumer.java +++ b/com/mojang/blaze3d/vertex/VertexConsumer.java @@ -7,7 +7,9 @@ import net.fabricmc.api.Environment; import net.minecraft.client.renderer.LightTexture; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.util.ARGB; +import org.joml.Matrix3x2f; import org.joml.Matrix4f; +import org.joml.Vector2f; import org.joml.Vector3f; import org.joml.Vector3fc; import org.lwjgl.system.MemoryStack; @@ -144,6 +146,11 @@ public interface VertexConsumer { return this.addVertex(vector3f.x(), vector3f.y(), vector3f.z()); } + default VertexConsumer addVertexWith2DPose(Matrix3x2f pose, float x, float y, float z) { + Vector2f vector2f = pose.transformPosition(x, y, new Vector2f()); + return this.addVertex(vector2f.x(), vector2f.y(), z); + } + default VertexConsumer setNormal(PoseStack.Pose pose, float normalX, float normalY, float normalZ) { Vector3f vector3f = pose.transformNormal(normalX, normalY, normalZ, new Vector3f()); return this.setNormal(vector3f.x(), vector3f.y(), vector3f.z()); diff --git a/com/mojang/blaze3d/vertex/VertexFormat.java b/com/mojang/blaze3d/vertex/VertexFormat.java index 54b31292..5e8dd02e 100644 --- a/com/mojang/blaze3d/vertex/VertexFormat.java +++ b/com/mojang/blaze3d/vertex/VertexFormat.java @@ -3,8 +3,6 @@ package com.mojang.blaze3d.vertex; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.mojang.blaze3d.DontObfuscate; -import com.mojang.blaze3d.buffers.BufferType; -import com.mojang.blaze3d.buffers.BufferUsage; import com.mojang.blaze3d.buffers.GpuBuffer; import com.mojang.blaze3d.systems.CommandEncoder; import com.mojang.blaze3d.systems.GpuDevice; @@ -107,18 +105,14 @@ public class VertexFormat { public GpuBuffer uploadImmediateVertexBuffer(ByteBuffer byteBuffer) { GpuDevice gpuDevice = RenderSystem.getDevice(); if (this.immediateDrawVertexBuffer == null) { - this.immediateDrawVertexBuffer = gpuDevice.createBuffer( - () -> "Immediate vertex buffer for " + this, BufferType.VERTICES, BufferUsage.DYNAMIC_WRITE, byteBuffer - ); + this.immediateDrawVertexBuffer = gpuDevice.createBuffer(() -> "Immediate vertex buffer for " + this, 40, byteBuffer); } else { CommandEncoder commandEncoder = gpuDevice.createCommandEncoder(); if (this.immediateDrawVertexBuffer.size() < byteBuffer.remaining()) { this.immediateDrawVertexBuffer.close(); - this.immediateDrawVertexBuffer = gpuDevice.createBuffer( - () -> "Immediate vertex buffer for " + this, BufferType.VERTICES, BufferUsage.DYNAMIC_WRITE, byteBuffer - ); + this.immediateDrawVertexBuffer = gpuDevice.createBuffer(() -> "Immediate vertex buffer for " + this, 40, byteBuffer); } else { - commandEncoder.writeToBuffer(this.immediateDrawVertexBuffer, byteBuffer, 0); + commandEncoder.writeToBuffer(this.immediateDrawVertexBuffer.slice(), byteBuffer); } } @@ -128,16 +122,14 @@ public class VertexFormat { public GpuBuffer uploadImmediateIndexBuffer(ByteBuffer byteBuffer) { GpuDevice gpuDevice = RenderSystem.getDevice(); if (this.immediateDrawIndexBuffer == null) { - this.immediateDrawIndexBuffer = RenderSystem.getDevice() - .createBuffer(() -> "Immediate index buffer for " + this, BufferType.INDICES, BufferUsage.DYNAMIC_WRITE, byteBuffer); + this.immediateDrawIndexBuffer = RenderSystem.getDevice().createBuffer(() -> "Immediate index buffer for " + this, 72, byteBuffer); } else { CommandEncoder commandEncoder = gpuDevice.createCommandEncoder(); if (this.immediateDrawIndexBuffer.size() < byteBuffer.remaining()) { this.immediateDrawIndexBuffer.close(); - this.immediateDrawIndexBuffer = RenderSystem.getDevice() - .createBuffer(() -> "Immediate index buffer for " + this, BufferType.INDICES, BufferUsage.DYNAMIC_WRITE, byteBuffer); + this.immediateDrawIndexBuffer = RenderSystem.getDevice().createBuffer(() -> "Immediate index buffer for " + this, 72, byteBuffer); } else { - commandEncoder.writeToBuffer(this.immediateDrawIndexBuffer, byteBuffer, 0); + commandEncoder.writeToBuffer(this.immediateDrawIndexBuffer.slice(), byteBuffer); } } diff --git a/com/mojang/realmsclient/RealmsMainScreen.java b/com/mojang/realmsclient/RealmsMainScreen.java index 26414b7b..2955db25 100644 --- a/com/mojang/realmsclient/RealmsMainScreen.java +++ b/com/mojang/realmsclient/RealmsMainScreen.java @@ -4,7 +4,6 @@ import com.google.common.collect.Lists; import com.google.common.util.concurrent.RateLimiter; import com.mojang.authlib.yggdrasil.ProfileResult; import com.mojang.logging.LogUtils; -import com.mojang.math.Axis; import com.mojang.realmsclient.client.Ping; import com.mojang.realmsclient.client.RealmsClient; import com.mojang.realmsclient.dto.PingResult; @@ -12,24 +11,19 @@ import com.mojang.realmsclient.dto.RealmsNotification; import com.mojang.realmsclient.dto.RealmsServer; import com.mojang.realmsclient.dto.RealmsServerPlayerLists; import com.mojang.realmsclient.dto.RegionPingResult; -import com.mojang.realmsclient.dto.RealmsNotification.InfoPopup; -import com.mojang.realmsclient.dto.RealmsNotification.VisitUrl; -import com.mojang.realmsclient.dto.RealmsServer.State; import com.mojang.realmsclient.exception.RealmsServiceException; import com.mojang.realmsclient.gui.RealmsDataFetcher; import com.mojang.realmsclient.gui.RealmsServerList; import com.mojang.realmsclient.gui.screens.AddRealmPopupScreen; -import com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen; import com.mojang.realmsclient.gui.screens.RealmsCreateRealmScreen; import com.mojang.realmsclient.gui.screens.RealmsGenericErrorScreen; import com.mojang.realmsclient.gui.screens.RealmsLongRunningMcoTaskScreen; import com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen; import com.mojang.realmsclient.gui.screens.RealmsPopups; -import com.mojang.realmsclient.gui.task.DataFetcher.Subscription; -import com.mojang.realmsclient.gui.task.DataFetcher.Task; +import com.mojang.realmsclient.gui.screens.configuration.RealmsConfigureWorldScreen; +import com.mojang.realmsclient.gui.task.DataFetcher; import com.mojang.realmsclient.util.RealmsPersistence; import com.mojang.realmsclient.util.RealmsUtil; -import com.mojang.realmsclient.util.RealmsPersistence.RealmsPersistenceData; import com.mojang.realmsclient.util.task.GetServerDetailsTask; import java.util.ArrayList; import java.util.Collection; @@ -60,11 +54,10 @@ import net.minecraft.client.gui.components.MultiLineTextWidget; import net.minecraft.client.gui.components.ObjectSelectionList; import net.minecraft.client.gui.components.PlayerFaceRenderer; import net.minecraft.client.gui.components.PopupScreen; +import net.minecraft.client.gui.components.SpriteIconButton; import net.minecraft.client.gui.components.Tooltip; import net.minecraft.client.gui.components.WidgetSprites; import net.minecraft.client.gui.components.WidgetTooltipHolder; -import net.minecraft.client.gui.components.Button.OnPress; -import net.minecraft.client.gui.components.SpriteIconButton.CenteredIcon; import net.minecraft.client.gui.layouts.FrameLayout; import net.minecraft.client.gui.layouts.GridLayout; import net.minecraft.client.gui.layouts.HeaderAndFooterLayout; @@ -72,13 +65,12 @@ import net.minecraft.client.gui.layouts.Layout; import net.minecraft.client.gui.layouts.LayoutSettings; import net.minecraft.client.gui.layouts.LinearLayout; import net.minecraft.client.gui.layouts.SpacerElement; -import net.minecraft.client.gui.layouts.GridLayout.RowHelper; import net.minecraft.client.gui.navigation.CommonInputs; import net.minecraft.client.gui.navigation.ScreenRectangle; import net.minecraft.client.gui.screens.ConfirmLinkScreen; import net.minecraft.client.gui.screens.Screen; -import net.minecraft.client.gui.screens.inventory.tooltip.ClientActivePlayersTooltip.ActivePlayersTooltip; -import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.gui.screens.inventory.tooltip.ClientActivePlayersTooltip; +import net.minecraft.client.renderer.RenderPipelines; import net.minecraft.client.resources.sounds.SimpleSoundInstance; import net.minecraft.network.chat.CommonComponents; import net.minecraft.network.chat.Component; @@ -104,7 +96,6 @@ public class RealmsMainScreen extends RealmsScreen { private static final ResourceLocation NEWS_SPRITE = ResourceLocation.withDefaultNamespace("icon/news"); public static final ResourceLocation HARDCORE_MODE_SPRITE = ResourceLocation.withDefaultNamespace("hud/heart/hardcore_full"); static final Logger LOGGER = LogUtils.getLogger(); - private static final ResourceLocation LOGO_LOCATION = ResourceLocation.withDefaultNamespace("textures/gui/title/realms.png"); private static final ResourceLocation NO_REALMS_LOCATION = ResourceLocation.withDefaultNamespace("textures/gui/realms/no_realms.png"); private static final Component TITLE = Component.translatable("menu.online"); private static final Component LOADING_TEXT = Component.translatable("mco.selectServer.loading"); @@ -130,10 +121,6 @@ public class RealmsMainScreen extends RealmsScreen { private static final int BUTTON_COLUMNS = 3; private static final int BUTTON_SPACING = 4; private static final int CONTENT_WIDTH = 308; - private static final int LOGO_WIDTH = 128; - private static final int LOGO_HEIGHT = 34; - private static final int LOGO_TEXTURE_WIDTH = 128; - private static final int LOGO_TEXTURE_HEIGHT = 64; private static final int LOGO_PADDING = 5; private static final int HEADER_HEIGHT = 44; private static final int FOOTER_PADDING = 11; @@ -141,11 +128,11 @@ public class RealmsMainScreen extends RealmsScreen { private static final int NEW_REALM_SPRITE_HEIGHT = 20; private static final int ENTRY_WIDTH = 216; private static final int ITEM_HEIGHT = 36; - private static final boolean SNAPSHOT = !SharedConstants.getCurrentVersion().isStable(); + private static final boolean SNAPSHOT = !SharedConstants.getCurrentVersion().stable(); private static boolean snapshotToggle = SNAPSHOT; private final CompletableFuture availability = RealmsAvailability.get(); @Nullable - private Subscription dataSubscription; + private DataFetcher.Subscription dataSubscription; private final Set handledSeenNotifications = new HashSet(); private static boolean regionsPinged; private final RateLimiter inviteNarrationLimiter; @@ -191,7 +178,7 @@ public class RealmsMainScreen extends RealmsScreen { if (string != null) { ConfirmLinkScreen.confirmLinkNow(this, string); if (this.newsButton.notificationCount() != 0) { - RealmsPersistenceData realmsPersistenceData = RealmsPersistence.readFile(); + RealmsPersistence.RealmsPersistenceData realmsPersistenceData = RealmsPersistence.readFile(); realmsPersistenceData.hasUnreadNews = false; RealmsPersistence.writeFile(realmsPersistenceData); this.newsButton.setNotificationCount(0); @@ -299,14 +286,14 @@ public class RealmsMainScreen extends RealmsScreen { LinearLayout linearLayout2 = LinearLayout.horizontal(); linearLayout2.defaultCellSetting().alignVerticallyMiddle(); linearLayout2.addChild(SpacerElement.width(90)); - linearLayout2.addChild(ImageWidget.texture(128, 34, LOGO_LOCATION, 128, 64), LayoutSettings::alignHorizontallyCenter); + linearLayout2.addChild(realmsLogo(), LayoutSettings::alignHorizontallyCenter); linearLayout2.addChild(new FrameLayout(90, 44)).addChild(linearLayout, LayoutSettings::alignHorizontallyRight); return linearLayout2; } private Layout createFooter(RealmsMainScreen.LayoutState layoutState) { GridLayout gridLayout = new GridLayout().spacing(4); - RowHelper rowHelper = gridLayout.createRowHelper(3); + GridLayout.RowHelper rowHelper = gridLayout.createRowHelper(3); if (layoutState == RealmsMainScreen.LayoutState.LIST) { rowHelper.addChild(this.playButton); rowHelper.addChild(this.configureButton); @@ -323,23 +310,23 @@ public class RealmsMainScreen extends RealmsScreen { LinearLayout linearLayout = LinearLayout.vertical().spacing(8); linearLayout.defaultCellSetting().alignHorizontallyCenter(); linearLayout.addChild(ImageWidget.texture(130, 64, NO_REALMS_LOCATION, 130, 64)); - FocusableTextWidget focusableTextWidget = new FocusableTextWidget(308, NO_REALMS_TEXT, this.font, false, 4); + FocusableTextWidget focusableTextWidget = new FocusableTextWidget(308, NO_REALMS_TEXT, this.font, false, true, 4); linearLayout.addChild(focusableTextWidget); return linearLayout; } void updateButtonStates() { RealmsServer realmsServer = this.getSelectedServer(); + boolean bl = realmsServer != null; this.addRealmButton.active = this.activeLayoutState != RealmsMainScreen.LayoutState.LOADING; - this.playButton.active = realmsServer != null && this.shouldPlayButtonBeActive(realmsServer); - this.renewButton.active = realmsServer != null && this.shouldRenewButtonBeActive(realmsServer); - this.leaveButton.active = realmsServer != null && this.shouldLeaveButtonBeActive(realmsServer); - this.configureButton.active = realmsServer != null && this.shouldConfigureButtonBeActive(realmsServer); - } + this.playButton.active = bl && realmsServer.shouldPlayButtonBeActive(); + if (!this.playButton.active && bl && realmsServer.state == RealmsServer.State.CLOSED) { + this.playButton.setTooltip(Tooltip.create(RealmsServer.WORLD_CLOSED_COMPONENT)); + } - boolean shouldPlayButtonBeActive(RealmsServer realmsServer) { - boolean bl = !realmsServer.expired && realmsServer.state == State.OPEN; - return bl && (realmsServer.isCompatible() || realmsServer.needsUpgrade() || isSelfOwnedServer(realmsServer)); + this.renewButton.active = bl && this.shouldRenewButtonBeActive(realmsServer); + this.leaveButton.active = bl && this.shouldLeaveButtonBeActive(realmsServer); + this.configureButton.active = bl && this.shouldConfigureButtonBeActive(realmsServer); } private boolean shouldRenewButtonBeActive(RealmsServer realmsServer) { @@ -347,7 +334,7 @@ public class RealmsMainScreen extends RealmsScreen { } private boolean shouldConfigureButtonBeActive(RealmsServer realmsServer) { - return isSelfOwnedServer(realmsServer) && realmsServer.state != State.UNINITIALIZED; + return isSelfOwnedServer(realmsServer) && realmsServer.state != RealmsServer.State.UNINITIALIZED; } private boolean shouldLeaveButtonBeActive(RealmsServer realmsServer) { @@ -371,13 +358,13 @@ public class RealmsMainScreen extends RealmsScreen { } private void debugRefreshDataFetchers() { - for (Task task : this.minecraft.realmsDataFetcher().getTasks()) { + for (DataFetcher.Task task : this.minecraft.realmsDataFetcher().getTasks()) { task.reset(); } } - private Subscription initDataFetcher(RealmsDataFetcher dataFetcher) { - Subscription subscription = dataFetcher.dataFetcher.createSubscription(); + private DataFetcher.Subscription initDataFetcher(RealmsDataFetcher dataFetcher) { + DataFetcher.Subscription subscription = dataFetcher.dataFetcher.createSubscription(); subscription.subscribe(dataFetcher.serverListUpdateTask, serverListData -> { this.serverList.updateServersList(serverListData.serverList()); this.availableSnapshotServers = serverListData.availableSnapshotServers(); @@ -400,7 +387,7 @@ public class RealmsMainScreen extends RealmsScreen { this.notifications.addAll(list); for (RealmsNotification realmsNotification : list) { - if (realmsNotification instanceof InfoPopup infoPopup) { + if (realmsNotification instanceof RealmsNotification.InfoPopup infoPopup) { PopupScreen popupScreen = infoPopup.buildScreen(this, this::dismissNotification); if (popupScreen != null) { this.minecraft.setScreen(popupScreen); @@ -418,7 +405,7 @@ public class RealmsMainScreen extends RealmsScreen { this.pendingInvitesButton.setNotificationCount(integer); this.pendingInvitesButton.setTooltip(integer == 0 ? Tooltip.create(NO_PENDING_INVITES) : Tooltip.create(PENDING_INVITES)); if (integer > 0 && this.inviteNarrationLimiter.tryAcquire(1)) { - this.minecraft.getNarrator().sayNow(Component.translatable("mco.configure.world.invite.narration", integer)); + this.minecraft.getNarrator().saySystemNow(Component.translatable("mco.configure.world.invite.narration", integer)); } }); subscription.subscribe(dataFetcher.trialAvailabilityTask, boolean_ -> this.trialsAvailable = boolean_); @@ -566,7 +553,7 @@ public class RealmsMainScreen extends RealmsScreen { public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTick) { super.render(guiGraphics, mouseX, mouseY, partialTick); if (isSnapshot()) { - guiGraphics.drawString(this.font, "Minecraft " + SharedConstants.getCurrentVersion().getName(), 2, this.height - 10, -1); + guiGraphics.drawString(this.font, "Minecraft " + SharedConstants.getCurrentVersion().name(), 2, this.height - 10, -1); } if (this.trialsAvailable && this.addRealmButton.active) { @@ -578,7 +565,7 @@ public class RealmsMainScreen extends RealmsScreen { this.renderEnvironment(guiGraphics, "STAGE!", -256); break; case LOCAL: - this.renderEnvironment(guiGraphics, "LOCAL!", 8388479); + this.renderEnvironment(guiGraphics, "LOCAL!", -8388737); } } @@ -618,7 +605,7 @@ public class RealmsMainScreen extends RealmsScreen { Component.translatable( "mco.compatibility.downgrade.description", Component.literal(realmsServer.activeVersion).withColor(-171), - Component.literal(SharedConstants.getCurrentVersion().getName()).withColor(-171) + Component.literal(SharedConstants.getCurrentVersion().name()).withColor(-171) ), Component.translatable("mco.compatibility.downgrade") ); @@ -634,7 +621,7 @@ public class RealmsMainScreen extends RealmsScreen { Component.translatable( "mco.compatibility.incompatible.series.popup.message", Component.literal(realmsServer.activeVersion).withColor(-171), - Component.literal(SharedConstants.getCurrentVersion().getName()).withColor(-171) + Component.literal(SharedConstants.getCurrentVersion().name()).withColor(-171) ) ) .addButton(CommonComponents.GUI_BACK, PopupScreen::onClose) @@ -664,7 +651,7 @@ public class RealmsMainScreen extends RealmsScreen { Component component = Component.translatable("mco.compatibility.upgrade.title").withColor(-171); Component component2 = Component.translatable("mco.compatibility.upgrade"); Component component3 = Component.literal(server.activeVersion).withColor(-171); - Component component4 = Component.literal(SharedConstants.getCurrentVersion().getName()).withColor(-171); + Component component4 = Component.literal(SharedConstants.getCurrentVersion().name()).withColor(-171); Component component5 = isSelfOwnedServer(server) ? Component.translatable("mco.compatibility.upgrade.description", component3, component4) : Component.translatable("mco.compatibility.upgrade.friend.description", component3, component4); @@ -692,12 +679,12 @@ public class RealmsMainScreen extends RealmsScreen { } private void renderEnvironment(GuiGraphics guiGraphics, String text, int color) { - guiGraphics.pose().pushPose(); - guiGraphics.pose().translate((float)(this.width / 2 - 25), 20.0F, 0.0F); - guiGraphics.pose().mulPose(Axis.ZP.rotationDegrees(-20.0F)); - guiGraphics.pose().scale(1.5F, 1.5F, 1.5F); + guiGraphics.pose().pushMatrix(); + guiGraphics.pose().translate(this.width / 2 - 25, 20.0F); + guiGraphics.pose().rotate((float) (-Math.PI / 9)); + guiGraphics.pose().scale(1.5F, 1.5F); guiGraphics.drawString(this.font, text, 0, 0, color); - guiGraphics.pose().popPose(); + guiGraphics.pose().popMatrix(); } @Environment(EnvType.CLIENT) @@ -714,9 +701,9 @@ public class RealmsMainScreen extends RealmsScreen { @Override public void render(GuiGraphics guiGraphics, int index, int top, int left, int width, int height, int mouseX, int mouseY, boolean hovering, float partialTick) { - guiGraphics.blitSprite(RenderType::guiTextured, RealmsMainScreen.NEW_REALM_SPRITE, left - 5, top + height / 2 - 10, 40, 20); + guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, RealmsMainScreen.NEW_REALM_SPRITE, left - 5, top + height / 2 - 10, 40, 20); int i = top + height / 2 - 9 / 2; - guiGraphics.drawString(RealmsMainScreen.this.font, START_SNAPSHOT_REALM, left + 40 - 2, i - 5, 8388479); + guiGraphics.drawString(RealmsMainScreen.this.font, START_SNAPSHOT_REALM, left + 40 - 2, i - 5, -8388737); guiGraphics.drawString( RealmsMainScreen.this.font, Component.translatable("mco.snapshot.description", Objects.requireNonNullElse(this.parent.name, "unknown server")), @@ -724,7 +711,7 @@ public class RealmsMainScreen extends RealmsScreen { i + 5, -8355712 ); - this.tooltip.refreshTooltipForNextRenderPass(hovering, this.isFocused(), new ScreenRectangle(left, top, width, height)); + this.tooltip.refreshTooltipForNextRenderPass(guiGraphics, mouseX, mouseY, hovering, this.isFocused(), new ScreenRectangle(left, top, width, height)); } @Override @@ -812,7 +799,7 @@ public class RealmsMainScreen extends RealmsScreen { ResourceLocation.withDefaultNamespace("widget/cross_button"), ResourceLocation.withDefaultNamespace("widget/cross_button_highlighted") ); - protected CrossButton(OnPress onPress, Component message) { + protected CrossButton(Button.OnPress onPress, Component message) { super(0, 0, 14, 14, SPRITES, onPress); this.setTooltip(Tooltip.create(message)); } @@ -842,7 +829,7 @@ public class RealmsMainScreen extends RealmsScreen { int j = y + 2; if (realmsServer.expired) { this.drawRealmStatus(guiGraphics, i, j, mouseX, mouseY, RealmsMainScreen.EXPIRED_SPRITE, () -> RealmsMainScreen.SERVER_EXPIRED_TOOLTIP); - } else if (realmsServer.state == State.CLOSED) { + } else if (realmsServer.state == RealmsServer.State.CLOSED) { this.drawRealmStatus(guiGraphics, i, j, mouseX, mouseY, RealmsMainScreen.CLOSED_SPRITE, () -> RealmsMainScreen.SERVER_CLOSED_TOOLTIP); } else if (RealmsMainScreen.isSelfOwnedServer(realmsServer) && realmsServer.daysLeft < 7) { this.drawRealmStatus( @@ -862,7 +849,7 @@ public class RealmsMainScreen extends RealmsScreen { } } ); - } else if (realmsServer.state == State.OPEN) { + } else if (realmsServer.state == RealmsServer.State.OPEN) { this.drawRealmStatus(guiGraphics, i, j, mouseX, mouseY, RealmsMainScreen.OPEN_SPRITE, () -> RealmsMainScreen.SERVER_OPEN_TOOLTIP); } } @@ -870,9 +857,35 @@ public class RealmsMainScreen extends RealmsScreen { private void drawRealmStatus( GuiGraphics guiGraphics, int x, int y, int mouseX, int mouseY, ResourceLocation spriteLocation, Supplier tooltipSupplier ) { - guiGraphics.blitSprite(RenderType::guiTextured, spriteLocation, x, y, 10, 28); + guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, spriteLocation, x, y, 10, 28); if (RealmsMainScreen.this.realmSelectionList.isMouseOver(mouseX, mouseY) && mouseX >= x && mouseX <= x + 10 && mouseY >= y && mouseY <= y + 28) { - RealmsMainScreen.this.setTooltipForNextRenderPass((Component)tooltipSupplier.get()); + guiGraphics.setTooltipForNextFrame((Component)tooltipSupplier.get(), mouseX, mouseY); + } + } + + protected void renderFirstLine(GuiGraphics guiGraphics, int top, int left, int width, int serverNameColor, RealmsServer server) { + int i = this.textX(left); + int j = this.firstLineY(top); + Component component = RealmsMainScreen.getVersionComponent(server.activeVersion, server.isCompatible()); + int k = this.versionTextX(left, width, component); + this.renderClampedString(guiGraphics, server.getName(), i, j, k, serverNameColor); + if (component != CommonComponents.EMPTY && !server.isMinigameActive()) { + guiGraphics.drawString(RealmsMainScreen.this.font, component, k, j, -8355712); + } + } + + protected void renderSecondLine(GuiGraphics guiGraphics, int top, int left, int width, RealmsServer server) { + int i = this.textX(left); + int j = this.firstLineY(top); + int k = this.secondLineY(j); + String string = server.getMinigameName(); + boolean bl = server.isMinigameActive(); + if (bl && string != null) { + Component component = Component.literal(string).withStyle(ChatFormatting.GRAY); + guiGraphics.drawString(RealmsMainScreen.this.font, Component.translatable("mco.selectServer.minigameName", component).withColor(-171), i, k, -1); + } else { + int l = this.renderGameMode(server, guiGraphics, left, width, j); + this.renderClampedString(guiGraphics, server.getDescription(), i, this.secondLineY(j), l, -8355712); } } @@ -920,7 +933,7 @@ public class RealmsMainScreen extends RealmsScreen { if (bl) { j -= 10; - guiGraphics.blitSprite(RenderType::guiTextured, RealmsMainScreen.HARDCORE_MODE_SPRITE, j, this.secondLineY(firstLineY), 8, 8); + guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, RealmsMainScreen.HARDCORE_MODE_SPRITE, j, this.secondLineY(firstLineY), 8, 8); } return j; @@ -955,7 +968,7 @@ public class RealmsMainScreen extends RealmsScreen { } @Environment(EnvType.CLIENT) - static class NotificationButton extends CenteredIcon { + static class NotificationButton extends SpriteIconButton.CenteredIcon { private static final ResourceLocation[] NOTIFICATION_ICONS = new ResourceLocation[]{ ResourceLocation.withDefaultNamespace("notification/1"), ResourceLocation.withDefaultNamespace("notification/2"), @@ -969,7 +982,7 @@ public class RealmsMainScreen extends RealmsScreen { private static final int SPRITE_SIZE = 14; private int notificationCount; - public NotificationButton(Component message, ResourceLocation sprite, OnPress onPress) { + public NotificationButton(Component message, ResourceLocation sprite, Button.OnPress onPress) { super(20, 20, message, 14, 14, sprite, onPress, null); } @@ -991,7 +1004,7 @@ public class RealmsMainScreen extends RealmsScreen { private void drawNotificationCounter(GuiGraphics guiGraphics) { guiGraphics.blitSprite( - RenderType::guiTextured, NOTIFICATION_ICONS[Math.min(this.notificationCount, 6) - 1], this.getX() + this.getWidth() - 5, this.getY() - 3, 8, 8 + RenderPipelines.GUI_TEXTURED, NOTIFICATION_ICONS[Math.min(this.notificationCount, 6) - 1], this.getX() + this.getWidth() - 5, this.getY() - 3, 8, 8 ); } } @@ -1104,25 +1117,12 @@ public class RealmsMainScreen extends RealmsScreen { @Override public void render(GuiGraphics guiGraphics, int index, int top, int left, int width, int height, int mouseX, int mouseY, boolean hovering, float partialTick) { - int i = this.textX(left); - int j = this.firstLineY(top); - RealmsUtil.renderPlayerFace(guiGraphics, left, top, 32, this.server.ownerUUID); - Component component = RealmsMainScreen.getVersionComponent(this.server.activeVersion, -8355712); - int k = this.versionTextX(left, width, component); - this.renderClampedString(guiGraphics, this.server.getName(), i, j, k, -8355712); - if (component != CommonComponents.EMPTY) { - guiGraphics.drawString(RealmsMainScreen.this.font, component, k, j, -8355712); - } - - int l = left; - if (!this.server.isMinigameActive()) { - l = this.renderGameMode(this.server, guiGraphics, left, width, j); - } - - this.renderClampedString(guiGraphics, this.server.getDescription(), i, this.secondLineY(j), l, -8355712); - this.renderThirdLine(guiGraphics, top, left, this.server); this.renderStatusLights(this.server, guiGraphics, left + width, top, mouseX, mouseY); - this.tooltip.refreshTooltipForNextRenderPass(hovering, this.isFocused(), new ScreenRectangle(left, top, width, height)); + RealmsUtil.renderPlayerFace(guiGraphics, left, top, 32, this.server.ownerUUID); + this.renderFirstLine(guiGraphics, top, left, width, -8355712, this.server); + this.renderSecondLine(guiGraphics, top, left, width, this.server); + this.renderThirdLine(guiGraphics, top, left, this.server); + this.tooltip.refreshTooltipForNextRenderPass(guiGraphics, mouseX, mouseY, hovering, this.isFocused(), new ScreenRectangle(left, top, width, height)); } @Override @@ -1137,8 +1137,8 @@ public class RealmsMainScreen extends RealmsScreen { super(Minecraft.getInstance(), RealmsMainScreen.this.width, RealmsMainScreen.this.height, 0, 36); } - public void setSelected(@Nullable RealmsMainScreen.Entry entry) { - super.setSelected(entry); + public void setSelected(@Nullable RealmsMainScreen.Entry selected) { + super.setSelected(selected); RealmsMainScreen.this.updateButtonStates(); } @@ -1151,7 +1151,7 @@ public class RealmsMainScreen extends RealmsScreen { this.clearEntries(); for (RealmsNotification realmsNotification : RealmsMainScreen.this.notifications) { - if (realmsNotification instanceof VisitUrl visitUrl) { + if (realmsNotification instanceof RealmsNotification.VisitUrl visitUrl) { this.addEntriesForNotification(visitUrl, screen); RealmsMainScreen.this.markNotificationsAsSeen(List.of(realmsNotification)); break; @@ -1169,7 +1169,7 @@ public class RealmsMainScreen extends RealmsScreen { for (RealmsServer realmsServer : RealmsMainScreen.this.serverList) { RealmsMainScreen.Entry entry; if (RealmsMainScreen.isSnapshot() && !realmsServer.isSnapshotRealm()) { - if (realmsServer.state == State.UNINITIALIZED) { + if (realmsServer.state == RealmsServer.State.UNINITIALIZED) { continue; } @@ -1185,7 +1185,7 @@ public class RealmsMainScreen extends RealmsScreen { } } - private void addEntriesForNotification(VisitUrl url, RealmsMainScreen mainScreen) { + private void addEntriesForNotification(RealmsNotification.VisitUrl url, RealmsMainScreen mainScreen) { Component component = url.getMessage(); int i = RealmsMainScreen.this.font.wordWrapHeight(component, 216); int j = Mth.positiveCeilDiv(i + 7, 36) - 1; @@ -1224,51 +1224,24 @@ public class RealmsMainScreen extends RealmsScreen { @Override public void render(GuiGraphics guiGraphics, int index, int top, int left, int width, int height, int mouseX, int mouseY, boolean hovering, float partialTick) { - if (this.serverData.state == State.UNINITIALIZED) { - guiGraphics.blitSprite(RenderType::guiTextured, RealmsMainScreen.NEW_REALM_SPRITE, left - 5, top + height / 2 - 10, 40, 20); + if (this.serverData.state == RealmsServer.State.UNINITIALIZED) { + guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, RealmsMainScreen.NEW_REALM_SPRITE, left - 5, top + height / 2 - 10, 40, 20); int i = top + height / 2 - 9 / 2; - guiGraphics.drawString(RealmsMainScreen.this.font, RealmsMainScreen.SERVER_UNITIALIZED_TEXT, left + 40 - 2, i, 8388479); + guiGraphics.drawString(RealmsMainScreen.this.font, RealmsMainScreen.SERVER_UNITIALIZED_TEXT, left + 40 - 2, i, -8388737); } else { - this.renderStatusLights(this.serverData, guiGraphics, left + 36, top, mouseX, mouseY); RealmsUtil.renderPlayerFace(guiGraphics, left, top, 32, this.serverData.ownerUUID); - this.renderFirstLine(guiGraphics, top, left, width); - this.renderSecondLine(guiGraphics, top, left, width); + this.renderFirstLine(guiGraphics, top, left, width, -1, this.serverData); + this.renderSecondLine(guiGraphics, top, left, width, this.serverData); this.renderThirdLine(guiGraphics, top, left, this.serverData); - boolean bl = this.renderOnlinePlayers(guiGraphics, top, left, width, height, mouseX, mouseY); this.renderStatusLights(this.serverData, guiGraphics, left + width, top, mouseX, mouseY); + boolean bl = this.renderOnlinePlayers(guiGraphics, top, left, width, height, mouseX, mouseY, partialTick); if (!bl) { - this.tooltip.refreshTooltipForNextRenderPass(hovering, this.isFocused(), new ScreenRectangle(left, top, width, height)); + this.tooltip.refreshTooltipForNextRenderPass(guiGraphics, mouseX, mouseY, hovering, this.isFocused(), new ScreenRectangle(left, top, width, height)); } } } - private void renderFirstLine(GuiGraphics guiGraphics, int top, int left, int width) { - int i = this.textX(left); - int j = this.firstLineY(top); - Component component = RealmsMainScreen.getVersionComponent(this.serverData.activeVersion, this.serverData.isCompatible()); - int k = this.versionTextX(left, width, component); - this.renderClampedString(guiGraphics, this.serverData.getName(), i, j, k, -1); - if (component != CommonComponents.EMPTY && !this.serverData.isMinigameActive()) { - guiGraphics.drawString(RealmsMainScreen.this.font, component, k, j, -8355712); - } - } - - private void renderSecondLine(GuiGraphics guiGraphics, int top, int left, int width) { - int i = this.textX(left); - int j = this.firstLineY(top); - int k = this.secondLineY(j); - String string = this.serverData.getMinigameName(); - boolean bl = this.serverData.isMinigameActive(); - if (bl && string != null) { - Component component = Component.literal(string).withStyle(ChatFormatting.GRAY); - guiGraphics.drawString(RealmsMainScreen.this.font, Component.translatable("mco.selectServer.minigameName", component).withColor(-171), i, k, -1); - } else { - int l = this.renderGameMode(this.serverData, guiGraphics, left, width, j); - this.renderClampedString(guiGraphics, this.serverData.getDescription(), i, this.secondLineY(j), l, -8355712); - } - } - - private boolean renderOnlinePlayers(GuiGraphics guiGraphics, int top, int left, int width, int height, int mouseX, int mouseY) { + private boolean renderOnlinePlayers(GuiGraphics guiGraphics, int top, int left, int width, int height, int mouseX, int mouseY, float partialTick) { List list = RealmsMainScreen.this.onlinePlayersPerRealm.getProfileResultsFor(this.serverData.id); if (!list.isEmpty()) { int i = left + width - 21; @@ -1281,7 +1254,13 @@ public class RealmsMainScreen extends RealmsScreen { } if (mouseX >= k && mouseX <= i && mouseY >= j && mouseY <= j + 9) { - guiGraphics.renderTooltip(RealmsMainScreen.this.font, List.of(ONLINE_PLAYERS_TOOLTIP_HEADER), Optional.of(new ActivePlayersTooltip(list)), mouseX, mouseY); + guiGraphics.setTooltipForNextFrame( + RealmsMainScreen.this.font, + List.of(ONLINE_PLAYERS_TOOLTIP_HEADER), + Optional.of(new ClientActivePlayersTooltip.ActivePlayersTooltip(list)), + mouseX, + mouseY + ); return true; } } @@ -1302,9 +1281,9 @@ public class RealmsMainScreen extends RealmsScreen { @Override public boolean mouseClicked(double mouseX, double mouseY, int button) { - if (this.serverData.state == State.UNINITIALIZED) { + if (this.serverData.state == RealmsServer.State.UNINITIALIZED) { this.createUnitializedRealm(); - } else if (RealmsMainScreen.this.shouldPlayButtonBeActive(this.serverData)) { + } else if (this.serverData.shouldPlayButtonBeActive()) { if (Util.getMillis() - RealmsMainScreen.this.lastClickTime < 250L && this.isFocused()) { this.playRealm(); } @@ -1318,12 +1297,12 @@ public class RealmsMainScreen extends RealmsScreen { @Override public boolean keyPressed(int keyCode, int scanCode, int modifiers) { if (CommonInputs.selected(keyCode)) { - if (this.serverData.state == State.UNINITIALIZED) { + if (this.serverData.state == RealmsServer.State.UNINITIALIZED) { this.createUnitializedRealm(); return true; } - if (RealmsMainScreen.this.shouldPlayButtonBeActive(this.serverData)) { + if (this.serverData.shouldPlayButtonBeActive()) { this.playRealm(); return true; } @@ -1334,7 +1313,7 @@ public class RealmsMainScreen extends RealmsScreen { @Override public Component getNarration() { - return (Component)(this.serverData.state == State.UNINITIALIZED + return (Component)(this.serverData.state == RealmsServer.State.UNINITIALIZED ? RealmsMainScreen.UNITIALIZED_WORLD_NARRATION : Component.translatable("narrator.select", Objects.requireNonNullElse(this.serverData.name, "unknown server"))); } diff --git a/com/mojang/realmsclient/client/FileUpload.java b/com/mojang/realmsclient/client/FileUpload.java index bec4fada..915151ce 100644 --- a/com/mojang/realmsclient/client/FileUpload.java +++ b/com/mojang/realmsclient/client/FileUpload.java @@ -1,12 +1,10 @@ package com.mojang.realmsclient.client; import com.google.gson.JsonElement; -import com.google.gson.JsonParser; import com.mojang.logging.LogUtils; import com.mojang.realmsclient.client.worldupload.RealmsUploadCanceledException; import com.mojang.realmsclient.dto.UploadInfo; import com.mojang.realmsclient.gui.screens.UploadResult; -import com.mojang.realmsclient.gui.screens.UploadResult.Builder; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -22,6 +20,7 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.Util; import net.minecraft.client.User; +import net.minecraft.util.LenientJsonParser; import org.apache.http.HttpResponse; import org.apache.http.NameValuePair; import org.apache.http.client.config.RequestConfig; @@ -56,26 +55,26 @@ public class FileUpload { .setConnectTimeout((int)TimeUnit.SECONDS.toMillis(15L)) .build(); - public FileUpload(File file, long realmId, int slotId, UploadInfo uploadInfo, User user, String clientVersiob, String worldVersion, UploadStatus uploadStatus) { + public FileUpload(File file, long realmId, int slotId, UploadInfo uploadInfo, User user, String clientVersion, String worldVersion, UploadStatus uploadStatus) { this.file = file; this.realmId = realmId; this.slotId = slotId; this.uploadInfo = uploadInfo; this.sessionId = user.getSessionId(); this.username = user.getName(); - this.clientVersion = clientVersiob; + this.clientVersion = clientVersion; this.worldVersion = worldVersion; this.uploadStatus = uploadStatus; } public UploadResult upload() { if (this.uploadTask != null) { - return new Builder().build(); + return new UploadResult.Builder().build(); } else { this.uploadTask = CompletableFuture.supplyAsync(() -> this.requestUpload(0), Util.backgroundExecutor()); if (this.cancelled.get()) { this.cancel(); - return new Builder().build(); + return new UploadResult.Builder().build(); } else { return (UploadResult)this.uploadTask.join(); } @@ -90,7 +89,7 @@ public class FileUpload { * @param retries The number of times this upload has already been attempted */ private UploadResult requestUpload(int retries) { - Builder builder = new Builder(); + UploadResult.Builder builder = new UploadResult.Builder(); if (this.cancelled.get()) { return builder.build(); } else { @@ -156,7 +155,7 @@ public class FileUpload { post.setEntity(customInputStreamEntity); } - private void handleResponse(HttpResponse response, Builder uploadResult) throws IOException { + private void handleResponse(HttpResponse response, UploadResult.Builder uploadResult) throws IOException { int i = response.getStatusLine().getStatusCode(); if (i == 401) { LOGGER.debug("Realms server returned 401: {}", response.getFirstHeader("WWW-Authenticate")); @@ -167,11 +166,10 @@ public class FileUpload { String string = EntityUtils.toString(response.getEntity(), "UTF-8"); if (string != null) { try { - JsonParser jsonParser = new JsonParser(); - JsonElement jsonElement = jsonParser.parse(string).getAsJsonObject().get("errorMsg"); + JsonElement jsonElement = LenientJsonParser.parse(string).getAsJsonObject().get("errorMsg"); Optional optional = Optional.ofNullable(jsonElement).map(JsonElement::getAsString); uploadResult.withErrorMessage((String)optional.orElse(null)); - } catch (Exception var8) { + } catch (Exception var7) { } } } diff --git a/com/mojang/realmsclient/client/RealmsClient.java b/com/mojang/realmsclient/client/RealmsClient.java index 315856bb..222d1734 100644 --- a/com/mojang/realmsclient/client/RealmsClient.java +++ b/com/mojang/realmsclient/client/RealmsClient.java @@ -2,11 +2,8 @@ package com.mojang.realmsclient.client; import com.google.gson.JsonArray; import com.google.gson.JsonElement; -import com.google.gson.JsonParser; import com.mojang.logging.LogUtils; import com.mojang.realmsclient.RealmsMainScreen; -import com.mojang.realmsclient.client.RealmsError.AuthenticationError; -import com.mojang.realmsclient.client.RealmsError.CustomError; import com.mojang.realmsclient.dto.BackupList; import com.mojang.realmsclient.dto.GuardedSerializer; import com.mojang.realmsclient.dto.Ops; @@ -14,21 +11,28 @@ import com.mojang.realmsclient.dto.PendingInvite; import com.mojang.realmsclient.dto.PendingInvitesList; import com.mojang.realmsclient.dto.PingResult; import com.mojang.realmsclient.dto.PlayerInfo; +import com.mojang.realmsclient.dto.PreferredRegionsDto; +import com.mojang.realmsclient.dto.RealmsConfigurationDto; import com.mojang.realmsclient.dto.RealmsDescriptionDto; +import com.mojang.realmsclient.dto.RealmsJoinInformation; import com.mojang.realmsclient.dto.RealmsNews; import com.mojang.realmsclient.dto.RealmsNotification; +import com.mojang.realmsclient.dto.RealmsRegion; import com.mojang.realmsclient.dto.RealmsServer; -import com.mojang.realmsclient.dto.RealmsServerAddress; import com.mojang.realmsclient.dto.RealmsServerList; import com.mojang.realmsclient.dto.RealmsServerPlayerLists; +import com.mojang.realmsclient.dto.RealmsSetting; +import com.mojang.realmsclient.dto.RealmsSlotUpdateDto; import com.mojang.realmsclient.dto.RealmsWorldOptions; import com.mojang.realmsclient.dto.RealmsWorldResetDto; +import com.mojang.realmsclient.dto.RegionDataDto; +import com.mojang.realmsclient.dto.RegionSelectionPreference; +import com.mojang.realmsclient.dto.RegionSelectionPreferenceDto; import com.mojang.realmsclient.dto.ServerActivityList; import com.mojang.realmsclient.dto.Subscription; import com.mojang.realmsclient.dto.UploadInfo; import com.mojang.realmsclient.dto.WorldDownload; import com.mojang.realmsclient.dto.WorldTemplatePaginatedList; -import com.mojang.realmsclient.dto.RealmsServer.WorldType; import com.mojang.realmsclient.exception.RealmsHttpException; import com.mojang.realmsclient.exception.RealmsServiceException; import com.mojang.realmsclient.exception.RetryCallException; @@ -47,6 +51,8 @@ import net.fabricmc.api.EnvType; import net.minecraft.SharedConstants; import net.minecraft.Util; import net.minecraft.client.Minecraft; +import net.minecraft.client.User; +import net.minecraft.util.LenientJsonParser; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; @@ -70,6 +76,7 @@ public class RealmsClient { private static final String ACTIVITIES_RESOURCE = "activities"; private static final String OPS_RESOURCE = "ops"; private static final String REGIONS_RESOURCE = "regions/ping/stat"; + private static final String PREFERRED_REGION_RESOURCE = "regions/preferredRegions"; private static final String TRIALS_RESOURCE = "trial"; private static final String NOTIFICATIONS_RESOURCE = "notifications"; private static final String FEATURE_FLAGS_RESOURCE = "feature/v1"; @@ -93,7 +100,7 @@ public class RealmsClient { private static final String PATH_ACCEPT_INVITE = "/accept/$INVITATION_ID"; private static final String PATH_REJECT_INVITE = "/reject/$INVITATION_ID"; private static final String PATH_UNINVITE_MYSELF = "/$WORLD_ID"; - private static final String PATH_WORLD_UPDATE = "/$WORLD_ID"; + private static final String PATH_WORLD_CONFIGURE = "/$WORLD_ID/configuration"; private static final String PATH_SLOT = "/$WORLD_ID/slot/$SLOT_ID"; private static final String PATH_WORLD_OPEN = "/$WORLD_ID/open"; private static final String PATH_WORLD_CLOSE = "/$WORLD_ID/close"; @@ -147,21 +154,26 @@ public class RealmsClient { } private Set fetchFeatureFlags() { - String string = url("feature/v1", null, false); + User user = Minecraft.getInstance().getUser(); + if (user.getType() != User.Type.MSA) { + return Set.of(); + } else { + String string = url("feature/v1", null, false); - try { - String string2 = this.execute(Request.get(string, 5000, 10000)); - JsonArray jsonArray = JsonParser.parseString(string2).getAsJsonArray(); - Set set = (Set)jsonArray.asList().stream().map(JsonElement::getAsString).collect(Collectors.toSet()); - LOGGER.debug("Fetched Realms feature flags: {}", set); - return set; - } catch (RealmsServiceException var5) { - LOGGER.error("Failed to fetch Realms feature flags", (Throwable)var5); - } catch (Exception var6) { - LOGGER.error("Could not parse Realms feature flags", (Throwable)var6); + try { + String string2 = this.execute(Request.get(string, 5000, 10000)); + JsonArray jsonArray = LenientJsonParser.parse(string2).getAsJsonArray(); + Set set = (Set)jsonArray.asList().stream().map(JsonElement::getAsString).collect(Collectors.toSet()); + LOGGER.debug("Fetched Realms feature flags: {}", set); + return set; + } catch (RealmsServiceException var6) { + LOGGER.error("Failed to fetch Realms feature flags", (Throwable)var6); + } catch (Exception var7) { + LOGGER.error("Could not parse Realms feature flags", (Throwable)var7); + } + + return Set.of(); } - - return Set.of(); } public RealmsServerList listRealms() throws RealmsServiceException { @@ -171,19 +183,19 @@ public class RealmsClient { } String string2 = this.execute(Request.get(string)); - return RealmsServerList.parse(string2); + return RealmsServerList.parse(GSON, string2); } public List listSnapshotEligibleRealms() throws RealmsServiceException { String string = this.url("worlds/listPrereleaseEligibleWorlds"); String string2 = this.execute(Request.get(string)); - return RealmsServerList.parse(string2).servers; + return RealmsServerList.parse(GSON, string2).servers; } public RealmsServer createSnapshotRealm(Long parentId) throws RealmsServiceException { String string = String.valueOf(parentId); String string2 = this.url("worlds" + "/$PARENT_WORLD_ID/createPrereleaseRealm".replace("$PARENT_WORLD_ID", string)); - return RealmsServer.parse(this.execute(Request.post(string2, string))); + return RealmsServer.parse(GSON, this.execute(Request.post(string2, string))); } public List getNotifications() throws RealmsServiceException { @@ -217,7 +229,32 @@ public class RealmsClient { public RealmsServer getOwnRealm(long id) throws RealmsServiceException { String string = this.url("worlds" + "/$ID".replace("$ID", String.valueOf(id))); String string2 = this.execute(Request.get(string)); - return RealmsServer.parse(string2); + return RealmsServer.parse(GSON, string2); + } + + public PreferredRegionsDto getPreferredRegionSelections() throws RealmsServiceException { + String string = this.url("regions/preferredRegions"); + String string2 = this.execute(Request.get(string)); + + try { + PreferredRegionsDto preferredRegionsDto = GSON.fromJson(string2, PreferredRegionsDto.class); + if (preferredRegionsDto == null) { + return PreferredRegionsDto.empty(); + } else { + Set set = (Set)preferredRegionsDto.regionData().stream().map(RegionDataDto::region).collect(Collectors.toSet()); + + for (RealmsRegion realmsRegion : RealmsRegion.values()) { + if (realmsRegion != RealmsRegion.INVALID_REGION && !set.contains(realmsRegion)) { + LOGGER.debug("No realms region matching {} in server response", realmsRegion); + } + } + + return preferredRegionsDto; + } + } catch (Exception var9) { + LOGGER.error("Could not parse PreferredRegionSelections: {}", var9.getMessage()); + return PreferredRegionsDto.empty(); + } } public ServerActivityList getActivity(long worldId) throws RealmsServiceException { @@ -232,10 +269,10 @@ public class RealmsClient { return RealmsServerPlayerLists.parse(string2); } - public RealmsServerAddress join(long serverId) throws RealmsServiceException { - String string = this.url("worlds" + "/v1/$ID/join/pc".replace("$ID", serverId + "")); + public RealmsJoinInformation join(long worldId) throws RealmsServiceException { + String string = this.url("worlds" + "/v1/$ID/join/pc".replace("$ID", worldId + "")); String string2 = this.execute(Request.get(string, 5000, 30000)); - return RealmsServerAddress.parse(string2); + return RealmsJoinInformation.parse(GSON, string2); } public void initializeRealm(long worldId, String name, String description) throws RealmsServiceException { @@ -258,7 +295,7 @@ public class RealmsClient { try { return RealmsClient.CompatibleVersionResponse.valueOf(string2); } catch (IllegalArgumentException var5) { - throw new RealmsServiceException(CustomError.unknownCompatibilityResponse(string2)); + throw new RealmsServiceException(RealmsError.CustomError.unknownCompatibilityResponse(string2)); } } @@ -274,12 +311,12 @@ public class RealmsClient { this.execute(Request.delete(string)); } - public RealmsServer invite(long worldId, String playerName) throws RealmsServiceException { + public List invite(long worldId, String playerName) throws RealmsServiceException { PlayerInfo playerInfo = new PlayerInfo(); playerInfo.setName(playerName); String string = this.url("invites" + "/$WORLD_ID".replace("$WORLD_ID", String.valueOf(worldId))); String string2 = this.execute(Request.post(string, GSON.toJson(playerInfo))); - return RealmsServer.parse(string2); + return RealmsServer.parse(GSON, string2).players; } public BackupList backupsFor(long worldId) throws RealmsServiceException { @@ -288,15 +325,28 @@ public class RealmsClient { return BackupList.parse(string2); } - public void update(long worldId, String name, String description) throws RealmsServiceException { + public void updateConfiguration( + long worldId, + String name, + String description, + @Nullable RegionSelectionPreferenceDto regionSettings, + int slotId, + RealmsWorldOptions options, + List settings + ) throws RealmsServiceException { + RegionSelectionPreferenceDto regionSelectionPreferenceDto = regionSettings != null + ? regionSettings + : new RegionSelectionPreferenceDto(RegionSelectionPreference.DEFAULT_SELECTION, null); RealmsDescriptionDto realmsDescriptionDto = new RealmsDescriptionDto(name, description); - String string = this.url("worlds" + "/$WORLD_ID".replace("$WORLD_ID", String.valueOf(worldId))); - this.execute(Request.post(string, GSON.toJson(realmsDescriptionDto))); + RealmsSlotUpdateDto realmsSlotUpdateDto = new RealmsSlotUpdateDto(slotId, options, RealmsSetting.isHardcore(settings)); + RealmsConfigurationDto realmsConfigurationDto = new RealmsConfigurationDto(realmsSlotUpdateDto, settings, regionSelectionPreferenceDto, realmsDescriptionDto); + String string = this.url("worlds" + "/$WORLD_ID/configuration".replace("$WORLD_ID", String.valueOf(worldId))); + this.execute(Request.post(string, GSON.toJson(realmsConfigurationDto))); } - public void updateSlot(long worldId, int slotId, RealmsWorldOptions worldOptions) throws RealmsServiceException { + public void updateSlot(long worldId, int slotId, RealmsWorldOptions options, List settings) throws RealmsServiceException { String string = this.url("worlds" + "/$WORLD_ID/slot/$SLOT_ID".replace("$WORLD_ID", String.valueOf(worldId)).replace("$SLOT_ID", String.valueOf(slotId))); - String string2 = worldOptions.toJson(); + String string2 = GSON.toJson(new RealmsSlotUpdateDto(slotId, options, RealmsSetting.isHardcore(settings))); this.execute(Request.post(string, string2)); } @@ -311,7 +361,7 @@ public class RealmsClient { this.execute(Request.put(string, "", 40000, 600000)); } - public WorldTemplatePaginatedList fetchWorldTemplates(int page, int pageSize, WorldType worldType) throws RealmsServiceException { + public WorldTemplatePaginatedList fetchWorldTemplates(int page, int pageSize, RealmsServer.WorldType worldType) throws RealmsServiceException { String string = this.url( "worlds" + "/templates/$WORLD_TYPE".replace("$WORLD_TYPE", worldType.toString()), String.format(Locale.ROOT, "page=%d&pageSize=%d", page, pageSize) ); @@ -454,7 +504,7 @@ public class RealmsClient { private String execute(Request request) throws RealmsServiceException { request.cookie("sid", this.sessionId); request.cookie("user", this.username); - request.cookie("version", SharedConstants.getCurrentVersion().getName()); + request.cookie("version", SharedConstants.getCurrentVersion().name()); request.addSnapshotHeader(RealmsMainScreen.isSnapshot()); try { @@ -466,17 +516,22 @@ public class RealmsClient { } else if (i == 401) { String string2 = request.getHeader("WWW-Authenticate"); LOGGER.info("Could not authorize you against Realms server: {}", string2); - throw new RealmsServiceException(new AuthenticationError(string2)); + throw new RealmsServiceException(new RealmsError.AuthenticationError(string2)); } else { - RealmsError realmsError = RealmsError.parse(i, string); - throw new RealmsServiceException(realmsError); + String string2 = request.connection.getContentType(); + if (string2 != null && string2.startsWith("text/html")) { + throw new RealmsServiceException(RealmsError.CustomError.htmlPayload(i, string)); + } else { + RealmsError realmsError = RealmsError.parse(i, string); + throw new RealmsServiceException(realmsError); + } } } else { int j = request.getRetryAfterHeader(); throw new RetryCallException(j, i); } - } catch (RealmsHttpException var5) { - throw new RealmsServiceException(CustomError.connectivityError(var5)); + } catch (RealmsHttpException var6) { + throw new RealmsServiceException(RealmsError.CustomError.connectivityError(var6)); } } diff --git a/com/mojang/realmsclient/client/RealmsError.java b/com/mojang/realmsclient/client/RealmsError.java index 42db8a5f..dc494f2b 100644 --- a/com/mojang/realmsclient/client/RealmsError.java +++ b/com/mojang/realmsclient/client/RealmsError.java @@ -2,7 +2,6 @@ package com.mojang.realmsclient.client; import com.google.common.base.Strings; import com.google.gson.JsonObject; -import com.google.gson.JsonParser; import com.mojang.logging.LogUtils; import com.mojang.realmsclient.exception.RealmsHttpException; import java.util.Locale; @@ -11,6 +10,7 @@ import net.fabricmc.api.Environment; import net.minecraft.client.resources.language.I18n; import net.minecraft.network.chat.Component; import net.minecraft.util.GsonHelper; +import net.minecraft.util.LenientJsonParser; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; @@ -32,7 +32,7 @@ public interface RealmsError { return RealmsError.CustomError.noPayload(httpCode); } else { try { - JsonObject jsonObject = JsonParser.parseString(payload).getAsJsonObject(); + JsonObject jsonObject = LenientJsonParser.parse(payload).getAsJsonObject(); String string = GsonHelper.getAsString(jsonObject, "reason", null); String string2 = GsonHelper.getAsString(jsonObject, "errorMsg", null); int i = GsonHelper.getAsInt(jsonObject, "errorCode", -1); @@ -71,11 +71,17 @@ public interface RealmsError { public record CustomError(int httpCode, @Nullable Component payload) implements RealmsError { public static final RealmsError.CustomError SERVICE_BUSY = new RealmsError.CustomError(429, Component.translatable("mco.errorMessage.serviceBusy")); public static final Component RETRY_MESSAGE = Component.translatable("mco.errorMessage.retry"); + public static final String BODY_TAG = ""; + public static final String CLOSING_BODY_TAG = ""; public static RealmsError.CustomError unknownCompatibilityResponse(String payload) { return new RealmsError.CustomError(500, Component.translatable("mco.errorMessage.realmsService.unknownCompatibility", payload)); } + public static RealmsError.CustomError configurationError() { + return new RealmsError.CustomError(500, Component.translatable("mco.errorMessage.realmsService.configurationError")); + } + public static RealmsError.CustomError connectivityError(RealmsHttpException payload) { return new RealmsError.CustomError(500, Component.translatable("mco.errorMessage.realmsService.connectivity", payload.getMessage())); } @@ -88,6 +94,17 @@ public interface RealmsError { return new RealmsError.CustomError(httpCode, null); } + public static RealmsError.CustomError htmlPayload(int httpCode, String payload) { + int i = payload.indexOf(""); + int j = payload.indexOf(""); + if (i >= 0 && j > i) { + return new RealmsError.CustomError(httpCode, Component.literal(payload.substring(i + "".length(), j).trim())); + } else { + LOGGER.error("Got an error with an unreadable html body {}", payload); + return new RealmsError.CustomError(httpCode, null); + } + } + @Override public int errorCode() { return this.httpCode; diff --git a/com/mojang/realmsclient/client/worldupload/RealmsCreateWorldFlow.java b/com/mojang/realmsclient/client/worldupload/RealmsCreateWorldFlow.java index e28dd3bc..d1064a3c 100644 --- a/com/mojang/realmsclient/client/worldupload/RealmsCreateWorldFlow.java +++ b/com/mojang/realmsclient/client/worldupload/RealmsCreateWorldFlow.java @@ -3,13 +3,16 @@ package com.mojang.realmsclient.client.worldupload; import com.mojang.logging.LogUtils; import com.mojang.realmsclient.RealmsMainScreen; import com.mojang.realmsclient.dto.RealmsServer; +import com.mojang.realmsclient.dto.RealmsSetting; +import com.mojang.realmsclient.dto.RealmsSlot; import com.mojang.realmsclient.dto.RealmsWorldOptions; -import com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen; import com.mojang.realmsclient.gui.screens.RealmsGenericErrorScreen; +import com.mojang.realmsclient.gui.screens.configuration.RealmsConfigureWorldScreen; import com.mojang.realmsclient.util.task.RealmCreationTask; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; +import java.util.List; import java.util.concurrent.CompletionException; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -42,18 +45,17 @@ public class RealmsCreateWorldFlow { Path path2; try { path2 = createTemporaryWorldFolder(layeredRegistryAccess, primaryLevelData, path); - } catch (IOException var13) { + } catch (IOException var14) { LOGGER.warn("Failed to create temporary world folder."); minecraft.setScreen(new RealmsGenericErrorScreen(Component.translatable("mco.create.world.failed"), resetWorldScreen)); return true; } RealmsWorldOptions realmsWorldOptions = RealmsWorldOptions.createFromSettings( - primaryLevelData.getLevelSettings(), primaryLevelData.getLevelSettings().allowCommands(), SharedConstants.getCurrentVersion().getName() - ); - RealmsWorldUpload realmsWorldUpload = new RealmsWorldUpload( - path2, realmsWorldOptions, minecraft.getUser(), server.id, slot, RealmsWorldUploadStatusTracker.noOp() + primaryLevelData.getLevelSettings(), primaryLevelData.getLevelSettings().allowCommands(), SharedConstants.getCurrentVersion().name() ); + RealmsSlot realmsSlot = new RealmsSlot(slot, realmsWorldOptions, List.of(RealmsSetting.hardcoreSetting(primaryLevelData.getLevelSettings().hardcore()))); + RealmsWorldUpload realmsWorldUpload = new RealmsWorldUpload(path2, realmsSlot, minecraft.getUser(), server.id, RealmsWorldUploadStatusTracker.noOp()); minecraft.forceSetScreen( new AlertScreen(realmsWorldUpload::cancel, Component.translatable("mco.create.world.reset.title"), Component.empty(), CommonComponents.GUI_CANCEL, false) ); diff --git a/com/mojang/realmsclient/client/worldupload/RealmsWorldUpload.java b/com/mojang/realmsclient/client/worldupload/RealmsWorldUpload.java index 251a7f75..ee27b91e 100644 --- a/com/mojang/realmsclient/client/worldupload/RealmsWorldUpload.java +++ b/com/mojang/realmsclient/client/worldupload/RealmsWorldUpload.java @@ -3,7 +3,7 @@ package com.mojang.realmsclient.client.worldupload; import com.mojang.logging.LogUtils; import com.mojang.realmsclient.client.FileUpload; import com.mojang.realmsclient.client.RealmsClient; -import com.mojang.realmsclient.dto.RealmsWorldOptions; +import com.mojang.realmsclient.dto.RealmsSlot; import com.mojang.realmsclient.dto.UploadInfo; import com.mojang.realmsclient.exception.RealmsServiceException; import com.mojang.realmsclient.exception.RetryCallException; @@ -28,21 +28,19 @@ public class RealmsWorldUpload { public static final int UPLOAD_RETRIES = 20; private final RealmsClient client = RealmsClient.getOrCreate(); private final Path worldFolder; - private final RealmsWorldOptions worldOptions; + private final RealmsSlot realmsSlot; private final User user; private final long realmId; - private final int slotId; private final RealmsWorldUploadStatusTracker statusCallback; private volatile boolean cancelled; @Nullable private FileUpload uploadTask; - public RealmsWorldUpload(Path worldFolder, RealmsWorldOptions worldOptions, User user, long realmId, int slotId, RealmsWorldUploadStatusTracker statusCallback) { + public RealmsWorldUpload(Path worldFolder, RealmsSlot realmsSlot, User user, long realmId, RealmsWorldUploadStatusTracker statusCallback) { this.worldFolder = worldFolder; - this.worldOptions = worldOptions; + this.realmsSlot = realmsSlot; this.user = user; this.realmId = realmId; - this.slotId = slotId; this.statusCallback = statusCallback; } @@ -58,11 +56,11 @@ public class RealmsWorldUpload { FileUpload fileUpload = new FileUpload( file, this.realmId, - this.slotId, + this.realmsSlot.slotId, uploadInfo, this.user, - SharedConstants.getCurrentVersion().getName(), - this.worldOptions.version, + SharedConstants.getCurrentVersion().name(), + this.realmsSlot.options.version, this.statusCallback.getUploadStatus() ); this.uploadTask = fileUpload; @@ -73,7 +71,7 @@ public class RealmsWorldUpload { } UploadTokenCache.invalidate(this.realmId); - this.client.updateSlot(this.realmId, this.slotId, this.worldOptions); + this.client.updateSlot(this.realmId, this.realmsSlot.slotId, this.realmsSlot.options, this.realmsSlot.settings); } catch (IOException var11) { throw new RealmsUploadFailedException(var11.getMessage()); } catch (RealmsServiceException var12) { diff --git a/com/mojang/realmsclient/dto/BackupList.java b/com/mojang/realmsclient/dto/BackupList.java index c8d32617..f0fe6818 100644 --- a/com/mojang/realmsclient/dto/BackupList.java +++ b/com/mojang/realmsclient/dto/BackupList.java @@ -2,12 +2,11 @@ package com.mojang.realmsclient.dto; import com.google.common.collect.Lists; import com.google.gson.JsonElement; -import com.google.gson.JsonParser; import com.mojang.logging.LogUtils; -import java.util.Iterator; import java.util.List; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; +import net.minecraft.util.LenientJsonParser; import org.slf4j.Logger; @Environment(EnvType.CLIENT) @@ -16,17 +15,14 @@ public class BackupList extends ValueObject { public List backups; public static BackupList parse(String json) { - JsonParser jsonParser = new JsonParser(); BackupList backupList = new BackupList(); backupList.backups = Lists.newArrayList(); try { - JsonElement jsonElement = jsonParser.parse(json).getAsJsonObject().get("backups"); + JsonElement jsonElement = LenientJsonParser.parse(json).getAsJsonObject().get("backups"); if (jsonElement.isJsonArray()) { - Iterator iterator = jsonElement.getAsJsonArray().iterator(); - - while (iterator.hasNext()) { - backupList.backups.add(Backup.parse((JsonElement)iterator.next())); + for (JsonElement jsonElement2 : jsonElement.getAsJsonArray()) { + backupList.backups.add(Backup.parse(jsonElement2)); } } } catch (Exception var5) { diff --git a/com/mojang/realmsclient/dto/Exclude.java b/com/mojang/realmsclient/dto/Exclude.java new file mode 100644 index 00000000..ece141dc --- /dev/null +++ b/com/mojang/realmsclient/dto/Exclude.java @@ -0,0 +1,14 @@ +package com.mojang.realmsclient.dto; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; + +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.FIELD}) +@Environment(EnvType.CLIENT) +public @interface Exclude { +} diff --git a/com/mojang/realmsclient/dto/GuardedSerializer.java b/com/mojang/realmsclient/dto/GuardedSerializer.java index 5087988d..33ed0d8c 100644 --- a/com/mojang/realmsclient/dto/GuardedSerializer.java +++ b/com/mojang/realmsclient/dto/GuardedSerializer.java @@ -1,6 +1,9 @@ package com.mojang.realmsclient.dto; +import com.google.gson.ExclusionStrategy; +import com.google.gson.FieldAttributes; import com.google.gson.Gson; +import com.google.gson.GsonBuilder; import com.google.gson.JsonElement; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -8,7 +11,18 @@ import org.jetbrains.annotations.Nullable; @Environment(EnvType.CLIENT) public class GuardedSerializer { - private final Gson gson = new Gson(); + ExclusionStrategy strategy = new ExclusionStrategy() { + @Override + public boolean shouldSkipClass(Class class_) { + return false; + } + + @Override + public boolean shouldSkipField(FieldAttributes fieldAttributes) { + return fieldAttributes.getAnnotation(Exclude.class) != null; + } + }; + private final Gson gson = new GsonBuilder().addSerializationExclusionStrategy(this.strategy).addDeserializationExclusionStrategy(this.strategy).create(); public String toJson(ReflectionBasedSerialization reflectionBasedSerialization) { return this.gson.toJson(reflectionBasedSerialization); diff --git a/com/mojang/realmsclient/dto/Ops.java b/com/mojang/realmsclient/dto/Ops.java index 28b0f718..1ce769db 100644 --- a/com/mojang/realmsclient/dto/Ops.java +++ b/com/mojang/realmsclient/dto/Ops.java @@ -3,10 +3,10 @@ package com.mojang.realmsclient.dto; import com.google.common.collect.Sets; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import com.google.gson.JsonParser; import java.util.Set; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; +import net.minecraft.util.LenientJsonParser; @Environment(EnvType.CLIENT) public class Ops extends ValueObject { @@ -14,18 +14,16 @@ public class Ops extends ValueObject { public static Ops parse(String json) { Ops ops = new Ops(); - JsonParser jsonParser = new JsonParser(); try { - JsonElement jsonElement = jsonParser.parse(json); - JsonObject jsonObject = jsonElement.getAsJsonObject(); - JsonElement jsonElement2 = jsonObject.get("ops"); - if (jsonElement2.isJsonArray()) { - for (JsonElement jsonElement3 : jsonElement2.getAsJsonArray()) { - ops.ops.add(jsonElement3.getAsString()); + JsonObject jsonObject = LenientJsonParser.parse(json).getAsJsonObject(); + JsonElement jsonElement = jsonObject.get("ops"); + if (jsonElement.isJsonArray()) { + for (JsonElement jsonElement2 : jsonElement.getAsJsonArray()) { + ops.ops.add(jsonElement2.getAsString()); } } - } catch (Exception var8) { + } catch (Exception var6) { } return ops; diff --git a/com/mojang/realmsclient/dto/PendingInvitesList.java b/com/mojang/realmsclient/dto/PendingInvitesList.java index ce942dc9..1aa0081b 100644 --- a/com/mojang/realmsclient/dto/PendingInvitesList.java +++ b/com/mojang/realmsclient/dto/PendingInvitesList.java @@ -3,12 +3,11 @@ package com.mojang.realmsclient.dto; import com.google.common.collect.Lists; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import com.google.gson.JsonParser; import com.mojang.logging.LogUtils; -import java.util.Iterator; import java.util.List; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; +import net.minecraft.util.LenientJsonParser; import org.slf4j.Logger; @Environment(EnvType.CLIENT) @@ -20,13 +19,10 @@ public class PendingInvitesList extends ValueObject { PendingInvitesList pendingInvitesList = new PendingInvitesList(); try { - JsonParser jsonParser = new JsonParser(); - JsonObject jsonObject = jsonParser.parse(json).getAsJsonObject(); + JsonObject jsonObject = LenientJsonParser.parse(json).getAsJsonObject(); if (jsonObject.get("invites").isJsonArray()) { - Iterator iterator = jsonObject.get("invites").getAsJsonArray().iterator(); - - while (iterator.hasNext()) { - pendingInvitesList.pendingInvites.add(PendingInvite.parse(((JsonElement)iterator.next()).getAsJsonObject())); + for (JsonElement jsonElement : jsonObject.get("invites").getAsJsonArray()) { + pendingInvitesList.pendingInvites.add(PendingInvite.parse(jsonElement.getAsJsonObject())); } } } catch (Exception var5) { diff --git a/com/mojang/realmsclient/dto/PlayerInfo.java b/com/mojang/realmsclient/dto/PlayerInfo.java index 41d13667..f1a982f0 100644 --- a/com/mojang/realmsclient/dto/PlayerInfo.java +++ b/com/mojang/realmsclient/dto/PlayerInfo.java @@ -1,6 +1,8 @@ package com.mojang.realmsclient.dto; +import com.google.gson.annotations.JsonAdapter; import com.google.gson.annotations.SerializedName; +import com.mojang.util.UUIDTypeAdapter; import java.util.UUID; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -12,6 +14,7 @@ public class PlayerInfo extends ValueObject implements ReflectionBasedSerializat @Nullable private String name; @SerializedName("uuid") + @JsonAdapter(UUIDTypeAdapter.class) private UUID uuid; @SerializedName("operator") private boolean operator; diff --git a/com/mojang/realmsclient/dto/PreferredRegionsDto.java b/com/mojang/realmsclient/dto/PreferredRegionsDto.java new file mode 100644 index 00000000..8807b037 --- /dev/null +++ b/com/mojang/realmsclient/dto/PreferredRegionsDto.java @@ -0,0 +1,13 @@ +package com.mojang.realmsclient.dto; + +import com.google.gson.annotations.SerializedName; +import java.util.List; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; + +@Environment(EnvType.CLIENT) +public record PreferredRegionsDto(@SerializedName("regionDataList") List regionData) implements ReflectionBasedSerialization { + public static PreferredRegionsDto empty() { + return new PreferredRegionsDto(List.of()); + } +} diff --git a/com/mojang/realmsclient/dto/RealmsConfigurationDto.java b/com/mojang/realmsclient/dto/RealmsConfigurationDto.java new file mode 100644 index 00000000..08af4a3c --- /dev/null +++ b/com/mojang/realmsclient/dto/RealmsConfigurationDto.java @@ -0,0 +1,16 @@ +package com.mojang.realmsclient.dto; + +import com.google.gson.annotations.SerializedName; +import java.util.List; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import org.jetbrains.annotations.Nullable; + +@Environment(EnvType.CLIENT) +public record RealmsConfigurationDto( + @SerializedName("options") RealmsSlotUpdateDto options, + @SerializedName("settings") List settings, + @Nullable @SerializedName("regionSelectionPreference") RegionSelectionPreferenceDto regionSelectionPreference, + @Nullable @SerializedName("description") RealmsDescriptionDto description +) implements ReflectionBasedSerialization { +} diff --git a/com/mojang/realmsclient/dto/RealmsDescriptionDto.java b/com/mojang/realmsclient/dto/RealmsDescriptionDto.java index cc6ea79c..7bcef831 100644 --- a/com/mojang/realmsclient/dto/RealmsDescriptionDto.java +++ b/com/mojang/realmsclient/dto/RealmsDescriptionDto.java @@ -3,15 +3,17 @@ package com.mojang.realmsclient.dto; import com.google.gson.annotations.SerializedName; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; +import org.jetbrains.annotations.Nullable; @Environment(EnvType.CLIENT) public class RealmsDescriptionDto extends ValueObject implements ReflectionBasedSerialization { @SerializedName("name") + @Nullable public String name; @SerializedName("description") public String description; - public RealmsDescriptionDto(String name, String description) { + public RealmsDescriptionDto(@Nullable String name, String description) { this.name = name; this.description = description; } diff --git a/com/mojang/realmsclient/dto/RealmsJoinInformation.java b/com/mojang/realmsclient/dto/RealmsJoinInformation.java new file mode 100644 index 00000000..6626e7db --- /dev/null +++ b/com/mojang/realmsclient/dto/RealmsJoinInformation.java @@ -0,0 +1,40 @@ +package com.mojang.realmsclient.dto; + +import com.google.gson.annotations.SerializedName; +import com.mojang.logging.LogUtils; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import org.jetbrains.annotations.Nullable; +import org.slf4j.Logger; + +@Environment(EnvType.CLIENT) +public record RealmsJoinInformation( + @Nullable @SerializedName("address") String address, + @Nullable @SerializedName("resourcePackUrl") String resourcePackUrl, + @Nullable @SerializedName("resourcePackHash") String resourcePackHash, + @Nullable @SerializedName("sessionRegionData") RealmsJoinInformation.RegionData regionData +) implements ReflectionBasedSerialization { + private static final Logger LOGGER = LogUtils.getLogger(); + private static final RealmsJoinInformation EMPTY = new RealmsJoinInformation(null, null, null, null); + + public static RealmsJoinInformation parse(GuardedSerializer serializer, String json) { + try { + RealmsJoinInformation realmsJoinInformation = serializer.fromJson(json, RealmsJoinInformation.class); + if (realmsJoinInformation == null) { + LOGGER.error("Could not parse RealmsServerAddress: {}", json); + return EMPTY; + } else { + return realmsJoinInformation; + } + } catch (Exception var3) { + LOGGER.error("Could not parse RealmsServerAddress: {}", var3.getMessage()); + return EMPTY; + } + } + + @Environment(EnvType.CLIENT) + public record RegionData( + @Nullable @SerializedName("regionName") RealmsRegion region, @Nullable @SerializedName("serviceQuality") ServiceQuality serviceQuality + ) implements ReflectionBasedSerialization { + } +} diff --git a/com/mojang/realmsclient/dto/RealmsNews.java b/com/mojang/realmsclient/dto/RealmsNews.java index a89ecb97..1859c6c7 100644 --- a/com/mojang/realmsclient/dto/RealmsNews.java +++ b/com/mojang/realmsclient/dto/RealmsNews.java @@ -1,11 +1,11 @@ package com.mojang.realmsclient.dto; import com.google.gson.JsonObject; -import com.google.gson.JsonParser; import com.mojang.logging.LogUtils; import com.mojang.realmsclient.util.JsonUtils; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; +import net.minecraft.util.LenientJsonParser; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; @@ -19,7 +19,7 @@ public class RealmsNews extends ValueObject { RealmsNews realmsNews = new RealmsNews(); try { - JsonObject jsonObject = JsonParser.parseString(json).getAsJsonObject(); + JsonObject jsonObject = LenientJsonParser.parse(json).getAsJsonObject(); realmsNews.newsLink = JsonUtils.getStringOr("newsLink", jsonObject, null); } catch (Exception var3) { LOGGER.error("Could not parse RealmsNews: {}", var3.getMessage()); diff --git a/com/mojang/realmsclient/dto/RealmsNotification.java b/com/mojang/realmsclient/dto/RealmsNotification.java index eebeea42..3cdf458e 100644 --- a/com/mojang/realmsclient/dto/RealmsNotification.java +++ b/com/mojang/realmsclient/dto/RealmsNotification.java @@ -2,7 +2,6 @@ package com.mojang.realmsclient.dto; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import com.google.gson.JsonParser; import com.mojang.logging.LogUtils; import com.mojang.realmsclient.util.JsonUtils; import java.util.ArrayList; @@ -20,6 +19,7 @@ import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.CommonComponents; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; +import net.minecraft.util.LenientJsonParser; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; @@ -61,7 +61,7 @@ public class RealmsNotification { List list = new ArrayList(); try { - for (JsonElement jsonElement : JsonParser.parseString(json).getAsJsonObject().get("notifications").getAsJsonArray()) { + for (JsonElement jsonElement : LenientJsonParser.parse(json).getAsJsonObject().get("notifications").getAsJsonArray()) { list.add(parse(jsonElement.getAsJsonObject())); } } catch (Exception var5) { diff --git a/com/mojang/realmsclient/dto/RealmsRegion.java b/com/mojang/realmsclient/dto/RealmsRegion.java new file mode 100644 index 00000000..b2c8a99f --- /dev/null +++ b/com/mojang/realmsclient/dto/RealmsRegion.java @@ -0,0 +1,78 @@ +package com.mojang.realmsclient.dto; + +import com.google.gson.TypeAdapter; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; +import com.mojang.logging.LogUtils; +import java.io.IOException; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import org.jetbrains.annotations.Nullable; +import org.slf4j.Logger; + +@Environment(EnvType.CLIENT) +public enum RealmsRegion { + AUSTRALIA_EAST("AustraliaEast", "realms.configuration.region.australia_east"), + AUSTRALIA_SOUTHEAST("AustraliaSoutheast", "realms.configuration.region.australia_southeast"), + BRAZIL_SOUTH("BrazilSouth", "realms.configuration.region.brazil_south"), + CENTRAL_INDIA("CentralIndia", "realms.configuration.region.central_india"), + CENTRAL_US("CentralUs", "realms.configuration.region.central_us"), + EAST_ASIA("EastAsia", "realms.configuration.region.east_asia"), + EAST_US("EastUs", "realms.configuration.region.east_us"), + EAST_US_2("EastUs2", "realms.configuration.region.east_us_2"), + FRANCE_CENTRAL("FranceCentral", "realms.configuration.region.france_central"), + JAPAN_EAST("JapanEast", "realms.configuration.region.japan_east"), + JAPAN_WEST("JapanWest", "realms.configuration.region.japan_west"), + KOREA_CENTRAL("KoreaCentral", "realms.configuration.region.korea_central"), + NORTH_CENTRAL_US("NorthCentralUs", "realms.configuration.region.north_central_us"), + NORTH_EUROPE("NorthEurope", "realms.configuration.region.north_europe"), + SOUTH_CENTRAL_US("SouthCentralUs", "realms.configuration.region.south_central_us"), + SOUTHEAST_ASIA("SoutheastAsia", "realms.configuration.region.southeast_asia"), + SWEDEN_CENTRAL("SwedenCentral", "realms.configuration.region.sweden_central"), + UAE_NORTH("UAENorth", "realms.configuration.region.uae_north"), + UK_SOUTH("UKSouth", "realms.configuration.region.uk_south"), + WEST_CENTRAL_US("WestCentralUs", "realms.configuration.region.west_central_us"), + WEST_EUROPE("WestEurope", "realms.configuration.region.west_europe"), + WEST_US("WestUs", "realms.configuration.region.west_us"), + WEST_US_2("WestUs2", "realms.configuration.region.west_us_2"), + INVALID_REGION("invalid", ""); + + public final String nameId; + public final String translationKey; + + private RealmsRegion(final String nameId, final String translationKey) { + this.nameId = nameId; + this.translationKey = translationKey; + } + + @Nullable + public static RealmsRegion findByNameId(String nameId) { + for (RealmsRegion realmsRegion : values()) { + if (realmsRegion.nameId.equals(nameId)) { + return realmsRegion; + } + } + + return null; + } + + @Environment(EnvType.CLIENT) + public static class RealmsRegionJsonAdapter extends TypeAdapter { + private static final Logger LOGGER = LogUtils.getLogger(); + + public void write(JsonWriter writer, RealmsRegion region) throws IOException { + writer.value(region.nameId); + } + + public RealmsRegion read(JsonReader reader) throws IOException { + String string = reader.nextString(); + RealmsRegion realmsRegion = RealmsRegion.findByNameId(string); + if (realmsRegion == null) { + LOGGER.warn("Unsupported RealmsRegion {}", string); + return RealmsRegion.INVALID_REGION; + } else { + return realmsRegion; + } + } + } +} diff --git a/com/mojang/realmsclient/dto/RealmsServer.java b/com/mojang/realmsclient/dto/RealmsServer.java index 36dc3706..cd0a3b7e 100644 --- a/com/mojang/realmsclient/dto/RealmsServer.java +++ b/com/mojang/realmsclient/dto/RealmsServer.java @@ -3,13 +3,13 @@ package com.mojang.realmsclient.dto; import com.google.common.collect.ComparisonChain; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import com.google.gson.JsonArray; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonParser; +import com.google.gson.annotations.JsonAdapter; +import com.google.gson.annotations.SerializedName; import com.mojang.logging.LogUtils; -import com.mojang.realmsclient.util.JsonUtils; +import com.mojang.util.UUIDTypeAdapter; +import java.util.ArrayList; import java.util.Comparator; +import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; @@ -19,45 +19,76 @@ import java.util.Map.Entry; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.Util; +import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ServerData; -import net.minecraft.client.multiplayer.ServerData.Type; +import net.minecraft.network.chat.Component; import org.apache.commons.lang3.builder.EqualsBuilder; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; @Environment(EnvType.CLIENT) -public class RealmsServer extends ValueObject { +public class RealmsServer extends ValueObject implements ReflectionBasedSerialization { private static final Logger LOGGER = LogUtils.getLogger(); private static final int NO_VALUE = -1; - public long id; + public static final Component WORLD_CLOSED_COMPONENT = Component.translatable("mco.play.button.realm.closed"); + @SerializedName("id") + public long id = -1L; @Nullable + @SerializedName("remoteSubscriptionId") public String remoteSubscriptionId; @Nullable + @SerializedName("name") public String name; - public String motd; - public RealmsServer.State state; + @SerializedName("motd") + public String motd = ""; + @SerializedName("state") + public RealmsServer.State state = RealmsServer.State.CLOSED; @Nullable + @SerializedName("owner") public String owner; + @SerializedName("ownerUUID") + @JsonAdapter(UUIDTypeAdapter.class) public UUID ownerUUID = Util.NIL_UUID; - public List players; - public Map slots; + @SerializedName("players") + public List players = Lists.newArrayList(); + @SerializedName("slots") + private List slotList = createEmptySlots(); + @Exclude + public Map slots = new HashMap(); + @SerializedName("expired") public boolean expired; - public boolean expiredTrial; + @SerializedName("expiredTrial") + public boolean expiredTrial = false; + @SerializedName("daysLeft") public int daysLeft; - public RealmsServer.WorldType worldType; - public boolean isHardcore; - public int gameMode; - public int activeSlot; + @SerializedName("worldType") + public RealmsServer.WorldType worldType = RealmsServer.WorldType.NORMAL; + @SerializedName("isHardcore") + public boolean isHardcore = false; + @SerializedName("gameMode") + public int gameMode = -1; + @SerializedName("activeSlot") + public int activeSlot = -1; @Nullable + @SerializedName("minigameName") public String minigameName; - public int minigameId; + @SerializedName("minigameId") + public int minigameId = -1; @Nullable + @SerializedName("minigameImage") public String minigameImage; + @SerializedName("parentWorldId") public long parentRealmId = -1L; @Nullable + @SerializedName("parentWorldName") public String parentWorldName; + @SerializedName("activeVersion") public String activeVersion = ""; + @SerializedName("compatibility") public RealmsServer.Compatibility compatibility = RealmsServer.Compatibility.UNVERIFIABLE; + @Nullable + @SerializedName("regionSelectionPreference") + public RegionSelectionPreferenceDto regionSelectionPreference; public String getDescription() { return this.motd; @@ -81,53 +112,57 @@ public class RealmsServer extends ValueObject { this.motd = motd; } - public static RealmsServer parse(JsonObject json) { - RealmsServer realmsServer = new RealmsServer(); - + public static RealmsServer parse(GuardedSerializer serializer, String json) { try { - realmsServer.id = JsonUtils.getLongOr("id", json, -1L); - realmsServer.remoteSubscriptionId = JsonUtils.getStringOr("remoteSubscriptionId", json, null); - realmsServer.name = JsonUtils.getStringOr("name", json, null); - realmsServer.motd = JsonUtils.getStringOr("motd", json, ""); - realmsServer.state = getState(JsonUtils.getStringOr("state", json, RealmsServer.State.CLOSED.name())); - realmsServer.owner = JsonUtils.getStringOr("owner", json, null); - if (json.get("players") != null && json.get("players").isJsonArray()) { - realmsServer.players = parseInvited(json.get("players").getAsJsonArray()); - sortInvited(realmsServer); + RealmsServer realmsServer = serializer.fromJson(json, RealmsServer.class); + if (realmsServer == null) { + LOGGER.error("Could not parse McoServer: {}", json); + return new RealmsServer(); } else { - realmsServer.players = Lists.newArrayList(); + finalize(realmsServer); + return realmsServer; } - - realmsServer.daysLeft = JsonUtils.getIntOr("daysLeft", json, 0); - realmsServer.expired = JsonUtils.getBooleanOr("expired", json, false); - realmsServer.expiredTrial = JsonUtils.getBooleanOr("expiredTrial", json, false); - realmsServer.worldType = getWorldType(JsonUtils.getStringOr("worldType", json, RealmsServer.WorldType.NORMAL.name())); - realmsServer.isHardcore = JsonUtils.getBooleanOr("isHardcore", json, false); - realmsServer.gameMode = JsonUtils.getIntOr("gameMode", json, -1); - realmsServer.ownerUUID = JsonUtils.getUuidOr("ownerUUID", json, Util.NIL_UUID); - if (json.get("slots") != null && json.get("slots").isJsonArray()) { - realmsServer.slots = parseSlots(json.get("slots").getAsJsonArray()); - } else { - realmsServer.slots = createEmptySlots(); - } - - realmsServer.minigameName = JsonUtils.getStringOr("minigameName", json, null); - realmsServer.activeSlot = JsonUtils.getIntOr("activeSlot", json, -1); - realmsServer.minigameId = JsonUtils.getIntOr("minigameId", json, -1); - realmsServer.minigameImage = JsonUtils.getStringOr("minigameImage", json, null); - realmsServer.parentRealmId = JsonUtils.getLongOr("parentWorldId", json, -1L); - realmsServer.parentWorldName = JsonUtils.getStringOr("parentWorldName", json, null); - realmsServer.activeVersion = JsonUtils.getStringOr("activeVersion", json, ""); - realmsServer.compatibility = getCompatibility(JsonUtils.getStringOr("compatibility", json, RealmsServer.Compatibility.UNVERIFIABLE.name())); } catch (Exception var3) { LOGGER.error("Could not parse McoServer: {}", var3.getMessage()); + return new RealmsServer(); } - - return realmsServer; } - private static void sortInvited(RealmsServer realmsServer) { - realmsServer.players + public static void finalize(RealmsServer server) { + if (server.players == null) { + server.players = Lists.newArrayList(); + } + + if (server.slotList == null) { + server.slotList = createEmptySlots(); + } + + if (server.slots == null) { + server.slots = new HashMap(); + } + + if (server.worldType == null) { + server.worldType = RealmsServer.WorldType.NORMAL; + } + + if (server.activeVersion == null) { + server.activeVersion = ""; + } + + if (server.compatibility == null) { + server.compatibility = RealmsServer.Compatibility.UNVERIFIABLE; + } + + if (server.regionSelectionPreference == null) { + server.regionSelectionPreference = RegionSelectionPreferenceDto.DEFAULT; + } + + sortInvited(server); + finalizeSlots(server); + } + + private static void sortInvited(RealmsServer server) { + server.players .sort( (playerInfo, playerInfo2) -> ComparisonChain.start() .compareFalseFirst(playerInfo2.getAccepted(), playerInfo.getAccepted()) @@ -136,114 +171,24 @@ public class RealmsServer extends ValueObject { ); } - private static List parseInvited(JsonArray jsonArray) { - List list = Lists.newArrayList(); + private static void finalizeSlots(RealmsServer server) { + server.slotList.forEach(realmsSlot -> server.slots.put(realmsSlot.slotId, realmsSlot)); - for (JsonElement jsonElement : jsonArray) { - try { - JsonObject jsonObject = jsonElement.getAsJsonObject(); - PlayerInfo playerInfo = new PlayerInfo(); - playerInfo.setName(JsonUtils.getStringOr("name", jsonObject, null)); - playerInfo.setUuid(JsonUtils.getUuidOr("uuid", jsonObject, Util.NIL_UUID)); - playerInfo.setOperator(JsonUtils.getBooleanOr("operator", jsonObject, false)); - playerInfo.setAccepted(JsonUtils.getBooleanOr("accepted", jsonObject, false)); - playerInfo.setOnline(JsonUtils.getBooleanOr("online", jsonObject, false)); - list.add(playerInfo); - } catch (Exception var6) { + for (int i = 1; i <= 3; i++) { + if (!server.slots.containsKey(i)) { + server.slots.put(i, RealmsSlot.defaults(i)); } } + } + private static List createEmptySlots() { + List list = new ArrayList(); + list.add(RealmsSlot.defaults(1)); + list.add(RealmsSlot.defaults(2)); + list.add(RealmsSlot.defaults(3)); return list; } - private static Map parseSlots(JsonArray jsonArray) { - Map map = Maps.newHashMap(); - - for (JsonElement jsonElement : jsonArray) { - try { - JsonObject jsonObject = jsonElement.getAsJsonObject(); - JsonElement jsonElement2 = JsonParser.parseString(jsonObject.get("options").getAsString()); - RealmsSettings realmsSettings = parseSettings(jsonObject.get("settings")); - RealmsWorldOptions realmsWorldOptions; - if (jsonElement2 == null) { - realmsWorldOptions = RealmsWorldOptions.createDefaults(); - } else { - realmsWorldOptions = RealmsWorldOptions.parse(jsonElement2.getAsJsonObject(), realmsSettings); - } - - int i = JsonUtils.getIntOr("slotId", jsonObject, -1); - map.put(i, realmsWorldOptions); - } catch (Exception var9) { - } - } - - for (int j = 1; j <= 3; j++) { - if (!map.containsKey(j)) { - map.put(j, RealmsWorldOptions.createEmptyDefaults()); - } - } - - return map; - } - - private static RealmsSettings parseSettings(JsonElement json) { - boolean bl = false; - if (json.isJsonArray()) { - for (JsonElement jsonElement : json.getAsJsonArray()) { - JsonObject jsonObject = jsonElement.getAsJsonObject(); - bl = readBoolean(jsonObject, "hardcore", bl); - } - } - - return new RealmsSettings(bl); - } - - private static boolean readBoolean(JsonObject json, String memberName, boolean defaultValue) { - String string = JsonUtils.getStringOr("name", json, null); - return string != null && string.equals(memberName) ? JsonUtils.getBooleanOr("value", json, defaultValue) : defaultValue; - } - - private static Map createEmptySlots() { - Map map = Maps.newHashMap(); - map.put(1, RealmsWorldOptions.createEmptyDefaults()); - map.put(2, RealmsWorldOptions.createEmptyDefaults()); - map.put(3, RealmsWorldOptions.createEmptyDefaults()); - return map; - } - - public static RealmsServer parse(String json) { - try { - return parse(new JsonParser().parse(json).getAsJsonObject()); - } catch (Exception var2) { - LOGGER.error("Could not parse McoServer: {}", var2.getMessage()); - return new RealmsServer(); - } - } - - private static RealmsServer.State getState(String name) { - try { - return RealmsServer.State.valueOf(name); - } catch (Exception var2) { - return RealmsServer.State.CLOSED; - } - } - - private static RealmsServer.WorldType getWorldType(String name) { - try { - return RealmsServer.WorldType.valueOf(name); - } catch (Exception var2) { - return RealmsServer.WorldType.NORMAL; - } - } - - public static RealmsServer.Compatibility getCompatibility(@Nullable String id) { - try { - return RealmsServer.Compatibility.valueOf(id); - } catch (Exception var2) { - return RealmsServer.Compatibility.UNVERIFIABLE; - } - } - public boolean isCompatible() { return this.compatibility.isCompatible(); } @@ -256,6 +201,15 @@ public class RealmsServer extends ValueObject { return this.compatibility.needsDowngrade(); } + public boolean shouldPlayButtonBeActive() { + boolean bl = !this.expired && this.state == RealmsServer.State.OPEN; + return bl && (this.isCompatible() || this.needsUpgrade() || this.isSelfOwnedServer()); + } + + private boolean isSelfOwnedServer() { + return Minecraft.getInstance().isLocalPlayer(this.ownerUUID); + } + public int hashCode() { return Objects.hash(new Object[]{this.id, this.name, this.motd, this.state, this.owner, this.expired}); } @@ -290,6 +244,7 @@ public class RealmsServer extends ValueObject { realmsServer.state = this.state; realmsServer.owner = this.owner; realmsServer.players = this.players; + realmsServer.slotList = this.slotList.stream().map(RealmsSlot::clone).toList(); realmsServer.slots = this.cloneSlots(this.slots); realmsServer.expired = this.expired; realmsServer.expiredTrial = this.expiredTrial; @@ -306,14 +261,17 @@ public class RealmsServer extends ValueObject { realmsServer.parentRealmId = this.parentRealmId; realmsServer.activeVersion = this.activeVersion; realmsServer.compatibility = this.compatibility; + realmsServer.regionSelectionPreference = this.regionSelectionPreference != null ? this.regionSelectionPreference.clone() : null; return realmsServer; } - public Map cloneSlots(Map slots) { - Map map = Maps.newHashMap(); + public Map cloneSlots(Map slots) { + Map map = Maps.newHashMap(); - for (Entry entry : slots.entrySet()) { - map.put((Integer)entry.getKey(), ((RealmsWorldOptions)entry.getValue()).clone()); + for (Entry entry : slots.entrySet()) { + map.put( + (Integer)entry.getKey(), new RealmsSlot((Integer)entry.getKey(), ((RealmsSlot)entry.getValue()).options.clone(), ((RealmsSlot)entry.getValue()).settings) + ); } return map; @@ -329,12 +287,12 @@ public class RealmsServer extends ValueObject { public String getWorldName(int slot) { return this.name == null - ? ((RealmsWorldOptions)this.slots.get(slot)).getSlotName(slot) - : this.name + " (" + ((RealmsWorldOptions)this.slots.get(slot)).getSlotName(slot) + ")"; + ? ((RealmsSlot)this.slots.get(slot)).options.getSlotName(slot) + : this.name + " (" + ((RealmsSlot)this.slots.get(slot)).options.getSlotName(slot) + ")"; } public ServerData toServerData(String ip) { - return new ServerData((String)Objects.requireNonNullElse(this.name, "unknown server"), ip, Type.REALM); + return new ServerData((String)Objects.requireNonNullElse(this.name, "unknown server"), ip, ServerData.Type.REALM); } @Environment(EnvType.CLIENT) diff --git a/com/mojang/realmsclient/dto/RealmsServerAddress.java b/com/mojang/realmsclient/dto/RealmsServerAddress.java deleted file mode 100644 index 32d2853e..00000000 --- a/com/mojang/realmsclient/dto/RealmsServerAddress.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.mojang.realmsclient.dto; - -import com.google.gson.JsonObject; -import com.google.gson.JsonParser; -import com.mojang.logging.LogUtils; -import com.mojang.realmsclient.util.JsonUtils; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import org.jetbrains.annotations.Nullable; -import org.slf4j.Logger; - -@Environment(EnvType.CLIENT) -public class RealmsServerAddress extends ValueObject { - private static final Logger LOGGER = LogUtils.getLogger(); - @Nullable - public String address; - @Nullable - public String resourcePackUrl; - @Nullable - public String resourcePackHash; - - public static RealmsServerAddress parse(String json) { - RealmsServerAddress realmsServerAddress = new RealmsServerAddress(); - - try { - JsonObject jsonObject = JsonParser.parseString(json).getAsJsonObject(); - realmsServerAddress.address = JsonUtils.getStringOr("address", jsonObject, null); - realmsServerAddress.resourcePackUrl = JsonUtils.getStringOr("resourcePackUrl", jsonObject, null); - realmsServerAddress.resourcePackHash = JsonUtils.getStringOr("resourcePackHash", jsonObject, null); - } catch (Exception var3) { - LOGGER.error("Could not parse RealmsServerAddress: {}", var3.getMessage()); - } - - return realmsServerAddress; - } -} diff --git a/com/mojang/realmsclient/dto/RealmsServerList.java b/com/mojang/realmsclient/dto/RealmsServerList.java index 885e4cc2..f169753b 100644 --- a/com/mojang/realmsclient/dto/RealmsServerList.java +++ b/com/mojang/realmsclient/dto/RealmsServerList.java @@ -1,8 +1,6 @@ package com.mojang.realmsclient.dto; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonParser; +import com.google.gson.annotations.SerializedName; import com.mojang.logging.LogUtils; import java.util.ArrayList; import java.util.List; @@ -11,25 +9,24 @@ import net.fabricmc.api.Environment; import org.slf4j.Logger; @Environment(EnvType.CLIENT) -public class RealmsServerList extends ValueObject { +public class RealmsServerList extends ValueObject implements ReflectionBasedSerialization { private static final Logger LOGGER = LogUtils.getLogger(); - public List servers; - - public static RealmsServerList parse(String json) { - RealmsServerList realmsServerList = new RealmsServerList(); - realmsServerList.servers = new ArrayList(); + @SerializedName("servers") + public List servers = new ArrayList(); + public static RealmsServerList parse(GuardedSerializer serializer, String json) { try { - JsonObject jsonObject = JsonParser.parseString(json).getAsJsonObject(); - if (jsonObject.get("servers").isJsonArray()) { - for (JsonElement jsonElement : jsonObject.get("servers").getAsJsonArray()) { - realmsServerList.servers.add(RealmsServer.parse(jsonElement.getAsJsonObject())); - } + RealmsServerList realmsServerList = serializer.fromJson(json, RealmsServerList.class); + if (realmsServerList == null) { + LOGGER.error("Could not parse McoServerList: {}", json); + return new RealmsServerList(); + } else { + realmsServerList.servers.forEach(RealmsServer::finalize); + return realmsServerList; } - } catch (Exception var6) { - LOGGER.error("Could not parse McoServerList: {}", var6.getMessage()); + } catch (Exception var3) { + LOGGER.error("Could not parse McoServerList: {}", var3.getMessage()); + return new RealmsServerList(); } - - return realmsServerList; } } diff --git a/com/mojang/realmsclient/dto/RealmsServerPlayerLists.java b/com/mojang/realmsclient/dto/RealmsServerPlayerLists.java index e08694b9..54c5f7f4 100644 --- a/com/mojang/realmsclient/dto/RealmsServerPlayerLists.java +++ b/com/mojang/realmsclient/dto/RealmsServerPlayerLists.java @@ -6,7 +6,6 @@ import com.google.common.collect.ImmutableMap.Builder; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import com.google.gson.JsonParser; import com.mojang.authlib.minecraft.MinecraftSessionService; import com.mojang.authlib.yggdrasil.ProfileResult; import com.mojang.logging.LogUtils; @@ -19,6 +18,7 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.Minecraft; import net.minecraft.util.GsonHelper; +import net.minecraft.util.LenientJsonParser; import org.slf4j.Logger; @Environment(EnvType.CLIENT) @@ -38,7 +38,7 @@ public class RealmsServerPlayerLists extends ValueObject { String string = JsonUtils.getStringOr("playerList", jsonObject2, null); List list; if (string != null) { - JsonElement jsonElement2 = JsonParser.parseString(string); + JsonElement jsonElement2 = LenientJsonParser.parse(string); if (jsonElement2.isJsonArray()) { list = parsePlayers(jsonElement2.getAsJsonArray()); } else { diff --git a/com/mojang/realmsclient/dto/RealmsSetting.java b/com/mojang/realmsclient/dto/RealmsSetting.java new file mode 100644 index 00000000..2081dce6 --- /dev/null +++ b/com/mojang/realmsclient/dto/RealmsSetting.java @@ -0,0 +1,23 @@ +package com.mojang.realmsclient.dto; + +import com.google.gson.annotations.SerializedName; +import java.util.List; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; + +@Environment(EnvType.CLIENT) +public record RealmsSetting(@SerializedName("name") String name, @SerializedName("value") String value) implements ReflectionBasedSerialization { + public static RealmsSetting hardcoreSetting(boolean hardcore) { + return new RealmsSetting("hardcore", Boolean.toString(hardcore)); + } + + public static boolean isHardcore(List settings) { + for (RealmsSetting realmsSetting : settings) { + if (realmsSetting.name().equals("hardcore")) { + return Boolean.parseBoolean(realmsSetting.value()); + } + } + + return false; + } +} diff --git a/com/mojang/realmsclient/dto/RealmsSettings.java b/com/mojang/realmsclient/dto/RealmsSettings.java deleted file mode 100644 index 9a173274..00000000 --- a/com/mojang/realmsclient/dto/RealmsSettings.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.mojang.realmsclient.dto; - -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; - -@Environment(EnvType.CLIENT) -public record RealmsSettings(boolean hardcore) { -} diff --git a/com/mojang/realmsclient/dto/RealmsSlot.java b/com/mojang/realmsclient/dto/RealmsSlot.java new file mode 100644 index 00000000..1626dbd4 --- /dev/null +++ b/com/mojang/realmsclient/dto/RealmsSlot.java @@ -0,0 +1,56 @@ +package com.mojang.realmsclient.dto; + +import com.google.gson.TypeAdapter; +import com.google.gson.annotations.JsonAdapter; +import com.google.gson.annotations.SerializedName; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; + +@Environment(EnvType.CLIENT) +public final class RealmsSlot implements ReflectionBasedSerialization { + @SerializedName("slotId") + public int slotId; + @SerializedName("options") + @JsonAdapter(RealmsSlot.RealmsWorldOptionsJsonAdapter.class) + public RealmsWorldOptions options; + @SerializedName("settings") + public List settings; + + public RealmsSlot(int slotId, RealmsWorldOptions options, List settings) { + this.slotId = slotId; + this.options = options; + this.settings = settings; + } + + public static RealmsSlot defaults(int slotId) { + return new RealmsSlot(slotId, RealmsWorldOptions.createEmptyDefaults(), List.of(RealmsSetting.hardcoreSetting(false))); + } + + public RealmsSlot clone() { + return new RealmsSlot(this.slotId, this.options.clone(), new ArrayList(this.settings)); + } + + public boolean isHardcore() { + return RealmsSetting.isHardcore(this.settings); + } + + @Environment(EnvType.CLIENT) + static class RealmsWorldOptionsJsonAdapter extends TypeAdapter { + private RealmsWorldOptionsJsonAdapter() { + } + + public void write(JsonWriter writer, RealmsWorldOptions options) throws IOException { + writer.jsonValue(new GuardedSerializer().toJson(options)); + } + + public RealmsWorldOptions read(JsonReader reader) throws IOException { + String string = reader.nextString(); + return RealmsWorldOptions.parse(new GuardedSerializer(), string); + } + } +} diff --git a/com/mojang/realmsclient/dto/RealmsSlotUpdateDto.java b/com/mojang/realmsclient/dto/RealmsSlotUpdateDto.java new file mode 100644 index 00000000..0348b11a --- /dev/null +++ b/com/mojang/realmsclient/dto/RealmsSlotUpdateDto.java @@ -0,0 +1,56 @@ +package com.mojang.realmsclient.dto; + +import com.google.gson.annotations.SerializedName; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import org.jetbrains.annotations.Nullable; + +@Environment(EnvType.CLIENT) +public final class RealmsSlotUpdateDto implements ReflectionBasedSerialization { + @SerializedName("slotId") + public final int slotId; + @SerializedName("pvp") + private final boolean pvp; + @SerializedName("spawnMonsters") + private final boolean spawnMonsters; + @SerializedName("spawnProtection") + private final int spawnProtection; + @SerializedName("commandBlocks") + private final boolean commandBlocks; + @SerializedName("forceGameMode") + private final boolean forceGameMode; + @SerializedName("difficulty") + private final int difficulty; + @SerializedName("gameMode") + private final int gameMode; + @SerializedName("slotName") + private final String slotName; + @SerializedName("version") + private final String version; + @SerializedName("compatibility") + private final RealmsServer.Compatibility compatibility; + @SerializedName("worldTemplateId") + private final long templateId; + @Nullable + @SerializedName("worldTemplateImage") + private final String templateImage; + @SerializedName("hardcore") + private final boolean hardcore; + + public RealmsSlotUpdateDto(int slotId, RealmsWorldOptions options, boolean hardcore) { + this.slotId = slotId; + this.pvp = options.pvp; + this.spawnMonsters = options.spawnMonsters; + this.spawnProtection = options.spawnProtection; + this.commandBlocks = options.commandBlocks; + this.forceGameMode = options.forceGameMode; + this.difficulty = options.difficulty; + this.gameMode = options.gameMode; + this.slotName = options.getSlotName(slotId); + this.version = options.version; + this.compatibility = options.compatibility; + this.templateId = options.templateId; + this.templateImage = options.templateImage; + this.hardcore = hardcore; + } +} diff --git a/com/mojang/realmsclient/dto/RealmsWorldOptions.java b/com/mojang/realmsclient/dto/RealmsWorldOptions.java index 3856049a..6faba815 100644 --- a/com/mojang/realmsclient/dto/RealmsWorldOptions.java +++ b/com/mojang/realmsclient/dto/RealmsWorldOptions.java @@ -1,9 +1,6 @@ package com.mojang.realmsclient.dto; -import com.google.gson.JsonObject; -import com.mojang.realmsclient.dto.RealmsServer.Compatibility; -import com.mojang.realmsclient.util.JsonUtils; -import java.util.Objects; +import com.google.gson.annotations.SerializedName; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.resources.language.I18n; @@ -14,35 +11,36 @@ import net.minecraft.world.level.LevelSettings; import org.jetbrains.annotations.Nullable; @Environment(EnvType.CLIENT) -public class RealmsWorldOptions extends ValueObject { - public final boolean pvp; - public final boolean spawnMonsters; - public final int spawnProtection; - public final boolean commandBlocks; - public final boolean forceGameMode; - public final int difficulty; - public final int gameMode; - public final boolean hardcore; - private final String slotName; - public final String version; - public final Compatibility compatibility; - public long templateId; +public class RealmsWorldOptions extends ValueObject implements ReflectionBasedSerialization { + @SerializedName("pvp") + public boolean pvp = true; + @SerializedName("spawnMonsters") + public boolean spawnMonsters = true; + @SerializedName("spawnProtection") + public int spawnProtection = 0; + @SerializedName("commandBlocks") + public boolean commandBlocks = false; + @SerializedName("forceGameMode") + public boolean forceGameMode = false; + @SerializedName("difficulty") + public int difficulty = 2; + @SerializedName("gameMode") + public int gameMode = 0; + @SerializedName("slotName") + private String slotName = ""; + @SerializedName("version") + public String version = ""; + @SerializedName("compatibility") + public RealmsServer.Compatibility compatibility = RealmsServer.Compatibility.UNVERIFIABLE; + @SerializedName("worldTemplateId") + public long templateId = -1L; @Nullable - public String templateImage; + @SerializedName("worldTemplateImage") + public String templateImage = null; public boolean empty; - private static final boolean DEFAULT_FORCE_GAME_MODE = false; - private static final boolean DEFAULT_PVP = true; - private static final boolean DEFAULT_SPAWN_MONSTERS = true; - private static final int DEFAULT_SPAWN_PROTECTION = 0; - private static final boolean DEFAULT_COMMAND_BLOCKS = false; - private static final int DEFAULT_DIFFICULTY = 2; - private static final int DEFAULT_GAME_MODE = 0; - private static final boolean DEFAULT_HARDCORE_MODE = false; - private static final String DEFAULT_SLOT_NAME = ""; - private static final String DEFAULT_VERSION = ""; - private static final Compatibility DEFAULT_COMPATIBILITY = Compatibility.UNVERIFIABLE; - private static final long DEFAULT_TEMPLATE_ID = -1L; - private static final String DEFAULT_TEMPLATE_IMAGE = null; + + private RealmsWorldOptions() { + } public RealmsWorldOptions( boolean pvp, @@ -51,11 +49,10 @@ public class RealmsWorldOptions extends ValueObject { boolean commandBlocks, int difficulty, int gameMode, - boolean hardcore, boolean forceGameMode, String slotName, String version, - Compatibility compatibility + RealmsServer.Compatibility compatibility ) { this.pvp = pvp; this.spawnMonsters = spawnMonsters; @@ -63,7 +60,6 @@ public class RealmsWorldOptions extends ValueObject { this.commandBlocks = commandBlocks; this.difficulty = difficulty; this.gameMode = gameMode; - this.hardcore = hardcore; this.forceGameMode = forceGameMode; this.slotName = slotName; this.version = version; @@ -71,13 +67,19 @@ public class RealmsWorldOptions extends ValueObject { } public static RealmsWorldOptions createDefaults() { - return new RealmsWorldOptions(true, true, 0, false, 2, 0, false, false, "", "", DEFAULT_COMPATIBILITY); + return new RealmsWorldOptions(); } public static RealmsWorldOptions createDefaultsWith( GameType gameType, boolean commandBlocks, Difficulty difficulty, boolean hardcore, String version, String slotName ) { - return new RealmsWorldOptions(true, true, 0, commandBlocks, difficulty.getId(), gameType.getId(), hardcore, false, slotName, version, DEFAULT_COMPATIBILITY); + RealmsWorldOptions realmsWorldOptions = createDefaults(); + realmsWorldOptions.commandBlocks = commandBlocks; + realmsWorldOptions.difficulty = difficulty.getId(); + realmsWorldOptions.gameMode = gameType.getId(); + realmsWorldOptions.slotName = slotName; + realmsWorldOptions.version = version; + return realmsWorldOptions; } public static RealmsWorldOptions createFromSettings(LevelSettings levelSettings, boolean commandBlocks, String version) { @@ -94,23 +96,28 @@ public class RealmsWorldOptions extends ValueObject { this.empty = empty; } - public static RealmsWorldOptions parse(JsonObject json, RealmsSettings realmsSettings) { - RealmsWorldOptions realmsWorldOptions = new RealmsWorldOptions( - JsonUtils.getBooleanOr("pvp", json, true), - JsonUtils.getBooleanOr("spawnMonsters", json, true), - JsonUtils.getIntOr("spawnProtection", json, 0), - JsonUtils.getBooleanOr("commandBlocks", json, false), - JsonUtils.getIntOr("difficulty", json, 2), - JsonUtils.getIntOr("gameMode", json, 0), - realmsSettings.hardcore(), - JsonUtils.getBooleanOr("forceGameMode", json, false), - JsonUtils.getRequiredStringOr("slotName", json, ""), - JsonUtils.getRequiredStringOr("version", json, ""), - RealmsServer.getCompatibility(JsonUtils.getRequiredStringOr("compatibility", json, Compatibility.UNVERIFIABLE.name())) - ); - realmsWorldOptions.templateId = JsonUtils.getLongOr("worldTemplateId", json, -1L); - realmsWorldOptions.templateImage = JsonUtils.getStringOr("worldTemplateImage", json, DEFAULT_TEMPLATE_IMAGE); - return realmsWorldOptions; + public static RealmsWorldOptions parse(GuardedSerializer serializer, String json) { + RealmsWorldOptions realmsWorldOptions = serializer.fromJson(json, RealmsWorldOptions.class); + if (realmsWorldOptions == null) { + return createDefaults(); + } else { + finalize(realmsWorldOptions); + return realmsWorldOptions; + } + } + + private static void finalize(RealmsWorldOptions options) { + if (options.slotName == null) { + options.slotName = ""; + } + + if (options.version == null) { + options.version = ""; + } + + if (options.compatibility == null) { + options.compatibility = RealmsServer.Compatibility.UNVERIFIABLE; + } } public String getSlotName(int slotIndex) { @@ -125,55 +132,6 @@ public class RealmsWorldOptions extends ValueObject { return I18n.get("mco.configure.world.slot", slotIndex); } - public String toJson() { - JsonObject jsonObject = new JsonObject(); - if (!this.pvp) { - jsonObject.addProperty("pvp", this.pvp); - } - - if (!this.spawnMonsters) { - jsonObject.addProperty("spawnMonsters", this.spawnMonsters); - } - - if (this.spawnProtection != 0) { - jsonObject.addProperty("spawnProtection", this.spawnProtection); - } - - if (this.commandBlocks) { - jsonObject.addProperty("commandBlocks", this.commandBlocks); - } - - if (this.difficulty != 2) { - jsonObject.addProperty("difficulty", this.difficulty); - } - - if (this.gameMode != 0) { - jsonObject.addProperty("gameMode", this.gameMode); - } - - if (this.hardcore) { - jsonObject.addProperty("hardcore", this.hardcore); - } - - if (this.forceGameMode) { - jsonObject.addProperty("forceGameMode", this.forceGameMode); - } - - if (!Objects.equals(this.slotName, "")) { - jsonObject.addProperty("slotName", this.slotName); - } - - if (!Objects.equals(this.version, "")) { - jsonObject.addProperty("version", this.version); - } - - if (this.compatibility != DEFAULT_COMPATIBILITY) { - jsonObject.addProperty("compatibility", this.compatibility.name()); - } - - return jsonObject.toString(); - } - public RealmsWorldOptions clone() { return new RealmsWorldOptions( this.pvp, @@ -182,7 +140,6 @@ public class RealmsWorldOptions extends ValueObject { this.commandBlocks, this.difficulty, this.gameMode, - this.hardcore, this.forceGameMode, this.slotName, this.version, diff --git a/com/mojang/realmsclient/dto/RegionDataDto.java b/com/mojang/realmsclient/dto/RegionDataDto.java new file mode 100644 index 00000000..f4f1d4c6 --- /dev/null +++ b/com/mojang/realmsclient/dto/RegionDataDto.java @@ -0,0 +1,10 @@ +package com.mojang.realmsclient.dto; + +import com.google.gson.annotations.SerializedName; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; + +@Environment(EnvType.CLIENT) +public record RegionDataDto(@SerializedName("regionName") RealmsRegion region, @SerializedName("serviceQuality") ServiceQuality serviceQuality) + implements ReflectionBasedSerialization { +} diff --git a/com/mojang/realmsclient/dto/RegionSelectionPreference.java b/com/mojang/realmsclient/dto/RegionSelectionPreference.java new file mode 100644 index 00000000..4d49a87e --- /dev/null +++ b/com/mojang/realmsclient/dto/RegionSelectionPreference.java @@ -0,0 +1,48 @@ +package com.mojang.realmsclient.dto; + +import com.google.gson.TypeAdapter; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; +import com.mojang.logging.LogUtils; +import java.io.IOException; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import org.slf4j.Logger; + +@Environment(EnvType.CLIENT) +public enum RegionSelectionPreference { + AUTOMATIC_PLAYER(0, "realms.configuration.region_preference.automatic_player"), + AUTOMATIC_OWNER(1, "realms.configuration.region_preference.automatic_owner"), + MANUAL(2, ""); + + public static final RegionSelectionPreference DEFAULT_SELECTION = AUTOMATIC_PLAYER; + public final int id; + public final String translationKey; + + private RegionSelectionPreference(final int id, final String translationKey) { + this.id = id; + this.translationKey = translationKey; + } + + @Environment(EnvType.CLIENT) + public static class RegionSelectionPreferenceJsonAdapter extends TypeAdapter { + private static final Logger LOGGER = LogUtils.getLogger(); + + public void write(JsonWriter writer, RegionSelectionPreference regionSelectionPreference) throws IOException { + writer.value((long)regionSelectionPreference.id); + } + + public RegionSelectionPreference read(JsonReader reader) throws IOException { + int i = reader.nextInt(); + + for (RegionSelectionPreference regionSelectionPreference : RegionSelectionPreference.values()) { + if (regionSelectionPreference.id == i) { + return regionSelectionPreference; + } + } + + LOGGER.warn("Unsupported RegionSelectionPreference {}", i); + return RegionSelectionPreference.DEFAULT_SELECTION; + } + } +} diff --git a/com/mojang/realmsclient/dto/RegionSelectionPreferenceDto.java b/com/mojang/realmsclient/dto/RegionSelectionPreferenceDto.java new file mode 100644 index 00000000..ea01296f --- /dev/null +++ b/com/mojang/realmsclient/dto/RegionSelectionPreferenceDto.java @@ -0,0 +1,49 @@ +package com.mojang.realmsclient.dto; + +import com.google.gson.annotations.JsonAdapter; +import com.google.gson.annotations.SerializedName; +import com.mojang.logging.LogUtils; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import org.jetbrains.annotations.Nullable; +import org.slf4j.Logger; + +@Environment(EnvType.CLIENT) +public class RegionSelectionPreferenceDto extends ValueObject implements ReflectionBasedSerialization { + public static final RegionSelectionPreferenceDto DEFAULT = new RegionSelectionPreferenceDto(RegionSelectionPreference.AUTOMATIC_OWNER, null); + private static final Logger LOGGER = LogUtils.getLogger(); + @SerializedName("regionSelectionPreference") + @JsonAdapter(RegionSelectionPreference.RegionSelectionPreferenceJsonAdapter.class) + public RegionSelectionPreference regionSelectionPreference; + @SerializedName("preferredRegion") + @JsonAdapter(RealmsRegion.RealmsRegionJsonAdapter.class) + @Nullable + public RealmsRegion preferredRegion; + + public RegionSelectionPreferenceDto(RegionSelectionPreference regionSelectionPreference, @Nullable RealmsRegion preferredRegion) { + this.regionSelectionPreference = regionSelectionPreference; + this.preferredRegion = preferredRegion; + } + + private RegionSelectionPreferenceDto() { + } + + public static RegionSelectionPreferenceDto parse(GuardedSerializer serializer, String json) { + try { + RegionSelectionPreferenceDto regionSelectionPreferenceDto = serializer.fromJson(json, RegionSelectionPreferenceDto.class); + if (regionSelectionPreferenceDto == null) { + LOGGER.error("Could not parse RegionSelectionPreference: {}", json); + return new RegionSelectionPreferenceDto(); + } else { + return regionSelectionPreferenceDto; + } + } catch (Exception var3) { + LOGGER.error("Could not parse RegionSelectionPreference: {}", var3.getMessage()); + return new RegionSelectionPreferenceDto(); + } + } + + public RegionSelectionPreferenceDto clone() { + return new RegionSelectionPreferenceDto(this.regionSelectionPreference, this.preferredRegion); + } +} diff --git a/com/mojang/realmsclient/dto/ServerActivityList.java b/com/mojang/realmsclient/dto/ServerActivityList.java index d3911eff..1a3c1cf6 100644 --- a/com/mojang/realmsclient/dto/ServerActivityList.java +++ b/com/mojang/realmsclient/dto/ServerActivityList.java @@ -3,11 +3,11 @@ package com.mojang.realmsclient.dto; import com.google.common.collect.Lists; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import com.google.gson.JsonParser; import com.mojang.realmsclient.util.JsonUtils; import java.util.List; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; +import net.minecraft.util.LenientJsonParser; @Environment(EnvType.CLIENT) public class ServerActivityList extends ValueObject { @@ -16,10 +16,9 @@ public class ServerActivityList extends ValueObject { public static ServerActivityList parse(String json) { ServerActivityList serverActivityList = new ServerActivityList(); - JsonParser jsonParser = new JsonParser(); try { - JsonElement jsonElement = jsonParser.parse(json); + JsonElement jsonElement = LenientJsonParser.parse(json); JsonObject jsonObject = jsonElement.getAsJsonObject(); serverActivityList.periodInMillis = JsonUtils.getLongOr("periodInMillis", jsonObject, -1L); JsonElement jsonElement2 = jsonObject.get("playerActivityDto"); @@ -29,7 +28,7 @@ public class ServerActivityList extends ValueObject { serverActivityList.serverActivities.add(serverActivity); } } - } catch (Exception var10) { + } catch (Exception var9) { } return serverActivityList; diff --git a/com/mojang/realmsclient/dto/ServiceQuality.java b/com/mojang/realmsclient/dto/ServiceQuality.java new file mode 100644 index 00000000..5de05d66 --- /dev/null +++ b/com/mojang/realmsclient/dto/ServiceQuality.java @@ -0,0 +1,68 @@ +package com.mojang.realmsclient.dto; + +import com.google.gson.TypeAdapter; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; +import com.mojang.logging.LogUtils; +import java.io.IOException; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.resources.ResourceLocation; +import org.jetbrains.annotations.Nullable; +import org.slf4j.Logger; + +@Environment(EnvType.CLIENT) +public enum ServiceQuality { + GREAT(1, "icon/ping_5"), + GOOD(2, "icon/ping_4"), + OKAY(3, "icon/ping_3"), + POOR(4, "icon/ping_2"), + UNKNOWN(5, "icon/ping_unknown"); + + final int value; + private final ResourceLocation icon; + + private ServiceQuality(final int value, final String icon) { + this.value = value; + this.icon = ResourceLocation.withDefaultNamespace(icon); + } + + @Nullable + public static ServiceQuality byValue(int value) { + for (ServiceQuality serviceQuality : values()) { + if (serviceQuality.getValue() == value) { + return serviceQuality; + } + } + + return null; + } + + public int getValue() { + return this.value; + } + + public ResourceLocation getIcon() { + return this.icon; + } + + @Environment(EnvType.CLIENT) + public static class RealmsServiceQualityJsonAdapter extends TypeAdapter { + private static final Logger LOGGER = LogUtils.getLogger(); + + public void write(JsonWriter writer, ServiceQuality serviceQuality) throws IOException { + writer.value((long)serviceQuality.value); + } + + public ServiceQuality read(JsonReader reader) throws IOException { + int i = reader.nextInt(); + ServiceQuality serviceQuality = ServiceQuality.byValue(i); + if (serviceQuality == null) { + LOGGER.warn("Unsupported ServiceQuality {}", i); + return ServiceQuality.UNKNOWN; + } else { + return serviceQuality; + } + } + } +} diff --git a/com/mojang/realmsclient/dto/Subscription.java b/com/mojang/realmsclient/dto/Subscription.java index 1233907f..91347b82 100644 --- a/com/mojang/realmsclient/dto/Subscription.java +++ b/com/mojang/realmsclient/dto/Subscription.java @@ -1,11 +1,11 @@ package com.mojang.realmsclient.dto; import com.google.gson.JsonObject; -import com.google.gson.JsonParser; import com.mojang.logging.LogUtils; import com.mojang.realmsclient.util.JsonUtils; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; +import net.minecraft.util.LenientJsonParser; import org.slf4j.Logger; @Environment(EnvType.CLIENT) @@ -19,13 +19,12 @@ public class Subscription extends ValueObject { Subscription subscription = new Subscription(); try { - JsonParser jsonParser = new JsonParser(); - JsonObject jsonObject = jsonParser.parse(json).getAsJsonObject(); + JsonObject jsonObject = LenientJsonParser.parse(json).getAsJsonObject(); subscription.startDate = JsonUtils.getLongOr("startDate", jsonObject, 0L); subscription.daysLeft = JsonUtils.getIntOr("daysLeft", jsonObject, 0); subscription.type = typeFrom(JsonUtils.getStringOr("subscriptionType", jsonObject, Subscription.SubscriptionType.NORMAL.name())); - } catch (Exception var4) { - LOGGER.error("Could not parse Subscription: {}", var4.getMessage()); + } catch (Exception var3) { + LOGGER.error("Could not parse Subscription: {}", var3.getMessage()); } return subscription; diff --git a/com/mojang/realmsclient/dto/UploadInfo.java b/com/mojang/realmsclient/dto/UploadInfo.java index 006607b7..acec05f4 100644 --- a/com/mojang/realmsclient/dto/UploadInfo.java +++ b/com/mojang/realmsclient/dto/UploadInfo.java @@ -2,7 +2,6 @@ package com.mojang.realmsclient.dto; import com.google.common.annotations.VisibleForTesting; import com.google.gson.JsonObject; -import com.google.gson.JsonParser; import com.mojang.logging.LogUtils; import com.mojang.realmsclient.util.JsonUtils; import java.net.URI; @@ -11,6 +10,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; +import net.minecraft.util.LenientJsonParser; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; @@ -34,8 +34,7 @@ public class UploadInfo extends ValueObject { @Nullable public static UploadInfo parse(String json) { try { - JsonParser jsonParser = new JsonParser(); - JsonObject jsonObject = jsonParser.parse(json).getAsJsonObject(); + JsonObject jsonObject = LenientJsonParser.parse(json).getAsJsonObject(); String string = JsonUtils.getStringOr("uploadEndpoint", jsonObject, null); if (string != null) { int i = JsonUtils.getIntOr("port", jsonObject, -1); @@ -46,8 +45,8 @@ public class UploadInfo extends ValueObject { return new UploadInfo(bl, string2, uRI); } } - } catch (Exception var8) { - LOGGER.error("Could not parse UploadInfo: {}", var8.getMessage()); + } catch (Exception var7) { + LOGGER.error("Could not parse UploadInfo: {}", var7.getMessage()); } return null; diff --git a/com/mojang/realmsclient/dto/WorldDownload.java b/com/mojang/realmsclient/dto/WorldDownload.java index 8b1d5d1a..3f7d6fc6 100644 --- a/com/mojang/realmsclient/dto/WorldDownload.java +++ b/com/mojang/realmsclient/dto/WorldDownload.java @@ -1,11 +1,11 @@ package com.mojang.realmsclient.dto; import com.google.gson.JsonObject; -import com.google.gson.JsonParser; import com.mojang.logging.LogUtils; import com.mojang.realmsclient.util.JsonUtils; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; +import net.minecraft.util.LenientJsonParser; import org.slf4j.Logger; @Environment(EnvType.CLIENT) @@ -16,16 +16,15 @@ public class WorldDownload extends ValueObject { public String resourcePackHash; public static WorldDownload parse(String json) { - JsonParser jsonParser = new JsonParser(); - JsonObject jsonObject = jsonParser.parse(json).getAsJsonObject(); + JsonObject jsonObject = LenientJsonParser.parse(json).getAsJsonObject(); WorldDownload worldDownload = new WorldDownload(); try { worldDownload.downloadLink = JsonUtils.getStringOr("downloadLink", jsonObject, ""); worldDownload.resourcePackUrl = JsonUtils.getStringOr("resourcePackUrl", jsonObject, ""); worldDownload.resourcePackHash = JsonUtils.getStringOr("resourcePackHash", jsonObject, ""); - } catch (Exception var5) { - LOGGER.error("Could not parse WorldDownload: {}", var5.getMessage()); + } catch (Exception var4) { + LOGGER.error("Could not parse WorldDownload: {}", var4.getMessage()); } return worldDownload; diff --git a/com/mojang/realmsclient/dto/WorldTemplatePaginatedList.java b/com/mojang/realmsclient/dto/WorldTemplatePaginatedList.java index 71ef55bb..c87aef39 100644 --- a/com/mojang/realmsclient/dto/WorldTemplatePaginatedList.java +++ b/com/mojang/realmsclient/dto/WorldTemplatePaginatedList.java @@ -3,14 +3,13 @@ package com.mojang.realmsclient.dto; import com.google.common.collect.Lists; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import com.google.gson.JsonParser; import com.mojang.logging.LogUtils; import com.mojang.realmsclient.util.JsonUtils; import java.util.Collections; -import java.util.Iterator; import java.util.List; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; +import net.minecraft.util.LenientJsonParser; import org.slf4j.Logger; @Environment(EnvType.CLIENT) @@ -40,13 +39,10 @@ public class WorldTemplatePaginatedList extends ValueObject { worldTemplatePaginatedList.templates = Lists.newArrayList(); try { - JsonParser jsonParser = new JsonParser(); - JsonObject jsonObject = jsonParser.parse(json).getAsJsonObject(); + JsonObject jsonObject = LenientJsonParser.parse(json).getAsJsonObject(); if (jsonObject.get("templates").isJsonArray()) { - Iterator iterator = jsonObject.get("templates").getAsJsonArray().iterator(); - - while (iterator.hasNext()) { - worldTemplatePaginatedList.templates.add(WorldTemplate.parse(((JsonElement)iterator.next()).getAsJsonObject())); + for (JsonElement jsonElement : jsonObject.get("templates").getAsJsonArray()) { + worldTemplatePaginatedList.templates.add(WorldTemplate.parse(jsonElement.getAsJsonObject())); } } diff --git a/com/mojang/realmsclient/gui/RealmsDataFetcher.java b/com/mojang/realmsclient/gui/RealmsDataFetcher.java index 9819f20b..831fe422 100644 --- a/com/mojang/realmsclient/gui/RealmsDataFetcher.java +++ b/com/mojang/realmsclient/gui/RealmsDataFetcher.java @@ -8,7 +8,6 @@ import com.mojang.realmsclient.dto.RealmsServer; import com.mojang.realmsclient.dto.RealmsServerPlayerLists; import com.mojang.realmsclient.gui.task.DataFetcher; import com.mojang.realmsclient.gui.task.RepeatedDelayStrategy; -import com.mojang.realmsclient.gui.task.DataFetcher.Task; import com.mojang.realmsclient.util.RealmsPersistence; import java.time.Duration; import java.util.List; @@ -20,13 +19,13 @@ import net.minecraft.Util; @Environment(EnvType.CLIENT) public class RealmsDataFetcher { public final DataFetcher dataFetcher = new DataFetcher(Util.ioPool(), TimeUnit.MILLISECONDS, Util.timeSource); - private final List> tasks; - public final Task> notificationsTask; - public final Task serverListUpdateTask; - public final Task pendingInvitesTask; - public final Task trialAvailabilityTask; - public final Task newsTask; - public final Task onlinePlayersTask; + private final List> tasks; + public final DataFetcher.Task> notificationsTask; + public final DataFetcher.Task serverListUpdateTask; + public final DataFetcher.Task pendingInvitesTask; + public final DataFetcher.Task trialAvailabilityTask; + public final DataFetcher.Task newsTask; + public final DataFetcher.Task onlinePlayersTask; public final RealmsNewsManager newsManager = new RealmsNewsManager(new RealmsPersistence()); public RealmsDataFetcher(RealmsClient realmsClient) { @@ -54,7 +53,7 @@ public class RealmsDataFetcher { ); } - public List> getTasks() { + public List> getTasks() { return this.tasks; } diff --git a/com/mojang/realmsclient/gui/RealmsNewsManager.java b/com/mojang/realmsclient/gui/RealmsNewsManager.java index 3129eaf5..2a65a701 100644 --- a/com/mojang/realmsclient/gui/RealmsNewsManager.java +++ b/com/mojang/realmsclient/gui/RealmsNewsManager.java @@ -2,7 +2,6 @@ package com.mojang.realmsclient.gui; import com.mojang.realmsclient.dto.RealmsNews; import com.mojang.realmsclient.util.RealmsPersistence; -import com.mojang.realmsclient.util.RealmsPersistence.RealmsPersistenceData; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -14,7 +13,7 @@ public class RealmsNewsManager { public RealmsNewsManager(RealmsPersistence newsLocalStorage) { this.newsLocalStorage = newsLocalStorage; - RealmsPersistenceData realmsPersistenceData = newsLocalStorage.read(); + RealmsPersistence.RealmsPersistenceData realmsPersistenceData = newsLocalStorage.read(); this.hasUnreadNews = realmsPersistenceData.hasUnreadNews; this.newsLink = realmsPersistenceData.newsLink; } @@ -28,15 +27,15 @@ public class RealmsNewsManager { } public void updateUnreadNews(RealmsNews realmsNews) { - RealmsPersistenceData realmsPersistenceData = this.updateNewsStorage(realmsNews); + RealmsPersistence.RealmsPersistenceData realmsPersistenceData = this.updateNewsStorage(realmsNews); this.hasUnreadNews = realmsPersistenceData.hasUnreadNews; this.newsLink = realmsPersistenceData.newsLink; } - private RealmsPersistenceData updateNewsStorage(RealmsNews realmsNews) { - RealmsPersistenceData realmsPersistenceData = this.newsLocalStorage.read(); + private RealmsPersistence.RealmsPersistenceData updateNewsStorage(RealmsNews realmsNews) { + RealmsPersistence.RealmsPersistenceData realmsPersistenceData = this.newsLocalStorage.read(); if (realmsNews.newsLink != null && !realmsNews.newsLink.equals(realmsPersistenceData.newsLink)) { - RealmsPersistenceData realmsPersistenceData2 = new RealmsPersistenceData(); + RealmsPersistence.RealmsPersistenceData realmsPersistenceData2 = new RealmsPersistence.RealmsPersistenceData(); realmsPersistenceData2.newsLink = realmsNews.newsLink; realmsPersistenceData2.hasUnreadNews = true; this.newsLocalStorage.save(realmsPersistenceData2); diff --git a/com/mojang/realmsclient/gui/RealmsWorldSlotButton.java b/com/mojang/realmsclient/gui/RealmsWorldSlotButton.java index cdb880fb..7f982b2a 100644 --- a/com/mojang/realmsclient/gui/RealmsWorldSlotButton.java +++ b/com/mojang/realmsclient/gui/RealmsWorldSlotButton.java @@ -2,7 +2,7 @@ package com.mojang.realmsclient.gui; import com.mojang.realmsclient.RealmsMainScreen; import com.mojang.realmsclient.dto.RealmsServer; -import com.mojang.realmsclient.dto.RealmsWorldOptions; +import com.mojang.realmsclient.dto.RealmsSlot; import com.mojang.realmsclient.util.RealmsTextureManager; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -11,7 +11,7 @@ import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.components.Tooltip; -import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.RenderPipelines; import net.minecraft.network.chat.CommonComponents; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; @@ -22,40 +22,37 @@ import org.jetbrains.annotations.Nullable; @Environment(EnvType.CLIENT) public class RealmsWorldSlotButton extends Button { private static final ResourceLocation SLOT_FRAME_SPRITE = ResourceLocation.withDefaultNamespace("widget/slot_frame"); - private static final ResourceLocation CHECKMARK_SPRITE = ResourceLocation.withDefaultNamespace("icon/checkmark"); public static final ResourceLocation EMPTY_SLOT_LOCATION = ResourceLocation.withDefaultNamespace("textures/gui/realms/empty_frame.png"); public static final ResourceLocation DEFAULT_WORLD_SLOT_1 = ResourceLocation.withDefaultNamespace("textures/gui/title/background/panorama_0.png"); public static final ResourceLocation DEFAULT_WORLD_SLOT_2 = ResourceLocation.withDefaultNamespace("textures/gui/title/background/panorama_2.png"); public static final ResourceLocation DEFAULT_WORLD_SLOT_3 = ResourceLocation.withDefaultNamespace("textures/gui/title/background/panorama_3.png"); - private static final Component SLOT_ACTIVE_TOOLTIP = Component.translatable("mco.configure.world.slot.tooltip.active"); private static final Component SWITCH_TO_MINIGAME_SLOT_TOOLTIP = Component.translatable("mco.configure.world.slot.tooltip.minigame"); private static final Component SWITCH_TO_WORLD_SLOT_TOOLTIP = Component.translatable("mco.configure.world.slot.tooltip"); static final Component MINIGAME = Component.translatable("mco.worldSlot.minigame"); private static final int WORLD_NAME_MAX_WIDTH = 64; private static final String DOTS = "..."; private final int slotIndex; - @Nullable private RealmsWorldSlotButton.State state; - public RealmsWorldSlotButton(int x, int y, int width, int height, int slotIndex, Button.OnPress onPress) { + public RealmsWorldSlotButton(int x, int y, int width, int height, int slotIndex, RealmsServer serverData, Button.OnPress onPress) { super(x, y, width, height, CommonComponents.EMPTY, onPress, DEFAULT_NARRATION); this.slotIndex = slotIndex; + this.state = this.setServerData(serverData); } - @Nullable public RealmsWorldSlotButton.State getState() { return this.state; } - public void setServerData(RealmsServer serverData) { + public RealmsWorldSlotButton.State setServerData(RealmsServer serverData) { this.state = new RealmsWorldSlotButton.State(serverData, this.slotIndex); this.setTooltipAndNarration(this.state, serverData.minigameName); + return this.state; } private void setTooltipAndNarration(RealmsWorldSlotButton.State state, @Nullable String minigameName) { Component component = switch (state.action) { case SWITCH_SLOT -> state.minigame ? SWITCH_TO_MINIGAME_SLOT_TOOLTIP : SWITCH_TO_WORLD_SLOT_TOOLTIP; - case JOIN -> SLOT_ACTIVE_TOOLTIP; default -> null; }; if (component != null) { @@ -71,67 +68,59 @@ public class RealmsWorldSlotButton extends Button { } static RealmsWorldSlotButton.Action getAction(RealmsServer realmsServer, boolean isCurrentlyActiveSlot, boolean minigame) { - if (isCurrentlyActiveSlot && !realmsServer.expired && realmsServer.state != RealmsServer.State.UNINITIALIZED) { - return RealmsWorldSlotButton.Action.JOIN; - } else { - return isCurrentlyActiveSlot || minigame && realmsServer.expired ? RealmsWorldSlotButton.Action.NOTHING : RealmsWorldSlotButton.Action.SWITCH_SLOT; - } + return minigame || isCurrentlyActiveSlot && realmsServer.expired ? RealmsWorldSlotButton.Action.NOTHING : RealmsWorldSlotButton.Action.SWITCH_SLOT; } @Override public void renderWidget(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTick) { - if (this.state != null) { - int i = this.getX(); - int j = this.getY(); - boolean bl = this.isHoveredOrFocused(); - ResourceLocation resourceLocation; - if (this.state.minigame) { - resourceLocation = RealmsTextureManager.worldTemplate(String.valueOf(this.state.imageId), this.state.image); - } else if (this.state.empty) { - resourceLocation = EMPTY_SLOT_LOCATION; - } else if (this.state.image != null && this.state.imageId != -1L) { - resourceLocation = RealmsTextureManager.worldTemplate(String.valueOf(this.state.imageId), this.state.image); - } else if (this.slotIndex == 1) { - resourceLocation = DEFAULT_WORLD_SLOT_1; - } else if (this.slotIndex == 2) { - resourceLocation = DEFAULT_WORLD_SLOT_2; - } else if (this.slotIndex == 3) { - resourceLocation = DEFAULT_WORLD_SLOT_3; - } else { - resourceLocation = EMPTY_SLOT_LOCATION; - } + int i = this.getX(); + int j = this.getY(); + boolean bl = this.isHoveredOrFocused(); + ResourceLocation resourceLocation; + if (this.state.minigame) { + resourceLocation = RealmsTextureManager.worldTemplate(String.valueOf(this.state.imageId), this.state.image); + } else if (this.state.empty) { + resourceLocation = EMPTY_SLOT_LOCATION; + } else if (this.state.image != null && this.state.imageId != -1L) { + resourceLocation = RealmsTextureManager.worldTemplate(String.valueOf(this.state.imageId), this.state.image); + } else if (this.slotIndex == 1) { + resourceLocation = DEFAULT_WORLD_SLOT_1; + } else if (this.slotIndex == 2) { + resourceLocation = DEFAULT_WORLD_SLOT_2; + } else if (this.slotIndex == 3) { + resourceLocation = DEFAULT_WORLD_SLOT_3; + } else { + resourceLocation = EMPTY_SLOT_LOCATION; + } - int k = -1; - if (this.state.isCurrentlyActiveSlot) { - k = ARGB.colorFromFloat(1.0F, 0.56F, 0.56F, 0.56F); - } + int k = -1; + if (!this.state.activeSlot) { + k = ARGB.colorFromFloat(1.0F, 0.56F, 0.56F, 0.56F); + } - guiGraphics.blit(RenderType::guiTextured, resourceLocation, i + 3, j + 3, 0.0F, 0.0F, 74, 74, 74, 74, 74, 74, k); - if (bl && this.state.action != RealmsWorldSlotButton.Action.NOTHING) { - guiGraphics.blitSprite(RenderType::guiTextured, SLOT_FRAME_SPRITE, i, j, 80, 80); - } else if (this.state.isCurrentlyActiveSlot) { - guiGraphics.blitSprite(RenderType::guiTextured, SLOT_FRAME_SPRITE, i, j, 80, 80, ARGB.colorFromFloat(1.0F, 0.8F, 0.8F, 0.8F)); - } else { - guiGraphics.blitSprite(RenderType::guiTextured, SLOT_FRAME_SPRITE, i, j, 80, 80, ARGB.colorFromFloat(1.0F, 0.56F, 0.56F, 0.56F)); - } + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, resourceLocation, i + 1, j + 1, 0.0F, 0.0F, this.width - 2, this.height - 2, 74, 74, 74, 74, k); + if (bl && this.state.action != RealmsWorldSlotButton.Action.NOTHING) { + guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, SLOT_FRAME_SPRITE, i, j, this.width, this.height); + } else if (this.state.activeSlot) { + guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, SLOT_FRAME_SPRITE, i, j, this.width, this.height, ARGB.colorFromFloat(1.0F, 0.8F, 0.8F, 0.8F)); + } else { + guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, SLOT_FRAME_SPRITE, i, j, this.width, this.height, ARGB.colorFromFloat(1.0F, 0.56F, 0.56F, 0.56F)); + } - if (this.state.isCurrentlyActiveSlot) { - guiGraphics.blitSprite(RenderType::guiTextured, CHECKMARK_SPRITE, i + 67, j + 4, 9, 8); - } + if (this.state.hardcore) { + guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, RealmsMainScreen.HARDCORE_MODE_SPRITE, i + 3, j + 4, 9, 8); + } - if (this.state.hardcore) { - guiGraphics.blitSprite(RenderType::guiTextured, RealmsMainScreen.HARDCORE_MODE_SPRITE, i + 3, j + 4, 9, 8); - } + Font font = Minecraft.getInstance().font; + String string = this.state.slotName; + if (font.width(string) > 64) { + string = font.plainSubstrByWidth(string, 64 - font.width("...")) + "..."; + } - Font font = Minecraft.getInstance().font; - String string = this.state.slotName; - if (font.width(string) > 64) { - string = font.plainSubstrByWidth(string, 64 - font.width("...")) + "..."; - } - - guiGraphics.drawCenteredString(font, string, i + 40, j + 66, -1); + guiGraphics.drawCenteredString(font, string, i + this.width / 2, j + this.height - 14, -1); + if (this.state.activeSlot) { guiGraphics.drawCenteredString( - font, RealmsMainScreen.getVersionComponent(this.state.slotVersion, this.state.compatibility.isCompatible()), i + 40, j + 80 + 2, -1 + font, RealmsMainScreen.getVersionComponent(this.state.slotVersion, this.state.compatibility.isCompatible()), i + this.width / 2, j + this.height + 2, -1 ); } } @@ -139,13 +128,11 @@ public class RealmsWorldSlotButton extends Button { @Environment(EnvType.CLIENT) public static enum Action { NOTHING, - SWITCH_SLOT, - JOIN; + SWITCH_SLOT; } @Environment(EnvType.CLIENT) public static class State { - final boolean isCurrentlyActiveSlot; final String slotName; final String slotVersion; final RealmsServer.Compatibility compatibility; @@ -156,11 +143,11 @@ public class RealmsWorldSlotButton extends Button { public final boolean minigame; public final RealmsWorldSlotButton.Action action; public final boolean hardcore; + public final boolean activeSlot; public State(RealmsServer server, int slot) { this.minigame = slot == 4; if (this.minigame) { - this.isCurrentlyActiveSlot = server.isMinigameActive(); this.slotName = RealmsWorldSlotButton.MINIGAME.getString(); this.imageId = server.minigameId; this.image = server.minigameImage; @@ -168,19 +155,20 @@ public class RealmsWorldSlotButton extends Button { this.slotVersion = ""; this.compatibility = RealmsServer.Compatibility.UNVERIFIABLE; this.hardcore = false; + this.activeSlot = server.isMinigameActive(); } else { - RealmsWorldOptions realmsWorldOptions = (RealmsWorldOptions)server.slots.get(slot); - this.isCurrentlyActiveSlot = server.activeSlot == slot && !server.isMinigameActive(); - this.slotName = realmsWorldOptions.getSlotName(slot); - this.imageId = realmsWorldOptions.templateId; - this.image = realmsWorldOptions.templateImage; - this.empty = realmsWorldOptions.empty; - this.slotVersion = realmsWorldOptions.version; - this.compatibility = realmsWorldOptions.compatibility; - this.hardcore = realmsWorldOptions.hardcore; + RealmsSlot realmsSlot = (RealmsSlot)server.slots.get(slot); + this.slotName = realmsSlot.options.getSlotName(slot); + this.imageId = realmsSlot.options.templateId; + this.image = realmsSlot.options.templateImage; + this.empty = realmsSlot.options.empty; + this.slotVersion = realmsSlot.options.version; + this.compatibility = realmsSlot.options.compatibility; + this.hardcore = realmsSlot.isHardcore(); + this.activeSlot = server.activeSlot == slot && !server.isMinigameActive(); } - this.action = RealmsWorldSlotButton.getAction(server, this.isCurrentlyActiveSlot, this.minigame); + this.action = RealmsWorldSlotButton.getAction(server, this.minigame, this.activeSlot); } } } diff --git a/com/mojang/realmsclient/gui/screens/AddRealmPopupScreen.java b/com/mojang/realmsclient/gui/screens/AddRealmPopupScreen.java index 8045646a..0966336e 100644 --- a/com/mojang/realmsclient/gui/screens/AddRealmPopupScreen.java +++ b/com/mojang/realmsclient/gui/screens/AddRealmPopupScreen.java @@ -1,7 +1,5 @@ package com.mojang.realmsclient.gui.screens; -import com.mojang.blaze3d.pipeline.RenderTarget; -import com.mojang.blaze3d.systems.RenderSystem; import java.util.Collection; import java.util.List; import net.fabricmc.api.EnvType; @@ -14,7 +12,7 @@ import net.minecraft.client.gui.components.Tooltip; import net.minecraft.client.gui.components.WidgetSprites; import net.minecraft.client.gui.screens.ConfirmLinkScreen; import net.minecraft.client.gui.screens.Screen; -import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.RenderPipelines; import net.minecraft.network.chat.Component; import net.minecraft.realms.RealmsScreen; import net.minecraft.resources.ResourceLocation; @@ -31,11 +29,9 @@ public class AddRealmPopupScreen extends RealmsScreen { private static final WidgetSprites CROSS_BUTTON_SPRITES = new WidgetSprites( ResourceLocation.withDefaultNamespace("widget/cross_button"), ResourceLocation.withDefaultNamespace("widget/cross_button_highlighted") ); - private static final int BG_TEXTURE_WIDTH = 236; - private static final int BG_TEXTURE_HEIGHT = 34; - private static final int BG_BORDER_SIZE = 6; private static final int IMAGE_WIDTH = 195; private static final int IMAGE_HEIGHT = 152; + private static final int BG_BORDER_SIZE = 6; private static final int BUTTON_SPACING = 4; private static final int PADDING = 10; private static final int WIDTH = 320; @@ -115,26 +111,22 @@ public class AddRealmPopupScreen extends RealmsScreen { public static void renderDiamond(GuiGraphics guiGraphics, Button button) { int i = 8; - guiGraphics.pose().pushPose(); - guiGraphics.pose().translate(0.0F, 0.0F, 110.0F); guiGraphics.blitSprite( - RenderType::guiTextured, TRIAL_AVAILABLE_SPRITE, button.getX() + button.getWidth() - 8 - 4, button.getY() + button.getHeight() / 2 - 4, 8, 8 + RenderPipelines.GUI_TEXTURED, TRIAL_AVAILABLE_SPRITE, button.getX() + button.getWidth() - 8 - 4, button.getY() + button.getHeight() / 2 - 4, 8, 8 ); - guiGraphics.pose().popPose(); } @Override public void renderBackground(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTick) { + this.backgroundScreen.renderBackground(guiGraphics, -1, -1, partialTick); + guiGraphics.nextStratum(); this.backgroundScreen.render(guiGraphics, -1, -1, partialTick); - guiGraphics.flush(); - RenderTarget renderTarget = this.minecraft.getMainRenderTarget(); - RenderSystem.getDevice().createCommandEncoder().clearDepthTexture(renderTarget.getDepthTexture(), 1.0); - this.clearTooltipForNextRenderPass(); + guiGraphics.nextStratum(); this.renderTransparentBackground(guiGraphics); - guiGraphics.blitSprite(RenderType::guiTextured, BACKGROUND_SPRITE, this.left(), this.top(), 320, 172); + guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, BACKGROUND_SPRITE, this.left(), this.top(), 320, 172); if (!carouselImages.isEmpty()) { guiGraphics.blit( - RenderType::guiTextured, (ResourceLocation)carouselImages.get(this.carouselIndex), this.left() + 10, this.top() + 10, 0.0F, 0.0F, 195, 152, 195, 152 + RenderPipelines.GUI_TEXTURED, (ResourceLocation)carouselImages.get(this.carouselIndex), this.left() + 10, this.top() + 10, 0.0F, 0.0F, 195, 152, 195, 152 ); } } diff --git a/com/mojang/realmsclient/gui/screens/RealmsBrokenWorldScreen.java b/com/mojang/realmsclient/gui/screens/RealmsBrokenWorldScreen.java index 685b80e7..879142b2 100644 --- a/com/mojang/realmsclient/gui/screens/RealmsBrokenWorldScreen.java +++ b/com/mojang/realmsclient/gui/screens/RealmsBrokenWorldScreen.java @@ -5,12 +5,12 @@ import com.mojang.logging.LogUtils; import com.mojang.realmsclient.RealmsMainScreen; import com.mojang.realmsclient.client.RealmsClient; import com.mojang.realmsclient.dto.RealmsServer; -import com.mojang.realmsclient.dto.RealmsWorldOptions; +import com.mojang.realmsclient.dto.RealmsSlot; import com.mojang.realmsclient.dto.WorldDownload; -import com.mojang.realmsclient.dto.RealmsServer.State; import com.mojang.realmsclient.exception.RealmsServiceException; import com.mojang.realmsclient.gui.RealmsWorldSlotButton; import com.mojang.realmsclient.util.RealmsTextureManager; +import com.mojang.realmsclient.util.RealmsUtil; import com.mojang.realmsclient.util.task.OpenServerTask; import com.mojang.realmsclient.util.task.SwitchSlotTask; import java.util.Collection; @@ -23,7 +23,7 @@ import net.fabricmc.api.Environment; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.screens.Screen; -import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.RenderPipelines; import net.minecraft.network.chat.CommonComponents; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.ComponentUtils; @@ -75,7 +75,7 @@ public class RealmsBrokenWorldScreen extends RealmsScreen { } private void addButtons() { - for (Entry entry : this.serverData.slots.entrySet()) { + for (Entry entry : this.serverData.slots.entrySet()) { int i = (Integer)entry.getKey(); boolean bl = i != this.serverData.activeSlot || this.serverData.isMinigameActive(); Button button; @@ -87,7 +87,7 @@ public class RealmsBrokenWorldScreen extends RealmsScreen { ) .bounds(this.getFramePositionX(i), row(8), 80, 20) .build(); - button.active = !((RealmsWorldOptions)this.serverData.slots.get(i)).empty; + button.active = !((RealmsSlot)this.serverData.slots.get(i)).options.empty; } else { button = Button.builder( Component.translatable("mco.brokenworld.download"), @@ -124,8 +124,8 @@ public class RealmsBrokenWorldScreen extends RealmsScreen { } if (this.serverData != null) { - for (Entry entry : this.serverData.slots.entrySet()) { - if (((RealmsWorldOptions)entry.getValue()).templateImage != null && ((RealmsWorldOptions)entry.getValue()).templateId != -1L) { + for (Entry entry : this.serverData.slots.entrySet()) { + if (((RealmsSlot)entry.getValue()).options.templateImage != null && ((RealmsSlot)entry.getValue()).options.templateId != -1L) { this.drawSlotFrame( guiGraphics, this.getFramePositionX((Integer)entry.getKey()), @@ -133,11 +133,11 @@ public class RealmsBrokenWorldScreen extends RealmsScreen { mouseX, mouseY, this.serverData.activeSlot == (Integer)entry.getKey() && !this.isMinigame(), - ((RealmsWorldOptions)entry.getValue()).getSlotName((Integer)entry.getKey()), + ((RealmsSlot)entry.getValue()).options.getSlotName((Integer)entry.getKey()), (Integer)entry.getKey(), - ((RealmsWorldOptions)entry.getValue()).templateId, - ((RealmsWorldOptions)entry.getValue()).templateImage, - ((RealmsWorldOptions)entry.getValue()).empty + ((RealmsSlot)entry.getValue()).options.templateId, + ((RealmsSlot)entry.getValue()).options.templateImage, + ((RealmsSlot)entry.getValue()).options.empty ); } else { this.drawSlotFrame( @@ -147,11 +147,11 @@ public class RealmsBrokenWorldScreen extends RealmsScreen { mouseX, mouseY, this.serverData.activeSlot == (Integer)entry.getKey() && !this.isMinigame(), - ((RealmsWorldOptions)entry.getValue()).getSlotName((Integer)entry.getKey()), + ((RealmsSlot)entry.getValue()).options.getSlotName((Integer)entry.getKey()), (Integer)entry.getKey(), -1L, null, - ((RealmsWorldOptions)entry.getValue()).empty + ((RealmsSlot)entry.getValue()).options.empty ); } } @@ -162,25 +162,25 @@ public class RealmsBrokenWorldScreen extends RealmsScreen { return this.leftX + (index - 1) * 110; } - private void fetchServerData(long serverId) { - new Thread(() -> { - RealmsClient realmsClient = RealmsClient.getOrCreate(); + public Screen createErrorScreen(RealmsServiceException exception) { + return new RealmsGenericErrorScreen(exception, this.lastScreen); + } - try { - this.serverData = realmsClient.getOwnRealm(serverId); + private void fetchServerData(long serverId) { + RealmsUtil.supplyAsync( + realmsClient -> realmsClient.getOwnRealm(serverId), RealmsUtil.openScreenAndLogOnFailure(this::createErrorScreen, "Couldn't get own world") + ) + .thenAcceptAsync(realmsServer -> { + this.serverData = realmsServer; this.addButtons(); - } catch (RealmsServiceException var5) { - LOGGER.error("Couldn't get own world", (Throwable)var5); - this.minecraft.setScreen(new RealmsGenericErrorScreen(var5, this.lastScreen)); - } - }).start(); + }, this.minecraft); } public void doSwitchOrReset() { new Thread( () -> { RealmsClient realmsClient = RealmsClient.getOrCreate(); - if (this.serverData.state == State.CLOSED) { + if (this.serverData.state == RealmsServer.State.CLOSED) { this.minecraft .execute(() -> this.minecraft.setScreen(new RealmsLongRunningMcoTaskScreen(this, new OpenServerTask(this.serverData, this, true, this.minecraft)))); } else { @@ -189,7 +189,7 @@ public class RealmsBrokenWorldScreen extends RealmsScreen { this.minecraft.execute(() -> RealmsMainScreen.play(realmsServer, this)); } catch (RealmsServiceException var3) { LOGGER.error("Couldn't get own world", (Throwable)var3); - this.minecraft.execute(() -> this.minecraft.setScreen(this.lastScreen)); + this.minecraft.execute(() -> this.minecraft.setScreen(this.createErrorScreen(var3))); } } } @@ -259,12 +259,12 @@ public class RealmsBrokenWorldScreen extends RealmsScreen { if (isActiveNonMinigame) { float f = 0.9F + 0.1F * Mth.cos(this.animTick * 0.2F); - guiGraphics.blit(RenderType::guiTextured, resourceLocation, x + 3, y + 3, 0.0F, 0.0F, 74, 74, 74, 74, 74, 74, ARGB.colorFromFloat(1.0F, f, f, f)); - guiGraphics.blitSprite(RenderType::guiTextured, SLOT_FRAME_SPRITE, x, y, 80, 80); + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, resourceLocation, x + 3, y + 3, 0.0F, 0.0F, 74, 74, 74, 74, 74, 74, ARGB.colorFromFloat(1.0F, f, f, f)); + guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, SLOT_FRAME_SPRITE, x, y, 80, 80); } else { int i = ARGB.colorFromFloat(1.0F, 0.56F, 0.56F, 0.56F); - guiGraphics.blit(RenderType::guiTextured, resourceLocation, x + 3, y + 3, 0.0F, 0.0F, 74, 74, 74, 74, 74, 74, i); - guiGraphics.blitSprite(RenderType::guiTextured, SLOT_FRAME_SPRITE, x, y, 80, 80, i); + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, resourceLocation, x + 3, y + 3, 0.0F, 0.0F, 74, 74, 74, 74, 74, 74, i); + guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, SLOT_FRAME_SPRITE, x, y, 80, 80, i); } guiGraphics.drawCenteredString(this.font, text, x + 40, y + 66, -1); diff --git a/com/mojang/realmsclient/gui/screens/RealmsClientOutdatedScreen.java b/com/mojang/realmsclient/gui/screens/RealmsClientOutdatedScreen.java index dffbe8d7..66df996f 100644 --- a/com/mojang/realmsclient/gui/screens/RealmsClientOutdatedScreen.java +++ b/com/mojang/realmsclient/gui/screens/RealmsClientOutdatedScreen.java @@ -15,7 +15,7 @@ import net.minecraft.realms.RealmsScreen; @Environment(EnvType.CLIENT) public class RealmsClientOutdatedScreen extends RealmsScreen { private static final Component INCOMPATIBLE_TITLE = Component.translatable("mco.client.incompatible.title").withColor(-65536); - private static final Component INCOMPATIBLE_CLIENT_VERSION = Component.literal(SharedConstants.getCurrentVersion().getName()).withColor(-65536); + private static final Component INCOMPATIBLE_CLIENT_VERSION = Component.literal(SharedConstants.getCurrentVersion().name()).withColor(-65536); private static final Component UNSUPPORTED_SNAPSHOT_VERSION = Component.translatable("mco.client.unsupported.snapshot.version", INCOMPATIBLE_CLIENT_VERSION); private static final Component OUTDATED_STABLE_VERSION = Component.translatable("mco.client.outdated.stable.version", INCOMPATIBLE_CLIENT_VERSION); private final Screen lastScreen; @@ -48,6 +48,6 @@ public class RealmsClientOutdatedScreen extends RealmsScreen { } private Component getErrorMessage() { - return SharedConstants.getCurrentVersion().isStable() ? OUTDATED_STABLE_VERSION : UNSUPPORTED_SNAPSHOT_VERSION; + return SharedConstants.getCurrentVersion().stable() ? OUTDATED_STABLE_VERSION : UNSUPPORTED_SNAPSHOT_VERSION; } } diff --git a/com/mojang/realmsclient/gui/screens/RealmsConfigureWorldScreen.java b/com/mojang/realmsclient/gui/screens/RealmsConfigureWorldScreen.java deleted file mode 100644 index e2495370..00000000 --- a/com/mojang/realmsclient/gui/screens/RealmsConfigureWorldScreen.java +++ /dev/null @@ -1,470 +0,0 @@ -package com.mojang.realmsclient.gui.screens; - -import com.google.common.collect.Lists; -import com.mojang.logging.LogUtils; -import com.mojang.realmsclient.RealmsMainScreen; -import com.mojang.realmsclient.client.RealmsClient; -import com.mojang.realmsclient.dto.RealmsServer; -import com.mojang.realmsclient.dto.RealmsWorldOptions; -import com.mojang.realmsclient.dto.WorldTemplate; -import com.mojang.realmsclient.dto.RealmsServer.WorldType; -import com.mojang.realmsclient.dto.WorldTemplate.WorldTemplateType; -import com.mojang.realmsclient.exception.RealmsServiceException; -import com.mojang.realmsclient.gui.RealmsWorldSlotButton; -import com.mojang.realmsclient.gui.RealmsWorldSlotButton.State; -import com.mojang.realmsclient.util.task.CloseServerTask; -import com.mojang.realmsclient.util.task.OpenServerTask; -import com.mojang.realmsclient.util.task.SwitchMinigameTask; -import com.mojang.realmsclient.util.task.SwitchSlotTask; -import java.util.List; -import java.util.Objects; -import java.util.function.Supplier; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.client.gui.components.Button; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.network.chat.CommonComponents; -import net.minecraft.network.chat.Component; -import net.minecraft.realms.RealmsScreen; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.util.StringUtil; -import org.jetbrains.annotations.Nullable; -import org.slf4j.Logger; - -@Environment(EnvType.CLIENT) -public class RealmsConfigureWorldScreen extends RealmsScreen { - private static final ResourceLocation EXPIRED_SPRITE = ResourceLocation.withDefaultNamespace("realm_status/expired"); - private static final ResourceLocation EXPIRES_SOON_SPRITE = ResourceLocation.withDefaultNamespace("realm_status/expires_soon"); - private static final ResourceLocation OPEN_SPRITE = ResourceLocation.withDefaultNamespace("realm_status/open"); - private static final ResourceLocation CLOSED_SPRITE = ResourceLocation.withDefaultNamespace("realm_status/closed"); - private static final Logger LOGGER = LogUtils.getLogger(); - private static final Component WORLD_LIST_TITLE = Component.translatable("mco.configure.worlds.title"); - private static final Component TITLE = Component.translatable("mco.configure.world.title"); - private static final Component SERVER_EXPIRED_TOOLTIP = Component.translatable("mco.selectServer.expired"); - private static final Component SERVER_EXPIRING_SOON_TOOLTIP = Component.translatable("mco.selectServer.expires.soon"); - private static final Component SERVER_EXPIRING_IN_DAY_TOOLTIP = Component.translatable("mco.selectServer.expires.day"); - private static final Component SERVER_OPEN_TOOLTIP = Component.translatable("mco.selectServer.open"); - private static final Component SERVER_CLOSED_TOOLTIP = Component.translatable("mco.selectServer.closed"); - private static final int DEFAULT_BUTTON_WIDTH = 80; - private static final int DEFAULT_BUTTON_OFFSET = 5; - @Nullable - private Component toolTip; - private final RealmsMainScreen lastScreen; - @Nullable - private RealmsServer serverData; - private final long serverId; - private int leftX; - private int rightX; - private Button playersButton; - private Button settingsButton; - private Button subscriptionButton; - private Button optionsButton; - private Button backupButton; - private Button resetWorldButton; - private Button switchMinigameButton; - private boolean stateChanged; - private final List slotButtonList = Lists.newArrayList(); - - public RealmsConfigureWorldScreen(RealmsMainScreen lastScreen, long serverId) { - super(TITLE); - this.lastScreen = lastScreen; - this.serverId = serverId; - } - - @Override - public void init() { - if (this.serverData == null) { - this.fetchServerData(this.serverId); - } - - this.leftX = this.width / 2 - 187; - this.rightX = this.width / 2 + 190; - this.playersButton = this.addRenderableWidget( - Button.builder( - Component.translatable("mco.configure.world.buttons.players"), button -> this.minecraft.setScreen(new RealmsPlayerScreen(this, this.serverData)) - ) - .bounds(this.centerButton(0, 3), row(0), 100, 20) - .build() - ); - this.settingsButton = this.addRenderableWidget( - Button.builder( - Component.translatable("mco.configure.world.buttons.settings"), - button -> this.minecraft.setScreen(new RealmsSettingsScreen(this, this.serverData.clone())) - ) - .bounds(this.centerButton(1, 3), row(0), 100, 20) - .build() - ); - this.subscriptionButton = this.addRenderableWidget( - Button.builder( - Component.translatable("mco.configure.world.buttons.subscription"), - button -> this.minecraft.setScreen(new RealmsSubscriptionInfoScreen(this, this.serverData.clone(), this.lastScreen)) - ) - .bounds(this.centerButton(2, 3), row(0), 100, 20) - .build() - ); - this.slotButtonList.clear(); - - for (int i = 1; i < 5; i++) { - this.slotButtonList.add(this.addSlotButton(i)); - } - - this.switchMinigameButton = this.addRenderableWidget( - Button.builder( - Component.translatable("mco.configure.world.buttons.switchminigame"), - button -> this.minecraft - .setScreen( - new RealmsSelectWorldTemplateScreen(Component.translatable("mco.template.title.minigame"), this::templateSelectionCallback, WorldType.MINIGAME) - ) - ) - .bounds(this.leftButton(0), row(13) - 5, 100, 20) - .build() - ); - this.optionsButton = this.addRenderableWidget( - Button.builder( - Component.translatable("mco.configure.world.buttons.options"), - button -> this.minecraft - .setScreen( - new RealmsSlotOptionsScreen( - this, ((RealmsWorldOptions)this.serverData.slots.get(this.serverData.activeSlot)).clone(), this.serverData.worldType, this.serverData.activeSlot - ) - ) - ) - .bounds(this.leftButton(0), row(13) - 5, 90, 20) - .build() - ); - this.backupButton = this.addRenderableWidget( - Button.builder( - Component.translatable("mco.configure.world.backup"), - button -> this.minecraft.setScreen(new RealmsBackupScreen(this, this.serverData.clone(), this.serverData.activeSlot)) - ) - .bounds(this.leftButton(1), row(13) - 5, 90, 20) - .build() - ); - this.resetWorldButton = this.addRenderableWidget( - Button.builder( - Component.translatable("mco.configure.world.buttons.resetworld"), - button -> this.minecraft - .setScreen( - RealmsResetWorldScreen.forResetSlot(this, this.serverData.clone(), () -> this.minecraft.execute(() -> this.minecraft.setScreen(this.getNewScreen()))) - ) - ) - .bounds(this.leftButton(2), row(13) - 5, 90, 20) - .build() - ); - this.addRenderableWidget(Button.builder(CommonComponents.GUI_BACK, button -> this.onClose()).bounds(this.rightX - 80 + 8, row(13) - 5, 70, 20).build()); - this.backupButton.active = true; - if (this.serverData == null) { - this.hideMinigameButtons(); - this.hideRegularButtons(); - this.playersButton.active = false; - this.settingsButton.active = false; - this.subscriptionButton.active = false; - } else { - this.disableButtons(); - if (this.isMinigame()) { - this.hideRegularButtons(); - } else { - this.hideMinigameButtons(); - } - } - } - - private RealmsWorldSlotButton addSlotButton(int index) { - int i = this.frame(index); - int j = row(5) + 5; - RealmsWorldSlotButton realmsWorldSlotButton = new RealmsWorldSlotButton(i, j, 80, 80, index, button -> { - State state = ((RealmsWorldSlotButton)button).getState(); - if (state != null) { - switch (state.action) { - case NOTHING: - break; - case JOIN: - this.joinRealm(this.serverData); - break; - case SWITCH_SLOT: - if (state.minigame) { - this.switchToMinigame(); - } else if (state.empty) { - this.switchToEmptySlot(index, this.serverData); - } else { - this.switchToFullSlot(index, this.serverData); - } - break; - default: - throw new IllegalStateException("Unknown action " + state.action); - } - } - }); - if (this.serverData != null) { - realmsWorldSlotButton.setServerData(this.serverData); - } - - return this.addRenderableWidget(realmsWorldSlotButton); - } - - private int leftButton(int index) { - return this.leftX + index * 95; - } - - private int centerButton(int row, int column) { - return this.width / 2 - (column * 105 - 5) / 2 + row * 105; - } - - @Override - public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTick) { - super.render(guiGraphics, mouseX, mouseY, partialTick); - this.toolTip = null; - guiGraphics.drawCenteredString(this.font, WORLD_LIST_TITLE, this.width / 2, row(4), -1); - if (this.serverData == null) { - guiGraphics.drawCenteredString(this.font, this.title, this.width / 2, 17, -1); - } else { - String string = (String)Objects.requireNonNullElse(this.serverData.getName(), ""); - int i = this.font.width(string); - int j = this.serverData.state == com.mojang.realmsclient.dto.RealmsServer.State.CLOSED ? -6250336 : 8388479; - int k = this.font.width(this.title); - guiGraphics.drawCenteredString(this.font, this.title, this.width / 2, 12, -1); - guiGraphics.drawCenteredString(this.font, string, this.width / 2, 24, j); - int l = Math.min(this.centerButton(2, 3) + 80 - 11, this.width / 2 + i / 2 + k / 2 + 10); - this.drawServerStatus(guiGraphics, l, 7, mouseX, mouseY); - if (this.isMinigame()) { - String string2 = this.serverData.getMinigameName(); - if (string2 != null) { - guiGraphics.drawString(this.font, Component.translatable("mco.configure.world.minigame", string2), this.leftX + 80 + 20 + 10, row(13), -1); - } - } - } - } - - private int frame(int index) { - return this.leftX + (index - 1) * 98; - } - - @Override - public void onClose() { - this.minecraft.setScreen(this.lastScreen); - if (this.stateChanged) { - this.lastScreen.resetScreen(); - } - } - - public void fetchServerData(long serverId) { - new Thread(() -> { - RealmsClient realmsClient = RealmsClient.getOrCreate(); - - try { - RealmsServer realmsServer = realmsClient.getOwnRealm(serverId); - this.minecraft.execute(() -> { - this.serverData = realmsServer; - this.disableButtons(); - if (this.isMinigame()) { - this.show(this.switchMinigameButton); - } else { - this.show(this.optionsButton); - this.show(this.backupButton); - this.show(this.resetWorldButton); - } - - for (RealmsWorldSlotButton realmsWorldSlotButton : this.slotButtonList) { - realmsWorldSlotButton.setServerData(realmsServer); - } - }); - } catch (RealmsServiceException var5) { - LOGGER.error("Couldn't get own world", (Throwable)var5); - this.minecraft.execute(() -> this.minecraft.setScreen(new RealmsGenericErrorScreen(var5, this.lastScreen))); - } - }).start(); - } - - private void disableButtons() { - this.playersButton.active = !this.serverData.expired; - this.settingsButton.active = !this.serverData.expired; - this.subscriptionButton.active = true; - this.switchMinigameButton.active = !this.serverData.expired; - this.optionsButton.active = !this.serverData.expired; - this.resetWorldButton.active = !this.serverData.expired; - } - - private void joinRealm(RealmsServer server) { - if (this.serverData.state == com.mojang.realmsclient.dto.RealmsServer.State.OPEN) { - RealmsMainScreen.play(server, this); - } else { - this.openTheWorld(true); - } - } - - private void switchToMinigame() { - RealmsSelectWorldTemplateScreen realmsSelectWorldTemplateScreen = new RealmsSelectWorldTemplateScreen( - Component.translatable("mco.template.title.minigame"), this::templateSelectionCallback, WorldType.MINIGAME - ); - realmsSelectWorldTemplateScreen.setWarning(Component.translatable("mco.minigame.world.info.line1"), Component.translatable("mco.minigame.world.info.line2")); - this.minecraft.setScreen(realmsSelectWorldTemplateScreen); - } - - private void switchToFullSlot(int slot, RealmsServer server) { - this.minecraft - .setScreen( - RealmsPopups.infoPopupScreen( - this, - Component.translatable("mco.configure.world.slot.switch.question.line1"), - popupScreen -> { - this.stateChanged(); - this.minecraft - .setScreen( - new RealmsLongRunningMcoTaskScreen( - this.lastScreen, new SwitchSlotTask(server.id, slot, () -> this.minecraft.execute(() -> this.minecraft.setScreen(this.getNewScreen()))) - ) - ); - } - ) - ); - } - - private void switchToEmptySlot(int slot, RealmsServer server) { - this.minecraft - .setScreen( - RealmsPopups.infoPopupScreen( - this, - Component.translatable("mco.configure.world.slot.switch.question.line1"), - popupScreen -> { - this.stateChanged(); - RealmsResetWorldScreen realmsResetWorldScreen = RealmsResetWorldScreen.forEmptySlot( - this, slot, server, () -> this.minecraft.execute(() -> this.minecraft.setScreen(this.getNewScreen())) - ); - this.minecraft.setScreen(realmsResetWorldScreen); - } - ) - ); - } - - private void drawServerStatus(GuiGraphics guiGraphics, int x, int y, int mouseX, int mouseY) { - if (this.serverData.expired) { - this.drawRealmStatus(guiGraphics, x, y, mouseX, mouseY, EXPIRED_SPRITE, () -> SERVER_EXPIRED_TOOLTIP); - } else if (this.serverData.state == com.mojang.realmsclient.dto.RealmsServer.State.CLOSED) { - this.drawRealmStatus(guiGraphics, x, y, mouseX, mouseY, CLOSED_SPRITE, () -> SERVER_CLOSED_TOOLTIP); - } else if (this.serverData.state == com.mojang.realmsclient.dto.RealmsServer.State.OPEN) { - if (this.serverData.daysLeft < 7) { - this.drawRealmStatus( - guiGraphics, - x, - y, - mouseX, - mouseY, - EXPIRES_SOON_SPRITE, - () -> { - if (this.serverData.daysLeft <= 0) { - return SERVER_EXPIRING_SOON_TOOLTIP; - } else { - return (Component)(this.serverData.daysLeft == 1 - ? SERVER_EXPIRING_IN_DAY_TOOLTIP - : Component.translatable("mco.selectServer.expires.days", this.serverData.daysLeft)); - } - } - ); - } else { - this.drawRealmStatus(guiGraphics, x, y, mouseX, mouseY, OPEN_SPRITE, () -> SERVER_OPEN_TOOLTIP); - } - } - } - - private void drawRealmStatus(GuiGraphics guiGraphics, int x, int y, int mouseX, int mouseY, ResourceLocation sprite, Supplier tooltipSupplier) { - guiGraphics.blitSprite(RenderType::guiTextured, sprite, x, y, 10, 28); - if (mouseX >= x && mouseX <= x + 9 && mouseY >= y && mouseY <= y + 27) { - this.setTooltipForNextRenderPass((Component)tooltipSupplier.get()); - } - } - - private boolean isMinigame() { - return this.serverData != null && this.serverData.isMinigameActive(); - } - - private void hideRegularButtons() { - this.hide(this.optionsButton); - this.hide(this.backupButton); - this.hide(this.resetWorldButton); - } - - private void hide(Button button) { - button.visible = false; - } - - private void show(Button button) { - button.visible = true; - } - - private void hideMinigameButtons() { - this.hide(this.switchMinigameButton); - } - - public void saveSlotSettings(RealmsWorldOptions worldOptions) { - RealmsWorldOptions realmsWorldOptions = (RealmsWorldOptions)this.serverData.slots.get(this.serverData.activeSlot); - worldOptions.templateId = realmsWorldOptions.templateId; - worldOptions.templateImage = realmsWorldOptions.templateImage; - RealmsClient realmsClient = RealmsClient.getOrCreate(); - - try { - realmsClient.updateSlot(this.serverData.id, this.serverData.activeSlot, worldOptions); - this.serverData.slots.put(this.serverData.activeSlot, worldOptions); - if (realmsWorldOptions.gameMode != worldOptions.gameMode || realmsWorldOptions.hardcore != worldOptions.hardcore) { - RealmsMainScreen.refreshServerList(); - } - } catch (RealmsServiceException var5) { - LOGGER.error("Couldn't save slot settings", (Throwable)var5); - this.minecraft.setScreen(new RealmsGenericErrorScreen(var5, this)); - return; - } - - this.minecraft.setScreen(this); - } - - public void saveSettings(String key, String value) { - String string = StringUtil.isBlank(value) ? "" : value; - RealmsClient realmsClient = RealmsClient.getOrCreate(); - - try { - realmsClient.update(this.serverData.id, key, string); - this.serverData.setName(key); - this.serverData.setDescription(string); - this.stateChanged(); - } catch (RealmsServiceException var6) { - LOGGER.error("Couldn't save settings", (Throwable)var6); - this.minecraft.setScreen(new RealmsGenericErrorScreen(var6, this)); - return; - } - - this.minecraft.setScreen(this); - } - - public void openTheWorld(boolean join) { - RealmsConfigureWorldScreen realmsConfigureWorldScreen = this.getNewScreen(); - this.minecraft - .setScreen( - new RealmsLongRunningMcoTaskScreen(realmsConfigureWorldScreen, new OpenServerTask(this.serverData, realmsConfigureWorldScreen, join, this.minecraft)) - ); - } - - public void closeTheWorld() { - RealmsConfigureWorldScreen realmsConfigureWorldScreen = this.getNewScreen(); - this.minecraft.setScreen(new RealmsLongRunningMcoTaskScreen(realmsConfigureWorldScreen, new CloseServerTask(this.serverData, realmsConfigureWorldScreen))); - } - - public void stateChanged() { - this.stateChanged = true; - } - - private void templateSelectionCallback(@Nullable WorldTemplate worldTemplate) { - if (worldTemplate != null && WorldTemplateType.MINIGAME == worldTemplate.type) { - this.stateChanged(); - this.minecraft - .setScreen(new RealmsLongRunningMcoTaskScreen(this.lastScreen, new SwitchMinigameTask(this.serverData.id, worldTemplate, this.getNewScreen()))); - } else { - this.minecraft.setScreen(this); - } - } - - public RealmsConfigureWorldScreen getNewScreen() { - RealmsConfigureWorldScreen realmsConfigureWorldScreen = new RealmsConfigureWorldScreen(this.lastScreen, this.serverId); - realmsConfigureWorldScreen.stateChanged = this.stateChanged; - return realmsConfigureWorldScreen; - } -} diff --git a/com/mojang/realmsclient/gui/screens/RealmsCreateRealmScreen.java b/com/mojang/realmsclient/gui/screens/RealmsCreateRealmScreen.java index 78fecb6e..f6779d8c 100644 --- a/com/mojang/realmsclient/gui/screens/RealmsCreateRealmScreen.java +++ b/com/mojang/realmsclient/gui/screens/RealmsCreateRealmScreen.java @@ -35,10 +35,10 @@ public class RealmsCreateRealmScreen extends RealmsScreen { private EditBox descriptionBox; private final Runnable createWorldRunnable; - public RealmsCreateRealmScreen(RealmsMainScreen lastScreen, RealmsServer server, boolean isSnapshor) { + public RealmsCreateRealmScreen(RealmsMainScreen lastScreen, RealmsServer server, boolean isSnapshot) { super(CREATE_REALM_TEXT); this.lastScreen = lastScreen; - this.createWorldRunnable = () -> this.createWorld(server, isSnapshor); + this.createWorldRunnable = () -> this.createWorld(server, isSnapshot); } @Override diff --git a/com/mojang/realmsclient/gui/screens/RealmsDownloadLatestWorldScreen.java b/com/mojang/realmsclient/gui/screens/RealmsDownloadLatestWorldScreen.java index 9ee9a828..2352a7b3 100644 --- a/com/mojang/realmsclient/gui/screens/RealmsDownloadLatestWorldScreen.java +++ b/com/mojang/realmsclient/gui/screens/RealmsDownloadLatestWorldScreen.java @@ -104,7 +104,7 @@ public class RealmsDownloadLatestWorldScreen extends RealmsScreen { this.animTick++; if (this.status != null && this.narrationRateLimiter.tryAcquire(1)) { Component component = this.createProgressNarrationMessage(); - this.minecraft.getNarrator().sayNow(component); + this.minecraft.getNarrator().saySystemNow(component); } } diff --git a/com/mojang/realmsclient/gui/screens/RealmsLongRunningMcoConnectTaskScreen.java b/com/mojang/realmsclient/gui/screens/RealmsLongRunningMcoConnectTaskScreen.java new file mode 100644 index 00000000..86fe177c --- /dev/null +++ b/com/mojang/realmsclient/gui/screens/RealmsLongRunningMcoConnectTaskScreen.java @@ -0,0 +1,72 @@ +package com.mojang.realmsclient.gui.screens; + +import com.mojang.realmsclient.dto.RealmsJoinInformation; +import com.mojang.realmsclient.dto.ServiceQuality; +import com.mojang.realmsclient.util.task.LongRunningTask; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.client.gui.components.AbstractWidget; +import net.minecraft.client.gui.components.ImageWidget; +import net.minecraft.client.gui.components.StringWidget; +import net.minecraft.client.gui.layouts.FrameLayout; +import net.minecraft.client.gui.layouts.LayoutSettings; +import net.minecraft.client.gui.layouts.LinearLayout; +import net.minecraft.client.gui.navigation.ScreenRectangle; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; + +@Environment(EnvType.CLIENT) +public class RealmsLongRunningMcoConnectTaskScreen extends RealmsLongRunningMcoTaskScreen { + private final LongRunningTask task; + private final RealmsJoinInformation serverAddress; + private final LinearLayout footer = LinearLayout.vertical(); + + public RealmsLongRunningMcoConnectTaskScreen(Screen lastScreen, RealmsJoinInformation serverAddress, LongRunningTask task) { + super(lastScreen, task); + this.task = task; + this.serverAddress = serverAddress; + } + + @Override + public void init() { + super.init(); + if (this.serverAddress.regionData() != null && this.serverAddress.regionData().region() != null) { + LinearLayout linearLayout = LinearLayout.horizontal().spacing(10); + StringWidget stringWidget = new StringWidget( + Component.translatable("mco.connect.region", Component.translatable(this.serverAddress.regionData().region().translationKey)), this.font + ); + linearLayout.addChild(stringWidget); + ResourceLocation resourceLocation = this.serverAddress.regionData().serviceQuality() != null + ? this.serverAddress.regionData().serviceQuality().getIcon() + : ServiceQuality.UNKNOWN.getIcon(); + linearLayout.addChild(ImageWidget.sprite(10, 8, resourceLocation), LayoutSettings::alignVerticallyTop); + this.footer.addChild(linearLayout, layoutSettings -> layoutSettings.paddingTop(40)); + this.footer.visitWidgets(guiEventListener -> { + AbstractWidget var10000 = this.addRenderableWidget(guiEventListener); + }); + this.repositionElements(); + } + } + + @Override + protected void repositionElements() { + super.repositionElements(); + int i = this.layout.getY() + this.layout.getHeight(); + ScreenRectangle screenRectangle = new ScreenRectangle(0, i, this.width, this.height - i); + this.footer.arrangeElements(); + FrameLayout.alignInRectangle(this.footer, screenRectangle, 0.5F, 0.0F); + } + + @Override + public void tick() { + super.tick(); + this.task.tick(); + } + + @Override + protected void cancel() { + this.task.abortTask(); + super.cancel(); + } +} diff --git a/com/mojang/realmsclient/gui/screens/RealmsLongRunningMcoTaskScreen.java b/com/mojang/realmsclient/gui/screens/RealmsLongRunningMcoTaskScreen.java index 248c4592..f6a9a6c6 100644 --- a/com/mojang/realmsclient/gui/screens/RealmsLongRunningMcoTaskScreen.java +++ b/com/mojang/realmsclient/gui/screens/RealmsLongRunningMcoTaskScreen.java @@ -27,7 +27,7 @@ public class RealmsLongRunningMcoTaskScreen extends RealmsScreen { private static final RepeatedNarrator REPEATED_NARRATOR = new RepeatedNarrator(Duration.ofSeconds(5L)); private final List queuedTasks; private final Screen lastScreen; - private final LinearLayout layout = LinearLayout.vertical(); + protected final LinearLayout layout = LinearLayout.vertical(); private volatile Component title; @Nullable private LoadingDotsWidget loadingDotsWidget; @@ -80,8 +80,9 @@ public class RealmsLongRunningMcoTaskScreen extends RealmsScreen { @Override public void init() { this.layout.defaultCellSetting().alignHorizontallyCenter(); + this.layout.addChild(realmsLogo()); this.loadingDotsWidget = new LoadingDotsWidget(this.font, this.title); - this.layout.addChild(this.loadingDotsWidget, layoutSettings -> layoutSettings.paddingBottom(30)); + this.layout.addChild(this.loadingDotsWidget, layoutSettings -> layoutSettings.paddingTop(10).paddingBottom(30)); this.layout.addChild(Button.builder(CommonComponents.GUI_CANCEL, button -> this.cancel()).build()); this.layout.visitWidgets(guiEventListener -> { AbstractWidget var10000 = this.addRenderableWidget(guiEventListener); diff --git a/com/mojang/realmsclient/gui/screens/RealmsLongRunningMcoTickTaskScreen.java b/com/mojang/realmsclient/gui/screens/RealmsLongRunningMcoTickTaskScreen.java deleted file mode 100644 index 756af064..00000000 --- a/com/mojang/realmsclient/gui/screens/RealmsLongRunningMcoTickTaskScreen.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.mojang.realmsclient.gui.screens; - -import com.mojang.realmsclient.util.task.LongRunningTask; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.client.gui.screens.Screen; - -@Environment(EnvType.CLIENT) -public class RealmsLongRunningMcoTickTaskScreen extends RealmsLongRunningMcoTaskScreen { - private final LongRunningTask task; - - public RealmsLongRunningMcoTickTaskScreen(Screen lastScreen, LongRunningTask task) { - super(lastScreen, task); - this.task = task; - } - - @Override - public void tick() { - super.tick(); - this.task.tick(); - } - - @Override - protected void cancel() { - this.task.abortTask(); - super.cancel(); - } -} diff --git a/com/mojang/realmsclient/gui/screens/RealmsNotificationsScreen.java b/com/mojang/realmsclient/gui/screens/RealmsNotificationsScreen.java index 1511eb4a..ffbda3ac 100644 --- a/com/mojang/realmsclient/gui/screens/RealmsNotificationsScreen.java +++ b/com/mojang/realmsclient/gui/screens/RealmsNotificationsScreen.java @@ -3,7 +3,7 @@ package com.mojang.realmsclient.gui.screens; import com.mojang.realmsclient.RealmsAvailability; import com.mojang.realmsclient.dto.RealmsNotification; import com.mojang.realmsclient.gui.RealmsDataFetcher; -import com.mojang.realmsclient.gui.task.DataFetcher.Subscription; +import com.mojang.realmsclient.gui.task.DataFetcher; import java.util.Objects; import java.util.concurrent.CompletableFuture; import net.fabricmc.api.EnvType; @@ -11,7 +11,7 @@ import net.fabricmc.api.Environment; import net.minecraft.client.GameNarrator; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.screens.TitleScreen; -import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.RenderPipelines; import net.minecraft.realms.RealmsScreen; import net.minecraft.resources.ResourceLocation; import org.jetbrains.annotations.Nullable; @@ -24,7 +24,7 @@ public class RealmsNotificationsScreen extends RealmsScreen { private static final ResourceLocation TRIAL_AVAILABLE_SPRITE = ResourceLocation.withDefaultNamespace("icon/trial_available"); private final CompletableFuture validClient = RealmsAvailability.get().thenApply(result -> result.type() == RealmsAvailability.Type.SUCCESS); @Nullable - private Subscription realmsDataSubscription; + private DataFetcher.Subscription realmsDataSubscription; @Nullable private RealmsNotificationsScreen.DataFetcherConfiguration currentConfiguration; private volatile int numberOfPendingInvites; @@ -33,8 +33,8 @@ public class RealmsNotificationsScreen extends RealmsScreen { private static boolean hasUnseenNotifications; private final RealmsNotificationsScreen.DataFetcherConfiguration showAll = new RealmsNotificationsScreen.DataFetcherConfiguration() { @Override - public Subscription initDataFetcher(RealmsDataFetcher dataFetcher) { - Subscription subscription = dataFetcher.dataFetcher.createSubscription(); + public DataFetcher.Subscription initDataFetcher(RealmsDataFetcher dataFetcher) { + DataFetcher.Subscription subscription = dataFetcher.dataFetcher.createSubscription(); RealmsNotificationsScreen.this.addNewsAndInvitesSubscriptions(dataFetcher, subscription); RealmsNotificationsScreen.this.addNotificationsSubscriptions(dataFetcher, subscription); return subscription; @@ -47,8 +47,8 @@ public class RealmsNotificationsScreen extends RealmsScreen { }; private final RealmsNotificationsScreen.DataFetcherConfiguration onlyNotifications = new RealmsNotificationsScreen.DataFetcherConfiguration() { @Override - public Subscription initDataFetcher(RealmsDataFetcher dataFetcher) { - Subscription subscription = dataFetcher.dataFetcher.createSubscription(); + public DataFetcher.Subscription initDataFetcher(RealmsDataFetcher dataFetcher) { + DataFetcher.Subscription subscription = dataFetcher.dataFetcher.createSubscription(); RealmsNotificationsScreen.this.addNotificationsSubscriptions(dataFetcher, subscription); return subscription; } @@ -131,28 +131,28 @@ public class RealmsNotificationsScreen extends RealmsScreen { int m = k + 48 + 2; int n = l - 3; if (hasUnseenNotifications) { - guiGraphics.blitSprite(RenderType::guiTextured, UNSEEN_NOTIFICATION_SPRITE, n - 12, m + 3, 10, 10); + guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, UNSEEN_NOTIFICATION_SPRITE, n - 12, m + 3, 10, 10); n -= 16; } if (this.currentConfiguration != null && this.currentConfiguration.showOldNotifications()) { if (hasUnreadNews) { - guiGraphics.blitSprite(RenderType::guiTextured, NEWS_SPRITE, n - 14, m + 1, 14, 14); + guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, NEWS_SPRITE, n - 14, m + 1, 14, 14); n -= 16; } if (i != 0) { - guiGraphics.blitSprite(RenderType::guiTextured, INVITE_SPRITE, n - 14, m + 1, 14, 14); + guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, INVITE_SPRITE, n - 14, m + 1, 14, 14); n -= 16; } if (trialAvailable) { - guiGraphics.blitSprite(RenderType::guiTextured, TRIAL_AVAILABLE_SPRITE, n - 10, m + 4, 8, 8); + guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, TRIAL_AVAILABLE_SPRITE, n - 10, m + 4, 8, 8); } } } - void addNewsAndInvitesSubscriptions(RealmsDataFetcher dataFetcher, Subscription subscription) { + void addNewsAndInvitesSubscriptions(RealmsDataFetcher dataFetcher, DataFetcher.Subscription subscription) { subscription.subscribe(dataFetcher.pendingInvitesTask, integer -> this.numberOfPendingInvites = integer); subscription.subscribe(dataFetcher.trialAvailabilityTask, boolean_ -> trialAvailable = boolean_); subscription.subscribe(dataFetcher.newsTask, realmsNews -> { @@ -161,7 +161,7 @@ public class RealmsNotificationsScreen extends RealmsScreen { }); } - void addNotificationsSubscriptions(RealmsDataFetcher dataFetcher, Subscription subscription) { + void addNotificationsSubscriptions(RealmsDataFetcher dataFetcher, DataFetcher.Subscription subscription) { subscription.subscribe(dataFetcher.notificationsTask, list -> { hasUnseenNotifications = false; @@ -176,7 +176,7 @@ public class RealmsNotificationsScreen extends RealmsScreen { @Environment(EnvType.CLIENT) interface DataFetcherConfiguration { - Subscription initDataFetcher(RealmsDataFetcher dataFetcher); + DataFetcher.Subscription initDataFetcher(RealmsDataFetcher dataFetcher); boolean showOldNotifications(); } diff --git a/com/mojang/realmsclient/gui/screens/RealmsPendingInvitesScreen.java b/com/mojang/realmsclient/gui/screens/RealmsPendingInvitesScreen.java index bb1ef1c5..5d1fc970 100644 --- a/com/mojang/realmsclient/gui/screens/RealmsPendingInvitesScreen.java +++ b/com/mojang/realmsclient/gui/screens/RealmsPendingInvitesScreen.java @@ -7,8 +7,6 @@ import com.mojang.realmsclient.dto.PendingInvite; import com.mojang.realmsclient.exception.RealmsServiceException; import com.mojang.realmsclient.gui.RealmsDataFetcher; import com.mojang.realmsclient.gui.RowButton; -import com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen.Entry.AcceptRowButton; -import com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen.Entry.RejectRowButton; import com.mojang.realmsclient.util.RealmsUtil; import java.util.Arrays; import java.util.List; @@ -21,6 +19,7 @@ import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.components.ObjectSelectionList; import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.renderer.RenderPipelines; import net.minecraft.network.chat.CommonComponents; import net.minecraft.network.chat.Component; import net.minecraft.realms.RealmsScreen; @@ -66,7 +65,7 @@ public class RealmsPendingInvitesScreen extends RealmsScreen { List list2 = list.stream().map(pendingInvite -> new RealmsPendingInvitesScreen.Entry(pendingInvite)).toList(); this.pendingInvitationSelectionList.replaceEntries(list2); if (list2.isEmpty()) { - this.minecraft.getNarrator().say(NO_PENDING_INVITES_TEXT); + this.minecraft.getNarrator().saySystemQueued(NO_PENDING_INVITES_TEXT); } }, this.screenExecutor); this.addRenderableWidget(this.pendingInvitationSelectionList); @@ -122,13 +121,13 @@ public class RealmsPendingInvitesScreen extends RealmsScreen { this.toolTip = null; super.render(guiGraphics, mouseX, mouseY, partialTick); guiGraphics.drawCenteredString(this.font, this.title, this.width / 2, 12, -1); - if (this.toolTip != null) { - guiGraphics.renderTooltip(this.font, this.toolTip, mouseX, mouseY); - } - if (this.pendingInvites.isDone() && this.pendingInvitationSelectionList.hasPendingInvites()) { guiGraphics.drawCenteredString(this.font, NO_PENDING_INVITES_TEXT, this.width / 2, this.height / 2 - 20, -1); } + + if (this.toolTip != null) { + guiGraphics.setTooltipForNextFrame(this.font, this.toolTip, mouseX, mouseY); + } } void updateButtonStates() { @@ -145,7 +144,7 @@ public class RealmsPendingInvitesScreen extends RealmsScreen { Entry(final PendingInvite pendingInvite) { this.pendingInvite = pendingInvite; - this.rowButtons = Arrays.asList(new AcceptRowButton(this), new RejectRowButton(this)); + this.rowButtons = Arrays.asList(new RealmsPendingInvitesScreen.Entry.AcceptRowButton(), new RealmsPendingInvitesScreen.Entry.RejectRowButton()); } @Override @@ -161,8 +160,8 @@ public class RealmsPendingInvitesScreen extends RealmsScreen { private void renderPendingInvitationItem(GuiGraphics guiGraphics, PendingInvite pendingInvite, int x, int y, int mouseX, int mouseY) { guiGraphics.drawString(RealmsPendingInvitesScreen.this.font, pendingInvite.realmName, x + 38, y + 1, -1); - guiGraphics.drawString(RealmsPendingInvitesScreen.this.font, pendingInvite.realmOwnerName, x + 38, y + 12, 7105644); - guiGraphics.drawString(RealmsPendingInvitesScreen.this.font, RealmsUtil.convertToAgePresentationFromInstant(pendingInvite.date), x + 38, y + 24, 7105644); + guiGraphics.drawString(RealmsPendingInvitesScreen.this.font, pendingInvite.realmOwnerName, x + 38, y + 12, -9671572); + guiGraphics.drawString(RealmsPendingInvitesScreen.this.font, RealmsUtil.convertToAgePresentationFromInstant(pendingInvite.date), x + 38, y + 24, -9671572); RowButton.drawButtonsInRow(guiGraphics, this.rowButtons, RealmsPendingInvitesScreen.this.pendingInvitationSelectionList, x, y, mouseX, mouseY); RealmsUtil.renderPlayerFace(guiGraphics, x, y, 32, pendingInvite.realmOwnerUuid); } @@ -176,6 +175,50 @@ public class RealmsPendingInvitesScreen extends RealmsScreen { ); return Component.translatable("narrator.select", component); } + + @Environment(EnvType.CLIENT) + class AcceptRowButton extends RowButton { + AcceptRowButton() { + super(15, 15, 215, 5); + } + + @Override + protected void draw(GuiGraphics guiGraphics, int x, int y, boolean showTooltip) { + guiGraphics.blitSprite( + RenderPipelines.GUI_TEXTURED, showTooltip ? RealmsPendingInvitesScreen.ACCEPT_HIGHLIGHTED_SPRITE : RealmsPendingInvitesScreen.ACCEPT_SPRITE, x, y, 18, 18 + ); + if (showTooltip) { + RealmsPendingInvitesScreen.this.toolTip = RealmsPendingInvitesScreen.ACCEPT_INVITE; + } + } + + @Override + public void onClick(int index) { + RealmsPendingInvitesScreen.this.handleInvitation(true); + } + } + + @Environment(EnvType.CLIENT) + class RejectRowButton extends RowButton { + RejectRowButton() { + super(15, 15, 235, 5); + } + + @Override + protected void draw(GuiGraphics guiGraphics, int x, int y, boolean showTooltip) { + guiGraphics.blitSprite( + RenderPipelines.GUI_TEXTURED, showTooltip ? RealmsPendingInvitesScreen.REJECT_HIGHLIGHTED_SPRITE : RealmsPendingInvitesScreen.REJECT_SPRITE, x, y, 18, 18 + ); + if (showTooltip) { + RealmsPendingInvitesScreen.this.toolTip = RealmsPendingInvitesScreen.REJECT_INVITE; + } + } + + @Override + public void onClick(int index) { + RealmsPendingInvitesScreen.this.handleInvitation(false); + } + } } @Environment(EnvType.CLIENT) diff --git a/com/mojang/realmsclient/gui/screens/RealmsPopups.java b/com/mojang/realmsclient/gui/screens/RealmsPopups.java index 849e974f..b27a1fd9 100644 --- a/com/mojang/realmsclient/gui/screens/RealmsPopups.java +++ b/com/mojang/realmsclient/gui/screens/RealmsPopups.java @@ -14,6 +14,14 @@ public class RealmsPopups { private static final Component INFO = Component.translatable("mco.info").withColor(8226750); private static final Component WARNING = Component.translatable("mco.warning").withColor(-65536); + public static PopupScreen customPopupScreen(Screen backgroundScreen, Component title, Component message, Consumer onContinue) { + return new PopupScreen.Builder(backgroundScreen, title) + .setMessage(message) + .addButton(CommonComponents.GUI_CONTINUE, onContinue) + .addButton(CommonComponents.GUI_CANCEL, PopupScreen::onClose) + .build(); + } + public static PopupScreen infoPopupScreen(Screen backgroundScreen, Component message, Consumer onContinue) { return new PopupScreen.Builder(backgroundScreen, INFO) .setMessage(message) diff --git a/com/mojang/realmsclient/gui/screens/RealmsResetWorldScreen.java b/com/mojang/realmsclient/gui/screens/RealmsResetWorldScreen.java index c1b7447d..2649fe41 100644 --- a/com/mojang/realmsclient/gui/screens/RealmsResetWorldScreen.java +++ b/com/mojang/realmsclient/gui/screens/RealmsResetWorldScreen.java @@ -7,7 +7,6 @@ import com.mojang.realmsclient.client.worldupload.RealmsCreateWorldFlow; import com.mojang.realmsclient.dto.RealmsServer; import com.mojang.realmsclient.dto.WorldTemplate; import com.mojang.realmsclient.dto.WorldTemplatePaginatedList; -import com.mojang.realmsclient.dto.RealmsServer.WorldType; import com.mojang.realmsclient.exception.RealmsServiceException; import com.mojang.realmsclient.util.task.LongRunningTask; import com.mojang.realmsclient.util.task.RealmCreationTask; @@ -22,15 +21,13 @@ import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.AbstractWidget; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.components.StringWidget; -import net.minecraft.client.gui.components.Button.OnPress; import net.minecraft.client.gui.layouts.GridLayout; import net.minecraft.client.gui.layouts.HeaderAndFooterLayout; import net.minecraft.client.gui.layouts.LayoutSettings; import net.minecraft.client.gui.layouts.LinearLayout; import net.minecraft.client.gui.layouts.SpacerElement; -import net.minecraft.client.gui.layouts.GridLayout.RowHelper; import net.minecraft.client.gui.screens.Screen; -import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.RenderPipelines; import net.minecraft.network.chat.CommonComponents; import net.minecraft.network.chat.Component; import net.minecraft.realms.RealmsScreen; @@ -148,10 +145,10 @@ public class RealmsResetWorldScreen extends RealmsScreen { RealmsClient realmsClient = RealmsClient.getOrCreate(); try { - WorldTemplatePaginatedList worldTemplatePaginatedList = realmsClient.fetchWorldTemplates(1, 10, WorldType.NORMAL); - WorldTemplatePaginatedList worldTemplatePaginatedList2 = realmsClient.fetchWorldTemplates(1, 10, WorldType.ADVENTUREMAP); - WorldTemplatePaginatedList worldTemplatePaginatedList3 = realmsClient.fetchWorldTemplates(1, 10, WorldType.EXPERIENCE); - WorldTemplatePaginatedList worldTemplatePaginatedList4 = realmsClient.fetchWorldTemplates(1, 10, WorldType.INSPIRATION); + WorldTemplatePaginatedList worldTemplatePaginatedList = realmsClient.fetchWorldTemplates(1, 10, RealmsServer.WorldType.NORMAL); + WorldTemplatePaginatedList worldTemplatePaginatedList2 = realmsClient.fetchWorldTemplates(1, 10, RealmsServer.WorldType.ADVENTUREMAP); + WorldTemplatePaginatedList worldTemplatePaginatedList3 = realmsClient.fetchWorldTemplates(1, 10, RealmsServer.WorldType.EXPERIENCE); + WorldTemplatePaginatedList worldTemplatePaginatedList4 = realmsClient.fetchWorldTemplates(1, 10, RealmsServer.WorldType.INSPIRATION); RealmsResetWorldScreen.this.minecraft.execute(() -> { RealmsResetWorldScreen.this.templates = worldTemplatePaginatedList; RealmsResetWorldScreen.this.adventuremaps = worldTemplatePaginatedList2; @@ -164,7 +161,7 @@ public class RealmsResetWorldScreen extends RealmsScreen { } }).start(); GridLayout gridLayout = this.layout.addToContents(new GridLayout()); - RowHelper rowHelper = gridLayout.createRowHelper(3); + GridLayout.RowHelper rowHelper = gridLayout.createRowHelper(3); rowHelper.defaultCellSetting().paddingHorizontal(16); rowHelper.addChild( new RealmsResetWorldScreen.FrameButton( @@ -188,7 +185,7 @@ public class RealmsResetWorldScreen extends RealmsScreen { WORLD_TEMPLATES_TITLE, SURVIVAL_SPAWN_LOCATION, button -> this.minecraft - .setScreen(new RealmsSelectWorldTemplateScreen(WORLD_TEMPLATES_TITLE, this::templateSelectionCallback, WorldType.NORMAL, this.templates)) + .setScreen(new RealmsSelectWorldTemplateScreen(WORLD_TEMPLATES_TITLE, this::templateSelectionCallback, RealmsServer.WorldType.NORMAL, this.templates)) ) ); rowHelper.addChild(SpacerElement.height(16), 3); @@ -198,7 +195,7 @@ public class RealmsResetWorldScreen extends RealmsScreen { ADVENTURES_TITLE, ADVENTURE_MAP_LOCATION, button -> this.minecraft - .setScreen(new RealmsSelectWorldTemplateScreen(ADVENTURES_TITLE, this::templateSelectionCallback, WorldType.ADVENTUREMAP, this.adventuremaps)) + .setScreen(new RealmsSelectWorldTemplateScreen(ADVENTURES_TITLE, this::templateSelectionCallback, RealmsServer.WorldType.ADVENTUREMAP, this.adventuremaps)) ) ); rowHelper.addChild( @@ -207,7 +204,7 @@ public class RealmsResetWorldScreen extends RealmsScreen { EXPERIENCES_TITLE, EXPERIENCE_LOCATION, button -> this.minecraft - .setScreen(new RealmsSelectWorldTemplateScreen(EXPERIENCES_TITLE, this::templateSelectionCallback, WorldType.EXPERIENCE, this.experiences)) + .setScreen(new RealmsSelectWorldTemplateScreen(EXPERIENCES_TITLE, this::templateSelectionCallback, RealmsServer.WorldType.EXPERIENCE, this.experiences)) ) ); rowHelper.addChild( @@ -216,7 +213,7 @@ public class RealmsResetWorldScreen extends RealmsScreen { INSPIRATION_TITLE, INSPIRATION_LOCATION, button -> this.minecraft - .setScreen(new RealmsSelectWorldTemplateScreen(INSPIRATION_TITLE, this::templateSelectionCallback, WorldType.INSPIRATION, this.inspirations)) + .setScreen(new RealmsSelectWorldTemplateScreen(INSPIRATION_TITLE, this::templateSelectionCallback, RealmsServer.WorldType.INSPIRATION, this.inspirations)) ) ); this.layout.addToFooter(Button.builder(CommonComponents.GUI_BACK, button -> this.onClose()).build()); @@ -272,7 +269,7 @@ public class RealmsResetWorldScreen extends RealmsScreen { private static final int IMAGE_SIZE = 56; private final ResourceLocation image; - FrameButton(final Font font, final Component message, final ResourceLocation image, final OnPress onPress) { + FrameButton(final Font font, final Component message, final ResourceLocation image, final Button.OnPress onPress) { super(0, 0, 60, 60 + 9, message, onPress, DEFAULT_NARRATION); this.image = image; } @@ -287,8 +284,8 @@ public class RealmsResetWorldScreen extends RealmsScreen { int j = this.getX(); int k = this.getY(); - guiGraphics.blit(RenderType::guiTextured, this.image, j + 2, k + 2, 0.0F, 0.0F, 56, 56, 56, 56, 56, 56, i); - guiGraphics.blitSprite(RenderType::guiTextured, SLOT_FRAME_SPRITE, j, k, 60, 60, i); + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, this.image, j + 2, k + 2, 0.0F, 0.0F, 56, 56, 56, 56, 56, 56, i); + guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, SLOT_FRAME_SPRITE, j, k, 60, 60, i); int l = bl ? -6250336 : -1; guiGraphics.drawCenteredString(RealmsResetWorldScreen.this.font, this.getMessage(), j + 28, k - 14, l); } diff --git a/com/mojang/realmsclient/gui/screens/RealmsSelectFileToUploadScreen.java b/com/mojang/realmsclient/gui/screens/RealmsSelectFileToUploadScreen.java index 25e917ad..212743cc 100644 --- a/com/mojang/realmsclient/gui/screens/RealmsSelectFileToUploadScreen.java +++ b/com/mojang/realmsclient/gui/screens/RealmsSelectFileToUploadScreen.java @@ -186,9 +186,9 @@ public class RealmsSelectFileToUploadScreen extends RealmsScreen { this.addEntry(RealmsSelectFileToUploadScreen.this.new Entry(levelSummary)); } - public void setSelected(@Nullable RealmsSelectFileToUploadScreen.Entry entry) { - super.setSelected(entry); - RealmsSelectFileToUploadScreen.this.selectedWorld = this.children().indexOf(entry); + public void setSelected(@Nullable RealmsSelectFileToUploadScreen.Entry selected) { + super.setSelected(selected); + RealmsSelectFileToUploadScreen.this.selectedWorld = this.children().indexOf(selected); RealmsSelectFileToUploadScreen.this.uploadButton.active = RealmsSelectFileToUploadScreen.this.selectedWorld >= 0 && RealmsSelectFileToUploadScreen.this.selectedWorld < this.getItemCount(); } diff --git a/com/mojang/realmsclient/gui/screens/RealmsSelectWorldTemplateScreen.java b/com/mojang/realmsclient/gui/screens/RealmsSelectWorldTemplateScreen.java index 70b46687..a6502f07 100644 --- a/com/mojang/realmsclient/gui/screens/RealmsSelectWorldTemplateScreen.java +++ b/com/mojang/realmsclient/gui/screens/RealmsSelectWorldTemplateScreen.java @@ -4,14 +4,12 @@ import com.google.common.collect.Lists; import com.mojang.datafixers.util.Either; import com.mojang.logging.LogUtils; import com.mojang.realmsclient.client.RealmsClient; +import com.mojang.realmsclient.dto.RealmsServer; import com.mojang.realmsclient.dto.WorldTemplate; import com.mojang.realmsclient.dto.WorldTemplatePaginatedList; -import com.mojang.realmsclient.dto.RealmsServer.WorldType; import com.mojang.realmsclient.exception.RealmsServiceException; import com.mojang.realmsclient.util.RealmsTextureManager; import com.mojang.realmsclient.util.TextRenderingUtils; -import com.mojang.realmsclient.util.TextRenderingUtils.Line; -import com.mojang.realmsclient.util.TextRenderingUtils.LineSegment; import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -31,7 +29,7 @@ import net.minecraft.client.gui.components.WidgetSprites; import net.minecraft.client.gui.layouts.HeaderAndFooterLayout; import net.minecraft.client.gui.layouts.LinearLayout; import net.minecraft.client.gui.screens.ConfirmLinkScreen; -import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.RenderPipelines; import net.minecraft.client.resources.language.I18n; import net.minecraft.network.chat.CommonComponents; import net.minecraft.network.chat.Component; @@ -53,7 +51,7 @@ public class RealmsSelectWorldTemplateScreen extends RealmsScreen { private final HeaderAndFooterLayout layout = new HeaderAndFooterLayout(this); final Consumer callback; RealmsSelectWorldTemplateScreen.WorldTemplateList worldTemplateList; - private final WorldType worldType; + private final RealmsServer.WorldType worldType; private Button selectButton; private Button trailerButton; private Button publisherButton; @@ -64,14 +62,14 @@ public class RealmsSelectWorldTemplateScreen extends RealmsScreen { @Nullable private Component[] warning; @Nullable - List noTemplatesMessage; + List noTemplatesMessage; - public RealmsSelectWorldTemplateScreen(Component title, Consumer callback, WorldType worldType) { + public RealmsSelectWorldTemplateScreen(Component title, Consumer callback, RealmsServer.WorldType worldType) { this(title, callback, worldType, null); } public RealmsSelectWorldTemplateScreen( - Component title, Consumer callback, WorldType worldType, @Nullable WorldTemplatePaginatedList worldTemplatePaginatedList + Component title, Consumer callback, RealmsServer.WorldType worldType, @Nullable WorldTemplatePaginatedList worldTemplatePaginatedList ) { super(title); this.callback = callback; @@ -154,43 +152,50 @@ public class RealmsSelectWorldTemplateScreen extends RealmsScreen { private void fetchTemplatesAsync(WorldTemplatePaginatedList output) { (new Thread("realms-template-fetcher") { - public void run() { - WorldTemplatePaginatedList worldTemplatePaginatedList = output; - RealmsClient realmsClient = RealmsClient.getOrCreate(); + public void run() { + WorldTemplatePaginatedList worldTemplatePaginatedList = output; + RealmsClient realmsClient = RealmsClient.getOrCreate(); - while (worldTemplatePaginatedList != null) { - Either either = RealmsSelectWorldTemplateScreen.this.fetchTemplates(worldTemplatePaginatedList, realmsClient); - worldTemplatePaginatedList = (WorldTemplatePaginatedList)RealmsSelectWorldTemplateScreen.this.minecraft.submit(() -> { - if (either.right().isPresent()) { - RealmsSelectWorldTemplateScreen.LOGGER.error("Couldn't fetch templates", (Throwable)either.right().get()); - if (RealmsSelectWorldTemplateScreen.this.worldTemplateList.isEmpty()) { - RealmsSelectWorldTemplateScreen.this.noTemplatesMessage = TextRenderingUtils.decompose(I18n.get("mco.template.select.failure")); - } + while (worldTemplatePaginatedList != null) { + Either either = RealmsSelectWorldTemplateScreen.this.fetchTemplates(worldTemplatePaginatedList, realmsClient); + worldTemplatePaginatedList = (WorldTemplatePaginatedList)RealmsSelectWorldTemplateScreen.this.minecraft + .submit( + () -> { + if (either.right().isPresent()) { + RealmsSelectWorldTemplateScreen.LOGGER.error("Couldn't fetch templates", (Throwable)either.right().get()); + if (RealmsSelectWorldTemplateScreen.this.worldTemplateList.isEmpty()) { + RealmsSelectWorldTemplateScreen.this.noTemplatesMessage = TextRenderingUtils.decompose(I18n.get("mco.template.select.failure")); + } - return null; - } else { - WorldTemplatePaginatedList worldTemplatePaginatedListx = (WorldTemplatePaginatedList)either.left().get(); + return null; + } else { + WorldTemplatePaginatedList worldTemplatePaginatedListx = (WorldTemplatePaginatedList)either.left().get(); - for (WorldTemplate worldTemplate : worldTemplatePaginatedListx.templates) { - RealmsSelectWorldTemplateScreen.this.worldTemplateList.addEntry(worldTemplate); - } + for (WorldTemplate worldTemplate : worldTemplatePaginatedListx.templates) { + RealmsSelectWorldTemplateScreen.this.worldTemplateList.addEntry(worldTemplate); + } - if (worldTemplatePaginatedListx.templates.isEmpty()) { - if (RealmsSelectWorldTemplateScreen.this.worldTemplateList.isEmpty()) { - String string = I18n.get("mco.template.select.none", "%link"); - LineSegment lineSegment = LineSegment.link(I18n.get("mco.template.select.none.linkTitle"), CommonLinks.REALMS_CONTENT_CREATION.toString()); - RealmsSelectWorldTemplateScreen.this.noTemplatesMessage = TextRenderingUtils.decompose(string, lineSegment); + if (worldTemplatePaginatedListx.templates.isEmpty()) { + if (RealmsSelectWorldTemplateScreen.this.worldTemplateList.isEmpty()) { + String string = I18n.get("mco.template.select.none", "%link"); + TextRenderingUtils.LineSegment lineSegment = TextRenderingUtils.LineSegment.link( + I18n.get("mco.template.select.none.linkTitle"), CommonLinks.REALMS_CONTENT_CREATION.toString() + ); + RealmsSelectWorldTemplateScreen.this.noTemplatesMessage = TextRenderingUtils.decompose(string, lineSegment); + } + + return null; + } else { + return worldTemplatePaginatedListx; + } + } } - - return null; - } else { - return worldTemplatePaginatedListx; - } - } - }).join(); + ) + .join(); + } } - } - }).start(); + }) + .start(); } Either fetchTemplates(WorldTemplatePaginatedList templates, RealmsClient realmsClient) { @@ -217,18 +222,20 @@ public class RealmsSelectWorldTemplateScreen extends RealmsScreen { } } - private void renderMultilineMessage(GuiGraphics guiGraphics, int x, int y, List lines) { + private void renderMultilineMessage(GuiGraphics guiGraphics, int x, int y, List lines) { for (int i = 0; i < lines.size(); i++) { - Line line = (Line)lines.get(i); + TextRenderingUtils.Line line = (TextRenderingUtils.Line)lines.get(i); int j = row(4 + i); int k = line.segments.stream().mapToInt(lineSegmentx -> this.font.width(lineSegmentx.renderedText())).sum(); int l = this.width / 2 - k / 2; - for (LineSegment lineSegment : line.segments) { - int m = lineSegment.isLink() ? 3368635 : -1; - int n = guiGraphics.drawString(this.font, lineSegment.renderedText(), l, j, m); + for (TextRenderingUtils.LineSegment lineSegment : line.segments) { + int m = lineSegment.isLink() ? -13408581 : -1; + String string = lineSegment.renderedText(); + guiGraphics.drawString(this.font, string, l, j, m); + int n = l + this.font.width(string); if (lineSegment.isLink() && x > l && x < n && y > j - 3 && y < j + 8) { - this.setTooltipForNextRenderPass(Component.literal(lineSegment.getLinkUrl())); + guiGraphics.setTooltipForNextFrame(Component.literal(lineSegment.getLinkUrl()), x, y); this.currentLink = lineSegment.getLinkUrl(); } @@ -298,9 +305,9 @@ public class RealmsSelectWorldTemplateScreen extends RealmsScreen { @Override public void render(GuiGraphics guiGraphics, int index, int top, int left, int width, int height, int mouseX, int mouseY, boolean hovering, float partialTick) { guiGraphics.blit( - RenderType::guiTextured, RealmsTextureManager.worldTemplate(this.template.id, this.template.image), left + 1, top + 1 + 1, 0.0F, 0.0F, 38, 38, 38, 38 + RenderPipelines.GUI_TEXTURED, RealmsTextureManager.worldTemplate(this.template.id, this.template.image), left + 1, top + 1 + 1, 0.0F, 0.0F, 38, 38, 38, 38 ); - guiGraphics.blitSprite(RenderType::guiTextured, RealmsSelectWorldTemplateScreen.SLOT_FRAME_SPRITE, left, top + 1, 40, 40); + guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, RealmsSelectWorldTemplateScreen.SLOT_FRAME_SPRITE, left, top + 1, 40, 40); int i = 5; int j = RealmsSelectWorldTemplateScreen.this.font.width(this.template.version); if (this.websiteButton != null) { @@ -316,10 +323,10 @@ public class RealmsSelectWorldTemplateScreen extends RealmsScreen { int k = left + 45 + 20; int l = top + 5; guiGraphics.drawString(RealmsSelectWorldTemplateScreen.this.font, this.template.name, k, l, -1); - guiGraphics.drawString(RealmsSelectWorldTemplateScreen.this.font, this.template.version, left + width - j - 5, l, 7105644); + guiGraphics.drawString(RealmsSelectWorldTemplateScreen.this.font, this.template.version, left + width - j - 5, l, -9671572); guiGraphics.drawString(RealmsSelectWorldTemplateScreen.this.font, this.template.author, k, l + 9 + 5, -6250336); if (!this.template.recommendedPlayers.isBlank()) { - guiGraphics.drawString(RealmsSelectWorldTemplateScreen.this.font, this.template.recommendedPlayers, k, top + height - 9 / 2 - 5, 5000268); + guiGraphics.drawString(RealmsSelectWorldTemplateScreen.this.font, this.template.recommendedPlayers, k, top + height - 9 / 2 - 5, -11776948); } } @@ -366,9 +373,9 @@ public class RealmsSelectWorldTemplateScreen extends RealmsScreen { } } - public void setSelected(@Nullable RealmsSelectWorldTemplateScreen.Entry entry) { - super.setSelected(entry); - RealmsSelectWorldTemplateScreen.this.selectedTemplate = entry == null ? null : entry.template; + public void setSelected(@Nullable RealmsSelectWorldTemplateScreen.Entry selected) { + super.setSelected(selected); + RealmsSelectWorldTemplateScreen.this.selectedTemplate = selected == null ? null : selected.template; RealmsSelectWorldTemplateScreen.this.updateButtonStates(); } diff --git a/com/mojang/realmsclient/gui/screens/RealmsSettingsScreen.java b/com/mojang/realmsclient/gui/screens/RealmsSettingsScreen.java deleted file mode 100644 index 370948fa..00000000 --- a/com/mojang/realmsclient/gui/screens/RealmsSettingsScreen.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.mojang.realmsclient.gui.screens; - -import com.mojang.realmsclient.dto.RealmsServer; -import com.mojang.realmsclient.dto.RealmsServer.State; -import java.util.Objects; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.client.gui.components.Button; -import net.minecraft.client.gui.components.EditBox; -import net.minecraft.network.chat.CommonComponents; -import net.minecraft.network.chat.Component; -import net.minecraft.realms.RealmsScreen; -import net.minecraft.util.StringUtil; - -@Environment(EnvType.CLIENT) -public class RealmsSettingsScreen extends RealmsScreen { - private static final int COMPONENT_WIDTH = 212; - private static final Component NAME_LABEL = Component.translatable("mco.configure.world.name"); - private static final Component DESCRIPTION_LABEL = Component.translatable("mco.configure.world.description"); - private final RealmsConfigureWorldScreen configureWorldScreen; - private final RealmsServer serverData; - private EditBox descEdit; - private EditBox nameEdit; - - public RealmsSettingsScreen(RealmsConfigureWorldScreen configureWorldScreen, RealmsServer serverData) { - super(Component.translatable("mco.configure.world.settings.title")); - this.configureWorldScreen = configureWorldScreen; - this.serverData = serverData; - } - - @Override - public void init() { - int i = this.width / 2 - 106; - String string = this.serverData.state == State.OPEN ? "mco.configure.world.buttons.close" : "mco.configure.world.buttons.open"; - Button button = Button.builder( - Component.translatable(string), - buttonx -> { - if (this.serverData.state == State.OPEN) { - this.minecraft - .setScreen( - RealmsPopups.infoPopupScreen( - this, Component.translatable("mco.configure.world.close.question.line1"), popupScreen -> this.configureWorldScreen.closeTheWorld() - ) - ); - } else { - this.configureWorldScreen.openTheWorld(false); - } - } - ) - .bounds(this.width / 2 - 53, row(0), 106, 20) - .build(); - this.addRenderableWidget(button); - this.nameEdit = new EditBox(this.minecraft.font, i, row(4), 212, 20, Component.translatable("mco.configure.world.name")); - this.nameEdit.setMaxLength(32); - this.nameEdit.setValue((String)Objects.requireNonNullElse(this.serverData.getName(), "")); - this.addRenderableWidget(this.nameEdit); - this.descEdit = new EditBox(this.minecraft.font, i, row(8), 212, 20, Component.translatable("mco.configure.world.description")); - this.descEdit.setMaxLength(32); - this.descEdit.setValue(this.serverData.getDescription()); - this.addRenderableWidget(this.descEdit); - Button button2 = this.addRenderableWidget( - Button.builder(Component.translatable("mco.configure.world.buttons.done"), buttonx -> this.save()).bounds(i - 2, row(12), 106, 20).build() - ); - this.nameEdit.setResponder(stringx -> button2.active = !StringUtil.isBlank(stringx)); - this.addRenderableWidget(Button.builder(CommonComponents.GUI_CANCEL, buttonx -> this.onClose()).bounds(this.width / 2 + 2, row(12), 106, 20).build()); - } - - @Override - protected void setInitialFocus() { - this.setInitialFocus(this.nameEdit); - } - - @Override - public void onClose() { - this.minecraft.setScreen(this.configureWorldScreen); - } - - @Override - public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTick) { - super.render(guiGraphics, mouseX, mouseY, partialTick); - guiGraphics.drawCenteredString(this.font, this.title, this.width / 2, 17, -1); - guiGraphics.drawString(this.font, NAME_LABEL, this.width / 2 - 106, row(3), -1); - guiGraphics.drawString(this.font, DESCRIPTION_LABEL, this.width / 2 - 106, row(7), -1); - } - - public void save() { - this.configureWorldScreen.saveSettings(this.nameEdit.getValue(), this.descEdit.getValue()); - } -} diff --git a/com/mojang/realmsclient/gui/screens/RealmsSubscriptionInfoScreen.java b/com/mojang/realmsclient/gui/screens/RealmsSubscriptionInfoScreen.java deleted file mode 100644 index ce164769..00000000 --- a/com/mojang/realmsclient/gui/screens/RealmsSubscriptionInfoScreen.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.mojang.realmsclient.gui.screens; - -import com.mojang.logging.LogUtils; -import com.mojang.realmsclient.RealmsMainScreen; -import com.mojang.realmsclient.client.RealmsClient; -import com.mojang.realmsclient.dto.RealmsServer; -import com.mojang.realmsclient.dto.Subscription; -import com.mojang.realmsclient.dto.Subscription.SubscriptionType; -import com.mojang.realmsclient.exception.RealmsServiceException; -import java.text.DateFormat; -import java.util.Calendar; -import java.util.GregorianCalendar; -import java.util.TimeZone; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.client.GameNarrator; -import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.client.gui.components.Button; -import net.minecraft.client.gui.components.FittingMultiLineTextWidget; -import net.minecraft.client.gui.screens.ConfirmLinkScreen; -import net.minecraft.client.gui.screens.Screen; -import net.minecraft.network.chat.CommonComponents; -import net.minecraft.network.chat.Component; -import net.minecraft.realms.RealmsScreen; -import net.minecraft.util.CommonLinks; -import org.jetbrains.annotations.Nullable; -import org.slf4j.Logger; - -@Environment(EnvType.CLIENT) -public class RealmsSubscriptionInfoScreen extends RealmsScreen { - static final Logger LOGGER = LogUtils.getLogger(); - private static final Component SUBSCRIPTION_TITLE = Component.translatable("mco.configure.world.subscription.title"); - private static final Component SUBSCRIPTION_START_LABEL = Component.translatable("mco.configure.world.subscription.start"); - private static final Component TIME_LEFT_LABEL = Component.translatable("mco.configure.world.subscription.timeleft"); - private static final Component DAYS_LEFT_LABEL = Component.translatable("mco.configure.world.subscription.recurring.daysleft"); - private static final Component SUBSCRIPTION_EXPIRED_TEXT = Component.translatable("mco.configure.world.subscription.expired"); - private static final Component SUBSCRIPTION_LESS_THAN_A_DAY_TEXT = Component.translatable("mco.configure.world.subscription.less_than_a_day"); - private static final Component UNKNOWN = Component.translatable("mco.configure.world.subscription.unknown"); - private static final Component RECURRING_INFO = Component.translatable("mco.configure.world.subscription.recurring.info"); - private final Screen lastScreen; - final RealmsServer serverData; - final Screen mainScreen; - private Component daysLeft = UNKNOWN; - private Component startDate = UNKNOWN; - @Nullable - private SubscriptionType type; - - public RealmsSubscriptionInfoScreen(Screen lastScreen, RealmsServer serverData, Screen mainScreen) { - super(GameNarrator.NO_TITLE); - this.lastScreen = lastScreen; - this.serverData = serverData; - this.mainScreen = mainScreen; - } - - @Override - public void init() { - this.getSubscription(this.serverData.id); - this.addRenderableWidget( - Button.builder( - Component.translatable("mco.configure.world.subscription.extend"), - button -> ConfirmLinkScreen.confirmLinkNow(this, CommonLinks.extendRealms(this.serverData.remoteSubscriptionId, this.minecraft.getUser().getProfileId())) - ) - .bounds(this.width / 2 - 100, row(6), 200, 20) - .build() - ); - if (this.serverData.expired) { - this.addRenderableWidget( - Button.builder( - Component.translatable("mco.configure.world.delete.button"), - button -> this.minecraft - .setScreen(RealmsPopups.warningPopupScreen(this, Component.translatable("mco.configure.world.delete.question.line1"), popupScreen -> this.deleteRealm())) - ) - .bounds(this.width / 2 - 100, row(10), 200, 20) - .build() - ); - } else if (RealmsMainScreen.isSnapshot() && this.serverData.parentWorldName != null) { - this.addRenderableWidget( - new FittingMultiLineTextWidget( - this.width / 2 - 100, row(8), 200, 46, Component.translatable("mco.snapshot.subscription.info", this.serverData.parentWorldName), this.font - ) - ); - } else { - this.addRenderableWidget(new FittingMultiLineTextWidget(this.width / 2 - 100, row(8), 200, 46, RECURRING_INFO, this.font)); - } - - this.addRenderableWidget(Button.builder(CommonComponents.GUI_BACK, button -> this.onClose()).bounds(this.width / 2 - 100, row(12), 200, 20).build()); - } - - @Override - public Component getNarrationMessage() { - return CommonComponents.joinLines(SUBSCRIPTION_TITLE, SUBSCRIPTION_START_LABEL, this.startDate, TIME_LEFT_LABEL, this.daysLeft); - } - - private void deleteRealm() { - (new Thread("Realms-delete-realm") { - public void run() { - try { - RealmsClient realmsClient = RealmsClient.getOrCreate(); - realmsClient.deleteRealm(RealmsSubscriptionInfoScreen.this.serverData.id); - } catch (RealmsServiceException var2) { - RealmsSubscriptionInfoScreen.LOGGER.error("Couldn't delete world", (Throwable)var2); - } - - RealmsSubscriptionInfoScreen.this.minecraft - .execute(() -> RealmsSubscriptionInfoScreen.this.minecraft.setScreen(RealmsSubscriptionInfoScreen.this.mainScreen)); - } - }) - .start(); - this.minecraft.setScreen(this); - } - - private void getSubscription(long serverId) { - RealmsClient realmsClient = RealmsClient.getOrCreate(); - - try { - Subscription subscription = realmsClient.subscriptionFor(serverId); - this.daysLeft = this.daysLeftPresentation(subscription.daysLeft); - this.startDate = localPresentation(subscription.startDate); - this.type = subscription.type; - } catch (RealmsServiceException var5) { - LOGGER.error("Couldn't get subscription", (Throwable)var5); - this.minecraft.setScreen(new RealmsGenericErrorScreen(var5, this.lastScreen)); - } - } - - private static Component localPresentation(long time) { - Calendar calendar = new GregorianCalendar(TimeZone.getDefault()); - calendar.setTimeInMillis(time); - return Component.literal(DateFormat.getDateTimeInstance().format(calendar.getTime())); - } - - @Override - public void onClose() { - this.minecraft.setScreen(this.lastScreen); - } - - @Override - public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTick) { - super.render(guiGraphics, mouseX, mouseY, partialTick); - int i = this.width / 2 - 100; - guiGraphics.drawCenteredString(this.font, SUBSCRIPTION_TITLE, this.width / 2, 17, -1); - guiGraphics.drawString(this.font, SUBSCRIPTION_START_LABEL, i, row(0), -6250336); - guiGraphics.drawString(this.font, this.startDate, i, row(1), -1); - if (this.type == SubscriptionType.NORMAL) { - guiGraphics.drawString(this.font, TIME_LEFT_LABEL, i, row(3), -6250336); - } else if (this.type == SubscriptionType.RECURRING) { - guiGraphics.drawString(this.font, DAYS_LEFT_LABEL, i, row(3), -6250336); - } - - guiGraphics.drawString(this.font, this.daysLeft, i, row(4), -1); - } - - private Component daysLeftPresentation(int daysLeft) { - if (daysLeft < 0 && this.serverData.expired) { - return SUBSCRIPTION_EXPIRED_TEXT; - } else if (daysLeft <= 1) { - return SUBSCRIPTION_LESS_THAN_A_DAY_TEXT; - } else { - int i = daysLeft / 30; - int j = daysLeft % 30; - boolean bl = i > 0; - boolean bl2 = j > 0; - if (bl && bl2) { - return Component.translatable("mco.configure.world.subscription.remaining.months.days", i, j); - } else if (bl) { - return Component.translatable("mco.configure.world.subscription.remaining.months", i); - } else { - return bl2 ? Component.translatable("mco.configure.world.subscription.remaining.days", j) : Component.empty(); - } - } - } -} diff --git a/com/mojang/realmsclient/gui/screens/RealmsTermsScreen.java b/com/mojang/realmsclient/gui/screens/RealmsTermsScreen.java index 1f47b4c4..5ebde1ee 100644 --- a/com/mojang/realmsclient/gui/screens/RealmsTermsScreen.java +++ b/com/mojang/realmsclient/gui/screens/RealmsTermsScreen.java @@ -101,6 +101,6 @@ public class RealmsTermsScreen extends RealmsScreen { int l = j + this.font.width(TERMS_LINK_TEXT) + 1; int m = k + 1 + 9; this.onLink = j <= mouseX && mouseX <= l && k <= mouseY && mouseY <= m; - guiGraphics.drawString(this.font, TERMS_LINK_TEXT, this.width / 2 - 120 + i, row(5), this.onLink ? 7107012 : 3368635); + guiGraphics.drawString(this.font, TERMS_LINK_TEXT, this.width / 2 - 120 + i, row(5), this.onLink ? -9670204 : -13408581); } } diff --git a/com/mojang/realmsclient/gui/screens/RealmsUploadScreen.java b/com/mojang/realmsclient/gui/screens/RealmsUploadScreen.java index 1ab7c905..4ed45d87 100644 --- a/com/mojang/realmsclient/gui/screens/RealmsUploadScreen.java +++ b/com/mojang/realmsclient/gui/screens/RealmsUploadScreen.java @@ -8,7 +8,10 @@ import com.mojang.realmsclient.client.UploadStatus; import com.mojang.realmsclient.client.worldupload.RealmsUploadException; import com.mojang.realmsclient.client.worldupload.RealmsWorldUpload; import com.mojang.realmsclient.client.worldupload.RealmsWorldUploadStatusTracker; +import com.mojang.realmsclient.dto.RealmsSetting; +import com.mojang.realmsclient.dto.RealmsSlot; import com.mojang.realmsclient.dto.RealmsWorldOptions; +import com.mojang.realmsclient.gui.screens.configuration.RealmsConfigureWorldScreen; import com.mojang.realmsclient.util.task.LongRunningTask; import com.mojang.realmsclient.util.task.RealmCreationTask; import com.mojang.realmsclient.util.task.SwitchSlotTask; @@ -203,7 +206,7 @@ public class RealmsUploadScreen extends RealmsScreen implements RealmsWorldUploa this.uploadStatus.refreshBytesPerSecond(); if (this.narrationRateLimiter.tryAcquire(1)) { Component component = this.createProgressNarrationMessage(); - this.minecraft.getNarrator().sayNow(component); + this.minecraft.getNarrator().saySystemNow(component); } } @@ -227,7 +230,8 @@ public class RealmsUploadScreen extends RealmsScreen implements RealmsWorldUploa RealmsWorldOptions realmsWorldOptions = RealmsWorldOptions.createFromSettings( this.selectedLevel.getSettings(), true, this.selectedLevel.levelVersion().minecraftVersionName() ); - RealmsWorldUpload realmsWorldUpload = new RealmsWorldUpload(path, realmsWorldOptions, this.minecraft.getUser(), this.realmId, this.slotId, this); + RealmsSlot realmsSlot = new RealmsSlot(this.slotId, realmsWorldOptions, List.of(RealmsSetting.hardcoreSetting(this.selectedLevel.getSettings().hardcore()))); + RealmsWorldUpload realmsWorldUpload = new RealmsWorldUpload(path, realmsSlot, this.minecraft.getUser(), this.realmId, this); if (!this.currentUpload.compareAndSet(null, realmsWorldUpload)) { throw new IllegalStateException("Tried to start uploading but was already uploading"); } else { diff --git a/com/mojang/realmsclient/gui/screens/RealmsBackupInfoScreen.java b/com/mojang/realmsclient/gui/screens/configuration/RealmsBackupInfoScreen.java similarity index 99% rename from com/mojang/realmsclient/gui/screens/RealmsBackupInfoScreen.java rename to com/mojang/realmsclient/gui/screens/configuration/RealmsBackupInfoScreen.java index d22cbd1b..b437b136 100644 --- a/com/mojang/realmsclient/gui/screens/RealmsBackupInfoScreen.java +++ b/com/mojang/realmsclient/gui/screens/configuration/RealmsBackupInfoScreen.java @@ -1,4 +1,4 @@ -package com.mojang.realmsclient.gui.screens; +package com.mojang.realmsclient.gui.screens.configuration; import com.mojang.realmsclient.dto.Backup; import java.util.Locale; diff --git a/com/mojang/realmsclient/gui/screens/RealmsBackupScreen.java b/com/mojang/realmsclient/gui/screens/configuration/RealmsBackupScreen.java similarity index 90% rename from com/mojang/realmsclient/gui/screens/RealmsBackupScreen.java rename to com/mojang/realmsclient/gui/screens/configuration/RealmsBackupScreen.java index 78bdb234..d96721be 100644 --- a/com/mojang/realmsclient/gui/screens/RealmsBackupScreen.java +++ b/com/mojang/realmsclient/gui/screens/configuration/RealmsBackupScreen.java @@ -1,11 +1,13 @@ -package com.mojang.realmsclient.gui.screens; +package com.mojang.realmsclient.gui.screens.configuration; import com.mojang.logging.LogUtils; import com.mojang.realmsclient.client.RealmsClient; import com.mojang.realmsclient.dto.Backup; import com.mojang.realmsclient.dto.RealmsServer; -import com.mojang.realmsclient.dto.RealmsWorldOptions; +import com.mojang.realmsclient.dto.RealmsSlot; import com.mojang.realmsclient.exception.RealmsServiceException; +import com.mojang.realmsclient.gui.screens.RealmsLongRunningMcoTaskScreen; +import com.mojang.realmsclient.gui.screens.RealmsPopups; import com.mojang.realmsclient.util.RealmsUtil; import com.mojang.realmsclient.util.task.DownloadTask; import com.mojang.realmsclient.util.task.RestoreTask; @@ -143,7 +145,7 @@ public class RealmsBackupScreen extends RealmsScreen { this.slotId, (String)Objects.requireNonNullElse(this.serverData.name, "") + " (" - + ((RealmsWorldOptions)this.serverData.slots.get(this.serverData.activeSlot)).getSlotName(this.serverData.activeSlot) + + ((RealmsSlot)this.serverData.slots.get(this.serverData.activeSlot)).options.getSlotName(this.serverData.activeSlot) + ")", this ) @@ -227,13 +229,13 @@ public class RealmsBackupScreen extends RealmsScreen { } } - private void addToChangeList(String change) { - if (change.contains("uploaded")) { + private void addToChangeList(String key) { + if (key.contains("uploaded")) { String string = DateFormat.getDateTimeInstance(3, 3).format(this.backup.lastModifiedDate); - this.backup.changeList.put(change, string); + this.backup.changeList.put(key, string); this.backup.setUploadedVersion(true); } else { - this.backup.changeList.put(change, (String)this.backup.metadata.get(change)); + this.backup.changeList.put(key, (String)this.backup.metadata.get(key)); } } @@ -249,13 +251,15 @@ public class RealmsBackupScreen extends RealmsScreen { RealmsPopups.warningPopupScreen( RealmsBackupScreen.this, component2, - popupScreen -> RealmsBackupScreen.this.minecraft - .setScreen( - new RealmsLongRunningMcoTaskScreen( - RealmsBackupScreen.this.lastScreen.getNewScreen(), - new RestoreTask(this.backup, RealmsBackupScreen.this.serverData.id, RealmsBackupScreen.this.lastScreen) - ) - ) + popupScreen -> { + RealmsConfigureWorldScreen realmsConfigureWorldScreen = RealmsBackupScreen.this.lastScreen.getNewScreen(); + RealmsBackupScreen.this.minecraft + .setScreen( + new RealmsLongRunningMcoTaskScreen( + realmsConfigureWorldScreen, new RestoreTask(this.backup, RealmsBackupScreen.this.serverData.id, realmsConfigureWorldScreen) + ) + ); + } ) ); } @@ -283,7 +287,7 @@ public class RealmsBackupScreen extends RealmsScreen { j, l ); - guiGraphics.drawString(RealmsBackupScreen.this.font, this.getMediumDatePresentation(this.backup.lastModifiedDate), left, k, 5000268); + guiGraphics.drawString(RealmsBackupScreen.this.font, this.getMediumDatePresentation(this.backup.lastModifiedDate), left, k, -11776948); int m = 0; int n = top + height / 2 - 10; if (this.restoreButton != null) { diff --git a/com/mojang/realmsclient/gui/screens/configuration/RealmsConfigurationTab.java b/com/mojang/realmsclient/gui/screens/configuration/RealmsConfigurationTab.java new file mode 100644 index 00000000..490cba1f --- /dev/null +++ b/com/mojang/realmsclient/gui/screens/configuration/RealmsConfigurationTab.java @@ -0,0 +1,16 @@ +package com.mojang.realmsclient.gui.screens.configuration; + +import com.mojang.realmsclient.dto.RealmsServer; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; + +@Environment(EnvType.CLIENT) +public interface RealmsConfigurationTab { + void updateData(RealmsServer server); + + default void onSelected(RealmsServer server) { + } + + default void onDeselected(RealmsServer server) { + } +} diff --git a/com/mojang/realmsclient/gui/screens/configuration/RealmsConfigureWorldScreen.java b/com/mojang/realmsclient/gui/screens/configuration/RealmsConfigureWorldScreen.java new file mode 100644 index 00000000..419a3a27 --- /dev/null +++ b/com/mojang/realmsclient/gui/screens/configuration/RealmsConfigureWorldScreen.java @@ -0,0 +1,360 @@ +package com.mojang.realmsclient.gui.screens.configuration; + +import com.mojang.logging.LogUtils; +import com.mojang.realmsclient.RealmsMainScreen; +import com.mojang.realmsclient.client.RealmsClient; +import com.mojang.realmsclient.client.RealmsError; +import com.mojang.realmsclient.dto.PlayerInfo; +import com.mojang.realmsclient.dto.PreferredRegionsDto; +import com.mojang.realmsclient.dto.RealmsRegion; +import com.mojang.realmsclient.dto.RealmsServer; +import com.mojang.realmsclient.dto.RealmsSlot; +import com.mojang.realmsclient.dto.RegionDataDto; +import com.mojang.realmsclient.dto.RegionSelectionPreference; +import com.mojang.realmsclient.dto.RegionSelectionPreferenceDto; +import com.mojang.realmsclient.dto.ServiceQuality; +import com.mojang.realmsclient.exception.RealmsServiceException; +import com.mojang.realmsclient.gui.screens.RealmsGenericErrorScreen; +import com.mojang.realmsclient.gui.screens.RealmsLongRunningMcoTaskScreen; +import com.mojang.realmsclient.util.RealmsUtil; +import com.mojang.realmsclient.util.task.CloseServerTask; +import com.mojang.realmsclient.util.task.OpenServerTask; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.client.gui.components.AbstractWidget; +import net.minecraft.client.gui.components.Button; +import net.minecraft.client.gui.components.Tooltip; +import net.minecraft.client.gui.components.tabs.LoadingTab; +import net.minecraft.client.gui.components.tabs.Tab; +import net.minecraft.client.gui.components.tabs.TabManager; +import net.minecraft.client.gui.components.tabs.TabNavigationBar; +import net.minecraft.client.gui.layouts.HeaderAndFooterLayout; +import net.minecraft.client.gui.layouts.LinearLayout; +import net.minecraft.client.gui.navigation.ScreenRectangle; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.gui.screens.worldselection.CreateWorldScreen; +import net.minecraft.client.renderer.RenderPipelines; +import net.minecraft.network.chat.CommonComponents; +import net.minecraft.network.chat.Component; +import net.minecraft.realms.RealmsScreen; +import net.minecraft.util.StringUtil; +import org.jetbrains.annotations.Nullable; +import org.slf4j.Logger; + +@Environment(EnvType.CLIENT) +public class RealmsConfigureWorldScreen extends RealmsScreen { + private static final Logger LOGGER = LogUtils.getLogger(); + private static final Component PLAY_TEXT = Component.translatable("mco.selectServer.play"); + private final RealmsMainScreen lastScreen; + @Nullable + private RealmsServer serverData; + @Nullable + private PreferredRegionsDto regions; + private final Map regionServiceQuality = new LinkedHashMap(); + private final long serverId; + private boolean stateChanged; + private final TabManager tabManager = new TabManager(guiEventListener -> { + AbstractWidget var10000 = this.addRenderableWidget(guiEventListener); + }, guiEventListener -> this.removeWidget(guiEventListener), this::onTabSelected, this::onTabDeselected); + @Nullable + private Button playButton; + @Nullable + private TabNavigationBar tabNavigationBar; + private final HeaderAndFooterLayout layout = new HeaderAndFooterLayout(this); + + public RealmsConfigureWorldScreen(RealmsMainScreen lastScreen, long serverId, @Nullable RealmsServer serverData, @Nullable PreferredRegionsDto regions) { + super(Component.empty()); + this.lastScreen = lastScreen; + this.serverId = serverId; + this.serverData = serverData; + this.regions = regions; + } + + public RealmsConfigureWorldScreen(RealmsMainScreen lastScreen, long serverId) { + this(lastScreen, serverId, null, null); + } + + @Override + public void init() { + if (this.serverData == null) { + this.fetchServerData(this.serverId); + } + + if (this.regions == null) { + this.fetchRegionData(); + } + + Component component = Component.translatable("mco.configure.world.loading"); + this.tabNavigationBar = TabNavigationBar.builder(this.tabManager, this.width) + .addTabs( + new LoadingTab(this.getFont(), RealmsWorldsTab.TITLE, component), + new LoadingTab(this.getFont(), RealmsPlayersTab.TITLE, component), + new LoadingTab(this.getFont(), RealmsSubscriptionTab.TITLE, component), + new LoadingTab(this.getFont(), RealmsSettingsTab.TITLE, component) + ) + .build(); + this.addRenderableWidget(this.tabNavigationBar); + LinearLayout linearLayout = this.layout.addToFooter(LinearLayout.horizontal().spacing(8)); + this.playButton = linearLayout.addChild(Button.builder(PLAY_TEXT, button -> { + this.onClose(); + RealmsMainScreen.play(this.serverData, this); + }).width(150).build()); + this.playButton.active = false; + linearLayout.addChild(Button.builder(CommonComponents.GUI_BACK, button -> this.onClose()).build()); + this.layout.visitWidgets(abstractWidget -> { + abstractWidget.setTabOrderGroup(1); + this.addRenderableWidget(abstractWidget); + }); + this.tabNavigationBar.selectTab(0, false); + this.repositionElements(); + if (this.serverData != null && this.regions != null) { + this.onRealmsDataFetched(); + } + } + + private void onTabSelected(Tab tab) { + if (this.serverData != null && tab instanceof RealmsConfigurationTab realmsConfigurationTab) { + realmsConfigurationTab.onSelected(this.serverData); + } + } + + private void onTabDeselected(Tab tab) { + if (this.serverData != null && tab instanceof RealmsConfigurationTab realmsConfigurationTab) { + realmsConfigurationTab.onDeselected(this.serverData); + } + } + + public int getContentHeight() { + return this.layout.getContentHeight(); + } + + public int getHeaderHeight() { + return this.layout.getHeaderHeight(); + } + + public Screen getLastScreen() { + return this.lastScreen; + } + + public Screen createErrorScreen(RealmsServiceException exception) { + return new RealmsGenericErrorScreen(exception, this.lastScreen); + } + + @Override + public void repositionElements() { + if (this.tabNavigationBar != null) { + this.tabNavigationBar.setWidth(this.width); + this.tabNavigationBar.arrangeElements(); + int i = this.tabNavigationBar.getRectangle().bottom(); + ScreenRectangle screenRectangle = new ScreenRectangle(0, i, this.width, this.height - this.layout.getFooterHeight() - i); + this.tabManager.setTabArea(screenRectangle); + this.layout.setHeaderHeight(i); + this.layout.arrangeElements(); + } + } + + private void updateButtonStates() { + if (this.serverData != null && this.playButton != null) { + this.playButton.active = this.serverData.shouldPlayButtonBeActive(); + if (!this.playButton.active && this.serverData.state == RealmsServer.State.CLOSED) { + this.playButton.setTooltip(Tooltip.create(RealmsServer.WORLD_CLOSED_COMPONENT)); + } + } + } + + @Override + public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTick) { + super.render(guiGraphics, mouseX, mouseY, partialTick); + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, Screen.FOOTER_SEPARATOR, 0, this.height - this.layout.getFooterHeight() - 2, 0.0F, 0.0F, this.width, 2, 32, 2); + } + + @Override + public boolean keyPressed(int keyCode, int scanCode, int modifiers) { + return this.tabNavigationBar.keyPressed(keyCode) ? true : super.keyPressed(keyCode, scanCode, modifiers); + } + + @Override + protected void renderMenuBackground(GuiGraphics partialTick) { + partialTick.blit(RenderPipelines.GUI_TEXTURED, CreateWorldScreen.TAB_HEADER_BACKGROUND, 0, 0, 0.0F, 0.0F, this.width, this.layout.getHeaderHeight(), 16, 16); + this.renderMenuBackground(partialTick, 0, this.layout.getHeaderHeight(), this.width, this.height); + } + + @Override + public void onClose() { + if (this.serverData != null && this.tabManager.getCurrentTab() instanceof RealmsConfigurationTab realmsConfigurationTab) { + realmsConfigurationTab.onDeselected(this.serverData); + } + + this.minecraft.setScreen(this.lastScreen); + if (this.stateChanged) { + this.lastScreen.resetScreen(); + } + } + + public void fetchRegionData() { + RealmsUtil.supplyAsync( + RealmsClient::getPreferredRegionSelections, RealmsUtil.openScreenAndLogOnFailure(this::createErrorScreen, "Couldn't get realms region data") + ) + .thenAcceptAsync(preferredRegionsDto -> { + this.regions = preferredRegionsDto; + this.onRealmsDataFetched(); + }, this.minecraft); + } + + public void fetchServerData(long serverId) { + RealmsUtil.supplyAsync( + realmsClient -> realmsClient.getOwnRealm(serverId), RealmsUtil.openScreenAndLogOnFailure(this::createErrorScreen, "Couldn't get own world") + ) + .thenAcceptAsync(realmsServer -> { + this.serverData = realmsServer; + this.onRealmsDataFetched(); + }, this.minecraft); + } + + private void onRealmsDataFetched() { + if (this.serverData != null && this.regions != null) { + this.regionServiceQuality.clear(); + + for (RegionDataDto regionDataDto : this.regions.regionData()) { + if (regionDataDto.region() != RealmsRegion.INVALID_REGION) { + this.regionServiceQuality.put(regionDataDto.region(), regionDataDto.serviceQuality()); + } + } + + if (this.tabNavigationBar != null) { + this.removeWidget(this.tabNavigationBar); + } + + this.tabNavigationBar = TabNavigationBar.builder(this.tabManager, this.width) + .addTabs( + new RealmsWorldsTab(this, (Minecraft)Objects.requireNonNull(this.minecraft), this.serverData), + new RealmsPlayersTab(this, this.minecraft, this.serverData), + new RealmsSubscriptionTab(this, this.minecraft, this.serverData), + new RealmsSettingsTab(this, this.minecraft, this.serverData, this.regionServiceQuality) + ) + .build(); + this.addRenderableWidget(this.tabNavigationBar); + this.tabNavigationBar.selectTab(0, false); + this.tabNavigationBar.setTabActiveState(3, !this.serverData.expired); + if (this.serverData.expired) { + this.tabNavigationBar.setTabTooltip(3, Tooltip.create(Component.translatable("mco.configure.world.settings.expired"))); + } else { + this.tabNavigationBar.setTabTooltip(3, null); + } + + this.updateButtonStates(); + this.repositionElements(); + } + } + + public void saveSlotSettings(RealmsSlot slot) { + RealmsSlot realmsSlot = (RealmsSlot)this.serverData.slots.get(this.serverData.activeSlot); + slot.options.templateId = realmsSlot.options.templateId; + slot.options.templateImage = realmsSlot.options.templateImage; + RealmsClient realmsClient = RealmsClient.getOrCreate(); + + try { + if (this.serverData.activeSlot != slot.slotId) { + throw new RealmsServiceException(RealmsError.CustomError.configurationError()); + } + + realmsClient.updateSlot(this.serverData.id, slot.slotId, slot.options, slot.settings); + this.serverData.slots.put(this.serverData.activeSlot, slot); + if (slot.options.gameMode != realmsSlot.options.gameMode || slot.isHardcore() != realmsSlot.isHardcore()) { + RealmsMainScreen.refreshServerList(); + } + + this.stateChanged(); + } catch (RealmsServiceException var5) { + LOGGER.error("Couldn't save slot settings", (Throwable)var5); + this.minecraft.setScreen(new RealmsGenericErrorScreen(var5, this)); + return; + } + + this.minecraft.setScreen(this); + } + + public void saveSettings(String name, String description, RegionSelectionPreference regionSelectionPreference, @Nullable RealmsRegion preferredRegiom) { + String string = StringUtil.isBlank(description) ? "" : description; + String string2 = StringUtil.isBlank(name) ? "" : name; + RealmsClient realmsClient = RealmsClient.getOrCreate(); + + try { + RealmsSlot realmsSlot = (RealmsSlot)this.serverData.slots.get(this.serverData.activeSlot); + RealmsRegion realmsRegion = regionSelectionPreference == RegionSelectionPreference.MANUAL ? preferredRegiom : null; + RegionSelectionPreferenceDto regionSelectionPreferenceDto = new RegionSelectionPreferenceDto(regionSelectionPreference, realmsRegion); + realmsClient.updateConfiguration( + this.serverData.id, string2, string, regionSelectionPreferenceDto, realmsSlot.slotId, realmsSlot.options, realmsSlot.settings + ); + this.serverData.regionSelectionPreference = regionSelectionPreferenceDto; + this.serverData.name = name; + this.serverData.motd = string; + this.stateChanged(); + } catch (RealmsServiceException var11) { + LOGGER.error("Couldn't save settings", (Throwable)var11); + this.minecraft.setScreen(new RealmsGenericErrorScreen(var11, this)); + return; + } + + this.minecraft.setScreen(this); + } + + public void openTheWorld(boolean join) { + RealmsConfigureWorldScreen realmsConfigureWorldScreen = this.getNewScreenWithKnownData(this.serverData); + this.minecraft + .setScreen(new RealmsLongRunningMcoTaskScreen(this.getNewScreen(), new OpenServerTask(this.serverData, realmsConfigureWorldScreen, join, this.minecraft))); + } + + public void closeTheWorld() { + RealmsConfigureWorldScreen realmsConfigureWorldScreen = this.getNewScreenWithKnownData(this.serverData); + this.minecraft.setScreen(new RealmsLongRunningMcoTaskScreen(this.getNewScreen(), new CloseServerTask(this.serverData, realmsConfigureWorldScreen))); + } + + public void stateChanged() { + this.stateChanged = true; + if (this.tabNavigationBar != null) { + for (Tab tab : this.tabNavigationBar.getTabs()) { + if (tab instanceof RealmsConfigurationTab realmsConfigurationTab) { + realmsConfigurationTab.updateData(this.serverData); + } + } + } + } + + public boolean invitePlayer(long worldId, String playerName) { + RealmsClient realmsClient = RealmsClient.getOrCreate(); + + try { + List list = realmsClient.invite(worldId, playerName); + if (this.serverData != null) { + this.serverData.players = list; + } else { + this.serverData = realmsClient.getOwnRealm(worldId); + } + + this.stateChanged(); + return true; + } catch (RealmsServiceException var6) { + LOGGER.error("Couldn't invite user", (Throwable)var6); + return false; + } + } + + public RealmsConfigureWorldScreen getNewScreen() { + RealmsConfigureWorldScreen realmsConfigureWorldScreen = new RealmsConfigureWorldScreen(this.lastScreen, this.serverId); + realmsConfigureWorldScreen.stateChanged = this.stateChanged; + return realmsConfigureWorldScreen; + } + + public RealmsConfigureWorldScreen getNewScreenWithKnownData(RealmsServer server) { + RealmsConfigureWorldScreen realmsConfigureWorldScreen = new RealmsConfigureWorldScreen(this.lastScreen, this.serverId, server, this.regions); + realmsConfigureWorldScreen.stateChanged = this.stateChanged; + return realmsConfigureWorldScreen; + } +} diff --git a/com/mojang/realmsclient/gui/screens/RealmsInviteScreen.java b/com/mojang/realmsclient/gui/screens/configuration/RealmsInviteScreen.java similarity index 68% rename from com/mojang/realmsclient/gui/screens/RealmsInviteScreen.java rename to com/mojang/realmsclient/gui/screens/configuration/RealmsInviteScreen.java index 29ddbf30..6724a633 100644 --- a/com/mojang/realmsclient/gui/screens/RealmsInviteScreen.java +++ b/com/mojang/realmsclient/gui/screens/configuration/RealmsInviteScreen.java @@ -1,7 +1,5 @@ -package com.mojang.realmsclient.gui.screens; +package com.mojang.realmsclient.gui.screens.configuration; -import com.mojang.logging.LogUtils; -import com.mojang.realmsclient.client.RealmsClient; import com.mojang.realmsclient.dto.RealmsServer; import java.util.concurrent.CompletableFuture; import net.fabricmc.api.EnvType; @@ -14,34 +12,31 @@ import net.minecraft.client.gui.components.EditBox; import net.minecraft.client.gui.layouts.CommonLayouts; import net.minecraft.client.gui.layouts.HeaderAndFooterLayout; import net.minecraft.client.gui.layouts.LinearLayout; -import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.CommonComponents; import net.minecraft.network.chat.Component; import net.minecraft.realms.RealmsScreen; import net.minecraft.util.StringUtil; import org.jetbrains.annotations.Nullable; -import org.slf4j.Logger; @Environment(EnvType.CLIENT) public class RealmsInviteScreen extends RealmsScreen { - private static final Logger LOGGER = LogUtils.getLogger(); private static final Component TITLE = Component.translatable("mco.configure.world.buttons.invite"); private static final Component NAME_LABEL = Component.translatable("mco.configure.world.invite.profile.name").withColor(-6250336); private static final Component INVITING_PLAYER_TEXT = Component.translatable("mco.configure.world.players.inviting").withColor(-6250336); private static final Component NO_SUCH_PLAYER_ERROR_TEXT = Component.translatable("mco.configure.world.players.error").withColor(-65536); private final HeaderAndFooterLayout layout = new HeaderAndFooterLayout(this); + @Nullable private EditBox profileName; + @Nullable private Button inviteButton; private final RealmsServer serverData; private final RealmsConfigureWorldScreen configureScreen; - private final Screen lastScreen; @Nullable private Component message; - public RealmsInviteScreen(RealmsConfigureWorldScreen configureScreen, Screen lastScreen, RealmsServer serverData) { + public RealmsInviteScreen(RealmsConfigureWorldScreen configureScreen, RealmsServer serverData) { super(TITLE); this.configureScreen = configureScreen; - this.lastScreen = lastScreen; this.serverData = serverData; } @@ -66,53 +61,49 @@ public class RealmsInviteScreen extends RealmsScreen { @Override protected void setInitialFocus() { - this.setInitialFocus(this.profileName); + if (this.profileName != null) { + this.setInitialFocus(this.profileName); + } } private void onInvite() { - if (StringUtil.isBlank(this.profileName.getValue())) { - this.showMessage(NO_SUCH_PLAYER_ERROR_TEXT); - } else { - long l = this.serverData.id; - String string = this.profileName.getValue().trim(); - this.inviteButton.active = false; - this.profileName.setEditable(false); - this.showMessage(INVITING_PLAYER_TEXT); - CompletableFuture.supplyAsync(() -> { - try { - return RealmsClient.getOrCreate().invite(l, string); - } catch (Exception var4) { - LOGGER.error("Couldn't invite user"); - return null; - } - }, Util.ioPool()).thenAcceptAsync(realmsServer -> { - if (realmsServer != null) { - this.serverData.players = realmsServer.players; - this.minecraft.setScreen(new RealmsPlayerScreen(this.configureScreen, this.serverData)); - } else { - this.showMessage(NO_SUCH_PLAYER_ERROR_TEXT); - } + if (this.inviteButton != null && this.profileName != null) { + if (StringUtil.isBlank(this.profileName.getValue())) { + this.showMessage(NO_SUCH_PLAYER_ERROR_TEXT); + } else { + long l = this.serverData.id; + String string = this.profileName.getValue().trim(); + this.inviteButton.active = false; + this.profileName.setEditable(false); + this.showMessage(INVITING_PLAYER_TEXT); + CompletableFuture.supplyAsync(() -> this.configureScreen.invitePlayer(l, string), Util.ioPool()).thenAcceptAsync(boolean_ -> { + if (boolean_) { + this.minecraft.setScreen(this.configureScreen); + } else { + this.showMessage(NO_SUCH_PLAYER_ERROR_TEXT); + } - this.profileName.setEditable(true); - this.inviteButton.active = true; - }, this.screenExecutor); + this.profileName.setEditable(true); + this.inviteButton.active = true; + }, this.screenExecutor); + } } } private void showMessage(Component message) { this.message = message; - this.minecraft.getNarrator().sayNow(message); + this.minecraft.getNarrator().saySystemNow(message); } @Override public void onClose() { - this.minecraft.setScreen(this.lastScreen); + this.minecraft.setScreen(this.configureScreen); } @Override public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTick) { super.render(guiGraphics, mouseX, mouseY, partialTick); - if (this.message != null) { + if (this.message != null && this.inviteButton != null) { guiGraphics.drawCenteredString(this.font, this.message, this.width / 2, this.inviteButton.getY() + this.inviteButton.getHeight() + 8, -1); } } diff --git a/com/mojang/realmsclient/gui/screens/RealmsPlayerScreen.java b/com/mojang/realmsclient/gui/screens/configuration/RealmsPlayersTab.java similarity index 52% rename from com/mojang/realmsclient/gui/screens/RealmsPlayerScreen.java rename to com/mojang/realmsclient/gui/screens/configuration/RealmsPlayersTab.java index c01f73ba..acc4a290 100644 --- a/com/mojang/realmsclient/gui/screens/RealmsPlayerScreen.java +++ b/com/mojang/realmsclient/gui/screens/configuration/RealmsPlayersTab.java @@ -1,12 +1,11 @@ -package com.mojang.realmsclient.gui.screens; +package com.mojang.realmsclient.gui.screens.configuration; import com.google.common.collect.ImmutableList; import com.mojang.logging.LogUtils; -import com.mojang.realmsclient.client.RealmsClient; import com.mojang.realmsclient.dto.Ops; import com.mojang.realmsclient.dto.PlayerInfo; import com.mojang.realmsclient.dto.RealmsServer; -import com.mojang.realmsclient.exception.RealmsServiceException; +import com.mojang.realmsclient.gui.screens.RealmsConfirmScreen; import com.mojang.realmsclient.util.RealmsUtil; import java.util.List; import java.util.UUID; @@ -15,93 +14,74 @@ import net.fabricmc.api.Environment; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.client.gui.components.AbstractWidget; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.components.ContainerObjectSelectionList; import net.minecraft.client.gui.components.SpriteIconButton; import net.minecraft.client.gui.components.events.GuiEventListener; -import net.minecraft.client.gui.layouts.HeaderAndFooterLayout; -import net.minecraft.client.gui.layouts.LinearLayout; +import net.minecraft.client.gui.components.tabs.GridLayoutTab; +import net.minecraft.client.gui.layouts.GridLayout; +import net.minecraft.client.gui.layouts.LayoutSettings; import net.minecraft.client.gui.narration.NarratableEntry; +import net.minecraft.client.gui.navigation.ScreenRectangle; import net.minecraft.network.chat.CommonComponents; import net.minecraft.network.chat.Component; -import net.minecraft.realms.RealmsScreen; import net.minecraft.resources.ResourceLocation; -import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; @Environment(EnvType.CLIENT) -public class RealmsPlayerScreen extends RealmsScreen { +class RealmsPlayersTab extends GridLayoutTab implements RealmsConfigurationTab { static final Logger LOGGER = LogUtils.getLogger(); - private static final Component TITLE = Component.translatable("mco.configure.world.players.title"); + static final Component TITLE = Component.translatable("mco.configure.world.players.title"); static final Component QUESTION_TITLE = Component.translatable("mco.question"); private static final int PADDING = 8; - final HeaderAndFooterLayout layout = new HeaderAndFooterLayout(this); - private final RealmsConfigureWorldScreen lastScreen; - final RealmsServer serverData; - @Nullable - private RealmsPlayerScreen.InvitedObjectSelectionList invitedList; - boolean stateChanged; + final RealmsConfigureWorldScreen configurationScreen; + final Minecraft minecraft; + RealmsServer serverData; + private final RealmsPlayersTab.InvitedObjectSelectionList invitedList; - public RealmsPlayerScreen(RealmsConfigureWorldScreen lastScreen, RealmsServer serverData) { + RealmsPlayersTab(RealmsConfigureWorldScreen configurationScreen, Minecraft minecraft, RealmsServer serverData) { super(TITLE); - this.lastScreen = lastScreen; + this.configurationScreen = configurationScreen; + this.minecraft = minecraft; this.serverData = serverData; - } - - @Override - public void init() { - this.layout.addTitleHeader(TITLE, this.font); - this.invitedList = this.layout.addToContents(new RealmsPlayerScreen.InvitedObjectSelectionList()); - this.repopulateInvitedList(); - LinearLayout linearLayout = this.layout.addToFooter(LinearLayout.horizontal().spacing(8)); - linearLayout.addChild( - Button.builder( - Component.translatable("mco.configure.world.buttons.invite"), - button -> this.minecraft.setScreen(new RealmsInviteScreen(this.lastScreen, this, this.serverData)) - ) - .build() + GridLayout.RowHelper rowHelper = this.layout.spacing(8).createRowHelper(1); + this.invitedList = rowHelper.addChild( + new RealmsPlayersTab.InvitedObjectSelectionList(configurationScreen.width, this.calculateListHeight()), + LayoutSettings.defaults().alignVerticallyTop().alignHorizontallyCenter() ); - linearLayout.addChild(Button.builder(CommonComponents.GUI_BACK, button -> this.onClose()).build()); - this.layout.visitWidgets(guiEventListener -> { - AbstractWidget var10000 = this.addRenderableWidget(guiEventListener); - }); - this.repositionElements(); + rowHelper.addChild( + Button.builder( + Component.translatable("mco.configure.world.buttons.invite"), button -> minecraft.setScreen(new RealmsInviteScreen(configurationScreen, serverData)) + ) + .build(), + LayoutSettings.defaults().alignVerticallyBottom().alignHorizontallyCenter() + ); + this.updateData(serverData); + } + + public int calculateListHeight() { + return this.configurationScreen.getContentHeight() - 20 - 16; } @Override - protected void repositionElements() { - this.layout.arrangeElements(); - if (this.invitedList != null) { - this.invitedList.updateSize(this.width, this.layout); - } - } - - void repopulateInvitedList() { - if (this.invitedList != null) { - this.invitedList.children().clear(); - - for (PlayerInfo playerInfo : this.serverData.players) { - this.invitedList.children().add(new RealmsPlayerScreen.Entry(playerInfo)); - } - } + public void doLayout(ScreenRectangle rectangle) { + this.invitedList.setSize(this.configurationScreen.width, this.calculateListHeight()); + super.doLayout(rectangle); } @Override - public void onClose() { - this.backButtonClicked(); - } + public void updateData(RealmsServer server) { + this.serverData = server; + this.invitedList.children().clear(); - private void backButtonClicked() { - if (this.stateChanged) { - this.minecraft.setScreen(this.lastScreen.getNewScreen()); - } else { - this.minecraft.setScreen(this.lastScreen); + for (PlayerInfo playerInfo : server.players) { + this.invitedList.children().add(new RealmsPlayersTab.Entry(playerInfo)); } } @Environment(EnvType.CLIENT) - class Entry extends ContainerObjectSelectionList.Entry { + class Entry extends ContainerObjectSelectionList.Entry { + protected static final int SKIN_FACE_SIZE = 32; private static final Component NORMAL_USER_TEXT = Component.translatable("mco.configure.world.invites.normal.tooltip"); private static final Component OP_TEXT = Component.translatable("mco.configure.world.invites.ops.tooltip"); private static final Component REMOVE_TEXT = Component.translatable("mco.configure.world.invites.remove.tooltip"); @@ -117,10 +97,10 @@ public class RealmsPlayerScreen extends RealmsScreen { public Entry(final PlayerInfo playerInfo) { this.playerInfo = playerInfo; - int i = RealmsPlayerScreen.this.serverData.players.indexOf(this.playerInfo); + int i = RealmsPlayersTab.this.serverData.players.indexOf(this.playerInfo); this.makeOpButton = SpriteIconButton.builder(NORMAL_USER_TEXT, button -> this.op(i), false) .sprite(MAKE_OP_SPRITE, 8, 7) - .width(16 + RealmsPlayerScreen.this.font.width(NORMAL_USER_TEXT)) + .width(16 + RealmsPlayersTab.this.configurationScreen.getFont().width(NORMAL_USER_TEXT)) .narration( supplier -> CommonComponents.joinForNarration( Component.translatable("mco.invited.player.narration", playerInfo.getName()), @@ -131,7 +111,7 @@ public class RealmsPlayerScreen extends RealmsScreen { .build(); this.removeOpButton = SpriteIconButton.builder(OP_TEXT, button -> this.deop(i), false) .sprite(REMOVE_OP_SPRITE, 8, 7) - .width(16 + RealmsPlayerScreen.this.font.width(OP_TEXT)) + .width(16 + RealmsPlayersTab.this.configurationScreen.getFont().width(OP_TEXT)) .narration( supplier -> CommonComponents.joinForNarration( Component.translatable("mco.invited.player.narration", playerInfo.getName()), @@ -142,7 +122,7 @@ public class RealmsPlayerScreen extends RealmsScreen { .build(); this.removeButton = SpriteIconButton.builder(REMOVE_TEXT, button -> this.uninvite(i), false) .sprite(REMOVE_PLAYER_SPRITE, 8, 7) - .width(16 + RealmsPlayerScreen.this.font.width(REMOVE_TEXT)) + .width(16 + RealmsPlayersTab.this.configurationScreen.getFont().width(REMOVE_TEXT)) .narration( supplier -> CommonComponents.joinForNarration(Component.translatable("mco.invited.player.narration", playerInfo.getName()), (Component)supplier.get()) ) @@ -150,60 +130,57 @@ public class RealmsPlayerScreen extends RealmsScreen { this.updateOpButtons(); } - private void op(int index) { - RealmsClient realmsClient = RealmsClient.getOrCreate(); - UUID uUID = ((PlayerInfo)RealmsPlayerScreen.this.serverData.players.get(index)).getUuid(); - - try { - this.updateOps(realmsClient.op(RealmsPlayerScreen.this.serverData.id, uUID)); - } catch (RealmsServiceException var5) { - RealmsPlayerScreen.LOGGER.error("Couldn't op the user", (Throwable)var5); - } - - this.updateOpButtons(); - this.setFocused(this.removeOpButton); + private void op(int player) { + UUID uUID = ((PlayerInfo)RealmsPlayersTab.this.serverData.players.get(player)).getUuid(); + RealmsUtil.supplyAsync( + realmsClient -> realmsClient.op(RealmsPlayersTab.this.serverData.id, uUID), + realmsServiceException -> RealmsPlayersTab.LOGGER.error("Couldn't op the user", (Throwable)realmsServiceException) + ) + .thenAcceptAsync(ops -> { + this.updateOps(ops); + this.updateOpButtons(); + this.setFocused(this.removeOpButton); + }, RealmsPlayersTab.this.minecraft); } - private void deop(int index) { - RealmsClient realmsClient = RealmsClient.getOrCreate(); - UUID uUID = ((PlayerInfo)RealmsPlayerScreen.this.serverData.players.get(index)).getUuid(); - - try { - this.updateOps(realmsClient.deop(RealmsPlayerScreen.this.serverData.id, uUID)); - } catch (RealmsServiceException var5) { - RealmsPlayerScreen.LOGGER.error("Couldn't deop the user", (Throwable)var5); - } - - this.updateOpButtons(); - this.setFocused(this.makeOpButton); + private void deop(int player) { + UUID uUID = ((PlayerInfo)RealmsPlayersTab.this.serverData.players.get(player)).getUuid(); + RealmsUtil.supplyAsync( + realmsClient -> realmsClient.deop(RealmsPlayersTab.this.serverData.id, uUID), + realmsServiceException -> RealmsPlayersTab.LOGGER.error("Couldn't deop the user", (Throwable)realmsServiceException) + ) + .thenAcceptAsync(ops -> { + this.updateOps(ops); + this.updateOpButtons(); + this.setFocused(this.makeOpButton); + }, RealmsPlayersTab.this.minecraft); } - private void uninvite(int index) { - if (index >= 0 && index < RealmsPlayerScreen.this.serverData.players.size()) { - PlayerInfo playerInfo = (PlayerInfo)RealmsPlayerScreen.this.serverData.players.get(index); - RealmsConfirmScreen realmsConfirmScreen = new RealmsConfirmScreen(bl -> { - if (bl) { - RealmsClient realmsClient = RealmsClient.getOrCreate(); - - try { - realmsClient.uninvite(RealmsPlayerScreen.this.serverData.id, playerInfo.getUuid()); - } catch (RealmsServiceException var6) { - RealmsPlayerScreen.LOGGER.error("Couldn't uninvite user", (Throwable)var6); + private void uninvite(int player) { + if (player >= 0 && player < RealmsPlayersTab.this.serverData.players.size()) { + PlayerInfo playerInfo = (PlayerInfo)RealmsPlayersTab.this.serverData.players.get(player); + RealmsConfirmScreen realmsConfirmScreen = new RealmsConfirmScreen( + bl -> { + if (bl) { + RealmsUtil.runAsync( + realmsClient -> realmsClient.uninvite(RealmsPlayersTab.this.serverData.id, playerInfo.getUuid()), + realmsServiceException -> RealmsPlayersTab.LOGGER.error("Couldn't uninvite user", (Throwable)realmsServiceException) + ); + RealmsPlayersTab.this.serverData.players.remove(player); + RealmsPlayersTab.this.updateData(RealmsPlayersTab.this.serverData); } - RealmsPlayerScreen.this.serverData.players.remove(index); - RealmsPlayerScreen.this.repopulateInvitedList(); - } - - RealmsPlayerScreen.this.stateChanged = true; - RealmsPlayerScreen.this.minecraft.setScreen(RealmsPlayerScreen.this); - }, RealmsPlayerScreen.QUESTION_TITLE, Component.translatable("mco.configure.world.uninvite.player", playerInfo.getName())); - RealmsPlayerScreen.this.minecraft.setScreen(realmsConfirmScreen); + RealmsPlayersTab.this.minecraft.setScreen(RealmsPlayersTab.this.configurationScreen); + }, + RealmsPlayersTab.QUESTION_TITLE, + Component.translatable("mco.configure.world.uninvite.player", playerInfo.getName()) + ); + RealmsPlayersTab.this.minecraft.setScreen(realmsConfirmScreen); } } private void updateOps(Ops ops) { - for (PlayerInfo playerInfo : RealmsPlayerScreen.this.serverData.players) { + for (PlayerInfo playerInfo : RealmsPlayersTab.this.serverData.players) { playerInfo.setOperator(ops.ops.contains(playerInfo.getName())); } } @@ -233,7 +210,7 @@ public class RealmsPlayerScreen extends RealmsScreen { if (!this.playerInfo.getAccepted()) { i = -6250336; } else if (this.playerInfo.getOnline()) { - i = 8388479; + i = -16711936; } else { i = -1; } @@ -241,7 +218,7 @@ public class RealmsPlayerScreen extends RealmsScreen { int j = top + height / 2 - 16; RealmsUtil.renderPlayerFace(guiGraphics, left, j, 32, this.playerInfo.getUuid()); int k = top + height / 2 - 9 / 2; - guiGraphics.drawString(RealmsPlayerScreen.this.font, this.playerInfo.getName(), left + 8 + 32, k, i); + guiGraphics.drawString(RealmsPlayersTab.this.configurationScreen.getFont(), this.playerInfo.getName(), left + 8 + 32, k, i); int l = top + height / 2 - 10; int m = left + width - this.removeButton.getWidth(); this.removeButton.setPosition(m, l); @@ -255,25 +232,32 @@ public class RealmsPlayerScreen extends RealmsScreen { } @Environment(EnvType.CLIENT) - class InvitedObjectSelectionList extends ContainerObjectSelectionList { + class InvitedObjectSelectionList extends ContainerObjectSelectionList { private static final int ITEM_HEIGHT = 36; - public InvitedObjectSelectionList() { - super( - Minecraft.getInstance(), - RealmsPlayerScreen.this.width, - RealmsPlayerScreen.this.layout.getContentHeight(), - RealmsPlayerScreen.this.layout.getHeaderHeight(), - 36, - (int)(9.0F * 1.5F) - ); + public InvitedObjectSelectionList(final int width, final int height) { + super(Minecraft.getInstance(), width, height, RealmsPlayersTab.this.configurationScreen.getHeaderHeight(), 36, (int)(9.0F * 1.5F)); } @Override protected void renderHeader(GuiGraphics guiGraphics, int x, int y) { - String string = RealmsPlayerScreen.this.serverData.players != null ? Integer.toString(RealmsPlayerScreen.this.serverData.players.size()) : "0"; + String string = RealmsPlayersTab.this.serverData.players != null ? Integer.toString(RealmsPlayersTab.this.serverData.players.size()) : "0"; Component component = Component.translatable("mco.configure.world.invited.number", string).withStyle(ChatFormatting.UNDERLINE); - guiGraphics.drawString(RealmsPlayerScreen.this.font, component, x + this.getRowWidth() / 2 - RealmsPlayerScreen.this.font.width(component) / 2, y, -1); + guiGraphics.drawString( + RealmsPlayersTab.this.configurationScreen.getFont(), + component, + x + this.getRowWidth() / 2 - RealmsPlayersTab.this.configurationScreen.getFont().width(component) / 2, + y, + -1 + ); + } + + @Override + protected void renderListBackground(GuiGraphics guiGraphics) { + } + + @Override + protected void renderListSeparators(GuiGraphics guiGraphics) { } @Override diff --git a/com/mojang/realmsclient/gui/screens/configuration/RealmsPreferredRegionSelectionScreen.java b/com/mojang/realmsclient/gui/screens/configuration/RealmsPreferredRegionSelectionScreen.java new file mode 100644 index 00000000..eb1bc7e9 --- /dev/null +++ b/com/mojang/realmsclient/gui/screens/configuration/RealmsPreferredRegionSelectionScreen.java @@ -0,0 +1,165 @@ +package com.mojang.realmsclient.gui.screens.configuration; + +import com.mojang.realmsclient.dto.RealmsRegion; +import com.mojang.realmsclient.dto.RegionSelectionPreference; +import com.mojang.realmsclient.dto.ServiceQuality; +import java.util.Map; +import java.util.Objects; +import java.util.function.BiConsumer; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.client.gui.components.AbstractWidget; +import net.minecraft.client.gui.components.Button; +import net.minecraft.client.gui.components.ObjectSelectionList; +import net.minecraft.client.gui.components.StringWidget; +import net.minecraft.client.gui.layouts.HeaderAndFooterLayout; +import net.minecraft.client.gui.layouts.LinearLayout; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.renderer.RenderPipelines; +import net.minecraft.network.chat.CommonComponents; +import net.minecraft.network.chat.Component; +import org.jetbrains.annotations.Nullable; + +@Environment(EnvType.CLIENT) +public class RealmsPreferredRegionSelectionScreen extends Screen { + private static final Component REGION_SELECTION_LABEL = Component.translatable("mco.configure.world.region_preference.title"); + private static final int SPACING = 8; + private final HeaderAndFooterLayout layout = new HeaderAndFooterLayout(this); + private final Screen parent; + private final BiConsumer applySettings; + final Map regionServiceQuality; + @Nullable + private RealmsPreferredRegionSelectionScreen.RegionSelectionList list; + RealmsSettingsTab.RegionSelection selection; + @Nullable + private Button doneButton; + + public RealmsPreferredRegionSelectionScreen( + Screen parent, + BiConsumer applySettings, + Map regionServiceQuality, + RealmsSettingsTab.RegionSelection selection + ) { + super(REGION_SELECTION_LABEL); + this.parent = parent; + this.applySettings = applySettings; + this.regionServiceQuality = regionServiceQuality; + this.selection = selection; + } + + @Override + public void onClose() { + this.minecraft.setScreen(this.parent); + } + + @Override + protected void init() { + LinearLayout linearLayout = this.layout.addToHeader(LinearLayout.vertical().spacing(8)); + linearLayout.defaultCellSetting().alignHorizontallyCenter(); + linearLayout.addChild(new StringWidget(this.getTitle(), this.font)); + this.list = this.layout.addToContents(new RealmsPreferredRegionSelectionScreen.RegionSelectionList()); + LinearLayout linearLayout2 = this.layout.addToFooter(LinearLayout.horizontal().spacing(8)); + this.doneButton = linearLayout2.addChild(Button.builder(CommonComponents.GUI_DONE, button -> { + this.applySettings.accept(this.selection.preference(), this.selection.region()); + this.onClose(); + }).build()); + linearLayout2.addChild(Button.builder(CommonComponents.GUI_CANCEL, button -> this.onClose()).build()); + this.list + .setSelected( + (RealmsPreferredRegionSelectionScreen.RegionSelectionList.Entry)this.list + .children() + .stream() + .filter(entry -> Objects.equals(entry.regionSelection, this.selection)) + .findFirst() + .orElse(null) + ); + this.layout.visitWidgets(guiEventListener -> { + AbstractWidget var10000 = this.addRenderableWidget(guiEventListener); + }); + this.repositionElements(); + } + + @Override + protected void repositionElements() { + this.layout.arrangeElements(); + this.list.updateSize(this.width, this.layout); + } + + void updateButtonValidity() { + this.doneButton.active = this.list.getSelected() != null; + } + + @Environment(EnvType.CLIENT) + class RegionSelectionList extends ObjectSelectionList { + RegionSelectionList() { + super( + RealmsPreferredRegionSelectionScreen.this.minecraft, + RealmsPreferredRegionSelectionScreen.this.width, + RealmsPreferredRegionSelectionScreen.this.height - 77, + 40, + 16 + ); + this.addEntry(new RealmsPreferredRegionSelectionScreen.RegionSelectionList.Entry(RegionSelectionPreference.AUTOMATIC_PLAYER, null)); + this.addEntry(new RealmsPreferredRegionSelectionScreen.RegionSelectionList.Entry(RegionSelectionPreference.AUTOMATIC_OWNER, null)); + RealmsPreferredRegionSelectionScreen.this.regionServiceQuality + .keySet() + .stream() + .map(realmsRegion -> new RealmsPreferredRegionSelectionScreen.RegionSelectionList.Entry(RegionSelectionPreference.MANUAL, realmsRegion)) + .forEach(entry -> this.addEntry(entry)); + } + + public void setSelected(@Nullable RealmsPreferredRegionSelectionScreen.RegionSelectionList.Entry selected) { + super.setSelected(selected); + if (selected != null) { + RealmsPreferredRegionSelectionScreen.this.selection = selected.regionSelection; + } + + RealmsPreferredRegionSelectionScreen.this.updateButtonValidity(); + } + + @Environment(EnvType.CLIENT) + class Entry extends ObjectSelectionList.Entry { + final RealmsSettingsTab.RegionSelection regionSelection; + private final Component name; + + public Entry(final RegionSelectionPreference regionSelectionPreference, @Nullable final RealmsRegion preferredRegion) { + this(new RealmsSettingsTab.RegionSelection(regionSelectionPreference, preferredRegion)); + } + + public Entry(final RealmsSettingsTab.RegionSelection regionSelection) { + this.regionSelection = regionSelection; + if (regionSelection.preference() == RegionSelectionPreference.MANUAL) { + if (regionSelection.region() != null) { + this.name = Component.translatable(regionSelection.region().translationKey); + } else { + this.name = Component.empty(); + } + } else { + this.name = Component.translatable(regionSelection.preference().translationKey); + } + } + + @Override + public Component getNarration() { + return Component.translatable("narrator.select", this.name); + } + + @Override + public void render(GuiGraphics guiGraphics, int index, int top, int left, int width, int height, int mouseX, int mouseY, boolean hovering, float partialTick) { + guiGraphics.drawString(RealmsPreferredRegionSelectionScreen.this.font, this.name, left + 5, top + 2, -1); + if (this.regionSelection.region() != null && RealmsPreferredRegionSelectionScreen.this.regionServiceQuality.containsKey(this.regionSelection.region())) { + ServiceQuality serviceQuality = (ServiceQuality)RealmsPreferredRegionSelectionScreen.this.regionServiceQuality + .getOrDefault(this.regionSelection.region(), ServiceQuality.UNKNOWN); + guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, serviceQuality.getIcon(), left + width - 18, top + 2, 10, 8); + } + } + + @Override + public boolean mouseClicked(double mouseX, double mouseY, int button) { + RegionSelectionList.this.setSelected(this); + return super.mouseClicked(mouseX, mouseY, button); + } + } + } +} diff --git a/com/mojang/realmsclient/gui/screens/configuration/RealmsSettingsTab.java b/com/mojang/realmsclient/gui/screens/configuration/RealmsSettingsTab.java new file mode 100644 index 00000000..e708e559 --- /dev/null +++ b/com/mojang/realmsclient/gui/screens/configuration/RealmsSettingsTab.java @@ -0,0 +1,192 @@ +package com.mojang.realmsclient.gui.screens.configuration; + +import com.mojang.realmsclient.dto.RealmsRegion; +import com.mojang.realmsclient.dto.RealmsServer; +import com.mojang.realmsclient.dto.RegionSelectionPreference; +import com.mojang.realmsclient.dto.RegionSelectionPreferenceDto; +import com.mojang.realmsclient.dto.ServiceQuality; +import com.mojang.realmsclient.gui.screens.RealmsPopups; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.ChatFormatting; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.components.Button; +import net.minecraft.client.gui.components.EditBox; +import net.minecraft.client.gui.components.ImageWidget; +import net.minecraft.client.gui.components.StringWidget; +import net.minecraft.client.gui.components.tabs.GridLayoutTab; +import net.minecraft.client.gui.layouts.EqualSpacingLayout; +import net.minecraft.client.gui.layouts.GridLayout; +import net.minecraft.client.gui.layouts.SpacerElement; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.MutableComponent; +import net.minecraft.resources.ResourceLocation; +import org.jetbrains.annotations.Nullable; + +@Environment(EnvType.CLIENT) +public class RealmsSettingsTab extends GridLayoutTab implements RealmsConfigurationTab { + private static final int COMPONENT_WIDTH = 212; + private static final int EXTRA_SPACING = 2; + private static final int DEFAULT_SPACING = 6; + static final Component TITLE = Component.translatable("mco.configure.world.settings.title"); + private static final Component NAME_LABEL = Component.translatable("mco.configure.world.name"); + private static final Component DESCRIPTION_LABEL = Component.translatable("mco.configure.world.description"); + private static final Component REGION_PREFERENCE_LABEL = Component.translatable("mco.configure.world.region_preference"); + private final RealmsConfigureWorldScreen configurationScreen; + private final Minecraft minecraft; + private RealmsServer serverData; + private final Map regionServiceQuality; + final Button closeOpenButton; + private EditBox descEdit; + private EditBox nameEdit; + private final StringWidget selectedRegionStringWidget; + private final ImageWidget selectedRegionImageWidget; + private RealmsSettingsTab.RegionSelection preferredRegionSelection; + + RealmsSettingsTab( + RealmsConfigureWorldScreen configurationScreen, Minecraft minecraft, RealmsServer serverData, Map regionServiceQuality + ) { + super(TITLE); + this.configurationScreen = configurationScreen; + this.minecraft = minecraft; + this.serverData = serverData; + this.regionServiceQuality = regionServiceQuality; + GridLayout.RowHelper rowHelper = this.layout.rowSpacing(6).createRowHelper(1); + rowHelper.addChild(new StringWidget(NAME_LABEL, configurationScreen.getFont())); + this.nameEdit = new EditBox(minecraft.font, 0, 0, 212, 20, Component.translatable("mco.configure.world.name")); + this.nameEdit.setMaxLength(32); + rowHelper.addChild(this.nameEdit); + rowHelper.addChild(SpacerElement.height(2)); + rowHelper.addChild(new StringWidget(DESCRIPTION_LABEL, configurationScreen.getFont())); + this.descEdit = new EditBox(minecraft.font, 0, 0, 212, 20, Component.translatable("mco.configure.world.description")); + this.descEdit.setMaxLength(32); + rowHelper.addChild(this.descEdit); + rowHelper.addChild(SpacerElement.height(2)); + rowHelper.addChild(new StringWidget(REGION_PREFERENCE_LABEL, configurationScreen.getFont())); + EqualSpacingLayout equalSpacingLayout = new EqualSpacingLayout(0, 0, 212, 9, EqualSpacingLayout.Orientation.HORIZONTAL); + this.selectedRegionStringWidget = equalSpacingLayout.addChild(new StringWidget(192, 9, Component.empty(), configurationScreen.getFont()).alignLeft()); + this.selectedRegionImageWidget = equalSpacingLayout.addChild(ImageWidget.sprite(10, 8, ServiceQuality.UNKNOWN.getIcon())); + rowHelper.addChild(equalSpacingLayout); + rowHelper.addChild( + Button.builder(Component.translatable("mco.configure.world.buttons.region_preference"), button -> this.openPreferenceSelector()) + .bounds(0, 0, 212, 20) + .build() + ); + rowHelper.addChild(SpacerElement.height(2)); + this.closeOpenButton = rowHelper.addChild( + Button.builder( + Component.empty(), + button -> { + if (serverData.state == RealmsServer.State.OPEN) { + minecraft.setScreen( + RealmsPopups.customPopupScreen( + configurationScreen, + Component.translatable("mco.configure.world.close.question.title"), + Component.translatable("mco.configure.world.close.question.line1"), + popupScreen -> { + this.save(); + configurationScreen.closeTheWorld(); + } + ) + ); + } else { + this.save(); + configurationScreen.openTheWorld(false); + } + } + ) + .bounds(0, 0, 212, 20) + .build() + ); + this.closeOpenButton.active = false; + this.updateData(serverData); + } + + private static MutableComponent getTranslatableFromPreference(RealmsSettingsTab.RegionSelection regionSelection) { + return (regionSelection.preference().equals(RegionSelectionPreference.MANUAL) && regionSelection.region() != null + ? Component.translatable(regionSelection.region().translationKey) + : Component.translatable(regionSelection.preference().translationKey)) + .withStyle(ChatFormatting.GRAY); + } + + private static ResourceLocation getServiceQualityIcon(RealmsSettingsTab.RegionSelection regionSelection, Map qualities) { + if (regionSelection.region() != null && qualities.containsKey(regionSelection.region())) { + ServiceQuality serviceQuality = (ServiceQuality)qualities.getOrDefault(regionSelection.region(), ServiceQuality.UNKNOWN); + return serviceQuality.getIcon(); + } else { + return ServiceQuality.UNKNOWN.getIcon(); + } + } + + private void openPreferenceSelector() { + this.minecraft + .setScreen( + new RealmsPreferredRegionSelectionScreen( + this.configurationScreen, this::applyRegionPreferenceSelection, this.regionServiceQuality, this.preferredRegionSelection + ) + ); + } + + private void applyRegionPreferenceSelection(RegionSelectionPreference regionSelectionPreference, RealmsRegion preferredRegion) { + this.preferredRegionSelection = new RealmsSettingsTab.RegionSelection(regionSelectionPreference, preferredRegion); + this.updateRegionPreferenceValues(); + } + + private void updateRegionPreferenceValues() { + this.selectedRegionStringWidget.setMessage(getTranslatableFromPreference(this.preferredRegionSelection)); + this.selectedRegionImageWidget.updateResource(getServiceQualityIcon(this.preferredRegionSelection, this.regionServiceQuality)); + this.selectedRegionImageWidget.visible = this.preferredRegionSelection.preference == RegionSelectionPreference.MANUAL; + } + + @Override + public void onSelected(RealmsServer server) { + this.updateData(server); + } + + @Override + public void updateData(RealmsServer server) { + this.serverData = server; + if (server.regionSelectionPreference == null) { + server.regionSelectionPreference = RegionSelectionPreferenceDto.DEFAULT; + } + + if (server.regionSelectionPreference.regionSelectionPreference == RegionSelectionPreference.MANUAL + && server.regionSelectionPreference.preferredRegion == null) { + Optional optional = this.regionServiceQuality.keySet().stream().findFirst(); + optional.ifPresent(realmsRegion -> server.regionSelectionPreference.preferredRegion = realmsRegion); + } + + String string = server.state == RealmsServer.State.OPEN ? "mco.configure.world.buttons.close" : "mco.configure.world.buttons.open"; + this.closeOpenButton.setMessage(Component.translatable(string)); + this.closeOpenButton.active = true; + this.preferredRegionSelection = new RealmsSettingsTab.RegionSelection( + server.regionSelectionPreference.regionSelectionPreference, server.regionSelectionPreference.preferredRegion + ); + this.nameEdit.setValue((String)Objects.requireNonNullElse(server.getName(), "")); + this.descEdit.setValue(server.getDescription()); + this.updateRegionPreferenceValues(); + } + + @Override + public void onDeselected(RealmsServer server) { + this.save(); + } + + public void save() { + if (this.serverData.regionSelectionPreference == null + || !Objects.equals(this.nameEdit.getValue(), this.serverData.name) + || !Objects.equals(this.descEdit.getValue(), this.serverData.motd) + || this.preferredRegionSelection.preference() != this.serverData.regionSelectionPreference.regionSelectionPreference + || this.preferredRegionSelection.region() != this.serverData.regionSelectionPreference.preferredRegion) { + this.configurationScreen + .saveSettings(this.nameEdit.getValue(), this.descEdit.getValue(), this.preferredRegionSelection.preference(), this.preferredRegionSelection.region()); + } + } + + @Environment(EnvType.CLIENT) + public record RegionSelection(RegionSelectionPreference preference, @Nullable RealmsRegion region) { + } +} diff --git a/com/mojang/realmsclient/gui/screens/RealmsSlotOptionsScreen.java b/com/mojang/realmsclient/gui/screens/configuration/RealmsSlotOptionsScreen.java similarity index 68% rename from com/mojang/realmsclient/gui/screens/RealmsSlotOptionsScreen.java rename to com/mojang/realmsclient/gui/screens/configuration/RealmsSlotOptionsScreen.java index d8eb8128..be13f059 100644 --- a/com/mojang/realmsclient/gui/screens/RealmsSlotOptionsScreen.java +++ b/com/mojang/realmsclient/gui/screens/configuration/RealmsSlotOptionsScreen.java @@ -1,8 +1,10 @@ -package com.mojang.realmsclient.gui.screens; +package com.mojang.realmsclient.gui.screens.configuration; import com.google.common.collect.ImmutableList; +import com.mojang.realmsclient.dto.RealmsServer; +import com.mojang.realmsclient.dto.RealmsSlot; import com.mojang.realmsclient.dto.RealmsWorldOptions; -import com.mojang.realmsclient.dto.RealmsServer.WorldType; +import com.mojang.realmsclient.gui.screens.RealmsPopups; import java.util.List; import java.util.function.Consumer; import net.fabricmc.api.EnvType; @@ -12,7 +14,6 @@ import net.minecraft.client.gui.components.AbstractSliderButton; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.components.CycleButton; import net.minecraft.client.gui.components.EditBox; -import net.minecraft.client.gui.components.CycleButton.OnValueChange; import net.minecraft.network.chat.CommonComponents; import net.minecraft.network.chat.Component; import net.minecraft.realms.RealmsLabel; @@ -33,8 +34,8 @@ public class RealmsSlotOptionsScreen extends RealmsScreen { protected final RealmsConfigureWorldScreen parentScreen; private int column1X; private int columnWidth; - private final RealmsWorldOptions options; - private final WorldType worldType; + private final RealmsSlot slot; + private final RealmsServer.WorldType worldType; private Difficulty difficulty; private GameType gameMode; private final String defaultSlotName; @@ -46,21 +47,21 @@ public class RealmsSlotOptionsScreen extends RealmsScreen { private boolean forceGameMode; RealmsSlotOptionsScreen.SettingsSlider spawnProtectionButton; - public RealmsSlotOptionsScreen(RealmsConfigureWorldScreen parent, RealmsWorldOptions options, WorldType worldType, int activeSlot) { + public RealmsSlotOptionsScreen(RealmsConfigureWorldScreen parentScreen, RealmsSlot slot, RealmsServer.WorldType worldType, int slotIndex) { super(Component.translatable("mco.configure.world.buttons.options")); - this.parentScreen = parent; - this.options = options; + this.parentScreen = parentScreen; + this.slot = slot; this.worldType = worldType; - this.difficulty = findByIndex(DIFFICULTIES, options.difficulty, 2); - this.gameMode = findByIndex(GAME_MODES, options.gameMode, 0); - this.defaultSlotName = options.getDefaultSlotName(activeSlot); - this.setWorldName(options.getSlotName(activeSlot)); - if (worldType == WorldType.NORMAL) { - this.pvp = options.pvp; - this.spawnProtection = options.spawnProtection; - this.forceGameMode = options.forceGameMode; - this.spawnMonsters = options.spawnMonsters; - this.commandBlocks = options.commandBlocks; + this.difficulty = findByIndex(DIFFICULTIES, slot.options.difficulty, 2); + this.gameMode = findByIndex(GAME_MODES, slot.options.gameMode, 0); + this.defaultSlotName = slot.options.getDefaultSlotName(slotIndex); + this.setWorldName(slot.options.getSlotName(slotIndex)); + if (worldType == RealmsServer.WorldType.NORMAL) { + this.pvp = slot.options.pvp; + this.spawnProtection = slot.options.spawnProtection; + this.forceGameMode = slot.options.forceGameMode; + this.spawnMonsters = slot.options.spawnMonsters; + this.commandBlocks = slot.options.commandBlocks; } else { this.pvp = true; this.spawnProtection = 0; @@ -75,17 +76,17 @@ public class RealmsSlotOptionsScreen extends RealmsScreen { this.minecraft.setScreen(this.parentScreen); } - private static T findByIndex(List list, int index, int fallback) { + private static T findByIndex(List values, int index, int defaultIndex) { try { - return (T)list.get(index); + return (T)values.get(index); } catch (IndexOutOfBoundsException var4) { - return (T)list.get(fallback); + return (T)values.get(defaultIndex); } } - private static int findIndex(List list, T object, int fallback) { - int i = list.indexOf(object); - return i == -1 ? fallback : i; + private static int findIndex(List values, T item, int defaultIndex) { + int i = values.indexOf(item); + return i == -1 ? defaultIndex : i; } @Override @@ -93,17 +94,17 @@ public class RealmsSlotOptionsScreen extends RealmsScreen { this.columnWidth = 170; this.column1X = this.width / 2 - this.columnWidth; int i = this.width / 2 + 10; - if (this.worldType != WorldType.NORMAL) { + if (this.worldType != RealmsServer.WorldType.NORMAL) { Component component; - if (this.worldType == WorldType.ADVENTUREMAP) { + if (this.worldType == RealmsServer.WorldType.ADVENTUREMAP) { component = Component.translatable("mco.configure.world.edit.subscreen.adventuremap"); - } else if (this.worldType == WorldType.INSPIRATION) { + } else if (this.worldType == RealmsServer.WorldType.INSPIRATION) { component = Component.translatable("mco.configure.world.edit.subscreen.inspiration"); } else { component = Component.translatable("mco.configure.world.edit.subscreen.experience"); } - this.addLabel(new RealmsLabel(component, this.width / 2, 26, 16711680)); + this.addLabel(new RealmsLabel(component, this.width / 2, 26, -65536)); } this.nameEdit = this.addWidget( @@ -115,7 +116,7 @@ public class RealmsSlotOptionsScreen extends RealmsScreen { CycleButton.onOffBuilder(this.pvp) .create(i, row(1), this.columnWidth, 20, Component.translatable("mco.configure.world.pvp"), (cycleButtonx, boolean_) -> this.pvp = boolean_) ); - this.addRenderableWidget( + CycleButton cycleButton2 = this.addRenderableWidget( CycleButton.builder(GameType::getShortDisplayName) .withValues(GAME_MODES) .withInitialValue(this.gameMode) @@ -125,7 +126,7 @@ public class RealmsSlotOptionsScreen extends RealmsScreen { new RealmsSlotOptionsScreen.SettingsSlider(i, row(3), this.columnWidth, this.spawnProtection, 0.0F, 16.0F) ); Component component2 = Component.translatable("mco.configure.world.spawn_toggle.message"); - CycleButton cycleButton2 = CycleButton.onOffBuilder(this.difficulty != Difficulty.PEACEFUL && this.spawnMonsters) + CycleButton cycleButton3 = CycleButton.onOffBuilder(this.difficulty != Difficulty.PEACEFUL && this.spawnMonsters) .create( i, row(5), @@ -134,21 +135,21 @@ public class RealmsSlotOptionsScreen extends RealmsScreen { Component.translatable("mco.configure.world.spawnMonsters"), this.confirmDangerousOption(component2, boolean_ -> this.spawnMonsters = boolean_) ); - this.addRenderableWidget( + CycleButton cycleButton4 = this.addRenderableWidget( CycleButton.builder(Difficulty::getDisplayName) .withValues(DIFFICULTIES) .withInitialValue(this.difficulty) .create(this.column1X, row(5), this.columnWidth, 20, Component.translatable("options.difficulty"), (cycleButton2x, difficulty) -> { this.difficulty = difficulty; - if (this.worldType == WorldType.NORMAL) { + if (this.worldType == RealmsServer.WorldType.NORMAL) { boolean bl = this.difficulty != Difficulty.PEACEFUL; - cycleButton2.active = bl; - cycleButton2.setValue(bl && this.spawnMonsters); + cycleButton3.active = bl; + cycleButton3.setValue(bl && this.spawnMonsters); } }) ); - this.addRenderableWidget(cycleButton2); - CycleButton cycleButton3 = this.addRenderableWidget( + this.addRenderableWidget(cycleButton3); + CycleButton cycleButton5 = this.addRenderableWidget( CycleButton.onOffBuilder(this.forceGameMode) .create( this.column1X, @@ -159,22 +160,29 @@ public class RealmsSlotOptionsScreen extends RealmsScreen { (cycleButtonx, boolean_) -> this.forceGameMode = boolean_ ) ); - CycleButton cycleButton4 = this.addRenderableWidget( + CycleButton cycleButton6 = this.addRenderableWidget( CycleButton.onOffBuilder(this.commandBlocks) .create( i, row(7), this.columnWidth, 20, Component.translatable("mco.configure.world.commandBlocks"), (cycleButtonx, boolean_) -> this.commandBlocks = boolean_ ) ); - if (this.worldType != WorldType.NORMAL) { + if (this.worldType != RealmsServer.WorldType.NORMAL) { cycleButton.active = false; - cycleButton2.active = false; - this.spawnProtectionButton.active = false; - cycleButton4.active = false; cycleButton3.active = false; + this.spawnProtectionButton.active = false; + cycleButton5.active = false; } if (this.difficulty == Difficulty.PEACEFUL) { + cycleButton3.active = false; + } + + if (this.slot.isHardcore()) { + cycleButton6.active = false; + cycleButton4.active = false; cycleButton2.active = false; + cycleButton3.active = false; + cycleButton5.active = false; } this.addRenderableWidget( @@ -185,13 +193,13 @@ public class RealmsSlotOptionsScreen extends RealmsScreen { this.addRenderableWidget(Button.builder(CommonComponents.GUI_CANCEL, button -> this.onClose()).bounds(i, row(13), this.columnWidth, 20).build()); } - private OnValueChange confirmDangerousOption(Component question, Consumer onPress) { + private CycleButton.OnValueChange confirmDangerousOption(Component text, Consumer callback) { return (cycleButton, boolean_) -> { if (boolean_) { - onPress.accept(true); + callback.accept(true); } else { - this.minecraft.setScreen(RealmsPopups.warningPopupScreen(this, question, popupScreen -> { - onPress.accept(false); + this.minecraft.setScreen(RealmsPopups.warningPopupScreen(this, text, popupScreen -> { + callback.accept(false); popupScreen.onClose(); })); } @@ -211,50 +219,58 @@ public class RealmsSlotOptionsScreen extends RealmsScreen { this.nameEdit.render(guiGraphics, mouseX, mouseY, partialTick); } - private void setWorldName(String name) { - if (name.equals(this.defaultSlotName)) { + private void setWorldName(String worldName) { + if (worldName.equals(this.defaultSlotName)) { this.worldName = ""; } else { - this.worldName = name; + this.worldName = worldName; } } private void saveSettings() { int i = findIndex(DIFFICULTIES, this.difficulty, 2); int j = findIndex(GAME_MODES, this.gameMode, 0); - if (this.worldType != WorldType.ADVENTUREMAP && this.worldType != WorldType.EXPERIENCE && this.worldType != WorldType.INSPIRATION) { - boolean bl = this.worldType == WorldType.NORMAL && this.difficulty != Difficulty.PEACEFUL && this.spawnMonsters; + if (this.worldType != RealmsServer.WorldType.ADVENTUREMAP + && this.worldType != RealmsServer.WorldType.EXPERIENCE + && this.worldType != RealmsServer.WorldType.INSPIRATION) { + boolean bl = this.worldType == RealmsServer.WorldType.NORMAL && this.difficulty != Difficulty.PEACEFUL && this.spawnMonsters; this.parentScreen .saveSlotSettings( - new RealmsWorldOptions( - this.pvp, - bl, - this.spawnProtection, - this.commandBlocks, - i, - j, - this.options.hardcore, - this.forceGameMode, - this.worldName, - this.options.version, - this.options.compatibility + new RealmsSlot( + this.slot.slotId, + new RealmsWorldOptions( + this.pvp, + bl, + this.spawnProtection, + this.commandBlocks, + i, + j, + this.forceGameMode, + this.worldName, + this.slot.options.version, + this.slot.options.compatibility + ), + this.slot.settings ) ); } else { this.parentScreen .saveSlotSettings( - new RealmsWorldOptions( - this.options.pvp, - this.options.spawnMonsters, - this.options.spawnProtection, - this.options.commandBlocks, - i, - j, - this.options.hardcore, - this.options.forceGameMode, - this.worldName, - this.options.version, - this.options.compatibility + new RealmsSlot( + this.slot.slotId, + new RealmsWorldOptions( + this.slot.options.pvp, + this.slot.options.spawnMonsters, + this.slot.options.spawnProtection, + this.slot.options.commandBlocks, + i, + j, + this.slot.options.forceGameMode, + this.worldName, + this.slot.options.version, + this.slot.options.compatibility + ), + this.slot.settings ) ); } diff --git a/com/mojang/realmsclient/gui/screens/configuration/RealmsSubscriptionTab.java b/com/mojang/realmsclient/gui/screens/configuration/RealmsSubscriptionTab.java new file mode 100644 index 00000000..698a7fa8 --- /dev/null +++ b/com/mojang/realmsclient/gui/screens/configuration/RealmsSubscriptionTab.java @@ -0,0 +1,183 @@ +package com.mojang.realmsclient.gui.screens.configuration; + +import com.mojang.logging.LogUtils; +import com.mojang.realmsclient.RealmsMainScreen; +import com.mojang.realmsclient.client.RealmsClient; +import com.mojang.realmsclient.dto.RealmsServer; +import com.mojang.realmsclient.dto.Subscription; +import com.mojang.realmsclient.exception.RealmsServiceException; +import com.mojang.realmsclient.gui.screens.RealmsPopups; +import com.mojang.realmsclient.util.RealmsUtil; +import java.text.DateFormat; +import java.util.Calendar; +import java.util.GregorianCalendar; +import java.util.TimeZone; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.ChatFormatting; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.Font; +import net.minecraft.client.gui.components.Button; +import net.minecraft.client.gui.components.FocusableTextWidget; +import net.minecraft.client.gui.components.StringWidget; +import net.minecraft.client.gui.components.tabs.GridLayoutTab; +import net.minecraft.client.gui.layouts.GridLayout; +import net.minecraft.client.gui.layouts.LayoutSettings; +import net.minecraft.client.gui.layouts.SpacerElement; +import net.minecraft.client.gui.screens.ConfirmLinkScreen; +import net.minecraft.network.chat.CommonComponents; +import net.minecraft.network.chat.Component; +import net.minecraft.util.CommonLinks; +import org.jetbrains.annotations.Nullable; +import org.slf4j.Logger; + +@Environment(EnvType.CLIENT) +class RealmsSubscriptionTab extends GridLayoutTab implements RealmsConfigurationTab { + private static final Logger LOGGER = LogUtils.getLogger(); + private static final int DEFAULT_COMPONENT_WIDTH = 200; + private static final int EXTRA_SPACING = 2; + private static final int DEFAULT_SPACING = 6; + static final Component TITLE = Component.translatable("mco.configure.world.subscription.tab"); + private static final Component SUBSCRIPTION_START_LABEL = Component.translatable("mco.configure.world.subscription.start"); + private static final Component TIME_LEFT_LABEL = Component.translatable("mco.configure.world.subscription.timeleft"); + private static final Component DAYS_LEFT_LABEL = Component.translatable("mco.configure.world.subscription.recurring.daysleft"); + private static final Component SUBSCRIPTION_EXPIRED_TEXT = Component.translatable("mco.configure.world.subscription.expired").withStyle(ChatFormatting.GRAY); + private static final Component SUBSCRIPTION_LESS_THAN_A_DAY_TEXT = Component.translatable("mco.configure.world.subscription.less_than_a_day") + .withStyle(ChatFormatting.GRAY); + private static final Component UNKNOWN = Component.translatable("mco.configure.world.subscription.unknown"); + private static final Component RECURRING_INFO = Component.translatable("mco.configure.world.subscription.recurring.info"); + private final RealmsConfigureWorldScreen configurationScreen; + private final Minecraft minecraft; + private final Button deleteButton; + private final FocusableTextWidget subscriptionInfo; + private final StringWidget startDateWidget; + private final StringWidget daysLeftLabelWidget; + private final StringWidget daysLeftWidget; + private RealmsServer serverData; + private Component daysLeft = UNKNOWN; + private Component startDate = UNKNOWN; + @Nullable + private Subscription.SubscriptionType type; + + RealmsSubscriptionTab(RealmsConfigureWorldScreen configurationScreen, Minecraft minecraft, RealmsServer serverData) { + super(TITLE); + this.configurationScreen = configurationScreen; + this.minecraft = minecraft; + this.serverData = serverData; + GridLayout.RowHelper rowHelper = this.layout.rowSpacing(6).createRowHelper(1); + Font font = configurationScreen.getFont(); + rowHelper.addChild(new StringWidget(200, 9, SUBSCRIPTION_START_LABEL, font).alignLeft()); + this.startDateWidget = rowHelper.addChild(new StringWidget(200, 9, this.startDate, font).alignLeft()); + rowHelper.addChild(SpacerElement.height(2)); + this.daysLeftLabelWidget = rowHelper.addChild(new StringWidget(200, 9, TIME_LEFT_LABEL, font).alignLeft()); + this.daysLeftWidget = rowHelper.addChild(new StringWidget(200, 9, this.daysLeft, font).alignLeft()); + rowHelper.addChild(SpacerElement.height(2)); + rowHelper.addChild( + Button.builder( + Component.translatable("mco.configure.world.subscription.extend"), + button -> ConfirmLinkScreen.confirmLinkNow( + configurationScreen, CommonLinks.extendRealms(serverData.remoteSubscriptionId, minecraft.getUser().getProfileId()) + ) + ) + .bounds(0, 0, 200, 20) + .build() + ); + rowHelper.addChild(SpacerElement.height(2)); + this.deleteButton = rowHelper.addChild( + Button.builder( + Component.translatable("mco.configure.world.delete.button"), + button -> minecraft.setScreen( + RealmsPopups.warningPopupScreen( + configurationScreen, Component.translatable("mco.configure.world.delete.question.line1"), popupScreen -> this.deleteRealm() + ) + ) + ) + .bounds(0, 0, 200, 20) + .build() + ); + rowHelper.addChild(SpacerElement.height(2)); + this.subscriptionInfo = rowHelper.addChild( + new FocusableTextWidget(200, Component.empty(), font, true, true, 4), LayoutSettings.defaults().alignHorizontallyCenter() + ); + this.subscriptionInfo.setMaxWidth(200); + this.subscriptionInfo.setCentered(false); + this.updateData(serverData); + } + + private void deleteRealm() { + RealmsUtil.runAsync( + realmsClient -> realmsClient.deleteRealm(this.serverData.id), + RealmsUtil.openScreenAndLogOnFailure(this.configurationScreen::createErrorScreen, "Couldn't delete world") + ) + .thenRunAsync(() -> this.minecraft.setScreen(this.configurationScreen.getLastScreen()), this.minecraft); + this.minecraft.setScreen(this.configurationScreen); + } + + private void getSubscription(long serverId) { + RealmsClient realmsClient = RealmsClient.getOrCreate(); + + try { + Subscription subscription = realmsClient.subscriptionFor(serverId); + this.daysLeft = this.daysLeftPresentation(subscription.daysLeft); + this.startDate = localPresentation(subscription.startDate); + this.type = subscription.type; + } catch (RealmsServiceException var5) { + LOGGER.error("Couldn't get subscription", (Throwable)var5); + this.minecraft.setScreen(this.configurationScreen.createErrorScreen(var5)); + } + } + + private static Component localPresentation(long time) { + Calendar calendar = new GregorianCalendar(TimeZone.getDefault()); + calendar.setTimeInMillis(time); + return Component.literal(DateFormat.getDateTimeInstance().format(calendar.getTime())).withStyle(ChatFormatting.GRAY); + } + + private Component daysLeftPresentation(int daysLeft) { + if (daysLeft < 0 && this.serverData.expired) { + return SUBSCRIPTION_EXPIRED_TEXT; + } else if (daysLeft <= 1) { + return SUBSCRIPTION_LESS_THAN_A_DAY_TEXT; + } else { + int i = daysLeft / 30; + int j = daysLeft % 30; + boolean bl = i > 0; + boolean bl2 = j > 0; + if (bl && bl2) { + return Component.translatable("mco.configure.world.subscription.remaining.months.days", i, j).withStyle(ChatFormatting.GRAY); + } else if (bl) { + return Component.translatable("mco.configure.world.subscription.remaining.months", i).withStyle(ChatFormatting.GRAY); + } else { + return bl2 ? Component.translatable("mco.configure.world.subscription.remaining.days", j).withStyle(ChatFormatting.GRAY) : Component.empty(); + } + } + } + + @Override + public void updateData(RealmsServer server) { + this.serverData = server; + this.getSubscription(server.id); + this.startDateWidget.setMessage(this.startDate); + if (this.type == Subscription.SubscriptionType.NORMAL) { + this.daysLeftLabelWidget.setMessage(TIME_LEFT_LABEL); + } else if (this.type == Subscription.SubscriptionType.RECURRING) { + this.daysLeftLabelWidget.setMessage(DAYS_LEFT_LABEL); + } + + this.daysLeftWidget.setMessage(this.daysLeft); + boolean bl = RealmsMainScreen.isSnapshot() && server.parentWorldName != null; + this.deleteButton.active = server.expired; + if (bl) { + this.subscriptionInfo.setMessage(Component.translatable("mco.snapshot.subscription.info", server.parentWorldName)); + } else { + this.subscriptionInfo.setMessage(RECURRING_INFO); + } + + this.layout.arrangeElements(); + } + + @Override + public Component getTabExtraNarration() { + return CommonComponents.joinLines(TITLE, SUBSCRIPTION_START_LABEL, this.startDate, TIME_LEFT_LABEL, this.daysLeft); + } +} diff --git a/com/mojang/realmsclient/gui/screens/configuration/RealmsWorldsTab.java b/com/mojang/realmsclient/gui/screens/configuration/RealmsWorldsTab.java new file mode 100644 index 00000000..f2350601 --- /dev/null +++ b/com/mojang/realmsclient/gui/screens/configuration/RealmsWorldsTab.java @@ -0,0 +1,208 @@ +package com.mojang.realmsclient.gui.screens.configuration; + +import com.google.common.collect.Lists; +import com.mojang.realmsclient.dto.RealmsServer; +import com.mojang.realmsclient.dto.RealmsSlot; +import com.mojang.realmsclient.dto.WorldTemplate; +import com.mojang.realmsclient.gui.RealmsWorldSlotButton; +import com.mojang.realmsclient.gui.screens.RealmsLongRunningMcoTaskScreen; +import com.mojang.realmsclient.gui.screens.RealmsPopups; +import com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen; +import com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen; +import com.mojang.realmsclient.util.task.SwitchMinigameTask; +import com.mojang.realmsclient.util.task.SwitchSlotTask; +import java.util.List; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.components.Button; +import net.minecraft.client.gui.components.tabs.GridLayoutTab; +import net.minecraft.client.gui.layouts.GridLayout; +import net.minecraft.client.gui.layouts.LayoutSettings; +import net.minecraft.network.chat.Component; +import org.jetbrains.annotations.Nullable; + +@Environment(EnvType.CLIENT) +class RealmsWorldsTab extends GridLayoutTab implements RealmsConfigurationTab { + static final Component TITLE = Component.translatable("mco.configure.worlds.title"); + private final RealmsConfigureWorldScreen configurationScreen; + private final Minecraft minecraft; + private RealmsServer serverData; + private final Button optionsButton; + private final Button backupButton; + private final Button resetWorldButton; + private final List slotButtonList = Lists.newArrayList(); + + RealmsWorldsTab(RealmsConfigureWorldScreen configurationScreen, Minecraft minecraft, RealmsServer serverData) { + super(TITLE); + this.configurationScreen = configurationScreen; + this.minecraft = minecraft; + this.serverData = serverData; + GridLayout.RowHelper rowHelper = this.layout.spacing(20).createRowHelper(1); + GridLayout.RowHelper rowHelper2 = new GridLayout().spacing(16).createRowHelper(4); + this.slotButtonList.clear(); + + for (int i = 1; i < 5; i++) { + this.slotButtonList.add((RealmsWorldSlotButton)rowHelper2.addChild(this.createSlotButton(i), LayoutSettings.defaults().alignVerticallyBottom())); + } + + rowHelper.addChild(rowHelper2.getGrid()); + GridLayout.RowHelper rowHelper3 = new GridLayout().spacing(8).createRowHelper(1); + this.optionsButton = rowHelper3.addChild( + Button.builder( + Component.translatable("mco.configure.world.buttons.options"), + button -> minecraft.setScreen( + new RealmsSlotOptionsScreen( + configurationScreen, ((RealmsSlot)serverData.slots.get(serverData.activeSlot)).clone(), serverData.worldType, serverData.activeSlot + ) + ) + ) + .bounds(0, 0, 150, 20) + .build() + ); + this.backupButton = rowHelper3.addChild( + Button.builder( + Component.translatable("mco.configure.world.backup"), + button -> minecraft.setScreen(new RealmsBackupScreen(configurationScreen, serverData.clone(), serverData.activeSlot)) + ) + .bounds(0, 0, 150, 20) + .build() + ); + this.resetWorldButton = rowHelper3.addChild(Button.builder(Component.empty(), button -> this.resetButtonPressed()).bounds(0, 0, 150, 20).build()); + rowHelper.addChild(rowHelper3.getGrid(), LayoutSettings.defaults().alignHorizontallyCenter()); + this.backupButton.active = true; + this.updateData(serverData); + } + + private void resetButtonPressed() { + if (this.isMinigame()) { + this.minecraft + .setScreen( + new RealmsSelectWorldTemplateScreen( + Component.translatable("mco.template.title.minigame"), this::templateSelectionCallback, RealmsServer.WorldType.MINIGAME + ) + ); + } else { + this.minecraft + .setScreen( + RealmsResetWorldScreen.forResetSlot( + this.configurationScreen, this.serverData.clone(), () -> this.minecraft.execute(() -> this.minecraft.setScreen(this.configurationScreen.getNewScreen())) + ) + ); + } + } + + private void templateSelectionCallback(@Nullable WorldTemplate template) { + if (template != null && WorldTemplate.WorldTemplateType.MINIGAME == template.type) { + this.configurationScreen.stateChanged(); + RealmsConfigureWorldScreen realmsConfigureWorldScreen = this.configurationScreen.getNewScreen(); + this.minecraft + .setScreen(new RealmsLongRunningMcoTaskScreen(realmsConfigureWorldScreen, new SwitchMinigameTask(this.serverData.id, template, realmsConfigureWorldScreen))); + } else { + this.minecraft.setScreen(this.configurationScreen); + } + } + + private boolean isMinigame() { + return this.serverData.isMinigameActive(); + } + + @Override + public void onSelected(RealmsServer server) { + this.updateData(server); + } + + @Override + public void updateData(RealmsServer server) { + this.serverData = server; + this.optionsButton.active = !server.expired && !this.isMinigame(); + this.resetWorldButton.active = !server.expired; + if (this.isMinigame()) { + this.resetWorldButton.setMessage(Component.translatable("mco.configure.world.buttons.switchminigame")); + } else { + boolean bl = server.slots.containsKey(server.activeSlot) && ((RealmsSlot)server.slots.get(server.activeSlot)).options.empty; + if (bl) { + this.resetWorldButton.setMessage(Component.translatable("mco.configure.world.buttons.newworld")); + } else { + this.resetWorldButton.setMessage(Component.translatable("mco.configure.world.buttons.resetworld")); + } + } + + this.backupButton.active = !this.isMinigame(); + + for (RealmsWorldSlotButton realmsWorldSlotButton : this.slotButtonList) { + RealmsWorldSlotButton.State state = realmsWorldSlotButton.setServerData(server); + if (state.activeSlot) { + realmsWorldSlotButton.setSize(80, 80); + } else { + realmsWorldSlotButton.setSize(50, 50); + } + } + } + + private RealmsWorldSlotButton createSlotButton(int slotIndex) { + return new RealmsWorldSlotButton(0, 0, 80, 80, slotIndex, this.serverData, button -> { + RealmsWorldSlotButton.State state = ((RealmsWorldSlotButton)button).getState(); + switch (state.action) { + case SWITCH_SLOT: + if (state.minigame) { + this.switchToMinigame(); + } else if (state.empty) { + this.switchToEmptySlot(slotIndex, this.serverData); + } else { + this.switchToFullSlot(slotIndex, this.serverData); + } + case NOTHING: + return; + default: + throw new IllegalStateException("Unknown action " + state.action); + } + }); + } + + private void switchToMinigame() { + RealmsSelectWorldTemplateScreen realmsSelectWorldTemplateScreen = new RealmsSelectWorldTemplateScreen( + Component.translatable("mco.template.title.minigame"), this::templateSelectionCallback, RealmsServer.WorldType.MINIGAME + ); + realmsSelectWorldTemplateScreen.setWarning(Component.translatable("mco.minigame.world.info.line1"), Component.translatable("mco.minigame.world.info.line2")); + this.minecraft.setScreen(realmsSelectWorldTemplateScreen); + } + + private void switchToFullSlot(int slotIndex, RealmsServer serverData) { + this.minecraft + .setScreen( + RealmsPopups.infoPopupScreen( + this.configurationScreen, + Component.translatable("mco.configure.world.slot.switch.question.line1"), + popupScreen -> { + RealmsConfigureWorldScreen realmsConfigureWorldScreen = this.configurationScreen.getNewScreen(); + this.configurationScreen.stateChanged(); + this.minecraft + .setScreen( + new RealmsLongRunningMcoTaskScreen( + realmsConfigureWorldScreen, + new SwitchSlotTask(serverData.id, slotIndex, () -> this.minecraft.execute(() -> this.minecraft.setScreen(realmsConfigureWorldScreen))) + ) + ); + } + ) + ); + } + + private void switchToEmptySlot(int slotIndex, RealmsServer serverData) { + this.minecraft + .setScreen( + RealmsPopups.infoPopupScreen( + this.configurationScreen, + Component.translatable("mco.configure.world.slot.switch.question.line1"), + popupScreen -> { + this.configurationScreen.stateChanged(); + RealmsResetWorldScreen realmsResetWorldScreen = RealmsResetWorldScreen.forEmptySlot( + this.configurationScreen, slotIndex, serverData, () -> this.minecraft.execute(() -> this.minecraft.setScreen(this.configurationScreen.getNewScreen())) + ); + this.minecraft.setScreen(realmsResetWorldScreen); + } + ) + ); + } +} diff --git a/com/mojang/realmsclient/gui/screens/configuration/package-info.java b/com/mojang/realmsclient/gui/screens/configuration/package-info.java new file mode 100644 index 00000000..77811226 --- /dev/null +++ b/com/mojang/realmsclient/gui/screens/configuration/package-info.java @@ -0,0 +1,11 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +@Environment(EnvType.CLIENT) +package com.mojang.realmsclient.gui.screens.configuration; + +import javax.annotation.ParametersAreNonnullByDefault; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.FieldsAreNonnullByDefault; +import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/com/mojang/realmsclient/util/RealmsUtil.java b/com/mojang/realmsclient/util/RealmsUtil.java index 57c93fee..070989dc 100644 --- a/com/mojang/realmsclient/util/RealmsUtil.java +++ b/com/mojang/realmsclient/util/RealmsUtil.java @@ -1,19 +1,30 @@ package com.mojang.realmsclient.util; import com.mojang.authlib.yggdrasil.ProfileResult; +import com.mojang.logging.LogUtils; +import com.mojang.realmsclient.client.RealmsClient; +import com.mojang.realmsclient.exception.RealmsServiceException; import java.util.Date; import java.util.UUID; +import java.util.concurrent.CompletableFuture; +import java.util.function.Consumer; +import java.util.function.Function; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; +import net.minecraft.Util; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.PlayerFaceRenderer; +import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.resources.DefaultPlayerSkin; import net.minecraft.client.resources.PlayerSkin; import net.minecraft.network.chat.Component; +import org.jetbrains.annotations.Nullable; +import org.slf4j.Logger; @Environment(EnvType.CLIENT) public class RealmsUtil { + private static final Logger LOGGER = LogUtils.getLogger(); private static final Component RIGHT_NOW = Component.translatable("mco.util.time.now"); private static final int MINUTES = 60; private static final int HOURS = 3600; @@ -49,4 +60,54 @@ public class RealmsUtil { PlayerSkin playerSkin = profileResult != null ? minecraft.getSkinManager().getInsecureSkin(profileResult.profile()) : DefaultPlayerSkin.get(playerUuid); PlayerFaceRenderer.draw(guiGraphics, playerSkin, x, y, size); } + + public static CompletableFuture supplyAsync(RealmsUtil.RealmsIoFunction action, @Nullable Consumer onError) { + return CompletableFuture.supplyAsync(() -> { + RealmsClient realmsClient = RealmsClient.getOrCreate(); + + try { + return action.apply(realmsClient); + } catch (Throwable var5) { + if (var5 instanceof RealmsServiceException realmsServiceException) { + if (onError != null) { + onError.accept(realmsServiceException); + } + } else { + LOGGER.error("Unhandled exception", var5); + } + + throw new RuntimeException(var5); + } + }, Util.nonCriticalIoPool()); + } + + public static CompletableFuture runAsync(RealmsUtil.RealmsIoConsumer action, @Nullable Consumer onError) { + return supplyAsync(action, onError); + } + + public static Consumer openScreenOnFailure(Function screenSupplier) { + Minecraft minecraft = Minecraft.getInstance(); + return realmsServiceException -> minecraft.execute(() -> minecraft.setScreen((Screen)screenSupplier.apply(realmsServiceException))); + } + + public static Consumer openScreenAndLogOnFailure(Function screenSupplier, String errorMessage) { + return openScreenOnFailure(screenSupplier).andThen(realmsServiceException -> LOGGER.error(errorMessage, (Throwable)realmsServiceException)); + } + + @FunctionalInterface + @Environment(EnvType.CLIENT) + public interface RealmsIoConsumer extends RealmsUtil.RealmsIoFunction { + void accept(RealmsClient realmsClient) throws RealmsServiceException; + + default Void apply(RealmsClient realmsClient) throws RealmsServiceException { + this.accept(realmsClient); + return null; + } + } + + @FunctionalInterface + @Environment(EnvType.CLIENT) + public interface RealmsIoFunction { + T apply(RealmsClient realmsClient) throws RealmsServiceException; + } } diff --git a/com/mojang/realmsclient/util/task/CloseServerTask.java b/com/mojang/realmsclient/util/task/CloseServerTask.java index 14264519..8ee22907 100644 --- a/com/mojang/realmsclient/util/task/CloseServerTask.java +++ b/com/mojang/realmsclient/util/task/CloseServerTask.java @@ -3,9 +3,8 @@ package com.mojang.realmsclient.util.task; import com.mojang.logging.LogUtils; import com.mojang.realmsclient.client.RealmsClient; import com.mojang.realmsclient.dto.RealmsServer; -import com.mojang.realmsclient.dto.RealmsServer.State; import com.mojang.realmsclient.exception.RetryCallException; -import com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen; +import com.mojang.realmsclient.gui.screens.configuration.RealmsConfigureWorldScreen; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.network.chat.Component; @@ -35,7 +34,7 @@ public class CloseServerTask extends LongRunningTask { boolean bl = realmsClient.close(this.serverData.id); if (bl) { this.configureScreen.stateChanged(); - this.serverData.state = State.CLOSED; + this.serverData.state = RealmsServer.State.CLOSED; setScreen(this.configureScreen); break; } diff --git a/com/mojang/realmsclient/util/task/ConnectTask.java b/com/mojang/realmsclient/util/task/ConnectTask.java index d1dbe39a..9e830357 100644 --- a/com/mojang/realmsclient/util/task/ConnectTask.java +++ b/com/mojang/realmsclient/util/task/ConnectTask.java @@ -1,7 +1,7 @@ package com.mojang.realmsclient.util.task; +import com.mojang.realmsclient.dto.RealmsJoinInformation; import com.mojang.realmsclient.dto.RealmsServer; -import com.mojang.realmsclient.dto.RealmsServerAddress; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.Minecraft; @@ -15,17 +15,17 @@ public class ConnectTask extends LongRunningTask { private static final Component TITLE = Component.translatable("mco.connect.connecting"); private final RealmsConnect realmsConnect; private final RealmsServer server; - private final RealmsServerAddress address; + private final RealmsJoinInformation address; - public ConnectTask(Screen onlineScreen, RealmsServer server, RealmsServerAddress address) { + public ConnectTask(Screen onlineScreen, RealmsServer server, RealmsJoinInformation address) { this.server = server; this.address = address; this.realmsConnect = new RealmsConnect(onlineScreen); } public void run() { - if (this.address.address != null) { - this.realmsConnect.connect(this.server, ServerAddress.parseString(this.address.address)); + if (this.address.address() != null) { + this.realmsConnect.connect(this.server, ServerAddress.parseString(this.address.address())); } else { this.abortTask(); } diff --git a/com/mojang/realmsclient/util/task/GetServerDetailsTask.java b/com/mojang/realmsclient/util/task/GetServerDetailsTask.java index fa82fc16..2deb26a9 100644 --- a/com/mojang/realmsclient/util/task/GetServerDetailsTask.java +++ b/com/mojang/realmsclient/util/task/GetServerDetailsTask.java @@ -2,14 +2,14 @@ package com.mojang.realmsclient.util.task; import com.mojang.logging.LogUtils; import com.mojang.realmsclient.client.RealmsClient; +import com.mojang.realmsclient.dto.RealmsJoinInformation; import com.mojang.realmsclient.dto.RealmsServer; -import com.mojang.realmsclient.dto.RealmsServerAddress; import com.mojang.realmsclient.exception.RealmsServiceException; import com.mojang.realmsclient.exception.RetryCallException; import com.mojang.realmsclient.gui.screens.RealmsBrokenWorldScreen; import com.mojang.realmsclient.gui.screens.RealmsGenericErrorScreen; +import com.mojang.realmsclient.gui.screens.RealmsLongRunningMcoConnectTaskScreen; import com.mojang.realmsclient.gui.screens.RealmsLongRunningMcoTaskScreen; -import com.mojang.realmsclient.gui.screens.RealmsLongRunningMcoTickTaskScreen; import com.mojang.realmsclient.gui.screens.RealmsPopups; import com.mojang.realmsclient.gui.screens.RealmsTermsScreen; import java.net.URL; @@ -44,9 +44,9 @@ public class GetServerDetailsTask extends LongRunningTask { } public void run() { - RealmsServerAddress realmsServerAddress; + RealmsJoinInformation realmsJoinInformation; try { - realmsServerAddress = this.fetchServerAddress(); + realmsJoinInformation = this.fetchServerAddress(); } catch (CancellationException var4) { LOGGER.info("User aborted connecting to realms"); return; @@ -79,13 +79,13 @@ public class GetServerDetailsTask extends LongRunningTask { return; } - if (realmsServerAddress.address == null) { + if (realmsJoinInformation.address() == null) { this.error(Component.translatable("mco.errorMessage.connectionFailure")); } else { - boolean bl2 = realmsServerAddress.resourcePackUrl != null && realmsServerAddress.resourcePackHash != null; + boolean bl2 = realmsJoinInformation.resourcePackUrl() != null && realmsJoinInformation.resourcePackHash() != null; Screen screen = (Screen)(bl2 - ? this.resourcePackDownloadConfirmationScreen(realmsServerAddress, generatePackId(this.server), this::connectScreen) - : this.connectScreen(realmsServerAddress)); + ? this.resourcePackDownloadConfirmationScreen(realmsJoinInformation, generatePackId(this.server), this::connectScreen) + : this.connectScreen(realmsJoinInformation)); setScreen(screen); } } @@ -103,7 +103,7 @@ public class GetServerDetailsTask extends LongRunningTask { return TITLE; } - private RealmsServerAddress fetchServerAddress() throws RealmsServiceException, TimeoutException, CancellationException { + private RealmsJoinInformation fetchServerAddress() throws RealmsServiceException, TimeoutException, CancellationException { RealmsClient realmsClient = RealmsClient.getOrCreate(); for (int i = 0; i < 40; i++) { @@ -121,34 +121,42 @@ public class GetServerDetailsTask extends LongRunningTask { throw new TimeoutException(); } - public RealmsLongRunningMcoTaskScreen connectScreen(RealmsServerAddress serverAddress) { - return new RealmsLongRunningMcoTickTaskScreen(this.lastScreen, new ConnectTask(this.lastScreen, this.server, serverAddress)); + public RealmsLongRunningMcoTaskScreen connectScreen(RealmsJoinInformation serverAddress) { + return new RealmsLongRunningMcoConnectTaskScreen(this.lastScreen, serverAddress, new ConnectTask(this.lastScreen, this.server, serverAddress)); } - private PopupScreen resourcePackDownloadConfirmationScreen(RealmsServerAddress serverAddress, UUID packId, Function connectScreen) { + private PopupScreen resourcePackDownloadConfirmationScreen( + RealmsJoinInformation serverAddress, UUID packId, Function connectScreenSupplier + ) { Component component = Component.translatable("mco.configure.world.resourcepack.question"); - return RealmsPopups.infoPopupScreen(this.lastScreen, component, popupScreen -> { - setScreen(new GenericMessageScreen(APPLYING_PACK_TEXT)); - this.scheduleResourcePackDownload(serverAddress, packId).thenRun(() -> setScreen((Screen)connectScreen.apply(serverAddress))).exceptionally(throwable -> { - Minecraft.getInstance().getDownloadedPackSource().cleanupAfterDisconnect(); - LOGGER.error("Failed to download resource pack from {}", serverAddress, throwable); - setScreen(new RealmsGenericErrorScreen(Component.translatable("mco.download.resourcePack.fail"), this.lastScreen)); - return null; - }); - }); + return RealmsPopups.infoPopupScreen( + this.lastScreen, + component, + popupScreen -> { + setScreen(new GenericMessageScreen(APPLYING_PACK_TEXT)); + this.scheduleResourcePackDownload(serverAddress, packId) + .thenRun(() -> setScreen((Screen)connectScreenSupplier.apply(serverAddress))) + .exceptionally(throwable -> { + Minecraft.getInstance().getDownloadedPackSource().cleanupAfterDisconnect(); + LOGGER.error("Failed to download resource pack from {}", serverAddress, throwable); + setScreen(new RealmsGenericErrorScreen(Component.translatable("mco.download.resourcePack.fail"), this.lastScreen)); + return null; + }); + } + ); } - private CompletableFuture scheduleResourcePackDownload(RealmsServerAddress serverAddress, UUID id) { + private CompletableFuture scheduleResourcePackDownload(RealmsJoinInformation serverAddress, UUID packId) { try { - if (serverAddress.resourcePackUrl == null) { + if (serverAddress.resourcePackUrl() == null) { return CompletableFuture.failedFuture(new IllegalStateException("resourcePackUrl was null")); - } else if (serverAddress.resourcePackHash == null) { + } else if (serverAddress.resourcePackHash() == null) { return CompletableFuture.failedFuture(new IllegalStateException("resourcePackHash was null")); } else { DownloadedPackSource downloadedPackSource = Minecraft.getInstance().getDownloadedPackSource(); - CompletableFuture completableFuture = downloadedPackSource.waitForPackFeedback(id); + CompletableFuture completableFuture = downloadedPackSource.waitForPackFeedback(packId); downloadedPackSource.allowServerPacks(); - downloadedPackSource.pushPack(id, new URL(serverAddress.resourcePackUrl), serverAddress.resourcePackHash); + downloadedPackSource.pushPack(packId, new URL(serverAddress.resourcePackUrl()), serverAddress.resourcePackHash()); return completableFuture; } } catch (Exception var5) { diff --git a/com/mojang/realmsclient/util/task/OpenServerTask.java b/com/mojang/realmsclient/util/task/OpenServerTask.java index 37a489c8..2c473cbf 100644 --- a/com/mojang/realmsclient/util/task/OpenServerTask.java +++ b/com/mojang/realmsclient/util/task/OpenServerTask.java @@ -4,9 +4,8 @@ import com.mojang.logging.LogUtils; import com.mojang.realmsclient.RealmsMainScreen; import com.mojang.realmsclient.client.RealmsClient; import com.mojang.realmsclient.dto.RealmsServer; -import com.mojang.realmsclient.dto.RealmsServer.State; import com.mojang.realmsclient.exception.RetryCallException; -import com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen; +import com.mojang.realmsclient.gui.screens.configuration.RealmsConfigureWorldScreen; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.Minecraft; @@ -42,11 +41,11 @@ public class OpenServerTask extends LongRunningTask { boolean bl = realmsClient.open(this.serverData.id); if (bl) { this.minecraft.execute(() -> { - if (this.returnScreen instanceof RealmsConfigureWorldScreen) { - ((RealmsConfigureWorldScreen)this.returnScreen).stateChanged(); + if (this.returnScreen instanceof RealmsConfigureWorldScreen realmsConfigureWorldScreen) { + realmsConfigureWorldScreen.stateChanged(); } - this.serverData.state = State.OPEN; + this.serverData.state = RealmsServer.State.OPEN; if (this.join) { RealmsMainScreen.play(this.serverData, this.returnScreen); } else { diff --git a/com/mojang/realmsclient/util/task/RestoreTask.java b/com/mojang/realmsclient/util/task/RestoreTask.java index 9863d94b..7ae8437f 100644 --- a/com/mojang/realmsclient/util/task/RestoreTask.java +++ b/com/mojang/realmsclient/util/task/RestoreTask.java @@ -5,8 +5,8 @@ import com.mojang.realmsclient.client.RealmsClient; import com.mojang.realmsclient.dto.Backup; import com.mojang.realmsclient.exception.RealmsServiceException; import com.mojang.realmsclient.exception.RetryCallException; -import com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen; import com.mojang.realmsclient.gui.screens.RealmsGenericErrorScreen; +import com.mojang.realmsclient.gui.screens.configuration.RealmsConfigureWorldScreen; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.network.chat.Component; @@ -20,9 +20,9 @@ public class RestoreTask extends LongRunningTask { private final long realmId; private final RealmsConfigureWorldScreen lastScreen; - public RestoreTask(Backup backup, long worldId, RealmsConfigureWorldScreen lastScreen) { + public RestoreTask(Backup backup, long realmId, RealmsConfigureWorldScreen lastScreen) { this.backup = backup; - this.realmId = worldId; + this.realmId = realmId; this.lastScreen = lastScreen; } @@ -42,7 +42,7 @@ public class RestoreTask extends LongRunningTask { return; } - setScreen(this.lastScreen.getNewScreen()); + setScreen(this.lastScreen); return; } catch (RetryCallException var4) { if (this.aborted()) { diff --git a/com/mojang/realmsclient/util/task/SwitchMinigameTask.java b/com/mojang/realmsclient/util/task/SwitchMinigameTask.java index 0fa6cc89..5b65bcbc 100644 --- a/com/mojang/realmsclient/util/task/SwitchMinigameTask.java +++ b/com/mojang/realmsclient/util/task/SwitchMinigameTask.java @@ -4,7 +4,7 @@ import com.mojang.logging.LogUtils; import com.mojang.realmsclient.client.RealmsClient; import com.mojang.realmsclient.dto.WorldTemplate; import com.mojang.realmsclient.exception.RetryCallException; -import com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen; +import com.mojang.realmsclient.gui.screens.configuration.RealmsConfigureWorldScreen; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.network.chat.Component; @@ -16,12 +16,12 @@ public class SwitchMinigameTask extends LongRunningTask { private static final Component TITLE = Component.translatable("mco.minigame.world.starting.screen.title"); private final long realmId; private final WorldTemplate worldTemplate; - private final RealmsConfigureWorldScreen lastScreen; + private final RealmsConfigureWorldScreen nextScreen; - public SwitchMinigameTask(long worldId, WorldTemplate worldTemplate, RealmsConfigureWorldScreen lastScreen) { - this.realmId = worldId; + public SwitchMinigameTask(long realmId, WorldTemplate worldTemplate, RealmsConfigureWorldScreen lastScreen) { + this.realmId = realmId; this.worldTemplate = worldTemplate; - this.lastScreen = lastScreen; + this.nextScreen = lastScreen; } public void run() { @@ -34,7 +34,7 @@ public class SwitchMinigameTask extends LongRunningTask { } if (realmsClient.putIntoMinigameMode(this.realmId, this.worldTemplate.id)) { - setScreen(this.lastScreen); + setScreen(this.nextScreen); break; } } catch (RetryCallException var4) { diff --git a/data/minecraft/advancement/adventure/heart_transplanter.json b/data/minecraft/advancement/adventure/heart_transplanter.json new file mode 100644 index 00000000..34cce853 --- /dev/null +++ b/data/minecraft/advancement/adventure/heart_transplanter.json @@ -0,0 +1,305 @@ +{ + "parent": "minecraft:adventure/root", + "criteria": { + "place_creaking_heart_awake": { + "conditions": { + "location": [ + { + "block": "minecraft:creaking_heart", + "condition": "minecraft:block_state_property", + "properties": { + "creaking_heart_state": "awake" + } + } + ] + }, + "trigger": "minecraft:placed_block" + }, + "place_creaking_heart_dormant": { + "conditions": { + "location": [ + { + "block": "minecraft:creaking_heart", + "condition": "minecraft:block_state_property", + "properties": { + "creaking_heart_state": "dormant" + } + } + ] + }, + "trigger": "minecraft:placed_block" + }, + "place_pale_oak_log": { + "conditions": { + "location": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:all_of", + "terms": [ + { + "condition": "minecraft:location_check", + "predicate": { + "block": { + "blocks": "#minecraft:pale_oak_logs", + "state": { + "axis": "y" + } + } + } + }, + { + "condition": "minecraft:location_check", + "offsetY": -1, + "predicate": { + "block": { + "blocks": "minecraft:creaking_heart", + "state": { + "axis": "y" + } + } + } + }, + { + "condition": "minecraft:location_check", + "offsetY": -2, + "predicate": { + "block": { + "blocks": "#minecraft:pale_oak_logs", + "state": { + "axis": "y" + } + } + } + } + ] + }, + { + "condition": "minecraft:all_of", + "terms": [ + { + "condition": "minecraft:location_check", + "predicate": { + "block": { + "blocks": "#minecraft:pale_oak_logs", + "state": { + "axis": "y" + } + } + } + }, + { + "condition": "minecraft:location_check", + "offsetY": 1, + "predicate": { + "block": { + "blocks": "minecraft:creaking_heart", + "state": { + "axis": "y" + } + } + } + }, + { + "condition": "minecraft:location_check", + "offsetY": 2, + "predicate": { + "block": { + "blocks": "#minecraft:pale_oak_logs", + "state": { + "axis": "y" + } + } + } + } + ] + }, + { + "condition": "minecraft:all_of", + "terms": [ + { + "condition": "minecraft:location_check", + "predicate": { + "block": { + "blocks": "#minecraft:pale_oak_logs", + "state": { + "axis": "z" + } + } + } + }, + { + "condition": "minecraft:location_check", + "offsetZ": -1, + "predicate": { + "block": { + "blocks": "minecraft:creaking_heart", + "state": { + "axis": "z" + } + } + } + }, + { + "condition": "minecraft:location_check", + "offsetZ": -2, + "predicate": { + "block": { + "blocks": "#minecraft:pale_oak_logs", + "state": { + "axis": "z" + } + } + } + } + ] + }, + { + "condition": "minecraft:all_of", + "terms": [ + { + "condition": "minecraft:location_check", + "predicate": { + "block": { + "blocks": "#minecraft:pale_oak_logs", + "state": { + "axis": "z" + } + } + } + }, + { + "condition": "minecraft:location_check", + "offsetZ": 1, + "predicate": { + "block": { + "blocks": "minecraft:creaking_heart", + "state": { + "axis": "z" + } + } + } + }, + { + "condition": "minecraft:location_check", + "offsetZ": 2, + "predicate": { + "block": { + "blocks": "#minecraft:pale_oak_logs", + "state": { + "axis": "z" + } + } + } + } + ] + }, + { + "condition": "minecraft:all_of", + "terms": [ + { + "condition": "minecraft:location_check", + "predicate": { + "block": { + "blocks": "#minecraft:pale_oak_logs", + "state": { + "axis": "x" + } + } + } + }, + { + "condition": "minecraft:location_check", + "offsetX": -1, + "predicate": { + "block": { + "blocks": "minecraft:creaking_heart", + "state": { + "axis": "x" + } + } + } + }, + { + "condition": "minecraft:location_check", + "offsetX": -2, + "predicate": { + "block": { + "blocks": "#minecraft:pale_oak_logs", + "state": { + "axis": "x" + } + } + } + } + ] + }, + { + "condition": "minecraft:all_of", + "terms": [ + { + "condition": "minecraft:location_check", + "predicate": { + "block": { + "blocks": "#minecraft:pale_oak_logs", + "state": { + "axis": "x" + } + } + } + }, + { + "condition": "minecraft:location_check", + "offsetX": 1, + "predicate": { + "block": { + "blocks": "minecraft:creaking_heart", + "state": { + "axis": "x" + } + } + } + }, + { + "condition": "minecraft:location_check", + "offsetX": 2, + "predicate": { + "block": { + "blocks": "#minecraft:pale_oak_logs", + "state": { + "axis": "x" + } + } + } + } + ] + } + ] + } + ] + }, + "trigger": "minecraft:placed_block" + } + }, + "display": { + "description": { + "translate": "advancements.adventure.heart_transplanter.description" + }, + "icon": { + "count": 1, + "id": "minecraft:creaking_heart" + }, + "title": { + "translate": "advancements.adventure.heart_transplanter.title" + } + }, + "requirements": [ + [ + "place_creaking_heart_dormant", + "place_creaking_heart_awake", + "place_pale_oak_log" + ] + ], + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/data/minecraft/advancement/husbandry/place_dried_ghast_in_water.json b/data/minecraft/advancement/husbandry/place_dried_ghast_in_water.json new file mode 100644 index 00000000..9a7f5d05 --- /dev/null +++ b/data/minecraft/advancement/husbandry/place_dried_ghast_in_water.json @@ -0,0 +1,37 @@ +{ + "parent": "minecraft:husbandry/root", + "criteria": { + "place_dried_ghast_in_water": { + "conditions": { + "location": [ + { + "block": "minecraft:dried_ghast", + "condition": "minecraft:block_state_property", + "properties": { + "waterlogged": "true" + } + } + ] + }, + "trigger": "minecraft:placed_block" + } + }, + "display": { + "description": { + "translate": "advancements.husbandry.place_dried_ghast_in_water.description" + }, + "icon": { + "count": 1, + "id": "minecraft:dried_ghast" + }, + "title": { + "translate": "advancements.husbandry.place_dried_ghast_in_water.title" + } + }, + "requirements": [ + [ + "place_dried_ghast_in_water" + ] + ], + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/data/minecraft/advancement/husbandry/remove_wolf_armor.json b/data/minecraft/advancement/husbandry/remove_wolf_armor.json index 57c05fbf..8b4902af 100644 --- a/data/minecraft/advancement/husbandry/remove_wolf_armor.json +++ b/data/minecraft/advancement/husbandry/remove_wolf_armor.json @@ -13,10 +13,10 @@ } ], "item": { - "items": "minecraft:shears" + "items": "minecraft:wolf_armor" } }, - "trigger": "minecraft:player_interacted_with_entity" + "trigger": "minecraft:player_sheared_equipment" } }, "display": { diff --git a/data/minecraft/advancement/recipes/building_blocks/dried_ghast.json b/data/minecraft/advancement/recipes/building_blocks/dried_ghast.json new file mode 100644 index 00000000..dd0457b0 --- /dev/null +++ b/data/minecraft/advancement/recipes/building_blocks/dried_ghast.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ghast_tear": { + "conditions": { + "items": [ + { + "items": "minecraft:ghast_tear" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dried_ghast" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_ghast_tear" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dried_ghast" + ] + } +} \ No newline at end of file diff --git a/data/minecraft/advancement/recipes/combat/black_harness.json b/data/minecraft/advancement/recipes/combat/black_harness.json new file mode 100644 index 00000000..1dae0d67 --- /dev/null +++ b/data/minecraft/advancement/recipes/combat/black_harness.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_dried_ghast": { + "conditions": { + "items": [ + { + "items": "minecraft:dried_ghast" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:black_harness" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_dried_ghast" + ] + ], + "rewards": { + "recipes": [ + "minecraft:black_harness" + ] + } +} \ No newline at end of file diff --git a/data/minecraft/advancement/recipes/combat/blue_harness.json b/data/minecraft/advancement/recipes/combat/blue_harness.json new file mode 100644 index 00000000..2aa627e7 --- /dev/null +++ b/data/minecraft/advancement/recipes/combat/blue_harness.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_dried_ghast": { + "conditions": { + "items": [ + { + "items": "minecraft:dried_ghast" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:blue_harness" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_dried_ghast" + ] + ], + "rewards": { + "recipes": [ + "minecraft:blue_harness" + ] + } +} \ No newline at end of file diff --git a/data/minecraft/advancement/recipes/combat/brown_harness.json b/data/minecraft/advancement/recipes/combat/brown_harness.json new file mode 100644 index 00000000..c881b49e --- /dev/null +++ b/data/minecraft/advancement/recipes/combat/brown_harness.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_dried_ghast": { + "conditions": { + "items": [ + { + "items": "minecraft:dried_ghast" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:brown_harness" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_dried_ghast" + ] + ], + "rewards": { + "recipes": [ + "minecraft:brown_harness" + ] + } +} \ No newline at end of file diff --git a/data/minecraft/advancement/recipes/combat/cyan_harness.json b/data/minecraft/advancement/recipes/combat/cyan_harness.json new file mode 100644 index 00000000..7a64ee5f --- /dev/null +++ b/data/minecraft/advancement/recipes/combat/cyan_harness.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_dried_ghast": { + "conditions": { + "items": [ + { + "items": "minecraft:dried_ghast" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:cyan_harness" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_dried_ghast" + ] + ], + "rewards": { + "recipes": [ + "minecraft:cyan_harness" + ] + } +} \ No newline at end of file diff --git a/data/minecraft/advancement/recipes/combat/dye_black_harness.json b/data/minecraft/advancement/recipes/combat/dye_black_harness.json new file mode 100644 index 00000000..9106bcfc --- /dev/null +++ b/data/minecraft/advancement/recipes/combat/dye_black_harness.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_needed_dye": { + "conditions": { + "items": [ + { + "items": "minecraft:black_dye" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dye_black_harness" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_needed_dye" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dye_black_harness" + ] + } +} \ No newline at end of file diff --git a/data/minecraft/advancement/recipes/combat/dye_blue_harness.json b/data/minecraft/advancement/recipes/combat/dye_blue_harness.json new file mode 100644 index 00000000..45a1224b --- /dev/null +++ b/data/minecraft/advancement/recipes/combat/dye_blue_harness.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_needed_dye": { + "conditions": { + "items": [ + { + "items": "minecraft:blue_dye" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dye_blue_harness" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_needed_dye" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dye_blue_harness" + ] + } +} \ No newline at end of file diff --git a/data/minecraft/advancement/recipes/combat/dye_brown_harness.json b/data/minecraft/advancement/recipes/combat/dye_brown_harness.json new file mode 100644 index 00000000..488d3b31 --- /dev/null +++ b/data/minecraft/advancement/recipes/combat/dye_brown_harness.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_needed_dye": { + "conditions": { + "items": [ + { + "items": "minecraft:brown_dye" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dye_brown_harness" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_needed_dye" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dye_brown_harness" + ] + } +} \ No newline at end of file diff --git a/data/minecraft/advancement/recipes/combat/dye_cyan_harness.json b/data/minecraft/advancement/recipes/combat/dye_cyan_harness.json new file mode 100644 index 00000000..7265f72d --- /dev/null +++ b/data/minecraft/advancement/recipes/combat/dye_cyan_harness.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_needed_dye": { + "conditions": { + "items": [ + { + "items": "minecraft:cyan_dye" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dye_cyan_harness" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_needed_dye" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dye_cyan_harness" + ] + } +} \ No newline at end of file diff --git a/data/minecraft/advancement/recipes/combat/dye_gray_harness.json b/data/minecraft/advancement/recipes/combat/dye_gray_harness.json new file mode 100644 index 00000000..bbca3b0d --- /dev/null +++ b/data/minecraft/advancement/recipes/combat/dye_gray_harness.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_needed_dye": { + "conditions": { + "items": [ + { + "items": "minecraft:gray_dye" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dye_gray_harness" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_needed_dye" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dye_gray_harness" + ] + } +} \ No newline at end of file diff --git a/data/minecraft/advancement/recipes/combat/dye_green_harness.json b/data/minecraft/advancement/recipes/combat/dye_green_harness.json new file mode 100644 index 00000000..1b628ebe --- /dev/null +++ b/data/minecraft/advancement/recipes/combat/dye_green_harness.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_needed_dye": { + "conditions": { + "items": [ + { + "items": "minecraft:green_dye" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dye_green_harness" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_needed_dye" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dye_green_harness" + ] + } +} \ No newline at end of file diff --git a/data/minecraft/advancement/recipes/combat/dye_light_blue_harness.json b/data/minecraft/advancement/recipes/combat/dye_light_blue_harness.json new file mode 100644 index 00000000..711e4f53 --- /dev/null +++ b/data/minecraft/advancement/recipes/combat/dye_light_blue_harness.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_needed_dye": { + "conditions": { + "items": [ + { + "items": "minecraft:light_blue_dye" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dye_light_blue_harness" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_needed_dye" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dye_light_blue_harness" + ] + } +} \ No newline at end of file diff --git a/data/minecraft/advancement/recipes/combat/dye_light_gray_harness.json b/data/minecraft/advancement/recipes/combat/dye_light_gray_harness.json new file mode 100644 index 00000000..d12b45c3 --- /dev/null +++ b/data/minecraft/advancement/recipes/combat/dye_light_gray_harness.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_needed_dye": { + "conditions": { + "items": [ + { + "items": "minecraft:light_gray_dye" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dye_light_gray_harness" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_needed_dye" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dye_light_gray_harness" + ] + } +} \ No newline at end of file diff --git a/data/minecraft/advancement/recipes/combat/dye_lime_harness.json b/data/minecraft/advancement/recipes/combat/dye_lime_harness.json new file mode 100644 index 00000000..598aa402 --- /dev/null +++ b/data/minecraft/advancement/recipes/combat/dye_lime_harness.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_needed_dye": { + "conditions": { + "items": [ + { + "items": "minecraft:lime_dye" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dye_lime_harness" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_needed_dye" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dye_lime_harness" + ] + } +} \ No newline at end of file diff --git a/data/minecraft/advancement/recipes/combat/dye_magenta_harness.json b/data/minecraft/advancement/recipes/combat/dye_magenta_harness.json new file mode 100644 index 00000000..600c22ef --- /dev/null +++ b/data/minecraft/advancement/recipes/combat/dye_magenta_harness.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_needed_dye": { + "conditions": { + "items": [ + { + "items": "minecraft:magenta_dye" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dye_magenta_harness" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_needed_dye" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dye_magenta_harness" + ] + } +} \ No newline at end of file diff --git a/data/minecraft/advancement/recipes/combat/dye_orange_harness.json b/data/minecraft/advancement/recipes/combat/dye_orange_harness.json new file mode 100644 index 00000000..3156e92d --- /dev/null +++ b/data/minecraft/advancement/recipes/combat/dye_orange_harness.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_needed_dye": { + "conditions": { + "items": [ + { + "items": "minecraft:orange_dye" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dye_orange_harness" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_needed_dye" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dye_orange_harness" + ] + } +} \ No newline at end of file diff --git a/data/minecraft/advancement/recipes/combat/dye_pink_harness.json b/data/minecraft/advancement/recipes/combat/dye_pink_harness.json new file mode 100644 index 00000000..f04fd583 --- /dev/null +++ b/data/minecraft/advancement/recipes/combat/dye_pink_harness.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_needed_dye": { + "conditions": { + "items": [ + { + "items": "minecraft:pink_dye" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dye_pink_harness" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_needed_dye" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dye_pink_harness" + ] + } +} \ No newline at end of file diff --git a/data/minecraft/advancement/recipes/combat/dye_purple_harness.json b/data/minecraft/advancement/recipes/combat/dye_purple_harness.json new file mode 100644 index 00000000..06cdfd0a --- /dev/null +++ b/data/minecraft/advancement/recipes/combat/dye_purple_harness.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_needed_dye": { + "conditions": { + "items": [ + { + "items": "minecraft:purple_dye" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dye_purple_harness" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_needed_dye" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dye_purple_harness" + ] + } +} \ No newline at end of file diff --git a/data/minecraft/advancement/recipes/combat/dye_red_harness.json b/data/minecraft/advancement/recipes/combat/dye_red_harness.json new file mode 100644 index 00000000..78efa4cd --- /dev/null +++ b/data/minecraft/advancement/recipes/combat/dye_red_harness.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_needed_dye": { + "conditions": { + "items": [ + { + "items": "minecraft:red_dye" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dye_red_harness" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_needed_dye" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dye_red_harness" + ] + } +} \ No newline at end of file diff --git a/data/minecraft/advancement/recipes/combat/dye_white_harness.json b/data/minecraft/advancement/recipes/combat/dye_white_harness.json new file mode 100644 index 00000000..525dae8a --- /dev/null +++ b/data/minecraft/advancement/recipes/combat/dye_white_harness.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_needed_dye": { + "conditions": { + "items": [ + { + "items": "minecraft:white_dye" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dye_white_harness" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_needed_dye" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dye_white_harness" + ] + } +} \ No newline at end of file diff --git a/data/minecraft/advancement/recipes/combat/dye_yellow_harness.json b/data/minecraft/advancement/recipes/combat/dye_yellow_harness.json new file mode 100644 index 00000000..734e65e2 --- /dev/null +++ b/data/minecraft/advancement/recipes/combat/dye_yellow_harness.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_needed_dye": { + "conditions": { + "items": [ + { + "items": "minecraft:yellow_dye" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dye_yellow_harness" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_needed_dye" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dye_yellow_harness" + ] + } +} \ No newline at end of file diff --git a/data/minecraft/advancement/recipes/combat/gray_harness.json b/data/minecraft/advancement/recipes/combat/gray_harness.json new file mode 100644 index 00000000..2408659b --- /dev/null +++ b/data/minecraft/advancement/recipes/combat/gray_harness.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_dried_ghast": { + "conditions": { + "items": [ + { + "items": "minecraft:dried_ghast" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:gray_harness" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_dried_ghast" + ] + ], + "rewards": { + "recipes": [ + "minecraft:gray_harness" + ] + } +} \ No newline at end of file diff --git a/data/minecraft/advancement/recipes/combat/green_harness.json b/data/minecraft/advancement/recipes/combat/green_harness.json new file mode 100644 index 00000000..7d65884b --- /dev/null +++ b/data/minecraft/advancement/recipes/combat/green_harness.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_dried_ghast": { + "conditions": { + "items": [ + { + "items": "minecraft:dried_ghast" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:green_harness" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_dried_ghast" + ] + ], + "rewards": { + "recipes": [ + "minecraft:green_harness" + ] + } +} \ No newline at end of file diff --git a/data/minecraft/advancement/recipes/combat/light_blue_harness.json b/data/minecraft/advancement/recipes/combat/light_blue_harness.json new file mode 100644 index 00000000..e417b9db --- /dev/null +++ b/data/minecraft/advancement/recipes/combat/light_blue_harness.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_dried_ghast": { + "conditions": { + "items": [ + { + "items": "minecraft:dried_ghast" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:light_blue_harness" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_dried_ghast" + ] + ], + "rewards": { + "recipes": [ + "minecraft:light_blue_harness" + ] + } +} \ No newline at end of file diff --git a/data/minecraft/advancement/recipes/combat/light_gray_harness.json b/data/minecraft/advancement/recipes/combat/light_gray_harness.json new file mode 100644 index 00000000..5fe6b90f --- /dev/null +++ b/data/minecraft/advancement/recipes/combat/light_gray_harness.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_dried_ghast": { + "conditions": { + "items": [ + { + "items": "minecraft:dried_ghast" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:light_gray_harness" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_dried_ghast" + ] + ], + "rewards": { + "recipes": [ + "minecraft:light_gray_harness" + ] + } +} \ No newline at end of file diff --git a/data/minecraft/advancement/recipes/combat/lime_harness.json b/data/minecraft/advancement/recipes/combat/lime_harness.json new file mode 100644 index 00000000..06a00932 --- /dev/null +++ b/data/minecraft/advancement/recipes/combat/lime_harness.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_dried_ghast": { + "conditions": { + "items": [ + { + "items": "minecraft:dried_ghast" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:lime_harness" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_dried_ghast" + ] + ], + "rewards": { + "recipes": [ + "minecraft:lime_harness" + ] + } +} \ No newline at end of file diff --git a/data/minecraft/advancement/recipes/combat/magenta_harness.json b/data/minecraft/advancement/recipes/combat/magenta_harness.json new file mode 100644 index 00000000..f0bda003 --- /dev/null +++ b/data/minecraft/advancement/recipes/combat/magenta_harness.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_dried_ghast": { + "conditions": { + "items": [ + { + "items": "minecraft:dried_ghast" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:magenta_harness" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_dried_ghast" + ] + ], + "rewards": { + "recipes": [ + "minecraft:magenta_harness" + ] + } +} \ No newline at end of file diff --git a/data/minecraft/advancement/recipes/combat/orange_harness.json b/data/minecraft/advancement/recipes/combat/orange_harness.json new file mode 100644 index 00000000..84963abd --- /dev/null +++ b/data/minecraft/advancement/recipes/combat/orange_harness.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_dried_ghast": { + "conditions": { + "items": [ + { + "items": "minecraft:dried_ghast" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:orange_harness" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_dried_ghast" + ] + ], + "rewards": { + "recipes": [ + "minecraft:orange_harness" + ] + } +} \ No newline at end of file diff --git a/data/minecraft/advancement/recipes/combat/pink_harness.json b/data/minecraft/advancement/recipes/combat/pink_harness.json new file mode 100644 index 00000000..a35a0459 --- /dev/null +++ b/data/minecraft/advancement/recipes/combat/pink_harness.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_dried_ghast": { + "conditions": { + "items": [ + { + "items": "minecraft:dried_ghast" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:pink_harness" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_dried_ghast" + ] + ], + "rewards": { + "recipes": [ + "minecraft:pink_harness" + ] + } +} \ No newline at end of file diff --git a/data/minecraft/advancement/recipes/combat/purple_harness.json b/data/minecraft/advancement/recipes/combat/purple_harness.json new file mode 100644 index 00000000..43be1672 --- /dev/null +++ b/data/minecraft/advancement/recipes/combat/purple_harness.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_dried_ghast": { + "conditions": { + "items": [ + { + "items": "minecraft:dried_ghast" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:purple_harness" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_dried_ghast" + ] + ], + "rewards": { + "recipes": [ + "minecraft:purple_harness" + ] + } +} \ No newline at end of file diff --git a/data/minecraft/advancement/recipes/combat/red_harness.json b/data/minecraft/advancement/recipes/combat/red_harness.json new file mode 100644 index 00000000..04a19361 --- /dev/null +++ b/data/minecraft/advancement/recipes/combat/red_harness.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_dried_ghast": { + "conditions": { + "items": [ + { + "items": "minecraft:dried_ghast" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:red_harness" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_dried_ghast" + ] + ], + "rewards": { + "recipes": [ + "minecraft:red_harness" + ] + } +} \ No newline at end of file diff --git a/data/minecraft/advancement/recipes/combat/saddle.json b/data/minecraft/advancement/recipes/combat/saddle.json new file mode 100644 index 00000000..1df7e159 --- /dev/null +++ b/data/minecraft/advancement/recipes/combat/saddle.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_leather": { + "conditions": { + "items": [ + { + "items": "minecraft:leather" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:saddle" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_leather" + ] + ], + "rewards": { + "recipes": [ + "minecraft:saddle" + ] + } +} \ No newline at end of file diff --git a/data/minecraft/advancement/recipes/combat/white_harness.json b/data/minecraft/advancement/recipes/combat/white_harness.json new file mode 100644 index 00000000..6a9fd00d --- /dev/null +++ b/data/minecraft/advancement/recipes/combat/white_harness.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_dried_ghast": { + "conditions": { + "items": [ + { + "items": "minecraft:dried_ghast" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:white_harness" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_dried_ghast" + ] + ], + "rewards": { + "recipes": [ + "minecraft:white_harness" + ] + } +} \ No newline at end of file diff --git a/data/minecraft/advancement/recipes/combat/yellow_harness.json b/data/minecraft/advancement/recipes/combat/yellow_harness.json new file mode 100644 index 00000000..4209d18a --- /dev/null +++ b/data/minecraft/advancement/recipes/combat/yellow_harness.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_dried_ghast": { + "conditions": { + "items": [ + { + "items": "minecraft:dried_ghast" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:yellow_harness" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_dried_ghast" + ] + ], + "rewards": { + "recipes": [ + "minecraft:yellow_harness" + ] + } +} \ No newline at end of file diff --git a/data/minecraft/advancement/recipes/building_blocks/dye_black_bed.json b/data/minecraft/advancement/recipes/decorations/dye_black_bed.json similarity index 100% rename from data/minecraft/advancement/recipes/building_blocks/dye_black_bed.json rename to data/minecraft/advancement/recipes/decorations/dye_black_bed.json diff --git a/data/minecraft/advancement/recipes/building_blocks/dye_black_carpet.json b/data/minecraft/advancement/recipes/decorations/dye_black_carpet.json similarity index 100% rename from data/minecraft/advancement/recipes/building_blocks/dye_black_carpet.json rename to data/minecraft/advancement/recipes/decorations/dye_black_carpet.json diff --git a/data/minecraft/advancement/recipes/building_blocks/dye_blue_bed.json b/data/minecraft/advancement/recipes/decorations/dye_blue_bed.json similarity index 100% rename from data/minecraft/advancement/recipes/building_blocks/dye_blue_bed.json rename to data/minecraft/advancement/recipes/decorations/dye_blue_bed.json diff --git a/data/minecraft/advancement/recipes/building_blocks/dye_blue_carpet.json b/data/minecraft/advancement/recipes/decorations/dye_blue_carpet.json similarity index 100% rename from data/minecraft/advancement/recipes/building_blocks/dye_blue_carpet.json rename to data/minecraft/advancement/recipes/decorations/dye_blue_carpet.json diff --git a/data/minecraft/advancement/recipes/building_blocks/dye_brown_bed.json b/data/minecraft/advancement/recipes/decorations/dye_brown_bed.json similarity index 100% rename from data/minecraft/advancement/recipes/building_blocks/dye_brown_bed.json rename to data/minecraft/advancement/recipes/decorations/dye_brown_bed.json diff --git a/data/minecraft/advancement/recipes/building_blocks/dye_brown_carpet.json b/data/minecraft/advancement/recipes/decorations/dye_brown_carpet.json similarity index 100% rename from data/minecraft/advancement/recipes/building_blocks/dye_brown_carpet.json rename to data/minecraft/advancement/recipes/decorations/dye_brown_carpet.json diff --git a/data/minecraft/advancement/recipes/building_blocks/dye_cyan_bed.json b/data/minecraft/advancement/recipes/decorations/dye_cyan_bed.json similarity index 100% rename from data/minecraft/advancement/recipes/building_blocks/dye_cyan_bed.json rename to data/minecraft/advancement/recipes/decorations/dye_cyan_bed.json diff --git a/data/minecraft/advancement/recipes/building_blocks/dye_cyan_carpet.json b/data/minecraft/advancement/recipes/decorations/dye_cyan_carpet.json similarity index 100% rename from data/minecraft/advancement/recipes/building_blocks/dye_cyan_carpet.json rename to data/minecraft/advancement/recipes/decorations/dye_cyan_carpet.json diff --git a/data/minecraft/advancement/recipes/building_blocks/dye_gray_bed.json b/data/minecraft/advancement/recipes/decorations/dye_gray_bed.json similarity index 100% rename from data/minecraft/advancement/recipes/building_blocks/dye_gray_bed.json rename to data/minecraft/advancement/recipes/decorations/dye_gray_bed.json diff --git a/data/minecraft/advancement/recipes/building_blocks/dye_gray_carpet.json b/data/minecraft/advancement/recipes/decorations/dye_gray_carpet.json similarity index 100% rename from data/minecraft/advancement/recipes/building_blocks/dye_gray_carpet.json rename to data/minecraft/advancement/recipes/decorations/dye_gray_carpet.json diff --git a/data/minecraft/advancement/recipes/building_blocks/dye_green_bed.json b/data/minecraft/advancement/recipes/decorations/dye_green_bed.json similarity index 100% rename from data/minecraft/advancement/recipes/building_blocks/dye_green_bed.json rename to data/minecraft/advancement/recipes/decorations/dye_green_bed.json diff --git a/data/minecraft/advancement/recipes/building_blocks/dye_green_carpet.json b/data/minecraft/advancement/recipes/decorations/dye_green_carpet.json similarity index 100% rename from data/minecraft/advancement/recipes/building_blocks/dye_green_carpet.json rename to data/minecraft/advancement/recipes/decorations/dye_green_carpet.json diff --git a/data/minecraft/advancement/recipes/building_blocks/dye_light_blue_bed.json b/data/minecraft/advancement/recipes/decorations/dye_light_blue_bed.json similarity index 100% rename from data/minecraft/advancement/recipes/building_blocks/dye_light_blue_bed.json rename to data/minecraft/advancement/recipes/decorations/dye_light_blue_bed.json diff --git a/data/minecraft/advancement/recipes/building_blocks/dye_light_blue_carpet.json b/data/minecraft/advancement/recipes/decorations/dye_light_blue_carpet.json similarity index 100% rename from data/minecraft/advancement/recipes/building_blocks/dye_light_blue_carpet.json rename to data/minecraft/advancement/recipes/decorations/dye_light_blue_carpet.json diff --git a/data/minecraft/advancement/recipes/building_blocks/dye_light_gray_bed.json b/data/minecraft/advancement/recipes/decorations/dye_light_gray_bed.json similarity index 100% rename from data/minecraft/advancement/recipes/building_blocks/dye_light_gray_bed.json rename to data/minecraft/advancement/recipes/decorations/dye_light_gray_bed.json diff --git a/data/minecraft/advancement/recipes/building_blocks/dye_light_gray_carpet.json b/data/minecraft/advancement/recipes/decorations/dye_light_gray_carpet.json similarity index 100% rename from data/minecraft/advancement/recipes/building_blocks/dye_light_gray_carpet.json rename to data/minecraft/advancement/recipes/decorations/dye_light_gray_carpet.json diff --git a/data/minecraft/advancement/recipes/building_blocks/dye_lime_bed.json b/data/minecraft/advancement/recipes/decorations/dye_lime_bed.json similarity index 100% rename from data/minecraft/advancement/recipes/building_blocks/dye_lime_bed.json rename to data/minecraft/advancement/recipes/decorations/dye_lime_bed.json diff --git a/data/minecraft/advancement/recipes/building_blocks/dye_lime_carpet.json b/data/minecraft/advancement/recipes/decorations/dye_lime_carpet.json similarity index 100% rename from data/minecraft/advancement/recipes/building_blocks/dye_lime_carpet.json rename to data/minecraft/advancement/recipes/decorations/dye_lime_carpet.json diff --git a/data/minecraft/advancement/recipes/building_blocks/dye_magenta_bed.json b/data/minecraft/advancement/recipes/decorations/dye_magenta_bed.json similarity index 100% rename from data/minecraft/advancement/recipes/building_blocks/dye_magenta_bed.json rename to data/minecraft/advancement/recipes/decorations/dye_magenta_bed.json diff --git a/data/minecraft/advancement/recipes/building_blocks/dye_magenta_carpet.json b/data/minecraft/advancement/recipes/decorations/dye_magenta_carpet.json similarity index 100% rename from data/minecraft/advancement/recipes/building_blocks/dye_magenta_carpet.json rename to data/minecraft/advancement/recipes/decorations/dye_magenta_carpet.json diff --git a/data/minecraft/advancement/recipes/building_blocks/dye_orange_bed.json b/data/minecraft/advancement/recipes/decorations/dye_orange_bed.json similarity index 100% rename from data/minecraft/advancement/recipes/building_blocks/dye_orange_bed.json rename to data/minecraft/advancement/recipes/decorations/dye_orange_bed.json diff --git a/data/minecraft/advancement/recipes/building_blocks/dye_orange_carpet.json b/data/minecraft/advancement/recipes/decorations/dye_orange_carpet.json similarity index 100% rename from data/minecraft/advancement/recipes/building_blocks/dye_orange_carpet.json rename to data/minecraft/advancement/recipes/decorations/dye_orange_carpet.json diff --git a/data/minecraft/advancement/recipes/building_blocks/dye_pink_bed.json b/data/minecraft/advancement/recipes/decorations/dye_pink_bed.json similarity index 100% rename from data/minecraft/advancement/recipes/building_blocks/dye_pink_bed.json rename to data/minecraft/advancement/recipes/decorations/dye_pink_bed.json diff --git a/data/minecraft/advancement/recipes/building_blocks/dye_pink_carpet.json b/data/minecraft/advancement/recipes/decorations/dye_pink_carpet.json similarity index 100% rename from data/minecraft/advancement/recipes/building_blocks/dye_pink_carpet.json rename to data/minecraft/advancement/recipes/decorations/dye_pink_carpet.json diff --git a/data/minecraft/advancement/recipes/building_blocks/dye_purple_bed.json b/data/minecraft/advancement/recipes/decorations/dye_purple_bed.json similarity index 100% rename from data/minecraft/advancement/recipes/building_blocks/dye_purple_bed.json rename to data/minecraft/advancement/recipes/decorations/dye_purple_bed.json diff --git a/data/minecraft/advancement/recipes/building_blocks/dye_purple_carpet.json b/data/minecraft/advancement/recipes/decorations/dye_purple_carpet.json similarity index 100% rename from data/minecraft/advancement/recipes/building_blocks/dye_purple_carpet.json rename to data/minecraft/advancement/recipes/decorations/dye_purple_carpet.json diff --git a/data/minecraft/advancement/recipes/building_blocks/dye_red_bed.json b/data/minecraft/advancement/recipes/decorations/dye_red_bed.json similarity index 100% rename from data/minecraft/advancement/recipes/building_blocks/dye_red_bed.json rename to data/minecraft/advancement/recipes/decorations/dye_red_bed.json diff --git a/data/minecraft/advancement/recipes/building_blocks/dye_red_carpet.json b/data/minecraft/advancement/recipes/decorations/dye_red_carpet.json similarity index 100% rename from data/minecraft/advancement/recipes/building_blocks/dye_red_carpet.json rename to data/minecraft/advancement/recipes/decorations/dye_red_carpet.json diff --git a/data/minecraft/advancement/recipes/building_blocks/dye_white_bed.json b/data/minecraft/advancement/recipes/decorations/dye_white_bed.json similarity index 100% rename from data/minecraft/advancement/recipes/building_blocks/dye_white_bed.json rename to data/minecraft/advancement/recipes/decorations/dye_white_bed.json diff --git a/data/minecraft/advancement/recipes/building_blocks/dye_white_carpet.json b/data/minecraft/advancement/recipes/decorations/dye_white_carpet.json similarity index 100% rename from data/minecraft/advancement/recipes/building_blocks/dye_white_carpet.json rename to data/minecraft/advancement/recipes/decorations/dye_white_carpet.json diff --git a/data/minecraft/advancement/recipes/building_blocks/dye_yellow_bed.json b/data/minecraft/advancement/recipes/decorations/dye_yellow_bed.json similarity index 100% rename from data/minecraft/advancement/recipes/building_blocks/dye_yellow_bed.json rename to data/minecraft/advancement/recipes/decorations/dye_yellow_bed.json diff --git a/data/minecraft/advancement/recipes/building_blocks/dye_yellow_carpet.json b/data/minecraft/advancement/recipes/decorations/dye_yellow_carpet.json similarity index 100% rename from data/minecraft/advancement/recipes/building_blocks/dye_yellow_carpet.json rename to data/minecraft/advancement/recipes/decorations/dye_yellow_carpet.json diff --git a/data/minecraft/advancement/recipes/tools/lead.json b/data/minecraft/advancement/recipes/tools/lead.json index a872bd4e..750f4e84 100644 --- a/data/minecraft/advancement/recipes/tools/lead.json +++ b/data/minecraft/advancement/recipes/tools/lead.json @@ -1,11 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_slime_ball": { + "has_string": { "conditions": { "items": [ { - "items": "minecraft:slime_ball" + "items": "minecraft:string" } ] }, @@ -21,7 +21,7 @@ "requirements": [ [ "has_the_recipe", - "has_slime_ball" + "has_string" ] ], "rewards": { diff --git a/data/minecraft/datapacks/minecart_improvements/pack.mcmeta b/data/minecraft/datapacks/minecart_improvements/pack.mcmeta index 4252c522..0ed5aa7a 100644 --- a/data/minecraft/datapacks/minecart_improvements/pack.mcmeta +++ b/data/minecraft/datapacks/minecart_improvements/pack.mcmeta @@ -8,6 +8,6 @@ "description": { "translate": "dataPack.minecart_improvements.description" }, - "pack_format": 71 + "pack_format": 80 } } \ No newline at end of file diff --git a/data/minecraft/datapacks/redstone_experiments/pack.mcmeta b/data/minecraft/datapacks/redstone_experiments/pack.mcmeta index 7a9a5460..7bd121c2 100644 --- a/data/minecraft/datapacks/redstone_experiments/pack.mcmeta +++ b/data/minecraft/datapacks/redstone_experiments/pack.mcmeta @@ -8,6 +8,6 @@ "description": { "translate": "dataPack.redstone_experiments.description" }, - "pack_format": 71 + "pack_format": 80 } } \ No newline at end of file diff --git a/data/minecraft/datapacks/trade_rebalance/pack.mcmeta b/data/minecraft/datapacks/trade_rebalance/pack.mcmeta index 67223954..bd51de48 100644 --- a/data/minecraft/datapacks/trade_rebalance/pack.mcmeta +++ b/data/minecraft/datapacks/trade_rebalance/pack.mcmeta @@ -8,6 +8,6 @@ "description": { "translate": "dataPack.trade_rebalance.description" }, - "pack_format": 71 + "pack_format": 80 } } \ No newline at end of file diff --git a/data/minecraft/dialog/custom_options.json b/data/minecraft/dialog/custom_options.json new file mode 100644 index 00000000..21b4f8a2 --- /dev/null +++ b/data/minecraft/dialog/custom_options.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:dialog_list", + "button_width": 310, + "columns": 1, + "dialogs": "#minecraft:pause_screen_additions", + "exit_action": { + "label": { + "translate": "gui.back" + }, + "width": 200 + }, + "external_title": { + "translate": "menu.custom_options" + }, + "title": { + "translate": "menu.custom_options.title" + } +} \ No newline at end of file diff --git a/data/minecraft/dialog/quick_actions.json b/data/minecraft/dialog/quick_actions.json new file mode 100644 index 00000000..9a8345fd --- /dev/null +++ b/data/minecraft/dialog/quick_actions.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:dialog_list", + "button_width": 310, + "columns": 1, + "dialogs": "#minecraft:quick_actions", + "exit_action": { + "label": { + "translate": "gui.back" + }, + "width": 200 + }, + "external_title": { + "translate": "menu.quick_actions" + }, + "title": { + "translate": "menu.quick_actions.title" + } +} \ No newline at end of file diff --git a/data/minecraft/dialog/server_links.json b/data/minecraft/dialog/server_links.json new file mode 100644 index 00000000..44840928 --- /dev/null +++ b/data/minecraft/dialog/server_links.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:server_links", + "button_width": 310, + "columns": 1, + "exit_action": { + "label": { + "translate": "gui.back" + }, + "width": 200 + }, + "external_title": { + "translate": "menu.server_links" + }, + "title": { + "translate": "menu.server_links.title" + } +} \ No newline at end of file diff --git a/data/minecraft/dimension_type/overworld.json b/data/minecraft/dimension_type/overworld.json index f147a128..e1734d76 100644 --- a/data/minecraft/dimension_type/overworld.json +++ b/data/minecraft/dimension_type/overworld.json @@ -1,6 +1,7 @@ { "ambient_light": 0.0, "bed_works": true, + "cloud_height": 192, "coordinate_scale": 1.0, "effects": "minecraft:overworld", "has_ceiling": false, diff --git a/data/minecraft/dimension_type/overworld_caves.json b/data/minecraft/dimension_type/overworld_caves.json index 5a819fb0..85b6a944 100644 --- a/data/minecraft/dimension_type/overworld_caves.json +++ b/data/minecraft/dimension_type/overworld_caves.json @@ -1,6 +1,7 @@ { "ambient_light": 0.0, "bed_works": true, + "cloud_height": 192, "coordinate_scale": 1.0, "effects": "minecraft:overworld", "has_ceiling": true, diff --git a/data/minecraft/jukebox_song/tears.json b/data/minecraft/jukebox_song/tears.json new file mode 100644 index 00000000..37147b82 --- /dev/null +++ b/data/minecraft/jukebox_song/tears.json @@ -0,0 +1,8 @@ +{ + "comparator_output": 10, + "description": { + "translate": "jukebox_song.minecraft.tears" + }, + "length_in_seconds": 175.0, + "sound_event": "minecraft:music_disc.tears" +} \ No newline at end of file diff --git a/data/minecraft/loot_table/blocks/dried_ghast.json b/data/minecraft/loot_table/blocks/dried_ghast.json new file mode 100644 index 00000000..0657cf0b --- /dev/null +++ b/data/minecraft/loot_table/blocks/dried_ghast.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:dried_ghast" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "minecraft:blocks/dried_ghast" +} \ No newline at end of file diff --git a/data/minecraft/loot_table/chests/ancient_city.json b/data/minecraft/loot_table/chests/ancient_city.json index 7b918754..47734cc0 100644 --- a/data/minecraft/loot_table/chests/ancient_city.json +++ b/data/minecraft/loot_table/chests/ancient_city.json @@ -115,11 +115,15 @@ "functions": [ { "add": false, - "count": 1.0, + "count": { + "type": "minecraft:uniform", + "max": 5.0, + "min": 1.0 + }, "function": "minecraft:set_count" } ], - "name": "minecraft:saddle", + "name": "minecraft:leather", "weight": 2 }, { diff --git a/data/minecraft/loot_table/chests/desert_pyramid.json b/data/minecraft/loot_table/chests/desert_pyramid.json index c2a9bae1..7d216cb8 100644 --- a/data/minecraft/loot_table/chests/desert_pyramid.json +++ b/data/minecraft/loot_table/chests/desert_pyramid.json @@ -118,7 +118,18 @@ }, { "type": "minecraft:item", - "name": "minecraft:saddle", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 5.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "minecraft:leather", "weight": 20 }, { diff --git a/data/minecraft/loot_table/chests/jungle_temple.json b/data/minecraft/loot_table/chests/jungle_temple.json index a7cc53d5..156e5673 100644 --- a/data/minecraft/loot_table/chests/jungle_temple.json +++ b/data/minecraft/loot_table/chests/jungle_temple.json @@ -118,7 +118,18 @@ }, { "type": "minecraft:item", - "name": "minecraft:saddle", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 5.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "minecraft:leather", "weight": 3 }, { diff --git a/data/minecraft/loot_table/chests/simple_dungeon.json b/data/minecraft/loot_table/chests/simple_dungeon.json index b4b9f053..65cd5af7 100644 --- a/data/minecraft/loot_table/chests/simple_dungeon.json +++ b/data/minecraft/loot_table/chests/simple_dungeon.json @@ -6,7 +6,18 @@ "entries": [ { "type": "minecraft:item", - "name": "minecraft:saddle", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 5.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "minecraft:leather", "weight": 20 }, { diff --git a/data/minecraft/loot_table/chests/stronghold_corridor.json b/data/minecraft/loot_table/chests/stronghold_corridor.json index 5b348c0d..91c541bc 100644 --- a/data/minecraft/loot_table/chests/stronghold_corridor.json +++ b/data/minecraft/loot_table/chests/stronghold_corridor.json @@ -141,7 +141,18 @@ }, { "type": "minecraft:item", - "name": "minecraft:saddle" + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 5.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "minecraft:leather" }, { "type": "minecraft:item", diff --git a/data/minecraft/loot_table/entities/ghast.json b/data/minecraft/loot_table/entities/ghast.json index 9bf278de..8fdc086e 100644 --- a/data/minecraft/loot_table/entities/ghast.json +++ b/data/minecraft/loot_table/entities/ghast.json @@ -60,6 +60,42 @@ } ], "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:damage_source_properties", + "predicate": { + "direct_entity": { + "type": "minecraft:fireball" + }, + "tags": [ + { + "expected": true, + "id": "minecraft:is_projectile" + } + ] + } + }, + { + "condition": "minecraft:killed_by_player" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:music_disc_tears" + } + ], + "functions": [ + { + "add": false, + "count": 1.0, + "function": "minecraft:set_count" + } + ], + "rolls": 1.0 } ], "random_sequence": "minecraft:entities/ghast" diff --git a/data/minecraft/loot_table/entities/happy_ghast.json b/data/minecraft/loot_table/entities/happy_ghast.json new file mode 100644 index 00000000..97d8ab86 --- /dev/null +++ b/data/minecraft/loot_table/entities/happy_ghast.json @@ -0,0 +1,4 @@ +{ + "type": "minecraft:entity", + "random_sequence": "minecraft:entities/happy_ghast" +} \ No newline at end of file diff --git a/data/minecraft/loot_table/gameplay/piglin_bartering.json b/data/minecraft/loot_table/gameplay/piglin_bartering.json index ad21753c..97a5e3f9 100644 --- a/data/minecraft/loot_table/gameplay/piglin_bartering.json +++ b/data/minecraft/loot_table/gameplay/piglin_bartering.json @@ -91,6 +91,18 @@ "name": "minecraft:ender_pearl", "weight": 10 }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": 1.0, + "function": "minecraft:set_count" + } + ], + "name": "minecraft:dried_ghast", + "weight": 10 + }, { "type": "minecraft:item", "functions": [ diff --git a/data/minecraft/recipe/black_harness.json b/data/minecraft/recipe/black_harness.json new file mode 100644 index 00000000..1b3e0253 --- /dev/null +++ b/data/minecraft/recipe/black_harness.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "harness", + "key": { + "#": "minecraft:black_wool", + "G": "minecraft:glass", + "L": "minecraft:leather" + }, + "pattern": [ + "LLL", + "G#G" + ], + "result": { + "count": 1, + "id": "minecraft:black_harness" + } +} \ No newline at end of file diff --git a/data/minecraft/recipe/blue_harness.json b/data/minecraft/recipe/blue_harness.json new file mode 100644 index 00000000..c5eae53a --- /dev/null +++ b/data/minecraft/recipe/blue_harness.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "harness", + "key": { + "#": "minecraft:blue_wool", + "G": "minecraft:glass", + "L": "minecraft:leather" + }, + "pattern": [ + "LLL", + "G#G" + ], + "result": { + "count": 1, + "id": "minecraft:blue_harness" + } +} \ No newline at end of file diff --git a/data/minecraft/recipe/brown_harness.json b/data/minecraft/recipe/brown_harness.json new file mode 100644 index 00000000..1e878a30 --- /dev/null +++ b/data/minecraft/recipe/brown_harness.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "harness", + "key": { + "#": "minecraft:brown_wool", + "G": "minecraft:glass", + "L": "minecraft:leather" + }, + "pattern": [ + "LLL", + "G#G" + ], + "result": { + "count": 1, + "id": "minecraft:brown_harness" + } +} \ No newline at end of file diff --git a/data/minecraft/recipe/cyan_harness.json b/data/minecraft/recipe/cyan_harness.json new file mode 100644 index 00000000..8101ef75 --- /dev/null +++ b/data/minecraft/recipe/cyan_harness.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "harness", + "key": { + "#": "minecraft:cyan_wool", + "G": "minecraft:glass", + "L": "minecraft:leather" + }, + "pattern": [ + "LLL", + "G#G" + ], + "result": { + "count": 1, + "id": "minecraft:cyan_harness" + } +} \ No newline at end of file diff --git a/data/minecraft/recipe/dried_ghast.json b/data/minecraft/recipe/dried_ghast.json new file mode 100644 index 00000000..ba1bdce8 --- /dev/null +++ b/data/minecraft/recipe/dried_ghast.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "group": "dry_ghast", + "key": { + "#": "minecraft:ghast_tear", + "X": "minecraft:soul_sand" + }, + "pattern": [ + "###", + "#X#", + "###" + ], + "result": { + "count": 1, + "id": "minecraft:dried_ghast" + } +} \ No newline at end of file diff --git a/data/minecraft/recipe/dye_black_bed.json b/data/minecraft/recipe/dye_black_bed.json index 316585c3..ccbcab16 100644 --- a/data/minecraft/recipe/dye_black_bed.json +++ b/data/minecraft/recipe/dye_black_bed.json @@ -1,7 +1,7 @@ { "type": "minecraft:crafting_shapeless", - "category": "building", - "group": "bed", + "category": "misc", + "group": "bed_dye", "ingredients": [ "minecraft:black_dye", [ diff --git a/data/minecraft/recipe/dye_black_carpet.json b/data/minecraft/recipe/dye_black_carpet.json index 42a2f2e3..d2c1d677 100644 --- a/data/minecraft/recipe/dye_black_carpet.json +++ b/data/minecraft/recipe/dye_black_carpet.json @@ -1,7 +1,7 @@ { "type": "minecraft:crafting_shapeless", - "category": "building", - "group": "carpet", + "category": "misc", + "group": "carpet_dye", "ingredients": [ "minecraft:black_dye", [ diff --git a/data/minecraft/recipe/dye_black_harness.json b/data/minecraft/recipe/dye_black_harness.json new file mode 100644 index 00000000..801382b4 --- /dev/null +++ b/data/minecraft/recipe/dye_black_harness.json @@ -0,0 +1,29 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "equipment", + "group": "harness_dye", + "ingredients": [ + "minecraft:black_dye", + [ + "minecraft:blue_harness", + "minecraft:brown_harness", + "minecraft:cyan_harness", + "minecraft:gray_harness", + "minecraft:green_harness", + "minecraft:light_blue_harness", + "minecraft:light_gray_harness", + "minecraft:lime_harness", + "minecraft:magenta_harness", + "minecraft:orange_harness", + "minecraft:pink_harness", + "minecraft:purple_harness", + "minecraft:red_harness", + "minecraft:yellow_harness", + "minecraft:white_harness" + ] + ], + "result": { + "count": 1, + "id": "minecraft:black_harness" + } +} \ No newline at end of file diff --git a/data/minecraft/recipe/dye_blue_bed.json b/data/minecraft/recipe/dye_blue_bed.json index 5597e51b..56030722 100644 --- a/data/minecraft/recipe/dye_blue_bed.json +++ b/data/minecraft/recipe/dye_blue_bed.json @@ -1,7 +1,7 @@ { "type": "minecraft:crafting_shapeless", - "category": "building", - "group": "bed", + "category": "misc", + "group": "bed_dye", "ingredients": [ "minecraft:blue_dye", [ diff --git a/data/minecraft/recipe/dye_blue_carpet.json b/data/minecraft/recipe/dye_blue_carpet.json index 7d3eaa4f..7636b055 100644 --- a/data/minecraft/recipe/dye_blue_carpet.json +++ b/data/minecraft/recipe/dye_blue_carpet.json @@ -1,7 +1,7 @@ { "type": "minecraft:crafting_shapeless", - "category": "building", - "group": "carpet", + "category": "misc", + "group": "carpet_dye", "ingredients": [ "minecraft:blue_dye", [ diff --git a/data/minecraft/recipe/dye_blue_harness.json b/data/minecraft/recipe/dye_blue_harness.json new file mode 100644 index 00000000..8a2c576c --- /dev/null +++ b/data/minecraft/recipe/dye_blue_harness.json @@ -0,0 +1,29 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "equipment", + "group": "harness_dye", + "ingredients": [ + "minecraft:blue_dye", + [ + "minecraft:black_harness", + "minecraft:brown_harness", + "minecraft:cyan_harness", + "minecraft:gray_harness", + "minecraft:green_harness", + "minecraft:light_blue_harness", + "minecraft:light_gray_harness", + "minecraft:lime_harness", + "minecraft:magenta_harness", + "minecraft:orange_harness", + "minecraft:pink_harness", + "minecraft:purple_harness", + "minecraft:red_harness", + "minecraft:yellow_harness", + "minecraft:white_harness" + ] + ], + "result": { + "count": 1, + "id": "minecraft:blue_harness" + } +} \ No newline at end of file diff --git a/data/minecraft/recipe/dye_brown_bed.json b/data/minecraft/recipe/dye_brown_bed.json index 2ded199b..d7c954da 100644 --- a/data/minecraft/recipe/dye_brown_bed.json +++ b/data/minecraft/recipe/dye_brown_bed.json @@ -1,7 +1,7 @@ { "type": "minecraft:crafting_shapeless", - "category": "building", - "group": "bed", + "category": "misc", + "group": "bed_dye", "ingredients": [ "minecraft:brown_dye", [ diff --git a/data/minecraft/recipe/dye_brown_carpet.json b/data/minecraft/recipe/dye_brown_carpet.json index 9040c26e..2b9096be 100644 --- a/data/minecraft/recipe/dye_brown_carpet.json +++ b/data/minecraft/recipe/dye_brown_carpet.json @@ -1,7 +1,7 @@ { "type": "minecraft:crafting_shapeless", - "category": "building", - "group": "carpet", + "category": "misc", + "group": "carpet_dye", "ingredients": [ "minecraft:brown_dye", [ diff --git a/data/minecraft/recipe/dye_brown_harness.json b/data/minecraft/recipe/dye_brown_harness.json new file mode 100644 index 00000000..7af8cbc4 --- /dev/null +++ b/data/minecraft/recipe/dye_brown_harness.json @@ -0,0 +1,29 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "equipment", + "group": "harness_dye", + "ingredients": [ + "minecraft:brown_dye", + [ + "minecraft:black_harness", + "minecraft:blue_harness", + "minecraft:cyan_harness", + "minecraft:gray_harness", + "minecraft:green_harness", + "minecraft:light_blue_harness", + "minecraft:light_gray_harness", + "minecraft:lime_harness", + "minecraft:magenta_harness", + "minecraft:orange_harness", + "minecraft:pink_harness", + "minecraft:purple_harness", + "minecraft:red_harness", + "minecraft:yellow_harness", + "minecraft:white_harness" + ] + ], + "result": { + "count": 1, + "id": "minecraft:brown_harness" + } +} \ No newline at end of file diff --git a/data/minecraft/recipe/dye_cyan_bed.json b/data/minecraft/recipe/dye_cyan_bed.json index ee083305..3e7c34d5 100644 --- a/data/minecraft/recipe/dye_cyan_bed.json +++ b/data/minecraft/recipe/dye_cyan_bed.json @@ -1,7 +1,7 @@ { "type": "minecraft:crafting_shapeless", - "category": "building", - "group": "bed", + "category": "misc", + "group": "bed_dye", "ingredients": [ "minecraft:cyan_dye", [ diff --git a/data/minecraft/recipe/dye_cyan_carpet.json b/data/minecraft/recipe/dye_cyan_carpet.json index 7264bc00..99e9912c 100644 --- a/data/minecraft/recipe/dye_cyan_carpet.json +++ b/data/minecraft/recipe/dye_cyan_carpet.json @@ -1,7 +1,7 @@ { "type": "minecraft:crafting_shapeless", - "category": "building", - "group": "carpet", + "category": "misc", + "group": "carpet_dye", "ingredients": [ "minecraft:cyan_dye", [ diff --git a/data/minecraft/recipe/dye_cyan_harness.json b/data/minecraft/recipe/dye_cyan_harness.json new file mode 100644 index 00000000..7c8ddb21 --- /dev/null +++ b/data/minecraft/recipe/dye_cyan_harness.json @@ -0,0 +1,29 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "equipment", + "group": "harness_dye", + "ingredients": [ + "minecraft:cyan_dye", + [ + "minecraft:black_harness", + "minecraft:blue_harness", + "minecraft:brown_harness", + "minecraft:gray_harness", + "minecraft:green_harness", + "minecraft:light_blue_harness", + "minecraft:light_gray_harness", + "minecraft:lime_harness", + "minecraft:magenta_harness", + "minecraft:orange_harness", + "minecraft:pink_harness", + "minecraft:purple_harness", + "minecraft:red_harness", + "minecraft:yellow_harness", + "minecraft:white_harness" + ] + ], + "result": { + "count": 1, + "id": "minecraft:cyan_harness" + } +} \ No newline at end of file diff --git a/data/minecraft/recipe/dye_gray_bed.json b/data/minecraft/recipe/dye_gray_bed.json index 234a725b..8d9110a7 100644 --- a/data/minecraft/recipe/dye_gray_bed.json +++ b/data/minecraft/recipe/dye_gray_bed.json @@ -1,7 +1,7 @@ { "type": "minecraft:crafting_shapeless", - "category": "building", - "group": "bed", + "category": "misc", + "group": "bed_dye", "ingredients": [ "minecraft:gray_dye", [ diff --git a/data/minecraft/recipe/dye_gray_carpet.json b/data/minecraft/recipe/dye_gray_carpet.json index 033577ea..e4562712 100644 --- a/data/minecraft/recipe/dye_gray_carpet.json +++ b/data/minecraft/recipe/dye_gray_carpet.json @@ -1,7 +1,7 @@ { "type": "minecraft:crafting_shapeless", - "category": "building", - "group": "carpet", + "category": "misc", + "group": "carpet_dye", "ingredients": [ "minecraft:gray_dye", [ diff --git a/data/minecraft/recipe/dye_gray_harness.json b/data/minecraft/recipe/dye_gray_harness.json new file mode 100644 index 00000000..515eff4b --- /dev/null +++ b/data/minecraft/recipe/dye_gray_harness.json @@ -0,0 +1,29 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "equipment", + "group": "harness_dye", + "ingredients": [ + "minecraft:gray_dye", + [ + "minecraft:black_harness", + "minecraft:blue_harness", + "minecraft:brown_harness", + "minecraft:cyan_harness", + "minecraft:green_harness", + "minecraft:light_blue_harness", + "minecraft:light_gray_harness", + "minecraft:lime_harness", + "minecraft:magenta_harness", + "minecraft:orange_harness", + "minecraft:pink_harness", + "minecraft:purple_harness", + "minecraft:red_harness", + "minecraft:yellow_harness", + "minecraft:white_harness" + ] + ], + "result": { + "count": 1, + "id": "minecraft:gray_harness" + } +} \ No newline at end of file diff --git a/data/minecraft/recipe/dye_green_bed.json b/data/minecraft/recipe/dye_green_bed.json index f49321a4..ca1d2626 100644 --- a/data/minecraft/recipe/dye_green_bed.json +++ b/data/minecraft/recipe/dye_green_bed.json @@ -1,7 +1,7 @@ { "type": "minecraft:crafting_shapeless", - "category": "building", - "group": "bed", + "category": "misc", + "group": "bed_dye", "ingredients": [ "minecraft:green_dye", [ diff --git a/data/minecraft/recipe/dye_green_carpet.json b/data/minecraft/recipe/dye_green_carpet.json index f1d9c80d..b71eb47a 100644 --- a/data/minecraft/recipe/dye_green_carpet.json +++ b/data/minecraft/recipe/dye_green_carpet.json @@ -1,7 +1,7 @@ { "type": "minecraft:crafting_shapeless", - "category": "building", - "group": "carpet", + "category": "misc", + "group": "carpet_dye", "ingredients": [ "minecraft:green_dye", [ diff --git a/data/minecraft/recipe/dye_green_harness.json b/data/minecraft/recipe/dye_green_harness.json new file mode 100644 index 00000000..8dc440af --- /dev/null +++ b/data/minecraft/recipe/dye_green_harness.json @@ -0,0 +1,29 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "equipment", + "group": "harness_dye", + "ingredients": [ + "minecraft:green_dye", + [ + "minecraft:black_harness", + "minecraft:blue_harness", + "minecraft:brown_harness", + "minecraft:cyan_harness", + "minecraft:gray_harness", + "minecraft:light_blue_harness", + "minecraft:light_gray_harness", + "minecraft:lime_harness", + "minecraft:magenta_harness", + "minecraft:orange_harness", + "minecraft:pink_harness", + "minecraft:purple_harness", + "minecraft:red_harness", + "minecraft:yellow_harness", + "minecraft:white_harness" + ] + ], + "result": { + "count": 1, + "id": "minecraft:green_harness" + } +} \ No newline at end of file diff --git a/data/minecraft/recipe/dye_light_blue_bed.json b/data/minecraft/recipe/dye_light_blue_bed.json index e8f8555a..093a6ca9 100644 --- a/data/minecraft/recipe/dye_light_blue_bed.json +++ b/data/minecraft/recipe/dye_light_blue_bed.json @@ -1,7 +1,7 @@ { "type": "minecraft:crafting_shapeless", - "category": "building", - "group": "bed", + "category": "misc", + "group": "bed_dye", "ingredients": [ "minecraft:light_blue_dye", [ diff --git a/data/minecraft/recipe/dye_light_blue_carpet.json b/data/minecraft/recipe/dye_light_blue_carpet.json index 201a234c..08142251 100644 --- a/data/minecraft/recipe/dye_light_blue_carpet.json +++ b/data/minecraft/recipe/dye_light_blue_carpet.json @@ -1,7 +1,7 @@ { "type": "minecraft:crafting_shapeless", - "category": "building", - "group": "carpet", + "category": "misc", + "group": "carpet_dye", "ingredients": [ "minecraft:light_blue_dye", [ diff --git a/data/minecraft/recipe/dye_light_blue_harness.json b/data/minecraft/recipe/dye_light_blue_harness.json new file mode 100644 index 00000000..acde4b06 --- /dev/null +++ b/data/minecraft/recipe/dye_light_blue_harness.json @@ -0,0 +1,29 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "equipment", + "group": "harness_dye", + "ingredients": [ + "minecraft:light_blue_dye", + [ + "minecraft:black_harness", + "minecraft:blue_harness", + "minecraft:brown_harness", + "minecraft:cyan_harness", + "minecraft:gray_harness", + "minecraft:green_harness", + "minecraft:light_gray_harness", + "minecraft:lime_harness", + "minecraft:magenta_harness", + "minecraft:orange_harness", + "minecraft:pink_harness", + "minecraft:purple_harness", + "minecraft:red_harness", + "minecraft:yellow_harness", + "minecraft:white_harness" + ] + ], + "result": { + "count": 1, + "id": "minecraft:light_blue_harness" + } +} \ No newline at end of file diff --git a/data/minecraft/recipe/dye_light_gray_bed.json b/data/minecraft/recipe/dye_light_gray_bed.json index 00cfa5a5..ef2b1d99 100644 --- a/data/minecraft/recipe/dye_light_gray_bed.json +++ b/data/minecraft/recipe/dye_light_gray_bed.json @@ -1,7 +1,7 @@ { "type": "minecraft:crafting_shapeless", - "category": "building", - "group": "bed", + "category": "misc", + "group": "bed_dye", "ingredients": [ "minecraft:light_gray_dye", [ diff --git a/data/minecraft/recipe/dye_light_gray_carpet.json b/data/minecraft/recipe/dye_light_gray_carpet.json index 9836e6ea..1c35cd9e 100644 --- a/data/minecraft/recipe/dye_light_gray_carpet.json +++ b/data/minecraft/recipe/dye_light_gray_carpet.json @@ -1,7 +1,7 @@ { "type": "minecraft:crafting_shapeless", - "category": "building", - "group": "carpet", + "category": "misc", + "group": "carpet_dye", "ingredients": [ "minecraft:light_gray_dye", [ diff --git a/data/minecraft/recipe/dye_light_gray_harness.json b/data/minecraft/recipe/dye_light_gray_harness.json new file mode 100644 index 00000000..c1657d70 --- /dev/null +++ b/data/minecraft/recipe/dye_light_gray_harness.json @@ -0,0 +1,29 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "equipment", + "group": "harness_dye", + "ingredients": [ + "minecraft:light_gray_dye", + [ + "minecraft:black_harness", + "minecraft:blue_harness", + "minecraft:brown_harness", + "minecraft:cyan_harness", + "minecraft:gray_harness", + "minecraft:green_harness", + "minecraft:light_blue_harness", + "minecraft:lime_harness", + "minecraft:magenta_harness", + "minecraft:orange_harness", + "minecraft:pink_harness", + "minecraft:purple_harness", + "minecraft:red_harness", + "minecraft:yellow_harness", + "minecraft:white_harness" + ] + ], + "result": { + "count": 1, + "id": "minecraft:light_gray_harness" + } +} \ No newline at end of file diff --git a/data/minecraft/recipe/dye_lime_bed.json b/data/minecraft/recipe/dye_lime_bed.json index 1afd7aff..04704dfd 100644 --- a/data/minecraft/recipe/dye_lime_bed.json +++ b/data/minecraft/recipe/dye_lime_bed.json @@ -1,7 +1,7 @@ { "type": "minecraft:crafting_shapeless", - "category": "building", - "group": "bed", + "category": "misc", + "group": "bed_dye", "ingredients": [ "minecraft:lime_dye", [ diff --git a/data/minecraft/recipe/dye_lime_carpet.json b/data/minecraft/recipe/dye_lime_carpet.json index 0d4e4a38..368f019e 100644 --- a/data/minecraft/recipe/dye_lime_carpet.json +++ b/data/minecraft/recipe/dye_lime_carpet.json @@ -1,7 +1,7 @@ { "type": "minecraft:crafting_shapeless", - "category": "building", - "group": "carpet", + "category": "misc", + "group": "carpet_dye", "ingredients": [ "minecraft:lime_dye", [ diff --git a/data/minecraft/recipe/dye_lime_harness.json b/data/minecraft/recipe/dye_lime_harness.json new file mode 100644 index 00000000..17c61ef6 --- /dev/null +++ b/data/minecraft/recipe/dye_lime_harness.json @@ -0,0 +1,29 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "equipment", + "group": "harness_dye", + "ingredients": [ + "minecraft:lime_dye", + [ + "minecraft:black_harness", + "minecraft:blue_harness", + "minecraft:brown_harness", + "minecraft:cyan_harness", + "minecraft:gray_harness", + "minecraft:green_harness", + "minecraft:light_blue_harness", + "minecraft:light_gray_harness", + "minecraft:magenta_harness", + "minecraft:orange_harness", + "minecraft:pink_harness", + "minecraft:purple_harness", + "minecraft:red_harness", + "minecraft:yellow_harness", + "minecraft:white_harness" + ] + ], + "result": { + "count": 1, + "id": "minecraft:lime_harness" + } +} \ No newline at end of file diff --git a/data/minecraft/recipe/dye_magenta_bed.json b/data/minecraft/recipe/dye_magenta_bed.json index ae2db60d..962d05bf 100644 --- a/data/minecraft/recipe/dye_magenta_bed.json +++ b/data/minecraft/recipe/dye_magenta_bed.json @@ -1,7 +1,7 @@ { "type": "minecraft:crafting_shapeless", - "category": "building", - "group": "bed", + "category": "misc", + "group": "bed_dye", "ingredients": [ "minecraft:magenta_dye", [ diff --git a/data/minecraft/recipe/dye_magenta_carpet.json b/data/minecraft/recipe/dye_magenta_carpet.json index a161f330..541d706d 100644 --- a/data/minecraft/recipe/dye_magenta_carpet.json +++ b/data/minecraft/recipe/dye_magenta_carpet.json @@ -1,7 +1,7 @@ { "type": "minecraft:crafting_shapeless", - "category": "building", - "group": "carpet", + "category": "misc", + "group": "carpet_dye", "ingredients": [ "minecraft:magenta_dye", [ diff --git a/data/minecraft/recipe/dye_magenta_harness.json b/data/minecraft/recipe/dye_magenta_harness.json new file mode 100644 index 00000000..b3b33cd4 --- /dev/null +++ b/data/minecraft/recipe/dye_magenta_harness.json @@ -0,0 +1,29 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "equipment", + "group": "harness_dye", + "ingredients": [ + "minecraft:magenta_dye", + [ + "minecraft:black_harness", + "minecraft:blue_harness", + "minecraft:brown_harness", + "minecraft:cyan_harness", + "minecraft:gray_harness", + "minecraft:green_harness", + "minecraft:light_blue_harness", + "minecraft:light_gray_harness", + "minecraft:lime_harness", + "minecraft:orange_harness", + "minecraft:pink_harness", + "minecraft:purple_harness", + "minecraft:red_harness", + "minecraft:yellow_harness", + "minecraft:white_harness" + ] + ], + "result": { + "count": 1, + "id": "minecraft:magenta_harness" + } +} \ No newline at end of file diff --git a/data/minecraft/recipe/dye_orange_bed.json b/data/minecraft/recipe/dye_orange_bed.json index fd5a35b6..30bc3cb0 100644 --- a/data/minecraft/recipe/dye_orange_bed.json +++ b/data/minecraft/recipe/dye_orange_bed.json @@ -1,7 +1,7 @@ { "type": "minecraft:crafting_shapeless", - "category": "building", - "group": "bed", + "category": "misc", + "group": "bed_dye", "ingredients": [ "minecraft:orange_dye", [ diff --git a/data/minecraft/recipe/dye_orange_carpet.json b/data/minecraft/recipe/dye_orange_carpet.json index 5d09cc91..cf661449 100644 --- a/data/minecraft/recipe/dye_orange_carpet.json +++ b/data/minecraft/recipe/dye_orange_carpet.json @@ -1,7 +1,7 @@ { "type": "minecraft:crafting_shapeless", - "category": "building", - "group": "carpet", + "category": "misc", + "group": "carpet_dye", "ingredients": [ "minecraft:orange_dye", [ diff --git a/data/minecraft/recipe/dye_orange_harness.json b/data/minecraft/recipe/dye_orange_harness.json new file mode 100644 index 00000000..323a8648 --- /dev/null +++ b/data/minecraft/recipe/dye_orange_harness.json @@ -0,0 +1,29 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "equipment", + "group": "harness_dye", + "ingredients": [ + "minecraft:orange_dye", + [ + "minecraft:black_harness", + "minecraft:blue_harness", + "minecraft:brown_harness", + "minecraft:cyan_harness", + "minecraft:gray_harness", + "minecraft:green_harness", + "minecraft:light_blue_harness", + "minecraft:light_gray_harness", + "minecraft:lime_harness", + "minecraft:magenta_harness", + "minecraft:pink_harness", + "minecraft:purple_harness", + "minecraft:red_harness", + "minecraft:yellow_harness", + "minecraft:white_harness" + ] + ], + "result": { + "count": 1, + "id": "minecraft:orange_harness" + } +} \ No newline at end of file diff --git a/data/minecraft/recipe/dye_pink_bed.json b/data/minecraft/recipe/dye_pink_bed.json index 638186c8..c3a4a66d 100644 --- a/data/minecraft/recipe/dye_pink_bed.json +++ b/data/minecraft/recipe/dye_pink_bed.json @@ -1,7 +1,7 @@ { "type": "minecraft:crafting_shapeless", - "category": "building", - "group": "bed", + "category": "misc", + "group": "bed_dye", "ingredients": [ "minecraft:pink_dye", [ diff --git a/data/minecraft/recipe/dye_pink_carpet.json b/data/minecraft/recipe/dye_pink_carpet.json index 7c7cfa0c..96f81d87 100644 --- a/data/minecraft/recipe/dye_pink_carpet.json +++ b/data/minecraft/recipe/dye_pink_carpet.json @@ -1,7 +1,7 @@ { "type": "minecraft:crafting_shapeless", - "category": "building", - "group": "carpet", + "category": "misc", + "group": "carpet_dye", "ingredients": [ "minecraft:pink_dye", [ diff --git a/data/minecraft/recipe/dye_pink_harness.json b/data/minecraft/recipe/dye_pink_harness.json new file mode 100644 index 00000000..8d66968c --- /dev/null +++ b/data/minecraft/recipe/dye_pink_harness.json @@ -0,0 +1,29 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "equipment", + "group": "harness_dye", + "ingredients": [ + "minecraft:pink_dye", + [ + "minecraft:black_harness", + "minecraft:blue_harness", + "minecraft:brown_harness", + "minecraft:cyan_harness", + "minecraft:gray_harness", + "minecraft:green_harness", + "minecraft:light_blue_harness", + "minecraft:light_gray_harness", + "minecraft:lime_harness", + "minecraft:magenta_harness", + "minecraft:orange_harness", + "minecraft:purple_harness", + "minecraft:red_harness", + "minecraft:yellow_harness", + "minecraft:white_harness" + ] + ], + "result": { + "count": 1, + "id": "minecraft:pink_harness" + } +} \ No newline at end of file diff --git a/data/minecraft/recipe/dye_purple_bed.json b/data/minecraft/recipe/dye_purple_bed.json index 219a474f..12858890 100644 --- a/data/minecraft/recipe/dye_purple_bed.json +++ b/data/minecraft/recipe/dye_purple_bed.json @@ -1,7 +1,7 @@ { "type": "minecraft:crafting_shapeless", - "category": "building", - "group": "bed", + "category": "misc", + "group": "bed_dye", "ingredients": [ "minecraft:purple_dye", [ diff --git a/data/minecraft/recipe/dye_purple_carpet.json b/data/minecraft/recipe/dye_purple_carpet.json index ce58865c..0ddc3fc5 100644 --- a/data/minecraft/recipe/dye_purple_carpet.json +++ b/data/minecraft/recipe/dye_purple_carpet.json @@ -1,7 +1,7 @@ { "type": "minecraft:crafting_shapeless", - "category": "building", - "group": "carpet", + "category": "misc", + "group": "carpet_dye", "ingredients": [ "minecraft:purple_dye", [ diff --git a/data/minecraft/recipe/dye_purple_harness.json b/data/minecraft/recipe/dye_purple_harness.json new file mode 100644 index 00000000..136405a2 --- /dev/null +++ b/data/minecraft/recipe/dye_purple_harness.json @@ -0,0 +1,29 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "equipment", + "group": "harness_dye", + "ingredients": [ + "minecraft:purple_dye", + [ + "minecraft:black_harness", + "minecraft:blue_harness", + "minecraft:brown_harness", + "minecraft:cyan_harness", + "minecraft:gray_harness", + "minecraft:green_harness", + "minecraft:light_blue_harness", + "minecraft:light_gray_harness", + "minecraft:lime_harness", + "minecraft:magenta_harness", + "minecraft:orange_harness", + "minecraft:pink_harness", + "minecraft:red_harness", + "minecraft:yellow_harness", + "minecraft:white_harness" + ] + ], + "result": { + "count": 1, + "id": "minecraft:purple_harness" + } +} \ No newline at end of file diff --git a/data/minecraft/recipe/dye_red_bed.json b/data/minecraft/recipe/dye_red_bed.json index 2f89edc5..eca24d83 100644 --- a/data/minecraft/recipe/dye_red_bed.json +++ b/data/minecraft/recipe/dye_red_bed.json @@ -1,7 +1,7 @@ { "type": "minecraft:crafting_shapeless", - "category": "building", - "group": "bed", + "category": "misc", + "group": "bed_dye", "ingredients": [ "minecraft:red_dye", [ diff --git a/data/minecraft/recipe/dye_red_carpet.json b/data/minecraft/recipe/dye_red_carpet.json index f675d58b..5ae59273 100644 --- a/data/minecraft/recipe/dye_red_carpet.json +++ b/data/minecraft/recipe/dye_red_carpet.json @@ -1,7 +1,7 @@ { "type": "minecraft:crafting_shapeless", - "category": "building", - "group": "carpet", + "category": "misc", + "group": "carpet_dye", "ingredients": [ "minecraft:red_dye", [ diff --git a/data/minecraft/recipe/dye_red_harness.json b/data/minecraft/recipe/dye_red_harness.json new file mode 100644 index 00000000..d9421d1a --- /dev/null +++ b/data/minecraft/recipe/dye_red_harness.json @@ -0,0 +1,29 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "equipment", + "group": "harness_dye", + "ingredients": [ + "minecraft:red_dye", + [ + "minecraft:black_harness", + "minecraft:blue_harness", + "minecraft:brown_harness", + "minecraft:cyan_harness", + "minecraft:gray_harness", + "minecraft:green_harness", + "minecraft:light_blue_harness", + "minecraft:light_gray_harness", + "minecraft:lime_harness", + "minecraft:magenta_harness", + "minecraft:orange_harness", + "minecraft:pink_harness", + "minecraft:purple_harness", + "minecraft:yellow_harness", + "minecraft:white_harness" + ] + ], + "result": { + "count": 1, + "id": "minecraft:red_harness" + } +} \ No newline at end of file diff --git a/data/minecraft/recipe/dye_white_bed.json b/data/minecraft/recipe/dye_white_bed.json index 8a8289db..42d00c46 100644 --- a/data/minecraft/recipe/dye_white_bed.json +++ b/data/minecraft/recipe/dye_white_bed.json @@ -1,7 +1,7 @@ { "type": "minecraft:crafting_shapeless", - "category": "building", - "group": "bed", + "category": "misc", + "group": "bed_dye", "ingredients": [ "minecraft:white_dye", [ diff --git a/data/minecraft/recipe/dye_white_carpet.json b/data/minecraft/recipe/dye_white_carpet.json index 7d838bf0..5f712efa 100644 --- a/data/minecraft/recipe/dye_white_carpet.json +++ b/data/minecraft/recipe/dye_white_carpet.json @@ -1,7 +1,7 @@ { "type": "minecraft:crafting_shapeless", - "category": "building", - "group": "carpet", + "category": "misc", + "group": "carpet_dye", "ingredients": [ "minecraft:white_dye", [ diff --git a/data/minecraft/recipe/dye_white_harness.json b/data/minecraft/recipe/dye_white_harness.json new file mode 100644 index 00000000..96069455 --- /dev/null +++ b/data/minecraft/recipe/dye_white_harness.json @@ -0,0 +1,29 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "equipment", + "group": "harness_dye", + "ingredients": [ + "minecraft:white_dye", + [ + "minecraft:black_harness", + "minecraft:blue_harness", + "minecraft:brown_harness", + "minecraft:cyan_harness", + "minecraft:gray_harness", + "minecraft:green_harness", + "minecraft:light_blue_harness", + "minecraft:light_gray_harness", + "minecraft:lime_harness", + "minecraft:magenta_harness", + "minecraft:orange_harness", + "minecraft:pink_harness", + "minecraft:purple_harness", + "minecraft:red_harness", + "minecraft:yellow_harness" + ] + ], + "result": { + "count": 1, + "id": "minecraft:white_harness" + } +} \ No newline at end of file diff --git a/data/minecraft/recipe/dye_yellow_bed.json b/data/minecraft/recipe/dye_yellow_bed.json index 43fe9ea1..56a68bab 100644 --- a/data/minecraft/recipe/dye_yellow_bed.json +++ b/data/minecraft/recipe/dye_yellow_bed.json @@ -1,7 +1,7 @@ { "type": "minecraft:crafting_shapeless", - "category": "building", - "group": "bed", + "category": "misc", + "group": "bed_dye", "ingredients": [ "minecraft:yellow_dye", [ diff --git a/data/minecraft/recipe/dye_yellow_carpet.json b/data/minecraft/recipe/dye_yellow_carpet.json index 8c0c3198..0aee13bd 100644 --- a/data/minecraft/recipe/dye_yellow_carpet.json +++ b/data/minecraft/recipe/dye_yellow_carpet.json @@ -1,7 +1,7 @@ { "type": "minecraft:crafting_shapeless", - "category": "building", - "group": "carpet", + "category": "misc", + "group": "carpet_dye", "ingredients": [ "minecraft:yellow_dye", [ diff --git a/data/minecraft/recipe/dye_yellow_harness.json b/data/minecraft/recipe/dye_yellow_harness.json new file mode 100644 index 00000000..8c425430 --- /dev/null +++ b/data/minecraft/recipe/dye_yellow_harness.json @@ -0,0 +1,29 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "equipment", + "group": "harness_dye", + "ingredients": [ + "minecraft:yellow_dye", + [ + "minecraft:black_harness", + "minecraft:blue_harness", + "minecraft:brown_harness", + "minecraft:cyan_harness", + "minecraft:gray_harness", + "minecraft:green_harness", + "minecraft:light_blue_harness", + "minecraft:light_gray_harness", + "minecraft:lime_harness", + "minecraft:magenta_harness", + "minecraft:orange_harness", + "minecraft:pink_harness", + "minecraft:purple_harness", + "minecraft:red_harness", + "minecraft:white_harness" + ] + ], + "result": { + "count": 1, + "id": "minecraft:yellow_harness" + } +} \ No newline at end of file diff --git a/data/minecraft/recipe/gray_harness.json b/data/minecraft/recipe/gray_harness.json new file mode 100644 index 00000000..059326d6 --- /dev/null +++ b/data/minecraft/recipe/gray_harness.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "harness", + "key": { + "#": "minecraft:gray_wool", + "G": "minecraft:glass", + "L": "minecraft:leather" + }, + "pattern": [ + "LLL", + "G#G" + ], + "result": { + "count": 1, + "id": "minecraft:gray_harness" + } +} \ No newline at end of file diff --git a/data/minecraft/recipe/green_harness.json b/data/minecraft/recipe/green_harness.json new file mode 100644 index 00000000..58d4f93e --- /dev/null +++ b/data/minecraft/recipe/green_harness.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "harness", + "key": { + "#": "minecraft:green_wool", + "G": "minecraft:glass", + "L": "minecraft:leather" + }, + "pattern": [ + "LLL", + "G#G" + ], + "result": { + "count": 1, + "id": "minecraft:green_harness" + } +} \ No newline at end of file diff --git a/data/minecraft/recipe/lead.json b/data/minecraft/recipe/lead.json index 647426d6..be3bcf9f 100644 --- a/data/minecraft/recipe/lead.json +++ b/data/minecraft/recipe/lead.json @@ -2,12 +2,11 @@ "type": "minecraft:crafting_shaped", "category": "equipment", "key": { - "O": "minecraft:slime_ball", "~": "minecraft:string" }, "pattern": [ "~~ ", - "~O ", + "~~ ", " ~" ], "result": { diff --git a/data/minecraft/recipe/light_blue_harness.json b/data/minecraft/recipe/light_blue_harness.json new file mode 100644 index 00000000..2fd9bd5f --- /dev/null +++ b/data/minecraft/recipe/light_blue_harness.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "harness", + "key": { + "#": "minecraft:light_blue_wool", + "G": "minecraft:glass", + "L": "minecraft:leather" + }, + "pattern": [ + "LLL", + "G#G" + ], + "result": { + "count": 1, + "id": "minecraft:light_blue_harness" + } +} \ No newline at end of file diff --git a/data/minecraft/recipe/light_gray_harness.json b/data/minecraft/recipe/light_gray_harness.json new file mode 100644 index 00000000..82c38a86 --- /dev/null +++ b/data/minecraft/recipe/light_gray_harness.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "harness", + "key": { + "#": "minecraft:light_gray_wool", + "G": "minecraft:glass", + "L": "minecraft:leather" + }, + "pattern": [ + "LLL", + "G#G" + ], + "result": { + "count": 1, + "id": "minecraft:light_gray_harness" + } +} \ No newline at end of file diff --git a/data/minecraft/recipe/lime_harness.json b/data/minecraft/recipe/lime_harness.json new file mode 100644 index 00000000..532870c7 --- /dev/null +++ b/data/minecraft/recipe/lime_harness.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "harness", + "key": { + "#": "minecraft:lime_wool", + "G": "minecraft:glass", + "L": "minecraft:leather" + }, + "pattern": [ + "LLL", + "G#G" + ], + "result": { + "count": 1, + "id": "minecraft:lime_harness" + } +} \ No newline at end of file diff --git a/data/minecraft/recipe/magenta_harness.json b/data/minecraft/recipe/magenta_harness.json new file mode 100644 index 00000000..bf1c4144 --- /dev/null +++ b/data/minecraft/recipe/magenta_harness.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "harness", + "key": { + "#": "minecraft:magenta_wool", + "G": "minecraft:glass", + "L": "minecraft:leather" + }, + "pattern": [ + "LLL", + "G#G" + ], + "result": { + "count": 1, + "id": "minecraft:magenta_harness" + } +} \ No newline at end of file diff --git a/data/minecraft/recipe/orange_harness.json b/data/minecraft/recipe/orange_harness.json new file mode 100644 index 00000000..c448bffc --- /dev/null +++ b/data/minecraft/recipe/orange_harness.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "harness", + "key": { + "#": "minecraft:orange_wool", + "G": "minecraft:glass", + "L": "minecraft:leather" + }, + "pattern": [ + "LLL", + "G#G" + ], + "result": { + "count": 1, + "id": "minecraft:orange_harness" + } +} \ No newline at end of file diff --git a/data/minecraft/recipe/pink_harness.json b/data/minecraft/recipe/pink_harness.json new file mode 100644 index 00000000..fb2ded03 --- /dev/null +++ b/data/minecraft/recipe/pink_harness.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "harness", + "key": { + "#": "minecraft:pink_wool", + "G": "minecraft:glass", + "L": "minecraft:leather" + }, + "pattern": [ + "LLL", + "G#G" + ], + "result": { + "count": 1, + "id": "minecraft:pink_harness" + } +} \ No newline at end of file diff --git a/data/minecraft/recipe/purple_harness.json b/data/minecraft/recipe/purple_harness.json new file mode 100644 index 00000000..8d87ab4f --- /dev/null +++ b/data/minecraft/recipe/purple_harness.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "harness", + "key": { + "#": "minecraft:purple_wool", + "G": "minecraft:glass", + "L": "minecraft:leather" + }, + "pattern": [ + "LLL", + "G#G" + ], + "result": { + "count": 1, + "id": "minecraft:purple_harness" + } +} \ No newline at end of file diff --git a/data/minecraft/recipe/red_harness.json b/data/minecraft/recipe/red_harness.json new file mode 100644 index 00000000..f7a2ee24 --- /dev/null +++ b/data/minecraft/recipe/red_harness.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "harness", + "key": { + "#": "minecraft:red_wool", + "G": "minecraft:glass", + "L": "minecraft:leather" + }, + "pattern": [ + "LLL", + "G#G" + ], + "result": { + "count": 1, + "id": "minecraft:red_harness" + } +} \ No newline at end of file diff --git a/data/minecraft/recipe/saddle.json b/data/minecraft/recipe/saddle.json new file mode 100644 index 00000000..1a026c19 --- /dev/null +++ b/data/minecraft/recipe/saddle.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "#": "minecraft:iron_ingot", + "X": "minecraft:leather" + }, + "pattern": [ + " X ", + "X#X" + ], + "result": { + "count": 1, + "id": "minecraft:saddle" + } +} \ No newline at end of file diff --git a/data/minecraft/recipe/white_harness.json b/data/minecraft/recipe/white_harness.json new file mode 100644 index 00000000..66f96edf --- /dev/null +++ b/data/minecraft/recipe/white_harness.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "harness", + "key": { + "#": "minecraft:white_wool", + "G": "minecraft:glass", + "L": "minecraft:leather" + }, + "pattern": [ + "LLL", + "G#G" + ], + "result": { + "count": 1, + "id": "minecraft:white_harness" + } +} \ No newline at end of file diff --git a/data/minecraft/recipe/yellow_harness.json b/data/minecraft/recipe/yellow_harness.json new file mode 100644 index 00000000..118429ce --- /dev/null +++ b/data/minecraft/recipe/yellow_harness.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "harness", + "key": { + "#": "minecraft:yellow_wool", + "G": "minecraft:glass", + "L": "minecraft:leather" + }, + "pattern": [ + "LLL", + "G#G" + ], + "result": { + "count": 1, + "id": "minecraft:yellow_harness" + } +} \ No newline at end of file diff --git a/data/minecraft/structure/ancient_city/city/entrance/entrance_connector.nbt b/data/minecraft/structure/ancient_city/city/entrance/entrance_connector.nbt index a9bc2879..71e0c519 100644 --- a/data/minecraft/structure/ancient_city/city/entrance/entrance_connector.nbt +++ b/data/minecraft/structure/ancient_city/city/entrance/entrance_connector.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ee0fa7b8b4176657971c4f905da4854be8315a285b69ee5c31cfd5808d8f80fd -size 9417 +oid sha256:c288b9d3c76241a265cc962a07f7a3bc979b050c7426c4f64076bb123b6205aa +size 9416 diff --git a/data/minecraft/structure/ancient_city/city/entrance/entrance_path_1.nbt b/data/minecraft/structure/ancient_city/city/entrance/entrance_path_1.nbt index 07cb40ba..85701902 100644 --- a/data/minecraft/structure/ancient_city/city/entrance/entrance_path_1.nbt +++ b/data/minecraft/structure/ancient_city/city/entrance/entrance_path_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0d3f4d080ff2c90cdee9d7db9c1776821c67992e44e399a0972b2c49f7c73329 +oid sha256:e232f01dd3f5566cf70b9165436a87e6a5a845392e09e82cfe69297ac99f5eb9 size 9752 diff --git a/data/minecraft/structure/ancient_city/city/entrance/entrance_path_2.nbt b/data/minecraft/structure/ancient_city/city/entrance/entrance_path_2.nbt index 3352274f..eb7aa1c8 100644 --- a/data/minecraft/structure/ancient_city/city/entrance/entrance_path_2.nbt +++ b/data/minecraft/structure/ancient_city/city/entrance/entrance_path_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0f6f566b21bf3654b87ad476a5541c4b63120874a782d0bad2507843b70b9336 -size 13778 +oid sha256:ac1b5174e21cb959125756e9d4b3e9360d709b5054f43154ab5a1fbfe3a1e53a +size 13777 diff --git a/data/minecraft/structure/ancient_city/city/entrance/entrance_path_3.nbt b/data/minecraft/structure/ancient_city/city/entrance/entrance_path_3.nbt index 3ad59a96..a402f5e7 100644 --- a/data/minecraft/structure/ancient_city/city/entrance/entrance_path_3.nbt +++ b/data/minecraft/structure/ancient_city/city/entrance/entrance_path_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5f238dd1a12be504f21ae653d64312fbd4371541b0a6d94861ed6729839b17d4 -size 12154 +oid sha256:e74cd7b918889d533541f2a9d296bdcd7e62ae0bf4ffc6bc614039902be00f5a +size 12153 diff --git a/data/minecraft/structure/ancient_city/city/entrance/entrance_path_4.nbt b/data/minecraft/structure/ancient_city/city/entrance/entrance_path_4.nbt index 0654fedb..c4865cc8 100644 --- a/data/minecraft/structure/ancient_city/city/entrance/entrance_path_4.nbt +++ b/data/minecraft/structure/ancient_city/city/entrance/entrance_path_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7039093b5f35dfee9cd932bbea02681bceeeb0f8578ff90d184f559964ca2906 -size 11789 +oid sha256:c4d49cb5f2a954fb4cfbe0498717dc8a89a1bc6ea62c5ea87d2e51f2b7289069 +size 11787 diff --git a/data/minecraft/structure/ancient_city/city/entrance/entrance_path_5.nbt b/data/minecraft/structure/ancient_city/city/entrance/entrance_path_5.nbt index 1c7de10a..9f72fc6c 100644 --- a/data/minecraft/structure/ancient_city/city/entrance/entrance_path_5.nbt +++ b/data/minecraft/structure/ancient_city/city/entrance/entrance_path_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fc2c03b145ef26c7ec0852cb5cf44ce5e4bf8836824c015e16f63c8f40029cc6 -size 9069 +oid sha256:923fd272df41188a21aac3a5d2b89f7527e28ddbdc19b9f57b94d71c201165d0 +size 9068 diff --git a/data/minecraft/structure/ancient_city/city_center/city_center_1.nbt b/data/minecraft/structure/ancient_city/city_center/city_center_1.nbt index facc54fe..f1f31adc 100644 --- a/data/minecraft/structure/ancient_city/city_center/city_center_1.nbt +++ b/data/minecraft/structure/ancient_city/city_center/city_center_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8c723283f0cb821497dc9d8d1c811378544e101106ef3453b0a445b3337a4467 -size 26261 +oid sha256:489908fc7a119943a9eed2c870ebe844dccd601c926310f63972689e348bc0a4 +size 26259 diff --git a/data/minecraft/structure/ancient_city/city_center/city_center_2.nbt b/data/minecraft/structure/ancient_city/city_center/city_center_2.nbt index 35b38b5a..7c5e2499 100644 --- a/data/minecraft/structure/ancient_city/city_center/city_center_2.nbt +++ b/data/minecraft/structure/ancient_city/city_center/city_center_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:33635c52b80ca60a97fafab1bc56fc22194ca44139d3b7ba87404382ce57692d -size 26678 +oid sha256:2fdbc95234cc08259eb2862c2d2b3f25b3fe5fee36432256cf4ec42c941a8159 +size 26676 diff --git a/data/minecraft/structure/ancient_city/city_center/city_center_3.nbt b/data/minecraft/structure/ancient_city/city_center/city_center_3.nbt index b4ad2168..8507184f 100644 --- a/data/minecraft/structure/ancient_city/city_center/city_center_3.nbt +++ b/data/minecraft/structure/ancient_city/city_center/city_center_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e366f629275c98646f9a8375bc3db96d1201785c077d372e552bcb7d9fd05ace -size 26122 +oid sha256:7aa8b8f9e2a608a4d8c886d0b016277a2955b4dae4319637efd9dd13b04be0e7 +size 26121 diff --git a/data/minecraft/structure/ancient_city/city_center/walls/bottom_1.nbt b/data/minecraft/structure/ancient_city/city_center/walls/bottom_1.nbt index 9a5fad52..c1286701 100644 --- a/data/minecraft/structure/ancient_city/city_center/walls/bottom_1.nbt +++ b/data/minecraft/structure/ancient_city/city_center/walls/bottom_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:69e52e8e99199837dd980e3df61093cf1fe86941a6ba171c449b9c7bd7bdba4e +oid sha256:f7f6c951741f6c6c7d50d80dbd5369463bbf69c7c11c2adfba0ff9f001fe72ea size 7473 diff --git a/data/minecraft/structure/ancient_city/city_center/walls/bottom_2.nbt b/data/minecraft/structure/ancient_city/city_center/walls/bottom_2.nbt index a7b19e1f..5a31e0f2 100644 --- a/data/minecraft/structure/ancient_city/city_center/walls/bottom_2.nbt +++ b/data/minecraft/structure/ancient_city/city_center/walls/bottom_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:94078cabc273db04ab20b5e65c275d213e720ee97af16e0eeb527b87f7b1806b -size 7002 +oid sha256:a2dfedc106de6d3fd673351f1ce2ea9b0f2b66dddaa21ef7baf181870886c70c +size 7001 diff --git a/data/minecraft/structure/ancient_city/city_center/walls/bottom_left_corner.nbt b/data/minecraft/structure/ancient_city/city_center/walls/bottom_left_corner.nbt index 50f484f5..aacf121c 100644 --- a/data/minecraft/structure/ancient_city/city_center/walls/bottom_left_corner.nbt +++ b/data/minecraft/structure/ancient_city/city_center/walls/bottom_left_corner.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f9133f57d994d4af77538bf371c37ac3bc04b181ba671a7a936c4efd26609ad6 -size 2612 +oid sha256:96b7fd66f2307de57a450c40ebe5f83c06a17caab3ff4e0d26b63e27205f9ec7 +size 2610 diff --git a/data/minecraft/structure/ancient_city/city_center/walls/bottom_right_corner.nbt b/data/minecraft/structure/ancient_city/city_center/walls/bottom_right_corner.nbt index 80f9a382..3fdf3c87 100644 --- a/data/minecraft/structure/ancient_city/city_center/walls/bottom_right_corner.nbt +++ b/data/minecraft/structure/ancient_city/city_center/walls/bottom_right_corner.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8ce289950d788eac13a9cc58adaf61ef1580f2b7beb1261ccfa9be6a63590613 -size 3048 +oid sha256:11a880446f6d6afbb4687c07991fae587f36a99bbb6187e905d4d4fffff9ea85 +size 3047 diff --git a/data/minecraft/structure/ancient_city/city_center/walls/bottom_right_corner_1.nbt b/data/minecraft/structure/ancient_city/city_center/walls/bottom_right_corner_1.nbt index 96e8fd69..8dea00ec 100644 --- a/data/minecraft/structure/ancient_city/city_center/walls/bottom_right_corner_1.nbt +++ b/data/minecraft/structure/ancient_city/city_center/walls/bottom_right_corner_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eba3507d4d5b4bae4fc583c8c06b22fc0202f2a097631c87ae18f6c9c428618d -size 2597 +oid sha256:55bc8cfe43e27149abe0a5e3aac129d4a34d4c6b687fd1e7635ae76054320c6a +size 2595 diff --git a/data/minecraft/structure/ancient_city/city_center/walls/bottom_right_corner_2.nbt b/data/minecraft/structure/ancient_city/city_center/walls/bottom_right_corner_2.nbt index 28c3eed5..8975ab26 100644 --- a/data/minecraft/structure/ancient_city/city_center/walls/bottom_right_corner_2.nbt +++ b/data/minecraft/structure/ancient_city/city_center/walls/bottom_right_corner_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ed6dc2edad44446959f52f6d3ceba5f8d48fae950292c40e7094999a56cb5836 -size 2668 +oid sha256:c38823a7dca99df6b61efad447daef69e5d207761e2037abc0225d92247fff83 +size 2666 diff --git a/data/minecraft/structure/ancient_city/city_center/walls/left.nbt b/data/minecraft/structure/ancient_city/city_center/walls/left.nbt index 003cd6b6..2c163306 100644 --- a/data/minecraft/structure/ancient_city/city_center/walls/left.nbt +++ b/data/minecraft/structure/ancient_city/city_center/walls/left.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4fe65739864227b640fa28a720ef415f53258410c8037da3d77f6add16c35175 -size 3183 +oid sha256:6cecda131beba8c70ce8c33467fd835f9b63d7728b5293cd1942fb428a477b7d +size 3182 diff --git a/data/minecraft/structure/ancient_city/city_center/walls/right.nbt b/data/minecraft/structure/ancient_city/city_center/walls/right.nbt index cca00da8..1edeeacf 100644 --- a/data/minecraft/structure/ancient_city/city_center/walls/right.nbt +++ b/data/minecraft/structure/ancient_city/city_center/walls/right.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6f48ddb70a8c75e76f1cc17cc27c283649aa85bce35c5003054deeb58b90a9dd -size 3178 +oid sha256:db94a136c85486122f5986af20070117c59ee1e40291f652911459b7cee5dd9b +size 3177 diff --git a/data/minecraft/structure/ancient_city/city_center/walls/top.nbt b/data/minecraft/structure/ancient_city/city_center/walls/top.nbt index e1fdf2ca..33ab2630 100644 --- a/data/minecraft/structure/ancient_city/city_center/walls/top.nbt +++ b/data/minecraft/structure/ancient_city/city_center/walls/top.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4eac1799b7c8ce71a121e2f473d974576805b8cca517fbf4d7f1957e4c837b6b -size 7120 +oid sha256:e3b7d5a32e682ecaf92975ed3ce4b07beb6d7cda07afac2d17944648ef1187d0 +size 7119 diff --git a/data/minecraft/structure/ancient_city/city_center/walls/top_left_corner.nbt b/data/minecraft/structure/ancient_city/city_center/walls/top_left_corner.nbt index 8a23f92a..737fd6f8 100644 --- a/data/minecraft/structure/ancient_city/city_center/walls/top_left_corner.nbt +++ b/data/minecraft/structure/ancient_city/city_center/walls/top_left_corner.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8b96c6f181847d5f7b64fd460607c1bdc4e0e7be9b5d83ab0fd25ee1fadb71ce -size 2598 +oid sha256:ad67e93581ac042470ebda91950cfbaf5b963aba597b5d763ace9b4e77481c6b +size 2597 diff --git a/data/minecraft/structure/ancient_city/city_center/walls/top_right_corner.nbt b/data/minecraft/structure/ancient_city/city_center/walls/top_right_corner.nbt index 11f824c5..f917d969 100644 --- a/data/minecraft/structure/ancient_city/city_center/walls/top_right_corner.nbt +++ b/data/minecraft/structure/ancient_city/city_center/walls/top_right_corner.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fb052e8d20aea7b2deca6296d26e0e229c2d4b3c23e7fbd60d0a29d9fbdc5c0e -size 2644 +oid sha256:918b546c8f761211783e1c3202444763784740a34bcd695b2bd2db61ea0c3b2c +size 2643 diff --git a/data/minecraft/structure/ancient_city/structures/barracks.nbt b/data/minecraft/structure/ancient_city/structures/barracks.nbt index 7f8ff304..3cdee348 100644 --- a/data/minecraft/structure/ancient_city/structures/barracks.nbt +++ b/data/minecraft/structure/ancient_city/structures/barracks.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4540518c61767941fe1c924f092263c2803e276826adcdad8e4dcd0c31365af8 -size 5634 +oid sha256:1f89707ae4b1b4e911fe6be420f9ddcbedc59a5b021cde6ad43fc7a2efcc299a +size 5632 diff --git a/data/minecraft/structure/ancient_city/structures/camp_1.nbt b/data/minecraft/structure/ancient_city/structures/camp_1.nbt index f80bde0d..ecb6eec5 100644 --- a/data/minecraft/structure/ancient_city/structures/camp_1.nbt +++ b/data/minecraft/structure/ancient_city/structures/camp_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f5c527e9ae11f095e46e4bf9ff75ff21cedbdedf691a395ce428a7f7f4bc7213 +oid sha256:53e3e286a5297ff4c3de51117389b10df512d2a1aced6340dd995514155797c2 size 1165 diff --git a/data/minecraft/structure/ancient_city/structures/camp_2.nbt b/data/minecraft/structure/ancient_city/structures/camp_2.nbt index a74deaed..4ce552a9 100644 --- a/data/minecraft/structure/ancient_city/structures/camp_2.nbt +++ b/data/minecraft/structure/ancient_city/structures/camp_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:effa8ed94fa63e5d4a7ab478aa046909ccc6018a58e4b85fbee326781fd56178 -size 1274 +oid sha256:f4d7e6b7f0427e759aa340afde626ffda60106d81ef49a72fdec745ba3bf6349 +size 1272 diff --git a/data/minecraft/structure/ancient_city/structures/camp_3.nbt b/data/minecraft/structure/ancient_city/structures/camp_3.nbt index 3b756bc9..804a878b 100644 --- a/data/minecraft/structure/ancient_city/structures/camp_3.nbt +++ b/data/minecraft/structure/ancient_city/structures/camp_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8ece7845e9cd5a24a189ca02b86f530fdc09ac860ec6e76d8c0dcdcfba60bfc4 -size 1017 +oid sha256:1964c06fd453ae73c2a0d974c3bab93fe93f470dbc4ff61cbab7413c2cd8b41f +size 1014 diff --git a/data/minecraft/structure/ancient_city/structures/chamber_1.nbt b/data/minecraft/structure/ancient_city/structures/chamber_1.nbt index c5478d04..994e74fb 100644 --- a/data/minecraft/structure/ancient_city/structures/chamber_1.nbt +++ b/data/minecraft/structure/ancient_city/structures/chamber_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a43ad780063fb51a93ba8eb678ed2986baad6d37ec09f63fb1a8577bffcf151b -size 2536 +oid sha256:65a6c102e4a671b8843f1f6d76485418d6234b3ac6f7d60ddd08bbe6775da3bb +size 2534 diff --git a/data/minecraft/structure/ancient_city/structures/chamber_2.nbt b/data/minecraft/structure/ancient_city/structures/chamber_2.nbt index 3a13e502..4dae6c9e 100644 --- a/data/minecraft/structure/ancient_city/structures/chamber_2.nbt +++ b/data/minecraft/structure/ancient_city/structures/chamber_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:01c4f5766ea37568f343de8a6a55f8c4bd3ee124998cd43b28bd8a3b204ac420 -size 1312 +oid sha256:8ab389bde1de2975194f1721e825c3034686db81ceede308377d09c413aac1b5 +size 1311 diff --git a/data/minecraft/structure/ancient_city/structures/chamber_3.nbt b/data/minecraft/structure/ancient_city/structures/chamber_3.nbt index d22455bf..217f24fd 100644 --- a/data/minecraft/structure/ancient_city/structures/chamber_3.nbt +++ b/data/minecraft/structure/ancient_city/structures/chamber_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0d91d870ef88b2819562405aa9feb5a20565a28c59c93d112c76ea638e470269 -size 1101 +oid sha256:a0eacefa3c9455959f4b126530a825b8d154ca06e92c0619a715d377b08f66db +size 1100 diff --git a/data/minecraft/structure/ancient_city/structures/ice_box_1.nbt b/data/minecraft/structure/ancient_city/structures/ice_box_1.nbt index 854fe2e4..3ef27980 100644 --- a/data/minecraft/structure/ancient_city/structures/ice_box_1.nbt +++ b/data/minecraft/structure/ancient_city/structures/ice_box_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c043032b6920fd60cefe64b27cbb72647a5a03a2cccb5a9caa3ca6b6cafd0f3a -size 3908 +oid sha256:c71a8343f6d6c1dd122100331a20427db32281d4a9ad9a877adfcc04a80bbb7e +size 3907 diff --git a/data/minecraft/structure/ancient_city/structures/large_pillar_1.nbt b/data/minecraft/structure/ancient_city/structures/large_pillar_1.nbt index 91b01d60..980169cf 100644 --- a/data/minecraft/structure/ancient_city/structures/large_pillar_1.nbt +++ b/data/minecraft/structure/ancient_city/structures/large_pillar_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1a44ffc00cde5b80a27eae33851f193780aee51f6840e23f399457656815455f -size 1477 +oid sha256:962c30d5799f045943a88dd7ad6d25ec2b9b5a4a89b4d280be0e8500b148acbe +size 1476 diff --git a/data/minecraft/structure/ancient_city/structures/large_ruin_1.nbt b/data/minecraft/structure/ancient_city/structures/large_ruin_1.nbt index 45c4c461..729d2922 100644 --- a/data/minecraft/structure/ancient_city/structures/large_ruin_1.nbt +++ b/data/minecraft/structure/ancient_city/structures/large_ruin_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:933c4ad7dace77403e7d1f89f24d5df2a08dd481c1cc25441e158f01e7c2beea -size 398 +oid sha256:f70c3438a2d8f3cef431cb53a8caac1b23145602c508360d582c226199f52249 +size 397 diff --git a/data/minecraft/structure/ancient_city/structures/medium_pillar_1.nbt b/data/minecraft/structure/ancient_city/structures/medium_pillar_1.nbt index d9269d15..ac96ece3 100644 --- a/data/minecraft/structure/ancient_city/structures/medium_pillar_1.nbt +++ b/data/minecraft/structure/ancient_city/structures/medium_pillar_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:56fc7422345bab3ce32eea7b615ef9f290a290233cc5a25d2456b87b5f8941ff -size 960 +oid sha256:309bb78a175fa9f7a74f601f2f0895438480877bc69dccd1a98c35e3fc3b5c13 +size 959 diff --git a/data/minecraft/structure/ancient_city/structures/medium_ruin_1.nbt b/data/minecraft/structure/ancient_city/structures/medium_ruin_1.nbt index c3d71a82..b802268f 100644 --- a/data/minecraft/structure/ancient_city/structures/medium_ruin_1.nbt +++ b/data/minecraft/structure/ancient_city/structures/medium_ruin_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6b5acdfebc43a1b35a2e9d55724cd1dbfa286a6980c02cffd7856771616f975c -size 327 +oid sha256:43826db6a0e94c8f9654e40c99ed54f134c56b41794b6ce746292db743156060 +size 326 diff --git a/data/minecraft/structure/ancient_city/structures/medium_ruin_2.nbt b/data/minecraft/structure/ancient_city/structures/medium_ruin_2.nbt index d8191e8c..ecd66f7e 100644 --- a/data/minecraft/structure/ancient_city/structures/medium_ruin_2.nbt +++ b/data/minecraft/structure/ancient_city/structures/medium_ruin_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eda44c0455b4c1ee349285749a95ecf7104c08c9261c56dbf94b3048cd4ee85d +oid sha256:449a015270d13deccdf2f9d915d1d4ca536436767969de3ef43da496631b035b size 353 diff --git a/data/minecraft/structure/ancient_city/structures/sauna_1.nbt b/data/minecraft/structure/ancient_city/structures/sauna_1.nbt index 5241bfb2..553a7669 100644 --- a/data/minecraft/structure/ancient_city/structures/sauna_1.nbt +++ b/data/minecraft/structure/ancient_city/structures/sauna_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:769a317936314d2fc3472b6c75b04a77e665b2115426a7b20c5ab3271315e7d3 -size 6958 +oid sha256:c9aad06839ab1df6e48372772a11f4f3fb86229fbcd8fc6175e8c7955f594989 +size 6956 diff --git a/data/minecraft/structure/ancient_city/structures/small_ruin_1.nbt b/data/minecraft/structure/ancient_city/structures/small_ruin_1.nbt index 8183c597..5e782014 100644 --- a/data/minecraft/structure/ancient_city/structures/small_ruin_1.nbt +++ b/data/minecraft/structure/ancient_city/structures/small_ruin_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:15cc556b3d3b875d177af3791ad566a32aa1254e2e6380102845826c1b8ce35f -size 315 +oid sha256:77b8048e8740c46ca9bba2e613ba0245f0868d2eef3c8c1f21660944c9e89aad +size 313 diff --git a/data/minecraft/structure/ancient_city/structures/small_ruin_2.nbt b/data/minecraft/structure/ancient_city/structures/small_ruin_2.nbt index b9170f29..58efe20c 100644 --- a/data/minecraft/structure/ancient_city/structures/small_ruin_2.nbt +++ b/data/minecraft/structure/ancient_city/structures/small_ruin_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4243646a68fea4468eb66e19551cd501d6ae9ed208cf3d6c4f28354b811b1cfd +oid sha256:09b9a8ecfc66ed7aff36eedfe51b42a2a9b40af396745f60944cc1dae5445c5b size 310 diff --git a/data/minecraft/structure/ancient_city/structures/small_statue.nbt b/data/minecraft/structure/ancient_city/structures/small_statue.nbt index 11c21100..f0e037a3 100644 --- a/data/minecraft/structure/ancient_city/structures/small_statue.nbt +++ b/data/minecraft/structure/ancient_city/structures/small_statue.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:25556cf041678538a187a71e45c4fdf22bd53e1b798c33e5a78b300942878497 -size 893 +oid sha256:efaebf2348d2c0a9ae0e119a491750e8712790df8098f1c7174c7f9d9e35a868 +size 892 diff --git a/data/minecraft/structure/ancient_city/structures/tall_ruin_1.nbt b/data/minecraft/structure/ancient_city/structures/tall_ruin_1.nbt index c6a5dfa1..73f84eaf 100644 --- a/data/minecraft/structure/ancient_city/structures/tall_ruin_1.nbt +++ b/data/minecraft/structure/ancient_city/structures/tall_ruin_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:25be6dfe191366da2087f4f068263298fe6d33f01bc55f9c2a82df5c54f01b10 -size 2794 +oid sha256:0175ac804510fdaf3ab7eb38cacbdae3fe69f0365fd0080af7752923c28ce215 +size 2792 diff --git a/data/minecraft/structure/ancient_city/structures/tall_ruin_2.nbt b/data/minecraft/structure/ancient_city/structures/tall_ruin_2.nbt index 4fe47d41..8e734e84 100644 --- a/data/minecraft/structure/ancient_city/structures/tall_ruin_2.nbt +++ b/data/minecraft/structure/ancient_city/structures/tall_ruin_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ce6c30cf98a73caee2ee358000e4e1dbbee45c4387365c40073538d0800edaa3 -size 3487 +oid sha256:019acb83644b53229b6443a552ecd9bbf8c1c9e5d599060781cc0b0e34cc2910 +size 3485 diff --git a/data/minecraft/structure/ancient_city/structures/tall_ruin_3.nbt b/data/minecraft/structure/ancient_city/structures/tall_ruin_3.nbt index 8636ce09..dbddcada 100644 --- a/data/minecraft/structure/ancient_city/structures/tall_ruin_3.nbt +++ b/data/minecraft/structure/ancient_city/structures/tall_ruin_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7cfcb7276ba2ca080e2d9d7f716b0cd6b97108459b11e1aa2e937256115e9e34 -size 1523 +oid sha256:1c678265fcd90c057b9d5301e0c121e95342afe340247e407010d5271ee96747 +size 1521 diff --git a/data/minecraft/structure/ancient_city/structures/tall_ruin_4.nbt b/data/minecraft/structure/ancient_city/structures/tall_ruin_4.nbt index 7e868b52..2f024207 100644 --- a/data/minecraft/structure/ancient_city/structures/tall_ruin_4.nbt +++ b/data/minecraft/structure/ancient_city/structures/tall_ruin_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:534afbf9e58d128c06d7fa80a4998188a7a4219197d57f6ca6b143179e9c3c99 -size 2297 +oid sha256:9b2fe8c060db79e5ba4c39cdfc79c48bbefe9a3951faa2026529c071498d1775 +size 2295 diff --git a/data/minecraft/structure/ancient_city/walls/intact_corner_wall_1.nbt b/data/minecraft/structure/ancient_city/walls/intact_corner_wall_1.nbt index cc40f206..6d6d69c2 100644 --- a/data/minecraft/structure/ancient_city/walls/intact_corner_wall_1.nbt +++ b/data/minecraft/structure/ancient_city/walls/intact_corner_wall_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2b5ff101dcb81871374ab581da95de2a58360d72cfd9246795bfb384d8694106 -size 3838 +oid sha256:ec0a24c9c0f6968adc24234aa0f01054b54788adc67a8c604c2ccb7a14a1005d +size 3837 diff --git a/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_1.nbt b/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_1.nbt index 7acf762b..f90f18ed 100644 --- a/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_1.nbt +++ b/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:531cf18f6b1ee9813bddc0fbd399a33819f4a393163b0a051f9a5662479fcaaa -size 2027 +oid sha256:2b0a676f98a11feb82dd8113826768a9bd56f0c05fc13804cdae2e021b5410a2 +size 2026 diff --git a/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_2.nbt b/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_2.nbt index b7fadaf1..80732f11 100644 --- a/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_2.nbt +++ b/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eb3bc45f5e95603c51a8bd4f6e12311a633e8b5dc8b828804b1a9bf47869e2d8 -size 2007 +oid sha256:360c1a2e00c7403522f425267b9567519a69115521b17e734b9bbf2f8c9dc5d2 +size 2006 diff --git a/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_bridge.nbt b/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_bridge.nbt index d991df7a..098c379e 100644 --- a/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_bridge.nbt +++ b/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_bridge.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:819864325016eb3fcc00922ecc89e2c297f9d3b373208419a7247b689ca2a891 -size 2721 +oid sha256:ae78a46807dd6bca3abf2b232d345060102bd1b3989bad2f24ac3fd376d1a493 +size 2720 diff --git a/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_passage_1.nbt b/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_passage_1.nbt index 7369bf9a..93684ac0 100644 --- a/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_passage_1.nbt +++ b/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_passage_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:54502f7825dcc976b930f8f647b4ae5d08819aefe3bc100731b513b184483a20 -size 1662 +oid sha256:4aace45e7e83361979a5e73ea69ad544b0ae8a8f738bc57feb8e8e68ee0fd0d9 +size 1661 diff --git a/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_stairs_1.nbt b/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_stairs_1.nbt index 2a5a3a43..ef9e24e9 100644 --- a/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_stairs_1.nbt +++ b/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_stairs_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:52f8b193f0ff952d07330c06bc06ebb53dcafa05fb1c770d299eb7ca6b83fbd0 +oid sha256:4b20dbfe523163e701f30f43b0681c3402285121fb8e159601488c1ed352a276 size 2119 diff --git a/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_stairs_2.nbt b/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_stairs_2.nbt index ec85d51f..c6b56e81 100644 --- a/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_stairs_2.nbt +++ b/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_stairs_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3ccd3bfd8bd429aeb0c3659003fe857deb5827be30706a200429d9d3cd5697e9 -size 2170 +oid sha256:38dfcf439e387ed273b56bfb5ae65cbb924afd9c98d83c3243a0c1c4fbe2c835 +size 2169 diff --git a/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_stairs_3.nbt b/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_stairs_3.nbt index d8d74606..abd63c85 100644 --- a/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_stairs_3.nbt +++ b/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_stairs_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:439dc54d299e2e4f31809bdd401167174f653bb3c0575d8219a46fd3a5dfb52a -size 2157 +oid sha256:327f34a2fc13f21fd94a3c15b44d2c8a608122e819b3d32d74d4cb8c4da143fc +size 2155 diff --git a/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_stairs_4.nbt b/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_stairs_4.nbt index 3f356226..9cff3f65 100644 --- a/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_stairs_4.nbt +++ b/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_stairs_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c4e827dc73e13ce87640842a91eb0c82564eea2f64e775ddb1ea1ecf818f8af5 -size 2055 +oid sha256:35efce9ceac502f11bd60d1853f5aedffb923b0bc56e440f9bf365679a10ce4a +size 2057 diff --git a/data/minecraft/structure/ancient_city/walls/intact_intersection_wall_1.nbt b/data/minecraft/structure/ancient_city/walls/intact_intersection_wall_1.nbt index a4d776af..f18a7aa8 100644 --- a/data/minecraft/structure/ancient_city/walls/intact_intersection_wall_1.nbt +++ b/data/minecraft/structure/ancient_city/walls/intact_intersection_wall_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:63edbc16982c730a2251699361dd11288476ccdb740237ac06c82fb7cbc36ffa -size 3126 +oid sha256:cf91ff3b8c6aaf69ff05e22983f68af0b13381ba29152ec80910801cef1f0aae +size 3125 diff --git a/data/minecraft/structure/ancient_city/walls/intact_lshape_wall_1.nbt b/data/minecraft/structure/ancient_city/walls/intact_lshape_wall_1.nbt index 32aeaba8..107d4803 100644 --- a/data/minecraft/structure/ancient_city/walls/intact_lshape_wall_1.nbt +++ b/data/minecraft/structure/ancient_city/walls/intact_lshape_wall_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2289f0fa7d4be96cd905d62cdc514f9dda407697375c8dfff3e31eb0346de1b1 -size 2385 +oid sha256:d5594cf2361ed15f71669e9fa79afe822a5e1f602279704632789195b69a7f29 +size 2384 diff --git a/data/minecraft/structure/ancient_city/walls/ruined_corner_wall_1.nbt b/data/minecraft/structure/ancient_city/walls/ruined_corner_wall_1.nbt index 5be6a7e6..7fe2f11a 100644 --- a/data/minecraft/structure/ancient_city/walls/ruined_corner_wall_1.nbt +++ b/data/minecraft/structure/ancient_city/walls/ruined_corner_wall_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dde81b0f18792cfef86a856e64a7c791e6c734280cd4083f0fa047c014be53e7 -size 4171 +oid sha256:bcbba1f3b9743c7af0acaf33cd69d9fd833297c80ae0bf28d02d36db6b95cd47 +size 4170 diff --git a/data/minecraft/structure/ancient_city/walls/ruined_corner_wall_2.nbt b/data/minecraft/structure/ancient_city/walls/ruined_corner_wall_2.nbt index 53524066..345f29ba 100644 --- a/data/minecraft/structure/ancient_city/walls/ruined_corner_wall_2.nbt +++ b/data/minecraft/structure/ancient_city/walls/ruined_corner_wall_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b7e2f13d7560e7de1183bc206da8eba8a8991f4ae05f28af74cf0c404e37429a -size 3305 +oid sha256:0ab82d428bba2bb8c55329d75c7c6cfbeeff04b8856c4dfebfd68bd300aacd0b +size 3304 diff --git a/data/minecraft/structure/ancient_city/walls/ruined_horizontal_wall_stairs_1.nbt b/data/minecraft/structure/ancient_city/walls/ruined_horizontal_wall_stairs_1.nbt index 735e5d40..3744b126 100644 --- a/data/minecraft/structure/ancient_city/walls/ruined_horizontal_wall_stairs_1.nbt +++ b/data/minecraft/structure/ancient_city/walls/ruined_horizontal_wall_stairs_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f83b84c0f10f1a548c8345c0c57b3919398da8a58b332ed04b2824fe4b7b2a5a -size 1491 +oid sha256:e7d62e3681b483aeb6b149ea6f3996a8ccd5bd87974524be9135fc28178149b3 +size 1490 diff --git a/data/minecraft/structure/ancient_city/walls/ruined_horizontal_wall_stairs_2.nbt b/data/minecraft/structure/ancient_city/walls/ruined_horizontal_wall_stairs_2.nbt index 5502f0f0..e89e1f6f 100644 --- a/data/minecraft/structure/ancient_city/walls/ruined_horizontal_wall_stairs_2.nbt +++ b/data/minecraft/structure/ancient_city/walls/ruined_horizontal_wall_stairs_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9ff1e2c5ad32d4ee6213e0efc611846a21ab9354b5d63176ccea4c0c06cb29c7 -size 1976 +oid sha256:336130661f957eedcc6360f2b1f128750c1eacd938f3d71382699c5761d182fb +size 1975 diff --git a/data/minecraft/structure/ancient_city/walls/ruined_horizontal_wall_stairs_3.nbt b/data/minecraft/structure/ancient_city/walls/ruined_horizontal_wall_stairs_3.nbt index f2f12aad..501987f7 100644 --- a/data/minecraft/structure/ancient_city/walls/ruined_horizontal_wall_stairs_3.nbt +++ b/data/minecraft/structure/ancient_city/walls/ruined_horizontal_wall_stairs_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:26f8477e011b1a47d91d4f476775edad99f985d12f6097266224a6378c93e33e -size 1386 +oid sha256:1ec13dcbb194517d121b6f729a6bb5c62c085b5de8b3174471f7b7a82e3f6fee +size 1385 diff --git a/data/minecraft/structure/ancient_city/walls/ruined_horizontal_wall_stairs_4.nbt b/data/minecraft/structure/ancient_city/walls/ruined_horizontal_wall_stairs_4.nbt index 23d3eb21..d95dc5bf 100644 --- a/data/minecraft/structure/ancient_city/walls/ruined_horizontal_wall_stairs_4.nbt +++ b/data/minecraft/structure/ancient_city/walls/ruined_horizontal_wall_stairs_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3680337be9682818cd0065ac2180036e99108ee59b04fb21d5a748735ea3be08 -size 1341 +oid sha256:5c66e7b0a5aade70170af66844e83d4ee6970f7e26d2b80702af7d55b4fc6001 +size 1340 diff --git a/data/minecraft/structure/bastion/blocks/air.nbt b/data/minecraft/structure/bastion/blocks/air.nbt index 2bed24fe..77ed1444 100644 --- a/data/minecraft/structure/bastion/blocks/air.nbt +++ b/data/minecraft/structure/bastion/blocks/air.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1aec5b7ac1036bca3095a6975dc372ac40e090d676fe44283e1486a66a371d11 +oid sha256:74be73c85b8c295829873dd2a06a0a1971bb001beafb83097b24c90e04fc258a size 228 diff --git a/data/minecraft/structure/bastion/blocks/gold.nbt b/data/minecraft/structure/bastion/blocks/gold.nbt index 1730f3e7..1a750da0 100644 --- a/data/minecraft/structure/bastion/blocks/gold.nbt +++ b/data/minecraft/structure/bastion/blocks/gold.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0ac4e8087eb0c2fcb63b270b39d47693c16b2dbe155eaaa641fa4cdf392c4912 +oid sha256:49ce6070229dadbe6475c3b66c784c3218417eb0ec95a1094ccfb2241b11c756 size 233 diff --git a/data/minecraft/structure/bastion/bridge/bridge_pieces/bridge.nbt b/data/minecraft/structure/bastion/bridge/bridge_pieces/bridge.nbt index deea80bd..952d326e 100644 --- a/data/minecraft/structure/bastion/bridge/bridge_pieces/bridge.nbt +++ b/data/minecraft/structure/bastion/bridge/bridge_pieces/bridge.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b4908a2f3a45e6ea97ed3da3a8eed53264ff45c1719231bbfaf1d92ec94b9df -size 15687 +oid sha256:9a143530d72a79ffe74780a7f7376f6ced5528c5c4c15db13fd5beae5dd8903f +size 15686 diff --git a/data/minecraft/structure/bastion/bridge/connectors/back_bridge_bottom.nbt b/data/minecraft/structure/bastion/bridge/connectors/back_bridge_bottom.nbt index e7877511..b16a7df8 100644 --- a/data/minecraft/structure/bastion/bridge/connectors/back_bridge_bottom.nbt +++ b/data/minecraft/structure/bastion/bridge/connectors/back_bridge_bottom.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9dfeeb903aa1eac05f3d4eb460a8d8fcd5bd5a7777280752f1503d593e92d4be -size 1428 +oid sha256:cefb011c343b3745db0a1eaec387d86ac32148599f8eb6fa4bd90f6518502297 +size 1427 diff --git a/data/minecraft/structure/bastion/bridge/connectors/back_bridge_top.nbt b/data/minecraft/structure/bastion/bridge/connectors/back_bridge_top.nbt index 341a09bb..fce74ab7 100644 --- a/data/minecraft/structure/bastion/bridge/connectors/back_bridge_top.nbt +++ b/data/minecraft/structure/bastion/bridge/connectors/back_bridge_top.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fa6491fcc720d767cbe2f34b71eef992aa1bd45fd711d5f6244290423ec92151 -size 1375 +oid sha256:8c81b4e051e9f4c242671ee96201db0a60f15f7213e5fca2cdca400ac6eff2d2 +size 1374 diff --git a/data/minecraft/structure/bastion/bridge/legs/leg_0.nbt b/data/minecraft/structure/bastion/bridge/legs/leg_0.nbt index 3316a67f..fb4cdc3f 100644 --- a/data/minecraft/structure/bastion/bridge/legs/leg_0.nbt +++ b/data/minecraft/structure/bastion/bridge/legs/leg_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a57d734a88735370dcf3eb568a60f58b6a598020090d57c45013b6034a8bc055 -size 708 +oid sha256:6560daffa9694f74e470a33a0c603d3475dee4e934f3fa8ee5febf2baa5f6676 +size 707 diff --git a/data/minecraft/structure/bastion/bridge/legs/leg_1.nbt b/data/minecraft/structure/bastion/bridge/legs/leg_1.nbt index 658088e9..9d943f69 100644 --- a/data/minecraft/structure/bastion/bridge/legs/leg_1.nbt +++ b/data/minecraft/structure/bastion/bridge/legs/leg_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dd95099df065bebccc53cf3ac48f3e45a3630167480a9ea292b77626d7b3552e -size 739 +oid sha256:733c2cd82d20577a574c7ce4da48d3d898ce232d0a8b796181bf4f12bc3e4a42 +size 738 diff --git a/data/minecraft/structure/bastion/bridge/rampart_plates/plate_0.nbt b/data/minecraft/structure/bastion/bridge/rampart_plates/plate_0.nbt index 675ebc3f..20e052c7 100644 --- a/data/minecraft/structure/bastion/bridge/rampart_plates/plate_0.nbt +++ b/data/minecraft/structure/bastion/bridge/rampart_plates/plate_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a7aa884769bff6ac1b5de04fe5becb2b1e8945bf16f8a380670abb4f7eee0167 -size 2055 +oid sha256:8baf0847b63c3508d117d369fb6950fad45c1bf9e25c6ebd4ba4c3dd41638568 +size 2054 diff --git a/data/minecraft/structure/bastion/bridge/ramparts/rampart_0.nbt b/data/minecraft/structure/bastion/bridge/ramparts/rampart_0.nbt index b5afe57b..6d47ae05 100644 --- a/data/minecraft/structure/bastion/bridge/ramparts/rampart_0.nbt +++ b/data/minecraft/structure/bastion/bridge/ramparts/rampart_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:938ac11c4528667884f3627a126f1f7619ba00e1f53dae3b21a88506bad8f8b0 -size 12580 +oid sha256:aa0a5ae38be5d9d78f8ed24a71067dc736c975fe5b34a73ffb0dd7d087c4a60d +size 12578 diff --git a/data/minecraft/structure/bastion/bridge/ramparts/rampart_1.nbt b/data/minecraft/structure/bastion/bridge/ramparts/rampart_1.nbt index 67c5419b..5b25035c 100644 --- a/data/minecraft/structure/bastion/bridge/ramparts/rampart_1.nbt +++ b/data/minecraft/structure/bastion/bridge/ramparts/rampart_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3be3273a36689907eda363401de27947579bd1ed0f723e53ac8eb14984ea1445 -size 19410 +oid sha256:5dd80cbd5209b1fe1312f0278359b56ea0cc27f9c8110a14ff560c34c5dfeb19 +size 19408 diff --git a/data/minecraft/structure/bastion/bridge/starting_pieces/entrance.nbt b/data/minecraft/structure/bastion/bridge/starting_pieces/entrance.nbt index 6eb4f19a..cc6c474e 100644 --- a/data/minecraft/structure/bastion/bridge/starting_pieces/entrance.nbt +++ b/data/minecraft/structure/bastion/bridge/starting_pieces/entrance.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d730d1eaafd8d59168e579879862ee5054fd04093004aa0519f322c21df4b020 -size 41138 +oid sha256:ba735a8bc81a64d455bdcb8e7382e0dae0ddf9b14f5540b2f29cf13ee8643bba +size 41136 diff --git a/data/minecraft/structure/bastion/bridge/starting_pieces/entrance_base.nbt b/data/minecraft/structure/bastion/bridge/starting_pieces/entrance_base.nbt index b9e3a413..fc8818a2 100644 --- a/data/minecraft/structure/bastion/bridge/starting_pieces/entrance_base.nbt +++ b/data/minecraft/structure/bastion/bridge/starting_pieces/entrance_base.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f8b0760a6afd42907831f52d2063940d14e193e01dd51f932f369aa905b05840 -size 45585 +oid sha256:0b8eda700ee9d2f95d38fa30d4a748a8a73eccd4e249ac69e09e97d03bee8a61 +size 45584 diff --git a/data/minecraft/structure/bastion/bridge/starting_pieces/entrance_face.nbt b/data/minecraft/structure/bastion/bridge/starting_pieces/entrance_face.nbt index 47002ff9..0f0c7c3a 100644 --- a/data/minecraft/structure/bastion/bridge/starting_pieces/entrance_face.nbt +++ b/data/minecraft/structure/bastion/bridge/starting_pieces/entrance_face.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:21e79f03ed40b160bf83bb327b925dbb0891699ff9dfb75258a8b2997a7a1879 -size 2739 +oid sha256:7eff040303ace67ecf5efa2950e686fde3532249e1e8f8c9763885477b57e4df +size 2738 diff --git a/data/minecraft/structure/bastion/bridge/walls/wall_base_0.nbt b/data/minecraft/structure/bastion/bridge/walls/wall_base_0.nbt index f77143b2..87d1e4e0 100644 --- a/data/minecraft/structure/bastion/bridge/walls/wall_base_0.nbt +++ b/data/minecraft/structure/bastion/bridge/walls/wall_base_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1af548531081e5e3cea7efc6529e8a64c0bacd546a185ee4d01c0e8815b8bc90 +oid sha256:d3c03025ac9edcf4c9f41b0a0de163b0a819b0fbdb8053540f97d1461a35a5f3 size 17432 diff --git a/data/minecraft/structure/bastion/bridge/walls/wall_base_1.nbt b/data/minecraft/structure/bastion/bridge/walls/wall_base_1.nbt index 95403bf7..16e3715f 100644 --- a/data/minecraft/structure/bastion/bridge/walls/wall_base_1.nbt +++ b/data/minecraft/structure/bastion/bridge/walls/wall_base_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5a08d918ef900b4ccb80025f8be322a4c2e63f5f6fffbe97f934a340d7c9e290 -size 17260 +oid sha256:46ac87d2fa9688b6cd620e1127ecf8765baa5d3e04f130515e15500e6e68dcb2 +size 17258 diff --git a/data/minecraft/structure/bastion/hoglin_stable/air_base.nbt b/data/minecraft/structure/bastion/hoglin_stable/air_base.nbt index 6115e3f7..94e246fd 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/air_base.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/air_base.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:96946897fb784ec66d70fc1c00ddaf102e1681aaaf28c2f2e06d3da00b9f7e66 -size 80384 +oid sha256:c20bd7272a234f90bb8c5aae3a368734dc303b6958f37a85690b8c8dc82a59cd +size 80382 diff --git a/data/minecraft/structure/bastion/hoglin_stable/connectors/end_post_connector.nbt b/data/minecraft/structure/bastion/hoglin_stable/connectors/end_post_connector.nbt index ff8e698c..1975866b 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/connectors/end_post_connector.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/connectors/end_post_connector.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:14c2a5cb9967a2f98918a7f247f6bbafa6e6acbb0bf4bf35dcffc85f6205fa84 +oid sha256:578a2ecae5a224ebebbbd6dd6f9b5dd7db0e06a3854eedf9122699bd215be69f size 288 diff --git a/data/minecraft/structure/bastion/hoglin_stable/large_stables/inner_0.nbt b/data/minecraft/structure/bastion/hoglin_stable/large_stables/inner_0.nbt index c0adfe98..050893d3 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/large_stables/inner_0.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/large_stables/inner_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0a967416a384f024982424bf0f25cceb8c2eb944d4588e6ddcce6f6d9591eb25 -size 1880 +oid sha256:d5eff1de9a798c69a55329bf18f2f7fb67d8734ad47f31475ea80b8310b3e47f +size 1879 diff --git a/data/minecraft/structure/bastion/hoglin_stable/large_stables/inner_1.nbt b/data/minecraft/structure/bastion/hoglin_stable/large_stables/inner_1.nbt index 87a19724..34493f22 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/large_stables/inner_1.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/large_stables/inner_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5fbd152b7bb57393fed5d07b380c2be9d5d1c810ee4da45316f3497f6be4f4ff -size 2077 +oid sha256:e8dbe1f6081fc5d4e95f015b7a47f749faa893a25ce01d5a3c9e2c0d278c4729 +size 2076 diff --git a/data/minecraft/structure/bastion/hoglin_stable/large_stables/inner_2.nbt b/data/minecraft/structure/bastion/hoglin_stable/large_stables/inner_2.nbt index 590f3983..f1796bad 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/large_stables/inner_2.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/large_stables/inner_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:267c2d75ad0e73e33c6d96bff79eb7fb2c19b21bf175fce7030d66c7beff9467 -size 2353 +oid sha256:c6654a93bb073d27b51f11dbfec23743e783a7d4541f8e6905eb228a58056841 +size 2352 diff --git a/data/minecraft/structure/bastion/hoglin_stable/large_stables/inner_3.nbt b/data/minecraft/structure/bastion/hoglin_stable/large_stables/inner_3.nbt index 75f98a25..3ae06747 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/large_stables/inner_3.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/large_stables/inner_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:43caa18a6872b397cf064ecb508cda8c655439e0f9f86151e1c7e7e71ad553c3 -size 2400 +oid sha256:04267a330e6700fac318d3d35fcdee394864d76bcdebbf517ac6546b59a5597c +size 2398 diff --git a/data/minecraft/structure/bastion/hoglin_stable/large_stables/inner_4.nbt b/data/minecraft/structure/bastion/hoglin_stable/large_stables/inner_4.nbt index 5741bd4e..ea672d78 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/large_stables/inner_4.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/large_stables/inner_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:44facb69403ddc6bfc17c87962a2c7d662aad3bc82b8e9135944371d2faf7f67 +oid sha256:00c06185b9692c353c752ea1faed9050ed999a3d3a9578bb967c9a0fb934b600 size 2146 diff --git a/data/minecraft/structure/bastion/hoglin_stable/large_stables/outer_0.nbt b/data/minecraft/structure/bastion/hoglin_stable/large_stables/outer_0.nbt index 2348d78a..c631e10f 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/large_stables/outer_0.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/large_stables/outer_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:08b0dfdda697f8bb474efeb93b8c29680121bedfac210a3f3a9e193b105477f2 -size 1966 +oid sha256:e1f4963e62d2a76661f60a22c1d7f08c6c5c0c9a83a474526e87ad5bba15a0ba +size 1965 diff --git a/data/minecraft/structure/bastion/hoglin_stable/large_stables/outer_1.nbt b/data/minecraft/structure/bastion/hoglin_stable/large_stables/outer_1.nbt index 31e95e0f..25c8b63c 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/large_stables/outer_1.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/large_stables/outer_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e9bc200f2875b204354373bf3bda1130655fcd1977db8f0f38b5f4f5c8a91f81 -size 2318 +oid sha256:d3dcd243ec015eaa3b8de995ab0934fc95c77a4daa906dcd4719429ae3790f95 +size 2317 diff --git a/data/minecraft/structure/bastion/hoglin_stable/large_stables/outer_2.nbt b/data/minecraft/structure/bastion/hoglin_stable/large_stables/outer_2.nbt index c521419a..5093cb7a 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/large_stables/outer_2.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/large_stables/outer_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f8195e38abe39b55b69c9fce79bc52367064984b728d8428c0eff98c5ab20ec -size 2556 +oid sha256:f670268dc4e8b545a6cabe6c5e83b707724fa51079d5af03515644f75e4d9ead +size 2555 diff --git a/data/minecraft/structure/bastion/hoglin_stable/large_stables/outer_3.nbt b/data/minecraft/structure/bastion/hoglin_stable/large_stables/outer_3.nbt index 4addf619..1232876a 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/large_stables/outer_3.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/large_stables/outer_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5f96c07847b57221f5590a505746426069a9dfc2b7ebef722cefba47176af982 -size 2454 +oid sha256:b9b72afe055d2e12673acceb3693d08501003864b2dbd9413b7e261b368b2433 +size 2453 diff --git a/data/minecraft/structure/bastion/hoglin_stable/large_stables/outer_4.nbt b/data/minecraft/structure/bastion/hoglin_stable/large_stables/outer_4.nbt index 6e42dba2..c384b0cd 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/large_stables/outer_4.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/large_stables/outer_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:30c3e550a47bc0bba15e935bc112fab9bd26d18ad55c1eb7c31ecbfd2f9d6dc4 +oid sha256:fd635b5a614dfa6644af0998d68e7d87e5eb98ea4f679b7238514cd571c0730f size 2398 diff --git a/data/minecraft/structure/bastion/hoglin_stable/posts/end_post.nbt b/data/minecraft/structure/bastion/hoglin_stable/posts/end_post.nbt index 47cb460b..e63d7c39 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/posts/end_post.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/posts/end_post.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b1b63dbc4e20d8f12bef83cd4e65a294fa02bfcbaad7e0652922057779ad57e0 +oid sha256:20e3bfbc1eb516dd6db21d8b1b01e7878f31a8a4c0c1934aa33f7d3adfd44b33 size 530 diff --git a/data/minecraft/structure/bastion/hoglin_stable/posts/stair_post.nbt b/data/minecraft/structure/bastion/hoglin_stable/posts/stair_post.nbt index 559509a0..c4978e75 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/posts/stair_post.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/posts/stair_post.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9cd43fa2fbb0e511176849537170b53bac23d1ce55ae9ac4252fa96b172aaf3b -size 1168 +oid sha256:e98c1d60591f20ec80eaaac80ba28dee248cc139ec7fc74c5ac91bbb581a9111 +size 1167 diff --git a/data/minecraft/structure/bastion/hoglin_stable/rampart_plates/rampart_plate_1.nbt b/data/minecraft/structure/bastion/hoglin_stable/rampart_plates/rampart_plate_1.nbt index 6e545c13..0b4977ae 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/rampart_plates/rampart_plate_1.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/rampart_plates/rampart_plate_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6c761c3e03e102310ff5ff607a78199f56a192eaeb1eb596b203b3ac477d13ff +oid sha256:0ef69d7b57b28575704cdd32a08fe66f8ac34bfd5a0e77b1547220d371abaea7 size 2179 diff --git a/data/minecraft/structure/bastion/hoglin_stable/ramparts/ramparts_1.nbt b/data/minecraft/structure/bastion/hoglin_stable/ramparts/ramparts_1.nbt index 2751cb99..0aebc877 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/ramparts/ramparts_1.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/ramparts/ramparts_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:347a18dbfed89ba1a1fddc8bb08d2a6067a85ae4b69e1f82e9cfe4d9b1cc7cd9 -size 19111 +oid sha256:9941b70f8a180ebd47f25b5042c2c6ac82c29da738fb12965d3f7fcd05b32d07 +size 19109 diff --git a/data/minecraft/structure/bastion/hoglin_stable/ramparts/ramparts_2.nbt b/data/minecraft/structure/bastion/hoglin_stable/ramparts/ramparts_2.nbt index 108300d5..37aa96da 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/ramparts/ramparts_2.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/ramparts/ramparts_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ee01ef99955d6b60595c685e4664f4cf38780347506953b501bad67054ad7b86 -size 12208 +oid sha256:4b8fb5b8b597a51f5d148dc0ec62ae3a17835be34b2dc94ccf13141fafe592e9 +size 12206 diff --git a/data/minecraft/structure/bastion/hoglin_stable/ramparts/ramparts_3.nbt b/data/minecraft/structure/bastion/hoglin_stable/ramparts/ramparts_3.nbt index a5e1ad90..4a982b7e 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/ramparts/ramparts_3.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/ramparts/ramparts_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cd0abd57fa5ef4353cc225c5dde9483c3124c12a0cfea0b3b537399c058e21d3 -size 6391 +oid sha256:e34b045095cba1a16aa3122bfe6e15db5c106b71353c24a2ff3b592d69f7aba2 +size 6389 diff --git a/data/minecraft/structure/bastion/hoglin_stable/small_stables/inner_0.nbt b/data/minecraft/structure/bastion/hoglin_stable/small_stables/inner_0.nbt index 74c9cf68..4b8a1c6e 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/small_stables/inner_0.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/small_stables/inner_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f4a3fa82feeb51ae3cef85cdfba81ea1d77714f8a733ec82ab0985a66b37e75e -size 1898 +oid sha256:ebdc5043928efcef8c3a7485a99b30efbd079f5308202f0ede0cbf067773dddd +size 1897 diff --git a/data/minecraft/structure/bastion/hoglin_stable/small_stables/inner_1.nbt b/data/minecraft/structure/bastion/hoglin_stable/small_stables/inner_1.nbt index 8e6e9bbf..9e025113 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/small_stables/inner_1.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/small_stables/inner_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:169faba3ca2ab85760303743db6fb813b512081e163d07ea39e781a72231e343 +oid sha256:da042d9ce36ad53b6806884b92410978f4db9dc0db662c5b1c6b36c8535938f1 size 1980 diff --git a/data/minecraft/structure/bastion/hoglin_stable/small_stables/inner_2.nbt b/data/minecraft/structure/bastion/hoglin_stable/small_stables/inner_2.nbt index 3117436b..2f526736 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/small_stables/inner_2.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/small_stables/inner_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7c96eead0e023ff9a810baee6d56ebb4991fd80837a438bb3450a2d281e16ae5 -size 2211 +oid sha256:be1cc4f38c6bc9c1158cb962f5640e2194a1d43c402af43a727a473434923fbc +size 2209 diff --git a/data/minecraft/structure/bastion/hoglin_stable/small_stables/inner_3.nbt b/data/minecraft/structure/bastion/hoglin_stable/small_stables/inner_3.nbt index a447c557..d5ce609f 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/small_stables/inner_3.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/small_stables/inner_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f1b79ea257db895b5cf5429d1834adb529bbf4c2c408a3f94e63f8e4909034d2 -size 1681 +oid sha256:c85c61cbf78e6ed8da39bf2c190ac27f5f3012e7916adb9588d9993361656ede +size 1680 diff --git a/data/minecraft/structure/bastion/hoglin_stable/small_stables/outer_0.nbt b/data/minecraft/structure/bastion/hoglin_stable/small_stables/outer_0.nbt index 4d1c3ac8..17f9c800 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/small_stables/outer_0.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/small_stables/outer_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fd1cb6a9ad6cf496d6ddf38a350745d2baf858c675c91f5ecc2d4f62d10ee01d -size 2136 +oid sha256:c6616a2a68aeaeed2dc890437be1af0ca5ab3ccd098c8e461c0f372596b07090 +size 2137 diff --git a/data/minecraft/structure/bastion/hoglin_stable/small_stables/outer_1.nbt b/data/minecraft/structure/bastion/hoglin_stable/small_stables/outer_1.nbt index c87ea139..40646960 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/small_stables/outer_1.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/small_stables/outer_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:52fa15cb9b36be037eae273ffd848db47437251fe8c59c2988fbdaaad4c100a4 +oid sha256:7f08fd26c57eaf2adfa287c18696001bc523bbb934c637bf7cc9cdac93f77b33 size 2064 diff --git a/data/minecraft/structure/bastion/hoglin_stable/small_stables/outer_2.nbt b/data/minecraft/structure/bastion/hoglin_stable/small_stables/outer_2.nbt index 5763278b..c4c5ff65 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/small_stables/outer_2.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/small_stables/outer_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0122bc552ce7878d9b73a1774f2ef8e06a262a02e2f4469c2e404025693b8ef3 -size 2148 +oid sha256:3a1ceb14388769f34fa9705bbe427daa124eed0bf4b8d268b444650fb7c6d5bd +size 2149 diff --git a/data/minecraft/structure/bastion/hoglin_stable/small_stables/outer_3.nbt b/data/minecraft/structure/bastion/hoglin_stable/small_stables/outer_3.nbt index 7995ed1f..540bc653 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/small_stables/outer_3.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/small_stables/outer_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fe4e0e6ba7ea120913a4ba5f433b6e1fc8091673b1183f1b42c989c5271f62a3 -size 1850 +oid sha256:c262717dbcfec5881f7cf2dfb6fe5a78d6faa8445d9779c6af6e19c86f317c03 +size 1849 diff --git a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_1_0.nbt b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_1_0.nbt index 0d7bb29a..c5dcc5b4 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_1_0.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_1_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d7b03e73f834b71023b8021b127cb1d59ab62447161ea472d1791fa40f9ab42c -size 4466 +oid sha256:dc8974b4adac37a47e783d4b26f86a6fc796b6ce8611bc3ca28133764f84b968 +size 4465 diff --git a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_1_1.nbt b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_1_1.nbt index 3ebce9b1..bc8eaeaa 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_1_1.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_1_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8edc308248965c320f1529e769d7275073f10b334fa5c50a79bd20cd19359a7b -size 4275 +oid sha256:d147a01b68977509147433bdee84d5e1efc6cf286e76936b096124ec9ce92d3f +size 4274 diff --git a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_1_2.nbt b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_1_2.nbt index e72bd101..83e37b56 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_1_2.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_1_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:add3151ec8dee1d69646ea8e4ec623a53bdbd4810c048dde20a03ab27fb516b9 -size 4338 +oid sha256:f09c989c2caddbb6e31bab4be3c57fbad98bc3650a160bbcc747c49b423cb36d +size 4336 diff --git a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_1_3.nbt b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_1_3.nbt index ff5ddac9..5f98698c 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_1_3.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_1_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1a802f29d49889324e72f742f2003601d13567de3a4d0584eb6486d87ee4c651 -size 4498 +oid sha256:f7529ec3c1e9b2c46bba22f40c6d99953e39dc0b784ecbc20529b5707da9dc66 +size 4497 diff --git a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_1_4.nbt b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_1_4.nbt index 2a178fba..b6677a73 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_1_4.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_1_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:73ef017dc54649ee7c3296ca778df5519efa094023a384dbede841c951931365 -size 4439 +oid sha256:2ef35a48e446af1f321dfb03e0aa91da046309ae525a8eb87515896e563689a4 +size 4438 diff --git a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_2_0.nbt b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_2_0.nbt index a7762b66..4f24b4d3 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_2_0.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_2_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6ca296955e16994a5773cda073f714a1b0b6f1083fcd1aef387f5c906946353e -size 4414 +oid sha256:4e405d5fa1e3756e61d9d3f7723d0caf0342837763888f06237f6785037f6e13 +size 4413 diff --git a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_2_1.nbt b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_2_1.nbt index b4e9528d..42620183 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_2_1.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_2_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:60bc62fc154309d9b450a78ece00a56ca51c1d3755f8a058593d055268443248 +oid sha256:bad1fbc50e86ec502ecb2ca5c3f36e6a9a602827448a3ce1b8f90af4c2c4a292 size 4334 diff --git a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_2_2.nbt b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_2_2.nbt index d956c077..d1f92a83 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_2_2.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_2_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f4482fdf0190e5fbcfeaa755c57ac8df1d1c74cdb1b5da1991b872d22a885121 -size 4119 +oid sha256:351640893681b10ee769181f3e19880d3bbc5d154227cce920ac16413b0e240d +size 4118 diff --git a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_2_3.nbt b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_2_3.nbt index f7cf7436..53262754 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_2_3.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_2_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9a3de4a4ab3ca0806d61ec314351474d853cc3ea4d3500ead383b6584c659471 -size 3303 +oid sha256:c10c4ae3ba180099447784be48ccea8f55a02726d1f4ca1b324a6b2d331cd22f +size 3302 diff --git a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_2_4.nbt b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_2_4.nbt index 06477fb9..089babd3 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_2_4.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_2_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:12a544b7f668618a1ab1b51621e6b24b830aae2d5c68e74039b9e980a83ce4a8 -size 4379 +oid sha256:205cc3532d29d9d14c5ff6f908b2f4e03b4705e9f9873879429afe60e8528642 +size 4378 diff --git a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_3_0.nbt b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_3_0.nbt index bf4c697c..6778ff95 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_3_0.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_3_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5b51dfd962cfb38cfc2407705c24343e5c9b05e72da33365ba3be310556f42be -size 4021 +oid sha256:b2be04e2dc91d410b8b871fccec62fc45327d9a718bd6d6c240487f1c01db5a0 +size 4020 diff --git a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_3_1.nbt b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_3_1.nbt index 4a3c0438..0e988cee 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_3_1.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_3_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dba1e769710ce3bb22043a60eaff1aa4020fccd3487bfd337b33d54da2093208 +oid sha256:8bf14b6ef306594c40f1a3417b2fd446c9402c50e05bf912b6e22fea59836f8b size 4005 diff --git a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_3_2.nbt b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_3_2.nbt index af4b231a..c62c8e60 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_3_2.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_3_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:649d32106dcea031e74fefd623323e6b00ff467bb131e03b18b7e28ce2eb6f3f -size 4210 +oid sha256:ca8aa8b38fe0fb464fc894dccae83b80179aae0fe98ecf1745a896531fd4ec20 +size 4209 diff --git a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_3_3.nbt b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_3_3.nbt index f5ff98a7..03281c3e 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_3_3.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_3_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1a53a187c812c0417aca0324d7c66f9a7d78697728e142064128a76b374950e2 -size 4322 +oid sha256:27a1742d45734cbaed2b5fdb7977beda9bce35110222a4f3ac0a4c61ffb05214 +size 4321 diff --git a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_3_4.nbt b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_3_4.nbt index 01015038..791ca96f 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_3_4.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_3_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b9bb53bd82c2dfb3410dc1d4f545cc662c5938aa8b1d75dc1d4a30386331cca8 +oid sha256:ce4191c51d95207cfec1bdb62f59511f27a8062f7a3342798cfc49e248f68e26 size 2779 diff --git a/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/stairs_0_mirrored.nbt b/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/stairs_0_mirrored.nbt index ba86b1fa..ebcba6bb 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/stairs_0_mirrored.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/stairs_0_mirrored.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:705c493cc8f8c6d6fd3877b4a62fe6fb51dfb94a252a4b571a8f4080b64bacea -size 4612 +oid sha256:a0e07c17bfe198df7d6e2e8cfb741b60322c924cf098215624b04674b83e68a6 +size 4611 diff --git a/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/stairs_1_mirrored.nbt b/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/stairs_1_mirrored.nbt index d4bdc6b5..c55f3b46 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/stairs_1_mirrored.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/stairs_1_mirrored.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9cf271e15cb7296b25130f5f000bccf2745d6c0add65f82c7b651679d75a86b5 -size 4627 +oid sha256:412e2ca1cbf4c2d0e105a9223114d1e161e6222db05f532c6279033856dcfb3c +size 4626 diff --git a/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/stairs_2_mirrored.nbt b/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/stairs_2_mirrored.nbt index 49571da7..5651db5c 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/stairs_2_mirrored.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/stairs_2_mirrored.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d087b1741320f401f710aef3b6de76818031eb5102f5bcb2f4255ef15a6a2a71 -size 4544 +oid sha256:7b707d97a083f149d02fc370fa301b0f414e4a8d7b68a8bb7d959ebc9f5d9f98 +size 4543 diff --git a/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/stairs_3_mirrored.nbt b/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/stairs_3_mirrored.nbt index 536f5d82..e39c351a 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/stairs_3_mirrored.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/stairs_3_mirrored.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3ca157286b50ad49110f62c1074910e3d8e32f9045e1fc49afafa18e2a667ff0 -size 4742 +oid sha256:93afb46a48b40bfb8d19839f879f0eba8962454a07d975c9b2e5da8ffabded3e +size 4741 diff --git a/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/stairs_4_mirrored.nbt b/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/stairs_4_mirrored.nbt index 99017157..d5dffc7f 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/stairs_4_mirrored.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/stairs_4_mirrored.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ee85e8f17dd5570475a1b36be7d3fb6e7425ab3791a7749194b3898bc81b8002 +oid sha256:183447caff4b35b0653219787ce1fa6747e254d7b3e4fb046f4b1ec775026280 size 4591 diff --git a/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/starting_stairs_0.nbt b/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/starting_stairs_0.nbt index 0ffeca3d..a4e0ace4 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/starting_stairs_0.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/starting_stairs_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f67d0e6a38f7e8f31befc5e9335d8e0ac54760b58c87eaf77ca5af970964f46e -size 4628 +oid sha256:cf99a75e4293f46c0147c927146f93c91816d546ebc2c070874d6f933172a5d6 +size 4627 diff --git a/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/starting_stairs_1.nbt b/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/starting_stairs_1.nbt index 3eb996c5..3397770e 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/starting_stairs_1.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/starting_stairs_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:70ea1e3da9135e7884eaef78d90afe4a049712e5976baa71619bc590f99e2b67 -size 4911 +oid sha256:8c3fafef36f60370b77f359a8105d5a6884221601a2d4583a89d39b78c46d322 +size 4910 diff --git a/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/starting_stairs_2.nbt b/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/starting_stairs_2.nbt index 1a607cef..4c4c8fdd 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/starting_stairs_2.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/starting_stairs_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0df504e9e25a49a634a0588b79e1a5b04d967a07297cb6faf0e8f3097187a34f +oid sha256:9ef411d694aa9c27ebc6c2df7693bd7a13a8f2e7239cecb3f3595d418d2d5e4a size 4910 diff --git a/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/starting_stairs_3.nbt b/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/starting_stairs_3.nbt index 944499b0..2bf02507 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/starting_stairs_3.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/starting_stairs_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7b23bfe3e0016f43e8b6ff2af83e631766f1ee09d994c6902df40b6bc8b9c2e2 -size 4917 +oid sha256:4c630b99449cb3d3909bc45f78ab1655e00adc1e40d314823887a7a9db742b48 +size 4916 diff --git a/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/starting_stairs_4.nbt b/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/starting_stairs_4.nbt index 92cfba5b..03faabe2 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/starting_stairs_4.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/starting_stairs_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6cdff82d90794fb3587c90eb3dc2280409ca60732c2766bcb6dde42814817c6a -size 4586 +oid sha256:8cedd98ced57bc2f63ace429f99cea0c142dea8da4a6d7458280ce2ec1da65d5 +size 4585 diff --git a/data/minecraft/structure/bastion/hoglin_stable/walls/side_wall_0.nbt b/data/minecraft/structure/bastion/hoglin_stable/walls/side_wall_0.nbt index 0e7a128c..7f89785a 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/walls/side_wall_0.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/walls/side_wall_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e7ff531a290cb3b8355ef81f8cb18770ba33bc76a6f09ada0b15dd826ed253bc -size 16618 +oid sha256:d0047067442c1785bea74264adec3f031a3c1420f51a6e923c1efca4ae3b02d0 +size 16616 diff --git a/data/minecraft/structure/bastion/hoglin_stable/walls/side_wall_1.nbt b/data/minecraft/structure/bastion/hoglin_stable/walls/side_wall_1.nbt index 031a7801..8546f6c4 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/walls/side_wall_1.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/walls/side_wall_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ed6a060daf94cabb12309c9b921aaf0a8f5bd172783a9f1e9d3709eea9af26ab -size 17027 +oid sha256:c4d72c56e11cc15b025d9c5f50a51f7d225b9013fe6e3fe4f84971cbccb07087 +size 17025 diff --git a/data/minecraft/structure/bastion/hoglin_stable/walls/wall_base.nbt b/data/minecraft/structure/bastion/hoglin_stable/walls/wall_base.nbt index 78a154b7..038fd8c0 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/walls/wall_base.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/walls/wall_base.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7268ad310241d969f51a97b4920d80c41d359555a80c78a6714f5c4d2b0b44fa -size 16415 +oid sha256:66074d73b74007ea3b67a142b437359a828cd966419a33736173e98171069aa6 +size 16414 diff --git a/data/minecraft/structure/bastion/mobs/crossbow_piglin.nbt b/data/minecraft/structure/bastion/mobs/crossbow_piglin.nbt index ff4ef823..90d2e092 100644 --- a/data/minecraft/structure/bastion/mobs/crossbow_piglin.nbt +++ b/data/minecraft/structure/bastion/mobs/crossbow_piglin.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4531806e9eb81df1c71f483863bf5cd95acc1227c1119d63f5a2a77c9826d14d +oid sha256:ce24d71bed2a07284f9d4f96d0a316ae67418a060f6a2e6a169d6dd29f9de687 size 684 diff --git a/data/minecraft/structure/bastion/mobs/empty.nbt b/data/minecraft/structure/bastion/mobs/empty.nbt index 10936a2c..8119e8eb 100644 --- a/data/minecraft/structure/bastion/mobs/empty.nbt +++ b/data/minecraft/structure/bastion/mobs/empty.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:441c8f6637bd9d7bb01bd8b54d23df27c332b7687e749a8c342c1cc6928f5377 -size 229 +oid sha256:2e09ae428d23cda8b1abf8d7cefff987f608c5d3cc426efa2472da1aba5839ce +size 228 diff --git a/data/minecraft/structure/bastion/mobs/hoglin.nbt b/data/minecraft/structure/bastion/mobs/hoglin.nbt index 5d4cb3a7..71a1ac2f 100644 --- a/data/minecraft/structure/bastion/mobs/hoglin.nbt +++ b/data/minecraft/structure/bastion/mobs/hoglin.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f6daf9734d073c4908095e2addf320ac087078a46735ce11896850b4fd4e935b +oid sha256:06b0d9ba5efa3c1b41efd1ebf1942ca0491fd535edd7b78922e5708785479c93 size 705 diff --git a/data/minecraft/structure/bastion/mobs/melee_piglin.nbt b/data/minecraft/structure/bastion/mobs/melee_piglin.nbt index 75fef413..9519bc51 100644 --- a/data/minecraft/structure/bastion/mobs/melee_piglin.nbt +++ b/data/minecraft/structure/bastion/mobs/melee_piglin.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3494959301901330a3014860bba32493d31de8e4d86c050f158a10e010679152 +oid sha256:3815108611ff30aa3b11cb62beae13a23b64db39d247b0e914ee3746ca494f53 size 651 diff --git a/data/minecraft/structure/bastion/mobs/melee_piglin_always.nbt b/data/minecraft/structure/bastion/mobs/melee_piglin_always.nbt index 10b299f4..05268a73 100644 --- a/data/minecraft/structure/bastion/mobs/melee_piglin_always.nbt +++ b/data/minecraft/structure/bastion/mobs/melee_piglin_always.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:751baed480fcfb5b8f6ba5ebd3c8f89e229a054a375ef699aa9c69dd88f8fa34 -size 643 +oid sha256:f93fd1337033d07d44ecca552e16d77b91a8cf95b822ac7fcf80d7cfa9050e22 +size 644 diff --git a/data/minecraft/structure/bastion/mobs/sword_piglin.nbt b/data/minecraft/structure/bastion/mobs/sword_piglin.nbt index 9506a1a9..02ba5e36 100644 --- a/data/minecraft/structure/bastion/mobs/sword_piglin.nbt +++ b/data/minecraft/structure/bastion/mobs/sword_piglin.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:303c2a9cca36c9550b7c5f3c7cad337cfb62252e57bcc89ca9b95002d0421b11 +oid sha256:c46dbcc4f1746102e6a584226aa19d0a66faf36fc2aaf0b4c0711ffd33f0416a size 690 diff --git a/data/minecraft/structure/bastion/treasure/bases/centers/center_0.nbt b/data/minecraft/structure/bastion/treasure/bases/centers/center_0.nbt index 0933c651..896c43a5 100644 --- a/data/minecraft/structure/bastion/treasure/bases/centers/center_0.nbt +++ b/data/minecraft/structure/bastion/treasure/bases/centers/center_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d4c29745e94c05c7cd0e39d3b8bd745baceae5e84638b574d7c715b4c18f67a2 -size 1025 +oid sha256:7c111db1d533aa90d4317594ac55ea47d5f3df011351f9c98c814c5c78f940f8 +size 1024 diff --git a/data/minecraft/structure/bastion/treasure/bases/centers/center_1.nbt b/data/minecraft/structure/bastion/treasure/bases/centers/center_1.nbt index ce2ab35a..f963481e 100644 --- a/data/minecraft/structure/bastion/treasure/bases/centers/center_1.nbt +++ b/data/minecraft/structure/bastion/treasure/bases/centers/center_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:456677c73d91419c85455f60888cba68e326b929b5fda6754395b26216a27aa3 -size 961 +oid sha256:d2217b6a80f17662b893b2811dc909dd557477d2aa63feb13ef6709872ffdcfb +size 959 diff --git a/data/minecraft/structure/bastion/treasure/bases/centers/center_2.nbt b/data/minecraft/structure/bastion/treasure/bases/centers/center_2.nbt index c1eb040f..8a905d7a 100644 --- a/data/minecraft/structure/bastion/treasure/bases/centers/center_2.nbt +++ b/data/minecraft/structure/bastion/treasure/bases/centers/center_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f833314b479a56a4312d86188567c9bdc2a6f346e1542c75fc034aa7d473a94c -size 1076 +oid sha256:3e9231f90974ded199ac6ac4b19ada9b8148bcd0dcc6d29da51716c9bab96fda +size 1074 diff --git a/data/minecraft/structure/bastion/treasure/bases/centers/center_3.nbt b/data/minecraft/structure/bastion/treasure/bases/centers/center_3.nbt index 6d0f6e7f..df123c22 100644 --- a/data/minecraft/structure/bastion/treasure/bases/centers/center_3.nbt +++ b/data/minecraft/structure/bastion/treasure/bases/centers/center_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:48457c034deaa1664010e500c30e64ed18bd6380293db23c3e151a5b0050ed29 -size 737 +oid sha256:d7daec1b62176801ef58ff8b817a82945abba2d4cf0b45890386774dce5eeac8 +size 735 diff --git a/data/minecraft/structure/bastion/treasure/bases/lava_basin.nbt b/data/minecraft/structure/bastion/treasure/bases/lava_basin.nbt index ced8eee0..0218f31f 100644 --- a/data/minecraft/structure/bastion/treasure/bases/lava_basin.nbt +++ b/data/minecraft/structure/bastion/treasure/bases/lava_basin.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8aa6fa6939a5dce6f46b5ca549bdbc4a28a711bd4f57a439c69bcf5835c45bb3 -size 6585 +oid sha256:8523b4405911bf3b8d67247194416a30e8c27934ed42b245718bf053af947f18 +size 6583 diff --git a/data/minecraft/structure/bastion/treasure/big_air_full.nbt b/data/minecraft/structure/bastion/treasure/big_air_full.nbt index 042556c5..b3897c13 100644 --- a/data/minecraft/structure/bastion/treasure/big_air_full.nbt +++ b/data/minecraft/structure/bastion/treasure/big_air_full.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6c162614d50e97df8fa78085c94f5fb1a7095ce3ce5acf1a0d505b38aac5e464 -size 69674 +oid sha256:186bb361d853743a2d7fed0609763747f41c01e5f33d3a8dffdea71ba4d7b023 +size 69673 diff --git a/data/minecraft/structure/bastion/treasure/brains/center_brain.nbt b/data/minecraft/structure/bastion/treasure/brains/center_brain.nbt index 3dec0fcc..6db49a58 100644 --- a/data/minecraft/structure/bastion/treasure/brains/center_brain.nbt +++ b/data/minecraft/structure/bastion/treasure/brains/center_brain.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8a837a2d1d18328fc8b0872389ed6c55503c08b40a40bedc4ba433feb2ce9631 +oid sha256:9a89022283879b7d188bcbe921396f3cd96830124a52293917cf9d75104f02d8 size 416 diff --git a/data/minecraft/structure/bastion/treasure/connectors/center_to_wall_middle.nbt b/data/minecraft/structure/bastion/treasure/connectors/center_to_wall_middle.nbt index a8f82074..0c0af79c 100644 --- a/data/minecraft/structure/bastion/treasure/connectors/center_to_wall_middle.nbt +++ b/data/minecraft/structure/bastion/treasure/connectors/center_to_wall_middle.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f287da8e876b13a045598f74526b78d09cbb283bbfd6524d7c7953776a042482 -size 288 +oid sha256:49b0e8f51de8987fb623443e1d1b51f8db786a360b48e10b24c1d9023615fd5b +size 287 diff --git a/data/minecraft/structure/bastion/treasure/connectors/center_to_wall_top.nbt b/data/minecraft/structure/bastion/treasure/connectors/center_to_wall_top.nbt index c8c6081d..8ff93c78 100644 --- a/data/minecraft/structure/bastion/treasure/connectors/center_to_wall_top.nbt +++ b/data/minecraft/structure/bastion/treasure/connectors/center_to_wall_top.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9bdd9ee43ca56e98c9ebbbe7ef32c8ac93eca7f2ceb8a5053988f332d939979e -size 287 +oid sha256:e001c3ce424faea037c7d0646dc56a0435ed0527ebb777f247b2d851635b91c0 +size 286 diff --git a/data/minecraft/structure/bastion/treasure/connectors/center_to_wall_top_entrance.nbt b/data/minecraft/structure/bastion/treasure/connectors/center_to_wall_top_entrance.nbt index 6b2eb681..b8e19c4b 100644 --- a/data/minecraft/structure/bastion/treasure/connectors/center_to_wall_top_entrance.nbt +++ b/data/minecraft/structure/bastion/treasure/connectors/center_to_wall_top_entrance.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b07e4f0a120e2ae453d9b60edf82ceebb8eb97c4a9fac752326e6237ff4fc2a6 -size 292 +oid sha256:1376b07077a81088f6a6c6101c65aaa18321769e0bef0da099f925d40a04c4dc +size 290 diff --git a/data/minecraft/structure/bastion/treasure/corners/bottom/corner_0.nbt b/data/minecraft/structure/bastion/treasure/corners/bottom/corner_0.nbt index 9642e6ec..4e5636cd 100644 --- a/data/minecraft/structure/bastion/treasure/corners/bottom/corner_0.nbt +++ b/data/minecraft/structure/bastion/treasure/corners/bottom/corner_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1db1c88ff3850e5d7d150b69dc6e6c259d0da2bdda94967c1f1f37adc7a4cc19 +oid sha256:fb6299529fc61f5c3ce3cb7ef7ff653d7896fcd1189213a36da6dff42ffb502f size 1685 diff --git a/data/minecraft/structure/bastion/treasure/corners/bottom/corner_1.nbt b/data/minecraft/structure/bastion/treasure/corners/bottom/corner_1.nbt index 8c998c5a..b1aa3729 100644 --- a/data/minecraft/structure/bastion/treasure/corners/bottom/corner_1.nbt +++ b/data/minecraft/structure/bastion/treasure/corners/bottom/corner_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e9c3bb7c08e483ef75f8d84411798a52bd3e2fc22d13e0aafeffb5e76932042b +oid sha256:ea8376a4f1786f4c94cc4243aabcb06f2fc847394ca12ef4ec9c2c826c6c1a87 size 1680 diff --git a/data/minecraft/structure/bastion/treasure/corners/edges/bottom.nbt b/data/minecraft/structure/bastion/treasure/corners/edges/bottom.nbt index 594e5560..aa2b8e1e 100644 --- a/data/minecraft/structure/bastion/treasure/corners/edges/bottom.nbt +++ b/data/minecraft/structure/bastion/treasure/corners/edges/bottom.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f981d96e09e42210688f8e858bfcc43a576952489d49e5ba3f32706b35b34f5 -size 451 +oid sha256:03757887f587fd5c58fd1277f85c2a7b0e89d39aa37c9c8d8667fbb5110d3c55 +size 450 diff --git a/data/minecraft/structure/bastion/treasure/corners/edges/middle.nbt b/data/minecraft/structure/bastion/treasure/corners/edges/middle.nbt index 9142d59d..58243b36 100644 --- a/data/minecraft/structure/bastion/treasure/corners/edges/middle.nbt +++ b/data/minecraft/structure/bastion/treasure/corners/edges/middle.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ee374b861e94a7bfce94273c26c14fe0a80f73ca332814cb962fa1e61fb6a6ca +oid sha256:fa114fa5c15694bdd7f8d83474d55ef6a81a9857e416add18cf330c272fb2d34 size 440 diff --git a/data/minecraft/structure/bastion/treasure/corners/edges/top.nbt b/data/minecraft/structure/bastion/treasure/corners/edges/top.nbt index 77cabd53..e3028421 100644 --- a/data/minecraft/structure/bastion/treasure/corners/edges/top.nbt +++ b/data/minecraft/structure/bastion/treasure/corners/edges/top.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:df5592b67339d7a05cd53251d867a86bb59c567f38cdffcb9b204561770cee1e -size 457 +oid sha256:63ca9e12b4f342b0ed4adc961c7f7661559161f41a126c7bff0dd97a8448121b +size 456 diff --git a/data/minecraft/structure/bastion/treasure/corners/middle/corner_0.nbt b/data/minecraft/structure/bastion/treasure/corners/middle/corner_0.nbt index 93849a78..8ad353c3 100644 --- a/data/minecraft/structure/bastion/treasure/corners/middle/corner_0.nbt +++ b/data/minecraft/structure/bastion/treasure/corners/middle/corner_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4e26ab019be5a9c9f43d5c233ca21cdd9ab3c5da0791f6caf78405aecea3daf5 -size 1586 +oid sha256:a1abd2ac0875e818c3db41d6e24b08f7458f2b15bfbde92dd7a4d295923979e5 +size 1585 diff --git a/data/minecraft/structure/bastion/treasure/corners/middle/corner_1.nbt b/data/minecraft/structure/bastion/treasure/corners/middle/corner_1.nbt index c166b23f..add9085d 100644 --- a/data/minecraft/structure/bastion/treasure/corners/middle/corner_1.nbt +++ b/data/minecraft/structure/bastion/treasure/corners/middle/corner_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c6bcd90ecbb75b449d13d9739c9fcf6c93ab53e9ee392f8654cc554c0783b75c -size 1539 +oid sha256:0f7e177d317c27deada7ad0b58c1fa172949e23d01327f3f9fb119f6f13a488b +size 1538 diff --git a/data/minecraft/structure/bastion/treasure/corners/top/corner_0.nbt b/data/minecraft/structure/bastion/treasure/corners/top/corner_0.nbt index 6d0ea1a4..6caa119e 100644 --- a/data/minecraft/structure/bastion/treasure/corners/top/corner_0.nbt +++ b/data/minecraft/structure/bastion/treasure/corners/top/corner_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c0e78890d1d117afb63a2068b653f6dc6ffad31d43b1160adb7e535349990123 +oid sha256:4b05fffb5ca44fc11b86c070aa3433f77a7397efc6e8b9a88f35d3aff56d1777 size 1553 diff --git a/data/minecraft/structure/bastion/treasure/corners/top/corner_1.nbt b/data/minecraft/structure/bastion/treasure/corners/top/corner_1.nbt index 6842b4ff..b9a18fbf 100644 --- a/data/minecraft/structure/bastion/treasure/corners/top/corner_1.nbt +++ b/data/minecraft/structure/bastion/treasure/corners/top/corner_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f2c7aa7175a46002f4818b00db0e3c059db98e168cb4086468292919e4695c6e +oid sha256:47182901008f437a4e6990b9f3e88b59f71301805fe2f5ad4f3f3a1a55fce523 size 1573 diff --git a/data/minecraft/structure/bastion/treasure/entrances/entrance_0.nbt b/data/minecraft/structure/bastion/treasure/entrances/entrance_0.nbt index 468b20e8..baf5d5ed 100644 --- a/data/minecraft/structure/bastion/treasure/entrances/entrance_0.nbt +++ b/data/minecraft/structure/bastion/treasure/entrances/entrance_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d04449ccaefab611105970eb6225e6b8ea4649a306ea50b9d9b7eb73de730a75 -size 11197 +oid sha256:47d144f7ddd7b83acefd3a343d2b4b1f2ecb06ae3f6af5c203e12661256d9a47 +size 11196 diff --git a/data/minecraft/structure/bastion/treasure/extensions/empty.nbt b/data/minecraft/structure/bastion/treasure/extensions/empty.nbt index 92eca3ab..daefc55c 100644 --- a/data/minecraft/structure/bastion/treasure/extensions/empty.nbt +++ b/data/minecraft/structure/bastion/treasure/extensions/empty.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef4aff2a710e0e64829b10a9d43d45f4329b27affbac55a61c10c91726919855 -size 233 +oid sha256:ae28d82c55ecbbd20a9cc1ed269c2b3206094047dbf0f6af41c28b8cf67ecdc4 +size 232 diff --git a/data/minecraft/structure/bastion/treasure/extensions/fire_room.nbt b/data/minecraft/structure/bastion/treasure/extensions/fire_room.nbt index 812ff290..04b7c23e 100644 --- a/data/minecraft/structure/bastion/treasure/extensions/fire_room.nbt +++ b/data/minecraft/structure/bastion/treasure/extensions/fire_room.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:161a95eabfa107b128820933b1cdbb1a418945edc081ece633df41998becdf90 -size 1867 +oid sha256:9c8c459d153fe5ba2165e87e9f05674c23b7493f1f765790ec3dae3887cd4df1 +size 1866 diff --git a/data/minecraft/structure/bastion/treasure/extensions/house_0.nbt b/data/minecraft/structure/bastion/treasure/extensions/house_0.nbt index a2d618b8..be1a8450 100644 --- a/data/minecraft/structure/bastion/treasure/extensions/house_0.nbt +++ b/data/minecraft/structure/bastion/treasure/extensions/house_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:293849fe896f06bdc053867c0a56fd9556766752915d48b98dc44826c0c7a056 +oid sha256:530c179b815416da0f5cad50f6a02a1f09f950054aab05615c3105e0c087a9c9 size 2078 diff --git a/data/minecraft/structure/bastion/treasure/extensions/house_1.nbt b/data/minecraft/structure/bastion/treasure/extensions/house_1.nbt index b23dae89..2d2d05d0 100644 --- a/data/minecraft/structure/bastion/treasure/extensions/house_1.nbt +++ b/data/minecraft/structure/bastion/treasure/extensions/house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0faaf2792ce4ed90778be6e123b6ca592b14cc21cbdba8af6e20e99a2ce06dac -size 2160 +oid sha256:f005e43d28bff3919a0f36244885098a34490842c66ed75f9877dc32b171f01b +size 2159 diff --git a/data/minecraft/structure/bastion/treasure/extensions/large_bridge_0.nbt b/data/minecraft/structure/bastion/treasure/extensions/large_bridge_0.nbt index 0398ea0b..87f41e13 100644 --- a/data/minecraft/structure/bastion/treasure/extensions/large_bridge_0.nbt +++ b/data/minecraft/structure/bastion/treasure/extensions/large_bridge_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2d2b73318067adeb3a03de6a57d8ec129b41e92d36539bc3a8a05a1a18e42f95 +oid sha256:b2a851c62b0523c294df4c8f10434dece4dbdcf40ec1b67c58f448a5f0825525 size 455 diff --git a/data/minecraft/structure/bastion/treasure/extensions/large_bridge_1.nbt b/data/minecraft/structure/bastion/treasure/extensions/large_bridge_1.nbt index 0f7be9e8..34ade502 100644 --- a/data/minecraft/structure/bastion/treasure/extensions/large_bridge_1.nbt +++ b/data/minecraft/structure/bastion/treasure/extensions/large_bridge_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bebd4a59c91d0b9172960698910f4513ba6ff02c02cc0c5b76a3351ba1d69a73 +oid sha256:a6b800962066d6a9b514fded1610cb4a05b94d0d36a8a02aad6d96e323f6e1c0 size 418 diff --git a/data/minecraft/structure/bastion/treasure/extensions/large_bridge_2.nbt b/data/minecraft/structure/bastion/treasure/extensions/large_bridge_2.nbt index 1dfcaf52..c412451a 100644 --- a/data/minecraft/structure/bastion/treasure/extensions/large_bridge_2.nbt +++ b/data/minecraft/structure/bastion/treasure/extensions/large_bridge_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5dad75d7504b8105c18879c0ab59fcaffaf00b01fbe8695c19c51158f970e616 -size 539 +oid sha256:205fe27155a0d3bb4ba518de7b4a414b6b1693fb4dac4374c03c4608572a4e6a +size 538 diff --git a/data/minecraft/structure/bastion/treasure/extensions/large_bridge_3.nbt b/data/minecraft/structure/bastion/treasure/extensions/large_bridge_3.nbt index 9261b716..76cb6522 100644 --- a/data/minecraft/structure/bastion/treasure/extensions/large_bridge_3.nbt +++ b/data/minecraft/structure/bastion/treasure/extensions/large_bridge_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:674d0bba22ff08c145aca9d0d895b79f3011d607b06f027bab633c8e2077e145 -size 616 +oid sha256:5a40a13360e8ff8f370687e4fa21879f37ff3d1fcb583c1238733e6b02568431 +size 615 diff --git a/data/minecraft/structure/bastion/treasure/extensions/roofed_bridge.nbt b/data/minecraft/structure/bastion/treasure/extensions/roofed_bridge.nbt index 4028f326..718cc99f 100644 --- a/data/minecraft/structure/bastion/treasure/extensions/roofed_bridge.nbt +++ b/data/minecraft/structure/bastion/treasure/extensions/roofed_bridge.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:907682c1131eb7a471cc4dc631c3d96a356fd1c86bf0d35e2ec126e4fa5dbbf7 +oid sha256:d9d47775db394f4bf9a7bde0448ef7e27c55a2e4d454aca226a82c64b5d0ac99 size 642 diff --git a/data/minecraft/structure/bastion/treasure/extensions/small_bridge_0.nbt b/data/minecraft/structure/bastion/treasure/extensions/small_bridge_0.nbt index 8368375b..7fe2b71e 100644 --- a/data/minecraft/structure/bastion/treasure/extensions/small_bridge_0.nbt +++ b/data/minecraft/structure/bastion/treasure/extensions/small_bridge_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e01ee7e5aa269825bb89d14a0818e2146172125a2c03b574ad4fe57e477f986f +oid sha256:f3f96f0778ec91d3d936fe16934e3ad55b594c5f4d35e2cde0b440cbee234691 size 320 diff --git a/data/minecraft/structure/bastion/treasure/extensions/small_bridge_1.nbt b/data/minecraft/structure/bastion/treasure/extensions/small_bridge_1.nbt index 1b24bc65..3cb0aca9 100644 --- a/data/minecraft/structure/bastion/treasure/extensions/small_bridge_1.nbt +++ b/data/minecraft/structure/bastion/treasure/extensions/small_bridge_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3c723861fdd55426bb4397930370a4cd0be7023c2ce8328f465e2e83336c78bd +oid sha256:3b4079800519c8b99edf3c2d696e69ecc84475cf5d77fab52553478e237278c4 size 390 diff --git a/data/minecraft/structure/bastion/treasure/extensions/small_bridge_2.nbt b/data/minecraft/structure/bastion/treasure/extensions/small_bridge_2.nbt index 4c45bc3e..b999614b 100644 --- a/data/minecraft/structure/bastion/treasure/extensions/small_bridge_2.nbt +++ b/data/minecraft/structure/bastion/treasure/extensions/small_bridge_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:da3a01008481f31145aba8282e200c35515f6835056aaf4c37c3bb60a4572dbd +oid sha256:d340d35eb76faee8d53ea02e0817a75453e2ebb54eebd63ff78079b6beeab2c1 size 349 diff --git a/data/minecraft/structure/bastion/treasure/extensions/small_bridge_3.nbt b/data/minecraft/structure/bastion/treasure/extensions/small_bridge_3.nbt index 45eb4de6..fd8512a4 100644 --- a/data/minecraft/structure/bastion/treasure/extensions/small_bridge_3.nbt +++ b/data/minecraft/structure/bastion/treasure/extensions/small_bridge_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e03371c05a93936b11fa10e8594efb7e991ff59b00354d27ce5893f0020357c -size 480 +oid sha256:04bf148958c090859d19622386d51da0bc109c1c711fabc32d1c526550e113ab +size 479 diff --git a/data/minecraft/structure/bastion/treasure/ramparts/bottom_wall_0.nbt b/data/minecraft/structure/bastion/treasure/ramparts/bottom_wall_0.nbt index 1233ed32..8ea19c07 100644 --- a/data/minecraft/structure/bastion/treasure/ramparts/bottom_wall_0.nbt +++ b/data/minecraft/structure/bastion/treasure/ramparts/bottom_wall_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7deef3ba0020b40dc9f8fb0cf073d060efee8f32f7e1c2b37341ebeb1938901d -size 11781 +oid sha256:199fa5b8a88a94233ec1bc9a2c4cd3b3929f46a9796140b48c012d0158980e58 +size 11780 diff --git a/data/minecraft/structure/bastion/treasure/ramparts/lava_basin_main.nbt b/data/minecraft/structure/bastion/treasure/ramparts/lava_basin_main.nbt index 6476888c..e78b2513 100644 --- a/data/minecraft/structure/bastion/treasure/ramparts/lava_basin_main.nbt +++ b/data/minecraft/structure/bastion/treasure/ramparts/lava_basin_main.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:44d1309e93626a973ff3f53c77b54603f66ce1adbd38f742720488276e728ede -size 24169 +oid sha256:fd7aea849ec9920817f475af4fb949f53aae323cd4e0f571da74981c87bb3b28 +size 24168 diff --git a/data/minecraft/structure/bastion/treasure/ramparts/lava_basin_side.nbt b/data/minecraft/structure/bastion/treasure/ramparts/lava_basin_side.nbt index e1d8c83e..2de08c5e 100644 --- a/data/minecraft/structure/bastion/treasure/ramparts/lava_basin_side.nbt +++ b/data/minecraft/structure/bastion/treasure/ramparts/lava_basin_side.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:62a1f786236c2925dcad756277de4a2b78c53ca0ff097b90a61fd28fede36a64 +oid sha256:8da578bf14f735dfc1d23eafee05be9bf6457c14a5f2f8eef8c87439751569b0 size 23969 diff --git a/data/minecraft/structure/bastion/treasure/ramparts/mid_wall_main.nbt b/data/minecraft/structure/bastion/treasure/ramparts/mid_wall_main.nbt index 41d972d1..ace12d2d 100644 --- a/data/minecraft/structure/bastion/treasure/ramparts/mid_wall_main.nbt +++ b/data/minecraft/structure/bastion/treasure/ramparts/mid_wall_main.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:36620ea022072bc99dd4053b27ab435e2d249e34de6f27f4b96cd8852c0650e6 -size 18999 +oid sha256:da26d3993daf17d5bfad13bf780fd95cd203ea87e289fef8d164b16e9b9011fc +size 18998 diff --git a/data/minecraft/structure/bastion/treasure/ramparts/mid_wall_side.nbt b/data/minecraft/structure/bastion/treasure/ramparts/mid_wall_side.nbt index 57555934..86ece26f 100644 --- a/data/minecraft/structure/bastion/treasure/ramparts/mid_wall_side.nbt +++ b/data/minecraft/structure/bastion/treasure/ramparts/mid_wall_side.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c26c0c297e8e35273196a2b94cada2f35a4f6c9b51d9903316070d7250355155 -size 18147 +oid sha256:dffd928abd650a13f15af8563077e01328d10431a1fd9367016c974f4c84923f +size 18145 diff --git a/data/minecraft/structure/bastion/treasure/ramparts/top_wall.nbt b/data/minecraft/structure/bastion/treasure/ramparts/top_wall.nbt index bb9325ae..1e523ea2 100644 --- a/data/minecraft/structure/bastion/treasure/ramparts/top_wall.nbt +++ b/data/minecraft/structure/bastion/treasure/ramparts/top_wall.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4c09407fb1ccc3abf5d2b97d2371e791b76e2f9599d50a6bed6ed3ade891a60a -size 9861 +oid sha256:0f00c76d2f4634f0e28e8f652eff0042beebe709097d5a887ab2f9127e53732f +size 9860 diff --git a/data/minecraft/structure/bastion/treasure/roofs/center_roof.nbt b/data/minecraft/structure/bastion/treasure/roofs/center_roof.nbt index d54290bd..56a54af2 100644 --- a/data/minecraft/structure/bastion/treasure/roofs/center_roof.nbt +++ b/data/minecraft/structure/bastion/treasure/roofs/center_roof.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6240a76b7a16875836ff70493c257e5af31f7913996d8ad02fcfb57420c4e150 -size 3448 +oid sha256:7cbb849cf214ed20e3b56e586ac08b636334aa89c4ff4d08f43b37c2aa588007 +size 3445 diff --git a/data/minecraft/structure/bastion/treasure/roofs/corner_roof.nbt b/data/minecraft/structure/bastion/treasure/roofs/corner_roof.nbt index 9750048e..13561d1a 100644 --- a/data/minecraft/structure/bastion/treasure/roofs/corner_roof.nbt +++ b/data/minecraft/structure/bastion/treasure/roofs/corner_roof.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b227874f6f823ff7a2b595eca2a3d67890049c074b0ccfc0e8bb688b8c4da5de +oid sha256:0e214a5e2da6006215bd882a7649ca28f5bbace572e8e20bb48d87510c6d315a size 425 diff --git a/data/minecraft/structure/bastion/treasure/roofs/wall_roof.nbt b/data/minecraft/structure/bastion/treasure/roofs/wall_roof.nbt index e1ef66a7..7a2ff9ee 100644 --- a/data/minecraft/structure/bastion/treasure/roofs/wall_roof.nbt +++ b/data/minecraft/structure/bastion/treasure/roofs/wall_roof.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d58b1b93135af90fed349b27594cad51ff297b939e0632ebba534c87f2f2a432 +oid sha256:d4f7c8d14ec497c95d48b845e246117b87e3d4d581d973f8cbb51386f8bd411e size 991 diff --git a/data/minecraft/structure/bastion/treasure/stairs/lower_stairs.nbt b/data/minecraft/structure/bastion/treasure/stairs/lower_stairs.nbt index 4159596e..fdefdc69 100644 --- a/data/minecraft/structure/bastion/treasure/stairs/lower_stairs.nbt +++ b/data/minecraft/structure/bastion/treasure/stairs/lower_stairs.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:931d5a97e389c103f20a57c40d141ad44012e9be5f8c5a808d7e89833e0f13b3 +oid sha256:9f2ab72514f81439e127e6e786859159e2112cb354756e6337ae8b49ec613bfd size 447 diff --git a/data/minecraft/structure/bastion/treasure/walls/bottom/wall_0.nbt b/data/minecraft/structure/bastion/treasure/walls/bottom/wall_0.nbt index 2176ac3a..95fd292c 100644 --- a/data/minecraft/structure/bastion/treasure/walls/bottom/wall_0.nbt +++ b/data/minecraft/structure/bastion/treasure/walls/bottom/wall_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:13df1fcdb021e97fa8889500061eb1b715f334b075cdc60a66571029123ffbee -size 6613 +oid sha256:1bbc5356df5e46339b81a9a257ab4feb521dc9d1920c12891ca8b6c312c5b278 +size 6611 diff --git a/data/minecraft/structure/bastion/treasure/walls/bottom/wall_1.nbt b/data/minecraft/structure/bastion/treasure/walls/bottom/wall_1.nbt index fb44b051..60ddc77f 100644 --- a/data/minecraft/structure/bastion/treasure/walls/bottom/wall_1.nbt +++ b/data/minecraft/structure/bastion/treasure/walls/bottom/wall_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ff7f71307354415512fd3c891214532f9b8b47e981e477e04a96983f0c5a4806 -size 6500 +oid sha256:a1681513e167eefd7579a52d194512d9c22ba99434295fddffe670259e3cd3eb +size 6499 diff --git a/data/minecraft/structure/bastion/treasure/walls/bottom/wall_2.nbt b/data/minecraft/structure/bastion/treasure/walls/bottom/wall_2.nbt index eb912b97..081eb676 100644 --- a/data/minecraft/structure/bastion/treasure/walls/bottom/wall_2.nbt +++ b/data/minecraft/structure/bastion/treasure/walls/bottom/wall_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:07cb216a5eafbcdfc07e856a981e6a5eeaaab9aac5ed854a57a90b954353ec0b -size 6443 +oid sha256:a151b8241c6447ca764cc609934be77e6e374de890f78b0932f3514d614f24d9 +size 6442 diff --git a/data/minecraft/structure/bastion/treasure/walls/bottom/wall_3.nbt b/data/minecraft/structure/bastion/treasure/walls/bottom/wall_3.nbt index 93a91242..46052c6c 100644 --- a/data/minecraft/structure/bastion/treasure/walls/bottom/wall_3.nbt +++ b/data/minecraft/structure/bastion/treasure/walls/bottom/wall_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:420e473738bce9c695c12550bcdd30de8b85c3f4ba5b6d5929aa0effeea311f1 -size 6491 +oid sha256:d95cd9f66b3c8c1f75c85a5f062ed75256efaf1b15ad3f149ce3800a87124adf +size 6489 diff --git a/data/minecraft/structure/bastion/treasure/walls/entrance_wall.nbt b/data/minecraft/structure/bastion/treasure/walls/entrance_wall.nbt index 6f8f6fae..5f80473f 100644 --- a/data/minecraft/structure/bastion/treasure/walls/entrance_wall.nbt +++ b/data/minecraft/structure/bastion/treasure/walls/entrance_wall.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d60769a303afd0d941fe4fcdf3fd6b34a3bd6b402161f16434572d9e9500f56c -size 2679 +oid sha256:a63bbcf684102933879eb68f397dc6678736cada271c569d106d72823360e4c2 +size 2678 diff --git a/data/minecraft/structure/bastion/treasure/walls/lava_wall.nbt b/data/minecraft/structure/bastion/treasure/walls/lava_wall.nbt index 8ae9501a..a96c380d 100644 --- a/data/minecraft/structure/bastion/treasure/walls/lava_wall.nbt +++ b/data/minecraft/structure/bastion/treasure/walls/lava_wall.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:04ca8e0d2210a9b78018c3a6d818fbee7c0107d32801acd34174b6a2fa0584a1 -size 2799 +oid sha256:30998c0d321af565ed7dab2d73db5fa1b06f1d4db5143e6c3191e1fff156bf2b +size 2798 diff --git a/data/minecraft/structure/bastion/treasure/walls/mid/wall_0.nbt b/data/minecraft/structure/bastion/treasure/walls/mid/wall_0.nbt index 29791372..2c9c54d0 100644 --- a/data/minecraft/structure/bastion/treasure/walls/mid/wall_0.nbt +++ b/data/minecraft/structure/bastion/treasure/walls/mid/wall_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:959f7f86be59181f16ff78e3292e2bee1031c41ebe1ca647b0be47ae4f09561e -size 6297 +oid sha256:f9cc50631fe766ff0a0b3c7b9fe6ca53b657cfaf03f79018fb58d2b640878b08 +size 6295 diff --git a/data/minecraft/structure/bastion/treasure/walls/mid/wall_1.nbt b/data/minecraft/structure/bastion/treasure/walls/mid/wall_1.nbt index b83d8f49..7fe5cff5 100644 --- a/data/minecraft/structure/bastion/treasure/walls/mid/wall_1.nbt +++ b/data/minecraft/structure/bastion/treasure/walls/mid/wall_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5b6f9e325425db947d23ae362436a6d3038a6c50ceacc876f595359505d1777f -size 6153 +oid sha256:ab719ea2b269ffd29770dafb1e0b27473c8ca7eeab5df4ece387ebd3a641e8db +size 6152 diff --git a/data/minecraft/structure/bastion/treasure/walls/mid/wall_2.nbt b/data/minecraft/structure/bastion/treasure/walls/mid/wall_2.nbt index 7c53b99e..762b038e 100644 --- a/data/minecraft/structure/bastion/treasure/walls/mid/wall_2.nbt +++ b/data/minecraft/structure/bastion/treasure/walls/mid/wall_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7ef9393b82968026027a5ce24b7f293e054cb0dace94cee9920d7103a10c0284 +oid sha256:bf0fee2964fc096e2a4c4224f69e7e79e5308eedc055bc548712abc50f703cdc size 6174 diff --git a/data/minecraft/structure/bastion/treasure/walls/outer/bottom_corner.nbt b/data/minecraft/structure/bastion/treasure/walls/outer/bottom_corner.nbt index 0638fa62..beb11e50 100644 --- a/data/minecraft/structure/bastion/treasure/walls/outer/bottom_corner.nbt +++ b/data/minecraft/structure/bastion/treasure/walls/outer/bottom_corner.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:76f36715b74a4df2197e2dcf07ced33c0d11887828688551fe691fbb16879a14 +oid sha256:eca60d6cd203e3912513965b5b5836041849f100af90f1e2cdd41b2855c50b8f size 781 diff --git a/data/minecraft/structure/bastion/treasure/walls/outer/medium_outer_wall.nbt b/data/minecraft/structure/bastion/treasure/walls/outer/medium_outer_wall.nbt index 5347b864..8739ea07 100644 --- a/data/minecraft/structure/bastion/treasure/walls/outer/medium_outer_wall.nbt +++ b/data/minecraft/structure/bastion/treasure/walls/outer/medium_outer_wall.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1580d5287c39f72bc147bc1903a429b82de5881be56d849ecadadbc6ab833f5f -size 2333 +oid sha256:6aa5ff98bfa3eecfbf3f8388161d59527076209ff6ddaba1369c86ec946597b5 +size 2332 diff --git a/data/minecraft/structure/bastion/treasure/walls/outer/mid_corner.nbt b/data/minecraft/structure/bastion/treasure/walls/outer/mid_corner.nbt index 814859d2..83814793 100644 --- a/data/minecraft/structure/bastion/treasure/walls/outer/mid_corner.nbt +++ b/data/minecraft/structure/bastion/treasure/walls/outer/mid_corner.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:06aa94c664dbf982063cb9ddeb169d8fb4ba6ec82adfa3d0aa218fc21d7f4ce9 +oid sha256:a0b5c52ab50a2f3b6ba687433f6f3c2115b7cc932ba0beaecbbbfb259265c6af size 714 diff --git a/data/minecraft/structure/bastion/treasure/walls/outer/outer_wall.nbt b/data/minecraft/structure/bastion/treasure/walls/outer/outer_wall.nbt index 82806e98..c22a090f 100644 --- a/data/minecraft/structure/bastion/treasure/walls/outer/outer_wall.nbt +++ b/data/minecraft/structure/bastion/treasure/walls/outer/outer_wall.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:06e328ecdd3e3b0be43fe2bd95777d3044f2f6f06ffee6c6c5e951ec68c88f23 -size 2206 +oid sha256:e81723f07423f2d157458af73b5f15598acb60d8879d479e9532c7c5efacf0e2 +size 2205 diff --git a/data/minecraft/structure/bastion/treasure/walls/outer/tall_outer_wall.nbt b/data/minecraft/structure/bastion/treasure/walls/outer/tall_outer_wall.nbt index 59317635..0a9445f5 100644 --- a/data/minecraft/structure/bastion/treasure/walls/outer/tall_outer_wall.nbt +++ b/data/minecraft/structure/bastion/treasure/walls/outer/tall_outer_wall.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6df5fa67c7338a7ec56c0a5d27cb0d544a86f67e239b7a31c4eb2027a9331e97 -size 2449 +oid sha256:b8855e23bcb4fc45b77a701f139ebd405acce85a51d949f38d1517ebf466cc3f +size 2453 diff --git a/data/minecraft/structure/bastion/treasure/walls/outer/top_corner.nbt b/data/minecraft/structure/bastion/treasure/walls/outer/top_corner.nbt index 6fcfdf00..f75e8dfa 100644 --- a/data/minecraft/structure/bastion/treasure/walls/outer/top_corner.nbt +++ b/data/minecraft/structure/bastion/treasure/walls/outer/top_corner.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d16644e4d63090a0d0c8fa4085f7736436287ce7f02c72a42fb40a34b1130379 -size 806 +oid sha256:7e59c62e6e161a62957d5f0219d7419f4536e75a567b303cdb39c91d1d06448b +size 805 diff --git a/data/minecraft/structure/bastion/treasure/walls/top/main_entrance.nbt b/data/minecraft/structure/bastion/treasure/walls/top/main_entrance.nbt index 74d6a7ac..fbf8d98b 100644 --- a/data/minecraft/structure/bastion/treasure/walls/top/main_entrance.nbt +++ b/data/minecraft/structure/bastion/treasure/walls/top/main_entrance.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cd50209261255d9ebcc714c583888402842c49281381575fb286e8b5f50c8069 -size 6220 +oid sha256:0b68305a5a2ba284c69006ef80bc60a9e1a704249ec367f1619fd8108d3587df +size 6219 diff --git a/data/minecraft/structure/bastion/treasure/walls/top/wall_0.nbt b/data/minecraft/structure/bastion/treasure/walls/top/wall_0.nbt index de88a67c..40d19cb3 100644 --- a/data/minecraft/structure/bastion/treasure/walls/top/wall_0.nbt +++ b/data/minecraft/structure/bastion/treasure/walls/top/wall_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c9d9dbdf4e549dc4b94dae4acea385e718247b32935c77fdf5f289bb6e51f475 -size 6226 +oid sha256:5641960054c6e7fbfca1e619644de4930d6dc282e731c0d853352a179397eda9 +size 6225 diff --git a/data/minecraft/structure/bastion/treasure/walls/top/wall_1.nbt b/data/minecraft/structure/bastion/treasure/walls/top/wall_1.nbt index 49fe80cd..109ffaa8 100644 --- a/data/minecraft/structure/bastion/treasure/walls/top/wall_1.nbt +++ b/data/minecraft/structure/bastion/treasure/walls/top/wall_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b2ec7ed04f9edecf9d2057985c93afb66f1567b706ebdda8359948d3aa14425 -size 6219 +oid sha256:079ab8b8f6190e604b89ea92abe93b839d35a8296f15b9fea7b9d43be83060e5 +size 6218 diff --git a/data/minecraft/structure/bastion/units/air_base.nbt b/data/minecraft/structure/bastion/units/air_base.nbt index 36074284..7887002b 100644 --- a/data/minecraft/structure/bastion/units/air_base.nbt +++ b/data/minecraft/structure/bastion/units/air_base.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b1eb892bddc94b79c67fa1a011302668fc4a4b6d7a81bc1dd70606d287d321bd -size 63633 +oid sha256:69adec0f932e888f27278647c75d9c7e919fb73faabcc65ad6f550c5ee2bfe5e +size 63631 diff --git a/data/minecraft/structure/bastion/units/center_pieces/center_0.nbt b/data/minecraft/structure/bastion/units/center_pieces/center_0.nbt index 4161dcf7..6f22f0d6 100644 --- a/data/minecraft/structure/bastion/units/center_pieces/center_0.nbt +++ b/data/minecraft/structure/bastion/units/center_pieces/center_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ab8b4a8ee187945f8010ba1fa1ae5e2e7c08180912718176cb82ac3c26b3107a -size 3083 +oid sha256:061b0a0f06233823dd34d8f574cac8be233cd2a3ab37db8b80784014b47a7386 +size 3082 diff --git a/data/minecraft/structure/bastion/units/center_pieces/center_1.nbt b/data/minecraft/structure/bastion/units/center_pieces/center_1.nbt index 736cc240..1c947f7d 100644 --- a/data/minecraft/structure/bastion/units/center_pieces/center_1.nbt +++ b/data/minecraft/structure/bastion/units/center_pieces/center_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d796a5a117de448bd016b98fa4167ffadb2dc9c4d6e1af97be238654b7cca33d -size 3293 +oid sha256:6b40b5c9ee5a72480cd7d5d0c1fd154cc40a3a45935c62d6c080602b108624a9 +size 3291 diff --git a/data/minecraft/structure/bastion/units/center_pieces/center_2.nbt b/data/minecraft/structure/bastion/units/center_pieces/center_2.nbt index 431246ba..194af83c 100644 --- a/data/minecraft/structure/bastion/units/center_pieces/center_2.nbt +++ b/data/minecraft/structure/bastion/units/center_pieces/center_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:05973ff26dd00268cc8804ca9d7f93641aa610daafbeb1dd54cf234719718075 -size 3359 +oid sha256:9136e08b33ea659d212c4420e0a154f3a769074781f01aee9fa0bcab6f37d759 +size 3357 diff --git a/data/minecraft/structure/bastion/units/edges/edge_0.nbt b/data/minecraft/structure/bastion/units/edges/edge_0.nbt index 284a0b40..36ce42cb 100644 --- a/data/minecraft/structure/bastion/units/edges/edge_0.nbt +++ b/data/minecraft/structure/bastion/units/edges/edge_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f89066c8b67a41a0227b563cf4d4bed438e2310766df3e227b2ac37871f4867b -size 2382 +oid sha256:fe0ddef6f7dc6e1da6ea3d8c72d6f1e08c0952ffe04b19600be86b96f4a9f1d8 +size 2381 diff --git a/data/minecraft/structure/bastion/units/fillers/stage_0.nbt b/data/minecraft/structure/bastion/units/fillers/stage_0.nbt index a07ae499..1a5b0b0f 100644 --- a/data/minecraft/structure/bastion/units/fillers/stage_0.nbt +++ b/data/minecraft/structure/bastion/units/fillers/stage_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1300cc619834d4e491484700168044fd862a8f01a8a35fa49e3c89b69bbc0a23 +oid sha256:0db8b532223b0378f56cb95fd1fc3a68c87a89ce7a99f5de9833d39496aa90b5 size 2454 diff --git a/data/minecraft/structure/bastion/units/pathways/pathway_0.nbt b/data/minecraft/structure/bastion/units/pathways/pathway_0.nbt index 0a865090..f97018b7 100644 --- a/data/minecraft/structure/bastion/units/pathways/pathway_0.nbt +++ b/data/minecraft/structure/bastion/units/pathways/pathway_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6491030165b17c5620dcd2cd96194c8772e3ecbdb53629b9585b0c2a781e96d2 +oid sha256:15f8fa3685ada469536d491c46159b37e4eb8066ae6abfade6cdffe412b03364 size 355 diff --git a/data/minecraft/structure/bastion/units/pathways/pathway_wall_0.nbt b/data/minecraft/structure/bastion/units/pathways/pathway_wall_0.nbt index 98f008e4..8d4efeb9 100644 --- a/data/minecraft/structure/bastion/units/pathways/pathway_wall_0.nbt +++ b/data/minecraft/structure/bastion/units/pathways/pathway_wall_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bf313a4f86dd2980164280f654bddefda3be8d35b7993f5473a72b92ee37c512 -size 355 +oid sha256:cc0736c959a26236483bcc02ae0d247538449a76ef9b56a9b71af6366429d753 +size 354 diff --git a/data/minecraft/structure/bastion/units/rampart_plates/plate_0.nbt b/data/minecraft/structure/bastion/units/rampart_plates/plate_0.nbt index 8fd5b8bb..23470a51 100644 --- a/data/minecraft/structure/bastion/units/rampart_plates/plate_0.nbt +++ b/data/minecraft/structure/bastion/units/rampart_plates/plate_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0e4d8ecce7cdc4623b6a97d2187f575ee8f2c424fa0907b887be6e329ee90c08 +oid sha256:1bed79012925cf03b29849e1ba13e534530068f1dca6df2c85c1aac9ad740fc3 size 3657 diff --git a/data/minecraft/structure/bastion/units/ramparts/ramparts_0.nbt b/data/minecraft/structure/bastion/units/ramparts/ramparts_0.nbt index f7a2f378..d4c77f9d 100644 --- a/data/minecraft/structure/bastion/units/ramparts/ramparts_0.nbt +++ b/data/minecraft/structure/bastion/units/ramparts/ramparts_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:745bd9161756423d1c76b86a98afec9d8dec216b01ca6feafe4465337927ad62 -size 23660 +oid sha256:ed82af3db6ae0d3b9f7e005cc175c340c5813543432bfb77008923b101f2815e +size 23658 diff --git a/data/minecraft/structure/bastion/units/ramparts/ramparts_1.nbt b/data/minecraft/structure/bastion/units/ramparts/ramparts_1.nbt index 2b4353b3..e8365a60 100644 --- a/data/minecraft/structure/bastion/units/ramparts/ramparts_1.nbt +++ b/data/minecraft/structure/bastion/units/ramparts/ramparts_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:494598a4b4e5d214187f7d2c5d2a3fa46ba8f90fd7731b2adbd520ee5ae95319 -size 11771 +oid sha256:af6ebb6ebb5045c93483136be24bf9aae065fe3423baa787efaa84d328bf5af6 +size 11769 diff --git a/data/minecraft/structure/bastion/units/ramparts/ramparts_2.nbt b/data/minecraft/structure/bastion/units/ramparts/ramparts_2.nbt index c83a0f0d..82d16ff6 100644 --- a/data/minecraft/structure/bastion/units/ramparts/ramparts_2.nbt +++ b/data/minecraft/structure/bastion/units/ramparts/ramparts_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e266270810fa72176f8e5bfe4c99f1786e69e0a883e27a9a46a7f170823d57ee -size 6942 +oid sha256:005b2ccf73d3e6f34064d2b7511d16dc6275e60bf908eb6843e5ca3df4a7a8c1 +size 6940 diff --git a/data/minecraft/structure/bastion/units/stages/rot/stage_1_0.nbt b/data/minecraft/structure/bastion/units/stages/rot/stage_1_0.nbt index 7acf24a3..7d471182 100644 --- a/data/minecraft/structure/bastion/units/stages/rot/stage_1_0.nbt +++ b/data/minecraft/structure/bastion/units/stages/rot/stage_1_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:48287b1f3746e0c5cc5051e36e20a20560df9eefe9681afb6e2e2c5c49729115 -size 2401 +oid sha256:2d31cdc8aaf45907a1003ea8522abe8b3f89a91ba89bc269a061e530a553c4eb +size 2400 diff --git a/data/minecraft/structure/bastion/units/stages/stage_0_0.nbt b/data/minecraft/structure/bastion/units/stages/stage_0_0.nbt index 88cffbb0..086dd457 100644 --- a/data/minecraft/structure/bastion/units/stages/stage_0_0.nbt +++ b/data/minecraft/structure/bastion/units/stages/stage_0_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aa689d40304cd7e83afa8d115e020e4637f8890ac61404d4aeef516497fe0d57 -size 2549 +oid sha256:9512d136fbaa22017b36cedd9bb21e86cc20c75fb89ac7b521259ba9ddfff432 +size 2548 diff --git a/data/minecraft/structure/bastion/units/stages/stage_0_1.nbt b/data/minecraft/structure/bastion/units/stages/stage_0_1.nbt index b84a94a4..789dcfda 100644 --- a/data/minecraft/structure/bastion/units/stages/stage_0_1.nbt +++ b/data/minecraft/structure/bastion/units/stages/stage_0_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d08fd74605ed363cccadd51e2a11eb8f3cc5866a72020f3b614da30995496bee +oid sha256:e067ff7b2fc1431faf76372300c5eaad8c48c6c7cf5a825e1d1289b00eb089e5 size 2613 diff --git a/data/minecraft/structure/bastion/units/stages/stage_0_2.nbt b/data/minecraft/structure/bastion/units/stages/stage_0_2.nbt index a01a44f7..f4514a9a 100644 --- a/data/minecraft/structure/bastion/units/stages/stage_0_2.nbt +++ b/data/minecraft/structure/bastion/units/stages/stage_0_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0ca7ce8f5c16b1dcc191edb91eee9ea5b46a0c10570b123c0e7fdf00054c3ebc -size 2705 +oid sha256:cf3d46f539a99c205794e9e8e87e15b4fed256a4a618367f06a035bb399070cb +size 2703 diff --git a/data/minecraft/structure/bastion/units/stages/stage_0_3.nbt b/data/minecraft/structure/bastion/units/stages/stage_0_3.nbt index b5e84d7d..f295a029 100644 --- a/data/minecraft/structure/bastion/units/stages/stage_0_3.nbt +++ b/data/minecraft/structure/bastion/units/stages/stage_0_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3fd7df08d0785b3d0149e3754b27a3623f9eb89515bedfd7894bc6a0c1004332 +oid sha256:c40b05ccbe61ca84b141488056b6283ea04ac1c49ede8d1430f1c1065c0a139b size 2506 diff --git a/data/minecraft/structure/bastion/units/stages/stage_1_0.nbt b/data/minecraft/structure/bastion/units/stages/stage_1_0.nbt index da644d21..f085c13f 100644 --- a/data/minecraft/structure/bastion/units/stages/stage_1_0.nbt +++ b/data/minecraft/structure/bastion/units/stages/stage_1_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7923d5745fd9699976cabb2c59385d0acf4931baa86f246d8d6b4833680466e7 +oid sha256:bfe184e5006aba80f45a693afdc9f4c15ca247debd66f4aba3016f470cba7b00 size 2442 diff --git a/data/minecraft/structure/bastion/units/stages/stage_1_1.nbt b/data/minecraft/structure/bastion/units/stages/stage_1_1.nbt index 9a5d986a..ded33d49 100644 --- a/data/minecraft/structure/bastion/units/stages/stage_1_1.nbt +++ b/data/minecraft/structure/bastion/units/stages/stage_1_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:206620e7e57bfd058a714dd8152cf15451ea4f0e5ebf87b8399eda430711a4db +oid sha256:59dc9b1ebd5fdb22ea0b2ce1089d77fea9eac8dd0381eba776871b9198c751f7 size 2421 diff --git a/data/minecraft/structure/bastion/units/stages/stage_1_2.nbt b/data/minecraft/structure/bastion/units/stages/stage_1_2.nbt index e8b33350..0170335b 100644 --- a/data/minecraft/structure/bastion/units/stages/stage_1_2.nbt +++ b/data/minecraft/structure/bastion/units/stages/stage_1_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f8b1cf8791d74b8fed85b8ac4757abcfb07e89e0385264155b292b6a91416b5c -size 2510 +oid sha256:15e8bd8e24c3a236c6a676a31108630906a3da5306d5147f69ae417d805268bc +size 2509 diff --git a/data/minecraft/structure/bastion/units/stages/stage_1_3.nbt b/data/minecraft/structure/bastion/units/stages/stage_1_3.nbt index 94e93f74..d00703ff 100644 --- a/data/minecraft/structure/bastion/units/stages/stage_1_3.nbt +++ b/data/minecraft/structure/bastion/units/stages/stage_1_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a127ad91c56d36808c25e988162d6e7e064944059050462f1fb8a91c5975d578 +oid sha256:bddc0df35a237c4e1f9b9c3a68cd09246ee01b06f88fbbdd73c9e60e767c308e size 2486 diff --git a/data/minecraft/structure/bastion/units/stages/stage_2_0.nbt b/data/minecraft/structure/bastion/units/stages/stage_2_0.nbt index 4c5f2e6c..2268a539 100644 --- a/data/minecraft/structure/bastion/units/stages/stage_2_0.nbt +++ b/data/minecraft/structure/bastion/units/stages/stage_2_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f0e8474e662a84540ce82a4c4d2474bbb5997ae8ed6d564e27027fa0d4a19031 +oid sha256:236e730545bc3d7001550fbbf54c2bd7a0f30d92c7c4424b50654f3da05a7efe size 2423 diff --git a/data/minecraft/structure/bastion/units/stages/stage_2_1.nbt b/data/minecraft/structure/bastion/units/stages/stage_2_1.nbt index d087931c..3801d3df 100644 --- a/data/minecraft/structure/bastion/units/stages/stage_2_1.nbt +++ b/data/minecraft/structure/bastion/units/stages/stage_2_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:261f9362ed18a8669fdc1650d9f12ae8dc2204280e0c40e801c3e65bdbffa67e -size 2461 +oid sha256:bdd86a0867cd31d20b6b90c73dfc967593eec06dd0ef9f7ff3b7090acd55568a +size 2460 diff --git a/data/minecraft/structure/bastion/units/stages/stage_3_0.nbt b/data/minecraft/structure/bastion/units/stages/stage_3_0.nbt index 7f69b564..e01a86c4 100644 --- a/data/minecraft/structure/bastion/units/stages/stage_3_0.nbt +++ b/data/minecraft/structure/bastion/units/stages/stage_3_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9fd0b70d7b857eff72621459e79f364e08ec09c135dbd1146641da5458ef85ac -size 633 +oid sha256:ad2dab6268e334ea5d1c8223765cade1962f55cf545148934735e53a5aa99846 +size 632 diff --git a/data/minecraft/structure/bastion/units/stages/stage_3_1.nbt b/data/minecraft/structure/bastion/units/stages/stage_3_1.nbt index 42dd9065..52e3f2ae 100644 --- a/data/minecraft/structure/bastion/units/stages/stage_3_1.nbt +++ b/data/minecraft/structure/bastion/units/stages/stage_3_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ac9c2b36496ccd90ed1eeaf51d57bb9ae740e3761966c47ccf37873ef81e9699 -size 690 +oid sha256:9fa65ed83834b324d4a066bf3a05461a424cc98339acb1c926cf38f2928a64df +size 689 diff --git a/data/minecraft/structure/bastion/units/stages/stage_3_2.nbt b/data/minecraft/structure/bastion/units/stages/stage_3_2.nbt index da400a0f..3f006713 100644 --- a/data/minecraft/structure/bastion/units/stages/stage_3_2.nbt +++ b/data/minecraft/structure/bastion/units/stages/stage_3_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3e8146b7b4417642b6e648302757c2b4c68e0b9712a701b45738ac1239fd7388 -size 629 +oid sha256:4c74987044e6b7eaa76fa47ac5ebc5537a53ee3233f6ef524b6cd39e00576d98 +size 628 diff --git a/data/minecraft/structure/bastion/units/stages/stage_3_3.nbt b/data/minecraft/structure/bastion/units/stages/stage_3_3.nbt index 8e66d3df..83a6d223 100644 --- a/data/minecraft/structure/bastion/units/stages/stage_3_3.nbt +++ b/data/minecraft/structure/bastion/units/stages/stage_3_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f76af5ca523b040112960c0a505b3ece77e5992159e790511ce6a8caaeece986 -size 656 +oid sha256:b8b75428881e411017f17760a7f5fd6c3c23a8c8a50e2344066e8336656f06ed +size 654 diff --git a/data/minecraft/structure/bastion/units/wall_units/edge_0_large.nbt b/data/minecraft/structure/bastion/units/wall_units/edge_0_large.nbt index 77dff64d..51ed6ffd 100644 --- a/data/minecraft/structure/bastion/units/wall_units/edge_0_large.nbt +++ b/data/minecraft/structure/bastion/units/wall_units/edge_0_large.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3bb8fe7dbf20c95cfbdef81d266f4d61ff4a6e012cac2bb2eb4c60455c4e96df -size 2822 +oid sha256:6461ca85f210b5175d1e183c34ca278fc7b61eb51eae4a977ffcb6e570e17dcb +size 2821 diff --git a/data/minecraft/structure/bastion/units/wall_units/unit_0.nbt b/data/minecraft/structure/bastion/units/wall_units/unit_0.nbt index 313e43b6..7932ddea 100644 --- a/data/minecraft/structure/bastion/units/wall_units/unit_0.nbt +++ b/data/minecraft/structure/bastion/units/wall_units/unit_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2fa14f1ca19141fce88a0dcb3ef405a0a38a510864275c0614a23fb0c75c6e1e -size 2500 +oid sha256:c62fee247252564d3e0e9e8e6fa0566111ae962dc74639b8a1e4d250377f4237 +size 2499 diff --git a/data/minecraft/structure/bastion/units/walls/connected_wall.nbt b/data/minecraft/structure/bastion/units/walls/connected_wall.nbt index 94d91ea0..4b2b5a46 100644 --- a/data/minecraft/structure/bastion/units/walls/connected_wall.nbt +++ b/data/minecraft/structure/bastion/units/walls/connected_wall.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6dc8eb6a234a3b03e2d392d470784185a2c6af51c1f23466313a42d821d7f08e -size 15617 +oid sha256:6a76a64901904c9a8cdf4eb7d761f63ea43ddbe6a9b900858da09bc020064761 +size 15616 diff --git a/data/minecraft/structure/bastion/units/walls/wall_base.nbt b/data/minecraft/structure/bastion/units/walls/wall_base.nbt index 7231189a..f6f7393a 100644 --- a/data/minecraft/structure/bastion/units/walls/wall_base.nbt +++ b/data/minecraft/structure/bastion/units/walls/wall_base.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ba9597ee197d511ddc2126906822a4d8e0bb1c575f8cf0f225b519cb97c9fc9e -size 16904 +oid sha256:722d24354600384f554d51d5bc0c9a52f1a3cdc7401cb510f251e04a4ab9fa9b +size 16902 diff --git a/data/minecraft/structure/empty.nbt b/data/minecraft/structure/empty.nbt index b6c1aec9..16e5230e 100644 --- a/data/minecraft/structure/empty.nbt +++ b/data/minecraft/structure/empty.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:20e3954591985dd1a07905e837d8f87a6b32c431c03add42c79aa133b7fa3acc -size 125 +oid sha256:9dc15b495faf46c846a3bd2281940b9cac2abe970155a7bfc1ed2801dfe22bf3 +size 124 diff --git a/data/minecraft/structure/end_city/base_floor.nbt b/data/minecraft/structure/end_city/base_floor.nbt index 0109c8e9..e74e5a9b 100644 --- a/data/minecraft/structure/end_city/base_floor.nbt +++ b/data/minecraft/structure/end_city/base_floor.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:346bfce557fb954deb66d6a86cf54a074b82b33c999fa10b0c69af03b374d613 -size 1687 +oid sha256:2d8750fb3ee8b6fb6b8b22cb21e0f11986c2e15b2f1987648f58401a28310f14 +size 1685 diff --git a/data/minecraft/structure/end_city/base_roof.nbt b/data/minecraft/structure/end_city/base_roof.nbt index 83be8023..ffdfcc0b 100644 --- a/data/minecraft/structure/end_city/base_roof.nbt +++ b/data/minecraft/structure/end_city/base_roof.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b3baed4b258f7c839fe54cb16f4073a0fec44dec33a9cd1df0380907032addf1 -size 1180 +oid sha256:033d6283eaeadbfe27da75e87ad4e5de26b79f2d09e67787fb712cead7070a18 +size 1178 diff --git a/data/minecraft/structure/end_city/bridge_end.nbt b/data/minecraft/structure/end_city/bridge_end.nbt index 910a0489..c803be8c 100644 --- a/data/minecraft/structure/end_city/bridge_end.nbt +++ b/data/minecraft/structure/end_city/bridge_end.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:13e527f87c4e80dcf5e0ea601f655249e816cb17fb7609c2bc46ce3fd623eb04 -size 475 +oid sha256:e61e7f1aea0407303c68c3417ba64af27c7a34a9760fc56b3ac12f3e9b94e003 +size 474 diff --git a/data/minecraft/structure/end_city/bridge_gentle_stairs.nbt b/data/minecraft/structure/end_city/bridge_gentle_stairs.nbt index 21295946..26b7d05c 100644 --- a/data/minecraft/structure/end_city/bridge_gentle_stairs.nbt +++ b/data/minecraft/structure/end_city/bridge_gentle_stairs.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:10b9569847e12c5f7a03f8188b12240f04c2d0f05149ffcce2a793fb7015c2e1 -size 1143 +oid sha256:b8bf20feaa01140dd9fe1abede0fea907e3d0f4c68b0347bdac8c2a3e67c0a8f +size 1142 diff --git a/data/minecraft/structure/end_city/bridge_piece.nbt b/data/minecraft/structure/end_city/bridge_piece.nbt index b9a4c8a3..1787e989 100644 --- a/data/minecraft/structure/end_city/bridge_piece.nbt +++ b/data/minecraft/structure/end_city/bridge_piece.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:03ff1b030765ae5515cc1f76d9d8aaaa993e571e4da965c3169343a2e8120232 -size 599 +oid sha256:4f66ecb804da072c4ffce7e1d5401b65fc206ef6bbb98e88a1aa9b1a206d67d1 +size 598 diff --git a/data/minecraft/structure/end_city/bridge_steep_stairs.nbt b/data/minecraft/structure/end_city/bridge_steep_stairs.nbt index c7581ddd..eeef58a6 100644 --- a/data/minecraft/structure/end_city/bridge_steep_stairs.nbt +++ b/data/minecraft/structure/end_city/bridge_steep_stairs.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a54933c9e11e5855d11c21ab2958e5e165b1063611f09faa9d8f8f8e5a7767a6 -size 714 +oid sha256:d2cae7ae8a5137a16dda8804c0bf40997f5c876fc2378830ddefe74e35f11b6a +size 713 diff --git a/data/minecraft/structure/end_city/fat_tower_base.nbt b/data/minecraft/structure/end_city/fat_tower_base.nbt index 47a852c4..28c2f8ce 100644 --- a/data/minecraft/structure/end_city/fat_tower_base.nbt +++ b/data/minecraft/structure/end_city/fat_tower_base.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c023918a5ce6f700544285133fad412b08c758d811bccec5591e869ebb2e93d4 -size 2338 +oid sha256:3b1ee48d0493bb3e225d1abdcec2f0e962cd34cbc01c375963ddc23bb5d977be +size 2337 diff --git a/data/minecraft/structure/end_city/fat_tower_middle.nbt b/data/minecraft/structure/end_city/fat_tower_middle.nbt index c7353e5f..add52a64 100644 --- a/data/minecraft/structure/end_city/fat_tower_middle.nbt +++ b/data/minecraft/structure/end_city/fat_tower_middle.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0e37900c1b075d98e69505e9635c4856481e3c8b1f751d0daf5e19115ab55769 -size 4468 +oid sha256:9135efc462fe771ad379b1fafe6b50d6436e2bb54f265255624d611bf5df68e5 +size 4466 diff --git a/data/minecraft/structure/end_city/fat_tower_top.nbt b/data/minecraft/structure/end_city/fat_tower_top.nbt index 14438ab5..cb6fdf1a 100644 --- a/data/minecraft/structure/end_city/fat_tower_top.nbt +++ b/data/minecraft/structure/end_city/fat_tower_top.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:61c1ac5d569a6422caf50a6b20da2273591e6c47bfd4a418e23d210678080bbf -size 5960 +oid sha256:f5378a31e12b608883ed4b74c44736d65a66a5e7dafde680e3cf7de18d92b9b0 +size 5958 diff --git a/data/minecraft/structure/end_city/second_floor_1.nbt b/data/minecraft/structure/end_city/second_floor_1.nbt index b027cd9c..8798f8fa 100644 --- a/data/minecraft/structure/end_city/second_floor_1.nbt +++ b/data/minecraft/structure/end_city/second_floor_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:26c0b3778d488215a2038472bdfac6fd5301a7bbf3a19b69015d0583e770268b -size 3716 +oid sha256:caa60bd53ade980cb85eab4f3a02c7bc26c5d4e23437b9bcf2c16cd09c2a3884 +size 3715 diff --git a/data/minecraft/structure/end_city/second_floor_2.nbt b/data/minecraft/structure/end_city/second_floor_2.nbt index fc5c01e3..638f44a1 100644 --- a/data/minecraft/structure/end_city/second_floor_2.nbt +++ b/data/minecraft/structure/end_city/second_floor_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:35b025abb80fbe03389a14cfbcd0e51106be4b5930d19055e9c8cefdeb60c2ee -size 3970 +oid sha256:7a394d86fcec4d9d6c58d25cdcd883ed5b02fb0323152006715700297165a28d +size 3968 diff --git a/data/minecraft/structure/end_city/second_roof.nbt b/data/minecraft/structure/end_city/second_roof.nbt index e4cb8249..993fec50 100644 --- a/data/minecraft/structure/end_city/second_roof.nbt +++ b/data/minecraft/structure/end_city/second_roof.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0eaab91df6bf412f6f785fc0cc456211510d89faee2a322363889beb75908629 -size 1427 +oid sha256:2edbe7ce3e12ec738bbd0b0807ca246592b42507fa0b4bb70ffc25b490b48895 +size 1425 diff --git a/data/minecraft/structure/end_city/ship.nbt b/data/minecraft/structure/end_city/ship.nbt index 95ff2bbe..a907e676 100644 --- a/data/minecraft/structure/end_city/ship.nbt +++ b/data/minecraft/structure/end_city/ship.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5e112c4114622650bc278bd76f013458e121b2c75d2ebee1d70a9103a9c258fc -size 26445 +oid sha256:3ffd87210eb5ab8e930270e96b23b05d6a12f1f993fd4c3389f3240e1530b5f7 +size 26443 diff --git a/data/minecraft/structure/end_city/third_floor_1.nbt b/data/minecraft/structure/end_city/third_floor_1.nbt index 784c4f77..b5ad9db6 100644 --- a/data/minecraft/structure/end_city/third_floor_1.nbt +++ b/data/minecraft/structure/end_city/third_floor_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f001eaf4ec75aac48b942f276a3bf50ec3edb7b33a9e0a5ff1c4fc1966d3638 -size 4787 +oid sha256:e3055acd7997792b834b425e430508849580c29242c2e267bcadb44b52c4fd24 +size 4786 diff --git a/data/minecraft/structure/end_city/third_floor_2.nbt b/data/minecraft/structure/end_city/third_floor_2.nbt index 9be436bf..05904c24 100644 --- a/data/minecraft/structure/end_city/third_floor_2.nbt +++ b/data/minecraft/structure/end_city/third_floor_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a9ac78e3c477ec32f35cb4d1759d9c12704cb053b9fe75cfe2fb92b485026c13 -size 5159 +oid sha256:3a97386c335decb06316b09753245e3ea2c4dd9b458213bf40ee1a25c41ae92d +size 5157 diff --git a/data/minecraft/structure/end_city/third_roof.nbt b/data/minecraft/structure/end_city/third_roof.nbt index 4ffccf76..8632ef69 100644 --- a/data/minecraft/structure/end_city/third_roof.nbt +++ b/data/minecraft/structure/end_city/third_roof.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:13aa79f7b0639245bcc6d9f83322a77781a79546fd384a89285d48918f59f255 -size 1831 +oid sha256:99b3de8c26e670fea7e8fe9987519a5348e76109da4a37f3ee1df447b7ab25b7 +size 1830 diff --git a/data/minecraft/structure/end_city/tower_base.nbt b/data/minecraft/structure/end_city/tower_base.nbt index 16384553..200feff2 100644 --- a/data/minecraft/structure/end_city/tower_base.nbt +++ b/data/minecraft/structure/end_city/tower_base.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:98a082ac23cf5ff676382c9c0a7c820c865e3b24b069266812948b1512509f13 +oid sha256:17e9c7045cf0498d72934393becdf2b26101dcf59c647f4f6e297da067ac1382 size 933 diff --git a/data/minecraft/structure/end_city/tower_floor.nbt b/data/minecraft/structure/end_city/tower_floor.nbt index 23baadb9..eaa3caa8 100644 --- a/data/minecraft/structure/end_city/tower_floor.nbt +++ b/data/minecraft/structure/end_city/tower_floor.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9b74b7884fda52a40d80580e6cba4743fade8a18f3e311db897a60600fce3420 -size 980 +oid sha256:9d530feac1bae807570134838636b8a3cdb451194758b3e474d2994343f52568 +size 979 diff --git a/data/minecraft/structure/end_city/tower_piece.nbt b/data/minecraft/structure/end_city/tower_piece.nbt index 25d7157e..39f3381d 100644 --- a/data/minecraft/structure/end_city/tower_piece.nbt +++ b/data/minecraft/structure/end_city/tower_piece.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f3467b086120eb08ee889061396d3a88e353279e1d41a49a72c465089e0a07d9 +oid sha256:0c2523c941bfc2e9211fae69ed041f7b0da9eb87fe38504c8467cf29ba7f0238 size 898 diff --git a/data/minecraft/structure/end_city/tower_top.nbt b/data/minecraft/structure/end_city/tower_top.nbt index d1b463aa..e6f8ad18 100644 --- a/data/minecraft/structure/end_city/tower_top.nbt +++ b/data/minecraft/structure/end_city/tower_top.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:93dd86c5d1ca0c9efde859e18013a82ebf9e64266607028a7413fd06decbff18 -size 2036 +oid sha256:08e76eb4ceccb6de5d2f8420e3efbbfbca89831df9d164c36cf9f52a0c13180c +size 2034 diff --git a/data/minecraft/structure/fossil/skull_1.nbt b/data/minecraft/structure/fossil/skull_1.nbt index 5657a63d..a9f42bb2 100644 --- a/data/minecraft/structure/fossil/skull_1.nbt +++ b/data/minecraft/structure/fossil/skull_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:56dd3abf23a9190172c68ebd27c351a833cac3372b3c0f95095ce9dcf35d9d12 -size 442 +oid sha256:2deb52abdcf7b070edb6b9c8daba6a4bad7e8685a3ef329d7f0dd8d3aafb5c4f +size 440 diff --git a/data/minecraft/structure/fossil/skull_1_coal.nbt b/data/minecraft/structure/fossil/skull_1_coal.nbt index 162069b9..6ed5f91f 100644 --- a/data/minecraft/structure/fossil/skull_1_coal.nbt +++ b/data/minecraft/structure/fossil/skull_1_coal.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:963b965694e23e206fa5cc6c12487c55cf5f985d2f51f723444818bee9e6f506 -size 396 +oid sha256:76538ce777066954a06f9db9ac71ccfca6192e9a99f54ccf991736c2a49e7e01 +size 395 diff --git a/data/minecraft/structure/fossil/skull_2.nbt b/data/minecraft/structure/fossil/skull_2.nbt index 1a4ae3e4..477fe43a 100644 --- a/data/minecraft/structure/fossil/skull_2.nbt +++ b/data/minecraft/structure/fossil/skull_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a2ee092118d3ab0b979584098a282a5f706fb6e92a1bff0c3dbe764692d22530 -size 398 +oid sha256:63955c0dc62e238896bec48f53853679e6ed47d651e16e081036a31c570f7fab +size 397 diff --git a/data/minecraft/structure/fossil/skull_2_coal.nbt b/data/minecraft/structure/fossil/skull_2_coal.nbt index dbe9ec45..5416e68e 100644 --- a/data/minecraft/structure/fossil/skull_2_coal.nbt +++ b/data/minecraft/structure/fossil/skull_2_coal.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dbb6d58ff0df7d5dc3c8acef39d65103793ee250ae6f5982e85cdd231ca31144 -size 346 +oid sha256:980fe5078f82fe511d894e9a7bbf6c78229756bf6829c2115201a72c5464fd3f +size 344 diff --git a/data/minecraft/structure/fossil/skull_3.nbt b/data/minecraft/structure/fossil/skull_3.nbt index aa3d8d3e..2bdb752a 100644 --- a/data/minecraft/structure/fossil/skull_3.nbt +++ b/data/minecraft/structure/fossil/skull_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:81f783dc5ed4657bda93c5bf9742fa00c825773dc1643d6a07b13d3228de6035 -size 348 +oid sha256:5c9309a83cc388b8f33082cf1a52b78e8e16bcde4fdf66a75d9a16b6d1f4583a +size 347 diff --git a/data/minecraft/structure/fossil/skull_3_coal.nbt b/data/minecraft/structure/fossil/skull_3_coal.nbt index 3ae33555..cdfb0907 100644 --- a/data/minecraft/structure/fossil/skull_3_coal.nbt +++ b/data/minecraft/structure/fossil/skull_3_coal.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d0dcd14772d827a860a54d9d1ac35f0e3f97f1f559666a3dcbdf62c9c5cfc8e -size 318 +oid sha256:990d8c8870aef2209fe5257ccd035fb39c539992b52d237bdd476f27cd5758a5 +size 316 diff --git a/data/minecraft/structure/fossil/skull_4.nbt b/data/minecraft/structure/fossil/skull_4.nbt index d0a2acfa..e7fc636b 100644 --- a/data/minecraft/structure/fossil/skull_4.nbt +++ b/data/minecraft/structure/fossil/skull_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a03515c8385b6f1e58aacf448138ae793a31fbd10eed00f6a13110e9aeed21c9 -size 270 +oid sha256:2010ccdc4ced26d31076078163122611fe4714c8156b364459d5a4898d264456 +size 268 diff --git a/data/minecraft/structure/fossil/skull_4_coal.nbt b/data/minecraft/structure/fossil/skull_4_coal.nbt index 8a1e6b87..13ad8219 100644 --- a/data/minecraft/structure/fossil/skull_4_coal.nbt +++ b/data/minecraft/structure/fossil/skull_4_coal.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8e9ba2a82c6662bf42ef650d20d7c8f19e47f13b02f511ca125e86968c60d332 -size 236 +oid sha256:4a3285c86000f9860d14ce6803bade9e7375d4765ee357994ec8f2567eea7b7e +size 234 diff --git a/data/minecraft/structure/fossil/spine_1.nbt b/data/minecraft/structure/fossil/spine_1.nbt index df9fb36c..c146b873 100644 --- a/data/minecraft/structure/fossil/spine_1.nbt +++ b/data/minecraft/structure/fossil/spine_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a83a94441cd4dd26e7c5c51b6ca0691b82079d3a160762cc78b5c4a16342a1f9 -size 272 +oid sha256:410203c0ea1c9369f1ecbed4dc0af228733460df273cee2c79246062f3421cfc +size 271 diff --git a/data/minecraft/structure/fossil/spine_1_coal.nbt b/data/minecraft/structure/fossil/spine_1_coal.nbt index e66bf147..20843cb5 100644 --- a/data/minecraft/structure/fossil/spine_1_coal.nbt +++ b/data/minecraft/structure/fossil/spine_1_coal.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c13d78e136a398c2416f9e9cea3dfd1723b37e679a1c282d130247e71e1fcd38 -size 252 +oid sha256:5066c7b5a3ae13c2f84dd1ec969ed9fad1ba28558493a5036e0b855acb2ed5d1 +size 251 diff --git a/data/minecraft/structure/fossil/spine_2.nbt b/data/minecraft/structure/fossil/spine_2.nbt index 5c6c71d3..f31a24d5 100644 --- a/data/minecraft/structure/fossil/spine_2.nbt +++ b/data/minecraft/structure/fossil/spine_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:48c995f2c544103e9b4a822d9f27120fa2b47cbd7cc0100aac7ba5072656fbec -size 362 +oid sha256:5705759805b3147844436e39329f6c52864dd75816a6f95170dabd9aa9cd506a +size 360 diff --git a/data/minecraft/structure/fossil/spine_2_coal.nbt b/data/minecraft/structure/fossil/spine_2_coal.nbt index 1eeb5468..cad9e04a 100644 --- a/data/minecraft/structure/fossil/spine_2_coal.nbt +++ b/data/minecraft/structure/fossil/spine_2_coal.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:41004dfb3d55cbe4f640a832b0974f5317dc69e6c598a47d5cd17dfcaedf016f -size 325 +oid sha256:fa5949b4692f6b9e07048cf139a7f775a28c42c20ab9f94bd9abfad7c0ed8264 +size 324 diff --git a/data/minecraft/structure/fossil/spine_3.nbt b/data/minecraft/structure/fossil/spine_3.nbt index 7ba732cc..88593bed 100644 --- a/data/minecraft/structure/fossil/spine_3.nbt +++ b/data/minecraft/structure/fossil/spine_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4ddd6619e889609969db8bfc55786a60bd6bf445d98f64530e9124b3c1142fac -size 457 +oid sha256:4a3db2628a6d8e597b88987fa44f0ce4de1311963d333ae17f6d02f1866738e6 +size 456 diff --git a/data/minecraft/structure/fossil/spine_3_coal.nbt b/data/minecraft/structure/fossil/spine_3_coal.nbt index fc66715d..ad0ae184 100644 --- a/data/minecraft/structure/fossil/spine_3_coal.nbt +++ b/data/minecraft/structure/fossil/spine_3_coal.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:09959f73d34b76c4b2664ace11c0fa640799d63ef423caa6276447c49398e734 -size 437 +oid sha256:25edd01ea22aa1ecac7078b5dd7e25b38621a8f5cdf4042d3a2a1b06efd3564d +size 436 diff --git a/data/minecraft/structure/fossil/spine_4.nbt b/data/minecraft/structure/fossil/spine_4.nbt index 94cfecd7..c41cd504 100644 --- a/data/minecraft/structure/fossil/spine_4.nbt +++ b/data/minecraft/structure/fossil/spine_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f23183fd2517f00621390517cc8be9ff5e6658c3288089b70e1d439fc89ec78d -size 529 +oid sha256:4fb0db494297a08b7f5aa1bdcc187090e5111ba77af38b03245ae07cd3b05b99 +size 528 diff --git a/data/minecraft/structure/fossil/spine_4_coal.nbt b/data/minecraft/structure/fossil/spine_4_coal.nbt index 3dbcaa08..8517945b 100644 --- a/data/minecraft/structure/fossil/spine_4_coal.nbt +++ b/data/minecraft/structure/fossil/spine_4_coal.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d99db2c3e1fcdc1daa05f4e1bb47f4c3b305754df95096f4c92d4713d98c8b80 -size 482 +oid sha256:18b9efdc772eab1243bd8f17776466b3fb0096317faad319400a6714ff929b3f +size 481 diff --git a/data/minecraft/structure/igloo/bottom.nbt b/data/minecraft/structure/igloo/bottom.nbt index b30a9757..444a79e4 100644 --- a/data/minecraft/structure/igloo/bottom.nbt +++ b/data/minecraft/structure/igloo/bottom.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f8e1207a54f0554e620d6c62b36cac8f13c513ca8d1af6ed9d5ad5e17e4d741b +oid sha256:60cd57be1fc967a53952f6043661b2a6b5ffe3792c8f64f11d37454df407e263 size 2732 diff --git a/data/minecraft/structure/igloo/middle.nbt b/data/minecraft/structure/igloo/middle.nbt index 7eb77598..0032e927 100644 --- a/data/minecraft/structure/igloo/middle.nbt +++ b/data/minecraft/structure/igloo/middle.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6b952c9d51b898137f3f54e5edd6d88b8de7200cecb7e6d450a4b43aa89c945a -size 237 +oid sha256:585c9ec4bb1132ab61858986499aa85aab5598832dd1d8a20c41bdb90471ff52 +size 236 diff --git a/data/minecraft/structure/igloo/top.nbt b/data/minecraft/structure/igloo/top.nbt index d34830fe..3d29c0f6 100644 --- a/data/minecraft/structure/igloo/top.nbt +++ b/data/minecraft/structure/igloo/top.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8650b4c724935c16fc3042b5cf647957f1b8a9fa0bac95ab50a3f89a5c3853e2 -size 925 +oid sha256:e01aa83cde8f6ad41c731ed42d432218d0af273dcc218fc0e9f2d555b24e1b69 +size 924 diff --git a/data/minecraft/structure/nether_fossils/fossil_1.nbt b/data/minecraft/structure/nether_fossils/fossil_1.nbt index aff45a41..5f39b6ba 100644 --- a/data/minecraft/structure/nether_fossils/fossil_1.nbt +++ b/data/minecraft/structure/nether_fossils/fossil_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fdd49c588fbd2b4cbddef15b72eda592111ad9910f038e0638742029f7ab450f -size 398 +oid sha256:ccbaf0075fee9b503fff80b9c0172b27c344a2f5aa6703838b9ddfcad14857e8 +size 397 diff --git a/data/minecraft/structure/nether_fossils/fossil_10.nbt b/data/minecraft/structure/nether_fossils/fossil_10.nbt index f364e143..c95d24e8 100644 --- a/data/minecraft/structure/nether_fossils/fossil_10.nbt +++ b/data/minecraft/structure/nether_fossils/fossil_10.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dd186459f007d2177be95df660e9d7304de732f019fa1a21f27efeea14d5164d -size 238 +oid sha256:2e4946cd44712ccaec97b8d504c6c66c16a2ebad3e8fa6062393e3f949cc6de1 +size 237 diff --git a/data/minecraft/structure/nether_fossils/fossil_11.nbt b/data/minecraft/structure/nether_fossils/fossil_11.nbt index d2776184..f2886a35 100644 --- a/data/minecraft/structure/nether_fossils/fossil_11.nbt +++ b/data/minecraft/structure/nether_fossils/fossil_11.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7dbd25e2626eac8f5ab540a2b83a0fe1232730612e33c5dbb13e056c3e9d2632 -size 675 +oid sha256:69db10414205eb46eb529a76ca742d7cd2dd47a2845d1605a07a85a80268c4f4 +size 674 diff --git a/data/minecraft/structure/nether_fossils/fossil_12.nbt b/data/minecraft/structure/nether_fossils/fossil_12.nbt index 6b45fdc6..76e4a6e2 100644 --- a/data/minecraft/structure/nether_fossils/fossil_12.nbt +++ b/data/minecraft/structure/nether_fossils/fossil_12.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6aaebd4181e3b73d05326905ce04bd7e628f0465172b9e9e05958d730c650748 -size 318 +oid sha256:e3479ebe730e5e688c78e37b1ba60e6d5ed77f770e9c7cfbf543a95dd03d4d53 +size 316 diff --git a/data/minecraft/structure/nether_fossils/fossil_13.nbt b/data/minecraft/structure/nether_fossils/fossil_13.nbt index be14d3ba..a4f7ecb2 100644 --- a/data/minecraft/structure/nether_fossils/fossil_13.nbt +++ b/data/minecraft/structure/nether_fossils/fossil_13.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e2b4227ed3b77effcac82d86cc7f663833b4a9c4c85b753a1aa50a0a689844f6 -size 525 +oid sha256:8db3b01c3afaef14c7baa166615d5909e86233da21fa9cc0b4a779d6d2669fcb +size 523 diff --git a/data/minecraft/structure/nether_fossils/fossil_14.nbt b/data/minecraft/structure/nether_fossils/fossil_14.nbt index fcdea3ab..dec5700f 100644 --- a/data/minecraft/structure/nether_fossils/fossil_14.nbt +++ b/data/minecraft/structure/nether_fossils/fossil_14.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4dde7e58b8fcf47cc90475425c1d67b44a2d46c1a0fb0f4a4179db0cdf84a77f -size 939 +oid sha256:7801c75bdbc1bfe17704e391059b7cab1604e8b39b9571bdb121cabce64990fc +size 938 diff --git a/data/minecraft/structure/nether_fossils/fossil_2.nbt b/data/minecraft/structure/nether_fossils/fossil_2.nbt index 9e78ef09..c3415bc7 100644 --- a/data/minecraft/structure/nether_fossils/fossil_2.nbt +++ b/data/minecraft/structure/nether_fossils/fossil_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:109e7f1944c6336a08655f11375d0f4ee69f6ebe6661c935af5405f2d68061da -size 260 +oid sha256:f1a55b29d6bb446b1e410c525338a681fb814293cdc5c1dd39b879401622258f +size 258 diff --git a/data/minecraft/structure/nether_fossils/fossil_3.nbt b/data/minecraft/structure/nether_fossils/fossil_3.nbt index c03d3204..091f4b3a 100644 --- a/data/minecraft/structure/nether_fossils/fossil_3.nbt +++ b/data/minecraft/structure/nether_fossils/fossil_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3574cd9097b97c79a0abab633e57f9ad876ead2118605cf733b217961f7d63a5 +oid sha256:e3d6f2f0d3addf8c0fd5f5f0117eb82adcdeaa374d6157b6580cde4953ffca60 size 249 diff --git a/data/minecraft/structure/nether_fossils/fossil_4.nbt b/data/minecraft/structure/nether_fossils/fossil_4.nbt index a20d98ee..2130b22d 100644 --- a/data/minecraft/structure/nether_fossils/fossil_4.nbt +++ b/data/minecraft/structure/nether_fossils/fossil_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:08d2dbd98204a2829789ace8a57c517747e3a0ae4af31b760ff0280aba6b5241 -size 212 +oid sha256:e3efc5e0af88ddc8e347810286397722839164f24a845a5d111b1f08d57954a6 +size 211 diff --git a/data/minecraft/structure/nether_fossils/fossil_5.nbt b/data/minecraft/structure/nether_fossils/fossil_5.nbt index d84e7afd..a08b4cd0 100644 --- a/data/minecraft/structure/nether_fossils/fossil_5.nbt +++ b/data/minecraft/structure/nether_fossils/fossil_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f5112c9739caeef6f27b6a39d065f3626641ba8a4bbca4040c43e1ed119299d7 -size 206 +oid sha256:580805ad435696c9dc4c67ef2c5a78567635f9da7040eb0b5a3d407a8da9992b +size 205 diff --git a/data/minecraft/structure/nether_fossils/fossil_6.nbt b/data/minecraft/structure/nether_fossils/fossil_6.nbt index 11d5a02d..ce33c133 100644 --- a/data/minecraft/structure/nether_fossils/fossil_6.nbt +++ b/data/minecraft/structure/nether_fossils/fossil_6.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c65c4e7528903c5b17d5a1e79b02c7e226ebdf940bc3013829a3a9a7a6a525a3 -size 631 +oid sha256:8d8c6ca0b5a4eb93824f9011d7b9aee07c610da000a7b254f26274d23485aaec +size 630 diff --git a/data/minecraft/structure/nether_fossils/fossil_7.nbt b/data/minecraft/structure/nether_fossils/fossil_7.nbt index 1f63b760..ec82cbe1 100644 --- a/data/minecraft/structure/nether_fossils/fossil_7.nbt +++ b/data/minecraft/structure/nether_fossils/fossil_7.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f7b7aae3c464be0d4dd84ffbcb66712a099c88eb07fc66482961e4fd3ddacccb +oid sha256:b7b070a9ba488a7aa83e61377a23f47bf1a6774d545958212b7edf26186d07d7 size 510 diff --git a/data/minecraft/structure/nether_fossils/fossil_8.nbt b/data/minecraft/structure/nether_fossils/fossil_8.nbt index f322c535..9def0969 100644 --- a/data/minecraft/structure/nether_fossils/fossil_8.nbt +++ b/data/minecraft/structure/nether_fossils/fossil_8.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ccba775285eb55a3a840b72667c5262c1618b81b6009d68f8e9a144e00b5c093 -size 221 +oid sha256:b8b598967ce21557c5066923519eb6ec9630ccb85c78df518820859336584d55 +size 219 diff --git a/data/minecraft/structure/nether_fossils/fossil_9.nbt b/data/minecraft/structure/nether_fossils/fossil_9.nbt index 68476fb5..7d6ce793 100644 --- a/data/minecraft/structure/nether_fossils/fossil_9.nbt +++ b/data/minecraft/structure/nether_fossils/fossil_9.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:490ddd56993e62d7169f3c0857ef9699b5bbd0e4d6283462b70065c2b2c65ce7 -size 395 +oid sha256:0273dcad1b2228e31566be4d41e1c09cd656ac7d85fd6af6d8d93c376381a2b8 +size 393 diff --git a/data/minecraft/structure/pillager_outpost/base_plate.nbt b/data/minecraft/structure/pillager_outpost/base_plate.nbt index dc96e8b9..4185bdb5 100644 --- a/data/minecraft/structure/pillager_outpost/base_plate.nbt +++ b/data/minecraft/structure/pillager_outpost/base_plate.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:545a463bd09c2ae64003f8a1f11bcc0ea5a7b626832a331d1ee324ae31a90e69 +oid sha256:edbef658ef561bed7ddf952541cd8f97f83fa64760ea94d420281131ca671be7 size 19281 diff --git a/data/minecraft/structure/pillager_outpost/feature_cage1.nbt b/data/minecraft/structure/pillager_outpost/feature_cage1.nbt index 3c527227..abd1ae06 100644 --- a/data/minecraft/structure/pillager_outpost/feature_cage1.nbt +++ b/data/minecraft/structure/pillager_outpost/feature_cage1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:15caa2d6898f0372d0885b647bcd1adcff2af4a2678ed30eccc04fc64d0e467a -size 1630 +oid sha256:200279e54e56d8ba8308d069e2a8102578cbb428a54a6f8dc445c5df9cc7fff9 +size 1629 diff --git a/data/minecraft/structure/pillager_outpost/feature_cage2.nbt b/data/minecraft/structure/pillager_outpost/feature_cage2.nbt index 4db861ab..8243dc4e 100644 --- a/data/minecraft/structure/pillager_outpost/feature_cage2.nbt +++ b/data/minecraft/structure/pillager_outpost/feature_cage2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:074860097463fb3ef2bfad768196b79514b8867ed9b26d3c0e7750346ce0fb34 -size 1032 +oid sha256:4edd0284a5432f0b0e2e33cb4b28090d0bad2ada7048109273e585d6f5cb253a +size 1031 diff --git a/data/minecraft/structure/pillager_outpost/feature_cage_with_allays.nbt b/data/minecraft/structure/pillager_outpost/feature_cage_with_allays.nbt index 3c040592..299307dc 100644 --- a/data/minecraft/structure/pillager_outpost/feature_cage_with_allays.nbt +++ b/data/minecraft/structure/pillager_outpost/feature_cage_with_allays.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ec7da568eb209e633d4554bde0fb2a92b515a4c1bdeaa32b9cb057e9751c6877 +oid sha256:bc79e799e34ebb1b51c39c42abfeb351ef7202c8ed96e256ce939afe88eca378 size 1756 diff --git a/data/minecraft/structure/pillager_outpost/feature_logs.nbt b/data/minecraft/structure/pillager_outpost/feature_logs.nbt index abe72b6c..8102afc7 100644 --- a/data/minecraft/structure/pillager_outpost/feature_logs.nbt +++ b/data/minecraft/structure/pillager_outpost/feature_logs.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aacacf97d90f7fd5ad581d85b5f4286a252dc52a5a8b4f519f3bd0d8f294a99c -size 659 +oid sha256:bae9d60dd2529af2b176c267f1003ef194f79acbb081f17361dab7ca0c2cb4bd +size 658 diff --git a/data/minecraft/structure/pillager_outpost/feature_plate.nbt b/data/minecraft/structure/pillager_outpost/feature_plate.nbt index b8718f35..96c708c0 100644 --- a/data/minecraft/structure/pillager_outpost/feature_plate.nbt +++ b/data/minecraft/structure/pillager_outpost/feature_plate.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:00719e8430087b80b62ea1652c87a08f1fb747ee6d59cad5fb46b4c37e72111e -size 6040 +oid sha256:f045d31791527cf15d5cf987ca94609c9797ffbf36402a8eff94f6c766665f13 +size 6039 diff --git a/data/minecraft/structure/pillager_outpost/feature_targets.nbt b/data/minecraft/structure/pillager_outpost/feature_targets.nbt index 4652ddb5..59af6744 100644 --- a/data/minecraft/structure/pillager_outpost/feature_targets.nbt +++ b/data/minecraft/structure/pillager_outpost/feature_targets.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:970201a3d21627be3d656007d84b160bc5135284f87e584f90d3a7bf36e690f9 -size 579 +oid sha256:48e480afab44fd29ea1b5ec06a5e74420d5e1258d25dc669020e4c7ae9c14d61 +size 578 diff --git a/data/minecraft/structure/pillager_outpost/feature_tent1.nbt b/data/minecraft/structure/pillager_outpost/feature_tent1.nbt index 12b63e53..84702ee8 100644 --- a/data/minecraft/structure/pillager_outpost/feature_tent1.nbt +++ b/data/minecraft/structure/pillager_outpost/feature_tent1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:774bb0e5d388622f0cd909374be9d88c68b91000c820e1a06e2bee7601d474c5 -size 858 +oid sha256:6530c41ff633977073234d3f6b787abdd4cff7f33fe94daf083ba4cc216ea5c0 +size 857 diff --git a/data/minecraft/structure/pillager_outpost/feature_tent2.nbt b/data/minecraft/structure/pillager_outpost/feature_tent2.nbt index 2821f11f..e19cffa8 100644 --- a/data/minecraft/structure/pillager_outpost/feature_tent2.nbt +++ b/data/minecraft/structure/pillager_outpost/feature_tent2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b28790d9aff3aba91cbfacbe3ed1f045c88d6cc49734225162b1dccbe64a4acb -size 869 +oid sha256:eb10d5daab4576c7486bc6e5de7db9303acc3edf6ce44d9d1010be06a956d813 +size 867 diff --git a/data/minecraft/structure/pillager_outpost/watchtower.nbt b/data/minecraft/structure/pillager_outpost/watchtower.nbt index accac53b..f7b798a4 100644 --- a/data/minecraft/structure/pillager_outpost/watchtower.nbt +++ b/data/minecraft/structure/pillager_outpost/watchtower.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:77d9d16adb47c3bc41577688097bfae24ef61416470205b744be0cf6e5e2c614 -size 14585 +oid sha256:8a2a8e248f8887b68c288584657ca837aa5fb0c8441deeaca46638daab96f83d +size 14584 diff --git a/data/minecraft/structure/pillager_outpost/watchtower_overgrown.nbt b/data/minecraft/structure/pillager_outpost/watchtower_overgrown.nbt index 9eda14f8..b86b7f48 100644 --- a/data/minecraft/structure/pillager_outpost/watchtower_overgrown.nbt +++ b/data/minecraft/structure/pillager_outpost/watchtower_overgrown.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e494109b801e6c9fb411a45b1d90a50ffc1c843c36b38e7bfc9439ad6fff404a -size 16026 +oid sha256:d1ab72ab29078acdc997d3ab099dc39aeb4837f6e719190fee821d1fa9691fdc +size 16025 diff --git a/data/minecraft/structure/ruined_portal/giant_portal_1.nbt b/data/minecraft/structure/ruined_portal/giant_portal_1.nbt index 5bf04e54..9cb389ae 100644 --- a/data/minecraft/structure/ruined_portal/giant_portal_1.nbt +++ b/data/minecraft/structure/ruined_portal/giant_portal_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:407df76c96650e418fa374304cf34099cb5d86ed406c31b641b1e5e1490e19cc -size 7201 +oid sha256:6de29d0560315b8a284b3f3c41ed69ded7c297a147d52ee540ba2191a4f0a778 +size 7196 diff --git a/data/minecraft/structure/ruined_portal/giant_portal_2.nbt b/data/minecraft/structure/ruined_portal/giant_portal_2.nbt index 62a8d256..333e275c 100644 --- a/data/minecraft/structure/ruined_portal/giant_portal_2.nbt +++ b/data/minecraft/structure/ruined_portal/giant_portal_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:36bbce074e7e8d1f4f8759d9dd1a51d2a0d9d8edf06059d196326bd87b89b1ef -size 6838 +oid sha256:dc6810728d60975a259c2b8a2d7f2775e3151ff195fb70bdba3470f10396385f +size 6837 diff --git a/data/minecraft/structure/ruined_portal/giant_portal_3.nbt b/data/minecraft/structure/ruined_portal/giant_portal_3.nbt index cc566371..d21a17c5 100644 --- a/data/minecraft/structure/ruined_portal/giant_portal_3.nbt +++ b/data/minecraft/structure/ruined_portal/giant_portal_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e8e2be323fd63be8cfbd016ff268231dc018d5fd0f9eb44f91128330fdbf52b8 -size 9899 +oid sha256:e601432d72d3c6fa7e0cce260f5adfca10b79fd1c1f7feb8a3ac7203d63f9698 +size 9897 diff --git a/data/minecraft/structure/ruined_portal/portal_1.nbt b/data/minecraft/structure/ruined_portal/portal_1.nbt index 79932242..3a2cde52 100644 --- a/data/minecraft/structure/ruined_portal/portal_1.nbt +++ b/data/minecraft/structure/ruined_portal/portal_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4732799ba5ba60d6bb8a36bffee6c9bf8206bb8213ebfb7c66925ffab317f937 -size 1432 +oid sha256:5ff326d4898b45a83386756ca4355e8881354cfa55f53f34d4bc5f058b17e4c3 +size 1431 diff --git a/data/minecraft/structure/ruined_portal/portal_10.nbt b/data/minecraft/structure/ruined_portal/portal_10.nbt index b08683ea..f89a1ab7 100644 --- a/data/minecraft/structure/ruined_portal/portal_10.nbt +++ b/data/minecraft/structure/ruined_portal/portal_10.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:35c91ecf224e8f822b0891b6e20a33585d3d71b57dcadb7e9d107845ad50dc52 -size 2880 +oid sha256:13e33e0046580fcb88888dcee158a6e98561393e37e185fdbfb40b43151a5890 +size 2878 diff --git a/data/minecraft/structure/ruined_portal/portal_2.nbt b/data/minecraft/structure/ruined_portal/portal_2.nbt index ccc914e1..89dcb5a1 100644 --- a/data/minecraft/structure/ruined_portal/portal_2.nbt +++ b/data/minecraft/structure/ruined_portal/portal_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b30b3c1cd081c6f967c0fd8d1c9a674629b5cf118b289372de2e155d048708c2 +oid sha256:6bde439559b7452c40cf040ce6c472f8a223be03d281b92a8a20bfd3e5bd9b7f size 2762 diff --git a/data/minecraft/structure/ruined_portal/portal_3.nbt b/data/minecraft/structure/ruined_portal/portal_3.nbt index 29a6d0c7..90e935be 100644 --- a/data/minecraft/structure/ruined_portal/portal_3.nbt +++ b/data/minecraft/structure/ruined_portal/portal_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2172d865f8f2a96e76944d258640732097e61ebf5d513726264e08614fe51f9a -size 1995 +oid sha256:b49623eb572e54a267f5e7532ab50e11a10390f3a0fdd6f7aa624eed2713e9d9 +size 1993 diff --git a/data/minecraft/structure/ruined_portal/portal_4.nbt b/data/minecraft/structure/ruined_portal/portal_4.nbt index 9783efe1..851a6d00 100644 --- a/data/minecraft/structure/ruined_portal/portal_4.nbt +++ b/data/minecraft/structure/ruined_portal/portal_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aaee59d7c5670b830e395b707c591237535addfcfe1054ad6905fa5026e68f0f -size 1886 +oid sha256:a7687260bd47d1efd66fe9ca1f2b58cdfa530c32623e7bb3b9a68dd306501af3 +size 1885 diff --git a/data/minecraft/structure/ruined_portal/portal_5.nbt b/data/minecraft/structure/ruined_portal/portal_5.nbt index 38c53431..0b2f1347 100644 --- a/data/minecraft/structure/ruined_portal/portal_5.nbt +++ b/data/minecraft/structure/ruined_portal/portal_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1e78ccbbe0ccd21a11efa9629825ba7597a7212f3c293581f03f54556c82abc8 -size 2217 +oid sha256:be686a5b4239af5ef14eec546c9b3b4eb05a70669583d8d8430cb44c666001b8 +size 2215 diff --git a/data/minecraft/structure/ruined_portal/portal_6.nbt b/data/minecraft/structure/ruined_portal/portal_6.nbt index c6351485..a7105912 100644 --- a/data/minecraft/structure/ruined_portal/portal_6.nbt +++ b/data/minecraft/structure/ruined_portal/portal_6.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6ad6dc668e63b26146f375f00d0d78bbfb2142ac22287a2f1a4e90b1686113fe -size 984 +oid sha256:880158a0baddfa8d2b64043f5da69bc0e0c979b6abaa665165f63e895b92936c +size 982 diff --git a/data/minecraft/structure/ruined_portal/portal_7.nbt b/data/minecraft/structure/ruined_portal/portal_7.nbt index 157ccd08..98ff0e6c 100644 --- a/data/minecraft/structure/ruined_portal/portal_7.nbt +++ b/data/minecraft/structure/ruined_portal/portal_7.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5757e27387fd37eec0f8c5bb097a9a0c2dc06a52e195e8797074fe6d2ed6a029 -size 1831 +oid sha256:51f805ff00a7265a6d30f03176198a3cbfce26ed9ee08a4fa21c4cd3a3be4239 +size 1829 diff --git a/data/minecraft/structure/ruined_portal/portal_8.nbt b/data/minecraft/structure/ruined_portal/portal_8.nbt index 1929b7dc..3c73a98c 100644 --- a/data/minecraft/structure/ruined_portal/portal_8.nbt +++ b/data/minecraft/structure/ruined_portal/portal_8.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d168bd5d1f768556532ea834f5dddd198654601d20ecd37c421e211f2fb8901 -size 3408 +oid sha256:aa8ab6cfaa7c552196ff61d09400277af9280b2f76edc43d8e78b00de7f74197 +size 3406 diff --git a/data/minecraft/structure/ruined_portal/portal_9.nbt b/data/minecraft/structure/ruined_portal/portal_9.nbt index 35ca4523..ed6c4db5 100644 --- a/data/minecraft/structure/ruined_portal/portal_9.nbt +++ b/data/minecraft/structure/ruined_portal/portal_9.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d8f955a5558f029884afe18d3c75b99a61d0c4c746c72ad89ce419cbe5b4c2bb -size 2169 +oid sha256:d9ae5664daab0fe71385d4ba170c925020239e6859bd1dd47d807be8d6e6f5cb +size 2167 diff --git a/data/minecraft/structure/shipwreck/rightsideup_backhalf.nbt b/data/minecraft/structure/shipwreck/rightsideup_backhalf.nbt index f07bb63b..fcc21658 100644 --- a/data/minecraft/structure/shipwreck/rightsideup_backhalf.nbt +++ b/data/minecraft/structure/shipwreck/rightsideup_backhalf.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3376ca0a80901bd13612f5598ca15e55d76b644de62593f2bf1d4f28405cd8dc -size 2713 +oid sha256:4a50a6fe58a4380d3709f96215c0e6f55eb9a892b3cb1e1d6ea4b5aed8633c31 +size 2711 diff --git a/data/minecraft/structure/shipwreck/rightsideup_backhalf_degraded.nbt b/data/minecraft/structure/shipwreck/rightsideup_backhalf_degraded.nbt index 93f8617d..eccab338 100644 --- a/data/minecraft/structure/shipwreck/rightsideup_backhalf_degraded.nbt +++ b/data/minecraft/structure/shipwreck/rightsideup_backhalf_degraded.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e37caffe1652f4370bb0c22a5025f632f4d038d35a1712f8808763b121e6d549 -size 2570 +oid sha256:b8c583c59545e3b19ac4f39bc15492803581be9189ecc8a1d12ff9acdea2f2d9 +size 2569 diff --git a/data/minecraft/structure/shipwreck/rightsideup_fronthalf.nbt b/data/minecraft/structure/shipwreck/rightsideup_fronthalf.nbt index d4b8c03b..9c337bae 100644 --- a/data/minecraft/structure/shipwreck/rightsideup_fronthalf.nbt +++ b/data/minecraft/structure/shipwreck/rightsideup_fronthalf.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5f49bd50e7843b61c35e95d498f76db679c4a987fc576fdfcb21eb173d426f71 -size 2476 +oid sha256:d3173ba5fed0a3d107449d657eea0332db7892e0bc67075d1c8cdb3daf107226 +size 2474 diff --git a/data/minecraft/structure/shipwreck/rightsideup_fronthalf_degraded.nbt b/data/minecraft/structure/shipwreck/rightsideup_fronthalf_degraded.nbt index 575b9889..03f0f9e2 100644 --- a/data/minecraft/structure/shipwreck/rightsideup_fronthalf_degraded.nbt +++ b/data/minecraft/structure/shipwreck/rightsideup_fronthalf_degraded.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6b8120b175def83ad132c5cb90a51bc8131dae55bbdabe156742d2adbd695dde -size 2253 +oid sha256:cc66d71676eea92415ed86ff9176c0e9a877f696b835f2c5730ca4890459fd98 +size 2251 diff --git a/data/minecraft/structure/shipwreck/rightsideup_full.nbt b/data/minecraft/structure/shipwreck/rightsideup_full.nbt index 8846f6a6..ef0ddeb1 100644 --- a/data/minecraft/structure/shipwreck/rightsideup_full.nbt +++ b/data/minecraft/structure/shipwreck/rightsideup_full.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8da5471014a685b76d0a8a1148fab4cf192e4dab3faaf6e814f59571a0dd14cc -size 3755 +oid sha256:d7c598266f776857a75cb2f8edea435c5464c8a3128469305c4da73bc7ca3e91 +size 3754 diff --git a/data/minecraft/structure/shipwreck/rightsideup_full_degraded.nbt b/data/minecraft/structure/shipwreck/rightsideup_full_degraded.nbt index 6a034a5e..56bb92ff 100644 --- a/data/minecraft/structure/shipwreck/rightsideup_full_degraded.nbt +++ b/data/minecraft/structure/shipwreck/rightsideup_full_degraded.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a7ef2e951962eba36aec0c60c73f3d324ea678d4048625ad2dba07e7978146cb -size 3528 +oid sha256:39de852e0f32c0f46ca9c4ad7f5a4134a78630c95b1dbc5abd56a09de2486b24 +size 3526 diff --git a/data/minecraft/structure/shipwreck/sideways_backhalf.nbt b/data/minecraft/structure/shipwreck/sideways_backhalf.nbt index 913a47ae..9eb9dedf 100644 --- a/data/minecraft/structure/shipwreck/sideways_backhalf.nbt +++ b/data/minecraft/structure/shipwreck/sideways_backhalf.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3aa82fc24c3dfc56abbd146db8ea78aac92245bd0cb5b33ecaced76da014675a -size 2436 +oid sha256:c76b475211b2a49088ca4de5aab0f363b816b1f09fc69865c24411e79bb5851e +size 2434 diff --git a/data/minecraft/structure/shipwreck/sideways_backhalf_degraded.nbt b/data/minecraft/structure/shipwreck/sideways_backhalf_degraded.nbt index 3877d633..6fdbcb30 100644 --- a/data/minecraft/structure/shipwreck/sideways_backhalf_degraded.nbt +++ b/data/minecraft/structure/shipwreck/sideways_backhalf_degraded.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2dfaa159668d4fc42e6ff02f3d9d85502aaca6ff077208eb6b64eca943dc0fbf -size 2259 +oid sha256:fdccccb720f5fbad21c49729364f257dfdff23f29929cc612aab77783fe966e0 +size 2258 diff --git a/data/minecraft/structure/shipwreck/sideways_fronthalf.nbt b/data/minecraft/structure/shipwreck/sideways_fronthalf.nbt index 914d4464..94f311a3 100644 --- a/data/minecraft/structure/shipwreck/sideways_fronthalf.nbt +++ b/data/minecraft/structure/shipwreck/sideways_fronthalf.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:406ef9ad7cbe5441761084b8972f3064457157a3f8f5b120b4df4f827867404d -size 2204 +oid sha256:9b0ccc016f518954d13ff5213a1dccb29659e32a47a572905c4de49417b3e272 +size 2203 diff --git a/data/minecraft/structure/shipwreck/sideways_fronthalf_degraded.nbt b/data/minecraft/structure/shipwreck/sideways_fronthalf_degraded.nbt index e048a030..56a2f7c7 100644 --- a/data/minecraft/structure/shipwreck/sideways_fronthalf_degraded.nbt +++ b/data/minecraft/structure/shipwreck/sideways_fronthalf_degraded.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9a3738aaa7df2fa307bbea395badfac79c252d132000f9cf93aed9775983e0d7 -size 1914 +oid sha256:5dace99c13adaf7f24ba2ecd1ccb3424a7c7db52f54101769d07dfcb78b2be8a +size 1912 diff --git a/data/minecraft/structure/shipwreck/sideways_full.nbt b/data/minecraft/structure/shipwreck/sideways_full.nbt index 02acbd78..ca8e12ea 100644 --- a/data/minecraft/structure/shipwreck/sideways_full.nbt +++ b/data/minecraft/structure/shipwreck/sideways_full.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:630929d672737a8d1033620157ce3cd5e3fa69cecf48df08505a5db47a577a29 -size 3512 +oid sha256:c5e1ddb414d3f6f1af3fa18928953ee7d26bcdf37ed744ad77d8388e54ddf8b5 +size 3510 diff --git a/data/minecraft/structure/shipwreck/sideways_full_degraded.nbt b/data/minecraft/structure/shipwreck/sideways_full_degraded.nbt index e8655984..80a7dff6 100644 --- a/data/minecraft/structure/shipwreck/sideways_full_degraded.nbt +++ b/data/minecraft/structure/shipwreck/sideways_full_degraded.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:923117f06c9141069d4b4c7e37ebdbdc5e89bce6d0acf6932ded12c41ec0a7f7 -size 3308 +oid sha256:728c02c1ac95eca0f847cef84c07de8019589594f76be5c28f82159e608f95f4 +size 3306 diff --git a/data/minecraft/structure/shipwreck/upsidedown_backhalf.nbt b/data/minecraft/structure/shipwreck/upsidedown_backhalf.nbt index 6402588b..c5ca5dba 100644 --- a/data/minecraft/structure/shipwreck/upsidedown_backhalf.nbt +++ b/data/minecraft/structure/shipwreck/upsidedown_backhalf.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f840a092f44c4eacb9263a90e735c5213ed5e0fb9698f169e75d9a2cf8361cb -size 2518 +oid sha256:d18161b793a544d358a40529c496cc9a51b513c506f40c0e1733384b1a18e0e1 +size 2516 diff --git a/data/minecraft/structure/shipwreck/upsidedown_backhalf_degraded.nbt b/data/minecraft/structure/shipwreck/upsidedown_backhalf_degraded.nbt index f917b758..1d1ef495 100644 --- a/data/minecraft/structure/shipwreck/upsidedown_backhalf_degraded.nbt +++ b/data/minecraft/structure/shipwreck/upsidedown_backhalf_degraded.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:59a9a1d7fe8aab036a9588361af4410a69b85ad29bc1acf150bf1ee38b605b70 -size 2389 +oid sha256:0445c0c80be0c5b0a86349590c883e1b2564b2a4f90be5196811a00437da3b7f +size 2387 diff --git a/data/minecraft/structure/shipwreck/upsidedown_fronthalf.nbt b/data/minecraft/structure/shipwreck/upsidedown_fronthalf.nbt index 6529669b..b4dbfdb2 100644 --- a/data/minecraft/structure/shipwreck/upsidedown_fronthalf.nbt +++ b/data/minecraft/structure/shipwreck/upsidedown_fronthalf.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1b76e4b2df1424d6e1404a829ef3442231fc93ebbbecc6a81e00d90af085fcf1 -size 2325 +oid sha256:14ac3ff9b5c51d84e3c62dcfc46ce64800927f62712366289a730cd7125e883f +size 2323 diff --git a/data/minecraft/structure/shipwreck/upsidedown_fronthalf_degraded.nbt b/data/minecraft/structure/shipwreck/upsidedown_fronthalf_degraded.nbt index b51f7f6a..11b0a8bf 100644 --- a/data/minecraft/structure/shipwreck/upsidedown_fronthalf_degraded.nbt +++ b/data/minecraft/structure/shipwreck/upsidedown_fronthalf_degraded.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bcfce1b511fcac6b8242d03a373702d7a040d50f5b179d4c44ffdae6f3a7604f -size 2210 +oid sha256:47a6ac5d334b2cbe883adf4aa29f6f22026e8e99dfe98b303b645eb007787ae3 +size 2209 diff --git a/data/minecraft/structure/shipwreck/upsidedown_full.nbt b/data/minecraft/structure/shipwreck/upsidedown_full.nbt index 8d8d0389..f28cfbae 100644 --- a/data/minecraft/structure/shipwreck/upsidedown_full.nbt +++ b/data/minecraft/structure/shipwreck/upsidedown_full.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9a9946f38d7b0a3b3b5d692be0665e3e835ae723c1be1f8566d9e12ab3fbeff1 -size 3470 +oid sha256:c66dbfe8e8b5c2adaaf9615993280de0ce96752a8e7f0c8a6cc38394863744be +size 3468 diff --git a/data/minecraft/structure/shipwreck/upsidedown_full_degraded.nbt b/data/minecraft/structure/shipwreck/upsidedown_full_degraded.nbt index 32934d3e..f2707efc 100644 --- a/data/minecraft/structure/shipwreck/upsidedown_full_degraded.nbt +++ b/data/minecraft/structure/shipwreck/upsidedown_full_degraded.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ce600e21360a07b3d4657b0d9fea67d6a4315d086167a1f301e1b5f2901f26cb -size 3299 +oid sha256:73a307930daceda08a5306ae8679439a3ec2c177b3e0844382f54a96ce91dfb0 +size 3298 diff --git a/data/minecraft/structure/shipwreck/with_mast.nbt b/data/minecraft/structure/shipwreck/with_mast.nbt index 51d10f41..2b1aa4d5 100644 --- a/data/minecraft/structure/shipwreck/with_mast.nbt +++ b/data/minecraft/structure/shipwreck/with_mast.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:689133e1e1813474f0a19ccec1c3779a9ef0b274485cd386d1745ea090641783 -size 3960 +oid sha256:020b2a951e0e2844ae36ef540558e9b647b74e6960a7d5191c5852f8a5242562 +size 3959 diff --git a/data/minecraft/structure/shipwreck/with_mast_degraded.nbt b/data/minecraft/structure/shipwreck/with_mast_degraded.nbt index d6b4f418..89abb6df 100644 --- a/data/minecraft/structure/shipwreck/with_mast_degraded.nbt +++ b/data/minecraft/structure/shipwreck/with_mast_degraded.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1b4244ce177b4dda16d01756d01c90cf090ac2aa0134dd3d684ea234dbd4bb28 -size 3685 +oid sha256:a6609f200e97034a722ac04c216ee6412a8c6e40aad5556d53671db0fe8eafaa +size 3684 diff --git a/data/minecraft/structure/trail_ruins/buildings/group_full_1.nbt b/data/minecraft/structure/trail_ruins/buildings/group_full_1.nbt index 71cda637..1bea7b1d 100644 --- a/data/minecraft/structure/trail_ruins/buildings/group_full_1.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/group_full_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d152c7eb5714e0dc3f7ef05d55ffcd706d87c8c23bc27c8d8a6c1f6eaaf9d2a9 +oid sha256:f889f778deff4dae4c5c1cec7c200db1a29a1dcc492388769cfa92696a4404cc size 1339 diff --git a/data/minecraft/structure/trail_ruins/buildings/group_full_2.nbt b/data/minecraft/structure/trail_ruins/buildings/group_full_2.nbt index 68dbc837..069d0c9a 100644 --- a/data/minecraft/structure/trail_ruins/buildings/group_full_2.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/group_full_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3533ca3e878beab7e804a3ef4302dc3bdd33f4477a72243f541374fcae957448 -size 1281 +oid sha256:e03a4d1680cf6293e2a6981b09fe9567c9b0f74b57c1a9b506806214c0104f59 +size 1280 diff --git a/data/minecraft/structure/trail_ruins/buildings/group_full_3.nbt b/data/minecraft/structure/trail_ruins/buildings/group_full_3.nbt index 3ca1116f..f931606b 100644 --- a/data/minecraft/structure/trail_ruins/buildings/group_full_3.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/group_full_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:de955635bcfa6d2e34413cbbde1861f7f9ef7ee04ef2c117182527eeeaddd671 -size 1299 +oid sha256:9a0c3037d4f1cb65a51fbe4b760004b4f0bdc83bd49bd58631e4f5617eacc813 +size 1298 diff --git a/data/minecraft/structure/trail_ruins/buildings/group_full_4.nbt b/data/minecraft/structure/trail_ruins/buildings/group_full_4.nbt index ad07dafa..9c46a15d 100644 --- a/data/minecraft/structure/trail_ruins/buildings/group_full_4.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/group_full_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:54515b8275db63a91899b511ba904633c5f6e660385cae0d88ada4dd9017f16e +oid sha256:2aae84994ef410285f22df8a9aab0b3b1dbb7de2280229106ba84eb15b9e6e20 size 1263 diff --git a/data/minecraft/structure/trail_ruins/buildings/group_full_5.nbt b/data/minecraft/structure/trail_ruins/buildings/group_full_5.nbt index db81b4e1..1dfac52f 100644 --- a/data/minecraft/structure/trail_ruins/buildings/group_full_5.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/group_full_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:225069440b7328a580ae7e340b40220607385447af520eff268342f94757b2a3 -size 1261 +oid sha256:0df8e7ea03f5bca4774ade6d58715afe90357c4eea8e9bbc6e063c1f01280ce3 +size 1260 diff --git a/data/minecraft/structure/trail_ruins/buildings/group_hall_1.nbt b/data/minecraft/structure/trail_ruins/buildings/group_hall_1.nbt index 487c246b..e864703e 100644 --- a/data/minecraft/structure/trail_ruins/buildings/group_hall_1.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/group_hall_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:10c2ca97bd65e8fc979427ea7d356013f7fb4479595ffddff1a807badeaeb840 -size 1517 +oid sha256:87addff536642451ce777570a8e9c33cd77b71577ebe95c38ad38b6623f484bb +size 1516 diff --git a/data/minecraft/structure/trail_ruins/buildings/group_hall_2.nbt b/data/minecraft/structure/trail_ruins/buildings/group_hall_2.nbt index f3de70fb..00a19b64 100644 --- a/data/minecraft/structure/trail_ruins/buildings/group_hall_2.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/group_hall_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e0fe0ebce593325839664613aba0d1fdf7e8af7b61284d361c6b2e923aaa550 -size 1616 +oid sha256:c89a56adc080f73b24dab7ba097f666c00fb8d1bbae468e2c6da94347f9922ab +size 1615 diff --git a/data/minecraft/structure/trail_ruins/buildings/group_hall_3.nbt b/data/minecraft/structure/trail_ruins/buildings/group_hall_3.nbt index f38de6c1..7f430eb5 100644 --- a/data/minecraft/structure/trail_ruins/buildings/group_hall_3.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/group_hall_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:309c859b55ac76e1b8d9abba4666c2682f2a8f5bf6d40818a8e6472bfd3aecc0 +oid sha256:d452a89fd0a6123ac7d8f5b0ff3fd56aabc6d652e9a8dac6e8ef44b072548022 size 1716 diff --git a/data/minecraft/structure/trail_ruins/buildings/group_hall_4.nbt b/data/minecraft/structure/trail_ruins/buildings/group_hall_4.nbt index fd288190..14c97fb1 100644 --- a/data/minecraft/structure/trail_ruins/buildings/group_hall_4.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/group_hall_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d996fa67e8b4d477faf8929469ed5221086b486d4edfc8fc0aa915309b948a6c +oid sha256:c8e176b8b76e847c0e4d3ef69bcc44b0b7a4b69f9b6d8358ad7bb150ea0fa83e size 1640 diff --git a/data/minecraft/structure/trail_ruins/buildings/group_hall_5.nbt b/data/minecraft/structure/trail_ruins/buildings/group_hall_5.nbt index ae7e97ab..0a63ac81 100644 --- a/data/minecraft/structure/trail_ruins/buildings/group_hall_5.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/group_hall_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:95e41915c23f5df704df316bbf0ecda9b40efa53e69a933cca23d3dd59720808 +oid sha256:6718c25ae76679bad26fabe3640bab3974abc60734227a2830b9a40b58b976d1 size 1526 diff --git a/data/minecraft/structure/trail_ruins/buildings/group_lower_1.nbt b/data/minecraft/structure/trail_ruins/buildings/group_lower_1.nbt index 09f6e6c4..a4709aa3 100644 --- a/data/minecraft/structure/trail_ruins/buildings/group_lower_1.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/group_lower_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:90db8183624d6869e60a9598d049e0f1561681bdfa1598976b9278a94fcb1a7f +oid sha256:e365be688ff4eb801397d1e9df1625b9eb285bd7318f713a951b1335881e7b9b size 1047 diff --git a/data/minecraft/structure/trail_ruins/buildings/group_lower_2.nbt b/data/minecraft/structure/trail_ruins/buildings/group_lower_2.nbt index fbc83842..92dff0d1 100644 --- a/data/minecraft/structure/trail_ruins/buildings/group_lower_2.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/group_lower_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d93fe9b15580acce74a01a1c7e2a0c7eb786acb770cde881e680a48931821ed9 -size 1043 +oid sha256:03318389f608f43907427d12cfcc9f75d185b6bad5f9c203faf380a4130aabab +size 1044 diff --git a/data/minecraft/structure/trail_ruins/buildings/group_lower_3.nbt b/data/minecraft/structure/trail_ruins/buildings/group_lower_3.nbt index 2e49c448..826d609c 100644 --- a/data/minecraft/structure/trail_ruins/buildings/group_lower_3.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/group_lower_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aaa78e883c5f2080f5afac01b19a00e5c2c382d6817a9ac6d57dc1a63e781e7a +oid sha256:85f7f03da7c7532e7cb6ed5569fef5287c4539d951136edddbcb98fd2ce47490 size 1046 diff --git a/data/minecraft/structure/trail_ruins/buildings/group_lower_4.nbt b/data/minecraft/structure/trail_ruins/buildings/group_lower_4.nbt index 6aabc371..057b24b7 100644 --- a/data/minecraft/structure/trail_ruins/buildings/group_lower_4.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/group_lower_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cdceb5f569f826ee4533c4ff83cf1890caebc7e6fbc0c8d3cfd8023eb253860d +oid sha256:eeeb1a907e77c23de18dd38978a944fdf1e65f6e4a231a374a156c92cbb1a063 size 974 diff --git a/data/minecraft/structure/trail_ruins/buildings/group_lower_5.nbt b/data/minecraft/structure/trail_ruins/buildings/group_lower_5.nbt index ffb580dd..9c464fdd 100644 --- a/data/minecraft/structure/trail_ruins/buildings/group_lower_5.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/group_lower_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:15d73d26068f5a722467dd9a877b8908b8cebe1c8881e731945256ae86bed9cd -size 973 +oid sha256:12741ce84f7669f1a8d436523311764dcca10bf534f44e5689aeb9da3d8193a1 +size 972 diff --git a/data/minecraft/structure/trail_ruins/buildings/group_room_1.nbt b/data/minecraft/structure/trail_ruins/buildings/group_room_1.nbt index 462bb287..17bd7d80 100644 --- a/data/minecraft/structure/trail_ruins/buildings/group_room_1.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/group_room_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:00a7ffa73c2a8f0ae342cf4c66e32a67888751ea8974955be527d6562568d772 +oid sha256:c700bd5b083296b6a853e4a9d8e135757ece4b635972ad07e07f9030fd7da450 size 780 diff --git a/data/minecraft/structure/trail_ruins/buildings/group_room_2.nbt b/data/minecraft/structure/trail_ruins/buildings/group_room_2.nbt index 0f392dc6..efafdff1 100644 --- a/data/minecraft/structure/trail_ruins/buildings/group_room_2.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/group_room_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cea7eaeecff94b4e770f75d050116bc5b6d5c54b31d76ae9fb43de6aa8f461c9 -size 864 +oid sha256:37575151564a08a347effadddb0f03162d48638eb7cb6e794c50238429a3ccbb +size 863 diff --git a/data/minecraft/structure/trail_ruins/buildings/group_room_3.nbt b/data/minecraft/structure/trail_ruins/buildings/group_room_3.nbt index 3701d1b6..d39aef87 100644 --- a/data/minecraft/structure/trail_ruins/buildings/group_room_3.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/group_room_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:42055527e698154d8435e66ad316af5c297545398139014edfcf6b99ada5e678 -size 848 +oid sha256:17092c71e10441f89e849f55ab3562d798197cc25ca5641cc57c5a42e44df5a3 +size 847 diff --git a/data/minecraft/structure/trail_ruins/buildings/group_room_4.nbt b/data/minecraft/structure/trail_ruins/buildings/group_room_4.nbt index cd4e8983..15d410ea 100644 --- a/data/minecraft/structure/trail_ruins/buildings/group_room_4.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/group_room_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:153c8adbf6930c5ebaae07ccc2d354bc0b3004649da3e4b7efdd4b8af76bdf2a -size 781 +oid sha256:13b8e92951671613d37065b69ab7f184398f7ede907c2957ce86e6f94d252529 +size 780 diff --git a/data/minecraft/structure/trail_ruins/buildings/group_room_5.nbt b/data/minecraft/structure/trail_ruins/buildings/group_room_5.nbt index fae7ebeb..c40b976d 100644 --- a/data/minecraft/structure/trail_ruins/buildings/group_room_5.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/group_room_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1b7929253421ecb546f387370cba954e37174dab3ee6cf91b53016967d258ac7 +oid sha256:b599ecd5df9e07bfb0c1e96dd6bef58f142bc91fccb985b2bcce801a5c6239bf size 779 diff --git a/data/minecraft/structure/trail_ruins/buildings/group_upper_1.nbt b/data/minecraft/structure/trail_ruins/buildings/group_upper_1.nbt index 6fafa98e..ae25350e 100644 --- a/data/minecraft/structure/trail_ruins/buildings/group_upper_1.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/group_upper_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8b72413a76d797568ca5b8cbdee16c5b51a7ffd87dff01ab80ce530fb22650ab -size 1270 +oid sha256:bc8843a6c444133d662e3d3185494d861e89a0a2738afdeb7f9b1098406401ca +size 1269 diff --git a/data/minecraft/structure/trail_ruins/buildings/group_upper_2.nbt b/data/minecraft/structure/trail_ruins/buildings/group_upper_2.nbt index f4506fcb..7ab385e5 100644 --- a/data/minecraft/structure/trail_ruins/buildings/group_upper_2.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/group_upper_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d36f157229e9033f87d3b5565af22e2fec0f43d5e93a13007f81dc85fc0c2fbd -size 1263 +oid sha256:ff906be9ab7f03607d9c74a77ce3c0d113570ebf03bc599d3efd6b9720016d29 +size 1262 diff --git a/data/minecraft/structure/trail_ruins/buildings/group_upper_3.nbt b/data/minecraft/structure/trail_ruins/buildings/group_upper_3.nbt index 6ee221a3..b3f5b703 100644 --- a/data/minecraft/structure/trail_ruins/buildings/group_upper_3.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/group_upper_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:44f813b89436f4c4226d3e24b19b3832040c417cfba22a66f9473a082150d0ae -size 1274 +oid sha256:573ca202d4d8fa8ca9056ccf0873dad2ef0e80418b84a3b7cb8d4e992e502fe0 +size 1273 diff --git a/data/minecraft/structure/trail_ruins/buildings/group_upper_4.nbt b/data/minecraft/structure/trail_ruins/buildings/group_upper_4.nbt index f82481f8..10b6a3e4 100644 --- a/data/minecraft/structure/trail_ruins/buildings/group_upper_4.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/group_upper_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:874fcbd6bfd22219bd3d17f35bb5897204d333a5f3cdc3b3be2a1e73bf16bcde +oid sha256:e63e8ad0dbf7622cf9a8921d84545d14782b694a6bcda309b128711de8249552 size 1181 diff --git a/data/minecraft/structure/trail_ruins/buildings/group_upper_5.nbt b/data/minecraft/structure/trail_ruins/buildings/group_upper_5.nbt index 57541f12..f238c873 100644 --- a/data/minecraft/structure/trail_ruins/buildings/group_upper_5.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/group_upper_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fa234f068ba1605fe0660f9bffdedf3fce67d7f1be5e5fa7e580cb52c646e9a9 -size 1178 +oid sha256:f1b53250b73f2573ece1e09d423305268bbb0c5d9405ddba14000444fc91c456 +size 1177 diff --git a/data/minecraft/structure/trail_ruins/buildings/large_room_1.nbt b/data/minecraft/structure/trail_ruins/buildings/large_room_1.nbt index fbf6d4a1..4ed12b83 100644 --- a/data/minecraft/structure/trail_ruins/buildings/large_room_1.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/large_room_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a6c465972dd9d28b3eaa1a1984c8e5beda1b44e27dd6ba55bc02e7dd191cdc25 -size 1946 +oid sha256:190354397b373723f4edef2ce85171864615a63a41ec7089ef54f45feca8f487 +size 1944 diff --git a/data/minecraft/structure/trail_ruins/buildings/large_room_2.nbt b/data/minecraft/structure/trail_ruins/buildings/large_room_2.nbt index 0ef9cd0f..983b2730 100644 --- a/data/minecraft/structure/trail_ruins/buildings/large_room_2.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/large_room_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1a51af25eac3001671f2e931613e3ac00bdbe89208d0519056bb117063d34fd1 -size 1658 +oid sha256:dd1687e3060bd1cc76882b0e0bc1df7e3921849b0cd3ba13026be4f7586532d4 +size 1656 diff --git a/data/minecraft/structure/trail_ruins/buildings/large_room_3.nbt b/data/minecraft/structure/trail_ruins/buildings/large_room_3.nbt index 6968f7e1..0312fa14 100644 --- a/data/minecraft/structure/trail_ruins/buildings/large_room_3.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/large_room_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c5f4149206b7be7229512f3a00b88543152927927a60b566f2c6bb2c01218047 +oid sha256:8411d2874fa4093238da8045c857fe0c4a114f62d4508fd5b5c53590490f52b8 size 2707 diff --git a/data/minecraft/structure/trail_ruins/buildings/large_room_4.nbt b/data/minecraft/structure/trail_ruins/buildings/large_room_4.nbt index e7483bd7..31e1a9a9 100644 --- a/data/minecraft/structure/trail_ruins/buildings/large_room_4.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/large_room_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:80e09a4d5187f9dcd321e89dedea983ec3ccb003710345642cb98cdd496e9bd6 -size 1564 +oid sha256:13e2bcfe75036e1ef469528e6954c671fafb9887da76c0f966254540d9baba12 +size 1563 diff --git a/data/minecraft/structure/trail_ruins/buildings/large_room_5.nbt b/data/minecraft/structure/trail_ruins/buildings/large_room_5.nbt index 0a7a9402..724b2285 100644 --- a/data/minecraft/structure/trail_ruins/buildings/large_room_5.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/large_room_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:56437fd9a46dd90e5aff85a65b756b51bb3e788e017e57421db5df86bc967754 -size 3219 +oid sha256:43ca4b19fc8547c4d31414019e1e3d057601060a421bc874f37de887fcacb40d +size 3217 diff --git a/data/minecraft/structure/trail_ruins/buildings/one_room_1.nbt b/data/minecraft/structure/trail_ruins/buildings/one_room_1.nbt index 978a6b55..05c5b317 100644 --- a/data/minecraft/structure/trail_ruins/buildings/one_room_1.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/one_room_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ff1c61a51b0f6c1589ee47e526ae4eb48a34757e6199d630ab5155959ab50ba1 -size 1005 +oid sha256:e7dd9ea6b47c2426aa9464735254dab5cce02ad6fbd5eeae1e37a134450c83f3 +size 1004 diff --git a/data/minecraft/structure/trail_ruins/buildings/one_room_2.nbt b/data/minecraft/structure/trail_ruins/buildings/one_room_2.nbt index 2832259c..cd6c8551 100644 --- a/data/minecraft/structure/trail_ruins/buildings/one_room_2.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/one_room_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c7ac17b53fe665a4f3685ae439769afe50e4ff75625be94aef2d3344f3175f6d +oid sha256:6080fde15753ad90aa3e3f152e36e028c4cd413bf7a49ff2f6f63c7973a0223c size 1086 diff --git a/data/minecraft/structure/trail_ruins/buildings/one_room_3.nbt b/data/minecraft/structure/trail_ruins/buildings/one_room_3.nbt index dae05945..78c2f11b 100644 --- a/data/minecraft/structure/trail_ruins/buildings/one_room_3.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/one_room_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:753e904984c5a1e68fbb9de80559392bc0821d1c0b79980833b324b8500e554b +oid sha256:d25cd57b460ccbf5576acf6e1b27563cfad1a961f3b63983d4d354cdf7f3a4f2 size 1105 diff --git a/data/minecraft/structure/trail_ruins/buildings/one_room_4.nbt b/data/minecraft/structure/trail_ruins/buildings/one_room_4.nbt index 4ae5cf34..3b14c218 100644 --- a/data/minecraft/structure/trail_ruins/buildings/one_room_4.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/one_room_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:97ca94b5d310ee5262411f795b50a7740bbde576b3c10fecfa228f91abd5d2e5 -size 1452 +oid sha256:feea881090ecc1e7202d153a059354b9c87d09f8af89efef026b2cc42946e018 +size 1451 diff --git a/data/minecraft/structure/trail_ruins/buildings/one_room_5.nbt b/data/minecraft/structure/trail_ruins/buildings/one_room_5.nbt index 53e4270a..09ae7c52 100644 --- a/data/minecraft/structure/trail_ruins/buildings/one_room_5.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/one_room_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:659ed7b0809b07728fbb0b82294ba89c52a553ad88437aca769b11655e7f4177 +oid sha256:8600c7cbe9ba771944b73827325eaed322f8b8b6c4d2e97037332980be9d9bb9 size 973 diff --git a/data/minecraft/structure/trail_ruins/decor/decor_1.nbt b/data/minecraft/structure/trail_ruins/decor/decor_1.nbt index cac37b4f..9fca0ab7 100644 --- a/data/minecraft/structure/trail_ruins/decor/decor_1.nbt +++ b/data/minecraft/structure/trail_ruins/decor/decor_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4885fded73b3b555560c2392141eafb46497ccd7a6bc8d8713c6837327c33962 -size 489 +oid sha256:5b36d666c4ae3bfeb905f0ee54b042592678ec82eb9f6e27a18a9d0c55478dfc +size 488 diff --git a/data/minecraft/structure/trail_ruins/decor/decor_2.nbt b/data/minecraft/structure/trail_ruins/decor/decor_2.nbt index fb67d79e..f8d50c05 100644 --- a/data/minecraft/structure/trail_ruins/decor/decor_2.nbt +++ b/data/minecraft/structure/trail_ruins/decor/decor_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0601a050fad4a29eb147e014b1ed931d0560a320808a168d0a7782041375e1df -size 471 +oid sha256:9f3784bb155429f7aab6ea0bfd0037d73f280eddb4c0284a6f17c69f4cd0750a +size 470 diff --git a/data/minecraft/structure/trail_ruins/decor/decor_3.nbt b/data/minecraft/structure/trail_ruins/decor/decor_3.nbt index 1018da9a..5b3171c8 100644 --- a/data/minecraft/structure/trail_ruins/decor/decor_3.nbt +++ b/data/minecraft/structure/trail_ruins/decor/decor_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:597352b3c437c2e7e8ded5839aaceb8be19b0bbdc6e00d54150b046dedefffbd -size 377 +oid sha256:d80b3f873d4d15f1b6eae1dbe7325b62ba95d45d6f33c07b72c9d3632126a83a +size 376 diff --git a/data/minecraft/structure/trail_ruins/decor/decor_4.nbt b/data/minecraft/structure/trail_ruins/decor/decor_4.nbt index c34b4b5e..1fcf8a59 100644 --- a/data/minecraft/structure/trail_ruins/decor/decor_4.nbt +++ b/data/minecraft/structure/trail_ruins/decor/decor_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2e32df9c1b81dceebfe89c63e769ebd11e9fd95da42ec0b1673b71f6af18f357 +oid sha256:7c891c1d4fc7d2a64ead4eea1796f3e1da103b2c82ed1968953169374a1f823c size 416 diff --git a/data/minecraft/structure/trail_ruins/decor/decor_5.nbt b/data/minecraft/structure/trail_ruins/decor/decor_5.nbt index 9e71081f..7e834af7 100644 --- a/data/minecraft/structure/trail_ruins/decor/decor_5.nbt +++ b/data/minecraft/structure/trail_ruins/decor/decor_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dcd5254373a6216df5e32388823e6d5b9873b1c91459ed2cec0555dea3abefe5 -size 492 +oid sha256:43093dfd2a659823228826e72f35c3b6406631944ad82a8e2b2991bf97bc32fe +size 491 diff --git a/data/minecraft/structure/trail_ruins/decor/decor_6.nbt b/data/minecraft/structure/trail_ruins/decor/decor_6.nbt index afd5a016..2ea23487 100644 --- a/data/minecraft/structure/trail_ruins/decor/decor_6.nbt +++ b/data/minecraft/structure/trail_ruins/decor/decor_6.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c344164b937830038222606e147614e0f04612cf95872f6d5223f52f1260d23a +oid sha256:8a994a9c968c2fad7aac3507a7ead0fb2bdf637a94b1487a35194b6110ce719d size 506 diff --git a/data/minecraft/structure/trail_ruins/decor/decor_7.nbt b/data/minecraft/structure/trail_ruins/decor/decor_7.nbt index 2d69e782..83c9e40d 100644 --- a/data/minecraft/structure/trail_ruins/decor/decor_7.nbt +++ b/data/minecraft/structure/trail_ruins/decor/decor_7.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4c729c4d6e60884a24948d99fb2a36195bf1155c5cd09834fda038cac2b758fa -size 631 +oid sha256:af41a15f3e86c31318d7aebf61522b2370d63ea83c5ff196f22bb3a338a3c792 +size 630 diff --git a/data/minecraft/structure/trail_ruins/roads/long_road_end.nbt b/data/minecraft/structure/trail_ruins/roads/long_road_end.nbt index 026d768e..9034307e 100644 --- a/data/minecraft/structure/trail_ruins/roads/long_road_end.nbt +++ b/data/minecraft/structure/trail_ruins/roads/long_road_end.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6e0e13b50f7e6d1c2420956a4a93c576e3c0d12338030a02428aa2dfe54e49bd +oid sha256:e387c978fe331a5e03690f25200283ca471f11bea2cb04e0040449e23e60cbab size 858 diff --git a/data/minecraft/structure/trail_ruins/roads/road_end_1.nbt b/data/minecraft/structure/trail_ruins/roads/road_end_1.nbt index 562dd061..35936ac8 100644 --- a/data/minecraft/structure/trail_ruins/roads/road_end_1.nbt +++ b/data/minecraft/structure/trail_ruins/roads/road_end_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4e2ca2809e712344e9c24795c07a806114c53b33e7e8d9a128afd77902c8c35f -size 467 +oid sha256:c76e00b1af3091ec3c0b1bd1f4e99722c8d2d8c45f786eab410f87f7f5c64ffa +size 466 diff --git a/data/minecraft/structure/trail_ruins/roads/road_section_1.nbt b/data/minecraft/structure/trail_ruins/roads/road_section_1.nbt index 01127051..d475698e 100644 --- a/data/minecraft/structure/trail_ruins/roads/road_section_1.nbt +++ b/data/minecraft/structure/trail_ruins/roads/road_section_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1dc5f3b5490705ab7e410e871a2b9fae17d56b5657d453ddfa0ffcfc54d84090 -size 706 +oid sha256:4f73495979fe6fb55d747e9dc92a8f165469afa040db574d8015b45c83d86a5e +size 705 diff --git a/data/minecraft/structure/trail_ruins/roads/road_section_2.nbt b/data/minecraft/structure/trail_ruins/roads/road_section_2.nbt index 264544f4..ed27218a 100644 --- a/data/minecraft/structure/trail_ruins/roads/road_section_2.nbt +++ b/data/minecraft/structure/trail_ruins/roads/road_section_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c35cce424163cb7644b737a8ac6d980ddc32b98ea4d33291fd9fdbf3b7d4dc3 -size 719 +oid sha256:20408b7460214266dceded721235650716c36b8e20f8b7efee4218924842d932 +size 718 diff --git a/data/minecraft/structure/trail_ruins/roads/road_section_3.nbt b/data/minecraft/structure/trail_ruins/roads/road_section_3.nbt index cb1a8d27..966bc58d 100644 --- a/data/minecraft/structure/trail_ruins/roads/road_section_3.nbt +++ b/data/minecraft/structure/trail_ruins/roads/road_section_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fe52ab8269ea31e06869adc01e116509cc9f61147cde47903aedf9baf0af9649 -size 757 +oid sha256:ca1b0bed2973caa1b0a9c43ac282da09cdebdd18eae91ab04b5362b2695dd842 +size 755 diff --git a/data/minecraft/structure/trail_ruins/roads/road_section_4.nbt b/data/minecraft/structure/trail_ruins/roads/road_section_4.nbt index 758b63fb..5985f6c0 100644 --- a/data/minecraft/structure/trail_ruins/roads/road_section_4.nbt +++ b/data/minecraft/structure/trail_ruins/roads/road_section_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a8d81bf011f7ce447a551bec81e4ccccb7d14e02fafcb69fc3f4670c4fd700c1 -size 772 +oid sha256:accd73dab8fc9553f5fcd3b8a53f83bc49e2e32283280e17e626b2a358ceb3c5 +size 771 diff --git a/data/minecraft/structure/trail_ruins/roads/road_spacer_1.nbt b/data/minecraft/structure/trail_ruins/roads/road_spacer_1.nbt index 72b0caa9..90db92de 100644 --- a/data/minecraft/structure/trail_ruins/roads/road_spacer_1.nbt +++ b/data/minecraft/structure/trail_ruins/roads/road_spacer_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a4371ff2428a011a9cf5ba163ec6106c505cdc3a030f9afb7c3b7808d0560b5e -size 644 +oid sha256:d5850f2cbda17eaf6f849ad16d08ed302ee05dff2e8ffec2da53c935d84243e0 +size 643 diff --git a/data/minecraft/structure/trail_ruins/tower/hall_1.nbt b/data/minecraft/structure/trail_ruins/tower/hall_1.nbt index 67772620..a1a4a461 100644 --- a/data/minecraft/structure/trail_ruins/tower/hall_1.nbt +++ b/data/minecraft/structure/trail_ruins/tower/hall_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6555bda901feed127456a4aa278441cb67977ea6e95e2ca30187a2f445565132 -size 1519 +oid sha256:3eb8474cb6341e520a60e14edb22666a420bd2926348ce2b0c8467de518dc5aa +size 1518 diff --git a/data/minecraft/structure/trail_ruins/tower/hall_2.nbt b/data/minecraft/structure/trail_ruins/tower/hall_2.nbt index 81fac965..0d68b4e3 100644 --- a/data/minecraft/structure/trail_ruins/tower/hall_2.nbt +++ b/data/minecraft/structure/trail_ruins/tower/hall_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:372862f43d5a41112fba2801489c17435e5beca34b7208b332442a009883ff68 -size 1894 +oid sha256:f0a7309dfec2311d3a83a8baa6832b007bffc44c4d9e5f8b31f347450742927b +size 1893 diff --git a/data/minecraft/structure/trail_ruins/tower/hall_3.nbt b/data/minecraft/structure/trail_ruins/tower/hall_3.nbt index 1aa408dc..b736e207 100644 --- a/data/minecraft/structure/trail_ruins/tower/hall_3.nbt +++ b/data/minecraft/structure/trail_ruins/tower/hall_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:166aa9384e5faf56e50bcdfb046e4606229eb6618c839c36a638098fc80571f1 -size 2140 +oid sha256:2616e832423900b1593d3325acbac6ec655f9b25ba8619fe00cbeffa05f96825 +size 2139 diff --git a/data/minecraft/structure/trail_ruins/tower/hall_4.nbt b/data/minecraft/structure/trail_ruins/tower/hall_4.nbt index c62fe34f..9fdff350 100644 --- a/data/minecraft/structure/trail_ruins/tower/hall_4.nbt +++ b/data/minecraft/structure/trail_ruins/tower/hall_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2e3a25e7cf897d11a24b073c90fdddb93d7122c38a86fdbe88efc619215b8b0a +oid sha256:3b47df197b08e55e084a788926e6d7ba58435ec7003a3c5c3d7aa8d21d73d353 size 2030 diff --git a/data/minecraft/structure/trail_ruins/tower/hall_5.nbt b/data/minecraft/structure/trail_ruins/tower/hall_5.nbt index ed305307..18cbdbbb 100644 --- a/data/minecraft/structure/trail_ruins/tower/hall_5.nbt +++ b/data/minecraft/structure/trail_ruins/tower/hall_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7ee68a75368dee8a91c2d81ddc66c379d66a4f853bea98db88958db0ab204958 -size 1873 +oid sha256:27032dfb32b04e7c1ba47f58e5a4f7a1f944557316459a320cc86b13ca96a9a4 +size 1872 diff --git a/data/minecraft/structure/trail_ruins/tower/large_hall_1.nbt b/data/minecraft/structure/trail_ruins/tower/large_hall_1.nbt index e70e103b..4d04bdb0 100644 --- a/data/minecraft/structure/trail_ruins/tower/large_hall_1.nbt +++ b/data/minecraft/structure/trail_ruins/tower/large_hall_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e88236b894dc043d9074e4bb66eb14d563e09b1c9cfcea71cf076d6b90d43a32 -size 2024 +oid sha256:7284e42f5d07f4f3a77c989b09d87798c94b56698f59e7565cd6d0b3da3e23e1 +size 2023 diff --git a/data/minecraft/structure/trail_ruins/tower/large_hall_2.nbt b/data/minecraft/structure/trail_ruins/tower/large_hall_2.nbt index 715c47cc..f4d09e75 100644 --- a/data/minecraft/structure/trail_ruins/tower/large_hall_2.nbt +++ b/data/minecraft/structure/trail_ruins/tower/large_hall_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:373ecf6b74e681d7e8e876073bd0732c440fcd2fa03c875d48008dc4ebde77a5 +oid sha256:5ec38e73ed99964786ed9494e530d0d7efaeed5eba1e285bf86699b487bb1d03 size 1965 diff --git a/data/minecraft/structure/trail_ruins/tower/large_hall_3.nbt b/data/minecraft/structure/trail_ruins/tower/large_hall_3.nbt index d3759ac3..eb45d2a8 100644 --- a/data/minecraft/structure/trail_ruins/tower/large_hall_3.nbt +++ b/data/minecraft/structure/trail_ruins/tower/large_hall_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ee1cac8891ca88746bf10ee970962da0300d5cfa160fcc552e7ce13750e9ce5d +oid sha256:0561de18580892f1b9bbaa692791a9d95fb3b59e82bdc8a08c70f9ceaced7be7 size 2023 diff --git a/data/minecraft/structure/trail_ruins/tower/large_hall_4.nbt b/data/minecraft/structure/trail_ruins/tower/large_hall_4.nbt index b206ddda..639edf22 100644 --- a/data/minecraft/structure/trail_ruins/tower/large_hall_4.nbt +++ b/data/minecraft/structure/trail_ruins/tower/large_hall_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eef43435145233b28f62b9f2165488f3acfdbf979c71954788af5d542c5812f3 +oid sha256:b9075c3820c10c573f3ff301fb2caade4d3763a259c5b83236f7dfe78558dbe0 size 1807 diff --git a/data/minecraft/structure/trail_ruins/tower/large_hall_5.nbt b/data/minecraft/structure/trail_ruins/tower/large_hall_5.nbt index 10daf43b..4180813e 100644 --- a/data/minecraft/structure/trail_ruins/tower/large_hall_5.nbt +++ b/data/minecraft/structure/trail_ruins/tower/large_hall_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5d239f8d16e0df3edf1ada01b0bfc488a68b224825162fc03d2e5ad5ce9ca994 -size 2003 +oid sha256:3e64637511387092a34de64a2279dd153082cc4a21031f0d96baf3079ab2c53f +size 2002 diff --git a/data/minecraft/structure/trail_ruins/tower/one_room_1.nbt b/data/minecraft/structure/trail_ruins/tower/one_room_1.nbt index bb930d66..beba6abb 100644 --- a/data/minecraft/structure/trail_ruins/tower/one_room_1.nbt +++ b/data/minecraft/structure/trail_ruins/tower/one_room_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:793f6717966ae1a7e1a5b1b8a75120f618cca29e03107742206b465aa350ff33 +oid sha256:38818c4a16f0c85b64bf24bf4f2454036ba46d0f9e94dad85cc742a6faaf037b size 649 diff --git a/data/minecraft/structure/trail_ruins/tower/one_room_2.nbt b/data/minecraft/structure/trail_ruins/tower/one_room_2.nbt index edbda065..6d476629 100644 --- a/data/minecraft/structure/trail_ruins/tower/one_room_2.nbt +++ b/data/minecraft/structure/trail_ruins/tower/one_room_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:183db34e52052245660a983d05c7d3eff954cff0af9baaf3231a2a6e01601ae8 +oid sha256:8305dd62a1792bf427d17762947803f63d64f6abecddb663a73424b257626f6c size 718 diff --git a/data/minecraft/structure/trail_ruins/tower/one_room_3.nbt b/data/minecraft/structure/trail_ruins/tower/one_room_3.nbt index e7b1e576..7a20d6f9 100644 --- a/data/minecraft/structure/trail_ruins/tower/one_room_3.nbt +++ b/data/minecraft/structure/trail_ruins/tower/one_room_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ad763e86448be5d52760659ca91dc86f7595fa064972189890f131e955b7d9a0 -size 624 +oid sha256:abddd13e3b6d4b830f18b3cbfdf236ae2cb33b4678d3745eb3d94b3d331c3c3c +size 623 diff --git a/data/minecraft/structure/trail_ruins/tower/one_room_4.nbt b/data/minecraft/structure/trail_ruins/tower/one_room_4.nbt index b68a85f1..5d0c93f8 100644 --- a/data/minecraft/structure/trail_ruins/tower/one_room_4.nbt +++ b/data/minecraft/structure/trail_ruins/tower/one_room_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d7f78444001698166da7805289bc14faca591d8ffbfcdcdc7171c4d34afefd91 +oid sha256:b7b6485e720e249d60f33ab449d1ea685f5146a630cba562c58fcb53d0594595 size 615 diff --git a/data/minecraft/structure/trail_ruins/tower/one_room_5.nbt b/data/minecraft/structure/trail_ruins/tower/one_room_5.nbt index 23c32079..e89a2e95 100644 --- a/data/minecraft/structure/trail_ruins/tower/one_room_5.nbt +++ b/data/minecraft/structure/trail_ruins/tower/one_room_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:03435418f6e67f02e35b37b823577754b10eb01aeb12ff183df3100c822cc95d -size 637 +oid sha256:0b87fb28aabd60deeba7bca95dee50110f764db427b27d73bc92b5d1a5c7f3a5 +size 636 diff --git a/data/minecraft/structure/trail_ruins/tower/platform_1.nbt b/data/minecraft/structure/trail_ruins/tower/platform_1.nbt index 69a84252..c1526660 100644 --- a/data/minecraft/structure/trail_ruins/tower/platform_1.nbt +++ b/data/minecraft/structure/trail_ruins/tower/platform_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:468109a6364b7b428ba2d97987613b3c4424f875d9db30e3bbaa71e1e01b7256 +oid sha256:55e1d05b1015437f408aa406b5e9d2b86baac4188079d7f68734a04b968b419b size 1196 diff --git a/data/minecraft/structure/trail_ruins/tower/platform_2.nbt b/data/minecraft/structure/trail_ruins/tower/platform_2.nbt index d3adb3f7..cff97e7e 100644 --- a/data/minecraft/structure/trail_ruins/tower/platform_2.nbt +++ b/data/minecraft/structure/trail_ruins/tower/platform_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c2cc850a901f5f80c92f291406429ab1a0c7832f6e8112b77fb9a0f63e601f3e +oid sha256:93d43bce6dafc225721c72abc2c5e590f3e95df37f639c7f6b016c0afc7c6a39 size 1135 diff --git a/data/minecraft/structure/trail_ruins/tower/platform_3.nbt b/data/minecraft/structure/trail_ruins/tower/platform_3.nbt index 0336932e..951bad80 100644 --- a/data/minecraft/structure/trail_ruins/tower/platform_3.nbt +++ b/data/minecraft/structure/trail_ruins/tower/platform_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e3023c615949733f003f04e9f1fc08d0f50ade276f328b35ac30f228d9669d06 -size 859 +oid sha256:e4dc729d53a1d103175a4e92c5744eb14ff5aab8e01c6446e37e6852a1ec2c31 +size 858 diff --git a/data/minecraft/structure/trail_ruins/tower/platform_4.nbt b/data/minecraft/structure/trail_ruins/tower/platform_4.nbt index e2d18384..380805f5 100644 --- a/data/minecraft/structure/trail_ruins/tower/platform_4.nbt +++ b/data/minecraft/structure/trail_ruins/tower/platform_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:31dbce2eeca9394995d9fb06e5ac8de8e459bb6fd6e144e2ee8b74c9e1c6d5f9 -size 1206 +oid sha256:d49dced0e568dd979dc32c272a670c4870babe6ad035b2a576235027aacd9de7 +size 1205 diff --git a/data/minecraft/structure/trail_ruins/tower/platform_5.nbt b/data/minecraft/structure/trail_ruins/tower/platform_5.nbt index f674c181..ea59560f 100644 --- a/data/minecraft/structure/trail_ruins/tower/platform_5.nbt +++ b/data/minecraft/structure/trail_ruins/tower/platform_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:223e0293262a72714a8eb73bbc306f3cc7c1cfff6dbfae48ca234c77589367e0 -size 1147 +oid sha256:55cde94fc67dc01c158f9860db317e9aef88354fbb73c6a67522ab4a10cd17ad +size 1145 diff --git a/data/minecraft/structure/trail_ruins/tower/stable_1.nbt b/data/minecraft/structure/trail_ruins/tower/stable_1.nbt index 787f3ea0..002c2675 100644 --- a/data/minecraft/structure/trail_ruins/tower/stable_1.nbt +++ b/data/minecraft/structure/trail_ruins/tower/stable_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0448a2a0b33e7c10204d06ef58f06ebb7e3adced4fafb22f10731540a4c7fab1 -size 1274 +oid sha256:639959e809402ea1b90a60d81c753ee8fb54a54488edc78e23c400b162a03696 +size 1273 diff --git a/data/minecraft/structure/trail_ruins/tower/stable_2.nbt b/data/minecraft/structure/trail_ruins/tower/stable_2.nbt index 9cf4e745..ea38411b 100644 --- a/data/minecraft/structure/trail_ruins/tower/stable_2.nbt +++ b/data/minecraft/structure/trail_ruins/tower/stable_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:279e1aca15b76ea3958893a75d9ef9055cc19474d39ce551db6698bf19224ef2 +oid sha256:a036d6b5d4fa04959eeb81bd8130adc1fdaa37d28b00a35d9a17a0ab1437e942 size 1291 diff --git a/data/minecraft/structure/trail_ruins/tower/stable_3.nbt b/data/minecraft/structure/trail_ruins/tower/stable_3.nbt index 774c52a0..3c05f12c 100644 --- a/data/minecraft/structure/trail_ruins/tower/stable_3.nbt +++ b/data/minecraft/structure/trail_ruins/tower/stable_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:39dfd300f802c62ef765b9d12da4c939b960c2d681c5feb700875bd6a63fa564 +oid sha256:c80252ba3dd122834fcbb3fc6be2ba11a6a17c097908799bd6e39a0d4ccbb60d size 1256 diff --git a/data/minecraft/structure/trail_ruins/tower/stable_4.nbt b/data/minecraft/structure/trail_ruins/tower/stable_4.nbt index b809bd09..58d2713e 100644 --- a/data/minecraft/structure/trail_ruins/tower/stable_4.nbt +++ b/data/minecraft/structure/trail_ruins/tower/stable_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2b31b265afb4d5b15279c9331a710ec88d96cd74fd8666ac19998adbd949dde2 -size 1290 +oid sha256:0cc137eec72971d6526e1bd13d62d444244910e1d4526ecd8189d6286ad897ff +size 1289 diff --git a/data/minecraft/structure/trail_ruins/tower/stable_5.nbt b/data/minecraft/structure/trail_ruins/tower/stable_5.nbt index 210cfcc0..7ea479a0 100644 --- a/data/minecraft/structure/trail_ruins/tower/stable_5.nbt +++ b/data/minecraft/structure/trail_ruins/tower/stable_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:95ef86b72d48d858bc25c1c3288faed7f6574135bef2f7695731b617e69f9113 +oid sha256:3543f849e09d53bfa0db2631a7c4961dd35eb545d54d723c70d9dff2fefaf8ad size 1035 diff --git a/data/minecraft/structure/trail_ruins/tower/tower_1.nbt b/data/minecraft/structure/trail_ruins/tower/tower_1.nbt index 5da27a92..a1a14770 100644 --- a/data/minecraft/structure/trail_ruins/tower/tower_1.nbt +++ b/data/minecraft/structure/trail_ruins/tower/tower_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c0c400d7ea41606b9a46bd34f780156ed2ce7267cb323366ea876e6fa9b787c4 -size 1585 +oid sha256:d12fea9d8239d5a94cc6f81eb239f7081f05767fcd373fedbdf3414fc2003b41 +size 1584 diff --git a/data/minecraft/structure/trail_ruins/tower/tower_2.nbt b/data/minecraft/structure/trail_ruins/tower/tower_2.nbt index 6e2b3b7d..5b334495 100644 --- a/data/minecraft/structure/trail_ruins/tower/tower_2.nbt +++ b/data/minecraft/structure/trail_ruins/tower/tower_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c85f1f4e2413d14247bcaf98991bae06d4b327ecb9cb3159fbc05122fc0a1f7 -size 1619 +oid sha256:c3f8c33311c9be71ce1f5c839ba1b016bfdb00f48353d48c7a01ee420475f6f8 +size 1617 diff --git a/data/minecraft/structure/trail_ruins/tower/tower_3.nbt b/data/minecraft/structure/trail_ruins/tower/tower_3.nbt index d69d4a2b..7fada9cd 100644 --- a/data/minecraft/structure/trail_ruins/tower/tower_3.nbt +++ b/data/minecraft/structure/trail_ruins/tower/tower_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9640544cfb237f7ebe7816d329f4efdd966ff318e6aca999d25c834912f3d32b -size 2229 +oid sha256:d5916bf866b236b7eada7a9437aca5cc8ddcf5f9ae2b3f962bd8acba26fc9629 +size 2228 diff --git a/data/minecraft/structure/trail_ruins/tower/tower_4.nbt b/data/minecraft/structure/trail_ruins/tower/tower_4.nbt index 354f66d3..a0903009 100644 --- a/data/minecraft/structure/trail_ruins/tower/tower_4.nbt +++ b/data/minecraft/structure/trail_ruins/tower/tower_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e9f108f2725593a3de9c59bf8df9bac37a5d7d59586cacc5a425245235e97ee0 -size 2091 +oid sha256:974f6c86a328e44bc16529314d7097722a36d9b05a240d2553a672dcc35fd0f3 +size 2090 diff --git a/data/minecraft/structure/trail_ruins/tower/tower_5.nbt b/data/minecraft/structure/trail_ruins/tower/tower_5.nbt index 3aa5fda3..b4281038 100644 --- a/data/minecraft/structure/trail_ruins/tower/tower_5.nbt +++ b/data/minecraft/structure/trail_ruins/tower/tower_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:694705298d02bf47cf3485f3831385ffe84dac9de19ffe1ad3c7abb9d4a3ea94 -size 2062 +oid sha256:93e42e42d31185e3bb64b5ee1b0cdb60526410b56f19cbdc3c01e627ca737677 +size 2061 diff --git a/data/minecraft/structure/trail_ruins/tower/tower_top_1.nbt b/data/minecraft/structure/trail_ruins/tower/tower_top_1.nbt index 9c5fd516..d0eb7684 100644 --- a/data/minecraft/structure/trail_ruins/tower/tower_top_1.nbt +++ b/data/minecraft/structure/trail_ruins/tower/tower_top_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bf374b874ef7416d346a75b80f8b960e09f5ab0b4bf31d564a82c0175c4dd877 -size 505 +oid sha256:6eaf3ec7eae365ddffc8b861103b3746cf56173f37d6f9a0bd57b0671a521f1a +size 504 diff --git a/data/minecraft/structure/trail_ruins/tower/tower_top_2.nbt b/data/minecraft/structure/trail_ruins/tower/tower_top_2.nbt index 4d59eeda..ffbbbeba 100644 --- a/data/minecraft/structure/trail_ruins/tower/tower_top_2.nbt +++ b/data/minecraft/structure/trail_ruins/tower/tower_top_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5bad514083ca7397f5fe5fbc6fc3a0a58745ebdecccf50f08fd936ec04cf935b -size 522 +oid sha256:b10b780c87a366de273add809d665729ba04926e3a0df092c21935a4eccd5d5d +size 521 diff --git a/data/minecraft/structure/trail_ruins/tower/tower_top_3.nbt b/data/minecraft/structure/trail_ruins/tower/tower_top_3.nbt index 32757368..7557e9f9 100644 --- a/data/minecraft/structure/trail_ruins/tower/tower_top_3.nbt +++ b/data/minecraft/structure/trail_ruins/tower/tower_top_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:91613ee95a81aaf29e29a7b5db294426be55c19c178ad31f599487d06b1d0d04 -size 501 +oid sha256:4b44c2d101f937b3725b0dd68bb62bd8c04bb4455731994fa5cb8458c02d2522 +size 500 diff --git a/data/minecraft/structure/trail_ruins/tower/tower_top_4.nbt b/data/minecraft/structure/trail_ruins/tower/tower_top_4.nbt index 1605097a..3fc5275e 100644 --- a/data/minecraft/structure/trail_ruins/tower/tower_top_4.nbt +++ b/data/minecraft/structure/trail_ruins/tower/tower_top_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:34f4ac2b44542b0c6d08b81792212def75b4d6a99e2bd2a28512bb54846ffb69 +oid sha256:c72fcfe984306ff2d9ebaa811d39a9cacea063b282f759cc6b8cd7e7f9d484a1 size 480 diff --git a/data/minecraft/structure/trail_ruins/tower/tower_top_5.nbt b/data/minecraft/structure/trail_ruins/tower/tower_top_5.nbt index e22f7226..e12ddb59 100644 --- a/data/minecraft/structure/trail_ruins/tower/tower_top_5.nbt +++ b/data/minecraft/structure/trail_ruins/tower/tower_top_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:da2c1ae06f9a706a8e3d464324655a99a078a248ffe4a274894439fd8f49a20b +oid sha256:cc33de03b1047cf3d0aae358e3a68dee518b3e933c3a92febab5065bb8d1d6eb size 406 diff --git a/data/minecraft/structure/trial_chambers/chamber/addon/c1_breeze.nbt b/data/minecraft/structure/trial_chambers/chamber/addon/c1_breeze.nbt index b1b69ba3..6727bad4 100644 --- a/data/minecraft/structure/trial_chambers/chamber/addon/c1_breeze.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/addon/c1_breeze.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f99ee53231f315f4c58ef4116119aa152260b4d11e9345f205d4295d1ea3c1a3 -size 1695 +oid sha256:75bd54cac3da41b4934f953af65f654f3de2e8efef897b6ad557af61e3bcf25b +size 1694 diff --git a/data/minecraft/structure/trial_chambers/chamber/addon/full_corner_column.nbt b/data/minecraft/structure/trial_chambers/chamber/addon/full_corner_column.nbt index d2577ef1..c197487e 100644 --- a/data/minecraft/structure/trial_chambers/chamber/addon/full_corner_column.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/addon/full_corner_column.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3bb444384fa3de83e33e2050cff451b09a2e4f939f91a4d96b9fe5528aec057b -size 4156 +oid sha256:1d50e71884da7121df4b1306c058d3e25d76ac362224ff148a65172a6936c37e +size 4157 diff --git a/data/minecraft/structure/trial_chambers/chamber/addon/full_stacked_walkway.nbt b/data/minecraft/structure/trial_chambers/chamber/addon/full_stacked_walkway.nbt index 1dab11d2..d7d8711e 100644 --- a/data/minecraft/structure/trial_chambers/chamber/addon/full_stacked_walkway.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/addon/full_stacked_walkway.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2286f1a60b6a8420bf77e31f8e05311210c9b4022f2d6fbf5fd70360bc9073bd -size 4337 +oid sha256:acb6677938d28f2931d6e1cdca6dacdc95655507bf0f15fe3b16ae5c473eaf8c +size 4336 diff --git a/data/minecraft/structure/trial_chambers/chamber/addon/full_stacked_walkway_2.nbt b/data/minecraft/structure/trial_chambers/chamber/addon/full_stacked_walkway_2.nbt index 2e558797..6fc8683e 100644 --- a/data/minecraft/structure/trial_chambers/chamber/addon/full_stacked_walkway_2.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/addon/full_stacked_walkway_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:34c5b07d5d2466c38341df61457b3cdf6bd0c0f53570747734b64ea387da441a -size 4281 +oid sha256:803851aebd7ce4dbf0ad9d08db1c6f68c30a0d76ed5434e7edb60b1fb8f2eddb +size 4280 diff --git a/data/minecraft/structure/trial_chambers/chamber/addon/grate_bridge.nbt b/data/minecraft/structure/trial_chambers/chamber/addon/grate_bridge.nbt index 4b386f0b..a3bc2bf3 100644 --- a/data/minecraft/structure/trial_chambers/chamber/addon/grate_bridge.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/addon/grate_bridge.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d36c593004773aaaa8a312eae63f9efa4e5f16d6034424bcf41b4efdae449e09 -size 1754 +oid sha256:61b96f4f019c442ed2c49abb4e505b3c3c25f2ea7cc8d282d6c6c34405b40b94 +size 1753 diff --git a/data/minecraft/structure/trial_chambers/chamber/addon/hanging_platform.nbt b/data/minecraft/structure/trial_chambers/chamber/addon/hanging_platform.nbt index 6404010c..de7be694 100644 --- a/data/minecraft/structure/trial_chambers/chamber/addon/hanging_platform.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/addon/hanging_platform.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d25f6d9bb4f411701701996780c53a613a1aff7cd11cea0be6b8a7041e11265e -size 488 +oid sha256:302d2cefede8cd755494e4965a7b27c461ba393841e3cb74a7bf9e319f9e4f85 +size 487 diff --git a/data/minecraft/structure/trial_chambers/chamber/addon/lower_staircase_down.nbt b/data/minecraft/structure/trial_chambers/chamber/addon/lower_staircase_down.nbt index 6c5b9ac3..be88fb96 100644 --- a/data/minecraft/structure/trial_chambers/chamber/addon/lower_staircase_down.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/addon/lower_staircase_down.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3fc83ac1d17e988eb4dfd3af7553e09c999340a170343f093069430d714bbcad +oid sha256:61369b54d956087402b5f5d16449f8ef5f64ca48aa79c3ae47bed1e6bf295e4d size 429 diff --git a/data/minecraft/structure/trial_chambers/chamber/addon/short_grate_platform.nbt b/data/minecraft/structure/trial_chambers/chamber/addon/short_grate_platform.nbt index 9f6c9c91..432239f4 100644 --- a/data/minecraft/structure/trial_chambers/chamber/addon/short_grate_platform.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/addon/short_grate_platform.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5a533a0b670fcb634907087e417c0a5e708a597362b3750a40fff14bd2b1f5bc +oid sha256:4c3bfa42e2be8527377b6b51e2ab004d6a8f3df2c602c3c6bca7c35d6adce253 size 800 diff --git a/data/minecraft/structure/trial_chambers/chamber/addon/short_platform.nbt b/data/minecraft/structure/trial_chambers/chamber/addon/short_platform.nbt index 75b7bb21..1a603475 100644 --- a/data/minecraft/structure/trial_chambers/chamber/addon/short_platform.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/addon/short_platform.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cc36d118750b649dde734d32be749d83d158509456b91cde3572cef3b0e2f02b -size 585 +oid sha256:0f11679d652d0369f03f0ca6bc36c66ee1c0b4b71f52823377f70579e25ce628 +size 583 diff --git a/data/minecraft/structure/trial_chambers/chamber/addon/walkway_with_bridge_1.nbt b/data/minecraft/structure/trial_chambers/chamber/addon/walkway_with_bridge_1.nbt index 3f80ad81..f00c63a6 100644 --- a/data/minecraft/structure/trial_chambers/chamber/addon/walkway_with_bridge_1.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/addon/walkway_with_bridge_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fba4c74612fcd191b40afc744a4a3c671dd036c0522afdf0c0f6704dd96209ca -size 6222 +oid sha256:6116b59f04dc75ddf80fbfc39f7b1d2ea48ee068ac0005ccf0f280aa6e11ada9 +size 6220 diff --git a/data/minecraft/structure/trial_chambers/chamber/assembly.nbt b/data/minecraft/structure/trial_chambers/chamber/assembly.nbt index 31cfdaef..f9e659e0 100644 --- a/data/minecraft/structure/trial_chambers/chamber/assembly.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/assembly.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:db894c78f0da8b44e5a0c79b351346b5ccc999416b0fe7d4c3bc9ff509c7b3df -size 54409 +oid sha256:0e80fed42a53b5c0c4fb332f4e7a7ad949fd75f38258c261de7fe26009c5506f +size 54408 diff --git a/data/minecraft/structure/trial_chambers/chamber/assembly/cover_1.nbt b/data/minecraft/structure/trial_chambers/chamber/assembly/cover_1.nbt index d41535d8..63879e0f 100644 --- a/data/minecraft/structure/trial_chambers/chamber/assembly/cover_1.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/assembly/cover_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c2546a9236b7ff319a51da439e5a9ef876d4a984f75048126d2b2ea23ef1cf9c +oid sha256:511be2262ed434d5db4e097744fd36dc5e52490a03acdf636677a811a58ea20b size 957 diff --git a/data/minecraft/structure/trial_chambers/chamber/assembly/cover_2.nbt b/data/minecraft/structure/trial_chambers/chamber/assembly/cover_2.nbt index d01f2720..1ab124bf 100644 --- a/data/minecraft/structure/trial_chambers/chamber/assembly/cover_2.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/assembly/cover_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:78cf6560d4a5947b6df06a4a79ebfc691f9ae388009dd31a71bd2e59d5707c5b -size 950 +oid sha256:802f5a1fb79a3b85358845e4b638b1943bc49f00c0b61becfd0d4ba3012030d6 +size 949 diff --git a/data/minecraft/structure/trial_chambers/chamber/assembly/cover_3.nbt b/data/minecraft/structure/trial_chambers/chamber/assembly/cover_3.nbt index 306ed7de..cc887921 100644 --- a/data/minecraft/structure/trial_chambers/chamber/assembly/cover_3.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/assembly/cover_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c4a7215d5cd5550322eb000a09075bc595d8ef1afdf78441e328b8beabcce624 +oid sha256:98493d5ed4a7c336ab3316875325458602646340c20d5cf6af7451dc0584779e size 957 diff --git a/data/minecraft/structure/trial_chambers/chamber/assembly/cover_4.nbt b/data/minecraft/structure/trial_chambers/chamber/assembly/cover_4.nbt index ab340718..2ee392fb 100644 --- a/data/minecraft/structure/trial_chambers/chamber/assembly/cover_4.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/assembly/cover_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a916c82fa22c31b5b9f2dccc0d4a4c0278f9809f03b61a1b3a0482352a15166f -size 953 +oid sha256:8d02afbda9735874f941ab86ffacc71cf54b5d8281aabcf246f2bb428740f8d5 +size 952 diff --git a/data/minecraft/structure/trial_chambers/chamber/assembly/cover_5.nbt b/data/minecraft/structure/trial_chambers/chamber/assembly/cover_5.nbt index 6c952606..57b17453 100644 --- a/data/minecraft/structure/trial_chambers/chamber/assembly/cover_5.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/assembly/cover_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e83f584a207ee3ed336cd89be1fcc7a1640b06f6fb8e5763e1a143ea2a14b396 +oid sha256:f0f91c18f28d2a59d493fe5c724f01e15bfc30802f96b561771b2122d88ac328 size 1024 diff --git a/data/minecraft/structure/trial_chambers/chamber/assembly/cover_6.nbt b/data/minecraft/structure/trial_chambers/chamber/assembly/cover_6.nbt index 0cd7251d..69191b7b 100644 --- a/data/minecraft/structure/trial_chambers/chamber/assembly/cover_6.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/assembly/cover_6.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3484d090e3be61fcacc0b3e255839c7c60558ce442ffbe75c723fff83de3d1f2 +oid sha256:68e2de18326dd978e0d74826a8ae949a5889f56da90d17e7f5d466313220ec71 size 1022 diff --git a/data/minecraft/structure/trial_chambers/chamber/assembly/cover_7.nbt b/data/minecraft/structure/trial_chambers/chamber/assembly/cover_7.nbt index 0cdc9f25..3c4bebad 100644 --- a/data/minecraft/structure/trial_chambers/chamber/assembly/cover_7.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/assembly/cover_7.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b80a71fe01ba645eb8894977c70ca7accdab1dc40401b7db08294db20cf85bb8 -size 756 +oid sha256:933ce29d317814402e8a2f16bd7f75f2dbf407c70eb393b74f12b7c06c23f23a +size 755 diff --git a/data/minecraft/structure/trial_chambers/chamber/assembly/full_column.nbt b/data/minecraft/structure/trial_chambers/chamber/assembly/full_column.nbt index 327336a3..c7e3cf5e 100644 --- a/data/minecraft/structure/trial_chambers/chamber/assembly/full_column.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/assembly/full_column.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4cf6da338fff29035d2defb4fc5bfc2bc9224b180f50fa35ea2d24505a43226f +oid sha256:5c0d3a82b162be9a4b2d63c67e9c3b482d692415da8895c2f2fe15555935757a size 661 diff --git a/data/minecraft/structure/trial_chambers/chamber/assembly/hanging_1.nbt b/data/minecraft/structure/trial_chambers/chamber/assembly/hanging_1.nbt index ffa9e32b..07e3df63 100644 --- a/data/minecraft/structure/trial_chambers/chamber/assembly/hanging_1.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/assembly/hanging_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0665f37afa2c2f5d87bbfd56a80eadd51ee75796244004c698ba97866108f51b -size 587 +oid sha256:5df11b34e18cfe4458584d13349b3668ce87638dadf72c2e017c7a48143f412f +size 586 diff --git a/data/minecraft/structure/trial_chambers/chamber/assembly/hanging_2.nbt b/data/minecraft/structure/trial_chambers/chamber/assembly/hanging_2.nbt index 2daf4a1d..9d4b1404 100644 --- a/data/minecraft/structure/trial_chambers/chamber/assembly/hanging_2.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/assembly/hanging_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c7b02ed873c224b28498a56e679d0b1e648338f70763950ce353d1fd0c4c1827 -size 869 +oid sha256:b202ddd9206c045f4b0e6b41643a39715fd5a8434d6712a8406383a88d4ec750 +size 868 diff --git a/data/minecraft/structure/trial_chambers/chamber/assembly/hanging_3.nbt b/data/minecraft/structure/trial_chambers/chamber/assembly/hanging_3.nbt index 65c6e02b..ede471ef 100644 --- a/data/minecraft/structure/trial_chambers/chamber/assembly/hanging_3.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/assembly/hanging_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b764d23c6909446e6a3ef960c18b82a4079e0870059cfec5eaf8d80500fbb2e2 -size 537 +oid sha256:6e64f818919bd30036ca777c12484a5f29bf833a88b9d8618a0a16a369c65738 +size 536 diff --git a/data/minecraft/structure/trial_chambers/chamber/assembly/hanging_4.nbt b/data/minecraft/structure/trial_chambers/chamber/assembly/hanging_4.nbt index 489bb049..3040deb9 100644 --- a/data/minecraft/structure/trial_chambers/chamber/assembly/hanging_4.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/assembly/hanging_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:68b452cd8f8ba2a5fbdce0ccf675149dadabcaa0fddbc5f7fbd8241e6a3ede96 -size 639 +oid sha256:b27f4e2265075cd1e081a3e26033573a53b84012eb3cad55380693c564f2245a +size 638 diff --git a/data/minecraft/structure/trial_chambers/chamber/assembly/hanging_5.nbt b/data/minecraft/structure/trial_chambers/chamber/assembly/hanging_5.nbt index 24efa197..7a383888 100644 --- a/data/minecraft/structure/trial_chambers/chamber/assembly/hanging_5.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/assembly/hanging_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a20ffc225f0744803729bddc69315c885ec26c02be87995789f1b299ef3684c5 -size 340 +oid sha256:423f5cb15d4f62082aff8b27d052ff6ef8cd14532db380d1ebe3a2f060c10dd8 +size 339 diff --git a/data/minecraft/structure/trial_chambers/chamber/assembly/left_staircase_1.nbt b/data/minecraft/structure/trial_chambers/chamber/assembly/left_staircase_1.nbt index 106b5f32..a92f54e4 100644 --- a/data/minecraft/structure/trial_chambers/chamber/assembly/left_staircase_1.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/assembly/left_staircase_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:675c7f6b8aa5b67c3f1b08eec0a4dd1904aff206d6465275fe47dc41de29a83e +oid sha256:21111b58afc10c1dce7f57df72b56fe3d26711a3575aec709d3e187533ebcca7 size 2462 diff --git a/data/minecraft/structure/trial_chambers/chamber/assembly/left_staircase_2.nbt b/data/minecraft/structure/trial_chambers/chamber/assembly/left_staircase_2.nbt index 8bfbf9de..aac33528 100644 --- a/data/minecraft/structure/trial_chambers/chamber/assembly/left_staircase_2.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/assembly/left_staircase_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2bd2a0e49553fd48990b5c801f3b92c6ce28de9da80c3df8d3091b20a84e0afe -size 2495 +oid sha256:923e520ff92fa472b26a214447cdbc3fed6750820cd9db04c3c53ce1b95c4fb8 +size 2494 diff --git a/data/minecraft/structure/trial_chambers/chamber/assembly/left_staircase_3.nbt b/data/minecraft/structure/trial_chambers/chamber/assembly/left_staircase_3.nbt index 2e682dd6..dd39dfbd 100644 --- a/data/minecraft/structure/trial_chambers/chamber/assembly/left_staircase_3.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/assembly/left_staircase_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:225fef580c864a742e34a2a473b72d484ae13ed5f3da324f22788044413e1180 -size 2511 +oid sha256:87ce7da1357dbb16292dea8b697b8a38457e53790bac213cb92cf0521dabde64 +size 2510 diff --git a/data/minecraft/structure/trial_chambers/chamber/assembly/platform_1.nbt b/data/minecraft/structure/trial_chambers/chamber/assembly/platform_1.nbt index 27cdcee7..719619b9 100644 --- a/data/minecraft/structure/trial_chambers/chamber/assembly/platform_1.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/assembly/platform_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4db33533e2db454977741eeea106ba4ac676adc30caea2ba22f621f8113eb34d -size 473 +oid sha256:4aa659e188982f19c662d07d5fdbd0758c039cf2fb2b60b479e2f8aa0543d374 +size 472 diff --git a/data/minecraft/structure/trial_chambers/chamber/assembly/right_staircase_1.nbt b/data/minecraft/structure/trial_chambers/chamber/assembly/right_staircase_1.nbt index a0828a1f..9286643a 100644 --- a/data/minecraft/structure/trial_chambers/chamber/assembly/right_staircase_1.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/assembly/right_staircase_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a4e9b6222a3bd98b8f72644f6f144a104e7a2dae50ced81365cf071685e8a530 -size 2424 +oid sha256:c74e1c8e3cafce3ccd07254ae0a776f243557f21503d08f40685dfa97ce53d0e +size 2423 diff --git a/data/minecraft/structure/trial_chambers/chamber/assembly/right_staircase_2.nbt b/data/minecraft/structure/trial_chambers/chamber/assembly/right_staircase_2.nbt index 253368d7..b4348dad 100644 --- a/data/minecraft/structure/trial_chambers/chamber/assembly/right_staircase_2.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/assembly/right_staircase_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aecbd7a39a35be28aa2d76a2340f29cd5cf62119ea6221bb769f5afb9b48d01c -size 2551 +oid sha256:8843906713374b223496cd386033cb9e486ae2b5739259707892e66306f732db +size 2550 diff --git a/data/minecraft/structure/trial_chambers/chamber/assembly/right_staircase_3.nbt b/data/minecraft/structure/trial_chambers/chamber/assembly/right_staircase_3.nbt index 7679d593..ce6354a5 100644 --- a/data/minecraft/structure/trial_chambers/chamber/assembly/right_staircase_3.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/assembly/right_staircase_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b61448260af4e342b218304d304afde7537ec64ee49d04e3905df616692454f -size 2558 +oid sha256:bf3ef449d7e4b33874db9a0e2b01496eabbb2c9e433272aa740990c62ed9fbf6 +size 2557 diff --git a/data/minecraft/structure/trial_chambers/chamber/assembly/spawner_1.nbt b/data/minecraft/structure/trial_chambers/chamber/assembly/spawner_1.nbt index 5989943c..c927e210 100644 --- a/data/minecraft/structure/trial_chambers/chamber/assembly/spawner_1.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/assembly/spawner_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fc2e37afe5896db151e6df747982b4ed5fb0cf4a31815f5ea83f4225a0a164e1 -size 916 +oid sha256:2526a4dc37e5e4ad83fbcc46eb44b58d3f493f4b1a1cf433b99d0c707ae7a83e +size 919 diff --git a/data/minecraft/structure/trial_chambers/chamber/chamber_1.nbt b/data/minecraft/structure/trial_chambers/chamber/chamber_1.nbt index a6288892..8ac462b8 100644 --- a/data/minecraft/structure/trial_chambers/chamber/chamber_1.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/chamber_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a8c6e5d07fbf7f7753d854e3e15ca7b5fbcfab743c406503e7f90e5ffab1a252 -size 38589 +oid sha256:0fae88df818b8ca6d4bdba48ad3298b7852d0bc0ee66ae4402cb4192d3fc894d +size 38588 diff --git a/data/minecraft/structure/trial_chambers/chamber/chamber_2.nbt b/data/minecraft/structure/trial_chambers/chamber/chamber_2.nbt index 33c7d17e..52262447 100644 --- a/data/minecraft/structure/trial_chambers/chamber/chamber_2.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/chamber_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a3ba7af853a44e4610f53e2a96ae2aafddc56ea77964a2a17e49f9ff276d0d50 -size 38938 +oid sha256:2728910e0348fe0fe5a1ffe161eb627e723407924de6b60651899efdaaba286f +size 38937 diff --git a/data/minecraft/structure/trial_chambers/chamber/chamber_4.nbt b/data/minecraft/structure/trial_chambers/chamber/chamber_4.nbt index 55c37ff7..707ac74c 100644 --- a/data/minecraft/structure/trial_chambers/chamber/chamber_4.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/chamber_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5e637cb98838c02e44104d70014864f8a30660b8da3334525846e83377645ef4 -size 24479 +oid sha256:a446486c69c96d8ac622d25812eabe0df9fca550ad45081eecd1cef22eb03673 +size 24478 diff --git a/data/minecraft/structure/trial_chambers/chamber/chamber_8.nbt b/data/minecraft/structure/trial_chambers/chamber/chamber_8.nbt index def2226e..0b590766 100644 --- a/data/minecraft/structure/trial_chambers/chamber/chamber_8.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/chamber_8.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:432df228324fa35b45a8b212ad63434540835607510a573e6abb87048b4199ed +oid sha256:938b7ed78b103b37f440c295c1a87aff31f43898527f85a36fb7eb29fb61aa85 size 19203 diff --git a/data/minecraft/structure/trial_chambers/chamber/entrance_cap.nbt b/data/minecraft/structure/trial_chambers/chamber/entrance_cap.nbt index 391c694e..4592dbef 100644 --- a/data/minecraft/structure/trial_chambers/chamber/entrance_cap.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/entrance_cap.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f5c0328898d258c1689c6e3a23fce563d72b416b5cc0014ab7728b155377c927 -size 384 +oid sha256:0e08c5c0a9275787848bedeef4c89164dc82cd48b0e8bfe6b25cd55f28d9dd6d +size 383 diff --git a/data/minecraft/structure/trial_chambers/chamber/eruption.nbt b/data/minecraft/structure/trial_chambers/chamber/eruption.nbt index 383599ef..af8a3e02 100644 --- a/data/minecraft/structure/trial_chambers/chamber/eruption.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/eruption.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c2914d5d7eeb6581986572281578922f40e577a5ccc772f12089b727aaae67f6 +oid sha256:950c6364da1e6619527cc155b8d1867944c16f50546eab5e10680b4d35622788 size 31897 diff --git a/data/minecraft/structure/trial_chambers/chamber/eruption/breeze_slice_1.nbt b/data/minecraft/structure/trial_chambers/chamber/eruption/breeze_slice_1.nbt index 77782770..c73fbb5a 100644 --- a/data/minecraft/structure/trial_chambers/chamber/eruption/breeze_slice_1.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/eruption/breeze_slice_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ec39594f65e806198e1245fce573ae93d8d58627ce20ab760464bf1d30bf56e5 -size 2594 +oid sha256:538fad9e3de76fe77cb5fdfc7cb055bd7567a21ad40ab4ac53dd659a398d6387 +size 2593 diff --git a/data/minecraft/structure/trial_chambers/chamber/eruption/center_1.nbt b/data/minecraft/structure/trial_chambers/chamber/eruption/center_1.nbt index 3ec00510..22d69068 100644 --- a/data/minecraft/structure/trial_chambers/chamber/eruption/center_1.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/eruption/center_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c8e1753c581d4d4f9a5f4a69e63b30430b9e20128f0fda4a4d9f433f2584317f -size 1537 +oid sha256:78e24dd361f4e16fc06b99a9ce9db098afecb7d4bc198ff73b0eb1368cae7579 +size 1535 diff --git a/data/minecraft/structure/trial_chambers/chamber/eruption/quadrant_1.nbt b/data/minecraft/structure/trial_chambers/chamber/eruption/quadrant_1.nbt index 57677dd8..2962a80e 100644 --- a/data/minecraft/structure/trial_chambers/chamber/eruption/quadrant_1.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/eruption/quadrant_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:19508250e4c53949c04bca527c39321ecfca2f28e7abfa9a09486acdc5552c44 -size 4438 +oid sha256:4a03bef4e8d11acde18a34f63199048d6d085ac5d9173a8e1338aad97ccb94d6 +size 4437 diff --git a/data/minecraft/structure/trial_chambers/chamber/eruption/quadrant_2.nbt b/data/minecraft/structure/trial_chambers/chamber/eruption/quadrant_2.nbt index e20b85a6..1817c039 100644 --- a/data/minecraft/structure/trial_chambers/chamber/eruption/quadrant_2.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/eruption/quadrant_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:03f4f915a42687a3bf919805c6b506e353b8dde41d3b8f69167ce97f7ecac03b -size 4602 +oid sha256:d74f175a6cad0555f77e4d1294fb271164967eeb4f8a92f4454728e99b74c5d1 +size 4601 diff --git a/data/minecraft/structure/trial_chambers/chamber/eruption/quadrant_3.nbt b/data/minecraft/structure/trial_chambers/chamber/eruption/quadrant_3.nbt index 31a6b541..d6c4b20b 100644 --- a/data/minecraft/structure/trial_chambers/chamber/eruption/quadrant_3.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/eruption/quadrant_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4db0e8b059443a80a59b36cb2b8addd12092fc3a9e539f2df2aa3750e61fffe1 -size 4684 +oid sha256:c7326b5b82113971b31ca518be7c6736992230b2eecbd05fc53aa793ade5c49f +size 4688 diff --git a/data/minecraft/structure/trial_chambers/chamber/eruption/quadrant_4.nbt b/data/minecraft/structure/trial_chambers/chamber/eruption/quadrant_4.nbt index 4b59d915..ce5a6c15 100644 --- a/data/minecraft/structure/trial_chambers/chamber/eruption/quadrant_4.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/eruption/quadrant_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:21e35e7325f3490e3fef12c1613508f25e2f027e284192418b37899d18ad3ec6 -size 4835 +oid sha256:fa76be66f217ef3a2afc58f2b3da449f8d5269795dc05577de6f98dc5d215e8a +size 4834 diff --git a/data/minecraft/structure/trial_chambers/chamber/eruption/quadrant_5.nbt b/data/minecraft/structure/trial_chambers/chamber/eruption/quadrant_5.nbt index f6ac3a71..48a062d8 100644 --- a/data/minecraft/structure/trial_chambers/chamber/eruption/quadrant_5.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/eruption/quadrant_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ee5e78e5a6cdf5abd27b9d527e39f5ec24610663cb00e932d742e76f38936c00 -size 4787 +oid sha256:b7463712792c795f2c9c026a796ec14eb90c92037f2bcb9d31f1f3bb08e2957a +size 4786 diff --git a/data/minecraft/structure/trial_chambers/chamber/eruption/slice_1.nbt b/data/minecraft/structure/trial_chambers/chamber/eruption/slice_1.nbt index 195bfd21..be8fac4c 100644 --- a/data/minecraft/structure/trial_chambers/chamber/eruption/slice_1.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/eruption/slice_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:668e3c8442251a361b01032c3cdacaa44df9f95ff1e67f09cf7130e7c29f5440 -size 2506 +oid sha256:1977bc7606f466ea522ee89d8c0b34c221e0d9a208f5f029adb324b1b315c0e6 +size 2505 diff --git a/data/minecraft/structure/trial_chambers/chamber/eruption/slice_2.nbt b/data/minecraft/structure/trial_chambers/chamber/eruption/slice_2.nbt index 9fd55a77..6c27c621 100644 --- a/data/minecraft/structure/trial_chambers/chamber/eruption/slice_2.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/eruption/slice_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:04628b4339dcd28cda378c95f5597fdf0f58b7c5f66c47b5a3871cec09096867 -size 2483 +oid sha256:1664b08bec6a3d783736092ae9752306218129a289a5ceb8c8b0ed4297bed80d +size 2482 diff --git a/data/minecraft/structure/trial_chambers/chamber/eruption/slice_3.nbt b/data/minecraft/structure/trial_chambers/chamber/eruption/slice_3.nbt index ee22b474..046d8bda 100644 --- a/data/minecraft/structure/trial_chambers/chamber/eruption/slice_3.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/eruption/slice_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bdd86ac92086c00316819000f35b3ba05c323d9da84fc896315abc272a523aeb -size 2476 +oid sha256:ebeab60caf93ba612ea65268f5074ee54d5b2c2c373d2b5b107f0a1fbb3d9990 +size 2475 diff --git a/data/minecraft/structure/trial_chambers/chamber/pedestal.nbt b/data/minecraft/structure/trial_chambers/chamber/pedestal.nbt index d81573f2..c35c6e69 100644 --- a/data/minecraft/structure/trial_chambers/chamber/pedestal.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/pedestal.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b295ab3103c3932f3f2fe1e73ecead95887b961252cc45af37174598a148991f +oid sha256:bc0fe514f8b0705062fdb66e8a1f5a92d91e81e14630d78fdf8924dddc0ed91d size 47359 diff --git a/data/minecraft/structure/trial_chambers/chamber/pedestal/center_1.nbt b/data/minecraft/structure/trial_chambers/chamber/pedestal/center_1.nbt index 9858bd1a..752c5cfb 100644 --- a/data/minecraft/structure/trial_chambers/chamber/pedestal/center_1.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/pedestal/center_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:75e5faf16607b6cb5e450776d9faf2f866f1b9b5d73917256f24700f7c82b071 -size 3678 +oid sha256:31c60901f704239fdc3a57ec9f37dfde0f940bee9118bb57d250c9b5c9ec622a +size 3677 diff --git a/data/minecraft/structure/trial_chambers/chamber/pedestal/ominous_slice_1.nbt b/data/minecraft/structure/trial_chambers/chamber/pedestal/ominous_slice_1.nbt index 6f8e6f02..01b32eb8 100644 --- a/data/minecraft/structure/trial_chambers/chamber/pedestal/ominous_slice_1.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/pedestal/ominous_slice_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:331b71a8eda9ee8122f17710185d85c0c23287ce7443316313ccc02cb7981b32 -size 1920 +oid sha256:01d7961decfaeba364e6ea93f064799db4d2a7971b97952352014b24c297ec4e +size 1919 diff --git a/data/minecraft/structure/trial_chambers/chamber/pedestal/quadrant_1.nbt b/data/minecraft/structure/trial_chambers/chamber/pedestal/quadrant_1.nbt index 2146635c..ce021e6e 100644 --- a/data/minecraft/structure/trial_chambers/chamber/pedestal/quadrant_1.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/pedestal/quadrant_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3661dbc9a9cc50baeacac35c606c2c54661117a54afb7c0155762096ff58932e -size 3462 +oid sha256:4739d45bafa3ad7507230b8ae1c6398e1a3246d189f446b503efb86d4bbff7ae +size 3461 diff --git a/data/minecraft/structure/trial_chambers/chamber/pedestal/quadrant_2.nbt b/data/minecraft/structure/trial_chambers/chamber/pedestal/quadrant_2.nbt index cc054a97..89e8e6b0 100644 --- a/data/minecraft/structure/trial_chambers/chamber/pedestal/quadrant_2.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/pedestal/quadrant_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:20a31e073feecb19e7b0b1f41c1de7641f7813f5fe6ccd83cb1fdf74f2db4c24 -size 3326 +oid sha256:bf196d9d614f099164c9965a55061a227951d9f4843562fdb3dc3c827259891c +size 3325 diff --git a/data/minecraft/structure/trial_chambers/chamber/pedestal/quadrant_3.nbt b/data/minecraft/structure/trial_chambers/chamber/pedestal/quadrant_3.nbt index 734d0941..b35f256e 100644 --- a/data/minecraft/structure/trial_chambers/chamber/pedestal/quadrant_3.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/pedestal/quadrant_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:330baee7ed6b7cda6ffa4cc8f4fd6ffecefb78fbdbd0d787cc4285644dbfcd5a -size 3910 +oid sha256:a2b49b232b2e3eba4eae94bf5d4e90e63f023a2bcad551b5287c2b2735517ec9 +size 3909 diff --git a/data/minecraft/structure/trial_chambers/chamber/pedestal/slice_1.nbt b/data/minecraft/structure/trial_chambers/chamber/pedestal/slice_1.nbt index c55e03a6..55e4f746 100644 --- a/data/minecraft/structure/trial_chambers/chamber/pedestal/slice_1.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/pedestal/slice_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c221a25e972fea2f08c26aabdf78044cc3cdada18f0468fcd9832716ced5b2fa +oid sha256:57210a6b6ecd46550b8b78099dc923d5b0c69a880f0ae5976becc36204752f1b size 1922 diff --git a/data/minecraft/structure/trial_chambers/chamber/pedestal/slice_2.nbt b/data/minecraft/structure/trial_chambers/chamber/pedestal/slice_2.nbt index e950def3..9cc62b99 100644 --- a/data/minecraft/structure/trial_chambers/chamber/pedestal/slice_2.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/pedestal/slice_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bb86f5590ffc75974fc5f10517a5d46719c3747ef2b107af874db4b08cbe3cc0 -size 1965 +oid sha256:70ebdb3673ec83f75ac881f5e4ee7c477a2c4ecd57f7a18fdfec24eecc0092eb +size 1964 diff --git a/data/minecraft/structure/trial_chambers/chamber/pedestal/slice_3.nbt b/data/minecraft/structure/trial_chambers/chamber/pedestal/slice_3.nbt index a68920b2..33904b43 100644 --- a/data/minecraft/structure/trial_chambers/chamber/pedestal/slice_3.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/pedestal/slice_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:20321a5dfd2b73ea583ee793153b5efdca27a5a15fceca0f39299bc25ac4265d -size 2011 +oid sha256:8643a8426dabc4d5c8026d63f50681d80f1be664ec0256abab132f53ed6ac473 +size 2010 diff --git a/data/minecraft/structure/trial_chambers/chamber/pedestal/slice_4.nbt b/data/minecraft/structure/trial_chambers/chamber/pedestal/slice_4.nbt index 578b9abd..7d522053 100644 --- a/data/minecraft/structure/trial_chambers/chamber/pedestal/slice_4.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/pedestal/slice_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e64d09f6653a886c56b3d9d085e3c7918a8756766ce3f54d2bc3674c4c8b3a33 -size 2019 +oid sha256:c4377bc224525498983e4a49deed62f3737316be1f5b804b48464bf5a4029405 +size 2018 diff --git a/data/minecraft/structure/trial_chambers/chamber/pedestal/slice_5.nbt b/data/minecraft/structure/trial_chambers/chamber/pedestal/slice_5.nbt index 46715e26..46fe31e4 100644 --- a/data/minecraft/structure/trial_chambers/chamber/pedestal/slice_5.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/pedestal/slice_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3b802f037ca8944763d00d9f4ab6f7a6dc23e8238272a2e7ec1476eb744cd07b -size 1971 +oid sha256:d101706d66278ba0ac1392c5334f4cf3bae6a1cd666f9ecd174f1d97a753c7c0 +size 1970 diff --git a/data/minecraft/structure/trial_chambers/chamber/slanted.nbt b/data/minecraft/structure/trial_chambers/chamber/slanted.nbt index 4231a0be..218a36a4 100644 --- a/data/minecraft/structure/trial_chambers/chamber/slanted.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/slanted.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b984607c2c0992c89da34130ff8b60a599a30467c9ddd225e4cbca0f3dd39285 -size 34273 +oid sha256:a441ceab23cdf2b05d00346d3a93cfead1620f99d84097d672176eac51bd0876 +size 34272 diff --git a/data/minecraft/structure/trial_chambers/chamber/slanted/center.nbt b/data/minecraft/structure/trial_chambers/chamber/slanted/center.nbt index 0c881b1c..ae2e665b 100644 --- a/data/minecraft/structure/trial_chambers/chamber/slanted/center.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/slanted/center.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b187a12329f7192efd64af50171ab3177ab27e8cf317fa9d0c65ef613d1efe2d +oid sha256:a3e62d957291bd22f586c395f64ecf5b2e83cf12ae0c3b6ef0deb776a76e712a size 1276 diff --git a/data/minecraft/structure/trial_chambers/chamber/slanted/hallway_1.nbt b/data/minecraft/structure/trial_chambers/chamber/slanted/hallway_1.nbt index f48631b8..3171e6ad 100644 --- a/data/minecraft/structure/trial_chambers/chamber/slanted/hallway_1.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/slanted/hallway_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:99e2a145ab64ee61d89d51b6ade2576e028c08e6e8411bcef6e7c13f0285c2de +oid sha256:9de68a4d1887b930291b4ecd7ef751b3d027682e9ec5e5141ce135f4df53bd62 size 1008 diff --git a/data/minecraft/structure/trial_chambers/chamber/slanted/hallway_2.nbt b/data/minecraft/structure/trial_chambers/chamber/slanted/hallway_2.nbt index 24da8e30..2b20e0ef 100644 --- a/data/minecraft/structure/trial_chambers/chamber/slanted/hallway_2.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/slanted/hallway_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f6bbd4c10785c4f50c609d4d1ff7b0f683915d6e9359acc0a755e0183c52ad97 -size 1133 +oid sha256:167c5978e10e35ef186bb9ba5484e2f067c8402b324fc25d563cf521bdcbe3e9 +size 1132 diff --git a/data/minecraft/structure/trial_chambers/chamber/slanted/hallway_3.nbt b/data/minecraft/structure/trial_chambers/chamber/slanted/hallway_3.nbt index 8aaaeea4..620b70eb 100644 --- a/data/minecraft/structure/trial_chambers/chamber/slanted/hallway_3.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/slanted/hallway_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:57178d6d5ffd4a199e87718ae394e231d3b58fa9b9ff926fcbc2cf0a52752326 +oid sha256:7171f020160975d2bc93a8b415c5323a39ae26cdde99eeeea6987abb38a7ebb5 size 1059 diff --git a/data/minecraft/structure/trial_chambers/chamber/slanted/ominous_upper_arm_1.nbt b/data/minecraft/structure/trial_chambers/chamber/slanted/ominous_upper_arm_1.nbt index b4af0da8..7bacb231 100644 --- a/data/minecraft/structure/trial_chambers/chamber/slanted/ominous_upper_arm_1.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/slanted/ominous_upper_arm_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ed6c1efa3d73dd00638faa639a923dbf2954d3886861f933f9e092e7b238bc92 -size 1344 +oid sha256:844b76cebe1f245e169d9d6fef93595cf22382021d4362f6fa9682c348b4c7e3 +size 1343 diff --git a/data/minecraft/structure/trial_chambers/chamber/slanted/quadrant_1.nbt b/data/minecraft/structure/trial_chambers/chamber/slanted/quadrant_1.nbt index 5a793dda..a329d039 100644 --- a/data/minecraft/structure/trial_chambers/chamber/slanted/quadrant_1.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/slanted/quadrant_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:94d64e1d800ea3daa3e7de55fca831fb9f9aed1ca4e195a7940aaf81760f7a43 +oid sha256:b177c3a914a92dcf66d66c8274b43749f47e22c5ae2a51730887b36713594d72 size 3431 diff --git a/data/minecraft/structure/trial_chambers/chamber/slanted/quadrant_2.nbt b/data/minecraft/structure/trial_chambers/chamber/slanted/quadrant_2.nbt index 14742a19..56c369ed 100644 --- a/data/minecraft/structure/trial_chambers/chamber/slanted/quadrant_2.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/slanted/quadrant_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4b7f3419c4ba135af9a82e27aaf9542b309b66338738f6bef29d8a4267cba0d5 +oid sha256:03e059eefcaf5e61a82002de52803d5f14fbb1ccbc80f0fb69c87e459a3a8437 size 3446 diff --git a/data/minecraft/structure/trial_chambers/chamber/slanted/quadrant_3.nbt b/data/minecraft/structure/trial_chambers/chamber/slanted/quadrant_3.nbt index 7fb0ca03..14da9dc4 100644 --- a/data/minecraft/structure/trial_chambers/chamber/slanted/quadrant_3.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/slanted/quadrant_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:716549066edeceefe0c1e22ecafdb782fcc504eaa1299de091aafc307deb3dc8 +oid sha256:1dd6e5bae1d037621281a08a4c6802d2a6c761d5ab79d276d73b161666b4260c size 3436 diff --git a/data/minecraft/structure/trial_chambers/chamber/slanted/quadrant_4.nbt b/data/minecraft/structure/trial_chambers/chamber/slanted/quadrant_4.nbt index aa34db1d..7af02a17 100644 --- a/data/minecraft/structure/trial_chambers/chamber/slanted/quadrant_4.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/slanted/quadrant_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1ffecc8da9674bd5d8866f74c493d47a555cb3898a54aa315a60e746990db0c2 -size 4326 +oid sha256:7a5056f9ce07e3eaca28fab053c2c9b05ef9bf5dd3cfeef15815cd01454dcaa0 +size 4325 diff --git a/data/minecraft/structure/trial_chambers/chamber/slanted/ramp_1.nbt b/data/minecraft/structure/trial_chambers/chamber/slanted/ramp_1.nbt index 23f4f9f9..9d7f262e 100644 --- a/data/minecraft/structure/trial_chambers/chamber/slanted/ramp_1.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/slanted/ramp_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:36847877135397a449c9f12b1cc6697453b59c929b5dbeee82a98378556dde1a +oid sha256:9725f08cba3f6c4d7e6d3ffc74b063352e3a439c03473eeae5f546d919403ab9 size 1324 diff --git a/data/minecraft/structure/trial_chambers/chamber/slanted/ramp_2.nbt b/data/minecraft/structure/trial_chambers/chamber/slanted/ramp_2.nbt index 36f9f88d..2fdf1695 100644 --- a/data/minecraft/structure/trial_chambers/chamber/slanted/ramp_2.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/slanted/ramp_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5f2379dd777a2e9610001b50e0898c55d52a7d9a248f892143dda684225b494d -size 1319 +oid sha256:e6c97bf70a54a616954e3981514fdc5f9cac864252f940d0a7065e8207f988c4 +size 1317 diff --git a/data/minecraft/structure/trial_chambers/chamber/slanted/ramp_3.nbt b/data/minecraft/structure/trial_chambers/chamber/slanted/ramp_3.nbt index 44f5da17..fc6491ef 100644 --- a/data/minecraft/structure/trial_chambers/chamber/slanted/ramp_3.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/slanted/ramp_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:33a72af41000038a81f25ecdc91b80df376d30d7db83a0b656ea684938834a84 -size 1453 +oid sha256:79c6e6dab616d52b095db16942c98f0ef9eabe536742d34a694e8d045cd9c799 +size 1451 diff --git a/data/minecraft/structure/trial_chambers/chamber/slanted/ramp_4.nbt b/data/minecraft/structure/trial_chambers/chamber/slanted/ramp_4.nbt index 904a0cf6..11cce32d 100644 --- a/data/minecraft/structure/trial_chambers/chamber/slanted/ramp_4.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/slanted/ramp_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8a8c99e63cfca10267a039c203e15cf96e58adf644006923284672fe1881cfcd -size 1232 +oid sha256:a782ec308cf495c54b2e8a0f2b833ea9c2f1491a0068456deb6ecc0365cb4d76 +size 1231 diff --git a/data/minecraft/structure/trial_chambers/chests/connectors/supply.nbt b/data/minecraft/structure/trial_chambers/chests/connectors/supply.nbt index 3dac102b..f4163cca 100644 --- a/data/minecraft/structure/trial_chambers/chests/connectors/supply.nbt +++ b/data/minecraft/structure/trial_chambers/chests/connectors/supply.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0fde573e8d394658bed123d8254680c37a7b4b85f150f60673273c1a71e8e658 -size 355 +oid sha256:82b1b9ab362dc88f1e7517d385547458d3ef80fef81158e7517cfeee42d02b9a +size 354 diff --git a/data/minecraft/structure/trial_chambers/chests/supply.nbt b/data/minecraft/structure/trial_chambers/chests/supply.nbt index ec690e78..bde33957 100644 --- a/data/minecraft/structure/trial_chambers/chests/supply.nbt +++ b/data/minecraft/structure/trial_chambers/chests/supply.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:68ff0fb04c804e18705fda445021b1112b9bd4c0c7185a5dac296596dd1367bf -size 440 +oid sha256:75203742f80245dc447642b2f70f25c18e706f88ae0434ec2e85060d0e7b9056 +size 439 diff --git a/data/minecraft/structure/trial_chambers/corridor/addon/arrow_dispenser.nbt b/data/minecraft/structure/trial_chambers/corridor/addon/arrow_dispenser.nbt index 04b18aa5..c8a807d5 100644 --- a/data/minecraft/structure/trial_chambers/corridor/addon/arrow_dispenser.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/addon/arrow_dispenser.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:532eb16fb777b8dd89dca5bb213b0870bf541ecb5cef2a9f380c883211b6f772 -size 835 +oid sha256:8b20f039aabdfde57cc24d2dc425f021f7d2969d28697690019fbe25063c41e9 +size 834 diff --git a/data/minecraft/structure/trial_chambers/corridor/addon/bridge_lower.nbt b/data/minecraft/structure/trial_chambers/corridor/addon/bridge_lower.nbt index b7bd70c1..815cd2ae 100644 --- a/data/minecraft/structure/trial_chambers/corridor/addon/bridge_lower.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/addon/bridge_lower.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5d5c51a6c9f1b553ed7ae9e89eb12d7ae7a9aa048e62b7f86204919b5b7269bb -size 698 +oid sha256:cbbdd83e7b702cedbec7cf78ac7d5da96548a85ae6471c6daca9cce6a92f494c +size 697 diff --git a/data/minecraft/structure/trial_chambers/corridor/addon/chandelier_upper.nbt b/data/minecraft/structure/trial_chambers/corridor/addon/chandelier_upper.nbt index b1450c2b..44867494 100644 --- a/data/minecraft/structure/trial_chambers/corridor/addon/chandelier_upper.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/addon/chandelier_upper.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:156ad800d5d496b1dcf13688bbee3d528ba45cf6ef0548a5659576aea9b018e9 -size 514 +oid sha256:b881cc141a2716bd772f154d60ed8a4ef7f07cfb3045f5ce8bf2c2ad9f69e4ca +size 513 diff --git a/data/minecraft/structure/trial_chambers/corridor/addon/decoration_upper.nbt b/data/minecraft/structure/trial_chambers/corridor/addon/decoration_upper.nbt index 2b85f42d..1943fe94 100644 --- a/data/minecraft/structure/trial_chambers/corridor/addon/decoration_upper.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/addon/decoration_upper.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:800c3753bd9c66f7afff6e12dc09a585e28790a6e22c680fad6e16bb150ff872 -size 514 +oid sha256:05843b8c9b8c8e0a08a185379c7104e05e4dab95ba7cc55c992bc071dc829ce7 +size 513 diff --git a/data/minecraft/structure/trial_chambers/corridor/addon/display_1.nbt b/data/minecraft/structure/trial_chambers/corridor/addon/display_1.nbt index 71a232ea..19343dba 100644 --- a/data/minecraft/structure/trial_chambers/corridor/addon/display_1.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/addon/display_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b9673a2b70fa92bb1bcac56cffaa3001f6eeaccfa262c82c1acc92b105be1630 -size 901 +oid sha256:f35eff787b1969c6eca94e142c2470dde226e428f54fbbcbe2a9c972faa4a95c +size 899 diff --git a/data/minecraft/structure/trial_chambers/corridor/addon/display_2.nbt b/data/minecraft/structure/trial_chambers/corridor/addon/display_2.nbt index d955a846..8672c2c6 100644 --- a/data/minecraft/structure/trial_chambers/corridor/addon/display_2.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/addon/display_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8b7c4e7cc24131893045db4708264ed7817a40d2cdedb0d3fa6330bc089c7c6e -size 1528 +oid sha256:8de7f226e9e9662b7058cb09649c7404ceae20a6f1b353384d4b8c5359d51f6f +size 1527 diff --git a/data/minecraft/structure/trial_chambers/corridor/addon/display_3.nbt b/data/minecraft/structure/trial_chambers/corridor/addon/display_3.nbt index a0d54316..2ac06632 100644 --- a/data/minecraft/structure/trial_chambers/corridor/addon/display_3.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/addon/display_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9a5c413e8f8e4a0f145d69ae4de050ec2bfe371612f28b5b57fc48630e4a2e8c -size 812 +oid sha256:1e38cf8053f46aadec6f42bca587883ea1b1678b029e97b3760e8e05e8a2062d +size 811 diff --git a/data/minecraft/structure/trial_chambers/corridor/addon/head_upper.nbt b/data/minecraft/structure/trial_chambers/corridor/addon/head_upper.nbt index f7115ca5..fcccc81c 100644 --- a/data/minecraft/structure/trial_chambers/corridor/addon/head_upper.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/addon/head_upper.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dc8b35e37dff3f53091a2262a5d32b254f6ea0b9fb29860005b6911210ffe5ea -size 526 +oid sha256:162350f7e477d8d4260b8755fe8d9921c3bf9a76b408890498225eb6aade8590 +size 525 diff --git a/data/minecraft/structure/trial_chambers/corridor/addon/ladder_to_middle.nbt b/data/minecraft/structure/trial_chambers/corridor/addon/ladder_to_middle.nbt index 50d1c12b..fb848586 100644 --- a/data/minecraft/structure/trial_chambers/corridor/addon/ladder_to_middle.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/addon/ladder_to_middle.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:55b9b28c0bc3490395fc22465831618c6101ac9d9943bc93c4dc77924632ada1 -size 670 +oid sha256:6ce790afe6f47c5e6a7458f8f9baa8efc98beba4a988b07cec75107c2d7a2592 +size 669 diff --git a/data/minecraft/structure/trial_chambers/corridor/addon/open_walkway.nbt b/data/minecraft/structure/trial_chambers/corridor/addon/open_walkway.nbt index 5cc8dc7a..38c78493 100644 --- a/data/minecraft/structure/trial_chambers/corridor/addon/open_walkway.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/addon/open_walkway.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:486bf7f9363451c7f1f1236127f8e3432642ef75a6d6371d56d77c1658af7a55 -size 1161 +oid sha256:8d6087b7d390fc6e3dad9e49efa6efca9b6c9022dc307415c514f2ecf5312a29 +size 1160 diff --git a/data/minecraft/structure/trial_chambers/corridor/addon/open_walkway_upper.nbt b/data/minecraft/structure/trial_chambers/corridor/addon/open_walkway_upper.nbt index fd8e6baa..c10d48bd 100644 --- a/data/minecraft/structure/trial_chambers/corridor/addon/open_walkway_upper.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/addon/open_walkway_upper.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:35c3ec728d2d798ad7725babf4560c148f8f372dada951a8b12d599403eca1d7 -size 587 +oid sha256:6e42d1ceb5b32a0f5c87ed876ace2566f57ace17c651611aea5558043215059a +size 586 diff --git a/data/minecraft/structure/trial_chambers/corridor/addon/reward_upper.nbt b/data/minecraft/structure/trial_chambers/corridor/addon/reward_upper.nbt index ea90477b..7b9b530c 100644 --- a/data/minecraft/structure/trial_chambers/corridor/addon/reward_upper.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/addon/reward_upper.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2a6393e09c4de0fdd9762bd387b356c30b0121bec76ff62ffb01ee61b4e7a3dc -size 590 +oid sha256:35d0ebf762aa0b687b5c42d381b1492e8b36a9b7b564a8b34fdffae22ca70ac5 +size 588 diff --git a/data/minecraft/structure/trial_chambers/corridor/addon/staircase.nbt b/data/minecraft/structure/trial_chambers/corridor/addon/staircase.nbt index a916e27d..001e173e 100644 --- a/data/minecraft/structure/trial_chambers/corridor/addon/staircase.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/addon/staircase.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c4e1cba468e358e2d61f5e0b84c4dd2d6a86ea27e8fbf49f9f2ec8634ed1d067 -size 457 +oid sha256:9ede6c93587379d3b6e6d1ef6b8a32ce93dc1017315a3f72a593bd37461b500d +size 456 diff --git a/data/minecraft/structure/trial_chambers/corridor/addon/wall.nbt b/data/minecraft/structure/trial_chambers/corridor/addon/wall.nbt index 880b92f6..47328da1 100644 --- a/data/minecraft/structure/trial_chambers/corridor/addon/wall.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/addon/wall.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4bdf1b43d9df51f1aeda37db6dcad60ca64a4cc9ecb71ec8eff7cbbdb0d143e9 -size 909 +oid sha256:4a3b63e55b6f780409fa911fd009a3e25874a19c61ac2bbc50e2718dfc849e7e +size 908 diff --git a/data/minecraft/structure/trial_chambers/corridor/addon/walled_walkway.nbt b/data/minecraft/structure/trial_chambers/corridor/addon/walled_walkway.nbt index 5759e8ca..92e821cf 100644 --- a/data/minecraft/structure/trial_chambers/corridor/addon/walled_walkway.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/addon/walled_walkway.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a4963cef102f5160f0fe5635b777f6472e2c987818dd20e858000fc0c09b002a -size 1187 +oid sha256:4999de7a418c35d6f09d760019390dc4fcb5d269935b0b9d6b91d2e16930334a +size 1186 diff --git a/data/minecraft/structure/trial_chambers/corridor/atrium/bogged_relief.nbt b/data/minecraft/structure/trial_chambers/corridor/atrium/bogged_relief.nbt index 92f6c32a..fc11b40e 100644 --- a/data/minecraft/structure/trial_chambers/corridor/atrium/bogged_relief.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/atrium/bogged_relief.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d75d6a0b99d2d37be081ddada6ccd6a237ef2092e83f04ae9fdefeb105e231d2 -size 3245 +oid sha256:6477d27e9afbb946bd3a430309f79163195bf8d7a2a3f9c684a375e80c432486 +size 3244 diff --git a/data/minecraft/structure/trial_chambers/corridor/atrium/breeze_relief.nbt b/data/minecraft/structure/trial_chambers/corridor/atrium/breeze_relief.nbt index 3cf60307..ff4f34fe 100644 --- a/data/minecraft/structure/trial_chambers/corridor/atrium/breeze_relief.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/atrium/breeze_relief.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a587c41a1e95087052d7f1a124224fff571eb2fe97593bbfb7ac54f3827815d3 -size 3224 +oid sha256:e114da5f2dd9f53321916e404ab8d2cea9fc285cbccf817f60c58efc2ac34106 +size 3222 diff --git a/data/minecraft/structure/trial_chambers/corridor/atrium/grand_staircase_1.nbt b/data/minecraft/structure/trial_chambers/corridor/atrium/grand_staircase_1.nbt index 5c6139fa..722a3c08 100644 --- a/data/minecraft/structure/trial_chambers/corridor/atrium/grand_staircase_1.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/atrium/grand_staircase_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a1303c85e302960e6660e2373d282b7ca104227ebf74717f874e599fa1f19788 -size 2884 +oid sha256:1a15e5d6a4c07ecac68c1768bfa32ae63323cbb4d5d69afc9074d3def52e9a04 +size 2883 diff --git a/data/minecraft/structure/trial_chambers/corridor/atrium/grand_staircase_2.nbt b/data/minecraft/structure/trial_chambers/corridor/atrium/grand_staircase_2.nbt index 20cac789..a06d4b22 100644 --- a/data/minecraft/structure/trial_chambers/corridor/atrium/grand_staircase_2.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/atrium/grand_staircase_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:94053b9593b8714a403679eb2fe66dea6454fc073648b3a953ce2a5b463a033c -size 2821 +oid sha256:3d1e9fafa7f0a9f63c32ee159684727d74400e37069ff276b04d14de0537f693 +size 2820 diff --git a/data/minecraft/structure/trial_chambers/corridor/atrium/grand_staircase_3.nbt b/data/minecraft/structure/trial_chambers/corridor/atrium/grand_staircase_3.nbt index 6a96caf5..d793d65a 100644 --- a/data/minecraft/structure/trial_chambers/corridor/atrium/grand_staircase_3.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/atrium/grand_staircase_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:07e7f175a7951f3eac8c38a23e0b2b16c69b54f23997d74307178ae83ba34d63 -size 2831 +oid sha256:a907c15760045c5eb292f181544c5cfb68871bedde1dea1a24431e508821b2a4 +size 2830 diff --git a/data/minecraft/structure/trial_chambers/corridor/atrium/spider_relief.nbt b/data/minecraft/structure/trial_chambers/corridor/atrium/spider_relief.nbt index 51d70b94..59e8aa06 100644 --- a/data/minecraft/structure/trial_chambers/corridor/atrium/spider_relief.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/atrium/spider_relief.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b968a924d2928fda0b15057ab8746e7fca90a983b04c34c0e2c2002905c54238 +oid sha256:5713e78ee8ab8c8fe69b5958475c7ad764f59096e74de305b22c784cfca147b6 size 3849 diff --git a/data/minecraft/structure/trial_chambers/corridor/atrium/spiral_relief.nbt b/data/minecraft/structure/trial_chambers/corridor/atrium/spiral_relief.nbt index 0ccd1658..0eca4393 100644 --- a/data/minecraft/structure/trial_chambers/corridor/atrium/spiral_relief.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/atrium/spiral_relief.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1e91518beb403cb6ac2c54899b2bc0c22c7eae54f6a363a6e7bdded6028ae597 -size 3317 +oid sha256:66759e09527dd44a2b0c6c71fb03288b0faec2d0ce9dc4ada452b226e131fb4f +size 3316 diff --git a/data/minecraft/structure/trial_chambers/corridor/atrium_1.nbt b/data/minecraft/structure/trial_chambers/corridor/atrium_1.nbt index a2361e5f..fa52d4a7 100644 --- a/data/minecraft/structure/trial_chambers/corridor/atrium_1.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/atrium_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eb07c940b52744a466d8780269dad6a3a9a0457cdcd960cfb228e7bbe9f0b76f -size 23427 +oid sha256:1ca6f4b9e2f1c9afa6deadbc58ac53b48d50e92b133f0a192e9cefda8c34d349 +size 23426 diff --git a/data/minecraft/structure/trial_chambers/corridor/end_1.nbt b/data/minecraft/structure/trial_chambers/corridor/end_1.nbt index 9f895c8c..887c85a6 100644 --- a/data/minecraft/structure/trial_chambers/corridor/end_1.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/end_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:11c106c1afc3a392dac32ec26d28b89a06f25931ba3497715a42e4712c1f9406 -size 21446 +oid sha256:a230bfada0b2180884b66c39af3c1848d9647c79486d1728e97199b0ecfb8fb4 +size 21445 diff --git a/data/minecraft/structure/trial_chambers/corridor/end_2.nbt b/data/minecraft/structure/trial_chambers/corridor/end_2.nbt index 4125a818..12cf76d2 100644 --- a/data/minecraft/structure/trial_chambers/corridor/end_2.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/end_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:be9ade1acde4400861f9010f7e2ae1ed290850bfbe2e061feab991664ee683b0 -size 21889 +oid sha256:0c72ac13c36b63166da9ec3d66e1b5e9c8fec285b7c479d5f6b1d4659dfe4051 +size 21887 diff --git a/data/minecraft/structure/trial_chambers/corridor/entrance_1.nbt b/data/minecraft/structure/trial_chambers/corridor/entrance_1.nbt index b8bd3e07..de84551c 100644 --- a/data/minecraft/structure/trial_chambers/corridor/entrance_1.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/entrance_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:231b1735adb8ad38a1cad8329cb2e81d49d8d3bf67882c70ea3551a05ebe5cbf -size 22026 +oid sha256:c60d3b6f4db27038f7c9f44ad0e1796a526ba092e3f65135cb86c96f518b3946 +size 22024 diff --git a/data/minecraft/structure/trial_chambers/corridor/entrance_2.nbt b/data/minecraft/structure/trial_chambers/corridor/entrance_2.nbt index 42494c6d..5dc315f8 100644 --- a/data/minecraft/structure/trial_chambers/corridor/entrance_2.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/entrance_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:71d8c35e9afdcb29f33bfcdaedd0ab3b654ef356ff46156f1832885c12111412 -size 21600 +oid sha256:1fffa95ed0a917deabe5f3586d82c0ae52836e50dd2d57928cc630a2284b3866 +size 21599 diff --git a/data/minecraft/structure/trial_chambers/corridor/entrance_3.nbt b/data/minecraft/structure/trial_chambers/corridor/entrance_3.nbt index 24b3be3e..8aafab4b 100644 --- a/data/minecraft/structure/trial_chambers/corridor/entrance_3.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/entrance_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f197db17dbcc44aa831a39912f55f44fbf4bde2f93afa4bc0ea5ce68ff656e07 -size 24031 +oid sha256:99f956c8e3de9c03fe219f4c03fe569dc270ab465d96672a5fd0640dfb013d18 +size 24029 diff --git a/data/minecraft/structure/trial_chambers/corridor/first_plate.nbt b/data/minecraft/structure/trial_chambers/corridor/first_plate.nbt index 2e5e7dfb..8b83f2b1 100644 --- a/data/minecraft/structure/trial_chambers/corridor/first_plate.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/first_plate.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6d892cdaa068013a48d1241505913204ca5b7b46c1b98ccb3596d9795430a772 -size 1473 +oid sha256:bbca06ee5f77daab8f4b633913eb44e751b7c3654bb8f38047a19bc848484dc6 +size 1472 diff --git a/data/minecraft/structure/trial_chambers/corridor/second_plate.nbt b/data/minecraft/structure/trial_chambers/corridor/second_plate.nbt index 08951f1c..fa159250 100644 --- a/data/minecraft/structure/trial_chambers/corridor/second_plate.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/second_plate.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:880716d15554ffd4fed04dbf1b1026b1c81382ef71a73e1e334eef9058895f51 -size 1478 +oid sha256:a9d1a636f68dfc2c201f555128a95d8535b9a4c500c53abb1c8fe206f6bb1c67 +size 1477 diff --git a/data/minecraft/structure/trial_chambers/corridor/straight_1.nbt b/data/minecraft/structure/trial_chambers/corridor/straight_1.nbt index 46da6ab5..1c0c1d5b 100644 --- a/data/minecraft/structure/trial_chambers/corridor/straight_1.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/straight_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8e54e41f3a3b165af77e075ad5f38c3368fdb4490c4689dcc37459b9d08c31dd +oid sha256:993a953506dc4e2a3712e3472e712dde07a8076f1eeb788d7e218bcb57330c10 size 5672 diff --git a/data/minecraft/structure/trial_chambers/corridor/straight_2.nbt b/data/minecraft/structure/trial_chambers/corridor/straight_2.nbt index ce8d67c3..30e1c09b 100644 --- a/data/minecraft/structure/trial_chambers/corridor/straight_2.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/straight_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3fb3f5e3e0f92ce6782bcf47c9504a696a46b96c330670a2369e7500104baa65 +oid sha256:ed82a53b01c910788a5c1844e2e79fd9789e33e7a95e77ef8f69c3f54ba74e86 size 5848 diff --git a/data/minecraft/structure/trial_chambers/corridor/straight_3.nbt b/data/minecraft/structure/trial_chambers/corridor/straight_3.nbt index f8eb60b5..56f6f4a4 100644 --- a/data/minecraft/structure/trial_chambers/corridor/straight_3.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/straight_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fca6dfd5ee9592672a7c4713eef0116bd4be04d8d47859c479e15281caa1eaa8 -size 5821 +oid sha256:99a00e1437a6b2db6eca263475a6dfb97498895ffe09a5b4d5ed0678f0b56ed6 +size 5820 diff --git a/data/minecraft/structure/trial_chambers/corridor/straight_4.nbt b/data/minecraft/structure/trial_chambers/corridor/straight_4.nbt index 87af3515..dd20b8e0 100644 --- a/data/minecraft/structure/trial_chambers/corridor/straight_4.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/straight_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7dc689c3ca56fdcaf72c7352f1757c7754a64636f1c105b7613f986b79c96750 -size 5815 +oid sha256:240005f5c9d7cb32696c23dc728dba1f0715d9e477357074346be713db10ebf7 +size 5814 diff --git a/data/minecraft/structure/trial_chambers/corridor/straight_5.nbt b/data/minecraft/structure/trial_chambers/corridor/straight_5.nbt index 6b3d20e5..d6e152d6 100644 --- a/data/minecraft/structure/trial_chambers/corridor/straight_5.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/straight_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d61e4ba84dece1875e20e87642e58f2ec934422f7ccbf6becdae1e8f77118385 -size 5822 +oid sha256:1daa98529930310eaf982588152b32736b1d13c4e679ab8702ced977f7871b3b +size 5821 diff --git a/data/minecraft/structure/trial_chambers/corridor/straight_6.nbt b/data/minecraft/structure/trial_chambers/corridor/straight_6.nbt index d17d8f79..c1b47e1c 100644 --- a/data/minecraft/structure/trial_chambers/corridor/straight_6.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/straight_6.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:be0495335016b21f3ea046ee8c54ecdb4ed5f6ba5d7d45f4aa0f884e9c73055e -size 5788 +oid sha256:3ab43d8e9155d54f96927c7a495537ff2365d75d9cb0a0f944bef34512201cee +size 5787 diff --git a/data/minecraft/structure/trial_chambers/corridor/straight_7.nbt b/data/minecraft/structure/trial_chambers/corridor/straight_7.nbt index fbcc2a48..ed3a85f7 100644 --- a/data/minecraft/structure/trial_chambers/corridor/straight_7.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/straight_7.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8058ca53f3214266270386e87d3341ce650a55dcf22a755f24785fe81124fa73 -size 5777 +oid sha256:e746f44e796baf13ec5e67350d0dd4b257e5e0c5afc03c239a6f5d51070afa04 +size 5776 diff --git a/data/minecraft/structure/trial_chambers/corridor/straight_8.nbt b/data/minecraft/structure/trial_chambers/corridor/straight_8.nbt index e085c7dd..ce6485f2 100644 --- a/data/minecraft/structure/trial_chambers/corridor/straight_8.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/straight_8.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:745a5f94b9b94deb7cf4090a38577423cad48cabeeed4a1acbe3824c36401afd +oid sha256:b8b4915795ea66d5db5761d0caee00b2a243946a33cdcedb168a39d0d45f128e size 5562 diff --git a/data/minecraft/structure/trial_chambers/decor/barrel.nbt b/data/minecraft/structure/trial_chambers/decor/barrel.nbt index d84c720c..3c6ccb8a 100644 --- a/data/minecraft/structure/trial_chambers/decor/barrel.nbt +++ b/data/minecraft/structure/trial_chambers/decor/barrel.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0a6fee458d6f59d2a3d92b159f67d217697fcee32ada3b5b9577136ec4c848e8 -size 337 +oid sha256:39a95415f502f7be4324286f43c5f464b756abc53c06d1f75931bd696e49a71d +size 336 diff --git a/data/minecraft/structure/trial_chambers/decor/black_bed.nbt b/data/minecraft/structure/trial_chambers/decor/black_bed.nbt index a81a9c05..93f35b4d 100644 --- a/data/minecraft/structure/trial_chambers/decor/black_bed.nbt +++ b/data/minecraft/structure/trial_chambers/decor/black_bed.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2e89546d0cb54f00f0a60497f98ebb3b05496d0f22bcad79e23ecf543e53b66d -size 327 +oid sha256:07f5276c014c4e98d6386da0061fa08e943e4ec1437e058b0f7dc68f85d1cb05 +size 326 diff --git a/data/minecraft/structure/trial_chambers/decor/blue_bed.nbt b/data/minecraft/structure/trial_chambers/decor/blue_bed.nbt index caeac9c8..70439d3d 100644 --- a/data/minecraft/structure/trial_chambers/decor/blue_bed.nbt +++ b/data/minecraft/structure/trial_chambers/decor/blue_bed.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e173866bd6eefa8f37990754f7a0845423a9a2319a21a48e91b3ceb0988714bf -size 325 +oid sha256:ff2573abc22075eb4f80cda9d081ca9274e6d12874b780fa8ff15458f1257461 +size 324 diff --git a/data/minecraft/structure/trial_chambers/decor/brown_bed.nbt b/data/minecraft/structure/trial_chambers/decor/brown_bed.nbt index 1d477f31..7aeeb44c 100644 --- a/data/minecraft/structure/trial_chambers/decor/brown_bed.nbt +++ b/data/minecraft/structure/trial_chambers/decor/brown_bed.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a7f50ec522b2e760c640c41412458cdaeaa2c18469a241fdd1a5aa3d7399cc1e -size 327 +oid sha256:026db297c9dc1552430e239c7d25f72366920700ffab970bea8e42a194ca743a +size 326 diff --git a/data/minecraft/structure/trial_chambers/decor/candle_1.nbt b/data/minecraft/structure/trial_chambers/decor/candle_1.nbt index 4e738865..9c2a9379 100644 --- a/data/minecraft/structure/trial_chambers/decor/candle_1.nbt +++ b/data/minecraft/structure/trial_chambers/decor/candle_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:07374a44772c6f378ed238ea9ef5f779b1019f245bd539c24813d29575e8d1b7 +oid sha256:9bca9a33fbfd78f0a17215078eff4ec834fa632d1201e5062fc57d878f00697d size 307 diff --git a/data/minecraft/structure/trial_chambers/decor/candle_2.nbt b/data/minecraft/structure/trial_chambers/decor/candle_2.nbt index 96b6a086..7f43acff 100644 --- a/data/minecraft/structure/trial_chambers/decor/candle_2.nbt +++ b/data/minecraft/structure/trial_chambers/decor/candle_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b463e889494d370408e097f54b23161db4a92d71581b1e7b99b60a34c12fea14 +oid sha256:f3110cdd2d2392ca2f24c760106649a8f52ff523e2a104cce40bf8a5528e24aa size 307 diff --git a/data/minecraft/structure/trial_chambers/decor/candle_3.nbt b/data/minecraft/structure/trial_chambers/decor/candle_3.nbt index 507f4d2a..b48396b1 100644 --- a/data/minecraft/structure/trial_chambers/decor/candle_3.nbt +++ b/data/minecraft/structure/trial_chambers/decor/candle_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7346e76067b3a83dd0a72a653e3bc2e968847d79e1a13bd05e132dd64f520ee1 +oid sha256:1916770407069e3ec883c5ef216b9759024ce792fa6dbbfc56082a5c6bc54f7d size 307 diff --git a/data/minecraft/structure/trial_chambers/decor/candle_4.nbt b/data/minecraft/structure/trial_chambers/decor/candle_4.nbt index f6103c07..4dd403c0 100644 --- a/data/minecraft/structure/trial_chambers/decor/candle_4.nbt +++ b/data/minecraft/structure/trial_chambers/decor/candle_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:57fbb95e970572caf4221a544a07a4456717863ce7da8e0d312de8f1c679e41b +oid sha256:6651df879477d0124974912ba6fd13193224c61d0817c5c6bf471955ea135073 size 307 diff --git a/data/minecraft/structure/trial_chambers/decor/cyan_bed.nbt b/data/minecraft/structure/trial_chambers/decor/cyan_bed.nbt index 7ff662f8..8bec7d58 100644 --- a/data/minecraft/structure/trial_chambers/decor/cyan_bed.nbt +++ b/data/minecraft/structure/trial_chambers/decor/cyan_bed.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8fa1f6bc3aa323c512b0da54d9a61252380d52e3dedbdb7121f4c69c41a53a58 -size 325 +oid sha256:453f4b451961abb7c1d6c3669acce43102418b411de668449bbaf14574843223 +size 324 diff --git a/data/minecraft/structure/trial_chambers/decor/dead_bush_pot.nbt b/data/minecraft/structure/trial_chambers/decor/dead_bush_pot.nbt index dffe3182..787c3cb4 100644 --- a/data/minecraft/structure/trial_chambers/decor/dead_bush_pot.nbt +++ b/data/minecraft/structure/trial_chambers/decor/dead_bush_pot.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:727a32ec43aad0050ef407dc667b38d36b15c2383510f690a31a4136106323f4 -size 290 +oid sha256:058fc94d4e701acdb2711c7a0fe1269e555e7d779dd82e8c8de9eae176cfc7ff +size 289 diff --git a/data/minecraft/structure/trial_chambers/decor/disposal.nbt b/data/minecraft/structure/trial_chambers/decor/disposal.nbt index 97019c6d..54321f6a 100644 --- a/data/minecraft/structure/trial_chambers/decor/disposal.nbt +++ b/data/minecraft/structure/trial_chambers/decor/disposal.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b98de5a96bdbbf821baf8027d805eceb6202648ae0e7a983a1c8c0ffee11fe21 -size 516 +oid sha256:31fff3c1699babc9aa5094a5392515318b9773660440dea592b065e6093c0fc2 +size 514 diff --git a/data/minecraft/structure/trial_chambers/decor/empty_pot.nbt b/data/minecraft/structure/trial_chambers/decor/empty_pot.nbt index 27286601..425bdd64 100644 --- a/data/minecraft/structure/trial_chambers/decor/empty_pot.nbt +++ b/data/minecraft/structure/trial_chambers/decor/empty_pot.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ed85c26b5c9362f8c2d31f401c6dd0d189bb909c4fe2a80bdfac674031a32959 -size 286 +oid sha256:a7a0562cee09cb77d9de2ebfe94fa7374b5f8f4cd31e80d798a85bb6f7ed558f +size 285 diff --git a/data/minecraft/structure/trial_chambers/decor/flow_pot.nbt b/data/minecraft/structure/trial_chambers/decor/flow_pot.nbt index 3bd42f19..e6b5e2e8 100644 --- a/data/minecraft/structure/trial_chambers/decor/flow_pot.nbt +++ b/data/minecraft/structure/trial_chambers/decor/flow_pot.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4fd991fb2030a5bfbcb53f513ee5f30baf55e5dda03c3916193ff1b8f42b3ef0 -size 388 +oid sha256:1e0e1e327cdb6aeebd856af1e5f32dbf95139057ea97db0489cdc6fd2c367577 +size 387 diff --git a/data/minecraft/structure/trial_chambers/decor/gray_bed.nbt b/data/minecraft/structure/trial_chambers/decor/gray_bed.nbt index 29f8c800..9378800d 100644 --- a/data/minecraft/structure/trial_chambers/decor/gray_bed.nbt +++ b/data/minecraft/structure/trial_chambers/decor/gray_bed.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e306a9c4ac8afc8629154fdade41dbd1fe5130be57f93dcefb45bfea92b71154 -size 326 +oid sha256:01edffee64e6122a1205b2e96c29516683e57344d6e5aaf931d96db01a95f920 +size 325 diff --git a/data/minecraft/structure/trial_chambers/decor/green_bed.nbt b/data/minecraft/structure/trial_chambers/decor/green_bed.nbt index 4da2008f..daeb4135 100644 --- a/data/minecraft/structure/trial_chambers/decor/green_bed.nbt +++ b/data/minecraft/structure/trial_chambers/decor/green_bed.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:399d19bc9708558007f39fccd5ada67b474a3d3b261d68b5d173311ba8d63b87 -size 327 +oid sha256:ed829072f01964b96e57a36afc2327ad09d8a86abcb8d02d9272a539575ffed2 +size 326 diff --git a/data/minecraft/structure/trial_chambers/decor/guster_pot.nbt b/data/minecraft/structure/trial_chambers/decor/guster_pot.nbt index 8fbd8a3e..fd35ae7a 100644 --- a/data/minecraft/structure/trial_chambers/decor/guster_pot.nbt +++ b/data/minecraft/structure/trial_chambers/decor/guster_pot.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1c862aba5b064eafe69ec7941a498f10fc5156aa041d1d506ee78644fbdcb90d -size 385 +oid sha256:58fb3422257bdfc7a55faab78549d54c8c56e5b913d522636ba924cace52e100 +size 384 diff --git a/data/minecraft/structure/trial_chambers/decor/light_blue_bed.nbt b/data/minecraft/structure/trial_chambers/decor/light_blue_bed.nbt index c37ea3bf..78564fbc 100644 --- a/data/minecraft/structure/trial_chambers/decor/light_blue_bed.nbt +++ b/data/minecraft/structure/trial_chambers/decor/light_blue_bed.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f075c1f99d7e22088f04135b1eed263931fb91ceeb663be92efea6ed6cc89ae +oid sha256:1f64bfd8fbd9058cbd15d637ad18b4077cfdc961490380390a450adb206aca14 size 331 diff --git a/data/minecraft/structure/trial_chambers/decor/light_gray_bed.nbt b/data/minecraft/structure/trial_chambers/decor/light_gray_bed.nbt index 01f5e89c..da1e1b23 100644 --- a/data/minecraft/structure/trial_chambers/decor/light_gray_bed.nbt +++ b/data/minecraft/structure/trial_chambers/decor/light_gray_bed.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1fab3071b65cf5fc70adf7b67155ff2d6329b804665cf59f6e926c9bf05d7c66 +oid sha256:e81769cf077be6241b69cfd42720aa0834ca0af4e06fa0d3d3eb6cf3c7e29494 size 331 diff --git a/data/minecraft/structure/trial_chambers/decor/lime_bed.nbt b/data/minecraft/structure/trial_chambers/decor/lime_bed.nbt index e98cd3b3..8c264174 100644 --- a/data/minecraft/structure/trial_chambers/decor/lime_bed.nbt +++ b/data/minecraft/structure/trial_chambers/decor/lime_bed.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:52548e4f640696996af6f70586c0340420469e8f070788e5e764acfabfa938d4 -size 325 +oid sha256:b2be62da0f17e09f63225a1cca75fa2aa4d79427c214a217c47818925da472e2 +size 324 diff --git a/data/minecraft/structure/trial_chambers/decor/magenta_bed.nbt b/data/minecraft/structure/trial_chambers/decor/magenta_bed.nbt index 5f534e80..6c0e3bb2 100644 --- a/data/minecraft/structure/trial_chambers/decor/magenta_bed.nbt +++ b/data/minecraft/structure/trial_chambers/decor/magenta_bed.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b6497328c475559da381b562eb7de3b171b7dee1da4d1cd92b8e2befa092f1f4 -size 328 +oid sha256:33a2710a87fe518657d9dda56393490bc09ed10a8a56130d00941ee9338fc467 +size 327 diff --git a/data/minecraft/structure/trial_chambers/decor/orange_bed.nbt b/data/minecraft/structure/trial_chambers/decor/orange_bed.nbt index 6c682b3e..1a0868e9 100644 --- a/data/minecraft/structure/trial_chambers/decor/orange_bed.nbt +++ b/data/minecraft/structure/trial_chambers/decor/orange_bed.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:01085ae3b260adaf35f39ca382270215c0ab5137a0822f26e7b75d25364f4944 -size 328 +oid sha256:d6251c7d02200b4abca32073d6a54c908810d64642f33b7051fd537ecdc95052 +size 327 diff --git a/data/minecraft/structure/trial_chambers/decor/pink_bed.nbt b/data/minecraft/structure/trial_chambers/decor/pink_bed.nbt index e50e03d6..8c16ac27 100644 --- a/data/minecraft/structure/trial_chambers/decor/pink_bed.nbt +++ b/data/minecraft/structure/trial_chambers/decor/pink_bed.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e5927fe332aad2ad4d7de72ec138fbd1e88a577940dd3a52f616a477694f502a +oid sha256:750a34522bcace2b980014bd4971283e08e1ac8ed7bceafba4515140a7807442 size 325 diff --git a/data/minecraft/structure/trial_chambers/decor/purple_bed.nbt b/data/minecraft/structure/trial_chambers/decor/purple_bed.nbt index 2fa37b87..16f06635 100644 --- a/data/minecraft/structure/trial_chambers/decor/purple_bed.nbt +++ b/data/minecraft/structure/trial_chambers/decor/purple_bed.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3a861e7ce40320ee4c96be39c90c6fbfedb03941ff5e8d1b3922db260dab89bc -size 328 +oid sha256:c8a0b65778fb984783a1d947fc343cd2f5e8c21040931bc14cf07d8c7d332cc5 +size 327 diff --git a/data/minecraft/structure/trial_chambers/decor/red_bed.nbt b/data/minecraft/structure/trial_chambers/decor/red_bed.nbt index d17e3547..b153d3cb 100644 --- a/data/minecraft/structure/trial_chambers/decor/red_bed.nbt +++ b/data/minecraft/structure/trial_chambers/decor/red_bed.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e2ee9cf76e52fa0840b2c8b26722ff970729cf7550d333fd17cb7c5a674e1c5c -size 324 +oid sha256:211c123a0104a5515ced9136766794d935bb82ecbf9356fb0f46e428f9269118 +size 323 diff --git a/data/minecraft/structure/trial_chambers/decor/scrape_pot.nbt b/data/minecraft/structure/trial_chambers/decor/scrape_pot.nbt index 63b93c00..1414cc31 100644 --- a/data/minecraft/structure/trial_chambers/decor/scrape_pot.nbt +++ b/data/minecraft/structure/trial_chambers/decor/scrape_pot.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:629fd0f6bc8641c6cbf24883815ff0c0433851cf99c23956d284d25813cbf879 -size 385 +oid sha256:741906b573213a9ad26a2b0204376a5293e5de83185c54ef1596a79940688ed9 +size 383 diff --git a/data/minecraft/structure/trial_chambers/decor/undecorated_pot.nbt b/data/minecraft/structure/trial_chambers/decor/undecorated_pot.nbt index c5cadee4..03608516 100644 --- a/data/minecraft/structure/trial_chambers/decor/undecorated_pot.nbt +++ b/data/minecraft/structure/trial_chambers/decor/undecorated_pot.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d49035f907fcaa5f7fcce0f5ac2ad39f4cd758e0c5713a8a24d6a71d25ce34d0 -size 353 +oid sha256:94f6599bde4ca5d2e34a4afcbc5d0250f77681e2f4715c8f6e514f64de55639e +size 352 diff --git a/data/minecraft/structure/trial_chambers/decor/white_bed.nbt b/data/minecraft/structure/trial_chambers/decor/white_bed.nbt index 8f6491d8..e0c81874 100644 --- a/data/minecraft/structure/trial_chambers/decor/white_bed.nbt +++ b/data/minecraft/structure/trial_chambers/decor/white_bed.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2f540d0049e23157273518319fa95480c8e7b97b16a3cf175a57b8f52184a835 -size 327 +oid sha256:ad5b2d4f9fae5b9e7166f5b0e2f672a8c2987eb6d9adef947a7e7ccda878b39f +size 326 diff --git a/data/minecraft/structure/trial_chambers/decor/yellow_bed.nbt b/data/minecraft/structure/trial_chambers/decor/yellow_bed.nbt index 7e31b8ec..ee346338 100644 --- a/data/minecraft/structure/trial_chambers/decor/yellow_bed.nbt +++ b/data/minecraft/structure/trial_chambers/decor/yellow_bed.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5612c7733dd950a1cb5ecd48564e7a1f086cbed7063a02e36ec33365ef8c7416 +oid sha256:eb45d0482bddfa04065f55f060c14bbb21e382c94097186895ab297bd91c5c79 size 328 diff --git a/data/minecraft/structure/trial_chambers/dispensers/chamber.nbt b/data/minecraft/structure/trial_chambers/dispensers/chamber.nbt index ac8bb46e..f1c401e8 100644 --- a/data/minecraft/structure/trial_chambers/dispensers/chamber.nbt +++ b/data/minecraft/structure/trial_chambers/dispensers/chamber.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a7fe5c08c143375307947d76cb54e10b4a32f45bfae95335f2dbf362e1cad134 -size 384 +oid sha256:d3c5221cdd96622972c0dabe3eedaf438e1fa6773287a63f4d49538b28b4f86d +size 382 diff --git a/data/minecraft/structure/trial_chambers/dispensers/floor_dispenser.nbt b/data/minecraft/structure/trial_chambers/dispensers/floor_dispenser.nbt index 3ab2e1b4..32534540 100644 --- a/data/minecraft/structure/trial_chambers/dispensers/floor_dispenser.nbt +++ b/data/minecraft/structure/trial_chambers/dispensers/floor_dispenser.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5d8f8480185b80dd7639d2cb6aa591999681786dd4effc501d0d786278ac961b -size 358 +oid sha256:81e1231306e5db709a569790c38489c9223f9d8af247b3628b841392618fe8e5 +size 356 diff --git a/data/minecraft/structure/trial_chambers/dispensers/wall_dispenser.nbt b/data/minecraft/structure/trial_chambers/dispensers/wall_dispenser.nbt index f5615241..19682431 100644 --- a/data/minecraft/structure/trial_chambers/dispensers/wall_dispenser.nbt +++ b/data/minecraft/structure/trial_chambers/dispensers/wall_dispenser.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8aea8a8811d8106b227c216a75ed4b4fbe58c9f38ac0ab842a560c0022bcab71 -size 414 +oid sha256:130ab99d6ee96c8782784dbf3c392a8c33e1db2ff90665b3c780fa0066828736 +size 413 diff --git a/data/minecraft/structure/trial_chambers/hallway/cache_1.nbt b/data/minecraft/structure/trial_chambers/hallway/cache_1.nbt index 09c61941..1d2b8bd9 100644 --- a/data/minecraft/structure/trial_chambers/hallway/cache_1.nbt +++ b/data/minecraft/structure/trial_chambers/hallway/cache_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c5e5fefb1cd837816339df8d8655d2e19dd12e52ee022a229a07baa56e1bdd9 -size 2709 +oid sha256:344096518a4f194ec67c8a986cf610a7fb05a0e89ba76156307f43d582d22e01 +size 2708 diff --git a/data/minecraft/structure/trial_chambers/hallway/corner_staircase.nbt b/data/minecraft/structure/trial_chambers/hallway/corner_staircase.nbt index 35b978fa..a3e892b7 100644 --- a/data/minecraft/structure/trial_chambers/hallway/corner_staircase.nbt +++ b/data/minecraft/structure/trial_chambers/hallway/corner_staircase.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0463c77c17a36de8000a3920688599fc7a1383c811179d8c01ec5006b4c8adee -size 1435 +oid sha256:5d8cb99b757f163bb72813f2482e215efe409cba057bd4baafce3959dde9370b +size 1434 diff --git a/data/minecraft/structure/trial_chambers/hallway/corner_staircase_down.nbt b/data/minecraft/structure/trial_chambers/hallway/corner_staircase_down.nbt index dd54275e..5c04661e 100644 --- a/data/minecraft/structure/trial_chambers/hallway/corner_staircase_down.nbt +++ b/data/minecraft/structure/trial_chambers/hallway/corner_staircase_down.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:26fae3910b7c1452061cfc6cacaacca159082404211532443e3fe62ecb772067 -size 1438 +oid sha256:1c1309e05a513d2aefcea6c3b39c8b4f4f2ab944ca847f4de33a2c05ae62d7d9 +size 1437 diff --git a/data/minecraft/structure/trial_chambers/hallway/corridor_connector_1.nbt b/data/minecraft/structure/trial_chambers/hallway/corridor_connector_1.nbt index 0d204827..b0c2c560 100644 --- a/data/minecraft/structure/trial_chambers/hallway/corridor_connector_1.nbt +++ b/data/minecraft/structure/trial_chambers/hallway/corridor_connector_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:889ebdb2bffa12bbd756fe4af5f766fe06d499afddf4fbcd6291cf8f1d5a59bd +oid sha256:5afc3cc5fda5f8a49dca9096d3ede1e8924eeecbbed9c59288cfdee8dc969c68 size 689 diff --git a/data/minecraft/structure/trial_chambers/hallway/encounter_1.nbt b/data/minecraft/structure/trial_chambers/hallway/encounter_1.nbt index 6e6271d3..ff092690 100644 --- a/data/minecraft/structure/trial_chambers/hallway/encounter_1.nbt +++ b/data/minecraft/structure/trial_chambers/hallway/encounter_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3d84847152ab284b483acc6d968488a75b94c4cb08203882f2954dad46c0ebe8 -size 7351 +oid sha256:91b9dacfff444b664af6c15ed5f1dc71efcb456f8469de64ee045d08b19019c5 +size 7350 diff --git a/data/minecraft/structure/trial_chambers/hallway/encounter_2.nbt b/data/minecraft/structure/trial_chambers/hallway/encounter_2.nbt index ed7cb57b..44b5bc9f 100644 --- a/data/minecraft/structure/trial_chambers/hallway/encounter_2.nbt +++ b/data/minecraft/structure/trial_chambers/hallway/encounter_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8dfd1b616e935ab527e4c12e6685af7d39df1cde1188f5871853e0ab543ffae9 +oid sha256:e308ef9abaa992e83ec5c513062e26455ed77efecf9cea09160f8f19dde3c2db size 6705 diff --git a/data/minecraft/structure/trial_chambers/hallway/encounter_3.nbt b/data/minecraft/structure/trial_chambers/hallway/encounter_3.nbt index 313924c4..2f215380 100644 --- a/data/minecraft/structure/trial_chambers/hallway/encounter_3.nbt +++ b/data/minecraft/structure/trial_chambers/hallway/encounter_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8b451df393b096b4c4c1a81c156c3ed3b215e19171b751fa80d0b23d76cc094a -size 5628 +oid sha256:b9ace406cf85f754dfe5a18e1beeed671a1eaf216a6a356ec36350a54b9ff49f +size 5627 diff --git a/data/minecraft/structure/trial_chambers/hallway/encounter_4.nbt b/data/minecraft/structure/trial_chambers/hallway/encounter_4.nbt index 72612ed1..b28bb15c 100644 --- a/data/minecraft/structure/trial_chambers/hallway/encounter_4.nbt +++ b/data/minecraft/structure/trial_chambers/hallway/encounter_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:46793a7be5f957a96f1060295d9d148b62b58ad15d47faaabf95099d582043bc -size 17906 +oid sha256:d20e7a1dd1b2bdf124e8f516ba7931a407f4c1bd897a6c6e82d21522c525c91d +size 17905 diff --git a/data/minecraft/structure/trial_chambers/hallway/encounter_5.nbt b/data/minecraft/structure/trial_chambers/hallway/encounter_5.nbt index c58a7f54..233ef801 100644 --- a/data/minecraft/structure/trial_chambers/hallway/encounter_5.nbt +++ b/data/minecraft/structure/trial_chambers/hallway/encounter_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d3bc5b33d2467a1f31bcfd80288e717fd57e1312fb68b5df142d9ac37d83e78e -size 14324 +oid sha256:af2a57f1aedc268711eb87c35a1d58ab72150d555a80a742faa46dedc4436296 +size 14323 diff --git a/data/minecraft/structure/trial_chambers/hallway/left_corner.nbt b/data/minecraft/structure/trial_chambers/hallway/left_corner.nbt index 9495e057..dbcf717c 100644 --- a/data/minecraft/structure/trial_chambers/hallway/left_corner.nbt +++ b/data/minecraft/structure/trial_chambers/hallway/left_corner.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d03de289c207172325ad68c8cb3204a11304d09352ae89ca4b5193be99b522bb +oid sha256:62b73eb5835baa1e5e83a8d9707e8f082627e4a438447e550544b5da6c40a851 size 938 diff --git a/data/minecraft/structure/trial_chambers/hallway/long_straight_staircase.nbt b/data/minecraft/structure/trial_chambers/hallway/long_straight_staircase.nbt index 033cedf9..eb77f5d5 100644 --- a/data/minecraft/structure/trial_chambers/hallway/long_straight_staircase.nbt +++ b/data/minecraft/structure/trial_chambers/hallway/long_straight_staircase.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:96c8e87a7c863ef5870b47df2401374121cd505e9c7157e2aae0b0fad1dc82f2 -size 2593 +oid sha256:3c52a8c23ae071ec692401e7216d0fec78c6e4d08736cff58ccceaa71bc5cf8a +size 2592 diff --git a/data/minecraft/structure/trial_chambers/hallway/long_straight_staircase_down.nbt b/data/minecraft/structure/trial_chambers/hallway/long_straight_staircase_down.nbt index 452c5018..d90f0be4 100644 --- a/data/minecraft/structure/trial_chambers/hallway/long_straight_staircase_down.nbt +++ b/data/minecraft/structure/trial_chambers/hallway/long_straight_staircase_down.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7a9808130669bc85292559445fdce9bdc63a120de3809d562092887cdc83f3f9 -size 2594 +oid sha256:20251b4659567148298786e953bd849be24df32091cc3c8a606273cb510cd827 +size 2593 diff --git a/data/minecraft/structure/trial_chambers/hallway/lower_hallway_connector.nbt b/data/minecraft/structure/trial_chambers/hallway/lower_hallway_connector.nbt index 4616de2a..bf6c1aa9 100644 --- a/data/minecraft/structure/trial_chambers/hallway/lower_hallway_connector.nbt +++ b/data/minecraft/structure/trial_chambers/hallway/lower_hallway_connector.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:01f5d7921e5c9371196b60d2ee15672f271ef15a1b0cb36ec3578430766a29f6 -size 3186 +oid sha256:699597657d966e507e4048dcbd5961ccb6dfbf761f75ff4078c3e8f2c77e94df +size 3185 diff --git a/data/minecraft/structure/trial_chambers/hallway/right_corner.nbt b/data/minecraft/structure/trial_chambers/hallway/right_corner.nbt index 3e5773a9..4c75a427 100644 --- a/data/minecraft/structure/trial_chambers/hallway/right_corner.nbt +++ b/data/minecraft/structure/trial_chambers/hallway/right_corner.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fa573c01bf41d204a5c271d4396e7aee2f7fdb5eff754c0b8ef59bde4408bd93 +oid sha256:2272329d6af47eb3d530b72a2d9d395ae8e1c9c417897751829b1b26a06851ab size 945 diff --git a/data/minecraft/structure/trial_chambers/hallway/rubble.nbt b/data/minecraft/structure/trial_chambers/hallway/rubble.nbt index d146a365..be4c3663 100644 --- a/data/minecraft/structure/trial_chambers/hallway/rubble.nbt +++ b/data/minecraft/structure/trial_chambers/hallway/rubble.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f27f0c27fa5bc7194ce9033ede9e0cbb81918b01e21df3f12880184200dc31ab -size 936 +oid sha256:43156b36f1219a0ca94b340aaa5ceb48ac503e267d92e79ca662648baab33d06 +size 935 diff --git a/data/minecraft/structure/trial_chambers/hallway/rubble_chamber.nbt b/data/minecraft/structure/trial_chambers/hallway/rubble_chamber.nbt index 02f135ab..ea572e9c 100644 --- a/data/minecraft/structure/trial_chambers/hallway/rubble_chamber.nbt +++ b/data/minecraft/structure/trial_chambers/hallway/rubble_chamber.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fcd92d89c618123d53c0802a22170f4cb2ff76749bfe3d1971e4005214d82e75 -size 926 +oid sha256:b85b7dfdcfa25c8478814d1a2c96a9d8ed59ec1b66d7063112842f6216afdfa9 +size 925 diff --git a/data/minecraft/structure/trial_chambers/hallway/rubble_chamber_thin.nbt b/data/minecraft/structure/trial_chambers/hallway/rubble_chamber_thin.nbt index ad7a0c48..dbb7a1f0 100644 --- a/data/minecraft/structure/trial_chambers/hallway/rubble_chamber_thin.nbt +++ b/data/minecraft/structure/trial_chambers/hallway/rubble_chamber_thin.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:73bc3cf6aee34c77905ccddb2ea2450e52fef65a9fd9b650ae7ff698e6221f83 +oid sha256:4065c6de864f3d38eaea5b91f7ab0966b34ac22cb3ba70e4999ca2db32fbda3b size 471 diff --git a/data/minecraft/structure/trial_chambers/hallway/rubble_thin.nbt b/data/minecraft/structure/trial_chambers/hallway/rubble_thin.nbt index ad7a0c48..dbb7a1f0 100644 --- a/data/minecraft/structure/trial_chambers/hallway/rubble_thin.nbt +++ b/data/minecraft/structure/trial_chambers/hallway/rubble_thin.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:73bc3cf6aee34c77905ccddb2ea2450e52fef65a9fd9b650ae7ff698e6221f83 +oid sha256:4065c6de864f3d38eaea5b91f7ab0966b34ac22cb3ba70e4999ca2db32fbda3b size 471 diff --git a/data/minecraft/structure/trial_chambers/hallway/straight.nbt b/data/minecraft/structure/trial_chambers/hallway/straight.nbt index 9145ff2e..2ea307c8 100644 --- a/data/minecraft/structure/trial_chambers/hallway/straight.nbt +++ b/data/minecraft/structure/trial_chambers/hallway/straight.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8c2fff6a2eb4a192909607b9362b23b8f5b352f36be1aa9a78718f3d69973aad +oid sha256:ad2ff2a65bed2435d02de5ca961710d79bb586a3040e88c4d1a0b778b41ec62b size 932 diff --git a/data/minecraft/structure/trial_chambers/hallway/straight_staircase.nbt b/data/minecraft/structure/trial_chambers/hallway/straight_staircase.nbt index 0b6905bd..6a5a6fee 100644 --- a/data/minecraft/structure/trial_chambers/hallway/straight_staircase.nbt +++ b/data/minecraft/structure/trial_chambers/hallway/straight_staircase.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e5f3e450981318a95a71a0793486d95bbd557258a09d99547bc04621193a3c66 +oid sha256:b1fcdf07730f9fd505330af2bf9b282a6cf71e62fef66163104643cc06fd93dc size 1177 diff --git a/data/minecraft/structure/trial_chambers/hallway/straight_staircase_down.nbt b/data/minecraft/structure/trial_chambers/hallway/straight_staircase_down.nbt index dff4b762..d01d460c 100644 --- a/data/minecraft/structure/trial_chambers/hallway/straight_staircase_down.nbt +++ b/data/minecraft/structure/trial_chambers/hallway/straight_staircase_down.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:71075ba1152e52a15fda8f210255a139b658ffec1757c753c40f81c146848a77 -size 1177 +oid sha256:ac8c7110ed96faa443cc47ffc9e2aaaf750e4fe3864525dff09560994cfee9d7 +size 1176 diff --git a/data/minecraft/structure/trial_chambers/hallway/trapped_staircase.nbt b/data/minecraft/structure/trial_chambers/hallway/trapped_staircase.nbt index ba565f5c..70d43c52 100644 --- a/data/minecraft/structure/trial_chambers/hallway/trapped_staircase.nbt +++ b/data/minecraft/structure/trial_chambers/hallway/trapped_staircase.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:70a99b0412d6db9564b2403ff09da870427fc21109186a52a9cc7bd365338918 -size 3613 +oid sha256:7f961b46847b410a1df84080e25ff1e56b7d169e68dac84121ba9319d8c27085 +size 3612 diff --git a/data/minecraft/structure/trial_chambers/hallway/upper_hallway_connector.nbt b/data/minecraft/structure/trial_chambers/hallway/upper_hallway_connector.nbt index 7031dea9..a683d970 100644 --- a/data/minecraft/structure/trial_chambers/hallway/upper_hallway_connector.nbt +++ b/data/minecraft/structure/trial_chambers/hallway/upper_hallway_connector.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3a1f8160f316ae069909ec604084d6081e48cca07049effff2ab53da01135378 -size 2700 +oid sha256:1434e62f211ccb55b02724af98d8c9824ae60334c2a95fb433c36a586c7c5b58 +size 2699 diff --git a/data/minecraft/structure/trial_chambers/intersection/intersection_1.nbt b/data/minecraft/structure/trial_chambers/intersection/intersection_1.nbt index e9130dbe..3df81bfa 100644 --- a/data/minecraft/structure/trial_chambers/intersection/intersection_1.nbt +++ b/data/minecraft/structure/trial_chambers/intersection/intersection_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:331230d9f8dc8856bcf228b4e5f485a53e52350a81fbe45eb6bd4b545c7f6c23 -size 29422 +oid sha256:66c6fd724fcea8c8d2452d54475dd038dcd223e57dbc44ebb27cdbad9c0d0c91 +size 29421 diff --git a/data/minecraft/structure/trial_chambers/intersection/intersection_2.nbt b/data/minecraft/structure/trial_chambers/intersection/intersection_2.nbt index 2b7d6ed3..3f202ace 100644 --- a/data/minecraft/structure/trial_chambers/intersection/intersection_2.nbt +++ b/data/minecraft/structure/trial_chambers/intersection/intersection_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:77a6780276406f49d87649d63e2d33240db1f8f629b7948a9d55c790e450122e -size 30344 +oid sha256:852618569d72ccf25465b89f15cf47cd3fd7346d1ba2f6bffb1d456218f13ce0 +size 30342 diff --git a/data/minecraft/structure/trial_chambers/intersection/intersection_3.nbt b/data/minecraft/structure/trial_chambers/intersection/intersection_3.nbt index 704ce122..14f9d562 100644 --- a/data/minecraft/structure/trial_chambers/intersection/intersection_3.nbt +++ b/data/minecraft/structure/trial_chambers/intersection/intersection_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:61ef1d936bf105b25990a6499bebeb7509ae95a19b2b9b5ec508f394ea6835ae -size 49356 +oid sha256:a7e0a259140e1dbe6296ee0826ab6f6d03b07d93926e971db3a08d3387cd0255 +size 49354 diff --git a/data/minecraft/structure/trial_chambers/reward/ominous_vault.nbt b/data/minecraft/structure/trial_chambers/reward/ominous_vault.nbt index 3d78a2e5..86c55a31 100644 --- a/data/minecraft/structure/trial_chambers/reward/ominous_vault.nbt +++ b/data/minecraft/structure/trial_chambers/reward/ominous_vault.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aec1b02c3493b82c828285614bc420cf59bfbc9885dbeed1b9f95611b9a5b65b -size 690 +oid sha256:c5309e93bc7a36d655c929eb451a4ce0440a4d9088ae19f84e0b58a0033e0e64 +size 689 diff --git a/data/minecraft/structure/trial_chambers/reward/vault.nbt b/data/minecraft/structure/trial_chambers/reward/vault.nbt index 7f0ad2a6..21c7197f 100644 --- a/data/minecraft/structure/trial_chambers/reward/vault.nbt +++ b/data/minecraft/structure/trial_chambers/reward/vault.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2a8af677dc71c18f46169fbb5fd42ab3b0088344c408797cd7ae46c00a49a0cf +oid sha256:19e96b429729880a8f8f270e0188979e2c45ea2b68b4bcca1115f6bf582550f4 size 504 diff --git a/data/minecraft/structure/trial_chambers/spawner/breeze/breeze.nbt b/data/minecraft/structure/trial_chambers/spawner/breeze/breeze.nbt index 711f984e..e46bb4af 100644 --- a/data/minecraft/structure/trial_chambers/spawner/breeze/breeze.nbt +++ b/data/minecraft/structure/trial_chambers/spawner/breeze/breeze.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8ef0d88bdff17ba95df86a128bd672d242569352b9b8ef8d77921f92a1c73b96 -size 469 +oid sha256:2d259632db8f7b4b80419091f1ed99869b3897ece098d29edce441e89122799b +size 468 diff --git a/data/minecraft/structure/trial_chambers/spawner/connectors/breeze.nbt b/data/minecraft/structure/trial_chambers/spawner/connectors/breeze.nbt index e0b3592d..d9c042ed 100644 --- a/data/minecraft/structure/trial_chambers/spawner/connectors/breeze.nbt +++ b/data/minecraft/structure/trial_chambers/spawner/connectors/breeze.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d0159d9e47048eebdf5790eeb43881aa2964435ab60330dcdb01039c5fd812a8 -size 328 +oid sha256:254d11fae715b074c06975b4df71541ce8eab6f82681ab13fce8ab9c962198fe +size 327 diff --git a/data/minecraft/structure/trial_chambers/spawner/connectors/melee.nbt b/data/minecraft/structure/trial_chambers/spawner/connectors/melee.nbt index 7d500dd3..4bf71813 100644 --- a/data/minecraft/structure/trial_chambers/spawner/connectors/melee.nbt +++ b/data/minecraft/structure/trial_chambers/spawner/connectors/melee.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f6c3d7f10943f0926cc06dd35365cc3da585776b4acd99fe2ad0e9ea28ad98c2 -size 327 +oid sha256:edab2f92ee4a5454121d4f2bf96471b66ec75a4a9f8a1c6c66be980f970b4fc3 +size 326 diff --git a/data/minecraft/structure/trial_chambers/spawner/connectors/ranged.nbt b/data/minecraft/structure/trial_chambers/spawner/connectors/ranged.nbt index d3fef7d7..887c7e2f 100644 --- a/data/minecraft/structure/trial_chambers/spawner/connectors/ranged.nbt +++ b/data/minecraft/structure/trial_chambers/spawner/connectors/ranged.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7489c3cee5e67f912bc0a8f0222b3cc11904f49df53d1b040f7e3397fc13be07 -size 327 +oid sha256:a7320c47bf84a447c4edcdff1f8a5110537d2c72ea25f2be97653268ffea605a +size 326 diff --git a/data/minecraft/structure/trial_chambers/spawner/connectors/slow_ranged.nbt b/data/minecraft/structure/trial_chambers/spawner/connectors/slow_ranged.nbt index 553dcd05..bdc30e2c 100644 --- a/data/minecraft/structure/trial_chambers/spawner/connectors/slow_ranged.nbt +++ b/data/minecraft/structure/trial_chambers/spawner/connectors/slow_ranged.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:37d49db6ea43ac8c0f26a0e12f2479d21525aee26a32d8af35070a2d088559dc -size 331 +oid sha256:17c1b7bf88c5d30a1066b6e8eed608852e77a26361bd235a594bef83f901b27c +size 330 diff --git a/data/minecraft/structure/trial_chambers/spawner/connectors/small_melee.nbt b/data/minecraft/structure/trial_chambers/spawner/connectors/small_melee.nbt index 2f6e4ae8..35c56c8c 100644 --- a/data/minecraft/structure/trial_chambers/spawner/connectors/small_melee.nbt +++ b/data/minecraft/structure/trial_chambers/spawner/connectors/small_melee.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2ae39dd6e7d208a8ded4d0f3955be446d8d2febc2e832c259a44267ea6050a1a -size 330 +oid sha256:8b40d2e6c5086694239eec29e894c7a8b122db7c6d8dc6b523c8056d9c663310 +size 329 diff --git a/data/minecraft/structure/trial_chambers/spawner/melee/husk.nbt b/data/minecraft/structure/trial_chambers/spawner/melee/husk.nbt index 036e474a..01af0bad 100644 --- a/data/minecraft/structure/trial_chambers/spawner/melee/husk.nbt +++ b/data/minecraft/structure/trial_chambers/spawner/melee/husk.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:545e9b7ba28612f8983f62ce67566e5c5d77807f2f21ce3dc08736e7544e0af1 -size 473 +oid sha256:3ca5536f399f109033f9a5e2c48c9dc8148db90e0900d2623582a9727c84a6de +size 472 diff --git a/data/minecraft/structure/trial_chambers/spawner/melee/spider.nbt b/data/minecraft/structure/trial_chambers/spawner/melee/spider.nbt index 163c9020..9cffa4dd 100644 --- a/data/minecraft/structure/trial_chambers/spawner/melee/spider.nbt +++ b/data/minecraft/structure/trial_chambers/spawner/melee/spider.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fbd8622ac50bce4859fd62f12ecb952dd76246405d379fb45aa3e95fcf655162 -size 481 +oid sha256:5d7248d23aa800b2f9759ed5dbe3e7b1536bdcadcb5846b638a88f5076fd6a77 +size 480 diff --git a/data/minecraft/structure/trial_chambers/spawner/melee/zombie.nbt b/data/minecraft/structure/trial_chambers/spawner/melee/zombie.nbt index 0b2af2d7..342bca46 100644 --- a/data/minecraft/structure/trial_chambers/spawner/melee/zombie.nbt +++ b/data/minecraft/structure/trial_chambers/spawner/melee/zombie.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0f9c7fa6e6d2eb5764e09b6e0c8e0a24e611eaf6663e7439ca8f71d549c61cef -size 480 +oid sha256:e64cbb393fdd370faaaa905611e1c48e649913902b8f6fa0bbb94a9672076dc2 +size 479 diff --git a/data/minecraft/structure/trial_chambers/spawner/ranged/poison_skeleton.nbt b/data/minecraft/structure/trial_chambers/spawner/ranged/poison_skeleton.nbt index 91d51f84..3ee5c86e 100644 --- a/data/minecraft/structure/trial_chambers/spawner/ranged/poison_skeleton.nbt +++ b/data/minecraft/structure/trial_chambers/spawner/ranged/poison_skeleton.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:03b7f7060e37ca889183f1297f9b1de9bb3197d91c185026b4cdff3becda31b9 +oid sha256:8ed2deffe5014617ad8487e04426baadc0c37c7e57f829f751e6cd7308a0098a size 524 diff --git a/data/minecraft/structure/trial_chambers/spawner/ranged/skeleton.nbt b/data/minecraft/structure/trial_chambers/spawner/ranged/skeleton.nbt index a9e07936..6028bdb6 100644 --- a/data/minecraft/structure/trial_chambers/spawner/ranged/skeleton.nbt +++ b/data/minecraft/structure/trial_chambers/spawner/ranged/skeleton.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e3db58700b238f60f931762b37f5671b16a87559541c33a89cf976d3a3b19d8d -size 480 +oid sha256:571a594bd68b69f8e64a6e39cefb2e7b1932145b0030f2f496023ff51dd685d0 +size 479 diff --git a/data/minecraft/structure/trial_chambers/spawner/ranged/stray.nbt b/data/minecraft/structure/trial_chambers/spawner/ranged/stray.nbt index dae6c72d..a87b7c06 100644 --- a/data/minecraft/structure/trial_chambers/spawner/ranged/stray.nbt +++ b/data/minecraft/structure/trial_chambers/spawner/ranged/stray.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e2d0cf706fc8efc4ee52fe1974e29c917aa6504dffd1911038886a5ba7c52d4f -size 476 +oid sha256:20cf0f4e195d8e51bbb3c4d69b707a598c883cffb7820a709db726d7891c83d9 +size 475 diff --git a/data/minecraft/structure/trial_chambers/spawner/slow_ranged/poison_skeleton.nbt b/data/minecraft/structure/trial_chambers/spawner/slow_ranged/poison_skeleton.nbt index bc4a4f18..6379ab24 100644 --- a/data/minecraft/structure/trial_chambers/spawner/slow_ranged/poison_skeleton.nbt +++ b/data/minecraft/structure/trial_chambers/spawner/slow_ranged/poison_skeleton.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5078172bf1324faab157939d1c2e9cc0246471896e880ed379b1f0b5f889f44a -size 527 +oid sha256:250a7e2a6bf8236b280c93e07d913c0e0397a1de1d2ba4d96ff8a275bf30b97e +size 526 diff --git a/data/minecraft/structure/trial_chambers/spawner/slow_ranged/skeleton.nbt b/data/minecraft/structure/trial_chambers/spawner/slow_ranged/skeleton.nbt index 8b569c9e..10295fa0 100644 --- a/data/minecraft/structure/trial_chambers/spawner/slow_ranged/skeleton.nbt +++ b/data/minecraft/structure/trial_chambers/spawner/slow_ranged/skeleton.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:10eeb4919f93d2ca376f6205e67e7827da6d6787cae904a0c14bc72edbca4bb3 -size 485 +oid sha256:dd98063ac4e23d4303be65568a61788685f42d00dead7588e0399d6328222c42 +size 484 diff --git a/data/minecraft/structure/trial_chambers/spawner/slow_ranged/stray.nbt b/data/minecraft/structure/trial_chambers/spawner/slow_ranged/stray.nbt index 8ecf1363..a46b68e0 100644 --- a/data/minecraft/structure/trial_chambers/spawner/slow_ranged/stray.nbt +++ b/data/minecraft/structure/trial_chambers/spawner/slow_ranged/stray.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:33a75cd2a3a5a3d10d67b72258059a32365a88ca2888370c3f11259267d54cc5 -size 479 +oid sha256:b5233306a81c1a4667fcae5d257d968084fb9433c6a0e28e35b7c260b4134329 +size 477 diff --git a/data/minecraft/structure/trial_chambers/spawner/small_melee/baby_zombie.nbt b/data/minecraft/structure/trial_chambers/spawner/small_melee/baby_zombie.nbt index ca171c75..43065c8f 100644 --- a/data/minecraft/structure/trial_chambers/spawner/small_melee/baby_zombie.nbt +++ b/data/minecraft/structure/trial_chambers/spawner/small_melee/baby_zombie.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bd4f9b4f9225d9365619810dab80e3ca6127b5cc3d8803f0585584fe557dd953 -size 499 +oid sha256:5bb8995ec96a65a8488936969f741f509a4cbd91ea15b6c5220013c9ee5f354a +size 498 diff --git a/data/minecraft/structure/trial_chambers/spawner/small_melee/cave_spider.nbt b/data/minecraft/structure/trial_chambers/spawner/small_melee/cave_spider.nbt index 7c4f95c4..2f14faa5 100644 --- a/data/minecraft/structure/trial_chambers/spawner/small_melee/cave_spider.nbt +++ b/data/minecraft/structure/trial_chambers/spawner/small_melee/cave_spider.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9fa8ebc7055d6157ccd50af0c0b95f6ebe16ddc44ea57d36de405ef21fdadeab -size 523 +oid sha256:8b513a8d436c14cb63a0ae908db3383e55f1382e168a280d616d062e69cba526 +size 522 diff --git a/data/minecraft/structure/trial_chambers/spawner/small_melee/silverfish.nbt b/data/minecraft/structure/trial_chambers/spawner/small_melee/silverfish.nbt index 8b33cbaa..8a1a8d9a 100644 --- a/data/minecraft/structure/trial_chambers/spawner/small_melee/silverfish.nbt +++ b/data/minecraft/structure/trial_chambers/spawner/small_melee/silverfish.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f669423f1fc03dab12cc9852eb63cdf32c927a53144ae268fec6aef9fbb9ce6 -size 483 +oid sha256:1490328f95dff2ee696cccc2a94548e28cfeed69af3636e3934c771526b9ecc9 +size 482 diff --git a/data/minecraft/structure/trial_chambers/spawner/small_melee/slime.nbt b/data/minecraft/structure/trial_chambers/spawner/small_melee/slime.nbt index 19797a2d..6c3685cb 100644 --- a/data/minecraft/structure/trial_chambers/spawner/small_melee/slime.nbt +++ b/data/minecraft/structure/trial_chambers/spawner/small_melee/slime.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4d20383d795b2ee171aa1aeac7cff5a8f8c373b904bd73b71e68e8b25a85ccd2 +oid sha256:5824af46e94719a8f416137e47caef5a22e23449523f499e331510db57119920 size 473 diff --git a/data/minecraft/structure/underwater_ruin/big_brick_1.nbt b/data/minecraft/structure/underwater_ruin/big_brick_1.nbt index defa0269..b45ea244 100644 --- a/data/minecraft/structure/underwater_ruin/big_brick_1.nbt +++ b/data/minecraft/structure/underwater_ruin/big_brick_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b32243eb7701df0ea33090cc07662bb60460a827a5e9e470b41e0b1ab9073d18 -size 11114 +oid sha256:d884a8791a58646fb35020609c505254aa78647c61d95898e022c20b1df0ebd9 +size 11113 diff --git a/data/minecraft/structure/underwater_ruin/big_brick_2.nbt b/data/minecraft/structure/underwater_ruin/big_brick_2.nbt index e1bd44d7..982fb4ea 100644 --- a/data/minecraft/structure/underwater_ruin/big_brick_2.nbt +++ b/data/minecraft/structure/underwater_ruin/big_brick_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8931c09bffe1862eacc55b4b18cc20dcaad7cd318b66b86418af838d5325b8f4 -size 11462 +oid sha256:ec62e19e01a2936f28af21a31dae89b9462553fab41bcda5b89ed38d50309d4c +size 11461 diff --git a/data/minecraft/structure/underwater_ruin/big_brick_3.nbt b/data/minecraft/structure/underwater_ruin/big_brick_3.nbt index 1d75b045..9842fc7b 100644 --- a/data/minecraft/structure/underwater_ruin/big_brick_3.nbt +++ b/data/minecraft/structure/underwater_ruin/big_brick_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d4a497df74ebe3fd9ee99b1523bcd40868d9747ab2982e83098c31a4492182a4 -size 11632 +oid sha256:7cdd910c000388989ddcbf4985becb82c6a4d5effe5e85d568412eeea18e10ec +size 11631 diff --git a/data/minecraft/structure/underwater_ruin/big_brick_8.nbt b/data/minecraft/structure/underwater_ruin/big_brick_8.nbt index 83d3b3f8..250e1e11 100644 --- a/data/minecraft/structure/underwater_ruin/big_brick_8.nbt +++ b/data/minecraft/structure/underwater_ruin/big_brick_8.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:764c5569377fe8ed8274e9153eb1cf5226cf7082e1b2e35dfee53515cb1d58f2 -size 11015 +oid sha256:f7a1bd37fb483d7351ff68d3704bd936ede9a89a9300647b987ad2e994534fac +size 11014 diff --git a/data/minecraft/structure/underwater_ruin/big_cracked_1.nbt b/data/minecraft/structure/underwater_ruin/big_cracked_1.nbt index 7c827bdb..61745939 100644 --- a/data/minecraft/structure/underwater_ruin/big_cracked_1.nbt +++ b/data/minecraft/structure/underwater_ruin/big_cracked_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:135f10a8bea9c16b0923b527ea4030cb80e3afc7eaf4f35617e63c9faa64d576 +oid sha256:faf5e20c0c7b4986279f7f18caa1f765e581928de49754694a13aee30890be08 size 11097 diff --git a/data/minecraft/structure/underwater_ruin/big_cracked_2.nbt b/data/minecraft/structure/underwater_ruin/big_cracked_2.nbt index 7e7fc90f..affb7e7c 100644 --- a/data/minecraft/structure/underwater_ruin/big_cracked_2.nbt +++ b/data/minecraft/structure/underwater_ruin/big_cracked_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bf855043e1222e3b926e33c3afd514e4983a6192670b562cd4cc3583d28f035e -size 11505 +oid sha256:ef31a716b8b325af68e2400fbb25754a11b0b19e2e4d97b1e15cd1e6cd39ee64 +size 11504 diff --git a/data/minecraft/structure/underwater_ruin/big_cracked_3.nbt b/data/minecraft/structure/underwater_ruin/big_cracked_3.nbt index 04f70ce9..14212127 100644 --- a/data/minecraft/structure/underwater_ruin/big_cracked_3.nbt +++ b/data/minecraft/structure/underwater_ruin/big_cracked_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ad6a9abc232164e62afd785a039c0bc9dff831d2ee4581f8005ff48659c95d27 -size 11622 +oid sha256:b99cdf8fb8b42c2ef0205c118e930d9dfa2da430d8238073399fba9fbd8e04ad +size 11621 diff --git a/data/minecraft/structure/underwater_ruin/big_cracked_8.nbt b/data/minecraft/structure/underwater_ruin/big_cracked_8.nbt index dcc1fdc0..c5cfe0a4 100644 --- a/data/minecraft/structure/underwater_ruin/big_cracked_8.nbt +++ b/data/minecraft/structure/underwater_ruin/big_cracked_8.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0bc4922929b67eab30a4149cb028e80eb449a54a8ed0f4b6a4a63168d7dd1a9b -size 11024 +oid sha256:4b4342746904a8a72feeb6e4f62a0aa0420ca6846bddcf2982d3dda76299242c +size 11023 diff --git a/data/minecraft/structure/underwater_ruin/big_mossy_1.nbt b/data/minecraft/structure/underwater_ruin/big_mossy_1.nbt index 6fec7403..828dced2 100644 --- a/data/minecraft/structure/underwater_ruin/big_mossy_1.nbt +++ b/data/minecraft/structure/underwater_ruin/big_mossy_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5f57e8581610b040a6356b848832853b4ce9a5aa307dddaa8df2c9a80c9dc653 -size 11096 +oid sha256:6722af2b600d526c2bf8b7cd9d38b3098de9b9a90c1161634294d69ad9337d3c +size 11095 diff --git a/data/minecraft/structure/underwater_ruin/big_mossy_2.nbt b/data/minecraft/structure/underwater_ruin/big_mossy_2.nbt index 8af0af16..7f3d3a20 100644 --- a/data/minecraft/structure/underwater_ruin/big_mossy_2.nbt +++ b/data/minecraft/structure/underwater_ruin/big_mossy_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:06e0a1f60650216d05dc818fc1e6b987fb322f038a54d6d2d49e8fb246b2377a -size 11504 +oid sha256:7182854f3d0a90210c7f7c622bd2145c4d1edfccc9e30616888f6e829a1f20e4 +size 11503 diff --git a/data/minecraft/structure/underwater_ruin/big_mossy_3.nbt b/data/minecraft/structure/underwater_ruin/big_mossy_3.nbt index 68d29fe5..7df60ce9 100644 --- a/data/minecraft/structure/underwater_ruin/big_mossy_3.nbt +++ b/data/minecraft/structure/underwater_ruin/big_mossy_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fa6cd4a982f298d17f2564f016a3a7ae454cfa28ef815f8f799f95ef2de1d643 -size 11632 +oid sha256:4cdb3e166c2a16f8538381d426ddffa2a05bba361f283eedf1076217be6e14fa +size 11631 diff --git a/data/minecraft/structure/underwater_ruin/big_mossy_8.nbt b/data/minecraft/structure/underwater_ruin/big_mossy_8.nbt index 78f4860a..e4e51379 100644 --- a/data/minecraft/structure/underwater_ruin/big_mossy_8.nbt +++ b/data/minecraft/structure/underwater_ruin/big_mossy_8.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d2a4f54087a48c5bebfa76461ce67520d1d198d5613651c394a42824484d2e37 -size 11045 +oid sha256:e79f5121f71f45e0a040762e949a5dc197b116b985a0aae64547b87c2b082af7 +size 11044 diff --git a/data/minecraft/structure/underwater_ruin/big_warm_4.nbt b/data/minecraft/structure/underwater_ruin/big_warm_4.nbt index 76ec1184..d3cc0892 100644 --- a/data/minecraft/structure/underwater_ruin/big_warm_4.nbt +++ b/data/minecraft/structure/underwater_ruin/big_warm_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2b4ee1669b409e0c6e1403b9c75807301814bf5198a86ef99360fdf6e445d735 -size 11266 +oid sha256:225bd4c2a66f7336a96a6c5ab221e0c63a1f56b72d87ccf41d2ec7320640bf89 +size 11265 diff --git a/data/minecraft/structure/underwater_ruin/big_warm_5.nbt b/data/minecraft/structure/underwater_ruin/big_warm_5.nbt index ace75129..e55a20ce 100644 --- a/data/minecraft/structure/underwater_ruin/big_warm_5.nbt +++ b/data/minecraft/structure/underwater_ruin/big_warm_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7df3d38127d1931e9011875247ec239f8325ec1a5ed4274d5d023e84dc26cc16 -size 11034 +oid sha256:3ce6b416bb60706a98967f26bbcaa308e6319994ec3c0f044b5796717995ff6f +size 11032 diff --git a/data/minecraft/structure/underwater_ruin/big_warm_6.nbt b/data/minecraft/structure/underwater_ruin/big_warm_6.nbt index c8a7af47..56bb9675 100644 --- a/data/minecraft/structure/underwater_ruin/big_warm_6.nbt +++ b/data/minecraft/structure/underwater_ruin/big_warm_6.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e217c6184a5a889654b5c8b187287385543b86c7dab7a9cea6819c48e6414bcb -size 11108 +oid sha256:eb7923d460c4a7a6d2ac4a1c71856a0aadd2eb8c7b7f813c1e06ac74c8221aba +size 11106 diff --git a/data/minecraft/structure/underwater_ruin/big_warm_7.nbt b/data/minecraft/structure/underwater_ruin/big_warm_7.nbt index 6ec28cf2..329d6fde 100644 --- a/data/minecraft/structure/underwater_ruin/big_warm_7.nbt +++ b/data/minecraft/structure/underwater_ruin/big_warm_7.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7be409aa151a9b3d93df99f4aeccaf94ffbd73cd4cd0f8daa331059568cade10 -size 11141 +oid sha256:668fbd2a52ebea5a0685a51b2db09e1eef7975d2b9c6715adfd0e836938c30eb +size 11139 diff --git a/data/minecraft/structure/underwater_ruin/brick_1.nbt b/data/minecraft/structure/underwater_ruin/brick_1.nbt index d74baf9b..a7d0d6da 100644 --- a/data/minecraft/structure/underwater_ruin/brick_1.nbt +++ b/data/minecraft/structure/underwater_ruin/brick_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eecaeefdc29aeb10d46faa4522400016f44c228e5378c5c1f27242f05e7d6876 -size 1270 +oid sha256:e12b8da29ed3ec354e6d48c904a8912bbad522c2694bbaa22eda06e6a006228c +size 1269 diff --git a/data/minecraft/structure/underwater_ruin/brick_2.nbt b/data/minecraft/structure/underwater_ruin/brick_2.nbt index bd85dcae..1c290a73 100644 --- a/data/minecraft/structure/underwater_ruin/brick_2.nbt +++ b/data/minecraft/structure/underwater_ruin/brick_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:97002db1d400693c9396fac807980944fc3cdd12f51b0884b79e22f48c86ceaf -size 1260 +oid sha256:61bf377dc4e0765cdb1bd83fb87f780e10eeda3c6e5d234fa04fa1804b3ee2ab +size 1259 diff --git a/data/minecraft/structure/underwater_ruin/brick_3.nbt b/data/minecraft/structure/underwater_ruin/brick_3.nbt index a0e5e64e..f4196ec5 100644 --- a/data/minecraft/structure/underwater_ruin/brick_3.nbt +++ b/data/minecraft/structure/underwater_ruin/brick_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ba1919f2ed48419fcf516182aa894f73ab27ddedf4aa1aef3bb89a5a8e90cf39 -size 1319 +oid sha256:652c7ae56749b9c1de939bfaa0cf520b0cb8e68c3a2ce292bfac94325a69a96f +size 1318 diff --git a/data/minecraft/structure/underwater_ruin/brick_4.nbt b/data/minecraft/structure/underwater_ruin/brick_4.nbt index 677f6861..6419e09a 100644 --- a/data/minecraft/structure/underwater_ruin/brick_4.nbt +++ b/data/minecraft/structure/underwater_ruin/brick_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f595d60dcdef6a8f326edba51bf54d6c2f8d419b098c674d95f609d630751a1 -size 1296 +oid sha256:bec9f906601004ec4e9ef142c0401a29fc99c7adbb6e07941c062a5061ed862c +size 1295 diff --git a/data/minecraft/structure/underwater_ruin/brick_5.nbt b/data/minecraft/structure/underwater_ruin/brick_5.nbt index 7cc6a452..12b97750 100644 --- a/data/minecraft/structure/underwater_ruin/brick_5.nbt +++ b/data/minecraft/structure/underwater_ruin/brick_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d3370d83ae75c85e2266515e71437cdd006b83f94ae6f7d92b52ab567b55ae62 -size 1277 +oid sha256:cf8d78beec3aeb4b824b84f2b79a1000e93ddb4bcf53f64fb8667629bcd9ac59 +size 1276 diff --git a/data/minecraft/structure/underwater_ruin/brick_6.nbt b/data/minecraft/structure/underwater_ruin/brick_6.nbt index 39d52a90..04383d6e 100644 --- a/data/minecraft/structure/underwater_ruin/brick_6.nbt +++ b/data/minecraft/structure/underwater_ruin/brick_6.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:62f7e757469f0c7852a5790620413462e54642b24aa294317f6c052d5e539aec -size 1468 +oid sha256:8bb905b766c68440d983385ea13240f10749c3e40dd479e7b6fb3dc8d88273f5 +size 1467 diff --git a/data/minecraft/structure/underwater_ruin/brick_7.nbt b/data/minecraft/structure/underwater_ruin/brick_7.nbt index 184828b2..cc2f2b33 100644 --- a/data/minecraft/structure/underwater_ruin/brick_7.nbt +++ b/data/minecraft/structure/underwater_ruin/brick_7.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fc894b307fb84615af2518d2a1e23a42261161f7acf647ccea90d86c6e6a1287 -size 1293 +oid sha256:15353a32e97614c8a3efb8717eaa83bc8a50c279c8c5772676cff11098d7e2ed +size 1292 diff --git a/data/minecraft/structure/underwater_ruin/brick_8.nbt b/data/minecraft/structure/underwater_ruin/brick_8.nbt index abe0a5b7..a3cf8620 100644 --- a/data/minecraft/structure/underwater_ruin/brick_8.nbt +++ b/data/minecraft/structure/underwater_ruin/brick_8.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cc85d708af63e9936a60295ce4838f30d8489dc3eb5e2392ad1fd8fd90b9254c -size 1306 +oid sha256:038d11bb7c449de7b5bdb09ad74b9a631d6899327a8b8c1a0ce7c4b5c723ab40 +size 1305 diff --git a/data/minecraft/structure/underwater_ruin/cracked_1.nbt b/data/minecraft/structure/underwater_ruin/cracked_1.nbt index 1d092462..4e6aa6b3 100644 --- a/data/minecraft/structure/underwater_ruin/cracked_1.nbt +++ b/data/minecraft/structure/underwater_ruin/cracked_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6dd933d0e1cd310437051326d10186485da9affa8f102bc0d0d569dc3973c59c -size 1266 +oid sha256:98491b37961fc78b7d41fe846bacaaebbac755674e7975c3aaa2db8f8513fc37 +size 1265 diff --git a/data/minecraft/structure/underwater_ruin/cracked_2.nbt b/data/minecraft/structure/underwater_ruin/cracked_2.nbt index 58aaf891..86495a41 100644 --- a/data/minecraft/structure/underwater_ruin/cracked_2.nbt +++ b/data/minecraft/structure/underwater_ruin/cracked_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8143276d0e83a1b2279e7f084b5b39b86d88e5373588ec8cdc58eb56ad879173 +oid sha256:46a1a51a959b3df00066674b182d9e23d23565bf086f860aa079817f1f5b26b9 size 1258 diff --git a/data/minecraft/structure/underwater_ruin/cracked_3.nbt b/data/minecraft/structure/underwater_ruin/cracked_3.nbt index 4b227c93..f563d562 100644 --- a/data/minecraft/structure/underwater_ruin/cracked_3.nbt +++ b/data/minecraft/structure/underwater_ruin/cracked_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eb625b6db009c98b90448642d74d81cafa5adf5b7b8648c46631886dabca72ea -size 1348 +oid sha256:e647c62f56adcefb8c01f23619471592575c8c4b6300f225ff241faba111e404 +size 1346 diff --git a/data/minecraft/structure/underwater_ruin/cracked_4.nbt b/data/minecraft/structure/underwater_ruin/cracked_4.nbt index 8ae19c5e..2a7e82d0 100644 --- a/data/minecraft/structure/underwater_ruin/cracked_4.nbt +++ b/data/minecraft/structure/underwater_ruin/cracked_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3e107f5d7a9dcbb72a156553b7c0a1088e6af33c34ef40b16f78d1889d52abe0 -size 1257 +oid sha256:3f57142224bf38adb966d26fd03aead0a5b76f9d009dc74943d35f7115af75bd +size 1256 diff --git a/data/minecraft/structure/underwater_ruin/cracked_5.nbt b/data/minecraft/structure/underwater_ruin/cracked_5.nbt index b33fc44b..3e5ccb1e 100644 --- a/data/minecraft/structure/underwater_ruin/cracked_5.nbt +++ b/data/minecraft/structure/underwater_ruin/cracked_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6e72b4746f9f6fbe0ffb32f23ea2b81184d00bc343478ecd36b2e7d38a962a36 -size 1282 +oid sha256:fa651c0258a49bfac897c27d7cf29d304adadfa611f4c761c13c70bc28a2d09a +size 1280 diff --git a/data/minecraft/structure/underwater_ruin/cracked_6.nbt b/data/minecraft/structure/underwater_ruin/cracked_6.nbt index b99cc249..e30d2619 100644 --- a/data/minecraft/structure/underwater_ruin/cracked_6.nbt +++ b/data/minecraft/structure/underwater_ruin/cracked_6.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4142805aee06de69f692f664956d195d591af24a229ed1fe1776ad1c5361bbcb -size 1410 +oid sha256:277f57deb4f5e58735335eac0a0d58c3ec76a7e5218a49e62bff06bdecaae3a4 +size 1408 diff --git a/data/minecraft/structure/underwater_ruin/cracked_7.nbt b/data/minecraft/structure/underwater_ruin/cracked_7.nbt index 2c82ecde..db51e6be 100644 --- a/data/minecraft/structure/underwater_ruin/cracked_7.nbt +++ b/data/minecraft/structure/underwater_ruin/cracked_7.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7c2b1eaf3726a85d2c821b23c431bc30a414fc9134e172abce94af33bfcf884e -size 1314 +oid sha256:8a8c93650e148af5191383091b00b5536d66e0d808247213ab626dcebca12d1d +size 1313 diff --git a/data/minecraft/structure/underwater_ruin/cracked_8.nbt b/data/minecraft/structure/underwater_ruin/cracked_8.nbt index 03a82586..6fb3c2d4 100644 --- a/data/minecraft/structure/underwater_ruin/cracked_8.nbt +++ b/data/minecraft/structure/underwater_ruin/cracked_8.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8f245736d5954668652e3db0673d29515e2c1684631db0b7b301f142e91db25b -size 1294 +oid sha256:ea2ed5cf54500d01d54af95bb0c6dbb01dc4d24e38a55d69ee3f5bdfe7c6863a +size 1293 diff --git a/data/minecraft/structure/underwater_ruin/mossy_1.nbt b/data/minecraft/structure/underwater_ruin/mossy_1.nbt index 83a25270..96153e27 100644 --- a/data/minecraft/structure/underwater_ruin/mossy_1.nbt +++ b/data/minecraft/structure/underwater_ruin/mossy_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7421deba3cdc5b5ab992661d7732abe5e248e03878c7195e64f5b28c98b77665 -size 1279 +oid sha256:820284b25307d2fccaca343828fec76334a38ac712c61840b7369ead5d28f8cb +size 1278 diff --git a/data/minecraft/structure/underwater_ruin/mossy_2.nbt b/data/minecraft/structure/underwater_ruin/mossy_2.nbt index 5fe476a6..f3b6f7a4 100644 --- a/data/minecraft/structure/underwater_ruin/mossy_2.nbt +++ b/data/minecraft/structure/underwater_ruin/mossy_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4255a060ebff0b9c71340194440f24f0ba4e125c54883bb61eca47b2340364a9 -size 1233 +oid sha256:9193f08626d69ee7daccf8341dd2a9ebb04684933b7b64692e485e4f636a8545 +size 1232 diff --git a/data/minecraft/structure/underwater_ruin/mossy_3.nbt b/data/minecraft/structure/underwater_ruin/mossy_3.nbt index 2739d787..5c7b60b7 100644 --- a/data/minecraft/structure/underwater_ruin/mossy_3.nbt +++ b/data/minecraft/structure/underwater_ruin/mossy_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5e68755d83083d2ca8122f136312322450a446a248b4178acfa0a48c17130db9 -size 1323 +oid sha256:18d453a65672e3be50d807beca6c958e897fe3d457582df702928ce9ee17308a +size 1322 diff --git a/data/minecraft/structure/underwater_ruin/mossy_4.nbt b/data/minecraft/structure/underwater_ruin/mossy_4.nbt index a47f2612..7fc781e8 100644 --- a/data/minecraft/structure/underwater_ruin/mossy_4.nbt +++ b/data/minecraft/structure/underwater_ruin/mossy_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0c5dd62686c9e1d0317818b73053c6c098329b7b42bc039f1d1b8e5fd73ca8bb -size 1282 +oid sha256:8ae642ef589da547b0a0aed420b9f5ae380e6f290a32e398ca67e9dba1c94be7 +size 1281 diff --git a/data/minecraft/structure/underwater_ruin/mossy_5.nbt b/data/minecraft/structure/underwater_ruin/mossy_5.nbt index ca9993d4..fcf41ced 100644 --- a/data/minecraft/structure/underwater_ruin/mossy_5.nbt +++ b/data/minecraft/structure/underwater_ruin/mossy_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7f1961245d4cc22f1bb274d8b53b08e9b191822c4b2e2d89f2d03fe177ce0724 -size 1300 +oid sha256:7fa3ac5958f704555fb27531e7d689fc1fa059824e998a4463022486598a5b76 +size 1298 diff --git a/data/minecraft/structure/underwater_ruin/mossy_6.nbt b/data/minecraft/structure/underwater_ruin/mossy_6.nbt index 915797cd..c10167d3 100644 --- a/data/minecraft/structure/underwater_ruin/mossy_6.nbt +++ b/data/minecraft/structure/underwater_ruin/mossy_6.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:241d0796b5f1468accceeff9cb268e96f68c88f9e036a33ea93a8cb2b3e26044 -size 1452 +oid sha256:a7914a2e7e0e1c67b3d337dc06a76f76eab1b23ef14add5b0eea57d7026c2bea +size 1451 diff --git a/data/minecraft/structure/underwater_ruin/mossy_7.nbt b/data/minecraft/structure/underwater_ruin/mossy_7.nbt index 56795391..6378dd21 100644 --- a/data/minecraft/structure/underwater_ruin/mossy_7.nbt +++ b/data/minecraft/structure/underwater_ruin/mossy_7.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:36fbc836a7084fcddf9a56e348c265c3c5ce2ce0781523992e13663fae46cfdd -size 1310 +oid sha256:397971656eff147c990fe1827a8238059189eac016f5e8148107c13d25a2727b +size 1308 diff --git a/data/minecraft/structure/underwater_ruin/mossy_8.nbt b/data/minecraft/structure/underwater_ruin/mossy_8.nbt index 01515164..be712925 100644 --- a/data/minecraft/structure/underwater_ruin/mossy_8.nbt +++ b/data/minecraft/structure/underwater_ruin/mossy_8.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:85a005d9515789914a1f329371afcda9c21afd2a9947d85a14b56d9a3b809bd1 -size 1322 +oid sha256:5833b99634ec6d721f860d60d6f0c171d163b98cdc10e14e2e313d228b1616fa +size 1320 diff --git a/data/minecraft/structure/underwater_ruin/warm_1.nbt b/data/minecraft/structure/underwater_ruin/warm_1.nbt index c701d7cb..abd92e89 100644 --- a/data/minecraft/structure/underwater_ruin/warm_1.nbt +++ b/data/minecraft/structure/underwater_ruin/warm_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:874b236c5169422eec35bd6d7d3da2833d0bcf9880bcbab140ddd34b942b396e -size 1269 +oid sha256:ad55559f56e218e6d6a59e2a805b1a7d4f1aacdbdcc35d1b94043a761779c4b5 +size 1268 diff --git a/data/minecraft/structure/underwater_ruin/warm_2.nbt b/data/minecraft/structure/underwater_ruin/warm_2.nbt index 752d3423..f6b83870 100644 --- a/data/minecraft/structure/underwater_ruin/warm_2.nbt +++ b/data/minecraft/structure/underwater_ruin/warm_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4b67c4309672436a26b1192735dd3c72253ccc56fcfe07dec3d47405aabebe51 -size 1299 +oid sha256:04d1220a76a8ec70cb0080835c5634fcbcc15a445baeebcda00441ffecc671d4 +size 1298 diff --git a/data/minecraft/structure/underwater_ruin/warm_3.nbt b/data/minecraft/structure/underwater_ruin/warm_3.nbt index eaf20823..20e8d2cd 100644 --- a/data/minecraft/structure/underwater_ruin/warm_3.nbt +++ b/data/minecraft/structure/underwater_ruin/warm_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a8b29c15227db2820538750cf4082f02acb9c8e8d6710254d4cd2ef62faf1c60 -size 1272 +oid sha256:220566420e60bef3b024b419f2df88212f426beb13862ee10e52dffa040ef842 +size 1271 diff --git a/data/minecraft/structure/underwater_ruin/warm_4.nbt b/data/minecraft/structure/underwater_ruin/warm_4.nbt index ff91681e..15c8088b 100644 --- a/data/minecraft/structure/underwater_ruin/warm_4.nbt +++ b/data/minecraft/structure/underwater_ruin/warm_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d66b6a8b55cfede5adc8d53e75e1f9493dd7655161159e928ac498020e855020 -size 1348 +oid sha256:7c041bbac6711aae128aec269a743fa4a78fa12d32970ff640249e12f389878b +size 1347 diff --git a/data/minecraft/structure/underwater_ruin/warm_5.nbt b/data/minecraft/structure/underwater_ruin/warm_5.nbt index 93e5023c..d006ad3a 100644 --- a/data/minecraft/structure/underwater_ruin/warm_5.nbt +++ b/data/minecraft/structure/underwater_ruin/warm_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:78f4a1da5d59427f110d1c9566ec088bcf715a4c3020dff540cd26423b966c60 -size 1227 +oid sha256:6fedbcb5dac89409d308af0cb7d675570a0060824eb51568f11ae223efe8cea0 +size 1226 diff --git a/data/minecraft/structure/underwater_ruin/warm_6.nbt b/data/minecraft/structure/underwater_ruin/warm_6.nbt index 347c012a..becdbf03 100644 --- a/data/minecraft/structure/underwater_ruin/warm_6.nbt +++ b/data/minecraft/structure/underwater_ruin/warm_6.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:375fabe46977f50dbf8ea3448eb61ac63305f3a3341dff159884ce3507f3410d -size 1271 +oid sha256:1eaf160a0c7cd9cb5bf049646043b428ffdbe59c28b114b6b634d0d8c483ff12 +size 1270 diff --git a/data/minecraft/structure/underwater_ruin/warm_7.nbt b/data/minecraft/structure/underwater_ruin/warm_7.nbt index dd9a5f83..0fb286bc 100644 --- a/data/minecraft/structure/underwater_ruin/warm_7.nbt +++ b/data/minecraft/structure/underwater_ruin/warm_7.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d8ae879269e8136f69b6f9e026b84a8d54517da58c1cce43bf2a6ca260d8ad99 -size 1211 +oid sha256:7b6c95b51f9a62d6e0768e41d2edbcc438b80675602f6a549d91cf5fc6b5485d +size 1210 diff --git a/data/minecraft/structure/underwater_ruin/warm_8.nbt b/data/minecraft/structure/underwater_ruin/warm_8.nbt index f8b9a8a5..06fde8ce 100644 --- a/data/minecraft/structure/underwater_ruin/warm_8.nbt +++ b/data/minecraft/structure/underwater_ruin/warm_8.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1116512f62dc862281e379829a113b214f40b0ba09852fa8984832c4c8ef4a76 -size 1340 +oid sha256:5e1d02683d86fe90868787e15ab509f5ab07c4194e5f6fdd615d84da2c903e2f +size 1339 diff --git a/data/minecraft/structure/village/common/animals/cat_black.nbt b/data/minecraft/structure/village/common/animals/cat_black.nbt index 90171a6a..12e86b66 100644 --- a/data/minecraft/structure/village/common/animals/cat_black.nbt +++ b/data/minecraft/structure/village/common/animals/cat_black.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:71e56c9b90c28e3b5fe35c2c8b5955c5ab28b626359ab644df65fa939eb5fdf5 +oid sha256:57a9eb22916c977253dfffc7ab50f76f5a0d75ef1429cf09fe627ddbefda8318 size 892 diff --git a/data/minecraft/structure/village/common/animals/cat_british.nbt b/data/minecraft/structure/village/common/animals/cat_british.nbt index 6bb708a3..58c996d1 100644 --- a/data/minecraft/structure/village/common/animals/cat_british.nbt +++ b/data/minecraft/structure/village/common/animals/cat_british.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:52e843aa9763c836e1e83a157b231d8398c0a7e82f64cf243672e8269800dbf6 +oid sha256:7c5b66eb2c10f8e9fd609e64a5329117dd7f89fae97da8ef3243a7d5cda2ffa6 size 901 diff --git a/data/minecraft/structure/village/common/animals/cat_calico.nbt b/data/minecraft/structure/village/common/animals/cat_calico.nbt index efb1f64f..530e982f 100644 --- a/data/minecraft/structure/village/common/animals/cat_calico.nbt +++ b/data/minecraft/structure/village/common/animals/cat_calico.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9739aed88113d53d6c6336a175f772adf5a23871d2bd46225505c131485c9e73 -size 827 +oid sha256:2c267f0ea94069b5094f20cd4542cf342605025fbf05ae95fdbd561689e9511c +size 825 diff --git a/data/minecraft/structure/village/common/animals/cat_jellie.nbt b/data/minecraft/structure/village/common/animals/cat_jellie.nbt index 16426a14..4ffb71bf 100644 --- a/data/minecraft/structure/village/common/animals/cat_jellie.nbt +++ b/data/minecraft/structure/village/common/animals/cat_jellie.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ff79cfa1a393638f1aae5f00dec9ec44fb6edc5fe28160ff4ebd440109f34aee -size 896 +oid sha256:34779b87582a853af29435ec6f7f5963c0cfb42da89ecffe60fe7d4d227ac006 +size 897 diff --git a/data/minecraft/structure/village/common/animals/cat_persian.nbt b/data/minecraft/structure/village/common/animals/cat_persian.nbt index e7775b19..4a941e1a 100644 --- a/data/minecraft/structure/village/common/animals/cat_persian.nbt +++ b/data/minecraft/structure/village/common/animals/cat_persian.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fe6a6b2a50565e8401bb86659ae0c136137aa6eeef2852b87630cdffacfd2708 -size 829 +oid sha256:e624d1c24120d6cd26b50ff28ee41435931ed298fa422492f2a92e9c1e3e84c7 +size 828 diff --git a/data/minecraft/structure/village/common/animals/cat_ragdoll.nbt b/data/minecraft/structure/village/common/animals/cat_ragdoll.nbt index dbe6754b..2f3b1227 100644 --- a/data/minecraft/structure/village/common/animals/cat_ragdoll.nbt +++ b/data/minecraft/structure/village/common/animals/cat_ragdoll.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3cfae776a64dbddc31fbe91e67ec797d2adee07bc9084e1629729014de9306f5 -size 892 +oid sha256:8b469b32b843a37fc0ec010466ef9b2417e25a907b9df4b92f58af3ddbd532dd +size 890 diff --git a/data/minecraft/structure/village/common/animals/cat_red.nbt b/data/minecraft/structure/village/common/animals/cat_red.nbt index 121087df..a0716078 100644 --- a/data/minecraft/structure/village/common/animals/cat_red.nbt +++ b/data/minecraft/structure/village/common/animals/cat_red.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:28ac1ea87d58c274206cb5d1aaf88800f5ed863b2ac2adcd1142af20b04453c4 -size 810 +oid sha256:f4fb26604382b504c3be91a5eb154493db699017c154b39c47e1f0c9d8070e47 +size 808 diff --git a/data/minecraft/structure/village/common/animals/cat_siamese.nbt b/data/minecraft/structure/village/common/animals/cat_siamese.nbt index f7011150..ba7f914f 100644 --- a/data/minecraft/structure/village/common/animals/cat_siamese.nbt +++ b/data/minecraft/structure/village/common/animals/cat_siamese.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:da9f4fbd41f6a74dc2173eebce2c87ee57c0e939062231f48d6b270d1d76e723 -size 819 +oid sha256:87fb268952ef722c960a0fdd7a8a2f28bedb3042711dd97c122a406410f7e486 +size 817 diff --git a/data/minecraft/structure/village/common/animals/cat_tabby.nbt b/data/minecraft/structure/village/common/animals/cat_tabby.nbt index 85f0b039..ea2fc473 100644 --- a/data/minecraft/structure/village/common/animals/cat_tabby.nbt +++ b/data/minecraft/structure/village/common/animals/cat_tabby.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:387169823d4187c6c0e49103b22c2782fbb23cb564f300ae6913966d454589be +oid sha256:7969b0272d7081b4cf6e6990594c7d59cf0a6052603a2c6cc67675b65cdc58b9 size 888 diff --git a/data/minecraft/structure/village/common/animals/cat_white.nbt b/data/minecraft/structure/village/common/animals/cat_white.nbt index 68224029..24fb482b 100644 --- a/data/minecraft/structure/village/common/animals/cat_white.nbt +++ b/data/minecraft/structure/village/common/animals/cat_white.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fd6efa38e8a63def2027ca6288e88152e8eefdc1a134efa1e14ddf9cfd3bbb72 -size 886 +oid sha256:63745951eef3401a1cead23f0dfd452650cb7655eaacb8ce11fa106dd9736c8f +size 885 diff --git a/data/minecraft/structure/village/common/animals/cows_1.nbt b/data/minecraft/structure/village/common/animals/cows_1.nbt index f0a7f02b..07f8c607 100644 --- a/data/minecraft/structure/village/common/animals/cows_1.nbt +++ b/data/minecraft/structure/village/common/animals/cows_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dc2f2661be5a50d11a1974b8040e029d4ef1ce0c0d95962ea5ff7755822c46d9 -size 928 +oid sha256:a33887c55216d1e31aab0b8481e00c135c56bf517f91a3eec27736095485ef28 +size 929 diff --git a/data/minecraft/structure/village/common/animals/horses_1.nbt b/data/minecraft/structure/village/common/animals/horses_1.nbt index 10aa7bf1..feb1bd3e 100644 --- a/data/minecraft/structure/village/common/animals/horses_1.nbt +++ b/data/minecraft/structure/village/common/animals/horses_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a820cf34db2e42a14df54a6621c7cfc411ca775bcab5da544e38dcacfe710a53 -size 893 +oid sha256:9cbf3120e5bacc05e811969ce4410bdc72d87aeb9ab050fd1e1097e620e3aa64 +size 894 diff --git a/data/minecraft/structure/village/common/animals/horses_2.nbt b/data/minecraft/structure/village/common/animals/horses_2.nbt index 5540d605..9114377b 100644 --- a/data/minecraft/structure/village/common/animals/horses_2.nbt +++ b/data/minecraft/structure/village/common/animals/horses_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3f36e6c3c4e12cfae750fb39f0e073c012e1f0e780b206bea7e4f6dcbcaeed69 -size 1003 +oid sha256:13ca899ff38db26de3947639b3f46c67e19b0937a52aa11c96a35c3b0808e894 +size 1004 diff --git a/data/minecraft/structure/village/common/animals/horses_3.nbt b/data/minecraft/structure/village/common/animals/horses_3.nbt index 37a9ecfa..eb884846 100644 --- a/data/minecraft/structure/village/common/animals/horses_3.nbt +++ b/data/minecraft/structure/village/common/animals/horses_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1c03c6c60b00bab979623f5354a560ac28920d1527d06b25f5d08f5cda9fa9fe -size 1011 +oid sha256:db3cb2420feb61912153c8900646cbfc12d110aa0e35a7b951e0dfcc08979a72 +size 1013 diff --git a/data/minecraft/structure/village/common/animals/horses_4.nbt b/data/minecraft/structure/village/common/animals/horses_4.nbt index 8b6b76f0..fa98343e 100644 --- a/data/minecraft/structure/village/common/animals/horses_4.nbt +++ b/data/minecraft/structure/village/common/animals/horses_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9f6a6fa970a4170f891138301637785e61a0cb46da9f6bfb94112eafab1eec47 +oid sha256:91108d646442cadb9fefd15dc3d4f0bf139435957131ff6967d452bdec85d73a size 884 diff --git a/data/minecraft/structure/village/common/animals/horses_5.nbt b/data/minecraft/structure/village/common/animals/horses_5.nbt index 87aaf86f..b3fa9686 100644 --- a/data/minecraft/structure/village/common/animals/horses_5.nbt +++ b/data/minecraft/structure/village/common/animals/horses_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:79f564d335a2508f4c4cb44545f1ba403601eef67a3473c99c71d70453080b62 -size 906 +oid sha256:bef5c6c0d1594a5318a7769914997b15bc8fcb17378f41329405c46a9481bf59 +size 907 diff --git a/data/minecraft/structure/village/common/animals/pigs_1.nbt b/data/minecraft/structure/village/common/animals/pigs_1.nbt index a9678381..c59fd110 100644 --- a/data/minecraft/structure/village/common/animals/pigs_1.nbt +++ b/data/minecraft/structure/village/common/animals/pigs_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d88b9a9850a695802a44a86e6a14f44aa3b2db09965bc2a193e043f61a638d51 -size 932 +oid sha256:a72c5cad2b059922642fab4238d85dab0f2b4458181f2dd2656f8ffcf96a8fbd +size 931 diff --git a/data/minecraft/structure/village/common/animals/sheep_1.nbt b/data/minecraft/structure/village/common/animals/sheep_1.nbt index e0382ba6..6da31ead 100644 --- a/data/minecraft/structure/village/common/animals/sheep_1.nbt +++ b/data/minecraft/structure/village/common/animals/sheep_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:36fb013f2b16a4f726622e797ea43586ff1efff6d684c633ab5cf8e8e431a8b4 +oid sha256:6abda9b49ca17d1bfa5345e5db8b968a2650ddc720bf7f0179a92db7a5e577b5 size 950 diff --git a/data/minecraft/structure/village/common/animals/sheep_2.nbt b/data/minecraft/structure/village/common/animals/sheep_2.nbt index 812ed734..026c657c 100644 --- a/data/minecraft/structure/village/common/animals/sheep_2.nbt +++ b/data/minecraft/structure/village/common/animals/sheep_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b707ec29bf03436c749397d0a2eb50fc7c7bfc0bc1a614719d3c99e9dd11b649 -size 950 +oid sha256:475931a64fd4b6035273e069bfa9e4beee726e0c3c297edba9787369b453bfbc +size 951 diff --git a/data/minecraft/structure/village/common/iron_golem.nbt b/data/minecraft/structure/village/common/iron_golem.nbt index 63f0c1a4..db95ee3c 100644 --- a/data/minecraft/structure/village/common/iron_golem.nbt +++ b/data/minecraft/structure/village/common/iron_golem.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8e760878b1a2884ec411b5c480e5be16783dc73ab566e88c52506116c16e84b2 +oid sha256:3422020731b408fc6a228c7e4225363f300006119c08e4d19e10aede72bd982c size 823 diff --git a/data/minecraft/structure/village/common/well_bottom.nbt b/data/minecraft/structure/village/common/well_bottom.nbt index 9d6270d0..31213e3b 100644 --- a/data/minecraft/structure/village/common/well_bottom.nbt +++ b/data/minecraft/structure/village/common/well_bottom.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4b21747020d10888eb17671968778429f3a672a328164affa64739abf1c34fdf +oid sha256:aedd356076b3cb7ed3e7b9097112e36e8f6ac0270b4e25b2019eee65f9f65476 size 427 diff --git a/data/minecraft/structure/village/decays/grass_11x13.nbt b/data/minecraft/structure/village/decays/grass_11x13.nbt index 0d980324..c819f90a 100644 --- a/data/minecraft/structure/village/decays/grass_11x13.nbt +++ b/data/minecraft/structure/village/decays/grass_11x13.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f85eae8e13483d840180249c26b2603fd55e675e44a282e72f96171008148dd4 -size 558 +oid sha256:8f13ef72ba37a94be0e1536f6574d50c3727ef1cb584f302309ab02d06a765e2 +size 557 diff --git a/data/minecraft/structure/village/decays/grass_16x16.nbt b/data/minecraft/structure/village/decays/grass_16x16.nbt index 1928a038..8a5dd6aa 100644 --- a/data/minecraft/structure/village/decays/grass_16x16.nbt +++ b/data/minecraft/structure/village/decays/grass_16x16.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:020f16905f04082d4cc341cce96442686407ba48c5b448a64ee46afdbac39cd6 +oid sha256:dc299c9c9a8ba0b58fc9bed851544b1a61aa3f26ad6eb8be226d2873c8d961fb size 874 diff --git a/data/minecraft/structure/village/decays/grass_9x9.nbt b/data/minecraft/structure/village/decays/grass_9x9.nbt index 5c53712d..94006f9d 100644 --- a/data/minecraft/structure/village/decays/grass_9x9.nbt +++ b/data/minecraft/structure/village/decays/grass_9x9.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ceb5d1b69c10870baaa4119665c9ed9dac11e10d5f9ae7f93bb9209197c310cc +oid sha256:3bc50d9d5e730af0d216112c1bf585009896db2121313aaee9cb64cc9b1b1e44 size 393 diff --git a/data/minecraft/structure/village/desert/camel_spawn.nbt b/data/minecraft/structure/village/desert/camel_spawn.nbt index 2284e01b..942fc237 100644 --- a/data/minecraft/structure/village/desert/camel_spawn.nbt +++ b/data/minecraft/structure/village/desert/camel_spawn.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:17f25e404a65c004036e1a472c9333d4275bbf06efafbf53fbfcbef7266d2cc3 +oid sha256:4a4557aa382b5852b82e47355d8d232f69b94575b6171b337f68128696c15b1c size 283 diff --git a/data/minecraft/structure/village/desert/desert_lamp_1.nbt b/data/minecraft/structure/village/desert/desert_lamp_1.nbt index a7a2893f..ee1173fc 100644 --- a/data/minecraft/structure/village/desert/desert_lamp_1.nbt +++ b/data/minecraft/structure/village/desert/desert_lamp_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:97ad489ffb1ada4ccb6c0c0656d1c98e88a8f061600c3c16d75a3141ce9b6ce7 -size 279 +oid sha256:88b25589fd1865a97d731e408e6f7f159c4428d91074e7a80b57625eb4207d69 +size 278 diff --git a/data/minecraft/structure/village/desert/houses/desert_animal_pen_1.nbt b/data/minecraft/structure/village/desert/houses/desert_animal_pen_1.nbt index 945dfd50..807bd776 100644 --- a/data/minecraft/structure/village/desert/houses/desert_animal_pen_1.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_animal_pen_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8b5f2bc895b8813741a17f5a9cd4209ba1e4bacaaf3ebfc634db4df93abef9fa -size 1690 +oid sha256:089f85e5bff24a81f7a188ef160e64c41a98ecfeb3f5e06395d3a0d2530e31f8 +size 1687 diff --git a/data/minecraft/structure/village/desert/houses/desert_animal_pen_2.nbt b/data/minecraft/structure/village/desert/houses/desert_animal_pen_2.nbt index b75e208c..f208f64b 100644 --- a/data/minecraft/structure/village/desert/houses/desert_animal_pen_2.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_animal_pen_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:44dd5e2271ab63af6aeeba6c198141a683720abebd6e4636b2b2d4dcc7034a59 -size 1864 +oid sha256:812728dafd87d6b779d0355aa11e8dac411d7613d966b1c6677913c4efbf0b62 +size 1863 diff --git a/data/minecraft/structure/village/desert/houses/desert_armorer_1.nbt b/data/minecraft/structure/village/desert/houses/desert_armorer_1.nbt index 28ccd4a1..603a3ca0 100644 --- a/data/minecraft/structure/village/desert/houses/desert_armorer_1.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_armorer_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d62c4facd15468717daf4ecc4d15e9a3ba4f49313ea9dd68e47402b421306356 -size 1765 +oid sha256:5ea026a42d249b32dd76f84f14100eebed90fa399a87386d1628df55bb4bb176 +size 1762 diff --git a/data/minecraft/structure/village/desert/houses/desert_butcher_shop_1.nbt b/data/minecraft/structure/village/desert/houses/desert_butcher_shop_1.nbt index 55861836..7e7edc2e 100644 --- a/data/minecraft/structure/village/desert/houses/desert_butcher_shop_1.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_butcher_shop_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:60f85bc8b72fe02a7aa3187b78768399e737ae1ff3718d81300ebce3b70ceaa1 -size 1797 +oid sha256:55d0d852e3d42e4dc90e2d7f8005f7d5454e095f003bc3e3d946210c5f63a3e2 +size 1794 diff --git a/data/minecraft/structure/village/desert/houses/desert_cartographer_house_1.nbt b/data/minecraft/structure/village/desert/houses/desert_cartographer_house_1.nbt index 05b8ff0c..886ee7b6 100644 --- a/data/minecraft/structure/village/desert/houses/desert_cartographer_house_1.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_cartographer_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c9ac7028562fdf0aa6d288507795c3a645429b5090ab5653949931fde6641413 -size 1677 +oid sha256:8386ab3f517fb5dde652c7f0ce28b4398554e8fc8d10bda3976628affd394854 +size 1676 diff --git a/data/minecraft/structure/village/desert/houses/desert_farm_1.nbt b/data/minecraft/structure/village/desert/houses/desert_farm_1.nbt index 474371cd..760c3b4a 100644 --- a/data/minecraft/structure/village/desert/houses/desert_farm_1.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_farm_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:54899eebba96aa9648b34bcdcca07125e79f7e7b79f203e36923be1018319670 -size 715 +oid sha256:a1661d4e98ff89885a16d079e4bf103b2ebcb268fcf08ac80694c1ff0dc1271c +size 713 diff --git a/data/minecraft/structure/village/desert/houses/desert_farm_2.nbt b/data/minecraft/structure/village/desert/houses/desert_farm_2.nbt index ce3ddcd0..4536ca75 100644 --- a/data/minecraft/structure/village/desert/houses/desert_farm_2.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_farm_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7165c2553820cd6eaa29fab8fa786f330ce0303b0d9aad8780db6a05b7457faf -size 887 +oid sha256:6e7df0c1c7217226c5272ff46cbfbdf4fe066c8f1514d0358a6b7b5a2d4994c6 +size 886 diff --git a/data/minecraft/structure/village/desert/houses/desert_fisher_1.nbt b/data/minecraft/structure/village/desert/houses/desert_fisher_1.nbt index 608f58f7..fe5a4a2a 100644 --- a/data/minecraft/structure/village/desert/houses/desert_fisher_1.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_fisher_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:91f0a1c0398c2ea1b70f5eaa57db47e3dcb3a9e811edb4543acf95a663f05b3d -size 2286 +oid sha256:415259c431aa4232bdbeb82c22d62d62cbf88d9402e0866c5b8c0bb09627bdf6 +size 2285 diff --git a/data/minecraft/structure/village/desert/houses/desert_fletcher_house_1.nbt b/data/minecraft/structure/village/desert/houses/desert_fletcher_house_1.nbt index 222ecf59..1101390f 100644 --- a/data/minecraft/structure/village/desert/houses/desert_fletcher_house_1.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_fletcher_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:893b998bb174d5e116cbb08a68a33457a35c9860fc52c94c9f4f4b93f37538d2 -size 3095 +oid sha256:09ae4a3aed291a5340570ae559c3a2f3275a746129ad92cf69fa5cc50968be69 +size 3094 diff --git a/data/minecraft/structure/village/desert/houses/desert_large_farm_1.nbt b/data/minecraft/structure/village/desert/houses/desert_large_farm_1.nbt index 9444858a..086afe8e 100644 --- a/data/minecraft/structure/village/desert/houses/desert_large_farm_1.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_large_farm_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:10b245801e305655146605e26d723e2ee46bdd7b1e3404782bc28d6b91bf4f25 -size 1623 +oid sha256:6616e0f5247d64268542bf0ca29cd925d4cff8eed8399eb9f9c4e812d827fa94 +size 1620 diff --git a/data/minecraft/structure/village/desert/houses/desert_library_1.nbt b/data/minecraft/structure/village/desert/houses/desert_library_1.nbt index 3f3c31e9..e5713452 100644 --- a/data/minecraft/structure/village/desert/houses/desert_library_1.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_library_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3cda71597a329812c44d65b449de4a5ad2de1e8ea9cb48ec2b149883fac3d426 -size 1539 +oid sha256:66c428146544fffc8df4b8f0d6201eec0b652d7c04c6b8770ec11e34e87d67e1 +size 1538 diff --git a/data/minecraft/structure/village/desert/houses/desert_mason_1.nbt b/data/minecraft/structure/village/desert/houses/desert_mason_1.nbt index 99a4b46d..7b0c7f40 100644 --- a/data/minecraft/structure/village/desert/houses/desert_mason_1.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_mason_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:67f100aa8af0f46cfcdb1d90473c8083f7934b21b611bc22296d709e57ec746e -size 1443 +oid sha256:89d2a14fe3c4916123ea4d9e7dc781e940c31f16ce8179db1ac32534525d8c94 +size 1441 diff --git a/data/minecraft/structure/village/desert/houses/desert_medium_house_1.nbt b/data/minecraft/structure/village/desert/houses/desert_medium_house_1.nbt index 48496a15..1afd4c27 100644 --- a/data/minecraft/structure/village/desert/houses/desert_medium_house_1.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_medium_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c5217566b822ef1c791f0021b7b25dc9e7b0b4e13f0a39215b03a6293b88967e -size 1442 +oid sha256:5ce60a3c531e67c48d53dde38502ec213c4da74d2e677850039360b18917c15f +size 1439 diff --git a/data/minecraft/structure/village/desert/houses/desert_medium_house_2.nbt b/data/minecraft/structure/village/desert/houses/desert_medium_house_2.nbt index b10082dd..e6cea989 100644 --- a/data/minecraft/structure/village/desert/houses/desert_medium_house_2.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_medium_house_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7757ad5b65558a3735ef7b8d21d4476ea2c457dfd0343884f4dbedd94ee0d836 -size 2838 +oid sha256:6a896d3135395b138fca37b6fc48311ba02cc4010f92e32c1dcb6641e2408b64 +size 2836 diff --git a/data/minecraft/structure/village/desert/houses/desert_shepherd_house_1.nbt b/data/minecraft/structure/village/desert/houses/desert_shepherd_house_1.nbt index d0ea5d14..fd5c1ff5 100644 --- a/data/minecraft/structure/village/desert/houses/desert_shepherd_house_1.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_shepherd_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a91385eec381fd69e54c3cb556918a519cd271682fb92963b934670db88eec2c -size 1567 +oid sha256:9d44b1c7ec774f9bf65e0abc759cd5e7ee2768e0318f695bf867caa711033575 +size 1565 diff --git a/data/minecraft/structure/village/desert/houses/desert_small_house_1.nbt b/data/minecraft/structure/village/desert/houses/desert_small_house_1.nbt index e3c08fd5..dcfaaa4b 100644 --- a/data/minecraft/structure/village/desert/houses/desert_small_house_1.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_small_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:09dbc7eed5f44eed3e1a3bdc6d06c06cddf064967a16c2687214128da39ad38f -size 1180 +oid sha256:9a1aa88a67bcf580c4c3158bba4f3a839c7174b4f7c137ab77396713acc5b343 +size 1179 diff --git a/data/minecraft/structure/village/desert/houses/desert_small_house_2.nbt b/data/minecraft/structure/village/desert/houses/desert_small_house_2.nbt index 90d7fc75..f3371327 100644 --- a/data/minecraft/structure/village/desert/houses/desert_small_house_2.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_small_house_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:66bfe2fdef3455283aae502ee77565eead1d70524bba39b19551ccf2de23dbb6 -size 1314 +oid sha256:219a6fd46a26a7d089eb65a0092351b0351a0aa64f653201e12ea75f1b0bc1bf +size 1312 diff --git a/data/minecraft/structure/village/desert/houses/desert_small_house_3.nbt b/data/minecraft/structure/village/desert/houses/desert_small_house_3.nbt index 0b8f3adf..4bc2286c 100644 --- a/data/minecraft/structure/village/desert/houses/desert_small_house_3.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_small_house_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:84e0be34e11c528e138e2b0e1289d4202e05bfd23ae2e527e3a73c7faf67cf03 -size 1132 +oid sha256:991032f1aad95b8e3cff202ca94684d6ec967e7124fa609226f9b675323b0960 +size 1130 diff --git a/data/minecraft/structure/village/desert/houses/desert_small_house_4.nbt b/data/minecraft/structure/village/desert/houses/desert_small_house_4.nbt index 86ce86af..27f7be53 100644 --- a/data/minecraft/structure/village/desert/houses/desert_small_house_4.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_small_house_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4dd4a2b5bcc534f3313888175d132270bad7052ed7ce8e459ff84e4d72bf2d53 -size 1055 +oid sha256:e316a03c54102eb1eef050fffd4c053fcaa6253317f71f8baf6d6c8bf286b9e5 +size 1052 diff --git a/data/minecraft/structure/village/desert/houses/desert_small_house_5.nbt b/data/minecraft/structure/village/desert/houses/desert_small_house_5.nbt index e49a660c..6208d0bc 100644 --- a/data/minecraft/structure/village/desert/houses/desert_small_house_5.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_small_house_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3c1a8e527f16c52c9c17d5bc9dec0370005886797489e57fa67d7e78bd1f7d46 -size 1108 +oid sha256:f8e7173595eb889e13235216723e27ea162cb3023469847463d2162170086a83 +size 1107 diff --git a/data/minecraft/structure/village/desert/houses/desert_small_house_6.nbt b/data/minecraft/structure/village/desert/houses/desert_small_house_6.nbt index e28216df..78ec2e9d 100644 --- a/data/minecraft/structure/village/desert/houses/desert_small_house_6.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_small_house_6.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f32591e4b7fd2db39eb20e47c7ff9a3e540b968a735110fe2f5cb9f0e21e40c5 -size 2293 +oid sha256:f7231a97936cb990f2a129038b2d5cec0563232c07eedbc2a8963c3ee6248c2a +size 2292 diff --git a/data/minecraft/structure/village/desert/houses/desert_small_house_7.nbt b/data/minecraft/structure/village/desert/houses/desert_small_house_7.nbt index 1a5b9a4b..de19ef2f 100644 --- a/data/minecraft/structure/village/desert/houses/desert_small_house_7.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_small_house_7.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:52c096e1e1a44358fda2bb57f991f19d29bfdf0d4ba72f2ac005ae418f363aaf -size 1600 +oid sha256:89f921ad34c64fd4ac51664ecc948ae5a695fea53268dd906651e1c996b8f1ed +size 1598 diff --git a/data/minecraft/structure/village/desert/houses/desert_small_house_8.nbt b/data/minecraft/structure/village/desert/houses/desert_small_house_8.nbt index b7dfda91..c3b5e106 100644 --- a/data/minecraft/structure/village/desert/houses/desert_small_house_8.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_small_house_8.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:970fd097bb83ad420538536f8e85ab60e0991e76bdcf7ae72984aaf772e32960 -size 1026 +oid sha256:77555fac9d22e2f48f2125f9f72548edcf17bd9b73ad69abd1589f8479e178e6 +size 1024 diff --git a/data/minecraft/structure/village/desert/houses/desert_tannery_1.nbt b/data/minecraft/structure/village/desert/houses/desert_tannery_1.nbt index dd71d769..2bbcadeb 100644 --- a/data/minecraft/structure/village/desert/houses/desert_tannery_1.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_tannery_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:171d0d430edc28a4de440a80165e8dd0c2eb59c188b1ee5b36f9c6752f624ac2 -size 1836 +oid sha256:bf9e0fd832182d1221f72046b11ca52862f942382719c5d77f961e5df2a05533 +size 1835 diff --git a/data/minecraft/structure/village/desert/houses/desert_temple_1.nbt b/data/minecraft/structure/village/desert/houses/desert_temple_1.nbt index c036fc9a..e82a33f3 100644 --- a/data/minecraft/structure/village/desert/houses/desert_temple_1.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_temple_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c74bcbe20a95003a240bfc8e7d669fcc0df05a24c62792a2cd25db14ae0d6db3 -size 2999 +oid sha256:cdd28e94d565fb4008a97903d94e5c559d37ad316c3c854f37380e8159b6179b +size 2998 diff --git a/data/minecraft/structure/village/desert/houses/desert_temple_2.nbt b/data/minecraft/structure/village/desert/houses/desert_temple_2.nbt index c6ecb8a5..dc9e96b8 100644 --- a/data/minecraft/structure/village/desert/houses/desert_temple_2.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_temple_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9b6065d5206ce94b7ee2479e999f9f9ab31189de6c28c337d2c7dbe44dfa2da6 -size 2880 +oid sha256:aaa34167bcec7b5f22e10226e471f949ebac903c334565134e6e5872494cae88 +size 2878 diff --git a/data/minecraft/structure/village/desert/houses/desert_tool_smith_1.nbt b/data/minecraft/structure/village/desert/houses/desert_tool_smith_1.nbt index 24823184..4df14c7b 100644 --- a/data/minecraft/structure/village/desert/houses/desert_tool_smith_1.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_tool_smith_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:be7d27a72f616c585b7622c498db8aa773524a909839f5ee99a38f1020bc27e3 -size 2962 +oid sha256:d0886eb68ae29943f68f20f465ed0e06a85018d4187026c76b0d3e3d7299b38b +size 2960 diff --git a/data/minecraft/structure/village/desert/houses/desert_weaponsmith_1.nbt b/data/minecraft/structure/village/desert/houses/desert_weaponsmith_1.nbt index c7d0d4b5..9746dcb3 100644 --- a/data/minecraft/structure/village/desert/houses/desert_weaponsmith_1.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_weaponsmith_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e063f39e481c4625252eaee886db447fddb368fe5cac430e25ea78f11534ebd7 -size 2083 +oid sha256:44935361c646c0170183dec2bad82dbe6aabca809e16885eb86b1d1f124da0f3 +size 2080 diff --git a/data/minecraft/structure/village/desert/streets/corner_01.nbt b/data/minecraft/structure/village/desert/streets/corner_01.nbt index 0997cb33..819ed2f5 100644 --- a/data/minecraft/structure/village/desert/streets/corner_01.nbt +++ b/data/minecraft/structure/village/desert/streets/corner_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:837bf606c8e99c2e9c622c8637ade74e6637e59efa3e85abd50fa657342867c0 +oid sha256:5ce48889ca17142b34c666042713765bac856de5f5b13340890948bbd9b85008 size 749 diff --git a/data/minecraft/structure/village/desert/streets/corner_02.nbt b/data/minecraft/structure/village/desert/streets/corner_02.nbt index d2177490..73ff548f 100644 --- a/data/minecraft/structure/village/desert/streets/corner_02.nbt +++ b/data/minecraft/structure/village/desert/streets/corner_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:46edb1633bf2a1033c399cdf89a49a1e9a1cc319b2c895007978ea964d1ba258 +oid sha256:7fd1f2f425c0a1ea7399e67baf2b383c1066374aae16b75de0f429124d0184cc size 469 diff --git a/data/minecraft/structure/village/desert/streets/crossroad_01.nbt b/data/minecraft/structure/village/desert/streets/crossroad_01.nbt index fc4231df..e3a739bb 100644 --- a/data/minecraft/structure/village/desert/streets/crossroad_01.nbt +++ b/data/minecraft/structure/village/desert/streets/crossroad_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9b9b001ee7f336dafdebe250f60e618e26260d5572477a8292432de0fe9daf5f -size 1273 +oid sha256:1e35d27114c96f9a7147d7d80ed1f7565fa6c7f31e81dd7d014fbe601465bb31 +size 1272 diff --git a/data/minecraft/structure/village/desert/streets/crossroad_02.nbt b/data/minecraft/structure/village/desert/streets/crossroad_02.nbt index c5f943a6..13135c17 100644 --- a/data/minecraft/structure/village/desert/streets/crossroad_02.nbt +++ b/data/minecraft/structure/village/desert/streets/crossroad_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:65a5874ddc4058cffea8ab835e9d8a3d5fa832c0b62321a4316e34d1259edf4c -size 783 +oid sha256:4e583e60a584ff11e48b7894093e6bf4ec5c5f18ebd5cc661b9f0fdf19ed538a +size 782 diff --git a/data/minecraft/structure/village/desert/streets/crossroad_03.nbt b/data/minecraft/structure/village/desert/streets/crossroad_03.nbt index 6512b8fa..d8dfbfd1 100644 --- a/data/minecraft/structure/village/desert/streets/crossroad_03.nbt +++ b/data/minecraft/structure/village/desert/streets/crossroad_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:87bfaf45889f92b4e34068125ca01c78a5e46c7565785601f3079e13ab55f6b6 -size 444 +oid sha256:2cca29272385798f91a3a5f09415e26ffb536682338bdaf2b4e2991ffb948984 +size 443 diff --git a/data/minecraft/structure/village/desert/streets/square_01.nbt b/data/minecraft/structure/village/desert/streets/square_01.nbt index 4c6f973a..832043b7 100644 --- a/data/minecraft/structure/village/desert/streets/square_01.nbt +++ b/data/minecraft/structure/village/desert/streets/square_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:68d22f544cfa719be51c39069619030fadf3e20100c1b103d089d6756c0d8557 -size 1582 +oid sha256:eb95488d7ddac1d439f79b31d36bfcf56aff7d9290eb0ab8d067916712101fc5 +size 1581 diff --git a/data/minecraft/structure/village/desert/streets/square_02.nbt b/data/minecraft/structure/village/desert/streets/square_02.nbt index 94ad560d..e30730e9 100644 --- a/data/minecraft/structure/village/desert/streets/square_02.nbt +++ b/data/minecraft/structure/village/desert/streets/square_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4e7d8e99d3d12d0bb34a5a7916dc39f25ddf4db27806942794366bbebddaa942 -size 1311 +oid sha256:c34a79827d60aad4169d9fdad673c6a4f02b35813258eae7e6926cb972ea83f3 +size 1310 diff --git a/data/minecraft/structure/village/desert/streets/straight_01.nbt b/data/minecraft/structure/village/desert/streets/straight_01.nbt index ffb39a41..313f40fd 100644 --- a/data/minecraft/structure/village/desert/streets/straight_01.nbt +++ b/data/minecraft/structure/village/desert/streets/straight_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e2db72d1eeb1e2ea7021068592450cc215ca2b9229a420b01474ab4239049504 -size 985 +oid sha256:9c7c07c899598356f5e18f03e7d2c363f7123b8b10ca3d8498be3b036429b904 +size 984 diff --git a/data/minecraft/structure/village/desert/streets/straight_02.nbt b/data/minecraft/structure/village/desert/streets/straight_02.nbt index dafc849c..04e3f95d 100644 --- a/data/minecraft/structure/village/desert/streets/straight_02.nbt +++ b/data/minecraft/structure/village/desert/streets/straight_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:53efae7fead90ea3593197a4647b59aee5fd3eb11a456eb503303898681e5011 -size 1230 +oid sha256:98ba04c44abe137af22e1b283dfb788848ea73914eaf9e0b69218740ce7fe1e2 +size 1229 diff --git a/data/minecraft/structure/village/desert/streets/straight_03.nbt b/data/minecraft/structure/village/desert/streets/straight_03.nbt index 46ab33be..f97516ca 100644 --- a/data/minecraft/structure/village/desert/streets/straight_03.nbt +++ b/data/minecraft/structure/village/desert/streets/straight_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e8c706ee2d7d455d712f128ea1ab51a50f1239191c8b0d45f80d0baa22004bb6 -size 323 +oid sha256:50207330758a6394dabede63b8533d7edd678045ecf4c1eecb8e7b4a565eae6d +size 322 diff --git a/data/minecraft/structure/village/desert/streets/turn_01.nbt b/data/minecraft/structure/village/desert/streets/turn_01.nbt index c338914b..df053c66 100644 --- a/data/minecraft/structure/village/desert/streets/turn_01.nbt +++ b/data/minecraft/structure/village/desert/streets/turn_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6cfda88878719ddae202035d2fed1be02725601e1215e66fa98532c33174c87d -size 401 +oid sha256:4ce8c5b50ba4553271eeb9769a2fc1175aaa50d2e89c7141c3896c78c915059f +size 400 diff --git a/data/minecraft/structure/village/desert/terminators/terminator_01.nbt b/data/minecraft/structure/village/desert/terminators/terminator_01.nbt index bef5b138..7bddf6c5 100644 --- a/data/minecraft/structure/village/desert/terminators/terminator_01.nbt +++ b/data/minecraft/structure/village/desert/terminators/terminator_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b901e8e903be47348848379bc96479aaa185cfb054bb92bf0996e13011d7dcda -size 294 +oid sha256:08614100a50fa37e9089cecebacec7b90d954f43e44e83f377043a470d4397f7 +size 293 diff --git a/data/minecraft/structure/village/desert/terminators/terminator_02.nbt b/data/minecraft/structure/village/desert/terminators/terminator_02.nbt index d8f5b263..2d3e8d42 100644 --- a/data/minecraft/structure/village/desert/terminators/terminator_02.nbt +++ b/data/minecraft/structure/village/desert/terminators/terminator_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c671ace00ad9cf4916d1e5cf914df70efede0f3f0d80d1d19b2f2aef87d5cdba -size 373 +oid sha256:7509beb478cba3f6d149b8893121e0050efd486358128cc1b4be6e0db30769e2 +size 372 diff --git a/data/minecraft/structure/village/desert/town_centers/desert_meeting_point_1.nbt b/data/minecraft/structure/village/desert/town_centers/desert_meeting_point_1.nbt index 3199676c..906f4268 100644 --- a/data/minecraft/structure/village/desert/town_centers/desert_meeting_point_1.nbt +++ b/data/minecraft/structure/village/desert/town_centers/desert_meeting_point_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c052b42f6d1182968e60656be3c5278f97334f60d365e0cfc8c35aefd815b62 -size 1016 +oid sha256:bb63352da9ba01698fc6e6a87ca8ae53240471efa62a7e2b64756d41979166a8 +size 1015 diff --git a/data/minecraft/structure/village/desert/town_centers/desert_meeting_point_2.nbt b/data/minecraft/structure/village/desert/town_centers/desert_meeting_point_2.nbt index 08ac2dba..cc64235d 100644 --- a/data/minecraft/structure/village/desert/town_centers/desert_meeting_point_2.nbt +++ b/data/minecraft/structure/village/desert/town_centers/desert_meeting_point_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:37ad005126d1996870fcaf30e4faac6e6134c843059c1c1e66b173316d8249d0 +oid sha256:a9c5f29de56059ec240ee3f0d727bbec4bda33386a4539e5c9fa09802456a049 size 1835 diff --git a/data/minecraft/structure/village/desert/town_centers/desert_meeting_point_3.nbt b/data/minecraft/structure/village/desert/town_centers/desert_meeting_point_3.nbt index 142d8aa2..67627085 100644 --- a/data/minecraft/structure/village/desert/town_centers/desert_meeting_point_3.nbt +++ b/data/minecraft/structure/village/desert/town_centers/desert_meeting_point_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:42212b9a6dce46218458e520327084be91871bfa2772512302cb1775d67ddef0 -size 1900 +oid sha256:da7ca605b9753bcc363b5965d676e9118f73299bfab7a634d6239eae616b690b +size 1898 diff --git a/data/minecraft/structure/village/desert/villagers/baby.nbt b/data/minecraft/structure/village/desert/villagers/baby.nbt index 87189bff..4a2ebfd2 100644 --- a/data/minecraft/structure/village/desert/villagers/baby.nbt +++ b/data/minecraft/structure/village/desert/villagers/baby.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5e7e145695d2b5b60e33466712807b76701f60e435147ef3509259cc1c47f069 -size 719 +oid sha256:b4afbd5172aceddfb65f141f1554e29d0116fe39079c5ac407a00cf6968f19fa +size 720 diff --git a/data/minecraft/structure/village/desert/villagers/nitwit.nbt b/data/minecraft/structure/village/desert/villagers/nitwit.nbt index c34d04b9..aea3f716 100644 --- a/data/minecraft/structure/village/desert/villagers/nitwit.nbt +++ b/data/minecraft/structure/village/desert/villagers/nitwit.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:744215dabc436a79a04feb450fa5bb8cd2043590fd268e57b85d905794299d94 -size 716 +oid sha256:31d8864c8144146b398e46c5eba7277b1f7e3cac6b5d9d78b21e3f7749b3035d +size 715 diff --git a/data/minecraft/structure/village/desert/villagers/unemployed.nbt b/data/minecraft/structure/village/desert/villagers/unemployed.nbt index 9e1fb669..bea1ad0b 100644 --- a/data/minecraft/structure/village/desert/villagers/unemployed.nbt +++ b/data/minecraft/structure/village/desert/villagers/unemployed.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:151c9af9cfcfdb60d046c532f7db86ad5f88d624baafc5c2c954a3f77bb92d63 +oid sha256:4c9401ee959b66b7e3e4ba3a9c436f5fa480dff43bdc897a418cac3ba971cfc7 size 715 diff --git a/data/minecraft/structure/village/desert/zombie/houses/desert_medium_house_1.nbt b/data/minecraft/structure/village/desert/zombie/houses/desert_medium_house_1.nbt index da8a3529..b3ed1df1 100644 --- a/data/minecraft/structure/village/desert/zombie/houses/desert_medium_house_1.nbt +++ b/data/minecraft/structure/village/desert/zombie/houses/desert_medium_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a57e2878770bf47bd8172c4ec852d21bd05c472757adf3aab3b227912d03541e -size 1449 +oid sha256:7eb9682900ea023ba1ecf02eb243186e7b95843921697ec61f1d3c30d485d5cb +size 1448 diff --git a/data/minecraft/structure/village/desert/zombie/houses/desert_medium_house_2.nbt b/data/minecraft/structure/village/desert/zombie/houses/desert_medium_house_2.nbt index 20a07556..f978efe6 100644 --- a/data/minecraft/structure/village/desert/zombie/houses/desert_medium_house_2.nbt +++ b/data/minecraft/structure/village/desert/zombie/houses/desert_medium_house_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cd5b47619ab6ec1426602ffedc32387890983ae255db35a2f93d92b95ee95978 -size 2846 +oid sha256:1f3ae0dfbe9313dab82523727e0945105ee2aba89e7858a5b462100396ef82fc +size 2843 diff --git a/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_1.nbt b/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_1.nbt index c6c53cf0..5e8577a9 100644 --- a/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_1.nbt +++ b/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:451b0518cffd9fc672db08eadf105109d6d93ddba3159e5f393f33ad78a4c7f2 -size 1186 +oid sha256:505ad270efb8fa6a555adb3cd921a4c83e1f5504b9919d5331fca281853d5f6f +size 1184 diff --git a/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_2.nbt b/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_2.nbt index a3f310df..dcf42199 100644 --- a/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_2.nbt +++ b/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a46e96daaa634ded3bfd9cf455cc06d108153e762bd0073ae18c39b4c636bb91 -size 1319 +oid sha256:33d66ca844011871e69e6803473aa2148018a1d4262703bb16113bede63197aa +size 1318 diff --git a/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_3.nbt b/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_3.nbt index 0d41cdc8..ea94d305 100644 --- a/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_3.nbt +++ b/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a4df91e7cf766ca21e9b9cee3209c4ec3fc2131e255a38ac09c74b6ff30592fe -size 1138 +oid sha256:b21de303bdc84a4c794d58f3553534656b0f03bb507b9b1a81826546a0a86b53 +size 1137 diff --git a/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_4.nbt b/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_4.nbt index 04b02435..51277b20 100644 --- a/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_4.nbt +++ b/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:516defc96b9af56866a346c3f9744c54e8c806ce37afafda9d88067a87078de0 -size 1062 +oid sha256:d89e070b877afe50333b6772bad2ae880f337819628b4ff07c3e8c2757dea746 +size 1059 diff --git a/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_5.nbt b/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_5.nbt index 44d4284e..2938fdfc 100644 --- a/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_5.nbt +++ b/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:67e7c4bf5077a80bcb550f6c2652bec88c28bf4b593812f4de865a1e39ef7b6d -size 1114 +oid sha256:fe47040611a9e1ca9fc4857164d0f77e8721573234002ab0bae13a7eb409ce46 +size 1113 diff --git a/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_6.nbt b/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_6.nbt index 2f4b99c2..818e739e 100644 --- a/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_6.nbt +++ b/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_6.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:51fa8a4f8e92459d3c4db67df899b21951c4ae7c2cf0945d3b81ec6191724d9b -size 1964 +oid sha256:f7aaffc788b1cb74f0f603976d6b79680f020799b9df25b075c4a1576eb2bf14 +size 1962 diff --git a/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_7.nbt b/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_7.nbt index 69f08870..b4f8d7eb 100644 --- a/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_7.nbt +++ b/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_7.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:430789e2dac163d5d6b5f267fddb34cb1d3041f1e10b7e030d5d62218b6bcb03 -size 1606 +oid sha256:c9f9d8e927af311ddd62e7ddaf5de37e78902da857417b553efc9faf3135baa2 +size 1604 diff --git a/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_8.nbt b/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_8.nbt index 75f739c9..8686ab1e 100644 --- a/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_8.nbt +++ b/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_8.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:197b14304c3592cb0396725d65025036461d999fed8a0215f6b25aaa845ce8e7 -size 1031 +oid sha256:b9ad18626260ef873965dcd5858dfd3e7d68c269499f378a7ed9b372d24546bc +size 1029 diff --git a/data/minecraft/structure/village/desert/zombie/streets/corner_01.nbt b/data/minecraft/structure/village/desert/zombie/streets/corner_01.nbt index 10348427..108b8587 100644 --- a/data/minecraft/structure/village/desert/zombie/streets/corner_01.nbt +++ b/data/minecraft/structure/village/desert/zombie/streets/corner_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e00bdea6fcbd117502fb810b7bd9fff5b9bed1053e1dc231c019b81299016f45 +oid sha256:c1b4c9f6cd334b242aba8c39f55ada6d6638bd3b7891610b5857b4e770f4193d size 754 diff --git a/data/minecraft/structure/village/desert/zombie/streets/corner_02.nbt b/data/minecraft/structure/village/desert/zombie/streets/corner_02.nbt index 5f47fd75..4ccc899c 100644 --- a/data/minecraft/structure/village/desert/zombie/streets/corner_02.nbt +++ b/data/minecraft/structure/village/desert/zombie/streets/corner_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:40345e14ffadd24b714dae15167c90bfc379025187dec1ed537c0a2b3214e883 +oid sha256:b4de249b38503f003a758c49f3ddf63798c6b399c5911077e765d4d2ab90b145 size 472 diff --git a/data/minecraft/structure/village/desert/zombie/streets/crossroad_01.nbt b/data/minecraft/structure/village/desert/zombie/streets/crossroad_01.nbt index 8fdcadd7..0e2933da 100644 --- a/data/minecraft/structure/village/desert/zombie/streets/crossroad_01.nbt +++ b/data/minecraft/structure/village/desert/zombie/streets/crossroad_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e3ebc74e4cb6fad9e4c3ba423f3850a057e5cdbdf8b3d9960d416abd5742c821 -size 1279 +oid sha256:b17a2085481a20854a5638cde6d7bc0b7d2d7595e8c091bb5f555dc1c7f24dd9 +size 1278 diff --git a/data/minecraft/structure/village/desert/zombie/streets/crossroad_02.nbt b/data/minecraft/structure/village/desert/zombie/streets/crossroad_02.nbt index 89fc84a8..fd559a4f 100644 --- a/data/minecraft/structure/village/desert/zombie/streets/crossroad_02.nbt +++ b/data/minecraft/structure/village/desert/zombie/streets/crossroad_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cc4e35f380fa77d90e6942a4dbc3225c801a1679daaceeacd2bd6e53e1351846 -size 787 +oid sha256:3f1b350301a4d9aceba6e62cff7f041b4e4164f009136d9e9d56936b51297d3b +size 786 diff --git a/data/minecraft/structure/village/desert/zombie/streets/crossroad_03.nbt b/data/minecraft/structure/village/desert/zombie/streets/crossroad_03.nbt index 5786e3b9..ca21e343 100644 --- a/data/minecraft/structure/village/desert/zombie/streets/crossroad_03.nbt +++ b/data/minecraft/structure/village/desert/zombie/streets/crossroad_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:11495ec71f7352173fa9a561cd80f60a9cee9888326f9e0a1e3802d17d0457f2 +oid sha256:9ed976da307fd24e9103d56d1411e44b55844a2b6d2363d9f7506cf506015eaa size 449 diff --git a/data/minecraft/structure/village/desert/zombie/streets/square_01.nbt b/data/minecraft/structure/village/desert/zombie/streets/square_01.nbt index 0a4b0859..0986510b 100644 --- a/data/minecraft/structure/village/desert/zombie/streets/square_01.nbt +++ b/data/minecraft/structure/village/desert/zombie/streets/square_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a660213749ace646ecefa8c53fa696f039fa311c1510a4933d1136d08aab62e8 -size 1587 +oid sha256:369c05dae961d66b234a1eb6b7dada56b2a501ee397faf0612f533431ada35bc +size 1586 diff --git a/data/minecraft/structure/village/desert/zombie/streets/square_02.nbt b/data/minecraft/structure/village/desert/zombie/streets/square_02.nbt index 19958ac4..85280bf3 100644 --- a/data/minecraft/structure/village/desert/zombie/streets/square_02.nbt +++ b/data/minecraft/structure/village/desert/zombie/streets/square_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d8a5fa7af1b57e15e20c731f58a44cb356378b09160284db859198ad68a30b36 -size 1315 +oid sha256:90c2ab39184b7bdd2e19f786866af424ae33183bc6a51d55e5df8339e5921647 +size 1314 diff --git a/data/minecraft/structure/village/desert/zombie/streets/straight_01.nbt b/data/minecraft/structure/village/desert/zombie/streets/straight_01.nbt index 513e4623..741c2bb7 100644 --- a/data/minecraft/structure/village/desert/zombie/streets/straight_01.nbt +++ b/data/minecraft/structure/village/desert/zombie/streets/straight_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:86e9a2abf0fddfd6bb8742ff748534a0c979bce4ad61f47b4d326ceef7ecb02a +oid sha256:a244b01b5d0b7dbe9bc638151a0b021abc1643c3ab3f0066d5963506e3945211 size 989 diff --git a/data/minecraft/structure/village/desert/zombie/streets/straight_02.nbt b/data/minecraft/structure/village/desert/zombie/streets/straight_02.nbt index 4afa167f..b9e553f4 100644 --- a/data/minecraft/structure/village/desert/zombie/streets/straight_02.nbt +++ b/data/minecraft/structure/village/desert/zombie/streets/straight_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:818fe0948123ffd5e6abe0c64e4a3a18edbb0edcbba110093904ab9e362217fe +oid sha256:840a9192e225ba150d5ff0466b7ab73cab418648c5e091b1517a150890910118 size 1234 diff --git a/data/minecraft/structure/village/desert/zombie/streets/straight_03.nbt b/data/minecraft/structure/village/desert/zombie/streets/straight_03.nbt index 1e584a9b..ef4fcbdb 100644 --- a/data/minecraft/structure/village/desert/zombie/streets/straight_03.nbt +++ b/data/minecraft/structure/village/desert/zombie/streets/straight_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:14527664fc3d5176967fa396c1578067609fac80f3414739e1c0c6e691d8a9ef +oid sha256:2b0b6646b9a5bd306e2d8edfc958f3ee1828a0c6a8af5f147bc9b94d5277885c size 328 diff --git a/data/minecraft/structure/village/desert/zombie/streets/turn_01.nbt b/data/minecraft/structure/village/desert/zombie/streets/turn_01.nbt index ffe7bd61..926eca57 100644 --- a/data/minecraft/structure/village/desert/zombie/streets/turn_01.nbt +++ b/data/minecraft/structure/village/desert/zombie/streets/turn_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:499c5b90be40a3d2a360a87df7b436f7ccc2a5dda82ae2d0f48374f05b511ec0 -size 406 +oid sha256:ae1f72fbd63ed2ae4fcf9c65e232743a92db0e81fd6dc98f919865091e29f825 +size 405 diff --git a/data/minecraft/structure/village/desert/zombie/terminators/terminator_02.nbt b/data/minecraft/structure/village/desert/zombie/terminators/terminator_02.nbt index 3fdf913c..e7a5ecb6 100644 --- a/data/minecraft/structure/village/desert/zombie/terminators/terminator_02.nbt +++ b/data/minecraft/structure/village/desert/zombie/terminators/terminator_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1a730d3aeab2b25dee09cd9e5738eabdb4f57d0009a46e8053e4f605b7075878 -size 377 +oid sha256:f942bf911af6652702119952007fe81ce8bce9446ec144a80e2e6f5ae51d8956 +size 376 diff --git a/data/minecraft/structure/village/desert/zombie/town_centers/desert_meeting_point_1.nbt b/data/minecraft/structure/village/desert/zombie/town_centers/desert_meeting_point_1.nbt index a7e9e85d..eddbb617 100644 --- a/data/minecraft/structure/village/desert/zombie/town_centers/desert_meeting_point_1.nbt +++ b/data/minecraft/structure/village/desert/zombie/town_centers/desert_meeting_point_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:61cca96e22c7b6ececf5b8d4f700b08454fdcd74cb21141c09bfe65b0a537a97 -size 1128 +oid sha256:d9383360626fd62391a6e28dfa516fcbddd90059d0eccf6c197b69a3e77da25f +size 1127 diff --git a/data/minecraft/structure/village/desert/zombie/town_centers/desert_meeting_point_2.nbt b/data/minecraft/structure/village/desert/zombie/town_centers/desert_meeting_point_2.nbt index c59aa030..aca96160 100644 --- a/data/minecraft/structure/village/desert/zombie/town_centers/desert_meeting_point_2.nbt +++ b/data/minecraft/structure/village/desert/zombie/town_centers/desert_meeting_point_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:435718a267d404f886b4f3eda5fb2b8732f5e38d5cc9b84443af6a4a36926176 -size 2312 +oid sha256:ba6ac85696af49301515b546fc8286f6b93eb773117601f9f0ccabe169527d55 +size 2311 diff --git a/data/minecraft/structure/village/desert/zombie/town_centers/desert_meeting_point_3.nbt b/data/minecraft/structure/village/desert/zombie/town_centers/desert_meeting_point_3.nbt index 87a1f558..022de5e9 100644 --- a/data/minecraft/structure/village/desert/zombie/town_centers/desert_meeting_point_3.nbt +++ b/data/minecraft/structure/village/desert/zombie/town_centers/desert_meeting_point_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f71f0c912160a03a4b70cc8b6826d2e61b91393f2d9aff15cfe4617ce614af9b -size 4580 +oid sha256:d09ed5fae2ded0f8b7fefc283cab4d17189099dc970378993016c94f27936ced +size 4579 diff --git a/data/minecraft/structure/village/desert/zombie/villagers/nitwit.nbt b/data/minecraft/structure/village/desert/zombie/villagers/nitwit.nbt index 7c5889f5..b53ce471 100644 --- a/data/minecraft/structure/village/desert/zombie/villagers/nitwit.nbt +++ b/data/minecraft/structure/village/desert/zombie/villagers/nitwit.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:547274e462cc985437a37a99c4106d4c799a3aaf709c2bf0b8e6a5975c3f69d4 +oid sha256:4a4c03bfac69ddd217eaaf731dee6a21c94a6bd32ad0d876a281e83ddf268aa8 size 722 diff --git a/data/minecraft/structure/village/desert/zombie/villagers/unemployed.nbt b/data/minecraft/structure/village/desert/zombie/villagers/unemployed.nbt index 1add0fd6..fe7f11c4 100644 --- a/data/minecraft/structure/village/desert/zombie/villagers/unemployed.nbt +++ b/data/minecraft/structure/village/desert/zombie/villagers/unemployed.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9b9caa22782c0643793fe1618f9593f65751d9dd4305e62d80decf4ba20d126a +oid sha256:0dbac1526fd515b9675bd1ff2a3777db3f0d7517107030f0f712492e3cad3d16 size 721 diff --git a/data/minecraft/structure/village/plains/houses/plains_accessory_1.nbt b/data/minecraft/structure/village/plains/houses/plains_accessory_1.nbt index 49b5e91e..efdfe953 100644 --- a/data/minecraft/structure/village/plains/houses/plains_accessory_1.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_accessory_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4a9265c57a404667a629331403dc3a3bab5ee9febb26397ea8c7ba226489d988 +oid sha256:a36549d0e5aac6931eb0cb9c4fe459f33521a15eea9273ef5f9872d6f6867455 size 523 diff --git a/data/minecraft/structure/village/plains/houses/plains_animal_pen_1.nbt b/data/minecraft/structure/village/plains/houses/plains_animal_pen_1.nbt index 77e7c66c..660789c4 100644 --- a/data/minecraft/structure/village/plains/houses/plains_animal_pen_1.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_animal_pen_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c1314787141388101fe5eb17bbea71fef60ae26dd637210a46fb386792a0107e -size 726 +oid sha256:ba21b0ec4d2e87e4f68d3a4b7feebf181b782f10db3df411a868506ec291f6a9 +size 724 diff --git a/data/minecraft/structure/village/plains/houses/plains_animal_pen_2.nbt b/data/minecraft/structure/village/plains/houses/plains_animal_pen_2.nbt index a1d1e002..c0949b07 100644 --- a/data/minecraft/structure/village/plains/houses/plains_animal_pen_2.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_animal_pen_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:775ca022cde2687a67ad46a504da89af9b7703db076e86a35249fcb3c952b1ff -size 1013 +oid sha256:3ea00d00908de654804bf71bd78317bf5d407ddb22d0f53410ad8c4701c05729 +size 1011 diff --git a/data/minecraft/structure/village/plains/houses/plains_animal_pen_3.nbt b/data/minecraft/structure/village/plains/houses/plains_animal_pen_3.nbt index ff21fe3f..5dfd07b4 100644 --- a/data/minecraft/structure/village/plains/houses/plains_animal_pen_3.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_animal_pen_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e84cc9ccfdb81546ca78999a80e6555827e41a4878758849b2148ca8351462d0 -size 1355 +oid sha256:02a57cdcdb548d949d75469a549bd4bb6345ac2be6d9efd8e1aa017b0b36cb98 +size 1353 diff --git a/data/minecraft/structure/village/plains/houses/plains_armorer_house_1.nbt b/data/minecraft/structure/village/plains/houses/plains_armorer_house_1.nbt index abcb0de8..787815ef 100644 --- a/data/minecraft/structure/village/plains/houses/plains_armorer_house_1.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_armorer_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2fb1fa11e280daa7fb58b9d28b906ad947b7ce8ae5defb269277b750fc78e778 -size 2634 +oid sha256:a705d6e16caca2d740b948dc799a8ac13f40967adf24865c480114bf2c1d1fa8 +size 2629 diff --git a/data/minecraft/structure/village/plains/houses/plains_big_house_1.nbt b/data/minecraft/structure/village/plains/houses/plains_big_house_1.nbt index 7e917e9d..6539296d 100644 --- a/data/minecraft/structure/village/plains/houses/plains_big_house_1.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_big_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ec0cb0671dcb95ad9d2635db7a9d5dc87d3e8da89ea260fd40200720c855e8a3 -size 3264 +oid sha256:1e04ab05d7408a2968b3830334a0d830c2db8b1bd4be1aee326bd60caf45b3a1 +size 3262 diff --git a/data/minecraft/structure/village/plains/houses/plains_butcher_shop_1.nbt b/data/minecraft/structure/village/plains/houses/plains_butcher_shop_1.nbt index 279b1e94..e4323698 100644 --- a/data/minecraft/structure/village/plains/houses/plains_butcher_shop_1.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_butcher_shop_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d41f31ae1f207b400c31afa5764f48833e496bf672750e4a96b93bf33395fc6 -size 4183 +oid sha256:97c0c6a9ce5315b30b723ba7af0a6f20414b295a4d60878df3c11b159b172aed +size 4181 diff --git a/data/minecraft/structure/village/plains/houses/plains_butcher_shop_2.nbt b/data/minecraft/structure/village/plains/houses/plains_butcher_shop_2.nbt index 50cbb0e3..ebb9de22 100644 --- a/data/minecraft/structure/village/plains/houses/plains_butcher_shop_2.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_butcher_shop_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ce6bc556f4b0b98b802c37ea5274c4ace0c5093b9cda3c69d629ab7ac226d5cb -size 4580 +oid sha256:a1c37038036e63471a2b0c6866dde64edfa3275200ba99f6344dfbeafa5ec9af +size 4578 diff --git a/data/minecraft/structure/village/plains/houses/plains_cartographer_1.nbt b/data/minecraft/structure/village/plains/houses/plains_cartographer_1.nbt index 2ebbcff9..1ccd5050 100644 --- a/data/minecraft/structure/village/plains/houses/plains_cartographer_1.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_cartographer_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ff2a30edeaca1f27559daa21f64e9bd25d7143af0446254737a86cb610cfb9b9 -size 2393 +oid sha256:00e202cd07fe6f6cb4aac19c26bd33febd5ecb1c3a994512b826757e38f94df1 +size 2391 diff --git a/data/minecraft/structure/village/plains/houses/plains_fisher_cottage_1.nbt b/data/minecraft/structure/village/plains/houses/plains_fisher_cottage_1.nbt index 537524ea..326313b4 100644 --- a/data/minecraft/structure/village/plains/houses/plains_fisher_cottage_1.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_fisher_cottage_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c487fbbeee78ff20083a47c88ee40a22d49ae27df22dcfd581cec5b291bf9047 -size 3527 +oid sha256:2306e9806e8fc864d4392d8b22ae1587b6f09847d61366fb13548d359f439325 +size 3525 diff --git a/data/minecraft/structure/village/plains/houses/plains_fletcher_house_1.nbt b/data/minecraft/structure/village/plains/houses/plains_fletcher_house_1.nbt index b39ef428..da96d887 100644 --- a/data/minecraft/structure/village/plains/houses/plains_fletcher_house_1.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_fletcher_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7373de513aeb0cca715f7075fbe5d82b7730c860cd82e5f77af327ebc25df7c7 -size 2914 +oid sha256:bd42cae2c89c24cfa003a13af4394b49eda38dd34ccf56123fbf3e44de2dc620 +size 2913 diff --git a/data/minecraft/structure/village/plains/houses/plains_large_farm_1.nbt b/data/minecraft/structure/village/plains/houses/plains_large_farm_1.nbt index 64dd723b..30c3eee7 100644 --- a/data/minecraft/structure/village/plains/houses/plains_large_farm_1.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_large_farm_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8e76392b14c91133da580f66111a740e1f6f8c353add4b1c1907f5558a963012 +oid sha256:01eb8c82bafac0e11ff5823fac6f1b2e99dfe9c46b61964eeea6f1951c264d3e size 1157 diff --git a/data/minecraft/structure/village/plains/houses/plains_library_1.nbt b/data/minecraft/structure/village/plains/houses/plains_library_1.nbt index b2dc3bc0..e8f6cc71 100644 --- a/data/minecraft/structure/village/plains/houses/plains_library_1.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_library_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d24dace3284d40e5b299efbbf47740e109b792b1e23b7266b26ec19f20eec3da -size 6515 +oid sha256:9e266386a2c37d37e7ad5b546b4d2aec5939f5d2824c0bd73006e06b1e7384bc +size 6514 diff --git a/data/minecraft/structure/village/plains/houses/plains_library_2.nbt b/data/minecraft/structure/village/plains/houses/plains_library_2.nbt index 3afe527e..582d5f08 100644 --- a/data/minecraft/structure/village/plains/houses/plains_library_2.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_library_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:37be8af236b2558613aa1f80841c88c4f66190c32d391d74f77d889b1ebeb381 +oid sha256:0bb465336be22b377e79ebb78e8614c33cc46fa85880fe459b48afdf5a3d5bd2 size 2917 diff --git a/data/minecraft/structure/village/plains/houses/plains_masons_house_1.nbt b/data/minecraft/structure/village/plains/houses/plains_masons_house_1.nbt index 211b1f41..8d8892b4 100644 --- a/data/minecraft/structure/village/plains/houses/plains_masons_house_1.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_masons_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:70a6d88887179d4f6527554b4f1118ab4c32b2fe76d41e11a34198797d255e45 -size 2297 +oid sha256:27eb6adc93e2dcc0d32003e5f0f3f55cdc34667f261dfb6b5e7e61a8050f78cf +size 2296 diff --git a/data/minecraft/structure/village/plains/houses/plains_medium_house_1.nbt b/data/minecraft/structure/village/plains/houses/plains_medium_house_1.nbt index 7864a9b1..77a3b78d 100644 --- a/data/minecraft/structure/village/plains/houses/plains_medium_house_1.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_medium_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8e64f7c396ac944543b20a69b7264720d5a6e9fa8818e4f490a565a46f30d94e -size 4241 +oid sha256:9264bcb46375f11699608f6d4e88ecc96ddd8da097591edb063433f2a0c41234 +size 4240 diff --git a/data/minecraft/structure/village/plains/houses/plains_medium_house_2.nbt b/data/minecraft/structure/village/plains/houses/plains_medium_house_2.nbt index 8358847d..9267e317 100644 --- a/data/minecraft/structure/village/plains/houses/plains_medium_house_2.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_medium_house_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7317a11f3741f69d62e3d514a80d223f5df0c28d8fc4236b325e03a4c7279f04 -size 2543 +oid sha256:b1f573b79e5e435c312fae55c03c1e0c8b3cade33fd2577be6adb3c51315ee54 +size 2542 diff --git a/data/minecraft/structure/village/plains/houses/plains_meeting_point_4.nbt b/data/minecraft/structure/village/plains/houses/plains_meeting_point_4.nbt index b4c12c6d..1557bad1 100644 --- a/data/minecraft/structure/village/plains/houses/plains_meeting_point_4.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_meeting_point_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3b9f8431562cb2e2810f214aa8be88d8ff8ed68375ba645a4beae67e4b78093a -size 3907 +oid sha256:ff0f1431323e891f970cdda5cdd2f472f0a666772b68bbccaf1529f1ae17dc78 +size 3905 diff --git a/data/minecraft/structure/village/plains/houses/plains_meeting_point_5.nbt b/data/minecraft/structure/village/plains/houses/plains_meeting_point_5.nbt index 9846b734..8ba51cab 100644 --- a/data/minecraft/structure/village/plains/houses/plains_meeting_point_5.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_meeting_point_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:74caa113550ab07104e416d1bb279773154017d17296dc22e70f4b6c0dffc451 -size 2652 +oid sha256:b1acc1c65b6ffab362771430c46b12f9696afe1589bbd0e5e8f275e8a63a6b68 +size 2651 diff --git a/data/minecraft/structure/village/plains/houses/plains_shepherds_house_1.nbt b/data/minecraft/structure/village/plains/houses/plains_shepherds_house_1.nbt index a5d7e964..9f152dda 100644 --- a/data/minecraft/structure/village/plains/houses/plains_shepherds_house_1.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_shepherds_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:edef7883c9d55608bae7f5b69181cb07d36ef470187d3a537018746e0c817501 +oid sha256:5e8794711064d5ed8846126fee12b0942e77d8e9051f0209a54106eddbdfe832 size 2915 diff --git a/data/minecraft/structure/village/plains/houses/plains_small_farm_1.nbt b/data/minecraft/structure/village/plains/houses/plains_small_farm_1.nbt index 8655f738..25f77c9d 100644 --- a/data/minecraft/structure/village/plains/houses/plains_small_farm_1.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_small_farm_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:80fd42b91bd3e64f4a599c230214bb52e30f21ee3d1abe74dd76e9482dda236b +oid sha256:39429a84df4aedfa6f2d9cbec098f8aafb941cad511cc4f425c0271e174b5d88 size 773 diff --git a/data/minecraft/structure/village/plains/houses/plains_small_house_1.nbt b/data/minecraft/structure/village/plains/houses/plains_small_house_1.nbt index c20a33ea..8a33b0a0 100644 --- a/data/minecraft/structure/village/plains/houses/plains_small_house_1.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_small_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:124244c41977d5383b59805030d87ede3061070a15d31678d7f9660d8060733b -size 1809 +oid sha256:b90e21408dc8a6fd7b5be040b28d4665287b8e30d96b104a3d8ccbdd6f1737f6 +size 1808 diff --git a/data/minecraft/structure/village/plains/houses/plains_small_house_2.nbt b/data/minecraft/structure/village/plains/houses/plains_small_house_2.nbt index f240d266..dbe1b2b6 100644 --- a/data/minecraft/structure/village/plains/houses/plains_small_house_2.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_small_house_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8e5e3a54e1a459bc95a48d789eaac11d584c8ebd5f72b3096dde512391702331 -size 1700 +oid sha256:08cfcb8349f6fa44db2fd18e9229ee9bfd77183b7f3845f294cc0f54773def53 +size 1699 diff --git a/data/minecraft/structure/village/plains/houses/plains_small_house_3.nbt b/data/minecraft/structure/village/plains/houses/plains_small_house_3.nbt index 3a9e23a4..6ae05c82 100644 --- a/data/minecraft/structure/village/plains/houses/plains_small_house_3.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_small_house_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:86f9aedea24a4988633b25f91f6ef066f80033509ff3889b18162515df5967da -size 1803 +oid sha256:0e037fca0f0bd5af919b7b624196ca06d874de91e8491bf5c6576cfa11ff668d +size 1802 diff --git a/data/minecraft/structure/village/plains/houses/plains_small_house_4.nbt b/data/minecraft/structure/village/plains/houses/plains_small_house_4.nbt index 26a2944b..91705ce9 100644 --- a/data/minecraft/structure/village/plains/houses/plains_small_house_4.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_small_house_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:438edab2f0d94d30862d8ab3eeb1b3087d8298415dd4247032b610d57218f7e5 -size 1726 +oid sha256:87b61e6ad485b2c2118fdab77ede6318b0dc9ce23206d46e221530b851bd71c3 +size 1725 diff --git a/data/minecraft/structure/village/plains/houses/plains_small_house_5.nbt b/data/minecraft/structure/village/plains/houses/plains_small_house_5.nbt index 2b72c295..3d95eba0 100644 --- a/data/minecraft/structure/village/plains/houses/plains_small_house_5.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_small_house_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1b61a823f26aae487dcc57110788c4a0a06ba7fe77ede89b40ca0ab77844ebdc -size 3492 +oid sha256:45260a17cce83e1e9383c858fc8b0baa9a6adb6763f201c5dc39b79e9a957fec +size 3491 diff --git a/data/minecraft/structure/village/plains/houses/plains_small_house_6.nbt b/data/minecraft/structure/village/plains/houses/plains_small_house_6.nbt index 4869e9f5..fef302d1 100644 --- a/data/minecraft/structure/village/plains/houses/plains_small_house_6.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_small_house_6.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e35b1b652f53395c54afb5a9a694de007e76165ab28d7ad6df094e3bf9f09c26 -size 1775 +oid sha256:adecefaa2b57655fe0b6a8f91bcfca310ab26adbb987c3f0a661d9c57352f928 +size 1774 diff --git a/data/minecraft/structure/village/plains/houses/plains_small_house_7.nbt b/data/minecraft/structure/village/plains/houses/plains_small_house_7.nbt index b11a728b..f35ee9e2 100644 --- a/data/minecraft/structure/village/plains/houses/plains_small_house_7.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_small_house_7.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:115d28e8ed3b9e8aa9212b07a5e7f2b6e21cd4d455861671eafd9a5d4e4de326 -size 2036 +oid sha256:549865bcca138d26dd4172d4e9739f31a696177cdb35e9bc9e6ebb351ccac8a3 +size 2034 diff --git a/data/minecraft/structure/village/plains/houses/plains_small_house_8.nbt b/data/minecraft/structure/village/plains/houses/plains_small_house_8.nbt index 648e4745..d35df5f7 100644 --- a/data/minecraft/structure/village/plains/houses/plains_small_house_8.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_small_house_8.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7c77aa158397ca9b1aac2b9bcb54fd730858a841d245341aced5805bb0989742 -size 2684 +oid sha256:4b0fbcd0c88588b96a7d547495b64ec42f0503c5cdf4fe3da0fa73f4484f7488 +size 2682 diff --git a/data/minecraft/structure/village/plains/houses/plains_stable_1.nbt b/data/minecraft/structure/village/plains/houses/plains_stable_1.nbt index 43bb6e9d..683a783d 100644 --- a/data/minecraft/structure/village/plains/houses/plains_stable_1.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_stable_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:823d1bd3f71cbdc72108caca853589270282288bcbf115339d83241e439fad4b +oid sha256:e67a76efb3b86b24f707dd8e090c764471a97ff27b924ecc41ebe92e2de38198 size 3779 diff --git a/data/minecraft/structure/village/plains/houses/plains_stable_2.nbt b/data/minecraft/structure/village/plains/houses/plains_stable_2.nbt index b3fb3d63..8096e6b8 100644 --- a/data/minecraft/structure/village/plains/houses/plains_stable_2.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_stable_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8507262d181174c43e8bc4f2dde1bec8de037dab8984cd7298d5804493dc6fb8 -size 3072 +oid sha256:9c1cbad5a65c9e542dcd74b21d4e1a23167462ccc6bd2b00d0cd0ac8f559b4bb +size 3071 diff --git a/data/minecraft/structure/village/plains/houses/plains_tannery_1.nbt b/data/minecraft/structure/village/plains/houses/plains_tannery_1.nbt index 976d39d6..33ae9a8d 100644 --- a/data/minecraft/structure/village/plains/houses/plains_tannery_1.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_tannery_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6ee26f3393e042277abab746f8bd23cbcf305654143f9dc56b5a4e57106853ec -size 2503 +oid sha256:0ca0f350a12da1143eb9fbb5890f03a10b2b92f60dbec97e6ff5e1fb8358bc59 +size 2501 diff --git a/data/minecraft/structure/village/plains/houses/plains_temple_3.nbt b/data/minecraft/structure/village/plains/houses/plains_temple_3.nbt index eeac4ed2..21aee845 100644 --- a/data/minecraft/structure/village/plains/houses/plains_temple_3.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_temple_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8bd46ae28b09a8075ec83ae4809e5ca48e5610c411f22293804397c36098b35e -size 2493 +oid sha256:4043777acc6ab0b3616d2f74aa5c9420da7595573c45b40d1eb29c37cc8f231d +size 2491 diff --git a/data/minecraft/structure/village/plains/houses/plains_temple_4.nbt b/data/minecraft/structure/village/plains/houses/plains_temple_4.nbt index 06949e58..d25f282e 100644 --- a/data/minecraft/structure/village/plains/houses/plains_temple_4.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_temple_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:55d7fdc0a3e58d16a0ccfa074bbe88304613a33ed5787a6e37647148a2a61505 -size 3211 +oid sha256:10ed43917a85b19f5b2f7a6c8d8177a15ed9f2f58e53ef56d2b90235b917402a +size 3210 diff --git a/data/minecraft/structure/village/plains/houses/plains_tool_smith_1.nbt b/data/minecraft/structure/village/plains/houses/plains_tool_smith_1.nbt index 26ee4875..cf89c57f 100644 --- a/data/minecraft/structure/village/plains/houses/plains_tool_smith_1.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_tool_smith_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f70da9c35dfe01e1958ccb8466d1b4b195a46c6db542dc7e391724ca65d1463f -size 2675 +oid sha256:e3a9a52abeb10f97d5912664c85597dcfa15c7e20ccb68a79922a3e8ba714fb3 +size 2674 diff --git a/data/minecraft/structure/village/plains/houses/plains_weaponsmith_1.nbt b/data/minecraft/structure/village/plains/houses/plains_weaponsmith_1.nbt index bc98bf73..b468816a 100644 --- a/data/minecraft/structure/village/plains/houses/plains_weaponsmith_1.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_weaponsmith_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eb27f257b0f663a206337cad5049ed284b836cbbcf549beea9a3b5892524861f -size 3365 +oid sha256:0646d5bcd350c86ff15b0ed252f7c6bf1383454c2b6aaa471d44928071e0f8b4 +size 3362 diff --git a/data/minecraft/structure/village/plains/plains_lamp_1.nbt b/data/minecraft/structure/village/plains/plains_lamp_1.nbt index b0b7468a..2b3596d8 100644 --- a/data/minecraft/structure/village/plains/plains_lamp_1.nbt +++ b/data/minecraft/structure/village/plains/plains_lamp_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:88abb93e379edf14580bc2b834d1584c0107d22541088ff9cddc191bcfc546ff -size 470 +oid sha256:0f0541f31dca3fc9e12d2745e86fb1e0ee49b19e48b73ddf5e1f4e89b36bd9eb +size 469 diff --git a/data/minecraft/structure/village/plains/streets/corner_01.nbt b/data/minecraft/structure/village/plains/streets/corner_01.nbt index f26a3776..f56fe63d 100644 --- a/data/minecraft/structure/village/plains/streets/corner_01.nbt +++ b/data/minecraft/structure/village/plains/streets/corner_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a163001e656fbd5a7b20e598fca7fe8b327302ea177988988538977d1d8e8232 -size 1183 +oid sha256:c42f4c67791fe62500e26c6340aee9bba1ce7dcb5e707ae8490245c130c12775 +size 1182 diff --git a/data/minecraft/structure/village/plains/streets/corner_02.nbt b/data/minecraft/structure/village/plains/streets/corner_02.nbt index fbad771c..c5e4fdda 100644 --- a/data/minecraft/structure/village/plains/streets/corner_02.nbt +++ b/data/minecraft/structure/village/plains/streets/corner_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:26f3aa773a1d399db8371ff0c0088574ce97c151d1477f95d905dbec3bc0e601 +oid sha256:69e9768ad5d6ebe056f40c4ae2506b2681cd33f06115441f24cb624f8d9be141 size 1109 diff --git a/data/minecraft/structure/village/plains/streets/corner_03.nbt b/data/minecraft/structure/village/plains/streets/corner_03.nbt index eb62d2cd..04889360 100644 --- a/data/minecraft/structure/village/plains/streets/corner_03.nbt +++ b/data/minecraft/structure/village/plains/streets/corner_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0292975e4912a945a8f615fa077518f8e4d9fd9661de2152ef015ac38492d4ee +oid sha256:9fd19ce9436b3c1c9b7a6ed3663711a022b7e98ba6c03689947f2b98fce90728 size 351 diff --git a/data/minecraft/structure/village/plains/streets/crossroad_01.nbt b/data/minecraft/structure/village/plains/streets/crossroad_01.nbt index 148a4fe5..8bd4f95e 100644 --- a/data/minecraft/structure/village/plains/streets/crossroad_01.nbt +++ b/data/minecraft/structure/village/plains/streets/crossroad_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:106a1cc4efc79e9ff6a5fa6b98076ad2c9bb6a052faaa44ad5dd3429a59329a8 -size 1216 +oid sha256:024569a46fe43e3e94163e7b2533d78fed550fa0253cb165ac6345f43dce0c36 +size 1215 diff --git a/data/minecraft/structure/village/plains/streets/crossroad_02.nbt b/data/minecraft/structure/village/plains/streets/crossroad_02.nbt index 9a6f3dd9..536b1f60 100644 --- a/data/minecraft/structure/village/plains/streets/crossroad_02.nbt +++ b/data/minecraft/structure/village/plains/streets/crossroad_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:90d34cb88e2eb75aad05aa18f7242f1eed7c8397ab706d6078a5b7f472e6a88b -size 1161 +oid sha256:63ddf3eb2f8604fd2c8bf062a462be4237ccae7e7f7887e7c0242d3dc8157828 +size 1160 diff --git a/data/minecraft/structure/village/plains/streets/crossroad_03.nbt b/data/minecraft/structure/village/plains/streets/crossroad_03.nbt index e4fb7eae..89d942d0 100644 --- a/data/minecraft/structure/village/plains/streets/crossroad_03.nbt +++ b/data/minecraft/structure/village/plains/streets/crossroad_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6262071b40e83a64238b2fad11b66f1f56cbce1577191c84d6c6813e185ea7cf +oid sha256:89264cdc554fdc01246d5786ebb0bfb4f874d674baa4d0f6698773ada7c7f062 size 1204 diff --git a/data/minecraft/structure/village/plains/streets/crossroad_04.nbt b/data/minecraft/structure/village/plains/streets/crossroad_04.nbt index d3decc31..9f55d138 100644 --- a/data/minecraft/structure/village/plains/streets/crossroad_04.nbt +++ b/data/minecraft/structure/village/plains/streets/crossroad_04.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d9c31a2c3b97b536b22756dd32cb675f3f8ed397cd3217789dbf1ad1871910bb -size 378 +oid sha256:9e685b587cd2ae7ed1f13ad95550ef34c12aa48fd3b0e5ea750704023cd5ddc0 +size 377 diff --git a/data/minecraft/structure/village/plains/streets/crossroad_05.nbt b/data/minecraft/structure/village/plains/streets/crossroad_05.nbt index 11e3098c..88e204b7 100644 --- a/data/minecraft/structure/village/plains/streets/crossroad_05.nbt +++ b/data/minecraft/structure/village/plains/streets/crossroad_05.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bc044a11b1dec490adf0328278ec8fd10a6f0b3d22fa949996c2b40a54e73823 -size 410 +oid sha256:5f119b7e20e65938b1e1b7bb63520f108aa528e872c0ef4a3f15dd44e0e1ba9d +size 409 diff --git a/data/minecraft/structure/village/plains/streets/crossroad_06.nbt b/data/minecraft/structure/village/plains/streets/crossroad_06.nbt index 1c0174c3..c2e5cb53 100644 --- a/data/minecraft/structure/village/plains/streets/crossroad_06.nbt +++ b/data/minecraft/structure/village/plains/streets/crossroad_06.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:25d6fcd68a9c60e08382468e56ee8b091a6a2310f2c90d45f8d5af87ed467fc4 +oid sha256:a8f95276fc7ed9401566d47c13a657cbb7560821a91df0bdc8bb2c2776b7cbf8 size 471 diff --git a/data/minecraft/structure/village/plains/streets/straight_01.nbt b/data/minecraft/structure/village/plains/streets/straight_01.nbt index b93d81c5..c7599a96 100644 --- a/data/minecraft/structure/village/plains/streets/straight_01.nbt +++ b/data/minecraft/structure/village/plains/streets/straight_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c33daa0cdd49d332fb1064e75480203ff48c26703bdfce0fa98447cc1a134a20 +oid sha256:fe5c2f98a1dda6e0d28569dbd8597d09530ba04ad69ba23037e868fcea19bf25 size 1132 diff --git a/data/minecraft/structure/village/plains/streets/straight_02.nbt b/data/minecraft/structure/village/plains/streets/straight_02.nbt index 11a1f8f2..8c966faf 100644 --- a/data/minecraft/structure/village/plains/streets/straight_02.nbt +++ b/data/minecraft/structure/village/plains/streets/straight_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:405d11d1dafc49bbf94a05593c3326948fe005f8529cdbc81a26adfb51f3cdd7 -size 1085 +oid sha256:85f049bbfbbf5cba060197d89f9c13d10ddc9cfabb99aad16ae7b241303758ca +size 1084 diff --git a/data/minecraft/structure/village/plains/streets/straight_03.nbt b/data/minecraft/structure/village/plains/streets/straight_03.nbt index 459f26a6..0a1bbe44 100644 --- a/data/minecraft/structure/village/plains/streets/straight_03.nbt +++ b/data/minecraft/structure/village/plains/streets/straight_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e0080086bed1de2b10b0bbcf5572c2a214c0231e6ebc82e1dd79454115a38d1b +oid sha256:c9aad8c9cd22005f84d809025d05939e06c95dd223192fc597511ff71ee5e565 size 777 diff --git a/data/minecraft/structure/village/plains/streets/straight_04.nbt b/data/minecraft/structure/village/plains/streets/straight_04.nbt index 034f2ac6..4e82c380 100644 --- a/data/minecraft/structure/village/plains/streets/straight_04.nbt +++ b/data/minecraft/structure/village/plains/streets/straight_04.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:81e61b82027879f3b9bfd4393c19139c71a51e93a337c214f5ad401cbed36967 +oid sha256:a62544cd6a15fcc5cf22f7e564e9497736efc159982e926ad844f244346733bd size 634 diff --git a/data/minecraft/structure/village/plains/streets/straight_05.nbt b/data/minecraft/structure/village/plains/streets/straight_05.nbt index 079f005a..eef85307 100644 --- a/data/minecraft/structure/village/plains/streets/straight_05.nbt +++ b/data/minecraft/structure/village/plains/streets/straight_05.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:955241b329b205c43cc2cca3dd261f1a85ce05514b6ce4916334dee6c8e5bb50 -size 1329 +oid sha256:d89b7e040669e25d5697a118639fd72fc58f2ab1e471b45f7cc0cc0e1cb1061c +size 1328 diff --git a/data/minecraft/structure/village/plains/streets/straight_06.nbt b/data/minecraft/structure/village/plains/streets/straight_06.nbt index 975515e3..48a48cc2 100644 --- a/data/minecraft/structure/village/plains/streets/straight_06.nbt +++ b/data/minecraft/structure/village/plains/streets/straight_06.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c0d7e774f4a2985bb58c51c5be1f0b3f792afea65d87f52bd82d5c8a18b0ac1f -size 1704 +oid sha256:808f834aa1228d858886bf867481cb067a2e16e0f752f55db1e1cfd8d3d7f2cf +size 1703 diff --git a/data/minecraft/structure/village/plains/streets/turn_01.nbt b/data/minecraft/structure/village/plains/streets/turn_01.nbt index 4a5ee8e3..c8427cf7 100644 --- a/data/minecraft/structure/village/plains/streets/turn_01.nbt +++ b/data/minecraft/structure/village/plains/streets/turn_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d83132ed35a3034015ba9386485e73ed6195aa0b5a1b7752c108bf1c0a863456 -size 790 +oid sha256:35fdd1c0c82115f9f03a515b652d3255de88de64c30d03e9b6173d6d669befcb +size 789 diff --git a/data/minecraft/structure/village/plains/terminators/terminator_01.nbt b/data/minecraft/structure/village/plains/terminators/terminator_01.nbt index 71933995..c1b3ae3e 100644 --- a/data/minecraft/structure/village/plains/terminators/terminator_01.nbt +++ b/data/minecraft/structure/village/plains/terminators/terminator_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:34650b04439bb06b2e7871aa67e8282b345c24743c9bc80f6903e41cf3beedd2 -size 285 +oid sha256:274aa73a42978454d4dc9e4b61f2919ed2cb9fcd90899f3efeaef0857802505d +size 284 diff --git a/data/minecraft/structure/village/plains/terminators/terminator_02.nbt b/data/minecraft/structure/village/plains/terminators/terminator_02.nbt index 4ae9715b..7648a568 100644 --- a/data/minecraft/structure/village/plains/terminators/terminator_02.nbt +++ b/data/minecraft/structure/village/plains/terminators/terminator_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1b878198ed08e576b6d01138d8a970734e86a667e801af4db8b38507f50265ed -size 251 +oid sha256:9aed2acffa049dc80bd3e7b1c1ce9ac3fba960e63b84ab6cbc5b6833dbf58499 +size 250 diff --git a/data/minecraft/structure/village/plains/terminators/terminator_03.nbt b/data/minecraft/structure/village/plains/terminators/terminator_03.nbt index ccb1d251..02e523f5 100644 --- a/data/minecraft/structure/village/plains/terminators/terminator_03.nbt +++ b/data/minecraft/structure/village/plains/terminators/terminator_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:69c7d89264c0ad0a3b879b1d5b4286901a419450f4f7fef3f9cba40c77d96003 -size 292 +oid sha256:2d3398a06c6c117e822070c56da943809bdac11437c1f43e8d420f26742f4fb3 +size 291 diff --git a/data/minecraft/structure/village/plains/terminators/terminator_04.nbt b/data/minecraft/structure/village/plains/terminators/terminator_04.nbt index 3ce4dc1f..eb4808af 100644 --- a/data/minecraft/structure/village/plains/terminators/terminator_04.nbt +++ b/data/minecraft/structure/village/plains/terminators/terminator_04.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9100caa7a2660b2e9dfa22bf940802a75b733ea6f72f5576a1e7a8d66144c39b -size 322 +oid sha256:6a75e849f13a00d26ccd136cda000105e437f85828b1f5605aa775e5001a5507 +size 321 diff --git a/data/minecraft/structure/village/plains/town_centers/plains_fountain_01.nbt b/data/minecraft/structure/village/plains/town_centers/plains_fountain_01.nbt index e76ec0f1..41ac2dd6 100644 --- a/data/minecraft/structure/village/plains/town_centers/plains_fountain_01.nbt +++ b/data/minecraft/structure/village/plains/town_centers/plains_fountain_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e8669fb85e0339ca4fb5d93c7d797cf4a9f5e19fe6aaf1e4fa6f7604ab491f5a -size 957 +oid sha256:54558442bfaec17317986d7df724894ed55b02f0cc3eec727a52154c182ad363 +size 956 diff --git a/data/minecraft/structure/village/plains/town_centers/plains_meeting_point_1.nbt b/data/minecraft/structure/village/plains/town_centers/plains_meeting_point_1.nbt index 4e988bff..40ee7425 100644 --- a/data/minecraft/structure/village/plains/town_centers/plains_meeting_point_1.nbt +++ b/data/minecraft/structure/village/plains/town_centers/plains_meeting_point_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:06100ecc4de8e6e3d11f2748ba7d463533da93144509b3d6150e5bf33b957515 -size 1052 +oid sha256:a0a4ffb4a4ca18cd02ec0d95c77e437f5252580949c151b131f6065ff2e0ba5a +size 1051 diff --git a/data/minecraft/structure/village/plains/town_centers/plains_meeting_point_2.nbt b/data/minecraft/structure/village/plains/town_centers/plains_meeting_point_2.nbt index 40c7b7b6..5b87a508 100644 --- a/data/minecraft/structure/village/plains/town_centers/plains_meeting_point_2.nbt +++ b/data/minecraft/structure/village/plains/town_centers/plains_meeting_point_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:966a9b7035b75c6961b7eb056da3940951d242aa6d45bc30a81764ffed28eabf -size 2540 +oid sha256:b92eeda8234e1db7fc8ced9a0db34eba8e5cdf4fc5f9a6b8c8e41078f58ead4a +size 2538 diff --git a/data/minecraft/structure/village/plains/town_centers/plains_meeting_point_3.nbt b/data/minecraft/structure/village/plains/town_centers/plains_meeting_point_3.nbt index 6f37e1c3..4cc4feee 100644 --- a/data/minecraft/structure/village/plains/town_centers/plains_meeting_point_3.nbt +++ b/data/minecraft/structure/village/plains/town_centers/plains_meeting_point_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:04407203a40cd084dc430a10aea3b61ce9f83cb328a5b8948f72c1e7bb304802 -size 1585 +oid sha256:90e90b32dde02bdb58329778c1862699863be75a7e98fc09782170e53278cc3e +size 1586 diff --git a/data/minecraft/structure/village/plains/villagers/baby.nbt b/data/minecraft/structure/village/plains/villagers/baby.nbt index 0d0d870a..24f21ecd 100644 --- a/data/minecraft/structure/village/plains/villagers/baby.nbt +++ b/data/minecraft/structure/village/plains/villagers/baby.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:226a6656aae6f3f6d8b39c4d6c982edee40ab5e00c5110ac6a1a7027d2bc6cc9 +oid sha256:6dc3ba7283b2aa9aae829d8b3d0761bfbf759c89eb0fe5bd73706e355ac813ce size 718 diff --git a/data/minecraft/structure/village/plains/villagers/nitwit.nbt b/data/minecraft/structure/village/plains/villagers/nitwit.nbt index 77786c58..9f2391c8 100644 --- a/data/minecraft/structure/village/plains/villagers/nitwit.nbt +++ b/data/minecraft/structure/village/plains/villagers/nitwit.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:71a20804dd995d2223d9c25127acd8e7d73022a69263afb07441ed9086b3281c -size 716 +oid sha256:a8f1edb8dcc3e8cd0e7e38575a3f75ce5647cc56ffaaac24cd30f52bb68d0998 +size 715 diff --git a/data/minecraft/structure/village/plains/villagers/unemployed.nbt b/data/minecraft/structure/village/plains/villagers/unemployed.nbt index 732e1865..55bb2c6f 100644 --- a/data/minecraft/structure/village/plains/villagers/unemployed.nbt +++ b/data/minecraft/structure/village/plains/villagers/unemployed.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5e1502a0ff0665eb567561b6f73f382a0e0bc9765eaf88f2627dac15199bbdca -size 715 +oid sha256:7db025d2aa9e6ff9a3a837c29f9244f98359a60f4bdc64abd45d67a20400bb92 +size 714 diff --git a/data/minecraft/structure/village/plains/zombie/houses/plains_animal_pen_3.nbt b/data/minecraft/structure/village/plains/zombie/houses/plains_animal_pen_3.nbt index 67d43239..f7143e8c 100644 --- a/data/minecraft/structure/village/plains/zombie/houses/plains_animal_pen_3.nbt +++ b/data/minecraft/structure/village/plains/zombie/houses/plains_animal_pen_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f10a4f434070d819b5a62dd0acc6bf72d9173c6e76a9cf1ee2313b048cd3f306 -size 1362 +oid sha256:bad11192fab92d18a7a4ef568432dd55446665eed1c0c22a95c41ee7fe2a3e53 +size 1361 diff --git a/data/minecraft/structure/village/plains/zombie/houses/plains_big_house_1.nbt b/data/minecraft/structure/village/plains/zombie/houses/plains_big_house_1.nbt index 4d2f3d56..6e47ddc6 100644 --- a/data/minecraft/structure/village/plains/zombie/houses/plains_big_house_1.nbt +++ b/data/minecraft/structure/village/plains/zombie/houses/plains_big_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c29f0b4948d7ba2b28a4723aec0db31b00a8b4cec1e2a6fe16e653f947df517 -size 3272 +oid sha256:ad42877cd11fe8c10da76b56f51bb3d691b506a410dee21eda0e2d23503c08f2 +size 3271 diff --git a/data/minecraft/structure/village/plains/zombie/houses/plains_butcher_shop_2.nbt b/data/minecraft/structure/village/plains/zombie/houses/plains_butcher_shop_2.nbt index 670f6941..b84b05d2 100644 --- a/data/minecraft/structure/village/plains/zombie/houses/plains_butcher_shop_2.nbt +++ b/data/minecraft/structure/village/plains/zombie/houses/plains_butcher_shop_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5c287ee671a3b77f4883323d3e873a438314391a87101e8b9b5f10eed1b85a76 +oid sha256:aedb905ea68a7f26d6a75b6377e8adc5a3db8fa1984d461c714b1c1cf8680d23 size 4660 diff --git a/data/minecraft/structure/village/plains/zombie/houses/plains_fletcher_house_1.nbt b/data/minecraft/structure/village/plains/zombie/houses/plains_fletcher_house_1.nbt index f897e151..19303cea 100644 --- a/data/minecraft/structure/village/plains/zombie/houses/plains_fletcher_house_1.nbt +++ b/data/minecraft/structure/village/plains/zombie/houses/plains_fletcher_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:596271e8dd0a4341f82ee3d8a7077eb564c0a192dddf4dc9f42247c2bba64443 -size 2912 +oid sha256:5e27c2890a7973555746e05879270ad4f0196c79767c89bd1a2c6c587fbf3a4d +size 2906 diff --git a/data/minecraft/structure/village/plains/zombie/houses/plains_medium_house_1.nbt b/data/minecraft/structure/village/plains/zombie/houses/plains_medium_house_1.nbt index f0a9e4b0..9b2f8702 100644 --- a/data/minecraft/structure/village/plains/zombie/houses/plains_medium_house_1.nbt +++ b/data/minecraft/structure/village/plains/zombie/houses/plains_medium_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8a4593d668533a7b300607cf64bac9d22dd330bf8c6bd4d22136306b60f704ad +oid sha256:f74760dc66df5a6acd9c89658d14afd42c86dceffd619ded1b7255bec15858f8 size 4248 diff --git a/data/minecraft/structure/village/plains/zombie/houses/plains_medium_house_2.nbt b/data/minecraft/structure/village/plains/zombie/houses/plains_medium_house_2.nbt index 908701c1..d13fe5f9 100644 --- a/data/minecraft/structure/village/plains/zombie/houses/plains_medium_house_2.nbt +++ b/data/minecraft/structure/village/plains/zombie/houses/plains_medium_house_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:46a818ddc4021431bd9023e8211165678d8bc5801cb721609c202b26e9f3deb9 -size 2542 +oid sha256:231e97f651d0978ff1b31c953d09983249ea344435a2c0fafa2ffa941490683a +size 2541 diff --git a/data/minecraft/structure/village/plains/zombie/houses/plains_meeting_point_4.nbt b/data/minecraft/structure/village/plains/zombie/houses/plains_meeting_point_4.nbt index 95047a8d..411a1a69 100644 --- a/data/minecraft/structure/village/plains/zombie/houses/plains_meeting_point_4.nbt +++ b/data/minecraft/structure/village/plains/zombie/houses/plains_meeting_point_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:38de99e1435aa614cc767a7c036e6bc8dba6e9cbdfc6eab9b1ab0b6aba1ee81c -size 3919 +oid sha256:7c3cbc2acec77651384f5ce1845bc7273e68766f546d4d3292b3771399991eae +size 3918 diff --git a/data/minecraft/structure/village/plains/zombie/houses/plains_meeting_point_5.nbt b/data/minecraft/structure/village/plains/zombie/houses/plains_meeting_point_5.nbt index 7beb7510..667559f9 100644 --- a/data/minecraft/structure/village/plains/zombie/houses/plains_meeting_point_5.nbt +++ b/data/minecraft/structure/village/plains/zombie/houses/plains_meeting_point_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d357141658438201edd6b443d8dab9c81488186fa6879be0085f3f25efba80ab -size 2599 +oid sha256:a5a9574d6bca598f58d147935510b9e44e99d1d8349ac5aaef54acdc831e8146 +size 2597 diff --git a/data/minecraft/structure/village/plains/zombie/houses/plains_shepherds_house_1.nbt b/data/minecraft/structure/village/plains/zombie/houses/plains_shepherds_house_1.nbt index bf816f7f..e81ce63b 100644 --- a/data/minecraft/structure/village/plains/zombie/houses/plains_shepherds_house_1.nbt +++ b/data/minecraft/structure/village/plains/zombie/houses/plains_shepherds_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5ff6e832c041827f52d0d637d5194c3fffb60b8d064e2c9526ba2fa163aeb016 +oid sha256:12ec801f3e9d99830778867a04c2de37b1e2edc24dd0b38afb26b1c19de82bd9 size 2925 diff --git a/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_1.nbt b/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_1.nbt index b23dcb5d..57934c40 100644 --- a/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_1.nbt +++ b/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0359d6b1d29b47dafa0c92bf6b507229222f213e0df32931586ae632d900f8a7 -size 1810 +oid sha256:f53a543f7f6763bff1239e9b80b3f8ec5bd585002fc8db6825ed377f138ca367 +size 1808 diff --git a/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_2.nbt b/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_2.nbt index 774cd3cd..43e3ec16 100644 --- a/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_2.nbt +++ b/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:35b4e9c47da99164eba45a9445aa4400d097c74e55bee6f64b0a67848d296c9e -size 1708 +oid sha256:9e2bb4526bc8d0c6e75a07aecab17b340c7d54c01e3558f672e28e53755a4c35 +size 1706 diff --git a/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_3.nbt b/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_3.nbt index 0c0c57dd..d39c4f40 100644 --- a/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_3.nbt +++ b/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:79fcbfac449cd94031db5e675cba2120d27917955f5a46ab09e02b11a7b5d658 -size 1810 +oid sha256:f28c4b051065ec9874159d87a5445b6b9f0da37942f20f2ccd7ab025641bc592 +size 1809 diff --git a/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_4.nbt b/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_4.nbt index e0d3a45d..356f5a80 100644 --- a/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_4.nbt +++ b/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f6589ea31b8e1cd5bde2ef3385ef42e0595b2f11fc6cd3c06d319572f66e73b9 -size 1783 +oid sha256:f9d2194b13e31a88f745a8a39bcd0a688fe4cb1c75007cbdf549729179e632ec +size 1782 diff --git a/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_5.nbt b/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_5.nbt index 2a917726..5b41f3a3 100644 --- a/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_5.nbt +++ b/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e6e34b78bbcfd91b12c4c87ac744640873e1c42a62fb4d58935c2ff716d6cb01 -size 3496 +oid sha256:39d52e36df34e733acdde6ca3d547840bb640a03ca5e09a928827edda51a97fd +size 3495 diff --git a/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_6.nbt b/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_6.nbt index 6a36c1e7..de6ce7b8 100644 --- a/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_6.nbt +++ b/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_6.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e2bbc62501f4b53e1ad9ca1190845d9687fa23afd020326c54f3c43f95e75b76 -size 1767 +oid sha256:e01d4dc74578d796b25a8052f942e512f0201e4e4224b5878e1350856651e7d3 +size 1766 diff --git a/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_7.nbt b/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_7.nbt index cec39f83..add3da1f 100644 --- a/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_7.nbt +++ b/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_7.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aefe9b71874a6089bc2b964ff12392624b13db3a99344f0b59657ab302ed1a73 -size 2034 +oid sha256:ae8248d6b5a9eb80c5941266f322eedf6092dff4acf9952615d577bf1c378a29 +size 2032 diff --git a/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_8.nbt b/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_8.nbt index ee24203d..10229783 100644 --- a/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_8.nbt +++ b/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_8.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8ca735818d0bc2502cec6fc71c414b6a38e1da3fe9510dabbc80860210bbb800 -size 2691 +oid sha256:1e6727fc45e7913a75e4bfefb9624bd80a519220215d07167324f897791e047e +size 2690 diff --git a/data/minecraft/structure/village/plains/zombie/houses/plains_stable_1.nbt b/data/minecraft/structure/village/plains/zombie/houses/plains_stable_1.nbt index 622d4efa..8b35d7cf 100644 --- a/data/minecraft/structure/village/plains/zombie/houses/plains_stable_1.nbt +++ b/data/minecraft/structure/village/plains/zombie/houses/plains_stable_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:468250b64c51f574ac0c0d23e4af4a8923f3d7d4ff1029353337bf5bf9ba1b00 +oid sha256:b9f6958e7b6e09976a85c8a5e11d46fd71de7e66ec05f104ad3010fda0ffae41 size 3861 diff --git a/data/minecraft/structure/village/plains/zombie/streets/corner_01.nbt b/data/minecraft/structure/village/plains/zombie/streets/corner_01.nbt index 026f4514..2ca45542 100644 --- a/data/minecraft/structure/village/plains/zombie/streets/corner_01.nbt +++ b/data/minecraft/structure/village/plains/zombie/streets/corner_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d198f622066837ba788f749b425bf0d229736e02351883bac0fea353cb39fc1b -size 1188 +oid sha256:ea5bea56de978a9df79afa86ba745d35ab7774c436e9e4df8bf7563a85f30fae +size 1187 diff --git a/data/minecraft/structure/village/plains/zombie/streets/corner_02.nbt b/data/minecraft/structure/village/plains/zombie/streets/corner_02.nbt index 32a346ba..bbb8df9f 100644 --- a/data/minecraft/structure/village/plains/zombie/streets/corner_02.nbt +++ b/data/minecraft/structure/village/plains/zombie/streets/corner_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8382773a7bb602f329f9ac37d86959bad4f73252b2e062bec5fb56b49c0481be +oid sha256:a2da2aeaf64c3d8e2462b1990c9280e5ee9f5d82a6080e222a94e91cbbd7b5f2 size 1115 diff --git a/data/minecraft/structure/village/plains/zombie/streets/corner_03.nbt b/data/minecraft/structure/village/plains/zombie/streets/corner_03.nbt index cec2e553..bf93f59d 100644 --- a/data/minecraft/structure/village/plains/zombie/streets/corner_03.nbt +++ b/data/minecraft/structure/village/plains/zombie/streets/corner_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f85c9c62c73efc442fafca481fdd79c85034954e223b496149592a3adbcd8537 +oid sha256:61a2113f567da71c330da9a4be9b1b11c338780b581dbcb229dd28f2abda8f35 size 356 diff --git a/data/minecraft/structure/village/plains/zombie/streets/crossroad_01.nbt b/data/minecraft/structure/village/plains/zombie/streets/crossroad_01.nbt index 77de9c79..e0ac1d7e 100644 --- a/data/minecraft/structure/village/plains/zombie/streets/crossroad_01.nbt +++ b/data/minecraft/structure/village/plains/zombie/streets/crossroad_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d81b54138ee7164595b144bee73aee211703de0aa30fa69f613f43dcddd2fbae -size 1221 +oid sha256:2ca7693bdf0e16ca0cc6cb9a2c24f5c49be694d6efb31237f56debbbec2357a3 +size 1220 diff --git a/data/minecraft/structure/village/plains/zombie/streets/crossroad_02.nbt b/data/minecraft/structure/village/plains/zombie/streets/crossroad_02.nbt index d8e0b34c..2f9feeba 100644 --- a/data/minecraft/structure/village/plains/zombie/streets/crossroad_02.nbt +++ b/data/minecraft/structure/village/plains/zombie/streets/crossroad_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ecea71f5f8136aa9e3ced670a0c6eb964f469838801ac41d4cea1b44a3096149 +oid sha256:9af6cf372adf6710e89cea613b150224ca1ac032c5ee264e7e0e3b753b31a765 size 1165 diff --git a/data/minecraft/structure/village/plains/zombie/streets/crossroad_03.nbt b/data/minecraft/structure/village/plains/zombie/streets/crossroad_03.nbt index 5fc03e66..bac36ae5 100644 --- a/data/minecraft/structure/village/plains/zombie/streets/crossroad_03.nbt +++ b/data/minecraft/structure/village/plains/zombie/streets/crossroad_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e2eb80231eb2355ad8dc00f4e31ad73fd89b1ade898f8bbd4d386f38b975d31c -size 1209 +oid sha256:3dcaf4ef911125121b9ffb52402726088d09f1821597b3a6187d163fbe2c3d50 +size 1208 diff --git a/data/minecraft/structure/village/plains/zombie/streets/crossroad_04.nbt b/data/minecraft/structure/village/plains/zombie/streets/crossroad_04.nbt index b46e7961..31a8f2a0 100644 --- a/data/minecraft/structure/village/plains/zombie/streets/crossroad_04.nbt +++ b/data/minecraft/structure/village/plains/zombie/streets/crossroad_04.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e88dd2ad6310a1e381da2f655b5dc1fdb1bfbfebe426cb52fb401c59c0f0ca97 -size 383 +oid sha256:f0f066a7615fc9829c080f8ab9793557b03f27849b628dccc63c555672514b8b +size 384 diff --git a/data/minecraft/structure/village/plains/zombie/streets/crossroad_05.nbt b/data/minecraft/structure/village/plains/zombie/streets/crossroad_05.nbt index 03b50922..9427a576 100644 --- a/data/minecraft/structure/village/plains/zombie/streets/crossroad_05.nbt +++ b/data/minecraft/structure/village/plains/zombie/streets/crossroad_05.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d2e93939b3a2ddde050dfa2654a4803a54f25ab37cda90480dccd525520ab551 +oid sha256:5047f2c25d4938b5897d1516eedc9ced5e73825386131b70f7413513087276e8 size 414 diff --git a/data/minecraft/structure/village/plains/zombie/streets/crossroad_06.nbt b/data/minecraft/structure/village/plains/zombie/streets/crossroad_06.nbt index f5318639..86ff20e6 100644 --- a/data/minecraft/structure/village/plains/zombie/streets/crossroad_06.nbt +++ b/data/minecraft/structure/village/plains/zombie/streets/crossroad_06.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d74a98dd636a9f49a8b7beb5a04427cd50fc35e273cdff95c0cdd227c19e3392 -size 476 +oid sha256:1462db130f8e6c5511144945043486546a50531b118f1ea82aaa9bb25e008361 +size 475 diff --git a/data/minecraft/structure/village/plains/zombie/streets/straight_01.nbt b/data/minecraft/structure/village/plains/zombie/streets/straight_01.nbt index 18534b33..ec18f66f 100644 --- a/data/minecraft/structure/village/plains/zombie/streets/straight_01.nbt +++ b/data/minecraft/structure/village/plains/zombie/streets/straight_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d0205d49e6003eca432fe59302b662e4bf40af3e5470bb01e5a716b501ab54db +oid sha256:eac88e1aabfd3b0e0734ff557cc39b1a88b9bb5967e1c0a62b973747ba7921d7 size 1136 diff --git a/data/minecraft/structure/village/plains/zombie/streets/straight_02.nbt b/data/minecraft/structure/village/plains/zombie/streets/straight_02.nbt index 650b840c..b9e0dcce 100644 --- a/data/minecraft/structure/village/plains/zombie/streets/straight_02.nbt +++ b/data/minecraft/structure/village/plains/zombie/streets/straight_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0eba4508e80e29e1ed7e2144c2ed1342ec89b2d7790003423d8b692ee1ebf461 +oid sha256:ba403a0cef39185bc8448bcd952ff0b67c9f73959d4b33709d323ddbec6bfbad size 1090 diff --git a/data/minecraft/structure/village/plains/zombie/streets/straight_03.nbt b/data/minecraft/structure/village/plains/zombie/streets/straight_03.nbt index 87985e81..1c168134 100644 --- a/data/minecraft/structure/village/plains/zombie/streets/straight_03.nbt +++ b/data/minecraft/structure/village/plains/zombie/streets/straight_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c136c6bac24377cbe4bd02b831e25341f7fbf8c9aa7b5e60255d9e07dfbb2ce6 -size 783 +oid sha256:54feef8c9a25e64bc43855bfa80592f1ca2349354cbc08dd010416d206105008 +size 782 diff --git a/data/minecraft/structure/village/plains/zombie/streets/straight_04.nbt b/data/minecraft/structure/village/plains/zombie/streets/straight_04.nbt index 10086e9a..3934f519 100644 --- a/data/minecraft/structure/village/plains/zombie/streets/straight_04.nbt +++ b/data/minecraft/structure/village/plains/zombie/streets/straight_04.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ec3e88ac9a2574ba21f2545836fa40a9a1f0ca1251bbc549c4b87d2f54654ac1 -size 640 +oid sha256:04e7ab06954c4b5c2a84801edfff447bd6c76b1d76e720b4b267fd3076eea400 +size 639 diff --git a/data/minecraft/structure/village/plains/zombie/streets/straight_05.nbt b/data/minecraft/structure/village/plains/zombie/streets/straight_05.nbt index a57d3abe..b0553d9c 100644 --- a/data/minecraft/structure/village/plains/zombie/streets/straight_05.nbt +++ b/data/minecraft/structure/village/plains/zombie/streets/straight_05.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b73e0d93bfe1184b2ba37958df84138dcba3abb8b9942499444738349a7f1a6c -size 1335 +oid sha256:b4114cd3dfa6dd2a0358eb24f44601ecec2ecebdd70a8ab09b0d55d47cafa8fa +size 1333 diff --git a/data/minecraft/structure/village/plains/zombie/streets/straight_06.nbt b/data/minecraft/structure/village/plains/zombie/streets/straight_06.nbt index ae261b08..50a177e3 100644 --- a/data/minecraft/structure/village/plains/zombie/streets/straight_06.nbt +++ b/data/minecraft/structure/village/plains/zombie/streets/straight_06.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d2cb5e1bd0371b72d44f2dda92abdf23ee255ecfedac89ecc5a6f564510afba1 -size 1709 +oid sha256:9d6387876cf939ba6249067236de8a30c5677e157a32cab9ea47a5bee8d06f15 +size 1708 diff --git a/data/minecraft/structure/village/plains/zombie/streets/turn_01.nbt b/data/minecraft/structure/village/plains/zombie/streets/turn_01.nbt index f9912e04..f2afac29 100644 --- a/data/minecraft/structure/village/plains/zombie/streets/turn_01.nbt +++ b/data/minecraft/structure/village/plains/zombie/streets/turn_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:403a7197296924b5e0a5abdee6861464f3fb65489559eaababbf522b37ee720b -size 795 +oid sha256:eed031dbd0a88c78712bd61b807b4180a7e88dc03a27a248429142b837d89806 +size 794 diff --git a/data/minecraft/structure/village/plains/zombie/town_centers/plains_fountain_01.nbt b/data/minecraft/structure/village/plains/zombie/town_centers/plains_fountain_01.nbt index 4c953556..014175e9 100644 --- a/data/minecraft/structure/village/plains/zombie/town_centers/plains_fountain_01.nbt +++ b/data/minecraft/structure/village/plains/zombie/town_centers/plains_fountain_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c4576dfaaaa827f7a91b6ec548e2aa154b9727d6b5b1aa0cdd5fe04ffc9e4f87 -size 933 +oid sha256:d9c6a0636ea9af56fb234b4557e5a5ee072e10dd587cc489a2ea3c4a6e51e9b3 +size 932 diff --git a/data/minecraft/structure/village/plains/zombie/town_centers/plains_meeting_point_1.nbt b/data/minecraft/structure/village/plains/zombie/town_centers/plains_meeting_point_1.nbt index 4cb32e97..5ec66985 100644 --- a/data/minecraft/structure/village/plains/zombie/town_centers/plains_meeting_point_1.nbt +++ b/data/minecraft/structure/village/plains/zombie/town_centers/plains_meeting_point_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c92bf3c1392a456cff698067907f25d3b3a7988afc9fe1aee8c73c7015664556 -size 994 +oid sha256:886e9e5763dfefaee05b4311aee76c0dad06647972d4022497f55f45f4f04ff0 +size 993 diff --git a/data/minecraft/structure/village/plains/zombie/town_centers/plains_meeting_point_2.nbt b/data/minecraft/structure/village/plains/zombie/town_centers/plains_meeting_point_2.nbt index af998062..d05da482 100644 --- a/data/minecraft/structure/village/plains/zombie/town_centers/plains_meeting_point_2.nbt +++ b/data/minecraft/structure/village/plains/zombie/town_centers/plains_meeting_point_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:259b37c0c7abe105e8875bcbdb67321d2acfc7e850f9cfe4307023c64b4377db -size 2485 +oid sha256:52c577185f9ac3fafa245dddf3f17e31b64625cd722010719c7f6a43085030ba +size 2484 diff --git a/data/minecraft/structure/village/plains/zombie/town_centers/plains_meeting_point_3.nbt b/data/minecraft/structure/village/plains/zombie/town_centers/plains_meeting_point_3.nbt index adbf0fd1..48c51c4b 100644 --- a/data/minecraft/structure/village/plains/zombie/town_centers/plains_meeting_point_3.nbt +++ b/data/minecraft/structure/village/plains/zombie/town_centers/plains_meeting_point_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2b8457352b053ea8704c7e385a85858605d706e70489e74d69fd77314f51d365 +oid sha256:5857eb1125c9992245346620412e796af699ec5474ae4b581a6e0ba74c509291 size 1527 diff --git a/data/minecraft/structure/village/plains/zombie/villagers/nitwit.nbt b/data/minecraft/structure/village/plains/zombie/villagers/nitwit.nbt index 967e4096..5794ea31 100644 --- a/data/minecraft/structure/village/plains/zombie/villagers/nitwit.nbt +++ b/data/minecraft/structure/village/plains/zombie/villagers/nitwit.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:881a4402706e3ecff7d926f112b71ec6b15b353b575e6f75344a9540bd3cd2cc -size 721 +oid sha256:e7cc8301b20784ad49d87f23bed752dd77f2fef4f965ba231c4c41bdedf8cd2d +size 722 diff --git a/data/minecraft/structure/village/plains/zombie/villagers/unemployed.nbt b/data/minecraft/structure/village/plains/zombie/villagers/unemployed.nbt index 429b9750..6a8f3296 100644 --- a/data/minecraft/structure/village/plains/zombie/villagers/unemployed.nbt +++ b/data/minecraft/structure/village/plains/zombie/villagers/unemployed.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b97090541ba589c52244497a70c15bb2e33f9b53ba4050f08314a59d9c72c0e6 -size 721 +oid sha256:68bdbc6bc7be17937628de8e88e5d57479fb17296f9c165efe64c476786f66d9 +size 720 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_animal_pen_1.nbt b/data/minecraft/structure/village/savanna/houses/savanna_animal_pen_1.nbt index 3c8fceeb..3b261539 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_animal_pen_1.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_animal_pen_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bb9499026180ed92795c5ee2f0cb6640a6becc1d99066284bd6c06e6f12bb7f8 -size 1861 +oid sha256:80ce7d561324f39acecccb407cada528d777572a61da7f05587a7df038385da1 +size 1859 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_animal_pen_2.nbt b/data/minecraft/structure/village/savanna/houses/savanna_animal_pen_2.nbt index 03a63b8e..1f6769a9 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_animal_pen_2.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_animal_pen_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d2b51cf43a8b69bc61e2cfd72ec5bbf679e00fdf0cb6acd814c5fc93da3d9575 +oid sha256:1cd1629514334af8dfd17397f2e5daf9f6e53d1af54897478379e63f0d6ad482 size 3474 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_animal_pen_3.nbt b/data/minecraft/structure/village/savanna/houses/savanna_animal_pen_3.nbt index c82180af..1ae730e8 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_animal_pen_3.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_animal_pen_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b3f4cd4b3cdc4086133c95acacec5a61b839f0e3f510b557e857f4724a7eaec4 -size 1660 +oid sha256:79076c30a2c780f2cb8fd3020e09b87e1768752238d8131c55f27dea42dc20c2 +size 1659 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_armorer_1.nbt b/data/minecraft/structure/village/savanna/houses/savanna_armorer_1.nbt index 936da76c..fc8211d2 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_armorer_1.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_armorer_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:407eb9ac86a75580a3be143e6492e0339d45923cd5f7d97311c83792501238a0 -size 1723 +oid sha256:a47b5e78789a45ed253af620e5df7ab945dc3303d440818fb2220101b0f9aee8 +size 1721 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_butchers_shop_1.nbt b/data/minecraft/structure/village/savanna/houses/savanna_butchers_shop_1.nbt index ad954ba9..a5b02519 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_butchers_shop_1.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_butchers_shop_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:88fa938d258b745ea71080d667aa24f5ed0900b98680d1acfb4bb3e1c8e2a4b9 -size 3939 +oid sha256:91f4ad5dc73d7093b1cf0f05d29fedae25b3ae9d03dc31812ca9eff8dfb52d1a +size 3937 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_butchers_shop_2.nbt b/data/minecraft/structure/village/savanna/houses/savanna_butchers_shop_2.nbt index 3630d4cf..6c387301 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_butchers_shop_2.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_butchers_shop_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f4a46829910ea769b6a328aca392375ded57b0465e7ad9c9c6473ad73b4d470f -size 2087 +oid sha256:902d37e92d4de5b506e302a1030d30561ed135a83507fd5d2cdd233fa3537a53 +size 2083 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_cartographer_1.nbt b/data/minecraft/structure/village/savanna/houses/savanna_cartographer_1.nbt index 5c4e3182..64f9ddc1 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_cartographer_1.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_cartographer_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d5c8938fdff69e079e045baa856d970b0897beb7a97fc5ab078084c071e37e29 -size 2645 +oid sha256:e2052bc8a26346c5f169d2164590d3bc21f010c6c57e448223985b7cff775f32 +size 2642 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_fisher_cottage_1.nbt b/data/minecraft/structure/village/savanna/houses/savanna_fisher_cottage_1.nbt index 3dc6047f..adba13ce 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_fisher_cottage_1.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_fisher_cottage_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e73cbe2f0b220bf76b285eaf6cd5802a3bf824761504c68afff8e8ad2a342e3 -size 3181 +oid sha256:331aa192eb08b3d47d31f267a16a2a31b4308a07878c95cefcb70c5b22aa0260 +size 3178 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_fletcher_house_1.nbt b/data/minecraft/structure/village/savanna/houses/savanna_fletcher_house_1.nbt index 9042ba4e..d156886f 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_fletcher_house_1.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_fletcher_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2319391cee7d7df40443d31f652bdf0ee94a57463ac13ccb90dc6499b1ea389e -size 3036 +oid sha256:4d0a8cf84a02d6126ed7061854d2c34561d5233bad951336872350a15d43abe3 +size 3035 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_large_farm_1.nbt b/data/minecraft/structure/village/savanna/houses/savanna_large_farm_1.nbt index 3c7fc3e8..b252c3fa 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_large_farm_1.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_large_farm_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0e493eabef899d8cab64339452f17be0bea0c8a6c5abdc51f91e70cfad4d2a8b -size 1246 +oid sha256:3207e82847ac6bc1b9522ae144f936b44cbb9d573d594ff6c3bba496379bd9f1 +size 1245 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_large_farm_2.nbt b/data/minecraft/structure/village/savanna/houses/savanna_large_farm_2.nbt index edea3275..eab3d2eb 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_large_farm_2.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_large_farm_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7f95c22eba63f09f1e5388ad1e453f4b93315819a641eebcd40032b7675e097e -size 2153 +oid sha256:eb6a1028f011bdc137d12458359368bba4546fa90897aa2de2fb32ae9c8706a0 +size 2152 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_library_1.nbt b/data/minecraft/structure/village/savanna/houses/savanna_library_1.nbt index 9fdc0fd1..26316b55 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_library_1.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_library_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:91e5d48cd185ee9160a2efd5fc1418893f8164b012c5704ea3c8eca8e92012d2 -size 2770 +oid sha256:6f3ec23a07fee93360d24fbfe998ff7405045215b4048c3d614c15118af2b4ba +size 2768 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_mason_1.nbt b/data/minecraft/structure/village/savanna/houses/savanna_mason_1.nbt index b0ed0345..41bbde63 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_mason_1.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_mason_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3ed925df89cad8c80bea32672be74256d1c6131e797b8e35951d0e8464f42acb -size 2520 +oid sha256:b4aa40b28eee07b1fe04372bfb9d1fe4401a9ba6d70f42c273b71a963786cb95 +size 2518 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_medium_house_1.nbt b/data/minecraft/structure/village/savanna/houses/savanna_medium_house_1.nbt index d4a1a622..459e6082 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_medium_house_1.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_medium_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e563781338bfd01a534595218a064ad51409d0210b99de8a0a24d4c1ac283c4d -size 3642 +oid sha256:31a180812c414684e6fa249f4ee4cca0cd54a8d5d2f62461bad3a92810ef7a2b +size 3640 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_medium_house_2.nbt b/data/minecraft/structure/village/savanna/houses/savanna_medium_house_2.nbt index 895b8b10..81da05b2 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_medium_house_2.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_medium_house_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f525281463cee9dd1889c6531580de1abb14e14538c869e96be4718ddf5794d6 -size 1859 +oid sha256:609c3c21f0c15278219fd1acafec1dcec1574ff6a62974a5ddc7d6b55d987773 +size 1857 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_shepherd_1.nbt b/data/minecraft/structure/village/savanna/houses/savanna_shepherd_1.nbt index 822672a6..73b679df 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_shepherd_1.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_shepherd_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:12d1589606601bff3ab92ab5ae6c3996719378e5265fc7adb613662a123a3f11 -size 6327 +oid sha256:53b18a913f7d718e016ecf6201fb7931a435fe4e044e99463c85dd64c5389a5e +size 6326 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_small_farm.nbt b/data/minecraft/structure/village/savanna/houses/savanna_small_farm.nbt index 4cd33914..45e808ef 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_small_farm.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_small_farm.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:67a7e44b957c443c5715b6424092ad6dff7f014cd08e0f84d2dcefae24a243e2 -size 1138 +oid sha256:5ba218e7f971b697bee84a07531ce8335cea105a30b0111a5d2b5c7d62cacfd4 +size 1137 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_small_house_1.nbt b/data/minecraft/structure/village/savanna/houses/savanna_small_house_1.nbt index 258141b5..36ce0bb5 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_small_house_1.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_small_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:70be429e5426208b5955213d41bda35531a4d799df17f61641deffe8efeed269 -size 1851 +oid sha256:866c4b3527a9c2527e7bd691bfc54cb1293b0d819b1ebbe2106216ab38c69c39 +size 1850 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_small_house_2.nbt b/data/minecraft/structure/village/savanna/houses/savanna_small_house_2.nbt index 83ca0a91..5e622ecf 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_small_house_2.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_small_house_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8a98e1af5454fa54a228dab41b839261decddc2f9952d0d36e74a6e3797812e5 -size 1860 +oid sha256:57a54feeeb5dd7e184fc449a71a2302e4bb94e339518eed5b5c7bcfc600db9c4 +size 1858 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_small_house_3.nbt b/data/minecraft/structure/village/savanna/houses/savanna_small_house_3.nbt index 1d539eee..a4379f74 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_small_house_3.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_small_house_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b85f926bf316fe1b678411c27cfab57e755b5145d15c0ff0821de96667190b79 +oid sha256:11515c459ba9777380cd66a709511818d7726c6c648afe708a7820c35997e944 size 1812 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_small_house_4.nbt b/data/minecraft/structure/village/savanna/houses/savanna_small_house_4.nbt index 6383d3a2..30829628 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_small_house_4.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_small_house_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:11741df756defd3237df20f6281c984d493e00268ddc6d0f36727f6a7a64ed34 -size 2708 +oid sha256:ad15c909baa18527e8bfa6ae937c8baeb4810b1f0784507c59b4798334a177fc +size 2704 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_small_house_5.nbt b/data/minecraft/structure/village/savanna/houses/savanna_small_house_5.nbt index eaf45c91..5a509ef6 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_small_house_5.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_small_house_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b2d8b532189ebcc2ac14bfff4a9c5f2856f2414c726705c7b751ee765e26ffcb -size 2374 +oid sha256:eff388a85cae1baf6a8f310dec947d12127654fd8ca2c232e15b3236c5f51b60 +size 2373 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_small_house_6.nbt b/data/minecraft/structure/village/savanna/houses/savanna_small_house_6.nbt index 102c7fb8..fe1d8d63 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_small_house_6.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_small_house_6.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7baec6886bdcf2dd50962c4f6f4f9dc5691c5c0357931523cf1c5bd39d941bc8 +oid sha256:5ab46f09bc7830264fd855aa4e013a85a87911878f3c2d947ca90a5f4e9bdc66 size 1786 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_small_house_7.nbt b/data/minecraft/structure/village/savanna/houses/savanna_small_house_7.nbt index 0853f3f1..3744b6b5 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_small_house_7.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_small_house_7.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8fb8b9558c2d831865be58319c448703dbf5b50d7febcd920f68eb90e694a9f7 -size 1883 +oid sha256:a3545b0c7b5da8840006bda22c4e4bfcabba21f417fd3f10c232393a2ce05857 +size 1881 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_small_house_8.nbt b/data/minecraft/structure/village/savanna/houses/savanna_small_house_8.nbt index 0da1cb48..5734a9fb 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_small_house_8.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_small_house_8.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ecc77f9dd1d7876d3c2fcc8536f845c2e3c30a333d89efe3b56bf450fb4b4c0e -size 1546 +oid sha256:e54af89ea6046c79e06437bf10ba05576f19594eedbf75efdc15fb6d40417f55 +size 1545 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_tannery_1.nbt b/data/minecraft/structure/village/savanna/houses/savanna_tannery_1.nbt index cad20394..40408d88 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_tannery_1.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_tannery_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0134456d6beaeb6fd98bb3655a654ba5c9d6fa1e4c123a4cab0ad6b179de2aec -size 2132 +oid sha256:3ba769a41da0b1ca6def9202a345bdb114c863f797c3277ab835ebda905538ec +size 2130 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_temple_1.nbt b/data/minecraft/structure/village/savanna/houses/savanna_temple_1.nbt index 9cf11881..c2362600 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_temple_1.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_temple_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3595222c73adab13b78aa1f78c61e2a293e62c1b6f48fd53335527b14f5f8158 -size 3629 +oid sha256:23c2db18c96db68b7b096b87c7400db6f613fe18be5d9a671a7e76a6996799f8 +size 3627 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_temple_2.nbt b/data/minecraft/structure/village/savanna/houses/savanna_temple_2.nbt index 869c9cc9..885d801d 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_temple_2.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_temple_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9504989164f4a928f094c7d4016ade58a6455cdae84fd851e59ad08454d24984 -size 2026 +oid sha256:d3ef9ea83ef09eac40cb52c6ce5729e3afbaf903eab6fabd36ecfbbc39a4d987 +size 2023 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_tool_smith_1.nbt b/data/minecraft/structure/village/savanna/houses/savanna_tool_smith_1.nbt index 2a2c5fc2..c32de342 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_tool_smith_1.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_tool_smith_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c08a9b2b486d765317e78e4634aa1c067af2e47f53024d4404647ed44fe5c829 -size 2462 +oid sha256:3ad60f7911eb2d7b6cb8e9314584c8d37596046bcdef1b2835b9b3c3bf2548bd +size 2461 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_weaponsmith_1.nbt b/data/minecraft/structure/village/savanna/houses/savanna_weaponsmith_1.nbt index 421f560e..cd1f3eae 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_weaponsmith_1.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_weaponsmith_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f386433e63f3b41c2b5992c14d63b3c6d475ea9c28d71e244f0f44052c5560a0 +oid sha256:8f8ec01156867a6c0b707e3c2ca7bda67a77e486bf2c6feb84567ec1270dd048 size 2079 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_weaponsmith_2.nbt b/data/minecraft/structure/village/savanna/houses/savanna_weaponsmith_2.nbt index 750f123c..9fcadb69 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_weaponsmith_2.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_weaponsmith_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b57a07e40f551edf8e640eec615378fea479cf1b726026e6917c5276c4aa8569 -size 2200 +oid sha256:b512272516ee26b874c845933bc5201977e9e8ab2098505f44948a4f480333bf +size 2196 diff --git a/data/minecraft/structure/village/savanna/savanna_lamp_post_01.nbt b/data/minecraft/structure/village/savanna/savanna_lamp_post_01.nbt index eb6dac60..32176b28 100644 --- a/data/minecraft/structure/village/savanna/savanna_lamp_post_01.nbt +++ b/data/minecraft/structure/village/savanna/savanna_lamp_post_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7c0ea2b1a7269f87df17a32af548ebea9414fd507e4bfc1ca60b416eeec6c855 -size 284 +oid sha256:4bcbd938f7a3e2c16d35c43129b50ce7cec12b9d7f89537dc18dae3f59335c62 +size 283 diff --git a/data/minecraft/structure/village/savanna/streets/corner_01.nbt b/data/minecraft/structure/village/savanna/streets/corner_01.nbt index fa0b5f10..0cabf786 100644 --- a/data/minecraft/structure/village/savanna/streets/corner_01.nbt +++ b/data/minecraft/structure/village/savanna/streets/corner_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4d41a385841575f6d7f5d99e78787b5ddc78b8b6ca2eb53694930368235384e4 -size 1198 +oid sha256:31325ef0ce0588de3d9879699410528f51cb672cf3fdd63b7cbb3f6553decd7c +size 1197 diff --git a/data/minecraft/structure/village/savanna/streets/corner_03.nbt b/data/minecraft/structure/village/savanna/streets/corner_03.nbt index d89cd751..dbf5dbe9 100644 --- a/data/minecraft/structure/village/savanna/streets/corner_03.nbt +++ b/data/minecraft/structure/village/savanna/streets/corner_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7b2f04d4d7e916ad8e2a394a80c3602dd26e3386d21cfca6199819c6507dc2c2 +oid sha256:f229cf58e19207074017d003dd6a484239a059702cc1606ceaab393a0f973d17 size 351 diff --git a/data/minecraft/structure/village/savanna/streets/crossroad_02.nbt b/data/minecraft/structure/village/savanna/streets/crossroad_02.nbt index 9b106daa..7d93c2f8 100644 --- a/data/minecraft/structure/village/savanna/streets/crossroad_02.nbt +++ b/data/minecraft/structure/village/savanna/streets/crossroad_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2cf70ae5dfb9713c7ba22836a00aeda893b3579c1a2a73068375d24003aa41ef -size 627 +oid sha256:e038b7230c74f96f2456b5c0fb34b54b5c371758005416d38be654ba201fe7b1 +size 626 diff --git a/data/minecraft/structure/village/savanna/streets/crossroad_03.nbt b/data/minecraft/structure/village/savanna/streets/crossroad_03.nbt index ee15b52a..ef813545 100644 --- a/data/minecraft/structure/village/savanna/streets/crossroad_03.nbt +++ b/data/minecraft/structure/village/savanna/streets/crossroad_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e3af98a97aef7dcdafffef73a2e0038555d7afe44541e3408638915aebe9549c +oid sha256:0fed39a51a08e2efb615592085941639f971ed302ddc8338112faa7de9bf6bb4 size 1226 diff --git a/data/minecraft/structure/village/savanna/streets/crossroad_04.nbt b/data/minecraft/structure/village/savanna/streets/crossroad_04.nbt index d649f52a..ca35dcd7 100644 --- a/data/minecraft/structure/village/savanna/streets/crossroad_04.nbt +++ b/data/minecraft/structure/village/savanna/streets/crossroad_04.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aa0a95ae9b62afe58db53faf855b275d6b0cab684b23ba3d5f2c7987be2474fa -size 380 +oid sha256:22be4071c960681f563029079edea841dd904d57be0c1071325e08f0d76b0507 +size 379 diff --git a/data/minecraft/structure/village/savanna/streets/crossroad_05.nbt b/data/minecraft/structure/village/savanna/streets/crossroad_05.nbt index a28a6418..529ba69b 100644 --- a/data/minecraft/structure/village/savanna/streets/crossroad_05.nbt +++ b/data/minecraft/structure/village/savanna/streets/crossroad_05.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c6a535f0a9a6506caa4c03a5461ff06652b74a869ed8d4058b91d72e2e1c947c +oid sha256:a3e057ea34cdd72cb52bc255f9aa0504432f979ea2eae0b8185e1df4bdd2757b size 410 diff --git a/data/minecraft/structure/village/savanna/streets/crossroad_06.nbt b/data/minecraft/structure/village/savanna/streets/crossroad_06.nbt index 0bd7174a..2ffe1321 100644 --- a/data/minecraft/structure/village/savanna/streets/crossroad_06.nbt +++ b/data/minecraft/structure/village/savanna/streets/crossroad_06.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:852dbd434815650f5648dcbeb18380bcf0aafeb2bf3c8fd6050aa206477237f9 -size 468 +oid sha256:57da70fe7332cd65ae631c6ca5ae8da4e441abdaa62d4114aa405ddeaf9e6927 +size 467 diff --git a/data/minecraft/structure/village/savanna/streets/crossroad_07.nbt b/data/minecraft/structure/village/savanna/streets/crossroad_07.nbt index 5b22ba93..1fbf3fcc 100644 --- a/data/minecraft/structure/village/savanna/streets/crossroad_07.nbt +++ b/data/minecraft/structure/village/savanna/streets/crossroad_07.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7239996ad4cea7dd27e4fa7c534faade0161db5079e228c3660533cc2a8f24fc -size 1382 +oid sha256:89b06c0e0ed8896c2bf34c74e6207b736fecd39afcd240e0502b7cd5f3657f6f +size 1381 diff --git a/data/minecraft/structure/village/savanna/streets/split_01.nbt b/data/minecraft/structure/village/savanna/streets/split_01.nbt index 9aee9474..84fcc7ae 100644 --- a/data/minecraft/structure/village/savanna/streets/split_01.nbt +++ b/data/minecraft/structure/village/savanna/streets/split_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:90018ce795f41955da9850533f206688289abd1067eaca57525dc11e519aba08 -size 525 +oid sha256:40702f5dcd0c6ddc449340452c7da9d7fcdd77a7eb43684cbe407194748e3ff7 +size 524 diff --git a/data/minecraft/structure/village/savanna/streets/split_02.nbt b/data/minecraft/structure/village/savanna/streets/split_02.nbt index c0401041..26ffdebc 100644 --- a/data/minecraft/structure/village/savanna/streets/split_02.nbt +++ b/data/minecraft/structure/village/savanna/streets/split_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8367f5ea8edc3febbe35487f8d08484ad87197de0d1a9a13734c35ebf58c6313 -size 737 +oid sha256:cbd6d831808a1fdb24a944870decd13fdcc23ebaed8e728b59adbfba108d38a1 +size 736 diff --git a/data/minecraft/structure/village/savanna/streets/straight_02.nbt b/data/minecraft/structure/village/savanna/streets/straight_02.nbt index 97aa69e6..6ded6807 100644 --- a/data/minecraft/structure/village/savanna/streets/straight_02.nbt +++ b/data/minecraft/structure/village/savanna/streets/straight_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b55eab053c6b8bf188d3faa0ae7fe0e2efbfaaeded02b19314e9c906c21196d4 -size 1125 +oid sha256:eea59d84ea8236c388063abddef913f23fa4653fafc6a07bb10514ae940c702e +size 1124 diff --git a/data/minecraft/structure/village/savanna/streets/straight_04.nbt b/data/minecraft/structure/village/savanna/streets/straight_04.nbt index b5a40f97..f9ffbeb2 100644 --- a/data/minecraft/structure/village/savanna/streets/straight_04.nbt +++ b/data/minecraft/structure/village/savanna/streets/straight_04.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1ab61a4b90de5bf9a861d5e0dc44b97eb035faab013a61d0dc2c0b96f9c6faaf -size 641 +oid sha256:34c67517c27519975e977882e1e9adb7c0cf50e513dd1875cf12a4418fcbfe94 +size 640 diff --git a/data/minecraft/structure/village/savanna/streets/straight_05.nbt b/data/minecraft/structure/village/savanna/streets/straight_05.nbt index 3ac32ab7..e7e6e380 100644 --- a/data/minecraft/structure/village/savanna/streets/straight_05.nbt +++ b/data/minecraft/structure/village/savanna/streets/straight_05.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1e127aa310aba0e4821cc10a365178e924659a2598e6fb4acac64a34f059b08f -size 1931 +oid sha256:5297533de719b3ac8b34f4931eeb33503328b4f5c522cb2bcddc436c6775a0be +size 1929 diff --git a/data/minecraft/structure/village/savanna/streets/straight_06.nbt b/data/minecraft/structure/village/savanna/streets/straight_06.nbt index 15678bb0..c2634259 100644 --- a/data/minecraft/structure/village/savanna/streets/straight_06.nbt +++ b/data/minecraft/structure/village/savanna/streets/straight_06.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:35587d2b9da5b325c46df0429fa9e3288c8d85f0edc5f0e69a0f73ad76698de6 -size 1088 +oid sha256:57d0c614297d11d4489c196488213035cb014f75dd298ebe2c65ba8119b21207 +size 1087 diff --git a/data/minecraft/structure/village/savanna/streets/straight_08.nbt b/data/minecraft/structure/village/savanna/streets/straight_08.nbt index bbbc1bb3..25db2817 100644 --- a/data/minecraft/structure/village/savanna/streets/straight_08.nbt +++ b/data/minecraft/structure/village/savanna/streets/straight_08.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fbb646c3636c4dd9722b11310a2f77b09ce6d586cac17d5eda1d40a2e3ccd8c1 -size 940 +oid sha256:51780711f1e93814593d8b5eabc813ce75a2782125fdebc98eb0c273adf27029 +size 939 diff --git a/data/minecraft/structure/village/savanna/streets/straight_09.nbt b/data/minecraft/structure/village/savanna/streets/straight_09.nbt index f20fdafc..fcc2a598 100644 --- a/data/minecraft/structure/village/savanna/streets/straight_09.nbt +++ b/data/minecraft/structure/village/savanna/streets/straight_09.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dc6e623be9a695c672924b90b3c41c10302fa55eea1502311ef4a626e270e41a -size 1523 +oid sha256:0343e1729e7462aae866b323e07a4b88408a5eaa2e4fb6126fc4aa3f7e980979 +size 1522 diff --git a/data/minecraft/structure/village/savanna/streets/straight_10.nbt b/data/minecraft/structure/village/savanna/streets/straight_10.nbt index 4cb49415..19657ed5 100644 --- a/data/minecraft/structure/village/savanna/streets/straight_10.nbt +++ b/data/minecraft/structure/village/savanna/streets/straight_10.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d63381a9f3f15b9228a93c58da369027607839f614a396ac40cd7df53e18af2 -size 524 +oid sha256:11353298a6b58dc878d6c358a62b21408dd2e8a818c25f6faae036b94bf37aa5 +size 523 diff --git a/data/minecraft/structure/village/savanna/streets/straight_11.nbt b/data/minecraft/structure/village/savanna/streets/straight_11.nbt index a08e8ced..82c67f47 100644 --- a/data/minecraft/structure/village/savanna/streets/straight_11.nbt +++ b/data/minecraft/structure/village/savanna/streets/straight_11.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:878d68687bc6e191614fa44dab2652a89fb31682d233fe3453f554c617cc73f4 -size 1561 +oid sha256:7ac8fa594a48f53ac1abeb402d785761690ef4c6c3bc690be1981f2a42a80b4f +size 1560 diff --git a/data/minecraft/structure/village/savanna/streets/turn_01.nbt b/data/minecraft/structure/village/savanna/streets/turn_01.nbt index 9c7dfdb3..91b0e53f 100644 --- a/data/minecraft/structure/village/savanna/streets/turn_01.nbt +++ b/data/minecraft/structure/village/savanna/streets/turn_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a4d1e5bb6758db3aa351d099bd419b420424b59e0b3e5ae0d380ab1d3e7d4b01 -size 1159 +oid sha256:36ae6af3d3cac15e1699c700ca5edb21246c94a90c00bbd433d58582b4af3501 +size 1158 diff --git a/data/minecraft/structure/village/savanna/terminators/terminator_05.nbt b/data/minecraft/structure/village/savanna/terminators/terminator_05.nbt index b3c150b7..1f56c261 100644 --- a/data/minecraft/structure/village/savanna/terminators/terminator_05.nbt +++ b/data/minecraft/structure/village/savanna/terminators/terminator_05.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2b9c697bf2a5a9a174a0b6315b616e5f5ea6cfd0f17176ecc4e485a468c91e9c +oid sha256:6ae3080714e1f7eaec8e31b4d4ecb45ce59547e6ba31042acd500d07b382d592 size 1190 diff --git a/data/minecraft/structure/village/savanna/town_centers/savanna_meeting_point_1.nbt b/data/minecraft/structure/village/savanna/town_centers/savanna_meeting_point_1.nbt index 111f803d..5c01a5d6 100644 --- a/data/minecraft/structure/village/savanna/town_centers/savanna_meeting_point_1.nbt +++ b/data/minecraft/structure/village/savanna/town_centers/savanna_meeting_point_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9e2348d5dbcf52f48db98e5fa2b38be3b67bb582dcffb974e285f21e5b6393dc -size 3287 +oid sha256:ad810e1d73be9065dd07358784a4d6efa50fea3566553a3739e02e85be21b0dd +size 3286 diff --git a/data/minecraft/structure/village/savanna/town_centers/savanna_meeting_point_2.nbt b/data/minecraft/structure/village/savanna/town_centers/savanna_meeting_point_2.nbt index 25f37138..1c154103 100644 --- a/data/minecraft/structure/village/savanna/town_centers/savanna_meeting_point_2.nbt +++ b/data/minecraft/structure/village/savanna/town_centers/savanna_meeting_point_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8628f5c3347c83c8c908d944857d6fc795e59c4e0a2d9cea2459aac1ee6b2b18 -size 1119 +oid sha256:0ed0f4e79be0bf7c4e75e63424f4d3c79b0c4829c660411628cb7a1f25192c29 +size 1117 diff --git a/data/minecraft/structure/village/savanna/town_centers/savanna_meeting_point_3.nbt b/data/minecraft/structure/village/savanna/town_centers/savanna_meeting_point_3.nbt index 9f05558a..c34ba72c 100644 --- a/data/minecraft/structure/village/savanna/town_centers/savanna_meeting_point_3.nbt +++ b/data/minecraft/structure/village/savanna/town_centers/savanna_meeting_point_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2246bdfd4e8f9cfc097e58395b8edba3133d7e73bc5518bf343e5e4989da1f5e +oid sha256:4c527a0f23c1b26a2ed38415122aeb07b490c54bee6d0c5dd0a81c474db47fe6 size 981 diff --git a/data/minecraft/structure/village/savanna/town_centers/savanna_meeting_point_4.nbt b/data/minecraft/structure/village/savanna/town_centers/savanna_meeting_point_4.nbt index b72a6900..61c49d3c 100644 --- a/data/minecraft/structure/village/savanna/town_centers/savanna_meeting_point_4.nbt +++ b/data/minecraft/structure/village/savanna/town_centers/savanna_meeting_point_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d06594af96aef079e06e4ac5667f10072595fa02261fd7bd9e3d442942d19098 -size 1187 +oid sha256:e8a107ba18555d83d86a6718403ccd7f166713d7e94e773090475011df6775d2 +size 1186 diff --git a/data/minecraft/structure/village/savanna/villagers/baby.nbt b/data/minecraft/structure/village/savanna/villagers/baby.nbt index 53611a39..c80db10c 100644 --- a/data/minecraft/structure/village/savanna/villagers/baby.nbt +++ b/data/minecraft/structure/village/savanna/villagers/baby.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:465fa4d753bc13719fce28f065c6c4afb9c3f8e70c0c5dbf53648ab104813acd -size 722 +oid sha256:14e8c388eef5dbd170c3a2d27e00993bc723afcdda41ad132f60836189ed2614 +size 719 diff --git a/data/minecraft/structure/village/savanna/villagers/nitwit.nbt b/data/minecraft/structure/village/savanna/villagers/nitwit.nbt index d92f56f3..598ee1bd 100644 --- a/data/minecraft/structure/village/savanna/villagers/nitwit.nbt +++ b/data/minecraft/structure/village/savanna/villagers/nitwit.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7266f88e934fdfed15037728b17f2360b049e07f3078f1008945c8995e1f61f1 +oid sha256:91830493795fcce2d3c65bb8dee5b8e1b23546f22f0538333f127ded770c6e90 size 718 diff --git a/data/minecraft/structure/village/savanna/villagers/unemployed.nbt b/data/minecraft/structure/village/savanna/villagers/unemployed.nbt index 5e4e26c3..cf3fbb50 100644 --- a/data/minecraft/structure/village/savanna/villagers/unemployed.nbt +++ b/data/minecraft/structure/village/savanna/villagers/unemployed.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d39d183a08522d626eecc6e1d9114e0aa6978c996a149d017caa9533e266aac -size 717 +oid sha256:d836c861a68a77797a341b4a2d23df0c5b7dbdc6069bcf78e83762ed5feaed11 +size 715 diff --git a/data/minecraft/structure/village/savanna/zombie/houses/savanna_animal_pen_2.nbt b/data/minecraft/structure/village/savanna/zombie/houses/savanna_animal_pen_2.nbt index 0f874451..d71edf56 100644 --- a/data/minecraft/structure/village/savanna/zombie/houses/savanna_animal_pen_2.nbt +++ b/data/minecraft/structure/village/savanna/zombie/houses/savanna_animal_pen_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6a04726bbf226998145a88929c50ca4e6871ed19baff16cb0d7a214ef1ac7803 -size 3482 +oid sha256:610cdd76f3b97f0f456b02945ebabfa4f3b1521cb24a7976d3303c0de55e1a71 +size 3481 diff --git a/data/minecraft/structure/village/savanna/zombie/houses/savanna_animal_pen_3.nbt b/data/minecraft/structure/village/savanna/zombie/houses/savanna_animal_pen_3.nbt index f17f62fe..2c508b08 100644 --- a/data/minecraft/structure/village/savanna/zombie/houses/savanna_animal_pen_3.nbt +++ b/data/minecraft/structure/village/savanna/zombie/houses/savanna_animal_pen_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:94dc062d5d5605a303acab91f5539b465d31684632237b2bf45f783fe346aca6 +oid sha256:dff0f082614026782a6bf3476a38c6950a3bf96afc6724e379ed4341851c5db4 size 1666 diff --git a/data/minecraft/structure/village/savanna/zombie/houses/savanna_large_farm_2.nbt b/data/minecraft/structure/village/savanna/zombie/houses/savanna_large_farm_2.nbt index d5ac98d4..670ab839 100644 --- a/data/minecraft/structure/village/savanna/zombie/houses/savanna_large_farm_2.nbt +++ b/data/minecraft/structure/village/savanna/zombie/houses/savanna_large_farm_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e1040e0a0df8d69bbfaf150bd70f9f43fe6de295dbb37c653559c961c614818e -size 2162 +oid sha256:ed8f99ac2b0673203ecc86abe91bbd118946fad2030ca11b504475af57ef82c0 +size 2160 diff --git a/data/minecraft/structure/village/savanna/zombie/houses/savanna_medium_house_1.nbt b/data/minecraft/structure/village/savanna/zombie/houses/savanna_medium_house_1.nbt index 8b8fdce6..bb4cb2a0 100644 --- a/data/minecraft/structure/village/savanna/zombie/houses/savanna_medium_house_1.nbt +++ b/data/minecraft/structure/village/savanna/zombie/houses/savanna_medium_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a446acae6343acf22b6f3d2e088c94d1860c33e6197056ce9d7939c1318ebe06 -size 3646 +oid sha256:c540e6e69f2e0d89c06f43a195203779efebaf3a33845db39139e07167be4917 +size 3643 diff --git a/data/minecraft/structure/village/savanna/zombie/houses/savanna_medium_house_2.nbt b/data/minecraft/structure/village/savanna/zombie/houses/savanna_medium_house_2.nbt index cd2c2028..5fe51060 100644 --- a/data/minecraft/structure/village/savanna/zombie/houses/savanna_medium_house_2.nbt +++ b/data/minecraft/structure/village/savanna/zombie/houses/savanna_medium_house_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d230c4b750f029ee6d090d4b3a33034722b06a68a45bf78d1530214ace46df3 -size 1866 +oid sha256:e394a3e8d337451153a02cc83b5ddbfea89006404782b40433af5a60ea4bbfbd +size 1864 diff --git a/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_1.nbt b/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_1.nbt index 9755a6a5..1c43eb0c 100644 --- a/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_1.nbt +++ b/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d0cd759873244d414403d5b96fb6cef73bf75af29acf2096ee009f2765e83e05 +oid sha256:6b01c69893dd2f5b53eebb8c2366e810c825046a057037d8107d62eedb65f5bc size 1880 diff --git a/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_2.nbt b/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_2.nbt index 06511002..cfa923ac 100644 --- a/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_2.nbt +++ b/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:02ef7c186a2b4bccb9be8007e05f153065007313c9ed957ff04541e96ac20494 -size 1877 +oid sha256:3ac526ddd9a18b6f6e663f3deeec7cdb047b6b52821ebb0cc33f39e13ee8f6b7 +size 1875 diff --git a/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_3.nbt b/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_3.nbt index 9774b7ed..a87ab83d 100644 --- a/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_3.nbt +++ b/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aee26b94663a803bdbdedf834e6e76aae03c61cbf8469365a5378506b21752b7 +oid sha256:8466921a227571474bc7ed7b097a08bb652702620eec088c4e360bbe100d788d size 1829 diff --git a/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_4.nbt b/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_4.nbt index 34371cd5..7acc5889 100644 --- a/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_4.nbt +++ b/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:395272ebdd88c24167d96ceafab724ca36d882cf2521ec887b37af9c48203f0a -size 2710 +oid sha256:0d8634e748b37c1e0cff78ae6a37a1ba492a9e1329e989908d2d2de6a6378e13 +size 2707 diff --git a/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_5.nbt b/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_5.nbt index 08c8d943..7ebc72e3 100644 --- a/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_5.nbt +++ b/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d8b7949481a57cb186a969777ac6d2818ba14d5a3d0175c1bc1dff6aaa821880 -size 2395 +oid sha256:5555ffd4b07c2d9424ea484acf3ffcaa18ee4def8e58b728c9908dce9fe52af2 +size 2394 diff --git a/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_6.nbt b/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_6.nbt index 291d2310..2a28a221 100644 --- a/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_6.nbt +++ b/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_6.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f1152a45caf032700acb2899323c0549cb77b024d8573be5155f836dfea39585 -size 1793 +oid sha256:277f77e2ce777be81037c099a08c969db079724545409f39360400f961c25886 +size 1792 diff --git a/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_7.nbt b/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_7.nbt index 2d6ad302..3ac71176 100644 --- a/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_7.nbt +++ b/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_7.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5e6071f9a93ee0730d122ce9216965262489794e4450fbd827c651243aace78e -size 1909 +oid sha256:67bf2b635930f14a0cd3932b446c995ae8d7928d52102f408aeb457b5312d07d +size 1908 diff --git a/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_8.nbt b/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_8.nbt index 7595e5c2..51aee34c 100644 --- a/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_8.nbt +++ b/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_8.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8f22dca8304008c0a3f22724584b80a5980c16dc333bc96b84870b9084b539be -size 1552 +oid sha256:16b35bb4e9c0716db5177d1e0e4f5465d2ee5b57ac2698d809dde87311b43079 +size 1551 diff --git a/data/minecraft/structure/village/savanna/zombie/streets/corner_01.nbt b/data/minecraft/structure/village/savanna/zombie/streets/corner_01.nbt index e7905dad..8d370212 100644 --- a/data/minecraft/structure/village/savanna/zombie/streets/corner_01.nbt +++ b/data/minecraft/structure/village/savanna/zombie/streets/corner_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e62997eee162802e627cbffe28657f1b789c5d9d45f115682e21258dc1b561d2 -size 1204 +oid sha256:c32e2e63584fb9d91e5ae89028ddc0d1e7c0a519873f4fe6e1bdf109ec5539c2 +size 1203 diff --git a/data/minecraft/structure/village/savanna/zombie/streets/corner_03.nbt b/data/minecraft/structure/village/savanna/zombie/streets/corner_03.nbt index 45827fbb..c35547f6 100644 --- a/data/minecraft/structure/village/savanna/zombie/streets/corner_03.nbt +++ b/data/minecraft/structure/village/savanna/zombie/streets/corner_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0e0b9ac89a85fc09d68342a09212963f8b7955a12f48339a94cc0a3028cd07d7 -size 358 +oid sha256:e1ae054ee890108ee785a81853cbe0788b96765513e8f15dddb747e8ad955205 +size 357 diff --git a/data/minecraft/structure/village/savanna/zombie/streets/crossroad_02.nbt b/data/minecraft/structure/village/savanna/zombie/streets/crossroad_02.nbt index b728569c..93f6f215 100644 --- a/data/minecraft/structure/village/savanna/zombie/streets/crossroad_02.nbt +++ b/data/minecraft/structure/village/savanna/zombie/streets/crossroad_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0c55d27d35653b2cba4fde74272ead32ae51857328d848549d003eb59a8ac4f4 -size 632 +oid sha256:edb7e1b1728d464bb23b0a6576837ba9ce2942d60fbded95cc13e572b7032450 +size 631 diff --git a/data/minecraft/structure/village/savanna/zombie/streets/crossroad_03.nbt b/data/minecraft/structure/village/savanna/zombie/streets/crossroad_03.nbt index ec325901..b653c870 100644 --- a/data/minecraft/structure/village/savanna/zombie/streets/crossroad_03.nbt +++ b/data/minecraft/structure/village/savanna/zombie/streets/crossroad_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f0ed699439f9e7c6101f13ba80949dafc7dedde01110d400fe13634f60c2326e +oid sha256:aeb0848915c7a20bb1b27571481d5b96b033898490d134dc882b24ec7cbdc158 size 1230 diff --git a/data/minecraft/structure/village/savanna/zombie/streets/crossroad_04.nbt b/data/minecraft/structure/village/savanna/zombie/streets/crossroad_04.nbt index c43812d3..d981b76c 100644 --- a/data/minecraft/structure/village/savanna/zombie/streets/crossroad_04.nbt +++ b/data/minecraft/structure/village/savanna/zombie/streets/crossroad_04.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:829d4e4ad354a6c80beaf4e7064b328baea7efd65f4a2b6d3ec2c20e9d26e0f6 -size 385 +oid sha256:2d2b8cc6e95aa923621b8035f7412a01ac200172ce9c4d9d6deb2fa16dcc4aff +size 384 diff --git a/data/minecraft/structure/village/savanna/zombie/streets/crossroad_05.nbt b/data/minecraft/structure/village/savanna/zombie/streets/crossroad_05.nbt index cbf1667b..5fc14983 100644 --- a/data/minecraft/structure/village/savanna/zombie/streets/crossroad_05.nbt +++ b/data/minecraft/structure/village/savanna/zombie/streets/crossroad_05.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eed3253c7726228f6cb54d4e234b5a62635ef9ae15dbb8976bb8bc0249599066 -size 416 +oid sha256:9f32b11ffa8df38230440e07d1167453415ecb37aa3b1681a4449cdbf93a4585 +size 415 diff --git a/data/minecraft/structure/village/savanna/zombie/streets/crossroad_06.nbt b/data/minecraft/structure/village/savanna/zombie/streets/crossroad_06.nbt index 093d2937..34cb8bd8 100644 --- a/data/minecraft/structure/village/savanna/zombie/streets/crossroad_06.nbt +++ b/data/minecraft/structure/village/savanna/zombie/streets/crossroad_06.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d8de4f65422a920dd6233bc56a4f86ca36611baf3b432752cd1843623c1587f2 -size 473 +oid sha256:4ce7e825bf89a75824bf2d447a6779419b44b8afb37cb3ced9b92062de4c6602 +size 472 diff --git a/data/minecraft/structure/village/savanna/zombie/streets/crossroad_07.nbt b/data/minecraft/structure/village/savanna/zombie/streets/crossroad_07.nbt index 783f0b2e..8cfcdaa9 100644 --- a/data/minecraft/structure/village/savanna/zombie/streets/crossroad_07.nbt +++ b/data/minecraft/structure/village/savanna/zombie/streets/crossroad_07.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1ad087704e48fe4816b0f34d513db536cb74269c66d78a1dfcabe966e4b224a7 -size 1386 +oid sha256:9149bffc7d3d456e612a2114d4d5942c1f2cc70387f5109c5bacc2ea628cae5e +size 1385 diff --git a/data/minecraft/structure/village/savanna/zombie/streets/split_01.nbt b/data/minecraft/structure/village/savanna/zombie/streets/split_01.nbt index b0bc04d0..c78deebe 100644 --- a/data/minecraft/structure/village/savanna/zombie/streets/split_01.nbt +++ b/data/minecraft/structure/village/savanna/zombie/streets/split_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fa55744503790e9c8cbbd7d44bfbd404f4f9bec2ae6a39fe4a0e33418aa1af5c +oid sha256:3d572ebc3853320f462141b72c7a3e74114e4005e4096374c428be19d614c585 size 530 diff --git a/data/minecraft/structure/village/savanna/zombie/streets/split_02.nbt b/data/minecraft/structure/village/savanna/zombie/streets/split_02.nbt index 53d1b81e..f076a432 100644 --- a/data/minecraft/structure/village/savanna/zombie/streets/split_02.nbt +++ b/data/minecraft/structure/village/savanna/zombie/streets/split_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b2815835532b0aca87dfcd204e85be2fefef624b939f0ecd4874b0e190755305 +oid sha256:c8c2ee52e3072b36b25237f11fea1e700d8a1cdccd9f5cc0733e6782f61bf5cc size 743 diff --git a/data/minecraft/structure/village/savanna/zombie/streets/straight_02.nbt b/data/minecraft/structure/village/savanna/zombie/streets/straight_02.nbt index dbcefae4..79508f27 100644 --- a/data/minecraft/structure/village/savanna/zombie/streets/straight_02.nbt +++ b/data/minecraft/structure/village/savanna/zombie/streets/straight_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0460209ab678ff1bee9a987f01caff2a6035b6067d6372387504af44648b0c65 +oid sha256:4f0106a1b0f0744484799e8b6ef32eb043e40f92f5c0478996dff3d460bf6117 size 1130 diff --git a/data/minecraft/structure/village/savanna/zombie/streets/straight_04.nbt b/data/minecraft/structure/village/savanna/zombie/streets/straight_04.nbt index b265b693..5d55592c 100644 --- a/data/minecraft/structure/village/savanna/zombie/streets/straight_04.nbt +++ b/data/minecraft/structure/village/savanna/zombie/streets/straight_04.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:64b740769c12d7fcc1b226fd6014ca18231b51d4b484b60c9520c455d4e62446 -size 648 +oid sha256:c7b141af3a0698756090b46db677a356cca0474fde67ba846b617decaaca3bac +size 647 diff --git a/data/minecraft/structure/village/savanna/zombie/streets/straight_05.nbt b/data/minecraft/structure/village/savanna/zombie/streets/straight_05.nbt index 7c69fff1..dce00aef 100644 --- a/data/minecraft/structure/village/savanna/zombie/streets/straight_05.nbt +++ b/data/minecraft/structure/village/savanna/zombie/streets/straight_05.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:baa6c184575f8b1c8ddcf52fd4097401fc6f36f5600da0512683f2ec349d6ac1 -size 1938 +oid sha256:bec930d22fd3bab70eafaf08194c52a9f8970f26ada95680fd7213900af4ab6f +size 1937 diff --git a/data/minecraft/structure/village/savanna/zombie/streets/straight_06.nbt b/data/minecraft/structure/village/savanna/zombie/streets/straight_06.nbt index 3de9ad81..f974ff6f 100644 --- a/data/minecraft/structure/village/savanna/zombie/streets/straight_06.nbt +++ b/data/minecraft/structure/village/savanna/zombie/streets/straight_06.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:953dbb21a796bd775ef5ccf82547486f3b78d251d1b43ffdad597bd7939251c5 -size 1094 +oid sha256:a6acc1230d4ee06f66521e78581168c08c9f7828eca7669c8e99ad54887e23ef +size 1092 diff --git a/data/minecraft/structure/village/savanna/zombie/streets/straight_08.nbt b/data/minecraft/structure/village/savanna/zombie/streets/straight_08.nbt index d0a243b0..befd054c 100644 --- a/data/minecraft/structure/village/savanna/zombie/streets/straight_08.nbt +++ b/data/minecraft/structure/village/savanna/zombie/streets/straight_08.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ed923567d2e652cbc89407fcf1f6a328610115fd883c05f2593435a4c7f1a3c9 -size 945 +oid sha256:3e7cdab48209c5f46bb68090f90176f07d0c8139bc7bb512a7788bff7400fba9 +size 944 diff --git a/data/minecraft/structure/village/savanna/zombie/streets/straight_09.nbt b/data/minecraft/structure/village/savanna/zombie/streets/straight_09.nbt index 0aeef25f..135d500b 100644 --- a/data/minecraft/structure/village/savanna/zombie/streets/straight_09.nbt +++ b/data/minecraft/structure/village/savanna/zombie/streets/straight_09.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2411d77d9bc4ab220c9621e47bad91f3824bc9a708230fd1955fb616a41d843b +oid sha256:2e1a6ac1880b9e2b1ce94216fa65861fab032f6ed1f7f0bdb25fa7ddc37a98f5 size 1527 diff --git a/data/minecraft/structure/village/savanna/zombie/streets/straight_10.nbt b/data/minecraft/structure/village/savanna/zombie/streets/straight_10.nbt index 04d98983..74a7c290 100644 --- a/data/minecraft/structure/village/savanna/zombie/streets/straight_10.nbt +++ b/data/minecraft/structure/village/savanna/zombie/streets/straight_10.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:37f9eabc32577e5780c3b4963fac216015629f565c08f6d00dd5ac4feefd8dd5 -size 530 +oid sha256:990093e77df878fd088fb7d1a93f7a135b8b2c2d7a815a4b6b7e379a4513a46e +size 529 diff --git a/data/minecraft/structure/village/savanna/zombie/streets/straight_11.nbt b/data/minecraft/structure/village/savanna/zombie/streets/straight_11.nbt index bfa9deaf..fa39bcdb 100644 --- a/data/minecraft/structure/village/savanna/zombie/streets/straight_11.nbt +++ b/data/minecraft/structure/village/savanna/zombie/streets/straight_11.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0c49f9ac50929522b484e207d88f5930d23402f96b519d07eb3d0dffabb213c5 -size 1569 +oid sha256:a720135cd8f0625869e2dc575c8d188bed6044af3ef3e3ea8d3a2d91ef70ab5c +size 1567 diff --git a/data/minecraft/structure/village/savanna/zombie/streets/turn_01.nbt b/data/minecraft/structure/village/savanna/zombie/streets/turn_01.nbt index 61b7c4ce..1aefa414 100644 --- a/data/minecraft/structure/village/savanna/zombie/streets/turn_01.nbt +++ b/data/minecraft/structure/village/savanna/zombie/streets/turn_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef383f2ba16a5a45c7c635b5c14c5cf8cbbfdba9b7b73084b8f0b36c66e5c999 -size 1167 +oid sha256:ed8c9eefef311eb2cca22067e604b249ba22fe138d345a63087dfbfcbb005e5d +size 1166 diff --git a/data/minecraft/structure/village/savanna/zombie/terminators/terminator_05.nbt b/data/minecraft/structure/village/savanna/zombie/terminators/terminator_05.nbt index ca960304..6f03a121 100644 --- a/data/minecraft/structure/village/savanna/zombie/terminators/terminator_05.nbt +++ b/data/minecraft/structure/village/savanna/zombie/terminators/terminator_05.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c0df982a64ad5bc36709edcbff15c03549f11fab9c7749a73b447ad7a349c020 -size 1194 +oid sha256:a155d76b12b5bf3409eb8f356812f1ce4e81b36c44707cb76617ea7445ff19e2 +size 1193 diff --git a/data/minecraft/structure/village/savanna/zombie/town_centers/savanna_meeting_point_1.nbt b/data/minecraft/structure/village/savanna/zombie/town_centers/savanna_meeting_point_1.nbt index 98d3a7a0..a7d3ee37 100644 --- a/data/minecraft/structure/village/savanna/zombie/town_centers/savanna_meeting_point_1.nbt +++ b/data/minecraft/structure/village/savanna/zombie/town_centers/savanna_meeting_point_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:35db10e48e1576b3af6ce13d341726065ef8997f0924b4e9a9ca1720f6fa534d -size 3185 +oid sha256:cc9c621be55261c90902d3a4a25b434ce0f6fa6479adab9bce4526ab2d7c60a4 +size 3184 diff --git a/data/minecraft/structure/village/savanna/zombie/town_centers/savanna_meeting_point_2.nbt b/data/minecraft/structure/village/savanna/zombie/town_centers/savanna_meeting_point_2.nbt index f5742ffb..f581ac27 100644 --- a/data/minecraft/structure/village/savanna/zombie/town_centers/savanna_meeting_point_2.nbt +++ b/data/minecraft/structure/village/savanna/zombie/town_centers/savanna_meeting_point_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6bffc038f1858edeff9c91875516885823d55270c687dc64bcc90ae0bdb90c3e -size 2713 +oid sha256:fbcdb9eeefc9b99702e4fc32a0c5f9049e9c302c205b2657c33f32d2100290cc +size 2712 diff --git a/data/minecraft/structure/village/savanna/zombie/town_centers/savanna_meeting_point_3.nbt b/data/minecraft/structure/village/savanna/zombie/town_centers/savanna_meeting_point_3.nbt index b0fc49c9..83e04083 100644 --- a/data/minecraft/structure/village/savanna/zombie/town_centers/savanna_meeting_point_3.nbt +++ b/data/minecraft/structure/village/savanna/zombie/town_centers/savanna_meeting_point_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:321425685c02e7f7870ac3fe3c606a83d0f1bfb237cc3de5f0676ffc64727422 -size 919 +oid sha256:992010ecc0bdbbd4b33b5a0864b1bbcfe3c99b2e2d440c37ee31454739108337 +size 918 diff --git a/data/minecraft/structure/village/savanna/zombie/town_centers/savanna_meeting_point_4.nbt b/data/minecraft/structure/village/savanna/zombie/town_centers/savanna_meeting_point_4.nbt index 94141f43..df5053cb 100644 --- a/data/minecraft/structure/village/savanna/zombie/town_centers/savanna_meeting_point_4.nbt +++ b/data/minecraft/structure/village/savanna/zombie/town_centers/savanna_meeting_point_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7035ae7c494d72a9e70d4b10b11bc69674edb301bf1a2f888e1ec27f3ee13fe5 +oid sha256:d4852efc2a15198f7bc89e67211c220bbe529952bf4b8cc7b09d3fd01b696e1e size 1146 diff --git a/data/minecraft/structure/village/savanna/zombie/villagers/nitwit.nbt b/data/minecraft/structure/village/savanna/zombie/villagers/nitwit.nbt index cc3f2609..858018c9 100644 --- a/data/minecraft/structure/village/savanna/zombie/villagers/nitwit.nbt +++ b/data/minecraft/structure/village/savanna/zombie/villagers/nitwit.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c398248deb06a4df0c278dbd62dcb969016305cf67c616380b67f949657199dc -size 724 +oid sha256:22865d9dda0303f3b341db18723419c5fc1a254ae57bd4650cdbe269789a2a6c +size 723 diff --git a/data/minecraft/structure/village/savanna/zombie/villagers/unemployed.nbt b/data/minecraft/structure/village/savanna/zombie/villagers/unemployed.nbt index ffa97bd1..24042b0f 100644 --- a/data/minecraft/structure/village/savanna/zombie/villagers/unemployed.nbt +++ b/data/minecraft/structure/village/savanna/zombie/villagers/unemployed.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fe259aa946d849edd1faf9f266670d9fbf6aa66cdf286ef5a3a349a1d4b6800c -size 723 +oid sha256:b23d6c33f41281a26e2b9f20ec5fb241db07cb614964b2b7ec1dd3755d3e3872 +size 722 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_animal_pen_1.nbt b/data/minecraft/structure/village/snowy/houses/snowy_animal_pen_1.nbt index 8b9c4c71..37f632f2 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_animal_pen_1.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_animal_pen_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:889cc3f301668cf3ae74237e61cb7dc76e6f48be7e17dc802239ad17417819db -size 1622 +oid sha256:88e7f895ab422f7f20ad8434f3d332280ad9f9164e5faf41f4a71e21b0b615eb +size 1620 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_animal_pen_2.nbt b/data/minecraft/structure/village/snowy/houses/snowy_animal_pen_2.nbt index e054b1f9..0c625aed 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_animal_pen_2.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_animal_pen_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d1b1db0477514ce5ece0e34f3bafee87a9ae6c68f7765c184c57730babedcd1a -size 1262 +oid sha256:221b989e994d25780e8c07acc10ab9423aca3c001975e973e10ec5de102f1938 +size 1260 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_armorer_house_1.nbt b/data/minecraft/structure/village/snowy/houses/snowy_armorer_house_1.nbt index 35099a02..5db469fb 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_armorer_house_1.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_armorer_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:99ba17a2a4cd1d1cd6b6fbf96d4be9ff5ae8b68884b7dbf4815f3d5522718c6d -size 2192 +oid sha256:b01c2baaf98713b2a2fbb83a3b5f23daac1b3e3a8784521057eee6abe66af75f +size 2190 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_armorer_house_2.nbt b/data/minecraft/structure/village/snowy/houses/snowy_armorer_house_2.nbt index 6d11b727..d8c345dc 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_armorer_house_2.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_armorer_house_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e8569cf2747b328fa0487e3dde0a9c306ba10831ac87dd0e4a6f11252bbc886 -size 2070 +oid sha256:abf41bd498493af3da2d131da09f56e799ad4ab68ab42a3f7196bef375239e7c +size 2069 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_butchers_shop_1.nbt b/data/minecraft/structure/village/snowy/houses/snowy_butchers_shop_1.nbt index e8c8db44..1359eb4d 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_butchers_shop_1.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_butchers_shop_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4df78188100afac936a549bd7bf321d6e892ec0ee029015ec40a168bd7ed13b7 -size 2568 +oid sha256:4aaaca98388958dea10a42dc50d6d765eb208ea8d46dfcb04c0882095b2942ba +size 2566 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_butchers_shop_2.nbt b/data/minecraft/structure/village/snowy/houses/snowy_butchers_shop_2.nbt index 40b9709d..d5d6664a 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_butchers_shop_2.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_butchers_shop_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:33e43bff0d47c00d88ee0c35815e40b3856b8d3aede52140d7b6cf7a2233e34b -size 1463 +oid sha256:6ea6c961a3131257325c39ab382b8fe08278f2fb0bde1776251af910f7fdac3d +size 1462 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_cartographer_house_1.nbt b/data/minecraft/structure/village/snowy/houses/snowy_cartographer_house_1.nbt index 815517cf..ad2afdee 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_cartographer_house_1.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_cartographer_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:205e94ae1c228e4418dd6a396dd4db6a4a10c3033ec92c211c06147ab28e81a7 -size 2362 +oid sha256:6f28f5759b59737ee573b26bc8545ed197ad56cb3c0a9f63b19ce170c22cb5b4 +size 2360 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_farm_1.nbt b/data/minecraft/structure/village/snowy/houses/snowy_farm_1.nbt index 60de297d..23290a1e 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_farm_1.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_farm_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6ccdfa1c08f0915d07328747f8518dfcca797c42ead7763ecee418d89cf6ced8 -size 1254 +oid sha256:473d2f073e05e04774f4dc512cbeb140d643388ff36cc5189db2b31800ba3382 +size 1253 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_farm_2.nbt b/data/minecraft/structure/village/snowy/houses/snowy_farm_2.nbt index 10f8377b..5cac9ccd 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_farm_2.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_farm_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8cc0e511af21555f49c3e2fe89636c046b957b3a94f9383945a1e1462b1d3004 +oid sha256:62aef92eeeb07af1239c00a29fa32632a60ab0638756bbaba9a3819d3a9ca17b size 1075 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_fisher_cottage.nbt b/data/minecraft/structure/village/snowy/houses/snowy_fisher_cottage.nbt index 87782b25..b9c8bf81 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_fisher_cottage.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_fisher_cottage.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:62df4ee3e75384ffb6c97474bb8e2423ffd83c6347906e77edb8df96fbf4d00d -size 2237 +oid sha256:6e35ef53e8147de7d7b7eae95c9b033ecbe4302c7e8195a79cd2328891f59353 +size 2236 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_fletcher_house_1.nbt b/data/minecraft/structure/village/snowy/houses/snowy_fletcher_house_1.nbt index 886d75cd..98d27ecc 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_fletcher_house_1.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_fletcher_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2dd7f5a0dd515bad0f1805af36a14e265fcdae79f5ab647b0eb1e2756dd4851c -size 2122 +oid sha256:3717cc1f7e7dd19daf147e5b5b12471ea76b51715fead2c29dbaa387fc198747 +size 2121 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_library_1.nbt b/data/minecraft/structure/village/snowy/houses/snowy_library_1.nbt index f63c8930..2b12dca7 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_library_1.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_library_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:35e4194cb06fd84398ac9e510452d6ac054724fc3b4a7904ab714a01d12b1623 -size 3447 +oid sha256:42d3aa5b8c06234825d5c1d2ab71423c79b4def00f751dad7ad62f343f0c39d1 +size 3446 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_masons_house_1.nbt b/data/minecraft/structure/village/snowy/houses/snowy_masons_house_1.nbt index 0da52ed6..1c598f54 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_masons_house_1.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_masons_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:123d4b716d61af9f49779b8cd5b2ca6d3bf956a21164267096c31568c3f63fc9 -size 2999 +oid sha256:09c69dc5f143d7cf31b50f1716f3100a1757c6ffcff69e2a8dbc23d66933df87 +size 2997 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_masons_house_2.nbt b/data/minecraft/structure/village/snowy/houses/snowy_masons_house_2.nbt index a34baae1..74602b1b 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_masons_house_2.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_masons_house_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9bda52382419c63f656a59964128f98dc47edc95ec9923ea5d609c91df41ab8a -size 3186 +oid sha256:d415f40ff5670a531e075c91bbe301b111c489a016168b2258d958cabeae2db1 +size 3184 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_medium_house_1.nbt b/data/minecraft/structure/village/snowy/houses/snowy_medium_house_1.nbt index 28dd5bf0..50a2b8b5 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_medium_house_1.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_medium_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0f5ee3fa74ab0eb9434e4d9c7c126f78c4b2f0554d790734ecafb68d5391024a -size 1595 +oid sha256:6855ca467669ac7df91cee492a8ce6711423b8d428879efcc87dc4f9fbee78a3 +size 1594 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_medium_house_2.nbt b/data/minecraft/structure/village/snowy/houses/snowy_medium_house_2.nbt index e5ed1525..7f97012e 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_medium_house_2.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_medium_house_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9ab3947582e950c02cd9c4902c0152eb38266b51989738b241a6bfb14dcdd814 -size 3532 +oid sha256:43f166f2891b8f5fcab547f049d1e209250866652d57d6e22eaf5f685cdd1dfe +size 3530 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_medium_house_3.nbt b/data/minecraft/structure/village/snowy/houses/snowy_medium_house_3.nbt index 0d70b560..62d8e0d1 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_medium_house_3.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_medium_house_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b5791986573526860dbc2402b454f59da0963ec28eb50db10051a56f9ff979b2 -size 1206 +oid sha256:64e983fbe8239357f2b89c6b1b3dc140aeb77510684b9d9aa313ab3c0296a526 +size 1204 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_shepherds_house_1.nbt b/data/minecraft/structure/village/snowy/houses/snowy_shepherds_house_1.nbt index e56e2d55..1ffefd49 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_shepherds_house_1.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_shepherds_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b4ab16f4afa644888f792be165f791090585208a958adf08f9034bff4a0ab316 -size 2168 +oid sha256:5db103faa5ad6f20a4101c6c72da2bd4ae589bc46da638f2f531497d0e210403 +size 2166 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_small_house_1.nbt b/data/minecraft/structure/village/snowy/houses/snowy_small_house_1.nbt index e6bd59dd..3efe702a 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_small_house_1.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_small_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:86ec5f10d87ca7d1747d77c916b50ca5894b5f61b7025caeab2cd1367acbf1ce -size 1318 +oid sha256:b7b6732033a93468c2889f5bb7b58b457f24bc7f87929afe7fee08a2003c345e +size 1316 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_small_house_2.nbt b/data/minecraft/structure/village/snowy/houses/snowy_small_house_2.nbt index 6d632816..941dc325 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_small_house_2.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_small_house_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0c15108c9b3fb3e094ea49e3328b6afcf39e860d74aa9d92da364b861dd9e1a1 -size 2123 +oid sha256:a5311762f667325ca96f139319b97110dc46e5f3a74eea560068cb353cc13d77 +size 2121 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_small_house_3.nbt b/data/minecraft/structure/village/snowy/houses/snowy_small_house_3.nbt index a5882254..f357d533 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_small_house_3.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_small_house_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:317960e24cd3cf70ce5f4bad1dbfbe689578787e2dbafbdeaf674df7dc8f969a -size 1757 +oid sha256:3c948d5a119ec75ac7bc25c8d0455dba3a831c1409fce682e2bafcea592d8a32 +size 1754 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_small_house_4.nbt b/data/minecraft/structure/village/snowy/houses/snowy_small_house_4.nbt index 9f34d66c..f7006340 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_small_house_4.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_small_house_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5599cd514d10ae97a05ca0f2c6fde0ed8830d92404def616f67309ed35300a55 -size 1602 +oid sha256:b6693936a24f9adcf98f3c02395ccff9e113cdd667e8721fa0e3035fb53f19a5 +size 1600 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_small_house_5.nbt b/data/minecraft/structure/village/snowy/houses/snowy_small_house_5.nbt index a7a5159f..3a225c38 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_small_house_5.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_small_house_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0407d5821085e958ccae536a8856be87adca8234ab70e933a58171e9239df6fe -size 1141 +oid sha256:b7070ba787c96454e1d8421a249867958b9de0c2eb57b16e41a498b915ddddbe +size 1140 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_small_house_6.nbt b/data/minecraft/structure/village/snowy/houses/snowy_small_house_6.nbt index 0f7eb51d..b9f1f6ca 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_small_house_6.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_small_house_6.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1c1f5cb7cbfcd01de9cc7ce310d95725b256b089314ffec8a27e2b7e65f8e380 -size 2216 +oid sha256:dde8eea78df54434781121a51cb19bf16bf7609fe66e2ac39434755747fd1d32 +size 2213 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_small_house_7.nbt b/data/minecraft/structure/village/snowy/houses/snowy_small_house_7.nbt index d3888d49..5ac58dfa 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_small_house_7.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_small_house_7.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:02a9ee2aae7dd712d313ceecb6d5368283e6815564d79996129117cabcd3198e -size 1619 +oid sha256:914bbbd485566430912d27002c64941b2ca38031fc1ce9c69a87d70004d182ef +size 1618 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_small_house_8.nbt b/data/minecraft/structure/village/snowy/houses/snowy_small_house_8.nbt index 0ff7b631..2938a856 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_small_house_8.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_small_house_8.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:12a230ec5c66ea6da785bdf378e978637beca05e1d816e18c9448bd180b51cd7 -size 1021 +oid sha256:24003e5fe20d37569cbff4959c51f8f861b044a14d45f72d462910f14eaf481b +size 1020 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_tannery_1.nbt b/data/minecraft/structure/village/snowy/houses/snowy_tannery_1.nbt index d3caffa9..25ef58e0 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_tannery_1.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_tannery_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ec9c3b45af8702b4bfff89faa6d43fe04cdd5733062aa090b5e67443be8faed9 -size 2975 +oid sha256:33333fc062481258f785b3650de565077fad34f75bc6369ad65a5722d5af231e +size 2972 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_temple_1.nbt b/data/minecraft/structure/village/snowy/houses/snowy_temple_1.nbt index 6b6d3bbf..4bfbd062 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_temple_1.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_temple_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:728d8b8801c523b1bae0065e9fc41a6a20e6ffd91c063b3ddd9e91026d3c2fbc -size 3574 +oid sha256:7f050aac041859755efe89ca95b7fc18eda5280c08ce505e91053ead4f310878 +size 3573 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_tool_smith_1.nbt b/data/minecraft/structure/village/snowy/houses/snowy_tool_smith_1.nbt index fd38a1fd..e632ba51 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_tool_smith_1.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_tool_smith_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f87aaa7e44ef0b5a5c5788866632a072a75a023b44b0f85cb9ea7dde698c5aba -size 1915 +oid sha256:3408b7e65231345b6dcd9c06667c0ff9756752fbadbc70fedb34d0d46921d7f1 +size 1914 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_weapon_smith_1.nbt b/data/minecraft/structure/village/snowy/houses/snowy_weapon_smith_1.nbt index c305b865..a91effef 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_weapon_smith_1.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_weapon_smith_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:548076e7e2f9a21a307fdcc1d4e85178b1bf50b394874c12a9de9a777df7250e -size 2757 +oid sha256:e3004c4ddc07d01e613f4f0864a8af9269a215474ee6422ae99d8dfafbd71845 +size 2755 diff --git a/data/minecraft/structure/village/snowy/snowy_lamp_post_01.nbt b/data/minecraft/structure/village/snowy/snowy_lamp_post_01.nbt index 31488879..cd87ada3 100644 --- a/data/minecraft/structure/village/snowy/snowy_lamp_post_01.nbt +++ b/data/minecraft/structure/village/snowy/snowy_lamp_post_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7610f9abae41baeed9609642f71d711f530ecd12eb1abc6291e9dfd4c05e20c3 -size 380 +oid sha256:5d74eceb14c80737d4528d1faf03d062b51d92ff50485725b0dfd2146ffbe81a +size 378 diff --git a/data/minecraft/structure/village/snowy/snowy_lamp_post_02.nbt b/data/minecraft/structure/village/snowy/snowy_lamp_post_02.nbt index 7176e26b..0062b557 100644 --- a/data/minecraft/structure/village/snowy/snowy_lamp_post_02.nbt +++ b/data/minecraft/structure/village/snowy/snowy_lamp_post_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:80e59bb6c4e6544d1f8f2c0f048537388440f56ca4bfd657155dbdf9f345d72d -size 357 +oid sha256:ffde8c5e64237eacbb63348d7c0dffaf22bafefde85c1d9a75795404a855d5ef +size 356 diff --git a/data/minecraft/structure/village/snowy/snowy_lamp_post_03.nbt b/data/minecraft/structure/village/snowy/snowy_lamp_post_03.nbt index 14f78e56..bf710a07 100644 --- a/data/minecraft/structure/village/snowy/snowy_lamp_post_03.nbt +++ b/data/minecraft/structure/village/snowy/snowy_lamp_post_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4e5fa3ed908359b2d97242b2af77d2152abefdaf68eb819c246ad2d6a6e7b5cd -size 504 +oid sha256:d55db83c4ce4ace902ebf3cca41168d631109d7a54113d35daca880745884944 +size 503 diff --git a/data/minecraft/structure/village/snowy/streets/corner_01.nbt b/data/minecraft/structure/village/snowy/streets/corner_01.nbt index ba813243..da6bb44e 100644 --- a/data/minecraft/structure/village/snowy/streets/corner_01.nbt +++ b/data/minecraft/structure/village/snowy/streets/corner_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eae12cd8878b53ce079e77cbe91fd3d75920b2d236f6e874ab44e4290164d0ce +oid sha256:960cc5696556b5d81e6ab999071a86f6752f529b7688a599d13741a1b86873ef size 1097 diff --git a/data/minecraft/structure/village/snowy/streets/corner_02.nbt b/data/minecraft/structure/village/snowy/streets/corner_02.nbt index df5c03fd..189f12ca 100644 --- a/data/minecraft/structure/village/snowy/streets/corner_02.nbt +++ b/data/minecraft/structure/village/snowy/streets/corner_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fe41db9049eacfbe82907b941bba811899217879eff9b1f8e617004689897e58 -size 1809 +oid sha256:62d1a7db8733f4a2c87fd256bf04c7227ab1f4a5f22e1ac5d00ffe3b3ed67583 +size 1808 diff --git a/data/minecraft/structure/village/snowy/streets/corner_03.nbt b/data/minecraft/structure/village/snowy/streets/corner_03.nbt index 2e8f414d..96a0ab98 100644 --- a/data/minecraft/structure/village/snowy/streets/corner_03.nbt +++ b/data/minecraft/structure/village/snowy/streets/corner_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:142b44ac9edce32c71d12a0d18b36947ece29adc7fc77db5f06c7af912198336 -size 395 +oid sha256:fb23eee621ac6b414fb4c2e47cc771d96b3c214ad13c5db320346f851a25e04f +size 394 diff --git a/data/minecraft/structure/village/snowy/streets/crossroad_01.nbt b/data/minecraft/structure/village/snowy/streets/crossroad_01.nbt index 9411b1e9..7b046716 100644 --- a/data/minecraft/structure/village/snowy/streets/crossroad_01.nbt +++ b/data/minecraft/structure/village/snowy/streets/crossroad_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c7e9c5148c430cf939f0da405d3c0257994ae541f5816a38ea5947c8247760eb +oid sha256:336365f9c5069ad69f9a7079accfb5b35c703c8dba1163f7f80e43dc59ac9674 size 1920 diff --git a/data/minecraft/structure/village/snowy/streets/crossroad_02.nbt b/data/minecraft/structure/village/snowy/streets/crossroad_02.nbt index fd060e88..a6e8acfe 100644 --- a/data/minecraft/structure/village/snowy/streets/crossroad_02.nbt +++ b/data/minecraft/structure/village/snowy/streets/crossroad_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f42959c1672ae900446384e195d90dbdeb3c2f869b44b9f671eafc4cbc8afdeb +oid sha256:447af9d92dd219bbcd367d7c28862ebf493539f9b366f42d610d2d5a3c7ce63c size 1959 diff --git a/data/minecraft/structure/village/snowy/streets/crossroad_03.nbt b/data/minecraft/structure/village/snowy/streets/crossroad_03.nbt index 9daa666f..0991544f 100644 --- a/data/minecraft/structure/village/snowy/streets/crossroad_03.nbt +++ b/data/minecraft/structure/village/snowy/streets/crossroad_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b90941b1cd66facd31f81df414b318e365f8b2f6b5380bba1c582fc17c1d5e35 -size 2024 +oid sha256:58865fbb1741ad19dbb50f8a739922f4c90d441a9fa12e41e85924c1dcde8f62 +size 2023 diff --git a/data/minecraft/structure/village/snowy/streets/crossroad_04.nbt b/data/minecraft/structure/village/snowy/streets/crossroad_04.nbt index a5703881..58357bf3 100644 --- a/data/minecraft/structure/village/snowy/streets/crossroad_04.nbt +++ b/data/minecraft/structure/village/snowy/streets/crossroad_04.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cf2d81e346c53d45f602c9a60c0a6fc8afb427d3107cf76101911f470e5ad9e3 -size 431 +oid sha256:e112e6723f737dae72a3f9727c117613fd0e679e296aa50f86bf0d5cdba1e38b +size 430 diff --git a/data/minecraft/structure/village/snowy/streets/crossroad_05.nbt b/data/minecraft/structure/village/snowy/streets/crossroad_05.nbt index 95630440..4ae4cb8b 100644 --- a/data/minecraft/structure/village/snowy/streets/crossroad_05.nbt +++ b/data/minecraft/structure/village/snowy/streets/crossroad_05.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:33f37650bd78f5c5aad0acde734312999c6bd83f18a839b22ac30eba62169880 -size 474 +oid sha256:b7550faaf55a01863389ed27734c436241c45725e13efa216f834eb3787797e3 +size 473 diff --git a/data/minecraft/structure/village/snowy/streets/crossroad_06.nbt b/data/minecraft/structure/village/snowy/streets/crossroad_06.nbt index d36b6b52..5cb0db3f 100644 --- a/data/minecraft/structure/village/snowy/streets/crossroad_06.nbt +++ b/data/minecraft/structure/village/snowy/streets/crossroad_06.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a38fd4ce74619f104a4e484662e8195edcf8449531197323028e15890f3befa0 -size 529 +oid sha256:37d02587dac6aad8ca8f9a57c33b5b654ddf1023e458f3605377d6b320d68d9e +size 528 diff --git a/data/minecraft/structure/village/snowy/streets/square_01.nbt b/data/minecraft/structure/village/snowy/streets/square_01.nbt index b101ab71..76c07d48 100644 --- a/data/minecraft/structure/village/snowy/streets/square_01.nbt +++ b/data/minecraft/structure/village/snowy/streets/square_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:67f1ce60794045cc19e17b220959e3e26aacc5bf29eb5abf2d3dc1461f4b2dce -size 1511 +oid sha256:bf5fb475edf2593584b0111c35331987762a9d50c08d210afe59a56e2f3ace9c +size 1510 diff --git a/data/minecraft/structure/village/snowy/streets/straight_01.nbt b/data/minecraft/structure/village/snowy/streets/straight_01.nbt index a99ef6bf..6ce40364 100644 --- a/data/minecraft/structure/village/snowy/streets/straight_01.nbt +++ b/data/minecraft/structure/village/snowy/streets/straight_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bd87a7748dfa6809c33beae3ba6ff4422003c68bc682171f3b2f58c1b0b995df -size 1853 +oid sha256:ed4de19018476d7d876a409874f75c72b23502429ba2fb5536ee34027368a213 +size 1852 diff --git a/data/minecraft/structure/village/snowy/streets/straight_02.nbt b/data/minecraft/structure/village/snowy/streets/straight_02.nbt index 6d845ee4..9d1338ad 100644 --- a/data/minecraft/structure/village/snowy/streets/straight_02.nbt +++ b/data/minecraft/structure/village/snowy/streets/straight_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2e8150202e44a191b805b6b583777f62d2022675e1158089067a3793a465a0ef -size 1776 +oid sha256:be6d41d9ed9487c927897552f802e9676d47dd82c8ec86785eeb14d8effd94c9 +size 1775 diff --git a/data/minecraft/structure/village/snowy/streets/straight_03.nbt b/data/minecraft/structure/village/snowy/streets/straight_03.nbt index a0962e34..d02e6b71 100644 --- a/data/minecraft/structure/village/snowy/streets/straight_03.nbt +++ b/data/minecraft/structure/village/snowy/streets/straight_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fc8983ed37cae678d834b8398a62f45a92ce021631dcf9288e7b04f8852f26a1 -size 1220 +oid sha256:6db06efe57f33a43f7f1ccffd53d131d2ba4d0f9469943666f51c3da3fa0853c +size 1218 diff --git a/data/minecraft/structure/village/snowy/streets/straight_04.nbt b/data/minecraft/structure/village/snowy/streets/straight_04.nbt index 712156e3..43bfed0d 100644 --- a/data/minecraft/structure/village/snowy/streets/straight_04.nbt +++ b/data/minecraft/structure/village/snowy/streets/straight_04.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bd70b4221560d38e3b06b9a2674956b44e182e45e72be2d000607e283f0ae6d5 -size 710 +oid sha256:6ff402b4973a02edbe008df05daf9e4e00d6f06bfe48a870c6f169822205d37d +size 709 diff --git a/data/minecraft/structure/village/snowy/streets/straight_06.nbt b/data/minecraft/structure/village/snowy/streets/straight_06.nbt index d776802d..17e1d070 100644 --- a/data/minecraft/structure/village/snowy/streets/straight_06.nbt +++ b/data/minecraft/structure/village/snowy/streets/straight_06.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3c3c252376e1c0dd2f691a10f1846cb11b2bfd69535e394e8d90bf4a713610c4 -size 2619 +oid sha256:1c4de816f14c8d9676f7c92a2720c8cf1be953f0e05dafdcbd475ac5a169d14b +size 2618 diff --git a/data/minecraft/structure/village/snowy/streets/straight_08.nbt b/data/minecraft/structure/village/snowy/streets/straight_08.nbt index 0da7f212..9b14f7c9 100644 --- a/data/minecraft/structure/village/snowy/streets/straight_08.nbt +++ b/data/minecraft/structure/village/snowy/streets/straight_08.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6baed7ae7c2810dfe03049640d0f187953687bf5ad1e3a43b4e134454acaadae -size 1943 +oid sha256:24a778c72bbd9231613c5d76a75ba40912ac404035a9ec2441f7b1b15f20f2d1 +size 1942 diff --git a/data/minecraft/structure/village/snowy/streets/turn_01.nbt b/data/minecraft/structure/village/snowy/streets/turn_01.nbt index 96976744..ab035f32 100644 --- a/data/minecraft/structure/village/snowy/streets/turn_01.nbt +++ b/data/minecraft/structure/village/snowy/streets/turn_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:47a108e0a3b1f82496f34e76acb55c020b12982537efeb61b18fd88e76ea960c -size 1234 +oid sha256:91836865fdaf8cf670fd44f553845ad9fa7d7abe7b7a5b01db47200fdc0a1bf7 +size 1233 diff --git a/data/minecraft/structure/village/snowy/town_centers/snowy_meeting_point_1.nbt b/data/minecraft/structure/village/snowy/town_centers/snowy_meeting_point_1.nbt index 57e81c54..e2d1bc6a 100644 --- a/data/minecraft/structure/village/snowy/town_centers/snowy_meeting_point_1.nbt +++ b/data/minecraft/structure/village/snowy/town_centers/snowy_meeting_point_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ad0ebcc20bc453f03e5a898cdc6960d471a725467e6e505d830dafa2ff40b101 +oid sha256:f334dedbc72d4b6f27e04d926ab6120d0350c69ec5c220ecad9bf2d55d83db5e size 2734 diff --git a/data/minecraft/structure/village/snowy/town_centers/snowy_meeting_point_2.nbt b/data/minecraft/structure/village/snowy/town_centers/snowy_meeting_point_2.nbt index 0903e7a6..88b2dc29 100644 --- a/data/minecraft/structure/village/snowy/town_centers/snowy_meeting_point_2.nbt +++ b/data/minecraft/structure/village/snowy/town_centers/snowy_meeting_point_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b5dd557e36624e853b638132ab1ccd28cfb750289c302c0f9467748465554d09 -size 1036 +oid sha256:fab39ab72b6bb363742c338da3d84508184ef1d7c9e5ed212d1d0122b8a994a9 +size 1035 diff --git a/data/minecraft/structure/village/snowy/town_centers/snowy_meeting_point_3.nbt b/data/minecraft/structure/village/snowy/town_centers/snowy_meeting_point_3.nbt index 8662d2b4..5daeb07d 100644 --- a/data/minecraft/structure/village/snowy/town_centers/snowy_meeting_point_3.nbt +++ b/data/minecraft/structure/village/snowy/town_centers/snowy_meeting_point_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d6bc46e87f952dc7090c5ec404ed98658d3f4f78cbad906194f5f099e5892181 -size 852 +oid sha256:b75d7a85c32a9957afb03aed14b0d56afd2455a982c115afd59ed8485ad0ffed +size 851 diff --git a/data/minecraft/structure/village/snowy/villagers/baby.nbt b/data/minecraft/structure/village/snowy/villagers/baby.nbt index bf6110dc..3cbcce32 100644 --- a/data/minecraft/structure/village/snowy/villagers/baby.nbt +++ b/data/minecraft/structure/village/snowy/villagers/baby.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8c71a3a58b5d4db2a9a71154c8080121487ff669480ebca83fecb722769676e0 +oid sha256:0015033cb9dbd3a6f841151762587c67a02b0826b979c6a87be043877033cccd size 718 diff --git a/data/minecraft/structure/village/snowy/villagers/nitwit.nbt b/data/minecraft/structure/village/snowy/villagers/nitwit.nbt index 03c84afa..d0f58718 100644 --- a/data/minecraft/structure/village/snowy/villagers/nitwit.nbt +++ b/data/minecraft/structure/village/snowy/villagers/nitwit.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:490fb8742b929854fe7f126b31e2943b39e3caf493d6163e7d9a64189bde0c1b -size 716 +oid sha256:395e5c8190286484dfac4748e0f29b7d42b7247e0c7d4731ef9da97d0e72cf89 +size 715 diff --git a/data/minecraft/structure/village/snowy/villagers/unemployed.nbt b/data/minecraft/structure/village/snowy/villagers/unemployed.nbt index b0f4a7f2..8561ac5f 100644 --- a/data/minecraft/structure/village/snowy/villagers/unemployed.nbt +++ b/data/minecraft/structure/village/snowy/villagers/unemployed.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b7d316571d7f5924febc3fbfc644e9d38bf000fe579eb2a740237247382ac8fa -size 713 +oid sha256:cd0065571f242e618d2daa3b572c291d90a3d1a27bb474537549dfda3d22d04f +size 712 diff --git a/data/minecraft/structure/village/snowy/zombie/houses/snowy_medium_house_1.nbt b/data/minecraft/structure/village/snowy/zombie/houses/snowy_medium_house_1.nbt index 10921e2b..8ed81b82 100644 --- a/data/minecraft/structure/village/snowy/zombie/houses/snowy_medium_house_1.nbt +++ b/data/minecraft/structure/village/snowy/zombie/houses/snowy_medium_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fa9103006e0f3841c7c01296eb6e971279e4557b8529c443957334844a3a91e0 -size 1601 +oid sha256:614faa296f7762d2caa31313024bec99f41519bddf19beaae166c132ad49ea80 +size 1600 diff --git a/data/minecraft/structure/village/snowy/zombie/houses/snowy_medium_house_2.nbt b/data/minecraft/structure/village/snowy/zombie/houses/snowy_medium_house_2.nbt index 824a9906..5fff802c 100644 --- a/data/minecraft/structure/village/snowy/zombie/houses/snowy_medium_house_2.nbt +++ b/data/minecraft/structure/village/snowy/zombie/houses/snowy_medium_house_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3e6b6679c862252d4273756732ba759d948ed9956978e74975eadd81e070e651 -size 3578 +oid sha256:2137a575b766200204c8b13b66aa16f3fb87522fb56c1602a9b1085b6e9d1b2d +size 3576 diff --git a/data/minecraft/structure/village/snowy/zombie/houses/snowy_medium_house_3.nbt b/data/minecraft/structure/village/snowy/zombie/houses/snowy_medium_house_3.nbt index 11a6b7f0..f93aae9a 100644 --- a/data/minecraft/structure/village/snowy/zombie/houses/snowy_medium_house_3.nbt +++ b/data/minecraft/structure/village/snowy/zombie/houses/snowy_medium_house_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:36087303432bcb511bd5f7acd22ef4017de0e6da099ba67473e7f536330d2153 -size 1212 +oid sha256:e8aa9864d2f9e020eafc894c0e683ffb25a271e36c9f72ae5b7b889025236a06 +size 1209 diff --git a/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_1.nbt b/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_1.nbt index 63a0f38f..f2488964 100644 --- a/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_1.nbt +++ b/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b3ebe5ae71a0ea71765c7a17372ddc5b0502ef313fd740c904fb91c0da5c34a1 -size 1323 +oid sha256:11fa3ed0034d1691fb94528558958f0d925719b433aea121e45018bb7c3bd861 +size 1322 diff --git a/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_2.nbt b/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_2.nbt index a1b89b17..528a3015 100644 --- a/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_2.nbt +++ b/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aba472c62ca3a895f46be8fe261e890e96ab20f6225a5c26f4c3aeecba96b1fd -size 2141 +oid sha256:5d6c1738b7e8f90ac1ccfe393d12e0b6797742d2213dfbdebc4ffbb985fe9274 +size 2139 diff --git a/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_3.nbt b/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_3.nbt index 6fd00c29..11e422df 100644 --- a/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_3.nbt +++ b/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3ad0c1bf9f5af447be584cb142353ebe3370ef05af08c535610fb499cc767d40 -size 1813 +oid sha256:75c33cde299d5f35294e515e2b497e627f99d60a47af96cc93d1acc95742aa8d +size 1811 diff --git a/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_4.nbt b/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_4.nbt index b37bfcc9..199a4e56 100644 --- a/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_4.nbt +++ b/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:21d9cfaf5ab1c151c2aab3ef7095bcc4091c6731149cd62d47af8b8f8a5d0ac6 -size 1609 +oid sha256:b5a3a55119e943d78913efa393c4be14de1ffa23c8c2cb085721356d4d83fe5a +size 1607 diff --git a/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_5.nbt b/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_5.nbt index fd769650..a8a5fa2b 100644 --- a/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_5.nbt +++ b/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:93ba928b7e3471d2c6fcf2933e1ae4df8eb96eb1b4dc4972c40df58cb2e2ad15 -size 1149 +oid sha256:f4ec4ccdf2697b93c23a32d660ca4880a7fc428b4ae57cec5348cc3e46a942f5 +size 1147 diff --git a/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_6.nbt b/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_6.nbt index ed2f9f71..b6545013 100644 --- a/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_6.nbt +++ b/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_6.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:038383c81eaf95d46420f9d89dfe42c4d925b0f702f78b139bdbed3f2078fb97 -size 2223 +oid sha256:6b5991dcf07362ae8b0b5683bcd45239e0afa325ba73af3d4affed4d90fe9dcb +size 2221 diff --git a/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_7.nbt b/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_7.nbt index b387f9c8..b1e3420d 100644 --- a/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_7.nbt +++ b/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_7.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e4ccafb2a0e2dea904bcffc65f155f8bbd866205057d9117d69f5c8611e451fa -size 1625 +oid sha256:05ba2b34b2fefbc0a7bed274041f207ba3e49a9c530d6216a25a462c0d23334f +size 1624 diff --git a/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_8.nbt b/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_8.nbt index 581ef1f7..123de338 100644 --- a/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_8.nbt +++ b/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_8.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dbd0247e3ab9e2b881c2e09519958465c3560d167860da329e38b97529fa19bc -size 860 +oid sha256:70a12ff02f197c28aa905fa10e3d89db39e37f029ef489eff956d62c6e41841c +size 858 diff --git a/data/minecraft/structure/village/snowy/zombie/streets/corner_01.nbt b/data/minecraft/structure/village/snowy/zombie/streets/corner_01.nbt index a7ff376b..695076ee 100644 --- a/data/minecraft/structure/village/snowy/zombie/streets/corner_01.nbt +++ b/data/minecraft/structure/village/snowy/zombie/streets/corner_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:533dead5741ec33a84d305f0a885d912e5cf7521c56a8c95f08a3d59c2a2e1bf +oid sha256:0360d0678bf5033796e8b22584fef9c9749e13be7f44f6944db5d2761dcd3d57 size 1107 diff --git a/data/minecraft/structure/village/snowy/zombie/streets/corner_02.nbt b/data/minecraft/structure/village/snowy/zombie/streets/corner_02.nbt index 0d8792ed..614a836f 100644 --- a/data/minecraft/structure/village/snowy/zombie/streets/corner_02.nbt +++ b/data/minecraft/structure/village/snowy/zombie/streets/corner_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:99698bd404b4e7aea1ef05ef11d518f751bf09ea89b1cb8b31e0c20a3a0cba6a -size 1816 +oid sha256:94fe4cfc5a177db526427888a97b2dc54ae80d8fe569a66db0981b24ceb526f0 +size 1814 diff --git a/data/minecraft/structure/village/snowy/zombie/streets/corner_03.nbt b/data/minecraft/structure/village/snowy/zombie/streets/corner_03.nbt index 879c7248..1912deb6 100644 --- a/data/minecraft/structure/village/snowy/zombie/streets/corner_03.nbt +++ b/data/minecraft/structure/village/snowy/zombie/streets/corner_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5d14609ef523026073148518403530e5a90a8e1e584d5cf1a1155922e8f90890 +oid sha256:58ab77f011c09ba9b6fdc4a7d347db6e85c351c0297f81b3436f344e22b45167 size 400 diff --git a/data/minecraft/structure/village/snowy/zombie/streets/crossroad_01.nbt b/data/minecraft/structure/village/snowy/zombie/streets/crossroad_01.nbt index 8f35c7f1..7d24244c 100644 --- a/data/minecraft/structure/village/snowy/zombie/streets/crossroad_01.nbt +++ b/data/minecraft/structure/village/snowy/zombie/streets/crossroad_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:937346fed6ba2825fb2f4064c7b21f133f3f581f7679ec5f39bdba543d225424 +oid sha256:a4e11328e0985e009c0f79a790d3a17b3113413581dbfc4581ea11a1e09b4614 size 1925 diff --git a/data/minecraft/structure/village/snowy/zombie/streets/crossroad_02.nbt b/data/minecraft/structure/village/snowy/zombie/streets/crossroad_02.nbt index 24054762..cbd45190 100644 --- a/data/minecraft/structure/village/snowy/zombie/streets/crossroad_02.nbt +++ b/data/minecraft/structure/village/snowy/zombie/streets/crossroad_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:405bdda0da05dec988463e82d2ecf2a5125e4446371f1fcbba6943e60d3e3c82 +oid sha256:ceecd6d07b450554425baf9e44dcf5422fbe41595e9c58e8daeda3fed414a49e size 1963 diff --git a/data/minecraft/structure/village/snowy/zombie/streets/crossroad_03.nbt b/data/minecraft/structure/village/snowy/zombie/streets/crossroad_03.nbt index 65f5ac4a..3d4e35d8 100644 --- a/data/minecraft/structure/village/snowy/zombie/streets/crossroad_03.nbt +++ b/data/minecraft/structure/village/snowy/zombie/streets/crossroad_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6eef6d5282d21aff74f5e4fcf109e613294af294dce6a00ceb85ec41d8ba65f2 -size 2030 +oid sha256:d34d685c08ef7d8357d4cecbfe36a2ede23a5871fc3adda89e9c8c1a08f557db +size 2029 diff --git a/data/minecraft/structure/village/snowy/zombie/streets/crossroad_04.nbt b/data/minecraft/structure/village/snowy/zombie/streets/crossroad_04.nbt index fb80905e..04b62501 100644 --- a/data/minecraft/structure/village/snowy/zombie/streets/crossroad_04.nbt +++ b/data/minecraft/structure/village/snowy/zombie/streets/crossroad_04.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c328270aeda75cb0c949915410fc7fef3edf934a5cf08d653eff8f839973cd75 +oid sha256:290384a3a36cd9eba4a0de73a8955d1634848f2d06b1528bd7bb0286c51dd440 size 436 diff --git a/data/minecraft/structure/village/snowy/zombie/streets/crossroad_05.nbt b/data/minecraft/structure/village/snowy/zombie/streets/crossroad_05.nbt index 4478894b..2b84cf62 100644 --- a/data/minecraft/structure/village/snowy/zombie/streets/crossroad_05.nbt +++ b/data/minecraft/structure/village/snowy/zombie/streets/crossroad_05.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fee12ac5ae3865532a8f715172669817d6304119f8ccb34bcf761d8a34733c35 -size 478 +oid sha256:4fc08fbfb39d16318c69fadc85a9bd86821a161791c49f402239429b90264e2e +size 477 diff --git a/data/minecraft/structure/village/snowy/zombie/streets/crossroad_06.nbt b/data/minecraft/structure/village/snowy/zombie/streets/crossroad_06.nbt index 0c61e780..4c6cd569 100644 --- a/data/minecraft/structure/village/snowy/zombie/streets/crossroad_06.nbt +++ b/data/minecraft/structure/village/snowy/zombie/streets/crossroad_06.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2492a33cd7bae5d2568783c62954a107cd75fff63d9b77aeaee95f423326de63 -size 533 +oid sha256:886af8a7ae525e53df132e5d509082ff760b69daaec9dfc8a3a75535b4991df8 +size 532 diff --git a/data/minecraft/structure/village/snowy/zombie/streets/square_01.nbt b/data/minecraft/structure/village/snowy/zombie/streets/square_01.nbt index 27182697..f123df10 100644 --- a/data/minecraft/structure/village/snowy/zombie/streets/square_01.nbt +++ b/data/minecraft/structure/village/snowy/zombie/streets/square_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b094ffbc5fd918a9b345ee894de6d8fa57debb038321c0cce038d3b64203f914 -size 1517 +oid sha256:7738329656895f76a8f0194dcf8e03a5f2ecbbeff5e4973e19a9321f1be8ee8c +size 1516 diff --git a/data/minecraft/structure/village/snowy/zombie/streets/straight_01.nbt b/data/minecraft/structure/village/snowy/zombie/streets/straight_01.nbt index b2b22a1a..b7032e1d 100644 --- a/data/minecraft/structure/village/snowy/zombie/streets/straight_01.nbt +++ b/data/minecraft/structure/village/snowy/zombie/streets/straight_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9b7628d638d8a6193f6816ecb455582d8623d063bd5f0fe87e0d237b02c7468f -size 1857 +oid sha256:3b26ee2558a3fa316c6d884afcc1046867d96eb4adc780fbe09180c67ebd79c0 +size 1856 diff --git a/data/minecraft/structure/village/snowy/zombie/streets/straight_02.nbt b/data/minecraft/structure/village/snowy/zombie/streets/straight_02.nbt index 15a9a2fd..4a1defad 100644 --- a/data/minecraft/structure/village/snowy/zombie/streets/straight_02.nbt +++ b/data/minecraft/structure/village/snowy/zombie/streets/straight_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:63d0b33c3d6f3857ef2066167a7ebaaee21fcb5d48f745e3c3bac4439bde59de -size 1782 +oid sha256:85c78ae78ba8f84abd87afabfbe6a6788443846b9b83bcff40177324a7c31084 +size 1781 diff --git a/data/minecraft/structure/village/snowy/zombie/streets/straight_03.nbt b/data/minecraft/structure/village/snowy/zombie/streets/straight_03.nbt index feb33057..89fff1ba 100644 --- a/data/minecraft/structure/village/snowy/zombie/streets/straight_03.nbt +++ b/data/minecraft/structure/village/snowy/zombie/streets/straight_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:db154e96a88fa55ea84dd3a2e41a16debf62d85b491170f492d2ad884f852ed9 -size 1225 +oid sha256:b1d9c27bc9c256bb2021aae28db8ed1f17ffe9d910b589b3cf6417cb10d12d6f +size 1224 diff --git a/data/minecraft/structure/village/snowy/zombie/streets/straight_04.nbt b/data/minecraft/structure/village/snowy/zombie/streets/straight_04.nbt index d4546959..b1981356 100644 --- a/data/minecraft/structure/village/snowy/zombie/streets/straight_04.nbt +++ b/data/minecraft/structure/village/snowy/zombie/streets/straight_04.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7784d9941c79a8a62125981a74c5382a22001591f6ea152a425196426ee5a40c -size 719 +oid sha256:3d4908afa7ac9f19e7023c46581d8066af0265a2f8d2271675cbf7416650d3d3 +size 718 diff --git a/data/minecraft/structure/village/snowy/zombie/streets/straight_06.nbt b/data/minecraft/structure/village/snowy/zombie/streets/straight_06.nbt index b4a5cace..1303c193 100644 --- a/data/minecraft/structure/village/snowy/zombie/streets/straight_06.nbt +++ b/data/minecraft/structure/village/snowy/zombie/streets/straight_06.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cc8eb3d0043cb31951e064300effb6a699edf426e29c64b571c342da766809b1 +oid sha256:15e3d563d5a5c7472c6da3ea067164fecd35a304b7b0457c052e3f8130c26138 size 2623 diff --git a/data/minecraft/structure/village/snowy/zombie/streets/straight_08.nbt b/data/minecraft/structure/village/snowy/zombie/streets/straight_08.nbt index ff9f5224..3969facb 100644 --- a/data/minecraft/structure/village/snowy/zombie/streets/straight_08.nbt +++ b/data/minecraft/structure/village/snowy/zombie/streets/straight_08.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2e066f8d2ced0101a7b28b86b96e013eaa5a68ca47364973c7fbf6eda73a77b5 -size 1948 +oid sha256:f5aa04426cbd68c9a37bc90373c0002c9408947f64cfdb44b9344cc9b5823d77 +size 1947 diff --git a/data/minecraft/structure/village/snowy/zombie/streets/turn_01.nbt b/data/minecraft/structure/village/snowy/zombie/streets/turn_01.nbt index b79e065f..f9c38b0e 100644 --- a/data/minecraft/structure/village/snowy/zombie/streets/turn_01.nbt +++ b/data/minecraft/structure/village/snowy/zombie/streets/turn_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef8f31ec0af3d853ebd1bffd593b42e8cfae640d26d096732cf0829702dd0a05 +oid sha256:48557d6aecd8da8d48f8ecb0eab3ea7d48b353b025ebf573635b3fed870e0fca size 1238 diff --git a/data/minecraft/structure/village/snowy/zombie/town_centers/snowy_meeting_point_1.nbt b/data/minecraft/structure/village/snowy/zombie/town_centers/snowy_meeting_point_1.nbt index c129f1d2..81adb38a 100644 --- a/data/minecraft/structure/village/snowy/zombie/town_centers/snowy_meeting_point_1.nbt +++ b/data/minecraft/structure/village/snowy/zombie/town_centers/snowy_meeting_point_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f18cb0ad3302f6b8ad8c8baf1faa3206f7f0a7d2407885ec3b1d8447ff9e82e0 -size 2695 +oid sha256:8106a3adf2afe620d6864ce6f81a99c21d696fc50e13802c9cda36233332d3d3 +size 2694 diff --git a/data/minecraft/structure/village/snowy/zombie/town_centers/snowy_meeting_point_2.nbt b/data/minecraft/structure/village/snowy/zombie/town_centers/snowy_meeting_point_2.nbt index 72ecf2df..24e95c75 100644 --- a/data/minecraft/structure/village/snowy/zombie/town_centers/snowy_meeting_point_2.nbt +++ b/data/minecraft/structure/village/snowy/zombie/town_centers/snowy_meeting_point_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a9a2d6cf4c0153c5408dcb9515d0dc0715ffe6fb9d43ca3087263ce085db60b4 +oid sha256:b4db0890074d35091ded2fbe63941d830789f035084311aa854256c6e1c4c13f size 991 diff --git a/data/minecraft/structure/village/snowy/zombie/town_centers/snowy_meeting_point_3.nbt b/data/minecraft/structure/village/snowy/zombie/town_centers/snowy_meeting_point_3.nbt index 153eec27..a19f8d60 100644 --- a/data/minecraft/structure/village/snowy/zombie/town_centers/snowy_meeting_point_3.nbt +++ b/data/minecraft/structure/village/snowy/zombie/town_centers/snowy_meeting_point_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e610377e1563df6402132bb3e3ff11ccd02c93f6865e2b185ca886b2d9e886bc -size 817 +oid sha256:4e93364532b81f4fe4ecf6a5e49ae8f1d49fa871dfbf0d6f5e6f025c6e9fe750 +size 816 diff --git a/data/minecraft/structure/village/snowy/zombie/villagers/nitwit.nbt b/data/minecraft/structure/village/snowy/zombie/villagers/nitwit.nbt index c9e04efa..b26bb485 100644 --- a/data/minecraft/structure/village/snowy/zombie/villagers/nitwit.nbt +++ b/data/minecraft/structure/village/snowy/zombie/villagers/nitwit.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:45841e0b3239c3cf422628bc7e8cd836004a0c32333437796db3b8abe73d2cec -size 722 +oid sha256:cd1324db50b9a3a7a99bb5bcf37777289de9661d1d88c5f9b072a0454c2dfe2b +size 721 diff --git a/data/minecraft/structure/village/snowy/zombie/villagers/unemployed.nbt b/data/minecraft/structure/village/snowy/zombie/villagers/unemployed.nbt index 0bee67c7..9f2157e2 100644 --- a/data/minecraft/structure/village/snowy/zombie/villagers/unemployed.nbt +++ b/data/minecraft/structure/village/snowy/zombie/villagers/unemployed.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:90a8938f1f997026208dcf59345bfff72a33a1b915aabbd3b01e9b91d88ab0aa +oid sha256:904f6ade8a2b062d5b7280f8cafa39cfe893a964baa94fc26419019f924dbec6 size 719 diff --git a/data/minecraft/structure/village/taiga/houses/taiga_animal_pen_1.nbt b/data/minecraft/structure/village/taiga/houses/taiga_animal_pen_1.nbt index 201d6a95..cfb68699 100644 --- a/data/minecraft/structure/village/taiga/houses/taiga_animal_pen_1.nbt +++ b/data/minecraft/structure/village/taiga/houses/taiga_animal_pen_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:549f409837a833685d18c14b400e725fad5468a962df4a16f82d0aac71964400 -size 2091 +oid sha256:89dea7d0a0098d98d48ce2eefaf3def754fb09cb9904ac2d065da8db2849ccd7 +size 2090 diff --git a/data/minecraft/structure/village/taiga/houses/taiga_armorer_2.nbt b/data/minecraft/structure/village/taiga/houses/taiga_armorer_2.nbt index f3cf5ff1..265e6649 100644 --- a/data/minecraft/structure/village/taiga/houses/taiga_armorer_2.nbt +++ b/data/minecraft/structure/village/taiga/houses/taiga_armorer_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3a7ce94dab9454c3e3b366a0edfb88c9e107f5587aa8304b92d5c021a7b3663c +oid sha256:23282446623dab2e83624cbe2ddb0944adcc99e1333aca621f9f21642d8ae4ab size 2578 diff --git a/data/minecraft/structure/village/taiga/houses/taiga_armorer_house_1.nbt b/data/minecraft/structure/village/taiga/houses/taiga_armorer_house_1.nbt index 245878b2..08272a96 100644 --- a/data/minecraft/structure/village/taiga/houses/taiga_armorer_house_1.nbt +++ b/data/minecraft/structure/village/taiga/houses/taiga_armorer_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d6cd39963a7c152ef309454f04423cfc360be74828a64b0727081021bcff6a95 -size 2073 +oid sha256:5c93cb6cf5fd3ce3b5ae202aeaf2e01c62acaa9b48105968879cc35d05116570 +size 2071 diff --git a/data/minecraft/structure/village/taiga/houses/taiga_butcher_shop_1.nbt b/data/minecraft/structure/village/taiga/houses/taiga_butcher_shop_1.nbt index c4c6e7c9..88aa51a1 100644 --- a/data/minecraft/structure/village/taiga/houses/taiga_butcher_shop_1.nbt +++ b/data/minecraft/structure/village/taiga/houses/taiga_butcher_shop_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b23079b6304bab7545cf83073b24ff4bb24f632b4b29ed12ba5676d11176d4ea -size 3297 +oid sha256:7a753f6c146b96c1f6201de71e7c409c7321ada2f8a01542fd25d1e3cc666c41 +size 3294 diff --git a/data/minecraft/structure/village/taiga/houses/taiga_cartographer_house_1.nbt b/data/minecraft/structure/village/taiga/houses/taiga_cartographer_house_1.nbt index c25ec09e..76f9d000 100644 --- a/data/minecraft/structure/village/taiga/houses/taiga_cartographer_house_1.nbt +++ b/data/minecraft/structure/village/taiga/houses/taiga_cartographer_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:edc84afc3b8dbfbb1f861d51ca235634f08bf063401d62133931ae3d0bc4f26f -size 2607 +oid sha256:2cc31f5a8eeed7979d112d6e926eaafb855d579c5aaab0742a35754055c1eade +size 2606 diff --git a/data/minecraft/structure/village/taiga/houses/taiga_fisher_cottage_1.nbt b/data/minecraft/structure/village/taiga/houses/taiga_fisher_cottage_1.nbt index eac05214..fa1446bc 100644 --- a/data/minecraft/structure/village/taiga/houses/taiga_fisher_cottage_1.nbt +++ b/data/minecraft/structure/village/taiga/houses/taiga_fisher_cottage_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:220fc1f1954320d04a1afa5fb8f0dbe90ab21ca374b42b4b3675d0987e9aefe4 -size 3655 +oid sha256:632d19f9078ee37e7c2c80e11564778ec6ada87dadb4bf7ff96ed2822da2cf12 +size 3654 diff --git a/data/minecraft/structure/village/taiga/houses/taiga_fletcher_house_1.nbt b/data/minecraft/structure/village/taiga/houses/taiga_fletcher_house_1.nbt index 9fadd9e4..9dbf531c 100644 --- a/data/minecraft/structure/village/taiga/houses/taiga_fletcher_house_1.nbt +++ b/data/minecraft/structure/village/taiga/houses/taiga_fletcher_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:69d47efcb4cb0e6bd6ea1bcd3af7a24a65a8741c5b3162e342c828f8a5852ff2 -size 2768 +oid sha256:fb37c191e1192a2a8377178bc491b64330f9bc9e6bc5b425b07c1f6c14ee52c3 +size 2766 diff --git a/data/minecraft/structure/village/taiga/houses/taiga_large_farm_1.nbt b/data/minecraft/structure/village/taiga/houses/taiga_large_farm_1.nbt index 9f43993b..bbc3792d 100644 --- a/data/minecraft/structure/village/taiga/houses/taiga_large_farm_1.nbt +++ b/data/minecraft/structure/village/taiga/houses/taiga_large_farm_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:05b144bb5dd1aa5a3c916698a72862cbf63bbb6c90f7dd82c79e90eeace41692 -size 2214 +oid sha256:a1656d935deb700ea294567ec7425938d7902e90df8a9a4d74335ad848f67527 +size 2212 diff --git a/data/minecraft/structure/village/taiga/houses/taiga_large_farm_2.nbt b/data/minecraft/structure/village/taiga/houses/taiga_large_farm_2.nbt index 5dbcc56f..2c129970 100644 --- a/data/minecraft/structure/village/taiga/houses/taiga_large_farm_2.nbt +++ b/data/minecraft/structure/village/taiga/houses/taiga_large_farm_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2074c339273ca2c5bd8ae47aa8f37d3d3451540d544a2c9308a878ae39b6f472 -size 1601 +oid sha256:7db8cd07679af6cd59a36b03745c29e3621bbb314df5e1f5349997670b51ae71 +size 1600 diff --git a/data/minecraft/structure/village/taiga/houses/taiga_library_1.nbt b/data/minecraft/structure/village/taiga/houses/taiga_library_1.nbt index fdc99369..439c3336 100644 --- a/data/minecraft/structure/village/taiga/houses/taiga_library_1.nbt +++ b/data/minecraft/structure/village/taiga/houses/taiga_library_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:891e7cf1cf2f7db8330a661f8a7ff89e8a2ec2d092f3feba19d0772eccb1e07c +oid sha256:3d7cc85448c944fc799c05e68cec8248c7240eb9ae56218c922d8eb2329e671d size 3448 diff --git a/data/minecraft/structure/village/taiga/houses/taiga_masons_house_1.nbt b/data/minecraft/structure/village/taiga/houses/taiga_masons_house_1.nbt index 41d8ed7d..8f101a39 100644 --- a/data/minecraft/structure/village/taiga/houses/taiga_masons_house_1.nbt +++ b/data/minecraft/structure/village/taiga/houses/taiga_masons_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e209b55452c88b253184df33ea908c56d34892ff71949cc3230e69886243f98f -size 2191 +oid sha256:5bddd4802f3503286058b3a64555d23f0b91e91156e2c275fb79f137b9f57a97 +size 2190 diff --git a/data/minecraft/structure/village/taiga/houses/taiga_medium_house_1.nbt b/data/minecraft/structure/village/taiga/houses/taiga_medium_house_1.nbt index 8470d146..bcb4421e 100644 --- a/data/minecraft/structure/village/taiga/houses/taiga_medium_house_1.nbt +++ b/data/minecraft/structure/village/taiga/houses/taiga_medium_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:529fb5b169e5e80e3f298c156070181741f56fb376ec44889efa794c6caec3d8 -size 2837 +oid sha256:63cee817896e2b22efe0fb64d2a4579f47eeeb2d8a778a9fefbd03ff661e9c5c +size 2835 diff --git a/data/minecraft/structure/village/taiga/houses/taiga_medium_house_2.nbt b/data/minecraft/structure/village/taiga/houses/taiga_medium_house_2.nbt index b67228d0..b0bd2905 100644 --- a/data/minecraft/structure/village/taiga/houses/taiga_medium_house_2.nbt +++ b/data/minecraft/structure/village/taiga/houses/taiga_medium_house_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eedbf0bae8f89acd4516a889388e5e4b60542b303dd133f63c28292f7a246edd -size 2611 +oid sha256:fa96c49963528e43e7ee9d4d36c0d225405f36f9a92aac59bb55eff992b82b5c +size 2608 diff --git a/data/minecraft/structure/village/taiga/houses/taiga_medium_house_3.nbt b/data/minecraft/structure/village/taiga/houses/taiga_medium_house_3.nbt index 4cff06ac..345f5c8f 100644 --- a/data/minecraft/structure/village/taiga/houses/taiga_medium_house_3.nbt +++ b/data/minecraft/structure/village/taiga/houses/taiga_medium_house_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d7bebc110b48f4d0e7af8ba0fe6a4c0092bdbc8dd32113ee54acc531f7c672ed -size 3067 +oid sha256:e4fb94a39037d01c6bf28f38123ac8f222ca5d88a23dfe73d425b757afad57ae +size 3065 diff --git a/data/minecraft/structure/village/taiga/houses/taiga_medium_house_4.nbt b/data/minecraft/structure/village/taiga/houses/taiga_medium_house_4.nbt index 3732865f..8f8c7f0f 100644 --- a/data/minecraft/structure/village/taiga/houses/taiga_medium_house_4.nbt +++ b/data/minecraft/structure/village/taiga/houses/taiga_medium_house_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ffbb3a9bbfa89092b5b5b31d874e80f4f84129e71f828962c880ba05e8465045 -size 2772 +oid sha256:43025aa92b2ca6ed7606dc287e725a172b774e250028bb6a52dcac37e97401fe +size 2770 diff --git a/data/minecraft/structure/village/taiga/houses/taiga_shepherds_house_1.nbt b/data/minecraft/structure/village/taiga/houses/taiga_shepherds_house_1.nbt index de50f615..aa9232f0 100644 --- a/data/minecraft/structure/village/taiga/houses/taiga_shepherds_house_1.nbt +++ b/data/minecraft/structure/village/taiga/houses/taiga_shepherds_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:56bb13de46912d9493ef074a2e29bab79b1defa456d62c04952d0f8806b638fa -size 3017 +oid sha256:14f86fcd14348c02d6569f4457f9f430da3cb88b7bdb644fddd661e941d13094 +size 3016 diff --git a/data/minecraft/structure/village/taiga/houses/taiga_small_farm_1.nbt b/data/minecraft/structure/village/taiga/houses/taiga_small_farm_1.nbt index 12756497..2b8b6ce8 100644 --- a/data/minecraft/structure/village/taiga/houses/taiga_small_farm_1.nbt +++ b/data/minecraft/structure/village/taiga/houses/taiga_small_farm_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1c9d0ac0efd24f3a5eeffbf8fdbe75680a6eb0df48e2d09f56ce9c98dd37e3eb -size 1258 +oid sha256:beb69cac85ae842a7b69fdf682feae46093abe806e600c62550a6c8cf57d34e9 +size 1257 diff --git a/data/minecraft/structure/village/taiga/houses/taiga_small_house_1.nbt b/data/minecraft/structure/village/taiga/houses/taiga_small_house_1.nbt index 0c61d799..eaf00579 100644 --- a/data/minecraft/structure/village/taiga/houses/taiga_small_house_1.nbt +++ b/data/minecraft/structure/village/taiga/houses/taiga_small_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:66b508edf52e5e1fe236ffd63c708a35eb1a016a1c8e3f82cc56de49dc876643 +oid sha256:c92491ed46d5fbe90f6ac8d97276adc4f2b697c4d52ae85197f573bfc0a2fcfb size 2375 diff --git a/data/minecraft/structure/village/taiga/houses/taiga_small_house_2.nbt b/data/minecraft/structure/village/taiga/houses/taiga_small_house_2.nbt index 57322f6a..a7acb50a 100644 --- a/data/minecraft/structure/village/taiga/houses/taiga_small_house_2.nbt +++ b/data/minecraft/structure/village/taiga/houses/taiga_small_house_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f1af4dfc9d02103b0eb655c1974be4a8ee022eb987c19c92ea0c3f04eda2bfd3 -size 1777 +oid sha256:693589ee70b057d47420e9d718c04c847a75ec4b93ea7e1665b52d38a1b9e6a3 +size 1776 diff --git a/data/minecraft/structure/village/taiga/houses/taiga_small_house_3.nbt b/data/minecraft/structure/village/taiga/houses/taiga_small_house_3.nbt index 6c959260..9573d0b0 100644 --- a/data/minecraft/structure/village/taiga/houses/taiga_small_house_3.nbt +++ b/data/minecraft/structure/village/taiga/houses/taiga_small_house_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:06e0900e5844cec52e8be348a760a3465d1f1d76488f73288e8a6813d99263e8 -size 1872 +oid sha256:84b8eb38f8ace2d0b3cbe1305680ca6733043ee75203035ea3cafd4e3aa8f8ea +size 1870 diff --git a/data/minecraft/structure/village/taiga/houses/taiga_small_house_4.nbt b/data/minecraft/structure/village/taiga/houses/taiga_small_house_4.nbt index 75e8653d..363a8e22 100644 --- a/data/minecraft/structure/village/taiga/houses/taiga_small_house_4.nbt +++ b/data/minecraft/structure/village/taiga/houses/taiga_small_house_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b5add8320c01ea77ef1a1dafbfb2369d75095e6f449d6d269ba6be1ad25e8305 -size 1609 +oid sha256:3012c78bd7528abb657615733fa79b8866958d275c430fb345f1e3293dfcc532 +size 1607 diff --git a/data/minecraft/structure/village/taiga/houses/taiga_small_house_5.nbt b/data/minecraft/structure/village/taiga/houses/taiga_small_house_5.nbt index 32db18bb..b09806f8 100644 --- a/data/minecraft/structure/village/taiga/houses/taiga_small_house_5.nbt +++ b/data/minecraft/structure/village/taiga/houses/taiga_small_house_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:87865496cb72f493e6679f42c2776fb8cd550c4928d9a2168c7ab5834a5858a8 -size 2042 +oid sha256:3825a7ba54ed808a05fd585349b539f8b6283dafc62ef6a7c51c06f2f2259a4c +size 2041 diff --git a/data/minecraft/structure/village/taiga/houses/taiga_tannery_1.nbt b/data/minecraft/structure/village/taiga/houses/taiga_tannery_1.nbt index 753bc33d..8b8a22f0 100644 --- a/data/minecraft/structure/village/taiga/houses/taiga_tannery_1.nbt +++ b/data/minecraft/structure/village/taiga/houses/taiga_tannery_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:511e438fb42e146aab0f593566b950c9eae78559efa4843459c445dce30bcd18 -size 2152 +oid sha256:32462025d37ccff2e56e696da7137a816cbddfe4fe0fbff2cf5402202553b6e7 +size 2156 diff --git a/data/minecraft/structure/village/taiga/houses/taiga_temple_1.nbt b/data/minecraft/structure/village/taiga/houses/taiga_temple_1.nbt index ee224fc7..d5b8c724 100644 --- a/data/minecraft/structure/village/taiga/houses/taiga_temple_1.nbt +++ b/data/minecraft/structure/village/taiga/houses/taiga_temple_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4658115f8775edecb9dbb0605e4203983bc5f464a510a1e1435d34e362543155 -size 6645 +oid sha256:cfe8d58537f8b3acfb1d26a982212881df5f73fda5975533e8d9afc027238d95 +size 6643 diff --git a/data/minecraft/structure/village/taiga/houses/taiga_tool_smith_1.nbt b/data/minecraft/structure/village/taiga/houses/taiga_tool_smith_1.nbt index e26722d8..74325ad6 100644 --- a/data/minecraft/structure/village/taiga/houses/taiga_tool_smith_1.nbt +++ b/data/minecraft/structure/village/taiga/houses/taiga_tool_smith_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:222531b230ad73eae0b0964e05536cd61a6295eed3eaa6acb1caffa6ecbe16ba -size 2165 +oid sha256:598af4ee9e6e51d0a79aae6acba3ce29c2952f0eaf58cd05346aebb54ae483b1 +size 2164 diff --git a/data/minecraft/structure/village/taiga/houses/taiga_weaponsmith_1.nbt b/data/minecraft/structure/village/taiga/houses/taiga_weaponsmith_1.nbt index b523056e..213f08cb 100644 --- a/data/minecraft/structure/village/taiga/houses/taiga_weaponsmith_1.nbt +++ b/data/minecraft/structure/village/taiga/houses/taiga_weaponsmith_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e9ae382a03b621d534af0e434093ea63e4ae912624298d579f04767ade0130ec -size 2077 +oid sha256:8d0b797687b7f77c6b5255259f1bd389c60ab68cd605b20cf44431d6539e9b65 +size 2075 diff --git a/data/minecraft/structure/village/taiga/houses/taiga_weaponsmith_2.nbt b/data/minecraft/structure/village/taiga/houses/taiga_weaponsmith_2.nbt index 33a7a8dc..c5e7d201 100644 --- a/data/minecraft/structure/village/taiga/houses/taiga_weaponsmith_2.nbt +++ b/data/minecraft/structure/village/taiga/houses/taiga_weaponsmith_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a56f6d01751431334bbefb80b87b94cec0d83f8b6fc6c6365809367682bcc142 -size 1189 +oid sha256:04656c4fb17e7049a3d9fbb39df78afe834ce36a1c3444619f708da14d58f5eb +size 1187 diff --git a/data/minecraft/structure/village/taiga/streets/corner_01.nbt b/data/minecraft/structure/village/taiga/streets/corner_01.nbt index c17915f3..b7c82832 100644 --- a/data/minecraft/structure/village/taiga/streets/corner_01.nbt +++ b/data/minecraft/structure/village/taiga/streets/corner_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:539a2b2b2d685218c9970b692ea901720562c00acafc3bc7159937ca28de4e77 +oid sha256:39acedd7c2d1063eebcd8f4443af8bb6ff9a67eec50702a5f1834937e9709282 size 1182 diff --git a/data/minecraft/structure/village/taiga/streets/corner_02.nbt b/data/minecraft/structure/village/taiga/streets/corner_02.nbt index 2c2f1628..05ef4a77 100644 --- a/data/minecraft/structure/village/taiga/streets/corner_02.nbt +++ b/data/minecraft/structure/village/taiga/streets/corner_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:00c8fc82089e11cc415c0018a0b40a558b8def6bd27cfa5feb9e24d3f8409fc0 -size 1184 +oid sha256:f1bc74ad6fc172e167075583c0531a10a9977da534131cae84eb07f37ae441fe +size 1183 diff --git a/data/minecraft/structure/village/taiga/streets/corner_03.nbt b/data/minecraft/structure/village/taiga/streets/corner_03.nbt index b5ea8ecb..7779a2b8 100644 --- a/data/minecraft/structure/village/taiga/streets/corner_03.nbt +++ b/data/minecraft/structure/village/taiga/streets/corner_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:962c9ee9e08698631848974c49a3cc5de33f8cab6df0fbd6a9fae872fc2d2ad9 +oid sha256:89bf5a35fa907ba63245b56bb6e08d38e98819255fa4d123bf2322fe17ec0138 size 350 diff --git a/data/minecraft/structure/village/taiga/streets/crossroad_01.nbt b/data/minecraft/structure/village/taiga/streets/crossroad_01.nbt index 36355886..6efb0e67 100644 --- a/data/minecraft/structure/village/taiga/streets/crossroad_01.nbt +++ b/data/minecraft/structure/village/taiga/streets/crossroad_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d884465c81336c19ee7ae34c1df1fe5b0e6140ec12bf7c8ec5b321e03b845dcb +oid sha256:d2ea02707e46b848e2da9e9d56951d47307748aa464c51ead242a7eb2f4134b3 size 1214 diff --git a/data/minecraft/structure/village/taiga/streets/crossroad_02.nbt b/data/minecraft/structure/village/taiga/streets/crossroad_02.nbt index c3ebef6f..ce6d8803 100644 --- a/data/minecraft/structure/village/taiga/streets/crossroad_02.nbt +++ b/data/minecraft/structure/village/taiga/streets/crossroad_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:add7bfb42dab7ebcf960a775846aba320510458043c1dcb6d633ab09c9d50054 +oid sha256:397fc73c968ac15b5719c035ba8b042491a2bb8137fc491c9f3e01808558e537 size 1160 diff --git a/data/minecraft/structure/village/taiga/streets/crossroad_03.nbt b/data/minecraft/structure/village/taiga/streets/crossroad_03.nbt index 6427e21b..44bb066b 100644 --- a/data/minecraft/structure/village/taiga/streets/crossroad_03.nbt +++ b/data/minecraft/structure/village/taiga/streets/crossroad_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4b579155cdd533da8e0e5c017b408d826ce892fa1c2b9fec257df8b936e2f21c +oid sha256:b8400c5f3d71c91e9e7ac68df48a79017a46b9da5c2f8c613d64dee9f7bcdd3d size 1202 diff --git a/data/minecraft/structure/village/taiga/streets/crossroad_04.nbt b/data/minecraft/structure/village/taiga/streets/crossroad_04.nbt index b8200a62..5a82f932 100644 --- a/data/minecraft/structure/village/taiga/streets/crossroad_04.nbt +++ b/data/minecraft/structure/village/taiga/streets/crossroad_04.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:53e092fefee1987cc259313dd763eaf2a9abfae78c47c8e8b42c9ff5b1281ca6 -size 436 +oid sha256:9bfcc102751006c31d2977db5e2017f2542433ff79e75432adf80a52e37a2732 +size 435 diff --git a/data/minecraft/structure/village/taiga/streets/crossroad_05.nbt b/data/minecraft/structure/village/taiga/streets/crossroad_05.nbt index 8fe41994..c308a72b 100644 --- a/data/minecraft/structure/village/taiga/streets/crossroad_05.nbt +++ b/data/minecraft/structure/village/taiga/streets/crossroad_05.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d02462f2ba74f3b63d2df3283be72cc998439695087316c989cd766bfc4ac2db -size 410 +oid sha256:779b42986c0d54ad0c20350e72c071a46f3df0564cd630c9e7f0a851abbefe04 +size 409 diff --git a/data/minecraft/structure/village/taiga/streets/crossroad_06.nbt b/data/minecraft/structure/village/taiga/streets/crossroad_06.nbt index 5abce047..c46d6ae1 100644 --- a/data/minecraft/structure/village/taiga/streets/crossroad_06.nbt +++ b/data/minecraft/structure/village/taiga/streets/crossroad_06.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:46f9228b8debe8acbb9bb6a491f95d690569c20cad6694dd64f8d7266faa2240 +oid sha256:df821aad57d097baeaa606f475c418e350b4df7dd7637dd956ed4704f056ce1a size 470 diff --git a/data/minecraft/structure/village/taiga/streets/straight_01.nbt b/data/minecraft/structure/village/taiga/streets/straight_01.nbt index ab29d32d..3e99ff2a 100644 --- a/data/minecraft/structure/village/taiga/streets/straight_01.nbt +++ b/data/minecraft/structure/village/taiga/streets/straight_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fdc0213dff873e5ad43b208819100959f1cfaa228b06db94d4fc6f4a373a3088 +oid sha256:1e790771fa7d8957817e3ff3b78e6cb43ec93917bdda736bd060253ab8f4f435 size 1131 diff --git a/data/minecraft/structure/village/taiga/streets/straight_02.nbt b/data/minecraft/structure/village/taiga/streets/straight_02.nbt index 50d743bd..cce8e1a4 100644 --- a/data/minecraft/structure/village/taiga/streets/straight_02.nbt +++ b/data/minecraft/structure/village/taiga/streets/straight_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fd884410255d13fd842b44ad1609be8e46ceb6e0ae2c5ed6d0fa0b83643d46f3 -size 1147 +oid sha256:627884574f4091a0e0332e7aaa547d8fd2ad3cf0c284e15544f08501480c0686 +size 1146 diff --git a/data/minecraft/structure/village/taiga/streets/straight_03.nbt b/data/minecraft/structure/village/taiga/streets/straight_03.nbt index 17f64b0a..621456e9 100644 --- a/data/minecraft/structure/village/taiga/streets/straight_03.nbt +++ b/data/minecraft/structure/village/taiga/streets/straight_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:30768f0544012ebd8512c973dd6bdd4e06bf1a92086749d9acd986f68ec64b55 -size 776 +oid sha256:8c770d285aaf7f2427398f1a69fd3f92b95b187743006af247181015cba48431 +size 775 diff --git a/data/minecraft/structure/village/taiga/streets/straight_04.nbt b/data/minecraft/structure/village/taiga/streets/straight_04.nbt index ec48e3e1..7b77c2f7 100644 --- a/data/minecraft/structure/village/taiga/streets/straight_04.nbt +++ b/data/minecraft/structure/village/taiga/streets/straight_04.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7ef1273a6c5bae1d60b6559976b8923bd2dc4aabde112f5016705ac9f91ff027 -size 687 +oid sha256:8dd21fe86e2b74e370d31206a51f5e8bbbdd07f9503716dcac304541dd19e922 +size 685 diff --git a/data/minecraft/structure/village/taiga/streets/straight_05.nbt b/data/minecraft/structure/village/taiga/streets/straight_05.nbt index fd75fd10..d621cec9 100644 --- a/data/minecraft/structure/village/taiga/streets/straight_05.nbt +++ b/data/minecraft/structure/village/taiga/streets/straight_05.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b5f43d0b2141f1e316a4ef21e75c6d29482f371daaf4db8553a59f33f8b23fc -size 1390 +oid sha256:caebce2c8c197e19f414c848b6bb934d6c3afc273c547f4568b5813ef26f255f +size 1389 diff --git a/data/minecraft/structure/village/taiga/streets/straight_06.nbt b/data/minecraft/structure/village/taiga/streets/straight_06.nbt index 63766f1a..d35c4690 100644 --- a/data/minecraft/structure/village/taiga/streets/straight_06.nbt +++ b/data/minecraft/structure/village/taiga/streets/straight_06.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:861c664b858324d80ac8127bbe1d1bc2487fea9ecbfbc4cfe5595621395dbfb3 -size 1703 +oid sha256:b1d82c60ea828f7bd12bb112abdbe915eec76a84d9bad9e3a7968f9dd0952e30 +size 1702 diff --git a/data/minecraft/structure/village/taiga/streets/turn_01.nbt b/data/minecraft/structure/village/taiga/streets/turn_01.nbt index 6b4d056c..5396bcf3 100644 --- a/data/minecraft/structure/village/taiga/streets/turn_01.nbt +++ b/data/minecraft/structure/village/taiga/streets/turn_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:80a18e6963368a4184be4226ace4fbfba79dff703f186336479ae571d749e101 +oid sha256:3ab92c8d186b540546a6f2387cf12a94fd9efc3a3467517aba5b59ebc93e9a40 size 789 diff --git a/data/minecraft/structure/village/taiga/taiga_decoration_1.nbt b/data/minecraft/structure/village/taiga/taiga_decoration_1.nbt index 4be59419..5e01d616 100644 --- a/data/minecraft/structure/village/taiga/taiga_decoration_1.nbt +++ b/data/minecraft/structure/village/taiga/taiga_decoration_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef0000207ef611d224a342fe0c39f57388e582f21f288d770ad1e701e1993906 -size 423 +oid sha256:86f5a52cf36007039ced14b78322c33b4508abdd82e1f00d8ed748dd125979f7 +size 422 diff --git a/data/minecraft/structure/village/taiga/taiga_decoration_2.nbt b/data/minecraft/structure/village/taiga/taiga_decoration_2.nbt index 37f8f8d3..9c626e38 100644 --- a/data/minecraft/structure/village/taiga/taiga_decoration_2.nbt +++ b/data/minecraft/structure/village/taiga/taiga_decoration_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8cb8786ab9e3a374e6d4d37ed1a68186d79042598d283730bf2482ba11992411 +oid sha256:57eb948efeaf68738c64a735fd3a8983fc4ba2596ea890b957c612d5372ba778 size 368 diff --git a/data/minecraft/structure/village/taiga/taiga_decoration_3.nbt b/data/minecraft/structure/village/taiga/taiga_decoration_3.nbt index ded081b9..2ec2d7c6 100644 --- a/data/minecraft/structure/village/taiga/taiga_decoration_3.nbt +++ b/data/minecraft/structure/village/taiga/taiga_decoration_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6b4ec923f618d74f165d4413d3732393c7317b5fc061bf517fe7d6ca86377edf -size 354 +oid sha256:9b276e38481bfe0ce15810c3f93ef2aea5dc963b1d07b20d6ecd9279ddbddd1f +size 353 diff --git a/data/minecraft/structure/village/taiga/taiga_decoration_4.nbt b/data/minecraft/structure/village/taiga/taiga_decoration_4.nbt index e6fbe7c6..9b660119 100644 --- a/data/minecraft/structure/village/taiga/taiga_decoration_4.nbt +++ b/data/minecraft/structure/village/taiga/taiga_decoration_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6699d6d5f560774541f1ebf958e89609eb2f2f1a2774cb005cc57ff7da63f7ea -size 324 +oid sha256:c608271f80c6ee07497669a97138eeab6e522c338335c827687d174a67e498aa +size 323 diff --git a/data/minecraft/structure/village/taiga/taiga_decoration_5.nbt b/data/minecraft/structure/village/taiga/taiga_decoration_5.nbt index 64cfe04b..4efe3f87 100644 --- a/data/minecraft/structure/village/taiga/taiga_decoration_5.nbt +++ b/data/minecraft/structure/village/taiga/taiga_decoration_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b229a82414c7196e24bfb793ac71fbc6e84ea290fa3bd0c611abc3b6ee6a6d17 -size 250 +oid sha256:e0d27e29ffde61e82b0359ba38ff0b829cea4b874a1072e13486520bc2d7f0e8 +size 249 diff --git a/data/minecraft/structure/village/taiga/taiga_decoration_6.nbt b/data/minecraft/structure/village/taiga/taiga_decoration_6.nbt index c4b87b40..335fd0da 100644 --- a/data/minecraft/structure/village/taiga/taiga_decoration_6.nbt +++ b/data/minecraft/structure/village/taiga/taiga_decoration_6.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7d5df1e5851b40801ef98d7221748bd7fb5222ef6dc629ebd7f4918d53d51e77 -size 471 +oid sha256:023d0cdd7670d52cb9bbbe5293acc0425ddd039f0c143798dde5b771de549fe6 +size 469 diff --git a/data/minecraft/structure/village/taiga/taiga_lamp_post_1.nbt b/data/minecraft/structure/village/taiga/taiga_lamp_post_1.nbt index 7fb57577..245efb25 100644 --- a/data/minecraft/structure/village/taiga/taiga_lamp_post_1.nbt +++ b/data/minecraft/structure/village/taiga/taiga_lamp_post_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e8f40551acd9e44dc33f675360934fa16d8be21132b70cd09976a47d6992b9e5 +oid sha256:816a10e6913819e2c8d033ea8418a76dab1ecc2a6bf04eeee296205113eab0fb size 252 diff --git a/data/minecraft/structure/village/taiga/town_centers/taiga_meeting_point_1.nbt b/data/minecraft/structure/village/taiga/town_centers/taiga_meeting_point_1.nbt index 8d9eeee3..fca22810 100644 --- a/data/minecraft/structure/village/taiga/town_centers/taiga_meeting_point_1.nbt +++ b/data/minecraft/structure/village/taiga/town_centers/taiga_meeting_point_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d730a7b544cd9d766f794270afa25d08b07595943d836a4889cc4a6e519a012d -size 3948 +oid sha256:45f3723f608794f48be419495b1c7d22a51e9b5f716761209936e971fef047af +size 3946 diff --git a/data/minecraft/structure/village/taiga/town_centers/taiga_meeting_point_2.nbt b/data/minecraft/structure/village/taiga/town_centers/taiga_meeting_point_2.nbt index ae18c188..2116bb7a 100644 --- a/data/minecraft/structure/village/taiga/town_centers/taiga_meeting_point_2.nbt +++ b/data/minecraft/structure/village/taiga/town_centers/taiga_meeting_point_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b31cac4ceadc9fe8357b531d3039d10687e1a21b715a1e069429e3db4679881 -size 2272 +oid sha256:752a32c0eb1cb536c013f863565a28b6332e83e307c982b22c756b990993029e +size 2270 diff --git a/data/minecraft/structure/village/taiga/villagers/baby.nbt b/data/minecraft/structure/village/taiga/villagers/baby.nbt index 8d4b8782..d3fce75f 100644 --- a/data/minecraft/structure/village/taiga/villagers/baby.nbt +++ b/data/minecraft/structure/village/taiga/villagers/baby.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:df971237533ea7e337dc06d228b83544ab9794011dfafed9b6552b83411d43a8 +oid sha256:ec390ede70f31092d6669ca876d2bedd391012ca566dd38dce3092a129d65f6e size 719 diff --git a/data/minecraft/structure/village/taiga/villagers/nitwit.nbt b/data/minecraft/structure/village/taiga/villagers/nitwit.nbt index 37a0aff7..344fbdd5 100644 --- a/data/minecraft/structure/village/taiga/villagers/nitwit.nbt +++ b/data/minecraft/structure/village/taiga/villagers/nitwit.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1bee6145bde4dd406bf5301c472e9c8886df1b0ec80481b9d2ed6633c7d5068e +oid sha256:2be1fbe81aa1b5c6ef9e9e2671b60faafedf408a28ca358834df9eabe1d3aad8 size 716 diff --git a/data/minecraft/structure/village/taiga/villagers/unemployed.nbt b/data/minecraft/structure/village/taiga/villagers/unemployed.nbt index 4e06e993..967dcfa7 100644 --- a/data/minecraft/structure/village/taiga/villagers/unemployed.nbt +++ b/data/minecraft/structure/village/taiga/villagers/unemployed.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:61f99459960376aecf36e787e19f19b67e0ff47c395ac77cb715b462b0ceaedb -size 715 +oid sha256:edd652c3afe41f19b63a17a69d2aec255ad7b333042ce64b4c361e4e37db97d4 +size 714 diff --git a/data/minecraft/structure/village/taiga/zombie/houses/taiga_cartographer_house_1.nbt b/data/minecraft/structure/village/taiga/zombie/houses/taiga_cartographer_house_1.nbt index 2c49c42a..3e337061 100644 --- a/data/minecraft/structure/village/taiga/zombie/houses/taiga_cartographer_house_1.nbt +++ b/data/minecraft/structure/village/taiga/zombie/houses/taiga_cartographer_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e719a8dccdd507174a0437ff3cacf2a6a42557f7a0261c443c72f31f72700f8b -size 2613 +oid sha256:0f2730e2a9e006d6f56a1461268a299ca3a70cec255a4b302b7776ec379a83e1 +size 2612 diff --git a/data/minecraft/structure/village/taiga/zombie/houses/taiga_fisher_cottage_1.nbt b/data/minecraft/structure/village/taiga/zombie/houses/taiga_fisher_cottage_1.nbt index a40240f5..3a4c5233 100644 --- a/data/minecraft/structure/village/taiga/zombie/houses/taiga_fisher_cottage_1.nbt +++ b/data/minecraft/structure/village/taiga/zombie/houses/taiga_fisher_cottage_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:12312d370a03139ba9a7d289b9574f909024fa0928596719fb6303e88711880d -size 3667 +oid sha256:3ace6b1cf5c7baaf1e0de40150c3f08210845bc572d63e1ab703dfc6c47ee0c6 +size 3666 diff --git a/data/minecraft/structure/village/taiga/zombie/houses/taiga_large_farm_2.nbt b/data/minecraft/structure/village/taiga/zombie/houses/taiga_large_farm_2.nbt index c552db8f..8209a404 100644 --- a/data/minecraft/structure/village/taiga/zombie/houses/taiga_large_farm_2.nbt +++ b/data/minecraft/structure/village/taiga/zombie/houses/taiga_large_farm_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5250f58858b6faabf6b566b7f90c63c3e676d77e093dee5370885426867bb292 -size 1607 +oid sha256:99676c788d054c3efd8d84abfe7fff79bd9126c7578b80ed166ad6d5be786ad0 +size 1606 diff --git a/data/minecraft/structure/village/taiga/zombie/houses/taiga_library_1.nbt b/data/minecraft/structure/village/taiga/zombie/houses/taiga_library_1.nbt index 714c427a..bd0408d8 100644 --- a/data/minecraft/structure/village/taiga/zombie/houses/taiga_library_1.nbt +++ b/data/minecraft/structure/village/taiga/zombie/houses/taiga_library_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b73fa901547021debd257c4f0f78dd14b2f7802fdcb779485d110b95ba1e91f8 -size 3460 +oid sha256:10a6a7c3d2695b0bf5a7d2b743cd229af501d0817d80eeeff5aee7a32d5ce8af +size 3459 diff --git a/data/minecraft/structure/village/taiga/zombie/houses/taiga_medium_house_1.nbt b/data/minecraft/structure/village/taiga/zombie/houses/taiga_medium_house_1.nbt index e2e47429..2eb45531 100644 --- a/data/minecraft/structure/village/taiga/zombie/houses/taiga_medium_house_1.nbt +++ b/data/minecraft/structure/village/taiga/zombie/houses/taiga_medium_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:70fd036fcd7749352b63ae72bbe652e6741a1db33678fd765412f411c391bd85 -size 2790 +oid sha256:4248efb9461f14a8345a872a387e820e56c502fba0139b4c0ecfc7395eae5a11 +size 2785 diff --git a/data/minecraft/structure/village/taiga/zombie/houses/taiga_medium_house_2.nbt b/data/minecraft/structure/village/taiga/zombie/houses/taiga_medium_house_2.nbt index b0c94d18..e53ef46e 100644 --- a/data/minecraft/structure/village/taiga/zombie/houses/taiga_medium_house_2.nbt +++ b/data/minecraft/structure/village/taiga/zombie/houses/taiga_medium_house_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:db6875c18f6c1925777002a991edff302eb104a3e29cd5447503fceee69b6358 -size 2607 +oid sha256:1a3f4f34e344c16292e1a845a41708e3a0528d871ed3c53a4de8fe2390bbc3be +size 2604 diff --git a/data/minecraft/structure/village/taiga/zombie/houses/taiga_medium_house_3.nbt b/data/minecraft/structure/village/taiga/zombie/houses/taiga_medium_house_3.nbt index 77648f12..a2b6caac 100644 --- a/data/minecraft/structure/village/taiga/zombie/houses/taiga_medium_house_3.nbt +++ b/data/minecraft/structure/village/taiga/zombie/houses/taiga_medium_house_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ee62c080c0b2443e2d5f8087a205ec9eee326d99ec962298f9073a83765f75f2 -size 3070 +oid sha256:9456e191a4ca2ff61576bc458589772ba9f199519cfe126e4ee56be8c4a048b2 +size 3069 diff --git a/data/minecraft/structure/village/taiga/zombie/houses/taiga_medium_house_4.nbt b/data/minecraft/structure/village/taiga/zombie/houses/taiga_medium_house_4.nbt index bf220330..de9ce9aa 100644 --- a/data/minecraft/structure/village/taiga/zombie/houses/taiga_medium_house_4.nbt +++ b/data/minecraft/structure/village/taiga/zombie/houses/taiga_medium_house_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:48f68b6e3cb49a66f89eb7eefe19265c261f882f4164c2fa4a82c1a625a3213e -size 2710 +oid sha256:3cc08a29e7eeed59e6938b8af156371404a523def7ae8fbfe1efb65daef22e10 +size 2709 diff --git a/data/minecraft/structure/village/taiga/zombie/houses/taiga_shepherds_house_1.nbt b/data/minecraft/structure/village/taiga/zombie/houses/taiga_shepherds_house_1.nbt index 20c59439..238ce003 100644 --- a/data/minecraft/structure/village/taiga/zombie/houses/taiga_shepherds_house_1.nbt +++ b/data/minecraft/structure/village/taiga/zombie/houses/taiga_shepherds_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b6fd07194ac4ed7e3d76c5ed596dc90f6bb051b79dab28387ad8a0cfd0ab4506 -size 3041 +oid sha256:b69fa4c66d0a84146310970b459625ee5c0a8e96ec61fecadcaeca47447ffd31 +size 3040 diff --git a/data/minecraft/structure/village/taiga/zombie/houses/taiga_small_house_1.nbt b/data/minecraft/structure/village/taiga/zombie/houses/taiga_small_house_1.nbt index 23baa9b8..ad61d3ad 100644 --- a/data/minecraft/structure/village/taiga/zombie/houses/taiga_small_house_1.nbt +++ b/data/minecraft/structure/village/taiga/zombie/houses/taiga_small_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b3e6f1f317630e33fdf85c9d4b8096f6ba560273d9a89e27321971873a6c7c8 +oid sha256:59838c6505b2288c1167dc1aea7bd3ec756e4adb7ff75bfe516834ee090328b5 size 2381 diff --git a/data/minecraft/structure/village/taiga/zombie/houses/taiga_small_house_2.nbt b/data/minecraft/structure/village/taiga/zombie/houses/taiga_small_house_2.nbt index 6530704b..a24a3c56 100644 --- a/data/minecraft/structure/village/taiga/zombie/houses/taiga_small_house_2.nbt +++ b/data/minecraft/structure/village/taiga/zombie/houses/taiga_small_house_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:35936b1d031c8a02d5ecbd1b2d9916b6734d7a4a1fadbe6618934b6f6198065d +oid sha256:5504001987c3dbbed74714012f03154efc48de63c61241d75088af41dc8ed62f size 1796 diff --git a/data/minecraft/structure/village/taiga/zombie/houses/taiga_small_house_3.nbt b/data/minecraft/structure/village/taiga/zombie/houses/taiga_small_house_3.nbt index 3bd0af58..b2b7b739 100644 --- a/data/minecraft/structure/village/taiga/zombie/houses/taiga_small_house_3.nbt +++ b/data/minecraft/structure/village/taiga/zombie/houses/taiga_small_house_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:818178de12417a8c13e0b4c6bfe3bfffa8b19c93b2ba7b8984e9e27d670dede0 -size 1887 +oid sha256:6416e5606756ba5df38b642fe101d78f9783a9455683d0fc24b88bdd5cb153ad +size 1885 diff --git a/data/minecraft/structure/village/taiga/zombie/houses/taiga_small_house_4.nbt b/data/minecraft/structure/village/taiga/zombie/houses/taiga_small_house_4.nbt index 760a682a..75b2bc6d 100644 --- a/data/minecraft/structure/village/taiga/zombie/houses/taiga_small_house_4.nbt +++ b/data/minecraft/structure/village/taiga/zombie/houses/taiga_small_house_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:122c580fcc3e9909f0a71dc258e6ccb7c44cc880947413a866759c0d4b91073f -size 1615 +oid sha256:47ac2831fd6054c2db1dc50c3e860401f82b9afb7232f3027124b4116b6c8ccd +size 1613 diff --git a/data/minecraft/structure/village/taiga/zombie/houses/taiga_small_house_5.nbt b/data/minecraft/structure/village/taiga/zombie/houses/taiga_small_house_5.nbt index ab919492..6267beae 100644 --- a/data/minecraft/structure/village/taiga/zombie/houses/taiga_small_house_5.nbt +++ b/data/minecraft/structure/village/taiga/zombie/houses/taiga_small_house_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:49565095d90d046f1fd5ace9fa8dc96f8f82315507c6fec34c811dce4bba2bb2 -size 2049 +oid sha256:fa64d0e39f37ac2981a9b9cd33c5cceb1c075e1f60c9dc5411715293c5f8f9d5 +size 2047 diff --git a/data/minecraft/structure/village/taiga/zombie/houses/taiga_temple_1.nbt b/data/minecraft/structure/village/taiga/zombie/houses/taiga_temple_1.nbt index ee224fc7..d5b8c724 100644 --- a/data/minecraft/structure/village/taiga/zombie/houses/taiga_temple_1.nbt +++ b/data/minecraft/structure/village/taiga/zombie/houses/taiga_temple_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4658115f8775edecb9dbb0605e4203983bc5f464a510a1e1435d34e362543155 -size 6645 +oid sha256:cfe8d58537f8b3acfb1d26a982212881df5f73fda5975533e8d9afc027238d95 +size 6643 diff --git a/data/minecraft/structure/village/taiga/zombie/houses/taiga_tool_smith_1.nbt b/data/minecraft/structure/village/taiga/zombie/houses/taiga_tool_smith_1.nbt index b54b6abc..3129a517 100644 --- a/data/minecraft/structure/village/taiga/zombie/houses/taiga_tool_smith_1.nbt +++ b/data/minecraft/structure/village/taiga/zombie/houses/taiga_tool_smith_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:49eaf03f7adac44823cd5e03e834915b2248c904cc6552c3dd57ec274261edc2 -size 2175 +oid sha256:6546625eb4226802915334e6c13ebc11ebd10a48ce37d8bda1e0b60c9d5cb37e +size 2173 diff --git a/data/minecraft/structure/village/taiga/zombie/houses/taiga_weaponsmith_2.nbt b/data/minecraft/structure/village/taiga/zombie/houses/taiga_weaponsmith_2.nbt index 625aae4e..e8fc5fdd 100644 --- a/data/minecraft/structure/village/taiga/zombie/houses/taiga_weaponsmith_2.nbt +++ b/data/minecraft/structure/village/taiga/zombie/houses/taiga_weaponsmith_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:76ab302220108c91a91310d2029d0f495cd27f4a3b652ae13636cdff09bcb92a -size 1194 +oid sha256:8910daed3f7d529f9cf4ad4b9b0797731afb3ee05c933ee70308173ea2807950 +size 1193 diff --git a/data/minecraft/structure/village/taiga/zombie/streets/corner_01.nbt b/data/minecraft/structure/village/taiga/zombie/streets/corner_01.nbt index 5515f34b..7fb678b3 100644 --- a/data/minecraft/structure/village/taiga/zombie/streets/corner_01.nbt +++ b/data/minecraft/structure/village/taiga/zombie/streets/corner_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:91957e603679a9f595e5b0a62bb2dbb6f94684127adad72afcb110d2b53999b3 -size 1187 +oid sha256:7fd543122ebbfcdf109ed6c44241a6a8ee3922dd227b1faff1766e3a88a80989 +size 1186 diff --git a/data/minecraft/structure/village/taiga/zombie/streets/corner_02.nbt b/data/minecraft/structure/village/taiga/zombie/streets/corner_02.nbt index fc75e026..9d432783 100644 --- a/data/minecraft/structure/village/taiga/zombie/streets/corner_02.nbt +++ b/data/minecraft/structure/village/taiga/zombie/streets/corner_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a3efc6020cacfb1d028f1074033a4d1a2ca35e7ee8e9f2ccc9088c782431c59a +oid sha256:d7735197f5ce8f8f15bcf0aae0c970eca99af011682b7088da231cddb592ff94 size 1190 diff --git a/data/minecraft/structure/village/taiga/zombie/streets/corner_03.nbt b/data/minecraft/structure/village/taiga/zombie/streets/corner_03.nbt index f9bb2c04..3c1a6979 100644 --- a/data/minecraft/structure/village/taiga/zombie/streets/corner_03.nbt +++ b/data/minecraft/structure/village/taiga/zombie/streets/corner_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:567aaa72489dc2aed72bc691819c9130e69752cdf644e43f201fd1abf058ad7f +oid sha256:4b0d91d3641e858f7e7c5c9f2e32fbb86e18b5872b69fb971fe7d65c0364f26e size 355 diff --git a/data/minecraft/structure/village/taiga/zombie/streets/crossroad_01.nbt b/data/minecraft/structure/village/taiga/zombie/streets/crossroad_01.nbt index 429f2a4e..528bab3b 100644 --- a/data/minecraft/structure/village/taiga/zombie/streets/crossroad_01.nbt +++ b/data/minecraft/structure/village/taiga/zombie/streets/crossroad_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c0ec99447bd52e15ec78ba9bc668a092df7705eddba44322effa3773a74a8c4c -size 1220 +oid sha256:004a3e05a67e58a9b5b39451ddbb0638034da27bfa362d018020947d3c5a4c3b +size 1219 diff --git a/data/minecraft/structure/village/taiga/zombie/streets/crossroad_02.nbt b/data/minecraft/structure/village/taiga/zombie/streets/crossroad_02.nbt index 6d7527ba..c660ec52 100644 --- a/data/minecraft/structure/village/taiga/zombie/streets/crossroad_02.nbt +++ b/data/minecraft/structure/village/taiga/zombie/streets/crossroad_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e7dca079dfa2691e057eddb60dc481f02d2be1a24eb623714818c823af066cde +oid sha256:6f9a9aa2780180bde39188b81768da42793c541476c4645adf5a28c3fdd8f087 size 1164 diff --git a/data/minecraft/structure/village/taiga/zombie/streets/crossroad_03.nbt b/data/minecraft/structure/village/taiga/zombie/streets/crossroad_03.nbt index f08b42ec..531b4127 100644 --- a/data/minecraft/structure/village/taiga/zombie/streets/crossroad_03.nbt +++ b/data/minecraft/structure/village/taiga/zombie/streets/crossroad_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:918346395e8addc5dd12c7371680df7574dfbbd0730da9548e93ffd411d3afee -size 1208 +oid sha256:7b6d37b64237ba9b3003b757646ad33af8fe50d6a53ea97676d771806d0c23b7 +size 1207 diff --git a/data/minecraft/structure/village/taiga/zombie/streets/crossroad_04.nbt b/data/minecraft/structure/village/taiga/zombie/streets/crossroad_04.nbt index b9b97a72..d991733e 100644 --- a/data/minecraft/structure/village/taiga/zombie/streets/crossroad_04.nbt +++ b/data/minecraft/structure/village/taiga/zombie/streets/crossroad_04.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4d05bf0ab4a59d19cc0c704b9cdf0fa75233499d5ea26f01e83fb897356bff32 -size 445 +oid sha256:6ad0fab353822b354584efa5abf3471d7420873ba61b3776682e447d1c2739a6 +size 444 diff --git a/data/minecraft/structure/village/taiga/zombie/streets/crossroad_05.nbt b/data/minecraft/structure/village/taiga/zombie/streets/crossroad_05.nbt index 2aa93736..16834a6b 100644 --- a/data/minecraft/structure/village/taiga/zombie/streets/crossroad_05.nbt +++ b/data/minecraft/structure/village/taiga/zombie/streets/crossroad_05.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0049934cb3ca90c05596069e3ba616fca29eea3ee96018d43f21ccf92ce6fe5d -size 414 +oid sha256:764bdaf8dd7c9e0b0d68b9aacfb298b3e2c520bf6147a042367a7201f88ffd1a +size 413 diff --git a/data/minecraft/structure/village/taiga/zombie/streets/crossroad_06.nbt b/data/minecraft/structure/village/taiga/zombie/streets/crossroad_06.nbt index 7e1335d8..68361194 100644 --- a/data/minecraft/structure/village/taiga/zombie/streets/crossroad_06.nbt +++ b/data/minecraft/structure/village/taiga/zombie/streets/crossroad_06.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9b902f6d11cd16857fa09f46f039c4c64f961741cd5f0bd63e28de3f5bb65db1 -size 476 +oid sha256:f87b65e748080e9f48b182e2eafc0a04dbd711f59e116dec742e4799cc5bc821 +size 475 diff --git a/data/minecraft/structure/village/taiga/zombie/streets/straight_01.nbt b/data/minecraft/structure/village/taiga/zombie/streets/straight_01.nbt index 45ca057b..122ff6e8 100644 --- a/data/minecraft/structure/village/taiga/zombie/streets/straight_01.nbt +++ b/data/minecraft/structure/village/taiga/zombie/streets/straight_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a56190d78c97a7d319cb95ac2dd5dcab143b7f7ef9366ef3e775528fed60b4a3 +oid sha256:d894606afcb6a074da64dafe30e885a1d64309b8f94ab88d38de7ea71d415921 size 1135 diff --git a/data/minecraft/structure/village/taiga/zombie/streets/straight_02.nbt b/data/minecraft/structure/village/taiga/zombie/streets/straight_02.nbt index 1c42f1f5..48b4252d 100644 --- a/data/minecraft/structure/village/taiga/zombie/streets/straight_02.nbt +++ b/data/minecraft/structure/village/taiga/zombie/streets/straight_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fcec4140b15fc5cd74c4e8269fb1af844531f62252ecb1fd1cf36cd5b8fe79c5 +oid sha256:f56734fb2af211bd1a64b53f3256a7358261b235dade0bdcbd101c04d87e2be0 size 1151 diff --git a/data/minecraft/structure/village/taiga/zombie/streets/straight_03.nbt b/data/minecraft/structure/village/taiga/zombie/streets/straight_03.nbt index ec9e7ca8..3a9b8025 100644 --- a/data/minecraft/structure/village/taiga/zombie/streets/straight_03.nbt +++ b/data/minecraft/structure/village/taiga/zombie/streets/straight_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eced29acc8ab6435279f757c2d2b8194d75a508007f550cd0f43df8d73e17a09 +oid sha256:a7042b8817f534930349c25e977795a4616987943632b9d7b8a269142bdfaafa size 781 diff --git a/data/minecraft/structure/village/taiga/zombie/streets/straight_04.nbt b/data/minecraft/structure/village/taiga/zombie/streets/straight_04.nbt index b914d2d5..6df14544 100644 --- a/data/minecraft/structure/village/taiga/zombie/streets/straight_04.nbt +++ b/data/minecraft/structure/village/taiga/zombie/streets/straight_04.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a5dccd3fd5b22a4e7dde88e809e579148f2bf4c6e3ff50af205c2a0cbc13d780 -size 693 +oid sha256:5fa4721dee7e82d5d2db697494084275b01bdbb3bd20aa8e311ea9971383d9bb +size 690 diff --git a/data/minecraft/structure/village/taiga/zombie/streets/straight_05.nbt b/data/minecraft/structure/village/taiga/zombie/streets/straight_05.nbt index 10dcf6f0..11efbe16 100644 --- a/data/minecraft/structure/village/taiga/zombie/streets/straight_05.nbt +++ b/data/minecraft/structure/village/taiga/zombie/streets/straight_05.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f29c0b7d2b9357729f1868e693d61bbbd1d17708977a2b6e031bc7eddcd9c677 -size 1395 +oid sha256:8a92896f11aacbf7e895983f64d876d1e3ebd2daeda388a7c6f01a015e049d4f +size 1394 diff --git a/data/minecraft/structure/village/taiga/zombie/streets/straight_06.nbt b/data/minecraft/structure/village/taiga/zombie/streets/straight_06.nbt index b35683b9..e82ee2d7 100644 --- a/data/minecraft/structure/village/taiga/zombie/streets/straight_06.nbt +++ b/data/minecraft/structure/village/taiga/zombie/streets/straight_06.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e3fbda9e66c6f16bedbfc607bf685a6fccc689c291625543e6bf0d0f4b704c23 -size 1708 +oid sha256:4cc9849709e5dac9c9aa5ae2e633225c9fdd12b3a827c619f38d5b1e7ae89d2c +size 1707 diff --git a/data/minecraft/structure/village/taiga/zombie/streets/turn_01.nbt b/data/minecraft/structure/village/taiga/zombie/streets/turn_01.nbt index d7dc128b..a39ac646 100644 --- a/data/minecraft/structure/village/taiga/zombie/streets/turn_01.nbt +++ b/data/minecraft/structure/village/taiga/zombie/streets/turn_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e3b9717f7681891a890b13e7455e4f6b1206c9ee338886d0c992b7431976cba7 -size 794 +oid sha256:4323a007b9e27089d7ace62006a6ab10e5cdd851a88d1a504f822d9f0285ce45 +size 793 diff --git a/data/minecraft/structure/village/taiga/zombie/town_centers/taiga_meeting_point_1.nbt b/data/minecraft/structure/village/taiga/zombie/town_centers/taiga_meeting_point_1.nbt index 7e773353..ee7ee008 100644 --- a/data/minecraft/structure/village/taiga/zombie/town_centers/taiga_meeting_point_1.nbt +++ b/data/minecraft/structure/village/taiga/zombie/town_centers/taiga_meeting_point_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f10619385474e26ff157bf6871d92d81038f42b55bf3163ba2f616ff29556f2c +oid sha256:e5778e71c8cc1f246fe5f2a370d0760e244f5a56c9121b4c0b8f6f78e9b8298b size 1849 diff --git a/data/minecraft/structure/village/taiga/zombie/town_centers/taiga_meeting_point_2.nbt b/data/minecraft/structure/village/taiga/zombie/town_centers/taiga_meeting_point_2.nbt index edf6336c..3e967e17 100644 --- a/data/minecraft/structure/village/taiga/zombie/town_centers/taiga_meeting_point_2.nbt +++ b/data/minecraft/structure/village/taiga/zombie/town_centers/taiga_meeting_point_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:916d1a720f4252f95196f9b1f1e521060d260349995e499d470baae083d0c99d -size 2258 +oid sha256:de3d50dc1f5be0b1c7b5348b73470f90d8a651563521667481d6dba1a2780702 +size 2257 diff --git a/data/minecraft/structure/village/taiga/zombie/villagers/nitwit.nbt b/data/minecraft/structure/village/taiga/zombie/villagers/nitwit.nbt index 7cce4f1d..5bd01d1b 100644 --- a/data/minecraft/structure/village/taiga/zombie/villagers/nitwit.nbt +++ b/data/minecraft/structure/village/taiga/zombie/villagers/nitwit.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8043903746f5e430085ec653217d5a106de13b69221e8695aaaea9169cd1dc50 -size 722 +oid sha256:04888253233476763a11119b57dcc561eabafb65a6d29c9211ce41036da94780 +size 721 diff --git a/data/minecraft/structure/village/taiga/zombie/villagers/unemployed.nbt b/data/minecraft/structure/village/taiga/zombie/villagers/unemployed.nbt index cb60b226..0b832654 100644 --- a/data/minecraft/structure/village/taiga/zombie/villagers/unemployed.nbt +++ b/data/minecraft/structure/village/taiga/zombie/villagers/unemployed.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d72ca363e3e52449889017c3e05e7206eb429b7d10c7825b1d3ba5a20c59884c -size 721 +oid sha256:03766a20219dd735ffc274fa161da09e5259cdff6bdfc72eda8b7e5635fdd109 +size 720 diff --git a/data/minecraft/structure/woodland_mansion/1x1_a1.nbt b/data/minecraft/structure/woodland_mansion/1x1_a1.nbt index 874e42b0..6a961052 100644 --- a/data/minecraft/structure/woodland_mansion/1x1_a1.nbt +++ b/data/minecraft/structure/woodland_mansion/1x1_a1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b8e35c00c3d8ee10e95d7b1f71966258ec87d48ba964f8e0495d7cccba17474f -size 1434 +oid sha256:8d179e82c3963aae063d03e0a323fa3b0d3b86e417367ed764e879e101d14a7c +size 1433 diff --git a/data/minecraft/structure/woodland_mansion/1x1_a2.nbt b/data/minecraft/structure/woodland_mansion/1x1_a2.nbt index 7b7bb45a..69f99460 100644 --- a/data/minecraft/structure/woodland_mansion/1x1_a2.nbt +++ b/data/minecraft/structure/woodland_mansion/1x1_a2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d39db576b29a014bf4f30d25841316496af4cb4c4cbc9e412b11c2e621511822 -size 1529 +oid sha256:dafbb1082ddfeeb842e711867f5d1f2b046e6341f4279855f1ac0204bc5a3911 +size 1530 diff --git a/data/minecraft/structure/woodland_mansion/1x1_a3.nbt b/data/minecraft/structure/woodland_mansion/1x1_a3.nbt index a83c8c53..5c7e4d7a 100644 --- a/data/minecraft/structure/woodland_mansion/1x1_a3.nbt +++ b/data/minecraft/structure/woodland_mansion/1x1_a3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4d927b19460fd7ac297c940408e0475cb006b99c22bca7ec80d8648cb792e7b0 -size 1417 +oid sha256:0b1d9da64206e343187be04e377a2ca9ca4fe2f85ebf3cd7d5705a57cd385887 +size 1416 diff --git a/data/minecraft/structure/woodland_mansion/1x1_a4.nbt b/data/minecraft/structure/woodland_mansion/1x1_a4.nbt index d2b534cf..2d17437b 100644 --- a/data/minecraft/structure/woodland_mansion/1x1_a4.nbt +++ b/data/minecraft/structure/woodland_mansion/1x1_a4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1e7d96bc47ecb647aedfec7c5edf3157f972b56b2e287c646fe1af2166b2b27d -size 1684 +oid sha256:e354e16410d0cf215af0a171cd2ca1e7cc42b7c33079b18504784729b518432c +size 1682 diff --git a/data/minecraft/structure/woodland_mansion/1x1_a5.nbt b/data/minecraft/structure/woodland_mansion/1x1_a5.nbt index 0585725e..72a2dc44 100644 --- a/data/minecraft/structure/woodland_mansion/1x1_a5.nbt +++ b/data/minecraft/structure/woodland_mansion/1x1_a5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:166425bb51d7c5e4b25652bdd72afe8b859ab453489bc93bb11be449ec4fe438 -size 1492 +oid sha256:52e55bc50aea6554e35c24387e47a3d012d5b9b49170fe4235fccb818fd9e10e +size 1491 diff --git a/data/minecraft/structure/woodland_mansion/1x1_as1.nbt b/data/minecraft/structure/woodland_mansion/1x1_as1.nbt index 749dc3d6..47ee29cc 100644 --- a/data/minecraft/structure/woodland_mansion/1x1_as1.nbt +++ b/data/minecraft/structure/woodland_mansion/1x1_as1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:73735bd37fa03fdd7a840552647613a1da90011bf217dfe39526de1ef8126fdd -size 1486 +oid sha256:54b6a9000f25e11c25a23845ba68db587e362f47fbe0fe82eccb5682a4ddd203 +size 1485 diff --git a/data/minecraft/structure/woodland_mansion/1x1_as2.nbt b/data/minecraft/structure/woodland_mansion/1x1_as2.nbt index 99d01853..830c99f2 100644 --- a/data/minecraft/structure/woodland_mansion/1x1_as2.nbt +++ b/data/minecraft/structure/woodland_mansion/1x1_as2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:90b085f69e11a09463ab68619cac06d4d1a7a75fd02637d89f141dc3cf522021 -size 1456 +oid sha256:6f0dbfca7d9a67cd4e2df465d517d203d3c66d27ffe0f2766dcccf30753cb7e9 +size 1454 diff --git a/data/minecraft/structure/woodland_mansion/1x1_as3.nbt b/data/minecraft/structure/woodland_mansion/1x1_as3.nbt index 6133484b..4b321913 100644 --- a/data/minecraft/structure/woodland_mansion/1x1_as3.nbt +++ b/data/minecraft/structure/woodland_mansion/1x1_as3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3468e7549919c021e1db95f79ae3d9eef8057044ed425f84ccacdbfde2bf17dc -size 1212 +oid sha256:6ae51351bae2ccb6900d38232d34528a6c5f4698d8d58e34848d9c405030deff +size 1211 diff --git a/data/minecraft/structure/woodland_mansion/1x1_as4.nbt b/data/minecraft/structure/woodland_mansion/1x1_as4.nbt index ccf76a2b..b67cb46e 100644 --- a/data/minecraft/structure/woodland_mansion/1x1_as4.nbt +++ b/data/minecraft/structure/woodland_mansion/1x1_as4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:633f100d4ee72bca7423172870861376f0cb24aa6740cebe17cc76b7e79bb1be +oid sha256:72ec63e32853d03d7dd9e251e2e68459060d0c011771e1243db8e0fe180de61a size 1212 diff --git a/data/minecraft/structure/woodland_mansion/1x1_b1.nbt b/data/minecraft/structure/woodland_mansion/1x1_b1.nbt index 66ce7767..c1ba3a9c 100644 --- a/data/minecraft/structure/woodland_mansion/1x1_b1.nbt +++ b/data/minecraft/structure/woodland_mansion/1x1_b1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0748abbf7e10145d3c613853a1efbdbad6e329e0608746c68dc1fbe1f895413c -size 1925 +oid sha256:ac733f88d393275735ed74e7101f96d42f9bb273d9ae38a66132235dd93e57e5 +size 1924 diff --git a/data/minecraft/structure/woodland_mansion/1x1_b2.nbt b/data/minecraft/structure/woodland_mansion/1x1_b2.nbt index f02ee3fc..c776691e 100644 --- a/data/minecraft/structure/woodland_mansion/1x1_b2.nbt +++ b/data/minecraft/structure/woodland_mansion/1x1_b2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:95967699cd0cf7dfc01de0c87ffdfc616dbcb446e3c51a4f9f6e88ba63ce04ea -size 1865 +oid sha256:3398b42a1938f7fa367c10ef4d190ef7aa4b6f3498bb17787a0f5620111e8337 +size 1864 diff --git a/data/minecraft/structure/woodland_mansion/1x1_b3.nbt b/data/minecraft/structure/woodland_mansion/1x1_b3.nbt index 02c08203..b23acf97 100644 --- a/data/minecraft/structure/woodland_mansion/1x1_b3.nbt +++ b/data/minecraft/structure/woodland_mansion/1x1_b3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1ed3a344146b43d2d8a1d8e40b0f52da70186af38c142a390ba3138a763c367f -size 1808 +oid sha256:8f443bc59cd2ecd3775d2de5715b6dfd5370d3c83fc766502f3b9efff014b9bd +size 1807 diff --git a/data/minecraft/structure/woodland_mansion/1x1_b4.nbt b/data/minecraft/structure/woodland_mansion/1x1_b4.nbt index 84b97df0..11671261 100644 --- a/data/minecraft/structure/woodland_mansion/1x1_b4.nbt +++ b/data/minecraft/structure/woodland_mansion/1x1_b4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ecff030441310fedc75e0e48757768451711a018c3d127e452a9f5521deda82d -size 1832 +oid sha256:2c18b2c84edba42a2ee851781859a8451ac2401d94c6d5235d4585be51d54fc4 +size 1831 diff --git a/data/minecraft/structure/woodland_mansion/1x1_b5.nbt b/data/minecraft/structure/woodland_mansion/1x1_b5.nbt index 120f6db7..5737e309 100644 --- a/data/minecraft/structure/woodland_mansion/1x1_b5.nbt +++ b/data/minecraft/structure/woodland_mansion/1x1_b5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6783e72c031711138b4ced78d16170c5a83a30be0102d149df991e1d056edefe -size 1923 +oid sha256:118214568f4a101ce8f5218f2b355146c76697bf5f043e5bf3765304d607ce89 +size 1920 diff --git a/data/minecraft/structure/woodland_mansion/1x2_a1.nbt b/data/minecraft/structure/woodland_mansion/1x2_a1.nbt index 68f37cf6..3f5c3b9b 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_a1.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_a1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1a373d9eb2f45088d52dd372ae2a98fea9677835cc10b8fd6177c96004a5fb22 -size 2938 +oid sha256:42f404e7c2a2922cc411c0f787a7c69f47d10178635c0d1977b5466eb615aeef +size 2936 diff --git a/data/minecraft/structure/woodland_mansion/1x2_a2.nbt b/data/minecraft/structure/woodland_mansion/1x2_a2.nbt index 787b1b05..d94af41b 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_a2.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_a2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:abf0ee7eac1abf5a77dea5260213cfc62ac8505c439865f9a7316ca17c7021c8 +oid sha256:20302996b6a0df51fb957179c5f25a998b2b0f9b811859b3de456d4186fe4a22 size 2829 diff --git a/data/minecraft/structure/woodland_mansion/1x2_a3.nbt b/data/minecraft/structure/woodland_mansion/1x2_a3.nbt index 3d0d5b7e..c4cbc36e 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_a3.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_a3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e90f1bd1b7f8c513d5f0a2db1194b2fd6b67edbfe9d970a560705219ce9466f6 -size 2952 +oid sha256:11ade9837b1d53dd52794390c007f1638dc1b34e12e1e7b4688fff5c9b8d585c +size 2951 diff --git a/data/minecraft/structure/woodland_mansion/1x2_a4.nbt b/data/minecraft/structure/woodland_mansion/1x2_a4.nbt index f4ad6c07..eb095591 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_a4.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_a4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:acabca0c4147bc8f0412206d1d897bd15fd0ac4fdf661310dfe5afed10713ba9 -size 2898 +oid sha256:5c81e5109d2ebebc953bd6224654a04d02c09dd6c738843f2a79eb3c8c9c8ab7 +size 2896 diff --git a/data/minecraft/structure/woodland_mansion/1x2_a5.nbt b/data/minecraft/structure/woodland_mansion/1x2_a5.nbt index 306316bd..bdcbdbae 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_a5.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_a5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c180017a011440d463cdba9c12e0529733db7428da1e7c27f51e2867d4324607 -size 2571 +oid sha256:dc2566f5c0ca6215426713fdb942c2fa12a3d1a67637e10447f665ab397b4fae +size 2570 diff --git a/data/minecraft/structure/woodland_mansion/1x2_a6.nbt b/data/minecraft/structure/woodland_mansion/1x2_a6.nbt index 7d381fb8..9f348368 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_a6.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_a6.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a4699216cf524212c9dc524add5f528bfbf5c4bd2e0eb41b846c799a1960c42a -size 2810 +oid sha256:458d00a033e70021a7034d33c5ff81e6efb8a36c0862aab5cb6c4acd4945b18b +size 2808 diff --git a/data/minecraft/structure/woodland_mansion/1x2_a7.nbt b/data/minecraft/structure/woodland_mansion/1x2_a7.nbt index 7efe81fc..41db954b 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_a7.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_a7.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:47de6e95cd90e3f53ee2c871d50d28a811e8d79326e23c7948064e74f2497cd9 -size 2949 +oid sha256:ae27eece498acf81cb0eb82f038d744fa4740a0e485f76a330894191be0d6ade +size 2948 diff --git a/data/minecraft/structure/woodland_mansion/1x2_a8.nbt b/data/minecraft/structure/woodland_mansion/1x2_a8.nbt index ed29bc34..d7fbd114 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_a8.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_a8.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a34fecc7793ebd453ebc0dbf602a86e4fbd4b5c0ff692d3322acc6dfd919b5b2 -size 3191 +oid sha256:5eebfbe4711fc094ce1a863d320e8893738ffe2ed648316268c11ca275d734a3 +size 3189 diff --git a/data/minecraft/structure/woodland_mansion/1x2_a9.nbt b/data/minecraft/structure/woodland_mansion/1x2_a9.nbt index 446227f3..ef7254c4 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_a9.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_a9.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6bdc5f04dee01ca2a0ef3e9c842549b9082fcd973ef2328fff8fe1e6a683d405 -size 3096 +oid sha256:6c53cd4c303f00b0546e59313aa0884fba6ca0eeed10646b97ead5d033761f79 +size 3094 diff --git a/data/minecraft/structure/woodland_mansion/1x2_b1.nbt b/data/minecraft/structure/woodland_mansion/1x2_b1.nbt index 41d0e8d7..a9e76549 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_b1.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_b1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8f116daeaa3f233ae8c09fb26a1397d1a3028eaac891bae03fc7d2c29f2be617 -size 3279 +oid sha256:443ba965d921142d7b48c9bae4895af968b77ae0cd077995362926359c2370f4 +size 3277 diff --git a/data/minecraft/structure/woodland_mansion/1x2_b2.nbt b/data/minecraft/structure/woodland_mansion/1x2_b2.nbt index 6459d661..6a0eb9d1 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_b2.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_b2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4b13941be098d1ba86cf08f0eb90a9ea2c2e152c2ee0e08a0907941f449f0e30 -size 3136 +oid sha256:1b1c834a5362aac90bb8b8639074c520aae0480bbd2f2d437f13e90bd73f3742 +size 3134 diff --git a/data/minecraft/structure/woodland_mansion/1x2_b3.nbt b/data/minecraft/structure/woodland_mansion/1x2_b3.nbt index 8aceda5b..f226d752 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_b3.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_b3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:81230506b96e7f06506dd1785dc9e00f5a5c5dd9d0958412fa6cc03a6b950f0c -size 2795 +oid sha256:913d2ab4884db934da1f91c7daf90b0274bb3b85d13d8cf1a10619b69f0dbacc +size 2793 diff --git a/data/minecraft/structure/woodland_mansion/1x2_b4.nbt b/data/minecraft/structure/woodland_mansion/1x2_b4.nbt index 96848b98..69a0d908 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_b4.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_b4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e17a6edb5fd88b821ce77c4d7afb6cb306a0a1b73d0c780fb1fb0b9eb87443b8 -size 2966 +oid sha256:d0a11ce4c2d7d555c78c151cd707ca141446e1e518a379cbc8560bef0460f756 +size 2964 diff --git a/data/minecraft/structure/woodland_mansion/1x2_b5.nbt b/data/minecraft/structure/woodland_mansion/1x2_b5.nbt index e56cdeb0..5302ce76 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_b5.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_b5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:28ae058c56dcee187fd8fbe7559e086f026b5abcd7324d5dcb8da24e75b7cc3c -size 2409 +oid sha256:136ec83be2d1e8512d59afe6ad1a78cbb4990b41669f94e84874476cc736cef0 +size 2408 diff --git a/data/minecraft/structure/woodland_mansion/1x2_c1.nbt b/data/minecraft/structure/woodland_mansion/1x2_c1.nbt index 260100ad..a9c07e22 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_c1.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_c1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6dd8b2e08865a03b8e8dfc95a4330d0011d47a02be4b6c0d7988c19e36057fd4 -size 3547 +oid sha256:d75f79bbc65691aedfbac12de41f8e859c9f450332f950157547541a51ebdcd8 +size 3546 diff --git a/data/minecraft/structure/woodland_mansion/1x2_c2.nbt b/data/minecraft/structure/woodland_mansion/1x2_c2.nbt index cc2b62ec..2f43c81b 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_c2.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_c2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ecc6729e5c01eda9afa3364ecc347f4bbbe18e55b91cf171150ffd07e3b8cf09 -size 3349 +oid sha256:c380a93704a7dd8009825ca734faf83f816075a24000afc58947584aa01d40ed +size 3348 diff --git a/data/minecraft/structure/woodland_mansion/1x2_c3.nbt b/data/minecraft/structure/woodland_mansion/1x2_c3.nbt index 062c325b..1cf4b81c 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_c3.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_c3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3d0f00f5347265061fcd62ed510b5ca7b8e7608cf7a77f397412f4a23d9bb06e -size 3618 +oid sha256:0b17c1b83e795f69963e3b33179cfc4d6051669c8313367138a901222d849628 +size 3616 diff --git a/data/minecraft/structure/woodland_mansion/1x2_c4.nbt b/data/minecraft/structure/woodland_mansion/1x2_c4.nbt index b5430b90..68f9ec73 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_c4.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_c4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:84db41ed65110aa325175c192c12dc42ba506f5700fff98ebdc7a981241ae885 -size 3621 +oid sha256:cb6eccab83246438e241aef93c11786008015264e96280d35de03f56aa61f322 +size 3620 diff --git a/data/minecraft/structure/woodland_mansion/1x2_c_stairs.nbt b/data/minecraft/structure/woodland_mansion/1x2_c_stairs.nbt index 553a8295..cc0a7a66 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_c_stairs.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_c_stairs.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:835ba5bf8c353ada27a7100cdf810c3e479ea5fbf18ebbed5fce41d232dc86a0 -size 6731 +oid sha256:bee62efba9e5f2807182ee009b23e8a8d35c0ffa56c7ab2aa8a1b8f3bc351864 +size 6730 diff --git a/data/minecraft/structure/woodland_mansion/1x2_d1.nbt b/data/minecraft/structure/woodland_mansion/1x2_d1.nbt index a6da8cd9..8e150e9e 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_d1.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_d1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5256609a2560a1a6d9134aeef9c6d3b6d4bef7eaf290aad9d4977f344d05be52 -size 3735 +oid sha256:2ae3d4061ae1237b23ad2489676cf53576382e908e653a7db9fc472edf46617a +size 3733 diff --git a/data/minecraft/structure/woodland_mansion/1x2_d2.nbt b/data/minecraft/structure/woodland_mansion/1x2_d2.nbt index 0255c87a..b0156841 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_d2.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_d2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:66e2cfe9e1d8dbdcdb5040ce769c4e8403fe8bcabbd61cf605f48d88d5bfe412 -size 3907 +oid sha256:d0e389172d90798f6c4b13bae842939824c4bec6b58c10eb83c9b27f6f6bf158 +size 3905 diff --git a/data/minecraft/structure/woodland_mansion/1x2_d3.nbt b/data/minecraft/structure/woodland_mansion/1x2_d3.nbt index 6936f4d7..878f426a 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_d3.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_d3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5e45bec4e7d745e8cee7d4241c63ffe5c5df5168156a5dbdfd4682d36e1a8392 -size 3844 +oid sha256:a388efd10e82be44fb0368c035903dc831727b926664996bf1bfb0d6258d75f7 +size 3843 diff --git a/data/minecraft/structure/woodland_mansion/1x2_d4.nbt b/data/minecraft/structure/woodland_mansion/1x2_d4.nbt index c6bbbbd4..1cd0d38b 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_d4.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_d4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cb617169a410aefa40b21f50cb644aec72caffa59ac44426743b98748420d241 -size 3410 +oid sha256:5cfa9b8ea97ee6c3b7f75e96d51ec5875f1438c3ae063ac5463af35344a8bdb0 +size 3409 diff --git a/data/minecraft/structure/woodland_mansion/1x2_d5.nbt b/data/minecraft/structure/woodland_mansion/1x2_d5.nbt index 25cf2a61..d60ba051 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_d5.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_d5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:52d597f17b3d2b41867cca48f3bed21e186512b03a024aafab7de39fd24b91c2 +oid sha256:2d26d4a7b0504902506a47db90480d9a3fc595d1bb2fe5a38edd576582ab6e4b size 3374 diff --git a/data/minecraft/structure/woodland_mansion/1x2_d_stairs.nbt b/data/minecraft/structure/woodland_mansion/1x2_d_stairs.nbt index 420c25d6..07883e13 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_d_stairs.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_d_stairs.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:45d0103747115f59a72c8d6814db8e5e157a453bd4d80baae1eabadc89860012 -size 6626 +oid sha256:bc5288ea2cdc084943963ae52b3489feb57b8cdb9772c00e19c96babca72ccc4 +size 6625 diff --git a/data/minecraft/structure/woodland_mansion/1x2_s1.nbt b/data/minecraft/structure/woodland_mansion/1x2_s1.nbt index fb4b8a3e..2d02665d 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_s1.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_s1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6d731c95eb6cbca9a0935331c3df23aaaa45bfaaf92254c6e5f0282ce46b3353 -size 2688 +oid sha256:af6b4105f346ff336c3f451e26c2f73d11ff687a3fd2c05e21d02edaee1d0646 +size 2686 diff --git a/data/minecraft/structure/woodland_mansion/1x2_s2.nbt b/data/minecraft/structure/woodland_mansion/1x2_s2.nbt index dcccd47a..0af6b927 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_s2.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_s2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2a68d09014a43f6589e6895003e411f6144297c15db1c88d3d0bf09ce7b3a1d3 -size 2733 +oid sha256:1dc443b107c9d08e58624f7c5eb737172aa807bdccf250d6393a41156895a931 +size 2731 diff --git a/data/minecraft/structure/woodland_mansion/1x2_se1.nbt b/data/minecraft/structure/woodland_mansion/1x2_se1.nbt index 1416f3eb..6025f79e 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_se1.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_se1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:beae3d473369713463b522f0d5c38bc06a688292749ae63d03633bb6f290ab6c -size 3885 +oid sha256:abfad6e20a3cf174db1cde0c180c837d918b6563af9d701051d77a142bc14635 +size 3883 diff --git a/data/minecraft/structure/woodland_mansion/2x2_a1.nbt b/data/minecraft/structure/woodland_mansion/2x2_a1.nbt index bb7b9e2b..a964c4b1 100644 --- a/data/minecraft/structure/woodland_mansion/2x2_a1.nbt +++ b/data/minecraft/structure/woodland_mansion/2x2_a1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:04d58c08dfe075f11ded73b7668d8d106e5550cd015027bff9d6bfe348fdbc50 -size 6290 +oid sha256:957dba2bf4d5034885d300bf175870500e05f6f8c3784475f1a87606cae44fbe +size 6288 diff --git a/data/minecraft/structure/woodland_mansion/2x2_a2.nbt b/data/minecraft/structure/woodland_mansion/2x2_a2.nbt index 5ddaaad4..c8f45599 100644 --- a/data/minecraft/structure/woodland_mansion/2x2_a2.nbt +++ b/data/minecraft/structure/woodland_mansion/2x2_a2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a0cb7495bd0e8f2294a84939b72656b0a16aa657d5ba48432fca8289743e6cbf -size 5634 +oid sha256:4ab579789e2a1e2da89c06cddddbc9a99d12141952762f9741f03e4dadae7e87 +size 5632 diff --git a/data/minecraft/structure/woodland_mansion/2x2_a3.nbt b/data/minecraft/structure/woodland_mansion/2x2_a3.nbt index 7637ca29..1ae5c25e 100644 --- a/data/minecraft/structure/woodland_mansion/2x2_a3.nbt +++ b/data/minecraft/structure/woodland_mansion/2x2_a3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7617035b62691ce6b7413465432214bda764c1546ee9a047221e7f0ac1643f24 -size 5215 +oid sha256:30702e4d16defb700bd82603210323b5b12225f32898909df2cca5894d06749c +size 5213 diff --git a/data/minecraft/structure/woodland_mansion/2x2_a4.nbt b/data/minecraft/structure/woodland_mansion/2x2_a4.nbt index 70b266e6..69fa34de 100644 --- a/data/minecraft/structure/woodland_mansion/2x2_a4.nbt +++ b/data/minecraft/structure/woodland_mansion/2x2_a4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e7cb11b424dc3a0834402554ef76098d55cd5430b202ae3830938405ab157064 -size 5410 +oid sha256:4e8b77e8d321ccf71ad65754898288ed3fd1b759ff1be7073c0a56300ee088e4 +size 5409 diff --git a/data/minecraft/structure/woodland_mansion/2x2_b1.nbt b/data/minecraft/structure/woodland_mansion/2x2_b1.nbt index 91c4e353..38ea00f3 100644 --- a/data/minecraft/structure/woodland_mansion/2x2_b1.nbt +++ b/data/minecraft/structure/woodland_mansion/2x2_b1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1477daced5ade3a76cbf49a24eec6ca1758e9c9c1936a2a9691d7a7dd05d2af9 -size 7315 +oid sha256:9120be3b78b129d6b2e81c78da5143af16b13f6ec5a69641428b83e804dc54f0 +size 7313 diff --git a/data/minecraft/structure/woodland_mansion/2x2_b2.nbt b/data/minecraft/structure/woodland_mansion/2x2_b2.nbt index 16e5e8ee..bb652096 100644 --- a/data/minecraft/structure/woodland_mansion/2x2_b2.nbt +++ b/data/minecraft/structure/woodland_mansion/2x2_b2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fc2c7c0768f13e610a50900623e63c058cffd8ba0d8aee96e1c99fcfbfbecf44 -size 7301 +oid sha256:46093092f1d15c24f0718079127254407c01dd6ee33685517af829161bbfdfa4 +size 7299 diff --git a/data/minecraft/structure/woodland_mansion/2x2_b3.nbt b/data/minecraft/structure/woodland_mansion/2x2_b3.nbt index 158c7840..826fe9e7 100644 --- a/data/minecraft/structure/woodland_mansion/2x2_b3.nbt +++ b/data/minecraft/structure/woodland_mansion/2x2_b3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:958429b9b420db192a5e04cffb8fe748a2d3a692ae0ae94c6afcf8b22459e707 -size 7105 +oid sha256:d364bb426be6d54ff5fb825cc131517584f5ac3fcdcf84a547ad3233b0ad9adf +size 7104 diff --git a/data/minecraft/structure/woodland_mansion/2x2_b4.nbt b/data/minecraft/structure/woodland_mansion/2x2_b4.nbt index ea18d8d1..f7073616 100644 --- a/data/minecraft/structure/woodland_mansion/2x2_b4.nbt +++ b/data/minecraft/structure/woodland_mansion/2x2_b4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:38734f189d0b8db293590c1a92cfe211009298590d226efd637aea410044c2bf -size 7243 +oid sha256:06354b3ea11cd040043a3c6ea2a6398b9382998e05fef868c5bf46ddf8e5f7c2 +size 7241 diff --git a/data/minecraft/structure/woodland_mansion/2x2_b5.nbt b/data/minecraft/structure/woodland_mansion/2x2_b5.nbt index b5a95de1..67fca1eb 100644 --- a/data/minecraft/structure/woodland_mansion/2x2_b5.nbt +++ b/data/minecraft/structure/woodland_mansion/2x2_b5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:00297476e57993ea4a84df08fb87e1d85bd8b92f414f488126fdf23ca7442522 -size 7545 +oid sha256:db280fc2fb9859a55cb10dbb0d6e257aa3d0338ff5365298288d3337bd5ce707 +size 7542 diff --git a/data/minecraft/structure/woodland_mansion/2x2_s1.nbt b/data/minecraft/structure/woodland_mansion/2x2_s1.nbt index f814f655..8c21830d 100644 --- a/data/minecraft/structure/woodland_mansion/2x2_s1.nbt +++ b/data/minecraft/structure/woodland_mansion/2x2_s1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:13ce04c379c86c7e1fad007bfd69c8ea18a767c5e1f0f99815cd9d2e9676957b -size 6795 +oid sha256:df6bb35e22d82a53fd31f2970b54aa4e5abec8586b6396e5d30ef16b7ddc5ad8 +size 6794 diff --git a/data/minecraft/structure/woodland_mansion/carpet_east.nbt b/data/minecraft/structure/woodland_mansion/carpet_east.nbt index 02d3dc31..6c5d3c49 100644 --- a/data/minecraft/structure/woodland_mansion/carpet_east.nbt +++ b/data/minecraft/structure/woodland_mansion/carpet_east.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b2136f216b3d74bf71e766ae3dfc364d3d2d2b9d1bc0f7e7bea85f9a6ad36d1d -size 180 +oid sha256:63e5cfc5fc0266fea0cd894911f262dc1899356d63f776f51f7da89944d4c96a +size 179 diff --git a/data/minecraft/structure/woodland_mansion/carpet_north.nbt b/data/minecraft/structure/woodland_mansion/carpet_north.nbt index 22435066..84064346 100644 --- a/data/minecraft/structure/woodland_mansion/carpet_north.nbt +++ b/data/minecraft/structure/woodland_mansion/carpet_north.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8e77119aa1e5e852c331c666503777c492523734bef6470d1a6cb8832b1e92e0 -size 178 +oid sha256:d5a1eef65248d2f16858e3ff62aea9555cf64d7213e77ad880874b70f9484e4f +size 176 diff --git a/data/minecraft/structure/woodland_mansion/carpet_south_1.nbt b/data/minecraft/structure/woodland_mansion/carpet_south_1.nbt index 52c3273b..48dd03f8 100644 --- a/data/minecraft/structure/woodland_mansion/carpet_south_1.nbt +++ b/data/minecraft/structure/woodland_mansion/carpet_south_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:60f4b66bceb51ac4a128057d1ca4e3cb1aa0e492e88431bdfc83a686ac8be1e1 -size 721 +oid sha256:a684fc7964273eb6c90fb076fff18883d06a429327cd2df2f08519519b79558a +size 719 diff --git a/data/minecraft/structure/woodland_mansion/carpet_south_2.nbt b/data/minecraft/structure/woodland_mansion/carpet_south_2.nbt index 54102087..4a4429c3 100644 --- a/data/minecraft/structure/woodland_mansion/carpet_south_2.nbt +++ b/data/minecraft/structure/woodland_mansion/carpet_south_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:144cd7d83b2cd947a28eb82650bea652db5a84148b9f00fae66f97ec15991114 -size 930 +oid sha256:291aa408b1e77410a19f313f697f1abdc50a31c5b1d2e0a25e252a872f8a3e9a +size 929 diff --git a/data/minecraft/structure/woodland_mansion/carpet_west_1.nbt b/data/minecraft/structure/woodland_mansion/carpet_west_1.nbt index d4e758b7..451c50f8 100644 --- a/data/minecraft/structure/woodland_mansion/carpet_west_1.nbt +++ b/data/minecraft/structure/woodland_mansion/carpet_west_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ff184b5cdbf9a8f6b4c88b9a55bf5265bd8b2233cd403d4f5c2733d53c275190 -size 794 +oid sha256:cfa571031afcd440696284a5440174a40854230385be2ca828b2c12815bbc88d +size 793 diff --git a/data/minecraft/structure/woodland_mansion/carpet_west_2.nbt b/data/minecraft/structure/woodland_mansion/carpet_west_2.nbt index 40197632..ed3cc172 100644 --- a/data/minecraft/structure/woodland_mansion/carpet_west_2.nbt +++ b/data/minecraft/structure/woodland_mansion/carpet_west_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:62405d417776d0abd36b0f2a9100d93075de83996a2f76ba5757ee78b5769457 +oid sha256:05ca8710ab139fadc5259218b0ec027587b2716a0d69afa01141d9c010645a56 size 1021 diff --git a/data/minecraft/structure/woodland_mansion/corridor_floor.nbt b/data/minecraft/structure/woodland_mansion/corridor_floor.nbt index e9255d4f..af6937a2 100644 --- a/data/minecraft/structure/woodland_mansion/corridor_floor.nbt +++ b/data/minecraft/structure/woodland_mansion/corridor_floor.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8fdee78da78f72607946ca110be9f3f383f3bc8d1a9c1ea873fff490bf2fb546 -size 1172 +oid sha256:3b617c9e650ad1091d37229c9d02c7092bbcbd8d525f77b70842bdc1616293e2 +size 1171 diff --git a/data/minecraft/structure/woodland_mansion/entrance.nbt b/data/minecraft/structure/woodland_mansion/entrance.nbt index a7405f73..03bb4e99 100644 --- a/data/minecraft/structure/woodland_mansion/entrance.nbt +++ b/data/minecraft/structure/woodland_mansion/entrance.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:37d955bbd625165646c82c8cdeeec5dcf272ec8f3ca3dc475dbddd033f50485a -size 18256 +oid sha256:1b8ca614295f295b5032d0c0d39ed746552aa8bdb911049bc532910d35e7ca43 +size 18255 diff --git a/data/minecraft/structure/woodland_mansion/indoors_door_1.nbt b/data/minecraft/structure/woodland_mansion/indoors_door_1.nbt index d4c1a2ed..cf9bd835 100644 --- a/data/minecraft/structure/woodland_mansion/indoors_door_1.nbt +++ b/data/minecraft/structure/woodland_mansion/indoors_door_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3184572067ef43d22b6c56eabefdb64550b03cb77caebeec4fbe2ad6fac433c1 -size 410 +oid sha256:c26ee222c3b46de6f291840be01cff63b010e139db1df138c283699a097978b1 +size 409 diff --git a/data/minecraft/structure/woodland_mansion/indoors_door_2.nbt b/data/minecraft/structure/woodland_mansion/indoors_door_2.nbt index aff781ea..f41c5f59 100644 --- a/data/minecraft/structure/woodland_mansion/indoors_door_2.nbt +++ b/data/minecraft/structure/woodland_mansion/indoors_door_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b56ab713f0ff5fb9a3fa0d0d1ceb00b11ea45e777a09f15b2a062d0787c60eb9 -size 505 +oid sha256:b906b1c832cf2cf1647ddf6971864cb2297af2b5acbd1b3eeaa0e262d7e25d21 +size 504 diff --git a/data/minecraft/structure/woodland_mansion/indoors_wall_1.nbt b/data/minecraft/structure/woodland_mansion/indoors_wall_1.nbt index d427ab44..a3ba8531 100644 --- a/data/minecraft/structure/woodland_mansion/indoors_wall_1.nbt +++ b/data/minecraft/structure/woodland_mansion/indoors_wall_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:31d1f4b4ea4ef34623ac13e49d0007c6a4b3db2b0041dada241bc97c931d3ba3 -size 366 +oid sha256:a1545cfb9fb7140cb35e059db77211c7ed055e9ffd919e1c0c9125d595bccd30 +size 364 diff --git a/data/minecraft/structure/woodland_mansion/indoors_wall_2.nbt b/data/minecraft/structure/woodland_mansion/indoors_wall_2.nbt index 19e0d201..0167c656 100644 --- a/data/minecraft/structure/woodland_mansion/indoors_wall_2.nbt +++ b/data/minecraft/structure/woodland_mansion/indoors_wall_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1c401e8fa63ed13fc5636b658d019d46d37dee4bc5366472ea44b31ca3cb6766 -size 442 +oid sha256:e799a7e748ef40c974bfdd965a79a40c69758c2f06f5197dac6f056f2ea30ae6 +size 441 diff --git a/data/minecraft/structure/woodland_mansion/roof.nbt b/data/minecraft/structure/woodland_mansion/roof.nbt index 86b6bd65..c34c0d62 100644 --- a/data/minecraft/structure/woodland_mansion/roof.nbt +++ b/data/minecraft/structure/woodland_mansion/roof.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b26acb4c0c99d304b677e9c4621113a7c8b79511e42dca93051a4c9b18484f87 -size 333 +oid sha256:faaa1638248d9f8a3fe99bf80e8230a05c2d6b4051747b3e45e3613c3485a635 +size 332 diff --git a/data/minecraft/structure/woodland_mansion/roof_corner.nbt b/data/minecraft/structure/woodland_mansion/roof_corner.nbt index 74f68aff..2c9f1b13 100644 --- a/data/minecraft/structure/woodland_mansion/roof_corner.nbt +++ b/data/minecraft/structure/woodland_mansion/roof_corner.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a515bb0b689c61ba657bf041d675b220f1b2b81269d7bf8cd0e1c483e9fd95f1 -size 450 +oid sha256:152ad6aed41f5d72f32773ee98ee4142e373de551b6830c9cefe509cacd78f58 +size 449 diff --git a/data/minecraft/structure/woodland_mansion/roof_front.nbt b/data/minecraft/structure/woodland_mansion/roof_front.nbt index 2ab79e2e..be54ba0b 100644 --- a/data/minecraft/structure/woodland_mansion/roof_front.nbt +++ b/data/minecraft/structure/woodland_mansion/roof_front.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aebfe73038d68f51202559505764cf12268d5cb0a737888714ace55e34418dae -size 636 +oid sha256:b61455699cd82053f9807b3a2f364ec09644e148909118de7528019d5dce2a10 +size 635 diff --git a/data/minecraft/structure/woodland_mansion/roof_inner_corner.nbt b/data/minecraft/structure/woodland_mansion/roof_inner_corner.nbt index 96a1af48..cb0aac39 100644 --- a/data/minecraft/structure/woodland_mansion/roof_inner_corner.nbt +++ b/data/minecraft/structure/woodland_mansion/roof_inner_corner.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:63aa2fa62ad819624a868dd70177026bcb63e404a3d048f3a7231acc8a4727f6 -size 445 +oid sha256:1e0840c8bcb81d7a935099b4313d7ada790f1dd2cc8183dbe0a005c1816859b0 +size 444 diff --git a/data/minecraft/structure/woodland_mansion/small_wall.nbt b/data/minecraft/structure/woodland_mansion/small_wall.nbt index e9518274..af2edac5 100644 --- a/data/minecraft/structure/woodland_mansion/small_wall.nbt +++ b/data/minecraft/structure/woodland_mansion/small_wall.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e5a4247489ab3a2e6fdb9841bc04e863d7e4c4355a882e770d673cc4faec797a -size 511 +oid sha256:f9f6d31d2a11febab375298c8091899d59f94d408d5451a1c2647b1691953bcb +size 510 diff --git a/data/minecraft/structure/woodland_mansion/small_wall_corner.nbt b/data/minecraft/structure/woodland_mansion/small_wall_corner.nbt index e875b3af..3b699383 100644 --- a/data/minecraft/structure/woodland_mansion/small_wall_corner.nbt +++ b/data/minecraft/structure/woodland_mansion/small_wall_corner.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bfda42a2839d6c96bec3323a2eccd4549808bea1a14b3eeb7da8db2af5661d1f -size 262 +oid sha256:3268eaecd144f276a2b5261e17d42d45bd7a3c4c0900f0ba22ea3fec84e69e81 +size 261 diff --git a/data/minecraft/structure/woodland_mansion/wall_corner.nbt b/data/minecraft/structure/woodland_mansion/wall_corner.nbt index 78581730..0f736a14 100644 --- a/data/minecraft/structure/woodland_mansion/wall_corner.nbt +++ b/data/minecraft/structure/woodland_mansion/wall_corner.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e381e5a9d2d21fae441874c15237aa76e41b418a896b43583ca664ffbe433682 -size 308 +oid sha256:d117b39d8c3d833d6001fdf64851853bf5a9d83103d8f6c7a35d21410ae30bfb +size 307 diff --git a/data/minecraft/structure/woodland_mansion/wall_flat.nbt b/data/minecraft/structure/woodland_mansion/wall_flat.nbt index 73a54a56..fd12d954 100644 --- a/data/minecraft/structure/woodland_mansion/wall_flat.nbt +++ b/data/minecraft/structure/woodland_mansion/wall_flat.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:46acf8bef5b3eb4510cd0128b0def652f35d302de4a983f51c05ed43b1490fb7 -size 727 +oid sha256:58666cbe474f3a7daec96ecc6c7dcbd1224b6004b05ccf5a37717d3b0d6dd034 +size 726 diff --git a/data/minecraft/structure/woodland_mansion/wall_window.nbt b/data/minecraft/structure/woodland_mansion/wall_window.nbt index 51c4d389..25eec005 100644 --- a/data/minecraft/structure/woodland_mansion/wall_window.nbt +++ b/data/minecraft/structure/woodland_mansion/wall_window.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ee8a83acde4b6e64134d52810ed51731a05030f139179756ce42af3bb57be079 +oid sha256:c119307b9941dd837d58d4428370da09ecbb0887e2391c7ce58829e8bbefc9e6 size 830 diff --git a/data/minecraft/tags/block/happy_ghast_avoids.json b/data/minecraft/tags/block/happy_ghast_avoids.json new file mode 100644 index 00000000..7051ac91 --- /dev/null +++ b/data/minecraft/tags/block/happy_ghast_avoids.json @@ -0,0 +1,10 @@ +{ + "values": [ + "minecraft:sweet_berry_bush", + "minecraft:cactus", + "minecraft:wither_rose", + "minecraft:magma_block", + "minecraft:fire", + "minecraft:pointed_dripstone" + ] +} \ No newline at end of file diff --git a/data/minecraft/tags/block/sand.json b/data/minecraft/tags/block/sand.json index 669a6508..43f90f3f 100644 --- a/data/minecraft/tags/block/sand.json +++ b/data/minecraft/tags/block/sand.json @@ -2,7 +2,6 @@ "values": [ "minecraft:sand", "minecraft:red_sand", - "minecraft:suspicious_sand", "minecraft:suspicious_sand" ] } \ No newline at end of file diff --git a/data/minecraft/tags/block/plays_ambient_desert_block_sounds.json b/data/minecraft/tags/block/triggers_ambient_desert_dry_vegetation_block_sounds.json similarity index 100% rename from data/minecraft/tags/block/plays_ambient_desert_block_sounds.json rename to data/minecraft/tags/block/triggers_ambient_desert_dry_vegetation_block_sounds.json diff --git a/data/minecraft/tags/block/triggers_ambient_desert_sand_block_sounds.json b/data/minecraft/tags/block/triggers_ambient_desert_sand_block_sounds.json new file mode 100644 index 00000000..3d8220ec --- /dev/null +++ b/data/minecraft/tags/block/triggers_ambient_desert_sand_block_sounds.json @@ -0,0 +1,6 @@ +{ + "values": [ + "minecraft:sand", + "minecraft:red_sand" + ] +} \ No newline at end of file diff --git a/data/minecraft/tags/block/triggers_ambient_dried_ghast_block_sounds.json b/data/minecraft/tags/block/triggers_ambient_dried_ghast_block_sounds.json new file mode 100644 index 00000000..e8aa4afd --- /dev/null +++ b/data/minecraft/tags/block/triggers_ambient_dried_ghast_block_sounds.json @@ -0,0 +1,6 @@ +{ + "values": [ + "minecraft:soul_sand", + "minecraft:soul_soil" + ] +} \ No newline at end of file diff --git a/data/minecraft/tags/dialog/pause_screen_additions.json b/data/minecraft/tags/dialog/pause_screen_additions.json new file mode 100644 index 00000000..f72d209d --- /dev/null +++ b/data/minecraft/tags/dialog/pause_screen_additions.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/data/minecraft/tags/dialog/quick_actions.json b/data/minecraft/tags/dialog/quick_actions.json new file mode 100644 index 00000000..f72d209d --- /dev/null +++ b/data/minecraft/tags/dialog/quick_actions.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/data/minecraft/tags/entity_type/can_equip_harness.json b/data/minecraft/tags/entity_type/can_equip_harness.json new file mode 100644 index 00000000..bf784bb2 --- /dev/null +++ b/data/minecraft/tags/entity_type/can_equip_harness.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:happy_ghast" + ] +} \ No newline at end of file diff --git a/data/minecraft/tags/entity_type/dismounts_underwater.json b/data/minecraft/tags/entity_type/dismounts_underwater.json index ee9b1e25..9c53e262 100644 --- a/data/minecraft/tags/entity_type/dismounts_underwater.json +++ b/data/minecraft/tags/entity_type/dismounts_underwater.json @@ -3,6 +3,7 @@ "minecraft:camel", "minecraft:chicken", "minecraft:donkey", + "minecraft:happy_ghast", "minecraft:horse", "minecraft:llama", "minecraft:mule", diff --git a/data/minecraft/tags/entity_type/fall_damage_immune.json b/data/minecraft/tags/entity_type/fall_damage_immune.json index 6ccfba3a..3198c78f 100644 --- a/data/minecraft/tags/entity_type/fall_damage_immune.json +++ b/data/minecraft/tags/entity_type/fall_damage_immune.json @@ -10,6 +10,7 @@ "minecraft:cat", "minecraft:chicken", "minecraft:ghast", + "minecraft:happy_ghast", "minecraft:phantom", "minecraft:magma_cube", "minecraft:ocelot", diff --git a/data/minecraft/tags/entity_type/followable_friendly_mobs.json b/data/minecraft/tags/entity_type/followable_friendly_mobs.json new file mode 100644 index 00000000..26848cc3 --- /dev/null +++ b/data/minecraft/tags/entity_type/followable_friendly_mobs.json @@ -0,0 +1,29 @@ +{ + "values": [ + "minecraft:armadillo", + "minecraft:bee", + "minecraft:camel", + "minecraft:cat", + "minecraft:chicken", + "minecraft:cow", + "minecraft:donkey", + "minecraft:fox", + "minecraft:goat", + "minecraft:happy_ghast", + "minecraft:horse", + "minecraft:skeleton_horse", + "minecraft:llama", + "minecraft:mule", + "minecraft:ocelot", + "minecraft:panda", + "minecraft:parrot", + "minecraft:pig", + "minecraft:polar_bear", + "minecraft:rabbit", + "minecraft:sheep", + "minecraft:sniffer", + "minecraft:strider", + "minecraft:villager", + "minecraft:wolf" + ] +} \ No newline at end of file diff --git a/data/minecraft/tags/item/happy_ghast_food.json b/data/minecraft/tags/item/happy_ghast_food.json new file mode 100644 index 00000000..952b6ca8 --- /dev/null +++ b/data/minecraft/tags/item/happy_ghast_food.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:snowball" + ] +} \ No newline at end of file diff --git a/data/minecraft/tags/item/happy_ghast_tempt_items.json b/data/minecraft/tags/item/happy_ghast_tempt_items.json new file mode 100644 index 00000000..141ba108 --- /dev/null +++ b/data/minecraft/tags/item/happy_ghast_tempt_items.json @@ -0,0 +1,6 @@ +{ + "values": [ + "#minecraft:happy_ghast_food", + "#minecraft:harnesses" + ] +} \ No newline at end of file diff --git a/data/minecraft/tags/item/harnesses.json b/data/minecraft/tags/item/harnesses.json new file mode 100644 index 00000000..2592da68 --- /dev/null +++ b/data/minecraft/tags/item/harnesses.json @@ -0,0 +1,20 @@ +{ + "values": [ + "minecraft:white_harness", + "minecraft:orange_harness", + "minecraft:magenta_harness", + "minecraft:light_blue_harness", + "minecraft:yellow_harness", + "minecraft:lime_harness", + "minecraft:pink_harness", + "minecraft:gray_harness", + "minecraft:light_gray_harness", + "minecraft:cyan_harness", + "minecraft:purple_harness", + "minecraft:blue_harness", + "minecraft:brown_harness", + "minecraft:green_harness", + "minecraft:red_harness", + "minecraft:black_harness" + ] +} \ No newline at end of file diff --git a/data/minecraft/tags/item/horse_food.json b/data/minecraft/tags/item/horse_food.json index d348d107..a7adf36b 100644 --- a/data/minecraft/tags/item/horse_food.json +++ b/data/minecraft/tags/item/horse_food.json @@ -4,6 +4,7 @@ "minecraft:sugar", "minecraft:hay_block", "minecraft:apple", + "minecraft:carrot", "minecraft:golden_carrot", "minecraft:golden_apple", "minecraft:enchanted_golden_apple" diff --git a/data/minecraft/tags/item/sand.json b/data/minecraft/tags/item/sand.json index 669a6508..43f90f3f 100644 --- a/data/minecraft/tags/item/sand.json +++ b/data/minecraft/tags/item/sand.json @@ -2,7 +2,6 @@ "values": [ "minecraft:sand", "minecraft:red_sand", - "minecraft:suspicious_sand", "minecraft:suspicious_sand" ] } \ No newline at end of file diff --git a/data/minecraft/worldgen/configured_feature/patch_leaf_litter.json b/data/minecraft/worldgen/configured_feature/patch_leaf_litter.json index 6e38b375..cc423a50 100644 --- a/data/minecraft/worldgen/configured_feature/patch_leaf_litter.json +++ b/data/minecraft/worldgen/configured_feature/patch_leaf_litter.json @@ -136,8 +136,22 @@ { "type": "minecraft:block_predicate_filter", "predicate": { - "type": "minecraft:matching_blocks", - "blocks": "minecraft:air" + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + }, + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:grass_block", + "offset": [ + 0, + -1, + 0 + ] + } + ] } } ] diff --git a/net/minecraft/DetectedVersion.java b/net/minecraft/DetectedVersion.java index d611d9ae..7adba0eb 100644 --- a/net/minecraft/DetectedVersion.java +++ b/net/minecraft/DetectedVersion.java @@ -9,44 +9,32 @@ import java.io.InputStreamReader; import java.time.ZonedDateTime; import java.util.Date; import java.util.UUID; -import net.minecraft.server.packs.PackType; import net.minecraft.util.GsonHelper; import net.minecraft.world.level.storage.DataVersion; import org.slf4j.Logger; -public class DetectedVersion implements WorldVersion { +public class DetectedVersion { private static final Logger LOGGER = LogUtils.getLogger(); - public static final WorldVersion BUILT_IN = new DetectedVersion(); - private final String id; - private final String name; - private final boolean stable; - private final DataVersion worldVersion; - private final int protocolVersion; - private final int resourcePackVersion; - private final int dataPackVersion; - private final Date buildTime; + public static final WorldVersion BUILT_IN = createFromConstants(); - private DetectedVersion() { - this.id = UUID.randomUUID().toString().replaceAll("-", ""); - this.name = "1.21.5"; - this.stable = true; - this.worldVersion = new DataVersion(4325, "main"); - this.protocolVersion = SharedConstants.getProtocolVersion(); - this.resourcePackVersion = 55; - this.dataPackVersion = 71; - this.buildTime = new Date(); + private static WorldVersion createFromConstants() { + return new WorldVersion.Simple( + UUID.randomUUID().toString().replaceAll("-", ""), "1.21.6", new DataVersion(4435, "main"), SharedConstants.getProtocolVersion(), 63, 80, new Date(), true + ); } - private DetectedVersion(JsonObject json) { - this.id = GsonHelper.getAsString(json, "id"); - this.name = GsonHelper.getAsString(json, "name"); - this.stable = GsonHelper.getAsBoolean(json, "stable"); - this.worldVersion = new DataVersion(GsonHelper.getAsInt(json, "world_version"), GsonHelper.getAsString(json, "series_id", DataVersion.MAIN_SERIES)); - this.protocolVersion = GsonHelper.getAsInt(json, "protocol_version"); + private static WorldVersion createFromJson(JsonObject json) { JsonObject jsonObject = GsonHelper.getAsJsonObject(json, "pack_version"); - this.resourcePackVersion = GsonHelper.getAsInt(jsonObject, "resource"); - this.dataPackVersion = GsonHelper.getAsInt(jsonObject, "data"); - this.buildTime = Date.from(ZonedDateTime.parse(GsonHelper.getAsString(json, "build_time")).toInstant()); + return new WorldVersion.Simple( + GsonHelper.getAsString(json, "id"), + GsonHelper.getAsString(json, "name"), + new DataVersion(GsonHelper.getAsInt(json, "world_version"), GsonHelper.getAsString(json, "series_id", "main")), + GsonHelper.getAsInt(json, "protocol_version"), + GsonHelper.getAsInt(jsonObject, "resource"), + GsonHelper.getAsInt(jsonObject, "data"), + Date.from(ZonedDateTime.parse(GsonHelper.getAsString(json, "build_time")).toInstant()), + GsonHelper.getAsBoolean(json, "stable") + ); } /** @@ -60,7 +48,7 @@ public class DetectedVersion implements WorldVersion { WorldVersion var9; label63: { - DetectedVersion var2; + WorldVersion var2; try { if (inputStream == null) { LOGGER.warn("Missing version information!"); @@ -71,7 +59,7 @@ public class DetectedVersion implements WorldVersion { InputStreamReader inputStreamReader = new InputStreamReader(inputStream); try { - var2 = new DetectedVersion(GsonHelper.parse(inputStreamReader)); + var2 = createFromJson(GsonHelper.parse(inputStreamReader)); } catch (Throwable var6) { try { inputStreamReader.close(); @@ -111,39 +99,4 @@ public class DetectedVersion implements WorldVersion { throw new IllegalStateException("Game version information is corrupt", var8); } } - - @Override - public String getId() { - return this.id; - } - - @Override - public String getName() { - return this.name; - } - - @Override - public DataVersion getDataVersion() { - return this.worldVersion; - } - - @Override - public int getProtocolVersion() { - return this.protocolVersion; - } - - @Override - public int getPackVersion(PackType packType) { - return packType == PackType.SERVER_DATA ? this.dataPackVersion : this.resourcePackVersion; - } - - @Override - public Date getBuildTime() { - return this.buildTime; - } - - @Override - public boolean isStable() { - return this.stable; - } } diff --git a/net/minecraft/FileUtil.java b/net/minecraft/FileUtil.java index c113ce3a..cc5ec16a 100644 --- a/net/minecraft/FileUtil.java +++ b/net/minecraft/FileUtil.java @@ -32,7 +32,7 @@ public class FileUtil { public static String findAvailableName(Path dirPath, String fileName, String fileFormat) throws IOException { fileName = sanitizeName(fileName); - if (RESERVED_WINDOWS_FILENAMES.matcher(fileName).matches()) { + if (!isPathPartPortable(fileName)) { fileName = "_" + fileName + "_"; } @@ -79,7 +79,7 @@ public class FileUtil { public static boolean isPathPortable(Path path) { for (Path path2 : path) { - if (RESERVED_WINDOWS_FILENAMES.matcher(path2.toString()).matches()) { + if (!isPathPartPortable(path2.toString())) { return false; } } @@ -87,6 +87,10 @@ public class FileUtil { return true; } + public static boolean isPathPartPortable(String path) { + return !RESERVED_WINDOWS_FILENAMES.matcher(path).matches(); + } + public static Path createPathToResource(Path dirPath, String locationPath, String fileFormat) { String string = locationPath + fileFormat; Path path = Paths.get(string); diff --git a/net/minecraft/SharedConstants.java b/net/minecraft/SharedConstants.java index 3c50eea0..2d3a3623 100644 --- a/net/minecraft/SharedConstants.java +++ b/net/minecraft/SharedConstants.java @@ -34,7 +34,7 @@ public class SharedConstants { * @deprecated Use {@link #getCurrentVersion()} and {@link com.mojang.bridge.game.GameVersion#getWorldVersion()} instead. */ @Deprecated - public static final int WORLD_VERSION = 4325; + public static final int WORLD_VERSION = 4435; @Deprecated public static final String SERIES = "main"; /** @@ -44,7 +44,7 @@ public class SharedConstants { * @deprecated Use {@link #getCurrentVersion()} and {@link com.mojang.bridge.game.GameVersion#getName()} instead. */ @Deprecated - public static final String VERSION_STRING = "1.21.5"; + public static final String VERSION_STRING = "1.21.6"; /** * The numeric format number for the networking protocol used by the release target of this game version. * @@ -54,7 +54,7 @@ public class SharedConstants { * @deprecated Use {@link #getProtocolVersion()} instead. */ @Deprecated - public static final int RELEASE_NETWORK_PROTOCOL_VERSION = 770; + public static final int RELEASE_NETWORK_PROTOCOL_VERSION = 771; /** * The numeric format number for the networking protocol used by the snapshot of this game version. * @@ -66,8 +66,8 @@ public class SharedConstants { * @deprecated Use {@link #getProtocolVersion()} instead. */ @Deprecated - public static final int SNAPSHOT_NETWORK_PROTOCOL_VERSION = 243; - public static final int SNBT_NAG_VERSION = 4292; + public static final int SNAPSHOT_NETWORK_PROTOCOL_VERSION = 256; + public static final int SNBT_NAG_VERSION = 4420; /** * The bit in the networking protocol version for denoting {@linkplain #SNAPSHOT snapshot versions}. * @@ -82,7 +82,7 @@ public class SharedConstants { * @deprecated Use {@link #getCurrentVersion()}, {@link com.mojang.bridge.game.GameVersion#com.mojang.bridge.game.GameVersion#getPackVersion(com.mojang.bridge.game.PackType)}, and com.mojang.bridge.game.PackType#RESOURCE instead. */ @Deprecated - public static final int RESOURCE_PACK_FORMAT = 55; + public static final int RESOURCE_PACK_FORMAT = 63; /** * The format of the data packs used by this game version. Data packs contain server-side data such as recipes, loot tables, and tags. * @@ -90,7 +90,7 @@ public class SharedConstants { * @deprecated Use {@link #getCurrentVersion()}, {@link com.mojang.bridge.game.GameVersion#com.mojang.bridge.game.GameVersion#getPackVersion(com.mojang.bridge.game.PackType)}, and com.mojang.bridge.game.PackType#DATA instead. */ @Deprecated - public static final int DATA_PACK_FORMAT = 71; + public static final int DATA_PACK_FORMAT = 80; @Deprecated public static final int LANGUAGE_FORMAT = 1; public static final int REPORT_FORMAT_VERSION = 1; @@ -110,6 +110,8 @@ public class SharedConstants { public static final boolean DEBUG_HOTKEYS = false; public static final boolean DEBUG_UI_NARRATION = false; public static final boolean DEBUG_RENDER = false; + public static final boolean DEBUG_SHUFFLE_UI_RENDERING_ORDER = false; + public static final boolean DEBUG_RENDER_UI_LAYERING_RECTANGLES = false; public static final boolean DEBUG_PATHFINDING = false; public static final boolean DEBUG_WATER = false; public static final boolean DEBUG_HEIGHTMAP = false; @@ -155,10 +157,12 @@ public class SharedConstants { public static final boolean DEBUG_VAULT_DETECTS_SHEEP_AS_PLAYERS = false; public static final boolean DEBUG_FORCE_ONBOARDING_SCREEN = false; public static final boolean DEBUG_CURSOR_POS = false; + public static final boolean DEBUG_DEFAULT_SKIN_OVERRIDE = false; public static final boolean DEBUG_IGNORE_LOCAL_MOB_CAP = false; public static final boolean DEBUG_DISABLE_LIQUID_SPREADING = false; public static final boolean DEBUG_AQUIFERS = false; public static final boolean DEBUG_JFR_PROFILING_ENABLE_LEVEL_LOADING = false; + public static final boolean DEBUG_ENTITY_BLOCK_INTERSECTION = false; public static boolean debugGenerateSquareTerrainWithoutNoise = false; public static boolean debugGenerateStripedTerrainWithoutNoise = false; public static final boolean DEBUG_ONLY_GENERATE_HALF_THE_WORLD = false; @@ -278,7 +282,7 @@ public class SharedConstants { *

For releases, this will be equivalent to {@link #RELEASE_NETWORK_PROTOCOL_VERSION}. For snapshot versions, this will be the combination (bitwise OR) of {@link #SNAPSHOT_NETWORK_PROTOCOL_VERSION} and the bit marked by {@link #SNAPSHOT_PROTOCOL_BIT}.

*/ public static int getProtocolVersion() { - return 770; + return 771; } public static boolean debugVoidTerrain(ChunkPos chunkPos) { diff --git a/net/minecraft/SystemReport.java b/net/minecraft/SystemReport.java index c0ddd101..f6f4e11f 100644 --- a/net/minecraft/SystemReport.java +++ b/net/minecraft/SystemReport.java @@ -39,8 +39,8 @@ public class SystemReport { private final Map entries = Maps.newLinkedHashMap(); public SystemReport() { - this.setDetail("Minecraft Version", SharedConstants.getCurrentVersion().getName()); - this.setDetail("Minecraft Version ID", SharedConstants.getCurrentVersion().getId()); + this.setDetail("Minecraft Version", SharedConstants.getCurrentVersion().name()); + this.setDetail("Minecraft Version ID", SharedConstants.getCurrentVersion().id()); this.setDetail("Operating System", OPERATING_SYSTEM); this.setDetail("Java Version", JAVA_VERSION); this.setDetail("Java VM Version", JAVA_VM_VERSION); diff --git a/net/minecraft/Util.java b/net/minecraft/Util.java index 2e912aae..53b3ad32 100644 --- a/net/minecraft/Util.java +++ b/net/minecraft/Util.java @@ -82,7 +82,7 @@ import net.minecraft.server.Bootstrap; import net.minecraft.util.Mth; import net.minecraft.util.RandomSource; import net.minecraft.util.SingleKeyCache; -import net.minecraft.util.TimeSource.NanoTimeSource; +import net.minecraft.util.TimeSource; import net.minecraft.util.datafix.DataFixers; import net.minecraft.world.level.block.state.properties.Property; import org.jetbrains.annotations.Nullable; @@ -100,7 +100,7 @@ public class Util { public static final int LINEAR_LOOKUP_THRESHOLD = 8; private static final Set ALLOWED_UNTRUSTED_LINK_PROTOCOLS = Set.of("http", "https"); public static final long NANOS_PER_MILLI = 1000000L; - public static NanoTimeSource timeSource = System::nanoTime; + public static TimeSource.NanoTimeSource timeSource = System::nanoTime; public static final Ticker TICKER = new Ticker() { @Override public long read() { @@ -261,7 +261,7 @@ public class Util { try { type2 = DataFixers.getDataFixer() - .getSchema(DataFixUtils.makeKey(SharedConstants.getCurrentVersion().getDataVersion().getVersion())) + .getSchema(DataFixUtils.makeKey(SharedConstants.getCurrentVersion().dataVersion().version())) .getChoiceType(type, choiceName); } catch (IllegalArgumentException var4) { LOGGER.error("No data fixer registered for {}", choiceName); @@ -1053,8 +1053,18 @@ public class Util { public static enum OS { LINUX("linux"), SOLARIS("solaris"), - WINDOWS("WINDOWS", 2, "windows"), - OSX("OSX", 3, "mac"), + WINDOWS("windows") { + @Override + protected String[] getOpenUriArguments(URI uri) { + return new String[]{"rundll32", "url.dll,FileProtocolHandler", uri.toString()}; + } + }, + OSX("mac") { + @Override + protected String[] getOpenUriArguments(URI uri) { + return new String[]{"open", uri.toString()}; + } + }, UNKNOWN("unknown"); private final String telemetryName; diff --git a/net/minecraft/WorldVersion.java b/net/minecraft/WorldVersion.java index 575d0298..2658fc64 100644 --- a/net/minecraft/WorldVersion.java +++ b/net/minecraft/WorldVersion.java @@ -5,17 +5,29 @@ import net.minecraft.server.packs.PackType; import net.minecraft.world.level.storage.DataVersion; public interface WorldVersion { - DataVersion getDataVersion(); + DataVersion dataVersion(); - String getId(); + String id(); - String getName(); + String name(); - int getProtocolVersion(); + int protocolVersion(); - int getPackVersion(PackType packType); + int packVersion(PackType packType); - Date getBuildTime(); + Date buildTime(); - boolean isStable(); + boolean stable(); + + public record Simple( + String id, String name, DataVersion dataVersion, int protocolVersion, int resourcePackVersion, int datapackVersion, Date buildTime, boolean stable + ) implements WorldVersion { + @Override + public int packVersion(PackType packType) { + return switch (packType) { + case CLIENT_RESOURCES -> this.resourcePackVersion; + case SERVER_DATA -> this.datapackVersion; + }; + } + } } diff --git a/net/minecraft/advancements/Advancement.java b/net/minecraft/advancements/Advancement.java index efd74e85..396c3350 100644 --- a/net/minecraft/advancements/Advancement.java +++ b/net/minecraft/advancements/Advancement.java @@ -8,7 +8,6 @@ import java.util.Map; import java.util.Optional; import java.util.function.Consumer; import net.minecraft.ChatFormatting; -import net.minecraft.advancements.AdvancementRequirements.Strategy; import net.minecraft.advancements.critereon.CriterionValidator; import net.minecraft.core.ClientAsset; import net.minecraft.core.HolderGetter; @@ -105,7 +104,7 @@ public record Advancement( public void validate(ProblemReporter reporter, HolderGetter.Provider lootData) { this.criteria.forEach((string, criterion) -> { - CriterionValidator criterionValidator = new CriterionValidator(reporter.forChild(string), lootData); + CriterionValidator criterionValidator = new CriterionValidator(reporter.forChild(new ProblemReporter.RootFieldPathElement(string)), lootData); criterion.triggerInstance().validate(criterionValidator); }); } @@ -116,7 +115,7 @@ public record Advancement( private AdvancementRewards rewards = AdvancementRewards.EMPTY; private final ImmutableMap.Builder> criteria = ImmutableMap.builder(); private Optional requirements = Optional.empty(); - private Strategy requirementsStrategy = Strategy.AND; + private AdvancementRequirements.Strategy requirementsStrategy = AdvancementRequirements.Strategy.AND; private boolean sendsTelemetryEvent; public static Advancement.Builder advancement() { @@ -189,7 +188,7 @@ public record Advancement( return this; } - public Advancement.Builder requirements(Strategy requirementsStrategy) { + public Advancement.Builder requirements(AdvancementRequirements.Strategy requirementsStrategy) { this.requirementsStrategy = requirementsStrategy; return this; } diff --git a/net/minecraft/advancements/AdvancementRewards.java b/net/minecraft/advancements/AdvancementRewards.java index 1a6c38bd..d384f8e6 100644 --- a/net/minecraft/advancements/AdvancementRewards.java +++ b/net/minecraft/advancements/AdvancementRewards.java @@ -9,6 +9,7 @@ import net.minecraft.commands.CacheableFunction; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.MinecraftServer; +import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; @@ -34,26 +35,27 @@ public record AdvancementRewards(int experience, List> lo public void grant(ServerPlayer player) { player.giveExperiencePoints(this.experience); - LootParams lootParams = new LootParams.Builder(player.serverLevel()) + ServerLevel serverLevel = player.level(); + MinecraftServer minecraftServer = serverLevel.getServer(); + LootParams lootParams = new LootParams.Builder(serverLevel) .withParameter(LootContextParams.THIS_ENTITY, player) .withParameter(LootContextParams.ORIGIN, player.position()) .create(LootContextParamSets.ADVANCEMENT_REWARD); boolean bl = false; for (ResourceKey resourceKey : this.loot) { - for (ItemStack itemStack : player.server.reloadableRegistries().getLootTable(resourceKey).getRandomItems(lootParams)) { + for (ItemStack itemStack : minecraftServer.reloadableRegistries().getLootTable(resourceKey).getRandomItems(lootParams)) { if (player.addItem(itemStack)) { - player.level() - .playSound( - null, - player.getX(), - player.getY(), - player.getZ(), - SoundEvents.ITEM_PICKUP, - SoundSource.PLAYERS, - 0.2F, - ((player.getRandom().nextFloat() - player.getRandom().nextFloat()) * 0.7F + 1.0F) * 2.0F - ); + serverLevel.playSound( + null, + player.getX(), + player.getY(), + player.getZ(), + SoundEvents.ITEM_PICKUP, + SoundSource.PLAYERS, + 0.2F, + ((player.getRandom().nextFloat() - player.getRandom().nextFloat()) * 0.7F + 1.0F) * 2.0F + ); bl = true; } else { ItemEntity itemEntity = player.drop(itemStack, false); @@ -73,7 +75,6 @@ public record AdvancementRewards(int experience, List> lo player.awardRecipesByKey(this.recipes); } - MinecraftServer minecraftServer = player.server; this.function .flatMap(cacheableFunction -> cacheableFunction.get(minecraftServer.getFunctions())) .ifPresent( diff --git a/net/minecraft/advancements/CriteriaTriggers.java b/net/minecraft/advancements/CriteriaTriggers.java index d3ca76c3..7bc86559 100644 --- a/net/minecraft/advancements/CriteriaTriggers.java +++ b/net/minecraft/advancements/CriteriaTriggers.java @@ -94,6 +94,7 @@ public class CriteriaTriggers { public static final PickedUpItemTrigger THROWN_ITEM_PICKED_UP_BY_ENTITY = register("thrown_item_picked_up_by_entity", new PickedUpItemTrigger()); public static final PickedUpItemTrigger THROWN_ITEM_PICKED_UP_BY_PLAYER = register("thrown_item_picked_up_by_player", new PickedUpItemTrigger()); public static final PlayerInteractTrigger PLAYER_INTERACTED_WITH_ENTITY = register("player_interacted_with_entity", new PlayerInteractTrigger()); + public static final PlayerInteractTrigger PLAYER_SHEARED_EQUIPMENT = register("player_sheared_equipment", new PlayerInteractTrigger()); public static final StartRidingTrigger START_RIDING_TRIGGER = register("started_riding", new StartRidingTrigger()); public static final LightningStrikeTrigger LIGHTNING_STRIKE = register("lightning_strike", new LightningStrikeTrigger()); public static final UsingItemTrigger USING_ITEM = register("using_item", new UsingItemTrigger()); diff --git a/net/minecraft/advancements/critereon/AnyBlockInteractionTrigger.java b/net/minecraft/advancements/critereon/AnyBlockInteractionTrigger.java index 2adb9f60..d42cb46c 100644 --- a/net/minecraft/advancements/critereon/AnyBlockInteractionTrigger.java +++ b/net/minecraft/advancements/critereon/AnyBlockInteractionTrigger.java @@ -3,7 +3,6 @@ package net.minecraft.advancements.critereon; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; import java.util.Optional; -import net.minecraft.advancements.critereon.SimpleCriterionTrigger.SimpleInstance; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; @@ -21,7 +20,7 @@ public class AnyBlockInteractionTrigger extends SimpleCriterionTrigger triggerInstance.matches(lootContext)); } - public record TriggerInstance(Optional player, Optional location) implements SimpleInstance { + public record TriggerInstance(Optional player, Optional location) + implements SimpleCriterionTrigger.SimpleInstance { public static final Codec CODEC = RecordCodecBuilder.create( instance -> instance.group( EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter(AnyBlockInteractionTrigger.TriggerInstance::player), @@ -48,8 +48,8 @@ public class AnyBlockInteractionTrigger extends SimpleCriterionTrigger validator.validate(contextAwarePredicate, LootContextParamSets.ADVANCEMENT_LOCATION, ".location")); + SimpleCriterionTrigger.SimpleInstance.super.validate(validator); + this.location.ifPresent(contextAwarePredicate -> validator.validate(contextAwarePredicate, LootContextParamSets.ADVANCEMENT_LOCATION, "location")); } } } diff --git a/net/minecraft/advancements/critereon/BredAnimalsTrigger.java b/net/minecraft/advancements/critereon/BredAnimalsTrigger.java index d22b1d08..e5ab6c8b 100644 --- a/net/minecraft/advancements/critereon/BredAnimalsTrigger.java +++ b/net/minecraft/advancements/critereon/BredAnimalsTrigger.java @@ -73,9 +73,9 @@ public class BredAnimalsTrigger extends SimpleCriterionTrigger triggerInstance.matches(item)); } - public record TriggerInstance(Optional player, Optional item) implements SimpleInstance { + public record TriggerInstance(Optional player, Optional item) implements SimpleCriterionTrigger.SimpleInstance { public static final Codec CODEC = RecordCodecBuilder.create( instance -> instance.group( EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter(ConsumeItemTrigger.TriggerInstance::player), diff --git a/net/minecraft/advancements/critereon/ContextAwarePredicate.java b/net/minecraft/advancements/critereon/ContextAwarePredicate.java index 108b2b8e..ec318d80 100644 --- a/net/minecraft/advancements/critereon/ContextAwarePredicate.java +++ b/net/minecraft/advancements/critereon/ContextAwarePredicate.java @@ -4,6 +4,7 @@ import com.mojang.serialization.Codec; import java.util.List; import java.util.function.Predicate; import net.minecraft.Util; +import net.minecraft.util.ProblemReporter; import net.minecraft.world.level.storage.loot.LootContext; import net.minecraft.world.level.storage.loot.ValidationContext; import net.minecraft.world.level.storage.loot.predicates.LootItemCondition; @@ -31,7 +32,7 @@ public class ContextAwarePredicate { public void validate(ValidationContext context) { for (int i = 0; i < this.conditions.size(); i++) { LootItemCondition lootItemCondition = (LootItemCondition)this.conditions.get(i); - lootItemCondition.validate(context.forChild("[" + i + "]")); + lootItemCondition.validate(context.forChild(new ProblemReporter.IndexedPathElement(i))); } } } diff --git a/net/minecraft/advancements/critereon/CriterionValidator.java b/net/minecraft/advancements/critereon/CriterionValidator.java index acf64b79..ae0ce94c 100644 --- a/net/minecraft/advancements/critereon/CriterionValidator.java +++ b/net/minecraft/advancements/critereon/CriterionValidator.java @@ -30,13 +30,15 @@ public class CriterionValidator { } public void validate(ContextAwarePredicate entity, ContextKeySet contextKeySet, String name) { - entity.validate(new ValidationContext(this.reporter.forChild(name), contextKeySet, this.lootData)); + entity.validate(new ValidationContext(this.reporter.forChild(new ProblemReporter.FieldPathElement(name)), contextKeySet, this.lootData)); } public void validate(List entities, ContextKeySet contextKeySet, String name) { for (int i = 0; i < entities.size(); i++) { ContextAwarePredicate contextAwarePredicate = (ContextAwarePredicate)entities.get(i); - contextAwarePredicate.validate(new ValidationContext(this.reporter.forChild(name + "[" + i + "]"), contextKeySet, this.lootData)); + contextAwarePredicate.validate( + new ValidationContext(this.reporter.forChild(new ProblemReporter.IndexedFieldPathElement(name, i)), contextKeySet, this.lootData) + ); } } } diff --git a/net/minecraft/advancements/critereon/CuredZombieVillagerTrigger.java b/net/minecraft/advancements/critereon/CuredZombieVillagerTrigger.java index 6a0fdb89..86165741 100644 --- a/net/minecraft/advancements/critereon/CuredZombieVillagerTrigger.java +++ b/net/minecraft/advancements/critereon/CuredZombieVillagerTrigger.java @@ -47,8 +47,8 @@ public class CuredZombieVillagerTrigger extends SimpleCriterionTrigger triggerInstance.matches(lootContext)); } - public record TriggerInstance(Optional player, Optional location) implements SimpleInstance { + public record TriggerInstance(Optional player, Optional location) + implements SimpleCriterionTrigger.SimpleInstance { public static final Codec CODEC = RecordCodecBuilder.create( instance -> instance.group( EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter(DefaultBlockInteractionTrigger.TriggerInstance::player), @@ -46,8 +46,8 @@ public class DefaultBlockInteractionTrigger extends SimpleCriterionTrigger validator.validate(contextAwarePredicate, LootContextParamSets.BLOCK_USE, ".location")); + SimpleCriterionTrigger.SimpleInstance.super.validate(validator); + this.location.ifPresent(contextAwarePredicate -> validator.validate(contextAwarePredicate, LootContextParamSets.BLOCK_USE, "location")); } } } diff --git a/net/minecraft/advancements/critereon/DistanceTrigger.java b/net/minecraft/advancements/critereon/DistanceTrigger.java index 18ed1078..1f0e2fce 100644 --- a/net/minecraft/advancements/critereon/DistanceTrigger.java +++ b/net/minecraft/advancements/critereon/DistanceTrigger.java @@ -17,7 +17,7 @@ public class DistanceTrigger extends SimpleCriterionTrigger triggerInstance.matches(player.serverLevel(), position, vec3)); + this.trigger(player, triggerInstance -> triggerInstance.matches(player.level(), position, vec3)); } public record TriggerInstance(Optional player, Optional startPosition, Optional distance) diff --git a/net/minecraft/advancements/critereon/EffectsChangedTrigger.java b/net/minecraft/advancements/critereon/EffectsChangedTrigger.java index c2afbbe2..41bb8908 100644 --- a/net/minecraft/advancements/critereon/EffectsChangedTrigger.java +++ b/net/minecraft/advancements/critereon/EffectsChangedTrigger.java @@ -51,7 +51,7 @@ public class EffectsChangedTrigger extends SimpleCriterionTrigger triggerInstance.matches(player.serverLevel(), pos, vec3, lootContext)); + this.trigger(player, triggerInstance -> triggerInstance.matches(player.level(), pos, vec3, lootContext)); } public record TriggerInstance( @@ -50,7 +50,7 @@ public class FallAfterExplosionTrigger extends SimpleCriterionTrigger player, Optional rod, Optional entity, Optional item - ) implements SimpleInstance { + ) implements SimpleCriterionTrigger.SimpleInstance { public static final Codec CODEC = RecordCodecBuilder.create( instance -> instance.group( EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter(FishingRodHookedTrigger.TriggerInstance::player), @@ -77,8 +76,8 @@ public class FishingRodHookedTrigger extends SimpleCriterionTrigger triggerInstance.matches(inventory, stack, full, empty, occupied)); } - public record TriggerInstance(Optional player, Slots slots, List items) implements SimpleInstance { + public record TriggerInstance(Optional player, InventoryChangeTrigger.TriggerInstance.Slots slots, List items) + implements SimpleCriterionTrigger.SimpleInstance { public static final Codec CODEC = RecordCodecBuilder.create( instance -> instance.group( EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter(InventoryChangeTrigger.TriggerInstance::player), - Slots.CODEC.optionalFieldOf("slots", Slots.ANY).forGetter(InventoryChangeTrigger.TriggerInstance::slots), + InventoryChangeTrigger.TriggerInstance.Slots.CODEC + .optionalFieldOf("slots", InventoryChangeTrigger.TriggerInstance.Slots.ANY) + .forGetter(InventoryChangeTrigger.TriggerInstance::slots), ItemPredicate.CODEC.listOf().optionalFieldOf("items", List.of()).forGetter(InventoryChangeTrigger.TriggerInstance::items) ) .apply(instance, InventoryChangeTrigger.TriggerInstance::new) @@ -61,7 +62,8 @@ public class InventoryChangeTrigger extends SimpleCriterionTrigger hasItems(ItemPredicate... items) { - return CriteriaTriggers.INVENTORY_CHANGED.createCriterion(new InventoryChangeTrigger.TriggerInstance(Optional.empty(), Slots.ANY, List.of(items))); + return CriteriaTriggers.INVENTORY_CHANGED + .createCriterion(new InventoryChangeTrigger.TriggerInstance(Optional.empty(), InventoryChangeTrigger.TriggerInstance.Slots.ANY, List.of(items))); } public static Criterion hasItems(ItemLike... items) { @@ -101,5 +103,27 @@ public class InventoryChangeTrigger extends SimpleCriterionTrigger CODEC = RecordCodecBuilder.create( + instance -> instance.group( + MinMaxBounds.Ints.CODEC.optionalFieldOf("occupied", MinMaxBounds.Ints.ANY).forGetter(InventoryChangeTrigger.TriggerInstance.Slots::occupied), + MinMaxBounds.Ints.CODEC.optionalFieldOf("full", MinMaxBounds.Ints.ANY).forGetter(InventoryChangeTrigger.TriggerInstance.Slots::full), + MinMaxBounds.Ints.CODEC.optionalFieldOf("empty", MinMaxBounds.Ints.ANY).forGetter(InventoryChangeTrigger.TriggerInstance.Slots::empty) + ) + .apply(instance, InventoryChangeTrigger.TriggerInstance.Slots::new) + ); + public static final InventoryChangeTrigger.TriggerInstance.Slots ANY = new InventoryChangeTrigger.TriggerInstance.Slots( + MinMaxBounds.Ints.ANY, MinMaxBounds.Ints.ANY, MinMaxBounds.Ints.ANY + ); + + public boolean matches(int full, int empty, int occupied) { + if (!this.full.matches(full)) { + return false; + } else { + return !this.empty.matches(empty) ? false : this.occupied.matches(occupied); + } + } + } } } diff --git a/net/minecraft/advancements/critereon/ItemPredicate.java b/net/minecraft/advancements/critereon/ItemPredicate.java index 3c1648ae..ece1b8cb 100644 --- a/net/minecraft/advancements/critereon/ItemPredicate.java +++ b/net/minecraft/advancements/critereon/ItemPredicate.java @@ -24,11 +24,11 @@ public record ItemPredicate(Optional> items, MinMaxBounds.Ints c .apply(instance, ItemPredicate::new) ); - public boolean test(ItemStack itemStack) { - if (this.items.isPresent() && !itemStack.is((HolderSet)this.items.get())) { + public boolean test(ItemStack stack) { + if (this.items.isPresent() && !stack.is((HolderSet)this.items.get())) { return false; } else { - return !this.count.matches(itemStack.getCount()) ? false : this.components.test((DataComponentGetter)itemStack); + return !this.count.matches(stack.getCount()) ? false : this.components.test((DataComponentGetter)stack); } } diff --git a/net/minecraft/advancements/critereon/ItemUsedOnLocationTrigger.java b/net/minecraft/advancements/critereon/ItemUsedOnLocationTrigger.java index e1a11891..4b9ba8fc 100644 --- a/net/minecraft/advancements/critereon/ItemUsedOnLocationTrigger.java +++ b/net/minecraft/advancements/critereon/ItemUsedOnLocationTrigger.java @@ -6,14 +6,14 @@ import java.util.Arrays; import java.util.Optional; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.advancements.Criterion; -import net.minecraft.advancements.critereon.LocationPredicate.Builder; -import net.minecraft.advancements.critereon.SimpleCriterionTrigger.SimpleInstance; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; +import net.minecraft.util.StringRepresentable; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.properties.Property; import net.minecraft.world.level.storage.loot.LootContext; import net.minecraft.world.level.storage.loot.LootParams; import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets; @@ -30,7 +30,7 @@ public class ItemUsedOnLocationTrigger extends SimpleCriterionTrigger triggerInstance.matches(lootContext)); } - public record TriggerInstance(Optional player, Optional location) implements SimpleInstance { + public record TriggerInstance(Optional player, Optional location) + implements SimpleCriterionTrigger.SimpleInstance { public static final Codec CODEC = RecordCodecBuilder.create( instance -> instance.group( EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter(ItemUsedOnLocationTrigger.TriggerInstance::player), @@ -63,18 +64,42 @@ public class ItemUsedOnLocationTrigger extends SimpleCriterionTrigger> Criterion placedBlockWithProperties( + Block block, Property property, String value + ) { + StatePropertiesPredicate.Builder builder = StatePropertiesPredicate.Builder.properties().hasProperty(property, value); + ContextAwarePredicate contextAwarePredicate = ContextAwarePredicate.create( + LootItemBlockStatePropertyCondition.hasBlockStateProperties(block).setProperties(builder).build() + ); + return CriteriaTriggers.PLACED_BLOCK.createCriterion(new ItemUsedOnLocationTrigger.TriggerInstance(Optional.empty(), Optional.of(contextAwarePredicate))); + } + + public static Criterion placedBlockWithProperties(Block block, Property property, boolean value) { + return placedBlockWithProperties(block, property, String.valueOf(value)); + } + + public static Criterion placedBlockWithProperties(Block block, Property property, int value) { + return placedBlockWithProperties(block, property, String.valueOf(value)); + } + + public static & StringRepresentable> Criterion placedBlockWithProperties( + Block block, Property property, T value + ) { + return placedBlockWithProperties(block, property, value.getSerializedName()); + } + + private static ItemUsedOnLocationTrigger.TriggerInstance itemUsedOnLocation(LocationPredicate.Builder location, ItemPredicate.Builder tool) { ContextAwarePredicate contextAwarePredicate = ContextAwarePredicate.create( LocationCheck.checkLocation(location).build(), MatchTool.toolMatches(tool).build() ); return new ItemUsedOnLocationTrigger.TriggerInstance(Optional.empty(), Optional.of(contextAwarePredicate)); } - public static Criterion itemUsedOnBlock(Builder location, ItemPredicate.Builder tool) { + public static Criterion itemUsedOnBlock(LocationPredicate.Builder location, ItemPredicate.Builder tool) { return CriteriaTriggers.ITEM_USED_ON_BLOCK.createCriterion(itemUsedOnLocation(location, tool)); } - public static Criterion allayDropItemOnBlock(Builder location, ItemPredicate.Builder tool) { + public static Criterion allayDropItemOnBlock(LocationPredicate.Builder location, ItemPredicate.Builder tool) { return CriteriaTriggers.ALLAY_DROP_ITEM_ON_BLOCK.createCriterion(itemUsedOnLocation(location, tool)); } @@ -84,8 +109,8 @@ public class ItemUsedOnLocationTrigger extends SimpleCriterionTrigger validator.validate(contextAwarePredicate, LootContextParamSets.ADVANCEMENT_LOCATION, ".location")); + SimpleCriterionTrigger.SimpleInstance.super.validate(validator); + this.location.ifPresent(contextAwarePredicate -> validator.validate(contextAwarePredicate, LootContextParamSets.ADVANCEMENT_LOCATION, "location")); } } } diff --git a/net/minecraft/advancements/critereon/KilledByArrowTrigger.java b/net/minecraft/advancements/critereon/KilledByArrowTrigger.java index 1d29e798..94b755fa 100644 --- a/net/minecraft/advancements/critereon/KilledByArrowTrigger.java +++ b/net/minecraft/advancements/critereon/KilledByArrowTrigger.java @@ -11,8 +11,6 @@ import java.util.Optional; import java.util.Set; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.advancements.Criterion; -import net.minecraft.advancements.critereon.MinMaxBounds.Ints; -import net.minecraft.advancements.critereon.SimpleCriterionTrigger.SimpleInstance; import net.minecraft.core.HolderGetter; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.Entity; @@ -42,13 +40,13 @@ public class KilledByArrowTrigger extends SimpleCriterionTrigger player, List victims, Ints uniqueEntityTypes, Optional firedFromWeapon - ) implements SimpleInstance { + Optional player, List victims, MinMaxBounds.Ints uniqueEntityTypes, Optional firedFromWeapon + ) implements SimpleCriterionTrigger.SimpleInstance { public static final Codec CODEC = RecordCodecBuilder.create( instance -> instance.group( EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter(KilledByArrowTrigger.TriggerInstance::player), EntityPredicate.ADVANCEMENT_CODEC.listOf().optionalFieldOf("victims", List.of()).forGetter(KilledByArrowTrigger.TriggerInstance::victims), - Ints.CODEC.optionalFieldOf("unique_entity_types", Ints.ANY).forGetter(KilledByArrowTrigger.TriggerInstance::uniqueEntityTypes), + MinMaxBounds.Ints.CODEC.optionalFieldOf("unique_entity_types", MinMaxBounds.Ints.ANY).forGetter(KilledByArrowTrigger.TriggerInstance::uniqueEntityTypes), ItemPredicate.CODEC.optionalFieldOf("fired_from_weapon").forGetter(KilledByArrowTrigger.TriggerInstance::firedFromWeapon) ) .apply(instance, KilledByArrowTrigger.TriggerInstance::new) @@ -58,12 +56,15 @@ public class KilledByArrowTrigger extends SimpleCriterionTrigger crossbowKilled(HolderGetter itemRegistry, Ints uniqueEntityTypes) { + public static Criterion crossbowKilled(HolderGetter itemRegistry, MinMaxBounds.Ints uniqueEntityTypes) { return CriteriaTriggers.KILLED_BY_ARROW .createCriterion( new KilledByArrowTrigger.TriggerInstance( @@ -104,8 +105,8 @@ public class KilledByArrowTrigger extends SimpleCriterionTrigger triggerInstance.matches(lootTable)); } - public record TriggerInstance(Optional player, ResourceKey lootTable) implements SimpleInstance { + public record TriggerInstance(Optional player, ResourceKey lootTable) implements SimpleCriterionTrigger.SimpleInstance { public static final Codec CODEC = RecordCodecBuilder.create( instance -> instance.group( EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter(LootTableTrigger.TriggerInstance::player), diff --git a/net/minecraft/advancements/critereon/MinMaxBounds.java b/net/minecraft/advancements/critereon/MinMaxBounds.java index fe975e5d..afede7ef 100644 --- a/net/minecraft/advancements/critereon/MinMaxBounds.java +++ b/net/minecraft/advancements/critereon/MinMaxBounds.java @@ -52,19 +52,19 @@ public interface MinMaxBounds { private static final int MIN_FLAG = 1; public static final int MAX_FLAG = 2; - public R decode(B byteBuf) { - byte b = byteBuf.readByte(); - Optional optional = (b & 1) != 0 ? Optional.of(streamCodec.decode(byteBuf)) : Optional.empty(); - Optional optional2 = (b & 2) != 0 ? Optional.of(streamCodec.decode(byteBuf)) : Optional.empty(); + public R decode(B buffer) { + byte b = buffer.readByte(); + Optional optional = (b & 1) != 0 ? Optional.of(streamCodec.decode(buffer)) : Optional.empty(); + Optional optional2 = (b & 2) != 0 ? Optional.of(streamCodec.decode(buffer)) : Optional.empty(); return boundsFactory.create(optional, optional2); } - public void encode(B byteBuf, R minMaxBounds) { - Optional optional = minMaxBounds.min(); - Optional optional2 = minMaxBounds.max(); - byteBuf.writeByte((optional.isPresent() ? 1 : 0) | (optional2.isPresent() ? 2 : 0)); - optional.ifPresent(number -> streamCodec.encode(byteBuf, (T)number)); - optional2.ifPresent(number -> streamCodec.encode(byteBuf, (T)number)); + public void encode(B buffer, R value) { + Optional optional = value.min(); + Optional optional2 = value.max(); + buffer.writeByte((optional.isPresent() ? 1 : 0) | (optional2.isPresent() ? 2 : 0)); + optional.ifPresent(number -> streamCodec.encode(buffer, (T)number)); + optional2.ifPresent(number -> streamCodec.encode(buffer, (T)number)); } }; } diff --git a/net/minecraft/advancements/critereon/NbtPredicate.java b/net/minecraft/advancements/critereon/NbtPredicate.java index 3b202cc5..b210c114 100644 --- a/net/minecraft/advancements/critereon/NbtPredicate.java +++ b/net/minecraft/advancements/critereon/NbtPredicate.java @@ -1,5 +1,6 @@ package net.minecraft.advancements.critereon; +import com.mojang.logging.LogUtils; import com.mojang.serialization.Codec; import io.netty.buffer.ByteBuf; import net.minecraft.core.component.DataComponentGetter; @@ -10,15 +11,20 @@ import net.minecraft.nbt.Tag; import net.minecraft.nbt.TagParser; import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.codec.StreamCodec; +import net.minecraft.util.ProblemReporter; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.component.CustomData; +import net.minecraft.world.level.storage.TagValueOutput; import org.jetbrains.annotations.Nullable; +import org.slf4j.Logger; public record NbtPredicate(CompoundTag tag) { + private static final Logger LOGGER = LogUtils.getLogger(); public static final Codec CODEC = TagParser.LENIENT_CODEC.xmap(NbtPredicate::new, NbtPredicate::tag); public static final StreamCodec STREAM_CODEC = ByteBufCodecs.COMPOUND_TAG.map(NbtPredicate::new, NbtPredicate::tag); + public static final String SELECTED_ITEM_TAG = "SelectedItem"; public boolean matches(DataComponentGetter componentGetter) { CustomData customData = componentGetter.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY); @@ -34,14 +40,20 @@ public record NbtPredicate(CompoundTag tag) { } public static CompoundTag getEntityTagToCompare(Entity entity) { - CompoundTag compoundTag = entity.saveWithoutId(new CompoundTag()); - if (entity instanceof Player player) { - ItemStack itemStack = player.getInventory().getSelectedItem(); - if (!itemStack.isEmpty()) { - compoundTag.put("SelectedItem", itemStack.save(entity.registryAccess())); + CompoundTag var7; + try (ProblemReporter.ScopedCollector scopedCollector = new ProblemReporter.ScopedCollector(entity.problemPath(), LOGGER)) { + TagValueOutput tagValueOutput = TagValueOutput.createWithContext(scopedCollector, entity.registryAccess()); + entity.saveWithoutId(tagValueOutput); + if (entity instanceof Player player) { + ItemStack itemStack = player.getInventory().getSelectedItem(); + if (!itemStack.isEmpty()) { + tagValueOutput.store("SelectedItem", ItemStack.CODEC, itemStack); + } } + + var7 = tagValueOutput.buildResult(); } - return compoundTag; + return var7; } } diff --git a/net/minecraft/advancements/critereon/PickedUpItemTrigger.java b/net/minecraft/advancements/critereon/PickedUpItemTrigger.java index 73a0105c..7d91db0f 100644 --- a/net/minecraft/advancements/critereon/PickedUpItemTrigger.java +++ b/net/minecraft/advancements/critereon/PickedUpItemTrigger.java @@ -54,7 +54,7 @@ public class PickedUpItemTrigger extends SimpleCriterionTrigger equipmentSheared( + Optional player, ItemPredicate.Builder item, Optional entity + ) { + return CriteriaTriggers.PLAYER_SHEARED_EQUIPMENT.createCriterion(new PlayerInteractTrigger.TriggerInstance(player, Optional.of(item.build()), entity)); + } + + public static Criterion equipmentSheared(ItemPredicate.Builder iten, Optional entity) { + return CriteriaTriggers.PLAYER_SHEARED_EQUIPMENT + .createCriterion(new PlayerInteractTrigger.TriggerInstance(Optional.empty(), Optional.of(iten.build()), entity)); + } + public static Criterion itemUsedOnEntity(ItemPredicate.Builder item, Optional entity) { return itemUsedOnEntity(Optional.empty(), item, entity); } @@ -51,7 +62,7 @@ public class PlayerInteractTrigger extends SimpleCriterionTrigger !entityx.isSpectator(), 0.0F ); - if (entityHitResult == null || entityHitResult.getType() != Type.ENTITY) { + if (entityHitResult == null || entityHitResult.getType() != HitResult.Type.ENTITY) { return false; } @@ -190,7 +189,7 @@ public record PlayerPredicate( return this; } - public PlayerPredicate.Builder addStat(StatType type, Reference value, MinMaxBounds.Ints range) { + public PlayerPredicate.Builder addStat(StatType type, Holder.Reference value, MinMaxBounds.Ints range) { this.stats.add(new PlayerPredicate.StatMatcher<>(type, value, range)); return this; } diff --git a/net/minecraft/advancements/critereon/PlayerTrigger.java b/net/minecraft/advancements/critereon/PlayerTrigger.java index 01e3ddcd..bcdc5d68 100644 --- a/net/minecraft/advancements/critereon/PlayerTrigger.java +++ b/net/minecraft/advancements/critereon/PlayerTrigger.java @@ -5,8 +5,6 @@ import com.mojang.serialization.codecs.RecordCodecBuilder; import java.util.Optional; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.advancements.Criterion; -import net.minecraft.advancements.critereon.LocationPredicate.Builder; -import net.minecraft.advancements.critereon.SimpleCriterionTrigger.SimpleInstance; import net.minecraft.core.HolderGetter; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.item.Item; @@ -22,13 +20,13 @@ public class PlayerTrigger extends SimpleCriterionTrigger true); } - public record TriggerInstance(Optional player) implements SimpleInstance { + public record TriggerInstance(Optional player) implements SimpleCriterionTrigger.SimpleInstance { public static final Codec CODEC = RecordCodecBuilder.create( instance -> instance.group(EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter(PlayerTrigger.TriggerInstance::player)) .apply(instance, PlayerTrigger.TriggerInstance::new) ); - public static Criterion located(Builder location) { + public static Criterion located(LocationPredicate.Builder location) { return CriteriaTriggers.LOCATION .createCriterion(new PlayerTrigger.TriggerInstance(Optional.of(EntityPredicate.wrap(EntityPredicate.Builder.entity().located(location))))); } @@ -63,7 +61,7 @@ public class PlayerTrigger extends SimpleCriterionTrigger player, ResourceKey> recipeId, List ingredients) - implements SimpleInstance { + implements SimpleCriterionTrigger.SimpleInstance { public static final Codec CODEC = RecordCodecBuilder.create( instance -> instance.group( EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter(RecipeCraftedTrigger.TriggerInstance::player), diff --git a/net/minecraft/advancements/critereon/RecipeUnlockedTrigger.java b/net/minecraft/advancements/critereon/RecipeUnlockedTrigger.java index 9ca45eb6..5ea77874 100644 --- a/net/minecraft/advancements/critereon/RecipeUnlockedTrigger.java +++ b/net/minecraft/advancements/critereon/RecipeUnlockedTrigger.java @@ -5,7 +5,6 @@ import com.mojang.serialization.codecs.RecordCodecBuilder; import java.util.Optional; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.advancements.Criterion; -import net.minecraft.advancements.critereon.SimpleCriterionTrigger.SimpleInstance; import net.minecraft.resources.ResourceKey; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.item.crafting.Recipe; @@ -25,7 +24,7 @@ public class RecipeUnlockedTrigger extends SimpleCriterionTrigger player, ResourceKey> recipe) implements SimpleInstance { + public record TriggerInstance(Optional player, ResourceKey> recipe) implements SimpleCriterionTrigger.SimpleInstance { public static final Codec CODEC = RecordCodecBuilder.create( instance -> instance.group( EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter(RecipeUnlockedTrigger.TriggerInstance::player), diff --git a/net/minecraft/advancements/critereon/ShotCrossbowTrigger.java b/net/minecraft/advancements/critereon/ShotCrossbowTrigger.java index 75401768..6c055ad2 100644 --- a/net/minecraft/advancements/critereon/ShotCrossbowTrigger.java +++ b/net/minecraft/advancements/critereon/ShotCrossbowTrigger.java @@ -5,7 +5,6 @@ import com.mojang.serialization.codecs.RecordCodecBuilder; import java.util.Optional; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.advancements.Criterion; -import net.minecraft.advancements.critereon.SimpleCriterionTrigger.SimpleInstance; import net.minecraft.core.HolderGetter; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.item.Item; @@ -22,7 +21,7 @@ public class ShotCrossbowTrigger extends SimpleCriterionTrigger triggerInstance.matches(stack)); } - public record TriggerInstance(Optional player, Optional item) implements SimpleInstance { + public record TriggerInstance(Optional player, Optional item) implements SimpleCriterionTrigger.SimpleInstance { public static final Codec CODEC = RecordCodecBuilder.create( instance -> instance.group( EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter(ShotCrossbowTrigger.TriggerInstance::player), diff --git a/net/minecraft/advancements/critereon/SimpleCriterionTrigger.java b/net/minecraft/advancements/critereon/SimpleCriterionTrigger.java index bf85301e..5c917f19 100644 --- a/net/minecraft/advancements/critereon/SimpleCriterionTrigger.java +++ b/net/minecraft/advancements/critereon/SimpleCriterionTrigger.java @@ -70,7 +70,7 @@ public abstract class SimpleCriterionTrigger player(); diff --git a/net/minecraft/advancements/critereon/SummonedEntityTrigger.java b/net/minecraft/advancements/critereon/SummonedEntityTrigger.java index 222f2d38..fea73bef 100644 --- a/net/minecraft/advancements/critereon/SummonedEntityTrigger.java +++ b/net/minecraft/advancements/critereon/SummonedEntityTrigger.java @@ -41,7 +41,7 @@ public class SummonedEntityTrigger extends SimpleCriterionTrigger triggerInstance.matches(item)); } - public record TriggerInstance(Optional player, Optional item) implements SimpleInstance { + public record TriggerInstance(Optional player, Optional item) implements SimpleCriterionTrigger.SimpleInstance { public static final Codec CODEC = RecordCodecBuilder.create( instance -> instance.group( EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter(UsedTotemTrigger.TriggerInstance::player), diff --git a/net/minecraft/client/Camera.java b/net/minecraft/client/Camera.java index 93612f71..0ca508eb 100644 --- a/net/minecraft/client/Camera.java +++ b/net/minecraft/client/Camera.java @@ -9,24 +9,23 @@ import net.minecraft.tags.FluidTags; import net.minecraft.util.Mth; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.entity.vehicle.Minecart; import net.minecraft.world.entity.vehicle.NewMinecartBehavior; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.ClipContext; -import net.minecraft.world.level.ClipContext.Block; -import net.minecraft.world.level.ClipContext.Fluid; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.FluidState; import net.minecraft.world.level.material.FogType; import net.minecraft.world.phys.HitResult; import net.minecraft.world.phys.Vec3; -import net.minecraft.world.phys.HitResult.Type; +import net.minecraft.world.waypoints.TrackedWaypoint; import org.joml.Quaternionf; import org.joml.Vector3f; @Environment(EnvType.CLIENT) -public class Camera { +public class Camera implements TrackedWaypoint.Camera { private static final float DEFAULT_CAMERA_DISTANCE = 4.0F; private static final Vector3f FORWARDS = new Vector3f(0.0F, 0.0F, -1.0F); private static final Vector3f UP = new Vector3f(0.0F, 1.0F, 0.0F); @@ -78,8 +77,21 @@ public class Camera { this.setRotation(this.yRot + 180.0F, -this.xRot); } - float f = entity instanceof LivingEntity livingEntity ? livingEntity.getScale() : 1.0F; - this.move(-this.getMaxZoom(4.0F * f), 0.0F, 0.0F); + float f = 4.0F; + float g = 1.0F; + if (entity instanceof LivingEntity livingEntity) { + g = livingEntity.getScale(); + f = (float)livingEntity.getAttributeValue(Attributes.CAMERA_DISTANCE); + } + + float h = g; + float i = f; + if (entity.isPassenger() && entity.getVehicle() instanceof LivingEntity livingEntity2) { + h = livingEntity2.getScale(); + i = (float)livingEntity2.getAttributeValue(Attributes.CAMERA_DISTANCE); + } + + this.move(-this.getMaxZoom(Math.max(g * f, h * i)), 0.0F, 0.0F); } else if (entity instanceof LivingEntity && ((LivingEntity)entity).isSleeping()) { Direction direction = ((LivingEntity)entity).getBedOrientation(); this.setRotation(direction != null ? direction.toYRot() - 180.0F : 0.0F, 0.0F); @@ -103,8 +115,8 @@ public class Camera { float j = (i >> 2 & 1) * 2 - 1; Vec3 vec3 = this.position.add(g * 0.1F, h * 0.1F, j * 0.1F); Vec3 vec32 = vec3.add(new Vec3(this.forwards).scale(-maxZoom)); - HitResult hitResult = this.level.clip(new ClipContext(vec3, vec32, Block.VISUAL, Fluid.NONE, this.entity)); - if (hitResult.getType() != Type.MISS) { + HitResult hitResult = this.level.clip(new ClipContext(vec3, vec32, ClipContext.Block.VISUAL, ClipContext.Fluid.NONE, this.entity)); + if (hitResult.getType() != HitResult.Type.MISS) { float k = (float)hitResult.getLocation().distanceToSqr(this.position); if (k < Mth.square(maxZoom)) { maxZoom = Mth.sqrt(k); @@ -237,6 +249,16 @@ public class Camera { return this.partialTickTime; } + @Override + public float yaw() { + return Mth.wrapDegrees(this.getYRot()); + } + + @Override + public Vec3 position() { + return this.getPosition(); + } + @Environment(EnvType.CLIENT) public static class NearPlane { final Vec3 forward; diff --git a/net/minecraft/client/ClientBootstrap.java b/net/minecraft/client/ClientBootstrap.java index 34af8b87..371edb4f 100644 --- a/net/minecraft/client/ClientBootstrap.java +++ b/net/minecraft/client/ClientBootstrap.java @@ -3,6 +3,9 @@ package net.minecraft.client; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.color.item.ItemTintSources; +import net.minecraft.client.gui.screens.dialog.DialogScreens; +import net.minecraft.client.gui.screens.dialog.body.DialogBodyHandlers; +import net.minecraft.client.gui.screens.dialog.input.InputControlHandlers; import net.minecraft.client.renderer.item.ItemModels; import net.minecraft.client.renderer.item.properties.conditional.ConditionalItemModelProperties; import net.minecraft.client.renderer.item.properties.numeric.RangeSelectItemModelProperties; @@ -24,6 +27,9 @@ public class ClientBootstrap { ConditionalItemModelProperties.bootstrap(); RangeSelectItemModelProperties.bootstrap(); SpriteSources.bootstrap(); + DialogScreens.bootstrap(); + InputControlHandlers.bootstrap(); + DialogBodyHandlers.bootstrap(); } } } diff --git a/net/minecraft/client/GameNarrator.java b/net/minecraft/client/GameNarrator.java index 92f35ebb..958ab0b4 100644 --- a/net/minecraft/client/GameNarrator.java +++ b/net/minecraft/client/GameNarrator.java @@ -25,27 +25,37 @@ public class GameNarrator { this.minecraft = minecraft; } - public void sayChat(Component message) { + public void sayChatQueued(Component message) { if (this.getStatus().shouldNarrateChat()) { - String string = message.getString(); - this.logNarratedMessage(string); - this.narrateMessage(string, false); + this.narrateNotInterruptingMessage(message); } } - public void say(Component message) { + public void saySystemChatQueued(Component message) { + if (this.getStatus().shouldNarrateSystemOrChat()) { + this.narrateNotInterruptingMessage(message); + } + } + + public void saySystemQueued(Component message) { + if (this.getStatus().shouldNarrateSystem()) { + this.narrateNotInterruptingMessage(message); + } + } + + private void narrateNotInterruptingMessage(Component message) { String string = message.getString(); - if (this.getStatus().shouldNarrateSystem() && !string.isEmpty()) { + if (!string.isEmpty()) { this.logNarratedMessage(string); this.narrateMessage(string, false); } } - public void sayNow(Component message) { - this.sayNow(message.getString()); + public void saySystemNow(Component message) { + this.saySystemNow(message.getString()); } - public void sayNow(String message) { + public void saySystemNow(String message) { if (this.getStatus().shouldNarrateSystem() && !message.isEmpty()) { this.logNarratedMessage(message); if (this.narrator.active()) { diff --git a/net/minecraft/client/GuiMessageTag.java b/net/minecraft/client/GuiMessageTag.java index fa387420..c784369c 100644 --- a/net/minecraft/client/GuiMessageTag.java +++ b/net/minecraft/client/GuiMessageTag.java @@ -4,7 +4,7 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.RenderPipelines; import net.minecraft.network.chat.CommonComponents; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; @@ -61,7 +61,7 @@ public record GuiMessageTag(int indicatorColor, @Nullable GuiMessageTag.Icon ico } public void draw(GuiGraphics guiGraphics, int x, int y) { - guiGraphics.blitSprite(RenderType::guiTextured, this.sprite, x, y, this.width, this.height); + guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, this.sprite, x, y, this.width, this.height); } } } diff --git a/net/minecraft/client/KeyMapping.java b/net/minecraft/client/KeyMapping.java index d137fb56..1cd69823 100644 --- a/net/minecraft/client/KeyMapping.java +++ b/net/minecraft/client/KeyMapping.java @@ -3,8 +3,6 @@ package net.minecraft.client; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.mojang.blaze3d.platform.InputConstants; -import com.mojang.blaze3d.platform.InputConstants.Key; -import com.mojang.blaze3d.platform.InputConstants.Type; import java.util.Map; import java.util.Set; import java.util.function.Supplier; @@ -18,7 +16,7 @@ import org.jetbrains.annotations.Nullable; @Environment(EnvType.CLIENT) public class KeyMapping implements Comparable { private static final Map ALL = Maps.newHashMap(); - private static final Map MAP = Maps.newHashMap(); + private static final Map MAP = Maps.newHashMap(); private static final Set CATEGORIES = Sets.newHashSet(); public static final String CATEGORY_MOVEMENT = "key.categories.movement"; public static final String CATEGORY_MISC = "key.categories.misc"; @@ -37,20 +35,20 @@ public class KeyMapping implements Comparable { hashMap.put("key.categories.misc", 7); }); private final String name; - private final Key defaultKey; + private final InputConstants.Key defaultKey; private final String category; - private Key key; + private InputConstants.Key key; private boolean isDown; private int clickCount; - public static void click(Key key) { + public static void click(InputConstants.Key key) { KeyMapping keyMapping = (KeyMapping)MAP.get(key); if (keyMapping != null) { keyMapping.clickCount++; } } - public static void set(Key key, boolean held) { + public static void set(InputConstants.Key key, boolean held) { KeyMapping keyMapping = (KeyMapping)MAP.get(key); if (keyMapping != null) { keyMapping.setDown(held); @@ -62,7 +60,7 @@ public class KeyMapping implements Comparable { */ public static void setAll() { for (KeyMapping keyMapping : ALL.values()) { - if (keyMapping.key.getType() == Type.KEYSYM && keyMapping.key.getValue() != InputConstants.UNKNOWN.getValue()) { + if (keyMapping.key.getType() == InputConstants.Type.KEYSYM && keyMapping.key.getValue() != InputConstants.UNKNOWN.getValue()) { keyMapping.setDown(InputConstants.isKeyDown(Minecraft.getInstance().getWindow().getWindow(), keyMapping.key.getValue())); } } @@ -91,10 +89,10 @@ public class KeyMapping implements Comparable { } public KeyMapping(String name, int keyCode, String category) { - this(name, Type.KEYSYM, keyCode, category); + this(name, InputConstants.Type.KEYSYM, keyCode, category); } - public KeyMapping(String name, Type type, int keyCode, String category) { + public KeyMapping(String name, InputConstants.Type type, int keyCode, String category) { this.name = name; this.key = type.getOrCreate(keyCode); this.defaultKey = this.key; @@ -136,21 +134,21 @@ public class KeyMapping implements Comparable { return this.name; } - public Key getDefaultKey() { + public InputConstants.Key getDefaultKey() { return this.defaultKey; } /** * Binds a new KeyCode to this */ - public void setKey(Key key) { + public void setKey(InputConstants.Key key) { this.key = key; } - public int compareTo(KeyMapping keyMapping) { - return this.category.equals(keyMapping.category) - ? I18n.get(this.name).compareTo(I18n.get(keyMapping.name)) - : ((Integer)CATEGORY_SORT_ORDER.get(this.category)).compareTo((Integer)CATEGORY_SORT_ORDER.get(keyMapping.category)); + public int compareTo(KeyMapping other) { + return this.category.equals(other.category) + ? I18n.get(this.name).compareTo(I18n.get(other.name)) + : ((Integer)CATEGORY_SORT_ORDER.get(this.category)).compareTo((Integer)CATEGORY_SORT_ORDER.get(other.category)); } /** @@ -174,15 +172,15 @@ public class KeyMapping implements Comparable { public boolean matches(int keysym, int scancode) { return keysym == InputConstants.UNKNOWN.getValue() - ? this.key.getType() == Type.SCANCODE && this.key.getValue() == scancode - : this.key.getType() == Type.KEYSYM && this.key.getValue() == keysym; + ? this.key.getType() == InputConstants.Type.SCANCODE && this.key.getValue() == scancode + : this.key.getType() == InputConstants.Type.KEYSYM && this.key.getValue() == keysym; } /** * Returns {@code true} if the {@code KeyMapping} is set to a mouse key and the key matches. */ public boolean matchesMouse(int key) { - return this.key.getType() == Type.MOUSE && this.key.getValue() == key; + return this.key.getType() == InputConstants.Type.MOUSE && this.key.getValue() == key; } public Component getTranslatedKeyMessage() { diff --git a/net/minecraft/client/KeyboardHandler.java b/net/minecraft/client/KeyboardHandler.java index af958aa9..1709fe53 100644 --- a/net/minecraft/client/KeyboardHandler.java +++ b/net/minecraft/client/KeyboardHandler.java @@ -5,7 +5,7 @@ import com.mojang.blaze3d.Blaze3D; import com.mojang.blaze3d.platform.ClipboardManager; import com.mojang.blaze3d.platform.InputConstants; import com.mojang.blaze3d.platform.TextureUtil; -import com.mojang.blaze3d.platform.InputConstants.Key; +import com.mojang.logging.LogUtils; import java.nio.file.Path; import java.text.MessageFormat; import java.util.Locale; @@ -16,7 +16,6 @@ import net.minecraft.CrashReport; import net.minecraft.CrashReportCategory; import net.minecraft.ReportedException; import net.minecraft.Util; -import net.minecraft.client.gui.components.ChatComponent; import net.minecraft.client.gui.components.EditBox; import net.minecraft.client.gui.screens.PauseScreen; import net.minecraft.client.gui.screens.Screen; @@ -25,7 +24,7 @@ import net.minecraft.client.gui.screens.options.VideoSettingsScreen; import net.minecraft.client.gui.screens.options.controls.KeyBindsScreen; import net.minecraft.client.multiplayer.ClientPacketListener; import net.minecraft.client.player.LocalPlayer; -import net.minecraft.client.renderer.FogRenderer; +import net.minecraft.client.renderer.fog.FogRenderer; import net.minecraft.commands.arguments.blocks.BlockStateParser; import net.minecraft.core.BlockPos; import net.minecraft.core.registries.BuiltInRegistries; @@ -34,22 +33,28 @@ import net.minecraft.nbt.NbtUtils; import net.minecraft.network.chat.ClickEvent; import net.minecraft.network.chat.CommonComponents; import net.minecraft.network.chat.Component; +import net.minecraft.network.protocol.game.ServerboundChangeGameModePacket; import net.minecraft.resources.ResourceLocation; +import net.minecraft.server.commands.VersionCommand; import net.minecraft.util.Mth; import net.minecraft.util.NativeModuleLister; +import net.minecraft.util.ProblemReporter; import net.minecraft.world.entity.Entity; import net.minecraft.world.level.GameType; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.storage.TagValueOutput; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.EntityHitResult; import net.minecraft.world.phys.HitResult; import net.minecraft.world.phys.Vec3; import org.jetbrains.annotations.Nullable; +import org.slf4j.Logger; @Environment(EnvType.CLIENT) public class KeyboardHandler { + private static final Logger LOGGER = LogUtils.getLogger(); public static final int DEBUG_CRASH_TIME = 10000; private final Minecraft minecraft; private final ClipboardManager clipboardManager = new ClipboardManager(); @@ -66,11 +71,11 @@ public class KeyboardHandler { switch (keyCode) { case 69: this.minecraft.sectionPath = !this.minecraft.sectionPath; - this.debugFeedback("SectionPath: {0}", this.minecraft.sectionPath ? "shown" : "hidden"); + this.debugFeedbackFormatted("SectionPath: {0}", this.minecraft.sectionPath ? "shown" : "hidden"); return true; case 70: boolean bl2 = FogRenderer.toggleFog(); - this.debugFeedback("Fog: {0}", bl2 ? "enabled" : "disabled"); + this.debugFeedbackFormatted("Fog: {0}", bl2 ? "enabled" : "disabled"); return true; case 71: case 72: @@ -88,55 +93,58 @@ public class KeyboardHandler { return false; case 76: this.minecraft.smartCull = !this.minecraft.smartCull; - this.debugFeedback("SmartCull: {0}", this.minecraft.smartCull ? "enabled" : "disabled"); + this.debugFeedbackFormatted("SmartCull: {0}", this.minecraft.smartCull ? "enabled" : "disabled"); return true; case 79: boolean bl = this.minecraft.debugRenderer.toggleRenderOctree(); - this.debugFeedback("Frustum culling Octree: {0}", bl ? "enabled" : "disabled"); + this.debugFeedbackFormatted("Frustum culling Octree: {0}", bl ? "enabled" : "disabled"); return true; case 85: if (Screen.hasShiftDown()) { this.minecraft.levelRenderer.killFrustum(); - this.debugFeedback("Killed frustum"); + this.debugFeedbackFormatted("Killed frustum"); } else { this.minecraft.levelRenderer.captureFrustum(); - this.debugFeedback("Captured frustum"); + this.debugFeedbackFormatted("Captured frustum"); } return true; case 86: this.minecraft.sectionVisibility = !this.minecraft.sectionVisibility; - this.debugFeedback("SectionVisibility: {0}", this.minecraft.sectionVisibility ? "enabled" : "disabled"); + this.debugFeedbackFormatted("SectionVisibility: {0}", this.minecraft.sectionVisibility ? "enabled" : "disabled"); return true; case 87: this.minecraft.wireframe = !this.minecraft.wireframe; - this.debugFeedback("WireFrame: {0}", this.minecraft.wireframe ? "enabled" : "disabled"); + this.debugFeedbackFormatted("WireFrame: {0}", this.minecraft.wireframe ? "enabled" : "disabled"); return true; } } - private void debugComponent(ChatFormatting formatting, Component message) { - this.minecraft - .gui - .getChat() - .addMessage( - Component.empty().append(Component.translatable("debug.prefix").withStyle(formatting, ChatFormatting.BOLD)).append(CommonComponents.SPACE).append(message) - ); + private void showDebugChat(Component message) { + this.minecraft.gui.getChat().addMessage(message); + this.minecraft.getNarrator().saySystemQueued(message); + } + + private static Component decorateDebugComponent(ChatFormatting formatting, Component component) { + return Component.empty() + .append(Component.translatable("debug.prefix").withStyle(formatting, ChatFormatting.BOLD)) + .append(CommonComponents.SPACE) + .append(component); + } + + private void debugWarningComponent(Component message) { + this.showDebugChat(decorateDebugComponent(ChatFormatting.RED, message)); } private void debugFeedbackComponent(Component message) { - this.debugComponent(ChatFormatting.YELLOW, message); + this.showDebugChat(decorateDebugComponent(ChatFormatting.YELLOW, message)); } - private void debugFeedbackTranslated(String message, Object... args) { - this.debugFeedbackComponent(Component.translatableEscape(message, args)); + private void debugFeedbackTranslated(String message) { + this.debugFeedbackComponent(Component.translatable(message)); } - private void debugWarningTranslated(String message, Object... args) { - this.debugComponent(ChatFormatting.RED, Component.translatableEscape(message, args)); - } - - private void debugFeedback(String message, Object... args) { + private void debugFeedbackFormatted(String message, Object... args) { this.debugFeedbackComponent(Component.literal(MessageFormat.format(message, args))); } @@ -210,7 +218,7 @@ public class KeyboardHandler { return true; case 76: if (this.minecraft.debugClientMetricsStart(this::debugFeedbackComponent)) { - this.debugFeedbackTranslated("debug.profiling.start", 10); + this.debugFeedbackComponent(Component.translatable("debug.profiling.start", 10)); } return true; @@ -218,12 +226,10 @@ public class KeyboardHandler { if (!this.minecraft.player.hasPermissions(2)) { this.debugFeedbackTranslated("debug.creative_spectator.error"); } else if (!this.minecraft.player.isSpectator()) { - this.minecraft.player.connection.sendUnsignedCommand("gamemode spectator"); + this.minecraft.player.connection.send(new ServerboundChangeGameModePacket(GameType.SPECTATOR)); } else { - this.minecraft - .player - .connection - .sendUnsignedCommand("gamemode " + MoreObjects.firstNonNull(this.minecraft.gameMode.getPreviousPlayerMode(), GameType.CREATIVE).getName()); + GameType gameType = MoreObjects.firstNonNull(this.minecraft.gameMode.getPreviousPlayerMode(), GameType.CREATIVE); + this.minecraft.player.connection.send(new ServerboundChangeGameModePacket(gameType)); } return true; @@ -234,22 +240,22 @@ public class KeyboardHandler { return true; case 81: this.debugFeedbackTranslated("debug.help.message"); - ChatComponent chatComponent = this.minecraft.gui.getChat(); - chatComponent.addMessage(Component.translatable("debug.reload_chunks.help")); - chatComponent.addMessage(Component.translatable("debug.show_hitboxes.help")); - chatComponent.addMessage(Component.translatable("debug.copy_location.help")); - chatComponent.addMessage(Component.translatable("debug.clear_chat.help")); - chatComponent.addMessage(Component.translatable("debug.chunk_boundaries.help")); - chatComponent.addMessage(Component.translatable("debug.advanced_tooltips.help")); - chatComponent.addMessage(Component.translatable("debug.inspect.help")); - chatComponent.addMessage(Component.translatable("debug.profiling.help")); - chatComponent.addMessage(Component.translatable("debug.creative_spectator.help")); - chatComponent.addMessage(Component.translatable("debug.pause_focus.help")); - chatComponent.addMessage(Component.translatable("debug.help.help")); - chatComponent.addMessage(Component.translatable("debug.dump_dynamic_textures.help")); - chatComponent.addMessage(Component.translatable("debug.reload_resourcepacks.help")); - chatComponent.addMessage(Component.translatable("debug.pause.help")); - chatComponent.addMessage(Component.translatable("debug.gamemodes.help")); + this.showDebugChat(Component.translatable("debug.reload_chunks.help")); + this.showDebugChat(Component.translatable("debug.show_hitboxes.help")); + this.showDebugChat(Component.translatable("debug.copy_location.help")); + this.showDebugChat(Component.translatable("debug.clear_chat.help")); + this.showDebugChat(Component.translatable("debug.chunk_boundaries.help")); + this.showDebugChat(Component.translatable("debug.advanced_tooltips.help")); + this.showDebugChat(Component.translatable("debug.inspect.help")); + this.showDebugChat(Component.translatable("debug.profiling.help")); + this.showDebugChat(Component.translatable("debug.creative_spectator.help")); + this.showDebugChat(Component.translatable("debug.pause_focus.help")); + this.showDebugChat(Component.translatable("debug.help.help")); + this.showDebugChat(Component.translatable("debug.dump_dynamic_textures.help")); + this.showDebugChat(Component.translatable("debug.reload_resourcepacks.help")); + this.showDebugChat(Component.translatable("debug.version.help")); + this.showDebugChat(Component.translatable("debug.pause.help")); + this.showDebugChat(Component.translatable("debug.gamemodes.help")); return true; case 83: Path path = this.minecraft.gameDirectory.toPath().toAbsolutePath(); @@ -258,12 +264,16 @@ public class KeyboardHandler { Component component = Component.literal(path.relativize(path2).toString()) .withStyle(ChatFormatting.UNDERLINE) .withStyle(style -> style.withClickEvent(new ClickEvent.OpenFile(path2))); - this.debugFeedbackTranslated("debug.dump_dynamic_textures", component); + this.debugFeedbackComponent(Component.translatable("debug.dump_dynamic_textures", component)); return true; case 84: this.debugFeedbackTranslated("debug.reload_resourcepacks.message"); this.minecraft.reloadResourcePacks(); return true; + case 86: + this.debugFeedbackTranslated("debug.version.header"); + VersionCommand.dumpVersion(this::showDebugChat); + return true; case 293: if (!this.minecraft.player.hasPermissions(2)) { this.debugFeedbackTranslated("debug.gamemodes.error"); @@ -313,8 +323,12 @@ public class KeyboardHandler { this.debugFeedbackTranslated("debug.inspect.server.entity"); }); } else { - CompoundTag compoundTag2 = entity.saveWithoutId(new CompoundTag()); - this.copyCreateEntityCommand(resourceLocation, entity.position(), compoundTag2); + try (ProblemReporter.ScopedCollector scopedCollector = new ProblemReporter.ScopedCollector(entity.problemPath(), LOGGER)) { + TagValueOutput tagValueOutput = TagValueOutput.createWithContext(scopedCollector, entity.registryAccess()); + entity.saveWithoutId(tagValueOutput); + this.copyCreateEntityCommand(resourceLocation, entity.position(), tagValueOutput.buildResult()); + } + this.debugFeedbackTranslated("debug.inspect.client.entity"); } } else { @@ -340,7 +354,6 @@ public class KeyboardHandler { if (compound != null) { compound.remove("UUID"); compound.remove("Pos"); - compound.remove("Dimension"); String string = NbtUtils.toPrettyComponent(compound).getString(); string2 = String.format(Locale.ROOT, "/summon %s %.2f %.2f %.2f %s", entityId, pos.x, pos.y, pos.z, string); } else { @@ -401,9 +414,7 @@ public class KeyboardHandler { } Screenshot.grab( - this.minecraft.gameDirectory, - this.minecraft.getMainRenderTarget(), - component -> this.minecraft.execute(() -> this.minecraft.gui.getChat().addMessage(component)) + this.minecraft.gameDirectory, this.minecraft.getMainRenderTarget(), component -> this.minecraft.execute(() -> this.showDebugChat(component)) ); return; } @@ -448,7 +459,7 @@ public class KeyboardHandler { } } - Key key2 = InputConstants.getKey(key, scanCode); + InputConstants.Key key2 = InputConstants.getKey(key, scanCode); boolean bl3 = this.minecraft.screen == null; boolean bl4 = bl3 || this.minecraft.screen instanceof PauseScreen pauseScreen && !pauseScreen.showsPauseMenu(); if (action == 0) { @@ -559,7 +570,7 @@ public class KeyboardHandler { if (this.debugCrashKeyReportedCount == 0L) { this.debugFeedbackTranslated("debug.crash.message"); } else { - this.debugWarningTranslated("debug.crash.warning", Mth.ceil((float)m / 1000.0F)); + this.debugWarningComponent(Component.translatable("debug.crash.warning", Mth.ceil((float)m / 1000.0F))); } this.debugCrashKeyReportedTime = l; diff --git a/net/minecraft/client/Minecraft.java b/net/minecraft/client/Minecraft.java index 3252e654..db789914 100644 --- a/net/minecraft/client/Minecraft.java +++ b/net/minecraft/client/Minecraft.java @@ -27,7 +27,6 @@ import com.mojang.blaze3d.platform.WindowEventHandler; import com.mojang.blaze3d.systems.GpuDevice; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.systems.TimerQuery; -import com.mojang.blaze3d.systems.TimerQuery.FrameProfile; import com.mojang.blaze3d.vertex.Tesselator; import com.mojang.datafixers.DataFixer; import com.mojang.jtracy.DiscontinuousFrame; @@ -72,14 +71,12 @@ import net.minecraft.ReportedException; import net.minecraft.SharedConstants; import net.minecraft.SystemReport; import net.minecraft.Util; -import net.minecraft.client.DeltaTracker.Timer; -import net.minecraft.client.ResourceLoadStateTracker.ReloadReason; -import net.minecraft.client.User.Type; import net.minecraft.client.color.block.BlockColors; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.GuiSpriteManager; import net.minecraft.client.gui.components.DebugScreenOverlay; +import net.minecraft.client.gui.components.LogoRenderer; import net.minecraft.client.gui.components.debugchart.ProfilerPieChart; import net.minecraft.client.gui.components.toasts.SystemToast; import net.minecraft.client.gui.components.toasts.ToastManager; @@ -126,7 +123,6 @@ import net.minecraft.client.player.LocalPlayer; import net.minecraft.client.profiling.ClientMetricsSamplersProvider; import net.minecraft.client.quickplay.QuickPlay; import net.minecraft.client.quickplay.QuickPlayLog; -import net.minecraft.client.renderer.FogParameters; import net.minecraft.client.renderer.GameRenderer; import net.minecraft.client.renderer.GpuWarnlistManager; import net.minecraft.client.renderer.LevelRenderer; @@ -151,10 +147,10 @@ import net.minecraft.client.resources.FoliageColorReloadListener; import net.minecraft.client.resources.GrassColorReloadListener; import net.minecraft.client.resources.MapDecorationTextureManager; import net.minecraft.client.resources.MapTextureManager; -import net.minecraft.client.resources.MobEffectTextureManager; import net.minecraft.client.resources.PaintingTextureManager; import net.minecraft.client.resources.SkinManager; import net.minecraft.client.resources.SplashManager; +import net.minecraft.client.resources.WaypointStyleManager; import net.minecraft.client.resources.language.I18n; import net.minecraft.client.resources.language.LanguageManager; import net.minecraft.client.resources.model.EquipmentAssetManager; @@ -171,7 +167,10 @@ import net.minecraft.client.tutorial.Tutorial; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Holder; +import net.minecraft.core.Registry; import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.core.registries.Registries; +import net.minecraft.gametest.framework.GameTestTicker; import net.minecraft.network.Connection; import net.minecraft.network.chat.ClickEvent; import net.minecraft.network.chat.CommonComponents; @@ -180,13 +179,14 @@ import net.minecraft.network.chat.MutableComponent; import net.minecraft.network.chat.contents.KeybindResolver; import net.minecraft.network.protocol.game.ServerboundClientTickEndPacket; import net.minecraft.network.protocol.game.ServerboundPlayerActionPacket; -import net.minecraft.network.protocol.game.ServerboundPlayerActionPacket.Action; import net.minecraft.network.protocol.login.ServerboundHelloPacket; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.Bootstrap; import net.minecraft.server.MinecraftServer; import net.minecraft.server.Services; import net.minecraft.server.WorldStem; +import net.minecraft.server.dialog.Dialog; +import net.minecraft.server.dialog.Dialogs; import net.minecraft.server.level.progress.ProcessorChunkProgressListener; import net.minecraft.server.level.progress.StoringChunkProgressListener; import net.minecraft.server.packs.PackResources; @@ -202,7 +202,9 @@ import net.minecraft.server.packs.resources.ResourceManager; import net.minecraft.server.players.GameProfileCache; import net.minecraft.sounds.Music; import net.minecraft.sounds.Musics; +import net.minecraft.sounds.SoundSource; import net.minecraft.tags.BiomeTags; +import net.minecraft.tags.DialogTags; import net.minecraft.util.CommonLinks; import net.minecraft.util.FileZipper; import net.minecraft.util.MemoryReserve; @@ -219,7 +221,6 @@ import net.minecraft.util.profiling.Profiler; import net.minecraft.util.profiling.ProfilerFiller; import net.minecraft.util.profiling.SingleTickProfiler; import net.minecraft.util.profiling.Zone; -import net.minecraft.util.profiling.Profiler.Scope; import net.minecraft.util.profiling.metrics.profiling.ActiveMetricsRecorder; import net.minecraft.util.profiling.metrics.profiling.InactiveMetricsRecorder; import net.minecraft.util.profiling.metrics.profiling.MetricsRecorder; @@ -229,9 +230,6 @@ import net.minecraft.util.thread.ReentrantBlockableEventLoop; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.TickRateManager; -import net.minecraft.world.InteractionResult.Fail; -import net.minecraft.world.InteractionResult.Success; -import net.minecraft.world.InteractionResult.SwingSource; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.player.ChatVisiblity; @@ -265,6 +263,7 @@ public class Minecraft extends ReentrantBlockableEventLoop implements private static final ResourceLocation REGIONAL_COMPLIANCIES = ResourceLocation.withDefaultNamespace("regional_compliancies.json"); private static final CompletableFuture RESOURCE_RELOAD_INITIAL_TASK = CompletableFuture.completedFuture(Unit.INSTANCE); private static final Component SOCIAL_INTERACTIONS_NOT_AVAILABLE = Component.translatable("multiplayer.socialInteractions.not_available"); + private static final Component SAVING_LEVEL = Component.translatable("menu.savingLevel"); public static final String UPDATE_DRIVERS_ADVICE = "Please make sure you have up-to-date drivers (see aka.ms/mcdriver for instructions)."; private final long canary = Double.doubleToLongBits(Math.PI); private final Path resourcePackDirectory; @@ -274,7 +273,7 @@ public class Minecraft extends ReentrantBlockableEventLoop implements private final DataFixer fixerUpper; private final VirtualScreen virtualScreen; private final Window window; - private final Timer deltaTracker = new Timer(20.0F, 0L, this::getTickTargetMillis); + private final DeltaTracker.Timer deltaTracker = new DeltaTracker.Timer(20.0F, 0L, this::getTickTargetMillis); private final RenderBuffers renderBuffers; public final LevelRenderer levelRenderer; private final EntityRenderDispatcher entityRenderDispatcher; @@ -328,10 +327,10 @@ public class Minecraft extends ReentrantBlockableEventLoop implements */ private final BlockRenderDispatcher blockRenderer; private final PaintingTextureManager paintingTextures; - private final MobEffectTextureManager mobEffectTextures; private final MapTextureManager mapTextureManager; private final MapDecorationTextureManager mapDecorationTextures; private final GuiSpriteManager guiSprites; + private final WaypointStyleManager waypointStyles; private final ToastManager toastManager; private final Tutorial tutorial; private final PlayerSocialManager playerSocialManager; @@ -397,7 +396,7 @@ public class Minecraft extends ReentrantBlockableEventLoop implements private long savedCpuDuration; private double gpuUtilization; @Nullable - private FrameProfile currentFrameProfile; + private TimerQuery.FrameProfile currentFrameProfile; private final GameNarrator narrator; private final ChatListener chatListener; private ReportingContext reportingContext; @@ -447,13 +446,12 @@ public class Minecraft extends ReentrantBlockableEventLoop implements this.singleplayerServer = null; KeybindResolver.setKeyResolver(KeyMapping::createNameSupplier); this.fixerUpper = DataFixers.getDataFixer(); - this.toastManager = new ToastManager(this); this.gameThread = Thread.currentThread(); this.options = new Options(this, this.gameDirectory); + this.toastManager = new ToastManager(this, this.options); boolean bl = this.options.startedCleanly; this.options.startedCleanly = false; this.options.save(); - RenderSystem.setShaderGlintAlpha(this.options.glintStrength().get()); this.running = true; this.tutorial = new Tutorial(this, this.options); this.hotbarManager = new HotbarManager(path, this.fixerUpper); @@ -486,7 +484,7 @@ public class Minecraft extends ReentrantBlockableEventLoop implements GameLoadTimesEvent.INSTANCE.endStep(TelemetryProperty.LOAD_TIME_PRE_WINDOW_MS); try { - this.window.setIcon(this.vanillaPackResources, SharedConstants.getCurrentVersion().isStable() ? IconSet.RELEASE : IconSet.SNAPSHOT); + this.window.setIcon(this.vanillaPackResources, SharedConstants.getCurrentVersion().stable() ? IconSet.RELEASE : IconSet.SNAPSHOT); } catch (IOException var15) { LOGGER.error("Couldn't set icon", (Throwable)var15); } @@ -520,11 +518,11 @@ public class Minecraft extends ReentrantBlockableEventLoop implements this.skinManager = new SkinManager(file.toPath().resolve("skins"), this.minecraftSessionService, this); this.levelSource = new LevelStorageSource(path.resolve("saves"), path.resolve("backups"), this.directoryValidator, this.fixerUpper); this.commandHistory = new CommandHistory(path); - this.soundManager = new SoundManager(this.options); + this.musicManager = new MusicManager(this); + this.soundManager = new SoundManager(this.options, this.musicManager); this.resourceManager.registerReloadListener(this.soundManager); this.splashManager = new SplashManager(this.user); this.resourceManager.registerReloadListener(this.splashManager); - this.musicManager = new MusicManager(this); this.fontManager = new FontManager(this.textureManager); this.font = this.fontManager.createFont(); this.fontFilterFishy = this.fontManager.createFontFilterFishy(); @@ -588,11 +586,11 @@ public class Minecraft extends ReentrantBlockableEventLoop implements this.resourceManager.registerReloadListener(this.particleEngine); this.paintingTextures = new PaintingTextureManager(this.textureManager); this.resourceManager.registerReloadListener(this.paintingTextures); - this.mobEffectTextures = new MobEffectTextureManager(this.textureManager); - this.resourceManager.registerReloadListener(this.mobEffectTextures); this.guiSprites = new GuiSpriteManager(this.textureManager); this.resourceManager.registerReloadListener(this.guiSprites); - this.gameRenderer = new GameRenderer(this, this.entityRenderDispatcher.getItemInHandRenderer(), this.resourceManager, this.renderBuffers); + this.waypointStyles = new WaypointStyleManager(); + this.resourceManager.registerReloadListener(this.waypointStyles); + this.gameRenderer = new GameRenderer(this, this.entityRenderDispatcher.getItemInHandRenderer(), this.renderBuffers); this.levelRenderer = new LevelRenderer(this, this.entityRenderDispatcher, this.blockEntityRenderDispatcher, this.renderBuffers); this.resourceManager.registerReloadListener(this.levelRenderer); this.resourceManager.registerReloadListener(this.levelRenderer.getCloudRenderer()); @@ -647,9 +645,10 @@ public class Minecraft extends ReentrantBlockableEventLoop implements this.reportingContext = ReportingContext.create(ReportEnvironment.local(), this.userApiService); TitleScreen.registerTextures(this.textureManager); LoadingOverlay.registerTextures(this.textureManager); + this.gameRenderer.getPanorama().registerTextures(this.textureManager); this.setScreen(new GenericMessageScreen(Component.translatable("gui.loadingMinecraft"))); List list2 = this.resourcePackRepository.openAllSelected(); - this.reloadStateTracker.startReload(ReloadReason.INITIAL, list2); + this.reloadStateTracker.startReload(ResourceLoadStateTracker.ReloadReason.INITIAL, list2); ReloadInstance reloadInstance = this.resourceManager .createReload(Util.backgroundExecutor().forName("resourceLoad"), this, RESOURCE_RELOAD_INITIAL_TASK, list2); GameLoadTimesEvent.INSTANCE.beginStep(TelemetryProperty.LOAD_TIME_LOADING_OVERLAY_MS); @@ -664,7 +663,7 @@ public class Minecraft extends ReentrantBlockableEventLoop implements this.onResourceLoadFinished(gameLoadCookie); }), false) ); - this.quickPlayLog = QuickPlayLog.of(gameConfig.quickPlay.path()); + this.quickPlayLog = QuickPlayLog.of(gameConfig.quickPlay.logPath()); this.framerateLimitTracker = new FramerateLimitTracker(this.options, this); this.fpsPieProfiler = new ContinuousProfiler(Util.timeSource, () -> this.fpsPieRenderTicks, this.framerateLimitTracker::isHeavilyThrottled); if (TracyClient.isAvailable() && gameConfig.game.captureTracyImages) { @@ -697,12 +696,12 @@ public class Minecraft extends ReentrantBlockableEventLoop implements private Runnable buildInitialScreens(@Nullable Minecraft.GameLoadCookie gameLoadCookie) { List> list = new ArrayList(); - this.addInitialScreens(list); + boolean bl = this.addInitialScreens(list); Runnable runnable = () -> { - if (gameLoadCookie != null && gameLoadCookie.quickPlayData().isEnabled()) { - QuickPlay.connect(this, gameLoadCookie.quickPlayData(), gameLoadCookie.realmsClient()); + if (gameLoadCookie != null && gameLoadCookie.quickPlayData.isEnabled()) { + QuickPlay.connect(this, gameLoadCookie.quickPlayData.variant(), gameLoadCookie.realmsClient()); } else { - this.setScreen(new TitleScreen(true)); + this.setScreen(new TitleScreen(true, new LogoRenderer(bl))); } }; @@ -714,15 +713,17 @@ public class Minecraft extends ReentrantBlockableEventLoop implements return runnable; } - private void addInitialScreens(List> output) { + private boolean addInitialScreens(List> output) { + boolean bl = false; if (this.options.onboardAccessibility) { output.add((Function)runnable -> new AccessibilityOnboardingScreen(this.options, runnable)); + bl = true; } BanDetails banDetails = this.multiplayerBan(); if (banDetails != null) { - output.add((Function)runnable -> BanNoticeScreens.create(bl -> { - if (bl) { + output.add((Function)runnable -> BanNoticeScreens.create(blx -> { + if (blx) { Util.getPlatform().openUri(CommonLinks.SUSPENSION_HELP); } @@ -742,6 +743,8 @@ public class Minecraft extends ReentrantBlockableEventLoop implements output.add(BanNoticeScreens::createSkinBan); } } + + return bl; } private static boolean countryEqualsISO3(Object country) { @@ -763,7 +766,7 @@ public class Minecraft extends ReentrantBlockableEventLoop implements } stringBuilder.append(" "); - stringBuilder.append(SharedConstants.getCurrentVersion().getName()); + stringBuilder.append(SharedConstants.getCurrentVersion().name()); ClientPacketListener clientPacketListener = this.getConnection(); if (clientPacketListener != null && clientPacketListener.getConnection().isConnected()) { stringBuilder.append(" - "); @@ -783,7 +786,7 @@ public class Minecraft extends ReentrantBlockableEventLoop implements } private UserApiService createUserApiService(YggdrasilAuthenticationService authenticationService, GameConfig gameConfig) { - return gameConfig.user.user.getType() != Type.MSA + return gameConfig.user.user.getType() != User.Type.MSA ? UserApiService.OFFLINE : authenticationService.createUserApiService(gameConfig.user.user.getAccessToken()); } @@ -814,8 +817,8 @@ public class Minecraft extends ReentrantBlockableEventLoop implements private void abortResourcePackRecovery() { this.setOverlay(null); if (this.level != null) { - this.level.disconnect(); - this.disconnect(); + this.level.disconnect(ClientLevel.DEFAULT_QUIT_MESSAGE); + this.disconnectWithProgressScreen(); } this.setScreen(new TitleScreen()); @@ -858,7 +861,7 @@ public class Minecraft extends ReentrantBlockableEventLoop implements SingleTickProfiler singleTickProfiler = SingleTickProfiler.createTickProfiler("Renderer"); boolean bl2 = this.getDebugOverlay().showProfilerChart(); - try (Scope scope = Profiler.use(this.constructProfiler(bl2, singleTickProfiler))) { + try (Profiler.Scope scope = Profiler.use(this.constructProfiler(bl2, singleTickProfiler))) { this.metricsRecorder.startTick(); discontinuousFrame.start(); this.runTick(!bl); @@ -981,7 +984,7 @@ public class Minecraft extends ReentrantBlockableEventLoop implements this.resourcePackRepository.reload(); List list = this.resourcePackRepository.openAllSelected(); if (!error) { - this.reloadStateTracker.startReload(ReloadReason.MANUAL, list); + this.reloadStateTracker.startReload(ResourceLoadStateTracker.ReloadReason.MANUAL, list); } this.setOverlay( @@ -1075,7 +1078,7 @@ public class Minecraft extends ReentrantBlockableEventLoop implements } else { Component component = chatStatus.getMessage(); this.gui.setOverlayMessage(component, false); - this.narrator.sayNow(component); + this.narrator.saySystemNow(component); this.gui.setChatDisabledByPlayerShown(chatStatus == Minecraft.ChatStatus.DISABLED_BY_PROFILE); } } else { @@ -1144,10 +1147,10 @@ public class Minecraft extends ReentrantBlockableEventLoop implements try { if (this.level != null) { - this.level.disconnect(); + this.level.disconnect(ClientLevel.DEFAULT_QUIT_MESSAGE); } - this.disconnect(); + this.disconnectWithProgressScreen(); } catch (Throwable var6) { } @@ -1180,7 +1183,6 @@ public class Minecraft extends ReentrantBlockableEventLoop implements this.levelRenderer.close(); this.soundManager.destroy(); this.particleEngine.close(); - this.mobEffectTextures.close(); this.paintingTextures.close(); this.mapDecorationTextures.close(); this.guiSprites.close(); @@ -1258,7 +1260,6 @@ public class Minecraft extends ReentrantBlockableEventLoop implements RenderTarget renderTarget = this.getMainRenderTarget(); RenderSystem.getDevice().createCommandEncoder().clearColorAndDepthTextures(renderTarget.getColorTexture(), 0, renderTarget.getDepthTexture(), 1.0); - RenderSystem.setShaderFog(FogParameters.NO_FOG); profilerFiller.push("mouse"); this.mouseHandler.handleAccumulatedMovement(); profilerFiller.pop(); @@ -1295,9 +1296,14 @@ public class Minecraft extends ReentrantBlockableEventLoop implements profilerFiller.pop(); this.window.setErrorSection("Post render"); this.frames++; + boolean bl2 = this.pause; this.pause = this.hasSingleplayerServer() && (this.screen != null && this.screen.isPauseScreen() || this.overlay != null && this.overlay.isPauseScreen()) && !this.singleplayerServer.isPublished(); + if (!bl2 && this.pause) { + this.soundManager.pauseAllExcept(SoundSource.MUSIC, SoundSource.UI); + } + this.deltaTracker.updatePauseState(this.pause); this.deltaTracker.updateFrozenState(!this.isLevelRunningNormally()); long m = Util.getNanos(); @@ -1419,7 +1425,7 @@ public class Minecraft extends ReentrantBlockableEventLoop implements this.singleplayerServer.halt(true); } - this.disconnect(new GenericMessageScreen(Component.translatable("menu.savingLevel"))); + this.disconnectWithSavingScreen(); } catch (Throwable var2) { } @@ -1499,7 +1505,7 @@ public class Minecraft extends ReentrantBlockableEventLoop implements Path path; try { - String string2 = String.format(Locale.ROOT, "%s-%s-%s", Util.getFilenameFormattedDateTime(), string, SharedConstants.getCurrentVersion().getId()); + String string2 = String.format(Locale.ROOT, "%s-%s-%s", Util.getFilenameFormattedDateTime(), string, SharedConstants.getCurrentVersion().id()); String string3 = FileUtil.findAvailableName(MetricsPersister.PROFILING_RESULTS_DIR, string2, ".zip"); path = MetricsPersister.PROFILING_RESULTS_DIR.resolve(string3); } catch (IOException var21) { @@ -1549,14 +1555,13 @@ public class Minecraft extends ReentrantBlockableEventLoop implements } /** - * Displays the ingame menu + * Displays the in-game menu */ public void pauseGame(boolean pauseOnly) { if (this.screen == null) { boolean bl = this.hasSingleplayerServer() && !this.singleplayerServer.isPublished(); if (bl) { this.setScreen(new PauseScreen(!pauseOnly)); - this.soundManager.pause(); } else { this.setScreen(new PauseScreen(true)); } @@ -1569,7 +1574,7 @@ public class Minecraft extends ReentrantBlockableEventLoop implements } if (this.missTime <= 0 && !this.player.isUsingItem()) { - if (leftClick && this.hitResult != null && this.hitResult.getType() == net.minecraft.world.phys.HitResult.Type.BLOCK) { + if (leftClick && this.hitResult != null && this.hitResult.getType() == HitResult.Type.BLOCK) { BlockHitResult blockHitResult = (BlockHitResult)this.hitResult; BlockPos blockPos = blockHitResult.getBlockPos(); if (!this.level.getBlockState(blockPos).isAir()) { @@ -1662,8 +1667,8 @@ public class Minecraft extends ReentrantBlockableEventLoop implements interactionResult = this.gameMode.interact(this.player, entity, interactionHand); } - if (interactionResult instanceof Success success) { - if (success.swingSource() == SwingSource.CLIENT) { + if (interactionResult instanceof InteractionResult.Success success) { + if (success.swingSource() == InteractionResult.SwingSource.CLIENT) { this.player.swing(interactionHand); } @@ -1674,8 +1679,8 @@ public class Minecraft extends ReentrantBlockableEventLoop implements BlockHitResult blockHitResult = (BlockHitResult)this.hitResult; int i = itemStack.getCount(); InteractionResult interactionResult2 = this.gameMode.useItemOn(this.player, interactionHand, blockHitResult); - if (interactionResult2 instanceof Success success2) { - if (success2.swingSource() == SwingSource.CLIENT) { + if (interactionResult2 instanceof InteractionResult.Success success2) { + if (success2.swingSource() == InteractionResult.SwingSource.CLIENT) { this.player.swing(interactionHand); if (!itemStack.isEmpty() && (itemStack.getCount() != i || this.player.hasInfiniteMaterials())) { this.gameRenderer.itemInHandRenderer.itemUsed(interactionHand); @@ -1685,14 +1690,14 @@ public class Minecraft extends ReentrantBlockableEventLoop implements return; } - if (interactionResult2 instanceof Fail) { + if (interactionResult2 instanceof InteractionResult.Fail) { return; } } } - if (!itemStack.isEmpty() && this.gameMode.useItem(this.player, interactionHand) instanceof Success success3) { - if (success3.swingSource() == SwingSource.CLIENT) { + if (!itemStack.isEmpty() && this.gameMode.useItem(this.player, interactionHand) instanceof InteractionResult.Success success3) { + if (success3.swingSource() == InteractionResult.SwingSource.CLIENT) { this.player.swing(interactionHand); } @@ -1796,10 +1801,7 @@ public class Minecraft extends ReentrantBlockableEventLoop implements this.gameRenderer.clearPostEffect(); } - if (!this.pause) { - this.musicManager.tick(); - } - + this.musicManager.tick(); this.soundManager.tick(this.pause); if (this.level != null) { if (!this.pause) { @@ -1893,7 +1895,7 @@ public class Minecraft extends ReentrantBlockableEventLoop implements while (this.options.keySocialInteractions.consumeClick()) { if (!this.isMultiplayerServer()) { this.player.displayClientMessage(SOCIAL_INTERACTIONS_NOT_AVAILABLE, true); - this.narrator.sayNow(SOCIAL_INTERACTIONS_NOT_AVAILABLE); + this.narrator.saySystemNow(SOCIAL_INTERACTIONS_NOT_AVAILABLE); } else { if (this.socialInteractionsToast != null) { this.socialInteractionsToast.hide(); @@ -1917,9 +1919,13 @@ public class Minecraft extends ReentrantBlockableEventLoop implements this.setScreen(new AdvancementsScreen(this.player.connection.getAdvancements())); } + while (this.options.keyQuickActions.consumeClick()) { + this.getQuickActionsDialog().ifPresent(holder -> this.player.connection.showDialog(holder, this.screen)); + } + while (this.options.keySwapOffhand.consumeClick()) { if (!this.player.isSpectator()) { - this.getConnection().send(new ServerboundPlayerActionPacket(Action.SWAP_ITEM_WITH_OFFHAND, BlockPos.ZERO, Direction.DOWN)); + this.getConnection().send(new ServerboundPlayerActionPacket(ServerboundPlayerActionPacket.Action.SWAP_ITEM_WITH_OFFHAND, BlockPos.ZERO, Direction.DOWN)); } } @@ -1972,6 +1978,17 @@ public class Minecraft extends ReentrantBlockableEventLoop implements this.continueAttack(this.screen == null && !bl3 && this.options.keyAttack.isDown() && this.mouseHandler.isMouseGrabbed()); } + private Optional> getQuickActionsDialog() { + Registry registry = this.player.connection.registryAccess().lookupOrThrow(Registries.DIALOG); + return registry.get(DialogTags.QUICK_ACTIONS).flatMap(named -> { + if (named.size() == 0) { + return Optional.empty(); + } else { + return named.size() == 1 ? Optional.of(named.get(0)) : registry.get(Dialogs.QUICK_ACTIONS); + } + }); + } + public ClientTelemetryManager getTelemetryManager() { return this.telemetryManager; } @@ -1989,7 +2006,7 @@ public class Minecraft extends ReentrantBlockableEventLoop implements } public void doWorldLoad(LevelStorageSource.LevelStorageAccess levelStorage, PackRepository packRepository, WorldStem worldStem, boolean newWorld) { - this.disconnect(); + this.disconnectWithProgressScreen(); this.progressListener.set(null); Instant instant = Instant.now(); @@ -2034,6 +2051,7 @@ public class Minecraft extends ReentrantBlockableEventLoop implements } } + GameTestTicker.SINGLETON.startTicking(); profilerFiller.pop(); Duration duration = Duration.between(instant, Instant.now()); SocketAddress socketAddress = this.singleplayerServer.getConnection().startMemoryChannel(); @@ -2057,12 +2075,12 @@ public class Minecraft extends ReentrantBlockableEventLoop implements } } - public void disconnect() { - this.disconnect(new ProgressScreen(true), false); + public void disconnectWithSavingScreen() { + this.disconnect(new GenericMessageScreen(SAVING_LEVEL), false); } - public void disconnect(Screen nextScreen) { - this.disconnect(nextScreen, false); + public void disconnectWithProgressScreen() { + this.disconnect(new ProgressScreen(true), false); } public void disconnect(Screen nextScreen, boolean keepResourcePacks) { @@ -2170,6 +2188,7 @@ public class Minecraft extends ReentrantBlockableEventLoop implements this.levelRenderer.setLevel(level); this.particleEngine.setLevel(level); this.blockEntityRenderDispatcher.setLevel(level); + this.gameRenderer.setLevel(level); this.updateTitle(); } @@ -2258,7 +2277,7 @@ public class Minecraft extends ReentrantBlockableEventLoop implements * Called when user clicked he's mouse middle button (pick block) */ private void pickBlock() { - if (this.hitResult != null && this.hitResult.getType() != net.minecraft.world.phys.HitResult.Type.MISS) { + if (this.hitResult != null && this.hitResult.getType() != HitResult.Type.MISS) { boolean bl = Screen.hasControlDown(); switch (this.hitResult) { case BlockHitResult blockHitResult: @@ -2486,31 +2505,28 @@ public class Minecraft extends ReentrantBlockableEventLoop implements Music music = Optionull.map(this.screen, Screen::getBackgroundMusic); if (music != null) { return new MusicInfo(music); - } else if (this.player != null) { + } else if (this.player == null) { + return new MusicInfo(Musics.MENU); + } else { Level level = this.player.level(); if (level.dimension() == Level.END) { return this.gui.getBossOverlay().shouldPlayMusic() ? new MusicInfo(Musics.END_BOSS) : new MusicInfo(Musics.END); } else { Holder holder = level.getBiome(this.player.blockPosition()); - float f = holder.value().getBackgroundMusicVolume(); - if (!this.musicManager.isPlayingMusic(Musics.UNDER_WATER) && (!this.player.isUnderWater() || !holder.is(BiomeTags.PLAYS_UNDERWATER_MUSIC))) { - if (level.dimension() != Level.NETHER && this.player.getAbilities().instabuild && this.player.getAbilities().mayfly) { - return new MusicInfo(Musics.CREATIVE, f); - } else { - Optional> optional = holder.value().getBackgroundMusic(); - if (optional.isPresent()) { - Optional optional2 = ((WeightedList)optional.get()).getRandom(level.random); - return new MusicInfo((Music)optional2.orElse(null), f); - } else { - return new MusicInfo(Musics.GAME, f); - } - } + Biome biome = holder.value(); + float f = biome.getBackgroundMusicVolume(); + Optional> optional = biome.getBackgroundMusic(); + if (optional.isPresent()) { + Optional optional2 = ((WeightedList)optional.get()).getRandom(level.random); + return new MusicInfo((Music)optional2.orElse(null), f); + } else if (!this.musicManager.isPlayingMusic(Musics.UNDER_WATER) && (!this.player.isUnderWater() || !holder.is(BiomeTags.PLAYS_UNDERWATER_MUSIC))) { + return level.dimension() != Level.NETHER && this.player.getAbilities().instabuild && this.player.getAbilities().mayfly + ? new MusicInfo(Musics.CREATIVE, f) + : new MusicInfo(Musics.GAME, f); } else { return new MusicInfo(Musics.UNDER_WATER, f); } } - } else { - return new MusicInfo(Musics.MENU); } } @@ -2618,13 +2634,6 @@ public class Minecraft extends ReentrantBlockableEventLoop implements return this.paintingTextures; } - /** - * Gets the sprite uploader used for potions. - */ - public MobEffectTextureManager getMobEffectTextures() { - return this.mobEffectTextures; - } - public MapTextureManager getMapTextureManager() { return this.mapTextureManager; } @@ -2637,30 +2646,37 @@ public class Minecraft extends ReentrantBlockableEventLoop implements return this.guiSprites; } + public WaypointStyleManager getWaypointStyles() { + return this.waypointStyles; + } + @Override public void setWindowActive(boolean windowActive) { this.windowActive = windowActive; } - public Component grabPanoramixScreenshot(File gameDirectory, int width, int height) { - int i = this.window.getWidth(); - int j = this.window.getHeight(); + public Component grabPanoramixScreenshot(File gameDirectory) { + int i = 4; + int j = 4096; + int k = 4096; + int l = this.window.getWidth(); + int m = this.window.getHeight(); RenderTarget renderTarget = this.getMainRenderTarget(); float f = this.player.getXRot(); float g = this.player.getYRot(); float h = this.player.xRotO; - float k = this.player.yRotO; + float n = this.player.yRotO; this.gameRenderer.setRenderBlockOutline(false); - MutableComponent var12; + MutableComponent var13; try { this.gameRenderer.setPanoramicMode(true); - this.window.setWidth(width); - this.window.setHeight(height); - renderTarget.resize(width, height); + this.window.setWidth(4096); + this.window.setHeight(4096); + renderTarget.resize(4096, 4096); - for (int l = 0; l < 6; l++) { - switch (l) { + for (int o = 0; o < 6; o++) { + switch (o) { case 0: this.player.setYRot(g); this.player.setXRot(0.0F); @@ -2693,32 +2709,32 @@ public class Minecraft extends ReentrantBlockableEventLoop implements try { Thread.sleep(10L); - } catch (InterruptedException var17) { + } catch (InterruptedException var18) { } - Screenshot.grab(gameDirectory, "panorama_" + l + ".png", renderTarget, component -> {}); + Screenshot.grab(gameDirectory, "panorama_" + o + ".png", renderTarget, 4, component -> {}); } Component component = Component.literal(gameDirectory.getName()) .withStyle(ChatFormatting.UNDERLINE) .withStyle(style -> style.withClickEvent(new ClickEvent.OpenFile(gameDirectory.getAbsoluteFile()))); return Component.translatable("screenshot.success", component); - } catch (Exception var18) { - LOGGER.error("Couldn't save image", (Throwable)var18); - var12 = Component.translatable("screenshot.failure", var18.getMessage()); + } catch (Exception var19) { + LOGGER.error("Couldn't save image", (Throwable)var19); + var13 = Component.translatable("screenshot.failure", var19.getMessage()); } finally { this.player.setXRot(f); this.player.setYRot(g); this.player.xRotO = h; - this.player.yRotO = k; + this.player.yRotO = n; this.gameRenderer.setRenderBlockOutline(true); - this.window.setWidth(i); - this.window.setHeight(j); - renderTarget.resize(i, j); + this.window.setWidth(l); + this.window.setHeight(m); + renderTarget.resize(l, m); this.gameRenderer.setPanoramicMode(false); } - return var12; + return var13; } @Nullable @@ -2839,14 +2855,32 @@ public class Minecraft extends ReentrantBlockableEventLoop implements @Environment(EnvType.CLIENT) public static enum ChatStatus { - ENABLED("ENABLED", 0, CommonComponents.EMPTY), - DISABLED_BY_OPTIONS("DISABLED_BY_OPTIONS", 1, Component.translatable("chat.disabled.options").withStyle(ChatFormatting.RED)), - DISABLED_BY_LAUNCHER("DISABLED_BY_LAUNCHER", 2, Component.translatable("chat.disabled.launcher").withStyle(ChatFormatting.RED)), + ENABLED(CommonComponents.EMPTY) { + @Override + public boolean isChatAllowed(boolean isLocalServer) { + return true; + } + }, + DISABLED_BY_OPTIONS(Component.translatable("chat.disabled.options").withStyle(ChatFormatting.RED)) { + @Override + public boolean isChatAllowed(boolean isLocalServer) { + return false; + } + }, + DISABLED_BY_LAUNCHER(Component.translatable("chat.disabled.launcher").withStyle(ChatFormatting.RED)) { + @Override + public boolean isChatAllowed(boolean isLocalServer) { + return isLocalServer; + } + }, DISABLED_BY_PROFILE( - "DISABLED_BY_PROFILE", - 3, Component.translatable("chat.disabled.profile", Component.keybind(Minecraft.instance.options.keyChat.getName())).withStyle(ChatFormatting.RED) - ); + ) { + @Override + public boolean isChatAllowed(boolean isLocalServer) { + return isLocalServer; + } + }; static final Component INFO_DISABLED_BY_PROFILE = Component.translatable("chat.disabled.profile.moreInfo"); private final Component message; diff --git a/net/minecraft/client/MouseHandler.java b/net/minecraft/client/MouseHandler.java index 3ec5e081..7799b946 100644 --- a/net/minecraft/client/MouseHandler.java +++ b/net/minecraft/client/MouseHandler.java @@ -3,7 +3,6 @@ package net.minecraft.client; import com.mojang.blaze3d.Blaze3D; import com.mojang.blaze3d.platform.InputConstants; import com.mojang.blaze3d.platform.Window; -import com.mojang.blaze3d.platform.InputConstants.Type; import com.mojang.logging.LogUtils; import java.nio.file.InvalidPathException; import java.nio.file.Path; @@ -147,12 +146,12 @@ public class MouseHandler { this.isRightPressed = bl; } - KeyMapping.set(Type.MOUSE.getOrCreate(button), bl); + KeyMapping.set(InputConstants.Type.MOUSE.getOrCreate(button), bl); if (bl) { if (this.minecraft.player.isSpectator() && button == 2) { this.minecraft.gui.getSpectatorGui().onMouseMiddleClick(); } else { - KeyMapping.click(Type.MOUSE.getOrCreate(button)); + KeyMapping.click(InputConstants.Type.MOUSE.getOrCreate(button)); } } } @@ -421,7 +420,7 @@ public class MouseHandler { } /** - * Will set the focus to ingame if the Minecraft window is the active with focus. Also clears any GUI screen currently displayed + * Will set the focus to in-game if the Minecraft window is the active with focus. Also clears any GUI screen currently displayed */ public void grabMouse() { if (this.minecraft.isWindowActive()) { diff --git a/net/minecraft/client/NarratorStatus.java b/net/minecraft/client/NarratorStatus.java index a5df242e..ee9c0158 100644 --- a/net/minecraft/client/NarratorStatus.java +++ b/net/minecraft/client/NarratorStatus.java @@ -41,4 +41,8 @@ public enum NarratorStatus { public boolean shouldNarrateSystem() { return this == ALL || this == SYSTEM; } + + public boolean shouldNarrateSystemOrChat() { + return this == ALL || this == SYSTEM || this == CHAT; + } } diff --git a/net/minecraft/client/OptionInstance.java b/net/minecraft/client/OptionInstance.java index 6b746531..507a34f5 100644 --- a/net/minecraft/client/OptionInstance.java +++ b/net/minecraft/client/OptionInstance.java @@ -21,8 +21,6 @@ import java.util.stream.IntStream; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.Util; -import net.minecraft.client.OptionInstance.CycleableValueSet.ValueSetter; -import net.minecraft.client.OptionInstance.IntRangeBase.1; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.AbstractOptionSliderButton; import net.minecraft.client.gui.components.AbstractWidget; @@ -165,8 +163,9 @@ public final class OptionInstance { } @Environment(EnvType.CLIENT) - public record AltEnum(List values, List altValues, BooleanSupplier altCondition, ValueSetter valueSetter, Codec codec) - implements OptionInstance.CycleableValueSet { + public record AltEnum( + List values, List altValues, BooleanSupplier altCondition, OptionInstance.CycleableValueSet.ValueSetter valueSetter, Codec codec + ) implements OptionInstance.CycleableValueSet { @Override public CycleButton.ValueListSupplier valueListSupplier() { return CycleButton.ValueListSupplier.create(this.altCondition, this.values, this.altValues); @@ -187,8 +186,8 @@ public final class OptionInstance { public record ClampingLazyMaxIntRange(int minInclusive, IntSupplier maxSupplier, int encodableMaxInclusive) implements OptionInstance.IntRangeBase, OptionInstance.SliderableOrCyclableValueSet { - public Optional validateValue(Integer integer) { - return Optional.of(Mth.clamp(integer, this.minInclusive(), this.maxInclusive())); + public Optional validateValue(Integer value) { + return Optional.of(Mth.clamp(value, this.minInclusive(), this.maxInclusive())); } @Override @@ -224,7 +223,7 @@ public final class OptionInstance { interface CycleableValueSet extends OptionInstance.ValueSet { CycleButton.ValueListSupplier valueListSupplier(); - default ValueSetter valueSetter() { + default OptionInstance.CycleableValueSet.ValueSetter valueSetter() { return OptionInstance::set; } @@ -242,6 +241,11 @@ public final class OptionInstance { onValueChanged.accept(object); }); } + + @Environment(EnvType.CLIENT) + public interface ValueSetter { + void set(OptionInstance optionInstance, T object); + } } @Environment(EnvType.CLIENT) @@ -263,8 +267,8 @@ public final class OptionInstance { this(minInclusive, maxInclusive, true); } - public Optional validateValue(Integer integer) { - return integer.compareTo(this.minInclusive()) >= 0 && integer.compareTo(this.maxInclusive()) <= 0 ? Optional.of(integer) : Optional.empty(); + public Optional validateValue(Integer value) { + return value.compareTo(this.minInclusive()) >= 0 && value.compareTo(this.maxInclusive()) <= 0 ? Optional.of(value) : Optional.empty(); } @Override @@ -279,24 +283,44 @@ public final class OptionInstance { int maxInclusive(); - default double toSliderValue(Integer integer) { - if (integer == this.minInclusive()) { + default double toSliderValue(Integer value) { + if (value == this.minInclusive()) { return 0.0; } else { - return integer == this.maxInclusive() ? 1.0 : Mth.map(integer.intValue() + 0.5, (double)this.minInclusive(), this.maxInclusive() + 1.0, 0.0, 1.0); + return value == this.maxInclusive() ? 1.0 : Mth.map(value.intValue() + 0.5, (double)this.minInclusive(), this.maxInclusive() + 1.0, 0.0, 1.0); } } - default Integer fromSliderValue(double d) { - if (d >= 1.0) { - d = 0.99999F; + default Integer fromSliderValue(double value) { + if (value >= 1.0) { + value = 0.99999F; } - return Mth.floor(Mth.map(d, 0.0, 1.0, (double)this.minInclusive(), this.maxInclusive() + 1.0)); + return Mth.floor(Mth.map(value, 0.0, 1.0, (double)this.minInclusive(), this.maxInclusive() + 1.0)); } default OptionInstance.SliderableValueSet xmap(IntFunction to, ToIntFunction from) { - return new 1(this, from, to); + return new OptionInstance.SliderableValueSet() { + @Override + public Optional validateValue(R value) { + return IntRangeBase.this.validateValue(from.applyAsInt(value)).map(to::apply); + } + + @Override + public double toSliderValue(R value) { + return IntRangeBase.this.toSliderValue(from.applyAsInt(value)); + } + + @Override + public R fromSliderValue(double value) { + return (R)to.apply(IntRangeBase.this.fromSliderValue(value)); + } + + @Override + public Codec codec() { + return IntRangeBase.this.codec().xmap(to::apply, from::applyAsInt); + } + }; } } @@ -422,20 +446,40 @@ public final class OptionInstance { public static enum UnitDouble implements OptionInstance.SliderableValueSet { INSTANCE; - public Optional validateValue(Double double_) { - return double_ >= 0.0 && double_ <= 1.0 ? Optional.of(double_) : Optional.empty(); + public Optional validateValue(Double value) { + return value >= 0.0 && value <= 1.0 ? Optional.of(value) : Optional.empty(); } - public double toSliderValue(Double double_) { - return double_; + public double toSliderValue(Double value) { + return value; } - public Double fromSliderValue(double d) { - return d; + public Double fromSliderValue(double value) { + return value; } public OptionInstance.SliderableValueSet xmap(DoubleFunction encoder, ToDoubleFunction decoder) { - return new net.minecraft.client.OptionInstance.UnitDouble.1(this, decoder, encoder); + return new OptionInstance.SliderableValueSet() { + @Override + public Optional validateValue(R value) { + return UnitDouble.this.validateValue(decoder.applyAsDouble(value)).map(encoder::apply); + } + + @Override + public double toSliderValue(R value) { + return UnitDouble.this.toSliderValue(decoder.applyAsDouble(value)); + } + + @Override + public R fromSliderValue(double value) { + return (R)encoder.apply(UnitDouble.this.fromSliderValue(value)); + } + + @Override + public Codec codec() { + return UnitDouble.this.codec().xmap(encoder::apply, decoder::applyAsDouble); + } + }; } @Override diff --git a/net/minecraft/client/Options.java b/net/minecraft/client/Options.java index 278e053b..1eb3800f 100644 --- a/net/minecraft/client/Options.java +++ b/net/minecraft/client/Options.java @@ -9,14 +9,10 @@ import com.google.common.collect.Sets; import com.google.common.io.Files; import com.google.gson.Gson; import com.google.gson.JsonElement; -import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.google.gson.stream.JsonReader; import com.mojang.blaze3d.platform.InputConstants; import com.mojang.blaze3d.platform.VideoMode; import com.mojang.blaze3d.platform.Window; -import com.mojang.blaze3d.platform.InputConstants.Type; -import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.datafixers.util.Pair; import com.mojang.logging.LogUtils; import com.mojang.serialization.Codec; @@ -26,7 +22,6 @@ import java.io.File; import java.io.FileOutputStream; import java.io.OutputStreamWriter; import java.io.PrintWriter; -import java.io.StringReader; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Arrays; @@ -47,16 +42,11 @@ import net.fabricmc.api.Environment; import net.minecraft.ChatFormatting; import net.minecraft.SharedConstants; import net.minecraft.Util; -import net.minecraft.client.OptionInstance.AltEnum; -import net.minecraft.client.OptionInstance.ClampingLazyMaxIntRange; -import net.minecraft.client.OptionInstance.Enum; -import net.minecraft.client.OptionInstance.IntRange; -import net.minecraft.client.OptionInstance.LazyEnum; -import net.minecraft.client.OptionInstance.UnitDouble; import net.minecraft.client.gui.components.ChatComponent; import net.minecraft.client.gui.components.Tooltip; import net.minecraft.client.renderer.GpuWarnlistManager; import net.minecraft.client.resources.sounds.SimpleSoundInstance; +import net.minecraft.client.sounds.MusicManager; import net.minecraft.client.sounds.SoundEngine; import net.minecraft.client.sounds.SoundManager; import net.minecraft.client.tutorial.TutorialSteps; @@ -74,6 +64,7 @@ import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; import net.minecraft.util.ARGB; import net.minecraft.util.GsonHelper; +import net.minecraft.util.LenientJsonParser; import net.minecraft.util.Mth; import net.minecraft.util.datafix.DataFixTypes; import net.minecraft.world.entity.HumanoidArm; @@ -114,7 +105,7 @@ public class Options { } else { return double_ == 1.0 ? genericValueLabel(component, Component.translatable("options.sensitivity.max")) : percentValueLabel(component, 2.0 * double_); } - }, UnitDouble.INSTANCE, 0.5, double_ -> {}); + }, OptionInstance.UnitDouble.INSTANCE, 0.5, double_ -> {}); private final OptionInstance renderDistance; private final OptionInstance simulationDistance; private int serverRenderDistance = 0; @@ -122,7 +113,7 @@ public class Options { "options.entityDistanceScaling", OptionInstance.noTooltip(), Options::percentValueLabel, - new IntRange(2, 20).xmap(i -> i / 4.0, double_ -> (int)(double_ * 4.0)), + new OptionInstance.IntRange(2, 20).xmap(i -> i / 4.0, double_ -> (int)(double_ * 4.0)), Codec.doubleRange(0.5, 5.0), 1.0, double_ -> {} @@ -134,7 +125,7 @@ public class Options { (component, integer) -> integer == 260 ? genericValueLabel(component, Component.translatable("options.framerateLimit.max")) : genericValueLabel(component, Component.translatable("options.framerate", integer)), - new IntRange(1, 26).xmap(i -> i * 10, integer -> integer / 10), + new OptionInstance.IntRange(1, 26).xmap(i -> i * 10, integer -> integer / 10), Codec.intRange(10, 260), 120, integer -> Minecraft.getInstance().getFramerateLimitTracker().setFramerateLimit(integer) @@ -150,7 +141,7 @@ public class Options { }; }, OptionInstance.forOptionEnum(), - new Enum<>(Arrays.asList(InactivityFpsLimit.values()), InactivityFpsLimit.CODEC), + new OptionInstance.Enum<>(Arrays.asList(InactivityFpsLimit.values()), InactivityFpsLimit.CODEC), InactivityFpsLimit.AFK, inactivityFpsLimit -> {} ); @@ -158,12 +149,20 @@ public class Options { "options.renderClouds", OptionInstance.noTooltip(), OptionInstance.forOptionEnum(), - new Enum<>( + new OptionInstance.Enum<>( Arrays.asList(CloudStatus.values()), Codec.withAlternative(CloudStatus.CODEC, Codec.BOOL, boolean_ -> boolean_ ? CloudStatus.FANCY : CloudStatus.OFF) ), CloudStatus.FANCY, cloudStatus -> {} ); + private final OptionInstance cloudRange = new OptionInstance<>( + "options.renderCloudsDistance", + OptionInstance.noTooltip(), + (component, integer) -> genericValueLabel(component, Component.translatable("options.chunks", integer)), + new OptionInstance.IntRange(2, 128, true), + 128, + integer -> Minecraft.getInstance().levelRenderer.getCloudRenderer().markForRebuild() + ); private static final Component GRAPHICS_TOOLTIP_FAST = Component.translatable("options.graphics.fast.tooltip"); private static final Component GRAPHICS_TOOLTIP_FABULOUS = Component.translatable( "options.graphics.fabulous.tooltip", Component.translatable("options.graphics.fabulous").withStyle(ChatFormatting.ITALIC) @@ -182,7 +181,7 @@ public class Options { MutableComponent mutableComponent = Component.translatable(graphicsStatus.getKey()); return graphicsStatus == GraphicsStatus.FABULOUS ? mutableComponent.withStyle(ChatFormatting.ITALIC) : mutableComponent; }, - new AltEnum<>( + new OptionInstance.AltEnum<>( Arrays.asList(GraphicsStatus.values()), (List)Stream.of(GraphicsStatus.values()).filter(graphicsStatus -> graphicsStatus != GraphicsStatus.FABULOUS).collect(Collectors.toList()), () -> Minecraft.getInstance().isRunning() && Minecraft.getInstance().getGpuWarnlistManager().isSkippingFabulous(), @@ -217,7 +216,7 @@ public class Options { }; }, OptionInstance.forOptionEnum(), - new Enum<>(Arrays.asList(PrioritizeChunkUpdates.values()), Codec.INT.xmap(PrioritizeChunkUpdates::byId, PrioritizeChunkUpdates::getId)), + new OptionInstance.Enum<>(Arrays.asList(PrioritizeChunkUpdates.values()), Codec.INT.xmap(PrioritizeChunkUpdates::byId, PrioritizeChunkUpdates::getId)), PrioritizeChunkUpdates.NONE, prioritizeChunkUpdates -> {} ); @@ -227,7 +226,7 @@ public class Options { "options.chat.visibility", OptionInstance.noTooltip(), OptionInstance.forOptionEnum(), - new Enum<>(Arrays.asList(ChatVisiblity.values()), Codec.INT.xmap(ChatVisiblity::byId, ChatVisiblity::getId)), + new OptionInstance.Enum<>(Arrays.asList(ChatVisiblity.values()), Codec.INT.xmap(ChatVisiblity::byId, ChatVisiblity::getId)), ChatVisiblity.FULL, chatVisiblity -> {} ); @@ -235,12 +234,12 @@ public class Options { "options.chat.opacity", OptionInstance.noTooltip(), (component, double_) -> percentValueLabel(component, double_ * 0.9 + 0.1), - UnitDouble.INSTANCE, + OptionInstance.UnitDouble.INSTANCE, 1.0, double_ -> Minecraft.getInstance().gui.getChat().rescaleChat() ); private final OptionInstance chatLineSpacing = new OptionInstance<>( - "options.chat.line_spacing", OptionInstance.noTooltip(), Options::percentValueLabel, UnitDouble.INSTANCE, 0.0, double_ -> {} + "options.chat.line_spacing", OptionInstance.noTooltip(), Options::percentValueLabel, OptionInstance.UnitDouble.INSTANCE, 0.0, double_ -> {} ); private static final Component MENU_BACKGROUND_BLURRINESS_TOOLTIP = Component.translatable("options.accessibility.menu_background_blurriness.tooltip"); private static final int BLURRINESS_DEFAULT_VALUE = 5; @@ -248,7 +247,7 @@ public class Options { "options.accessibility.menu_background_blurriness", OptionInstance.cachedConstantTooltip(MENU_BACKGROUND_BLURRINESS_TOOLTIP), Options::genericValueOrOffLabel, - new IntRange(0, 10), + new OptionInstance.IntRange(0, 10), 5, integer -> {} ); @@ -256,12 +255,12 @@ public class Options { "options.accessibility.text_background_opacity", OptionInstance.noTooltip(), Options::percentValueLabel, - UnitDouble.INSTANCE, + OptionInstance.UnitDouble.INSTANCE, 0.5, double_ -> Minecraft.getInstance().gui.getChat().rescaleChat() ); private final OptionInstance panoramaSpeed = new OptionInstance<>( - "options.accessibility.panorama_speed", OptionInstance.noTooltip(), Options::percentValueLabel, UnitDouble.INSTANCE, 1.0, double_ -> {} + "options.accessibility.panorama_speed", OptionInstance.noTooltip(), Options::percentValueLabel, OptionInstance.UnitDouble.INSTANCE, 1.0, double_ -> {} ); private static final Component ACCESSIBILITY_TOOLTIP_CONTRAST_MODE = Component.translatable("options.accessibility.high_contrast.tooltip"); private final OptionInstance highContrast = OptionInstance.createBoolean( @@ -300,7 +299,7 @@ public class Options { "options.mainHand", OptionInstance.noTooltip(), OptionInstance.forOptionEnum(), - new Enum<>(Arrays.asList(HumanoidArm.values()), HumanoidArm.CODEC), + new OptionInstance.Enum<>(Arrays.asList(HumanoidArm.values()), HumanoidArm.CODEC), HumanoidArm.RIGHT, humanoidArm -> {} ); @@ -310,7 +309,7 @@ public class Options { "options.chat.scale", OptionInstance.noTooltip(), (component, double_) -> (Component)(double_ == 0.0 ? CommonComponents.optionStatus(component, false) : percentValueLabel(component, double_)), - UnitDouble.INSTANCE, + OptionInstance.UnitDouble.INSTANCE, 1.0, double_ -> Minecraft.getInstance().gui.getChat().rescaleChat() ); @@ -318,7 +317,7 @@ public class Options { "options.chat.width", OptionInstance.noTooltip(), (component, double_) -> pixelValueLabel(component, ChatComponent.getWidth(double_)), - UnitDouble.INSTANCE, + OptionInstance.UnitDouble.INSTANCE, 1.0, double_ -> Minecraft.getInstance().gui.getChat().rescaleChat() ); @@ -326,7 +325,7 @@ public class Options { "options.chat.height.unfocused", OptionInstance.noTooltip(), (component, double_) -> pixelValueLabel(component, ChatComponent.getHeight(double_)), - UnitDouble.INSTANCE, + OptionInstance.UnitDouble.INSTANCE, ChatComponent.defaultUnfocusedPct(), double_ -> Minecraft.getInstance().gui.getChat().rescaleChat() ); @@ -334,7 +333,7 @@ public class Options { "options.chat.height.focused", OptionInstance.noTooltip(), (component, double_) -> pixelValueLabel(component, ChatComponent.getHeight(double_)), - UnitDouble.INSTANCE, + OptionInstance.UnitDouble.INSTANCE, 1.0, double_ -> Minecraft.getInstance().gui.getChat().rescaleChat() ); @@ -344,7 +343,7 @@ public class Options { (component, double_) -> double_ <= 0.0 ? Component.translatable("options.chat.delay_none") : Component.translatable("options.chat.delay", String.format(Locale.ROOT, "%.1f", double_)), - new IntRange(0, 60).xmap(i -> i / 10.0, double_ -> (int)(double_ * 10.0)), + new OptionInstance.IntRange(0, 60).xmap(i -> i / 10.0, double_ -> (int)(double_ * 10.0)), Codec.doubleRange(0.0, 6.0), 0.0, double_ -> Minecraft.getInstance().getChatListener().setMessageDelay(double_) @@ -354,7 +353,7 @@ public class Options { "options.notifications.display_time", OptionInstance.cachedConstantTooltip(ACCESSIBILITY_TOOLTIP_NOTIFICATION_DISPLAY_TIME), (component, double_) -> genericValueLabel(component, Component.translatable("options.multiplier", double_)), - new IntRange(5, 100).xmap(i -> i / 10.0, double_ -> (int)(double_ * 10.0)), + new OptionInstance.IntRange(5, 100).xmap(i -> i / 10.0, double_ -> (int)(double_ * 10.0)), Codec.doubleRange(0.5, 10.0), 1.0, double_ -> {} @@ -363,7 +362,7 @@ public class Options { "options.mipmapLevels", OptionInstance.noTooltip(), (component, integer) -> (Component)(integer == 0 ? CommonComponents.optionStatus(component, false) : genericValueLabel(component, integer)), - new IntRange(0, 4), + new OptionInstance.IntRange(0, 4), 4, integer -> {} ); @@ -372,7 +371,7 @@ public class Options { "options.attackIndicator", OptionInstance.noTooltip(), OptionInstance.forOptionEnum(), - new Enum<>(Arrays.asList(AttackIndicatorStatus.values()), Codec.INT.xmap(AttackIndicatorStatus::byId, AttackIndicatorStatus::getId)), + new OptionInstance.Enum<>(Arrays.asList(AttackIndicatorStatus.values()), Codec.INT.xmap(AttackIndicatorStatus::byId, AttackIndicatorStatus::getId)), AttackIndicatorStatus.CROSSHAIR, attackIndicatorStatus -> {} ); @@ -382,13 +381,13 @@ public class Options { "options.biomeBlendRadius", OptionInstance.noTooltip(), (component, integer) -> { int i = integer * 2 + 1; return genericValueLabel(component, Component.translatable("options.biomeBlendRadius." + i)); - }, new IntRange(0, 7, false), 2, integer -> Minecraft.getInstance().levelRenderer.allChanged() + }, new OptionInstance.IntRange(0, 7, false), 2, integer -> Minecraft.getInstance().levelRenderer.allChanged() ); private final OptionInstance mouseWheelSensitivity = new OptionInstance<>( "options.mouseWheelSensitivity", OptionInstance.noTooltip(), (component, double_) -> genericValueLabel(component, Component.literal(String.format(Locale.ROOT, "%.2f", double_))), - new IntRange(-200, 100).xmap(Options::logMouse, Options::unlogMouse), + new OptionInstance.IntRange(-200, 100).xmap(Options::logMouse, Options::unlogMouse), Codec.doubleRange(logMouse(-200), logMouse(100)), logMouse(0), double_ -> {} @@ -507,9 +506,9 @@ public class Options { public final KeyMapping keyInventory = new KeyMapping("key.inventory", 69, "key.categories.inventory"); public final KeyMapping keySwapOffhand = new KeyMapping("key.swapOffhand", 70, "key.categories.inventory"); public final KeyMapping keyDrop = new KeyMapping("key.drop", 81, "key.categories.inventory"); - public final KeyMapping keyUse = new KeyMapping("key.use", Type.MOUSE, 1, "key.categories.gameplay"); - public final KeyMapping keyAttack = new KeyMapping("key.attack", Type.MOUSE, 0, "key.categories.gameplay"); - public final KeyMapping keyPickItem = new KeyMapping("key.pickItem", Type.MOUSE, 2, "key.categories.gameplay"); + public final KeyMapping keyUse = new KeyMapping("key.use", InputConstants.Type.MOUSE, 1, "key.categories.gameplay"); + public final KeyMapping keyAttack = new KeyMapping("key.attack", InputConstants.Type.MOUSE, 0, "key.categories.gameplay"); + public final KeyMapping keyPickItem = new KeyMapping("key.pickItem", InputConstants.Type.MOUSE, 2, "key.categories.gameplay"); public final KeyMapping keyChat = new KeyMapping("key.chat", 84, "key.categories.multiplayer"); public final KeyMapping keyPlayerList = new KeyMapping("key.playerlist", 258, "key.categories.multiplayer"); public final KeyMapping keyCommand = new KeyMapping("key.command", 47, "key.categories.multiplayer"); @@ -520,6 +519,7 @@ public class Options { public final KeyMapping keyFullscreen = new KeyMapping("key.fullscreen", 300, "key.categories.misc"); public final KeyMapping keySpectatorOutlines = new KeyMapping("key.spectatorOutlines", InputConstants.UNKNOWN.getValue(), "key.categories.misc"); public final KeyMapping keyAdvancements = new KeyMapping("key.advancements", 76, "key.categories.misc"); + public final KeyMapping keyQuickActions = new KeyMapping("key.quickActions", 71, "key.categories.misc"); public final KeyMapping[] keyHotbarSlots = new KeyMapping[]{ new KeyMapping("key.hotbar.1", 49, "key.categories.inventory"), new KeyMapping("key.hotbar.2", 50, "key.categories.inventory"), @@ -559,7 +559,8 @@ public class Options { this.keySwapOffhand, this.keySaveHotbarActivator, this.keyLoadHotbarActivator, - this.keyAdvancements + this.keyAdvancements, + this.keyQuickActions }), (KeyMapping[])this.keyHotbarSlots ); @@ -579,7 +580,7 @@ public class Options { default -> genericValueLabel(component, integer); }; }, - new IntRange(30, 110), + new OptionInstance.IntRange(30, 110), Codec.DOUBLE.xmap(double_ -> (int)(double_ * 40.0 + 70.0), integer -> (integer.intValue() - 70.0) / 40.0), 70, integer -> Minecraft.getInstance().levelRenderer.needsUpdate() @@ -608,7 +609,7 @@ public class Options { "options.screenEffectScale", OptionInstance.cachedConstantTooltip(ACCESSIBILITY_TOOLTIP_SCREEN_EFFECT), Options::percentValueOrOffLabel, - UnitDouble.INSTANCE, + OptionInstance.UnitDouble.INSTANCE, 1.0, double_ -> {} ); @@ -617,7 +618,7 @@ public class Options { "options.fovEffectScale", OptionInstance.cachedConstantTooltip(ACCESSIBILITY_TOOLTIP_FOV_EFFECT), Options::percentValueOrOffLabel, - UnitDouble.INSTANCE.xmap(Mth::square, Math::sqrt), + OptionInstance.UnitDouble.INSTANCE.xmap(Mth::square, Math::sqrt), Codec.doubleRange(0.0, 1.0), 1.0, double_ -> {} @@ -627,7 +628,7 @@ public class Options { "options.darknessEffectScale", OptionInstance.cachedConstantTooltip(ACCESSIBILITY_TOOLTIP_DARKNESS_EFFECT), Options::percentValueOrOffLabel, - UnitDouble.INSTANCE.xmap(Mth::square, Math::sqrt), + OptionInstance.UnitDouble.INSTANCE.xmap(Mth::square, Math::sqrt), 1.0, double_ -> {} ); @@ -636,7 +637,7 @@ public class Options { "options.glintSpeed", OptionInstance.cachedConstantTooltip(ACCESSIBILITY_TOOLTIP_GLINT_SPEED), Options::percentValueOrOffLabel, - UnitDouble.INSTANCE, + OptionInstance.UnitDouble.INSTANCE, 0.5, double_ -> {} ); @@ -645,16 +646,16 @@ public class Options { "options.glintStrength", OptionInstance.cachedConstantTooltip(ACCESSIBILITY_TOOLTIP_GLINT_STRENGTH), Options::percentValueOrOffLabel, - UnitDouble.INSTANCE, + OptionInstance.UnitDouble.INSTANCE, 0.75, - RenderSystem::setShaderGlintAlpha + double_ -> {} ); private static final Component ACCESSIBILITY_TOOLTIP_DAMAGE_TILT_STRENGTH = Component.translatable("options.damageTiltStrength.tooltip"); private final OptionInstance damageTiltStrength = new OptionInstance<>( "options.damageTiltStrength", OptionInstance.cachedConstantTooltip(ACCESSIBILITY_TOOLTIP_DAMAGE_TILT_STRENGTH), Options::percentValueOrOffLabel, - UnitDouble.INSTANCE, + OptionInstance.UnitDouble.INSTANCE, 1.0, double_ -> {} ); @@ -667,14 +668,14 @@ public class Options { } else { return i == 100 ? genericValueLabel(component, Component.translatable("options.gamma.max")) : genericValueLabel(component, i); } - }, UnitDouble.INSTANCE, 0.5, double_ -> {}); + }, OptionInstance.UnitDouble.INSTANCE, 0.5, double_ -> {}); public static final int AUTO_GUI_SCALE = 0; private static final int MAX_GUI_SCALE_INCLUSIVE = 2147483646; private final OptionInstance guiScale = new OptionInstance<>( "options.guiScale", OptionInstance.noTooltip(), (component, integer) -> integer == 0 ? Component.translatable("options.guiScale.auto") : Component.literal(Integer.toString(integer)), - new ClampingLazyMaxIntRange(0, () -> { + new OptionInstance.ClampingLazyMaxIntRange(0, () -> { Minecraft minecraftx = Minecraft.getInstance(); return !minecraftx.isRunning() ? 2147483646 : minecraftx.getWindow().calculateScale(0, minecraftx.isEnforceUnicode()); }, 2147483646), @@ -685,7 +686,7 @@ public class Options { "options.particles", OptionInstance.noTooltip(), OptionInstance.forOptionEnum(), - new Enum<>(Arrays.asList(ParticleStatus.values()), Codec.INT.xmap(ParticleStatus::byId, ParticleStatus::getId)), + new OptionInstance.Enum<>(Arrays.asList(ParticleStatus.values()), Codec.INT.xmap(ParticleStatus::byId, ParticleStatus::getId)), ParticleStatus.ALL, particleStatus -> {} ); @@ -695,7 +696,7 @@ public class Options { (component, narratorStatus) -> (Component)(this.minecraft.getNarrator().isActive() ? narratorStatus.getName() : Component.translatable("options.narrator.notavailable")), - new Enum<>(Arrays.asList(NarratorStatus.values()), Codec.INT.xmap(NarratorStatus::byId, NarratorStatus::getId)), + new OptionInstance.Enum<>(Arrays.asList(NarratorStatus.values()), Codec.INT.xmap(NarratorStatus::byId, NarratorStatus::getId)), NarratorStatus.OFF, narratorStatus -> this.minecraft.getNarrator().updateNarratorStatus(narratorStatus) ); @@ -710,7 +711,7 @@ public class Options { return string.startsWith("OpenAL Soft on ") ? Component.literal(string.substring(SoundEngine.OPEN_AL_SOFT_PREFIX_LENGTH)) : Component.literal(string); } }, - new LazyEnum<>( + new OptionInstance.LazyEnum<>( () -> Stream.concat(Stream.of(""), Minecraft.getInstance().getSoundManager().getAvailableSoundDevices().stream()).toList(), string -> Minecraft.getInstance().isRunning() && string != "" && !Minecraft.getInstance().getSoundManager().getAvailableSoundDevices().contains(string) ? Optional.empty() @@ -725,6 +726,25 @@ public class Options { } ); public boolean onboardAccessibility = true; + private static final Component MUSIC_FREQUENCY_TOOLTIP = Component.translatable("options.music_frequency.tooltip"); + private final OptionInstance musicFrequency = new OptionInstance<>( + "options.music_frequency", + OptionInstance.cachedConstantTooltip(MUSIC_FREQUENCY_TOOLTIP), + OptionInstance.forOptionEnum(), + new OptionInstance.Enum<>(Arrays.asList(MusicManager.MusicFrequency.values()), MusicManager.MusicFrequency.CODEC), + MusicManager.MusicFrequency.DEFAULT, + musicFrequency -> Minecraft.getInstance().getMusicManager().setMinutesBetweenSongs(musicFrequency) + ); + private static final Component NOW_PLAYING_TOAST_TOOLTIP = Component.translatable("options.showNowPlayingToast.tooltip"); + private final OptionInstance showNowPlayingToast = OptionInstance.createBoolean( + "options.showNowPlayingToast", OptionInstance.cachedConstantTooltip(NOW_PLAYING_TOAST_TOOLTIP), false, boolean_ -> { + if (boolean_) { + this.minecraft.getToastManager().createNowPlayingToast(); + } else { + this.minecraft.getToastManager().removeNowPlayingToast(); + } + } + ); public boolean syncWrites; public boolean startedCleanly = true; @@ -768,6 +788,10 @@ public class Options { return this.cloudStatus; } + public OptionInstance cloudRange() { + return this.cloudRange; + } + public OptionInstance graphicsMode() { return this.graphicsMode; } @@ -973,8 +997,14 @@ public class Options { return this.reducedDebugInfo; } - public final float getSoundSourceVolume(SoundSource category) { - return this.getSoundSourceOptionInstance(category).get().floatValue(); + public final float getFinalSoundSourceVolume(SoundSource soundSource) { + return soundSource == SoundSource.MASTER + ? this.getSoundSourceVolume(soundSource) + : this.getSoundSourceVolume(soundSource) * this.getSoundSourceVolume(SoundSource.MASTER); + } + + public final float getSoundSourceVolume(SoundSource soundSource) { + return this.getSoundSourceOptionInstance(soundSource).get().floatValue(); } public final OptionInstance getSoundSourceOptionInstance(SoundSource soundSource) { @@ -986,7 +1016,7 @@ public class Options { text, OptionInstance.noTooltip(), Options::percentValueOrOffLabel, - UnitDouble.INSTANCE, + OptionInstance.UnitDouble.INSTANCE, 1.0, double_ -> Minecraft.getInstance().getSoundManager().updateSourceVolume(soundSource, double_.floatValue()) ); @@ -1093,6 +1123,14 @@ public class Options { this.save(); } + public OptionInstance musicFrequency() { + return this.musicFrequency; + } + + public OptionInstance showNowPlayingToast() { + return this.showNowPlayingToast; + } + public Options(Minecraft minecraft, File gameDirectory) { this.minecraft = minecraft; this.optionsFile = new File(gameDirectory, "options.txt"); @@ -1101,7 +1139,7 @@ public class Options { "options.renderDistance", OptionInstance.noTooltip(), (component, integer) -> genericValueLabel(component, Component.translatable("options.chunks", integer)), - new IntRange(2, bl ? 32 : 16, false), + new OptionInstance.IntRange(2, bl ? 32 : 16, false), 12, integer -> Minecraft.getInstance().levelRenderer.needsUpdate() ); @@ -1109,7 +1147,7 @@ public class Options { "options.simulationDistance", OptionInstance.noTooltip(), (component, integer) -> genericValueLabel(component, Component.translatable("options.chunks", integer)), - new IntRange(5, bl ? 32 : 16, false), + new OptionInstance.IntRange(5, bl ? 32 : 16, false), 12, integer -> {} ); @@ -1154,6 +1192,7 @@ public class Options { optionAccess.process("particles", this.particles); optionAccess.process("reducedDebugInfo", this.reducedDebugInfo); optionAccess.process("renderClouds", this.cloudStatus); + optionAccess.process("cloudRange", this.cloudRange); optionAccess.process("renderDistance", this.renderDistance); optionAccess.process("simulationDistance", this.simulationDistance); optionAccess.process("screenEffectScale", this.screenEffectScale); @@ -1225,6 +1264,8 @@ public class Options { this.onboardAccessibility = accessor.process("onboardAccessibility", this.onboardAccessibility); accessor.process("menuBackgroundBlurriness", this.menuBackgroundBlurriness); this.startedCleanly = accessor.process("startedCleanly", this.startedCleanly); + accessor.process("showNowPlayingToast", this.showNowPlayingToast); + accessor.process("musicFrequency", this.musicFrequency); for (KeyMapping keyMapping : this.keyMappings) { String string = keyMapping.saveString(); @@ -1308,8 +1349,7 @@ public class Options { public void process(String name, OptionInstance value) { String string = this.getValue(name); if (string != null) { - JsonReader jsonReader = new JsonReader(new StringReader(string.isEmpty() ? "\"\"" : string)); - JsonElement jsonElement = JsonParser.parseReader(jsonReader); + JsonElement jsonElement = LenientJsonParser.parse(string.isEmpty() ? "\"\"" : string); value.codec() .parse(JsonOps.INSTANCE, jsonElement) .ifError(error -> Options.LOGGER.error("Error parsing option value {} for option {}: {}", string, value, error.message())) @@ -1402,7 +1442,7 @@ public class Options { final PrintWriter printWriter = new PrintWriter(new OutputStreamWriter(new FileOutputStream(this.optionsFile), StandardCharsets.UTF_8)); try { - printWriter.println("version:" + SharedConstants.getCurrentVersion().getDataVersion().getVersion()); + printWriter.println("version:" + SharedConstants.getCurrentVersion().dataVersion().version()); this.processOptions( new Options.FieldAccess() { public void writePrefix(String prefix) { @@ -1531,7 +1571,7 @@ public class Options { } public CloudStatus getCloudsType() { - return this.getEffectiveRenderDistance() >= 4 ? this.cloudStatus.get() : CloudStatus.OFF; + return this.cloudStatus.get(); } /** diff --git a/net/minecraft/client/PeriodicNotificationManager.java b/net/minecraft/client/PeriodicNotificationManager.java index 1873d6ce..1109651b 100644 --- a/net/minecraft/client/PeriodicNotificationManager.java +++ b/net/minecraft/client/PeriodicNotificationManager.java @@ -2,7 +2,6 @@ package net.minecraft.client; import com.google.common.collect.ImmutableMap; import com.google.common.math.LongMath; -import com.google.gson.JsonParser; import com.mojang.logging.LogUtils; import com.mojang.serialization.Codec; import com.mojang.serialization.JsonOps; @@ -26,6 +25,7 @@ import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.packs.resources.ResourceManager; import net.minecraft.server.packs.resources.SimplePreparableReloadListener; +import net.minecraft.util.StrictJsonParser; import net.minecraft.util.profiling.ProfilerFiller; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; @@ -60,13 +60,16 @@ public class PeriodicNotificationManager this.selector = selector; } - protected Map> prepare(ResourceManager resourceManager, ProfilerFiller profilerFiller) { + /** + * Performs any reloading that can be done off-thread, such as file IO + */ + protected Map> prepare(ResourceManager resourceManager, ProfilerFiller profiler) { try { Reader reader = resourceManager.openAsReader(this.notifications); Map var4; try { - var4 = (Map)CODEC.parse(JsonOps.INSTANCE, JsonParser.parseReader(reader)).result().orElseThrow(); + var4 = (Map)CODEC.parse(JsonOps.INSTANCE, StrictJsonParser.parse(reader)).result().orElseThrow(); } catch (Throwable var7) { if (reader != null) { try { @@ -90,8 +93,8 @@ public class PeriodicNotificationManager } } - protected void apply(Map> map, ResourceManager resourceManager, ProfilerFiller profilerFiller) { - List list = (List)map.entrySet() + protected void apply(Map> object, ResourceManager resourceManager, ProfilerFiller profiler) { + List list = (List)object.entrySet() .stream() .filter(entry -> this.selector.apply((String)entry.getKey())) .map(Entry::getValue) diff --git a/net/minecraft/client/Screenshot.java b/net/minecraft/client/Screenshot.java index 4341be61..39ecebce 100644 --- a/net/minecraft/client/Screenshot.java +++ b/net/minecraft/client/Screenshot.java @@ -1,7 +1,5 @@ package net.minecraft.client; -import com.mojang.blaze3d.buffers.BufferType; -import com.mojang.blaze3d.buffers.BufferUsage; import com.mojang.blaze3d.buffers.GpuBuffer; import com.mojang.blaze3d.pipeline.RenderTarget; import com.mojang.blaze3d.platform.NativeImage; @@ -17,6 +15,7 @@ import net.minecraft.ChatFormatting; import net.minecraft.Util; import net.minecraft.network.chat.ClickEvent; import net.minecraft.network.chat.Component; +import net.minecraft.util.ARGB; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; @@ -28,24 +27,22 @@ public class Screenshot { /** * Saves a screenshot in the game directory with a time-stamped filename. */ - public static void grab(File gameDirectory, RenderTarget buffer, Consumer messageConsumer) { - grab(gameDirectory, null, buffer, messageConsumer); + public static void grab(File gameDirectory, RenderTarget renderTarget, Consumer messageConsumer) { + grab(gameDirectory, null, renderTarget, 1, messageConsumer); } - /** - * Saves a screenshot in the game directory with the given file name (or null to generate a time-stamped name). - */ - public static void grab(File gameDirectory, @Nullable String screenshotName, RenderTarget buffer, Consumer messageConsumer) { + public static void grab(File gameDirectory, @Nullable String filename, RenderTarget renderTarget, int downscaleFactor, Consumer messageConsumer) { takeScreenshot( - buffer, + renderTarget, + downscaleFactor, nativeImage -> { File file2 = new File(gameDirectory, "screenshots"); file2.mkdir(); File file3; - if (screenshotName == null) { + if (filename == null) { file3 = getFile(file2); } else { - file3 = new File(file2, screenshotName); + file3 = new File(file2, filename); } Util.ioPool() @@ -86,23 +83,46 @@ public class Screenshot { } public static void takeScreenshot(RenderTarget renderTarget, Consumer writer) { + takeScreenshot(renderTarget, 1, writer); + } + + public static void takeScreenshot(RenderTarget renderTarget, int downscaleFactor, Consumer writer) { int i = renderTarget.width; int j = renderTarget.height; GpuTexture gpuTexture = renderTarget.getColorTexture(); if (gpuTexture == null) { throw new IllegalStateException("Tried to capture screenshot of an incomplete framebuffer"); - } else { - GpuBuffer gpuBuffer = RenderSystem.getDevice() - .createBuffer(() -> "Screenshot buffer", BufferType.PIXEL_PACK, BufferUsage.STATIC_READ, i * j * gpuTexture.getFormat().pixelSize()); + } else if (i % downscaleFactor == 0 && j % downscaleFactor == 0) { + GpuBuffer gpuBuffer = RenderSystem.getDevice().createBuffer(() -> "Screenshot buffer", 9, i * j * gpuTexture.getFormat().pixelSize()); CommandEncoder commandEncoder = RenderSystem.getDevice().createCommandEncoder(); RenderSystem.getDevice().createCommandEncoder().copyTextureToBuffer(gpuTexture, gpuBuffer, 0, () -> { - try (GpuBuffer.ReadView readView = commandEncoder.readBuffer(gpuBuffer)) { - NativeImage nativeImage = new NativeImage(i, j, false); + try (GpuBuffer.MappedView mappedView = commandEncoder.mapBuffer(gpuBuffer, true, false)) { + int l = j / downscaleFactor; + int m = i / downscaleFactor; + NativeImage nativeImage = new NativeImage(m, l, false); - for (int k = 0; k < j; k++) { - for (int l = 0; l < i; l++) { - int m = readView.data().getInt((l + k * i) * gpuTexture.getFormat().pixelSize()); - nativeImage.setPixelABGR(l, j - k - 1, m | 0xFF000000); + for (int n = 0; n < l; n++) { + for (int o = 0; o < m; o++) { + if (downscaleFactor == 1) { + int p = mappedView.data().getInt((o + n * i) * gpuTexture.getFormat().pixelSize()); + nativeImage.setPixelABGR(o, j - n - 1, p | 0xFF000000); + } else { + int p = 0; + int q = 0; + int r = 0; + + for (int s = 0; s < downscaleFactor; s++) { + for (int t = 0; t < downscaleFactor; t++) { + int u = mappedView.data().getInt((o * downscaleFactor + s + (n * downscaleFactor + t) * i) * gpuTexture.getFormat().pixelSize()); + p += ARGB.red(u); + q += ARGB.green(u); + r += ARGB.blue(u); + } + } + + int s = downscaleFactor * downscaleFactor; + nativeImage.setPixelABGR(o, l - n - 1, ARGB.color(255, p / s, q / s, r / s)); + } } } @@ -111,6 +131,8 @@ public class Screenshot { gpuBuffer.close(); }, 0); + } else { + throw new IllegalArgumentException("Image size is not divisible by downscale factor"); } } diff --git a/net/minecraft/client/ToggleKeyMapping.java b/net/minecraft/client/ToggleKeyMapping.java index 7e565ee3..f2638946 100644 --- a/net/minecraft/client/ToggleKeyMapping.java +++ b/net/minecraft/client/ToggleKeyMapping.java @@ -1,6 +1,6 @@ package net.minecraft.client; -import com.mojang.blaze3d.platform.InputConstants.Type; +import com.mojang.blaze3d.platform.InputConstants; import java.util.function.BooleanSupplier; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -10,7 +10,7 @@ public class ToggleKeyMapping extends KeyMapping { private final BooleanSupplier needsToggle; public ToggleKeyMapping(String name, int keyCode, String category, BooleanSupplier needsToggle) { - super(name, Type.KEYSYM, keyCode, category); + super(name, InputConstants.Type.KEYSYM, keyCode, category); this.needsToggle = needsToggle; } diff --git a/net/minecraft/client/animation/AnimationDefinition.java b/net/minecraft/client/animation/AnimationDefinition.java index 6da6afba..9c0a02c2 100644 --- a/net/minecraft/client/animation/AnimationDefinition.java +++ b/net/minecraft/client/animation/AnimationDefinition.java @@ -6,9 +6,14 @@ import java.util.List; import java.util.Map; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; +import net.minecraft.client.model.geom.ModelPart; @Environment(EnvType.CLIENT) public record AnimationDefinition(float lengthInSeconds, boolean looping, Map> boneAnimations) { + public KeyframeAnimation bake(ModelPart root) { + return KeyframeAnimation.bake(root, this); + } + @Environment(EnvType.CLIENT) public static class Builder { private final float length; diff --git a/net/minecraft/client/animation/KeyframeAnimation.java b/net/minecraft/client/animation/KeyframeAnimation.java new file mode 100644 index 00000000..0dc0d9fe --- /dev/null +++ b/net/minecraft/client/animation/KeyframeAnimation.java @@ -0,0 +1,94 @@ +package net.minecraft.client.animation; + +import java.util.ArrayList; +import java.util.List; +import java.util.function.Function; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.client.model.geom.ModelPart; +import net.minecraft.util.Mth; +import net.minecraft.world.entity.AnimationState; +import org.joml.Vector3f; + +@Environment(EnvType.CLIENT) +public class KeyframeAnimation { + private final AnimationDefinition definition; + private final List entries; + private final Vector3f scratchVector = new Vector3f(); + + private KeyframeAnimation(AnimationDefinition definition, List entries) { + this.definition = definition; + this.entries = entries; + } + + static KeyframeAnimation bake(ModelPart root, AnimationDefinition definition) { + List list = new ArrayList(); + Function function = root.createPartLookup(); + + for (java.util.Map.Entry> entry : definition.boneAnimations().entrySet()) { + String string = (String)entry.getKey(); + List list2 = (List)entry.getValue(); + ModelPart modelPart = (ModelPart)function.apply(string); + if (modelPart == null) { + throw new IllegalArgumentException("Cannot animate " + string + ", which does not exist in model"); + } + + for (AnimationChannel animationChannel : list2) { + list.add(new KeyframeAnimation.Entry(modelPart, animationChannel.target(), animationChannel.keyframes())); + } + } + + return new KeyframeAnimation(definition, List.copyOf(list)); + } + + public void applyStatic() { + this.apply(0L, 1.0F); + } + + public void applyWalk(float walkAnimationPos, float walkAnimationSpeed, float timeMultiplier, float speedMultiplier) { + long l = (long)(walkAnimationPos * 50.0F * timeMultiplier); + float f = Math.min(walkAnimationSpeed * speedMultiplier, 1.0F); + this.apply(l, f); + } + + public void apply(AnimationState animationState, float ageInTicks) { + this.apply(animationState, ageInTicks, 1.0F); + } + + public void apply(AnimationState animationState, float ageInTicks, float speedMultiplier) { + animationState.ifStarted(animationStatex -> this.apply((long)((float)animationStatex.getTimeInMillis(ageInTicks) * speedMultiplier), 1.0F)); + } + + public void apply(long timeInMillis, float scale) { + float f = this.getElapsedSeconds(timeInMillis); + + for (KeyframeAnimation.Entry entry : this.entries) { + entry.apply(f, scale, this.scratchVector); + } + } + + private float getElapsedSeconds(long timeInMillis) { + float f = (float)timeInMillis / 1000.0F; + return this.definition.looping() ? f % this.definition.lengthInSeconds() : f; + } + + @Environment(EnvType.CLIENT) + record Entry(ModelPart part, AnimationChannel.Target target, Keyframe[] keyframes) { + public void apply(float elapsedSeconds, float scale, Vector3f scratchVector) { + int i = Math.max(0, Mth.binarySearch(0, this.keyframes.length, ix -> elapsedSeconds <= this.keyframes[ix].timestamp()) - 1); + int j = Math.min(this.keyframes.length - 1, i + 1); + Keyframe keyframe = this.keyframes[i]; + Keyframe keyframe2 = this.keyframes[j]; + float f = elapsedSeconds - keyframe.timestamp(); + float g; + if (j != i) { + g = Mth.clamp(f / (keyframe2.timestamp() - keyframe.timestamp()), 0.0F, 1.0F); + } else { + g = 0.0F; + } + + keyframe2.interpolation().apply(scratchVector, g, this.keyframes, i, j, scale); + this.target.apply(this.part, scratchVector); + } + } +} diff --git a/net/minecraft/client/animation/KeyframeAnimations.java b/net/minecraft/client/animation/KeyframeAnimations.java index 955c0c29..a5f0be4a 100644 --- a/net/minecraft/client/animation/KeyframeAnimations.java +++ b/net/minecraft/client/animation/KeyframeAnimations.java @@ -1,48 +1,11 @@ package net.minecraft.client.animation; -import java.util.List; -import java.util.Optional; -import java.util.Map.Entry; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.minecraft.client.model.Model; -import net.minecraft.client.model.geom.ModelPart; -import net.minecraft.util.Mth; import org.joml.Vector3f; @Environment(EnvType.CLIENT) public class KeyframeAnimations { - public static void animate(Model model, AnimationDefinition definition, long accumulatedTime, float scale, Vector3f vector) { - float f = getElapsedSeconds(definition, accumulatedTime); - - for (Entry> entry : definition.boneAnimations().entrySet()) { - Optional optional = model.getAnyDescendantWithName((String)entry.getKey()); - List list = (List)entry.getValue(); - optional.ifPresent(modelPart -> list.forEach(animationChannel -> { - Keyframe[] keyframes = animationChannel.keyframes(); - int i = Math.max(0, Mth.binarySearch(0, keyframes.length, ix -> f <= keyframes[ix].timestamp()) - 1); - int j = Math.min(keyframes.length - 1, i + 1); - Keyframe keyframe = keyframes[i]; - Keyframe keyframe2 = keyframes[j]; - float h = f - keyframe.timestamp(); - float k; - if (j != i) { - k = Mth.clamp(h / (keyframe2.timestamp() - keyframe.timestamp()), 0.0F, 1.0F); - } else { - k = 0.0F; - } - - keyframe2.interpolation().apply(vector, k, keyframes, i, j, scale); - animationChannel.target().apply(modelPart, vector); - })); - } - } - - private static float getElapsedSeconds(AnimationDefinition animationDefinition, long accumulatedTime) { - float f = (float)accumulatedTime / 1000.0F; - return animationDefinition.looping() ? f % animationDefinition.lengthInSeconds() : f; - } - public static Vector3f posVec(float x, float y, float z) { return new Vector3f(x, -y, z); } diff --git a/net/minecraft/client/animation/definitions/BreezeAnimation.java b/net/minecraft/client/animation/definitions/BreezeAnimation.java index cb56282f..3cde81d4 100644 --- a/net/minecraft/client/animation/definitions/BreezeAnimation.java +++ b/net/minecraft/client/animation/definitions/BreezeAnimation.java @@ -6,390 +6,390 @@ import net.minecraft.client.animation.AnimationChannel; import net.minecraft.client.animation.AnimationDefinition; import net.minecraft.client.animation.Keyframe; import net.minecraft.client.animation.KeyframeAnimations; -import net.minecraft.client.animation.AnimationChannel.Interpolations; -import net.minecraft.client.animation.AnimationChannel.Targets; -import net.minecraft.client.animation.AnimationDefinition.Builder; @Environment(EnvType.CLIENT) public class BreezeAnimation { - public static final AnimationDefinition IDLE = Builder.withLength(2.0F) + public static final AnimationDefinition IDLE = AnimationDefinition.Builder.withLength(2.0F) .looping() .addAnimation( "wind_top", new AnimationChannel( - Targets.POSITION, - new Keyframe(0.0F, KeyframeAnimations.posVec(0.5F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.25F, KeyframeAnimations.posVec(0.5F, 0.0F, -0.5F), Interpolations.LINEAR), - new Keyframe(0.75F, KeyframeAnimations.posVec(-0.5F, 0.0F, -0.5F), Interpolations.LINEAR), - new Keyframe(1.25F, KeyframeAnimations.posVec(-0.5F, 0.0F, 0.5F), Interpolations.LINEAR), - new Keyframe(1.75F, KeyframeAnimations.posVec(0.5F, 0.0F, 0.5F), Interpolations.LINEAR), - new Keyframe(2.0F, KeyframeAnimations.posVec(0.5F, 0.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.POSITION, + new Keyframe(0.0F, KeyframeAnimations.posVec(0.5F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.25F, KeyframeAnimations.posVec(0.5F, 0.0F, -0.5F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.75F, KeyframeAnimations.posVec(-0.5F, 0.0F, -0.5F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(1.25F, KeyframeAnimations.posVec(-0.5F, 0.0F, 0.5F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(1.75F, KeyframeAnimations.posVec(0.5F, 0.0F, 0.5F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(2.0F, KeyframeAnimations.posVec(0.5F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "wind_mid", new AnimationChannel( - Targets.POSITION, - new Keyframe(0.0F, KeyframeAnimations.posVec(0.5F, 0.0F, -0.5F), Interpolations.LINEAR), - new Keyframe(0.5F, KeyframeAnimations.posVec(-0.5F, 0.0F, -0.5F), Interpolations.LINEAR), - new Keyframe(1.0F, KeyframeAnimations.posVec(-0.5F, 0.0F, 0.5F), Interpolations.LINEAR), - new Keyframe(1.5F, KeyframeAnimations.posVec(0.5F, 0.0F, 0.5F), Interpolations.LINEAR), - new Keyframe(2.0F, KeyframeAnimations.posVec(0.5F, 0.0F, -0.5F), Interpolations.LINEAR) + AnimationChannel.Targets.POSITION, + new Keyframe(0.0F, KeyframeAnimations.posVec(0.5F, 0.0F, -0.5F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.5F, KeyframeAnimations.posVec(-0.5F, 0.0F, -0.5F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(1.0F, KeyframeAnimations.posVec(-0.5F, 0.0F, 0.5F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(1.5F, KeyframeAnimations.posVec(0.5F, 0.0F, 0.5F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(2.0F, KeyframeAnimations.posVec(0.5F, 0.0F, -0.5F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "head", new AnimationChannel( - Targets.POSITION, - new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.CATMULLROM), - new Keyframe(1.0F, KeyframeAnimations.posVec(0.0F, 1.0F, 0.0F), Interpolations.CATMULLROM), - new Keyframe(2.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.CATMULLROM) + AnimationChannel.Targets.POSITION, + new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM), + new Keyframe(1.0F, KeyframeAnimations.posVec(0.0F, 1.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM), + new Keyframe(2.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM) ) ) .addAnimation( "rods", new AnimationChannel( - Targets.ROTATION, - new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(2.0F, KeyframeAnimations.degreeVec(0.0F, 1080.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.ROTATION, + new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(2.0F, KeyframeAnimations.degreeVec(0.0F, 1080.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "rods", new AnimationChannel( - Targets.POSITION, - new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(1.0F, KeyframeAnimations.posVec(0.0F, -1.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(2.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.POSITION, + new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(1.0F, KeyframeAnimations.posVec(0.0F, -1.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(2.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .build(); - public static final AnimationDefinition SHOOT = Builder.withLength(1.125F) + public static final AnimationDefinition SHOOT = AnimationDefinition.Builder.withLength(1.125F) .addAnimation( "head", new AnimationChannel( - Targets.ROTATION, - new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.25F, KeyframeAnimations.degreeVec(-12.5F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.75F, KeyframeAnimations.degreeVec(-12.5F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.9167F, KeyframeAnimations.degreeVec(5.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(1.125F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.ROTATION, + new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.25F, KeyframeAnimations.degreeVec(-12.5F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.75F, KeyframeAnimations.degreeVec(-12.5F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.9167F, KeyframeAnimations.degreeVec(5.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(1.125F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "head", new AnimationChannel( - Targets.POSITION, - new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.25F, KeyframeAnimations.posVec(0.0F, -2.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.7917F, KeyframeAnimations.posVec(0.0F, -1.0F, 2.0F), Interpolations.LINEAR), - new Keyframe(0.9583F, KeyframeAnimations.posVec(0.0F, -1.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(1.125F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.POSITION, + new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.25F, KeyframeAnimations.posVec(0.0F, -2.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.7917F, KeyframeAnimations.posVec(0.0F, -1.0F, 2.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.9583F, KeyframeAnimations.posVec(0.0F, -1.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(1.125F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( - "wind_bottom", new AnimationChannel(Targets.ROTATION, new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR)) - ) - .addAnimation( - "wind_mid", + "wind_bottom", new AnimationChannel( - Targets.ROTATION, - new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.25F, KeyframeAnimations.degreeVec(12.5F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.75F, KeyframeAnimations.degreeVec(12.5F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.9167F, KeyframeAnimations.degreeVec(-10.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(1.125F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.ROTATION, new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "wind_mid", new AnimationChannel( - Targets.POSITION, - new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.25F, KeyframeAnimations.posVec(0.0F, 0.0F, 5.0F), Interpolations.LINEAR), - new Keyframe(0.75F, KeyframeAnimations.posVec(0.0F, 0.0F, 6.0F), Interpolations.LINEAR), - new Keyframe(0.9167F, KeyframeAnimations.posVec(0.0F, 0.0F, -2.0F), Interpolations.LINEAR), - new Keyframe(1.125F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.ROTATION, + new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.25F, KeyframeAnimations.degreeVec(12.5F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.75F, KeyframeAnimations.degreeVec(12.5F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.9167F, KeyframeAnimations.degreeVec(-10.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(1.125F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) + ) + ) + .addAnimation( + "wind_mid", + new AnimationChannel( + AnimationChannel.Targets.POSITION, + new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.25F, KeyframeAnimations.posVec(0.0F, 0.0F, 5.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.75F, KeyframeAnimations.posVec(0.0F, 0.0F, 6.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.9167F, KeyframeAnimations.posVec(0.0F, 0.0F, -2.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(1.125F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "wind_top", new AnimationChannel( - Targets.ROTATION, - new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.25F, KeyframeAnimations.degreeVec(15.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.75F, KeyframeAnimations.degreeVec(15.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.9167F, KeyframeAnimations.degreeVec(-10.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(1.125F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.ROTATION, + new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.25F, KeyframeAnimations.degreeVec(15.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.75F, KeyframeAnimations.degreeVec(15.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.9167F, KeyframeAnimations.degreeVec(-10.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(1.125F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "wind_top", new AnimationChannel( - Targets.POSITION, - new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.25F, KeyframeAnimations.posVec(0.0F, 0.0F, 3.0F), Interpolations.LINEAR), - new Keyframe(0.8333F, KeyframeAnimations.posVec(0.0F, 0.0F, 4.0F), Interpolations.LINEAR), - new Keyframe(0.9583F, KeyframeAnimations.posVec(0.0F, 0.0F, -2.0F), Interpolations.LINEAR), - new Keyframe(1.125F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.POSITION, + new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.25F, KeyframeAnimations.posVec(0.0F, 0.0F, 3.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.8333F, KeyframeAnimations.posVec(0.0F, 0.0F, 4.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.9583F, KeyframeAnimations.posVec(0.0F, 0.0F, -2.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(1.125F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "body", new AnimationChannel( - Targets.ROTATION, - new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.25F, KeyframeAnimations.degreeVec(12.5F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.75F, KeyframeAnimations.degreeVec(12.5F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.9167F, KeyframeAnimations.degreeVec(-2.5F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(1.125F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.ROTATION, + new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.25F, KeyframeAnimations.degreeVec(12.5F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.75F, KeyframeAnimations.degreeVec(12.5F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.9167F, KeyframeAnimations.degreeVec(-2.5F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(1.125F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "body", new AnimationChannel( - Targets.POSITION, - new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.25F, KeyframeAnimations.posVec(0.0F, 3.0F, 5.0F), Interpolations.LINEAR), - new Keyframe(0.8333F, KeyframeAnimations.posVec(0.0F, 3.0F, 6.0F), Interpolations.LINEAR), - new Keyframe(0.9583F, KeyframeAnimations.posVec(0.0F, 3.0F, -1.0F), Interpolations.LINEAR), - new Keyframe(1.125F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.POSITION, + new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.25F, KeyframeAnimations.posVec(0.0F, 3.0F, 5.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.8333F, KeyframeAnimations.posVec(0.0F, 3.0F, 6.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.9583F, KeyframeAnimations.posVec(0.0F, 3.0F, -1.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(1.125F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "rods", new AnimationChannel( - Targets.ROTATION, - new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(1.0F, KeyframeAnimations.degreeVec(0.0F, 360.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.ROTATION, + new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(1.0F, KeyframeAnimations.degreeVec(0.0F, 360.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .build(); - public static final AnimationDefinition JUMP = Builder.withLength(0.5F) + public static final AnimationDefinition JUMP = AnimationDefinition.Builder.withLength(0.5F) .addAnimation( "body", new AnimationChannel( - Targets.POSITION, - new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, -10.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.125F, KeyframeAnimations.posVec(0.0F, 11.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.5F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.POSITION, + new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, -10.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.125F, KeyframeAnimations.posVec(0.0F, 11.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.5F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "head", new AnimationChannel( - Targets.ROTATION, - new Keyframe(0.0F, KeyframeAnimations.degreeVec(22.5F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.2083F, KeyframeAnimations.degreeVec(-19.25F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.5F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.ROTATION, + new Keyframe(0.0F, KeyframeAnimations.degreeVec(22.5F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.2083F, KeyframeAnimations.degreeVec(-19.25F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.5F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "wind_body", new AnimationChannel( - Targets.SCALE, - new Keyframe(0.0F, KeyframeAnimations.scaleVec(1.0, 1.0, 1.0), Interpolations.LINEAR), - new Keyframe(0.125F, KeyframeAnimations.scaleVec(1.0, 1.3F, 1.0), Interpolations.LINEAR), - new Keyframe(0.5F, KeyframeAnimations.scaleVec(1.0, 1.0, 1.0), Interpolations.LINEAR) + AnimationChannel.Targets.SCALE, + new Keyframe(0.0F, KeyframeAnimations.scaleVec(1.0, 1.0, 1.0), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.125F, KeyframeAnimations.scaleVec(1.0, 1.3F, 1.0), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.5F, KeyframeAnimations.scaleVec(1.0, 1.0, 1.0), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "wind_bottom", new AnimationChannel( - Targets.ROTATION, - new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 90.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.5F, KeyframeAnimations.degreeVec(0.0F, 360.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.ROTATION, + new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 90.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.5F, KeyframeAnimations.degreeVec(0.0F, 360.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "wind_bottom", new AnimationChannel( - Targets.SCALE, - new Keyframe(0.0F, KeyframeAnimations.scaleVec(1.0, 1.0, 1.0), Interpolations.LINEAR), - new Keyframe(0.125F, KeyframeAnimations.scaleVec(1.0, 1.1F, 1.0), Interpolations.LINEAR), - new Keyframe(0.5F, KeyframeAnimations.scaleVec(1.0, 1.0, 1.0), Interpolations.LINEAR) + AnimationChannel.Targets.SCALE, + new Keyframe(0.0F, KeyframeAnimations.scaleVec(1.0, 1.0, 1.0), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.125F, KeyframeAnimations.scaleVec(1.0, 1.1F, 1.0), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.5F, KeyframeAnimations.scaleVec(1.0, 1.0, 1.0), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "wind_mid", new AnimationChannel( - Targets.ROTATION, - new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.5F, KeyframeAnimations.degreeVec(0.0F, 180.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.ROTATION, + new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.5F, KeyframeAnimations.degreeVec(0.0F, 180.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "wind_mid", new AnimationChannel( - Targets.POSITION, - new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, -6.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.125F, KeyframeAnimations.posVec(0.0F, 2.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.5F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.POSITION, + new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, -6.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.125F, KeyframeAnimations.posVec(0.0F, 2.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.5F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "wind_top", new AnimationChannel( - Targets.ROTATION, - new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.5F, KeyframeAnimations.degreeVec(0.0F, 90.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.ROTATION, + new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.5F, KeyframeAnimations.degreeVec(0.0F, 90.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "wind_top", new AnimationChannel( - Targets.POSITION, - new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, -5.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.125F, KeyframeAnimations.posVec(0.0F, 2.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.5F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.POSITION, + new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, -5.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.125F, KeyframeAnimations.posVec(0.0F, 2.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.5F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "rods", new AnimationChannel( - Targets.ROTATION, - new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.5F, KeyframeAnimations.degreeVec(0.0F, 360.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.ROTATION, + new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.5F, KeyframeAnimations.degreeVec(0.0F, 360.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .build(); - public static final AnimationDefinition INHALE = Builder.withLength(2.0F) + public static final AnimationDefinition INHALE = AnimationDefinition.Builder.withLength(2.0F) .addAnimation( "body", new AnimationChannel( - Targets.POSITION, - new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.5F, KeyframeAnimations.posVec(0.0F, -10.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.625F, KeyframeAnimations.posVec(0.0F, -10.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.POSITION, + new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.5F, KeyframeAnimations.posVec(0.0F, -10.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.625F, KeyframeAnimations.posVec(0.0F, -10.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "head", new AnimationChannel( - Targets.ROTATION, - new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.5F, KeyframeAnimations.degreeVec(22.5F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.625F, KeyframeAnimations.degreeVec(22.5F, 0.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.ROTATION, + new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.5F, KeyframeAnimations.degreeVec(22.5F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.625F, KeyframeAnimations.degreeVec(22.5F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "wind_body", new AnimationChannel( - Targets.SCALE, - new Keyframe(0.0F, KeyframeAnimations.scaleVec(1.0, 1.0, 1.0), Interpolations.LINEAR), - new Keyframe(0.5F, KeyframeAnimations.scaleVec(1.0, 1.0, 1.0), Interpolations.LINEAR), - new Keyframe(0.625F, KeyframeAnimations.scaleVec(1.0, 1.0, 1.0), Interpolations.LINEAR) + AnimationChannel.Targets.SCALE, + new Keyframe(0.0F, KeyframeAnimations.scaleVec(1.0, 1.0, 1.0), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.5F, KeyframeAnimations.scaleVec(1.0, 1.0, 1.0), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.625F, KeyframeAnimations.scaleVec(1.0, 1.0, 1.0), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "wind_bottom", new AnimationChannel( - Targets.ROTATION, - new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.625F, KeyframeAnimations.degreeVec(0.0F, 90.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.ROTATION, + new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.625F, KeyframeAnimations.degreeVec(0.0F, 90.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "wind_bottom", new AnimationChannel( - Targets.SCALE, - new Keyframe(0.0F, KeyframeAnimations.scaleVec(1.0, 1.0, 1.0), Interpolations.LINEAR), - new Keyframe(0.5F, KeyframeAnimations.scaleVec(1.0, 1.0, 1.0), Interpolations.LINEAR), - new Keyframe(0.625F, KeyframeAnimations.scaleVec(1.0, 1.0, 1.0), Interpolations.LINEAR) + AnimationChannel.Targets.SCALE, + new Keyframe(0.0F, KeyframeAnimations.scaleVec(1.0, 1.0, 1.0), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.5F, KeyframeAnimations.scaleVec(1.0, 1.0, 1.0), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.625F, KeyframeAnimations.scaleVec(1.0, 1.0, 1.0), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "wind_mid", new AnimationChannel( - Targets.ROTATION, - new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.625F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.ROTATION, + new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.625F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "wind_mid", new AnimationChannel( - Targets.POSITION, - new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.5F, KeyframeAnimations.posVec(0.0F, -6.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.625F, KeyframeAnimations.posVec(0.0F, -6.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.POSITION, + new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.5F, KeyframeAnimations.posVec(0.0F, -6.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.625F, KeyframeAnimations.posVec(0.0F, -6.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "wind_top", new AnimationChannel( - Targets.ROTATION, - new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.625F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.ROTATION, + new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.625F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "wind_top", new AnimationChannel( - Targets.POSITION, - new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.5F, KeyframeAnimations.posVec(0.0F, -5.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.625F, KeyframeAnimations.posVec(0.0F, -5.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.POSITION, + new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.5F, KeyframeAnimations.posVec(0.0F, -5.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.625F, KeyframeAnimations.posVec(0.0F, -5.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "rods", new AnimationChannel( - Targets.ROTATION, - new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.625F, KeyframeAnimations.degreeVec(0.0F, 360.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.ROTATION, + new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.625F, KeyframeAnimations.degreeVec(0.0F, 360.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .build(); - public static final AnimationDefinition SLIDE = Builder.withLength(0.2F) + public static final AnimationDefinition SLIDE = AnimationDefinition.Builder.withLength(0.2F) .addAnimation( "body", new AnimationChannel( - Targets.POSITION, - new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.2F, KeyframeAnimations.posVec(0.0F, 0.0F, -6.0F), Interpolations.LINEAR) + AnimationChannel.Targets.POSITION, + new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.2F, KeyframeAnimations.posVec(0.0F, 0.0F, -6.0F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "wind_mid", new AnimationChannel( - Targets.POSITION, - new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.2F, KeyframeAnimations.posVec(0.0F, 0.0F, -3.0F), Interpolations.LINEAR) + AnimationChannel.Targets.POSITION, + new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.2F, KeyframeAnimations.posVec(0.0F, 0.0F, -3.0F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "wind_top", new AnimationChannel( - Targets.POSITION, - new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.2F, KeyframeAnimations.posVec(0.0F, 0.0F, -2.0F), Interpolations.LINEAR) + AnimationChannel.Targets.POSITION, + new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.2F, KeyframeAnimations.posVec(0.0F, 0.0F, -2.0F), AnimationChannel.Interpolations.LINEAR) ) ) .build(); - public static final AnimationDefinition SLIDE_BACK = Builder.withLength(0.1F) + public static final AnimationDefinition SLIDE_BACK = AnimationDefinition.Builder.withLength(0.1F) .addAnimation( "body", new AnimationChannel( - Targets.POSITION, - new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, -6.0F), Interpolations.LINEAR), - new Keyframe(0.1F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.POSITION, + new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, -6.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.1F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "wind_mid", new AnimationChannel( - Targets.POSITION, - new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, -3.0F), Interpolations.LINEAR), - new Keyframe(0.1F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.POSITION, + new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, -3.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.1F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "wind_top", new AnimationChannel( - Targets.POSITION, - new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, -2.0F), Interpolations.LINEAR), - new Keyframe(0.1F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.POSITION, + new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, -2.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.1F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .build(); diff --git a/net/minecraft/client/animation/definitions/CreakingAnimation.java b/net/minecraft/client/animation/definitions/CreakingAnimation.java index 99ed5e10..f2ab41a4 100644 --- a/net/minecraft/client/animation/definitions/CreakingAnimation.java +++ b/net/minecraft/client/animation/definitions/CreakingAnimation.java @@ -6,433 +6,430 @@ import net.minecraft.client.animation.AnimationChannel; import net.minecraft.client.animation.AnimationDefinition; import net.minecraft.client.animation.Keyframe; import net.minecraft.client.animation.KeyframeAnimations; -import net.minecraft.client.animation.AnimationChannel.Interpolations; -import net.minecraft.client.animation.AnimationChannel.Targets; -import net.minecraft.client.animation.AnimationDefinition.Builder; @Environment(EnvType.CLIENT) public class CreakingAnimation { - public static final AnimationDefinition CREAKING_WALK = Builder.withLength(1.125F) + public static final AnimationDefinition CREAKING_WALK = AnimationDefinition.Builder.withLength(1.125F) .looping() .addAnimation( "upper_body", new AnimationChannel( - Targets.ROTATION, - new Keyframe(0.0F, KeyframeAnimations.degreeVec(26.8802F, -23.399F, -9.0616F), Interpolations.LINEAR), - new Keyframe(0.125F, KeyframeAnimations.degreeVec(-2.2093F, 5.9119F, 0.0675F), Interpolations.LINEAR), - new Keyframe(0.5417F, KeyframeAnimations.degreeVec(23.0778F, 14.2906F, 4.6066F), Interpolations.LINEAR), - new Keyframe(0.7083F, KeyframeAnimations.degreeVec(-10.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.875F, KeyframeAnimations.degreeVec(7.5F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(1.125F, KeyframeAnimations.degreeVec(26.8802F, -23.399F, -9.0616F), Interpolations.LINEAR) + AnimationChannel.Targets.ROTATION, + new Keyframe(0.0F, KeyframeAnimations.degreeVec(26.8802F, -23.399F, -9.0616F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.125F, KeyframeAnimations.degreeVec(-2.2093F, 5.9119F, 0.0675F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.5417F, KeyframeAnimations.degreeVec(23.0778F, 14.2906F, 4.6066F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.7083F, KeyframeAnimations.degreeVec(-10.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.875F, KeyframeAnimations.degreeVec(7.5F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(1.125F, KeyframeAnimations.degreeVec(26.8802F, -23.399F, -9.0616F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "head", new AnimationChannel( - Targets.ROTATION, - new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.0417F, KeyframeAnimations.degreeVec(-17.5F, -62.5F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.0833F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.4167F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.4583F, KeyframeAnimations.degreeVec(0.0F, 15.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.5F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(1.0417F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(1.0833F, KeyframeAnimations.degreeVec(-37.1532F, 81.1131F, -28.3621F), Interpolations.LINEAR), - new Keyframe(1.125F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.ROTATION, + new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.0417F, KeyframeAnimations.degreeVec(-17.5F, -62.5F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.0833F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.4167F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.4583F, KeyframeAnimations.degreeVec(0.0F, 15.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.5F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(1.0417F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(1.0833F, KeyframeAnimations.degreeVec(-37.1532F, 81.1131F, -28.3621F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(1.125F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "right_arm", new AnimationChannel( - Targets.ROTATION, - new Keyframe(0.0F, KeyframeAnimations.degreeVec(12.5F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.25F, KeyframeAnimations.degreeVec(-32.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.875F, KeyframeAnimations.degreeVec(12.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(1.125F, KeyframeAnimations.degreeVec(-15.0F, 0.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.ROTATION, + new Keyframe(0.0F, KeyframeAnimations.degreeVec(12.5F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.25F, KeyframeAnimations.degreeVec(-32.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.875F, KeyframeAnimations.degreeVec(12.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(1.125F, KeyframeAnimations.degreeVec(-15.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "left_arm", new AnimationChannel( - Targets.ROTATION, - new Keyframe(0.0F, KeyframeAnimations.degreeVec(-15.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.125F, KeyframeAnimations.degreeVec(10.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.5417F, KeyframeAnimations.degreeVec(-25.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.75F, KeyframeAnimations.degreeVec(-9.0923F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.7917F, KeyframeAnimations.degreeVec(-15.137F, -66.7758F, 13.9603F), Interpolations.LINEAR), - new Keyframe(0.8333F, KeyframeAnimations.degreeVec(-9.0923F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(1.0F, KeyframeAnimations.degreeVec(10.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(1.125F, KeyframeAnimations.degreeVec(-15.0F, 0.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.ROTATION, + new Keyframe(0.0F, KeyframeAnimations.degreeVec(-15.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.125F, KeyframeAnimations.degreeVec(10.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.5417F, KeyframeAnimations.degreeVec(-25.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.75F, KeyframeAnimations.degreeVec(-9.0923F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.7917F, KeyframeAnimations.degreeVec(-15.137F, -66.7758F, 13.9603F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.8333F, KeyframeAnimations.degreeVec(-9.0923F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(1.0F, KeyframeAnimations.degreeVec(10.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(1.125F, KeyframeAnimations.degreeVec(-15.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "left_leg", new AnimationChannel( - Targets.ROTATION, - new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.25F, KeyframeAnimations.degreeVec(30.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.375F, KeyframeAnimations.degreeVec(49.8924F, -3.8282F, 3.2187F), Interpolations.LINEAR), - new Keyframe(0.5F, KeyframeAnimations.degreeVec(17.5F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.625F, KeyframeAnimations.degreeVec(-56.5613F, -12.2403F, -8.7374F), Interpolations.LINEAR), - new Keyframe(0.9167F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(1.125F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.ROTATION, + new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.25F, KeyframeAnimations.degreeVec(30.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.375F, KeyframeAnimations.degreeVec(49.8924F, -3.8282F, 3.2187F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.5F, KeyframeAnimations.degreeVec(17.5F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.625F, KeyframeAnimations.degreeVec(-56.5613F, -12.2403F, -8.7374F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.9167F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(1.125F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "left_leg", new AnimationChannel( - Targets.POSITION, - new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 2.0F), Interpolations.LINEAR), - new Keyframe(0.25F, KeyframeAnimations.posVec(0.0F, 0.1846F, 0.5979F), Interpolations.LINEAR), - new Keyframe(0.375F, KeyframeAnimations.posVec(0.0F, -0.0665F, -2.2177F), Interpolations.LINEAR), - new Keyframe(0.5F, KeyframeAnimations.posVec(0.0F, 1.3563F, -4.3474F), Interpolations.LINEAR), - new Keyframe(0.625F, KeyframeAnimations.posVec(0.0F, 0.1047F, -1.6556F), Interpolations.LINEAR), - new Keyframe(0.9167F, KeyframeAnimations.posVec(0.0F, 0.0F, -1.0F), Interpolations.LINEAR), - new Keyframe(1.125F, KeyframeAnimations.posVec(0.0F, 0.0F, 2.0F), Interpolations.LINEAR) + AnimationChannel.Targets.POSITION, + new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 2.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.25F, KeyframeAnimations.posVec(0.0F, 0.1846F, 0.5979F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.375F, KeyframeAnimations.posVec(0.0F, -0.0665F, -2.2177F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.5F, KeyframeAnimations.posVec(0.0F, 1.3563F, -4.3474F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.625F, KeyframeAnimations.posVec(0.0F, 0.1047F, -1.6556F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.9167F, KeyframeAnimations.posVec(0.0F, 0.0F, -1.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(1.125F, KeyframeAnimations.posVec(0.0F, 0.0F, 2.0F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "right_leg", new AnimationChannel( - Targets.ROTATION, - new Keyframe(0.0F, KeyframeAnimations.degreeVec(25.5305F, 11.3125F, 5.3525F), Interpolations.LINEAR), - new Keyframe(0.125F, KeyframeAnimations.degreeVec(-49.5628F, 7.3556F, 6.7933F), Interpolations.LINEAR), - new Keyframe(0.25F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.4583F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.9167F, KeyframeAnimations.degreeVec(30.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(1.0417F, KeyframeAnimations.degreeVec(55.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(1.125F, KeyframeAnimations.degreeVec(25.5305F, 11.3125F, 5.3525F), Interpolations.LINEAR) + AnimationChannel.Targets.ROTATION, + new Keyframe(0.0F, KeyframeAnimations.degreeVec(25.5305F, 11.3125F, 5.3525F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.125F, KeyframeAnimations.degreeVec(-49.5628F, 7.3556F, 6.7933F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.25F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.4583F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.9167F, KeyframeAnimations.degreeVec(30.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(1.0417F, KeyframeAnimations.degreeVec(55.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(1.125F, KeyframeAnimations.degreeVec(25.5305F, 11.3125F, 5.3525F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "right_leg", new AnimationChannel( - Targets.POSITION, - new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.9674F, -3.6578F), Interpolations.LINEAR), - new Keyframe(0.125F, KeyframeAnimations.posVec(0.0F, -0.2979F, -0.9411F), Interpolations.LINEAR), - new Keyframe(0.25F, KeyframeAnimations.posVec(0.0F, -0.3F, -0.94F), Interpolations.LINEAR), - new Keyframe(0.4583F, KeyframeAnimations.posVec(0.0F, -0.3F, 1.06F), Interpolations.LINEAR), - new Keyframe(1.125F, KeyframeAnimations.posVec(0.0F, 0.9674F, -3.6578F), Interpolations.LINEAR) + AnimationChannel.Targets.POSITION, + new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.9674F, -3.6578F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.125F, KeyframeAnimations.posVec(0.0F, -0.2979F, -0.9411F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.25F, KeyframeAnimations.posVec(0.0F, -0.3F, -0.94F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.4583F, KeyframeAnimations.posVec(0.0F, -0.3F, 1.06F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(1.125F, KeyframeAnimations.posVec(0.0F, 0.9674F, -3.6578F), AnimationChannel.Interpolations.LINEAR) ) ) .build(); - public static final AnimationDefinition CREAKING_ATTACK = Builder.withLength(0.7083F) + public static final AnimationDefinition CREAKING_ATTACK = AnimationDefinition.Builder.withLength(0.7083F) .looping() .addAnimation( "upper_body", new AnimationChannel( - Targets.ROTATION, - new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.0833F, KeyframeAnimations.degreeVec(0.0F, 45.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.1667F, KeyframeAnimations.degreeVec(-115.0F, 67.5F, -90.0F), Interpolations.LINEAR), - new Keyframe(0.375F, KeyframeAnimations.degreeVec(67.5F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.5417F, KeyframeAnimations.degreeVec(0.0F, 45.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.7083F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.ROTATION, + new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.0833F, KeyframeAnimations.degreeVec(0.0F, 45.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.1667F, KeyframeAnimations.degreeVec(-115.0F, 67.5F, -90.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.375F, KeyframeAnimations.degreeVec(67.5F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.5417F, KeyframeAnimations.degreeVec(0.0F, 45.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.7083F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "upper_body", new AnimationChannel( - Targets.POSITION, - new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.0833F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.2917F, KeyframeAnimations.posVec(0.0F, -2.7716F, -1.1481F), Interpolations.LINEAR), - new Keyframe(0.375F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.5417F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.7083F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.POSITION, + new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.0833F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.2917F, KeyframeAnimations.posVec(0.0F, -2.7716F, -1.1481F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.375F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.5417F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.7083F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "upper_body", new AnimationChannel( - Targets.SCALE, - new Keyframe(0.0F, KeyframeAnimations.scaleVec(1.0, 1.0, 1.0), Interpolations.LINEAR), - new Keyframe(0.7083F, KeyframeAnimations.scaleVec(1.0, 1.0, 1.0), Interpolations.LINEAR) + AnimationChannel.Targets.SCALE, + new Keyframe(0.0F, KeyframeAnimations.scaleVec(1.0, 1.0, 1.0), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.7083F, KeyframeAnimations.scaleVec(1.0, 1.0, 1.0), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "head", new AnimationChannel( - Targets.ROTATION, - new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.1667F, KeyframeAnimations.degreeVec(0.0F, -45.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.25F, KeyframeAnimations.degreeVec(-11.25F, -45.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.2917F, KeyframeAnimations.degreeVec(-117.3939F, 76.6331F, -130.1483F), Interpolations.LINEAR), - new Keyframe(0.4167F, KeyframeAnimations.degreeVec(-45.0F, -45.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.5F, KeyframeAnimations.degreeVec(60.0F, -45.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.5833F, KeyframeAnimations.degreeVec(60.0F, -45.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.625F, KeyframeAnimations.degreeVec(0.0F, -45.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.7083F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.ROTATION, + new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.1667F, KeyframeAnimations.degreeVec(0.0F, -45.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.25F, KeyframeAnimations.degreeVec(-11.25F, -45.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.2917F, KeyframeAnimations.degreeVec(-117.3939F, 76.6331F, -130.1483F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.4167F, KeyframeAnimations.degreeVec(-45.0F, -45.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.5F, KeyframeAnimations.degreeVec(60.0F, -45.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.5833F, KeyframeAnimations.degreeVec(60.0F, -45.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.625F, KeyframeAnimations.degreeVec(0.0F, -45.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.7083F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "head", new AnimationChannel( - Targets.POSITION, - new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.1667F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.4167F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.5F, KeyframeAnimations.posVec(0.3827F, 0.5133F, -0.7682F), Interpolations.LINEAR), - new Keyframe(0.5833F, KeyframeAnimations.posVec(0.3827F, 0.5133F, -0.7682F), Interpolations.LINEAR), - new Keyframe(0.625F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.7083F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.POSITION, + new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.1667F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.4167F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.5F, KeyframeAnimations.posVec(0.3827F, 0.5133F, -0.7682F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.5833F, KeyframeAnimations.posVec(0.3827F, 0.5133F, -0.7682F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.625F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.7083F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "head", new AnimationChannel( - Targets.SCALE, - new Keyframe(0.1667F, KeyframeAnimations.scaleVec(1.0, 1.0, 1.0), Interpolations.LINEAR), - new Keyframe(0.4167F, KeyframeAnimations.scaleVec(1.0, 1.0, 1.0), Interpolations.LINEAR), - new Keyframe(0.5F, KeyframeAnimations.scaleVec(1.0, 1.3F, 1.0), Interpolations.LINEAR), - new Keyframe(0.625F, KeyframeAnimations.scaleVec(1.0, 1.0, 1.0), Interpolations.LINEAR) + AnimationChannel.Targets.SCALE, + new Keyframe(0.1667F, KeyframeAnimations.scaleVec(1.0, 1.0, 1.0), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.4167F, KeyframeAnimations.scaleVec(1.0, 1.0, 1.0), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.5F, KeyframeAnimations.scaleVec(1.0, 1.3F, 1.0), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.625F, KeyframeAnimations.scaleVec(1.0, 1.0, 1.0), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "right_arm", new AnimationChannel( - Targets.ROTATION, - new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.1667F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.25F, KeyframeAnimations.degreeVec(7.5F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.4583F, KeyframeAnimations.degreeVec(55.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.625F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.7083F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.ROTATION, + new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.1667F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.25F, KeyframeAnimations.degreeVec(7.5F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.4583F, KeyframeAnimations.degreeVec(55.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.625F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.7083F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "right_arm", new AnimationChannel( - Targets.POSITION, - new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.1667F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.625F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.7083F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.POSITION, + new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.1667F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.625F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.7083F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "left_leg", new AnimationChannel( - Targets.ROTATION, - new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.1667F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.625F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.7083F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.ROTATION, + new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.1667F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.625F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.7083F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "left_leg", new AnimationChannel( - Targets.POSITION, - new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.1667F, KeyframeAnimations.posVec(0.0F, 0.0F, -2.0F), Interpolations.LINEAR), - new Keyframe(0.625F, KeyframeAnimations.posVec(0.0F, 0.0F, -2.0F), Interpolations.LINEAR), - new Keyframe(0.7083F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.POSITION, + new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.1667F, KeyframeAnimations.posVec(0.0F, 0.0F, -2.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.625F, KeyframeAnimations.posVec(0.0F, 0.0F, -2.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.7083F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "right_leg", new AnimationChannel( - Targets.ROTATION, - new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.1667F, KeyframeAnimations.degreeVec(0.0F, 45.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.625F, KeyframeAnimations.degreeVec(0.0F, 45.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.7083F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.ROTATION, + new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.1667F, KeyframeAnimations.degreeVec(0.0F, 45.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.625F, KeyframeAnimations.degreeVec(0.0F, 45.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.7083F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "right_leg", new AnimationChannel( - Targets.POSITION, - new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.1667F, KeyframeAnimations.posVec(0.7071F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.625F, KeyframeAnimations.posVec(0.7071F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.7083F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.POSITION, + new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.1667F, KeyframeAnimations.posVec(0.7071F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.625F, KeyframeAnimations.posVec(0.7071F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.7083F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "left_arm", new AnimationChannel( - Targets.ROTATION, - new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.1667F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.25F, KeyframeAnimations.degreeVec(10.3453F, 14.7669F, 2.664F), Interpolations.LINEAR), - new Keyframe(0.4583F, KeyframeAnimations.degreeVec(57.5F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.625F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.7083F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.ROTATION, + new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.1667F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.25F, KeyframeAnimations.degreeVec(10.3453F, 14.7669F, 2.664F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.4583F, KeyframeAnimations.degreeVec(57.5F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.625F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.7083F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "left_arm", new AnimationChannel( - Targets.POSITION, - new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.7083F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.POSITION, + new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.7083F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .build(); - public static final AnimationDefinition CREAKING_INVULNERABLE = Builder.withLength(0.2917F) + public static final AnimationDefinition CREAKING_INVULNERABLE = AnimationDefinition.Builder.withLength(0.2917F) .addAnimation( "upper_body", new AnimationChannel( - Targets.ROTATION, - new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.0833F, KeyframeAnimations.degreeVec(-5.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.1667F, KeyframeAnimations.degreeVec(5.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.25F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.ROTATION, + new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.0833F, KeyframeAnimations.degreeVec(-5.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.1667F, KeyframeAnimations.degreeVec(5.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.25F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "upper_body", new AnimationChannel( - Targets.POSITION, - new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.0833F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.25F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.POSITION, + new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.0833F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.25F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "right_arm", new AnimationChannel( - Targets.ROTATION, - new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.0833F, KeyframeAnimations.degreeVec(17.5F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.1667F, KeyframeAnimations.degreeVec(-15.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.25F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.ROTATION, + new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.0833F, KeyframeAnimations.degreeVec(17.5F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.1667F, KeyframeAnimations.degreeVec(-15.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.25F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "right_arm", new AnimationChannel( - Targets.POSITION, - new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.25F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.POSITION, + new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.25F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "left_arm", new AnimationChannel( - Targets.ROTATION, - new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.0833F, KeyframeAnimations.degreeVec(20.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.1667F, KeyframeAnimations.degreeVec(-15.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.25F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.ROTATION, + new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.0833F, KeyframeAnimations.degreeVec(20.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.1667F, KeyframeAnimations.degreeVec(-15.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.25F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "left_arm", new AnimationChannel( - Targets.POSITION, - new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.25F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.POSITION, + new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.25F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .build(); - public static final AnimationDefinition CREAKING_DEATH = Builder.withLength(2.25F) + public static final AnimationDefinition CREAKING_DEATH = AnimationDefinition.Builder.withLength(2.25F) .addAnimation( "upper_body", new AnimationChannel( - Targets.ROTATION, - new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.0833F, KeyframeAnimations.degreeVec(-40.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.1667F, KeyframeAnimations.degreeVec(-5.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.2917F, KeyframeAnimations.degreeVec(7.5F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.5833F, KeyframeAnimations.degreeVec(16.25F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.6667F, KeyframeAnimations.degreeVec(29.0814F, 62.5516F, 26.5771F), Interpolations.LINEAR), - new Keyframe(0.75F, KeyframeAnimations.degreeVec(12.2115F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(1.0F, KeyframeAnimations.degreeVec(10.25F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(1.0417F, KeyframeAnimations.degreeVec(-47.64F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(1.125F, KeyframeAnimations.degreeVec(21.96F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(1.25F, KeyframeAnimations.degreeVec(12.5F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(2.25F, KeyframeAnimations.degreeVec(17.3266F, 7.9022F, -0.1381F), Interpolations.LINEAR) + AnimationChannel.Targets.ROTATION, + new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.0833F, KeyframeAnimations.degreeVec(-40.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.1667F, KeyframeAnimations.degreeVec(-5.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.2917F, KeyframeAnimations.degreeVec(7.5F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.5833F, KeyframeAnimations.degreeVec(16.25F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.6667F, KeyframeAnimations.degreeVec(29.0814F, 62.5516F, 26.5771F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.75F, KeyframeAnimations.degreeVec(12.2115F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(1.0F, KeyframeAnimations.degreeVec(10.25F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(1.0417F, KeyframeAnimations.degreeVec(-47.64F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(1.125F, KeyframeAnimations.degreeVec(21.96F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(1.25F, KeyframeAnimations.degreeVec(12.5F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(2.25F, KeyframeAnimations.degreeVec(17.3266F, 7.9022F, -0.1381F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "upper_body", new AnimationChannel( - Targets.POSITION, - new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.0833F, KeyframeAnimations.posVec(0.0F, 0.557F, 1.2659F), Interpolations.LINEAR), - new Keyframe(0.1667F, KeyframeAnimations.posVec(0.0F, -2.0889F, -0.3493F), Interpolations.LINEAR), - new Keyframe(0.2917F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.POSITION, + new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.0833F, KeyframeAnimations.posVec(0.0F, 0.557F, 1.2659F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.1667F, KeyframeAnimations.posVec(0.0F, -2.0889F, -0.3493F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.2917F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "upper_body", new AnimationChannel( - Targets.SCALE, - new Keyframe(0.0F, KeyframeAnimations.scaleVec(1.0, 1.0, 1.0), Interpolations.LINEAR), - new Keyframe(0.0833F, KeyframeAnimations.scaleVec(1.0, 1.1F, 1.0), Interpolations.LINEAR), - new Keyframe(0.1667F, KeyframeAnimations.scaleVec(1.0, 0.9F, 1.0), Interpolations.LINEAR), - new Keyframe(0.2917F, KeyframeAnimations.scaleVec(1.0, 1.0, 1.0), Interpolations.LINEAR) + AnimationChannel.Targets.SCALE, + new Keyframe(0.0F, KeyframeAnimations.scaleVec(1.0, 1.0, 1.0), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.0833F, KeyframeAnimations.scaleVec(1.0, 1.1F, 1.0), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.1667F, KeyframeAnimations.scaleVec(1.0, 0.9F, 1.0), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.2917F, KeyframeAnimations.scaleVec(1.0, 1.0, 1.0), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "right_arm", new AnimationChannel( - Targets.ROTATION, - new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.2917F, KeyframeAnimations.degreeVec(-10.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.5F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(1.25F, KeyframeAnimations.degreeVec(-10.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(1.5417F, KeyframeAnimations.degreeVec(-10.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(1.5833F, KeyframeAnimations.degreeVec(-12.1479F, -34.3927F, 6.9326F), Interpolations.LINEAR), - new Keyframe(1.6667F, KeyframeAnimations.degreeVec(-10.0F, 0.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.ROTATION, + new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.2917F, KeyframeAnimations.degreeVec(-10.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.5F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(1.25F, KeyframeAnimations.degreeVec(-10.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(1.5417F, KeyframeAnimations.degreeVec(-10.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(1.5833F, KeyframeAnimations.degreeVec(-12.1479F, -34.3927F, 6.9326F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(1.6667F, KeyframeAnimations.degreeVec(-10.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "right_arm", new AnimationChannel( - Targets.POSITION, - new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.2917F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.POSITION, + new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.2917F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "left_arm", new AnimationChannel( - Targets.ROTATION, - new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.2917F, KeyframeAnimations.degreeVec(-10.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.5F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.8333F, KeyframeAnimations.degreeVec(-4.4444F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.875F, KeyframeAnimations.degreeVec(-26.7402F, -78.831F, 26.3025F), Interpolations.LINEAR), - new Keyframe(0.9583F, KeyframeAnimations.degreeVec(-5.5556F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(1.25F, KeyframeAnimations.degreeVec(-10.0F, 0.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.ROTATION, + new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.2917F, KeyframeAnimations.degreeVec(-10.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.5F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.8333F, KeyframeAnimations.degreeVec(-4.4444F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.875F, KeyframeAnimations.degreeVec(-26.7402F, -78.831F, 26.3025F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.9583F, KeyframeAnimations.degreeVec(-5.5556F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(1.25F, KeyframeAnimations.degreeVec(-10.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "left_arm", new AnimationChannel( - Targets.POSITION, - new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.2917F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.POSITION, + new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.2917F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "head", new AnimationChannel( - Targets.ROTATION, - new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.0833F, KeyframeAnimations.degreeVec(-5.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.2917F, KeyframeAnimations.degreeVec(10.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.5F, KeyframeAnimations.degreeVec(2.5F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.5417F, KeyframeAnimations.degreeVec(5.5F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.5833F, KeyframeAnimations.degreeVec(-67.4168F, -12.9552F, -8.0231F), Interpolations.LINEAR), - new Keyframe(0.6667F, KeyframeAnimations.degreeVec(8.5F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(1.0F, KeyframeAnimations.degreeVec(10.773F, -29.5608F, -5.3627F), Interpolations.LINEAR), - new Keyframe(1.25F, KeyframeAnimations.degreeVec(10.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(1.7917F, KeyframeAnimations.degreeVec(10.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(1.8333F, KeyframeAnimations.degreeVec(12.9625F, 39.2735F, 8.2901F), Interpolations.LINEAR), - new Keyframe(1.9167F, KeyframeAnimations.degreeVec(10.0F, 0.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.ROTATION, + new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.0833F, KeyframeAnimations.degreeVec(-5.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.2917F, KeyframeAnimations.degreeVec(10.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.5F, KeyframeAnimations.degreeVec(2.5F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.5417F, KeyframeAnimations.degreeVec(5.5F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.5833F, KeyframeAnimations.degreeVec(-67.4168F, -12.9552F, -8.0231F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.6667F, KeyframeAnimations.degreeVec(8.5F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(1.0F, KeyframeAnimations.degreeVec(10.773F, -29.5608F, -5.3627F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(1.25F, KeyframeAnimations.degreeVec(10.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(1.7917F, KeyframeAnimations.degreeVec(10.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(1.8333F, KeyframeAnimations.degreeVec(12.9625F, 39.2735F, 8.2901F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(1.9167F, KeyframeAnimations.degreeVec(10.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .addAnimation( "head", new AnimationChannel( - Targets.POSITION, - new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR), - new Keyframe(0.2917F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), Interpolations.LINEAR) + AnimationChannel.Targets.POSITION, + new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR), + new Keyframe(0.2917F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR) ) ) .build(); diff --git a/net/minecraft/client/animation/definitions/WardenAnimation.java b/net/minecraft/client/animation/definitions/WardenAnimation.java index 8460f557..26a8f7b4 100644 --- a/net/minecraft/client/animation/definitions/WardenAnimation.java +++ b/net/minecraft/client/animation/definitions/WardenAnimation.java @@ -102,66 +102,6 @@ public class WardenAnimation { new Keyframe(6.64F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM) ) ) - .addAnimation( - "right_ear", - new AnimationChannel( - AnimationChannel.Targets.ROTATION, - new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM), - new Keyframe(0.52F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM), - new Keyframe(2.28F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM), - new Keyframe(2.88F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM), - new Keyframe(3.36F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM), - new Keyframe(4.56F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM), - new Keyframe(5.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM), - new Keyframe(5.8F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM), - new Keyframe(6.64F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM) - ) - ) - .addAnimation( - "right_ear", - new AnimationChannel( - AnimationChannel.Targets.POSITION, - new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM), - new Keyframe(0.52F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM), - new Keyframe(2.28F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM), - new Keyframe(2.88F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM), - new Keyframe(3.36F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM), - new Keyframe(4.56F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM), - new Keyframe(5.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM), - new Keyframe(5.8F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM), - new Keyframe(6.64F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM) - ) - ) - .addAnimation( - "left_ear", - new AnimationChannel( - AnimationChannel.Targets.ROTATION, - new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM), - new Keyframe(0.52F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM), - new Keyframe(2.28F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM), - new Keyframe(2.88F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM), - new Keyframe(3.36F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM), - new Keyframe(4.56F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM), - new Keyframe(5.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM), - new Keyframe(5.8F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM), - new Keyframe(6.64F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM) - ) - ) - .addAnimation( - "left_ear", - new AnimationChannel( - AnimationChannel.Targets.POSITION, - new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM), - new Keyframe(0.52F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM), - new Keyframe(2.28F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM), - new Keyframe(2.88F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM), - new Keyframe(3.36F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM), - new Keyframe(4.56F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM), - new Keyframe(5.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM), - new Keyframe(5.8F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM), - new Keyframe(6.64F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM) - ) - ) .addAnimation( "right_arm", new AnimationChannel( @@ -577,34 +517,6 @@ public class WardenAnimation { new Keyframe(4.2F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM) ) ) - .addAnimation( - "right_ear", - new AnimationChannel( - AnimationChannel.Targets.ROTATION, - new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM), - new Keyframe(1.24F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM), - new Keyframe(1.76F, KeyframeAnimations.degreeVec(0.0F, 0.0F, -10.85F), AnimationChannel.Interpolations.CATMULLROM), - new Keyframe(2.08F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 12.5F), AnimationChannel.Interpolations.CATMULLROM), - new Keyframe(2.4F, KeyframeAnimations.degreeVec(0.0F, 0.0F, -10.85F), AnimationChannel.Interpolations.CATMULLROM), - new Keyframe(2.72F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 12.5F), AnimationChannel.Interpolations.CATMULLROM), - new Keyframe(3.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, -10.85F), AnimationChannel.Interpolations.CATMULLROM), - new Keyframe(4.2F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM) - ) - ) - .addAnimation( - "left_ear", - new AnimationChannel( - AnimationChannel.Targets.ROTATION, - new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM), - new Keyframe(1.24F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM), - new Keyframe(1.76F, KeyframeAnimations.degreeVec(0.0F, 0.0F, -15.85F), AnimationChannel.Interpolations.CATMULLROM), - new Keyframe(2.08F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 12.5F), AnimationChannel.Interpolations.CATMULLROM), - new Keyframe(2.4F, KeyframeAnimations.degreeVec(0.0F, 0.0F, -15.85F), AnimationChannel.Interpolations.CATMULLROM), - new Keyframe(2.72F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 12.5F), AnimationChannel.Interpolations.CATMULLROM), - new Keyframe(3.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, -15.85F), AnimationChannel.Interpolations.CATMULLROM), - new Keyframe(4.2F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM) - ) - ) .addAnimation( "right_arm", new AnimationChannel( diff --git a/net/minecraft/client/color/ColorLerper.java b/net/minecraft/client/color/ColorLerper.java new file mode 100644 index 00000000..ce515e9c --- /dev/null +++ b/net/minecraft/client/color/ColorLerper.java @@ -0,0 +1,73 @@ +package net.minecraft.client.color; + +import com.google.common.collect.Maps; +import java.util.Arrays; +import java.util.Map; +import java.util.stream.Collectors; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.util.ARGB; +import net.minecraft.util.Mth; +import net.minecraft.world.item.DyeColor; + +@Environment(EnvType.CLIENT) +public class ColorLerper { + public static final DyeColor[] MUSIC_NOTE_COLORS = new DyeColor[]{ + DyeColor.WHITE, + DyeColor.LIGHT_GRAY, + DyeColor.LIGHT_BLUE, + DyeColor.BLUE, + DyeColor.CYAN, + DyeColor.GREEN, + DyeColor.LIME, + DyeColor.YELLOW, + DyeColor.ORANGE, + DyeColor.PINK, + DyeColor.RED, + DyeColor.MAGENTA + }; + + public static int getLerpedColor(ColorLerper.Type type, float time) { + int i = Mth.floor(time); + int j = i / type.colorDuration; + int k = type.colors.length; + int l = j % k; + int m = (j + 1) % k; + float f = (i % type.colorDuration + Mth.frac(time)) / type.colorDuration; + int n = type.getColor(type.colors[l]); + int o = type.getColor(type.colors[m]); + return ARGB.lerp(f, n, o); + } + + static int getModifiedColor(DyeColor color, float brightness) { + if (color == DyeColor.WHITE) { + return -1644826; + } else { + int i = color.getTextureDiffuseColor(); + return ARGB.color(255, Mth.floor(ARGB.red(i) * brightness), Mth.floor(ARGB.green(i) * brightness), Mth.floor(ARGB.blue(i) * brightness)); + } + } + + @Environment(EnvType.CLIENT) + public static enum Type { + SHEEP(25, DyeColor.values(), 0.75F), + MUSIC_NOTE(30, ColorLerper.MUSIC_NOTE_COLORS, 1.25F); + + final int colorDuration; + private final Map colorByDye; + final DyeColor[] colors; + + private Type(final int colorDuration, final DyeColor[] colors, final float brightness) { + this.colorDuration = colorDuration; + this.colorByDye = Maps.newHashMap( + (Map)Arrays.stream(colors) + .collect(Collectors.toMap(dyeColor -> dyeColor, dyeColor -> ColorLerper.getModifiedColor(dyeColor, brightness))) + ); + this.colors = colors; + } + + public final int getColor(DyeColor dye) { + return (Integer)this.colorByDye.get(dye); + } + } +} diff --git a/net/minecraft/client/data/AtlasProvider.java b/net/minecraft/client/data/AtlasProvider.java index 5ebf7754..1bb9857c 100644 --- a/net/minecraft/client/data/AtlasProvider.java +++ b/net/minecraft/client/data/AtlasProvider.java @@ -28,8 +28,6 @@ import net.minecraft.client.resources.model.ModelBakery; import net.minecraft.data.CachedOutput; import net.minecraft.data.DataProvider; import net.minecraft.data.PackOutput; -import net.minecraft.data.PackOutput.PathProvider; -import net.minecraft.data.PackOutput.Target; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.equipment.trim.MaterialAssetGroup; @@ -66,10 +64,10 @@ public class AtlasProvider implements DataProvider { private static final List HUMANOID_LAYERS = List.of( EquipmentClientInfo.LayerType.HUMANOID, EquipmentClientInfo.LayerType.HUMANOID_LEGGINGS ); - private final PathProvider pathProvider; + private final PackOutput.PathProvider pathProvider; public AtlasProvider(PackOutput output) { - this.pathProvider = output.createPathProvider(Target.RESOURCE_PACK, "atlases"); + this.pathProvider = output.createPathProvider(PackOutput.Target.RESOURCE_PACK, "atlases"); } private static List patternTextures() { @@ -143,6 +141,10 @@ public class AtlasProvider implements DataProvider { return List.of(forMaterial(ModelBakery.SHIELD_BASE), forMaterial(ModelBakery.NO_PATTERN_SHIELD), forMapper(Sheets.SHIELD_MAPPER)); } + private static List guiSprites() { + return List.of(new DirectoryLister("gui/sprites", ""), new DirectoryLister("mob_effect", "mob_effect/")); + } + @Override public CompletableFuture run(CachedOutput output) { return CompletableFuture.allOf( @@ -152,9 +154,8 @@ public class AtlasProvider implements DataProvider { this.storeAtlas(output, AtlasIds.BLOCKS, blocksList()), this.storeAtlas(output, AtlasIds.CHESTS, simpleMapper(Sheets.CHEST_MAPPER)), this.storeAtlas(output, AtlasIds.DECORATED_POT, simpleMapper(Sheets.DECORATED_POT_MAPPER)), - this.storeAtlas(output, AtlasIds.GUI, noPrefixMapper("gui/sprites")), + this.storeAtlas(output, AtlasIds.GUI, guiSprites()), this.storeAtlas(output, AtlasIds.MAP_DECORATIONS, noPrefixMapper("map/decorations")), - this.storeAtlas(output, AtlasIds.MOB_EFFECTS, noPrefixMapper("mob_effect")), this.storeAtlas(output, AtlasIds.PAINTINGS, noPrefixMapper("painting")), this.storeAtlas(output, AtlasIds.PARTICLES, noPrefixMapper("particle")), this.storeAtlas(output, AtlasIds.SHIELD_PATTERNS, shieldPatterns()), diff --git a/net/minecraft/client/data/Main.java b/net/minecraft/client/data/Main.java index 7ef7ed80..29be4180 100644 --- a/net/minecraft/client/data/Main.java +++ b/net/minecraft/client/data/Main.java @@ -13,8 +13,8 @@ import net.minecraft.SuppressForbidden; import net.minecraft.client.ClientBootstrap; import net.minecraft.client.data.models.EquipmentAssetProvider; import net.minecraft.client.data.models.ModelProvider; +import net.minecraft.client.data.models.WaypointStyleProvider; import net.minecraft.data.DataGenerator; -import net.minecraft.data.DataGenerator.PackGenerator; import net.minecraft.obfuscate.DontObfuscate; import net.minecraft.server.Bootstrap; @@ -47,9 +47,10 @@ public class Main { } public static void addClientProviders(DataGenerator dataGenerator, boolean toRun) { - PackGenerator packGenerator = dataGenerator.getVanillaPack(toRun); + DataGenerator.PackGenerator packGenerator = dataGenerator.getVanillaPack(toRun); packGenerator.addProvider(ModelProvider::new); packGenerator.addProvider(EquipmentAssetProvider::new); + packGenerator.addProvider(WaypointStyleProvider::new); packGenerator.addProvider(AtlasProvider::new); } } diff --git a/net/minecraft/client/data/models/BlockModelGenerators.java b/net/minecraft/client/data/models/BlockModelGenerators.java index ae315175..3f552574 100644 --- a/net/minecraft/client/data/models/BlockModelGenerators.java +++ b/net/minecraft/client/data/models/BlockModelGenerators.java @@ -38,19 +38,24 @@ import net.minecraft.client.data.models.model.ModelTemplates; import net.minecraft.client.data.models.model.TextureMapping; import net.minecraft.client.data.models.model.TextureSlot; import net.minecraft.client.data.models.model.TexturedModel; +import net.minecraft.client.renderer.block.model.Variant; import net.minecraft.client.renderer.block.model.VariantMutator; import net.minecraft.client.renderer.block.model.multipart.CombinedCondition; import net.minecraft.client.renderer.block.model.multipart.Condition; import net.minecraft.client.renderer.item.ItemModel; +import net.minecraft.client.renderer.special.BannerSpecialRenderer; import net.minecraft.client.renderer.special.BedSpecialRenderer; import net.minecraft.client.renderer.special.ChestSpecialRenderer; +import net.minecraft.client.renderer.special.ConduitSpecialRenderer; +import net.minecraft.client.renderer.special.DecoratedPotSpecialRenderer; +import net.minecraft.client.renderer.special.PlayerHeadSpecialRenderer; import net.minecraft.client.renderer.special.ShulkerBoxSpecialRenderer; -import net.minecraft.client.renderer.special.SkullSpecialRenderer.Unbaked; +import net.minecraft.client.renderer.special.SkullSpecialRenderer; +import net.minecraft.client.renderer.special.SpecialModelRenderer; import net.minecraft.core.Direction; import net.minecraft.core.FrontAndTop; import net.minecraft.data.BlockFamilies; import net.minecraft.data.BlockFamily; -import net.minecraft.data.BlockFamily.Variant; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.random.Weighted; import net.minecraft.util.random.WeightedList; @@ -62,6 +67,7 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.CrafterBlock; import net.minecraft.world.level.block.CreakingHeartBlock; +import net.minecraft.world.level.block.DriedGhastBlock; import net.minecraft.world.level.block.HangingMossBlock; import net.minecraft.world.level.block.LayeredCauldronBlock; import net.minecraft.world.level.block.LightBlock; @@ -208,21 +214,21 @@ public class BlockModelGenerators { .put(Blocks.CHISELED_TUFF_BRICKS, TexturedModel.COLUMN_WITH_WALL.get(Blocks.CHISELED_TUFF_BRICKS)) .put(Blocks.CHISELED_TUFF, TexturedModel.COLUMN_WITH_WALL.get(Blocks.CHISELED_TUFF)) .build(); - static final Map> SHAPE_CONSUMERS = ImmutableMap.>builder() - .put(Variant.BUTTON, BlockModelGenerators.BlockFamilyProvider::button) - .put(Variant.DOOR, BlockModelGenerators.BlockFamilyProvider::door) - .put(Variant.CHISELED, BlockModelGenerators.BlockFamilyProvider::fullBlockVariant) - .put(Variant.CRACKED, BlockModelGenerators.BlockFamilyProvider::fullBlockVariant) - .put(Variant.CUSTOM_FENCE, BlockModelGenerators.BlockFamilyProvider::customFence) - .put(Variant.FENCE, BlockModelGenerators.BlockFamilyProvider::fence) - .put(Variant.CUSTOM_FENCE_GATE, BlockModelGenerators.BlockFamilyProvider::customFenceGate) - .put(Variant.FENCE_GATE, BlockModelGenerators.BlockFamilyProvider::fenceGate) - .put(Variant.SIGN, BlockModelGenerators.BlockFamilyProvider::sign) - .put(Variant.SLAB, BlockModelGenerators.BlockFamilyProvider::slab) - .put(Variant.STAIRS, BlockModelGenerators.BlockFamilyProvider::stairs) - .put(Variant.PRESSURE_PLATE, BlockModelGenerators.BlockFamilyProvider::pressurePlate) - .put(Variant.TRAPDOOR, BlockModelGenerators.BlockFamilyProvider::trapdoor) - .put(Variant.WALL, BlockModelGenerators.BlockFamilyProvider::wall) + static final Map> SHAPE_CONSUMERS = ImmutableMap.>builder() + .put(BlockFamily.Variant.BUTTON, BlockModelGenerators.BlockFamilyProvider::button) + .put(BlockFamily.Variant.DOOR, BlockModelGenerators.BlockFamilyProvider::door) + .put(BlockFamily.Variant.CHISELED, BlockModelGenerators.BlockFamilyProvider::fullBlockVariant) + .put(BlockFamily.Variant.CRACKED, BlockModelGenerators.BlockFamilyProvider::fullBlockVariant) + .put(BlockFamily.Variant.CUSTOM_FENCE, BlockModelGenerators.BlockFamilyProvider::customFence) + .put(BlockFamily.Variant.FENCE, BlockModelGenerators.BlockFamilyProvider::fence) + .put(BlockFamily.Variant.CUSTOM_FENCE_GATE, BlockModelGenerators.BlockFamilyProvider::customFenceGate) + .put(BlockFamily.Variant.FENCE_GATE, BlockModelGenerators.BlockFamilyProvider::fenceGate) + .put(BlockFamily.Variant.SIGN, BlockModelGenerators.BlockFamilyProvider::sign) + .put(BlockFamily.Variant.SLAB, BlockModelGenerators.BlockFamilyProvider::slab) + .put(BlockFamily.Variant.STAIRS, BlockModelGenerators.BlockFamilyProvider::stairs) + .put(BlockFamily.Variant.PRESSURE_PLATE, BlockModelGenerators.BlockFamilyProvider::pressurePlate) + .put(BlockFamily.Variant.TRAPDOOR, BlockModelGenerators.BlockFamilyProvider::trapdoor) + .put(BlockFamily.Variant.WALL, BlockModelGenerators.BlockFamilyProvider::wall) .build(); private static final Map MULTIFACE_GENERATOR = ImmutableMap.of( Direction.NORTH, @@ -240,15 +246,15 @@ public class BlockModelGenerators { ); private static final Map CHISELED_BOOKSHELF_SLOT_MODEL_CACHE = new HashMap(); - static net.minecraft.client.renderer.block.model.Variant plainModel(ResourceLocation modelLocation) { - return new net.minecraft.client.renderer.block.model.Variant(modelLocation); + static Variant plainModel(ResourceLocation modelLocation) { + return new Variant(modelLocation); } - static MultiVariant variant(net.minecraft.client.renderer.block.model.Variant variant) { + static MultiVariant variant(Variant variant) { return new MultiVariant(WeightedList.of(variant)); } - private static MultiVariant variants(net.minecraft.client.renderer.block.model.Variant... variants) { + private static MultiVariant variants(Variant... variants) { return new MultiVariant(WeightedList.of(Arrays.stream(variants).map(variant -> new Weighted<>(variant, 1)).toList())); } @@ -265,32 +271,23 @@ public class BlockModelGenerators { } private static BlockModelDefinitionGenerator createMirroredCubeGenerator( - Block block, - net.minecraft.client.renderer.block.model.Variant variant, - TextureMapping textureMapping, - BiConsumer modelOutput + Block block, Variant variant, TextureMapping textureMapping, BiConsumer modelOutput ) { - net.minecraft.client.renderer.block.model.Variant variant2 = plainModel(ModelTemplates.CUBE_MIRRORED_ALL.create(block, textureMapping, modelOutput)); + Variant variant2 = plainModel(ModelTemplates.CUBE_MIRRORED_ALL.create(block, textureMapping, modelOutput)); return MultiVariantGenerator.dispatch(block, createRotatedVariants(variant, variant2)); } private static BlockModelDefinitionGenerator createNorthWestMirroredCubeGenerator( - Block block, - net.minecraft.client.renderer.block.model.Variant variant, - TextureMapping textureMapping, - BiConsumer modelOutput + Block block, Variant variant, TextureMapping textureMapping, BiConsumer modelOutput ) { MultiVariant multiVariant = plainVariant(ModelTemplates.CUBE_NORTH_WEST_MIRRORED_ALL.create(block, textureMapping, modelOutput)); return createSimpleBlock(block, multiVariant); } private static BlockModelDefinitionGenerator createMirroredColumnGenerator( - Block block, - net.minecraft.client.renderer.block.model.Variant variant, - TextureMapping textureMapping, - BiConsumer modelOutput + Block block, Variant variant, TextureMapping textureMapping, BiConsumer modelOutput ) { - net.minecraft.client.renderer.block.model.Variant variant2 = plainModel(ModelTemplates.CUBE_COLUMN_MIRRORED.create(block, textureMapping, modelOutput)); + Variant variant2 = plainModel(ModelTemplates.CUBE_COLUMN_MIRRORED.create(block, textureMapping, modelOutput)); return MultiVariantGenerator.dispatch(block, createRotatedVariants(variant, variant2)).with(createRotatedPillar()); } @@ -360,13 +357,11 @@ public class BlockModelGenerators { } } - private static MultiVariant createRotatedVariants(net.minecraft.client.renderer.block.model.Variant variant) { + private static MultiVariant createRotatedVariants(Variant variant) { return variants(variant, variant.with(Y_ROT_90), variant.with(Y_ROT_180), variant.with(Y_ROT_270)); } - private static MultiVariant createRotatedVariants( - net.minecraft.client.renderer.block.model.Variant variant, net.minecraft.client.renderer.block.model.Variant mirroredVariant - ) { + private static MultiVariant createRotatedVariants(Variant variant, Variant mirroredVariant) { return variants(variant, mirroredVariant, variant.with(Y_ROT_180), mirroredVariant.with(Y_ROT_180)); } @@ -375,13 +370,13 @@ public class BlockModelGenerators { } private void createRotatedMirroredVariantBlock(Block block) { - net.minecraft.client.renderer.block.model.Variant variant = plainModel(TexturedModel.CUBE.create(block, this.modelOutput)); - net.minecraft.client.renderer.block.model.Variant variant2 = plainModel(TexturedModel.CUBE_MIRRORED.create(block, this.modelOutput)); + Variant variant = plainModel(TexturedModel.CUBE.create(block, this.modelOutput)); + Variant variant2 = plainModel(TexturedModel.CUBE_MIRRORED.create(block, this.modelOutput)); this.blockStateOutput.accept(MultiVariantGenerator.dispatch(block, createRotatedVariants(variant, variant2))); } private void createRotatedVariantBlock(Block block) { - net.minecraft.client.renderer.block.model.Variant variant = plainModel(TexturedModel.CUBE.create(block, this.modelOutput)); + Variant variant = plainModel(TexturedModel.CUBE.create(block, this.modelOutput)); this.blockStateOutput.accept(MultiVariantGenerator.dispatch(block, createRotatedVariants(variant))); } @@ -1190,7 +1185,7 @@ public class BlockModelGenerators { private void createColoredBlockWithRandomRotations(TexturedModel.Provider modelProvider, Block... coloredBlocks) { for (Block block : coloredBlocks) { - net.minecraft.client.renderer.block.model.Variant variant = plainModel(modelProvider.create(block, this.modelOutput)); + Variant variant = plainModel(modelProvider.create(block, this.modelOutput)); this.blockStateOutput.accept(MultiVariantGenerator.dispatch(block, createRotatedVariants(variant))); } } @@ -1252,7 +1247,7 @@ public class BlockModelGenerators { String string = "_age" + age; return new MultiVariant( WeightedList.of( - (List>)IntStream.range(1, 5) + (List>)IntStream.range(1, 5) .mapToObj(i -> new Weighted<>(plainModel(ModelLocationUtils.getModelLocation(Blocks.BAMBOO, i + string)), 1)) .collect(Collectors.toList()) ) @@ -1807,14 +1802,14 @@ public class BlockModelGenerators { private void createChorusPlant() { MultiVariant multiVariant = plainVariant(ModelLocationUtils.getModelLocation(Blocks.CHORUS_PLANT, "_side")); - net.minecraft.client.renderer.block.model.Variant variant = plainModel(ModelLocationUtils.getModelLocation(Blocks.CHORUS_PLANT, "_noside")); - net.minecraft.client.renderer.block.model.Variant variant2 = plainModel(ModelLocationUtils.getModelLocation(Blocks.CHORUS_PLANT, "_noside1")); - net.minecraft.client.renderer.block.model.Variant variant3 = plainModel(ModelLocationUtils.getModelLocation(Blocks.CHORUS_PLANT, "_noside2")); - net.minecraft.client.renderer.block.model.Variant variant4 = plainModel(ModelLocationUtils.getModelLocation(Blocks.CHORUS_PLANT, "_noside3")); - net.minecraft.client.renderer.block.model.Variant variant5 = variant.with(UV_LOCK); - net.minecraft.client.renderer.block.model.Variant variant6 = variant2.with(UV_LOCK); - net.minecraft.client.renderer.block.model.Variant variant7 = variant3.with(UV_LOCK); - net.minecraft.client.renderer.block.model.Variant variant8 = variant4.with(UV_LOCK); + Variant variant = plainModel(ModelLocationUtils.getModelLocation(Blocks.CHORUS_PLANT, "_noside")); + Variant variant2 = plainModel(ModelLocationUtils.getModelLocation(Blocks.CHORUS_PLANT, "_noside1")); + Variant variant3 = plainModel(ModelLocationUtils.getModelLocation(Blocks.CHORUS_PLANT, "_noside2")); + Variant variant4 = plainModel(ModelLocationUtils.getModelLocation(Blocks.CHORUS_PLANT, "_noside3")); + Variant variant5 = variant.with(UV_LOCK); + Variant variant6 = variant2.with(UV_LOCK); + Variant variant7 = variant3.with(UV_LOCK); + Variant variant8 = variant4.with(UV_LOCK); this.blockStateOutput .accept( MultiPartGenerator.multiPart(Blocks.CHORUS_PLANT) @@ -2191,7 +2186,7 @@ public class BlockModelGenerators { } private void createDirtPath() { - net.minecraft.client.renderer.block.model.Variant variant = plainModel(ModelLocationUtils.getModelLocation(Blocks.DIRT_PATH)); + Variant variant = plainModel(ModelLocationUtils.getModelLocation(Blocks.DIRT_PATH)); this.blockStateOutput.accept(MultiVariantGenerator.dispatch(Blocks.DIRT_PATH, createRotatedVariants(variant))); } @@ -2320,7 +2315,7 @@ public class BlockModelGenerators { private void createLilyPad() { ResourceLocation resourceLocation = this.createFlatItemModelWithBlockTexture(Items.LILY_PAD, Blocks.LILY_PAD); this.registerSimpleTintedItemModel(Blocks.LILY_PAD, resourceLocation, ItemModelUtils.constantTint(-9321636)); - net.minecraft.client.renderer.block.model.Variant variant = plainModel(ModelLocationUtils.getModelLocation(Blocks.LILY_PAD)); + Variant variant = plainModel(ModelLocationUtils.getModelLocation(Blocks.LILY_PAD)); this.blockStateOutput.accept(MultiVariantGenerator.dispatch(Blocks.LILY_PAD, createRotatedVariants(variant))); } @@ -2342,7 +2337,7 @@ public class BlockModelGenerators { } private void createNetherrack() { - net.minecraft.client.renderer.block.model.Variant variant = plainModel(TexturedModel.CUBE.create(Blocks.NETHERRACK, this.modelOutput)); + Variant variant = plainModel(TexturedModel.CUBE.create(Blocks.NETHERRACK, this.modelOutput)); this.blockStateOutput .accept( MultiVariantGenerator.dispatch( @@ -2792,7 +2787,7 @@ public class BlockModelGenerators { ); } - private net.minecraft.client.renderer.block.model.Variant createTurtleEggModel(int eggs, String variantName, TextureMapping textureMapping) { + private Variant createTurtleEggModel(int eggs, String variantName, TextureMapping textureMapping) { return switch (eggs) { case 1 -> plainModel( ModelTemplates.TURTLE_EGG.create(ModelLocationUtils.decorateBlockModelLocation(variantName + "turtle_egg"), textureMapping, this.modelOutput) @@ -2813,7 +2808,7 @@ public class BlockModelGenerators { }; } - private net.minecraft.client.renderer.block.model.Variant createTurtleEggModel(int eggs, int hatchAmount) { + private Variant createTurtleEggModel(int eggs, int hatchAmount) { return switch (hatchAmount) { case 0 -> this.createTurtleEggModel(eggs, "", TextureMapping.cube(TextureMapping.getBlockTexture(Blocks.TURTLE_EGG))); case 1 -> this.createTurtleEggModel(eggs, "slightly_cracked_", TextureMapping.cube(TextureMapping.getBlockTexture(Blocks.TURTLE_EGG, "_slightly_cracked"))); @@ -2834,6 +2829,27 @@ public class BlockModelGenerators { ); } + private void createDriedGhastBlock() { + ResourceLocation resourceLocation = ModelLocationUtils.getModelLocation(Blocks.DRIED_GHAST, "_hydration_0"); + this.registerSimpleItemModel(Blocks.DRIED_GHAST, resourceLocation); + Function function = integer -> { + String string = switch (integer) { + case 1 -> "_hydration_1"; + case 2 -> "_hydration_2"; + case 3 -> "_hydration_3"; + default -> "_hydration_0"; + }; + TextureMapping textureMapping = TextureMapping.driedGhast(string); + return ModelTemplates.DRIED_GHAST.createWithSuffix(Blocks.DRIED_GHAST, string, textureMapping, this.modelOutput); + }; + this.blockStateOutput + .accept( + MultiVariantGenerator.dispatch(Blocks.DRIED_GHAST) + .with(PropertyDispatch.initial(DriedGhastBlock.HYDRATION_LEVEL).generate(integer -> plainVariant((ResourceLocation)function.apply(integer)))) + .with(ROTATION_HORIZONTAL_FACING) + ); + } + private void createSnifferEgg() { this.registerSimpleFlatItemModel(Items.SNIFFER_EGG); this.blockStateOutput.accept(MultiVariantGenerator.dispatch(Blocks.SNIFFER_EGG).with(PropertyDispatch.initial(SnifferEggBlock.HATCH).generate(integer -> { @@ -3013,16 +3029,16 @@ public class BlockModelGenerators { private void createInfestedStone() { ResourceLocation resourceLocation = ModelLocationUtils.getModelLocation(Blocks.STONE); - net.minecraft.client.renderer.block.model.Variant variant = plainModel(resourceLocation); - net.minecraft.client.renderer.block.model.Variant variant2 = plainModel(ModelLocationUtils.getModelLocation(Blocks.STONE, "_mirrored")); + Variant variant = plainModel(resourceLocation); + Variant variant2 = plainModel(ModelLocationUtils.getModelLocation(Blocks.STONE, "_mirrored")); this.blockStateOutput.accept(MultiVariantGenerator.dispatch(Blocks.INFESTED_STONE, createRotatedVariants(variant, variant2))); this.registerSimpleItemModel(Blocks.INFESTED_STONE, resourceLocation); } private void createInfestedDeepslate() { ResourceLocation resourceLocation = ModelLocationUtils.getModelLocation(Blocks.DEEPSLATE); - net.minecraft.client.renderer.block.model.Variant variant = plainModel(resourceLocation); - net.minecraft.client.renderer.block.model.Variant variant2 = plainModel(ModelLocationUtils.getModelLocation(Blocks.DEEPSLATE, "_mirrored")); + Variant variant = plainModel(resourceLocation); + Variant variant2 = plainModel(ModelLocationUtils.getModelLocation(Blocks.DEEPSLATE, "_mirrored")); this.blockStateOutput.accept(MultiVariantGenerator.dispatch(Blocks.INFESTED_DEEPSLATE, createRotatedVariants(variant, variant2)).with(createRotatedPillar())); this.registerSimpleItemModel(Blocks.INFESTED_DEEPSLATE, resourceLocation); } @@ -3107,7 +3123,11 @@ public class BlockModelGenerators { MultiVariant multiVariant = plainVariant(ModelLocationUtils.decorateBlockModelLocation("skull")); this.blockStateOutput.accept(createSimpleBlock(headBlock, multiVariant)); this.blockStateOutput.accept(createSimpleBlock(wallHeadBlock, multiVariant)); - this.itemModelOutput.accept(headBlock.asItem(), ItemModelUtils.specialModel(modelLocation, new Unbaked(type))); + if (type == SkullBlock.Types.PLAYER) { + this.itemModelOutput.accept(headBlock.asItem(), ItemModelUtils.specialModel(modelLocation, new PlayerHeadSpecialRenderer.Unbaked())); + } else { + this.itemModelOutput.accept(headBlock.asItem(), ItemModelUtils.specialModel(modelLocation, new SkullSpecialRenderer.Unbaked(type))); + } } private void createHeads() { @@ -3127,8 +3147,7 @@ public class BlockModelGenerators { this.blockStateOutput.accept(createSimpleBlock(block, multiVariant)); this.blockStateOutput.accept(createSimpleBlock(wallBlock, multiVariant)); Item item = block.asItem(); - this.itemModelOutput - .accept(item, ItemModelUtils.specialModel(resourceLocation, new net.minecraft.client.renderer.special.BannerSpecialRenderer.Unbaked(color))); + this.itemModelOutput.accept(item, ItemModelUtils.specialModel(resourceLocation, new BannerSpecialRenderer.Unbaked(color))); } private void createBanners() { @@ -3197,7 +3216,7 @@ public class BlockModelGenerators { this.createBed(Blocks.BLACK_BED, Blocks.BLACK_WOOL, DyeColor.BLACK); } - private void generateSimpleSpecialItemModel(Block block, net.minecraft.client.renderer.special.SpecialModelRenderer.Unbaked specialModel) { + private void generateSimpleSpecialItemModel(Block block, SpecialModelRenderer.Unbaked specialModel) { Item item = block.asItem(); ResourceLocation resourceLocation = ModelLocationUtils.getModelLocation(item); this.itemModelOutput.accept(item, ItemModelUtils.specialModel(resourceLocation, specialModel)); @@ -3445,6 +3464,7 @@ public class BlockModelGenerators { this.createTripwireHook(); this.createTurtleEgg(); this.createSnifferEgg(); + this.createDriedGhastBlock(); this.createVine(); this.createMultiface(Blocks.GLOW_LICHEN); this.createMultiface(Blocks.SCULK_VEIN); @@ -3528,9 +3548,9 @@ public class BlockModelGenerators { this.createShulkerBox(Blocks.RED_SHULKER_BOX, DyeColor.RED); this.createShulkerBox(Blocks.BLACK_SHULKER_BOX, DyeColor.BLACK); this.createParticleOnlyBlock(Blocks.CONDUIT); - this.generateSimpleSpecialItemModel(Blocks.CONDUIT, new net.minecraft.client.renderer.special.ConduitSpecialRenderer.Unbaked()); + this.generateSimpleSpecialItemModel(Blocks.CONDUIT, new ConduitSpecialRenderer.Unbaked()); this.createParticleOnlyBlock(Blocks.DECORATED_POT, Blocks.TERRACOTTA); - this.generateSimpleSpecialItemModel(Blocks.DECORATED_POT, new net.minecraft.client.renderer.special.DecoratedPotSpecialRenderer.Unbaked()); + this.generateSimpleSpecialItemModel(Blocks.DECORATED_POT, new DecoratedPotSpecialRenderer.Unbaked()); this.createParticleOnlyBlock(Blocks.END_PORTAL, Blocks.OBSIDIAN); this.createParticleOnlyBlock(Blocks.END_GATEWAY, Blocks.OBSIDIAN); this.createTrivialCube(Blocks.AZALEA_LEAVES); @@ -3899,7 +3919,7 @@ public class BlockModelGenerators { @Nullable private BlockFamily family; @Nullable - private net.minecraft.client.renderer.block.model.Variant fullBlock; + private Variant fullBlock; private final Set skipGeneratingModelsFor = new HashSet(); public BlockFamilyProvider(final TextureMapping mapping) { @@ -4045,7 +4065,7 @@ public class BlockModelGenerators { if (this.family == null) { throw new IllegalStateException("Family not defined"); } else { - Block block = (Block)this.family.getVariants().get(Variant.WALL_SIGN); + Block block = (Block)this.family.getVariants().get(BlockFamily.Variant.WALL_SIGN); MultiVariant multiVariant = BlockModelGenerators.plainVariant( ModelTemplates.PARTICLE_ONLY.create(signBlock, this.mapping, BlockModelGenerators.this.modelOutput) ); @@ -4129,12 +4149,7 @@ public class BlockModelGenerators { @FunctionalInterface @Environment(EnvType.CLIENT) interface BlockStateGeneratorSupplier { - BlockModelDefinitionGenerator create( - Block block, - net.minecraft.client.renderer.block.model.Variant variant, - TextureMapping textureMapping, - BiConsumer biConsumer - ); + BlockModelDefinitionGenerator create(Block block, Variant variant, TextureMapping textureMapping, BiConsumer biConsumer); } @Environment(EnvType.CLIENT) diff --git a/net/minecraft/client/data/models/EquipmentAssetProvider.java b/net/minecraft/client/data/models/EquipmentAssetProvider.java index 19d1858d..28e86dc8 100644 --- a/net/minecraft/client/data/models/EquipmentAssetProvider.java +++ b/net/minecraft/client/data/models/EquipmentAssetProvider.java @@ -12,8 +12,6 @@ import net.minecraft.client.resources.model.EquipmentClientInfo; import net.minecraft.data.CachedOutput; import net.minecraft.data.DataProvider; import net.minecraft.data.PackOutput; -import net.minecraft.data.PackOutput.PathProvider; -import net.minecraft.data.PackOutput.Target; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.DyeColor; @@ -22,10 +20,10 @@ import net.minecraft.world.item.equipment.EquipmentAssets; @Environment(EnvType.CLIENT) public class EquipmentAssetProvider implements DataProvider { - private final PathProvider pathProvider; + private final PackOutput.PathProvider pathProvider; public EquipmentAssetProvider(PackOutput output) { - this.pathProvider = output.createPathProvider(Target.RESOURCE_PACK, "equipment"); + this.pathProvider = output.createPathProvider(PackOutput.Target.RESOURCE_PACK, "equipment"); } private static void bootstrap(BiConsumer, EquipmentClientInfo> output) { @@ -75,6 +73,20 @@ public class EquipmentAssetProvider implements DataProvider { .build() ); + for (Entry> entry : EquipmentAssets.HARNESSES.entrySet()) { + DyeColor dyeColor = (DyeColor)entry.getKey(); + ResourceKey resourceKey = (ResourceKey)entry.getValue(); + output.accept( + resourceKey, + EquipmentClientInfo.builder() + .addLayers( + EquipmentClientInfo.LayerType.HAPPY_GHAST_BODY, + EquipmentClientInfo.Layer.onlyIfDyed(ResourceLocation.withDefaultNamespace(dyeColor.getSerializedName() + "_harness"), false) + ) + .build() + ); + } + for (Entry> entry : EquipmentAssets.CARPETS.entrySet()) { DyeColor dyeColor = (DyeColor)entry.getKey(); ResourceKey resourceKey = (ResourceKey)entry.getValue(); diff --git a/net/minecraft/client/data/models/ItemModelGenerators.java b/net/minecraft/client/data/models/ItemModelGenerators.java index 5ef58ad3..ab90fc07 100644 --- a/net/minecraft/client/data/models/ItemModelGenerators.java +++ b/net/minecraft/client/data/models/ItemModelGenerators.java @@ -34,7 +34,8 @@ import net.minecraft.client.renderer.item.properties.numeric.UseDuration; import net.minecraft.client.renderer.item.properties.select.Charge; import net.minecraft.client.renderer.item.properties.select.DisplayContext; import net.minecraft.client.renderer.item.properties.select.TrimMaterialProperty; -import net.minecraft.client.renderer.special.ShieldSpecialRenderer.Unbaked; +import net.minecraft.client.renderer.special.ShieldSpecialRenderer; +import net.minecraft.client.renderer.special.TridentSpecialRenderer; import net.minecraft.core.component.DataComponents; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; @@ -315,8 +316,8 @@ public class ItemModelGenerators { } private void generateShield(Item shieldItem) { - ItemModel.Unbaked unbaked = ItemModelUtils.specialModel(ModelLocationUtils.getModelLocation(shieldItem), new Unbaked()); - ItemModel.Unbaked unbaked2 = ItemModelUtils.specialModel(ModelLocationUtils.getModelLocation(shieldItem, "_blocking"), new Unbaked()); + ItemModel.Unbaked unbaked = ItemModelUtils.specialModel(ModelLocationUtils.getModelLocation(shieldItem), new ShieldSpecialRenderer.Unbaked()); + ItemModel.Unbaked unbaked2 = ItemModelUtils.specialModel(ModelLocationUtils.getModelLocation(shieldItem, "_blocking"), new ShieldSpecialRenderer.Unbaked()); this.generateBooleanDispatch(shieldItem, ItemModelUtils.isUsingItem(), unbaked2, unbaked); } @@ -334,12 +335,8 @@ public class ItemModelGenerators { private void generateTrident(Item tridentItem) { ItemModel.Unbaked unbaked = ItemModelUtils.plainModel(this.createFlatItemModel(tridentItem, ModelTemplates.FLAT_ITEM)); - ItemModel.Unbaked unbaked2 = ItemModelUtils.specialModel( - ModelLocationUtils.getModelLocation(tridentItem, "_in_hand"), new net.minecraft.client.renderer.special.TridentSpecialRenderer.Unbaked() - ); - ItemModel.Unbaked unbaked3 = ItemModelUtils.specialModel( - ModelLocationUtils.getModelLocation(tridentItem, "_throwing"), new net.minecraft.client.renderer.special.TridentSpecialRenderer.Unbaked() - ); + ItemModel.Unbaked unbaked2 = ItemModelUtils.specialModel(ModelLocationUtils.getModelLocation(tridentItem, "_in_hand"), new TridentSpecialRenderer.Unbaked()); + ItemModel.Unbaked unbaked3 = ItemModelUtils.specialModel(ModelLocationUtils.getModelLocation(tridentItem, "_throwing"), new TridentSpecialRenderer.Unbaked()); ItemModel.Unbaked unbaked4 = ItemModelUtils.conditional(ItemModelUtils.isUsingItem(), unbaked3, unbaked2); this.itemModelOutput.accept(tridentItem, createFlatModelDispatch(unbaked, unbaked4)); } @@ -367,15 +364,15 @@ public class ItemModelGenerators { this.itemModelOutput.accept(item, ItemModelUtils.tintedModel(resourceLocation, new Dye(color))); } - private void generateWolfArmor(Item armorItem) { - ResourceLocation resourceLocation = TextureMapping.getItemTexture(armorItem); - ResourceLocation resourceLocation2 = TextureMapping.getItemTexture(armorItem, "_overlay"); - ResourceLocation resourceLocation3 = ModelTemplates.FLAT_ITEM.create(armorItem, TextureMapping.layer0(resourceLocation), this.modelOutput); - ResourceLocation resourceLocation4 = ModelLocationUtils.getModelLocation(armorItem, "_dyed"); + private void generateTwoLayerDyedItem(Item item) { + ResourceLocation resourceLocation = TextureMapping.getItemTexture(item); + ResourceLocation resourceLocation2 = TextureMapping.getItemTexture(item, "_overlay"); + ResourceLocation resourceLocation3 = ModelTemplates.FLAT_ITEM.create(item, TextureMapping.layer0(resourceLocation), this.modelOutput); + ResourceLocation resourceLocation4 = ModelLocationUtils.getModelLocation(item, "_dyed"); ModelTemplates.TWO_LAYERED_ITEM.create(resourceLocation4, TextureMapping.layered(resourceLocation, resourceLocation2), this.modelOutput); this.itemModelOutput .accept( - armorItem, + item, ItemModelUtils.conditional( ItemModelUtils.hasComponent(DataComponents.DYED_COLOR), ItemModelUtils.tintedModel(resourceLocation4, BLANK_LAYER, new Dye(0)), @@ -547,6 +544,7 @@ public class ItemModelGenerators { this.generateFlatItem(Items.MUSIC_DISC_OTHERSIDE, ModelTemplates.MUSIC_DISC); this.generateFlatItem(Items.MUSIC_DISC_RELIC, ModelTemplates.MUSIC_DISC); this.generateFlatItem(Items.MUSIC_DISC_5, ModelTemplates.MUSIC_DISC); + this.generateFlatItem(Items.MUSIC_DISC_TEARS, ModelTemplates.MUSIC_DISC); this.generateFlatItem(Items.MUTTON, ModelTemplates.FLAT_ITEM); this.generateFlatItem(Items.NAME_TAG, ModelTemplates.FLAT_ITEM); this.generateFlatItem(Items.NAUTILUS_SHELL, ModelTemplates.FLAT_ITEM); @@ -722,7 +720,23 @@ public class ItemModelGenerators { this.generateBundleModels(Items.ORANGE_BUNDLE); this.generateSpyglass(Items.SPYGLASS); this.generateTrident(Items.TRIDENT); - this.generateWolfArmor(Items.WOLF_ARMOR); + this.generateTwoLayerDyedItem(Items.WOLF_ARMOR); + this.generateFlatItem(Items.WHITE_HARNESS, ModelTemplates.FLAT_ITEM); + this.generateFlatItem(Items.ORANGE_HARNESS, ModelTemplates.FLAT_ITEM); + this.generateFlatItem(Items.MAGENTA_HARNESS, ModelTemplates.FLAT_ITEM); + this.generateFlatItem(Items.LIGHT_BLUE_HARNESS, ModelTemplates.FLAT_ITEM); + this.generateFlatItem(Items.YELLOW_HARNESS, ModelTemplates.FLAT_ITEM); + this.generateFlatItem(Items.LIME_HARNESS, ModelTemplates.FLAT_ITEM); + this.generateFlatItem(Items.PINK_HARNESS, ModelTemplates.FLAT_ITEM); + this.generateFlatItem(Items.GRAY_HARNESS, ModelTemplates.FLAT_ITEM); + this.generateFlatItem(Items.LIGHT_GRAY_HARNESS, ModelTemplates.FLAT_ITEM); + this.generateFlatItem(Items.CYAN_HARNESS, ModelTemplates.FLAT_ITEM); + this.generateFlatItem(Items.PURPLE_HARNESS, ModelTemplates.FLAT_ITEM); + this.generateFlatItem(Items.BLUE_HARNESS, ModelTemplates.FLAT_ITEM); + this.generateFlatItem(Items.BROWN_HARNESS, ModelTemplates.FLAT_ITEM); + this.generateFlatItem(Items.GREEN_HARNESS, ModelTemplates.FLAT_ITEM); + this.generateFlatItem(Items.RED_HARNESS, ModelTemplates.FLAT_ITEM); + this.generateFlatItem(Items.BLACK_HARNESS, ModelTemplates.FLAT_ITEM); this.generateBow(Items.BOW); this.generateCrossbow(Items.CROSSBOW); this.generateElytra(Items.ELYTRA); @@ -763,6 +777,7 @@ public class ItemModelGenerators { this.generateFlatItem(Items.GLOW_SQUID_SPAWN_EGG, ModelTemplates.FLAT_ITEM); this.generateFlatItem(Items.GOAT_SPAWN_EGG, ModelTemplates.FLAT_ITEM); this.generateFlatItem(Items.GUARDIAN_SPAWN_EGG, ModelTemplates.FLAT_ITEM); + this.generateFlatItem(Items.HAPPY_GHAST_SPAWN_EGG, ModelTemplates.FLAT_ITEM); this.generateFlatItem(Items.HOGLIN_SPAWN_EGG, ModelTemplates.FLAT_ITEM); this.generateFlatItem(Items.HORSE_SPAWN_EGG, ModelTemplates.FLAT_ITEM); this.generateFlatItem(Items.HUSK_SPAWN_EGG, ModelTemplates.FLAT_ITEM); diff --git a/net/minecraft/client/data/models/ModelProvider.java b/net/minecraft/client/data/models/ModelProvider.java index 5c0324f1..88235a27 100644 --- a/net/minecraft/client/data/models/ModelProvider.java +++ b/net/minecraft/client/data/models/ModelProvider.java @@ -21,13 +21,11 @@ import net.minecraft.client.data.models.model.ModelLocationUtils; import net.minecraft.client.renderer.block.model.BlockModelDefinition; import net.minecraft.client.renderer.item.ClientItem; import net.minecraft.client.renderer.item.ItemModel; -import net.minecraft.core.Holder.Reference; +import net.minecraft.core.Holder; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.data.CachedOutput; import net.minecraft.data.DataProvider; import net.minecraft.data.PackOutput; -import net.minecraft.data.PackOutput.PathProvider; -import net.minecraft.data.PackOutput.Target; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.Item; @@ -35,14 +33,14 @@ import net.minecraft.world.level.block.Block; @Environment(EnvType.CLIENT) public class ModelProvider implements DataProvider { - private final PathProvider blockStatePathProvider; - private final PathProvider itemInfoPathProvider; - private final PathProvider modelPathProvider; + private final PackOutput.PathProvider blockStatePathProvider; + private final PackOutput.PathProvider itemInfoPathProvider; + private final PackOutput.PathProvider modelPathProvider; public ModelProvider(PackOutput output) { - this.blockStatePathProvider = output.createPathProvider(Target.RESOURCE_PACK, "blockstates"); - this.itemInfoPathProvider = output.createPathProvider(Target.RESOURCE_PACK, "items"); - this.modelPathProvider = output.createPathProvider(Target.RESOURCE_PACK, "models"); + this.blockStatePathProvider = output.createPathProvider(PackOutput.Target.RESOURCE_PACK, "blockstates"); + this.itemInfoPathProvider = output.createPathProvider(PackOutput.Target.RESOURCE_PACK, "items"); + this.modelPathProvider = output.createPathProvider(PackOutput.Target.RESOURCE_PACK, "models"); } @Override @@ -70,16 +68,16 @@ public class ModelProvider implements DataProvider { static class BlockStateGeneratorCollector implements Consumer { private final Map generators = new HashMap(); - public void accept(BlockModelDefinitionGenerator blockModelDefinitionGenerator) { - Block block = blockModelDefinitionGenerator.block(); - BlockModelDefinitionGenerator blockModelDefinitionGenerator2 = (BlockModelDefinitionGenerator)this.generators.put(block, blockModelDefinitionGenerator); - if (blockModelDefinitionGenerator2 != null) { + public void accept(BlockModelDefinitionGenerator generator) { + Block block = generator.block(); + BlockModelDefinitionGenerator blockModelDefinitionGenerator = (BlockModelDefinitionGenerator)this.generators.put(block, generator); + if (blockModelDefinitionGenerator != null) { throw new IllegalStateException("Duplicate blockstate definition for " + block); } } public void validate() { - Stream> stream = BuiltInRegistries.BLOCK.listElements().filter(reference -> true); + Stream> stream = BuiltInRegistries.BLOCK.listElements().filter(reference -> true); List list = stream.filter(reference -> !this.generators.containsKey(reference.value())) .map(reference -> reference.key().location()) .toList(); @@ -88,7 +86,7 @@ public class ModelProvider implements DataProvider { } } - public CompletableFuture save(CachedOutput output, PathProvider pathProvider) { + public CompletableFuture save(CachedOutput output, PackOutput.PathProvider pathProvider) { Map map = Maps.transformValues(this.generators, BlockModelDefinitionGenerator::create); Function function = block -> pathProvider.json(block.builtInRegistryHolder().key().location()); return DataProvider.saveAll(output, BlockModelDefinition.CODEC, function, map); @@ -144,7 +142,7 @@ public class ModelProvider implements DataProvider { } } - public CompletableFuture save(CachedOutput output, PathProvider pathProvider) { + public CompletableFuture save(CachedOutput output, PackOutput.PathProvider pathProvider) { return DataProvider.saveAll(output, ClientItem.CODEC, item -> pathProvider.json(item.builtInRegistryHolder().key().location()), this.itemInfos); } } @@ -153,14 +151,14 @@ public class ModelProvider implements DataProvider { static class SimpleModelCollector implements BiConsumer { private final Map models = new HashMap(); - public void accept(ResourceLocation resourceLocation, ModelInstance modelInstance) { - Supplier supplier = (Supplier)this.models.put(resourceLocation, modelInstance); + public void accept(ResourceLocation location, ModelInstance model) { + Supplier supplier = (Supplier)this.models.put(location, model); if (supplier != null) { - throw new IllegalStateException("Duplicate model definition for " + resourceLocation); + throw new IllegalStateException("Duplicate model definition for " + location); } } - public CompletableFuture save(CachedOutput output, PathProvider pathProvider) { + public CompletableFuture save(CachedOutput output, PackOutput.PathProvider pathProvider) { return DataProvider.saveAll(output, Supplier::get, pathProvider::json, this.models); } } diff --git a/net/minecraft/client/data/models/WaypointStyleProvider.java b/net/minecraft/client/data/models/WaypointStyleProvider.java new file mode 100644 index 00000000..0d10fad8 --- /dev/null +++ b/net/minecraft/client/data/models/WaypointStyleProvider.java @@ -0,0 +1,72 @@ +package net.minecraft.client.data.models; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.CompletableFuture; +import java.util.function.BiConsumer; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.client.resources.WaypointStyle; +import net.minecraft.data.CachedOutput; +import net.minecraft.data.DataProvider; +import net.minecraft.data.PackOutput; +import net.minecraft.resources.ResourceKey; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.waypoints.WaypointStyleAsset; +import net.minecraft.world.waypoints.WaypointStyleAssets; + +@Environment(EnvType.CLIENT) +public class WaypointStyleProvider implements DataProvider { + private final PackOutput.PathProvider pathProvider; + + public WaypointStyleProvider(PackOutput packOutput) { + this.pathProvider = packOutput.createPathProvider(PackOutput.Target.RESOURCE_PACK, "waypoint_style"); + } + + private static void bootstrap(BiConsumer, WaypointStyle> consumer) { + consumer.accept( + WaypointStyleAssets.DEFAULT, + new WaypointStyle( + 128, + 332, + List.of( + ResourceLocation.withDefaultNamespace("default_0"), + ResourceLocation.withDefaultNamespace("default_1"), + ResourceLocation.withDefaultNamespace("default_2"), + ResourceLocation.withDefaultNamespace("default_3") + ) + ) + ); + consumer.accept( + WaypointStyleAssets.BOWTIE, + new WaypointStyle( + 64, + 332, + List.of( + ResourceLocation.withDefaultNamespace("bowtie"), + ResourceLocation.withDefaultNamespace("default_0"), + ResourceLocation.withDefaultNamespace("default_1"), + ResourceLocation.withDefaultNamespace("default_2"), + ResourceLocation.withDefaultNamespace("default_3") + ) + ) + ); + } + + @Override + public CompletableFuture run(CachedOutput output) { + Map, WaypointStyle> map = new HashMap(); + bootstrap((resourceKey, waypointStyle) -> { + if (map.putIfAbsent(resourceKey, waypointStyle) != null) { + throw new IllegalStateException("Tried to register waypoint style twice for id: " + resourceKey); + } + }); + return DataProvider.saveAll(output, WaypointStyle.CODEC, this.pathProvider::json, map); + } + + @Override + public String getName() { + return "Waypoint Style Definitions"; + } +} diff --git a/net/minecraft/client/data/models/blockstates/PropertyValueList.java b/net/minecraft/client/data/models/blockstates/PropertyValueList.java index 7147ec28..df3f459e 100644 --- a/net/minecraft/client/data/models/blockstates/PropertyValueList.java +++ b/net/minecraft/client/data/models/blockstates/PropertyValueList.java @@ -7,27 +7,27 @@ import java.util.stream.Collectors; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.Util; -import net.minecraft.world.level.block.state.properties.Property.Value; +import net.minecraft.world.level.block.state.properties.Property; @Environment(EnvType.CLIENT) -public record PropertyValueList(List> values) { +public record PropertyValueList(List> values) { public static final PropertyValueList EMPTY = new PropertyValueList(List.of()); - private static final Comparator> COMPARE_BY_NAME = Comparator.comparing(value -> value.property().getName()); + private static final Comparator> COMPARE_BY_NAME = Comparator.comparing(value -> value.property().getName()); - public PropertyValueList extend(Value value) { + public PropertyValueList extend(Property.Value value) { return new PropertyValueList(Util.copyAndAdd(this.values, value)); } public PropertyValueList extend(PropertyValueList values) { - return new PropertyValueList(ImmutableList.>builder().addAll(this.values).addAll(values.values).build()); + return new PropertyValueList(ImmutableList.>builder().addAll(this.values).addAll(values.values).build()); } - public static PropertyValueList of(Value... values) { + public static PropertyValueList of(Property.Value... values) { return new PropertyValueList(List.of(values)); } public String getKey() { - return (String)this.values.stream().sorted(COMPARE_BY_NAME).map(Value::toString).collect(Collectors.joining(",")); + return (String)this.values.stream().sorted(COMPARE_BY_NAME).map(Property.Value::toString).collect(Collectors.joining(",")); } public String toString() { diff --git a/net/minecraft/client/data/models/model/ModelTemplates.java b/net/minecraft/client/data/models/model/ModelTemplates.java index 89e1b8e4..87dd333a 100644 --- a/net/minecraft/client/data/models/model/ModelTemplates.java +++ b/net/minecraft/client/data/models/model/ModelTemplates.java @@ -153,6 +153,17 @@ public class ModelTemplates { public static final ModelTemplate PISTON_HEAD_SHORT = create("template_piston_head_short", TextureSlot.PLATFORM, TextureSlot.SIDE, TextureSlot.UNSTICKY); public static final ModelTemplate SEAGRASS = create("template_seagrass", TextureSlot.TEXTURE); public static final ModelTemplate TURTLE_EGG = create("template_turtle_egg", TextureSlot.ALL); + public static final ModelTemplate DRIED_GHAST = create( + "dried_ghast", + TextureSlot.PARTICLE, + TextureSlot.TOP, + TextureSlot.BOTTOM, + TextureSlot.NORTH, + TextureSlot.SOUTH, + TextureSlot.EAST, + TextureSlot.WEST, + TextureSlot.TENTACLES + ); public static final ModelTemplate TWO_TURTLE_EGGS = create("template_two_turtle_eggs", TextureSlot.ALL); public static final ModelTemplate THREE_TURTLE_EGGS = create("template_three_turtle_eggs", TextureSlot.ALL); public static final ModelTemplate FOUR_TURTLE_EGGS = create("template_four_turtle_eggs", TextureSlot.ALL); diff --git a/net/minecraft/client/data/models/model/TextureMapping.java b/net/minecraft/client/data/models/model/TextureMapping.java index ec345330..ff3bc6db 100644 --- a/net/minecraft/client/data/models/model/TextureMapping.java +++ b/net/minecraft/client/data/models/model/TextureMapping.java @@ -341,6 +341,18 @@ public class TextureMapping { .put(TextureSlot.WEST, getBlockTexture(Blocks.SNIFFER_EGG, name + "_west")); } + public static TextureMapping driedGhast(String name) { + return new TextureMapping() + .put(TextureSlot.PARTICLE, getBlockTexture(Blocks.DRIED_GHAST, name + "_north")) + .put(TextureSlot.BOTTOM, getBlockTexture(Blocks.DRIED_GHAST, name + "_bottom")) + .put(TextureSlot.TOP, getBlockTexture(Blocks.DRIED_GHAST, name + "_top")) + .put(TextureSlot.NORTH, getBlockTexture(Blocks.DRIED_GHAST, name + "_north")) + .put(TextureSlot.SOUTH, getBlockTexture(Blocks.DRIED_GHAST, name + "_south")) + .put(TextureSlot.EAST, getBlockTexture(Blocks.DRIED_GHAST, name + "_east")) + .put(TextureSlot.WEST, getBlockTexture(Blocks.DRIED_GHAST, name + "_west")) + .put(TextureSlot.TENTACLES, getBlockTexture(Blocks.DRIED_GHAST, name + "_tentacles")); + } + public static TextureMapping campfire(Block block) { return new TextureMapping().put(TextureSlot.LIT_LOG, getBlockTexture(block, "_log_lit")).put(TextureSlot.FIRE, getBlockTexture(block, "_fire")); } diff --git a/net/minecraft/client/data/models/model/TextureSlot.java b/net/minecraft/client/data/models/model/TextureSlot.java index 892dd4c6..c38dfceb 100644 --- a/net/minecraft/client/data/models/model/TextureSlot.java +++ b/net/minecraft/client/data/models/model/TextureSlot.java @@ -49,6 +49,7 @@ public final class TextureSlot { public static final TextureSlot CONTENT = create("content"); public static final TextureSlot INNER_TOP = create("inner_top"); public static final TextureSlot FLOWERBED = create("flowerbed"); + public static final TextureSlot TENTACLES = create("tentacles"); private final String id; @Nullable private final TextureSlot parent; diff --git a/net/minecraft/client/gui/Font.java b/net/minecraft/client/gui/Font.java index d8c642cf..111a49d7 100644 --- a/net/minecraft/client/gui/Font.java +++ b/net/minecraft/client/gui/Font.java @@ -1,6 +1,5 @@ package net.minecraft.client.gui; -import com.google.common.collect.Lists; import com.ibm.icu.text.ArabicShaping; import com.ibm.icu.text.ArabicShapingException; import com.ibm.icu.text.Bidi; @@ -15,6 +14,7 @@ import net.minecraft.client.StringSplitter; import net.minecraft.client.gui.font.FontSet; import net.minecraft.client.gui.font.glyphs.BakedGlyph; import net.minecraft.client.gui.font.glyphs.EmptyGlyph; +import net.minecraft.client.gui.navigation.ScreenRectangle; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.locale.Language; import net.minecraft.network.chat.Component; @@ -33,10 +33,11 @@ import org.joml.Matrix4f; @Environment(EnvType.CLIENT) public class Font { - private static final float EFFECT_DEPTH = 0.01F; - public static final float SHADOW_DEPTH = 0.03F; + private static final float EFFECT_DEPTH = 0.001F; + private static final float OVER_EFFECT_DEPTH = 0.001F; + private static final float UNDER_EFFECT_DEPTH = -0.001F; + public static final float SHADOW_DEPTH = 0.003F; public static final int NO_SHADOW = 0; - public static final int ALPHA_CUTOFF = 8; public final int lineHeight = 9; public final RandomSource random = RandomSource.create(); private final Function fonts; @@ -66,184 +67,103 @@ public class Font { } } - public int drawInBatch( + public void drawInBatch( String text, float x, float y, int color, - boolean dropShadow, + boolean drawShadow, Matrix4f pose, MultiBufferSource bufferSource, - Font.DisplayMode displayMode, + Font.DisplayMode mode, int backgroundColor, int packedLightCoords ) { - if (this.isBidirectional()) { - text = this.bidirectionalShaping(text); - } - - return this.drawInternal(text, x, y, color, dropShadow, pose, bufferSource, displayMode, backgroundColor, packedLightCoords, true); + Font.PreparedText preparedText = this.prepareText(text, x, y, color, drawShadow, backgroundColor); + preparedText.visit(Font.GlyphVisitor.forMultiBufferSource(bufferSource, pose, mode, packedLightCoords)); } - public int drawInBatch( + public void drawInBatch( Component text, float x, float y, int color, - boolean dropShadow, + boolean drawShadow, Matrix4f pose, MultiBufferSource bufferSource, - Font.DisplayMode displayMode, + Font.DisplayMode mode, int backgroundColor, int packedLightCoords ) { - return this.drawInBatch(text, x, y, color, dropShadow, pose, bufferSource, displayMode, backgroundColor, packedLightCoords, true); + Font.PreparedText preparedText = this.prepareText(text.getVisualOrderText(), x, y, color, drawShadow, backgroundColor); + preparedText.visit(Font.GlyphVisitor.forMultiBufferSource(bufferSource, pose, mode, packedLightCoords)); } - public int drawInBatch( - Component text, - float x, - float y, - int color, - boolean dropShadow, - Matrix4f pose, - MultiBufferSource bufferSource, - Font.DisplayMode displayMode, - int backgroundColor, - int packedLightCoords, - boolean inverseDepth - ) { - return this.drawInternal( - text.getVisualOrderText(), x, y, color, dropShadow, pose, bufferSource, displayMode, backgroundColor, packedLightCoords, inverseDepth - ); - } - - public int drawInBatch( + public void drawInBatch( FormattedCharSequence text, float x, float y, int color, - boolean dropShadow, + boolean drawShadow, Matrix4f pose, MultiBufferSource bufferSource, - Font.DisplayMode displayMode, + Font.DisplayMode mode, int backgroundColor, int packedLightCoords ) { - return this.drawInternal(text, x, y, color, dropShadow, pose, bufferSource, displayMode, backgroundColor, packedLightCoords, true); + Font.PreparedText preparedText = this.prepareText(text, x, y, color, drawShadow, backgroundColor); + preparedText.visit(Font.GlyphVisitor.forMultiBufferSource(bufferSource, pose, mode, packedLightCoords)); } public void drawInBatch8xOutline( FormattedCharSequence text, float x, float y, int color, int backgroundColor, Matrix4f pose, MultiBufferSource bufferSource, int packedLightCoords ) { - int i = adjustColor(backgroundColor); - Font.StringRenderOutput stringRenderOutput = new Font.StringRenderOutput(bufferSource, 0.0F, 0.0F, i, false, pose, Font.DisplayMode.NORMAL, packedLightCoords); + Font.PreparedTextBuilder preparedTextBuilder = new Font.PreparedTextBuilder(0.0F, 0.0F, backgroundColor, false); - for (int j = -1; j <= 1; j++) { - for (int k = -1; k <= 1; k++) { - if (j != 0 || k != 0) { + for (int i = -1; i <= 1; i++) { + for (int j = -1; j <= 1; j++) { + if (i != 0 || j != 0) { float[] fs = new float[]{x}; + int k = i; int l = j; - int m = k; - text.accept((lx, style, mx) -> { + text.accept((lx, style, m) -> { boolean bl = style.isBold(); FontSet fontSet = this.getFontSet(style.getFont()); - GlyphInfo glyphInfo = fontSet.getGlyphInfo(mx, this.filterFishyGlyphs); - stringRenderOutput.x = fs[0] + l * glyphInfo.getShadowOffset(); - stringRenderOutput.y = y + m * glyphInfo.getShadowOffset(); + GlyphInfo glyphInfo = fontSet.getGlyphInfo(m, this.filterFishyGlyphs); + preparedTextBuilder.x = fs[0] + k * glyphInfo.getShadowOffset(); + preparedTextBuilder.y = y + l * glyphInfo.getShadowOffset(); fs[0] += glyphInfo.getAdvance(bl); - return stringRenderOutput.accept(lx, style.withColor(i), mx); + return preparedTextBuilder.accept(lx, style.withColor(backgroundColor), m); }); } } } - stringRenderOutput.renderCharacters(); - Font.StringRenderOutput stringRenderOutput2 = new Font.StringRenderOutput( - bufferSource, x, y, adjustColor(color), false, pose, Font.DisplayMode.POLYGON_OFFSET, packedLightCoords - ); - text.accept(stringRenderOutput2); - stringRenderOutput2.finish(x); + Font.GlyphVisitor glyphVisitor = Font.GlyphVisitor.forMultiBufferSource(bufferSource, pose, Font.DisplayMode.NORMAL, packedLightCoords); + + for (BakedGlyph.GlyphInstance glyphInstance : preparedTextBuilder.glyphs) { + glyphVisitor.acceptGlyph(glyphInstance); + } + + Font.PreparedTextBuilder preparedTextBuilder2 = new Font.PreparedTextBuilder(x, y, color, false); + text.accept(preparedTextBuilder2); + preparedTextBuilder2.visit(Font.GlyphVisitor.forMultiBufferSource(bufferSource, pose, Font.DisplayMode.POLYGON_OFFSET, packedLightCoords)); } - private static int adjustColor(int color) { - return (color & -67108864) == 0 ? ARGB.opaque(color) : color; + public Font.PreparedText prepareText(String text, float x, float y, int color, boolean dropShadow, int backgroundColor) { + if (this.isBidirectional()) { + text = this.bidirectionalShaping(text); + } + + Font.PreparedTextBuilder preparedTextBuilder = new Font.PreparedTextBuilder(x, y, color, backgroundColor, dropShadow); + StringDecomposer.iterateFormatted(text, Style.EMPTY, preparedTextBuilder); + return preparedTextBuilder; } - private int drawInternal( - String text, - float x, - float y, - int color, - boolean dropShadow, - Matrix4f pose, - MultiBufferSource bufferSource, - Font.DisplayMode displayMode, - int backgroundColor, - int packedLightCoords, - boolean inverseDepth - ) { - color = adjustColor(color); - x = this.renderText(text, x, y, color, dropShadow, pose, bufferSource, displayMode, backgroundColor, packedLightCoords, inverseDepth); - return (int)x + (dropShadow ? 1 : 0); - } - - private int drawInternal( - FormattedCharSequence text, - float x, - float y, - int color, - boolean dropShadow, - Matrix4f pose, - MultiBufferSource bufferSource, - Font.DisplayMode displayMode, - int backgroundColor, - int packedLightCoords, - boolean inverseDepth - ) { - color = adjustColor(color); - x = this.renderText(text, x, y, color, dropShadow, pose, bufferSource, displayMode, backgroundColor, packedLightCoords, inverseDepth); - return (int)x + (dropShadow ? 1 : 0); - } - - private float renderText( - String text, - float x, - float y, - int color, - boolean dropShadow, - Matrix4f pose, - MultiBufferSource bufferSource, - Font.DisplayMode displayMode, - int backgroundColor, - int packedLightCoords, - boolean inverseDepth - ) { - Font.StringRenderOutput stringRenderOutput = new Font.StringRenderOutput( - bufferSource, x, y, color, backgroundColor, dropShadow, pose, displayMode, packedLightCoords, inverseDepth - ); - StringDecomposer.iterateFormatted(text, Style.EMPTY, stringRenderOutput); - return stringRenderOutput.finish(x); - } - - private float renderText( - FormattedCharSequence text, - float x, - float y, - int color, - boolean dropShadow, - Matrix4f pose, - MultiBufferSource bufferSource, - Font.DisplayMode displayMode, - int backgroundColor, - int packedLightCoords, - boolean inverseDepth - ) { - Font.StringRenderOutput stringRenderOutput = new Font.StringRenderOutput( - bufferSource, x, y, color, backgroundColor, dropShadow, pose, displayMode, packedLightCoords, inverseDepth - ); - text.accept(stringRenderOutput); - return stringRenderOutput.finish(x); + public Font.PreparedText prepareText(FormattedCharSequence text, float x, float y, int color, boolean dropShadow, int backgroundColor) { + Font.PreparedTextBuilder preparedTextBuilder = new Font.PreparedTextBuilder(x, y, color, backgroundColor, dropShadow); + text.accept(preparedTextBuilder); + return preparedTextBuilder; } /** @@ -288,6 +208,10 @@ public class Font { return Language.getInstance().getVisualOrder(this.splitter.splitLines(text, maxWidth, Style.EMPTY)); } + public List splitIgnoringLanguage(FormattedText text, int maxWidth) { + return this.splitter.splitLines(text, maxWidth, Style.EMPTY); + } + /** * Get bidiFlag that controls if the Unicode Bidirectional Algorithm should be run before rendering any string */ @@ -307,64 +231,98 @@ public class Font { } @Environment(EnvType.CLIENT) - class StringRenderOutput implements FormattedCharSink { - final MultiBufferSource bufferSource; + public interface GlyphVisitor { + static Font.GlyphVisitor forMultiBufferSource(MultiBufferSource bufferSource, Matrix4f pose, Font.DisplayMode displayMode, int packedLight) { + return new Font.GlyphVisitor() { + @Override + public void acceptGlyph(BakedGlyph.GlyphInstance glyph) { + BakedGlyph bakedGlyph = glyph.glyph(); + VertexConsumer vertexConsumer = bufferSource.getBuffer(bakedGlyph.renderType(displayMode)); + bakedGlyph.renderChar(glyph, pose, vertexConsumer, packedLight, false); + } + + @Override + public void acceptEffect(BakedGlyph glyph, BakedGlyph.Effect effect) { + VertexConsumer vertexConsumer = bufferSource.getBuffer(glyph.renderType(displayMode)); + glyph.renderEffect(effect, pose, vertexConsumer, packedLight, false); + } + }; + } + + void acceptGlyph(BakedGlyph.GlyphInstance glyph); + + void acceptEffect(BakedGlyph glyph, BakedGlyph.Effect effect); + } + + @Environment(EnvType.CLIENT) + public interface PreparedText { + void visit(Font.GlyphVisitor visitor); + + @Nullable + ScreenRectangle bounds(); + } + + @Environment(EnvType.CLIENT) + class PreparedTextBuilder implements FormattedCharSink, Font.PreparedText { private final boolean drawShadow; private final int color; private final int backgroundColor; - private final Matrix4f pose; - private final Font.DisplayMode mode; - private final int packedLightCoords; - private final boolean inverseDepth; float x; float y; - private final List glyphInstances = new ArrayList(); + private float left = Float.MAX_VALUE; + private float top = Float.MAX_VALUE; + private float right = -Float.MAX_VALUE; + private float bottom = -Float.MAX_VALUE; + private float backgroundLeft = Float.MAX_VALUE; + private float backgroundTop = Float.MAX_VALUE; + private float backgroundRight = -Float.MAX_VALUE; + private float backgroundBottom = -Float.MAX_VALUE; + final List glyphs = new ArrayList(); @Nullable private List effects; - private void addEffect(BakedGlyph.Effect effect) { - if (this.effects == null) { - this.effects = Lists.newArrayList(); - } - - this.effects.add(effect); + public PreparedTextBuilder(final float x, final float y, final int color, final boolean dropShadow) { + this(x, y, color, 0, dropShadow); } - public StringRenderOutput( - final MultiBufferSource bufferSource, - final float x, - final float y, - final int color, - final boolean dropShadow, - final Matrix4f pose, - final Font.DisplayMode mode, - final int packedLightCoords - ) { - this(bufferSource, x, y, color, 0, dropShadow, pose, mode, packedLightCoords, true); - } - - public StringRenderOutput( - final MultiBufferSource buferSource, - final float x, - final float y, - final int color, - final int backgroundColor, - final boolean dropShadow, - final Matrix4f pose, - final Font.DisplayMode displayMode, - final int packedLightCoords, - final boolean inverseDepth - ) { - this.bufferSource = buferSource; + public PreparedTextBuilder(final float x, final float y, final int color, final int backgroundColor, final boolean dropShadow) { this.x = x; this.y = y; this.drawShadow = dropShadow; this.color = color; this.backgroundColor = backgroundColor; - this.pose = pose; - this.mode = displayMode; - this.packedLightCoords = packedLightCoords; - this.inverseDepth = inverseDepth; + this.markBackground(x, y, 0.0F); + } + + private void markSize(float left, float top, float right, float bottom) { + this.left = Math.min(this.left, left); + this.top = Math.min(this.top, top); + this.right = Math.max(this.right, right); + this.bottom = Math.max(this.bottom, bottom); + } + + private void markBackground(float x, float y, float advance) { + if (ARGB.alpha(this.backgroundColor) != 0) { + this.backgroundLeft = Math.min(this.backgroundLeft, x - 1.0F); + this.backgroundTop = Math.min(this.backgroundTop, y - 1.0F); + this.backgroundRight = Math.max(this.backgroundRight, x + advance); + this.backgroundBottom = Math.max(this.backgroundBottom, y + 9.0F); + this.markSize(this.backgroundLeft, this.backgroundTop, this.backgroundRight, this.backgroundBottom); + } + } + + private void addGlyph(BakedGlyph.GlyphInstance glyph) { + this.glyphs.add(glyph); + this.markSize(glyph.left(), glyph.top(), glyph.right(), glyph.bottom()); + } + + private void addEffect(BakedGlyph.Effect effect) { + if (this.effects == null) { + this.effects = new ArrayList(); + } + + this.effects.add(effect); + this.markSize(effect.left(), effect.top(), effect.right(), effect.bottom()); } @Override @@ -381,44 +339,46 @@ public class Font { float h = glyphInfo.getShadowOffset(); if (!(bakedGlyph instanceof EmptyGlyph)) { float m = bl ? glyphInfo.getBoldOffset() : 0.0F; - this.glyphInstances.add(new BakedGlyph.GlyphInstance(this.x, this.y, k, l, bakedGlyph, style, m, h)); + this.addGlyph(new BakedGlyph.GlyphInstance(this.x, this.y, k, l, bakedGlyph, style, m, h)); } + this.markBackground(this.x, this.y, f); if (style.isStrikethrough()) { - this.addEffect(new BakedGlyph.Effect(g, this.y + 4.5F, this.x + f, this.y + 4.5F - 1.0F, this.getOverTextEffectDepth(), k, l, h)); + this.addEffect(new BakedGlyph.Effect(g, this.y + 4.5F - 1.0F, this.x + f, this.y + 4.5F, 0.001F, k, l, h)); } if (style.isUnderlined()) { - this.addEffect(new BakedGlyph.Effect(g, this.y + 9.0F, this.x + f, this.y + 9.0F - 1.0F, this.getOverTextEffectDepth(), k, l, h)); + this.addEffect(new BakedGlyph.Effect(g, this.y + 9.0F - 1.0F, this.x + f, this.y + 9.0F, 0.001F, k, l, h)); } this.x += f; return true; } - float finish(float x) { + @Override + public void visit(Font.GlyphVisitor visitor) { BakedGlyph bakedGlyph = null; - if (this.backgroundColor != 0) { - BakedGlyph.Effect effect = new BakedGlyph.Effect(x - 1.0F, this.y + 9.0F, this.x, this.y - 1.0F, this.getUnderTextEffectDepth(), this.backgroundColor); + if (ARGB.alpha(this.backgroundColor) != 0) { + BakedGlyph.Effect effect = new BakedGlyph.Effect( + this.backgroundLeft, this.backgroundTop, this.backgroundRight, this.backgroundBottom, -0.001F, this.backgroundColor + ); bakedGlyph = Font.this.getFontSet(Style.DEFAULT_FONT).whiteGlyph(); - VertexConsumer vertexConsumer = this.bufferSource.getBuffer(bakedGlyph.renderType(this.mode)); - bakedGlyph.renderEffect(effect, this.pose, vertexConsumer, this.packedLightCoords); + visitor.acceptEffect(bakedGlyph, effect); + } + + for (BakedGlyph.GlyphInstance glyphInstance : this.glyphs) { + visitor.acceptGlyph(glyphInstance); } - this.renderCharacters(); if (this.effects != null) { if (bakedGlyph == null) { bakedGlyph = Font.this.getFontSet(Style.DEFAULT_FONT).whiteGlyph(); } - VertexConsumer vertexConsumer2 = this.bufferSource.getBuffer(bakedGlyph.renderType(this.mode)); - for (BakedGlyph.Effect effect2 : this.effects) { - bakedGlyph.renderEffect(effect2, this.pose, vertexConsumer2, this.packedLightCoords); + visitor.acceptEffect(bakedGlyph, effect2); } } - - return this.x; } private int getTextColor(@Nullable TextColor textColor) { @@ -442,20 +402,18 @@ public class Font { } } - void renderCharacters() { - for (BakedGlyph.GlyphInstance glyphInstance : this.glyphInstances) { - BakedGlyph bakedGlyph = glyphInstance.glyph(); - VertexConsumer vertexConsumer = this.bufferSource.getBuffer(bakedGlyph.renderType(this.mode)); - bakedGlyph.renderChar(glyphInstance, this.pose, vertexConsumer, this.packedLightCoords); + @Nullable + @Override + public ScreenRectangle bounds() { + if (!(this.left >= this.right) && !(this.top >= this.bottom)) { + int i = Mth.floor(this.left); + int j = Mth.floor(this.top); + int k = Mth.ceil(this.right); + int l = Mth.ceil(this.bottom); + return new ScreenRectangle(i, j, k - i, l - j); + } else { + return null; } } - - private float getOverTextEffectDepth() { - return this.inverseDepth ? 0.01F : -0.01F; - } - - private float getUnderTextEffectDepth() { - return this.inverseDepth ? -0.01F : 0.01F; - } } } diff --git a/net/minecraft/client/gui/Gui.java b/net/minecraft/client/gui/Gui.java index 84653b2e..77c35459 100644 --- a/net/minecraft/client/gui/Gui.java +++ b/net/minecraft/client/gui/Gui.java @@ -1,19 +1,20 @@ package net.minecraft.client.gui; -import com.google.common.collect.Lists; +import com.google.common.collect.ImmutableMap; import com.google.common.collect.Ordering; import com.mojang.blaze3d.platform.Window; -import com.mojang.blaze3d.systems.RenderSystem; import java.util.Collection; import java.util.Comparator; -import java.util.List; +import java.util.Map; +import java.util.function.Supplier; import java.util.function.UnaryOperator; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.ChatFormatting; +import net.minecraft.Optionull; import net.minecraft.Util; import net.minecraft.client.AttackIndicatorStatus; -import net.minecraft.client.Camera; +import net.minecraft.client.CameraType; import net.minecraft.client.DeltaTracker; import net.minecraft.client.Minecraft; import net.minecraft.client.Options; @@ -23,11 +24,16 @@ import net.minecraft.client.gui.components.DebugScreenOverlay; import net.minecraft.client.gui.components.PlayerTabOverlay; import net.minecraft.client.gui.components.SubtitleOverlay; import net.minecraft.client.gui.components.spectator.SpectatorGui; +import net.minecraft.client.gui.contextualbar.ContextualBarRenderer; +import net.minecraft.client.gui.contextualbar.ExperienceBarRenderer; +import net.minecraft.client.gui.contextualbar.JumpableVehicleBarRenderer; +import net.minecraft.client.gui.contextualbar.LocatorBarRenderer; +import net.minecraft.client.gui.screens.ReceivingLevelScreen; import net.minecraft.client.player.LocalPlayer; import net.minecraft.client.renderer.LightTexture; -import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.RenderPipelines; +import net.minecraft.client.renderer.texture.MissingTextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.resources.MobEffectTextureManager; import net.minecraft.core.BlockPos; import net.minecraft.core.Holder; import net.minecraft.core.component.DataComponents; @@ -35,6 +41,7 @@ import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.network.chat.numbers.NumberFormat; import net.minecraft.network.chat.numbers.StyledFormat; +import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.MinecraftServer; import net.minecraft.sounds.SoundEvents; @@ -65,14 +72,13 @@ import net.minecraft.world.level.border.WorldBorder; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.EntityHitResult; import net.minecraft.world.phys.HitResult; -import net.minecraft.world.phys.HitResult.Type; import net.minecraft.world.scores.DisplaySlot; import net.minecraft.world.scores.Objective; import net.minecraft.world.scores.PlayerScoreEntry; import net.minecraft.world.scores.PlayerTeam; import net.minecraft.world.scores.Scoreboard; +import org.apache.commons.lang3.tuple.Pair; import org.jetbrains.annotations.Nullable; -import org.joml.Matrix4fStack; @Environment(EnvType.CLIENT) public class Gui { @@ -94,11 +100,6 @@ public class Gui { "hud/hotbar_attack_indicator_background" ); private static final ResourceLocation HOTBAR_ATTACK_INDICATOR_PROGRESS_SPRITE = ResourceLocation.withDefaultNamespace("hud/hotbar_attack_indicator_progress"); - private static final ResourceLocation JUMP_BAR_BACKGROUND_SPRITE = ResourceLocation.withDefaultNamespace("hud/jump_bar_background"); - private static final ResourceLocation JUMP_BAR_COOLDOWN_SPRITE = ResourceLocation.withDefaultNamespace("hud/jump_bar_cooldown"); - private static final ResourceLocation JUMP_BAR_PROGRESS_SPRITE = ResourceLocation.withDefaultNamespace("hud/jump_bar_progress"); - private static final ResourceLocation EXPERIENCE_BAR_BACKGROUND_SPRITE = ResourceLocation.withDefaultNamespace("hud/experience_bar_background"); - private static final ResourceLocation EXPERIENCE_BAR_PROGRESS_SPRITE = ResourceLocation.withDefaultNamespace("hud/experience_bar_progress"); private static final ResourceLocation ARMOR_EMPTY_SPRITE = ResourceLocation.withDefaultNamespace("hud/armor_empty"); private static final ResourceLocation ARMOR_HALF_SPRITE = ResourceLocation.withDefaultNamespace("hud/armor_half"); private static final ResourceLocation ARMOR_FULL_SPRITE = ResourceLocation.withDefaultNamespace("hud/armor_full"); @@ -124,6 +125,7 @@ public class Gui { private static final Component DEMO_EXPIRED_TEXT = Component.translatable("demo.demoExpired"); private static final Component SAVING_TEXT = Component.translatable("menu.savingLevel"); private static final float MIN_CROSSHAIR_ATTACK_SPEED = 5.0F; + private static final int EXPERIENCE_BAR_DISPLAY_TICKS = 100; private static final int NUM_HEARTS_PER_ROW = 10; private static final int LINE_HEIGHT = 10; private static final String SPACER = ": "; @@ -203,7 +205,8 @@ public class Gui { private int lastBubblePopSoundPlayed; private float autosaveIndicatorValue; private float lastAutosaveIndicatorValue; - private final LayeredDraw layers = new LayeredDraw(); + private Pair contextualInfoBar = Pair.of(Gui.ContextualInfo.EMPTY, ContextualBarRenderer.EMPTY); + private final Map> contextualInfoBarRenderers; private float scopeScale; public Gui(Minecraft minecraft) { @@ -214,28 +217,17 @@ public class Gui { this.tabList = new PlayerTabOverlay(minecraft, this); this.bossOverlay = new BossHealthOverlay(minecraft); this.subtitleOverlay = new SubtitleOverlay(minecraft); + this.contextualInfoBarRenderers = ImmutableMap.of( + Gui.ContextualInfo.EMPTY, + () -> ContextualBarRenderer.EMPTY, + Gui.ContextualInfo.EXPERIENCE, + () -> new ExperienceBarRenderer(minecraft), + Gui.ContextualInfo.LOCATOR, + () -> new LocatorBarRenderer(minecraft), + Gui.ContextualInfo.JUMPABLE_VEHICLE, + () -> new JumpableVehicleBarRenderer(minecraft) + ); this.resetTitleTimes(); - LayeredDraw layeredDraw = new LayeredDraw() - .add(this::renderCameraOverlays) - .add(this::renderCrosshair) - .add(this::renderHotbarAndDecorations) - .add(this::renderExperienceLevel) - .add(this::renderEffects) - .add((guiGraphics, deltaTracker) -> this.bossOverlay.render(guiGraphics)); - LayeredDraw layeredDraw2 = new LayeredDraw() - .add(this::renderDemoOverlay) - .add((guiGraphics, deltaTracker) -> { - if (this.debugOverlay.showDebugScreen()) { - this.debugOverlay.render(guiGraphics); - } - }) - .add(this::renderScoreboardSidebar) - .add(this::renderOverlayMessage) - .add(this::renderTitle) - .add(this::renderChat) - .add(this::renderTabList) - .add((guiGraphics, deltaTracker) -> this.subtitleOverlay.render(guiGraphics)); - this.layers.add(layeredDraw, () -> !minecraft.options.hideGui).add(this::renderSleepOverlay).add(layeredDraw2, () -> !minecraft.options.hideGui); } /** @@ -248,7 +240,43 @@ public class Gui { } public void render(GuiGraphics guiGraphics, DeltaTracker deltaTracker) { - this.layers.render(guiGraphics, deltaTracker); + if (this.minecraft.screen == null || !(this.minecraft.screen instanceof ReceivingLevelScreen)) { + if (!this.minecraft.options.hideGui) { + this.renderCameraOverlays(guiGraphics, deltaTracker); + this.renderCrosshair(guiGraphics, deltaTracker); + guiGraphics.nextStratum(); + this.renderHotbarAndDecorations(guiGraphics, deltaTracker); + this.renderEffects(guiGraphics, deltaTracker); + this.renderBossOverlay(guiGraphics, deltaTracker); + } + + this.renderSleepOverlay(guiGraphics, deltaTracker); + if (!this.minecraft.options.hideGui) { + this.renderDemoOverlay(guiGraphics, deltaTracker); + this.renderDebugOverlay(guiGraphics, deltaTracker); + this.renderScoreboardSidebar(guiGraphics, deltaTracker); + this.renderOverlayMessage(guiGraphics, deltaTracker); + this.renderTitle(guiGraphics, deltaTracker); + this.renderChat(guiGraphics, deltaTracker); + this.renderTabList(guiGraphics, deltaTracker); + this.renderSubtitleOverlay(guiGraphics, deltaTracker); + } + } + } + + private void renderBossOverlay(GuiGraphics guiGraphics, DeltaTracker deltaTracker) { + this.bossOverlay.render(guiGraphics); + } + + private void renderDebugOverlay(GuiGraphics guiGraphics, DeltaTracker deltaTracker) { + if (this.debugOverlay.showDebugScreen()) { + guiGraphics.nextStratum(); + this.debugOverlay.render(guiGraphics); + } + } + + private void renderSubtitleOverlay(GuiGraphics guiGraphics, DeltaTracker deltaTracker) { + this.subtitleOverlay.render(guiGraphics); } private void renderCameraOverlays(GuiGraphics guiGraphics, DeltaTracker deltaTracker) { @@ -298,6 +326,7 @@ public class Gui { private void renderSleepOverlay(GuiGraphics guiGraphics, DeltaTracker deltaTracker) { if (this.minecraft.player.getSleepTimer() > 0) { Profiler.get().push("sleep"); + guiGraphics.nextStratum(); float f = this.minecraft.player.getSleepTimer(); float g = f / 100.0F; if (g > 1.0F) { @@ -305,7 +334,7 @@ public class Gui { } int i = (int)(220.0F * g) << 24 | 1052704; - guiGraphics.fill(RenderType.guiOverlay(), 0, 0, guiGraphics.guiWidth(), guiGraphics.guiHeight(), i); + guiGraphics.fill(0, 0, guiGraphics.guiWidth(), guiGraphics.guiHeight(), i); Profiler.get().pop(); } } @@ -320,9 +349,10 @@ public class Gui { i = 255; } - if (i > 8) { - guiGraphics.pose().pushPose(); - guiGraphics.pose().translate((float)(guiGraphics.guiWidth() / 2), (float)(guiGraphics.guiHeight() - 68), 0.0F); + if (i > 0) { + guiGraphics.nextStratum(); + guiGraphics.pose().pushMatrix(); + guiGraphics.pose().translate(guiGraphics.guiWidth() / 2, guiGraphics.guiHeight() - 68); int j; if (this.animateOverlayMessageColor) { j = Mth.hsvToArgb(f / 50.0F, 0.7F, 0.6F, i); @@ -332,7 +362,7 @@ public class Gui { int k = font.width(this.overlayMessageString); guiGraphics.drawStringWithBackdrop(font, this.overlayMessageString, -k / 2, -4, k, j); - guiGraphics.pose().popPose(); + guiGraphics.pose().popMatrix(); } Profiler.get().pop(); @@ -355,24 +385,25 @@ public class Gui { } i = Mth.clamp(i, 0, 255); - if (i > 8) { - guiGraphics.pose().pushPose(); - guiGraphics.pose().translate((float)(guiGraphics.guiWidth() / 2), (float)(guiGraphics.guiHeight() / 2), 0.0F); - guiGraphics.pose().pushPose(); - guiGraphics.pose().scale(4.0F, 4.0F, 4.0F); + if (i > 0) { + guiGraphics.nextStratum(); + guiGraphics.pose().pushMatrix(); + guiGraphics.pose().translate(guiGraphics.guiWidth() / 2, guiGraphics.guiHeight() / 2); + guiGraphics.pose().pushMatrix(); + guiGraphics.pose().scale(4.0F, 4.0F); int j = font.width(this.title); int k = ARGB.color(i, -1); guiGraphics.drawStringWithBackdrop(font, this.title, -j / 2, -10, j, k); - guiGraphics.pose().popPose(); + guiGraphics.pose().popMatrix(); if (this.subtitle != null) { - guiGraphics.pose().pushPose(); - guiGraphics.pose().scale(2.0F, 2.0F, 2.0F); + guiGraphics.pose().pushMatrix(); + guiGraphics.pose().scale(2.0F, 2.0F); int l = font.width(this.subtitle); guiGraphics.drawStringWithBackdrop(font, this.subtitle, -l / 2, 5, l, k); - guiGraphics.pose().popPose(); + guiGraphics.pose().popMatrix(); } - guiGraphics.pose().popPose(); + guiGraphics.pose().popMatrix(); } Profiler.get().pop(); @@ -384,6 +415,7 @@ public class Gui { Window window = this.minecraft.getWindow(); int i = Mth.floor(this.minecraft.mouseHandler.getScaledXPos(window)); int j = Mth.floor(this.minecraft.mouseHandler.getScaledYPos(window)); + guiGraphics.nextStratum(); this.chat.render(guiGraphics, this.tickCount, i, j, false); } } @@ -401,6 +433,7 @@ public class Gui { Objective objective2 = objective != null ? objective : scoreboard.getDisplayObjective(DisplaySlot.SIDEBAR); if (objective2 != null) { + guiGraphics.nextStratum(); this.displayScoreboardSidebar(guiGraphics, objective2); } } @@ -413,6 +446,7 @@ public class Gui { this.tabList.setVisible(false); } else { this.tabList.setVisible(true); + guiGraphics.nextStratum(); this.tabList.render(guiGraphics, guiGraphics.guiWidth(), scoreboard, objective); } } @@ -421,20 +455,10 @@ public class Gui { Options options = this.minecraft.options; if (options.getCameraType().isFirstPerson()) { if (this.minecraft.gameMode.getPlayerMode() != GameType.SPECTATOR || this.canRenderCrosshairForSpectator(this.minecraft.hitResult)) { - if (this.debugOverlay.showDebugScreen() && !this.minecraft.player.isReducedDebugInfo() && !options.reducedDebugInfo().get()) { - Camera camera = this.minecraft.gameRenderer.getMainCamera(); - Matrix4fStack matrix4fStack = RenderSystem.getModelViewStack(); - matrix4fStack.pushMatrix(); - matrix4fStack.mul(guiGraphics.pose().last().pose()); - matrix4fStack.translate(guiGraphics.guiWidth() / 2, guiGraphics.guiHeight() / 2, 0.0F); - matrix4fStack.rotateX(-camera.getXRot() * (float) (Math.PI / 180.0)); - matrix4fStack.rotateY(camera.getYRot() * (float) (Math.PI / 180.0)); - matrix4fStack.scale(-1.0F, -1.0F, -1.0F); - this.debugOverlay.render3dCrosshair(); - matrix4fStack.popMatrix(); - } else { + if (!this.shouldRenderDebugCrosshair()) { + guiGraphics.nextStratum(); int i = 15; - guiGraphics.blitSprite(RenderType::crosshair, CROSSHAIR_SPRITE, (guiGraphics.guiWidth() - 15) / 2, (guiGraphics.guiHeight() - 15) / 2, 15, 15); + guiGraphics.blitSprite(RenderPipelines.CROSSHAIR, CROSSHAIR_SPRITE, (guiGraphics.guiWidth() - 15) / 2, (guiGraphics.guiHeight() - 15) / 2, 15, 15); if (this.minecraft.options.attackIndicator().get() == AttackIndicatorStatus.CROSSHAIR) { float f = this.minecraft.player.getAttackStrengthScale(0.0F); boolean bl = false; @@ -446,11 +470,11 @@ public class Gui { int j = guiGraphics.guiHeight() / 2 - 7 + 16; int k = guiGraphics.guiWidth() / 2 - 8; if (bl) { - guiGraphics.blitSprite(RenderType::crosshair, CROSSHAIR_ATTACK_INDICATOR_FULL_SPRITE, k, j, 16, 16); + guiGraphics.blitSprite(RenderPipelines.CROSSHAIR, CROSSHAIR_ATTACK_INDICATOR_FULL_SPRITE, k, j, 16, 16); } else if (f < 1.0F) { int l = (int)(f * 17.0F); - guiGraphics.blitSprite(RenderType::crosshair, CROSSHAIR_ATTACK_INDICATOR_BACKGROUND_SPRITE, k, j, 16, 4); - guiGraphics.blitSprite(RenderType::crosshair, CROSSHAIR_ATTACK_INDICATOR_PROGRESS_SPRITE, 16, 4, 0, 0, k, j, l, 4); + guiGraphics.blitSprite(RenderPipelines.CROSSHAIR, CROSSHAIR_ATTACK_INDICATOR_BACKGROUND_SPRITE, k, j, 16, 4); + guiGraphics.blitSprite(RenderPipelines.CROSSHAIR, CROSSHAIR_ATTACK_INDICATOR_PROGRESS_SPRITE, 16, 4, 0, 0, k, j, l, 4); } } } @@ -458,6 +482,13 @@ public class Gui { } } + public boolean shouldRenderDebugCrosshair() { + return this.debugOverlay.showDebugScreen() + && this.minecraft.options.getCameraType() == CameraType.FIRST_PERSON + && !this.minecraft.player.isReducedDebugInfo() + && !this.minecraft.options.reducedDebugInfo().get(); + } + /** * Checks if the crosshair can be rendered for a spectator based on the provided {@link HitResult}. *

@@ -468,9 +499,9 @@ public class Gui { private boolean canRenderCrosshairForSpectator(@Nullable HitResult rayTrace) { if (rayTrace == null) { return false; - } else if (rayTrace.getType() == Type.ENTITY) { + } else if (rayTrace.getType() == HitResult.Type.ENTITY) { return ((EntityHitResult)rayTrace).getEntity() instanceof MenuProvider; - } else if (rayTrace.getType() == Type.BLOCK) { + } else if (rayTrace.getType() == HitResult.Type.BLOCK) { BlockPos blockPos = ((BlockHitResult)rayTrace).getBlockPos(); Level level = this.minecraft.level; return level.getBlockState(blockPos).getMenuProvider(level, blockPos) != null; @@ -484,8 +515,6 @@ public class Gui { if (!collection.isEmpty() && (this.minecraft.screen == null || !this.minecraft.screen.showsActiveEffects())) { int i = 0; int j = 0; - MobEffectTextureManager mobEffectTextureManager = this.minecraft.getMobEffectTextures(); - List list = Lists.newArrayListWithExpectedSize(collection.size()); for (MobEffectInstance mobEffectInstance : Ordering.natural().reverse().sortedCopy(collection)) { Holder holder = mobEffectInstance.getEffect(); @@ -507,9 +536,9 @@ public class Gui { float f = 1.0F; if (mobEffectInstance.isAmbient()) { - guiGraphics.blitSprite(RenderType::guiTextured, EFFECT_BACKGROUND_AMBIENT_SPRITE, k, l, 24, 24); + guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, EFFECT_BACKGROUND_AMBIENT_SPRITE, k, l, 24, 24); } else { - guiGraphics.blitSprite(RenderType::guiTextured, EFFECT_BACKGROUND_SPRITE, k, l, 24, 24); + guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, EFFECT_BACKGROUND_SPRITE, k, l, 24, 24); if (mobEffectInstance.endsWithin(200)) { int m = mobEffectInstance.getDuration(); int n = 10 - m / 20; @@ -518,21 +547,19 @@ public class Gui { } } - TextureAtlasSprite textureAtlasSprite = mobEffectTextureManager.get(holder); - int n = k; - int o = l; - float g = f; - list.add((Runnable)() -> { - int kx = ARGB.white(g); - guiGraphics.blitSprite(RenderType::guiTextured, textureAtlasSprite, n + 3, o + 3, 18, 18, kx); - }); + guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, getMobEffectSprite(holder), k + 3, l + 3, 18, 18, ARGB.white(f)); } } - - list.forEach(Runnable::run); } } + public static ResourceLocation getMobEffectSprite(Holder effect) { + return (ResourceLocation)effect.unwrapKey() + .map(ResourceKey::location) + .map(resourceLocation -> resourceLocation.withPrefix("mob_effect/")) + .orElseGet(MissingTextureAtlasSprite::getLocation); + } + private void renderHotbarAndDecorations(GuiGraphics guiGraphics, DeltaTracker deltaTracker) { if (this.minecraft.gameMode.getPlayerMode() == GameType.SPECTATOR) { this.spectatorGui.renderHotbar(guiGraphics); @@ -540,23 +567,26 @@ public class Gui { this.renderItemHotbar(guiGraphics, deltaTracker); } - int i = guiGraphics.guiWidth() / 2 - 91; - PlayerRideableJumping playerRideableJumping = this.minecraft.player.jumpableVehicle(); - if (playerRideableJumping != null) { - this.renderJumpMeter(playerRideableJumping, guiGraphics, i); - } else if (this.isExperienceBarVisible()) { - this.renderExperienceBar(guiGraphics, i); - } - if (this.minecraft.gameMode.canHurtPlayer()) { this.renderPlayerHealth(guiGraphics); } this.renderVehicleHealth(guiGraphics); + Gui.ContextualInfo contextualInfo = this.nextContextualInfoState(); + if (contextualInfo != this.contextualInfoBar.getKey()) { + this.contextualInfoBar = Pair.of(contextualInfo, (ContextualBarRenderer)((Supplier)this.contextualInfoBarRenderers.get(contextualInfo)).get()); + } + + this.contextualInfoBar.getValue().renderBackground(guiGraphics, deltaTracker); + if (this.minecraft.gameMode.hasExperience() && this.minecraft.player.experienceLevel > 0) { + ContextualBarRenderer.renderExperienceLevel(guiGraphics, this.minecraft.font, this.minecraft.player.experienceLevel); + } + + this.contextualInfoBar.getValue().render(guiGraphics, deltaTracker); if (this.minecraft.gameMode.getPlayerMode() != GameType.SPECTATOR) { this.renderSelectedItemName(guiGraphics); } else if (this.minecraft.player.isSpectator()) { - this.spectatorGui.renderTooltip(guiGraphics); + this.spectatorGui.renderAction(guiGraphics); } } @@ -568,21 +598,18 @@ public class Gui { int i = guiGraphics.guiWidth() / 2; int j = 182; int k = 91; - guiGraphics.pose().pushPose(); - guiGraphics.pose().translate(0.0F, 0.0F, -90.0F); - guiGraphics.blitSprite(RenderType::guiTextured, HOTBAR_SPRITE, i - 91, guiGraphics.guiHeight() - 22, 182, 22); + guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, HOTBAR_SPRITE, i - 91, guiGraphics.guiHeight() - 22, 182, 22); guiGraphics.blitSprite( - RenderType::guiTextured, HOTBAR_SELECTION_SPRITE, i - 91 - 1 + player.getInventory().getSelectedSlot() * 20, guiGraphics.guiHeight() - 22 - 1, 24, 23 + RenderPipelines.GUI_TEXTURED, HOTBAR_SELECTION_SPRITE, i - 91 - 1 + player.getInventory().getSelectedSlot() * 20, guiGraphics.guiHeight() - 22 - 1, 24, 23 ); if (!itemStack.isEmpty()) { if (humanoidArm == HumanoidArm.LEFT) { - guiGraphics.blitSprite(RenderType::guiTextured, HOTBAR_OFFHAND_LEFT_SPRITE, i - 91 - 29, guiGraphics.guiHeight() - 23, 29, 24); + guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, HOTBAR_OFFHAND_LEFT_SPRITE, i - 91 - 29, guiGraphics.guiHeight() - 23, 29, 24); } else { - guiGraphics.blitSprite(RenderType::guiTextured, HOTBAR_OFFHAND_RIGHT_SPRITE, i + 91, guiGraphics.guiHeight() - 23, 29, 24); + guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, HOTBAR_OFFHAND_RIGHT_SPRITE, i + 91, guiGraphics.guiHeight() - 23, 29, 24); } } - guiGraphics.pose().popPose(); int l = 1; for (int m = 0; m < 9; m++) { @@ -610,78 +637,13 @@ public class Gui { } int p = (int)(f * 19.0F); - guiGraphics.blitSprite(RenderType::guiTextured, HOTBAR_ATTACK_INDICATOR_BACKGROUND_SPRITE, o, n, 18, 18); - guiGraphics.blitSprite(RenderType::guiTextured, HOTBAR_ATTACK_INDICATOR_PROGRESS_SPRITE, 18, 18, 0, 18 - p, o, n + 18 - p, 18, p); + guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, HOTBAR_ATTACK_INDICATOR_BACKGROUND_SPRITE, o, n, 18, 18); + guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, HOTBAR_ATTACK_INDICATOR_PROGRESS_SPRITE, 18, 18, 0, 18 - p, o, n + 18 - p, 18, p); } } } } - /** - * Renders the jump meter for a rideable entity on the screen using the provided rideable object, GuiGraphics object, and x-coordinate. - * - * @param rideable the PlayerRideableJumping object representing the rideable entity. - * @param guiGraphics the GuiGraphics object used for rendering. - * @param x the x-coordinate for rendering the jump meter. - */ - private void renderJumpMeter(PlayerRideableJumping rideable, GuiGraphics guiGraphics, int x) { - Profiler.get().push("jumpBar"); - float f = this.minecraft.player.getJumpRidingScale(); - int i = 182; - int j = (int)(f * 183.0F); - int k = guiGraphics.guiHeight() - 32 + 3; - guiGraphics.blitSprite(RenderType::guiTextured, JUMP_BAR_BACKGROUND_SPRITE, x, k, 182, 5); - if (rideable.getJumpCooldown() > 0) { - guiGraphics.blitSprite(RenderType::guiTextured, JUMP_BAR_COOLDOWN_SPRITE, x, k, 182, 5); - } else if (j > 0) { - guiGraphics.blitSprite(RenderType::guiTextured, JUMP_BAR_PROGRESS_SPRITE, 182, 5, 0, 0, x, k, j, 5); - } - - Profiler.get().pop(); - } - - /** - * Renders the experience bar on the screen using the provided GuiGraphics object and x-coordinate. - * - * @param guiGraphics the GuiGraphics object used for rendering. - * @param x the x-coordinate for rendering the experience bar. - */ - private void renderExperienceBar(GuiGraphics guiGraphics, int x) { - Profiler.get().push("expBar"); - int i = this.minecraft.player.getXpNeededForNextLevel(); - if (i > 0) { - int j = 182; - int k = (int)(this.minecraft.player.experienceProgress * 183.0F); - int l = guiGraphics.guiHeight() - 32 + 3; - guiGraphics.blitSprite(RenderType::guiTextured, EXPERIENCE_BAR_BACKGROUND_SPRITE, x, l, 182, 5); - if (k > 0) { - guiGraphics.blitSprite(RenderType::guiTextured, EXPERIENCE_BAR_PROGRESS_SPRITE, 182, 5, 0, 0, x, l, k, 5); - } - } - - Profiler.get().pop(); - } - - private void renderExperienceLevel(GuiGraphics guiGraphics, DeltaTracker deltaTracker) { - int i = this.minecraft.player.experienceLevel; - if (this.isExperienceBarVisible() && i > 0) { - Profiler.get().push("expLevel"); - String string = i + ""; - int j = (guiGraphics.guiWidth() - this.getFont().width(string)) / 2; - int k = guiGraphics.guiHeight() - 31 - 4; - guiGraphics.drawString(this.getFont(), string, j + 1, k, 0, false); - guiGraphics.drawString(this.getFont(), string, j - 1, k, 0, false); - guiGraphics.drawString(this.getFont(), string, j, k + 1, 0, false); - guiGraphics.drawString(this.getFont(), string, j, k - 1, 0, false); - guiGraphics.drawString(this.getFont(), string, j, k, 8453920, false); - Profiler.get().pop(); - } - } - - private boolean isExperienceBarVisible() { - return this.minecraft.player.jumpableVehicle() == null && this.minecraft.gameMode.hasExperience(); - } - /** * Renders the name of the selected item on the screen using the provided GuiGraphics object. * @@ -718,6 +680,7 @@ public class Gui { private void renderDemoOverlay(GuiGraphics guiGraphics, DeltaTracker deltaTracker) { if (this.minecraft.isDemo()) { Profiler.get().push("demo"); + guiGraphics.nextStratum(); Component component; if (this.minecraft.level.getGameTime() >= 120500L) { component = DEMO_EXPIRED_TEXT; @@ -924,15 +887,15 @@ public class Gui { for (int k = 0; k < 10; k++) { int l = x + k * 8; if (k * 2 + 1 < i) { - guiGraphics.blitSprite(RenderType::guiTextured, ARMOR_FULL_SPRITE, l, j, 9, 9); + guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, ARMOR_FULL_SPRITE, l, j, 9, 9); } if (k * 2 + 1 == i) { - guiGraphics.blitSprite(RenderType::guiTextured, ARMOR_HALF_SPRITE, l, j, 9, 9); + guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, ARMOR_HALF_SPRITE, l, j, 9, 9); } if (k * 2 + 1 > i) { - guiGraphics.blitSprite(RenderType::guiTextured, ARMOR_EMPTY_SPRITE, l, j, 9, 9); + guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, ARMOR_EMPTY_SPRITE, l, j, 9, 9); } } } @@ -1009,7 +972,7 @@ public class Gui { } private void renderHeart(GuiGraphics guiGraphics, Gui.HeartType heartType, int x, int y, boolean hardcore, boolean halfHeart, boolean blinking) { - guiGraphics.blitSprite(RenderType::guiTextured, heartType.getSprite(hardcore, blinking, halfHeart), x, y, 9, 9); + guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, heartType.getSprite(hardcore, blinking, halfHeart), x, y, 9, 9); } private void renderAirBubbles(GuiGraphics guiGraphics, Player player, int vehicleMaxHealth, int y, int x) { @@ -1029,13 +992,13 @@ public class Gui { for (int n = 1; n <= 10; n++) { int o = x - (n - 1) * 8 - 9; if (n <= k) { - guiGraphics.blitSprite(RenderType::guiTextured, AIR_SPRITE, o, y, 9, 9); + guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, AIR_SPRITE, o, y, 9, 9); } else if (bl2 && n == l && bl) { - guiGraphics.blitSprite(RenderType::guiTextured, AIR_POPPING_SPRITE, o, y, 9, 9); + guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, AIR_POPPING_SPRITE, o, y, 9, 9); this.playAirBubblePoppedSound(n, player, m); } else if (n > 10 - m) { int p = m == 10 && this.tickCount % 2 == 0 ? this.random.nextInt(2) : 0; - guiGraphics.blitSprite(RenderType::guiTextured, AIR_EMPTY_SPRITE, o, y + p, 9, 9); + guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, AIR_EMPTY_SPRITE, o, y + p, 9, 9); } } } @@ -1087,13 +1050,13 @@ public class Gui { } int l = x - j * 8 - 9; - guiGraphics.blitSprite(RenderType::guiTextured, resourceLocation, l, k, 9, 9); + guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, resourceLocation, l, k, 9, 9); if (j * 2 + 1 < i) { - guiGraphics.blitSprite(RenderType::guiTextured, resourceLocation3, l, k, 9, 9); + guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, resourceLocation3, l, k, 9, 9); } if (j * 2 + 1 == i) { - guiGraphics.blitSprite(RenderType::guiTextured, resourceLocation2, l, k, 9, 9); + guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, resourceLocation2, l, k, 9, 9); } } } @@ -1120,13 +1083,13 @@ public class Gui { for (int p = 0; p < o; p++) { int q = l - p * 8 - 9; - guiGraphics.blitSprite(RenderType::guiTextured, HEART_VEHICLE_CONTAINER_SPRITE, q, m, 9, 9); + guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, HEART_VEHICLE_CONTAINER_SPRITE, q, m, 9, 9); if (p * 2 + 1 + n < j) { - guiGraphics.blitSprite(RenderType::guiTextured, HEART_VEHICLE_FULL_SPRITE, q, m, 9, 9); + guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, HEART_VEHICLE_FULL_SPRITE, q, m, 9, 9); } if (p * 2 + 1 + n == j) { - guiGraphics.blitSprite(RenderType::guiTextured, HEART_VEHICLE_HALF_SPRITE, q, m, 9, 9); + guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, HEART_VEHICLE_HALF_SPRITE, q, m, 9, 9); } } @@ -1146,7 +1109,7 @@ public class Gui { private void renderTextureOverlay(GuiGraphics guiGraphics, ResourceLocation shaderLocation, float alpha) { int i = ARGB.white(alpha); guiGraphics.blit( - RenderType::guiTexturedOverlay, + RenderPipelines.GUI_TEXTURED, shaderLocation, 0, 0, @@ -1175,11 +1138,11 @@ public class Gui { int l = (guiGraphics.guiHeight() - j) / 2; int m = k + i; int n = l + j; - guiGraphics.blit(RenderType::guiTextured, SPYGLASS_SCOPE_LOCATION, k, l, 0.0F, 0.0F, i, j, i, j); - guiGraphics.fill(RenderType.guiOverlay(), 0, n, guiGraphics.guiWidth(), guiGraphics.guiHeight(), -90, -16777216); - guiGraphics.fill(RenderType.guiOverlay(), 0, 0, guiGraphics.guiWidth(), l, -90, -16777216); - guiGraphics.fill(RenderType.guiOverlay(), 0, l, k, n, -90, -16777216); - guiGraphics.fill(RenderType.guiOverlay(), m, l, guiGraphics.guiWidth(), n, -90, -16777216); + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, SPYGLASS_SCOPE_LOCATION, k, l, 0.0F, 0.0F, i, j, i, j); + guiGraphics.fill(RenderPipelines.GUI, 0, n, guiGraphics.guiWidth(), guiGraphics.guiHeight(), -16777216); + guiGraphics.fill(RenderPipelines.GUI, 0, 0, guiGraphics.guiWidth(), l, -16777216); + guiGraphics.fill(RenderPipelines.GUI, 0, l, k, n, -16777216); + guiGraphics.fill(RenderPipelines.GUI, m, l, guiGraphics.guiWidth(), n, -16777216); } /** @@ -1223,7 +1186,7 @@ public class Gui { } guiGraphics.blit( - RenderType::vignette, + RenderPipelines.VIGNETTE, VIGNETTE_LOCATION, 0, 0, @@ -1252,22 +1215,22 @@ public class Gui { int i = ARGB.white(alpha); TextureAtlasSprite textureAtlasSprite = this.minecraft.getBlockRenderer().getBlockModelShaper().getParticleIcon(Blocks.NETHER_PORTAL.defaultBlockState()); - guiGraphics.blitSprite(RenderType::guiTexturedOverlay, textureAtlasSprite, 0, 0, guiGraphics.guiWidth(), guiGraphics.guiHeight(), i); + guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, textureAtlasSprite, 0, 0, guiGraphics.guiWidth(), guiGraphics.guiHeight(), i); } private void renderConfusionOverlay(GuiGraphics guiGraphics, float intensity) { int i = guiGraphics.guiWidth(); int j = guiGraphics.guiHeight(); - guiGraphics.pose().pushPose(); + guiGraphics.pose().pushMatrix(); float f = Mth.lerp(intensity, 2.0F, 1.0F); - guiGraphics.pose().translate(i / 2.0F, j / 2.0F, 0.0F); - guiGraphics.pose().scale(f, f, f); - guiGraphics.pose().translate(-i / 2.0F, -j / 2.0F, 0.0F); + guiGraphics.pose().translate(i / 2.0F, j / 2.0F); + guiGraphics.pose().scale(f, f); + guiGraphics.pose().translate(-i / 2.0F, -j / 2.0F); float g = 0.2F * intensity; float h = 0.4F * intensity; float k = 0.2F * intensity; - guiGraphics.blit(resourceLocation -> RenderType.guiNauseaOverlay(), NAUSEA_LOCATION, 0, 0, 0.0F, 0.0F, i, j, i, j, ARGB.colorFromFloat(1.0F, g, h, k)); - guiGraphics.pose().popPose(); + guiGraphics.blit(RenderPipelines.GUI_NAUSEA_OVERLAY, NAUSEA_LOCATION, 0, 0, 0.0F, 0.0F, i, j, i, j, ARGB.colorFromFloat(1.0F, g, h, k)); + guiGraphics.pose().popMatrix(); } private void renderSlot(GuiGraphics guiGraphics, int x, int y, DeltaTracker deltaTracker, Player player, ItemStack stack, int seed) { @@ -1275,15 +1238,15 @@ public class Gui { float f = stack.getPopTime() - deltaTracker.getGameTimeDeltaPartialTick(false); if (f > 0.0F) { float g = 1.0F + f / 5.0F; - guiGraphics.pose().pushPose(); - guiGraphics.pose().translate((float)(x + 8), (float)(y + 12), 0.0F); - guiGraphics.pose().scale(1.0F / g, (g + 1.0F) / 2.0F, 1.0F); - guiGraphics.pose().translate((float)(-(x + 8)), (float)(-(y + 12)), 0.0F); + guiGraphics.pose().pushMatrix(); + guiGraphics.pose().translate(x + 8, y + 12); + guiGraphics.pose().scale(1.0F / g, (g + 1.0F) / 2.0F); + guiGraphics.pose().translate(-(x + 8), -(y + 12)); } guiGraphics.renderItem(player, stack, x, y, seed); if (f > 0.0F) { - guiGraphics.pose().popPose(); + guiGraphics.pose().popMatrix(); } guiGraphics.renderItemDecorations(this.minecraft.font, stack, x, y); @@ -1358,7 +1321,7 @@ public class Gui { public void setNowPlaying(Component displayName) { Component component = Component.translatable("record.nowPlaying", displayName); this.setOverlayMessage(component, true); - this.minecraft.getNarrator().sayNow(component); + this.minecraft.getNarrator().saySystemNow(component); } /** @@ -1510,17 +1473,52 @@ public class Gui { int i = Mth.floor( 255.0F * Mth.clamp(Mth.lerp(deltaTracker.getRealtimeDeltaTicks(), this.lastAutosaveIndicatorValue, this.autosaveIndicatorValue), 0.0F, 1.0F) ); - if (i > 8) { + if (i > 0) { Font font = this.getFont(); int j = font.width(SAVING_TEXT); int k = ARGB.color(i, -1); int l = guiGraphics.guiWidth() - j - 5; int m = guiGraphics.guiHeight() - 9 - 5; + guiGraphics.nextStratum(); guiGraphics.drawStringWithBackdrop(font, SAVING_TEXT, l, m, j, k); } } } + private boolean willPrioritizeExperienceInfo() { + return this.minecraft.player.experienceDisplayStartTick + 100 > this.minecraft.player.tickCount; + } + + private boolean willPrioritizeJumpInfo() { + return this.minecraft.player.getJumpRidingScale() > 0.0F + || Optionull.mapOrDefault(this.minecraft.player.jumpableVehicle(), PlayerRideableJumping::getJumpCooldown, 0) > 0; + } + + private Gui.ContextualInfo nextContextualInfoState() { + boolean bl = this.minecraft.player.connection.getWaypointManager().hasWaypoints(); + boolean bl2 = this.minecraft.player.jumpableVehicle() != null; + boolean bl3 = this.minecraft.gameMode.hasExperience(); + if (bl) { + if (bl2 && this.willPrioritizeJumpInfo()) { + return Gui.ContextualInfo.JUMPABLE_VEHICLE; + } else { + return bl3 && this.willPrioritizeExperienceInfo() ? Gui.ContextualInfo.EXPERIENCE : Gui.ContextualInfo.LOCATOR; + } + } else if (bl2) { + return Gui.ContextualInfo.JUMPABLE_VEHICLE; + } else { + return bl3 ? Gui.ContextualInfo.EXPERIENCE : Gui.ContextualInfo.EMPTY; + } + } + + @Environment(EnvType.CLIENT) + static enum ContextualInfo { + EMPTY, + EXPERIENCE, + LOCATOR, + JUMPABLE_VEHICLE; + } + @Environment(EnvType.CLIENT) static enum HeartType { CONTAINER( @@ -1649,4 +1647,9 @@ public class Gui { return heartType; } } + + @Environment(EnvType.CLIENT) + public interface RenderFunction { + void render(GuiGraphics guiGraphics, DeltaTracker deltaTracker); + } } diff --git a/net/minecraft/client/gui/GuiGraphics.java b/net/minecraft/client/gui/GuiGraphics.java index 7acea9d6..acb4a84e 100644 --- a/net/minecraft/client/gui/GuiGraphics.java +++ b/net/minecraft/client/gui/GuiGraphics.java @@ -1,17 +1,12 @@ package net.minecraft.client.gui; -import com.mojang.blaze3d.platform.Lighting; -import com.mojang.blaze3d.platform.Window; -import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.PoseStack; -import com.mojang.blaze3d.vertex.VertexConsumer; +import com.mojang.blaze3d.pipeline.RenderPipeline; +import com.mojang.blaze3d.textures.GpuTextureView; import java.util.ArrayDeque; import java.util.Deque; import java.util.List; import java.util.Objects; import java.util.Optional; -import java.util.function.Consumer; -import java.util.function.Function; import java.util.stream.Collectors; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -21,23 +16,38 @@ import net.minecraft.CrashReportDetail; import net.minecraft.ReportedException; import net.minecraft.Util; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.Font.DisplayMode; import net.minecraft.client.gui.navigation.ScreenRectangle; +import net.minecraft.client.gui.render.TextureSetup; +import net.minecraft.client.gui.render.state.BlitRenderState; +import net.minecraft.client.gui.render.state.ColoredRectangleRenderState; +import net.minecraft.client.gui.render.state.GuiItemRenderState; +import net.minecraft.client.gui.render.state.GuiRenderState; +import net.minecraft.client.gui.render.state.GuiTextRenderState; +import net.minecraft.client.gui.render.state.pip.GuiBannerResultRenderState; +import net.minecraft.client.gui.render.state.pip.GuiBookModelRenderState; +import net.minecraft.client.gui.render.state.pip.GuiEntityRenderState; +import net.minecraft.client.gui.render.state.pip.GuiProfilerChartRenderState; +import net.minecraft.client.gui.render.state.pip.GuiSignRenderState; +import net.minecraft.client.gui.render.state.pip.GuiSkinRenderState; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent; import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipPositioner; import net.minecraft.client.gui.screens.inventory.tooltip.DefaultTooltipPositioner; import net.minecraft.client.gui.screens.inventory.tooltip.TooltipRenderUtil; +import net.minecraft.client.model.BookModel; +import net.minecraft.client.model.Model; +import net.minecraft.client.model.PlayerModel; +import net.minecraft.client.model.geom.ModelPart; import net.minecraft.client.player.LocalPlayer; -import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.renderer.MultiBufferSource.BufferSource; +import net.minecraft.client.renderer.RenderPipelines; +import net.minecraft.client.renderer.entity.state.EntityRenderState; import net.minecraft.client.renderer.item.ItemStackRenderState; -import net.minecraft.client.renderer.texture.OverlayTexture; +import net.minecraft.client.renderer.state.MapRenderState; import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.resources.metadata.gui.GuiSpriteScaling; -import net.minecraft.client.resources.metadata.gui.GuiSpriteScaling.NineSlice.Border; import net.minecraft.core.component.DataComponents; +import net.minecraft.locale.Language; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.FormattedText; import net.minecraft.network.chat.HoverEvent; @@ -46,36 +56,42 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.util.ARGB; import net.minecraft.util.FormattedCharSequence; import net.minecraft.util.Mth; +import net.minecraft.util.profiling.ResultField; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.inventory.tooltip.TooltipComponent; +import net.minecraft.world.item.DyeColor; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.entity.BannerPatternLayers; +import net.minecraft.world.level.block.state.properties.WoodType; import org.jetbrains.annotations.Nullable; -import org.joml.Matrix4f; +import org.joml.Matrix3x2f; +import org.joml.Matrix3x2fStack; +import org.joml.Quaternionf; import org.joml.Vector2ic; +import org.joml.Vector3f; @Environment(EnvType.CLIENT) public class GuiGraphics { - public static final float MAX_GUI_Z = 10000.0F; - public static final float MIN_GUI_Z = -10000.0F; private static final int EXTRA_SPACE_AFTER_FIRST_TOOLTIP_LINE = 2; private final Minecraft minecraft; - private final PoseStack pose; - private final BufferSource bufferSource; + private final Matrix3x2fStack pose; private final GuiGraphics.ScissorStack scissorStack = new GuiGraphics.ScissorStack(); private final GuiSpriteManager sprites; - private final ItemStackRenderState scratchItemStackRenderState = new ItemStackRenderState(); + private final GuiRenderState guiRenderState; + @Nullable + private Runnable deferredTooltip; - private GuiGraphics(Minecraft minecraft, PoseStack pose, BufferSource bufferSource) { + private GuiGraphics(Minecraft minecraft, Matrix3x2fStack pose, GuiRenderState guiRenderState) { this.minecraft = minecraft; this.pose = pose; - this.bufferSource = bufferSource; this.sprites = minecraft.getGuiSprites(); + this.guiRenderState = guiRenderState; } - public GuiGraphics(Minecraft minecraft, BufferSource bufferSource) { - this(minecraft, new PoseStack(), bufferSource); + public GuiGraphics(Minecraft minecraft, GuiRenderState guiRenderState) { + this(minecraft, new Matrix3x2fStack(16), guiRenderState); } /** @@ -92,18 +108,16 @@ public class GuiGraphics { return this.minecraft.getWindow().getGuiScaledHeight(); } - /** - * {@return returns the PoseStack used for transformations and rendering.} - */ - public PoseStack pose() { - return this.pose; + public void nextStratum() { + this.guiRenderState.nextStratum(); } - /** - * Flushes the render state, ending the current batch and enabling depth testing. - */ - public void flush() { - this.bufferSource.endBatch(); + public void blurBeforeThisStratum() { + this.guiRenderState.blurBeforeThisStratum(); + } + + public Matrix3x2fStack pose() { + return this.pose; } /** @@ -115,26 +129,13 @@ public class GuiGraphics { * @param color the color of the line. */ public void hLine(int minX, int maxX, int y, int color) { - this.hLine(RenderType.gui(), minX, maxX, y, color); - } - - /** - * Draws a horizontal line from minX to maxX at the specified y-coordinate with the given color using the specified render type. - * - * @param renderType the render type to use. - * @param minX the x-coordinate of the start point. - * @param maxX the x-coordinate of the end point. - * @param y the y-coordinate of the line. - * @param color the color of the line. - */ - public void hLine(RenderType renderType, int minX, int maxX, int y, int color) { if (maxX < minX) { int i = minX; minX = maxX; maxX = i; } - this.fill(renderType, minX, y, maxX + 1, y + 1, color); + this.fill(minX, y, maxX + 1, y + 1, color); } /** @@ -146,26 +147,13 @@ public class GuiGraphics { * @param color the color of the line. */ public void vLine(int x, int minY, int maxY, int color) { - this.vLine(RenderType.gui(), x, minY, maxY, color); - } - - /** - * Draws a vertical line from minY to maxY at the specified x-coordinate with the given color using the specified render type. - * - * @param renderType the render type to use. - * @param x the x-coordinate of the line. - * @param minY the y-coordinate of the start point. - * @param maxY the y-coordinate of the end point. - * @param color the color of the line. - */ - public void vLine(RenderType renderType, int x, int minY, int maxY, int color) { if (maxY < minY) { int i = minY; minY = maxY; maxY = i; } - this.fill(renderType, x, minY + 1, x + 1, maxY, color); + this.fill(x, minY + 1, x + 1, maxY, color); } /** @@ -177,42 +165,21 @@ public class GuiGraphics { * @param maxY the maximum y-coordinate of the scissor region. */ public void enableScissor(int minX, int minY, int maxX, int maxY) { - ScreenRectangle screenRectangle = new ScreenRectangle(minX, minY, maxX - minX, maxY - minY).transformAxisAligned(this.pose.last().pose()); - this.applyScissor(this.scissorStack.push(screenRectangle)); + ScreenRectangle screenRectangle = new ScreenRectangle(minX, minY, maxX - minX, maxY - minY).transformAxisAligned(this.pose); + this.scissorStack.push(screenRectangle); } /** * Disables scissoring. */ public void disableScissor() { - this.applyScissor(this.scissorStack.pop()); + this.scissorStack.pop(); } public boolean containsPointInScissor(int x, int y) { return this.scissorStack.containsPoint(x, y); } - /** - * Applies scissoring based on the provided screen rectangle. - * - * @param rectangle the screen rectangle to apply scissoring with. Can be null to disable scissoring. - */ - private void applyScissor(@Nullable ScreenRectangle rectangle) { - this.flush(); - if (rectangle != null) { - Window window = Minecraft.getInstance().getWindow(); - int i = window.getHeight(); - double d = window.getGuiScale(); - double e = rectangle.left() * d; - double f = i - rectangle.bottom() * d; - double g = rectangle.width() * d; - double h = rectangle.height() * d; - RenderSystem.enableScissor((int)e, (int)f, Math.max(0, (int)g), Math.max(0, (int)h)); - } else { - RenderSystem.disableScissor(); - } - } - /** * Fills a rectangle with the specified color using the given coordinates as the boundaries. * @@ -223,50 +190,10 @@ public class GuiGraphics { * @param color the color to fill the rectangle with. */ public void fill(int minX, int minY, int maxX, int maxY, int color) { - this.fill(minX, minY, maxX, maxY, 0, color); + this.fill(RenderPipelines.GUI, minX, minY, maxX, maxY, color); } - /** - * Fills a rectangle with the specified color and z-level using the given coordinates as the boundaries. - * - * @param minX the minimum x-coordinate of the rectangle. - * @param minY the minimum y-coordinate of the rectangle. - * @param maxX the maximum x-coordinate of the rectangle. - * @param maxY the maximum y-coordinate of the rectangle. - * @param z the z-level of the rectangle. - * @param color the color to fill the rectangle with. - */ - public void fill(int minX, int minY, int maxX, int maxY, int z, int color) { - this.fill(RenderType.gui(), minX, minY, maxX, maxY, z, color); - } - - /** - * Fills a rectangle with the specified color using the given render type and coordinates as the boundaries. - * - * @param renderType the render type to use. - * @param minX the minimum x-coordinate of the rectangle. - * @param minY the minimum y-coordinate of the rectangle. - * @param maxX the maximum x-coordinate of the rectangle. - * @param maxY the maximum y-coordinate of the rectangle. - * @param color the color to fill the rectangle with. - */ - public void fill(RenderType renderType, int minX, int minY, int maxX, int maxY, int color) { - this.fill(renderType, minX, minY, maxX, maxY, 0, color); - } - - /** - * Fills a rectangle with the specified color and z-level using the given render type and coordinates as the boundaries. - * - * @param renderType the render type to use. - * @param minX the minimum x-coordinate of the rectangle. - * @param minY the minimum y-coordinate of the rectangle. - * @param maxX the maximum x-coordinate of the rectangle. - * @param maxY the maximum y-coordinate of the rectangle. - * @param z the z-level of the rectangle. - * @param color the color to fill the rectangle with. - */ - public void fill(RenderType renderType, int minX, int minY, int maxX, int maxY, int z, int color) { - Matrix4f matrix4f = this.pose.last().pose(); + public void fill(RenderPipeline pipeline, int minX, int minY, int maxX, int maxY, int color) { if (minX < maxX) { int i = minX; minX = maxX; @@ -279,88 +206,36 @@ public class GuiGraphics { maxY = i; } - VertexConsumer vertexConsumer = this.bufferSource.getBuffer(renderType); - vertexConsumer.addVertex(matrix4f, (float)minX, (float)minY, (float)z).setColor(color); - vertexConsumer.addVertex(matrix4f, (float)minX, (float)maxY, (float)z).setColor(color); - vertexConsumer.addVertex(matrix4f, (float)maxX, (float)maxY, (float)z).setColor(color); - vertexConsumer.addVertex(matrix4f, (float)maxX, (float)minY, (float)z).setColor(color); + this.submitColoredRectangle(pipeline, TextureSetup.noTexture(), minX, minY, maxX, maxY, color, null); } /** * Fills a rectangle with a gradient color from colorFrom to colorTo using the given coordinates as the boundaries. * - * @param x1 the x-coordinate of the first corner of the rectangle. - * @param y1 the y-coordinate of the first corner of the rectangle. - * @param x2 the x-coordinate of the second corner of the rectangle. - * @param y2 the y-coordinate of the second corner of the rectangle. + * @param minX the x-coordinate of the first corner of the rectangle. + * @param minY the y-coordinate of the first corner of the rectangle. + * @param maxX the x-coordinate of the second corner of the rectangle. + * @param maxY the y-coordinate of the second corner of the rectangle. * @param colorFrom the starting color of the gradient. * @param colorTo the ending color of the gradient. */ - public void fillGradient(int x1, int y1, int x2, int y2, int colorFrom, int colorTo) { - this.fillGradient(x1, y1, x2, y2, 0, colorFrom, colorTo); + public void fillGradient(int minX, int minY, int maxX, int maxY, int colorFrom, int colorTo) { + this.submitColoredRectangle(RenderPipelines.GUI, TextureSetup.noTexture(), minX, minY, maxX, maxY, colorFrom, colorTo); } - /** - * Fills a rectangle with a gradient color from colorFrom to colorTo at the specified z-level using the given coordinates as the boundaries. - * - * @param x1 the x-coordinate of the first corner of the rectangle. - * @param y1 the y-coordinate of the first corner of the rectangle. - * @param x2 the x-coordinate of the second corner of the rectangle. - * @param y2 the y-coordinate of the second corner of the rectangle. - * @param z the z-level of the rectangle. - * @param colorFrom the starting color of the gradient. - * @param colorTo the ending color of the gradient. - */ - public void fillGradient(int x1, int y1, int x2, int y2, int z, int colorFrom, int colorTo) { - this.fillGradient(RenderType.gui(), x1, y1, x2, y2, colorFrom, colorTo, z); + public void fill(RenderPipeline pipeline, TextureSetup textureSetup, int minX, int minY, int maxX, int maxY) { + this.submitColoredRectangle(pipeline, textureSetup, minX, minY, maxX, maxY, -1, null); } - /** - * Fills a rectangle with a gradient color from colorFrom to colorTo at the specified z-level using the given render type and coordinates as the boundaries. - * - * @param renderType the render type to use. - * @param x1 the x-coordinate of the first corner of the rectangle. - * @param y1 the y-coordinate of the first corner of the rectangle. - * @param x2 the x-coordinate of the second corner of the rectangle. - * @param y2 the y-coordinate of the second corner of the rectangle. - * @param colorFrom the starting color of the gradient. - * @param colorTo the ending color of the gradient. - * @param z the z-level of the rectangle. - */ - public void fillGradient(RenderType renderType, int x1, int y1, int x2, int y2, int colorFrom, int colorTo, int z) { - VertexConsumer vertexConsumer = this.bufferSource.getBuffer(renderType); - this.fillGradient(vertexConsumer, x1, y1, x2, y2, z, colorFrom, colorTo); - } - - /** - * The core `fillGradient` method. - *

- * Fills a rectangle with a gradient color from colorFrom to colorTo at the specified z-level using the given render type and coordinates as the boundaries. - * - * @param consumer the {@linkplain VertexConsumer} object for drawing the vertices on screen. - * @param x1 the x-coordinate of the first corner of the rectangle. - * @param y1 the y-coordinate of the first corner of the rectangle. - * @param x2 the x-coordinate of the second corner of the rectangle. - * @param y2 the y-coordinate of the second corner of the rectangle. - * @param z the z-level of the rectangle. - * @param colorFrom the starting color of the gradient. - * @param colorTo the ending color of the gradient. - */ - private void fillGradient(VertexConsumer consumer, int x1, int y1, int x2, int y2, int z, int colorFrom, int colorTo) { - Matrix4f matrix4f = this.pose.last().pose(); - consumer.addVertex(matrix4f, (float)x1, (float)y1, (float)z).setColor(colorFrom); - consumer.addVertex(matrix4f, (float)x1, (float)y2, (float)z).setColor(colorTo); - consumer.addVertex(matrix4f, (float)x2, (float)y2, (float)z).setColor(colorTo); - consumer.addVertex(matrix4f, (float)x2, (float)y1, (float)z).setColor(colorFrom); - } - - public void fillRenderType(RenderType renderType, int x1, int y1, int x2, int y2, int z) { - Matrix4f matrix4f = this.pose.last().pose(); - VertexConsumer vertexConsumer = this.bufferSource.getBuffer(renderType); - vertexConsumer.addVertex(matrix4f, (float)x1, (float)y1, (float)z); - vertexConsumer.addVertex(matrix4f, (float)x1, (float)y2, (float)z); - vertexConsumer.addVertex(matrix4f, (float)x2, (float)y2, (float)z); - vertexConsumer.addVertex(matrix4f, (float)x2, (float)y1, (float)z); + private void submitColoredRectangle( + RenderPipeline pipeline, TextureSetup textureSetup, int minX, int minY, int maxX, int maxY, int colorFrom, @Nullable Integer colorTo + ) { + this.guiRenderState + .submitGuiElement( + new ColoredRectangleRenderState( + pipeline, textureSetup, new Matrix3x2f(this.pose), minX, minY, maxX, maxY, colorFrom, colorTo != null ? colorTo : colorFrom, this.scissorStack.peek() + ) + ); } /** @@ -403,99 +278,32 @@ public class GuiGraphics { this.drawString(font, text, x - font.width(text) / 2, y, color); } - /** - * Draws a string at the specified coordinates using the given font, text, and color. Returns the width of the drawn string. - *

- * @return the width of the drawn string. - * - * @param font the font to use for rendering. - * @param text the text to draw. - * @param x the x-coordinate of the string. - * @param y the y-coordinate of the string. - * @param color the color of the string. - */ - public int drawString(Font font, @Nullable String text, int x, int y, int color) { - return this.drawString(font, text, x, y, color, true); + public void drawString(Font font, @Nullable String text, int x, int y, int color) { + this.drawString(font, text, x, y, color, true); } - /** - * Draws a string at the specified coordinates using the given font, text, color, and drop shadow. Returns the width of the drawn string. - *

- * @return the width of the drawn string. - * - * @param font the font to use for rendering. - * @param text the text to draw. - * @param x the x-coordinate of the string. - * @param y the y-coordinate of the string. - * @param color the color of the string. - * @param dropShadow whether to apply a drop shadow to the string. - */ - public int drawString(Font font, @Nullable String text, int x, int y, int color, boolean dropShadow) { - return text == null - ? 0 - : font.drawInBatch(text, (float)x, (float)y, color, dropShadow, this.pose.last().pose(), this.bufferSource, DisplayMode.NORMAL, 0, 15728880); + public void drawString(Font font, @Nullable String text, int x, int y, int color, boolean drawShadow) { + if (text != null) { + this.drawString(font, Language.getInstance().getVisualOrder(FormattedText.of(text)), x, y, color, drawShadow); + } } - /** - * Draws a formatted character sequence at the specified coordinates using the given font, text, and color. Returns the width of the drawn string. - *

- * @return the width of the drawn string. - * - * @param font the font to use for rendering. - * @param text the formatted character sequence to draw. - * @param x the x-coordinate of the string. - * @param y the y-coordinate of the string. - * @param color the color of the string - */ - public int drawString(Font font, FormattedCharSequence text, int x, int y, int color) { - return this.drawString(font, text, x, y, color, true); + public void drawString(Font font, FormattedCharSequence text, int x, int y, int color) { + this.drawString(font, text, x, y, color, true); } - /** - * Draws a formatted character sequence at the specified coordinates using the given font, text, color, and drop shadow. Returns the width of the drawn string. - *

- * @return returns the width of the drawn string. - * - * @param font the font to use for rendering. - * @param text the formatted character sequence to draw. - * @param x the x-coordinate of the string. - * @param y the y-coordinate of the string. - * @param color the color of the string. - * @param dropShadow whether to apply a drop shadow to the string. - */ - public int drawString(Font font, FormattedCharSequence text, int x, int y, int color, boolean dropShadow) { - return font.drawInBatch(text, (float)x, (float)y, color, dropShadow, this.pose.last().pose(), this.bufferSource, DisplayMode.NORMAL, 0, 15728880); + public void drawString(Font font, FormattedCharSequence text, int x, int y, int color, boolean drawShadow) { + if (ARGB.alpha(color) != 0) { + this.guiRenderState.submitText(new GuiTextRenderState(font, text, new Matrix3x2f(this.pose), x, y, color, 0, drawShadow, this.scissorStack.peek())); + } } - /** - * Draws a component's visual order text at the specified coordinates using the given font, text component, and color. - *

- * @return the width of the drawn string. - * - * @param font the font to use for rendering. - * @param text the text component to draw. - * @param x the x-coordinate of the string. - * @param y the y-coordinate of the string. - * @param color the color of the string. - */ - public int drawString(Font font, Component text, int x, int y, int color) { - return this.drawString(font, text, x, y, color, true); + public void drawString(Font font, Component text, int x, int y, int color) { + this.drawString(font, text, x, y, color, true); } - /** - * Draws a component's visual order text at the specified coordinates using the given font, text component, color, and drop shadow. - *

- * @return the width of the drawn string. - * - * @param font the font to use for rendering. - * @param text the text component to draw. - * @param x the x-coordinate of the string. - * @param y the y-coordinate of the string. - * @param color the color of the string. - * @param dropShadow whether to apply a drop shadow to the string. - */ - public int drawString(Font font, Component text, int x, int y, int color, boolean dropShadow) { - return this.drawString(font, text.getVisualOrderText(), x, y, color, dropShadow); + public void drawString(Font font, Component text, int x, int y, int color, boolean drawShadow) { + this.drawString(font, text.getVisualOrderText(), x, y, color, drawShadow); } /** @@ -519,14 +327,14 @@ public class GuiGraphics { } } - public int drawStringWithBackdrop(Font font, Component text, int x, int y, int xOffset, int color) { + public void drawStringWithBackdrop(Font font, Component text, int x, int y, int width, int color) { int i = this.minecraft.options.getBackgroundColor(0.0F); if (i != 0) { int j = 2; - this.fill(x - 2, y - 2, x + xOffset + 2, y + 9 + 2, ARGB.multiply(i, color)); + this.fill(x - 2, y - 2, x + width + 2, y + 9 + 2, ARGB.multiply(i, color)); } - return this.drawString(font, text, x, y, color, true); + this.drawString(font, text, x, y, color, true); } /** @@ -545,156 +353,138 @@ public class GuiGraphics { this.fill(x + width - 1, y + 1, x + width, y + height - 1, color); } - public void blitSprite(Function renderTypeGetter, ResourceLocation sprite, int x, int y, int width, int height) { - this.blitSprite(renderTypeGetter, sprite, x, y, width, height, -1); + public void blitSprite(RenderPipeline pipeline, ResourceLocation sprite, int x, int y, int width, int height) { + this.blitSprite(pipeline, sprite, x, y, width, height, -1); } - public void blitSprite(Function renderTypeGetter, ResourceLocation sprite, int x, int y, int width, int height, int blitOffset) { + public void blitSprite(RenderPipeline pipeline, ResourceLocation sprite, int x, int y, int width, int height, float fade) { + this.blitSprite(pipeline, sprite, x, y, width, height, ARGB.color(fade, -1)); + } + + public void blitSprite(RenderPipeline pipeline, ResourceLocation sprite, int x, int y, int width, int height, int color) { TextureAtlasSprite textureAtlasSprite = this.sprites.getSprite(sprite); GuiSpriteScaling guiSpriteScaling = this.sprites.getSpriteScaling(textureAtlasSprite); if (guiSpriteScaling instanceof GuiSpriteScaling.Stretch) { - this.blitSprite(renderTypeGetter, textureAtlasSprite, x, y, width, height, blitOffset); + this.blitSprite(pipeline, textureAtlasSprite, x, y, width, height, color); } else if (guiSpriteScaling instanceof GuiSpriteScaling.Tile tile) { - this.blitTiledSprite(renderTypeGetter, textureAtlasSprite, x, y, width, height, 0, 0, tile.width(), tile.height(), tile.width(), tile.height(), blitOffset); + this.blitTiledSprite(pipeline, textureAtlasSprite, x, y, width, height, 0, 0, tile.width(), tile.height(), tile.width(), tile.height(), color); } else if (guiSpriteScaling instanceof GuiSpriteScaling.NineSlice nineSlice) { - this.blitNineSlicedSprite(renderTypeGetter, textureAtlasSprite, nineSlice, x, y, width, height, blitOffset); + this.blitNineSlicedSprite(pipeline, textureAtlasSprite, nineSlice, x, y, width, height, color); } } public void blitSprite( - Function renderTypeGetter, - ResourceLocation sprite, - int textureWidth, - int textureHeight, - int uPosition, - int vPosition, - int x, - int y, - int uWidth, - int vHeight + RenderPipeline pipeline, ResourceLocation sprite, int textureWidth, int textureHeight, int u, int v, int x, int y, int width, int height + ) { + this.blitSprite(pipeline, sprite, textureWidth, textureHeight, u, v, x, y, width, height, -1); + } + + public void blitSprite( + RenderPipeline pipeline, ResourceLocation sprite, int textureWidth, int textureHeight, int u, int v, int x, int y, int width, int height, int color ) { TextureAtlasSprite textureAtlasSprite = this.sprites.getSprite(sprite); GuiSpriteScaling guiSpriteScaling = this.sprites.getSpriteScaling(textureAtlasSprite); if (guiSpriteScaling instanceof GuiSpriteScaling.Stretch) { - this.blitSprite(renderTypeGetter, textureAtlasSprite, textureWidth, textureHeight, uPosition, vPosition, x, y, uWidth, vHeight, -1); + this.blitSprite(pipeline, textureAtlasSprite, textureWidth, textureHeight, u, v, x, y, width, height, color); } else { - this.enableScissor(x, y, x + uWidth, y + vHeight); - this.blitSprite(renderTypeGetter, sprite, x - uPosition, y - vPosition, textureWidth, textureHeight, -1); + this.enableScissor(x, y, x + width, y + height); + this.blitSprite(pipeline, sprite, x - u, y - v, textureWidth, textureHeight, color); this.disableScissor(); } } - public void blitSprite(Function renderTypeGetter, TextureAtlasSprite sprite, int x, int y, int width, int height) { - this.blitSprite(renderTypeGetter, sprite, x, y, width, height, -1); + public void blitSprite(RenderPipeline pipeline, TextureAtlasSprite sprite, int x, int width, int y, int height) { + this.blitSprite(pipeline, sprite, x, width, y, height, -1); } - public void blitSprite(Function renderTypeGetter, TextureAtlasSprite sprite, int x, int y, int width, int height, int blitOffset) { + public void blitSprite(RenderPipeline pipeline, TextureAtlasSprite sprite, int x, int y, int width, int height, int color) { if (width != 0 && height != 0) { - this.innerBlit( - renderTypeGetter, sprite.atlasLocation(), x, x + width, y, y + height, sprite.getU0(), sprite.getU1(), sprite.getV0(), sprite.getV1(), blitOffset - ); + this.innerBlit(pipeline, sprite.atlasLocation(), x, x + width, y, y + height, sprite.getU0(), sprite.getU1(), sprite.getV0(), sprite.getV1(), color); } } private void blitSprite( - Function renderTypeGetter, - TextureAtlasSprite sprite, - int textureWidth, - int textureHeight, - int uPosition, - int vPosition, - int x, - int y, - int uWidth, - int vHeight, - int blitOffset + RenderPipeline pipeline, TextureAtlasSprite sprite, int textureWidth, int textureHeight, int u, int v, int x, int y, int width, int height, int color ) { - if (uWidth != 0 && vHeight != 0) { + if (width != 0 && height != 0) { this.innerBlit( - renderTypeGetter, + pipeline, sprite.atlasLocation(), x, - x + uWidth, + x + width, y, - y + vHeight, - sprite.getU((float)uPosition / textureWidth), - sprite.getU((float)(uPosition + uWidth) / textureWidth), - sprite.getV((float)vPosition / textureHeight), - sprite.getV((float)(vPosition + vHeight) / textureHeight), - blitOffset + y + height, + sprite.getU((float)u / textureWidth), + sprite.getU((float)(u + width) / textureWidth), + sprite.getV((float)v / textureHeight), + sprite.getV((float)(v + height) / textureHeight), + color ); } } private void blitNineSlicedSprite( - Function renderTypeGetter, - TextureAtlasSprite sprite, - GuiSpriteScaling.NineSlice nineSlice, - int x, - int y, - int blitOffset, - int width, - int height + RenderPipeline pipeline, TextureAtlasSprite sprite, GuiSpriteScaling.NineSlice nineSlice, int x, int y, int width, int height, int color ) { - Border border = nineSlice.border(); - int i = Math.min(border.left(), blitOffset / 2); - int j = Math.min(border.right(), blitOffset / 2); - int k = Math.min(border.top(), width / 2); - int l = Math.min(border.bottom(), width / 2); - if (blitOffset == nineSlice.width() && width == nineSlice.height()) { - this.blitSprite(renderTypeGetter, sprite, nineSlice.width(), nineSlice.height(), 0, 0, x, y, blitOffset, width, height); - } else if (width == nineSlice.height()) { - this.blitSprite(renderTypeGetter, sprite, nineSlice.width(), nineSlice.height(), 0, 0, x, y, i, width, height); + GuiSpriteScaling.NineSlice.Border border = nineSlice.border(); + int i = Math.min(border.left(), width / 2); + int j = Math.min(border.right(), width / 2); + int k = Math.min(border.top(), height / 2); + int l = Math.min(border.bottom(), height / 2); + if (width == nineSlice.width() && height == nineSlice.height()) { + this.blitSprite(pipeline, sprite, nineSlice.width(), nineSlice.height(), 0, 0, x, y, width, height, color); + } else if (height == nineSlice.height()) { + this.blitSprite(pipeline, sprite, nineSlice.width(), nineSlice.height(), 0, 0, x, y, i, height, color); this.blitNineSliceInnerSegment( - renderTypeGetter, + pipeline, nineSlice, sprite, x + i, y, - blitOffset - j - i, - width, + width - j - i, + height, i, 0, nineSlice.width() - j - i, nineSlice.height(), nineSlice.width(), nineSlice.height(), - height + color ); - this.blitSprite(renderTypeGetter, sprite, nineSlice.width(), nineSlice.height(), nineSlice.width() - j, 0, x + blitOffset - j, y, j, width, height); - } else if (blitOffset == nineSlice.width()) { - this.blitSprite(renderTypeGetter, sprite, nineSlice.width(), nineSlice.height(), 0, 0, x, y, blitOffset, k, height); + this.blitSprite(pipeline, sprite, nineSlice.width(), nineSlice.height(), nineSlice.width() - j, 0, x + width - j, y, j, height, color); + } else if (width == nineSlice.width()) { + this.blitSprite(pipeline, sprite, nineSlice.width(), nineSlice.height(), 0, 0, x, y, width, k, color); this.blitNineSliceInnerSegment( - renderTypeGetter, + pipeline, nineSlice, sprite, x, y + k, - blitOffset, - width - l - k, + width, + height - l - k, 0, k, nineSlice.width(), nineSlice.height() - l - k, nineSlice.width(), nineSlice.height(), - height + color ); - this.blitSprite(renderTypeGetter, sprite, nineSlice.width(), nineSlice.height(), 0, nineSlice.height() - l, x, y + width - l, blitOffset, l, height); + this.blitSprite(pipeline, sprite, nineSlice.width(), nineSlice.height(), 0, nineSlice.height() - l, x, y + height - l, width, l, color); } else { - this.blitSprite(renderTypeGetter, sprite, nineSlice.width(), nineSlice.height(), 0, 0, x, y, i, k, height); + this.blitSprite(pipeline, sprite, nineSlice.width(), nineSlice.height(), 0, 0, x, y, i, k, color); this.blitNineSliceInnerSegment( - renderTypeGetter, nineSlice, sprite, x + i, y, blitOffset - j - i, k, i, 0, nineSlice.width() - j - i, k, nineSlice.width(), nineSlice.height(), height + pipeline, nineSlice, sprite, x + i, y, width - j - i, k, i, 0, nineSlice.width() - j - i, k, nineSlice.width(), nineSlice.height(), color ); - this.blitSprite(renderTypeGetter, sprite, nineSlice.width(), nineSlice.height(), nineSlice.width() - j, 0, x + blitOffset - j, y, j, k, height); - this.blitSprite(renderTypeGetter, sprite, nineSlice.width(), nineSlice.height(), 0, nineSlice.height() - l, x, y + width - l, i, l, height); + this.blitSprite(pipeline, sprite, nineSlice.width(), nineSlice.height(), nineSlice.width() - j, 0, x + width - j, y, j, k, color); + this.blitSprite(pipeline, sprite, nineSlice.width(), nineSlice.height(), 0, nineSlice.height() - l, x, y + height - l, i, l, color); this.blitNineSliceInnerSegment( - renderTypeGetter, + pipeline, nineSlice, sprite, x + i, - y + width - l, - blitOffset - j - i, + y + height - l, + width - j - i, l, i, nineSlice.height() - l, @@ -702,112 +492,100 @@ public class GuiGraphics { l, nineSlice.width(), nineSlice.height(), - height + color ); this.blitSprite( - renderTypeGetter, - sprite, - nineSlice.width(), - nineSlice.height(), - nineSlice.width() - j, - nineSlice.height() - l, - x + blitOffset - j, - y + width - l, - j, - l, - height + pipeline, sprite, nineSlice.width(), nineSlice.height(), nineSlice.width() - j, nineSlice.height() - l, x + width - j, y + height - l, j, l, color ); this.blitNineSliceInnerSegment( - renderTypeGetter, nineSlice, sprite, x, y + k, i, width - l - k, 0, k, i, nineSlice.height() - l - k, nineSlice.width(), nineSlice.height(), height + pipeline, nineSlice, sprite, x, y + k, i, height - l - k, 0, k, i, nineSlice.height() - l - k, nineSlice.width(), nineSlice.height(), color ); this.blitNineSliceInnerSegment( - renderTypeGetter, + pipeline, nineSlice, sprite, x + i, y + k, - blitOffset - j - i, - width - l - k, + width - j - i, + height - l - k, i, k, nineSlice.width() - j - i, nineSlice.height() - l - k, nineSlice.width(), nineSlice.height(), - height + color ); this.blitNineSliceInnerSegment( - renderTypeGetter, + pipeline, nineSlice, sprite, - x + blitOffset - j, + x + width - j, y + k, j, - width - l - k, + height - l - k, nineSlice.width() - j, k, j, nineSlice.height() - l - k, nineSlice.width(), nineSlice.height(), - height + color ); } } private void blitNineSliceInnerSegment( - Function renderTypeGetter, + RenderPipeline pipeline, GuiSpriteScaling.NineSlice nineSlice, TextureAtlasSprite sprite, - int x, - int y, - int width, - int height, - int uPosition, - int vPosition, + int borderMinX, + int borderMinY, + int borderMaxX, + int borderMaxY, + int u, + int v, int spriteWidth, int spriteHeight, - int nineSliceWidth, - int nineSliceHeight, - int blitOffset + int textureWidth, + int textureHeight, + int color ) { - if (width > 0 && height > 0) { + if (borderMaxX > 0 && borderMaxY > 0) { if (nineSlice.stretchInner()) { this.innerBlit( - renderTypeGetter, + pipeline, sprite.atlasLocation(), - x, - x + width, - y, - y + height, - sprite.getU((float)uPosition / nineSliceWidth), - sprite.getU((float)(uPosition + spriteWidth) / nineSliceWidth), - sprite.getV((float)vPosition / nineSliceHeight), - sprite.getV((float)(vPosition + spriteHeight) / nineSliceHeight), - blitOffset + borderMinX, + borderMinX + borderMaxX, + borderMinY, + borderMinY + borderMaxY, + sprite.getU((float)u / textureWidth), + sprite.getU((float)(u + spriteWidth) / textureWidth), + sprite.getV((float)v / textureHeight), + sprite.getV((float)(v + spriteHeight) / textureHeight), + color ); } else { - this.blitTiledSprite( - renderTypeGetter, sprite, x, y, width, height, uPosition, vPosition, spriteWidth, spriteHeight, nineSliceWidth, nineSliceHeight, blitOffset - ); + this.blitTiledSprite(pipeline, sprite, borderMinX, borderMinY, borderMaxX, borderMaxY, u, v, spriteWidth, spriteHeight, textureWidth, textureHeight, color); } } } private void blitTiledSprite( - Function renderTypeGetter, + RenderPipeline pipeline, TextureAtlasSprite sprite, int x, int y, int width, int height, - int uPosition, - int vPosition, + int u, + int v, int spriteWidth, int spriteHeight, - int nineSliceWidth, - int nineSliceHeight, - int blitOffset + int textureWidth, + int textureHeight, + int color ) { if (width > 0 && height > 0) { if (spriteWidth > 0 && spriteHeight > 0) { @@ -816,7 +594,7 @@ public class GuiGraphics { for (int k = 0; k < height; k += spriteHeight) { int l = Math.min(spriteHeight, height - k); - this.blitSprite(renderTypeGetter, sprite, nineSliceWidth, nineSliceHeight, uPosition, vPosition, x + i, y + k, j, l, blitOffset); + this.blitSprite(pipeline, sprite, textureWidth, textureHeight, u, v, x + i, y + k, j, l, color); } } } else { @@ -826,103 +604,80 @@ public class GuiGraphics { } public void blit( - Function renderTypeGetter, - ResourceLocation atlasLocation, - int x, - int y, - float uOffset, - float vOffset, - int uWidth, - int vHeight, - int textureWidth, - int textureHeight, - int color + RenderPipeline pipeline, ResourceLocation atlas, int x, int y, float u, float v, int width, int height, int textureWidth, int textureHeight, int color ) { - this.blit(renderTypeGetter, atlasLocation, x, y, uOffset, vOffset, uWidth, vHeight, uWidth, vHeight, textureWidth, textureHeight, color); + this.blit(pipeline, atlas, x, y, u, v, width, height, width, height, textureWidth, textureHeight, color); + } + + public void blit(RenderPipeline pipeline, ResourceLocation atlas, int x, int y, float u, float v, int width, int height, int textureWidth, int textureHeight) { + this.blit(pipeline, atlas, x, y, u, v, width, height, width, height, textureWidth, textureHeight); } public void blit( - Function renderTypeGetter, - ResourceLocation atlasLocation, + RenderPipeline pipeline, + ResourceLocation atlas, int x, int y, - float uOffset, - float vOffset, + float u, + float v, + int width, + int height, int uWidth, int vHeight, int textureWidth, int textureHeight ) { - this.blit(renderTypeGetter, atlasLocation, x, y, uOffset, vOffset, uWidth, vHeight, uWidth, vHeight, textureWidth, textureHeight); + this.blit(pipeline, atlas, x, y, u, v, width, height, uWidth, vHeight, textureWidth, textureHeight, -1); } public void blit( - Function renderTypeGetter, - ResourceLocation atlasLocation, + RenderPipeline pipeline, + ResourceLocation atlas, int x, int y, - float uOffset, - float vOffset, - int uWidth, - int vHeight, + float u, + float v, int width, int height, - int textureWidth, - int textureHeight - ) { - this.blit(renderTypeGetter, atlasLocation, x, y, uOffset, vOffset, uWidth, vHeight, width, height, textureWidth, textureHeight, -1); - } - - public void blit( - Function renderTypeGetter, - ResourceLocation atlasLocation, - int x, - int y, - float uOffset, - float vOffset, int uWidth, int vHeight, - int width, - int height, int textureWidth, int textureHeight, int color ) { this.innerBlit( - renderTypeGetter, - atlasLocation, + pipeline, + atlas, x, - x + uWidth, + x + width, y, - y + vHeight, - (uOffset + 0.0F) / textureWidth, - (uOffset + width) / textureWidth, - (vOffset + 0.0F) / textureHeight, - (vOffset + height) / textureHeight, + y + height, + (u + 0.0F) / textureWidth, + (u + uWidth) / textureWidth, + (v + 0.0F) / textureHeight, + (v + vHeight) / textureHeight, color ); } - private void innerBlit( - Function renderTypeGetter, - ResourceLocation atlasLocation, - int x1, - int x2, - int y1, - int y2, - float minU, - float maxU, - float minV, - float maxV, - int color + public void blit(ResourceLocation atlas, int x0, int y0, int x1, int y1, float u0, float u1, float v0, float v1) { + this.innerBlit(RenderPipelines.GUI_TEXTURED, atlas, x0, x1, y0, y1, u0, u1, v0, v1, -1); + } + + private void innerBlit(RenderPipeline pipeline, ResourceLocation atlas, int x0, int x1, int y0, int y1, float u0, float u1, float v0, float v1, int color) { + GpuTextureView gpuTextureView = this.minecraft.getTextureManager().getTexture(atlas).getTextureView(); + this.submitBlit(pipeline, gpuTextureView, x0, y0, x1, y1, u0, u1, v0, v1, color); + } + + private void submitBlit( + RenderPipeline pipeline, GpuTextureView atlasTexture, int x0, int y0, int x1, int y1, float u0, float u1, float v0, float v1, int color ) { - RenderType renderType = (RenderType)renderTypeGetter.apply(atlasLocation); - Matrix4f matrix4f = this.pose.last().pose(); - VertexConsumer vertexConsumer = this.bufferSource.getBuffer(renderType); - vertexConsumer.addVertex(matrix4f, (float)x1, (float)y1, 0.0F).setUv(minU, minV).setColor(color); - vertexConsumer.addVertex(matrix4f, (float)x1, (float)y2, 0.0F).setUv(minU, maxV).setColor(color); - vertexConsumer.addVertex(matrix4f, (float)x2, (float)y2, 0.0F).setUv(maxU, maxV).setColor(color); - vertexConsumer.addVertex(matrix4f, (float)x2, (float)y1, 0.0F).setUv(maxU, minV).setColor(color); + this.guiRenderState + .submitGuiElement( + new BlitRenderState( + pipeline, TextureSetup.singleTexture(atlasTexture), new Matrix3x2f(this.pose), x0, y0, x1, y1, u0, u1, v0, v1, color, this.scissorStack.peek() + ) + ); } /** @@ -948,19 +703,6 @@ public class GuiGraphics { this.renderItem(this.minecraft.player, this.minecraft.level, stack, x, y, seed); } - /** - * Renders an item stack at the specified coordinates with a random seed and a custom value. - * - * @param stack the item stack to render. - * @param x the x-coordinate of the rendering position. - * @param y the y-coordinate of the rendering position. - * @param seed the random seed. - * @param guiOffset the GUI offset. - */ - public void renderItem(ItemStack stack, int x, int y, int seed, int guiOffset) { - this.renderItem(this.minecraft.player, this.minecraft.level, stack, x, y, seed, guiOffset); - } - /** * Renders a fake item stack at the specified coordinates. * @@ -1000,39 +742,13 @@ public class GuiGraphics { * @param seed the random seed. */ private void renderItem(@Nullable LivingEntity entity, @Nullable Level level, ItemStack stack, int x, int y, int seed) { - this.renderItem(entity, level, stack, x, y, seed, 0); - } - - /** - * Renders an item stack for a living entity in a specific level at the specified coordinates with a random seed and a custom GUI offset. - * - * @param entity the living entity. Can be null. - * @param level the level in which the rendering occurs. Can be null. - * @param stack the item stack to render. - * @param x the x-coordinate of the rendering position. - * @param y the y-coordinate of the rendering position. - * @param seed the random seed. - * @param guiOffset the GUI offset value. - */ - private void renderItem(@Nullable LivingEntity entity, @Nullable Level level, ItemStack stack, int x, int y, int seed, int guiOffset) { if (!stack.isEmpty()) { - this.minecraft.getItemModelResolver().updateForTopItem(this.scratchItemStackRenderState, stack, ItemDisplayContext.GUI, level, entity, seed); - this.pose.pushPose(); - this.pose.translate((float)(x + 8), (float)(y + 8), (float)(150 + guiOffset)); + ItemStackRenderState itemStackRenderState = new ItemStackRenderState(); + this.minecraft.getItemModelResolver().updateForTopItem(itemStackRenderState, stack, ItemDisplayContext.GUI, level, entity, seed); try { - this.pose.scale(16.0F, -16.0F, 16.0F); - boolean bl = !this.scratchItemStackRenderState.usesBlockLight(); - if (bl) { - this.flush(); - Lighting.setupForFlatItems(); - } - - this.scratchItemStackRenderState.render(this.pose, this.bufferSource, 15728880, OverlayTexture.NO_OVERLAY); - this.flush(); - if (bl) { - Lighting.setupFor3DItems(); - } + this.guiRenderState + .submitItem(new GuiItemRenderState(stack.getItem().getName().toString(), new Matrix3x2f(this.pose), itemStackRenderState, x, y, this.scissorStack.peek())); } catch (Throwable var11) { CrashReport crashReport = CrashReport.forThrowable(var11, "Rendering item"); CrashReportCategory crashReportCategory = crashReport.addCategory("Item being rendered"); @@ -1041,8 +757,6 @@ public class GuiGraphics { crashReportCategory.setDetail("Item Foil", (CrashReportDetail)(() -> String.valueOf(stack.hasFoil()))); throw new ReportedException(crashReport); } - - this.pose.popPose(); } } @@ -1069,174 +783,143 @@ public class GuiGraphics { */ public void renderItemDecorations(Font font, ItemStack stack, int x, int y, @Nullable String text) { if (!stack.isEmpty()) { - this.pose.pushPose(); + this.pose.pushMatrix(); this.renderItemBar(stack, x, y); - this.renderItemCount(font, stack, x, y, text); this.renderItemCooldown(stack, x, y); - this.pose.popPose(); + this.renderItemCount(font, stack, x, y, text); + this.pose.popMatrix(); } } - /** - * Renders a tooltip for an item stack at the specified mouse coordinates. - * - * @param font the font used for rendering text. - * @param stack the item stack to display the tooltip for. - * @param mouseX the x-coordinate of the mouse position. - * @param mouseY the y-coordinate of the mouse position. - */ - public void renderTooltip(Font font, ItemStack stack, int mouseX, int mouseY) { - this.renderTooltip(font, Screen.getTooltipFromItem(this.minecraft, stack), stack.getTooltipImage(), mouseX, mouseY, stack.get(DataComponents.TOOLTIP_STYLE)); + public void setTooltipForNextFrame(Component text, int x, int y) { + this.setTooltipForNextFrame(List.of(text.getVisualOrderText()), x, y); } - /** - * Renders a tooltip with customizable components at the specified mouse coordinates. - * - * @param font the font used for rendering text. - * @param tooltipLines the lines of the tooltip. - * @param visualTooltipComponent the visual tooltip component. Can be empty. - * @param mouseX the x-coordinate of the mouse position. - * @param mouseY the y-coordinate of the mouse position. - */ - public void renderTooltip(Font font, List tooltipLines, Optional visualTooltipComponent, int mouseX, int mouseY) { - this.renderTooltip(font, tooltipLines, visualTooltipComponent, mouseX, mouseY, null); + public void setTooltipForNextFrame(List lines, int x, int y) { + this.setTooltipForNextFrame(this.minecraft.font, lines, DefaultTooltipPositioner.INSTANCE, x, y, false); } - public void renderTooltip( - Font font, List tooltipLines, Optional visualTooltipComponent, int mouseX, int mouseY, @Nullable ResourceLocation sprite + public void setTooltipForNextFrame(Font font, ItemStack stack, int x, int y) { + this.setTooltipForNextFrame(font, Screen.getTooltipFromItem(this.minecraft, stack), stack.getTooltipImage(), x, y, stack.get(DataComponents.TOOLTIP_STYLE)); + } + + public void setTooltipForNextFrame(Font font, List lines, Optional tooltipImage, int x, int y) { + this.setTooltipForNextFrame(font, lines, tooltipImage, x, y, null); + } + + public void setTooltipForNextFrame( + Font font, List lines, Optional tooltipImage, int x, int y, @Nullable ResourceLocation background ) { - List list = (List)tooltipLines.stream() + List list = (List)lines.stream() .map(Component::getVisualOrderText) .map(ClientTooltipComponent::create) .collect(Util.toMutableList()); - visualTooltipComponent.ifPresent(tooltipComponent -> list.add(list.isEmpty() ? 0 : 1, ClientTooltipComponent.create(tooltipComponent))); - this.renderTooltipInternal(font, list, mouseX, mouseY, DefaultTooltipPositioner.INSTANCE, sprite); + tooltipImage.ifPresent(tooltipComponent -> list.add(list.isEmpty() ? 0 : 1, ClientTooltipComponent.create(tooltipComponent))); + this.setTooltipForNextFrameInternal(font, list, x, y, DefaultTooltipPositioner.INSTANCE, background, false); } - /** - * Renders a tooltip with a single line of text at the specified mouse coordinates. - * - * @param font the font used for rendering text. - * @param text the text to display in the tooltip. - * @param mouseX the x-coordinate of the mouse position. - * @param mouseY the y-coordinate of the mouse position. - */ - public void renderTooltip(Font font, Component text, int mouseX, int mouseY) { - this.renderTooltip(font, text, mouseX, mouseY, null); + public void setTooltipForNextFrame(Font font, Component text, int x, int y) { + this.setTooltipForNextFrame(font, text, x, y, null); } - public void renderTooltip(Font font, Component text, int mouseX, int mouseY, @Nullable ResourceLocation sprite) { - this.renderTooltip(font, List.of(text.getVisualOrderText()), mouseX, mouseY, sprite); + public void setTooltipForNextFrame(Font font, Component text, int x, int y, @Nullable ResourceLocation background) { + this.setTooltipForNextFrame(font, List.of(text.getVisualOrderText()), x, y, background); } - /** - * Renders a tooltip with multiple lines of component-based text at the specified mouse coordinates. - * - * @param font the font used for rendering text. - * @param tooltipLines the lines of the tooltip as components. - * @param mouseX the x-coordinate of the mouse position. - * @param mouseY the y-coordinate of the mouse position. - */ - public void renderComponentTooltip(Font font, List tooltipLines, int mouseX, int mouseY) { - this.renderComponentTooltip(font, tooltipLines, mouseX, mouseY, null); + public void setComponentTooltipForNextFrame(Font font, List lines, int x, int y) { + this.setComponentTooltipForNextFrame(font, lines, x, y, null); } - public void renderComponentTooltip(Font font, List tooltipLines, int mouseX, int mouseY, @Nullable ResourceLocation sprite) { - this.renderTooltipInternal( + public void setComponentTooltipForNextFrame(Font font, List lines, int x, int y, @Nullable ResourceLocation background) { + this.setTooltipForNextFrameInternal( font, - tooltipLines.stream().map(Component::getVisualOrderText).map(ClientTooltipComponent::create).toList(), - mouseX, - mouseY, + lines.stream().map(Component::getVisualOrderText).map(ClientTooltipComponent::create).toList(), + x, + y, DefaultTooltipPositioner.INSTANCE, - sprite + background, + false ); } - /** - * Renders a tooltip with multiple lines of formatted text at the specified mouse coordinates. - * - * @param font the font used for rendering text. - * @param tooltipLines the lines of the tooltip as formatted character sequences. - * @param mouseX the x-coordinate of the mouse position. - * @param mouseY the y-coordinate of the mouse position. - */ - public void renderTooltip(Font font, List tooltipLines, int mouseX, int mouseY) { - this.renderTooltip(font, tooltipLines, mouseX, mouseY, null); + public void setTooltipForNextFrame(Font font, List lines, int x, int y) { + this.setTooltipForNextFrame(font, lines, x, y, null); } - public void renderTooltip(Font font, List tooltipLines, int mouseX, int mouseY, @Nullable ResourceLocation sprite) { - this.renderTooltipInternal( + public void setTooltipForNextFrame(Font font, List lines, int x, int y, @Nullable ResourceLocation background) { + this.setTooltipForNextFrameInternal( font, - (List)tooltipLines.stream().map(ClientTooltipComponent::create).collect(Collectors.toList()), - mouseX, - mouseY, + (List)lines.stream().map(ClientTooltipComponent::create).collect(Collectors.toList()), + x, + y, DefaultTooltipPositioner.INSTANCE, - sprite + background, + false ); } - /** - * Renders a tooltip with multiple lines of formatted text using a custom tooltip positioner at the specified mouse coordinates. - * - * @param font the font used for rendering text. - * @param tooltipLines the lines of the tooltip as formatted character sequences. - * @param tooltipPositioner the positioner to determine the tooltip's position. - * @param mouseX the x-coordinate of the mouse position. - * @param mouseY the y-coordinate of the mouse position. - */ - public void renderTooltip(Font font, List tooltipLines, ClientTooltipPositioner tooltipPositioner, int mouseX, int mouseY) { - this.renderTooltipInternal( - font, - (List)tooltipLines.stream().map(ClientTooltipComponent::create).collect(Collectors.toList()), - mouseX, - mouseY, - tooltipPositioner, - null + public void setTooltipForNextFrame(Font font, List lines, ClientTooltipPositioner positioner, int x, int y, boolean focused) { + this.setTooltipForNextFrameInternal( + font, (List)lines.stream().map(ClientTooltipComponent::create).collect(Collectors.toList()), x, y, positioner, null, focused ); } - private void renderTooltipInternal( - Font font, List tooltipLines, int mouseX, int mouseY, ClientTooltipPositioner tooltipPositioner, @Nullable ResourceLocation sprite + private void setTooltipForNextFrameInternal( + Font font, List components, int x, int y, ClientTooltipPositioner positioner, @Nullable ResourceLocation background, boolean focused ) { - if (!tooltipLines.isEmpty()) { - int i = 0; - int j = tooltipLines.size() == 1 ? -2 : 0; + if (!components.isEmpty()) { + if (this.deferredTooltip == null || focused) { + this.deferredTooltip = () -> this.renderTooltip(font, components, x, y, positioner, background); + } + } + } - for (ClientTooltipComponent clientTooltipComponent : tooltipLines) { - int k = clientTooltipComponent.getWidth(font); - if (k > i) { - i = k; - } + public void renderTooltip( + Font font, List components, int x, int y, ClientTooltipPositioner positioner, @Nullable ResourceLocation background + ) { + int i = 0; + int j = components.size() == 1 ? -2 : 0; - j += clientTooltipComponent.getHeight(font); + for (ClientTooltipComponent clientTooltipComponent : components) { + int k = clientTooltipComponent.getWidth(font); + if (k > i) { + i = k; } - int l = i; - int m = j; - Vector2ic vector2ic = tooltipPositioner.positionTooltip(this.guiWidth(), this.guiHeight(), mouseX, mouseY, i, j); - int n = vector2ic.x(); - int o = vector2ic.y(); - this.pose.pushPose(); - int p = 400; - TooltipRenderUtil.renderTooltipBackground(this, n, o, i, j, 400, sprite); - this.pose.translate(0.0F, 0.0F, 400.0F); - int q = o; + j += clientTooltipComponent.getHeight(font); + } - for (int r = 0; r < tooltipLines.size(); r++) { - ClientTooltipComponent clientTooltipComponent2 = (ClientTooltipComponent)tooltipLines.get(r); - clientTooltipComponent2.renderText(font, n, q, this.pose.last().pose(), this.bufferSource); - q += clientTooltipComponent2.getHeight(font) + (r == 0 ? 2 : 0); - } + int l = i; + int m = j; + Vector2ic vector2ic = positioner.positionTooltip(this.guiWidth(), this.guiHeight(), x, y, i, j); + int n = vector2ic.x(); + int o = vector2ic.y(); + this.pose.pushMatrix(); + TooltipRenderUtil.renderTooltipBackground(this, n, o, i, j, background); + int p = o; - q = o; + for (int q = 0; q < components.size(); q++) { + ClientTooltipComponent clientTooltipComponent2 = (ClientTooltipComponent)components.get(q); + clientTooltipComponent2.renderText(this, font, n, p); + p += clientTooltipComponent2.getHeight(font) + (q == 0 ? 2 : 0); + } - for (int r = 0; r < tooltipLines.size(); r++) { - ClientTooltipComponent clientTooltipComponent2 = (ClientTooltipComponent)tooltipLines.get(r); - clientTooltipComponent2.renderImage(font, n, q, l, m, this); - q += clientTooltipComponent2.getHeight(font) + (r == 0 ? 2 : 0); - } + p = o; - this.pose.popPose(); + for (int q = 0; q < components.size(); q++) { + ClientTooltipComponent clientTooltipComponent2 = (ClientTooltipComponent)components.get(q); + clientTooltipComponent2.renderImage(font, n, p, l, m, this); + p += clientTooltipComponent2.getHeight(font) + (q == 0 ? 2 : 0); + } + + this.pose.popMatrix(); + } + + public void renderDeferredTooltip() { + if (this.deferredTooltip != null) { + this.nextStratum(); + this.deferredTooltip.run(); + this.deferredTooltip = null; } } @@ -1244,18 +927,15 @@ public class GuiGraphics { if (stack.isBarVisible()) { int i = x + 2; int j = y + 13; - this.fill(RenderType.gui(), i, j, i + 13, j + 2, 200, -16777216); - this.fill(RenderType.gui(), i, j, i + stack.getBarWidth(), j + 1, 200, ARGB.opaque(stack.getBarColor())); + this.fill(RenderPipelines.GUI, i, j, i + 13, j + 2, -16777216); + this.fill(RenderPipelines.GUI, i, j, i + stack.getBarWidth(), j + 1, ARGB.opaque(stack.getBarColor())); } } private void renderItemCount(Font font, ItemStack stack, int x, int y, @Nullable String text) { if (stack.getCount() != 1 || text != null) { String string = text == null ? String.valueOf(stack.getCount()) : text; - this.pose.pushPose(); - this.pose.translate(0.0F, 0.0F, 200.0F); this.drawString(font, string, x + 19 - 2 - font.width(string), y + 6 + 3, -1, true); - this.pose.popPose(); } } @@ -1267,7 +947,7 @@ public class GuiGraphics { if (f > 0.0F) { int i = y + Mth.floor(16.0F * (1.0F - f)); int j = i + Mth.ceil(16.0F * f); - this.fill(RenderType.gui(), x, i, x + 16, j, 200, Integer.MAX_VALUE); + this.fill(RenderPipelines.GUI, x, i, x + 16, j, Integer.MAX_VALUE); } } @@ -1283,25 +963,113 @@ public class GuiGraphics { if (style != null && style.getHoverEvent() != null) { switch (style.getHoverEvent()) { case HoverEvent.ShowItem(ItemStack var17): - this.renderTooltip(font, var17, mouseX, mouseY); + this.setTooltipForNextFrame(font, var17, mouseX, mouseY); break; case HoverEvent.ShowEntity(HoverEvent.EntityTooltipInfo var22): HoverEvent.EntityTooltipInfo var18 = var22; if (this.minecraft.options.advancedItemTooltips) { - this.renderComponentTooltip(font, var18.getTooltipLines(), mouseX, mouseY); + this.setComponentTooltipForNextFrame(font, var18.getTooltipLines(), mouseX, mouseY); } break; case HoverEvent.ShowText(Component var13): - this.renderTooltip(font, font.split(var13, Math.max(this.guiWidth() / 2, 200)), mouseX, mouseY); + this.setTooltipForNextFrame(font, font.split(var13, Math.max(this.guiWidth() / 2, 200)), mouseX, mouseY); break; default: } } } - public void drawSpecial(Consumer drawer) { - drawer.accept(this.bufferSource); - this.bufferSource.endBatch(); + public void submitMapRenderState(MapRenderState renderState) { + Minecraft minecraft = Minecraft.getInstance(); + TextureManager textureManager = minecraft.getTextureManager(); + GpuTextureView gpuTextureView = textureManager.getTexture(renderState.texture).getTextureView(); + this.submitBlit(RenderPipelines.GUI_TEXTURED, gpuTextureView, 0, 0, 128, 128, 0.0F, 1.0F, 0.0F, 1.0F, -1); + + for (MapRenderState.MapDecorationRenderState mapDecorationRenderState : renderState.decorations) { + if (mapDecorationRenderState.renderOnFrame) { + this.pose.pushMatrix(); + this.pose.translate(mapDecorationRenderState.x / 2.0F + 64.0F, mapDecorationRenderState.y / 2.0F + 64.0F); + this.pose.rotate((float) (Math.PI / 180.0) * mapDecorationRenderState.rot * 360.0F / 16.0F); + this.pose.scale(4.0F, 4.0F); + this.pose.translate(-0.125F, 0.125F); + TextureAtlasSprite textureAtlasSprite = mapDecorationRenderState.atlasSprite; + if (textureAtlasSprite != null) { + GpuTextureView gpuTextureView2 = textureManager.getTexture(textureAtlasSprite.atlasLocation()).getTextureView(); + this.submitBlit( + RenderPipelines.GUI_TEXTURED, + gpuTextureView2, + -1, + -1, + 1, + 1, + textureAtlasSprite.getU0(), + textureAtlasSprite.getU1(), + textureAtlasSprite.getV1(), + textureAtlasSprite.getV0(), + -1 + ); + } + + this.pose.popMatrix(); + if (mapDecorationRenderState.name != null) { + Font font = minecraft.font; + float f = font.width(mapDecorationRenderState.name); + float g = Mth.clamp(25.0F / f, 0.0F, 6.0F / 9.0F); + this.pose.pushMatrix(); + this.pose.translate(mapDecorationRenderState.x / 2.0F + 64.0F - f * g / 2.0F, mapDecorationRenderState.y / 2.0F + 64.0F + 4.0F); + this.pose.scale(g, g); + this.guiRenderState + .submitText( + new GuiTextRenderState( + font, mapDecorationRenderState.name.getVisualOrderText(), new Matrix3x2f(this.pose), 0, 0, -1, Integer.MIN_VALUE, false, this.scissorStack.peek() + ) + ); + this.pose.popMatrix(); + } + } + } + } + + public void submitEntityRenderState( + EntityRenderState renderState, + float scale, + Vector3f translation, + Quaternionf rotation, + @Nullable Quaternionf overrideCameraAngle, + int x0, + int y0, + int x1, + int y1 + ) { + this.guiRenderState + .submitPicturesInPictureState( + new GuiEntityRenderState(renderState, translation, rotation, overrideCameraAngle, x0, y0, x1, y1, scale, this.scissorStack.peek()) + ); + } + + public void submitSkinRenderState( + PlayerModel playerModel, ResourceLocation texture, float scale, float rotationX, float rotationY, float pivotY, int x0, int y0, int x1, int y1 + ) { + this.guiRenderState + .submitPicturesInPictureState(new GuiSkinRenderState(playerModel, texture, rotationX, rotationY, pivotY, x0, y0, x1, y1, scale, this.scissorStack.peek())); + } + + public void submitBookModelRenderState(BookModel bookModel, ResourceLocation texture, float scale, float open, float flip, int x0, int y0, int x1, int y1) { + this.guiRenderState + .submitPicturesInPictureState(new GuiBookModelRenderState(bookModel, texture, open, flip, x0, y0, x1, y1, scale, this.scissorStack.peek())); + } + + public void submitBannerPatternRenderState(ModelPart flag, DyeColor baseColor, BannerPatternLayers resultBannerPatterns, int x0, int y0, int x1, int y1) { + this.guiRenderState + .submitPicturesInPictureState(new GuiBannerResultRenderState(flag, baseColor, resultBannerPatterns, x0, y0, x1, y1, this.scissorStack.peek())); + } + + public void submitSignRenderState(Model signModel, float scale, WoodType woodType, int x0, int y0, int x1, int y1) { + this.guiRenderState.submitPicturesInPictureState(new GuiSignRenderState(signModel, woodType, x0, y0, x1, y1, scale, this.scissorStack.peek())); + } + + public void submitProfilerChartRenderState(List chartData, int x0, int y0, int x1, int y1) { + this.guiRenderState.submitPicturesInPictureState(new GuiProfilerChartRenderState(chartData, x0, y0, x1, y1, this.scissorStack.peek())); } /** @@ -1346,6 +1114,11 @@ public class GuiGraphics { } } + @Nullable + public ScreenRectangle peek() { + return (ScreenRectangle)this.stack.peekLast(); + } + public boolean containsPoint(int x, int y) { return this.stack.isEmpty() ? true : ((ScreenRectangle)this.stack.peek()).containsPoint(x, y); } diff --git a/net/minecraft/client/gui/LayeredDraw.java b/net/minecraft/client/gui/LayeredDraw.java deleted file mode 100644 index 6ff35ac6..00000000 --- a/net/minecraft/client/gui/LayeredDraw.java +++ /dev/null @@ -1,45 +0,0 @@ -package net.minecraft.client.gui; - -import java.util.ArrayList; -import java.util.List; -import java.util.function.BooleanSupplier; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.client.DeltaTracker; - -@Environment(EnvType.CLIENT) -public class LayeredDraw { - public static final float Z_SEPARATION = 200.0F; - private final List layers = new ArrayList(); - - public LayeredDraw add(LayeredDraw.Layer layer) { - this.layers.add(layer); - return this; - } - - public LayeredDraw add(LayeredDraw layeredDraw, BooleanSupplier renderInner) { - return this.add((guiGraphics, deltaTracker) -> { - if (renderInner.getAsBoolean()) { - layeredDraw.renderInner(guiGraphics, deltaTracker); - } - }); - } - - public void render(GuiGraphics guiGraphics, DeltaTracker deltaTracker) { - guiGraphics.pose().pushPose(); - this.renderInner(guiGraphics, deltaTracker); - guiGraphics.pose().popPose(); - } - - private void renderInner(GuiGraphics guiGraphics, DeltaTracker deltaTracker) { - for (LayeredDraw.Layer layer : this.layers) { - layer.render(guiGraphics, deltaTracker); - guiGraphics.pose().translate(0.0F, 0.0F, 200.0F); - } - } - - @Environment(EnvType.CLIENT) - public interface Layer { - void render(GuiGraphics guiGraphics, DeltaTracker deltaTracker); - } -} diff --git a/net/minecraft/client/gui/components/AbstractButton.java b/net/minecraft/client/gui/components/AbstractButton.java index e8ae1317..2c1a65d9 100644 --- a/net/minecraft/client/gui/components/AbstractButton.java +++ b/net/minecraft/client/gui/components/AbstractButton.java @@ -6,11 +6,10 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.navigation.CommonInputs; -import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.RenderPipelines; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.ARGB; -import net.minecraft.util.Mth; @Environment(EnvType.CLIENT) public abstract class AbstractButton extends AbstractWidget { @@ -21,8 +20,8 @@ public abstract class AbstractButton extends AbstractWidget { ResourceLocation.withDefaultNamespace("widget/button_highlighted") ); - public AbstractButton(int i, int j, int k, int l, Component component) { - super(i, j, k, l, component); + public AbstractButton(int x, int y, int width, int height, Component message) { + super(x, y, width, height, message); } public abstract void onPress(); @@ -31,7 +30,7 @@ public abstract class AbstractButton extends AbstractWidget { protected void renderWidget(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTick) { Minecraft minecraft = Minecraft.getInstance(); guiGraphics.blitSprite( - RenderType::guiTextured, + RenderPipelines.GUI_TEXTURED, SPRITES.get(this.active, this.isHoveredOrFocused()), this.getX(), this.getY(), @@ -39,8 +38,8 @@ public abstract class AbstractButton extends AbstractWidget { this.getHeight(), ARGB.white(this.alpha) ); - int i = this.active ? 16777215 : 10526880; - this.renderString(guiGraphics, minecraft.font, i | Mth.ceil(this.alpha * 255.0F) << 24); + int i = ARGB.color(this.alpha, this.active ? -1 : -6250336); + this.renderString(guiGraphics, minecraft.font, i); } public void renderString(GuiGraphics guiGraphics, Font font, int color) { diff --git a/net/minecraft/client/gui/components/AbstractScrollArea.java b/net/minecraft/client/gui/components/AbstractScrollArea.java index 6cb082d9..a902a00c 100644 --- a/net/minecraft/client/gui/components/AbstractScrollArea.java +++ b/net/minecraft/client/gui/components/AbstractScrollArea.java @@ -3,7 +3,7 @@ package net.minecraft.client.gui.components; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.RenderPipelines; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.Mth; @@ -16,8 +16,8 @@ public abstract class AbstractScrollArea extends AbstractWidget { private static final ResourceLocation SCROLLER_BACKGROUND_SPRITE = ResourceLocation.withDefaultNamespace("widget/scroller_background"); private boolean scrolling; - public AbstractScrollArea(int i, int j, int k, int l, Component component) { - super(i, j, k, l, component); + public AbstractScrollArea(int x, int y, int width, int height, Component message) { + super(x, y, width, height, message); } @Override @@ -102,8 +102,8 @@ public abstract class AbstractScrollArea extends AbstractWidget { int i = this.scrollBarX(); int j = this.scrollerHeight(); int k = this.scrollBarY(); - guiGraphics.blitSprite(RenderType::guiTextured, SCROLLER_BACKGROUND_SPRITE, i, this.getY(), 6, this.getHeight()); - guiGraphics.blitSprite(RenderType::guiTextured, SCROLLER_SPRITE, i, k, 6, j); + guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, SCROLLER_BACKGROUND_SPRITE, i, this.getY(), 6, this.getHeight()); + guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, SCROLLER_SPRITE, i, k, 6, j); } } diff --git a/net/minecraft/client/gui/components/AbstractSelectionList.java b/net/minecraft/client/gui/components/AbstractSelectionList.java index 83f26b03..cbc423dc 100644 --- a/net/minecraft/client/gui/components/AbstractSelectionList.java +++ b/net/minecraft/client/gui/components/AbstractSelectionList.java @@ -19,7 +19,7 @@ import net.minecraft.client.gui.narration.NarratedElementType; import net.minecraft.client.gui.narration.NarrationElementOutput; import net.minecraft.client.gui.navigation.ScreenDirection; import net.minecraft.client.gui.screens.Screen; -import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.RenderPipelines; import net.minecraft.network.chat.CommonComponents; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; @@ -74,6 +74,9 @@ public abstract class AbstractSelectionList= this.getX() - && mouseY >= this.getY() - && mouseX < this.getX() + this.width - && mouseY < this.getY() + this.height; + this.isHovered = guiGraphics.containsPointInScissor(mouseX, mouseY) && this.areCoordinatesInRectangle(mouseX, mouseY); this.renderWidget(guiGraphics, mouseX, mouseY, partialTick); - this.tooltip.refreshTooltipForNextRenderPass(this.isHovered(), this.isFocused(), this.getRectangle()); + this.tooltip.refreshTooltipForNextRenderPass(guiGraphics, mouseX, mouseY, this.isHovered(), this.isFocused(), this.getRectangle()); } } @@ -71,11 +67,6 @@ public abstract class AbstractWidget implements Renderable, GuiEventListener, La this.tooltip.set(tooltip); } - @Nullable - public Tooltip getTooltip() { - return this.tooltip.get(); - } - public void setTooltipDelay(Duration tooltipDelay) { this.tooltip.setDelay(tooltipDelay); } @@ -182,7 +173,7 @@ public abstract class AbstractWidget implements Renderable, GuiEventListener, La @Override public boolean isMouseOver(double mouseX, double mouseY) { - return this.active && this.visible && mouseX >= this.getX() && mouseY >= this.getY() && mouseX < this.getRight() && mouseY < this.getBottom(); + return this.active && this.visible && this.areCoordinatesInRectangle(mouseX, mouseY); } public void playDownSound(SoundManager handler) { @@ -312,6 +303,10 @@ public abstract class AbstractWidget implements Renderable, GuiEventListener, La return LayoutElement.super.getRectangle(); } + private boolean areCoordinatesInRectangle(double x, double y) { + return x >= this.getX() && y >= this.getY() && x < this.getRight() && y < this.getBottom(); + } + public void setRectangle(int width, int height, int x, int y) { this.setSize(width, height); this.setPosition(x, y); diff --git a/net/minecraft/client/gui/components/BossHealthOverlay.java b/net/minecraft/client/gui/components/BossHealthOverlay.java index 154f52c2..37528277 100644 --- a/net/minecraft/client/gui/components/BossHealthOverlay.java +++ b/net/minecraft/client/gui/components/BossHealthOverlay.java @@ -7,17 +7,14 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.RenderPipelines; import net.minecraft.network.chat.Component; import net.minecraft.network.protocol.game.ClientboundBossEventPacket; -import net.minecraft.network.protocol.game.ClientboundBossEventPacket.Handler; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.Mth; import net.minecraft.util.profiling.Profiler; import net.minecraft.util.profiling.ProfilerFiller; import net.minecraft.world.BossEvent; -import net.minecraft.world.BossEvent.BossBarColor; -import net.minecraft.world.BossEvent.BossBarOverlay; @Environment(EnvType.CLIENT) public class BossHealthOverlay { @@ -62,6 +59,7 @@ public class BossHealthOverlay { public void render(GuiGraphics guiGraphics) { if (!this.events.isEmpty()) { + guiGraphics.nextStratum(); ProfilerFiller profilerFiller = Profiler.get(); profilerFiller.push("bossHealth"); int i = guiGraphics.guiWidth(); @@ -74,7 +72,7 @@ public class BossHealthOverlay { int m = this.minecraft.font.width(component); int n = i / 2 - m / 2; int o = j - 9; - guiGraphics.drawString(this.minecraft.font, component, n, o, 16777215); + guiGraphics.drawString(this.minecraft.font, component, n, o, -1); j += 10 + 9; if (j >= guiGraphics.guiHeight() / 3) { break; @@ -96,18 +94,25 @@ public class BossHealthOverlay { private void drawBar( GuiGraphics guiGraphics, int x, int y, BossEvent bossEvent, int progress, ResourceLocation[] barProgressSprites, ResourceLocation[] overlayProgressSprites ) { - guiGraphics.blitSprite(RenderType::guiTextured, barProgressSprites[bossEvent.getColor().ordinal()], 182, 5, 0, 0, x, y, progress, 5); - if (bossEvent.getOverlay() != BossBarOverlay.PROGRESS) { - guiGraphics.blitSprite(RenderType::guiTextured, overlayProgressSprites[bossEvent.getOverlay().ordinal() - 1], 182, 5, 0, 0, x, y, progress, 5); + guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, barProgressSprites[bossEvent.getColor().ordinal()], 182, 5, 0, 0, x, y, progress, 5); + if (bossEvent.getOverlay() != BossEvent.BossBarOverlay.PROGRESS) { + guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, overlayProgressSprites[bossEvent.getOverlay().ordinal() - 1], 182, 5, 0, 0, x, y, progress, 5); } } public void update(ClientboundBossEventPacket packet) { packet.dispatch( - new Handler() { + new ClientboundBossEventPacket.Handler() { @Override public void add( - UUID id, Component name, float progress, BossBarColor color, BossBarOverlay overlay, boolean darkenScreen, boolean playMusic, boolean createWorldFog + UUID id, + Component name, + float progress, + BossEvent.BossBarColor color, + BossEvent.BossBarOverlay overlay, + boolean darkenScreen, + boolean playMusic, + boolean createWorldFog ) { BossHealthOverlay.this.events.put(id, new LerpingBossEvent(id, name, progress, color, overlay, darkenScreen, playMusic, createWorldFog)); } @@ -128,7 +133,7 @@ public class BossHealthOverlay { } @Override - public void updateStyle(UUID id, BossBarColor color, BossBarOverlay overlay) { + public void updateStyle(UUID id, BossEvent.BossBarColor color, BossEvent.BossBarOverlay overlay) { LerpingBossEvent lerpingBossEvent = (LerpingBossEvent)BossHealthOverlay.this.events.get(id); lerpingBossEvent.setColor(color); lerpingBossEvent.setOverlay(overlay); diff --git a/net/minecraft/client/gui/components/ChatComponent.java b/net/minecraft/client/gui/components/ChatComponent.java index a2723ef3..d81b6c70 100644 --- a/net/minecraft/client/gui/components/ChatComponent.java +++ b/net/minecraft/client/gui/components/ChatComponent.java @@ -12,8 +12,6 @@ import net.minecraft.Optionull; import net.minecraft.client.GuiMessage; import net.minecraft.client.GuiMessageTag; import net.minecraft.client.Minecraft; -import net.minecraft.client.GuiMessage.Line; -import net.minecraft.client.GuiMessageTag.Icon; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.screens.ChatScreen; import net.minecraft.client.multiplayer.chat.ChatListener; @@ -52,7 +50,7 @@ public class ChatComponent { /** * List of the ChatLines currently drawn */ - private final List trimmedMessages = Lists.newArrayList(); + private final List trimmedMessages = Lists.newArrayList(); private int chatScrollbarPos; private boolean newMessageSinceScroll; private final List messageDeletionQueue = new ArrayList(); @@ -68,6 +66,28 @@ public class ChatComponent { } } + private int forEachLine(int linesPerPage, int tickCount, boolean focused, int bottomY, ChatComponent.LineConsumer action) { + int i = this.getLineHeight(); + int j = 0; + + for (int k = Math.min(this.trimmedMessages.size() - this.chatScrollbarPos, linesPerPage) - 1; k >= 0; k--) { + int l = k + this.chatScrollbarPos; + GuiMessage.Line line = (GuiMessage.Line)this.trimmedMessages.get(l); + if (line != null) { + int m = tickCount - line.addedTime(); + float f = focused ? 1.0F : (float)getTimeFactor(m); + if (f > 1.0E-5F) { + j++; + int n = bottomY - k * i; + int o = n - i; + action.accept(0, o, n, line, k, f); + } + } + } + + return j; + } + public void render(GuiGraphics guiGraphics, int tickCount, int mouseX, int mouseY, boolean focused) { if (!this.isChatHidden()) { int i = this.getLinesPerPage(); @@ -78,92 +98,70 @@ public class ChatComponent { float f = (float)this.getScale(); int k = Mth.ceil(this.getWidth() / f); int l = guiGraphics.guiHeight(); - guiGraphics.pose().pushPose(); - guiGraphics.pose().scale(f, f, 1.0F); - guiGraphics.pose().translate(4.0F, 0.0F, 0.0F); + guiGraphics.pose().pushMatrix(); + guiGraphics.pose().scale(f, f); + guiGraphics.pose().translate(4.0F, 0.0F); int m = Mth.floor((l - 40) / f); int n = this.getMessageEndIndexAt(this.screenToChatX(mouseX), this.screenToChatY(mouseY)); - double d = this.minecraft.options.chatOpacity().get() * 0.9 + 0.1; - double e = this.minecraft.options.textBackgroundOpacity().get(); - double g = this.minecraft.options.chatLineSpacing().get(); - int o = this.getLineHeight(); - int p = (int)Math.round(-8.0 * (g + 1.0) + 4.0 * g); - int q = 0; - - for (int r = 0; r + this.chatScrollbarPos < this.trimmedMessages.size() && r < i; r++) { - int s = r + this.chatScrollbarPos; - Line line = (Line)this.trimmedMessages.get(s); - if (line != null) { - int t = tickCount - line.addedTime(); - if (t < 200 || focused) { - double h = focused ? 1.0 : getTimeFactor(t); - int u = (int)(255.0 * h * d); - int v = (int)(255.0 * h * e); - q++; - if (u > 3) { - int w = 0; - int x = m - r * o; - int y = x + p; - guiGraphics.fill(-4, x - o, 0 + k + 4 + 4, x, v << 24); - GuiMessageTag guiMessageTag = line.tag(); - if (guiMessageTag != null) { - int z = guiMessageTag.indicatorColor() | u << 24; - guiGraphics.fill(-4, x - o, -2, x, z); - if (s == n && guiMessageTag.icon() != null) { - int aa = this.getTagIconLeft(line); - int ab = y + 9; - this.drawTagIcon(guiGraphics, aa, ab, guiMessageTag.icon()); - } - } - - guiGraphics.pose().pushPose(); - guiGraphics.pose().translate(0.0F, 0.0F, 50.0F); - guiGraphics.drawString(this.minecraft.font, line.content(), 0, y, ARGB.color(u, -1)); - guiGraphics.pose().popPose(); - } + float g = this.minecraft.options.chatOpacity().get().floatValue() * 0.9F + 0.1F; + float h = this.minecraft.options.textBackgroundOpacity().get().floatValue(); + double d = this.minecraft.options.chatLineSpacing().get(); + int o = (int)Math.round(-8.0 * (d + 1.0) + 4.0 * d); + this.forEachLine(i, tickCount, focused, m, (lx, mx, nx, line, ox, hx) -> { + guiGraphics.fill(lx - 4, mx, lx + k + 4 + 4, nx, ARGB.color(hx * h, -16777216)); + GuiMessageTag guiMessageTag = line.tag(); + if (guiMessageTag != null) { + int px = ARGB.color(hx * g, guiMessageTag.indicatorColor()); + guiGraphics.fill(lx - 4, mx, lx - 2, nx, px); + if (ox == n && guiMessageTag.icon() != null) { + int qx = this.getTagIconLeft(line); + int rx = nx + o + 9; + this.drawTagIcon(guiGraphics, qx, rx, guiMessageTag.icon()); } } - } - - long ac = this.minecraft.getChatListener().queueSize(); - if (ac > 0L) { - int ad = (int)(128.0 * d); - int t = (int)(255.0 * e); - guiGraphics.pose().pushPose(); - guiGraphics.pose().translate(0.0F, (float)m, 0.0F); - guiGraphics.fill(-2, 0, k + 4, 9, t << 24); - guiGraphics.pose().translate(0.0F, 0.0F, 50.0F); - guiGraphics.drawString(this.minecraft.font, Component.translatable("chat.queue", ac), 0, 1, 16777215 + (ad << 24)); - guiGraphics.pose().popPose(); + }); + int p = this.forEachLine(i, tickCount, focused, m, (jx, kx, lx, line, mx, gx) -> { + int nx = lx + o; + guiGraphics.drawString(this.minecraft.font, line.content(), jx, nx, ARGB.color(gx * g, -1)); + }); + long q = this.minecraft.getChatListener().queueSize(); + if (q > 0L) { + int r = (int)(128.0F * g); + int s = (int)(255.0F * h); + guiGraphics.pose().pushMatrix(); + guiGraphics.pose().translate(0.0F, m); + guiGraphics.fill(-2, 0, k + 4, 9, s << 24); + guiGraphics.drawString(this.minecraft.font, Component.translatable("chat.queue", q), 0, 1, ARGB.color(r, -1)); + guiGraphics.pose().popMatrix(); } if (focused) { - int ad = this.getLineHeight(); - int t = j * ad; - int ae = q * ad; - int af = this.chatScrollbarPos * ae / j - m; - int u = ae * ae / t; - if (t != ae) { - int v = af > 0 ? 170 : 96; - int w = this.newMessageSinceScroll ? 13382451 : 3355562; - int x = k + 4; - guiGraphics.fill(x, -af, x + 2, -af - u, 100, w + (v << 24)); - guiGraphics.fill(x + 2, -af, x + 1, -af - u, 100, 13421772 + (v << 24)); + int r = this.getLineHeight(); + int s = j * r; + int t = p * r; + int u = this.chatScrollbarPos * t / j - m; + int v = t * t / s; + if (s != t) { + int w = u > 0 ? 170 : 96; + int x = this.newMessageSinceScroll ? 13382451 : 3355562; + int y = k + 4; + guiGraphics.fill(y, -u, y + 2, -u - v, ARGB.color(w, x)); + guiGraphics.fill(y + 2, -u, y + 1, -u - v, ARGB.color(w, 13421772)); } } - guiGraphics.pose().popPose(); + guiGraphics.pose().popMatrix(); profilerFiller.pop(); } } } - private void drawTagIcon(GuiGraphics guiGraphics, int left, int bottom, Icon tagIcon) { + private void drawTagIcon(GuiGraphics guiGraphics, int left, int bottom, GuiMessageTag.Icon tagIcon) { int i = bottom - tagIcon.height - 1; tagIcon.draw(guiGraphics, left, i); } - private int getTagIconLeft(Line line) { + private int getTagIconLeft(GuiMessage.Line line) { return this.minecraft.font.width(line.content()) + 4; } @@ -218,7 +216,7 @@ public class ChatComponent { private void addMessageToDisplayQueue(GuiMessage message) { int i = Mth.floor(this.getWidth() / this.getScale()); - Icon icon = message.icon(); + GuiMessageTag.Icon icon = message.icon(); if (icon != null) { i -= icon.width + 4 + 2; } @@ -234,7 +232,7 @@ public class ChatComponent { } boolean bl2 = j == list.size() - 1; - this.trimmedMessages.add(0, new Line(message.addedTime(), formattedCharSequence, message.tag(), bl2)); + this.trimmedMessages.add(0, new GuiMessage.Line(message.addedTime(), formattedCharSequence, message.tag(), bl2)); } while (this.trimmedMessages.size() > 100) { @@ -372,7 +370,7 @@ public class ChatComponent { double e = this.screenToChatY(mouseY); int i = this.getMessageLineIndexAt(d, e); if (i >= 0 && i < this.trimmedMessages.size()) { - Line line = (Line)this.trimmedMessages.get(i); + GuiMessage.Line line = (GuiMessage.Line)this.trimmedMessages.get(i); return this.minecraft.font.getSplitter().componentStyleAtWidth(line.content(), Mth.floor(d)); } else { return null; @@ -385,7 +383,7 @@ public class ChatComponent { double e = this.screenToChatY(mouseY); int i = this.getMessageEndIndexAt(d, e); if (i >= 0 && i < this.trimmedMessages.size()) { - Line line = (Line)this.trimmedMessages.get(i); + GuiMessage.Line line = (GuiMessage.Line)this.trimmedMessages.get(i); GuiMessageTag guiMessageTag = line.tag(); if (guiMessageTag != null && this.hasSelectedMessageTag(d, line, guiMessageTag)) { return guiMessageTag; @@ -395,11 +393,11 @@ public class ChatComponent { return null; } - private boolean hasSelectedMessageTag(double x, Line line, GuiMessageTag tag) { + private boolean hasSelectedMessageTag(double x, GuiMessage.Line line, GuiMessageTag tag) { if (x < 0.0) { return true; } else { - Icon icon = tag.icon(); + GuiMessageTag.Icon icon = tag.icon(); if (icon == null) { return false; } else { @@ -425,7 +423,7 @@ public class ChatComponent { return -1; } else { while (i >= 0) { - if (((Line)this.trimmedMessages.get(i)).endOfEntry()) { + if (((GuiMessage.Line)this.trimmedMessages.get(i)).endOfEntry()) { return i; } @@ -519,6 +517,12 @@ public class ChatComponent { record DelayedMessageDeletion(MessageSignature signature, int deletableAfter) { } + @FunctionalInterface + @Environment(EnvType.CLIENT) + interface LineConsumer { + void accept(int i, int j, int k, GuiMessage.Line line, int l, float f); + } + @Environment(EnvType.CLIENT) public static class State { final List messages; diff --git a/net/minecraft/client/gui/components/Checkbox.java b/net/minecraft/client/gui/components/Checkbox.java index d66a5cfd..b6bcf93a 100644 --- a/net/minecraft/client/gui/components/Checkbox.java +++ b/net/minecraft/client/gui/components/Checkbox.java @@ -8,7 +8,7 @@ import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.narration.NarratedElementType; import net.minecraft.client.gui.narration.NarrationElementOutput; -import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.RenderPipelines; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.ARGB; @@ -20,7 +20,7 @@ public class Checkbox extends AbstractButton { private static final ResourceLocation CHECKBOX_SELECTED_SPRITE = ResourceLocation.withDefaultNamespace("widget/checkbox_selected"); private static final ResourceLocation CHECKBOX_HIGHLIGHTED_SPRITE = ResourceLocation.withDefaultNamespace("widget/checkbox_highlighted"); private static final ResourceLocation CHECKBOX_SPRITE = ResourceLocation.withDefaultNamespace("widget/checkbox"); - private static final int TEXT_COLOR = 14737632; + private static final int TEXT_COLOR = -2039584; private static final int SPACING = 4; private static final int BOX_PADDING = 8; private boolean selected; @@ -30,7 +30,7 @@ public class Checkbox extends AbstractButton { Checkbox(int x, int y, int maxWidth, Component message, Font font, boolean selected, Checkbox.OnValueChange onValueChange) { super(x, y, 0, 0, message); this.width = this.getAdjustedWidth(maxWidth, message, font); - this.textWidget = new MultiLineTextWidget(message, font).setMaxWidth(this.width).setColor(14737632); + this.textWidget = new MultiLineTextWidget(message, font).setMaxWidth(this.width).setColor(-2039584); this.height = this.getAdjustedHeight(font); this.selected = selected; this.onValueChange = onValueChange; @@ -90,7 +90,7 @@ public class Checkbox extends AbstractButton { } int i = getBoxSize(font); - guiGraphics.blitSprite(RenderType::guiTextured, resourceLocation, this.getX(), this.getY(), i, i, ARGB.white(this.alpha)); + guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, resourceLocation, this.getX(), this.getY(), i, i, ARGB.white(this.alpha)); int j = this.getX() + i + 4; int k = this.getY() + i / 2 - this.textWidget.getHeight() / 2; this.textWidget.setPosition(j, k); diff --git a/net/minecraft/client/gui/components/CommandSuggestions.java b/net/minecraft/client/gui/components/CommandSuggestions.java index 568628a9..2f501747 100644 --- a/net/minecraft/client/gui/components/CommandSuggestions.java +++ b/net/minecraft/client/gui/components/CommandSuggestions.java @@ -32,6 +32,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.multiplayer.ClientSuggestionProvider; import net.minecraft.client.renderer.Rect2i; import net.minecraft.commands.Commands; import net.minecraft.commands.SharedSuggestionProvider; @@ -68,7 +69,7 @@ public class CommandSuggestions { private int commandUsagePosition; private int commandUsageWidth; @Nullable - private ParseResults currentParse; + private ParseResults currentParse; @Nullable private CompletableFuture pendingSuggestions; @Nullable @@ -210,7 +211,7 @@ public class CommandSuggestions { boolean bl2 = this.commandsOnly || bl; int i = this.input.getCursorPosition(); if (bl2) { - CommandDispatcher commandDispatcher = this.minecraft.player.connection.getCommands(); + CommandDispatcher commandDispatcher = this.minecraft.player.connection.getCommands(); if (this.currentParse == null) { this.currentParse = commandDispatcher.parse(stringReader, this.minecraft.player.connection.getSuggestionsProvider()); } @@ -261,7 +262,7 @@ public class CommandSuggestions { if (((Suggestions)this.pendingSuggestions.join()).isEmpty() && !this.currentParse.getExceptions().isEmpty()) { int i = 0; - for (Entry, CommandSyntaxException> entry : this.currentParse.getExceptions().entrySet()) { + for (Entry, CommandSyntaxException> entry : this.currentParse.getExceptions().entrySet()) { CommandSyntaxException commandSyntaxException = (CommandSyntaxException)entry.getValue(); if (commandSyntaxException.getType() == CommandSyntaxException.BUILT_IN_EXCEPTIONS.literalIncorrect()) { i++; @@ -291,9 +292,9 @@ public class CommandSuggestions { } private boolean fillNodeUsage(ChatFormatting chatFormatting) { - CommandContextBuilder commandContextBuilder = this.currentParse.getContext(); - SuggestionContext suggestionContext = commandContextBuilder.findSuggestionContext(this.input.getCursorPosition()); - Map, String> map = this.minecraft + CommandContextBuilder commandContextBuilder = this.currentParse.getContext(); + SuggestionContext suggestionContext = commandContextBuilder.findSuggestionContext(this.input.getCursorPosition()); + Map, String> map = this.minecraft .player .connection .getCommands() @@ -302,7 +303,7 @@ public class CommandSuggestions { int i = 0; Style style = Style.EMPTY.withColor(chatFormatting); - for (Entry, String> entry : map.entrySet()) { + for (Entry, String> entry : map.entrySet()) { if (!(entry.getKey() instanceof LiteralCommandNode)) { list.add(FormattedCharSequence.forward((String)entry.getValue(), style)); i = Math.max(i, this.font.width((String)entry.getValue())); @@ -328,13 +329,13 @@ public class CommandSuggestions { return suggestionText.startsWith(inputText) ? suggestionText.substring(inputText.length()) : null; } - private static FormattedCharSequence formatText(ParseResults provider, String command, int maxLength) { + private static FormattedCharSequence formatText(ParseResults provider, String command, int maxLength) { List list = Lists.newArrayList(); int i = 0; int j = -1; - CommandContextBuilder commandContextBuilder = provider.getContext().getLastChild(); + CommandContextBuilder commandContextBuilder = provider.getContext().getLastChild(); - for (ParsedArgument parsedArgument : commandContextBuilder.getArguments().values()) { + for (ParsedArgument parsedArgument : commandContextBuilder.getArguments().values()) { if (++j >= ARGUMENT_STYLES.size()) { j = 0; } @@ -484,7 +485,7 @@ public class CommandSuggestions { if (bl5) { Message message = ((Suggestion)this.suggestionList.get(this.current)).getTooltip(); if (message != null) { - guiGraphics.renderTooltip(CommandSuggestions.this.font, ComponentUtils.fromMessage(message), mouseX, mouseY); + guiGraphics.setTooltipForNextFrame(CommandSuggestions.this.font, ComponentUtils.fromMessage(message), mouseX, mouseY); } } } @@ -568,7 +569,7 @@ public class CommandSuggestions { CommandSuggestions.this.input .setSuggestion(CommandSuggestions.calculateSuggestionSuffix(CommandSuggestions.this.input.getValue(), suggestion.apply(this.originalContents))); if (this.lastNarratedEntry != this.current) { - CommandSuggestions.this.minecraft.getNarrator().sayNow(this.getNarrationMessage()); + CommandSuggestions.this.minecraft.getNarrator().saySystemNow(this.getNarrationMessage()); } } diff --git a/net/minecraft/client/gui/components/ContainerObjectSelectionList.java b/net/minecraft/client/gui/components/ContainerObjectSelectionList.java index 556ef556..68cabbfc 100644 --- a/net/minecraft/client/gui/components/ContainerObjectSelectionList.java +++ b/net/minecraft/client/gui/components/ContainerObjectSelectionList.java @@ -10,11 +10,9 @@ import net.minecraft.client.gui.components.events.GuiEventListener; import net.minecraft.client.gui.narration.NarratableEntry; import net.minecraft.client.gui.narration.NarratedElementType; import net.minecraft.client.gui.narration.NarrationElementOutput; -import net.minecraft.client.gui.narration.NarratableEntry.NarrationPriority; import net.minecraft.client.gui.navigation.FocusNavigationEvent; import net.minecraft.client.gui.navigation.ScreenAxis; import net.minecraft.client.gui.navigation.ScreenDirection; -import net.minecraft.client.gui.navigation.FocusNavigationEvent.ArrowNavigation; import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.Component; import net.minecraft.util.Mth; @@ -22,12 +20,12 @@ import org.jetbrains.annotations.Nullable; @Environment(EnvType.CLIENT) public abstract class ContainerObjectSelectionList> extends AbstractSelectionList { - public ContainerObjectSelectionList(Minecraft minecraft, int i, int j, int k, int l) { - super(minecraft, i, j, k, l); + public ContainerObjectSelectionList(Minecraft minecraft, int width, int height, int y, int itemHeight) { + super(minecraft, width, height, y, itemHeight); } - public ContainerObjectSelectionList(Minecraft minecraft, int i, int j, int k, int l, int m) { - super(minecraft, i, j, k, l, m); + public ContainerObjectSelectionList(Minecraft minecraft, int width, int height, int y, int itemHeight, int headerHeight) { + super(minecraft, width, height, y, itemHeight, headerHeight); } @Nullable @@ -35,7 +33,7 @@ public abstract class ContainerObjectSelectionList> - extends net.minecraft.client.gui.components.AbstractSelectionList.Entry - implements ContainerEventHandler { + public abstract static class Entry> extends AbstractSelectionList.Entry implements ContainerEventHandler { @Nullable private GuiEventListener focused; @Nullable @@ -174,7 +170,7 @@ public abstract class ContainerObjectSelectionList -1; case RIGHT -> 1; @@ -212,7 +208,7 @@ public abstract class ContainerObjectSelectionList extends AbstractButton { return this; } - public CycleButton.Builder displayOnlyValue() { - this.displayOnlyValue = true; + public CycleButton.Builder displayOnlyValue(boolean displayOnlyValue) { + this.displayOnlyValue = displayOnlyValue; return this; } + public CycleButton.Builder displayOnlyValue() { + return this.displayOnlyValue(true); + } + public CycleButton create(Component message, CycleButton.OnValueChange onValueChange) { return this.create(0, 0, 150, 20, message, onValueChange); } @@ -265,6 +267,7 @@ public class CycleButton extends AbstractButton { } } + @FunctionalInterface @Environment(EnvType.CLIENT) public interface OnValueChange { void onValueChange(CycleButton cycleButton, T object); @@ -277,14 +280,34 @@ public class CycleButton extends AbstractButton { List getDefaultList(); static CycleButton.ValueListSupplier create(Collection values) { - List list = ImmutableList.copyOf(values); - return new 1(list); + final List list = ImmutableList.copyOf(values); + return new CycleButton.ValueListSupplier() { + @Override + public List getSelectedList() { + return list; + } + + @Override + public List getDefaultList() { + return list; + } + }; } static CycleButton.ValueListSupplier create(BooleanSupplier altListSelector, List defaultList, List selectedList) { - List list = ImmutableList.copyOf(defaultList); - List list2 = ImmutableList.copyOf(selectedList); - return new 2(altListSelector, list2, list); + final List list = ImmutableList.copyOf(defaultList); + final List list2 = ImmutableList.copyOf(selectedList); + return new CycleButton.ValueListSupplier() { + @Override + public List getSelectedList() { + return altListSelector.getAsBoolean() ? list2 : list; + } + + @Override + public List getDefaultList() { + return list; + } + }; } } } diff --git a/net/minecraft/client/gui/components/DebugScreenOverlay.java b/net/minecraft/client/gui/components/DebugScreenOverlay.java index ba4bc514..34e31c27 100644 --- a/net/minecraft/client/gui/components/DebugScreenOverlay.java +++ b/net/minecraft/client/gui/components/DebugScreenOverlay.java @@ -3,16 +3,15 @@ package net.minecraft.client.gui.components; import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import com.mojang.blaze3d.buffers.BufferType; -import com.mojang.blaze3d.buffers.BufferUsage; import com.mojang.blaze3d.buffers.GpuBuffer; +import com.mojang.blaze3d.buffers.GpuBufferSlice; import com.mojang.blaze3d.pipeline.RenderPipeline; import com.mojang.blaze3d.pipeline.RenderTarget; import com.mojang.blaze3d.platform.GLX; import com.mojang.blaze3d.systems.GpuDevice; import com.mojang.blaze3d.systems.RenderPass; import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.textures.GpuTexture; +import com.mojang.blaze3d.textures.GpuTextureView; import com.mojang.blaze3d.vertex.BufferBuilder; import com.mojang.blaze3d.vertex.ByteBufferBuilder; import com.mojang.blaze3d.vertex.DefaultVertexFormat; @@ -41,6 +40,7 @@ import net.fabricmc.api.Environment; import net.minecraft.ChatFormatting; import net.minecraft.SharedConstants; import net.minecraft.Util; +import net.minecraft.client.Camera; import net.minecraft.client.ClientBrandRetriever; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; @@ -51,6 +51,7 @@ import net.minecraft.client.gui.components.debugchart.PingDebugChart; import net.minecraft.client.gui.components.debugchart.ProfilerPieChart; import net.minecraft.client.gui.components.debugchart.TpsDebugChart; import net.minecraft.client.multiplayer.ClientPacketListener; +import net.minecraft.client.renderer.DynamicUniforms; import net.minecraft.client.renderer.RenderPipelines; import net.minecraft.client.server.IntegratedServer; import net.minecraft.core.BlockPos; @@ -80,7 +81,7 @@ import net.minecraft.world.level.LightLayer; import net.minecraft.world.level.NaturalSpawner; import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.biome.BiomeSource; -import net.minecraft.world.level.biome.Climate.Sampler; +import net.minecraft.world.level.biome.Climate; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.Property; import net.minecraft.world.level.chunk.ChunkGenerator; @@ -91,14 +92,17 @@ import net.minecraft.world.level.levelgen.RandomState; import net.minecraft.world.level.material.FluidState; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.HitResult; -import net.minecraft.world.phys.HitResult.Type; import org.jetbrains.annotations.Nullable; +import org.joml.Matrix4f; +import org.joml.Matrix4fStack; +import org.joml.Vector3f; +import org.joml.Vector4f; @Environment(EnvType.CLIENT) public class DebugScreenOverlay { - private static final float CROSSHAIR_LENGTH = 10.0F; + private static final float CROSSHAIR_SCALE = 0.01F; private static final int CROSHAIR_INDEX_COUNT = 18; - private static final int COLOR_GREY = 14737632; + private static final int COLOR_GREY = -2039584; private static final int MARGIN_RIGHT = 2; private static final int MARGIN_LEFT = 2; private static final int MARGIN_TOP = 2; @@ -156,18 +160,17 @@ public class DebugScreenOverlay { this.bandwidthChart = new BandwidthDebugChart(this.font, this.bandwidthLogger); this.profilerPieChart = new ProfilerPieChart(this.font); - try (ByteBufferBuilder byteBufferBuilder = new ByteBufferBuilder(DefaultVertexFormat.POSITION_COLOR_NORMAL.getVertexSize() * 12)) { + try (ByteBufferBuilder byteBufferBuilder = ByteBufferBuilder.exactlySized(DefaultVertexFormat.POSITION_COLOR_NORMAL.getVertexSize() * 12)) { BufferBuilder bufferBuilder = new BufferBuilder(byteBufferBuilder, VertexFormat.Mode.LINES, DefaultVertexFormat.POSITION_COLOR_NORMAL); bufferBuilder.addVertex(0.0F, 0.0F, 0.0F).setColor(-65536).setNormal(1.0F, 0.0F, 0.0F); - bufferBuilder.addVertex(10.0F, 0.0F, 0.0F).setColor(-65536).setNormal(1.0F, 0.0F, 0.0F); + bufferBuilder.addVertex(1.0F, 0.0F, 0.0F).setColor(-65536).setNormal(1.0F, 0.0F, 0.0F); bufferBuilder.addVertex(0.0F, 0.0F, 0.0F).setColor(-16711936).setNormal(0.0F, 1.0F, 0.0F); - bufferBuilder.addVertex(0.0F, 10.0F, 0.0F).setColor(-16711936).setNormal(0.0F, 1.0F, 0.0F); + bufferBuilder.addVertex(0.0F, 1.0F, 0.0F).setColor(-16711936).setNormal(0.0F, 1.0F, 0.0F); bufferBuilder.addVertex(0.0F, 0.0F, 0.0F).setColor(-8421377).setNormal(0.0F, 0.0F, 1.0F); - bufferBuilder.addVertex(0.0F, 0.0F, 10.0F).setColor(-8421377).setNormal(0.0F, 0.0F, 1.0F); + bufferBuilder.addVertex(0.0F, 0.0F, 1.0F).setColor(-8421377).setNormal(0.0F, 0.0F, 1.0F); try (MeshData meshData = bufferBuilder.buildOrThrow()) { - this.crosshairBuffer = RenderSystem.getDevice() - .createBuffer(() -> "Crosshair vertex buffer", BufferType.VERTICES, BufferUsage.STATIC_WRITE, meshData.vertexBuffer()); + this.crosshairBuffer = RenderSystem.getDevice().createBuffer(() -> "Crosshair vertex buffer", 32, meshData.vertexBuffer()); } } } @@ -185,6 +188,7 @@ public class DebugScreenOverlay { this.liquid = entity.pick(20.0, 0.0F, true); this.drawGameInformation(guiGraphics); this.drawSystemInformation(guiGraphics); + guiGraphics.nextStratum(); this.profilerPieChart.setBottomOffset(10); if (this.renderFpsCharts) { int i = guiGraphics.guiWidth(); @@ -259,7 +263,7 @@ public class DebugScreenOverlay { int k = this.font.width(string); int l = leftSide ? 2 : guiGraphics.guiWidth() - 2 - k; int m = 2 + i * jx; - guiGraphics.drawString(this.font, string, l, m, 14737632, false); + guiGraphics.drawString(this.font, string, l, m, -2039584, false); } } } @@ -300,7 +304,7 @@ public class DebugScreenOverlay { if (this.minecraft.showOnlyReducedInfo()) { return Lists.newArrayList( "Minecraft " - + SharedConstants.getCurrentVersion().getName() + + SharedConstants.getCurrentVersion().name() + " (" + this.minecraft.getLaunchedVersion() + "/" @@ -336,7 +340,7 @@ public class DebugScreenOverlay { LongSet longSet = (LongSet)(level instanceof ServerLevel ? ((ServerLevel)level).getForceLoadedChunks() : LongSets.EMPTY_SET); List list = Lists.newArrayList( "Minecraft " - + SharedConstants.getCurrentVersion().getName() + + SharedConstants.getCurrentVersion().name() + " (" + this.minecraft.getLaunchedVersion() + "/" @@ -458,7 +462,7 @@ public class DebugScreenOverlay { ChunkGenerator chunkGenerator = serverChunkCache.getGenerator(); RandomState randomState = serverChunkCache.randomState(); chunkGenerator.addDebugScreenInfo(list, randomState, blockPos); - Sampler sampler = randomState.sampler(); + Climate.Sampler sampler = randomState.sampler(); BiomeSource biomeSource = chunkGenerator.getBiomeSource(); biomeSource.addDebugInfo(list, blockPos, sampler); NaturalSpawner.SpawnState spawnState = serverChunkCache.getLastSpawnState(); @@ -561,7 +565,7 @@ public class DebugScreenOverlay { if (this.minecraft.showOnlyReducedInfo()) { return list; } else { - if (this.block.getType() == Type.BLOCK) { + if (this.block.getType() == HitResult.Type.BLOCK) { BlockPos blockPos = ((BlockHitResult)this.block).getBlockPos(); BlockState blockState = this.minecraft.level.getBlockState(blockPos); list.add(""); @@ -575,7 +579,7 @@ public class DebugScreenOverlay { blockState.getTags().map(tagKey -> "#" + tagKey.location()).forEach(list::add); } - if (this.liquid.getType() == Type.BLOCK) { + if (this.liquid.getType() == HitResult.Type.BLOCK) { BlockPos blockPos = ((BlockHitResult)this.liquid).getBlockPos(); FluidState fluidState = this.minecraft.level.getFluidState(blockPos); list.add(""); @@ -694,28 +698,39 @@ public class DebugScreenOverlay { this.bandwidthLogger.reset(); } - public void render3dCrosshair() { + public void render3dCrosshair(Camera camera) { + Matrix4fStack matrix4fStack = RenderSystem.getModelViewStack(); + matrix4fStack.pushMatrix(); + matrix4fStack.translate(0.0F, 0.0F, -1.0F); + matrix4fStack.rotateX(camera.getXRot() * (float) (Math.PI / 180.0)); + matrix4fStack.rotateY(camera.getYRot() * (float) (Math.PI / 180.0)); + float f = 0.01F * this.minecraft.getWindow().getGuiScale(); + matrix4fStack.scale(-f, f, -f); RenderPipeline renderPipeline = RenderPipelines.LINES; - RenderSystem.setShaderColor(0.0F, 0.0F, 0.0F, 1.0F); RenderTarget renderTarget = Minecraft.getInstance().getMainRenderTarget(); - GpuTexture gpuTexture = renderTarget.getColorTexture(); - GpuTexture gpuTexture2 = renderTarget.getDepthTexture(); + GpuTextureView gpuTextureView = renderTarget.getColorTextureView(); + GpuTextureView gpuTextureView2 = renderTarget.getDepthTextureView(); GpuBuffer gpuBuffer = this.crosshairIndicies.getBuffer(18); + GpuBufferSlice[] gpuBufferSlices = RenderSystem.getDynamicUniforms() + .writeTransforms( + new DynamicUniforms.Transform(new Matrix4f(matrix4fStack), new Vector4f(0.0F, 0.0F, 0.0F, 1.0F), new Vector3f(), new Matrix4f(), 4.0F), + new DynamicUniforms.Transform(new Matrix4f(matrix4fStack), new Vector4f(1.0F, 1.0F, 1.0F, 1.0F), new Vector3f(), new Matrix4f(), 2.0F) + ); try (RenderPass renderPass = RenderSystem.getDevice() .createCommandEncoder() - .createRenderPass(gpuTexture, OptionalInt.empty(), gpuTexture2, OptionalDouble.empty())) { + .createRenderPass(() -> "3d crosshair", gpuTextureView, OptionalInt.empty(), gpuTextureView2, OptionalDouble.empty())) { renderPass.setPipeline(renderPipeline); - RenderSystem.setShaderColor(0.0F, 0.0F, 0.0F, 1.0F); - RenderSystem.lineWidth(4.0F); + RenderSystem.bindDefaultUniforms(renderPass); renderPass.setVertexBuffer(0, this.crosshairBuffer); renderPass.setIndexBuffer(gpuBuffer, this.crosshairIndicies.type()); - renderPass.drawIndexed(0, 18); - RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); - RenderSystem.lineWidth(2.0F); - renderPass.drawIndexed(0, 18); - RenderSystem.lineWidth(1.0F); + renderPass.setUniform("DynamicTransforms", gpuBufferSlices[0]); + renderPass.drawIndexed(0, 0, 18, 1); + renderPass.setUniform("DynamicTransforms", gpuBufferSlices[1]); + renderPass.drawIndexed(0, 0, 18, 1); } + + matrix4fStack.popMatrix(); } @Environment(EnvType.CLIENT) diff --git a/net/minecraft/client/gui/components/EditBox.java b/net/minecraft/client/gui/components/EditBox.java index f984d4fd..8c347c88 100644 --- a/net/minecraft/client/gui/components/EditBox.java +++ b/net/minecraft/client/gui/components/EditBox.java @@ -13,7 +13,7 @@ import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.narration.NarratedElementType; import net.minecraft.client.gui.narration.NarrationElementOutput; import net.minecraft.client.gui.screens.Screen; -import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.RenderPipelines; import net.minecraft.client.sounds.SoundManager; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; @@ -34,7 +34,7 @@ public class EditBox extends AbstractWidget { private static final int CURSOR_INSERT_WIDTH = 1; private static final int CURSOR_INSERT_COLOR = -3092272; private static final String CURSOR_APPEND_CHARACTER = "_"; - public static final int DEFAULT_TEXT_COLOR = 14737632; + public static final int DEFAULT_TEXT_COLOR = -2039584; private static final int CURSOR_BLINK_INTERVAL_MS = 300; private final Font font; /** @@ -51,6 +51,8 @@ public class EditBox extends AbstractWidget { * If this value is true along with isFocused, keyTyped will process the keys. */ private boolean isEditable = true; + private boolean centered = false; + private boolean textShadow = true; /** * The current character index that should be used as start of the rendered text. */ @@ -60,8 +62,8 @@ public class EditBox extends AbstractWidget { * other selection position, maybe the same as the cursor */ private int highlightPos; - private int textColor = 14737632; - private int textColorUneditable = 7368816; + private int textColor = -2039584; + private int textColorUneditable = -9408400; @Nullable private String suggestion; @Nullable @@ -74,6 +76,8 @@ public class EditBox extends AbstractWidget { @Nullable private Component hint; private long focusedTime = Util.getMillis(); + private int textX; + private int textY; public EditBox(Font font, int width, int height, Component message) { this(font, 0, 0, width, height, message); @@ -89,6 +93,8 @@ public class EditBox extends AbstractWidget { if (editBox != null) { this.setValue(editBox.getValue()); } + + this.updateTextPosition(); } public void setResponder(Consumer responder) { @@ -138,6 +144,18 @@ public class EditBox extends AbstractWidget { return this.value.substring(i, j); } + @Override + public void setX(int x) { + super.setX(x); + this.updateTextPosition(); + } + + @Override + public void setY(int y) { + super.setY(y); + this.updateTextPosition(); + } + public void setFilter(Predicate validator) { this.filter = validator; } @@ -175,6 +193,8 @@ public class EditBox extends AbstractWidget { if (this.responder != null) { this.responder.accept(newText); } + + this.updateTextPosition(); } private void deleteText(int count) { @@ -396,11 +416,7 @@ public class EditBox extends AbstractWidget { @Override public void onClick(double mouseX, double mouseY) { - int i = Mth.floor(mouseX) - this.getX(); - if (this.bordered) { - i -= 4; - } - + int i = Mth.floor(mouseX) - this.textX; String string = this.font.plainSubstrByWidth(this.value.substring(this.displayPos), this.getInnerWidth()); this.moveCursorTo(this.font.plainSubstrByWidth(string, i).length() + this.displayPos, Screen.hasShiftDown()); } @@ -414,7 +430,7 @@ public class EditBox extends AbstractWidget { if (this.isVisible()) { if (this.isBordered()) { ResourceLocation resourceLocation = SPRITES.get(this.isActive(), this.isFocused()); - guiGraphics.blitSprite(RenderType::guiTextured, resourceLocation, this.getX(), this.getY(), this.getWidth(), this.getHeight()); + guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, resourceLocation, this.getX(), this.getY(), this.getWidth(), this.getHeight()); } int i = this.isEditable ? this.textColor : this.textColorUneditable; @@ -422,48 +438,56 @@ public class EditBox extends AbstractWidget { String string = this.font.plainSubstrByWidth(this.value.substring(this.displayPos), this.getInnerWidth()); boolean bl = j >= 0 && j <= string.length(); boolean bl2 = this.isFocused() && (Util.getMillis() - this.focusedTime) / 300L % 2L == 0L && bl; - int k = this.bordered ? this.getX() + 4 : this.getX(); - int l = this.bordered ? this.getY() + (this.height - 8) / 2 : this.getY(); - int m = k; - int n = Mth.clamp(this.highlightPos - this.displayPos, 0, string.length()); + int k = this.textX; + int l = Mth.clamp(this.highlightPos - this.displayPos, 0, string.length()); if (!string.isEmpty()) { String string2 = bl ? string.substring(0, j) : string; - m = guiGraphics.drawString(this.font, (FormattedCharSequence)this.formatter.apply(string2, this.displayPos), k, l, i); + FormattedCharSequence formattedCharSequence = (FormattedCharSequence)this.formatter.apply(string2, this.displayPos); + guiGraphics.drawString(this.font, formattedCharSequence, k, this.textY, i, this.textShadow); + k += this.font.width(formattedCharSequence) + 1; } boolean bl3 = this.cursorPos < this.value.length() || this.value.length() >= this.getMaxLength(); - int o = m; + int m = k; if (!bl) { - o = j > 0 ? k + this.width : k; + m = j > 0 ? this.textX + this.width : this.textX; } else if (bl3) { - o = m - 1; - m--; + m = k - 1; + k--; } if (!string.isEmpty() && bl && j < string.length()) { - guiGraphics.drawString(this.font, (FormattedCharSequence)this.formatter.apply(string.substring(j), this.cursorPos), m, l, i); + guiGraphics.drawString(this.font, (FormattedCharSequence)this.formatter.apply(string.substring(j), this.cursorPos), k, this.textY, i, this.textShadow); } if (this.hint != null && string.isEmpty() && !this.isFocused()) { - guiGraphics.drawString(this.font, this.hint, m, l, i); + guiGraphics.drawString(this.font, this.hint, k, this.textY, i); } if (!bl3 && this.suggestion != null) { - guiGraphics.drawString(this.font, this.suggestion, o - 1, l, -8355712); + guiGraphics.drawString(this.font, this.suggestion, m - 1, this.textY, -8355712, this.textShadow); + } + + if (l != j) { + int n = this.textX + this.font.width(string.substring(0, l)); + this.renderHighlight(guiGraphics, m, this.textY - 1, n - 1, this.textY + 1 + 9); } if (bl2) { if (bl3) { - guiGraphics.fill(RenderType.guiOverlay(), o, l - 1, o + 1, l + 1 + 9, -3092272); + guiGraphics.fill(m, this.textY - 1, m + 1, this.textY + 1 + 9, -3092272); } else { - guiGraphics.drawString(this.font, "_", o, l, i); + guiGraphics.drawString(this.font, "_", m, this.textY, i, this.textShadow); } } + } + } - if (n != j) { - int p = k + this.font.width(string.substring(0, n)); - this.renderHighlight(guiGraphics, o, l - 1, p - 1, l + 1 + 9); - } + private void updateTextPosition() { + if (this.font != null) { + String string = this.font.plainSubstrByWidth(this.value.substring(this.displayPos), this.getInnerWidth()); + this.textX = this.getX() + (this.isCentered() ? (this.getWidth() - this.font.width(string)) / 2 : (this.bordered ? 4 : 0)); + this.textY = this.bordered ? this.getY() + (this.height - 8) / 2 : this.getY(); } } @@ -488,7 +512,7 @@ public class EditBox extends AbstractWidget { minX = this.getX() + this.width; } - guiGraphics.fill(RenderType.guiTextHighlight(), minX, minY, maxX, maxY, -16776961); + guiGraphics.fill(RenderPipelines.GUI_TEXT_HIGHLIGHT, minX, minY, maxX, maxY, -16776961); } /** @@ -528,6 +552,7 @@ public class EditBox extends AbstractWidget { */ public void setBordered(boolean enableBackgroundDrawing) { this.bordered = enableBackgroundDrawing; + this.updateTextPosition(); } /** @@ -565,6 +590,19 @@ public class EditBox extends AbstractWidget { this.isEditable = enabled; } + private boolean isCentered() { + return this.centered; + } + + public void setCentered(boolean centered) { + this.centered = centered; + this.updateTextPosition(); + } + + public void setTextShadow(boolean textShadow) { + this.textShadow = textShadow; + } + /** * Returns the width of the textbox depending on if background drawing is enabled. */ diff --git a/net/minecraft/client/gui/components/FittingMultiLineTextWidget.java b/net/minecraft/client/gui/components/FittingMultiLineTextWidget.java index 848b62a0..c802c4c5 100644 --- a/net/minecraft/client/gui/components/FittingMultiLineTextWidget.java +++ b/net/minecraft/client/gui/components/FittingMultiLineTextWidget.java @@ -51,10 +51,10 @@ public class FittingMultiLineTextWidget extends AbstractTextAreaWidget { @Override protected void renderContents(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTick) { - guiGraphics.pose().pushPose(); - guiGraphics.pose().translate((float)this.getInnerLeft(), (float)this.getInnerTop(), 0.0F); + guiGraphics.pose().pushMatrix(); + guiGraphics.pose().translate(this.getInnerLeft(), this.getInnerTop()); this.multilineWidget.render(guiGraphics, mouseX, mouseY, partialTick); - guiGraphics.pose().popPose(); + guiGraphics.pose().popMatrix(); } @Override diff --git a/net/minecraft/client/gui/components/FocusableTextWidget.java b/net/minecraft/client/gui/components/FocusableTextWidget.java index ae117b9e..654dbb65 100644 --- a/net/minecraft/client/gui/components/FocusableTextWidget.java +++ b/net/minecraft/client/gui/components/FocusableTextWidget.java @@ -8,11 +8,13 @@ import net.minecraft.client.gui.narration.NarratedElementType; import net.minecraft.client.gui.narration.NarrationElementOutput; import net.minecraft.client.sounds.SoundManager; import net.minecraft.network.chat.Component; +import net.minecraft.util.ARGB; @Environment(EnvType.CLIENT) public class FocusableTextWidget extends MultiLineTextWidget { - private static final int DEFAULT_PADDING = 4; + public static final int DEFAULT_PADDING = 4; private final boolean alwaysShowBorder; + private final boolean fillBackground; private final int padding; public FocusableTextWidget(int maxWidth, Component message, Font font) { @@ -20,15 +22,16 @@ public class FocusableTextWidget extends MultiLineTextWidget { } public FocusableTextWidget(int maxWidth, Component message, Font font, int padding) { - this(maxWidth, message, font, true, padding); + this(maxWidth, message, font, true, true, padding); } - public FocusableTextWidget(int maxWidth, Component message, Font font, boolean alwaysShowBorder, int padding) { + public FocusableTextWidget(int maxWidth, Component message, Font font, boolean alwaysShowBorder, boolean fillBackground, int padding) { super(message, font); this.setMaxWidth(maxWidth); this.setCentered(true); this.active = true; this.alwaysShowBorder = alwaysShowBorder; + this.fillBackground = fillBackground; this.padding = padding; } @@ -43,13 +46,16 @@ public class FocusableTextWidget extends MultiLineTextWidget { @Override public void renderWidget(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTick) { + int i = this.getX() - this.padding; + int j = this.getY() - this.padding; + int k = this.getWidth() + this.padding * 2; + int l = this.getHeight() + this.padding * 2; + int m = ARGB.color(this.alpha, this.alwaysShowBorder ? (this.isFocused() ? -1 : -6250336) : -1); + if (this.fillBackground) { + guiGraphics.fill(i + 1, j, i + k, j + l, ARGB.color(this.alpha, -16777216)); + } + if (this.isFocused() || this.alwaysShowBorder) { - int i = this.getX() - this.padding; - int j = this.getY() - this.padding; - int k = this.getWidth() + this.padding * 2; - int l = this.getHeight() + this.padding * 2; - int m = this.alwaysShowBorder ? (this.isFocused() ? -1 : -6250336) : -1; - guiGraphics.fill(i + 1, j, i + k, j + l, -16777216); guiGraphics.renderOutline(i, j, k, l, m); } diff --git a/net/minecraft/client/gui/components/ImageButton.java b/net/minecraft/client/gui/components/ImageButton.java index 8d0edd96..d1b33ca8 100644 --- a/net/minecraft/client/gui/components/ImageButton.java +++ b/net/minecraft/client/gui/components/ImageButton.java @@ -3,7 +3,7 @@ package net.minecraft.client.gui.components; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.RenderPipelines; import net.minecraft.network.chat.CommonComponents; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; @@ -28,6 +28,6 @@ public class ImageButton extends Button { @Override public void renderWidget(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTick) { ResourceLocation resourceLocation = this.sprites.get(this.isActive(), this.isHoveredOrFocused()); - guiGraphics.blitSprite(RenderType::guiTextured, resourceLocation, this.getX(), this.getY(), this.width, this.height); + guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, resourceLocation, this.getX(), this.getY(), this.width, this.height); } } diff --git a/net/minecraft/client/gui/components/ImageWidget.java b/net/minecraft/client/gui/components/ImageWidget.java index 1ebd7683..3b3c0b76 100644 --- a/net/minecraft/client/gui/components/ImageWidget.java +++ b/net/minecraft/client/gui/components/ImageWidget.java @@ -6,7 +6,7 @@ import net.minecraft.client.gui.ComponentPath; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.narration.NarrationElementOutput; import net.minecraft.client.gui.navigation.FocusNavigationEvent; -import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.RenderPipelines; import net.minecraft.client.sounds.SoundManager; import net.minecraft.network.chat.CommonComponents; import net.minecraft.resources.ResourceLocation; @@ -39,6 +39,8 @@ public abstract class ImageWidget extends AbstractWidget { return false; } + public abstract void updateResource(ResourceLocation resource); + @Nullable @Override public ComponentPath nextFocusPath(FocusNavigationEvent event) { @@ -47,7 +49,7 @@ public abstract class ImageWidget extends AbstractWidget { @Environment(EnvType.CLIENT) static class Sprite extends ImageWidget { - private final ResourceLocation sprite; + private ResourceLocation sprite; public Sprite(int x, int y, int width, int height, ResourceLocation sprite) { super(x, y, width, height); @@ -56,13 +58,18 @@ public abstract class ImageWidget extends AbstractWidget { @Override public void renderWidget(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTick) { - guiGraphics.blitSprite(RenderType::guiTextured, this.sprite, this.getX(), this.getY(), this.getWidth(), this.getHeight()); + guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, this.sprite, this.getX(), this.getY(), this.getWidth(), this.getHeight()); + } + + @Override + public void updateResource(ResourceLocation resource) { + this.sprite = resource; } } @Environment(EnvType.CLIENT) static class Texture extends ImageWidget { - private final ResourceLocation texture; + private ResourceLocation texture; private final int textureWidth; private final int textureHeight; @@ -76,8 +83,13 @@ public abstract class ImageWidget extends AbstractWidget { @Override protected void renderWidget(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTick) { guiGraphics.blit( - RenderType::guiTextured, this.texture, this.getX(), this.getY(), 0.0F, 0.0F, this.getWidth(), this.getHeight(), this.textureWidth, this.textureHeight + RenderPipelines.GUI_TEXTURED, this.texture, this.getX(), this.getY(), 0.0F, 0.0F, this.getWidth(), this.getHeight(), this.textureWidth, this.textureHeight ); } + + @Override + public void updateResource(ResourceLocation resource) { + this.texture = resource; + } } } diff --git a/net/minecraft/client/gui/components/ItemDisplayWidget.java b/net/minecraft/client/gui/components/ItemDisplayWidget.java new file mode 100644 index 00000000..40bc4a3a --- /dev/null +++ b/net/minecraft/client/gui/components/ItemDisplayWidget.java @@ -0,0 +1,53 @@ +package net.minecraft.client.gui.components; + +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.client.gui.narration.NarratedElementType; +import net.minecraft.client.gui.narration.NarrationElementOutput; +import net.minecraft.network.chat.Component; +import net.minecraft.world.item.ItemStack; + +@Environment(EnvType.CLIENT) +public class ItemDisplayWidget extends AbstractWidget { + private final Minecraft minecraft; + private final int offsetX; + private final int offsetY; + private final ItemStack itemStack; + private final boolean decorations; + private final boolean tooltip; + + public ItemDisplayWidget( + Minecraft minecraft, int offsetX, int offsetY, int width, int height, Component message, ItemStack itemStack, boolean decorations, boolean tooltip + ) { + super(0, 0, width, height, message); + this.minecraft = minecraft; + this.offsetX = offsetX; + this.offsetY = offsetY; + this.itemStack = itemStack; + this.decorations = decorations; + this.tooltip = tooltip; + } + + @Override + protected void renderWidget(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTick) { + guiGraphics.renderItem(this.itemStack, this.getX() + this.offsetX, this.getY() + this.offsetY, 0); + if (this.decorations) { + guiGraphics.renderItemDecorations(this.minecraft.font, this.itemStack, this.getX() + this.offsetX, this.getY() + this.offsetY, null); + } + + if (this.isFocused()) { + guiGraphics.renderOutline(this.getX(), this.getY(), this.getWidth(), this.getHeight(), -1); + } + + if (this.tooltip && this.isHoveredOrFocused()) { + guiGraphics.setTooltipForNextFrame(this.minecraft.font, this.itemStack, mouseX, mouseY); + } + } + + @Override + protected void updateWidgetNarration(NarrationElementOutput narrationElementOutput) { + narrationElementOutput.add(NarratedElementType.TITLE, Component.translatable("narration.item", this.itemStack.getHoverName())); + } +} diff --git a/net/minecraft/client/gui/components/LockIconButton.java b/net/minecraft/client/gui/components/LockIconButton.java index e1fab6ad..93115baf 100644 --- a/net/minecraft/client/gui/components/LockIconButton.java +++ b/net/minecraft/client/gui/components/LockIconButton.java @@ -3,7 +3,7 @@ package net.minecraft.client.gui.components; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.RenderPipelines; import net.minecraft.network.chat.CommonComponents; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; @@ -44,7 +44,7 @@ public class LockIconButton extends Button { icon = this.locked ? LockIconButton.Icon.LOCKED : LockIconButton.Icon.UNLOCKED; } - guiGraphics.blitSprite(RenderType::guiTextured, icon.sprite, this.getX(), this.getY(), this.width, this.height); + guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, icon.sprite, this.getX(), this.getY(), this.width, this.height); } @Environment(EnvType.CLIENT) diff --git a/net/minecraft/client/gui/components/LogoRenderer.java b/net/minecraft/client/gui/components/LogoRenderer.java index e90b1a81..99453728 100644 --- a/net/minecraft/client/gui/components/LogoRenderer.java +++ b/net/minecraft/client/gui/components/LogoRenderer.java @@ -3,7 +3,7 @@ package net.minecraft.client.gui.components; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.RenderPipelines; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.ARGB; import net.minecraft.util.RandomSource; @@ -38,9 +38,13 @@ public class LogoRenderer { int i = screenWidth / 2 - 128; float f = this.keepLogoThroughFade ? 1.0F : transparency; int j = ARGB.white(f); - guiGraphics.blit(RenderType::guiTextured, this.showEasterEgg ? EASTER_EGG_LOGO : MINECRAFT_LOGO, i, height, 0.0F, 0.0F, 256, 44, 256, 64, j); + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, this.showEasterEgg ? EASTER_EGG_LOGO : MINECRAFT_LOGO, i, height, 0.0F, 0.0F, 256, 44, 256, 64, j); int k = screenWidth / 2 - 64; int l = height + 44 - 7; - guiGraphics.blit(RenderType::guiTextured, MINECRAFT_EDITION, k, l, 0.0F, 0.0F, 128, 14, 128, 16, j); + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, MINECRAFT_EDITION, k, l, 0.0F, 0.0F, 128, 14, 128, 16, j); + } + + public boolean keepLogoThroughFade() { + return this.keepLogoThroughFade; } } diff --git a/net/minecraft/client/gui/components/MultiLineEditBox.java b/net/minecraft/client/gui/components/MultiLineEditBox.java index 618ce39a..0c10ebe9 100644 --- a/net/minecraft/client/gui/components/MultiLineEditBox.java +++ b/net/minecraft/client/gui/components/MultiLineEditBox.java @@ -6,18 +6,18 @@ import net.fabricmc.api.Environment; import net.minecraft.Util; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.client.gui.components.MultilineTextField.StringView; import net.minecraft.client.gui.narration.NarratedElementType; import net.minecraft.client.gui.narration.NarrationElementOutput; import net.minecraft.client.gui.screens.Screen; -import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.RenderPipelines; +import net.minecraft.network.chat.CommonComponents; import net.minecraft.network.chat.Component; import net.minecraft.util.StringUtil; @Environment(EnvType.CLIENT) public class MultiLineEditBox extends AbstractTextAreaWidget { private static final int CURSOR_INSERT_WIDTH = 1; - private static final int CURSOR_INSERT_COLOR = -3092272; + private static final int CURSOR_COLOR = -3092272; private static final String CURSOR_APPEND_CHARACTER = "_"; private static final int TEXT_COLOR = -2039584; private static final int PLACEHOLDER_TEXT_COLOR = -857677600; @@ -25,11 +25,30 @@ public class MultiLineEditBox extends AbstractTextAreaWidget { private final Font font; private final Component placeholder; private final MultilineTextField textField; + private final int textColor; + private final boolean textShadow; + private final int cursorColor; private long focusedTime = Util.getMillis(); - public MultiLineEditBox(Font font, int x, int y, int width, int height, Component placeholder, Component message) { - super(x, y, width, height, message); + MultiLineEditBox( + Font font, + int x, + int y, + int width, + int height, + Component placeholder, + Component message, + int textColor, + boolean textShadow, + int cursorColor, + boolean showBackground, + boolean showDecorations + ) { + super(x, y, width, height, message, showBackground, showDecorations); this.font = font; + this.textShadow = textShadow; + this.textColor = textColor; + this.cursorColor = cursorColor; this.placeholder = placeholder; this.textField = new MultilineTextField(font, width - this.totalInnerPadding()); this.textField.setCursorListener(this::scrollToCursor); @@ -39,12 +58,20 @@ public class MultiLineEditBox extends AbstractTextAreaWidget { this.textField.setCharacterLimit(characterLimit); } + public void setLineLimit(int lineLimit) { + this.textField.setLineLimit(lineLimit); + } + public void setValueListener(Consumer valueListener) { this.textField.setValueListener(valueListener); } - public void setValue(String fullText) { - this.textField.setValue(fullText); + public void setValue(String value) { + this.setValue(value, false); + } + + public void setValue(String value, boolean force) { + this.textField.setValue(value, force); } public String getValue() { @@ -97,17 +124,22 @@ public class MultiLineEditBox extends AbstractTextAreaWidget { int k = 0; int l = this.getInnerTop(); - for (StringView stringView : this.textField.iterateLines()) { + for (MultilineTextField.StringView stringView : this.textField.iterateLines()) { boolean bl3 = this.withinContentAreaTopBottom(l, l + 9); - if (bl && bl2 && i >= stringView.beginIndex() && i <= stringView.endIndex()) { + int m = this.getInnerLeft(); + if (bl && bl2 && i >= stringView.beginIndex() && i < stringView.endIndex()) { if (bl3) { - j = guiGraphics.drawString(this.font, string.substring(stringView.beginIndex(), i), this.getInnerLeft(), l, -2039584) - 1; - guiGraphics.fill(j, l - 1, j + 1, l + 1 + 9, -3092272); - guiGraphics.drawString(this.font, string.substring(i, stringView.endIndex()), j, l, -2039584); + String string2 = string.substring(stringView.beginIndex(), i); + guiGraphics.drawString(this.font, string2, m, l, this.textColor, this.textShadow); + j = m + this.font.width(string2); + guiGraphics.fill(j, l - 1, j + 1, l + 1 + 9, this.cursorColor); + guiGraphics.drawString(this.font, string.substring(i, stringView.endIndex()), j, l, this.textColor, this.textShadow); } } else { if (bl3) { - j = guiGraphics.drawString(this.font, string.substring(stringView.beginIndex(), stringView.endIndex()), this.getInnerLeft(), l, -2039584) - 1; + String string2 = string.substring(stringView.beginIndex(), stringView.endIndex()); + guiGraphics.drawString(this.font, string2, m, l, this.textColor, this.textShadow); + j = m + this.font.width(string2) - 1; } k = l; @@ -117,15 +149,15 @@ public class MultiLineEditBox extends AbstractTextAreaWidget { } if (bl && !bl2 && this.withinContentAreaTopBottom(k, k + 9)) { - guiGraphics.drawString(this.font, "_", j, k, -3092272); + guiGraphics.drawString(this.font, "_", j, k, this.cursorColor, this.textShadow); } if (this.textField.hasSelection()) { - StringView stringView2 = this.textField.getSelected(); - int m = this.getInnerLeft(); + MultilineTextField.StringView stringView2 = this.textField.getSelected(); + int n = this.getInnerLeft(); l = this.getInnerTop(); - for (StringView stringView3 : this.textField.iterateLines()) { + for (MultilineTextField.StringView stringView3 : this.textField.iterateLines()) { if (stringView2.beginIndex() > stringView3.endIndex()) { l += 9; } else { @@ -134,15 +166,15 @@ public class MultiLineEditBox extends AbstractTextAreaWidget { } if (this.withinContentAreaTopBottom(l, l + 9)) { - int n = this.font.width(string.substring(stringView3.beginIndex(), Math.max(stringView2.beginIndex(), stringView3.beginIndex()))); - int o; + int o = this.font.width(string.substring(stringView3.beginIndex(), Math.max(stringView2.beginIndex(), stringView3.beginIndex()))); + int p; if (stringView2.endIndex() > stringView3.endIndex()) { - o = this.width - this.innerPadding(); + p = this.width - this.innerPadding(); } else { - o = this.font.width(string.substring(stringView3.beginIndex(), stringView2.endIndex())); + p = this.font.width(string.substring(stringView3.beginIndex(), stringView2.endIndex())); } - this.renderHighlight(guiGraphics, m + n, l, m + o, l + 9); + this.renderHighlight(guiGraphics, n + o, l, n + p, l + 9); } l += 9; @@ -158,7 +190,7 @@ public class MultiLineEditBox extends AbstractTextAreaWidget { if (this.textField.hasCharacterLimit()) { int i = this.textField.characterLimit(); Component component = Component.translatable("gui.multiLineEditBox.character_limit", this.textField.value().length(), i); - guiGraphics.drawString(this.font, component, this.getX() + this.width - this.font.width(component), this.getY() + this.height + 4, 10526880); + guiGraphics.drawString(this.font, component, this.getX() + this.width - this.font.width(component), this.getY() + this.height + 4, -6250336); } } @@ -173,16 +205,16 @@ public class MultiLineEditBox extends AbstractTextAreaWidget { } private void renderHighlight(GuiGraphics guiGraphics, int minX, int minY, int maxX, int maxY) { - guiGraphics.fill(RenderType.guiTextHighlight(), minX, minY, maxX, maxY, -16776961); + guiGraphics.fill(RenderPipelines.GUI_TEXT_HIGHLIGHT, minX, minY, maxX, maxY, -16776961); } private void scrollToCursor() { double d = this.scrollAmount(); - StringView stringView = this.textField.getLineView((int)(d / 9.0)); + MultilineTextField.StringView stringView = this.textField.getLineView((int)(d / 9.0)); if (this.textField.cursor() <= stringView.beginIndex()) { d = this.textField.getLineAtCursor() * 9; } else { - StringView stringView2 = this.textField.getLineView((int)((d + this.height) / 9.0) - 1); + MultilineTextField.StringView stringView2 = this.textField.getLineView((int)((d + this.height) / 9.0) - 1); if (this.textField.cursor() > stringView2.endIndex()) { d = this.textField.getLineAtCursor() * 9 - this.height + 9 + this.totalInnerPadding(); } @@ -204,4 +236,77 @@ public class MultiLineEditBox extends AbstractTextAreaWidget { this.focusedTime = Util.getMillis(); } } + + public static MultiLineEditBox.Builder builder() { + return new MultiLineEditBox.Builder(); + } + + @Environment(EnvType.CLIENT) + public static class Builder { + private int x; + private int y; + private Component placeholder = CommonComponents.EMPTY; + private int textColor = -2039584; + private boolean textShadow = true; + private int cursorColor = -3092272; + private boolean showBackground = true; + private boolean showDecorations = true; + + public MultiLineEditBox.Builder setX(int x) { + this.x = x; + return this; + } + + public MultiLineEditBox.Builder setY(int y) { + this.y = y; + return this; + } + + public MultiLineEditBox.Builder setPlaceholder(Component placeholder) { + this.placeholder = placeholder; + return this; + } + + public MultiLineEditBox.Builder setTextColor(int textColor) { + this.textColor = textColor; + return this; + } + + public MultiLineEditBox.Builder setTextShadow(boolean textShadow) { + this.textShadow = textShadow; + return this; + } + + public MultiLineEditBox.Builder setCursorColor(int cursorColor) { + this.cursorColor = cursorColor; + return this; + } + + public MultiLineEditBox.Builder setShowBackground(boolean showBackground) { + this.showBackground = showBackground; + return this; + } + + public MultiLineEditBox.Builder setShowDecorations(boolean showDecorations) { + this.showDecorations = showDecorations; + return this; + } + + public MultiLineEditBox build(Font font, int width, int height, Component message) { + return new MultiLineEditBox( + font, + this.x, + this.y, + width, + height, + this.placeholder, + message, + this.textColor, + this.textShadow, + this.cursorColor, + this.showBackground, + this.showDecorations + ); + } + } } diff --git a/net/minecraft/client/gui/components/MultiLineLabel.java b/net/minecraft/client/gui/components/MultiLineLabel.java index 04e6e8e4..ca9a7024 100644 --- a/net/minecraft/client/gui/components/MultiLineLabel.java +++ b/net/minecraft/client/gui/components/MultiLineLabel.java @@ -7,8 +7,12 @@ import net.fabricmc.api.Environment; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.locale.Language; +import net.minecraft.network.chat.CommonComponents; import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.FormattedText; +import net.minecraft.network.chat.Style; import net.minecraft.util.FormattedCharSequence; +import net.minecraft.util.Mth; import org.jetbrains.annotations.Nullable; @Environment(EnvType.CLIENT) @@ -31,6 +35,18 @@ public interface MultiLineLabel { return y; } + @Nullable + @Override + public Style getStyleAtCentered(int x, int y, int height, double mouseX, double mouseY) { + return null; + } + + @Nullable + @Override + public Style getStyleAtLeftAligned(int x, int y, int height, double mouseX, double mouseY) { + return null; + } + @Override public int getLineCount() { return 0; @@ -71,7 +87,7 @@ public interface MultiLineLabel { int i = y; for (MultiLineLabel.TextAndWidth textAndWidth : this.getSplitMessage()) { - guiGraphics.drawCenteredString(font, textAndWidth.text, x, i, color); + guiGraphics.drawString(font, textAndWidth.text, x - textAndWidth.width / 2, i, color); i += lineHeight; } } @@ -98,22 +114,69 @@ public interface MultiLineLabel { return i; } + @Nullable + @Override + public Style getStyleAtCentered(int x, int y, int height, double mouseX, double mouseY) { + List list = this.getSplitMessage(); + int i = Mth.floor((mouseY - y) / height); + if (i >= 0 && i < list.size()) { + MultiLineLabel.TextAndWidth textAndWidth = (MultiLineLabel.TextAndWidth)list.get(i); + int j = x - textAndWidth.width / 2; + if (mouseX < j) { + return null; + } else { + int k = Mth.floor(mouseX - j); + return font.getSplitter().componentStyleAtWidth(textAndWidth.text, k); + } + } else { + return null; + } + } + + @Nullable + @Override + public Style getStyleAtLeftAligned(int x, int y, int height, double mouseX, double mouseY) { + if (mouseX < x) { + return null; + } else { + List list = this.getSplitMessage(); + int i = Mth.floor((mouseY - y) / height); + if (i >= 0 && i < list.size()) { + MultiLineLabel.TextAndWidth textAndWidth = (MultiLineLabel.TextAndWidth)list.get(i); + int j = Mth.floor(mouseX - x); + return font.getSplitter().componentStyleAtWidth(textAndWidth.text, j); + } else { + return null; + } + } + } + private List getSplitMessage() { Language language = Language.getInstance(); if (this.cachedTextAndWidth != null && language == this.splitWithLanguage) { return this.cachedTextAndWidth; } else { this.splitWithLanguage = language; - List list = new ArrayList(); + List list = new ArrayList(); for (Component component : components) { - list.addAll(font.split(component, maxWidth)); + list.addAll(font.splitIgnoringLanguage(component, maxWidth)); } this.cachedTextAndWidth = new ArrayList(); + int i = Math.min(list.size(), maxRows); + List list2 = list.subList(0, i); - for (FormattedCharSequence formattedCharSequence : list.subList(0, Math.min(list.size(), maxRows))) { - this.cachedTextAndWidth.add(new MultiLineLabel.TextAndWidth(formattedCharSequence, font.width(formattedCharSequence))); + for (int j = 0; j < list2.size(); j++) { + FormattedText formattedText = (FormattedText)list2.get(j); + FormattedCharSequence formattedCharSequence = Language.getInstance().getVisualOrder(formattedText); + if (j == list2.size() - 1 && i == maxRows && i != list.size()) { + FormattedText formattedText2 = font.substrByWidth(formattedText, font.width(formattedText) - font.width(CommonComponents.ELLIPSIS)); + FormattedText formattedText3 = FormattedText.composite(formattedText2, CommonComponents.ELLIPSIS); + this.cachedTextAndWidth.add(new MultiLineLabel.TextAndWidth(Language.getInstance().getVisualOrder(formattedText3), font.width(formattedText3))); + } else { + this.cachedTextAndWidth.add(new MultiLineLabel.TextAndWidth(formattedCharSequence, font.width(formattedCharSequence))); + } } return this.cachedTextAndWidth; @@ -140,6 +203,12 @@ public interface MultiLineLabel { int renderLeftAlignedNoShadow(GuiGraphics guiGraphics, int x, int y, int lineHeight, int color); + @Nullable + Style getStyleAtCentered(int x, int y, int height, double mouseX, double mouseY); + + @Nullable + Style getStyleAtLeftAligned(int x, int y, int height, double mouseX, double mouseY); + int getLineCount(); int getWidth(); diff --git a/net/minecraft/client/gui/components/MultiLineTextWidget.java b/net/minecraft/client/gui/components/MultiLineTextWidget.java index 0c313cd1..b1696850 100644 --- a/net/minecraft/client/gui/components/MultiLineTextWidget.java +++ b/net/minecraft/client/gui/components/MultiLineTextWidget.java @@ -1,13 +1,16 @@ package net.minecraft.client.gui.components; import java.util.OptionalInt; +import java.util.function.Consumer; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.Util; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.Style; import net.minecraft.util.SingleKeyCache; +import org.jetbrains.annotations.Nullable; @Environment(EnvType.CLIENT) public class MultiLineTextWidget extends AbstractStringWidget { @@ -15,6 +18,9 @@ public class MultiLineTextWidget extends AbstractStringWidget { private OptionalInt maxRows = OptionalInt.empty(); private final SingleKeyCache cache; private boolean centered = false; + private boolean allowHoverComponents = false; + @Nullable + private Consumer