1.21.6

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"
     }
   ]
 }

assets/minecraft/atlases/mob_effects.json

@@ -1,9 +0,0 @@
-{
-  "sources": [
-    {
-      "type": "minecraft:directory",
-      "prefix": "",
-      "source": "mob_effect"
-    }
-  ]
-}

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
+    }
+  }
+}

assets/minecraft/equipment/black_harness.json

@@ -0,0 +1,9 @@
+{
+  "layers": {
+    "happy_ghast_body": [
+      {
+        "texture": "minecraft:black_harness"
+      }
+    ]
+  }
+}

assets/minecraft/equipment/blue_harness.json

@@ -0,0 +1,9 @@
+{
+  "layers": {
+    "happy_ghast_body": [
+      {
+        "texture": "minecraft:blue_harness"
+      }
+    ]
+  }
+}

assets/minecraft/equipment/brown_harness.json

@@ -0,0 +1,9 @@
+{
+  "layers": {
+    "happy_ghast_body": [
+      {
+        "texture": "minecraft:brown_harness"
+      }
+    ]
+  }
+}

assets/minecraft/equipment/cyan_harness.json

@@ -0,0 +1,9 @@
+{
+  "layers": {
+    "happy_ghast_body": [
+      {
+        "texture": "minecraft:cyan_harness"
+      }
+    ]
+  }
+}

assets/minecraft/equipment/gray_harness.json

@@ -0,0 +1,9 @@
+{
+  "layers": {
+    "happy_ghast_body": [
+      {
+        "texture": "minecraft:gray_harness"
+      }
+    ]
+  }
+}

assets/minecraft/equipment/green_harness.json

@@ -0,0 +1,9 @@
+{
+  "layers": {
+    "happy_ghast_body": [
+      {
+        "texture": "minecraft:green_harness"
+      }
+    ]
+  }
+}

assets/minecraft/equipment/light_blue_harness.json

@@ -0,0 +1,9 @@
+{
+  "layers": {
+    "happy_ghast_body": [
+      {
+        "texture": "minecraft:light_blue_harness"
+      }
+    ]
+  }
+}

assets/minecraft/equipment/light_gray_harness.json

@@ -0,0 +1,9 @@
+{
+  "layers": {
+    "happy_ghast_body": [
+      {
+        "texture": "minecraft:light_gray_harness"
+      }
+    ]
+  }
+}

assets/minecraft/equipment/lime_harness.json

@@ -0,0 +1,9 @@
+{
+  "layers": {
+    "happy_ghast_body": [
+      {
+        "texture": "minecraft:lime_harness"
+      }
+    ]
+  }
+}

assets/minecraft/equipment/magenta_harness.json

@@ -0,0 +1,9 @@
+{
+  "layers": {
+    "happy_ghast_body": [
+      {
+        "texture": "minecraft:magenta_harness"
+      }
+    ]
+  }
+}

assets/minecraft/equipment/orange_harness.json

@@ -0,0 +1,9 @@
+{
+  "layers": {
+    "happy_ghast_body": [
+      {
+        "texture": "minecraft:orange_harness"
+      }
+    ]
+  }
+}

assets/minecraft/equipment/pink_harness.json

@@ -0,0 +1,9 @@
+{
+  "layers": {
+    "happy_ghast_body": [
+      {
+        "texture": "minecraft:pink_harness"
+      }
+    ]
+  }
+}

assets/minecraft/equipment/purple_harness.json

@@ -0,0 +1,9 @@
+{
+  "layers": {
+    "happy_ghast_body": [
+      {
+        "texture": "minecraft:purple_harness"
+      }
+    ]
+  }
+}

assets/minecraft/equipment/red_harness.json

@@ -0,0 +1,9 @@
+{
+  "layers": {
+    "happy_ghast_body": [
+      {
+        "texture": "minecraft:red_harness"
+      }
+    ]
+  }
+}

assets/minecraft/equipment/white_harness.json

@@ -0,0 +1,9 @@
+{
+  "layers": {
+    "happy_ghast_body": [
+      {
+        "texture": "minecraft:white_harness"
+      }
+    ]
+  }
+}

assets/minecraft/equipment/yellow_harness.json

@@ -0,0 +1,9 @@
+{
+  "layers": {
+    "happy_ghast_body": [
+      {
+        "texture": "minecraft:yellow_harness"
+      }
+    ]
+  }
+}

assets/minecraft/items/black_harness.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "minecraft:item/black_harness"
+  }
+}

assets/minecraft/items/blue_harness.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "minecraft:item/blue_harness"
+  }
+}

assets/minecraft/items/brown_harness.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "minecraft:item/brown_harness"
+  }
+}

assets/minecraft/items/cyan_harness.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "minecraft:item/cyan_harness"
+  }
+}

assets/minecraft/items/dried_ghast.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "minecraft:block/dried_ghast_hydration_0"
+  }
+}

assets/minecraft/items/gray_harness.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "minecraft:item/gray_harness"
+  }
+}

assets/minecraft/items/green_harness.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "minecraft:item/green_harness"
+  }
+}

assets/minecraft/items/happy_ghast_spawn_egg.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "minecraft:item/happy_ghast_spawn_egg"
+  }
+}

assets/minecraft/items/light_blue_harness.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "minecraft:item/light_blue_harness"
+  }
+}

assets/minecraft/items/light_gray_harness.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "minecraft:item/light_gray_harness"
+  }
+}

assets/minecraft/items/lime_harness.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "minecraft:item/lime_harness"
+  }
+}

assets/minecraft/items/magenta_harness.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "minecraft:item/magenta_harness"
+  }
+}

assets/minecraft/items/music_disc_tears.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "minecraft:item/music_disc_tears"
+  }
+}

assets/minecraft/items/orange_harness.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "minecraft:item/orange_harness"
+  }
+}

assets/minecraft/items/pink_harness.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "minecraft:item/pink_harness"
+  }
+}

assets/minecraft/items/player_head.json

@@ -3,8 +3,7 @@
     "type": "minecraft:special",
     "base": "minecraft:item/template_skull",
     "model": {
-      "type": "minecraft:head",
+      "type": "minecraft:player_head"
-      "kind": "player"
     }
   }
 }

assets/minecraft/items/purple_harness.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "minecraft:item/purple_harness"
+  }
+}

assets/minecraft/items/red_harness.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "minecraft:item/red_harness"
+  }
+}

assets/minecraft/items/white_harness.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "minecraft:item/white_harness"
+  }
+}

assets/minecraft/items/yellow_harness.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "minecraft:item/yellow_harness"
+  }
+}

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"
   }
 }

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",

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"}
+      }
+    }
+  ]
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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": {

assets/minecraft/models/item/black_harness.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecraft:item/black_harness"
+  }
+}

assets/minecraft/models/item/blue_harness.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecraft:item/blue_harness"
+  }
+}

assets/minecraft/models/item/brown_harness.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecraft:item/brown_harness"
+  }
+}

assets/minecraft/models/item/cyan_harness.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecraft:item/cyan_harness"
+  }
+}

assets/minecraft/models/item/gray_harness.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecraft:item/gray_harness"
+  }
+}

assets/minecraft/models/item/green_harness.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecraft:item/green_harness"
+  }
+}

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"
+  }
+}

assets/minecraft/models/item/light_blue_harness.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecraft:item/light_blue_harness"
+  }
+}

assets/minecraft/models/item/light_gray_harness.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecraft:item/light_gray_harness"
+  }
+}

assets/minecraft/models/item/lime_harness.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecraft:item/lime_harness"
+  }
+}

assets/minecraft/models/item/magenta_harness.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecraft:item/magenta_harness"
+  }
+}

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"
+  }
+}

assets/minecraft/models/item/orange_harness.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecraft:item/orange_harness"
+  }
+}

assets/minecraft/models/item/pink_harness.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecraft:item/pink_harness"
+  }
+}

assets/minecraft/models/item/purple_harness.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecraft:item/purple_harness"
+  }
+}

assets/minecraft/models/item/red_harness.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecraft:item/red_harness"
+  }
+}

assets/minecraft/models/item/white_harness.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecraft:item/white_harness"
+  }
+}

assets/minecraft/models/item/yellow_harness.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecraft:item/yellow_harness"
+  }
+}

assets/minecraft/post_effect/blur.json

@@ -14,17 +14,20 @@
                 }
             ],
             "output": "swap",
-            "uniforms": [
+            "uniforms": {
+                "BlurConfig": [
                     {
                         "name": "BlurDir",
                         "type": "vec2",
-                    "values": [ 1.0, 0.0 ]
+                        "value": [ 1.0, 0.0 ]
                     },
                     {
                         "name": "Radius",
-                    "type": "float"
+                        "type": "float",
+                        "value": 0.0
                     }
                 ]
+            }
         },
         {
             "vertex_shader": "minecraft:post/blur",
@@ -37,17 +40,20 @@
                 }
             ],
             "output": "minecraft:main",
-            "uniforms": [
+            "uniforms": {
+                "BlurConfig": [
                     {
                         "name": "BlurDir",
                         "type": "vec2",
-                    "values": [ 0.0, 1.0 ]
+                        "value": [ 0.0, 1.0 ]
                     },
                     {
                         "name": "Radius",
-                    "type": "float"
+                        "type": "float",
+                        "value": 0.0
                     }
                 ]
+            }
         }, {
             "vertex_shader": "minecraft:post/blur",
             "fragment_shader": "minecraft:post/box_blur",
@@ -59,17 +65,20 @@
                 }
             ],
             "output": "swap",
-            "uniforms": [
+            "uniforms": {
+                "BlurConfig": [
                     {
                         "name": "BlurDir",
                         "type": "vec2",
-                    "values": [ 1.0, 0.0 ]
+                        "value": [ 1.0, 0.0 ]
                     },
                     {
                         "name": "Radius",
-                    "type": "float"
+                        "type": "float",
+                        "value": 0.0
                     }
                 ]
+            }
         },
         {
             "vertex_shader": "minecraft:post/blur",
@@ -82,18 +91,22 @@
                 }
             ],
             "output": "minecraft:main",
-            "uniforms": [
+            "uniforms": {
+                "BlurConfig": [
                     {
                         "name": "BlurDir",
                         "type": "vec2",
-                    "values": [ 0.0, 1.0 ]
+                        "value": [ 0.0, 1.0 ]
                     },
                     {
                         "name": "Radius",
-                    "type": "float"
+                        "type": "float",
+                        "value": 0.0
                     }
                 ]
-        }, {
+            }
+        },
+        {
             "vertex_shader": "minecraft:post/blur",
             "fragment_shader": "minecraft:post/box_blur",
             "inputs": [
@@ -104,17 +117,20 @@
                 }
             ],
             "output": "swap",
-            "uniforms": [
+            "uniforms": {
+                "BlurConfig": [
                     {
                         "name": "BlurDir",
                         "type": "vec2",
-                    "values": [ 1.0, 0.0 ]
+                        "value": [ 1.0, 0.0 ]
                     },
                     {
                         "name": "Radius",
-                  "type": "float"
+                        "type": "float",
+                        "value": 0.0
                     }
                 ]
+            }
         },
         {
             "vertex_shader": "minecraft:post/blur",
@@ -127,17 +143,20 @@
                 }
             ],
             "output": "minecraft:main",
-            "uniforms": [
+            "uniforms": {
+                "BlurConfig": [
                     {
                         "name": "BlurDir",
                         "type": "vec2",
-                    "values": [ 0.0, 1.0 ]
+                        "value": [ 0.0, 1.0 ]
                     },
                     {
                         "name": "Radius",
-                    "type": "float"
+                        "type": "float",
+                        "value": 0.0
                     }
                 ]
             }
+        }
     ]
 }

assets/minecraft/post_effect/creeper.json

@@ -13,23 +13,25 @@
                 }
             ],
             "output": "swap",
-            "uniforms": [
+            "uniforms": {
+                "ColorConfig": [
                     {
                         "name": "RedMatrix",
                         "type": "vec3",
-                    "values": [ 0.0, 0.0, 0.0 ]
+                        "value": [ 0.0, 0.0, 0.0 ]
                     },
                     {
                         "name": "GreenMatrix",
                         "type": "vec3",
-                    "values": [ 0.3, 0.59, 0.11 ]
+                        "value": [ 0.3, 0.59, 0.11 ]
                     },
                     {
                         "name": "BlueMatrix",
                         "type": "vec3",
-                    "values": [ 0.0, 0.0, 0.0 ]
+                        "value": [ 0.0, 0.0, 0.0 ]
                     }
                 ]
+            }
         },
         {
             "vertex_shader": "minecraft:post/sobel",
@@ -41,18 +43,20 @@
                 }
             ],
             "output": "minecraft:main",
-            "uniforms": [
+            "uniforms": {
+                "BitsConfig": [
                     {
                         "name": "Resolution",
                         "type": "float",
-                    "values": [ 16.0 ]
+                        "value": 16.0
                     },
                     {
                         "name": "MosaicSize",
                         "type": "float",
-                    "values": [ 4.0 ]
+                        "value": 4.0
                     }
                 ]
             }
+        }
     ]
 }

assets/minecraft/post_effect/entity_outline.json

@@ -25,13 +25,20 @@
                 }
             ],
             "output": "minecraft:entity_outline",
-            "uniforms": [
+            "uniforms": {
+                "BlurConfig": [
                     {
                         "name": "BlurDir",
                         "type": "vec2",
-                    "values": [ 1.0, 0.0 ]
+                        "value": [ 1.0, 0.0 ]
+                    },
+                    {
+                        "name": "Radius",
+                        "type": "float",
+                        "value": 2.0
                     }
                 ]
+            }
         },
         {
             "vertex_shader": "minecraft:post/blur",
@@ -44,13 +51,20 @@
                 }
             ],
             "output": "swap",
-            "uniforms": [
+            "uniforms": {
+                "BlurConfig": [
                     {
                         "name": "BlurDir",
                         "type": "vec2",
-                    "values": [ 0.0, 1.0 ]
+                        "value": [ 0.0, 1.0 ]
+                    },
+                    {
+                        "name": "Radius",
+                        "type": "float",
+                        "value": 2.0
                     }
                 ]
+            }
         },
         {
             "vertex_shader": "minecraft:post/blit",
@@ -61,13 +75,15 @@
                     "target": "swap"
                 }
             ],
-            "uniforms": [
+            "uniforms": {
+                "BlitConfig": [
                     {
                         "name": "ColorModulate",
                         "type": "vec4",
-                    "values": [ 1.0, 1.0, 1.0, 1.0 ]
+                        "value": [ 1.0, 1.0, 1.0, 1.0 ]
                     }
-            ],
+                ]
+            },
             "output": "minecraft:entity_outline"
         }
     ]

assets/minecraft/post_effect/invert.json

@@ -13,13 +13,15 @@
                 }
             ],
             "output": "swap",
-            "uniforms": [
+            "uniforms": {
+                "InvertConfig": [
                     {
                         "name": "InverseAmount",
                         "type": "float",
-                    "values": [ 0.8 ]
+                        "value": 0.8
                     }
                 ]
+            }
         },
         {
             "vertex_shader": "minecraft:post/blit",
@@ -30,13 +32,15 @@
                     "target": "swap"
                 }
             ],
-            "uniforms": [
+            "uniforms": {
+                "BlitConfig": [
                     {
                         "name": "ColorModulate",
                         "type": "vec4",
-                    "values": [ 1.0, 1.0, 1.0, 1.0 ]
+                        "value": [ 1.0, 1.0, 1.0, 1.0 ]
                     }
-            ],
+                ]
+            },
             "output": "minecraft:main"
         }
     ]

assets/minecraft/post_effect/spider.json

@@ -17,18 +17,20 @@
                 }
             ],
             "output": "temp",
-            "uniforms": [
+            "uniforms": {
+                "BlurConfig": [
                     {
                         "name": "BlurDir",
                         "type": "vec2",
-                    "values": [ 1.0, 0.0 ]
+                        "value": [ 1.0, 0.0 ]
                     },
                     {
                         "name": "Radius",
                         "type": "float",
-                    "values": [ 15.0 ]
+                        "value": 15.0
                     }
                 ]
+            }
         },
         {
             "vertex_shader": "minecraft:post/blur",
@@ -41,18 +43,20 @@
                 }
             ],
             "output": "large_blur",
-            "uniforms": [
+            "uniforms": {
+                "BlurConfig": [
                     {
                         "name": "BlurDir",
                         "type": "vec2",
-                    "values": [ 0.0, 1.0 ]
+                        "value": [ 0.0, 1.0 ]
                     },
                     {
                         "name": "Radius",
                         "type": "float",
-                    "values": [ 15.0 ]
+                        "value": 15.0
                     }
                 ]
+            }
         },
         {
             "vertex_shader": "minecraft:post/blur",
@@ -65,18 +69,20 @@
                 }
             ],
             "output": "temp",
-            "uniforms": [
+            "uniforms": {
+                "BlurConfig": [
                     {
                         "name": "BlurDir",
                         "type": "vec2",
-                    "values": [ 1.0, 0.0 ]
+                        "value": [ 1.0, 0.0 ]
                     },
                     {
                         "name": "Radius",
                         "type": "float",
-                    "values": [ 7.0 ]
+                        "value": 7.0
                     }
                 ]
+            }
         },
         {
             "vertex_shader": "minecraft:post/blur",
@@ -89,18 +95,20 @@
                 }
             ],
             "output": "small_blur",
-            "uniforms": [
+            "uniforms": {
+                "BlurConfig": [
                     {
                         "name": "BlurDir",
                         "type": "vec2",
-                    "values": [ 0.0, 1.0 ]
+                        "value": [ 0.0, 1.0 ]
                     },
                     {
                         "name": "Radius",
                         "type": "float",
-                    "values": [ 7.0 ]
+                        "value": 7.0
                     }
                 ]
+            }
         },
         {
             "vertex_shader": "minecraft:post/rotscale",
@@ -116,33 +124,37 @@
                 }
             ],
             "output": "temp",
-            "uniforms": [
+            "uniforms": {
+                "RotScaleConfig": [
                     {
                         "name": "InScale",
                         "type": "vec2",
-                    "values": [ 1.25, 2.0 ]
+                        "value": [ 1.25, 2.0 ]
                     },
                     {
                         "name": "InOffset",
                         "type": "vec2",
-                    "values": [ -0.125, -0.1 ]
+                        "value": [ -0.125, -0.1 ]
                     },
                     {
                         "name": "InRotation",
                         "type": "float",
-                    "values": [ 0 ]
+                        "value": 0.0
-                },
+                    }
+                ],
+                "SpiderConfig": [
                     {
                         "name": "Scissor",
                         "type": "vec4",
-                    "values": [ 0.0, 0.0, 1.0, 1.0 ]
+                        "value": [ 0.0, 0.0, 1.0, 1.0 ]
                     },
                     {
                         "name": "Vignette",
                         "type": "vec4",
-                    "values": [ 0.1, 0.1, 0.9, 0.9 ]
+                        "value": [ 0.1, 0.1, 0.9, 0.9 ]
                     }
                 ]
+            }
         },
         {
             "vertex_shader": "minecraft:post/rotscale",
@@ -158,33 +170,37 @@
                 }
             ],
             "output": "swap",
-            "uniforms": [
+            "uniforms": {
+                "RotScaleConfig": [
                     {
                         "name": "InScale",
                         "type": "vec2",
-                    "values": [ 2.35, 4.2 ]
+                        "value": [ 2.35, 4.2 ]
                     },
                     {
                         "name": "InOffset",
                         "type": "vec2",
-                    "values": [ -1.1, -1.5 ]
+                        "value": [ -1.1, -1.5 ]
                     },
                     {
                         "name": "InRotation",
                         "type": "float",
-                    "values": [ -45.0 ]
+                        "value": -45.0
-                },
+                    }
+                ],
+                "SpiderConfig": [
                     {
                         "name": "Scissor",
                         "type": "vec4",
-                    "values": [ 0.21, 0.0, 0.79, 1.0 ]
+                        "value": [ 0.21, 0.0, 0.79, 1.0 ]
                     },
                     {
                         "name": "Vignette",
                         "type": "vec4",
-                    "values": [ 0.31, 0.1, 0.69, 0.9 ]
+                        "value": [ 0.31, 0.1, 0.69, 0.9 ]
                     }
                 ]
+            }
         },
         {
             "vertex_shader": "minecraft:post/rotscale",
@@ -200,33 +216,37 @@
                 }
             ],
             "output": "temp",
-            "uniforms": [
+            "uniforms": {
+                "RotScaleConfig": [
                     {
                         "name": "InScale",
                         "type": "vec2",
-                    "values": [ 2.35, 4.2 ]
+                        "value": [ 2.35, 4.2 ]
                     },
                     {
                         "name": "InOffset",
                         "type": "vec2",
-                    "values": [ 0.45, -4.45 ]
+                        "value": [ 0.45, -4.45 ]
                     },
                     {
                         "name": "InRotation",
                         "type": "float",
-                    "values": [ 45.0 ]
+                        "value": 45.0
-                },
+                    }
+                ],
+                "SpiderConfig": [
                     {
                         "name": "Scissor",
                         "type": "vec4",
-                    "values": [ 0.21, 0.0, 0.79, 1.0 ]
+                        "value": [ 0.21, 0.0, 0.79, 1.0 ]
                     },
                     {
                         "name": "Vignette",
                         "type": "vec4",
-                    "values": [ 0.31, 0.1, 0.69, 0.9 ]
+                        "value": [ 0.31, 0.1, 0.69, 0.9 ]
                     }
                 ]
+            }
         },
         {
             "vertex_shader": "minecraft:post/rotscale",
@@ -242,33 +262,37 @@
                 }
             ],
             "output": "swap",
-            "uniforms": [
+            "uniforms": {
+                "RotScaleConfig": [
                     {
                         "name": "InScale",
                         "type": "vec2",
-                    "values": [ 2.35, 2.35 ]
+                        "value": [ 2.35, 2.35 ]
                     },
                     {
                         "name": "InOffset",
                         "type": "vec2",
-                    "values": [ -0.385, -1.29 ]
+                        "value": [ -0.385, -1.29 ]
                     },
                     {
                         "name": "InRotation",
                         "type": "float",
-                    "values": [ 0.0 ]
+                        "value": 0.0
-                },
+                    }
+                ],
+                "SpiderConfig": [
                     {
                         "name": "Scissor",
                         "type": "vec4",
-                    "values": [ 0.0, 0.0, 1.0, 1.0 ]
+                        "value": [ 0.0, 0.0, 1.0, 1.0 ]
                     },
                     {
                         "name": "Vignette",
                         "type": "vec4",
-                    "values": [ 0.31, 0.1, 0.69, 0.9 ]
+                        "value": [ 0.31, 0.1, 0.69, 0.9 ]
                     }
                 ]
+            }
         },
         {
             "vertex_shader": "minecraft:post/rotscale",
@@ -284,33 +308,37 @@
                 }
             ],
             "output": "temp",
-            "uniforms": [
+            "uniforms": {
+                "RotScaleConfig": [
                     {
                         "name": "InScale",
                         "type": "vec2",
-                    "values": [ 2.35, 2.35 ]
+                        "value": [ 2.35, 2.35 ]
                     },
                     {
                         "name": "InOffset",
                         "type": "vec2",
-                    "values": [ -0.965, -1.29 ]
+                        "value": [ -0.965, -1.29 ]
                     },
                     {
                         "name": "InRotation",
                         "type": "float",
-                    "values": [ 0 ]
+                        "value": 0.0
-                },
+                    }
+                ],
+                "SpiderConfig": [
                     {
                         "name": "Scissor",
                         "type": "vec4",
-                    "values": [ 0.0, 0.0, 1.0, 1.0 ]
+                        "value": [ 0.0, 0.0, 1.0, 1.0 ]
                     },
                     {
                         "name": "Vignette",
                         "type": "vec4",
-                    "values": [ 0.31, 0.1, 0.69, 0.9 ]
+                        "value": [ 0.31, 0.1, 0.69, 0.9 ]
                     }
                 ]
+            }
         },
         {
             "vertex_shader": "minecraft:post/blit",
@@ -322,13 +350,15 @@
                 }
             ],
             "output": "minecraft:main",
-            "uniforms": [
+            "uniforms": {
+                "BlitConfig": [
                     {
                         "name": "ColorModulate",
                         "type": "vec4",
-                    "values": [ 1.0, 0.8, 0.8, 1.0 ]
+                        "value": [ 1.0, 0.8, 0.8, 1.0 ]
                     }
                 ]
             }
+        }
     ]
 }

assets/minecraft/post_effect/transparency.json

@@ -73,13 +73,15 @@
                     "target": "final"
                 }
             ],
-            "uniforms": [
+            "uniforms": {
+                "BlitConfig": [
                     {
                         "name": "ColorModulate",
                         "type": "vec4",
-                    "values": [ 1.0, 1.0, 1.0, 1.0 ]
+                        "value": [ 1.0, 1.0, 1.0, 1.0 ]
                     }
-            ],
+                ]
+            },
             "output": "minecraft:main"
         }
     ]

assets/minecraft/shaders/core/entity.fsh

@@ -1,15 +1,12 @@
 #version 150
 
 #moj_import <minecraft:fog.glsl>
+#moj_import <minecraft:dynamictransforms.glsl>
 
 uniform sampler2D Sampler0;
 
-uniform vec4 ColorModulator;
+in float sphericalVertexDistance;
-uniform float FogStart;
+in float cylindricalVertexDistance;
-uniform float FogEnd;
-uniform vec4 FogColor;
-
-in float vertexDistance;
 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);
 }

assets/minecraft/shaders/core/entity.vsh

@@ -2,6 +2,8 @@
 
 #moj_import <minecraft:light.glsl>
 #moj_import <minecraft:fog.glsl>
+#moj_import <minecraft:dynamictransforms.glsl>
+#moj_import <minecraft:projection.glsl>
 
 in vec3 Position;
 in vec4 Color;
@@ -13,15 +15,8 @@ in vec3 Normal;
 uniform sampler2D Sampler1;
 uniform sampler2D Sampler2;
 
-uniform mat4 ModelViewMat;
+out float sphericalVertexDistance;
-uniform mat4 ProjMat;
+out float cylindricalVertexDistance;
-uniform mat4 TextureMat;
-uniform int FogShape;
-
-uniform vec3 Light0_Direction;
-uniform vec3 Light1_Direction;
-
-out float vertexDistance;
 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;

assets/minecraft/shaders/core/glint.fsh

@@ -1,15 +1,13 @@
 #version 150
 
 #moj_import <minecraft:fog.glsl>
+#moj_import <minecraft:globals.glsl>
+#moj_import <minecraft:dynamictransforms.glsl>
 
 uniform sampler2D Sampler0;
 
-uniform vec4 ColorModulator;
+in float sphericalVertexDistance;
-uniform float FogStart;
+in float cylindricalVertexDistance;
-uniform float FogEnd;
-uniform float GlintAlpha;
-
-in float vertexDistance;
 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);
 }

assets/minecraft/shaders/core/glint.vsh

@@ -1,21 +1,20 @@
 #version 150
 
 #moj_import <minecraft:fog.glsl>
+#moj_import <minecraft:dynamictransforms.glsl>
+#moj_import <minecraft:projection.glsl>
 
 in vec3 Position;
 in vec2 UV0;
 
-uniform mat4 ModelViewMat;
+out float sphericalVertexDistance;
-uniform mat4 ProjMat;
+out float cylindricalVertexDistance;
-uniform mat4 TextureMat;
-uniform int FogShape;
-
-out float vertexDistance;
 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;
 }

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;
 

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() {

assets/minecraft/shaders/core/lightmap.fsh

@@ -1,14 +1,16 @@
 #version 150
 
-uniform float AmbientLightFactor;
+layout(std140) uniform LightmapInfo {
-uniform float SkyFactor;
+    float AmbientLightFactor;
-uniform float BlockFactor;
+    float SkyFactor;
-uniform int UseBrightLightmap;
+    float BlockFactor;
-uniform vec3 SkyLightColor;
+    int UseBrightLightmap;
-uniform float NightVisionFactor;
+    float NightVisionFactor;
-uniform float DarknessScale;
+    float DarknessScale;
-uniform float DarkenWorldFactor;
+    float DarkenWorldFactor;
-uniform float BrightnessFactor;
+    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 block_brightness = get_brightness(floor(texCoord.x * 16) / 15) * lightmapInfo.BlockFactor;
-    float sky_brightness = get_brightness(floor(texCoord.y * 16) / 15) * SkyFactor;
+    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) {
+    if (lightmapInfo.UseBrightLightmap == 0) {
-        color = clamp(color - vec3(DarknessScale), 0.0, 1.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);
 

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);
+}

assets/minecraft/shaders/core/panorama.vsh

@@ -0,0 +1,13 @@
+#version 150
+
+#moj_import <minecraft:dynamictransforms.glsl>
+#moj_import <minecraft:projection.glsl>
+
+in vec3 Position;
+out vec3 texCoord0;
+
+void main() {
+    gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0);
+
+    texCoord0 = Position;
+}

assets/minecraft/shaders/core/particle.fsh

@@ -1,15 +1,12 @@
 #version 150
 
 #moj_import <minecraft:fog.glsl>
+#moj_import <minecraft:dynamictransforms.glsl>
 
 uniform sampler2D Sampler0;
 
-uniform vec4 ColorModulator;
+in float sphericalVertexDistance;
-uniform float FogStart;
+in float cylindricalVertexDistance;
-uniform float FogEnd;
-uniform vec4 FogColor;
-
-in float vertexDistance;
 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);
 }

assets/minecraft/shaders/core/particle.vsh

@@ -1,6 +1,8 @@
 #version 150
 
 #moj_import <minecraft:fog.glsl>
+#moj_import <minecraft:dynamictransforms.glsl>
+#moj_import <minecraft:projection.glsl>
 
 in vec3 Position;
 in vec2 UV0;
@@ -9,18 +11,16 @@ in ivec2 UV2;
 
 uniform sampler2D Sampler2;
 
-uniform mat4 ModelViewMat;
+out float sphericalVertexDistance;
-uniform mat4 ProjMat;
+out float cylindricalVertexDistance;
-uniform int FogShape;
-
-out float vertexDistance;
 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);
 }

assets/minecraft/shaders/core/position.fsh

@@ -1,16 +1,13 @@
 #version 150
 
 #moj_import <minecraft:fog.glsl>
+#moj_import <minecraft:dynamictransforms.glsl>
 
-uniform vec4 ColorModulator;
+in float sphericalVertexDistance;
-uniform float FogStart;
+in float cylindricalVertexDistance;
-uniform float FogEnd;
-uniform vec4 FogColor;
-
-in float vertexDistance;
 
 out vec4 fragColor;
 
 void main() {
-    fragColor = linear_fog(ColorModulator, vertexDistance, FogStart, FogEnd, FogColor);
+    fragColor = apply_fog(ColorModulator, sphericalVertexDistance, cylindricalVertexDistance, FogEnvironmentalStart, FogEnvironmentalEnd, FogRenderDistanceStart, FogRenderDistanceEnd, FogColor);
 }

assets/minecraft/shaders/core/position.vsh

@@ -1,17 +1,17 @@
 #version 150
 
 #moj_import <minecraft:fog.glsl>
+#moj_import <minecraft:dynamictransforms.glsl>
+#moj_import <minecraft:projection.glsl>
 
 in vec3 Position;
 
-uniform mat4 ProjMat;
+out float sphericalVertexDistance;
-uniform mat4 ModelViewMat;
+out float cylindricalVertexDistance;
-uniform int FogShape;
-
-out float vertexDistance;
 
 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);
 }

assets/minecraft/shaders/core/position_color.fsh

@@ -1,8 +1,8 @@
 #version 150
 
-in vec4 vertexColor;
+#moj_import <minecraft:dynamictransforms.glsl>
 
-uniform vec4 ColorModulator;
+in vec4 vertexColor;
 
 out vec4 fragColor;
 

assets/minecraft/shaders/core/position_color.vsh

@@ -1,11 +1,11 @@
 #version 150
 
+#moj_import <minecraft:dynamictransforms.glsl>
+#moj_import <minecraft:projection.glsl>
+
 in vec3 Position;
 in vec4 Color;
 
-uniform mat4 ModelViewMat;
-uniform mat4 ProjMat;
-
 out vec4 vertexColor;
 
 void main() {

assets/minecraft/shaders/core/position_color_lightmap.fsh

@@ -1,8 +1,8 @@
 #version 150
 
-uniform sampler2D Sampler2;
+#moj_import <minecraft:dynamictransforms.glsl>
 
-uniform vec4 ColorModulator;
+uniform sampler2D Sampler2;
 
 in vec4 vertexColor;
 in vec2 texCoord2;

assets/minecraft/shaders/core/position_color_lightmap.vsh

@@ -1,12 +1,12 @@
 #version 150
 
+#moj_import <minecraft:dynamictransforms.glsl>
+#moj_import <minecraft:projection.glsl>
+
 in vec3 Position;
 in vec4 Color;
 in vec2 UV2;
 
-uniform mat4 ModelViewMat;
-uniform mat4 ProjMat;
-
 out vec4 vertexColor;
 out vec2 texCoord2;
 

assets/minecraft/shaders/core/position_color_tex_lightmap.fsh

@@ -1,8 +1,8 @@
 #version 150
 
-uniform sampler2D Sampler0;
+#moj_import <minecraft:dynamictransforms.glsl>
 
-uniform vec4 ColorModulator;
+uniform sampler2D Sampler0;
 
 in vec4 vertexColor;
 in vec2 texCoord0;

assets/minecraft/shaders/core/position_color_tex_lightmap.vsh

@@ -1,13 +1,13 @@
 #version 150
 
+#moj_import <minecraft:dynamictransforms.glsl>
+#moj_import <minecraft:projection.glsl>
+
 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;

assets/minecraft/shaders/core/position_tex.fsh

@@ -1,8 +1,8 @@
 #version 150
 
-uniform sampler2D Sampler0;
+#moj_import <minecraft:dynamictransforms.glsl>
 
-uniform vec4 ColorModulator;
+uniform sampler2D Sampler0;
 
 in vec2 texCoord0;
 

assets/minecraft/shaders/core/position_tex.vsh

@@ -1,11 +1,11 @@
 #version 150
 
+#moj_import <minecraft:dynamictransforms.glsl>
+#moj_import <minecraft:projection.glsl>
+
 in vec3 Position;
 in vec2 UV0;
 
-uniform mat4 ModelViewMat;
-uniform mat4 ProjMat;
-
 out vec2 texCoord0;
 
 void main() {

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;

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;
 

assets/minecraft/shaders/core/rendertype_beacon_beam.fsh

@@ -1,15 +1,11 @@
 #version 150
 
 #moj_import <minecraft:fog.glsl>
+#moj_import <minecraft:dynamictransforms.glsl>
+#moj_import <minecraft:projection.glsl>
 
 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);
 }

assets/minecraft/shaders/core/rendertype_beacon_beam.vsh

@@ -1,12 +1,12 @@
 #version 150
 
+#moj_import <minecraft:dynamictransforms.glsl>
+#moj_import <minecraft:projection.glsl>
+
 in vec3 Position;
 in vec4 Color;
 in vec2 UV0;
 
-uniform mat4 ModelViewMat;
-uniform mat4 ProjMat;
-
 out vec4 vertexColor;
 out vec2 texCoord0;
 

assets/minecraft/shaders/core/rendertype_clouds.fsh

@@ -2,9 +2,6 @@
 
 #moj_import <minecraft:fog.glsl>
 
-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;
 }

assets/minecraft/shaders/core/rendertype_clouds.vsh

@@ -1,23 +1,90 @@
 #version 150
 
 #moj_import <minecraft:fog.glsl>
+#moj_import <minecraft:dynamictransforms.glsl>
+#moj_import <minecraft:projection.glsl>
 
-in vec3 Position;
+const int FLAG_MASK_DIR = 7;
-in vec4 Color;
+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;
+layout(std140) uniform CloudInfo {
-uniform mat4 ProjMat;
+    vec4 CloudColor;
-uniform vec3 ModelOffset;
+    vec3 CloudOffset;
-uniform int FogShape;
+    vec3 CellSize;
-uniform vec4 ColorModulator;
+};
+
+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);
+    vertexDistance = fog_spherical_distance(pos);
-    vertexColor = Color * ColorModulator;
+    vertexColor = (useTopColor ? faceColors[1] : faceColors[direction]) * CloudColor;
 }

assets/minecraft/shaders/core/rendertype_crumbling.fsh

@@ -1,9 +1,12 @@
 #version 150
 
+#moj_import <minecraft:fog.glsl>
+#moj_import <minecraft:dynamictransforms.glsl>
+
 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);
 }

assets/minecraft/shaders/core/rendertype_crumbling.vsh

@@ -1,14 +1,17 @@
 #version 150
 
+#moj_import <minecraft:fog.glsl>
+#moj_import <minecraft:dynamictransforms.glsl>
+#moj_import <minecraft:projection.glsl>
+
 in vec3 Position;
 in vec4 Color;
 in vec2 UV0;
 in vec2 UV2;
 in vec3 Normal;
 
-uniform mat4 ModelViewMat;
+out float sphericalVertexDistance;
-uniform mat4 ProjMat;
+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;

assets/minecraft/shaders/core/rendertype_end_portal.fsh

@@ -2,17 +2,14 @@
 
 #moj_import <minecraft:fog.glsl>
 #moj_import <minecraft:matrix.glsl>
+#moj_import <minecraft:globals.glsl>
 
 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);
 }

assets/minecraft/shaders/core/rendertype_end_portal.vsh

@@ -2,19 +2,19 @@
 
 #moj_import <minecraft:fog.glsl>
 #moj_import <minecraft:projection.glsl>
+#moj_import <minecraft:dynamictransforms.glsl>
+#moj_import <minecraft:projection.glsl>
 
 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);
 }

assets/minecraft/shaders/core/rendertype_entity_alpha.vsh

@@ -1,5 +1,8 @@
 #version 150
 
+#moj_import <minecraft:dynamictransforms.glsl>
+#moj_import <minecraft:projection.glsl>
+
 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;

assets/minecraft/shaders/core/rendertype_entity_decal.fsh

@@ -1,15 +1,12 @@
 #version 150
 
 #moj_import <minecraft:fog.glsl>
+#moj_import <minecraft:dynamictransforms.glsl>
 
 uniform sampler2D Sampler0;
 
-uniform vec4 ColorModulator;
+in float sphericalVertexDistance;
-uniform float FogStart;
+in float cylindricalVertexDistance;
-uniform float FogEnd;
-uniform vec4 FogColor;
-
-in float vertexDistance;
 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);
 }

assets/minecraft/shaders/core/rendertype_entity_decal.vsh

@@ -2,6 +2,8 @@
 
 #moj_import <minecraft:light.glsl>
 #moj_import <minecraft:fog.glsl>
+#moj_import <minecraft:dynamictransforms.glsl>
+#moj_import <minecraft:projection.glsl>
 
 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;
+out float sphericalVertexDistance;
-uniform vec3 Light1_Direction;
+out float cylindricalVertexDistance;
-
-out float vertexDistance;
 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;

assets/minecraft/shaders/core/rendertype_entity_shadow.fsh

@@ -1,15 +1,12 @@
 #version 150
 
 #moj_import <minecraft:fog.glsl>
+#moj_import <minecraft:dynamictransforms.glsl>
 
 uniform sampler2D Sampler0;
 
-uniform vec4 ColorModulator;
+in float sphericalVertexDistance;
-uniform float FogStart;
+in float cylindricalVertexDistance;
-uniform float FogEnd;
-uniform vec4 FogColor;
-
-in float vertexDistance;
 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);
 }

assets/minecraft/shaders/core/rendertype_entity_shadow.vsh

@@ -1,23 +1,23 @@
 #version 150
 
 #moj_import <minecraft:fog.glsl>
+#moj_import <minecraft:dynamictransforms.glsl>
+#moj_import <minecraft:projection.glsl>
 
 in vec3 Position;
 in vec4 Color;
 in vec2 UV0;
 
-uniform mat4 ModelViewMat;
+out float sphericalVertexDistance;
-uniform mat4 ProjMat;
+out float cylindricalVertexDistance;
-uniform int FogShape;
-
-out float vertexDistance;
 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;
 }

assets/minecraft/shaders/core/rendertype_item_entity_translucent_cull.fsh

@@ -1,15 +1,12 @@
 #version 150
 
 #moj_import <minecraft:fog.glsl>
+#moj_import <minecraft:dynamictransforms.glsl>
 
 uniform sampler2D Sampler0;
 
-uniform vec4 ColorModulator;
+in float sphericalVertexDistance;
-uniform float FogStart;
+in float cylindricalVertexDistance;
-uniform float FogEnd;
-uniform vec4 FogColor;
-
-in float vertexDistance;
 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);
 }

assets/minecraft/shaders/core/rendertype_item_entity_translucent_cull.vsh

@@ -2,6 +2,8 @@
 
 #moj_import <minecraft:light.glsl>
 #moj_import <minecraft:fog.glsl>
+#moj_import <minecraft:dynamictransforms.glsl>
+#moj_import <minecraft:projection.glsl>
 
 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;
+out float sphericalVertexDistance;
-uniform vec3 Light1_Direction;
+out float cylindricalVertexDistance;
-
-out float vertexDistance;
 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;

assets/minecraft/shaders/core/rendertype_leash.fsh

@@ -2,15 +2,13 @@
 
 #moj_import <minecraft:fog.glsl>
 
-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);
 }

assets/minecraft/shaders/core/rendertype_leash.vsh

@@ -1,6 +1,8 @@
 #version 150
 
 #moj_import <minecraft:fog.glsl>
+#moj_import <minecraft:dynamictransforms.glsl>
+#moj_import <minecraft:projection.glsl>
 
 in vec3 Position;
 in vec4 Color;
@@ -8,17 +10,14 @@ in ivec2 UV2;
 
 uniform sampler2D Sampler2;
 
-uniform mat4 ModelViewMat;
+out float sphericalVertexDistance;
-uniform mat4 ProjMat;
+out float cylindricalVertexDistance;
-uniform vec4 ColorModulator;
-uniform int FogShape;
-
-out float vertexDistance;
 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);
 }

assets/minecraft/shaders/core/rendertype_lightning.fsh

@@ -1,16 +1,14 @@
 #version 150
 
 #moj_import <minecraft:fog.glsl>
+#moj_import <minecraft:dynamictransforms.glsl>
 
-uniform vec4 ColorModulator;
+in float sphericalVertexDistance;
-uniform float FogStart;
+in float cylindricalVertexDistance;
-uniform float FogEnd;
-
-in float vertexDistance;
 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));
 }

assets/minecraft/shaders/core/rendertype_lightning.vsh

@@ -1,20 +1,20 @@
 #version 150
 
 #moj_import <minecraft:fog.glsl>
+#moj_import <minecraft:dynamictransforms.glsl>
+#moj_import <minecraft:projection.glsl>
 
 in vec3 Position;
 in vec4 Color;
 
-uniform mat4 ModelViewMat;
+out float sphericalVertexDistance;
-uniform mat4 ProjMat;
+out float cylindricalVertexDistance;
-uniform int FogShape;
-
-out float vertexDistance;
 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;
 }

assets/minecraft/shaders/core/rendertype_lines.fsh

@@ -1,18 +1,15 @@
 #version 150
 
 #moj_import <minecraft:fog.glsl>
+#moj_import <minecraft:dynamictransforms.glsl>
 
-uniform vec4 ColorModulator;
+in float sphericalVertexDistance;
-uniform float FogStart;
+in float cylindricalVertexDistance;
-uniform float FogEnd;
-uniform vec4 FogColor;
-
-in float vertexDistance;
 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);
 }

assets/minecraft/shaders/core/rendertype_lines.vsh

@@ -1,18 +1,16 @@
 #version 150
 
 #moj_import <minecraft:fog.glsl>
+#moj_import <minecraft:globals.glsl>
+#moj_import <minecraft:dynamictransforms.glsl>
+#moj_import <minecraft:projection.glsl>
 
 in vec3 Position;
 in vec4 Color;
 in vec3 Normal;
 
-uniform mat4 ModelViewMat;
+out float sphericalVertexDistance;
-uniform mat4 ProjMat;
+out float cylindricalVertexDistance;
-uniform float LineWidth;
-uniform vec2 ScreenSize;
-uniform int FogShape;
-
-out float vertexDistance;
 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;
 }

assets/minecraft/shaders/core/rendertype_outline.fsh

@@ -1,8 +1,8 @@
 #version 150
 
-uniform sampler2D Sampler0;
+#moj_import <minecraft:dynamictransforms.glsl>
 
-uniform vec4 ColorModulator;
+uniform sampler2D Sampler0;
 
 in vec4 vertexColor;
 in vec2 texCoord0;

assets/minecraft/shaders/core/rendertype_outline.vsh

@@ -1,12 +1,12 @@
 #version 150
 
+#moj_import <minecraft:dynamictransforms.glsl>
+#moj_import <minecraft:projection.glsl>
+
 in vec3 Position;
 in vec4 Color;
 in vec2 UV0;
 
-uniform mat4 ModelViewMat;
-uniform mat4 ProjMat;
-
 out vec4 vertexColor;
 out vec2 texCoord0;
 

assets/minecraft/shaders/core/rendertype_text.fsh

@@ -1,15 +1,12 @@
 #version 150
 
 #moj_import <minecraft:fog.glsl>
+#moj_import <minecraft:dynamictransforms.glsl>
 
 uniform sampler2D Sampler0;
 
-uniform vec4 ColorModulator;
+in float sphericalVertexDistance;
-uniform float FogStart;
+in float cylindricalVertexDistance;
-uniform float FogEnd;
-uniform vec4 FogColor;
-
-in float vertexDistance;
 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);
 }

assets/minecraft/shaders/core/rendertype_text.vsh

@@ -1,6 +1,8 @@
 #version 150
 
 #moj_import <minecraft:fog.glsl>
+#moj_import <minecraft:dynamictransforms.glsl>
+#moj_import <minecraft:projection.glsl>
 
 in vec3 Position;
 in vec4 Color;
@@ -9,18 +11,16 @@ in ivec2 UV2;
 
 uniform sampler2D Sampler2;
 
-uniform mat4 ModelViewMat;
+out float sphericalVertexDistance;
-uniform mat4 ProjMat;
+out float cylindricalVertexDistance;
-uniform int FogShape;
-
-out float vertexDistance;
 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;
 }

assets/minecraft/shaders/core/rendertype_text_background.fsh

@@ -1,15 +1,12 @@
 #version 150
 
 #moj_import <minecraft:fog.glsl>
+#moj_import <minecraft:dynamictransforms.glsl>
 
 uniform sampler2D Sampler0;
 
-uniform vec4 ColorModulator;
+in float sphericalVertexDistance;
-uniform float FogStart;
+in float cylindricalVertexDistance;
-uniform float FogEnd;
-uniform vec4 FogColor;
-
-in float vertexDistance;
 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);
 }

assets/minecraft/shaders/core/rendertype_text_background.vsh

@@ -1,6 +1,8 @@
 #version 150
 
 #moj_import <minecraft:fog.glsl>
+#moj_import <minecraft:dynamictransforms.glsl>
+#moj_import <minecraft:projection.glsl>
 
 in vec3 Position;
 in vec4 Color;
@@ -8,16 +10,14 @@ in ivec2 UV2;
 
 uniform sampler2D Sampler2;
 
-uniform mat4 ModelViewMat;
+out float sphericalVertexDistance;
-uniform mat4 ProjMat;
+out float cylindricalVertexDistance;
-uniform int FogShape;
-
-out float vertexDistance;
 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);
 }

assets/minecraft/shaders/core/rendertype_text_background_see_through.fsh

@@ -1,6 +1,6 @@
 #version 150
 
-uniform vec4 ColorModulator;
+#moj_import <minecraft:dynamictransforms.glsl>
 
 in vec4 vertexColor;
 

assets/minecraft/shaders/core/rendertype_text_background_see_through.vsh

@@ -1,11 +1,11 @@
 #version 150
 
+#moj_import <minecraft:dynamictransforms.glsl>
+#moj_import <minecraft:projection.glsl>
+
 in vec3 Position;
 in vec4 Color;
 
-uniform mat4 ModelViewMat;
-uniform mat4 ProjMat;
-
 out vec4 vertexColor;
 
 void main() {

assets/minecraft/shaders/core/rendertype_text_intensity.fsh

@@ -1,15 +1,12 @@
 #version 150
 
 #moj_import <minecraft:fog.glsl>
+#moj_import <minecraft:dynamictransforms.glsl>
 
 uniform sampler2D Sampler0;
 
-uniform vec4 ColorModulator;
+in float sphericalVertexDistance;
-uniform float FogStart;
+in float cylindricalVertexDistance;
-uniform float FogEnd;
-uniform vec4 FogColor;
-
-in float vertexDistance;
 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);
 }

assets/minecraft/shaders/core/rendertype_text_intensity.vsh

@@ -1,6 +1,8 @@
 #version 150
 
 #moj_import <minecraft:fog.glsl>
+#moj_import <minecraft:dynamictransforms.glsl>
+#moj_import <minecraft:projection.glsl>
 
 in vec3 Position;
 in vec4 Color;
@@ -9,18 +11,16 @@ in ivec2 UV2;
 
 uniform sampler2D Sampler2;
 
-uniform mat4 ModelViewMat;
+out float sphericalVertexDistance;
-uniform mat4 ProjMat;
+out float cylindricalVertexDistance;
-uniform int FogShape;
-
-out float vertexDistance;
 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;
 }

assets/minecraft/shaders/core/rendertype_text_intensity_see_through.fsh

@@ -1,8 +1,8 @@
 #version 150
 
-uniform sampler2D Sampler0;
+#moj_import <minecraft:dynamictransforms.glsl>
 
-uniform vec4 ColorModulator;
+uniform sampler2D Sampler0;
 
 in vec4 vertexColor;
 in vec2 texCoord0;

assets/minecraft/shaders/core/rendertype_text_intensity_see_through.vsh

@@ -1,12 +1,12 @@
 #version 150
 
+#moj_import <minecraft:dynamictransforms.glsl>
+#moj_import <minecraft:projection.glsl>
+
 in vec3 Position;
 in vec4 Color;
 in vec2 UV0;
 
-uniform mat4 ModelViewMat;
-uniform mat4 ProjMat;
-
 out vec4 vertexColor;
 out vec2 texCoord0;
 

assets/minecraft/shaders/core/rendertype_text_see_through.fsh

@@ -1,8 +1,8 @@
 #version 150
 
-uniform sampler2D Sampler0;
+#moj_import <minecraft:dynamictransforms.glsl>
 
-uniform vec4 ColorModulator;
+uniform sampler2D Sampler0;
 
 in vec4 vertexColor;
 in vec2 texCoord0;

assets/minecraft/shaders/core/rendertype_text_see_through.vsh

@@ -1,12 +1,12 @@
 #version 150
 
+#moj_import <minecraft:dynamictransforms.glsl>
+#moj_import <minecraft:projection.glsl>
+
 in vec3 Position;
 in vec4 Color;
 in vec2 UV0;
 
-uniform mat4 ModelViewMat;
-uniform mat4 ProjMat;
-
 out vec4 vertexColor;
 out vec2 texCoord0;
 

assets/minecraft/shaders/core/rendertype_translucent_moving_block.fsh

@@ -1,10 +1,13 @@
 #version 150
 
+#moj_import <minecraft:fog.glsl>
+#moj_import <minecraft:dynamictransforms.glsl>
+
 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);
 }

assets/minecraft/shaders/core/rendertype_translucent_moving_block.vsh

@@ -1,5 +1,9 @@
 #version 150
 
+#moj_import <minecraft:fog.glsl>
+#moj_import <minecraft:dynamictransforms.glsl>
+#moj_import <minecraft:projection.glsl>
+
 in vec3 Position;
 in vec4 Color;
 in vec2 UV0;
@@ -8,15 +12,16 @@ in vec3 Normal;
 
 uniform sampler2D Sampler2;
 
-uniform mat4 ModelViewMat;
+out float sphericalVertexDistance;
-uniform mat4 ProjMat;
+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;
 }

assets/minecraft/shaders/core/rendertype_water_mask.fsh

@@ -1,6 +1,6 @@
 #version 150
 
-uniform vec4 ColorModulator;
+#moj_import <minecraft:dynamictransforms.glsl>
 
 out vec4 fragColor;
 

assets/minecraft/shaders/core/rendertype_water_mask.vsh

@@ -1,9 +1,9 @@
 #version 150
 
-in vec3 Position;
+#moj_import <minecraft:dynamictransforms.glsl>
+#moj_import <minecraft:projection.glsl>
 
-uniform mat4 ModelViewMat;
+in vec3 Position;
-uniform mat4 ProjMat;
 
 void main() {
     gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0);

assets/minecraft/shaders/core/rendertype_world_border.fsh

@@ -1,8 +1,8 @@
 #version 150
 
-uniform sampler2D Sampler0;
+#moj_import <minecraft:dynamictransforms.glsl>
 
-uniform vec4 ColorModulator;
+uniform sampler2D Sampler0;
 
 in vec2 texCoord0;
 

assets/minecraft/shaders/core/rendertype_world_border.vsh

@@ -1,13 +1,11 @@
 #version 150
 
+#moj_import <minecraft:dynamictransforms.glsl>
+#moj_import <minecraft:projection.glsl>
+
 in vec3 Position;
 in vec2 UV0;
 
-uniform mat4 TextureMat;
-uniform mat4 ModelViewMat;
-uniform mat4 ProjMat;
-uniform vec3 ModelOffset;
-
 out vec2 texCoord0;
 
 void main() {

assets/minecraft/shaders/core/sky.fsh

@@ -0,0 +1,13 @@
+#version 150
+
+#moj_import <minecraft:fog.glsl>
+#moj_import <minecraft:dynamictransforms.glsl>
+
+in float sphericalVertexDistance;
+in float cylindricalVertexDistance;
+
+out vec4 fragColor;
+
+void main() {
+    fragColor = apply_fog(ColorModulator, sphericalVertexDistance, cylindricalVertexDistance, 0.0, FogSkyEnd, FogSkyEnd, FogSkyEnd, FogColor);
+}

assets/minecraft/shaders/core/sky.vsh

@@ -0,0 +1,17 @@
+#version 150
+
+#moj_import <minecraft:fog.glsl>
+#moj_import <minecraft:dynamictransforms.glsl>
+#moj_import <minecraft:projection.glsl>
+
+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);
+}

assets/minecraft/shaders/core/stars.fsh

@@ -0,0 +1,9 @@
+#version 150
+
+#moj_import <minecraft:dynamictransforms.glsl>
+
+out vec4 fragColor;
+
+void main() {
+    fragColor = ColorModulator;
+}

assets/minecraft/shaders/core/stars.vsh

@@ -0,0 +1,10 @@
+#version 150
+
+#moj_import <minecraft:dynamictransforms.glsl>
+#moj_import <minecraft:projection.glsl>
+
+in vec3 Position;
+
+void main() {
+    gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0);
+}

assets/minecraft/shaders/core/terrain.fsh

@@ -1,15 +1,12 @@
 #version 150
 
 #moj_import <minecraft:fog.glsl>
+#moj_import <minecraft:dynamictransforms.glsl>
 
 uniform sampler2D Sampler0;
 
-uniform vec4 ColorModulator;
+in float sphericalVertexDistance;
-uniform float FogStart;
+in float cylindricalVertexDistance;
-uniform float FogEnd;
-uniform vec4 FogColor;
-
-in float vertexDistance;
 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);
 }

assets/minecraft/shaders/core/terrain.vsh

@@ -1,7 +1,8 @@
 #version 150
 
-#moj_import <minecraft:light.glsl>
 #moj_import <minecraft:fog.glsl>
+#moj_import <minecraft:dynamictransforms.glsl>
+#moj_import <minecraft:projection.glsl>
 
 in vec3 Position;
 in vec4 Color;
@@ -11,20 +12,21 @@ in vec3 Normal;
 
 uniform sampler2D Sampler2;
 
-uniform mat4 ModelViewMat;
+out float sphericalVertexDistance;
-uniform mat4 ProjMat;
+out float cylindricalVertexDistance;
-uniform vec3 ModelOffset;
-uniform int FogShape;
-
-out float vertexDistance;
 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;
 }

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;
+};

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) {
+float fog_spherical_distance(vec3 pos) {
-    if (vertexDistance <= fogStart) {
-        return 1.0;
-    } else if (vertexDistance >= fogEnd) {
-        return 0.0;
-    }
-
-    return smoothstep(fogEnd, fogStart, vertexDistance);
-}
-
-float fog_distance(vec3 pos, int shape) {
-    if (shape == 0) {
     return length(pos);
-    } else {
+}
+
+float fog_cylindrical_distance(vec3 pos) {
     float distXZ = length(pos.xz);
     float distY = abs(pos.y);
     return max(distXZ, distY);
 }
-}

assets/minecraft/shaders/include/globals.glsl

@@ -0,0 +1,8 @@
+#version 150
+
+layout(std140) uniform Globals {
+    vec2 ScreenSize;
+    float GlintAlpha;
+    float GameTime;
+    int MenuBlurRadius;
+};

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)));
-}

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);

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;
+layout(std140) uniform BitsConfig {
-uniform float MosaicSize;
+    float Resolution;
+    float MosaicSize;
+};
 
 out vec4 fragColor;
 

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;
 

assets/minecraft/shaders/post/blit.vsh

@@ -1,9 +1,13 @@
 #version 150
 
+#moj_import <minecraft:projection.glsl>
+
 in vec4 Position;
 
-uniform mat4 ProjMat;
+layout(std140) uniform SamplerInfo {
-uniform vec2 OutSize;
+    vec2 OutSize;
+    vec2 InSize;
+};
 
 out vec2 texCoord;
 

assets/minecraft/shaders/post/blur.vsh

@@ -1,11 +1,18 @@
 #version 150
 
+#moj_import <minecraft:projection.glsl>
+
 in vec4 Position;
 
-uniform mat4 ProjMat;
+layout(std140) uniform SamplerInfo {
-uniform vec2 InSize;
+    vec2 OutSize;
-uniform vec2 OutSize;
+    vec2 InSize;
-uniform vec2 BlurDir;
+};
+
+layout(std140) uniform BlurConfig {
+    vec2 BlurDir;
+    float Radius;
+};
 
 out vec2 texCoord;
 out vec2 sampleStep;

assets/minecraft/shaders/post/box_blur.fsh

@@ -1,12 +1,17 @@
 #version 150
 
+#moj_import <minecraft:globals.glsl>
+
 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);
     }

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;
+layout(std140) uniform SamplerInfo {
-uniform vec3 GreenMatrix;
+    vec2 OutSize;
-uniform vec3 BlueMatrix;
+    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;

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;
 

assets/minecraft/shaders/post/invert.vsh

@@ -1,10 +1,13 @@
 #version 150
 
+#moj_import <minecraft:projection.glsl>
+
 in vec4 Position;
 
-uniform mat4 ProjMat;
+layout(std140) uniform SamplerInfo {
-uniform vec2 InSize;
+    vec2 OutSize;
-uniform vec2 OutSize;
+    vec2 InSize;
+};
 
 out vec2 texCoord;
 

assets/minecraft/shaders/post/rotscale.vsh

@@ -1,14 +1,19 @@
 #version 150
 
+#moj_import <minecraft:projection.glsl>
+
 in vec4 Position;
 
-uniform mat4 ProjMat;
+layout(std140) uniform SamplerInfo {
-uniform vec2 InSize;
+    vec2 OutSize;
-uniform vec2 OutSize;
+    vec2 InSize;
+};
 
-uniform vec2 InScale;
+layout(std140) uniform RotScaleConfig {
-uniform vec2 InOffset;
+    vec2 InScale;
-uniform float InRotation;
+    vec2 InOffset;
+    float InRotation;
+};
 
 out vec2 texCoord;
 out vec2 scaledCoord;

assets/minecraft/shaders/post/screenquad.vsh

@@ -1,9 +1,13 @@
 #version 150
 
+#moj_import <minecraft:projection.glsl>
+
 in vec4 Position;
 
-uniform mat4 ProjMat;
+layout(std140) uniform SamplerInfo {
-uniform vec2 OutSize;
+    vec2 OutSize;
+    vec2 InSize;
+};
 
 out vec2 texCoord;
 

assets/minecraft/shaders/post/sobel.vsh

@@ -1,10 +1,13 @@
 #version 150
 
+#moj_import <minecraft:projection.glsl>
+
 in vec4 Position;
 
-uniform mat4 ProjMat;
+layout(std140) uniform SamplerInfo {
-uniform vec2 InSize;
+    vec2 OutSize;
-uniform vec2 OutSize;
+    vec2 InSize;
+};
 
 out vec2 texCoord;
 out vec2 oneTexel;

assets/minecraft/shaders/post/spiderclip.fsh

@@ -6,9 +6,15 @@ uniform sampler2D BlurSampler;
 in vec2 texCoord;
 in vec2 scaledCoord;
 
-uniform vec2 InSize;
+layout(std140) uniform SamplerInfo {
-uniform vec4 Scissor;
+    vec2 OutSize;
-uniform vec4 Vignette;
+    vec2 InSize;
+};
+
+layout(std140) uniform SpiderConfig {
+    vec4 Scissor;
+    vec4 Vignette;
+};
 
 out vec4 fragColor;
 

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!
@@ -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!