Skip to content

Commit

Permalink
Add class comments to new simple type names
Browse files Browse the repository at this point in the history 
Co-authored-by: Eli Orona <[email protected]>
  • Loading branch information
@supersaiyansubtlety @OroArmor
supersaiyansubtlety and OroArmor authored Sep 24, 2024
1 parent 3e107f0 commit 31f60c0
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions simple_type_field_names.json5
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@
"net/minecraft/unmapped/C_pennblrk": "source", // ServerCommandSource

// Registries
"net/minecraft/unmapped/C_tqxyjqsk": {
"net/minecraft/unmapped/C_tqxyjqsk": { // Registry
local_name: "registry",
inherit: true
},
"net/minecraft/unmapped/C_wqxmvzdq": "registryManager", // DynamicRegistryManager
"net/minecraft/unmapped/C_hqoyyfco": "context", // BootstrapContext
"net/minecraft/unmapped/C_ednuhnnn": "tag", // TagKey
"net/minecraft/unmapped/C_ncpywfca": {
"net/minecraft/unmapped/C_ncpywfca": { // Identifier
local_name: "id",
exclusive: true,
fallback: [
Expand Down Expand Up @@ -111,7 +111,7 @@
},

// Village
"net/minecraft/unmapped/C_argwryfu": {
"net/minecraft/unmapped/C_argwryfu": { // TradeOffer
local_name: "offer",
inherit: true,
fallback: [
Expand Down Expand Up @@ -159,7 +159,7 @@

// Network
"net/minecraft/unmapped/C_idfydwco": "buf", // PacketByteBuf
"net/minecraft/unmapped/C_mnjlaveb$C_mlxyrlwl": {
"net/minecraft/unmapped/C_mnjlaveb$C_mlxyrlwl": { // TagNetworkSerialization$NetworkPayload
local_name: "payload",
fallback: [
"networkPayload"
Expand Down

6 comments on commit 31f60c0

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With commit 31f60c0, 314 file(s) were updated with 2022 line(s) added and 1933 removed compared to the latest Quilt Mappings version.

View the diff here (1/3): 
diff -bur namedTargetSrc/net/minecraft/advancement/AdvancementRewards.java namedSrc/net/minecraft/advancement/AdvancementRewards.java
--- namedTargetSrc/net/minecraft/advancement/AdvancementRewards.java	2024-09-24 21:25:02.462401506 +0000
+++ namedSrc/net/minecraft/advancement/AdvancementRewards.java	2024-09-24 21:23:57.811741404 +0000
@@ -32,7 +32,7 @@
    public static final Codec<AdvancementRewards> CODEC = RecordCodecBuilder.create(
       instance -> instance.group(
                Codec.INT.optionalFieldOf("experience", Integer.valueOf(0)).forGetter(AdvancementRewards::experience),
-               RegistryKey.codec(RegistryKeys.LOOT_TABLE).listOf().optionalFieldOf("loot", List.of()).forGetter(AdvancementRewards::loot),
+               RegistryKey.createCodec(RegistryKeys.LOOT_TABLE).listOf().optionalFieldOf("loot", List.of()).forGetter(AdvancementRewards::loot),
                Identifier.CODEC.listOf().optionalFieldOf("recipes", List.of()).forGetter(AdvancementRewards::recipes),
                C_uxzryfxv.CODEC.optionalFieldOf("function").forGetter(AdvancementRewards::function)
             )
@@ -142,16 +142,16 @@
        * @mapping {@literal hashed m_sbnvjevi Lnet/minecraft/unmapped/C_wptigggq$C_wbctdknv;m_sbnvjevi(Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_wptigggq$C_wbctdknv;}
        * @mapping {@literal named loot Lnet/minecraft/advancement/AdvancementRewards$Builder;loot(Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/advancement/AdvancementRewards$Builder;}
        */
-      public static AdvancementRewards.Builder loot(RegistryKey<LootTable> registryKey) {
-         return new AdvancementRewards.Builder().addLoot(registryKey);
+      public static AdvancementRewards.Builder loot(RegistryKey<LootTable> element) {
+         return new AdvancementRewards.Builder().addLoot(element);
       }
 
       /**
        * @mapping {@literal hashed m_xltlznvb Lnet/minecraft/unmapped/C_wptigggq$C_wbctdknv;m_xltlznvb(Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_wptigggq$C_wbctdknv;}
        * @mapping {@literal named addLoot Lnet/minecraft/advancement/AdvancementRewards$Builder;addLoot(Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/advancement/AdvancementRewards$Builder;}
        */
-      public AdvancementRewards.Builder addLoot(RegistryKey<LootTable> registryKey) {
-         this.loot.add(registryKey);
+      public AdvancementRewards.Builder addLoot(RegistryKey<LootTable> element) {
+         this.loot.add(element);
          return this;
       }
 
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/ChangedDimensionCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/ChangedDimensionCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/ChangedDimensionCriterionTrigger.java	2024-09-24 21:25:02.316402241 +0000
+++ namedSrc/net/minecraft/advancement/criterion/ChangedDimensionCriterionTrigger.java	2024-09-24 21:23:57.615742410 +0000
@@ -45,8 +45,8 @@
       public static final Codec<ChangedDimensionCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
                   EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter(ChangedDimensionCriterionTrigger.Conditions::player),
-                  RegistryKey.codec(RegistryKeys.WORLD).optionalFieldOf("from").forGetter(ChangedDimensionCriterionTrigger.Conditions::from),
-                  RegistryKey.codec(RegistryKeys.WORLD).optionalFieldOf("to").forGetter(ChangedDimensionCriterionTrigger.Conditions::to)
+                  RegistryKey.createCodec(RegistryKeys.WORLD).optionalFieldOf("from").forGetter(ChangedDimensionCriterionTrigger.Conditions::from),
+                  RegistryKey.createCodec(RegistryKeys.WORLD).optionalFieldOf("to").forGetter(ChangedDimensionCriterionTrigger.Conditions::to)
                )
                .apply(instance, ChangedDimensionCriterionTrigger.Conditions::new)
       );
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterionTrigger.java	2024-09-24 21:25:02.388401878 +0000
+++ namedSrc/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterionTrigger.java	2024-09-24 21:23:57.711741917 +0000
@@ -28,8 +28,8 @@
     * @mapping {@literal hashed m_bwskqxvw Lnet/minecraft/unmapped/C_ccuyenqy;m_bwskqxvw(Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_xhhleach;)V}
     * @mapping {@literal named trigger Lnet/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterionTrigger;trigger(Lnet/minecraft/server/network/ServerPlayerEntity;Lnet/minecraft/registry/RegistryKey;)V}
     */
-   public void trigger(ServerPlayerEntity player, RegistryKey<LootTable> registryKey) {
-      this.trigger(player, conditions -> conditions.matches(registryKey));
+   public void trigger(ServerPlayerEntity player, RegistryKey<LootTable> arg2) {
+      this.trigger(player, conditions -> conditions.matches(arg2));
    }
 
    /**
@@ -44,7 +44,7 @@
       public static final Codec<PlayerGeneratesContainerLootCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
                   EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter(PlayerGeneratesContainerLootCriterionTrigger.Conditions::player),
-                  RegistryKey.codec(RegistryKeys.LOOT_TABLE)
+                  RegistryKey.createCodec(RegistryKeys.LOOT_TABLE)
                      .fieldOf("loot_table")
                      .forGetter(PlayerGeneratesContainerLootCriterionTrigger.Conditions::lootTable)
                )
@@ -55,16 +55,16 @@
        * @mapping {@literal hashed m_sdawxryt Lnet/minecraft/unmapped/C_ccuyenqy$C_jvilurms;m_sdawxryt(Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_rzypsigz;}
        * @mapping {@literal named create Lnet/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterionTrigger$Conditions;create(Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/advancement/AdvancementCriterion;}
        */
-      public static AdvancementCriterion<PlayerGeneratesContainerLootCriterionTrigger.Conditions> create(RegistryKey<LootTable> registryKey) {
-         return Criteria.PLAYER_GENERATES_CONTAINER_LOOT.create(new PlayerGeneratesContainerLootCriterionTrigger.Conditions(Optional.empty(), registryKey));
+      public static AdvancementCriterion<PlayerGeneratesContainerLootCriterionTrigger.Conditions> create(RegistryKey<LootTable> lootTable) {
+         return Criteria.PLAYER_GENERATES_CONTAINER_LOOT.create(new PlayerGeneratesContainerLootCriterionTrigger.Conditions(Optional.empty(), lootTable));
       }
 
       /**
        * @mapping {@literal hashed m_ocoesmqp Lnet/minecraft/unmapped/C_ccuyenqy$C_jvilurms;m_ocoesmqp(Lnet/minecraft/unmapped/C_xhhleach;)Z}
        * @mapping {@literal named matches Lnet/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterionTrigger$Conditions;matches(Lnet/minecraft/registry/RegistryKey;)Z}
        */
-      public boolean matches(RegistryKey<LootTable> registryKey) {
-         return this.lootTable == registryKey;
+      public boolean matches(RegistryKey<LootTable> arg) {
+         return this.lootTable == arg;
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/AbstractBlock.java namedSrc/net/minecraft/block/AbstractBlock.java
--- namedTargetSrc/net/minecraft/block/AbstractBlock.java	2024-09-24 21:25:02.303402307 +0000
+++ namedSrc/net/minecraft/block/AbstractBlock.java	2024-09-24 21:23:57.600742487 +0000
@@ -1656,8 +1656,8 @@
        * @mapping {@literal hashed m_trxxnxke Lnet/minecraft/unmapped/C_triydqro$C_eibemhky;m_trxxnxke(Lnet/minecraft/unmapped/C_xhhleach;)Z}
        * @mapping {@literal named isRegistryKey Lnet/minecraft/block/AbstractBlock$AbstractBlockState;isRegistryKey(Lnet/minecraft/registry/RegistryKey;)Z}
        */
-      public boolean isRegistryKey(RegistryKey<Block> registryKey) {
-         return this.getBlock().getBuiltInRegistryHolder().isRegistryKey(registryKey);
+      public boolean isRegistryKey(RegistryKey<Block> arg) {
+         return this.getBlock().getBuiltInRegistryHolder().isRegistryKey(arg);
       }
 
       /**
@@ -1952,22 +1952,21 @@
        */
       float jumpVelocityMultiplier = 1.0F;
       /**
-       * @mapping {@literal hashed f_eioycbda Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;f_eioycbda:Lnet/minecraft/unmapped/C_xhhleach;}
-       * @mapping {@literal named registryKey Lnet/minecraft/block/AbstractBlock$Settings;registryKey:Lnet/minecraft/registry/RegistryKey;}
+       * Mapping not found
        */
       @Nullable
-      private RegistryKey<Block> registryKey;
+      private RegistryKey<Block> f_eioycbda;
       /**
        * @mapping {@literal hashed f_pxqjcqnw Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;f_pxqjcqnw:Lnet/minecraft/unmapped/C_jquyxssk;}
        * @mapping {@literal named lootTableId Lnet/minecraft/block/AbstractBlock$Settings;lootTableId:Lnet/minecraft/unmapped/C_jquyxssk;}
        */
-      private C_jquyxssk<Block, Optional<RegistryKey<LootTable>>> lootTableId = registryKey -> Optional.of(
-            RegistryKey.of(RegistryKeys.LOOT_TABLE, registryKey.getValue().withPrefix("blocks/"))
+      private C_jquyxssk<Block, Optional<RegistryKey<LootTable>>> lootTableId = arg -> Optional.of(
+            RegistryKey.of(RegistryKeys.LOOT_TABLE, arg.getValue().withPrefix("blocks/"))
          );
       /**
        * Mapping not found
        */
-      private C_jquyxssk<Block, String> f_gxswpnob = registryKey -> Util.createTranslationKey("block", registryKey.getValue());
+      private C_jquyxssk<Block, String> f_gxswpnob = arg -> Util.createTranslationKey("block", arg.getValue());
       /**
        * @mapping {@literal hashed f_obppjqdx Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;f_obppjqdx:Z}
        * @mapping {@literal named opaque Lnet/minecraft/block/AbstractBlock$Settings;opaque:Z}
@@ -2313,7 +2312,7 @@
        * Mapping not found
        */
       protected Optional<RegistryKey<LootTable>> m_bybxvckr() {
-         return this.lootTableId.get((RegistryKey<Block>)Objects.requireNonNull(this.registryKey, "Block id not set"));
+         return this.lootTableId.get((RegistryKey<Block>)Objects.requireNonNull(this.f_eioycbda, "Block id not set"));
       }
 
       /**
@@ -2527,11 +2526,10 @@
       }
 
       /**
-       * @mapping {@literal hashed m_vuvrdzlb Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;m_vuvrdzlb(Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;}
-       * @mapping {@literal named m_vuvrdzlb Lnet/minecraft/block/AbstractBlock$Settings;m_vuvrdzlb(Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/block/AbstractBlock$Settings;}
+       * Mapping not found
        */
-      public AbstractBlock.Settings m_vuvrdzlb(RegistryKey<Block> registryKey) {
-         this.registryKey = registryKey;
+      public AbstractBlock.Settings m_vuvrdzlb(RegistryKey<Block> arg) {
+         this.f_eioycbda = arg;
          return this;
       }
 
@@ -2547,7 +2545,7 @@
        * Mapping not found
        */
       protected String m_telcghnd() {
-         return this.f_gxswpnob.get((RegistryKey<Block>)Objects.requireNonNull(this.registryKey, "Block id not set"));
+         return this.f_gxswpnob.get((RegistryKey<Block>)Objects.requireNonNull(this.f_eioycbda, "Block id not set"));
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/block/AttachedStemBlock.java namedSrc/net/minecraft/block/AttachedStemBlock.java
--- namedTargetSrc/net/minecraft/block/AttachedStemBlock.java	2024-09-24 21:25:02.494401344 +0000
+++ namedSrc/net/minecraft/block/AttachedStemBlock.java	2024-09-24 21:23:57.852741194 +0000
@@ -34,9 +34,9 @@
     */
    public static final MapCodec<AttachedStemBlock> CODEC = RecordCodecBuilder.mapCodec(
       stemBlock -> stemBlock.group(
-               RegistryKey.codec(RegistryKeys.BLOCK).fieldOf("fruit").forGetter(arg -> arg.gourdBlock),
-               RegistryKey.codec(RegistryKeys.BLOCK).fieldOf("stem").forGetter(arg -> arg.stem),
-               RegistryKey.codec(RegistryKeys.ITEM).fieldOf("seed").forGetter(arg -> arg.seed),
+               RegistryKey.createCodec(RegistryKeys.BLOCK).fieldOf("fruit").forGetter(arg -> arg.gourdBlock),
+               RegistryKey.createCodec(RegistryKeys.BLOCK).fieldOf("stem").forGetter(arg -> arg.stem),
+               RegistryKey.createCodec(RegistryKeys.ITEM).fieldOf("seed").forGetter(arg -> arg.seed),
                getSettingsCodec()
             )
             .apply(stemBlock, AttachedStemBlock::new)
diff -bur namedTargetSrc/net/minecraft/block/Blocks.java namedSrc/net/minecraft/block/Blocks.java
--- namedTargetSrc/net/minecraft/block/Blocks.java	2024-09-24 21:25:02.352402060 +0000
+++ namedSrc/net/minecraft/block/Blocks.java	2024-09-24 21:23:57.655742205 +0000
@@ -10680,17 +10680,17 @@
     * @mapping {@literal hashed m_cptpfson Lnet/minecraft/unmapped/C_jricjyva;m_cptpfson(Lnet/minecraft/unmapped/C_xhhleach;Ljava/util/function/Function;Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;)Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named m_cptpfson Lnet/minecraft/block/Blocks;m_cptpfson(Lnet/minecraft/registry/RegistryKey;Ljava/util/function/Function;Lnet/minecraft/block/AbstractBlock$Settings;)Lnet/minecraft/block/Block;}
     */
-   private static Block m_cptpfson(RegistryKey<Block> registryKey, Function<AbstractBlock.Settings, Block> function, AbstractBlock.Settings settings) {
-      Block lv = (Block)function.apply(settings.m_vuvrdzlb(registryKey));
-      return Registry.register(Registries.BLOCK, registryKey, lv);
+   private static Block m_cptpfson(RegistryKey<Block> arg, Function<AbstractBlock.Settings, Block> function, AbstractBlock.Settings settings) {
+      Block lv = (Block)function.apply(settings.m_vuvrdzlb(arg));
+      return Registry.register(Registries.BLOCK, arg, lv);
    }
 
    /**
     * @mapping {@literal hashed m_vfpzuwtj Lnet/minecraft/unmapped/C_jricjyva;m_vfpzuwtj(Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;)Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named m_vfpzuwtj Lnet/minecraft/block/Blocks;m_vfpzuwtj(Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/block/AbstractBlock$Settings;)Lnet/minecraft/block/Block;}
     */
-   private static Block m_vfpzuwtj(RegistryKey<Block> registryKey, AbstractBlock.Settings settings) {
-      return m_cptpfson(registryKey, Block::new, settings);
+   private static Block m_vfpzuwtj(RegistryKey<Block> arg, AbstractBlock.Settings settings) {
+      return m_cptpfson(arg, Block::new, settings);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/entity/BeaconBlockEntity.java namedSrc/net/minecraft/block/entity/BeaconBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/BeaconBlockEntity.java	2024-09-24 21:25:02.384401898 +0000
+++ namedSrc/net/minecraft/block/entity/BeaconBlockEntity.java	2024-09-24 21:23:57.706741943 +0000
@@ -415,7 +415,7 @@
     */
    private static void writeStatusEffect(NbtCompound nbt, String effectName, @Nullable Holder<StatusEffect> statusEffect) {
       if (statusEffect != null) {
-         statusEffect.getKey().ifPresent(registryKey -> nbt.putString(effectName, registryKey.getValue().toString()));
+         statusEffect.getKey().ifPresent(arg2 -> nbt.putString(effectName, arg2.getValue().toString()));
       }
    }
 
@@ -427,7 +427,7 @@
    private static Holder<StatusEffect> readStatusEffect(NbtCompound nbt, String effectName) {
       if (nbt.contains(effectName, NbtElement.STRING_TYPE)) {
          Identifier lv = Identifier.tryParse(nbt.getString(effectName));
-         return lv == null ? null : (Holder)Registries.STATUS_EFFECT.m_hnixtpdg(lv).map(BeaconBlockEntity::validate).orElse(null);
+         return lv == null ? null : (Holder)Registries.STATUS_EFFECT.find(lv).map(BeaconBlockEntity::validate).orElse(null);
       } else {
          return null;
       }
diff -bur namedTargetSrc/net/minecraft/block/entity/BrushableBlockEntity.java namedSrc/net/minecraft/block/entity/BrushableBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/BrushableBlockEntity.java	2024-09-24 21:25:02.440401616 +0000
+++ namedSrc/net/minecraft/block/entity/BrushableBlockEntity.java	2024-09-24 21:23:57.777741579 +0000
@@ -343,8 +343,8 @@
     * @mapping {@literal hashed m_llghgzmo Lnet/minecraft/unmapped/C_tlzeicbt;m_llghgzmo(Lnet/minecraft/unmapped/C_xhhleach;J)V}
     * @mapping {@literal named setLootTable Lnet/minecraft/block/entity/BrushableBlockEntity;setLootTable(Lnet/minecraft/registry/RegistryKey;J)V}
     */
-   public void setLootTable(RegistryKey<LootTable> registryKey, long lootTableSeed) {
-      this.lootTableId = registryKey;
+   public void setLootTable(RegistryKey<LootTable> arg, long lootTableSeed) {
+      this.lootTableId = arg;
       this.lootTableSeed = lootTableSeed;
    }
 
diff -bur namedTargetSrc/net/minecraft/block/entity/DecoratedPotBlockEntity.java namedSrc/net/minecraft/block/entity/DecoratedPotBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/DecoratedPotBlockEntity.java	2024-09-24 21:25:02.449401571 +0000
+++ namedSrc/net/minecraft/block/entity/DecoratedPotBlockEntity.java	2024-09-24 21:23:57.792741502 +0000
@@ -183,8 +183,8 @@
     * Mapping not found
     */
    @Override
-   public void setLootTable(@Nullable RegistryKey<LootTable> registryKey) {
-      this.lootTableId = registryKey;
+   public void setLootTable(@Nullable RegistryKey<LootTable> arg) {
+      this.lootTableId = arg;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/entity/LootableContainerBlockEntity.java namedSrc/net/minecraft/block/entity/LootableContainerBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/LootableContainerBlockEntity.java	2024-09-24 21:25:02.320402221 +0000
+++ namedSrc/net/minecraft/block/entity/LootableContainerBlockEntity.java	2024-09-24 21:23:57.618742395 +0000
@@ -53,8 +53,8 @@
     * Mapping not found
     */
    @Override
-   public void setLootTable(@Nullable RegistryKey<LootTable> registryKey) {
-      this.lootTableId = registryKey;
+   public void setLootTable(@Nullable RegistryKey<LootTable> arg) {
+      this.lootTableId = arg;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/entity/VaultBlockEntity.java namedSrc/net/minecraft/block/entity/VaultBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/VaultBlockEntity.java	2024-09-24 21:25:02.390401868 +0000
+++ namedSrc/net/minecraft/block/entity/VaultBlockEntity.java	2024-09-24 21:23:57.713741907 +0000
@@ -445,8 +445,8 @@
        * @mapping {@literal hashed m_vsawgyip Lnet/minecraft/unmapped/C_xclnoluc$C_vucktnfd;m_vsawgyip(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_sddaxwyk;}
        * @mapping {@literal named m_vsawgyip Lnet/minecraft/block/entity/VaultBlockEntity$C_vucktnfd;m_vsawgyip(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/item/ItemStack;}
        */
-      private static ItemStack m_vsawgyip(ServerWorld world, BlockPos pos, RegistryKey<LootTable> registryKey) {
-         LootTable lv = world.getServer().m_bilggnfr().getLootTable(registryKey);
+      private static ItemStack m_vsawgyip(ServerWorld world, BlockPos pos, RegistryKey<LootTable> key) {
+         LootTable lv = world.getServer().m_bilggnfr().getLootTable(key);
          LootContextParameterSet lv2 = new LootContextParameterSet.Builder(world)
             .add(LootContextParameters.ORIGIN, Vec3d.ofCenter(pos))
             .build(LootContextTypes.VAULT);
diff -bur namedTargetSrc/net/minecraft/block/enums/TrialSpawnerState.java namedSrc/net/minecraft/block/enums/TrialSpawnerState.java
--- namedTargetSrc/net/minecraft/block/enums/TrialSpawnerState.java	2024-09-24 21:25:02.491401359 +0000
+++ namedSrc/net/minecraft/block/enums/TrialSpawnerState.java	2024-09-24 21:23:57.847741219 +0000
@@ -198,7 +198,7 @@
                   lv.ejectingLootTable = lv2.lootTablesToEject().getDataOrEmpty(world.getRandom());
                }
 
-               lv.ejectingLootTable.ifPresent(registryKey -> logic.ejectLoot(world, pos, registryKey));
+               lv.ejectingLootTable.ifPresent(arg4 -> logic.ejectLoot(world, pos, arg4));
                lv.registeredPlayers.remove(lv.registeredPlayers.iterator().next());
                yield this;
             }
diff -bur namedTargetSrc/net/minecraft/block/FungusBlock.java namedSrc/net/minecraft/block/FungusBlock.java
--- namedTargetSrc/net/minecraft/block/FungusBlock.java	2024-09-24 21:25:02.497401329 +0000
+++ namedSrc/net/minecraft/block/FungusBlock.java	2024-09-24 21:23:57.858741163 +0000
@@ -28,7 +28,7 @@
     */
    public static final MapCodec<FungusBlock> CODEC = RecordCodecBuilder.mapCodec(
       instance -> instance.group(
-               RegistryKey.codec(RegistryKeys.CONFIGURED_FEATURE).fieldOf("feature").forGetter(block -> block.feature),
+               RegistryKey.createCodec(RegistryKeys.CONFIGURED_FEATURE).fieldOf("feature").forGetter(block -> block.feature),
                Registries.BLOCK.getCodec().fieldOf("grows_on").forGetter(block -> block.requiredGroundBlock),
                getSettingsCodec()
             )
@@ -67,9 +67,9 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_naobsnoy;<init>(Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;)V}
     * @mapping {@literal named <init> Lnet/minecraft/block/FungusBlock;<init>(Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/block/Block;Lnet/minecraft/block/AbstractBlock$Settings;)V}
     */
-   protected FungusBlock(RegistryKey<ConfiguredFeature<?, ?>> registryKey, Block block, AbstractBlock.Settings settings) {
+   protected FungusBlock(RegistryKey<ConfiguredFeature<?, ?>> feature, Block block, AbstractBlock.Settings settings) {
       super(settings);
-      this.feature = registryKey;
+      this.feature = feature;
       this.requiredGroundBlock = block;
    }
 
diff -bur namedTargetSrc/net/minecraft/block/MushroomPlantBlock.java namedSrc/net/minecraft/block/MushroomPlantBlock.java
--- namedTargetSrc/net/minecraft/block/MushroomPlantBlock.java	2024-09-24 21:25:02.385401894 +0000
+++ namedSrc/net/minecraft/block/MushroomPlantBlock.java	2024-09-24 21:23:57.707741938 +0000
@@ -26,7 +26,7 @@
     * @mapping {@literal named CODEC Lnet/minecraft/block/MushroomPlantBlock;CODEC:Lcom/mojang/serialization/MapCodec;}
     */
    public static final MapCodec<MushroomPlantBlock> CODEC = RecordCodecBuilder.mapCodec(
-      instance -> instance.group(RegistryKey.codec(RegistryKeys.CONFIGURED_FEATURE).fieldOf("feature").forGetter(arg -> arg.feature), getSettingsCodec())
+      instance -> instance.group(RegistryKey.createCodec(RegistryKeys.CONFIGURED_FEATURE).fieldOf("feature").forGetter(arg -> arg.feature), getSettingsCodec())
             .apply(instance, MushroomPlantBlock::new)
    );
    /**
@@ -57,9 +57,9 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_iesiegeg;<init>(Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;)V}
     * @mapping {@literal named <init> Lnet/minecraft/block/MushroomPlantBlock;<init>(Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/block/AbstractBlock$Settings;)V}
     */
-   public MushroomPlantBlock(RegistryKey<ConfiguredFeature<?, ?>> registryKey, AbstractBlock.Settings settings) {
+   public MushroomPlantBlock(RegistryKey<ConfiguredFeature<?, ?>> feature, AbstractBlock.Settings settings) {
       super(settings);
-      this.feature = registryKey;
+      this.feature = feature;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/NyliumBlock.java namedSrc/net/minecraft/block/NyliumBlock.java
--- namedTargetSrc/net/minecraft/block/NyliumBlock.java	2024-09-24 21:25:02.297402337 +0000
+++ namedSrc/net/minecraft/block/NyliumBlock.java	2024-09-24 21:23:57.594742518 +0000
@@ -105,14 +105,13 @@
     */
    private void generate(
       Registry<ConfiguredFeature<?, ?>> registry,
-      RegistryKey<ConfiguredFeature<?, ?>> registryKey,
+      RegistryKey<ConfiguredFeature<?, ?>> arg2,
       ServerWorld world,
       ChunkGenerator chunkGenerator,
       RandomGenerator random,
       BlockPos pos
    ) {
-      registry.getHolder(registryKey)
-         .ifPresent(registryKeyHolder -> ((ConfiguredFeature)registryKeyHolder.value()).generate(world, chunkGenerator, random, pos));
+      registry.getHolder(arg2).ifPresent(registryKeyHolder -> ((ConfiguredFeature)registryKeyHolder.value()).generate(world, chunkGenerator, random, pos));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/StemBlock.java namedSrc/net/minecraft/block/StemBlock.java
--- namedTargetSrc/net/minecraft/block/StemBlock.java	2024-09-24 21:25:02.449401571 +0000
+++ namedSrc/net/minecraft/block/StemBlock.java	2024-09-24 21:23:57.790741512 +0000
@@ -34,9 +34,9 @@
     */
    public static final MapCodec<StemBlock> CODEC = RecordCodecBuilder.mapCodec(
       instance -> instance.group(
-               RegistryKey.codec(RegistryKeys.BLOCK).fieldOf("fruit").forGetter(arg -> arg.gourdBlock),
-               RegistryKey.codec(RegistryKeys.BLOCK).fieldOf("attached_stem").forGetter(arg -> arg.attachedStem),
-               RegistryKey.codec(RegistryKeys.ITEM).fieldOf("seed").forGetter(arg -> arg.seed),
+               RegistryKey.createCodec(RegistryKeys.BLOCK).fieldOf("fruit").forGetter(arg -> arg.gourdBlock),
+               RegistryKey.createCodec(RegistryKeys.BLOCK).fieldOf("attached_stem").forGetter(arg -> arg.attachedStem),
+               RegistryKey.createCodec(RegistryKeys.ITEM).fieldOf("seed").forGetter(arg -> arg.seed),
                getSettingsCodec()
             )
             .apply(instance, StemBlock::new)
diff -bur namedTargetSrc/net/minecraft/block/TrialSpawnerConfig.java namedSrc/net/minecraft/block/TrialSpawnerConfig.java
--- namedTargetSrc/net/minecraft/block/TrialSpawnerConfig.java	2024-09-24 21:25:02.481401410 +0000
+++ namedSrc/net/minecraft/block/TrialSpawnerConfig.java	2024-09-24 21:23:57.834741286 +0000
@@ -51,10 +51,10 @@
                   .optionalFieldOf("ticks_between_spawn", DEFAULT_INSTANCE.ticksBetweenSpawn)
                   .forGetter(TrialSpawnerConfig::ticksBetweenSpawn),
                MobSpawnerEntry.DATA_POOL_CODEC.optionalFieldOf("spawn_potentials", DataPool.empty()).forGetter(TrialSpawnerConfig::spawnPotentialsDefinition),
-               DataPool.wrapCodecToAllowEmpty(RegistryKey.codec(RegistryKeys.LOOT_TABLE))
+               DataPool.wrapCodecToAllowEmpty(RegistryKey.createCodec(RegistryKeys.LOOT_TABLE))
                   .optionalFieldOf("loot_tables_to_eject", DEFAULT_INSTANCE.lootTablesToEject)
                   .forGetter(TrialSpawnerConfig::lootTablesToEject),
-               RegistryKey.codec(RegistryKeys.LOOT_TABLE)
+               RegistryKey.createCodec(RegistryKeys.LOOT_TABLE)
                   .optionalFieldOf("items_to_drop_when_ominous", DEFAULT_INSTANCE.itemsToDropWhenOminous)
                   .forGetter(TrialSpawnerConfig::itemsToDropWhenOminous)
             )
@@ -137,10 +137,9 @@
          .add(LootTables.TRIAL_CHAMBER_KEY_SPAWNER)
          .build();
       /**
-       * @mapping {@literal hashed f_reubvwnb Lnet/minecraft/unmapped/C_pocjjnjk$C_vnrwaphu;f_reubvwnb:Lnet/minecraft/unmapped/C_xhhleach;}
-       * @mapping {@literal named registryKey Lnet/minecraft/block/TrialSpawnerConfig$C_vnrwaphu;registryKey:Lnet/minecraft/registry/RegistryKey;}
+       * Mapping not found
        */
-      private RegistryKey<LootTable> registryKey = LootTables.TRIAL_CHAMBER_ITEMS_TO_DROP_WHEN_OMINOUS_SPAWNER;
+      private RegistryKey<LootTable> f_reubvwnb = LootTables.TRIAL_CHAMBER_ITEMS_TO_DROP_WHEN_OMINOUS_SPAWNER;
 
       /**
        * Mapping not found
@@ -207,11 +206,10 @@
       }
 
       /**
-       * @mapping {@literal hashed m_djzmjbrp Lnet/minecraft/unmapped/C_pocjjnjk$C_vnrwaphu;m_djzmjbrp(Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_pocjjnjk$C_vnrwaphu;}
-       * @mapping {@literal named m_djzmjbrp Lnet/minecraft/block/TrialSpawnerConfig$C_vnrwaphu;m_djzmjbrp(Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/block/TrialSpawnerConfig$C_vnrwaphu;}
+       * Mapping not found
        */
-      public TrialSpawnerConfig.C_vnrwaphu m_djzmjbrp(RegistryKey<LootTable> registryKey) {
-         this.registryKey = registryKey;
+      public TrialSpawnerConfig.C_vnrwaphu m_djzmjbrp(RegistryKey<LootTable> arg) {
+         this.f_reubvwnb = arg;
          return this;
       }
 
@@ -228,7 +226,7 @@
             this.f_jgmutzza,
             this.f_jgjwrvli,
             this.f_gurbcovz,
-            this.registryKey
+            this.f_reubvwnb
          );
       }
    }
diff -bur namedTargetSrc/net/minecraft/block/TrialSpawnerData.java namedSrc/net/minecraft/block/TrialSpawnerData.java
--- namedTargetSrc/net/minecraft/block/TrialSpawnerData.java	2024-09-24 21:25:02.441401611 +0000
+++ namedSrc/net/minecraft/block/TrialSpawnerData.java	2024-09-24 21:23:57.779741568 +0000
@@ -84,7 +84,7 @@
                Codec.LONG.lenientOptionalFieldOf("next_mob_spawns_at", Long.valueOf(0L)).forGetter(data -> data.nextMobSpawnTime),
                Codec.intRange(0, Integer.MAX_VALUE).lenientOptionalFieldOf("total_mobs_spawned", 0).forGetter(data -> data.totalMobsSpawned),
                MobSpawnerEntry.CODEC.lenientOptionalFieldOf("spawn_data").forGetter(data -> data.spawnData),
-               RegistryKey.codec(RegistryKeys.LOOT_TABLE).lenientOptionalFieldOf("ejecting_loot_table").forGetter(data -> data.ejectingLootTable)
+               RegistryKey.createCodec(RegistryKeys.LOOT_TABLE).lenientOptionalFieldOf("ejecting_loot_table").forGetter(data -> data.ejectingLootTable)
             )
             .apply(instance, TrialSpawnerData::new)
    );
diff -bur namedTargetSrc/net/minecraft/client/font/GlyphAtlasTexture.java namedSrc/net/minecraft/client/font/GlyphAtlasTexture.java
--- namedTargetSrc/net/minecraft/client/font/GlyphAtlasTexture.java	2024-09-24 21:25:02.330402171 +0000
+++ namedSrc/net/minecraft/client/font/GlyphAtlasTexture.java	2024-09-24 21:23:57.630742333 +0000
@@ -103,8 +103,8 @@
     * Mapping not found
     */
    @Override
-   public void saveTo(Identifier textureId, Path directoryPath) {
-      String string = textureId.toUnderscoreSeparatedString();
+   public void saveTo(Identifier id, Path directoryPath) {
+      String string = id.toUnderscoreSeparatedString();
       TextureUtil.writeAsPNG(directoryPath, string, this.getGlId(), 0, 256, 256, i -> (i & 0xFF000000) == 0 ? -16777216 : i);
    }
 
diff -bur namedTargetSrc/net/minecraft/client/font/UnihexFont.java namedSrc/net/minecraft/client/font/UnihexFont.java
--- namedTargetSrc/net/minecraft/client/font/UnihexFont.java	2024-09-24 21:25:02.447401581 +0000
+++ namedSrc/net/minecraft/client/font/UnihexFont.java	2024-09-24 21:23:57.787741527 +0000
@@ -304,8 +304,8 @@
        * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_pxvlatlk$C_mxikwcxh;<init>(Lnet/minecraft/unmapped/C_ncpywfca;Ljava/util/List;)V}
        * @mapping {@literal named <init> Lnet/minecraft/client/font/UnihexFont$Definition;<init>(Lnet/minecraft/util/Identifier;Ljava/util/List;)V}
        */
-      private Definition(Identifier hexFile, List<UnihexFont.DimensionOverride> sizeOverrides) {
-         this.hexFile = hexFile;
+      private Definition(Identifier id, List<UnihexFont.DimensionOverride> sizeOverrides) {
+         this.hexFile = id;
          this.sizeOverrides = sizeOverrides;
       }
 
diff -bur namedTargetSrc/net/minecraft/client/gl/PostProcessShader.java namedSrc/net/minecraft/client/gl/PostProcessShader.java
--- namedTargetSrc/net/minecraft/client/gl/PostProcessShader.java	2024-09-24 21:25:02.465401490 +0000
+++ namedSrc/net/minecraft/client/gl/PostProcessShader.java	2024-09-24 21:23:57.815741384 +0000
@@ -38,9 +38,10 @@
     */
    private final C_kfcjpoxm f_pxocueop;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_htnpkodd Lnet/minecraft/unmapped/C_ihtuvtqd;f_htnpkodd:Lnet/minecraft/unmapped/C_ncpywfca;}
+    * @mapping {@literal named id Lnet/minecraft/client/gl/PostProcessShader;id:Lnet/minecraft/util/Identifier;}
     */
-   private final Identifier f_htnpkodd;
+   private final Identifier id;
    /**
     * Mapping not found
     */
@@ -54,10 +55,10 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_ihtuvtqd;<init>(Ljava/lang/String;Lnet/minecraft/unmapped/C_kfcjpoxm;Lnet/minecraft/unmapped/C_ncpywfca;Ljava/util/List;)V}
     * @mapping {@literal named <init> Lnet/minecraft/client/gl/PostProcessShader;<init>(Ljava/lang/String;Lnet/minecraft/unmapped/C_kfcjpoxm;Lnet/minecraft/util/Identifier;Ljava/util/List;)V}
     */
-   public PostProcessShader(String string, C_kfcjpoxm arg, Identifier arg2, List<ShaderEffectConfig.Uniform> list) {
+   public PostProcessShader(String string, C_kfcjpoxm arg, Identifier id, List<ShaderEffectConfig.Uniform> list) {
       this.f_fergtmpa = string;
       this.f_pxocueop = arg;
-      this.f_htnpkodd = arg2;
+      this.id = id;
       this.f_bhpobmrp = list;
    }
 
@@ -78,9 +79,9 @@
          lv2.m_apnahyct(lv, map);
       }
 
-      Handle<Framebuffer> lv3 = (Handle<Framebuffer>)map.computeIfPresent(this.f_htnpkodd, (arg2, arg3) -> lv.readsAndWrites(arg3));
+      Handle<Framebuffer> lv3 = (Handle<Framebuffer>)map.computeIfPresent(this.id, (id, arg3) -> lv.readsAndWrites(arg3));
       if (lv3 == null) {
-         throw new IllegalStateException("Missing handle for target " + this.f_htnpkodd);
+         throw new IllegalStateException("Missing handle for target " + this.id);
       } else {
          lv.executes(() -> {
             Framebuffer lvx = lv3.get();
diff -bur namedTargetSrc/net/minecraft/client/gui/GuiAtlasManager.java namedSrc/net/minecraft/client/gui/GuiAtlasManager.java
--- namedTargetSrc/net/minecraft/client/gui/GuiAtlasManager.java	2024-09-24 21:25:02.507401279 +0000
+++ namedSrc/net/minecraft/client/gui/GuiAtlasManager.java	2024-09-24 21:23:57.873741086 +0000
@@ -36,8 +36,8 @@
     * Mapping not found
     */
    @Override
-   public Sprite getSprite(Identifier objectId) {
-      return super.getSprite(objectId);
+   public Sprite getSprite(Identifier id) {
+      return super.getSprite(id);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/GuiGraphics.java namedSrc/net/minecraft/client/gui/GuiGraphics.java
--- namedTargetSrc/net/minecraft/client/gui/GuiGraphics.java	2024-09-24 21:25:02.258402533 +0000
+++ namedSrc/net/minecraft/client/gui/GuiGraphics.java	2024-09-24 21:23:57.538742805 +0000
@@ -465,17 +465,19 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_rixppaza Lnet/minecraft/unmapped/C_sedilmty;m_rixppaza(Ljava/util/function/Function;Lnet/minecraft/unmapped/C_ncpywfca;IIII)V}
+    * @mapping {@literal named m_rixppaza Lnet/minecraft/client/gui/GuiGraphics;m_rixppaza(Ljava/util/function/Function;Lnet/minecraft/util/Identifier;IIII)V}
     */
-   public void m_rixppaza(Function<Identifier, RenderLayer> function, Identifier arg, int i, int j, int k, int l) {
-      this.m_kpwmfaru(function, arg, i, j, k, l, -1);
+   public void m_rixppaza(Function<Identifier, RenderLayer> function, Identifier id, int i, int j, int k, int l) {
+      this.m_kpwmfaru(function, id, i, j, k, l, -1);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_kpwmfaru Lnet/minecraft/unmapped/C_sedilmty;m_kpwmfaru(Ljava/util/function/Function;Lnet/minecraft/unmapped/C_ncpywfca;IIIII)V}
+    * @mapping {@literal named m_kpwmfaru Lnet/minecraft/client/gui/GuiGraphics;m_kpwmfaru(Ljava/util/function/Function;Lnet/minecraft/util/Identifier;IIIII)V}
     */
-   public void m_kpwmfaru(Function<Identifier, RenderLayer> function, Identifier arg, int i, int j, int k, int l, int m) {
-      Sprite lv = this.guiAtlasManager.getSprite(arg);
+   public void m_kpwmfaru(Function<Identifier, RenderLayer> function, Identifier id, int i, int j, int k, int l, int m) {
+      Sprite lv = this.guiAtlasManager.getSprite(id);
       SpriteScaling lv2 = this.guiAtlasManager.getScaling(lv);
       if (lv2 instanceof SpriteScaling.Stretch) {
          this.m_qvdirkns(function, lv, i, j, k, l, m);
@@ -487,10 +489,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_zrsopato Lnet/minecraft/unmapped/C_sedilmty;m_zrsopato(Ljava/util/function/Function;Lnet/minecraft/unmapped/C_ncpywfca;IIIIIIII)V}
+    * @mapping {@literal named m_zrsopato Lnet/minecraft/client/gui/GuiGraphics;m_zrsopato(Ljava/util/function/Function;Lnet/minecraft/util/Identifier;IIIIIIII)V}
     */
-   public void m_zrsopato(Function<Identifier, RenderLayer> function, Identifier arg, int i, int j, int k, int l, int m, int n, int o, int p) {
-      Sprite lv = this.guiAtlasManager.getSprite(arg);
+   public void m_zrsopato(Function<Identifier, RenderLayer> function, Identifier id, int i, int j, int k, int l, int m, int n, int o, int p) {
+      Sprite lv = this.guiAtlasManager.getSprite(id);
       SpriteScaling lv2 = this.guiAtlasManager.getScaling(lv);
       if (lv2 instanceof SpriteScaling.Stretch) {
          this.m_vbnoxrxs(function, lv, i, j, k, l, m, n, o, p, -1);
@@ -732,22 +735,24 @@
     * @mapping {@literal hashed m_olrwwnbg Lnet/minecraft/unmapped/C_sedilmty;m_olrwwnbg(Ljava/util/function/Function;Lnet/minecraft/unmapped/C_ncpywfca;IIFFIIIII)V}
     * @mapping {@literal named m_olrwwnbg Lnet/minecraft/client/gui/GuiGraphics;m_olrwwnbg(Ljava/util/function/Function;Lnet/minecraft/util/Identifier;IIFFIIIII)V}
     */
-   public void m_olrwwnbg(Function<Identifier, RenderLayer> function, Identifier arg, int i, int j, float f, float g, int k, int l, int m, int n, int argb) {
-      this.m_fgoqvxux(function, arg, i, j, f, g, k, l, k, l, m, n, argb);
+   public void m_olrwwnbg(Function<Identifier, RenderLayer> function, Identifier id, int i, int j, float f, float g, int k, int l, int m, int n, int argb) {
+      this.m_fgoqvxux(function, id, i, j, f, g, k, l, k, l, m, n, argb);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_tobhyohl Lnet/minecraft/unmapped/C_sedilmty;m_tobhyohl(Ljava/util/function/Function;Lnet/minecraft/unmapped/C_ncpywfca;IIFFIIII)V}
+    * @mapping {@literal named m_tobhyohl Lnet/minecraft/client/gui/GuiGraphics;m_tobhyohl(Ljava/util/function/Function;Lnet/minecraft/util/Identifier;IIFFIIII)V}
     */
-   public void m_tobhyohl(Function<Identifier, RenderLayer> function, Identifier arg, int i, int j, float f, float g, int k, int l, int m, int n) {
-      this.m_qynojiod(function, arg, i, j, f, g, k, l, k, l, m, n);
+   public void m_tobhyohl(Function<Identifier, RenderLayer> function, Identifier id, int i, int j, float f, float g, int k, int l, int m, int n) {
+      this.m_qynojiod(function, id, i, j, f, g, k, l, k, l, m, n);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_qynojiod Lnet/minecraft/unmapped/C_sedilmty;m_qynojiod(Ljava/util/function/Function;Lnet/minecraft/unmapped/C_ncpywfca;IIFFIIIIII)V}
+    * @mapping {@literal named m_qynojiod Lnet/minecraft/client/gui/GuiGraphics;m_qynojiod(Ljava/util/function/Function;Lnet/minecraft/util/Identifier;IIFFIIIIII)V}
     */
-   public void m_qynojiod(Function<Identifier, RenderLayer> function, Identifier arg, int i, int j, float f, float g, int k, int l, int m, int n, int o, int p) {
-      this.m_fgoqvxux(function, arg, i, j, f, g, k, l, m, n, o, p, -1);
+   public void m_qynojiod(Function<Identifier, RenderLayer> function, Identifier id, int i, int j, float f, float g, int k, int l, int m, int n, int o, int p) {
+      this.m_fgoqvxux(function, id, i, j, f, g, k, l, m, n, o, p, -1);
    }
 
    /**
@@ -755,10 +760,10 @@
     * @mapping {@literal named m_fgoqvxux Lnet/minecraft/client/gui/GuiGraphics;m_fgoqvxux(Ljava/util/function/Function;Lnet/minecraft/util/Identifier;IIFFIIIIIII)V}
     */
    public void m_fgoqvxux(
-      Function<Identifier, RenderLayer> function, Identifier arg, int i, int j, float f, float g, int k, int l, int m, int n, int o, int p, int argb
+      Function<Identifier, RenderLayer> function, Identifier id, int i, int j, float f, float g, int k, int l, int m, int n, int o, int p, int argb
    ) {
       this.m_oikvgwpo(
-         function, arg, i, i + k, j, j + l, (f + 0.0F) / (float)o, (f + (float)m) / (float)o, (g + 0.0F) / (float)p, (g + (float)n) / (float)p, argb
+         function, id, i, i + k, j, j + l, (f + 0.0F) / (float)o, (f + (float)m) / (float)o, (g + 0.0F) / (float)p, (g + (float)n) / (float)p, argb
       );
    }
 
@@ -766,8 +771,8 @@
     * @mapping {@literal hashed m_oikvgwpo Lnet/minecraft/unmapped/C_sedilmty;m_oikvgwpo(Ljava/util/function/Function;Lnet/minecraft/unmapped/C_ncpywfca;IIIIFFFFI)V}
     * @mapping {@literal named m_oikvgwpo Lnet/minecraft/client/gui/GuiGraphics;m_oikvgwpo(Ljava/util/function/Function;Lnet/minecraft/util/Identifier;IIIIFFFFI)V}
     */
-   private void m_oikvgwpo(Function<Identifier, RenderLayer> function, Identifier arg, int i, int j, int k, int l, float f, float g, float h, float m, int argb) {
-      RenderLayer lv = (RenderLayer)function.apply(arg);
+   private void m_oikvgwpo(Function<Identifier, RenderLayer> function, Identifier id, int i, int j, int k, int l, float f, float g, float h, float m, int argb) {
+      RenderLayer lv = (RenderLayer)function.apply(id);
       Matrix4f matrix4f = this.matrices.peek().getModel();
       VertexConsumer lv2 = this.vertexConsumers.getBuffer(lv);
       lv2.xyz(matrix4f, (float)i, (float)k, 0.0F).uv0(f, h).color(argb);
@@ -953,10 +958,10 @@
     * @mapping {@literal hashed m_efbfrifx Lnet/minecraft/unmapped/C_sedilmty;m_efbfrifx(Lnet/minecraft/unmapped/C_mavozmpp;Ljava/util/List;Ljava/util/Optional;IILnet/minecraft/unmapped/C_ncpywfca;)V}
     * @mapping {@literal named m_efbfrifx Lnet/minecraft/client/gui/GuiGraphics;m_efbfrifx(Lnet/minecraft/client/font/TextRenderer;Ljava/util/List;Ljava/util/Optional;IILnet/minecraft/util/Identifier;)V}
     */
-   public void m_efbfrifx(TextRenderer textRenderer, List<Text> list, Optional<TooltipData> optional, int x, int y, @Nullable Identifier arg2) {
+   public void m_efbfrifx(TextRenderer textRenderer, List<Text> list, Optional<TooltipData> optional, int x, int y, @Nullable Identifier id) {
       List<TooltipComponent> list2 = (List<TooltipComponent>)list.stream().map(Text::asOrderedText).map(TooltipComponent::of).collect(Util.toArrayList());
       optional.ifPresent(arg -> list2.add(list2.isEmpty() ? 0 : 1, TooltipComponent.of(arg)));
-      this.drawTooltip(textRenderer, list2, x, y, DefaultTooltipPositioner.INSTANCE, arg2);
+      this.drawTooltip(textRenderer, list2, x, y, DefaultTooltipPositioner.INSTANCE, id);
    }
 
    /**
@@ -971,8 +976,8 @@
     * @mapping {@literal hashed m_ztaqdhir Lnet/minecraft/unmapped/C_sedilmty;m_ztaqdhir(Lnet/minecraft/unmapped/C_mavozmpp;Lnet/minecraft/unmapped/C_rdaqiwdt;IILnet/minecraft/unmapped/C_ncpywfca;)V}
     * @mapping {@literal named m_ztaqdhir Lnet/minecraft/client/gui/GuiGraphics;m_ztaqdhir(Lnet/minecraft/client/font/TextRenderer;Lnet/minecraft/text/Text;IILnet/minecraft/util/Identifier;)V}
     */
-   public void m_ztaqdhir(TextRenderer textRenderer, Text arg2, int x, int y, @Nullable Identifier arg3) {
-      this.m_fzrxeqoz(textRenderer, List.of(arg2.asOrderedText()), x, y, arg3);
+   public void m_ztaqdhir(TextRenderer textRenderer, Text arg2, int x, int y, @Nullable Identifier id) {
+      this.m_fzrxeqoz(textRenderer, List.of(arg2.asOrderedText()), x, y, id);
    }
 
    /**
@@ -987,8 +992,8 @@
     * @mapping {@literal hashed m_trxugygo Lnet/minecraft/unmapped/C_sedilmty;m_trxugygo(Lnet/minecraft/unmapped/C_mavozmpp;Ljava/util/List;IILnet/minecraft/unmapped/C_ncpywfca;)V}
     * @mapping {@literal named m_trxugygo Lnet/minecraft/client/gui/GuiGraphics;m_trxugygo(Lnet/minecraft/client/font/TextRenderer;Ljava/util/List;IILnet/minecraft/util/Identifier;)V}
     */
-   public void m_trxugygo(TextRenderer textRenderer, List<Text> list, int x, int y, @Nullable Identifier arg2) {
-      this.drawTooltip(textRenderer, list.stream().map(Text::asOrderedText).map(TooltipComponent::of).toList(), x, y, DefaultTooltipPositioner.INSTANCE, arg2);
+   public void m_trxugygo(TextRenderer textRenderer, List<Text> list, int x, int y, @Nullable Identifier id) {
+      this.drawTooltip(textRenderer, list.stream().map(Text::asOrderedText).map(TooltipComponent::of).toList(), x, y, DefaultTooltipPositioner.INSTANCE, id);
    }
 
    /**
@@ -1003,14 +1008,14 @@
     * @mapping {@literal hashed m_fzrxeqoz Lnet/minecraft/unmapped/C_sedilmty;m_fzrxeqoz(Lnet/minecraft/unmapped/C_mavozmpp;Ljava/util/List;IILnet/minecraft/unmapped/C_ncpywfca;)V}
     * @mapping {@literal named m_fzrxeqoz Lnet/minecraft/client/gui/GuiGraphics;m_fzrxeqoz(Lnet/minecraft/client/font/TextRenderer;Ljava/util/List;IILnet/minecraft/util/Identifier;)V}
     */
-   public void m_fzrxeqoz(TextRenderer textRenderer, List<? extends OrderedText> list, int x, int y, @Nullable Identifier arg2) {
+   public void m_fzrxeqoz(TextRenderer textRenderer, List<? extends OrderedText> list, int x, int y, @Nullable Identifier id) {
       this.drawTooltip(
          textRenderer,
          (List<TooltipComponent>)list.stream().map(TooltipComponent::of).collect(Collectors.toList()),
          x,
          y,
          DefaultTooltipPositioner.INSTANCE,
-         arg2
+         id
       );
    }
 
@@ -1026,7 +1031,7 @@
     * @mapping {@literal hashed m_zpgnewud Lnet/minecraft/unmapped/C_sedilmty;m_zpgnewud(Lnet/minecraft/unmapped/C_mavozmpp;Ljava/util/List;IILnet/minecraft/unmapped/C_imjripdz;Lnet/minecraft/unmapped/C_ncpywfca;)V}
     * @mapping {@literal named drawTooltip Lnet/minecraft/client/gui/GuiGraphics;drawTooltip(Lnet/minecraft/client/font/TextRenderer;Ljava/util/List;IILnet/minecraft/client/gui/tooltip/TooltipPositioner;Lnet/minecraft/util/Identifier;)V}
     */
-   private void drawTooltip(TextRenderer textRenderer, List<TooltipComponent> tooltip, int x, int y, TooltipPositioner positioner, @Nullable Identifier arg3) {
+   private void drawTooltip(TextRenderer textRenderer, List<TooltipComponent> tooltip, int x, int y, TooltipPositioner positioner, @Nullable Identifier id) {
       if (!tooltip.isEmpty()) {
          int k = 0;
          int l = tooltip.size() == 1 ? -2 : 0;
@@ -1047,7 +1052,7 @@
          int q = vector2ic.y();
          this.matrices.push();
          int r = 400;
-         TooltipRenderHelper.renderBackground(this, p, q, k, l, 400, arg3);
+         TooltipRenderHelper.renderBackground(this, p, q, k, l, 400, id);
          this.matrices.translate(0.0F, 0.0F, 400.0F);
          int s = q;
 
diff -bur namedTargetSrc/net/minecraft/client/gui/hud/debug/DebugHud.java namedSrc/net/minecraft/client/gui/hud/debug/DebugHud.java
--- namedTargetSrc/net/minecraft/client/gui/hud/debug/DebugHud.java	2024-09-24 21:25:02.494401344 +0000
+++ namedSrc/net/minecraft/client/gui/hud/debug/DebugHud.java	2024-09-24 21:23:57.853741189 +0000
@@ -579,7 +579,7 @@
     * @mapping {@literal named getBiomeString Lnet/minecraft/client/gui/hud/debug/DebugHud;getBiomeString(Lnet/minecraft/registry/Holder;)Ljava/lang/String;}
     */
    private static String getBiomeString(Holder<Biome> biome) {
-      return biome.unwrap().map(registryKey -> registryKey.getValue().toString(), arg -> "[unregistered " + arg + "]");
+      return biome.unwrap().map(arg -> arg.getValue().toString(), arg -> "[unregistered " + arg + "]");
    }
 
    /**
@@ -685,7 +685,7 @@
                list.add(this.propertyToString(entry));
             }
 
-            lv2.streamTags().map(arg -> "#" + arg.id()).forEach(list::add);
+            lv2.streamTags().map(tag -> "#" + tag.id()).forEach(list::add);
          }
 
          if (this.fluidHit.getType() == HitResult.Type.BLOCK) {
diff -bur namedTargetSrc/net/minecraft/client/gui/hud/in_game/InGameHud.java namedSrc/net/minecraft/client/gui/hud/in_game/InGameHud.java
--- namedTargetSrc/net/minecraft/client/gui/hud/in_game/InGameHud.java	2024-09-24 21:25:02.366401989 +0000
+++ namedSrc/net/minecraft/client/gui/hud/in_game/InGameHud.java	2024-09-24 21:23:57.683742061 +0000
@@ -1550,7 +1550,7 @@
       float h = 0.2F * delta;
       float k = 0.4F * delta;
       float l = 0.2F * delta;
-      graphics.m_olrwwnbg(arg -> RenderLayer.getGuiNauseaOverlay(), f_vqdthxci, 0, 0, 0.0F, 0.0F, i, j, i, j, ArgbHelper.color(1.0F, h, k, l));
+      graphics.m_olrwwnbg(id -> RenderLayer.getGuiNauseaOverlay(), f_vqdthxci, 0, 0, 0.0F, 0.0F, i, j, i, j, ArgbHelper.color(1.0F, h, k, l));
       graphics.getMatrices().pop();
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/PlayerFaceRenderer.java namedSrc/net/minecraft/client/gui/PlayerFaceRenderer.java
--- namedTargetSrc/net/minecraft/client/gui/PlayerFaceRenderer.java	2024-09-24 21:25:02.357402035 +0000
+++ namedSrc/net/minecraft/client/gui/PlayerFaceRenderer.java	2024-09-24 21:23:57.662742169 +0000
@@ -83,12 +83,12 @@
     * @mapping {@literal hashed m_durbuulr Lnet/minecraft/unmapped/C_vefskfru;m_durbuulr(Lnet/minecraft/unmapped/C_sedilmty;Lnet/minecraft/unmapped/C_ncpywfca;IIIZZI)V}
     * @mapping {@literal named m_durbuulr Lnet/minecraft/client/gui/PlayerFaceRenderer;m_durbuulr(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/util/Identifier;IIIZZI)V}
     */
-   public static void m_durbuulr(GuiGraphics graphics, Identifier arg2, int i, int j, int k, boolean bl, boolean bl2, int l) {
+   public static void m_durbuulr(GuiGraphics graphics, Identifier id, int i, int j, int k, boolean bl, boolean bl2, int l) {
       int m = 8 + (bl2 ? 8 : 0);
       int n = 8 * (bl2 ? -1 : 1);
-      graphics.m_fgoqvxux(RenderLayer::getGuiTextured, arg2, i, j, 8.0F, (float)m, k, k, 8, n, 64, 64, l);
+      graphics.m_fgoqvxux(RenderLayer::getGuiTextured, id, i, j, 8.0F, (float)m, k, k, 8, n, 64, 64, l);
       if (bl) {
-         drawHat(graphics, arg2, i, j, k, bl2, l);
+         drawHat(graphics, id, i, j, k, bl2, l);
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/CustomizeBuffetWorldScreen.java namedSrc/net/minecraft/client/gui/screen/CustomizeBuffetWorldScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/CustomizeBuffetWorldScreen.java	2024-09-24 21:25:02.386401888 +0000
+++ namedSrc/net/minecraft/client/gui/screen/CustomizeBuffetWorldScreen.java	2024-09-24 21:23:57.708741933 +0000
@@ -86,7 +86,7 @@
       this.parent = parent;
       this.onDone = onDone;
       this.biomeRegistry = worldCreationContext.getWorldgenRegistryManager().getLookupOrThrow(RegistryKeys.BIOME);
-      Holder<Biome> lv = (Holder<Biome>)this.biomeRegistry.getHolder(Biomes.PLAINS).or(() -> this.biomeRegistry.holders().findAny()).orElseThrow();
+      Holder<Biome> lv = (Holder<Biome>)this.biomeRegistry.getHolder(Biomes.PLAINS).or(() -> this.biomeRegistry.streamHolders().findAny()).orElseThrow();
       this.biome = (Holder<Biome>)worldCreationContext.selectedDimensions()
          .getOverworldChunkGenerator()
          .getBiomeSource()
@@ -164,7 +164,7 @@
          super(CustomizeBuffetWorldScreen.this.client, CustomizeBuffetWorldScreen.this.width, CustomizeBuffetWorldScreen.this.height - 77, 40, 16);
          Collator collator = Collator.getInstance(Locale.getDefault());
          CustomizeBuffetWorldScreen.this.biomeRegistry
-            .holders()
+            .streamHolders()
             .map(holder -> new CustomizeBuffetWorldScreen.BuffetBiomesListWidget.BuffetBiomeItem(holder))
             .sorted(Comparator.comparing(item -> item.text.getString(), collator))
             .forEach(entry -> this.addEntry(entry));
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/BeaconScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/BeaconScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/BeaconScreen.java	2024-09-24 21:25:02.297402337 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/BeaconScreen.java	2024-09-24 21:23:57.594742518 +0000
@@ -497,9 +497,9 @@
        * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_askpskli$C_fyxmlizu;<init>(IILnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_rdaqiwdt;)V}
        * @mapping {@literal named <init> Lnet/minecraft/client/gui/screen/ingame/BeaconScreen$IconButtonWidget;<init>(IILnet/minecraft/util/Identifier;Lnet/minecraft/text/Text;)V}
        */
-      protected IconButtonWidget(int x, int y, Identifier texture, Text message) {
+      protected IconButtonWidget(int x, int y, Identifier id, Text message) {
          super(x, y, message);
-         this.texture = texture;
+         this.texture = id;
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.java	2024-09-24 21:25:02.297402337 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.java	2024-09-24 21:23:57.594742518 +0000
@@ -633,7 +633,7 @@
          predicate = idx -> idx.getNamespace().contains(string2) && idx.getPath().contains(string3);
       }
 
-      Registries.ITEM.getTags().map(HolderSet.NamedSet::getKey).filter(tag -> predicate.test(tag.id())).forEach(this.searchResultTags::add);
+      Registries.ITEM.streamBoundTags().map(HolderSet.NamedSet::getKey).filter(tag -> predicate.test(tag.id())).forEach(this.searchResultTags::add);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/EnchantmentScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/EnchantmentScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/EnchantmentScreen.java	2024-09-24 21:25:02.334402150 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/EnchantmentScreen.java	2024-09-24 21:23:57.635742307 +0000
@@ -264,7 +264,7 @@
             .world
             .getRegistryManager()
             .getLookupOrThrow(RegistryKeys.ENCHANTMENT)
-            .m_iotvxcay(this.handler.enchantmentId[l]);
+            .find(this.handler.enchantmentId[l]);
          if (!optional.isEmpty()) {
             int n = this.handler.enchantmentLevel[l];
             int o = l + 1;
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/PresetsScreen.java namedSrc/net/minecraft/client/gui/screen/PresetsScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/PresetsScreen.java	2024-09-24 21:25:02.440401616 +0000
+++ namedSrc/net/minecraft/client/gui/screen/PresetsScreen.java	2024-09-24 21:23:57.778741573 +0000
@@ -379,7 +379,7 @@
                PresetsScreen.LOGGER
                   .info(
                      "Discarding flat world preset {} since it contains experimental blocks {}",
-                     lv.getKey().map(registryKey -> registryKey.getValue().toString()).orElse("<unknown>"),
+                     lv.getKey().map(argx -> argx.getValue().toString()).orElse("<unknown>"),
                      set
                   );
             } else {
@@ -442,7 +442,7 @@
          public SuperflatPresetEntry(final Holder<FlatWorldGeneratorPreset> preset) {
             this.preset = preset.value();
             this.name = (Text)preset.getKey()
-               .map(registryKey -> Text.translatable(registryKey.getValue().toTranslationKey("flat_world_preset")))
+               .map(argx -> Text.translatable(argx.getValue().toTranslationKey("flat_world_preset")))
                .orElse(PresetsScreen.UNKNOWN_PRESET);
          }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/realms/RealmsResetWorldScreen.java namedSrc/net/minecraft/client/gui/screen/realms/RealmsResetWorldScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/realms/RealmsResetWorldScreen.java	2024-09-24 21:25:02.271402468 +0000
+++ namedSrc/net/minecraft/client/gui/screen/realms/RealmsResetWorldScreen.java	2024-09-24 21:23:57.557742708 +0000
@@ -470,9 +470,9 @@
        * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_jpqqwpue$C_awtthljb;<init>(Lnet/minecraft/unmapped/C_jpqqwpue;Lnet/minecraft/unmapped/C_mavozmpp;Lnet/minecraft/unmapped/C_rdaqiwdt;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_buwziidm$C_zlxjklbn;)V}
        * @mapping {@literal named <init> Lnet/minecraft/client/gui/screen/realms/RealmsResetWorldScreen$FrameButton;<init>(Lnet/minecraft/client/gui/screen/realms/RealmsResetWorldScreen;Lnet/minecraft/client/font/TextRenderer;Lnet/minecraft/text/Text;Lnet/minecraft/util/Identifier;Lnet/minecraft/client/gui/widget/button/ButtonWidget$PressAction;)V}
        */
-      FrameButton(final TextRenderer textRenderer, final Text message, final Identifier image, final ButtonWidget.PressAction onPress) {
+      FrameButton(final TextRenderer textRenderer, final Text message, final Identifier id, final ButtonWidget.PressAction onPress) {
          super(0, 0, 60, 60 + 9, message, onPress, DEFAULT_NARRATION);
-         this.image = image;
+         this.image = id;
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/SplashOverlay.java namedSrc/net/minecraft/client/gui/screen/SplashOverlay.java
--- namedTargetSrc/net/minecraft/client/gui/screen/SplashOverlay.java	2024-09-24 21:25:02.354402050 +0000
+++ namedSrc/net/minecraft/client/gui/screen/SplashOverlay.java	2024-09-24 21:23:57.658742189 +0000
@@ -202,8 +202,8 @@
       double e = d * 4.0;
       int z = (int)(e * 0.5);
       int aa = ArgbHelper.white(o);
-      graphics.m_fgoqvxux(arg -> RenderLayer.getMojangLogo(), LOGO, w - z, x - y, -0.0625F, 0.0F, z, (int)d, 120, 60, 120, 120, aa);
-      graphics.m_fgoqvxux(arg -> RenderLayer.getMojangLogo(), LOGO, w, x - y, 0.0625F, 60.0F, z, (int)d, 120, 60, 120, 120, aa);
+      graphics.m_fgoqvxux(id -> RenderLayer.getMojangLogo(), LOGO, w - z, x - y, -0.0625F, 0.0F, z, (int)d, 120, 60, 120, 120, aa);
+      graphics.m_fgoqvxux(id -> RenderLayer.getMojangLogo(), LOGO, w, x - y, 0.0625F, 60.0F, z, (int)d, 120, 60, 120, 120, aa);
       int ab = (int)((double)graphics.getScaledWindowHeight() * 0.8325);
       float ac = this.reload.getProgress();
       this.progress = MathHelper.clamp(this.progress * 0.95F + ac * 0.050000012F, 0.0F, 1.0F);
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/world/CreateWorldScreen.java namedSrc/net/minecraft/client/gui/screen/world/CreateWorldScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/world/CreateWorldScreen.java	2024-09-24 21:25:02.278402433 +0000
+++ namedSrc/net/minecraft/client/gui/screen/world/CreateWorldScreen.java	2024-09-24 21:23:57.569742646 +0000
@@ -267,7 +267,7 @@
       @Nullable Screen parent,
       Function<WorldLoader.DataLoadContext, GeneratorOptions> function,
       C_zugbgokk arg3,
-      RegistryKey<GeneratorType> registryKey,
+      RegistryKey<GeneratorType> value,
       C_vuympcpz arg5
    ) {
       showMessage(client, PREPARING);
@@ -284,9 +284,7 @@
          client
       );
       client.runTasks(completableFuture::isDone);
-      client.setScreen(
-         new CreateWorldScreen(client, parent, (WorldCreationContext)completableFuture.join(), Optional.of(registryKey), OptionalLong.empty(), arg5)
-      );
+      client.setScreen(new CreateWorldScreen(client, parent, (WorldCreationContext)completableFuture.join(), Optional.of(value), OptionalLong.empty(), arg5));
    }
 
    /**
@@ -409,7 +407,7 @@
       WorldDimensions.Baked lv2 = lv.selectedDimensions().bake(lv.datapackDimensions());
       LayeredRegistryManager<ServerRegistryLayer> lv3 = lv.worldgenRegistries().withReplacedLayers(ServerRegistryLayer.DIMENSIONS, lv2.toRegistryManager());
       Lifecycle lifecycle = FeatureFlags.containsDefault(lv.dataConfiguration().enabledFeatures()) ? Lifecycle.experimental() : Lifecycle.stable();
-      Lifecycle lifecycle2 = lv3.getCompositeManager().m_hlpdjttt();
+      Lifecycle lifecycle2 = lv3.getCompositeManager().getLifecycle();
       Lifecycle lifecycle3 = lifecycle2.add(lifecycle);
       boolean bl = !this.reopened && lifecycle2 == Lifecycle.stable();
       WorldInfo lv4 = this.createWorldInfo(lv2.specialWorldProperty() == WorldSaveProperties.WorldType.DEBUG);
@@ -622,9 +620,9 @@
       WorldLoader.<C_axyvksml, WorldCreationContext>load(
             lv,
             arg -> {
-               if (arg.datapackWorldgen().getLookupOrThrow(RegistryKeys.GENERATOR_TYPE).holders().findAny().isEmpty()) {
+               if (arg.datapackWorldgen().getLookupOrThrow(RegistryKeys.GENERATOR_TYPE).streamHolders().findAny().isEmpty()) {
                   throw new IllegalStateException("Needs at least one world preset to continue");
-               } else if (arg.datapackWorldgen().getLookupOrThrow(RegistryKeys.BIOME).holders().findAny().isEmpty()) {
+               } else if (arg.datapackWorldgen().getLookupOrThrow(RegistryKeys.BIOME).streamHolders().findAny().isEmpty()) {
                   throw new IllegalStateException("Needs at least one biome continue");
                } else {
                   WorldCreationContext lvx = this.worldCreator.getContext();

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

View the diff here (2/3): 
diff -bur namedTargetSrc/net/minecraft/client/gui/tooltip/TooltipRenderHelper.java namedSrc/net/minecraft/client/gui/tooltip/TooltipRenderHelper.java
--- namedTargetSrc/net/minecraft/client/gui/tooltip/TooltipRenderHelper.java	2024-09-24 21:25:02.398401828 +0000
+++ namedSrc/net/minecraft/client/gui/tooltip/TooltipRenderHelper.java	2024-09-24 21:23:57.721741866 +0000
@@ -61,29 +61,31 @@
     * @mapping {@literal hashed m_fvwksfuw Lnet/minecraft/unmapped/C_mkqzadhs;m_fvwksfuw(Lnet/minecraft/unmapped/C_sedilmty;IIIIILnet/minecraft/unmapped/C_ncpywfca;)V}
     * @mapping {@literal named renderBackground Lnet/minecraft/client/gui/tooltip/TooltipRenderHelper;renderBackground(Lnet/minecraft/client/gui/GuiGraphics;IIIIILnet/minecraft/util/Identifier;)V}
     */
-   public static void renderBackground(GuiGraphics graphics, int x, int y, int width, int height, int z, @Nullable Identifier arg2) {
+   public static void renderBackground(GuiGraphics graphics, int x, int y, int width, int height, int z, @Nullable Identifier id) {
       int n = x - 3 - 9;
       int o = y - 3 - 9;
       int p = width + 3 + 3 + 18;
       int q = height + 3 + 3 + 18;
       graphics.getMatrices().push();
       graphics.getMatrices().translate(0.0F, 0.0F, (float)z);
-      graphics.m_rixppaza(RenderLayer::getGuiTextured, m_lnrrnjvy(arg2), n, o, p, q);
-      graphics.m_rixppaza(RenderLayer::getGuiTextured, m_psgxchiu(arg2), n, o, p, q);
+      graphics.m_rixppaza(RenderLayer::getGuiTextured, m_lnrrnjvy(id), n, o, p, q);
+      graphics.m_rixppaza(RenderLayer::getGuiTextured, m_psgxchiu(id), n, o, p, q);
       graphics.getMatrices().pop();
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_lnrrnjvy Lnet/minecraft/unmapped/C_mkqzadhs;m_lnrrnjvy(Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_ncpywfca;}
+    * @mapping {@literal named m_lnrrnjvy Lnet/minecraft/client/gui/tooltip/TooltipRenderHelper;m_lnrrnjvy(Lnet/minecraft/util/Identifier;)Lnet/minecraft/util/Identifier;}
     */
-   private static Identifier m_lnrrnjvy(@Nullable Identifier arg) {
-      return arg == null ? f_cnbacymt : arg.withPath((UnaryOperator<String>)(string -> "tooltip/" + string + "_background"));
+   private static Identifier m_lnrrnjvy(@Nullable Identifier id) {
+      return id == null ? f_cnbacymt : id.withPath((UnaryOperator<String>)(string -> "tooltip/" + string + "_background"));
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_psgxchiu Lnet/minecraft/unmapped/C_mkqzadhs;m_psgxchiu(Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_ncpywfca;}
+    * @mapping {@literal named m_psgxchiu Lnet/minecraft/client/gui/tooltip/TooltipRenderHelper;m_psgxchiu(Lnet/minecraft/util/Identifier;)Lnet/minecraft/util/Identifier;}
     */
-   private static Identifier m_psgxchiu(@Nullable Identifier arg) {
-      return arg == null ? f_uqzlklzm : arg.withPath((UnaryOperator<String>)(string -> "tooltip/" + string + "_frame"));
+   private static Identifier m_psgxchiu(@Nullable Identifier id) {
+      return id == null ? f_uqzlklzm : id.withPath((UnaryOperator<String>)(string -> "tooltip/" + string + "_frame"));
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/button/LockButtonWidget.java namedSrc/net/minecraft/client/gui/widget/button/LockButtonWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/button/LockButtonWidget.java	2024-09-24 21:25:02.466401485 +0000
+++ namedSrc/net/minecraft/client/gui/widget/button/LockButtonWidget.java	2024-09-24 21:23:57.817741373 +0000
@@ -120,8 +120,8 @@
        * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_jjobpetg$C_hsyjefoi;<init>(Ljava/lang/String;ILnet/minecraft/unmapped/C_ncpywfca;)V}
        * @mapping {@literal named <init> Lnet/minecraft/client/gui/widget/button/LockButtonWidget$IconLocation;<init>(Ljava/lang/String;ILnet/minecraft/util/Identifier;)V}
        */
-      private IconLocation(final Identifier location) {
-         this.location = location;
+      private IconLocation(final Identifier id) {
+         this.location = id;
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/button/SpriteButtonWidget.java namedSrc/net/minecraft/client/gui/widget/button/SpriteButtonWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/button/SpriteButtonWidget.java	2024-09-24 21:25:02.495401339 +0000
+++ namedSrc/net/minecraft/client/gui/widget/button/SpriteButtonWidget.java	2024-09-24 21:23:57.855741178 +0000
@@ -192,9 +192,9 @@
        * @mapping {@literal named <init> Lnet/minecraft/client/gui/widget/button/SpriteButtonWidget$SpriteMessageButtonWidget;<init>(IILnet/minecraft/text/Text;IILnet/minecraft/util/Identifier;Lnet/minecraft/client/gui/widget/button/ButtonWidget$PressAction;Lnet/minecraft/client/gui/widget/button/ButtonWidget$NarrationFactory;)V}
        */
       protected SpriteMessageButtonWidget(
-         int i, int j, Text arg, int k, int l, Identifier arg2, ButtonWidget.PressAction arg3, @Nullable ButtonWidget.NarrationFactory arg4
+         int i, int j, Text arg, int k, int l, Identifier id, ButtonWidget.PressAction arg3, @Nullable ButtonWidget.NarrationFactory arg4
       ) {
-         super(i, j, arg, k, l, arg2, arg3, arg4);
+         super(i, j, arg, k, l, id, arg3, arg4);
       }
 
       /**
@@ -231,9 +231,9 @@
        * @mapping {@literal named <init> Lnet/minecraft/client/gui/widget/button/SpriteButtonWidget$SpriteOnlyButtonWidget;<init>(IILnet/minecraft/text/Text;IILnet/minecraft/util/Identifier;Lnet/minecraft/client/gui/widget/button/ButtonWidget$PressAction;Lnet/minecraft/client/gui/widget/button/ButtonWidget$NarrationFactory;)V}
        */
       protected SpriteOnlyButtonWidget(
-         int i, int j, Text arg, int k, int l, Identifier arg2, ButtonWidget.PressAction arg3, @Nullable ButtonWidget.NarrationFactory arg4
+         int i, int j, Text arg, int k, int l, Identifier id, ButtonWidget.PressAction arg3, @Nullable ButtonWidget.NarrationFactory arg4
       ) {
-         super(i, j, arg, k, l, arg2, arg3, arg4);
+         super(i, j, arg, k, l, id, arg3, arg4);
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/TexturedWidget.java namedSrc/net/minecraft/client/gui/widget/TexturedWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/TexturedWidget.java	2024-09-24 21:25:02.515401238 +0000
+++ namedSrc/net/minecraft/client/gui/widget/TexturedWidget.java	2024-09-24 21:23:57.886741019 +0000
@@ -89,9 +89,9 @@
        * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_zayqaxpx$C_dtwosnbx;<init>(IIIILnet/minecraft/unmapped/C_ncpywfca;)V}
        * @mapping {@literal named <init> Lnet/minecraft/client/gui/widget/TexturedWidget$Sprite;<init>(IIIILnet/minecraft/util/Identifier;)V}
        */
-      public Sprite(int x, int y, int width, int height, Identifier texture) {
+      public Sprite(int x, int y, int width, int height, Identifier id) {
          super(x, y, width, height);
-         this.texture = texture;
+         this.texture = id;
       }
 
       /**
@@ -129,9 +129,9 @@
        * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_zayqaxpx$C_wtzjlhrg;<init>(IIIILnet/minecraft/unmapped/C_ncpywfca;II)V}
        * @mapping {@literal named <init> Lnet/minecraft/client/gui/widget/TexturedWidget$Texture;<init>(IIIILnet/minecraft/util/Identifier;II)V}
        */
-      public Texture(int x, int y, int width, int height, Identifier texture, int textureWidth, int textureHeight) {
+      public Texture(int x, int y, int width, int height, Identifier id, int textureWidth, int textureHeight) {
          super(x, y, width, height);
-         this.texture = texture;
+         this.texture = id;
          this.textureWidth = textureWidth;
          this.textureHeight = textureHeight;
       }
diff -bur namedTargetSrc/net/minecraft/client/MinecraftClient.java namedSrc/net/minecraft/client/MinecraftClient.java
--- namedTargetSrc/net/minecraft/client/MinecraftClient.java	2024-09-24 21:25:02.315402246 +0000
+++ namedSrc/net/minecraft/client/MinecraftClient.java	2024-09-24 21:23:57.613742420 +0000
@@ -1753,7 +1753,7 @@
          }
       }
 
-      Registries.ITEM.holders().forEach(arg -> {
+      Registries.ITEM.streamHolders().forEach(arg -> {
          Item lvx = (Item)arg.value();
          String string = lvx.m_eryjwjll();
          String string2 = Text.translatable(string).getString();
diff -bur namedTargetSrc/net/minecraft/client/network/ClientCommandSource.java namedSrc/net/minecraft/client/network/ClientCommandSource.java
--- namedTargetSrc/net/minecraft/client/network/ClientCommandSource.java	2024-09-24 21:25:02.468401475 +0000
+++ namedSrc/net/minecraft/client/network/ClientCommandSource.java	2024-09-24 21:23:57.820741358 +0000
@@ -149,9 +149,9 @@
     */
    @Override
    public CompletableFuture<Suggestions> suggestRegistryElements(
-      RegistryKey<? extends Registry<?>> registryKey, CommandSource.ElementSuggestionType suggestionType, SuggestionsBuilder builder, CommandContext<?> context
+      RegistryKey<? extends Registry<?>> key, CommandSource.ElementSuggestionType suggestionType, SuggestionsBuilder builder, CommandContext<?> context
    ) {
-      return (CompletableFuture<Suggestions>)this.getRegistryManager().getLookup(registryKey).map(registry -> {
+      return (CompletableFuture<Suggestions>)this.getRegistryManager().getLookup(key).map(registry -> {
          this.suggestRegistryElements(registry, suggestionType, builder);
          return builder.buildFuture();
       }).orElseGet(() -> this.getCompletions(context));
diff -bur namedTargetSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java namedSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java
--- namedTargetSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java	2024-09-24 21:25:02.502401304 +0000
+++ namedSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java	2024-09-24 21:23:57.865741127 +0000
@@ -1918,11 +1918,11 @@
 
    /**
     * @mapping {@literal hashed m_rqcfgrmg Lnet/minecraft/unmapped/C_nuofrxvi;m_rqcfgrmg(Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_mnjlaveb$C_mlxyrlwl;)Lnet/minecraft/unmapped/C_tqxyjqsk$C_dbbudibo;}
-    * @mapping {@literal named m_rqcfgrmg Lnet/minecraft/client/network/ClientPlayNetworkHandler;m_rqcfgrmg(Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/registry/tag/TagNetworkSerialization$NetworkPayload;)Lnet/minecraft/registry/Registry$C_dbbudibo;}
+    * @mapping {@literal named m_rqcfgrmg Lnet/minecraft/client/network/ClientPlayNetworkHandler;m_rqcfgrmg(Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/registry/tag/TagNetworkSerialization$NetworkPayload;)Lnet/minecraft/registry/Registry$PendingTags;}
     */
-   private <T> Registry.C_dbbudibo<T> m_rqcfgrmg(RegistryKey<? extends Registry<? extends T>> registryKey, TagNetworkSerialization.NetworkPayload arg2) {
-      Registry<T> lv = this.clientRegistryManager.getLookupOrThrow(registryKey);
-      return lv.m_prsibeni(arg2.m_dvimurkf(lv));
+   private <T> Registry.PendingTags<T> m_rqcfgrmg(RegistryKey<? extends Registry<? extends T>> arg, TagNetworkSerialization.NetworkPayload payload) {
+      Registry<T> lv = this.clientRegistryManager.getLookupOrThrow(arg);
+      return lv.startTagReload(payload.deserialize(lv));
    }
 
    /**
@@ -1931,14 +1931,14 @@
    @Override
    public void onTagsSynchronization(TagsSynchronizationS2CPacket packet) {
       NetworkThreadUtils.forceMainThread(packet, this, this.client);
-      List<Registry.C_dbbudibo<?>> list = new ArrayList(packet.getGroups().size());
+      List<Registry.PendingTags<?>> list = new ArrayList(packet.getGroups().size());
       boolean bl = this.connection.isLocal();
-      packet.getGroups().forEach((registryKey, arg2) -> {
-         if (!bl || DynamicRegistrySync.m_wzlxyjqc(registryKey)) {
-            list.add(this.m_rqcfgrmg(registryKey, arg2));
+      packet.getGroups().forEach((arg, payload) -> {
+         if (!bl || DynamicRegistrySync.isSynced(arg)) {
+            list.add(this.m_rqcfgrmg(arg, payload));
          }
       });
-      list.forEach(Registry.C_dbbudibo::m_lucdhycj);
+      list.forEach(Registry.PendingTags::bind);
       this.f_vdcgenve = C_smdnyqwx.m_qszhlppm(this.clientRegistryManager, this.enabledFlags);
       List<ItemStack> list2 = List.copyOf(ItemGroups.getSearchGroup().getOrInitTabStacks());
       this.f_yzsmztuz.m_zndcnouo(list2);
diff -bur namedTargetSrc/net/minecraft/client/realms/RealmsWorldGeneratorType.java namedSrc/net/minecraft/client/realms/RealmsWorldGeneratorType.java
--- namedTargetSrc/net/minecraft/client/realms/RealmsWorldGeneratorType.java	2024-09-24 21:25:02.493401349 +0000
+++ namedSrc/net/minecraft/client/realms/RealmsWorldGeneratorType.java	2024-09-24 21:23:57.850741204 +0000
@@ -49,9 +49,9 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_oynhlvsg;<init>(Ljava/lang/String;IILnet/minecraft/unmapped/C_xhhleach;)V}
     * @mapping {@literal named <init> Lnet/minecraft/client/realms/RealmsWorldGeneratorType;<init>(Ljava/lang/String;IILnet/minecraft/registry/RegistryKey;)V}
     */
-   private RealmsWorldGeneratorType(final int id, final RegistryKey<GeneratorType> registryKey) {
+   private RealmsWorldGeneratorType(final int id, final RegistryKey<GeneratorType> arg) {
       this.id = id;
-      this.text = Text.translatable(registryKey.getValue().toTranslationKey("generator"));
+      this.text = Text.translatable(arg.getValue().toTranslationKey("generator"));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/render/debug/GameEventDebugRenderer.java namedSrc/net/minecraft/client/render/debug/GameEventDebugRenderer.java
--- namedTargetSrc/net/minecraft/client/render/debug/GameEventDebugRenderer.java	2024-09-24 21:25:02.355402045 +0000
+++ namedSrc/net/minecraft/client/render/debug/GameEventDebugRenderer.java	2024-09-24 21:23:57.659742184 +0000
@@ -162,8 +162,8 @@
     * @mapping {@literal hashed m_nvqidnmt Lnet/minecraft/unmapped/C_kgxeykxx;m_nvqidnmt(Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_vgpupfxx;)V}
     * @mapping {@literal named addEvent Lnet/minecraft/client/render/debug/GameEventDebugRenderer;addEvent(Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/util/math/Vec3d;)V}
     */
-   public void addEvent(RegistryKey<GameEvent> registryKey, Vec3d pos) {
-      this.entries.add(new GameEventDebugRenderer.Entry(Util.getMeasuringTimeMs(), registryKey, pos));
+   public void addEvent(RegistryKey<GameEvent> event, Vec3d pos) {
+      this.entries.add(new GameEventDebugRenderer.Entry(Util.getMeasuringTimeMs(), event, pos));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/render/debug/StructureDebugRenderer.java namedSrc/net/minecraft/client/render/debug/StructureDebugRenderer.java
--- namedTargetSrc/net/minecraft/client/render/debug/StructureDebugRenderer.java	2024-09-24 21:25:02.501401309 +0000
+++ namedSrc/net/minecraft/client/render/debug/StructureDebugRenderer.java	2024-09-24 21:23:57.863741137 +0000
@@ -138,10 +138,10 @@
     * @mapping {@literal hashed m_tmeqhmbo Lnet/minecraft/unmapped/C_jneftvkt;m_tmeqhmbo(Lnet/minecraft/unmapped/C_hmqypqzz;Ljava/util/List;Lnet/minecraft/unmapped/C_xhhleach;)V}
     * @mapping {@literal named addStructure Lnet/minecraft/client/render/debug/StructureDebugRenderer;addStructure(Lnet/minecraft/util/math/BlockBox;Ljava/util/List;Lnet/minecraft/registry/RegistryKey;)V}
     */
-   public void addStructure(BlockBox boundingBox, List<StructuresDebugPayload.Piece> piecesBoundingBoxes, RegistryKey<World> registryKey) {
-      ((Map)this.structureBoundingBoxes.computeIfAbsent(registryKey, registryKeyx -> new HashMap())).put(boundingBox.toString(), boundingBox);
+   public void addStructure(BlockBox boundingBox, List<StructuresDebugPayload.Piece> piecesBoundingBoxes, RegistryKey<World> key) {
+      ((Map)this.structureBoundingBoxes.computeIfAbsent(key, arg -> new HashMap())).put(boundingBox.toString(), boundingBox);
       Map<String, StructuresDebugPayload.Piece> map = (Map<String, StructuresDebugPayload.Piece>)this.boundingBoxPieces
-         .computeIfAbsent(registryKey, registryKeyx -> new HashMap());
+         .computeIfAbsent(key, arg -> new HashMap());
 
       for (StructuresDebugPayload.Piece lv : piecesBoundingBoxes) {
          map.put(lv.boundingBox().toString(), lv);
diff -bur namedTargetSrc/net/minecraft/client/render/entity/BoatEntityRenderer.java namedSrc/net/minecraft/client/render/entity/BoatEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/BoatEntityRenderer.java	2024-09-24 21:25:02.258402533 +0000
+++ namedSrc/net/minecraft/client/render/entity/BoatEntityRenderer.java	2024-09-24 21:23:57.539742800 +0000
@@ -52,7 +52,7 @@
          .collect(
             ImmutableMap.toImmutableMap(boatVariant -> boatVariant, variant -> Pair.of(m_cjkpqrnq(variant, isChest), this.getModel(context, variant, isChest)))
          );
-      this.f_aliiyrap = new Model.C_ihzqypnt(context.getPart(EntityModelLayers.BOAT), arg -> RenderLayer.getWaterMask());
+      this.f_aliiyrap = new Model.C_ihzqypnt(context.getPart(EntityModelLayers.BOAT), id -> RenderLayer.getWaterMask());
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/render/entity/feature/LlamaDecorFeatureRenderer.java namedSrc/net/minecraft/client/render/entity/feature/LlamaDecorFeatureRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/feature/LlamaDecorFeatureRenderer.java	2024-09-24 21:25:02.287402387 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/LlamaDecorFeatureRenderer.java	2024-09-24 21:23:57.579742595 +0000
@@ -65,9 +65,9 @@
     * @mapping {@literal hashed m_mfgrmedl Lnet/minecraft/unmapped/C_smzkjmlx;m_mfgrmedl(Lnet/minecraft/unmapped/C_cnszsxvd;Lnet/minecraft/unmapped/C_igrgeffe;Lnet/minecraft/unmapped/C_ivvdyrnm;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_ncpywfca;I)V}
     * @mapping {@literal named m_mfgrmedl Lnet/minecraft/client/render/entity/feature/LlamaDecorFeatureRenderer;m_mfgrmedl(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;Lnet/minecraft/unmapped/C_ivvdyrnm;Lnet/minecraft/item/ItemStack;Lnet/minecraft/util/Identifier;I)V}
     */
-   private void m_mfgrmedl(MatrixStack matrices, VertexConsumerProvider vertexConsumers, C_ivvdyrnm arg3, ItemStack stack, Identifier arg5, int i) {
+   private void m_mfgrmedl(MatrixStack matrices, VertexConsumerProvider vertexConsumers, C_ivvdyrnm arg3, ItemStack stack, Identifier id, int i) {
       LlamaEntityModel lv = arg3.f_vetzpkzw ? this.f_vgmqtflz : this.f_gwhswcjl;
       lv.setAngles(arg3);
-      this.f_cdikxozv.m_gzffgizr(C_mgbzsqdv.C_otwvbrdf.LLAMA_BODY, arg5, lv, stack, RenderLayer::getEntityCutoutNoCull, matrices, vertexConsumers, i);
+      this.f_cdikxozv.m_gzffgizr(C_mgbzsqdv.C_otwvbrdf.LLAMA_BODY, id, lv, stack, RenderLayer::getEntityCutoutNoCull, matrices, vertexConsumers, i);
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/render/entity/feature/SaddleFeatureRenderer.java namedSrc/net/minecraft/client/render/entity/feature/SaddleFeatureRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/feature/SaddleFeatureRenderer.java	2024-09-24 21:25:02.269402478 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/SaddleFeatureRenderer.java	2024-09-24 21:23:57.555742718 +0000
@@ -36,11 +36,11 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_wgzeroan;<init>(Lnet/minecraft/unmapped/C_mjeyymcw;Lnet/minecraft/unmapped/C_fouvqrqy;Lnet/minecraft/unmapped/C_fouvqrqy;Lnet/minecraft/unmapped/C_ncpywfca;)V}
     * @mapping {@literal named <init> Lnet/minecraft/client/render/entity/feature/SaddleFeatureRenderer;<init>(Lnet/minecraft/client/render/entity/feature/FeatureRendererContext;Lnet/minecraft/client/render/entity/model/EntityModel;Lnet/minecraft/client/render/entity/model/EntityModel;Lnet/minecraft/util/Identifier;)V}
     */
-   public SaddleFeatureRenderer(FeatureRendererContext<S, M> context, M arg2, M arg3, Identifier texture) {
+   public SaddleFeatureRenderer(FeatureRendererContext<S, M> context, M arg2, M arg3, Identifier id) {
       super(context);
       this.f_nkjsqulb = arg2;
       this.f_gxdscefv = arg3;
-      this.texture = texture;
+      this.texture = id;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/render/entity/feature/StuckObjectsFeatureRenderer.java namedSrc/net/minecraft/client/render/entity/feature/StuckObjectsFeatureRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/feature/StuckObjectsFeatureRenderer.java	2024-09-24 21:25:02.417401732 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/StuckObjectsFeatureRenderer.java	2024-09-24 21:23:57.742741758 +0000
@@ -26,9 +26,10 @@
     */
    private final Model f_ozfkfzvs;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_ovkqbzwt Lnet/minecraft/unmapped/C_puicivlk;f_ovkqbzwt:Lnet/minecraft/unmapped/C_ncpywfca;}
+    * @mapping {@literal named id Lnet/minecraft/client/render/entity/feature/StuckObjectsFeatureRenderer;id:Lnet/minecraft/util/Identifier;}
     */
-   private final Identifier f_ovkqbzwt;
+   private final Identifier id;
    /**
     * Mapping not found
     */
@@ -38,10 +39,10 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_puicivlk;<init>(Lnet/minecraft/unmapped/C_nbjmhtws;Lnet/minecraft/unmapped/C_lzwtpfka;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_puicivlk$C_muueptna;)V}
     * @mapping {@literal named <init> Lnet/minecraft/client/render/entity/feature/StuckObjectsFeatureRenderer;<init>(Lnet/minecraft/client/render/entity/LivingEntityRenderer;Lnet/minecraft/client/model/Model;Lnet/minecraft/util/Identifier;Lnet/minecraft/client/render/entity/feature/StuckObjectsFeatureRenderer$C_muueptna;)V}
     */
-   public StuckObjectsFeatureRenderer(LivingEntityRenderer<?, C_pkqgufgx, M> context, Model arg2, Identifier arg3, StuckObjectsFeatureRenderer.C_muueptna arg4) {
+   public StuckObjectsFeatureRenderer(LivingEntityRenderer<?, C_pkqgufgx, M> context, Model arg2, Identifier id, StuckObjectsFeatureRenderer.C_muueptna arg4) {
       super(context);
       this.f_ozfkfzvs = arg2;
-      this.f_ovkqbzwt = arg3;
+      this.id = id;
       this.f_iatkbbib = arg4;
    }
 
@@ -61,7 +62,7 @@
       float l = (float)(Math.atan2((double)directionY, (double)j) * 180.0F / (float)Math.PI);
       matrices.rotate(Axis.Y_POSITIVE.rotationDegrees(k - 90.0F));
       matrices.rotate(Axis.Z_POSITIVE.rotationDegrees(l));
-      this.f_ozfkfzvs.m_tivdiufh(matrices, vertexConsumers.getBuffer(this.f_ozfkfzvs.getLayer(this.f_ovkqbzwt)), light, OverlayTexture.DEFAULT_UV);
+      this.f_ozfkfzvs.m_tivdiufh(matrices, vertexConsumers.getBuffer(this.f_ozfkfzvs.getLayer(this.id)), light, OverlayTexture.DEFAULT_UV);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/render/entity/feature/VillagerClothingFeatureRenderer.java namedSrc/net/minecraft/client/render/entity/feature/VillagerClothingFeatureRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/feature/VillagerClothingFeatureRenderer.java	2024-09-24 21:25:02.516401233 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/VillagerClothingFeatureRenderer.java	2024-09-24 21:23:57.888741009 +0000
@@ -118,9 +118,9 @@
       Object2ObjectMap<K, VillagerResourceMetadata.HatType> hatLookUp, String keyType, DefaultedRegistry<K> registry, K key
    ) {
       return hatLookUp.computeIfAbsent(
-         key, object2 -> (VillagerResourceMetadata.HatType)this.resourceManager.getResource(this.findTexture(keyType, registry.getId(key))).flatMap(argx -> {
+         key, object2 -> (VillagerResourceMetadata.HatType)this.resourceManager.getResource(this.findTexture(keyType, registry.getId(key))).flatMap(arg -> {
                try {
-                  return argx.getMetadata().readSection(VillagerResourceMetadata.READER).map(VillagerResourceMetadata::getHatType);
+                  return arg.getMetadata().readSection(VillagerResourceMetadata.READER).map(VillagerResourceMetadata::getHatType);
                } catch (IOException var2) {
                   return Optional.empty();
                }
diff -bur namedTargetSrc/net/minecraft/client/render/entity/PlayerEntityRenderer.java namedSrc/net/minecraft/client/render/entity/PlayerEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/PlayerEntityRenderer.java	2024-09-24 21:25:02.486401385 +0000
+++ namedSrc/net/minecraft/client/render/entity/PlayerEntityRenderer.java	2024-09-24 21:23:57.840741255 +0000
@@ -299,23 +299,23 @@
     * @mapping {@literal hashed m_skywttwi Lnet/minecraft/unmapped/C_glzopqgl;m_skywttwi(Lnet/minecraft/unmapped/C_cnszsxvd;Lnet/minecraft/unmapped/C_igrgeffe;ILnet/minecraft/unmapped/C_ncpywfca;Z)V}
     * @mapping {@literal named renderRightArm Lnet/minecraft/client/render/entity/PlayerEntityRenderer;renderRightArm(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/util/Identifier;Z)V}
     */
-   public void renderRightArm(MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, Identifier texture, boolean bl) {
-      this.renderArm(matrices, vertexConsumers, light, texture, this.model.rightArm, bl);
+   public void renderRightArm(MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, Identifier id, boolean bl) {
+      this.renderArm(matrices, vertexConsumers, light, id, this.model.rightArm, bl);
    }
 
    /**
     * @mapping {@literal hashed m_spaomvdp Lnet/minecraft/unmapped/C_glzopqgl;m_spaomvdp(Lnet/minecraft/unmapped/C_cnszsxvd;Lnet/minecraft/unmapped/C_igrgeffe;ILnet/minecraft/unmapped/C_ncpywfca;Z)V}
     * @mapping {@literal named renderLeftArm Lnet/minecraft/client/render/entity/PlayerEntityRenderer;renderLeftArm(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/util/Identifier;Z)V}
     */
-   public void renderLeftArm(MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, Identifier texture, boolean bl) {
-      this.renderArm(matrices, vertexConsumers, light, texture, this.model.leftArm, bl);
+   public void renderLeftArm(MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, Identifier id, boolean bl) {
+      this.renderArm(matrices, vertexConsumers, light, id, this.model.leftArm, bl);
    }
 
    /**
     * @mapping {@literal hashed m_cxsilwbo Lnet/minecraft/unmapped/C_glzopqgl;m_cxsilwbo(Lnet/minecraft/unmapped/C_cnszsxvd;Lnet/minecraft/unmapped/C_igrgeffe;ILnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_rglqxnbw;Z)V}
     * @mapping {@literal named renderArm Lnet/minecraft/client/render/entity/PlayerEntityRenderer;renderArm(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/util/Identifier;Lnet/minecraft/client/model/ModelPart;Z)V}
     */
-   private void renderArm(MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, Identifier texture, ModelPart arm, boolean bl) {
+   private void renderArm(MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, Identifier id, ModelPart arm, boolean bl) {
       PlayerEntityModel lv = this.getModel();
       arm.resetTransform();
       arm.visible = true;
@@ -323,7 +323,7 @@
       lv.rightSleeve.visible = bl;
       lv.leftArm.roll = -0.1F;
       lv.rightArm.roll = 0.1F;
-      arm.render(matrices, vertexConsumers.getBuffer(RenderLayer.getEntityTranslucent(texture)), light, OverlayTexture.DEFAULT_UV);
+      arm.render(matrices, vertexConsumers.getBuffer(RenderLayer.getEntityTranslucent(id)), light, OverlayTexture.DEFAULT_UV);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/render/GameRenderer.java namedSrc/net/minecraft/client/render/GameRenderer.java
--- namedTargetSrc/net/minecraft/client/render/GameRenderer.java	2024-09-24 21:25:02.308402281 +0000
+++ namedSrc/net/minecraft/client/render/GameRenderer.java	2024-09-24 21:23:57.605742461 +0000
@@ -354,10 +354,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_svxrrlqv Lnet/minecraft/unmapped/C_sktkdoun;m_svxrrlqv(Lnet/minecraft/unmapped/C_ncpywfca;)V}
+    * @mapping {@literal named m_svxrrlqv Lnet/minecraft/client/render/GameRenderer;m_svxrrlqv(Lnet/minecraft/util/Identifier;)V}
     */
-   private void m_svxrrlqv(Identifier arg) {
-      this.f_xgsslhwt = arg;
+   private void m_svxrrlqv(Identifier id) {
+      this.f_xgsslhwt = id;
       this.shadersEnabled = true;
    }
 
diff -bur namedTargetSrc/net/minecraft/client/render/item/ItemModels.java namedSrc/net/minecraft/client/render/item/ItemModels.java
--- namedTargetSrc/net/minecraft/client/render/item/ItemModels.java	2024-09-24 21:25:02.434401646 +0000
+++ namedSrc/net/minecraft/client/render/item/ItemModels.java	2024-09-24 21:23:57.767741630 +0000
@@ -38,7 +38,7 @@
     */
    public ItemModels(BakedModelManager modelManager) {
       this.f_wisehwxj = modelManager::getMissingModel;
-      this.f_qrvogklc = arg2 -> modelManager.getModel(ModelIdentifier.inventory(arg2));
+      this.f_qrvogklc = id -> modelManager.getModel(ModelIdentifier.inventory(id));
    }
 
    /**
@@ -54,8 +54,8 @@
     * @mapping {@literal hashed m_tmglgggd Lnet/minecraft/unmapped/C_mcmbqsvm;m_tmglgggd(Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_nnhmhkbv;}
     * @mapping {@literal named m_tmglgggd Lnet/minecraft/client/render/item/ItemModels;m_tmglgggd(Lnet/minecraft/util/Identifier;)Lnet/minecraft/client/render/model/BakedModel;}
     */
-   public BakedModel m_tmglgggd(Identifier key) {
-      return (BakedModel)this.f_vmlyzphr.computeIfAbsent(key, this.f_qrvogklc);
+   public BakedModel m_tmglgggd(Identifier id) {
+      return (BakedModel)this.f_vmlyzphr.computeIfAbsent(id, this.f_qrvogklc);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/render/model/ModelLoader.java namedSrc/net/minecraft/client/render/model/ModelLoader.java
--- namedTargetSrc/net/minecraft/client/render/model/ModelLoader.java	2024-09-24 21:25:02.292402362 +0000
+++ namedSrc/net/minecraft/client/render/model/ModelLoader.java	2024-09-24 21:23:57.587742554 +0000
@@ -198,12 +198,13 @@
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_zeazndgo Lnet/minecraft/unmapped/C_gjnplkfz$C_qnxaydxn;m_zeazndgo(Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_nrqwmhri;}
+       * @mapping {@literal named m_zeazndgo Lnet/minecraft/client/render/model/ModelLoader$ModelLoaderBaker;m_zeazndgo(Lnet/minecraft/util/Identifier;)Lnet/minecraft/client/render/model/UnbakedModel;}
        */
-      private UnbakedModel m_zeazndgo(Identifier arg) {
-         UnbakedModel lv = (UnbakedModel)ModelLoader.this.f_fdoembiv.get(arg);
+      private UnbakedModel m_zeazndgo(Identifier id) {
+         UnbakedModel lv = (UnbakedModel)ModelLoader.this.f_fdoembiv.get(id);
          if (lv == null) {
-            ModelLoader.LOGGER.warn("Requested a model that was not discovered previously: {}", arg);
+            ModelLoader.LOGGER.warn("Requested a model that was not discovered previously: {}", id);
             return ModelLoader.this.model;
          } else {
             return lv;
diff -bur namedTargetSrc/net/minecraft/client/render/model/UnbakedModel.java namedSrc/net/minecraft/client/render/model/UnbakedModel.java
--- namedTargetSrc/net/minecraft/client/render/model/UnbakedModel.java	2024-09-24 21:25:02.285402397 +0000
+++ namedSrc/net/minecraft/client/render/model/UnbakedModel.java	2024-09-24 21:23:57.576742610 +0000
@@ -31,8 +31,9 @@
    @Environment(EnvType.CLIENT)
    public interface C_qnhehnbx {
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_ukijhnlq Lnet/minecraft/unmapped/C_nrqwmhri$C_qnhehnbx;m_ukijhnlq(Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_nrqwmhri;}
+       * @mapping {@literal named m_ukijhnlq Lnet/minecraft/client/render/model/UnbakedModel$C_qnhehnbx;m_ukijhnlq(Lnet/minecraft/util/Identifier;)Lnet/minecraft/client/render/model/UnbakedModel;}
        */
-      UnbakedModel m_ukijhnlq(Identifier arg);
+      UnbakedModel m_ukijhnlq(Identifier id);
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/render/RenderLayer.java namedSrc/net/minecraft/client/render/RenderLayer.java
--- namedTargetSrc/net/minecraft/client/render/RenderLayer.java	2024-09-24 21:25:02.464401495 +0000
+++ namedSrc/net/minecraft/client/render/RenderLayer.java	2024-09-24 21:23:57.813741394 +0000
@@ -929,13 +929,13 @@
     * @mapping {@literal named GUI_TEXTURED_OVERLAY Lnet/minecraft/client/render/RenderLayer;GUI_TEXTURED_OVERLAY:Ljava/util/function/Function;}
     */
    private static final Function<Identifier, RenderLayer> GUI_TEXTURED_OVERLAY = Util.memoize(
-      (Function<Identifier, RenderLayer>)(arg -> of(
+      (Function<Identifier, RenderLayer>)(id -> of(
             "gui_textured_overlay",
             VertexFormats.POSITION_TEXTURE_COLOR,
             VertexFormat.DrawMode.QUADS,
             1536,
             RenderLayer.MultiPhaseParameters.builder()
-               .texture(new RenderPhase.Texture(arg, TriState.DEFAULT, false))
+               .texture(new RenderPhase.Texture(id, TriState.DEFAULT, false))
                .shader(POSITION_TEX_COLOR_SHADER)
                .transparency(TRANSLUCENT_TRANSPARENCY)
                .depthTest(ALWAYS_DEPTH_TEST)
@@ -1378,7 +1378,7 @@
     * @mapping {@literal hashed m_soqxdpvf Lnet/minecraft/unmapped/C_tizlwnnv;m_soqxdpvf(Lnet/minecraft/unmapped/C_ncpywfca;FF)Lnet/minecraft/unmapped/C_tizlwnnv;}
     * @mapping {@literal named getBreezeWind Lnet/minecraft/client/render/RenderLayer;getBreezeWind(Lnet/minecraft/util/Identifier;FF)Lnet/minecraft/client/render/RenderLayer;}
     */
-   public static RenderLayer getBreezeWind(Identifier value, float x, float y) {
+   public static RenderLayer getBreezeWind(Identifier id, float x, float y) {
       return of(
          "breeze_wind",
          VertexFormats.POSITION_COLOR_TEXTURE_OVERLAY_LIGHT_NORMAL,
@@ -1388,7 +1388,7 @@
          true,
          RenderLayer.MultiPhaseParameters.builder()
             .shader(BREEZE_WIND_SHADER)
-            .texture(new RenderPhase.Texture(value, TriState.FALSE, false))
+            .texture(new RenderPhase.Texture(id, TriState.FALSE, false))
             .texturing(new RenderPhase.OffsetTexturing(x, y))
             .transparency(TRANSLUCENT_TRANSPARENCY)
             .cull(DISABLE_CULLING)
diff -bur namedTargetSrc/net/minecraft/client/render/RenderPhase.java namedSrc/net/minecraft/client/render/RenderPhase.java
--- namedTargetSrc/net/minecraft/client/render/RenderPhase.java	2024-09-24 21:25:02.394401848 +0000
+++ namedSrc/net/minecraft/client/render/RenderPhase.java	2024-09-24 21:23:57.718741881 +0000
@@ -1037,15 +1037,15 @@
        * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_yzzfidwp$C_litwwlrq;<init>(Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_jkoyijul;Z)V}
        * @mapping {@literal named <init> Lnet/minecraft/client/render/RenderPhase$Texture;<init>(Lnet/minecraft/util/Identifier;Lnet/minecraft/util/TriState;Z)V}
        */
-      public Texture(Identifier value, TriState blur, boolean mipmap) {
+      public Texture(Identifier id, TriState blur, boolean mipmap) {
          super(() -> {
             TextureManager lv = MinecraftClient.getInstance().getTextureManager();
-            AbstractTexture lv2 = lv.getTexture(value);
+            AbstractTexture lv2 = lv.getTexture(id);
             lv2.setFilter(blur.toBoolean(lv2.m_rrvkeoqf()), mipmap);
-            RenderSystem.setShaderTexture(0, value);
+            RenderSystem.setShaderTexture(0, id);
          }, () -> {
          });
-         this.id = Optional.of(value);
+         this.id = Optional.of(id);
          this.blur = blur;
          this.mipmap = mipmap;
       }
diff -bur namedTargetSrc/net/minecraft/client/render/TexturedRenderLayers.java namedSrc/net/minecraft/client/render/TexturedRenderLayers.java
--- namedTargetSrc/net/minecraft/client/render/TexturedRenderLayers.java	2024-09-24 21:25:02.439401621 +0000
+++ namedSrc/net/minecraft/client/render/TexturedRenderLayers.java	2024-09-24 21:23:57.776741584 +0000
@@ -179,7 +179,7 @@
     * @mapping {@literal named DECORATED_POT_PATTERN_TEXTURES Lnet/minecraft/client/render/TexturedRenderLayers;DECORATED_POT_PATTERN_TEXTURES:Ljava/util/Map;}
     */
    public static final Map<RegistryKey<DecoratedPotPattern>, Material> DECORATED_POT_PATTERN_TEXTURES = (Map<RegistryKey<DecoratedPotPattern>, Material>)Registries.DECORATED_POT_PATTERN
-      .holders()
+      .streamHolders()
       .collect(
          Collectors.toMap(Holder.Reference::getRegistryKey, pattern -> createDecoratedPotPatternTextureId(((DecoratedPotPattern)pattern.value()).assetId()))
       );
@@ -415,8 +415,8 @@
     * @mapping {@literal named getDecoratedPotPatternTextureId Lnet/minecraft/client/render/TexturedRenderLayers;getDecoratedPotPatternTextureId(Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/client/resource/Material;}
     */
    @Nullable
-   public static Material getDecoratedPotPatternTextureId(@Nullable RegistryKey<DecoratedPotPattern> registryKey) {
-      return registryKey == null ? null : (Material)DECORATED_POT_PATTERN_TEXTURES.get(registryKey);
+   public static Material getDecoratedPotPatternTextureId(@Nullable RegistryKey<DecoratedPotPattern> arg) {
+      return arg == null ? null : (Material)DECORATED_POT_PATTERN_TEXTURES.get(arg);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/texture/NativeImageBackedTexture.java namedSrc/net/minecraft/client/texture/NativeImageBackedTexture.java
--- namedTargetSrc/net/minecraft/client/texture/NativeImageBackedTexture.java	2024-09-24 21:25:02.273402458 +0000
+++ namedSrc/net/minecraft/client/texture/NativeImageBackedTexture.java	2024-09-24 21:23:57.560742692 +0000
@@ -115,9 +115,9 @@
     * Mapping not found
     */
    @Override
-   public void saveTo(Identifier textureId, Path directoryPath) throws IOException {
+   public void saveTo(Identifier id, Path directoryPath) throws IOException {
       if (this.image != null) {
-         String string = textureId.toUnderscoreSeparatedString() + ".png";
+         String string = id.toUnderscoreSeparatedString() + ".png";
          Path path2 = directoryPath.resolve(string);
          this.image.writeFile(path2);
       }
diff -bur namedTargetSrc/net/minecraft/client/texture/SpriteAtlasTexture.java namedSrc/net/minecraft/client/texture/SpriteAtlasTexture.java
--- namedTargetSrc/net/minecraft/client/texture/SpriteAtlasTexture.java	2024-09-24 21:25:02.472401455 +0000
+++ namedSrc/net/minecraft/client/texture/SpriteAtlasTexture.java	2024-09-24 21:23:57.825741332 +0000
@@ -156,8 +156,8 @@
     * Mapping not found
     */
    @Override
-   public void saveTo(Identifier textureId, Path directoryPath) throws IOException {
-      String string = textureId.toUnderscoreSeparatedString();
+   public void saveTo(Identifier id, Path directoryPath) throws IOException {
+      String string = id.toUnderscoreSeparatedString();
       TextureUtil.writeAsPng(directoryPath, string, this.getGlId(), this.mipLevel, this.width, this.height);
       dumpSpriteInfo(directoryPath, string, this.sprites);
    }
diff -bur namedTargetSrc/net/minecraft/client/texture/TextureManager.java namedSrc/net/minecraft/client/texture/TextureManager.java
--- namedTargetSrc/net/minecraft/client/texture/TextureManager.java	2024-09-24 21:25:02.371401964 +0000
+++ namedSrc/net/minecraft/client/texture/TextureManager.java	2024-09-24 21:23:57.691742020 +0000
@@ -279,12 +279,12 @@
          return;
       }
 
-      this.textures.forEach((arg, arg2) -> {
+      this.textures.forEach((id, arg2) -> {
          if (arg2 instanceof DumpableTexture lv) {
             try {
-               lv.saveTo(arg, path);
+               lv.saveTo(id, path);
             } catch (IOException var5) {
-               LOGGER.error("Failed to dump texture {}", arg, var5);
+               LOGGER.error("Failed to dump texture {}", id, var5);
             }
          }
       });
diff -bur namedTargetSrc/net/minecraft/client/toast/TutorialToast.java namedSrc/net/minecraft/client/toast/TutorialToast.java
--- namedTargetSrc/net/minecraft/client/toast/TutorialToast.java	2024-09-24 21:25:02.419401722 +0000
+++ namedSrc/net/minecraft/client/toast/TutorialToast.java	2024-09-24 21:23:57.744741748 +0000
@@ -18,9 +18,10 @@
 @Environment(EnvType.CLIENT)
 public class TutorialToast implements Toast {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_uqbarera Lnet/minecraft/unmapped/C_fbzposnd;f_uqbarera:Lnet/minecraft/unmapped/C_ncpywfca;}
+    * @mapping {@literal named ID Lnet/minecraft/client/toast/TutorialToast;ID:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier f_uqbarera = Identifier.ofDefault("toast/tutorial");
+   private static final Identifier ID = Identifier.ofDefault("toast/tutorial");
    /**
     * @mapping {@literal hashed f_uhgjtpsh Lnet/minecraft/unmapped/C_fbzposnd;f_uhgjtpsh:I}
     * @mapping {@literal named PROGRESS_BAR_WIDTH Lnet/minecraft/client/toast/TutorialToast;PROGRESS_BAR_WIDTH:I}
@@ -136,7 +137,7 @@
     */
    @Override
    public void draw(GuiGraphics graphics, TextRenderer textRenderer, long startTime) {
-      graphics.m_rixppaza(RenderLayer::getGuiTextured, f_uqbarera, 0, 0, this.getWidth(), this.getHeight());
+      graphics.m_rixppaza(RenderLayer::getGuiTextured, ID, 0, 0, this.getWidth(), this.getHeight());
       this.type.drawIcon(graphics, 6, 6);
       if (this.description == null) {
          graphics.drawText(textRenderer, this.title, 30, 12, -11534256, false);
@@ -217,16 +218,17 @@
       RIGHT_CLICK(Identifier.ofDefault("toast/right_click"));
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_axxeqmtb Lnet/minecraft/unmapped/C_fbzposnd$C_paqxhvoo;f_axxeqmtb:Lnet/minecraft/unmapped/C_ncpywfca;}
+       * @mapping {@literal named id Lnet/minecraft/client/toast/TutorialToast$Type;id:Lnet/minecraft/util/Identifier;}
        */
-      private final Identifier f_axxeqmtb;
+      private final Identifier id;
 
       /**
        * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_fbzposnd$C_paqxhvoo;<init>(Ljava/lang/String;ILnet/minecraft/unmapped/C_ncpywfca;)V}
        * @mapping {@literal named <init> Lnet/minecraft/client/toast/TutorialToast$Type;<init>(Ljava/lang/String;ILnet/minecraft/util/Identifier;)V}
        */
-      private Type(final Identifier arg) {
-         this.f_axxeqmtb = arg;
+      private Type(final Identifier id) {
+         this.id = id;
       }
 
       /**
@@ -234,7 +236,7 @@
        * @mapping {@literal named drawIcon Lnet/minecraft/client/toast/TutorialToast$Type;drawIcon(Lnet/minecraft/client/gui/GuiGraphics;II)V}
        */
       public void drawIcon(GuiGraphics graphics, int x, int y) {
-         graphics.m_rixppaza(RenderLayer::getGuiTextured, this.f_axxeqmtb, x, y, 20, 20);
+         graphics.m_rixppaza(RenderLayer::getGuiTextured, this.id, x, y, 20, 20);
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/world/GeneratorType.java namedSrc/net/minecraft/client/world/GeneratorType.java
--- namedTargetSrc/net/minecraft/client/world/GeneratorType.java	2024-09-24 21:25:02.445401591 +0000
+++ namedSrc/net/minecraft/client/world/GeneratorType.java	2024-09-24 21:23:57.784741543 +0000
@@ -26,7 +26,7 @@
     */
    public static final Codec<GeneratorType> DIRECT_CODEC = RecordCodecBuilder.<GeneratorType>create(
          instance -> instance.group(
-                  Codec.unboundedMap(RegistryKey.codec(RegistryKeys.DIMENSION), DimensionOptions.CODEC)
+                  Codec.unboundedMap(RegistryKey.createCodec(RegistryKeys.DIMENSION), DimensionOptions.CODEC)
                      .fieldOf("dimensions")
                      .forGetter(type -> type.dimensions)
                )
@@ -57,10 +57,10 @@
     */
    private ImmutableMap<RegistryKey<DimensionOptions>, DimensionOptions> m_jnmoajbr() {
       Builder<RegistryKey<DimensionOptions>, DimensionOptions> builder = ImmutableMap.builder();
-      WorldDimensions.streamInOrder(this.dimensions.keySet().stream()).forEach(registryKey -> {
-         DimensionOptions lv = (DimensionOptions)this.dimensions.get(registryKey);
+      WorldDimensions.streamInOrder(this.dimensions.keySet().stream()).forEach(arg -> {
+         DimensionOptions lv = (DimensionOptions)this.dimensions.get(arg);
          if (lv != null) {
-            builder.put(registryKey, lv);
+            builder.put(arg, lv);
          }
       });
       return builder.build();
diff -bur namedTargetSrc/net/minecraft/client/world/WorldCreator.java namedSrc/net/minecraft/client/world/WorldCreator.java
--- namedTargetSrc/net/minecraft/client/world/WorldCreator.java	2024-09-24 21:25:02.263402508 +0000
+++ namedSrc/net/minecraft/client/world/WorldCreator.java	2024-09-24 21:23:57.545742769 +0000
@@ -131,9 +131,7 @@
       context.initialWorldCreationOptions().disabledGameRules().forEach(arg -> this.gameRules.<GameRules.BooleanGameRule>get(arg).setValue(false, null));
       Optional.ofNullable(context.initialWorldCreationOptions().flatLevelPreset())
          .flatMap(
-            registryKey -> context.getWorldgenRegistryManager()
-                  .getLookup(RegistryKeys.FLAT_WORLD_GENERATOR_PRESET)
-                  .flatMap(registry -> registry.getHolder(registryKey))
+            arg2 -> context.getWorldgenRegistryManager().getLookup(RegistryKeys.FLAT_WORLD_GENERATOR_PRESET).flatMap(registry -> registry.getHolder(arg2))
          )
          .map(arg -> ((FlatWorldGeneratorPreset)arg.value()).generatorConfig())
          .ifPresent(arg -> this.updateContext(WorldScreenProvider.createFlatWorldModifier(arg)));
@@ -440,7 +438,7 @@
       Registry<GeneratorType> lv = this.getContext().getWorldgenRegistryManager().getLookupOrThrow(RegistryKeys.GENERATOR_TYPE);
       this.normalWorldTypes.clear();
       this.normalWorldTypes
-         .addAll((Collection)getWorldPresetList(lv, WorldPresetTags.NORMAL).orElseGet(() -> lv.holders().map(WorldCreator.WorldTypeEntry::new).toList()));
+         .addAll((Collection)getWorldPresetList(lv, WorldPresetTags.NORMAL).orElseGet(() -> lv.streamHolders().map(WorldCreator.WorldTypeEntry::new).toList()));
       this.extendedWorldTypes.clear();
       this.extendedWorldTypes.addAll((Collection)getWorldPresetList(lv, WorldPresetTags.EXTENDED).orElse(this.normalWorldTypes));
       Holder<GeneratorType> lv2 = this.worldType.preset();
@@ -456,7 +454,7 @@
     * @mapping {@literal named getWorldPreset Lnet/minecraft/client/world/WorldCreator;getWorldPreset(Lnet/minecraft/client/world/WorldCreationContext;Ljava/util/Optional;)Ljava/util/Optional;}
     */
    private static Optional<Holder<GeneratorType>> getWorldPreset(WorldCreationContext context, Optional<RegistryKey<GeneratorType>> generatorType) {
-      return generatorType.flatMap(registryKey -> context.getWorldgenRegistryManager().getLookupOrThrow(RegistryKeys.GENERATOR_TYPE).getHolder(registryKey));
+      return generatorType.flatMap(arg2 -> context.getWorldgenRegistryManager().getLookupOrThrow(RegistryKeys.GENERATOR_TYPE).getHolder(arg2));
    }
 
    /**
@@ -565,7 +563,7 @@
       public Text getName() {
          return (Text)Optional.ofNullable(this.preset)
             .flatMap(Holder::getKey)
-            .map(registryKey -> Text.translatable(registryKey.getValue().toTranslationKey("generator")))
+            .map(arg -> Text.translatable(arg.getValue().toTranslationKey("generator")))
             .orElse(CUSTOM);
       }
 
@@ -574,7 +572,7 @@
        * @mapping {@literal named isAmplified Lnet/minecraft/client/world/WorldCreator$WorldTypeEntry;isAmplified()Z}
        */
       public boolean isAmplified() {
-         return Optional.ofNullable(this.preset).flatMap(Holder::getKey).filter(registryKey -> registryKey.equals(GeneratorTypes.AMPLIFIED)).isPresent();
+         return Optional.ofNullable(this.preset).flatMap(Holder::getKey).filter(arg -> arg.equals(GeneratorTypes.AMPLIFIED)).isPresent();
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/world/WorldEventHandler.java namedSrc/net/minecraft/client/world/WorldEventHandler.java
--- namedTargetSrc/net/minecraft/client/world/WorldEventHandler.java	2024-09-24 21:25:02.272402463 +0000
+++ namedSrc/net/minecraft/client/world/WorldEventHandler.java	2024-09-24 21:23:57.561742687 +0000
@@ -139,7 +139,7 @@
             }
             break;
          case 1010:
-            this.world.getRegistryManager().getLookupOrThrow(RegistryKeys.JUKEBOX_SONG).m_iotvxcay(j).ifPresent(arg2 -> this.m_iawlkoaw(arg2, pos));
+            this.world.getRegistryManager().getLookupOrThrow(RegistryKeys.JUKEBOX_SONG).find(j).ifPresent(arg2 -> this.m_iawlkoaw(arg2, pos));
             break;
          case 1011:
             this.m_zcxlfcvo(pos);
diff -bur namedTargetSrc/net/minecraft/command/argument/ItemPredicateArgumentType.java namedSrc/net/minecraft/command/argument/ItemPredicateArgumentType.java
--- namedTargetSrc/net/minecraft/command/argument/ItemPredicateArgumentType.java	2024-09-24 21:25:02.269402478 +0000
+++ namedSrc/net/minecraft/command/argument/ItemPredicateArgumentType.java	2024-09-24 21:23:57.555742718 +0000
@@ -232,10 +232,10 @@
        * @mapping {@literal hashed m_efgkntvn Lnet/minecraft/unmapped/C_zelyotsz$C_wadhfwgl;m_efgkntvn(Lcom/mojang/brigadier/ImmutableStringReader;Lnet/minecraft/unmapped/C_ncpywfca;)Ljava/util/function/Predicate;}
        * @mapping {@literal named m_efgkntvn Lnet/minecraft/command/argument/ItemPredicateArgumentType$C_wadhfwgl;m_efgkntvn(Lcom/mojang/brigadier/ImmutableStringReader;Lnet/minecraft/util/Identifier;)Ljava/util/function/Predicate;}
        */
-      public Predicate<ItemStack> m_efgkntvn(ImmutableStringReader immutableStringReader, Identifier arg) throws CommandSyntaxException {
+      public Predicate<ItemStack> m_efgkntvn(ImmutableStringReader immutableStringReader, Identifier id) throws CommandSyntaxException {
          Holder.Reference<Item> lv = (Holder.Reference<Item>)this.f_xwwieyfc
-            .getHolder(RegistryKey.of(RegistryKeys.ITEM, arg))
-            .orElseThrow(() -> ItemPredicateArgumentType.ITEM_ID_INVALID_EXCEPTION.createWithContext(immutableStringReader, arg));
+            .getHolder(RegistryKey.of(RegistryKeys.ITEM, id))
+            .orElseThrow(() -> ItemPredicateArgumentType.ITEM_ID_INVALID_EXCEPTION.createWithContext(immutableStringReader, id));
          return stack -> stack.matches(lv);
       }
 
@@ -243,10 +243,10 @@
        * @mapping {@literal hashed m_wvjoubgz Lnet/minecraft/unmapped/C_zelyotsz$C_wadhfwgl;m_wvjoubgz(Lcom/mojang/brigadier/ImmutableStringReader;Lnet/minecraft/unmapped/C_ncpywfca;)Ljava/util/function/Predicate;}
        * @mapping {@literal named m_wvjoubgz Lnet/minecraft/command/argument/ItemPredicateArgumentType$C_wadhfwgl;m_wvjoubgz(Lcom/mojang/brigadier/ImmutableStringReader;Lnet/minecraft/util/Identifier;)Ljava/util/function/Predicate;}
        */
-      public Predicate<ItemStack> m_wvjoubgz(ImmutableStringReader immutableStringReader, Identifier arg) throws CommandSyntaxException {
+      public Predicate<ItemStack> m_wvjoubgz(ImmutableStringReader immutableStringReader, Identifier id) throws CommandSyntaxException {
          HolderSet<Item> lv = (HolderSet<Item>)this.f_xwwieyfc
-            .getTag(TagKey.of(RegistryKeys.ITEM, arg))
-            .orElseThrow(() -> ItemPredicateArgumentType.ITEM_TAG_UNKNOWN_EXCEPTION.createWithContext(immutableStringReader, arg));
+            .getTag(TagKey.of(RegistryKeys.ITEM, id))
+            .orElseThrow(() -> ItemPredicateArgumentType.ITEM_TAG_UNKNOWN_EXCEPTION.createWithContext(immutableStringReader, id));
          return stack -> stack.isIn(lv);
       }
 
@@ -254,16 +254,16 @@
        * @mapping {@literal hashed m_cnoyypou Lnet/minecraft/unmapped/C_zelyotsz$C_wadhfwgl;m_cnoyypou(Lcom/mojang/brigadier/ImmutableStringReader;Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_zelyotsz$C_weudnhcg;}
        * @mapping {@literal named m_tgelloxw Lnet/minecraft/command/argument/ItemPredicateArgumentType$C_wadhfwgl;m_tgelloxw(Lcom/mojang/brigadier/ImmutableStringReader;Lnet/minecraft/util/Identifier;)Lnet/minecraft/command/argument/ItemPredicateArgumentType$C_weudnhcg;}
        */
-      public ItemPredicateArgumentType.C_weudnhcg m_tgelloxw(ImmutableStringReader immutableStringReader, Identifier arg) throws CommandSyntaxException {
-         ItemPredicateArgumentType.C_weudnhcg lv = (ItemPredicateArgumentType.C_weudnhcg)ItemPredicateArgumentType.f_toutwicj.get(arg);
+      public ItemPredicateArgumentType.C_weudnhcg m_tgelloxw(ImmutableStringReader immutableStringReader, Identifier id) throws CommandSyntaxException {
+         ItemPredicateArgumentType.C_weudnhcg lv = (ItemPredicateArgumentType.C_weudnhcg)ItemPredicateArgumentType.f_toutwicj.get(id);
          if (lv != null) {
             return lv;
          } else {
             DataComponentType<?> lv2 = (DataComponentType<?>)this.f_jcaowuwh
-               .getHolder(RegistryKey.of(RegistryKeys.DATA_COMPONENT_TYPE, arg))
+               .getHolder(RegistryKey.of(RegistryKeys.DATA_COMPONENT_TYPE, id))
                .map(Holder::value)
-               .orElseThrow(() -> ItemPredicateArgumentType.ITEM_COMPONENT_UNKNOWN_EXCEPTION.createWithContext(immutableStringReader, arg));
-            return ItemPredicateArgumentType.C_weudnhcg.m_rkstoiss(immutableStringReader, arg, lv2);
+               .orElseThrow(() -> ItemPredicateArgumentType.ITEM_COMPONENT_UNKNOWN_EXCEPTION.createWithContext(immutableStringReader, id));
+            return ItemPredicateArgumentType.C_weudnhcg.m_rkstoiss(immutableStringReader, id, lv2);
          }
       }
 
@@ -287,14 +287,14 @@
        * @mapping {@literal hashed m_lbaihcsq Lnet/minecraft/unmapped/C_zelyotsz$C_wadhfwgl;m_lbaihcsq(Lcom/mojang/brigadier/ImmutableStringReader;Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_zelyotsz$C_vvlghner;}
        * @mapping {@literal named m_ylsaofiw Lnet/minecraft/command/argument/ItemPredicateArgumentType$C_wadhfwgl;m_ylsaofiw(Lcom/mojang/brigadier/ImmutableStringReader;Lnet/minecraft/util/Identifier;)Lnet/minecraft/command/argument/ItemPredicateArgumentType$C_vvlghner;}
        */
-      public ItemPredicateArgumentType.C_vvlghner m_ylsaofiw(ImmutableStringReader immutableStringReader, Identifier arg) throws CommandSyntaxException {
-         ItemPredicateArgumentType.C_vvlghner lv = (ItemPredicateArgumentType.C_vvlghner)ItemPredicateArgumentType.f_bljoiblj.get(arg);
+      public ItemPredicateArgumentType.C_vvlghner m_ylsaofiw(ImmutableStringReader immutableStringReader, Identifier id) throws CommandSyntaxException {
+         ItemPredicateArgumentType.C_vvlghner lv = (ItemPredicateArgumentType.C_vvlghner)ItemPredicateArgumentType.f_bljoiblj.get(id);
          return lv != null
             ? lv
             : (ItemPredicateArgumentType.C_vvlghner)this.f_jubyyvxm
-               .getHolder(RegistryKey.of(RegistryKeys.ITEM_SUB_PREDICATE_TYPE, arg))
+               .getHolder(RegistryKey.of(RegistryKeys.ITEM_SUB_PREDICATE_TYPE, id))
                .map(ItemPredicateArgumentType.C_vvlghner::new)
-               .orElseThrow(() -> ItemPredicateArgumentType.ITEM_PREDICATE_UNKNOWN_EXCEPTION.createWithContext(immutableStringReader, arg));
+               .orElseThrow(() -> ItemPredicateArgumentType.ITEM_PREDICATE_UNKNOWN_EXCEPTION.createWithContext(immutableStringReader, id));
       }
 
       /**
@@ -329,7 +329,7 @@
          return Stream.concat(
             ItemPredicateArgumentType.f_toutwicj.keySet().stream(),
             this.f_jcaowuwh
-               .holders()
+               .streamHolders()
                .filter(reference -> !((DataComponentType)reference.value()).isTransient())
                .map(reference -> reference.getRegistryKey().getValue())
          );
diff -bur namedTargetSrc/net/minecraft/command/argument/ItemStringReader.java namedSrc/net/minecraft/command/argument/ItemStringReader.java
--- namedTargetSrc/net/minecraft/command/argument/ItemStringReader.java	2024-09-24 21:25:02.436401636 +0000
+++ namedSrc/net/minecraft/command/argument/ItemStringReader.java	2024-09-24 21:23:57.771741609 +0000
@@ -380,7 +380,7 @@
          } else {
             int i = reader.getCursor();
             Identifier lv = Identifier.fromCommandInput(reader);
-            DataComponentType<?> lv2 = Registries.DATA_COMPONENT_TYPE.m_kxeijgiq(lv);
+            DataComponentType<?> lv2 = Registries.DATA_COMPONENT_TYPE.get(lv);
             if (lv2 != null && !lv2.isTransient()) {
                return lv2;
             } else {
diff -bur namedTargetSrc/net/minecraft/command/argument/RegistryEntryArgumentType.java namedSrc/net/minecraft/command/argument/RegistryEntryArgumentType.java
--- namedTargetSrc/net/minecraft/command/argument/RegistryEntryArgumentType.java	2024-09-24 21:25:02.416401737 +0000
+++ namedSrc/net/minecraft/command/argument/RegistryEntryArgumentType.java	2024-09-24 21:23:57.741741763 +0000
@@ -205,7 +205,7 @@
        * @mapping {@literal named serializeToNetwork Lnet/minecraft/command/argument/RegistryEntryArgumentType$TypeInfo;serializeToNetwork(Lnet/minecraft/command/argument/RegistryEntryArgumentType$TypeInfo$Template;Lnet/minecraft/network/PacketByteBuf;)V}
        */
       public void serializeToNetwork(RegistryEntryArgumentType.TypeInfo<T>.Template arg, PacketByteBuf buf) {
-         buf.writeRegistryKey(arg.registryKey);
+         buf.writeRegistryKey(arg.f_ruebpfes);
       }
 
       /**
@@ -221,7 +221,7 @@
        * @mapping {@literal named serializeToJson Lnet/minecraft/command/argument/RegistryEntryArgumentType$TypeInfo;serializeToJson(Lnet/minecraft/command/argument/RegistryEntryArgumentType$TypeInfo$Template;Lcom/google/gson/JsonObject;)V}
        */
       public void serializeToJson(RegistryEntryArgumentType.TypeInfo<T>.Template arg, JsonObject jsonObject) {
-         jsonObject.addProperty("registry", arg.registryKey.getValue().toString());
+         jsonObject.addProperty("registry", arg.f_ruebpfes.getValue().toString());
       }
 
       /**
@@ -238,17 +238,16 @@
        */
       public final class Template implements ArgumentTypeInfo.Template<RegistryEntryArgumentType<T>> {
          /**
-          * @mapping {@literal hashed f_ruebpfes Lnet/minecraft/unmapped/C_mymnmzsx$C_ipydwopz$C_bgcoghfg;f_ruebpfes:Lnet/minecraft/unmapped/C_xhhleach;}
-          * @mapping {@literal named registryKey Lnet/minecraft/command/argument/RegistryEntryArgumentType$TypeInfo$Template;registryKey:Lnet/minecraft/registry/RegistryKey;}
+          * Mapping not found
           */
-         final RegistryKey<? extends Registry<T>> registryKey;
+         final RegistryKey<? extends Registry<T>> f_ruebpfes;
 
          /**
           * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_mymnmzsx$C_ipydwopz$C_bgcoghfg;<init>(Lnet/minecraft/unmapped/C_mymnmzsx$C_ipydwopz;Lnet/minecraft/unmapped/C_xhhleach;)V}
           * @mapping {@literal named <init> Lnet/minecraft/command/argument/RegistryEntryArgumentType$TypeInfo$Template;<init>(Lnet/minecraft/command/argument/RegistryEntryArgumentType$TypeInfo;Lnet/minecraft/registry/RegistryKey;)V}
           */
-         Template(final RegistryKey<? extends Registry<T>> registryKey) {
-            this.registryKey = registryKey;
+         Template(final RegistryKey<? extends Registry<T>> arg2) {
+            this.f_ruebpfes = arg2;
          }
 
          /**
@@ -256,7 +255,7 @@
           * @mapping {@literal named instantiate Lnet/minecraft/command/argument/RegistryEntryArgumentType$TypeInfo$Template;instantiate(Lnet/minecraft/command/CommandBuildContext;)Lnet/minecraft/command/argument/RegistryEntryArgumentType;}
           */
          public RegistryEntryArgumentType<T> instantiate(CommandBuildContext arg) {
-            return new RegistryEntryArgumentType<>(arg, this.registryKey);
+            return new RegistryEntryArgumentType<>(arg, this.f_ruebpfes);
          }
 
          /**

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

View the diff here (3/3): 
diff -bur namedTargetSrc/net/minecraft/command/argument/RegistryEntryOrTagArgument.java namedSrc/net/minecraft/command/argument/RegistryEntryOrTagArgument.java
--- namedTargetSrc/net/minecraft/command/argument/RegistryEntryOrTagArgument.java	2024-09-24 21:25:02.250402574 +0000
+++ namedSrc/net/minecraft/command/argument/RegistryEntryOrTagArgument.java	2024-09-24 21:23:57.526742867 +0000
@@ -58,43 +58,40 @@
     */
    private final HolderLookup<T> lookup;
    /**
-    * @mapping {@literal hashed f_nbxmxsnf Lnet/minecraft/unmapped/C_bwiwqfgl;f_nbxmxsnf:Lnet/minecraft/unmapped/C_xhhleach;}
-    * @mapping {@literal named registryKey Lnet/minecraft/command/argument/RegistryEntryOrTagArgument;registryKey:Lnet/minecraft/registry/RegistryKey;}
+    * Mapping not found
     */
-   final RegistryKey<? extends Registry<T>> registryKey;
+   final RegistryKey<? extends Registry<T>> f_nbxmxsnf;
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_bwiwqfgl;<init>(Lnet/minecraft/unmapped/C_bprdujxm;Lnet/minecraft/unmapped/C_xhhleach;)V}
     * @mapping {@literal named <init> Lnet/minecraft/command/argument/RegistryEntryOrTagArgument;<init>(Lnet/minecraft/command/CommandBuildContext;Lnet/minecraft/registry/RegistryKey;)V}
     */
-   public RegistryEntryOrTagArgument(CommandBuildContext context, RegistryKey<? extends Registry<T>> registryKey) {
-      this.registryKey = registryKey;
-      this.lookup = context.getLookupOrThrow(registryKey);
+   public RegistryEntryOrTagArgument(CommandBuildContext context, RegistryKey<? extends Registry<T>> arg2) {
+      this.f_nbxmxsnf = arg2;
+      this.lookup = context.getLookupOrThrow(arg2);
    }
 
    /**
     * @mapping {@literal hashed m_kfwauvon Lnet/minecraft/unmapped/C_bwiwqfgl;m_kfwauvon(Lnet/minecraft/unmapped/C_bprdujxm;Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_bwiwqfgl;}
     * @mapping {@literal named create Lnet/minecraft/command/argument/RegistryEntryOrTagArgument;create(Lnet/minecraft/command/CommandBuildContext;Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/command/argument/RegistryEntryOrTagArgument;}
     */
-   public static <T> RegistryEntryOrTagArgument<T> create(CommandBuildContext context, RegistryKey<? extends Registry<T>> registryKey) {
-      return new RegistryEntryOrTagArgument<>(context, registryKey);
+   public static <T> RegistryEntryOrTagArgument<T> create(CommandBuildContext context, RegistryKey<? extends Registry<T>> arg2) {
+      return new RegistryEntryOrTagArgument<>(context, arg2);
    }
 
    /**
     * @mapping {@literal hashed m_vnamvtuc Lnet/minecraft/unmapped/C_bwiwqfgl;m_vnamvtuc(Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_bwiwqfgl$C_vxeoztnt;}
     * @mapping {@literal named getResult Lnet/minecraft/command/argument/RegistryEntryOrTagArgument;getResult(Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/command/argument/RegistryEntryOrTagArgument$Result;}
     */
-   public static <T> RegistryEntryOrTagArgument.Result<T> getResult(
-      CommandContext<ServerCommandSource> context, String name, RegistryKey<Registry<T>> registryKey
-   ) throws CommandSyntaxException {
+   public static <T> RegistryEntryOrTagArgument.Result<T> getResult(CommandContext<ServerCommandSource> context, String name, RegistryKey<Registry<T>> arg) throws CommandSyntaxException {
       RegistryEntryOrTagArgument.Result<?> lv = context.getArgument(name, RegistryEntryOrTagArgument.Result.class);
-      Optional<RegistryEntryOrTagArgument.Result<T>> optional = lv.castTo(registryKey);
+      Optional<RegistryEntryOrTagArgument.Result<T>> optional = lv.castTo(arg);
       return (RegistryEntryOrTagArgument.Result<T>)optional.orElseThrow(() -> lv.getResultValue().map(reference -> {
             RegistryKey<?> lvx = reference.getRegistryKey();
-            return RegistryEntryArgumentType.INVALID_REGISTRY_ENTRY_TYPE_EXCEPTION.create(lvx.getValue(), lvx.getRegistry(), registryKey.getValue());
+            return RegistryEntryArgumentType.INVALID_REGISTRY_ENTRY_TYPE_EXCEPTION.create(lvx.getValue(), lvx.getRegistry(), arg.getValue());
          }, namedSet -> {
             TagKey<?> lvx = namedSet.getKey();
-            return INVALID_TAG_EXCEPTION.create(lvx.id(), lvx.registry(), registryKey.getValue());
+            return INVALID_TAG_EXCEPTION.create(lvx.id(), lvx.registry(), arg.getValue());
          }));
    }
 
@@ -109,10 +106,10 @@
          try {
             reader.skip();
             Identifier lv = Identifier.fromCommandInput(reader);
-            TagKey<T> lv2 = TagKey.of(this.registryKey, lv);
+            TagKey<T> lv2 = TagKey.of(this.f_nbxmxsnf, lv);
             HolderSet.NamedSet<T> lv3 = (HolderSet.NamedSet<T>)this.lookup
                .getTag(lv2)
-               .orElseThrow(() -> NOT_FOUND_EXCEPTION.createWithContext(reader, lv, this.registryKey.getValue()));
+               .orElseThrow(() -> NOT_FOUND_EXCEPTION.createWithContext(reader, lv, this.f_nbxmxsnf.getValue()));
             return new RegistryEntryOrTagArgument.TagResult<>(lv3);
          } catch (CommandSyntaxException var6) {
             reader.setCursor(i);
@@ -120,10 +117,10 @@
          }
       } else {
          Identifier lv4 = Identifier.fromCommandInput(reader);
-         RegistryKey<T> lv5 = RegistryKey.of(this.registryKey, lv4);
+         RegistryKey<T> lv5 = RegistryKey.of(this.f_nbxmxsnf, lv4);
          Holder.Reference<T> lv6 = (Holder.Reference<T>)this.lookup
             .getHolder(lv5)
-            .orElseThrow(() -> RegistryEntryArgumentType.REGISTRY_ENTRY_NOT_FOUND_EXCEPTION.createWithContext(reader, lv4, this.registryKey.getValue()));
+            .orElseThrow(() -> RegistryEntryArgumentType.REGISTRY_ENTRY_NOT_FOUND_EXCEPTION.createWithContext(reader, lv4, this.f_nbxmxsnf.getValue()));
          return new RegistryEntryOrTagArgument.HolderResult<>(lv6);
       }
    }
@@ -164,8 +161,8 @@
        * Mapping not found
        */
       @Override
-      public <E> Optional<RegistryEntryOrTagArgument.Result<E>> castTo(RegistryKey<? extends Registry<E>> registryKey) {
-         return this.value.getRegistryKey().isOf(registryKey) ? Optional.of(this) : Optional.empty();
+      public <E> Optional<RegistryEntryOrTagArgument.Result<E>> castTo(RegistryKey<? extends Registry<E>> arg) {
+         return this.value.getRegistryKey().isOf(arg) ? Optional.of(this) : Optional.empty();
       }
 
       /**
@@ -195,7 +192,7 @@
        * @mapping {@literal named serializeToNetwork Lnet/minecraft/command/argument/RegistryEntryOrTagArgument$Info;serializeToNetwork(Lnet/minecraft/command/argument/RegistryEntryOrTagArgument$Info$Template;Lnet/minecraft/network/PacketByteBuf;)V}
        */
       public void serializeToNetwork(RegistryEntryOrTagArgument.Info<T>.Template arg, PacketByteBuf buf) {
-         buf.writeRegistryKey(arg.registryKey);
+         buf.writeRegistryKey(arg.f_qzhhszwx);
       }
 
       /**
@@ -211,7 +208,7 @@
        * @mapping {@literal named serializeToJson Lnet/minecraft/command/argument/RegistryEntryOrTagArgument$Info;serializeToJson(Lnet/minecraft/command/argument/RegistryEntryOrTagArgument$Info$Template;Lcom/google/gson/JsonObject;)V}
        */
       public void serializeToJson(RegistryEntryOrTagArgument.Info<T>.Template arg, JsonObject jsonObject) {
-         jsonObject.addProperty("registry", arg.registryKey.getValue().toString());
+         jsonObject.addProperty("registry", arg.f_qzhhszwx.getValue().toString());
       }
 
       /**
@@ -219,7 +216,7 @@
        * @mapping {@literal named unpack Lnet/minecraft/command/argument/RegistryEntryOrTagArgument$Info;unpack(Lnet/minecraft/command/argument/RegistryEntryOrTagArgument;)Lnet/minecraft/command/argument/RegistryEntryOrTagArgument$Info$Template;}
        */
       public RegistryEntryOrTagArgument.Info<T>.Template unpack(RegistryEntryOrTagArgument<T> arg) {
-         return new RegistryEntryOrTagArgument.Info.Template(arg.registryKey);
+         return new RegistryEntryOrTagArgument.Info.Template(arg.f_nbxmxsnf);
       }
 
       /**
@@ -228,17 +225,16 @@
        */
       public final class Template implements ArgumentTypeInfo.Template<RegistryEntryOrTagArgument<T>> {
          /**
-          * @mapping {@literal hashed f_qzhhszwx Lnet/minecraft/unmapped/C_bwiwqfgl$C_yhjqhzlk$C_itwjidak;f_qzhhszwx:Lnet/minecraft/unmapped/C_xhhleach;}
-          * @mapping {@literal named registryKey Lnet/minecraft/command/argument/RegistryEntryOrTagArgument$Info$Template;registryKey:Lnet/minecraft/registry/RegistryKey;}
+          * Mapping not found
           */
-         final RegistryKey<? extends Registry<T>> registryKey;
+         final RegistryKey<? extends Registry<T>> f_qzhhszwx;
 
          /**
           * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_bwiwqfgl$C_yhjqhzlk$C_itwjidak;<init>(Lnet/minecraft/unmapped/C_bwiwqfgl$C_yhjqhzlk;Lnet/minecraft/unmapped/C_xhhleach;)V}
           * @mapping {@literal named <init> Lnet/minecraft/command/argument/RegistryEntryOrTagArgument$Info$Template;<init>(Lnet/minecraft/command/argument/RegistryEntryOrTagArgument$Info;Lnet/minecraft/registry/RegistryKey;)V}
           */
-         Template(final RegistryKey<? extends Registry<T>> registryKey) {
-            this.registryKey = registryKey;
+         Template(final RegistryKey<? extends Registry<T>> arg2) {
+            this.f_qzhhszwx = arg2;
          }
 
          /**
@@ -246,7 +242,7 @@
           * @mapping {@literal named instantiate Lnet/minecraft/command/argument/RegistryEntryOrTagArgument$Info$Template;instantiate(Lnet/minecraft/command/CommandBuildContext;)Lnet/minecraft/command/argument/RegistryEntryOrTagArgument;}
           */
          public RegistryEntryOrTagArgument<T> instantiate(CommandBuildContext arg) {
-            return new RegistryEntryOrTagArgument<>(arg, this.registryKey);
+            return new RegistryEntryOrTagArgument<>(arg, this.f_qzhhszwx);
          }
 
          /**
@@ -274,7 +270,7 @@
        * @mapping {@literal hashed m_lkvgzdgo Lnet/minecraft/unmapped/C_bwiwqfgl$C_vxeoztnt;m_lkvgzdgo(Lnet/minecraft/unmapped/C_xhhleach;)Ljava/util/Optional;}
        * @mapping {@literal named castTo Lnet/minecraft/command/argument/RegistryEntryOrTagArgument$Result;castTo(Lnet/minecraft/registry/RegistryKey;)Ljava/util/Optional;}
        */
-      <E> Optional<RegistryEntryOrTagArgument.Result<E>> castTo(RegistryKey<? extends Registry<E>> registryKey);
+      <E> Optional<RegistryEntryOrTagArgument.Result<E>> castTo(RegistryKey<? extends Registry<E>> arg);
 
       /**
        * @mapping {@literal hashed m_wnaoukry Lnet/minecraft/unmapped/C_bwiwqfgl$C_vxeoztnt;m_wnaoukry()Ljava/lang/String;}
@@ -300,8 +296,8 @@
        * Mapping not found
        */
       @Override
-      public <E> Optional<RegistryEntryOrTagArgument.Result<E>> castTo(RegistryKey<? extends Registry<E>> registryKey) {
-         return this.tag.getKey().isOfRegistry(registryKey) ? Optional.of(this) : Optional.empty();
+      public <E> Optional<RegistryEntryOrTagArgument.Result<E>> castTo(RegistryKey<? extends Registry<E>> arg) {
+         return this.tag.getKey().isOfRegistry(arg) ? Optional.of(this) : Optional.empty();
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/command/argument/RegistryKeyOrTagKeyResult.java namedSrc/net/minecraft/command/argument/RegistryKeyOrTagKeyResult.java
--- namedTargetSrc/net/minecraft/command/argument/RegistryKeyOrTagKeyResult.java	2024-09-24 21:25:02.431401662 +0000
+++ namedSrc/net/minecraft/command/argument/RegistryKeyOrTagKeyResult.java	2024-09-24 21:23:57.763741650 +0000
@@ -35,25 +35,24 @@
     */
    private static final Collection<String> EXAMPLES = Arrays.asList("foo", "foo:bar", "012", "#skeletons", "#minecraft:skeletons");
    /**
-    * @mapping {@literal hashed f_zqlvjvdr Lnet/minecraft/unmapped/C_ybgoyqmh;f_zqlvjvdr:Lnet/minecraft/unmapped/C_xhhleach;}
-    * @mapping {@literal named registryKey Lnet/minecraft/command/argument/RegistryKeyOrTagKeyResult;registryKey:Lnet/minecraft/registry/RegistryKey;}
+    * Mapping not found
     */
-   final RegistryKey<? extends Registry<T>> registryKey;
+   final RegistryKey<? extends Registry<T>> f_zqlvjvdr;
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_ybgoyqmh;<init>(Lnet/minecraft/unmapped/C_xhhleach;)V}
     * @mapping {@literal named <init> Lnet/minecraft/command/argument/RegistryKeyOrTagKeyResult;<init>(Lnet/minecraft/registry/RegistryKey;)V}
     */
-   public RegistryKeyOrTagKeyResult(RegistryKey<? extends Registry<T>> registryKey) {
-      this.registryKey = registryKey;
+   public RegistryKeyOrTagKeyResult(RegistryKey<? extends Registry<T>> arg) {
+      this.f_zqlvjvdr = arg;
    }
 
    /**
     * @mapping {@literal hashed m_tvljewfq Lnet/minecraft/unmapped/C_ybgoyqmh;m_tvljewfq(Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_ybgoyqmh;}
     * @mapping {@literal named create Lnet/minecraft/command/argument/RegistryKeyOrTagKeyResult;create(Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/command/argument/RegistryKeyOrTagKeyResult;}
     */
-   public static <T> RegistryKeyOrTagKeyResult<T> create(RegistryKey<? extends Registry<T>> registryKey) {
-      return new RegistryKeyOrTagKeyResult<>(registryKey);
+   public static <T> RegistryKeyOrTagKeyResult<T> create(RegistryKey<? extends Registry<T>> arg) {
+      return new RegistryKeyOrTagKeyResult<>(arg);
    }
 
    /**
@@ -61,10 +60,10 @@
     * @mapping {@literal named getResult Lnet/minecraft/command/argument/RegistryKeyOrTagKeyResult;getResult(Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;Lnet/minecraft/registry/RegistryKey;Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;)Lnet/minecraft/command/argument/RegistryKeyOrTagKeyResult$Result;}
     */
    public static <T> RegistryKeyOrTagKeyResult.Result<T> getResult(
-      CommandContext<ServerCommandSource> context, String name, RegistryKey<Registry<T>> registryKey, DynamicCommandExceptionType exception
+      CommandContext<ServerCommandSource> context, String name, RegistryKey<Registry<T>> arg, DynamicCommandExceptionType exception
    ) throws CommandSyntaxException {
       RegistryKeyOrTagKeyResult.Result<?> lv = context.getArgument(name, RegistryKeyOrTagKeyResult.Result.class);
-      Optional<RegistryKeyOrTagKeyResult.Result<T>> optional = lv.castTo(registryKey);
+      Optional<RegistryKeyOrTagKeyResult.Result<T>> optional = lv.castTo(arg);
       return (RegistryKeyOrTagKeyResult.Result<T>)optional.orElseThrow(() -> exception.create(lv));
    }
 
@@ -79,14 +78,14 @@
          try {
             reader.skip();
             Identifier lv = Identifier.fromCommandInput(reader);
-            return new RegistryKeyOrTagKeyResult.TagResult<>(TagKey.of(this.registryKey, lv));
+            return new RegistryKeyOrTagKeyResult.TagResult<>(TagKey.of(this.f_zqlvjvdr, lv));
          } catch (CommandSyntaxException var4) {
             reader.setCursor(i);
             throw var4;
          }
       } else {
          Identifier lv2 = Identifier.fromCommandInput(reader);
-         return new RegistryKeyOrTagKeyResult.RegistryKeyResult<>(RegistryKey.of(this.registryKey, lv2));
+         return new RegistryKeyOrTagKeyResult.RegistryKeyResult<>(RegistryKey.of(this.f_zqlvjvdr, lv2));
       }
    }
 
@@ -97,7 +96,7 @@
    @Override
    public <S> CompletableFuture<Suggestions> listSuggestions(CommandContext<S> context, SuggestionsBuilder builder) {
       return context.getSource() instanceof CommandSource lv
-         ? lv.suggestRegistryElements(this.registryKey, CommandSource.ElementSuggestionType.ALL, builder, context)
+         ? lv.suggestRegistryElements(this.f_zqlvjvdr, CommandSource.ElementSuggestionType.ALL, builder, context)
          : builder.buildFuture();
    }
 
@@ -120,7 +119,7 @@
        * @mapping {@literal named serializeToNetwork Lnet/minecraft/command/argument/RegistryKeyOrTagKeyResult$Info;serializeToNetwork(Lnet/minecraft/command/argument/RegistryKeyOrTagKeyResult$Info$Template;Lnet/minecraft/network/PacketByteBuf;)V}
        */
       public void serializeToNetwork(RegistryKeyOrTagKeyResult.Info<T>.Template arg, PacketByteBuf buf) {
-         buf.writeRegistryKey(arg.registryKey);
+         buf.writeRegistryKey(arg.f_osltangg);
       }
 
       /**
@@ -136,7 +135,7 @@
        * @mapping {@literal named serializeToJson Lnet/minecraft/command/argument/RegistryKeyOrTagKeyResult$Info;serializeToJson(Lnet/minecraft/command/argument/RegistryKeyOrTagKeyResult$Info$Template;Lcom/google/gson/JsonObject;)V}
        */
       public void serializeToJson(RegistryKeyOrTagKeyResult.Info<T>.Template arg, JsonObject jsonObject) {
-         jsonObject.addProperty("registry", arg.registryKey.getValue().toString());
+         jsonObject.addProperty("registry", arg.f_osltangg.getValue().toString());
       }
 
       /**
@@ -144,7 +143,7 @@
        * @mapping {@literal named unpack Lnet/minecraft/command/argument/RegistryKeyOrTagKeyResult$Info;unpack(Lnet/minecraft/command/argument/RegistryKeyOrTagKeyResult;)Lnet/minecraft/command/argument/RegistryKeyOrTagKeyResult$Info$Template;}
        */
       public RegistryKeyOrTagKeyResult.Info<T>.Template unpack(RegistryKeyOrTagKeyResult<T> arg) {
-         return new RegistryKeyOrTagKeyResult.Info.Template(arg.registryKey);
+         return new RegistryKeyOrTagKeyResult.Info.Template(arg.f_zqlvjvdr);
       }
 
       /**
@@ -153,17 +152,16 @@
        */
       public final class Template implements ArgumentTypeInfo.Template<RegistryKeyOrTagKeyResult<T>> {
          /**
-          * @mapping {@literal hashed f_osltangg Lnet/minecraft/unmapped/C_ybgoyqmh$C_mdlaqxgp$C_lwhxrgaj;f_osltangg:Lnet/minecraft/unmapped/C_xhhleach;}
-          * @mapping {@literal named registryKey Lnet/minecraft/command/argument/RegistryKeyOrTagKeyResult$Info$Template;registryKey:Lnet/minecraft/registry/RegistryKey;}
+          * Mapping not found
           */
-         final RegistryKey<? extends Registry<T>> registryKey;
+         final RegistryKey<? extends Registry<T>> f_osltangg;
 
          /**
           * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_ybgoyqmh$C_mdlaqxgp$C_lwhxrgaj;<init>(Lnet/minecraft/unmapped/C_ybgoyqmh$C_mdlaqxgp;Lnet/minecraft/unmapped/C_xhhleach;)V}
           * @mapping {@literal named <init> Lnet/minecraft/command/argument/RegistryKeyOrTagKeyResult$Info$Template;<init>(Lnet/minecraft/command/argument/RegistryKeyOrTagKeyResult$Info;Lnet/minecraft/registry/RegistryKey;)V}
           */
-         Template(final RegistryKey<? extends Registry<T>> registryKey) {
-            this.registryKey = registryKey;
+         Template(final RegistryKey<? extends Registry<T>> arg2) {
+            this.f_osltangg = arg2;
          }
 
          /**
@@ -171,7 +169,7 @@
           * @mapping {@literal named instantiate Lnet/minecraft/command/argument/RegistryKeyOrTagKeyResult$Info$Template;instantiate(Lnet/minecraft/command/CommandBuildContext;)Lnet/minecraft/command/argument/RegistryKeyOrTagKeyResult;}
           */
          public RegistryKeyOrTagKeyResult<T> instantiate(CommandBuildContext arg) {
-            return new RegistryKeyOrTagKeyResult<>(this.registryKey);
+            return new RegistryKeyOrTagKeyResult<>(this.f_osltangg);
          }
 
          /**
@@ -201,8 +199,8 @@
        * Mapping not found
        */
       @Override
-      public <E> Optional<RegistryKeyOrTagKeyResult.Result<E>> castTo(RegistryKey<? extends Registry<E>> registryKey) {
-         return this.key.cast(registryKey).map(RegistryKeyOrTagKeyResult.RegistryKeyResult::new);
+      public <E> Optional<RegistryKeyOrTagKeyResult.Result<E>> castTo(RegistryKey<? extends Registry<E>> arg) {
+         return this.key.cast(arg).map(RegistryKeyOrTagKeyResult.RegistryKeyResult::new);
       }
 
       /**
@@ -237,7 +235,7 @@
        * @mapping {@literal hashed m_ynmuoeuc Lnet/minecraft/unmapped/C_ybgoyqmh$C_rckobmqr;m_ynmuoeuc(Lnet/minecraft/unmapped/C_xhhleach;)Ljava/util/Optional;}
        * @mapping {@literal named castTo Lnet/minecraft/command/argument/RegistryKeyOrTagKeyResult$Result;castTo(Lnet/minecraft/registry/RegistryKey;)Ljava/util/Optional;}
        */
-      <E> Optional<RegistryKeyOrTagKeyResult.Result<E>> castTo(RegistryKey<? extends Registry<E>> registryKey);
+      <E> Optional<RegistryKeyOrTagKeyResult.Result<E>> castTo(RegistryKey<? extends Registry<E>> arg);
 
       /**
        * @mapping {@literal hashed m_uysvgqki Lnet/minecraft/unmapped/C_ybgoyqmh$C_rckobmqr;m_uysvgqki()Ljava/lang/String;}
@@ -263,8 +261,8 @@
        * Mapping not found
        */
       @Override
-      public <E> Optional<RegistryKeyOrTagKeyResult.Result<E>> castTo(RegistryKey<? extends Registry<E>> registryKey) {
-         return this.key.cast(registryKey).map(RegistryKeyOrTagKeyResult.TagResult::new);
+      public <E> Optional<RegistryKeyOrTagKeyResult.Result<E>> castTo(RegistryKey<? extends Registry<E>> arg) {
+         return this.key.cast(arg).map(RegistryKeyOrTagKeyResult.TagResult::new);
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/command/argument/ResourceKeyArgument.java namedSrc/net/minecraft/command/argument/ResourceKeyArgument.java
--- namedTargetSrc/net/minecraft/command/argument/ResourceKeyArgument.java	2024-09-24 21:25:02.412401757 +0000
+++ namedSrc/net/minecraft/command/argument/ResourceKeyArgument.java	2024-09-24 21:23:57.735741794 +0000
@@ -84,10 +84,10 @@
     * @mapping {@literal named getKey Lnet/minecraft/command/argument/ResourceKeyArgument;getKey(Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;Lnet/minecraft/registry/RegistryKey;Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;)Lnet/minecraft/registry/RegistryKey;}
     */
    private static <T> RegistryKey<T> getKey(
-      CommandContext<ServerCommandSource> context, String id, RegistryKey<Registry<T>> registryKey, DynamicCommandExceptionType exception
+      CommandContext<ServerCommandSource> context, String id, RegistryKey<Registry<T>> registry, DynamicCommandExceptionType exception
    ) throws CommandSyntaxException {
       RegistryKey<?> lv = context.getArgument(id, RegistryKey.class);
-      Optional<RegistryKey<T>> optional = lv.cast(registryKey);
+      Optional<RegistryKey<T>> optional = lv.cast(registry);
       return (RegistryKey<T>)optional.orElseThrow(() -> exception.create(lv));
    }
 
@@ -104,10 +104,10 @@
     * @mapping {@literal named get Lnet/minecraft/command/argument/ResourceKeyArgument;get(Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;Lnet/minecraft/registry/RegistryKey;Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;)Lnet/minecraft/registry/Holder$Reference;}
     */
    private static <T> Holder.Reference<T> get(
-      CommandContext<ServerCommandSource> context, String id, RegistryKey<Registry<T>> registryKey, DynamicCommandExceptionType exception
+      CommandContext<ServerCommandSource> context, String id, RegistryKey<Registry<T>> arg, DynamicCommandExceptionType exception
    ) throws CommandSyntaxException {
-      RegistryKey<T> lv = getKey(context, id, registryKey, exception);
-      return (Holder.Reference<T>)getRegistry(context, registryKey).getHolder(lv).orElseThrow(() -> exception.create(lv.getValue()));
+      RegistryKey<T> lv = getKey(context, id, arg, exception);
+      return (Holder.Reference<T>)getRegistry(context, arg).getHolder(lv).orElseThrow(() -> exception.create(lv.getValue()));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/command/CommandBuildContext.java namedSrc/net/minecraft/command/CommandBuildContext.java
--- namedTargetSrc/net/minecraft/command/CommandBuildContext.java	2024-09-24 21:25:02.422401707 +0000
+++ namedSrc/net/minecraft/command/CommandBuildContext.java	2024-09-24 21:23:57.749741722 +0000
@@ -22,8 +22,8 @@
           * Mapping not found
           */
          @Override
-         public Stream<RegistryKey<? extends Registry<?>>> m_vwprjgpp() {
-            return provider.m_vwprjgpp();
+         public Stream<RegistryKey<? extends Registry<?>>> streamRegistryKeys() {
+            return provider.streamRegistryKeys();
          }
 
          /**
diff -bur namedTargetSrc/net/minecraft/command/CommandSource.java namedSrc/net/minecraft/command/CommandSource.java
--- namedTargetSrc/net/minecraft/command/CommandSource.java	2024-09-24 21:25:02.448401576 +0000
+++ namedSrc/net/minecraft/command/CommandSource.java	2024-09-24 21:23:57.789741517 +0000
@@ -114,7 +114,7 @@
     */
    default void suggestRegistryElements(Registry<?> registry, CommandSource.ElementSuggestionType suggestionType, SuggestionsBuilder builder) {
       if (suggestionType.shouldSuggestTags()) {
-         suggestResource(registry.getTags().map(arg -> arg.getKey().id()), builder, "#");
+         suggestResource(registry.streamBoundTags().map(arg -> arg.getKey().id()), builder, "#");
       }
 
       if (suggestionType.shouldSuggestElements()) {
@@ -196,7 +196,7 @@
     */
    static CompletableFuture<Suggestions> suggestIdentifiers(Iterable<Identifier> candidates, SuggestionsBuilder builder) {
       String string = builder.getRemaining().toLowerCase(Locale.ROOT);
-      forEachMatching(candidates, string, id -> id, arg -> builder.suggest(arg.toString()));
+      forEachMatching(candidates, string, id -> id, id -> builder.suggest(id.toString()));
       return builder.buildFuture();
    }
 
diff -bur namedTargetSrc/net/minecraft/command/EntitySelectorOptions.java namedSrc/net/minecraft/command/EntitySelectorOptions.java
--- namedTargetSrc/net/minecraft/command/EntitySelectorOptions.java	2024-09-24 21:25:02.490401364 +0000
+++ namedSrc/net/minecraft/command/EntitySelectorOptions.java	2024-09-24 21:23:57.846741224 +0000
@@ -315,10 +315,10 @@
          putOption("type", arg -> {
             arg.setSuggestionProvider((builder, consumer) -> {
                CommandSource.suggestIdentifiers(Registries.ENTITY_TYPE.getIds(), builder, String.valueOf('!'));
-               CommandSource.suggestResource(Registries.ENTITY_TYPE.getTags().map(argxx -> argxx.getKey().id()), builder, "!#");
+               CommandSource.suggestResource(Registries.ENTITY_TYPE.streamBoundTags().map(argxx -> argxx.getKey().id()), builder, "!#");
                if (!arg.excludesEntityType()) {
                   CommandSource.suggestIdentifiers(Registries.ENTITY_TYPE.getIds(), builder);
-                  CommandSource.suggestResource(Registries.ENTITY_TYPE.getTags().map(argxx -> argxx.getKey().id()), builder, String.valueOf('#'));
+                  CommandSource.suggestResource(Registries.ENTITY_TYPE.streamBoundTags().map(argxx -> argxx.getKey().id()), builder, String.valueOf('#'));
                }
 
                return builder.buildFuture();
diff -bur namedTargetSrc/net/minecraft/component/DataComponentPatch.java namedSrc/net/minecraft/component/DataComponentPatch.java
--- namedTargetSrc/net/minecraft/component/DataComponentPatch.java	2024-09-24 21:25:02.457401531 +0000
+++ namedSrc/net/minecraft/component/DataComponentPatch.java	2024-09-24 21:23:57.804741440 +0000
@@ -383,7 +383,7 @@
                }
 
                Identifier lv = Identifier.tryParse(string);
-               DataComponentType<?> lv2 = Registries.DATA_COMPONENT_TYPE.m_kxeijgiq(lv);
+               DataComponentType<?> lv2 = Registries.DATA_COMPONENT_TYPE.get(lv);
                if (lv2 == null) {
                   return DataResult.error(() -> "No component with type: '" + lv + "'");
                } else {
diff -bur namedTargetSrc/net/minecraft/component/type/BannerPatternsComponent.java namedSrc/net/minecraft/component/type/BannerPatternsComponent.java
--- namedTargetSrc/net/minecraft/component/type/BannerPatternsComponent.java	2024-09-24 21:25:02.453401551 +0000
+++ namedSrc/net/minecraft/component/type/BannerPatternsComponent.java	2024-09-24 21:23:57.797741476 +0000
@@ -72,10 +72,10 @@
        * @mapping {@literal named add Lnet/minecraft/component/type/BannerPatternsComponent$Builder;add(Lnet/minecraft/registry/HolderProvider;Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/util/DyeColor;)Lnet/minecraft/component/type/BannerPatternsComponent$Builder;}
        */
       @Deprecated
-      public BannerPatternsComponent.Builder add(HolderProvider<BannerPattern> pattern, RegistryKey<BannerPattern> registryKey, DyeColor color) {
-         Optional<Holder.Reference<BannerPattern>> optional = pattern.getHolder(registryKey);
+      public BannerPatternsComponent.Builder add(HolderProvider<BannerPattern> pattern, RegistryKey<BannerPattern> key, DyeColor color) {
+         Optional<Holder.Reference<BannerPattern>> optional = pattern.getHolder(key);
          if (optional.isEmpty()) {
-            BannerPatternsComponent.LOGGER.warn("Unable to find banner pattern with id: '{}'", registryKey.getValue());
+            BannerPatternsComponent.LOGGER.warn("Unable to find banner pattern with id: '{}'", key.getValue());
             return this;
          } else {
             return this.add((Holder<BannerPattern>)optional.get(), color);
diff -bur namedTargetSrc/net/minecraft/component/type/ContainerLootComponent.java namedSrc/net/minecraft/component/type/ContainerLootComponent.java
--- namedTargetSrc/net/minecraft/component/type/ContainerLootComponent.java	2024-09-24 21:25:02.494401344 +0000
+++ namedSrc/net/minecraft/component/type/ContainerLootComponent.java	2024-09-24 21:23:57.852741194 +0000
@@ -17,7 +17,7 @@
     */
    public static final Codec<ContainerLootComponent> CODEC = RecordCodecBuilder.create(
       instance -> instance.group(
-               RegistryKey.codec(RegistryKeys.LOOT_TABLE).fieldOf("loot_table").forGetter(ContainerLootComponent::lootTable),
+               RegistryKey.createCodec(RegistryKeys.LOOT_TABLE).fieldOf("loot_table").forGetter(ContainerLootComponent::lootTable),
                Codec.LONG.optionalFieldOf("seed", Long.valueOf(0L)).forGetter(ContainerLootComponent::seed)
             )
             .apply(instance, ContainerLootComponent::new)
diff -bur namedTargetSrc/net/minecraft/component/type/ItemEnchantmentsComponent.java namedSrc/net/minecraft/component/type/ItemEnchantmentsComponent.java
--- namedTargetSrc/net/minecraft/component/type/ItemEnchantmentsComponent.java	2024-09-24 21:25:02.437401632 +0000
+++ namedSrc/net/minecraft/component/type/ItemEnchantmentsComponent.java	2024-09-24 21:23:57.773741599 +0000
@@ -142,9 +142,9 @@
     * @mapping {@literal hashed m_rwfsmcfy Lnet/minecraft/unmapped/C_qlclfxvn;m_rwfsmcfy(Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_ednuhnnn;)Lnet/minecraft/unmapped/C_odfnijdo;}
     * @mapping {@literal named getTagOrEmpty Lnet/minecraft/component/type/ItemEnchantmentsComponent;getTagOrEmpty(Lnet/minecraft/registry/HolderLookup$Provider;Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/registry/tag/TagKey;)Lnet/minecraft/registry/HolderSet;}
     */
-   private static <T> HolderSet<T> getTagOrEmpty(@Nullable HolderLookup.Provider lookup, RegistryKey<Registry<T>> registryKey, TagKey<T> tag) {
+   private static <T> HolderSet<T> getTagOrEmpty(@Nullable HolderLookup.Provider lookup, RegistryKey<Registry<T>> arg2, TagKey<T> tag) {
       if (lookup != null) {
-         Optional<HolderSet.NamedSet<T>> optional = lookup.getLookupOrThrow(registryKey).getTag(tag);
+         Optional<HolderSet.NamedSet<T>> optional = lookup.getLookupOrThrow(arg2).getTag(tag);
          if (optional.isPresent()) {
             return (HolderSet<T>)optional.get();
          }
diff -bur namedTargetSrc/net/minecraft/data/client/ItemModelGenerator.java namedSrc/net/minecraft/data/client/ItemModelGenerator.java
--- namedTargetSrc/net/minecraft/data/client/ItemModelGenerator.java	2024-09-24 21:25:02.506401284 +0000
+++ namedSrc/net/minecraft/data/client/ItemModelGenerator.java	2024-09-24 21:23:57.872741091 +0000
@@ -167,7 +167,7 @@
     * @mapping {@literal hashed m_mppeudhx Lnet/minecraft/unmapped/C_cfvrpkog;m_mppeudhx(Lnet/minecraft/unmapped/C_vorddnax;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_mgbzsqdv;Lnet/minecraft/unmapped/C_yuycoehb;)V}
     * @mapping {@literal named registerArmor Lnet/minecraft/data/client/ItemModelGenerator;registerArmor(Lnet/minecraft/item/Item;Lnet/minecraft/util/Identifier;Lnet/minecraft/unmapped/C_mgbzsqdv;Lnet/minecraft/entity/EquipmentSlot;)V}
     */
-   private void registerArmor(Item arg, Identifier arg2, C_mgbzsqdv arg3, EquipmentSlot arg4) {
+   private void registerArmor(Item arg, Identifier id, C_mgbzsqdv arg3, EquipmentSlot arg4) {
       List<C_mgbzsqdv.C_jyzwvubc> list = arg3.m_jyfxgynh(C_mgbzsqdv.C_otwvbrdf.HUMANOID);
       if (!list.isEmpty()) {
          boolean bl = list.size() == 2 && ((C_mgbzsqdv.C_jyzwvubc)list.getFirst()).dyeable().isPresent();
@@ -175,9 +175,9 @@
          Identifier lv2 = Texture.getId(arg);
          Identifier lv3 = Texture.getSubId(arg, "_overlay");
          if (bl) {
-            Models.DOUBLE_LAYER_ITEM.upload(lv, Texture.doubleLayer(lv2, lv3), this.writer, (arg2x, map) -> this.createArmorJson(arg2x, map, arg2));
+            Models.DOUBLE_LAYER_ITEM.upload(lv, Texture.doubleLayer(lv2, lv3), this.writer, (arg2, map) -> this.createArmorJson(arg2, map, id));
          } else {
-            Models.SINGLE_LAYER_ITEM.upload(lv, Texture.layer0(lv2), this.writer, (arg2x, map) -> this.createArmorJson(arg2x, map, arg2));
+            Models.SINGLE_LAYER_ITEM.upload(lv, Texture.layer0(lv2), this.writer, (arg2, map) -> this.createArmorJson(arg2, map, id));
          }
          String string = switch (arg4) {
             case HEAD -> "helmet";
@@ -188,7 +188,7 @@
          };
 
          for (ItemModelGenerator.TrimModelData lv4 : TRIM_MATERIALS) {
-            String string2 = lv4.m_qfpygivh(arg2);
+            String string2 = lv4.m_qfpygivh(id);
             Identifier lv5 = this.suffixTrim(lv, string2);
             String string3 = string + "_trim_" + string2;
             Identifier lv6 = Identifier.ofDefault(string3).withPrefix("trims/items/");
@@ -539,8 +539,8 @@
        * @mapping {@literal hashed m_qfpygivh Lnet/minecraft/unmapped/C_cfvrpkog$C_cutcputf;m_qfpygivh(Lnet/minecraft/unmapped/C_ncpywfca;)Ljava/lang/String;}
        * @mapping {@literal named m_qfpygivh Lnet/minecraft/data/client/ItemModelGenerator$TrimModelData;m_qfpygivh(Lnet/minecraft/util/Identifier;)Ljava/lang/String;}
        */
-      public String m_qfpygivh(Identifier key) {
-         return (String)this.overrideArmorMaterials.getOrDefault(key, this.name);
+      public String m_qfpygivh(Identifier id) {
+         return (String)this.overrideArmorMaterials.getOrDefault(id, this.name);
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/data/DataPackOutput.java namedSrc/net/minecraft/data/DataPackOutput.java
--- namedTargetSrc/net/minecraft/data/DataPackOutput.java	2024-09-24 21:25:02.330402171 +0000
+++ namedSrc/net/minecraft/data/DataPackOutput.java	2024-09-24 21:23:57.630742333 +0000
@@ -53,16 +53,16 @@
     * @mapping {@literal hashed m_jgqgnctt Lnet/minecraft/unmapped/C_ugkmwocs;m_jgqgnctt(Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_ugkmwocs$C_ehniswvc;}
     * @mapping {@literal named m_jgqgnctt Lnet/minecraft/data/DataPackOutput;m_jgqgnctt(Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/data/DataPackOutput$PathResolver;}
     */
-   public DataPackOutput.PathResolver m_jgqgnctt(RegistryKey<? extends Registry<?>> registryKey) {
-      return this.createPathResolver(DataPackOutput.Type.DATA_PACK, RegistryKeys.getDirectory(registryKey));
+   public DataPackOutput.PathResolver m_jgqgnctt(RegistryKey<? extends Registry<?>> registry) {
+      return this.createPathResolver(DataPackOutput.Type.DATA_PACK, RegistryKeys.getDirectory(registry));
    }
 
    /**
     * @mapping {@literal hashed m_cxqnkpjt Lnet/minecraft/unmapped/C_ugkmwocs;m_cxqnkpjt(Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_ugkmwocs$C_ehniswvc;}
     * @mapping {@literal named m_cxqnkpjt Lnet/minecraft/data/DataPackOutput;m_cxqnkpjt(Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/data/DataPackOutput$PathResolver;}
     */
-   public DataPackOutput.PathResolver m_cxqnkpjt(RegistryKey<? extends Registry<?>> registryKey) {
-      return this.createPathResolver(DataPackOutput.Type.DATA_PACK, RegistryKeys.getTagDirectory(registryKey));
+   public DataPackOutput.PathResolver m_cxqnkpjt(RegistryKey<? extends Registry<?>> registry) {
+      return this.createPathResolver(DataPackOutput.Type.DATA_PACK, RegistryKeys.getTagDirectory(registry));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/data/report/BiomeParametersProvider.java namedSrc/net/minecraft/data/report/BiomeParametersProvider.java
--- namedTargetSrc/net/minecraft/data/report/BiomeParametersProvider.java	2024-09-24 21:25:02.244402604 +0000
+++ namedSrc/net/minecraft/data/report/BiomeParametersProvider.java	2024-09-24 21:23:57.517742913 +0000
@@ -48,7 +48,7 @@
     * @mapping {@literal hashed f_iubheypa Lnet/minecraft/unmapped/C_wwetinhi;f_iubheypa:Lcom/mojang/serialization/MapCodec;}
     * @mapping {@literal named ENTRY_CODEC Lnet/minecraft/data/report/BiomeParametersProvider;ENTRY_CODEC:Lcom/mojang/serialization/MapCodec;}
     */
-   private static final MapCodec<RegistryKey<Biome>> ENTRY_CODEC = RegistryKey.codec(RegistryKeys.BIOME).fieldOf("biome");
+   private static final MapCodec<RegistryKey<Biome>> ENTRY_CODEC = RegistryKey.createCodec(RegistryKeys.BIOME).fieldOf("biome");
    /**
     * @mapping {@literal hashed f_tjqcsbiq Lnet/minecraft/unmapped/C_wwetinhi;f_tjqcsbiq:Lcom/mojang/serialization/Codec;}
     * @mapping {@literal named CODEC Lnet/minecraft/data/report/BiomeParametersProvider;CODEC:Lcom/mojang/serialization/Codec;}
diff -bur namedTargetSrc/net/minecraft/data/report/BlockListProvider.java namedSrc/net/minecraft/data/report/BlockListProvider.java
--- namedTargetSrc/net/minecraft/data/report/BlockListProvider.java	2024-09-24 21:25:02.301402317 +0000
+++ namedSrc/net/minecraft/data/report/BlockListProvider.java	2024-09-24 21:23:57.598742497 +0000
@@ -55,7 +55,7 @@
                JsonObject jsonObject = new JsonObject();
                RegistryOps<JsonElement> lv = arg2.createSerializationContext(JsonOps.INSTANCE);
                arg2.getLookupOrThrow(RegistryKeys.BLOCK)
-                  .holders()
+                  .streamHolders()
                   .forEach(
                      arg2x -> {
                         JsonObject jsonObject2 = new JsonObject();
diff -bur namedTargetSrc/net/minecraft/data/report/ItemListProvider.java namedSrc/net/minecraft/data/report/ItemListProvider.java
--- namedTargetSrc/net/minecraft/data/report/ItemListProvider.java	2024-09-24 21:25:02.497401329 +0000
+++ namedSrc/net/minecraft/data/report/ItemListProvider.java	2024-09-24 21:23:57.857741168 +0000
@@ -49,7 +49,7 @@
                JsonObject jsonObject = new JsonObject();
                RegistryOps<JsonElement> lv = arg2.createSerializationContext(JsonOps.INSTANCE);
                arg2.getLookupOrThrow(RegistryKeys.ITEM)
-                  .holders()
+                  .streamHolders()
                   .forEach(
                      arg2x -> {
                         JsonObject jsonObject2 = new JsonObject();
diff -bur namedTargetSrc/net/minecraft/data/report/RegistriesDataPackProvider.java namedSrc/net/minecraft/data/report/RegistriesDataPackProvider.java
--- namedTargetSrc/net/minecraft/data/report/RegistriesDataPackProvider.java	2024-09-24 21:25:02.470401465 +0000
+++ namedSrc/net/minecraft/data/report/RegistriesDataPackProvider.java	2024-09-24 21:23:57.823741343 +0000
@@ -72,7 +72,7 @@
             lookup -> {
                DataPackOutput.PathResolver lvx = this.output.m_jgqgnctt(lv);
                return CompletableFuture.allOf(
-                  (CompletableFuture[])lookup.holders()
+                  (CompletableFuture[])lookup.streamHolders()
                      .map(
                         reference -> writeToPath(
                               lvx.resolveJsonFile(reference.getRegistryKey().getValue()), writer, ops, data.elementCodec(), (T)reference.value()
diff -bur namedTargetSrc/net/minecraft/data/report/RegistryDumpProvider.java namedSrc/net/minecraft/data/report/RegistryDumpProvider.java
--- namedTargetSrc/net/minecraft/data/report/RegistryDumpProvider.java	2024-09-24 21:25:02.406401788 +0000
+++ namedSrc/net/minecraft/data/report/RegistryDumpProvider.java	2024-09-24 21:23:57.728741830 +0000
@@ -37,7 +37,7 @@
    @Override
    public CompletableFuture<?> run(DataWriter writer) {
       JsonObject jsonObject = new JsonObject();
-      Registries.ROOT.holders().forEach(holder -> jsonObject.add(holder.getRegistryKey().getValue().toString(), toJson((Registry)holder.value())));
+      Registries.ROOT.streamHolders().forEach(holder -> jsonObject.add(holder.getRegistryKey().getValue().toString(), toJson((Registry)holder.value())));
       Path path = this.output.resolvePath(DataPackOutput.Type.REPORTS).resolve("registries.json");
       return DataProvider.writeToPath(writer, jsonObject, path);
    }
@@ -56,7 +56,7 @@
       int i = Registries.ROOT.getRawId(registry);
       jsonObject.addProperty("protocol_id", i);
       JsonObject jsonObject2 = new JsonObject();
-      registry.holders().forEach(holder -> {
+      registry.streamHolders().forEach(holder -> {
          T object = (T)holder.value();
          int ix = registry.getRawId(object);
          JsonObject jsonObject2x = new JsonObject();
diff -bur namedTargetSrc/net/minecraft/data/server/advancement/AdventureAdvancementTabGenerator.java namedSrc/net/minecraft/data/server/advancement/AdventureAdvancementTabGenerator.java
--- namedTargetSrc/net/minecraft/data/server/advancement/AdventureAdvancementTabGenerator.java	2024-09-24 21:25:02.479401420 +0000
+++ namedSrc/net/minecraft/data/server/advancement/AdventureAdvancementTabGenerator.java	2024-09-24 21:23:57.832741296 +0000
@@ -438,7 +438,7 @@
       AdvancementHolder lv12 = Advancement.Builder.create()
          .parent(lv4)
          .display(
-            Raid.m_pbwmgtdj(lv11),
+            Raid.createOminousBanner(lv11),
             Text.translatable("advancements.adventure.voluntary_exile.title"),
             Text.translatable("advancements.adventure.voluntary_exile.description"),
             null,
@@ -457,7 +457,7 @@
       Advancement.Builder.create()
          .parent(lv12)
          .display(
-            Raid.m_pbwmgtdj(lv11),
+            Raid.createOminousBanner(lv11),
             Text.translatable("advancements.adventure.hero_of_the_village.title"),
             Text.translatable("advancements.adventure.hero_of_the_village.description"),
             null,
diff -bur namedTargetSrc/net/minecraft/data/server/advancement/HusbandryAdvancementTabGenerator.java namedSrc/net/minecraft/data/server/advancement/HusbandryAdvancementTabGenerator.java
--- namedTargetSrc/net/minecraft/data/server/advancement/HusbandryAdvancementTabGenerator.java	2024-09-24 21:25:02.297402337 +0000
+++ namedSrc/net/minecraft/data/server/advancement/HusbandryAdvancementTabGenerator.java	2024-09-24 21:23:57.594742518 +0000
@@ -664,7 +664,7 @@
                               .m_vxhuvbxd(
                                  ItemPredicate.Builder.create()
                                     .m_xdlacdbp(lv2, Items.WOLF_ARMOR)
-                                    .m_rmnqrshz(DataComponentPredicate.builder().m_paqnuexm(DataComponentTypes.DAMAGE, 0).build())
+                                    .m_rmnqrshz(DataComponentPredicate.builder().add(DataComponentTypes.DAMAGE, 0).build())
                               )
                         )
                   )
@@ -707,7 +707,7 @@
     */
    private static Advancement.Builder appendLeashAllFrogTypesCriterion(HolderProvider<EntityType<?>> arg, HolderProvider<Item> arg2, Advancement.Builder task) {
       Registries.FROG_VARIANT
-         .holders()
+         .streamHolders()
          .forEach(
             arg4 -> task.putCriteria(
                   arg4.getRegistryKey().getValue().toString(),
@@ -798,7 +798,7 @@
     */
    private static Advancement.Builder appendTameAllCatVariantsCriterion(Advancement.Builder task) {
       Registries.CAT_VARIANT
-         .holders()
+         .streamHolders()
          .sorted(Comparator.comparing(arg -> arg.getRegistryKey().getValue()))
          .forEach(
             arg2 -> task.putCriteria(
@@ -818,10 +818,10 @@
       lv.streamElementKeys()
          .sorted(Comparator.comparing(RegistryKey::getValue))
          .forEach(
-            registryKey -> {
-               Holder<WolfVariant> lvx = lv.getHolderOrThrow(registryKey);
+            arg3 -> {
+               Holder<WolfVariant> lvx = lv.getHolderOrThrow(arg3);
                task.putCriteria(
-                  registryKey.getValue().toString(),
+                  arg3.getValue().toString(),
                   TameAnimalCriterionTrigger.Conditions.create(
                      EntityPredicate.Builder.create().typeSpecific(EntitySubPredicateTypes.m_kfwccmwu(HolderSet.createDirect(lvx)))
                   )
diff -bur namedTargetSrc/net/minecraft/data/server/loot_table/BlockLootTableGenerator.java namedSrc/net/minecraft/data/server/loot_table/BlockLootTableGenerator.java
--- namedTargetSrc/net/minecraft/data/server/loot_table/BlockLootTableGenerator.java	2024-09-24 21:25:02.254402554 +0000
+++ namedSrc/net/minecraft/data/server/loot_table/BlockLootTableGenerator.java	2024-09-24 21:23:57.534742826 +0000
@@ -859,16 +859,16 @@
          if (lv.enabledIn(this.enabledFeatures)) {
             lv.getLootTableId()
                .ifPresent(
-                  registryKey -> {
-                     if (set.add(registryKey)) {
-                        LootTable.Builder lvx = (LootTable.Builder)this.lootTables.remove(registryKey);
+                  arg2 -> {
+                     if (set.add(arg2)) {
+                        LootTable.Builder lvx = (LootTable.Builder)this.lootTables.remove(arg2);
                         if (lvx == null) {
                            throw new IllegalStateException(
-                              String.format(Locale.ROOT, "Missing loottable '%s' for '%s'", registryKey.getValue(), Registries.BLOCK.getId(lv))
+                              String.format(Locale.ROOT, "Missing loottable '%s' for '%s'", arg2.getValue(), Registries.BLOCK.getId(lv))
                            );
                         }
 
-                        biConsumer.accept(registryKey, lvx);
+                        biConsumer.accept(arg2, lvx);
                      }
                   }
                );
diff -bur namedTargetSrc/net/minecraft/data/server/loot_table/EntityLootTableGenerator.java namedSrc/net/minecraft/data/server/loot_table/EntityLootTableGenerator.java
--- namedTargetSrc/net/minecraft/data/server/loot_table/EntityLootTableGenerator.java	2024-09-24 21:25:02.441401611 +0000
+++ namedSrc/net/minecraft/data/server/loot_table/EntityLootTableGenerator.java	2024-09-24 21:23:57.781741558 +0000
@@ -147,7 +147,7 @@
       this.generate();
       Set<RegistryKey<LootTable>> set = new HashSet();
       Registries.ENTITY_TYPE
-         .holders()
+         .streamHolders()
          .forEach(
             arg -> {
                EntityType<?> lv = (EntityType<?>)arg.value();
@@ -163,13 +163,13 @@
 
                      if (map != null) {
                         map.forEach(
-                           (registryKey, arg3) -> {
-                              if (!set.add(registryKey)) {
+                           (arg2, arg3) -> {
+                              if (!set.add(arg2)) {
                                  throw new IllegalStateException(
-                                    String.format(Locale.ROOT, "Duplicate loottable '%s' for '%s'", registryKey, arg.getRegistryKey().getValue())
+                                    String.format(Locale.ROOT, "Duplicate loottable '%s' for '%s'", arg2, arg.getRegistryKey().getValue())
                                  );
                               } else {
-                                 biConsumer.accept(registryKey, arg3);
+                                 biConsumer.accept(arg2, arg3);
                               }
                            }
                         );
@@ -181,7 +181,7 @@
                            String.format(
                               Locale.ROOT,
                               "Weird loottables '%s' for '%s', not a LivingEntity so should not have loot",
-                              map2.keySet().stream().map(registryKey -> registryKey.getValue().toString()).collect(Collectors.joining(",")),
+                              map2.keySet().stream().map(argx -> argx.getValue().toString()).collect(Collectors.joining(",")),
                               arg.getRegistryKey().getValue()
                            )
                         );
@@ -209,13 +209,13 @@
     * @mapping {@literal hashed m_vtkdidok Lnet/minecraft/unmapped/C_egeqzyvk;m_vtkdidok(Lnet/minecraft/unmapped/C_pzdchrcy;Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_vqkczpuv$C_cjvmpogn;}
     * @mapping {@literal named variantSpecificFrogDamageSource Lnet/minecraft/data/server/loot_table/EntityLootTableGenerator;variantSpecificFrogDamageSource(Lnet/minecraft/registry/HolderProvider;Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/loot/condition/LootCondition$Builder;}
     */
-   protected LootCondition.Builder variantSpecificFrogDamageSource(HolderProvider<EntityType<?>> arg, RegistryKey<FrogVariant> registryKey) {
+   protected LootCondition.Builder variantSpecificFrogDamageSource(HolderProvider<EntityType<?>> arg, RegistryKey<FrogVariant> arg2) {
       return DamageSourcePropertiesLootCondition.builder(
          DamageSourcePredicate.Builder.create()
             .setSourceEntity(
                EntityPredicate.Builder.create()
                   .m_fbzdlqtk(arg, EntityType.FROG)
-                  .typeSpecific(EntitySubPredicateTypes.m_hopoaxal(Registries.FROG_VARIANT.getHolderOrThrow(registryKey)))
+                  .typeSpecific(EntitySubPredicateTypes.m_hopoaxal(Registries.FROG_VARIANT.getHolderOrThrow(arg2)))
             )
       );
    }
@@ -234,7 +234,7 @@
     * @mapping {@literal hashed m_znlvnkkb Lnet/minecraft/unmapped/C_egeqzyvk;m_znlvnkkb(Lnet/minecraft/unmapped/C_ogavsvbr;Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_inwsuliy$C_daaljsfu;)V}
     * @mapping {@literal named m_znlvnkkb Lnet/minecraft/data/server/loot_table/EntityLootTableGenerator;m_znlvnkkb(Lnet/minecraft/entity/EntityType;Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/loot/LootTable$Builder;)V}
     */
-   protected void m_znlvnkkb(EntityType<?> key, RegistryKey<LootTable> registryKey, LootTable.Builder arg3) {
-      ((Map)this.lootTables.computeIfAbsent(key, arg -> new HashMap())).put(registryKey, arg3);
+   protected void m_znlvnkkb(EntityType<?> key, RegistryKey<LootTable> arg2, LootTable.Builder arg3) {
+      ((Map)this.lootTables.computeIfAbsent(key, arg -> new HashMap())).put(arg2, arg3);
    }
 }
diff -bur namedTargetSrc/net/minecraft/data/server/LootTablesProvider.java namedSrc/net/minecraft/data/server/LootTablesProvider.java
--- namedTargetSrc/net/minecraft/data/server/LootTablesProvider.java	2024-09-24 21:25:02.308402281 +0000
+++ namedSrc/net/minecraft/data/server/LootTablesProvider.java	2024-09-24 21:23:57.605742461 +0000
@@ -96,19 +96,19 @@
    private CompletableFuture<?> m_cvuljxmh(DataWriter writer, HolderLookup.Provider arg2) {
       MutableRegistry<LootTable> lv = new SimpleRegistry<>(RegistryKeys.LOOT_TABLE, Lifecycle.experimental());
       Map<RandomSeed.Seed, Identifier> map = new Object2ObjectOpenHashMap<>();
-      this.lootTypeGenerators.forEach(arg3 -> ((LootTableGenerator)arg3.provider().apply(arg2)).generate((registryKey, arg4) -> {
-            Identifier lvx = m_ttdjbgbz(registryKey);
+      this.lootTypeGenerators.forEach(arg3 -> ((LootTableGenerator)arg3.provider().apply(arg2)).generate((arg3x, arg4) -> {
+            Identifier lvx = m_ttdjbgbz(arg3x);
             Identifier lv2x = (Identifier)map.put(RandomSequence.createSeed(lvx), lvx);
             if (lv2x != null) {
-               Util.logAndPause("Loot table random sequence seed collision on " + lv2x + " and " + registryKey.getValue());
+               Util.logAndPause("Loot table random sequence seed collision on " + lv2x + " and " + arg3x.getValue());
             }
 
             arg4.randomSequence(lvx);
             LootTable lv3x = arg4.type(arg3.paramSet).build();
-            lv.register(registryKey, lv3x, RegistrationInfo.DEFAULT);
+            lv.register(arg3x, lv3x, RegistrationInfo.DEFAULT);
          }));
       lv.freeze();
-      ErrorReporter.Impl lv2 = new ErrorReporter.Impl();
+      ErrorReporter.Collector lv2 = new ErrorReporter.Collector();
       HolderProvider.Provider lv3 = new DynamicRegistryManager.ImmutableRegistryManager(List.of(lv)).freeze();
       LootTableReporter lv4 = new LootTableReporter(lv2, LootContextTypes.GENERIC, lv3);
 
@@ -116,14 +116,14 @@
          lv2.report("Missing built-in table: " + lv5.getValue());
       }
 
-      lv.holders()
+      lv.streamHolders()
          .forEach(
             arg2x -> ((LootTable)arg2x.value())
                   .validate(
                      lv4.withContextType(((LootTable)arg2x.value()).getType()).makeChild("{" + arg2x.getRegistryKey().getValue() + "}", arg2x.getRegistryKey())
                   )
          );
-      Multimap<String, String> multimap = lv2.copyErrors();
+      Multimap<String, String> multimap = lv2.copyErrorsByPath();
       if (!multimap.isEmpty()) {
          multimap.forEach((string, string2) -> LOGGER.warn("Found validation problem in {}: {}", string, string2));
          throw new IllegalStateException("Failed to validate loot tables, see logs");
@@ -138,11 +138,10 @@
    }
 
    /**
-    * @mapping {@literal hashed m_ttdjbgbz Lnet/minecraft/unmapped/C_rriyyrek;m_ttdjbgbz(Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_ncpywfca;}
-    * @mapping {@literal named m_ttdjbgbz Lnet/minecraft/data/server/LootTablesProvider;m_ttdjbgbz(Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/util/Identifier;}
+    * Mapping not found
     */
-   private static Identifier m_ttdjbgbz(RegistryKey<LootTable> registryKey) {
-      return registryKey.getValue();
+   private static Identifier m_ttdjbgbz(RegistryKey<LootTable> arg) {
+      return arg.getValue();
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/data/server/recipe/CookingRecipeJsonFactory.java namedSrc/net/minecraft/data/server/recipe/CookingRecipeJsonFactory.java
--- namedTargetSrc/net/minecraft/data/server/recipe/CookingRecipeJsonFactory.java	2024-09-24 21:25:02.511401258 +0000
+++ namedSrc/net/minecraft/data/server/recipe/CookingRecipeJsonFactory.java	2024-09-24 21:23:57.878741060 +0000
@@ -183,11 +183,11 @@
     * Mapping not found
     */
    @Override
-   public void offerTo(RecipeExporter exporter, Identifier recipeId) {
-      this.validate(recipeId);
+   public void offerTo(RecipeExporter exporter, Identifier id) {
+      this.validate(id);
       Advancement.Builder lv = exporter.accept()
-         .putCriteria("has_the_recipe", RecipeUnlockedCriterionTrigger.create(recipeId))
-         .rewards(AdvancementRewards.Builder.recipe(recipeId))
+         .putCriteria("has_the_recipe", RecipeUnlockedCriterionTrigger.create(id))
+         .rewards(AdvancementRewards.Builder.recipe(id))
          .merger(AdvancementRequirements.RequirementMerger.ANY);
       this.criteria.forEach(lv::putCriteria);
       AbstractCookingRecipe lv2 = this.recipe
@@ -199,7 +199,7 @@
             this.experience,
             this.cookingTime
          );
-      exporter.accept(recipeId, lv2, lv.build(recipeId.withPrefix("recipes/" + this.category.getName() + "/")));
+      exporter.accept(id, lv2, lv.build(id.withPrefix("recipes/" + this.category.getName() + "/")));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/data/server/recipe/ShapedRecipeJsonFactory.java namedSrc/net/minecraft/data/server/recipe/ShapedRecipeJsonFactory.java
--- namedTargetSrc/net/minecraft/data/server/recipe/ShapedRecipeJsonFactory.java	2024-09-24 21:25:02.369401974 +0000
+++ namedSrc/net/minecraft/data/server/recipe/ShapedRecipeJsonFactory.java	2024-09-24 21:23:57.689742030 +0000
@@ -184,11 +184,11 @@
     * Mapping not found
     */
    @Override
-   public void offerTo(RecipeExporter exporter, Identifier recipeId) {
-      ShapedRecipePattern lv = this.validate(recipeId);
+   public void offerTo(RecipeExporter exporter, Identifier id) {
+      ShapedRecipePattern lv = this.validate(id);
       Advancement.Builder lv2 = exporter.accept()
-         .putCriteria("has_the_recipe", RecipeUnlockedCriterionTrigger.create(recipeId))
-         .rewards(AdvancementRewards.Builder.recipe(recipeId))
+         .putCriteria("has_the_recipe", RecipeUnlockedCriterionTrigger.create(id))
+         .rewards(AdvancementRewards.Builder.recipe(id))
          .merger(AdvancementRequirements.RequirementMerger.ANY);
       this.criteria.forEach(lv2::putCriteria);
       ShapedRecipe lv3 = new ShapedRecipe(
@@ -198,7 +198,7 @@
          new ItemStack(this.result, this.resultCount),
          this.showNotification
       );
-      exporter.accept(recipeId, lv3, lv2.build(recipeId.withPrefix("recipes/" + this.category.getName() + "/")));
+      exporter.accept(id, lv3, lv2.build(id.withPrefix("recipes/" + this.category.getName() + "/")));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/data/server/recipe/ShapelessRecipeJsonFactory.java namedSrc/net/minecraft/data/server/recipe/ShapelessRecipeJsonFactory.java
--- namedTargetSrc/net/minecraft/data/server/recipe/ShapelessRecipeJsonFactory.java	2024-09-24 21:25:02.380401919 +0000
+++ namedSrc/net/minecraft/data/server/recipe/ShapelessRecipeJsonFactory.java	2024-09-24 21:23:57.700741974 +0000
@@ -169,17 +169,17 @@
     * Mapping not found
     */
    @Override
-   public void offerTo(RecipeExporter exporter, Identifier recipeId) {
-      this.validate(recipeId);
+   public void offerTo(RecipeExporter exporter, Identifier id) {
+      this.validate(id);
       Advancement.Builder lv = exporter.accept()
-         .putCriteria("has_the_recipe", RecipeUnlockedCriterionTrigger.create(recipeId))
-         .rewards(AdvancementRewards.Builder.recipe(recipeId))
+         .putCriteria("has_the_recipe", RecipeUnlockedCriterionTrigger.create(id))
+         .rewards(AdvancementRewards.Builder.recipe(id))
          .merger(AdvancementRequirements.RequirementMerger.ANY);
       this.criteria.forEach(lv::putCriteria);
       ShapelessRecipe lv2 = new ShapelessRecipe(
          (String)Objects.requireNonNullElse(this.group, ""), RecipeJsonFactory.getCraftingCategory(this.category), this.result, this.ingredients
       );
-      exporter.accept(recipeId, lv2, lv.build(recipeId.withPrefix("recipes/" + this.category.getName() + "/")));
+      exporter.accept(id, lv2, lv.build(id.withPrefix("recipes/" + this.category.getName() + "/")));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/data/server/recipe/SingleItemRecipeJsonFactory.java namedSrc/net/minecraft/data/server/recipe/SingleItemRecipeJsonFactory.java
--- namedTargetSrc/net/minecraft/data/server/recipe/SingleItemRecipeJsonFactory.java	2024-09-24 21:25:02.308402281 +0000
+++ namedSrc/net/minecraft/data/server/recipe/SingleItemRecipeJsonFactory.java	2024-09-24 21:23:57.605742461 +0000
@@ -120,16 +120,16 @@
     * Mapping not found
     */
    @Override
-   public void offerTo(RecipeExporter exporter, Identifier recipeId) {
-      this.validate(recipeId);
+   public void offerTo(RecipeExporter exporter, Identifier id) {
+      this.validate(id);
       Advancement.Builder lv = exporter.accept()
-         .putCriteria("has_the_recipe", RecipeUnlockedCriterionTrigger.create(recipeId))
-         .rewards(AdvancementRewards.Builder.recipe(recipeId))
+         .putCriteria("has_the_recipe", RecipeUnlockedCriterionTrigger.create(id))
+         .rewards(AdvancementRewards.Builder.recipe(id))
          .merger(AdvancementRequirements.RequirementMerger.ANY);
       this.criteria.forEach(lv::putCriteria);
       CuttingRecipe lv2 = this.recipeFactory
          .create((String)Objects.requireNonNullElse(this.group, ""), this.ingredient, new ItemStack(this.result, this.count));
-      exporter.accept(recipeId, lv2, lv.build(recipeId.withPrefix("recipes/" + this.category.getName() + "/")));
+      exporter.accept(id, lv2, lv.build(id.withPrefix("recipes/" + this.category.getName() + "/")));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/data/server/RecipesProvider.java namedSrc/net/minecraft/data/server/RecipesProvider.java
--- namedTargetSrc/net/minecraft/data/server/RecipesProvider.java	2024-09-24 21:25:02.502401304 +0000
+++ namedSrc/net/minecraft/data/server/RecipesProvider.java	2024-09-24 21:23:57.866741122 +0000
@@ -977,8 +977,8 @@
     * @mapping {@literal hashed m_hgqabtqe Lnet/minecraft/unmapped/C_hwlnmobw;m_hgqabtqe(Lnet/minecraft/unmapped/C_ednuhnnn;)Lnet/minecraft/unmapped/C_rzypsigz;}
     * @mapping {@literal named conditionsFromTag Lnet/minecraft/data/server/RecipesProvider;conditionsFromTag(Lnet/minecraft/registry/tag/TagKey;)Lnet/minecraft/advancement/AdvancementCriterion;}
     */
-   protected AdvancementCriterion<InventoryChangedCriterionTrigger.Conditions> conditionsFromTag(TagKey<Item> tagKey) {
-      return conditionsFromItemPredicates(ItemPredicate.Builder.create().m_lubfxdrb(this.f_vvimmxmt, tagKey));
+   protected AdvancementCriterion<InventoryChangedCriterionTrigger.Conditions> conditionsFromTag(TagKey<Item> tag) {
+      return conditionsFromItemPredicates(ItemPredicate.Builder.create().m_lubfxdrb(this.f_vvimmxmt, tag));
    }
 
    /**
@@ -1054,8 +1054,8 @@
     * @mapping {@literal hashed m_gckzgpoa Lnet/minecraft/unmapped/C_hwlnmobw;m_gckzgpoa(Lnet/minecraft/unmapped/C_ednuhnnn;)Lnet/minecraft/unmapped/C_tcpsydrv;}
     * @mapping {@literal named m_gckzgpoa Lnet/minecraft/data/server/RecipesProvider;m_gckzgpoa(Lnet/minecraft/registry/tag/TagKey;)Lnet/minecraft/recipe/Ingredient;}
     */
-   protected Ingredient m_gckzgpoa(TagKey<Item> tagKey) {
-      return Ingredient.m_owdzpelq(this.f_vvimmxmt.getTagOrThrow(tagKey));
+   protected Ingredient m_gckzgpoa(TagKey<Item> tag) {
+      return Ingredient.m_owdzpelq(this.f_vvimmxmt.getTagOrThrow(tag));
    }
 
    /**
@@ -1182,10 +1182,11 @@
                      }
 
                      /**
-                      * Mapping not found
+                      * @mapping {@literal hashed m_xrefjdzc Lnet/minecraft/unmapped/C_hwlnmobw$C_ujfsvkmt$C_iscsdmnx;m_xrefjdzc(Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_awrmdwqd;)V}
+                      * @mapping {@literal named m_xrefjdzc Lnet/minecraft/data/server/RecipesProvider$C_ujfsvkmt$C_iscsdmnx;m_xrefjdzc(Lnet/minecraft/util/Identifier;Lnet/minecraft/recipe/Recipe;)V}
                       */
-                     private void m_xrefjdzc(Identifier arg, Recipe<?> arg2) {
-                        list.add(DataProvider.m_oiidqwdo(writer, arg2, Recipe.CODEC, arg2, lv.resolveJsonFile(arg)));
+                     private void m_xrefjdzc(Identifier id, Recipe<?> arg2) {
+                        list.add(DataProvider.m_oiidqwdo(writer, arg2, Recipe.CODEC, arg2, lv.resolveJsonFile(id)));
                      }
 
                      /**


The remaining diff is too long!

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With commit 31f60c0, 314 file(s) were updated with 2022 line(s) added and 1933 removed compared to the latest Quilt Mappings version.

View the diff here (1/3): 
diff -bur namedTargetSrc/net/minecraft/advancement/AdvancementRewards.java namedSrc/net/minecraft/advancement/AdvancementRewards.java
--- namedTargetSrc/net/minecraft/advancement/AdvancementRewards.java	2024-09-25 08:03:15.144542094 +0000
+++ namedSrc/net/minecraft/advancement/AdvancementRewards.java	2024-09-25 08:02:07.820230144 +0000
@@ -32,7 +32,7 @@
    public static final Codec<AdvancementRewards> CODEC = RecordCodecBuilder.create(
       instance -> instance.group(
                Codec.INT.optionalFieldOf("experience", Integer.valueOf(0)).forGetter(AdvancementRewards::experience),
-               RegistryKey.codec(RegistryKeys.LOOT_TABLE).listOf().optionalFieldOf("loot", List.of()).forGetter(AdvancementRewards::loot),
+               RegistryKey.createCodec(RegistryKeys.LOOT_TABLE).listOf().optionalFieldOf("loot", List.of()).forGetter(AdvancementRewards::loot),
                Identifier.CODEC.listOf().optionalFieldOf("recipes", List.of()).forGetter(AdvancementRewards::recipes),
                C_uxzryfxv.CODEC.optionalFieldOf("function").forGetter(AdvancementRewards::function)
             )
@@ -142,16 +142,16 @@
        * @mapping {@literal hashed m_sbnvjevi Lnet/minecraft/unmapped/C_wptigggq$C_wbctdknv;m_sbnvjevi(Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_wptigggq$C_wbctdknv;}
        * @mapping {@literal named loot Lnet/minecraft/advancement/AdvancementRewards$Builder;loot(Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/advancement/AdvancementRewards$Builder;}
        */
-      public static AdvancementRewards.Builder loot(RegistryKey<LootTable> registryKey) {
-         return new AdvancementRewards.Builder().addLoot(registryKey);
+      public static AdvancementRewards.Builder loot(RegistryKey<LootTable> element) {
+         return new AdvancementRewards.Builder().addLoot(element);
       }
 
       /**
        * @mapping {@literal hashed m_xltlznvb Lnet/minecraft/unmapped/C_wptigggq$C_wbctdknv;m_xltlznvb(Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_wptigggq$C_wbctdknv;}
        * @mapping {@literal named addLoot Lnet/minecraft/advancement/AdvancementRewards$Builder;addLoot(Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/advancement/AdvancementRewards$Builder;}
        */
-      public AdvancementRewards.Builder addLoot(RegistryKey<LootTable> registryKey) {
-         this.loot.add(registryKey);
+      public AdvancementRewards.Builder addLoot(RegistryKey<LootTable> element) {
+         this.loot.add(element);
          return this;
       }
 
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/ChangedDimensionCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/ChangedDimensionCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/ChangedDimensionCriterionTrigger.java	2024-09-25 08:03:14.982541328 +0000
+++ namedSrc/net/minecraft/advancement/criterion/ChangedDimensionCriterionTrigger.java	2024-09-25 08:02:07.645229299 +0000
@@ -45,8 +45,8 @@
       public static final Codec<ChangedDimensionCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
                   EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter(ChangedDimensionCriterionTrigger.Conditions::player),
-                  RegistryKey.codec(RegistryKeys.WORLD).optionalFieldOf("from").forGetter(ChangedDimensionCriterionTrigger.Conditions::from),
-                  RegistryKey.codec(RegistryKeys.WORLD).optionalFieldOf("to").forGetter(ChangedDimensionCriterionTrigger.Conditions::to)
+                  RegistryKey.createCodec(RegistryKeys.WORLD).optionalFieldOf("from").forGetter(ChangedDimensionCriterionTrigger.Conditions::from),
+                  RegistryKey.createCodec(RegistryKeys.WORLD).optionalFieldOf("to").forGetter(ChangedDimensionCriterionTrigger.Conditions::to)
                )
                .apply(instance, ChangedDimensionCriterionTrigger.Conditions::new)
       );
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterionTrigger.java	2024-09-25 08:03:15.057541683 +0000
+++ namedSrc/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterionTrigger.java	2024-09-25 08:02:07.725229685 +0000
@@ -28,8 +28,8 @@
     * @mapping {@literal hashed m_bwskqxvw Lnet/minecraft/unmapped/C_ccuyenqy;m_bwskqxvw(Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_xhhleach;)V}
     * @mapping {@literal named trigger Lnet/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterionTrigger;trigger(Lnet/minecraft/server/network/ServerPlayerEntity;Lnet/minecraft/registry/RegistryKey;)V}
     */
-   public void trigger(ServerPlayerEntity player, RegistryKey<LootTable> registryKey) {
-      this.trigger(player, conditions -> conditions.matches(registryKey));
+   public void trigger(ServerPlayerEntity player, RegistryKey<LootTable> arg2) {
+      this.trigger(player, conditions -> conditions.matches(arg2));
    }
 
    /**
@@ -44,7 +44,7 @@
       public static final Codec<PlayerGeneratesContainerLootCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
                   EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter(PlayerGeneratesContainerLootCriterionTrigger.Conditions::player),
-                  RegistryKey.codec(RegistryKeys.LOOT_TABLE)
+                  RegistryKey.createCodec(RegistryKeys.LOOT_TABLE)
                      .fieldOf("loot_table")
                      .forGetter(PlayerGeneratesContainerLootCriterionTrigger.Conditions::lootTable)
                )
@@ -55,16 +55,16 @@
        * @mapping {@literal hashed m_sdawxryt Lnet/minecraft/unmapped/C_ccuyenqy$C_jvilurms;m_sdawxryt(Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_rzypsigz;}
        * @mapping {@literal named create Lnet/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterionTrigger$Conditions;create(Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/advancement/AdvancementCriterion;}
        */
-      public static AdvancementCriterion<PlayerGeneratesContainerLootCriterionTrigger.Conditions> create(RegistryKey<LootTable> registryKey) {
-         return Criteria.PLAYER_GENERATES_CONTAINER_LOOT.create(new PlayerGeneratesContainerLootCriterionTrigger.Conditions(Optional.empty(), registryKey));
+      public static AdvancementCriterion<PlayerGeneratesContainerLootCriterionTrigger.Conditions> create(RegistryKey<LootTable> lootTable) {
+         return Criteria.PLAYER_GENERATES_CONTAINER_LOOT.create(new PlayerGeneratesContainerLootCriterionTrigger.Conditions(Optional.empty(), lootTable));
       }
 
       /**
        * @mapping {@literal hashed m_ocoesmqp Lnet/minecraft/unmapped/C_ccuyenqy$C_jvilurms;m_ocoesmqp(Lnet/minecraft/unmapped/C_xhhleach;)Z}
        * @mapping {@literal named matches Lnet/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterionTrigger$Conditions;matches(Lnet/minecraft/registry/RegistryKey;)Z}
        */
-      public boolean matches(RegistryKey<LootTable> registryKey) {
-         return this.lootTable == registryKey;
+      public boolean matches(RegistryKey<LootTable> arg) {
+         return this.lootTable == arg;
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/AbstractBlock.java namedSrc/net/minecraft/block/AbstractBlock.java
--- namedTargetSrc/net/minecraft/block/AbstractBlock.java	2024-09-25 08:03:14.971541276 +0000
+++ namedSrc/net/minecraft/block/AbstractBlock.java	2024-09-25 08:02:07.630229227 +0000
@@ -1656,8 +1656,8 @@
        * @mapping {@literal hashed m_trxxnxke Lnet/minecraft/unmapped/C_triydqro$C_eibemhky;m_trxxnxke(Lnet/minecraft/unmapped/C_xhhleach;)Z}
        * @mapping {@literal named isRegistryKey Lnet/minecraft/block/AbstractBlock$AbstractBlockState;isRegistryKey(Lnet/minecraft/registry/RegistryKey;)Z}
        */
-      public boolean isRegistryKey(RegistryKey<Block> registryKey) {
-         return this.getBlock().getBuiltInRegistryHolder().isRegistryKey(registryKey);
+      public boolean isRegistryKey(RegistryKey<Block> arg) {
+         return this.getBlock().getBuiltInRegistryHolder().isRegistryKey(arg);
       }
 
       /**
@@ -1952,22 +1952,21 @@
        */
       float jumpVelocityMultiplier = 1.0F;
       /**
-       * @mapping {@literal hashed f_eioycbda Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;f_eioycbda:Lnet/minecraft/unmapped/C_xhhleach;}
-       * @mapping {@literal named registryKey Lnet/minecraft/block/AbstractBlock$Settings;registryKey:Lnet/minecraft/registry/RegistryKey;}
+       * Mapping not found
        */
       @Nullable
-      private RegistryKey<Block> registryKey;
+      private RegistryKey<Block> f_eioycbda;
       /**
        * @mapping {@literal hashed f_pxqjcqnw Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;f_pxqjcqnw:Lnet/minecraft/unmapped/C_jquyxssk;}
        * @mapping {@literal named lootTableId Lnet/minecraft/block/AbstractBlock$Settings;lootTableId:Lnet/minecraft/unmapped/C_jquyxssk;}
        */
-      private C_jquyxssk<Block, Optional<RegistryKey<LootTable>>> lootTableId = registryKey -> Optional.of(
-            RegistryKey.of(RegistryKeys.LOOT_TABLE, registryKey.getValue().withPrefix("blocks/"))
+      private C_jquyxssk<Block, Optional<RegistryKey<LootTable>>> lootTableId = arg -> Optional.of(
+            RegistryKey.of(RegistryKeys.LOOT_TABLE, arg.getValue().withPrefix("blocks/"))
          );
       /**
        * Mapping not found
        */
-      private C_jquyxssk<Block, String> f_gxswpnob = registryKey -> Util.createTranslationKey("block", registryKey.getValue());
+      private C_jquyxssk<Block, String> f_gxswpnob = arg -> Util.createTranslationKey("block", arg.getValue());
       /**
        * @mapping {@literal hashed f_obppjqdx Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;f_obppjqdx:Z}
        * @mapping {@literal named opaque Lnet/minecraft/block/AbstractBlock$Settings;opaque:Z}
@@ -2313,7 +2312,7 @@
        * Mapping not found
        */
       protected Optional<RegistryKey<LootTable>> m_bybxvckr() {
-         return this.lootTableId.get((RegistryKey<Block>)Objects.requireNonNull(this.registryKey, "Block id not set"));
+         return this.lootTableId.get((RegistryKey<Block>)Objects.requireNonNull(this.f_eioycbda, "Block id not set"));
       }
 
       /**
@@ -2527,11 +2526,10 @@
       }
 
       /**
-       * @mapping {@literal hashed m_vuvrdzlb Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;m_vuvrdzlb(Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;}
-       * @mapping {@literal named m_vuvrdzlb Lnet/minecraft/block/AbstractBlock$Settings;m_vuvrdzlb(Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/block/AbstractBlock$Settings;}
+       * Mapping not found
        */
-      public AbstractBlock.Settings m_vuvrdzlb(RegistryKey<Block> registryKey) {
-         this.registryKey = registryKey;
+      public AbstractBlock.Settings m_vuvrdzlb(RegistryKey<Block> arg) {
+         this.f_eioycbda = arg;
          return this;
       }
 
@@ -2547,7 +2545,7 @@
        * Mapping not found
        */
       protected String m_telcghnd() {
-         return this.f_gxswpnob.get((RegistryKey<Block>)Objects.requireNonNull(this.registryKey, "Block id not set"));
+         return this.f_gxswpnob.get((RegistryKey<Block>)Objects.requireNonNull(this.f_eioycbda, "Block id not set"));
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/block/AttachedStemBlock.java namedSrc/net/minecraft/block/AttachedStemBlock.java
--- namedTargetSrc/net/minecraft/block/AttachedStemBlock.java	2024-09-25 08:03:15.178542255 +0000
+++ namedSrc/net/minecraft/block/AttachedStemBlock.java	2024-09-25 08:02:07.851230294 +0000
@@ -34,9 +34,9 @@
     */
    public static final MapCodec<AttachedStemBlock> CODEC = RecordCodecBuilder.mapCodec(
       stemBlock -> stemBlock.group(
-               RegistryKey.codec(RegistryKeys.BLOCK).fieldOf("fruit").forGetter(arg -> arg.gourdBlock),
-               RegistryKey.codec(RegistryKeys.BLOCK).fieldOf("stem").forGetter(arg -> arg.stem),
-               RegistryKey.codec(RegistryKeys.ITEM).fieldOf("seed").forGetter(arg -> arg.seed),
+               RegistryKey.createCodec(RegistryKeys.BLOCK).fieldOf("fruit").forGetter(arg -> arg.gourdBlock),
+               RegistryKey.createCodec(RegistryKeys.BLOCK).fieldOf("stem").forGetter(arg -> arg.stem),
+               RegistryKey.createCodec(RegistryKeys.ITEM).fieldOf("seed").forGetter(arg -> arg.seed),
                getSettingsCodec()
             )
             .apply(stemBlock, AttachedStemBlock::new)
diff -bur namedTargetSrc/net/minecraft/block/Blocks.java namedSrc/net/minecraft/block/Blocks.java
--- namedTargetSrc/net/minecraft/block/Blocks.java	2024-09-25 08:03:15.023541522 +0000
+++ namedSrc/net/minecraft/block/Blocks.java	2024-09-25 08:02:07.682229478 +0000
@@ -10680,17 +10680,17 @@
     * @mapping {@literal hashed m_cptpfson Lnet/minecraft/unmapped/C_jricjyva;m_cptpfson(Lnet/minecraft/unmapped/C_xhhleach;Ljava/util/function/Function;Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;)Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named m_cptpfson Lnet/minecraft/block/Blocks;m_cptpfson(Lnet/minecraft/registry/RegistryKey;Ljava/util/function/Function;Lnet/minecraft/block/AbstractBlock$Settings;)Lnet/minecraft/block/Block;}
     */
-   private static Block m_cptpfson(RegistryKey<Block> registryKey, Function<AbstractBlock.Settings, Block> function, AbstractBlock.Settings settings) {
-      Block lv = (Block)function.apply(settings.m_vuvrdzlb(registryKey));
-      return Registry.register(Registries.BLOCK, registryKey, lv);
+   private static Block m_cptpfson(RegistryKey<Block> arg, Function<AbstractBlock.Settings, Block> function, AbstractBlock.Settings settings) {
+      Block lv = (Block)function.apply(settings.m_vuvrdzlb(arg));
+      return Registry.register(Registries.BLOCK, arg, lv);
    }
 
    /**
     * @mapping {@literal hashed m_vfpzuwtj Lnet/minecraft/unmapped/C_jricjyva;m_vfpzuwtj(Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;)Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named m_vfpzuwtj Lnet/minecraft/block/Blocks;m_vfpzuwtj(Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/block/AbstractBlock$Settings;)Lnet/minecraft/block/Block;}
     */
-   private static Block m_vfpzuwtj(RegistryKey<Block> registryKey, AbstractBlock.Settings settings) {
-      return m_cptpfson(registryKey, Block::new, settings);
+   private static Block m_vfpzuwtj(RegistryKey<Block> arg, AbstractBlock.Settings settings) {
+      return m_cptpfson(arg, Block::new, settings);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/entity/BeaconBlockEntity.java namedSrc/net/minecraft/block/entity/BeaconBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/BeaconBlockEntity.java	2024-09-25 08:03:15.053541664 +0000
+++ namedSrc/net/minecraft/block/entity/BeaconBlockEntity.java	2024-09-25 08:02:07.720229661 +0000
@@ -415,7 +415,7 @@
     */
    private static void writeStatusEffect(NbtCompound nbt, String effectName, @Nullable Holder<StatusEffect> statusEffect) {
       if (statusEffect != null) {
-         statusEffect.getKey().ifPresent(registryKey -> nbt.putString(effectName, registryKey.getValue().toString()));
+         statusEffect.getKey().ifPresent(arg2 -> nbt.putString(effectName, arg2.getValue().toString()));
       }
    }
 
@@ -427,7 +427,7 @@
    private static Holder<StatusEffect> readStatusEffect(NbtCompound nbt, String effectName) {
       if (nbt.contains(effectName, NbtElement.STRING_TYPE)) {
          Identifier lv = Identifier.tryParse(nbt.getString(effectName));
-         return lv == null ? null : (Holder)Registries.STATUS_EFFECT.m_hnixtpdg(lv).map(BeaconBlockEntity::validate).orElse(null);
+         return lv == null ? null : (Holder)Registries.STATUS_EFFECT.find(lv).map(BeaconBlockEntity::validate).orElse(null);
       } else {
          return null;
       }
diff -bur namedTargetSrc/net/minecraft/block/entity/BrushableBlockEntity.java namedSrc/net/minecraft/block/entity/BrushableBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/BrushableBlockEntity.java	2024-09-25 08:03:15.114541952 +0000
+++ namedSrc/net/minecraft/block/entity/BrushableBlockEntity.java	2024-09-25 08:02:07.793230014 +0000
@@ -343,8 +343,8 @@
     * @mapping {@literal hashed m_llghgzmo Lnet/minecraft/unmapped/C_tlzeicbt;m_llghgzmo(Lnet/minecraft/unmapped/C_xhhleach;J)V}
     * @mapping {@literal named setLootTable Lnet/minecraft/block/entity/BrushableBlockEntity;setLootTable(Lnet/minecraft/registry/RegistryKey;J)V}
     */
-   public void setLootTable(RegistryKey<LootTable> registryKey, long lootTableSeed) {
-      this.lootTableId = registryKey;
+   public void setLootTable(RegistryKey<LootTable> arg, long lootTableSeed) {
+      this.lootTableId = arg;
       this.lootTableSeed = lootTableSeed;
    }
 
diff -bur namedTargetSrc/net/minecraft/block/entity/DecoratedPotBlockEntity.java namedSrc/net/minecraft/block/entity/DecoratedPotBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/DecoratedPotBlockEntity.java	2024-09-25 08:03:15.126542009 +0000
+++ namedSrc/net/minecraft/block/entity/DecoratedPotBlockEntity.java	2024-09-25 08:02:07.806230076 +0000
@@ -183,8 +183,8 @@
     * Mapping not found
     */
    @Override
-   public void setLootTable(@Nullable RegistryKey<LootTable> registryKey) {
-      this.lootTableId = registryKey;
+   public void setLootTable(@Nullable RegistryKey<LootTable> arg) {
+      this.lootTableId = arg;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/entity/LootableContainerBlockEntity.java namedSrc/net/minecraft/block/entity/LootableContainerBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/LootableContainerBlockEntity.java	2024-09-25 08:03:14.985541343 +0000
+++ namedSrc/net/minecraft/block/entity/LootableContainerBlockEntity.java	2024-09-25 08:02:07.649229319 +0000
@@ -53,8 +53,8 @@
     * Mapping not found
     */
    @Override
-   public void setLootTable(@Nullable RegistryKey<LootTable> registryKey) {
-      this.lootTableId = registryKey;
+   public void setLootTable(@Nullable RegistryKey<LootTable> arg) {
+      this.lootTableId = arg;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/entity/VaultBlockEntity.java namedSrc/net/minecraft/block/entity/VaultBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/VaultBlockEntity.java	2024-09-25 08:03:15.059541692 +0000
+++ namedSrc/net/minecraft/block/entity/VaultBlockEntity.java	2024-09-25 08:02:07.728229700 +0000
@@ -445,8 +445,8 @@
        * @mapping {@literal hashed m_vsawgyip Lnet/minecraft/unmapped/C_xclnoluc$C_vucktnfd;m_vsawgyip(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_sddaxwyk;}
        * @mapping {@literal named m_vsawgyip Lnet/minecraft/block/entity/VaultBlockEntity$C_vucktnfd;m_vsawgyip(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/item/ItemStack;}
        */
-      private static ItemStack m_vsawgyip(ServerWorld world, BlockPos pos, RegistryKey<LootTable> registryKey) {
-         LootTable lv = world.getServer().m_bilggnfr().getLootTable(registryKey);
+      private static ItemStack m_vsawgyip(ServerWorld world, BlockPos pos, RegistryKey<LootTable> key) {
+         LootTable lv = world.getServer().m_bilggnfr().getLootTable(key);
          LootContextParameterSet lv2 = new LootContextParameterSet.Builder(world)
             .add(LootContextParameters.ORIGIN, Vec3d.ofCenter(pos))
             .build(LootContextTypes.VAULT);
diff -bur namedTargetSrc/net/minecraft/block/enums/TrialSpawnerState.java namedSrc/net/minecraft/block/enums/TrialSpawnerState.java
--- namedTargetSrc/net/minecraft/block/enums/TrialSpawnerState.java	2024-09-25 08:03:15.174542236 +0000
+++ namedSrc/net/minecraft/block/enums/TrialSpawnerState.java	2024-09-25 08:02:07.848230279 +0000
@@ -198,7 +198,7 @@
                   lv.ejectingLootTable = lv2.lootTablesToEject().getDataOrEmpty(world.getRandom());
                }
 
-               lv.ejectingLootTable.ifPresent(registryKey -> logic.ejectLoot(world, pos, registryKey));
+               lv.ejectingLootTable.ifPresent(arg4 -> logic.ejectLoot(world, pos, arg4));
                lv.registeredPlayers.remove(lv.registeredPlayers.iterator().next());
                yield this;
             }
diff -bur namedTargetSrc/net/minecraft/block/FungusBlock.java namedSrc/net/minecraft/block/FungusBlock.java
--- namedTargetSrc/net/minecraft/block/FungusBlock.java	2024-09-25 08:03:15.183542278 +0000
+++ namedSrc/net/minecraft/block/FungusBlock.java	2024-09-25 08:02:07.857230323 +0000
@@ -28,7 +28,7 @@
     */
    public static final MapCodec<FungusBlock> CODEC = RecordCodecBuilder.mapCodec(
       instance -> instance.group(
-               RegistryKey.codec(RegistryKeys.CONFIGURED_FEATURE).fieldOf("feature").forGetter(block -> block.feature),
+               RegistryKey.createCodec(RegistryKeys.CONFIGURED_FEATURE).fieldOf("feature").forGetter(block -> block.feature),
                Registries.BLOCK.getCodec().fieldOf("grows_on").forGetter(block -> block.requiredGroundBlock),
                getSettingsCodec()
             )
@@ -67,9 +67,9 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_naobsnoy;<init>(Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;)V}
     * @mapping {@literal named <init> Lnet/minecraft/block/FungusBlock;<init>(Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/block/Block;Lnet/minecraft/block/AbstractBlock$Settings;)V}
     */
-   protected FungusBlock(RegistryKey<ConfiguredFeature<?, ?>> registryKey, Block block, AbstractBlock.Settings settings) {
+   protected FungusBlock(RegistryKey<ConfiguredFeature<?, ?>> feature, Block block, AbstractBlock.Settings settings) {
       super(settings);
-      this.feature = registryKey;
+      this.feature = feature;
       this.requiredGroundBlock = block;
    }
 
diff -bur namedTargetSrc/net/minecraft/block/MushroomPlantBlock.java namedSrc/net/minecraft/block/MushroomPlantBlock.java
--- namedTargetSrc/net/minecraft/block/MushroomPlantBlock.java	2024-09-25 08:03:15.053541664 +0000
+++ namedSrc/net/minecraft/block/MushroomPlantBlock.java	2024-09-25 08:02:07.720229661 +0000
@@ -26,7 +26,7 @@
     * @mapping {@literal named CODEC Lnet/minecraft/block/MushroomPlantBlock;CODEC:Lcom/mojang/serialization/MapCodec;}
     */
    public static final MapCodec<MushroomPlantBlock> CODEC = RecordCodecBuilder.mapCodec(
-      instance -> instance.group(RegistryKey.codec(RegistryKeys.CONFIGURED_FEATURE).fieldOf("feature").forGetter(arg -> arg.feature), getSettingsCodec())
+      instance -> instance.group(RegistryKey.createCodec(RegistryKeys.CONFIGURED_FEATURE).fieldOf("feature").forGetter(arg -> arg.feature), getSettingsCodec())
             .apply(instance, MushroomPlantBlock::new)
    );
    /**
@@ -57,9 +57,9 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_iesiegeg;<init>(Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;)V}
     * @mapping {@literal named <init> Lnet/minecraft/block/MushroomPlantBlock;<init>(Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/block/AbstractBlock$Settings;)V}
     */
-   public MushroomPlantBlock(RegistryKey<ConfiguredFeature<?, ?>> registryKey, AbstractBlock.Settings settings) {
+   public MushroomPlantBlock(RegistryKey<ConfiguredFeature<?, ?>> feature, AbstractBlock.Settings settings) {
       super(settings);
-      this.feature = registryKey;
+      this.feature = feature;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/NyliumBlock.java namedSrc/net/minecraft/block/NyliumBlock.java
--- namedTargetSrc/net/minecraft/block/NyliumBlock.java	2024-09-25 08:03:14.966541253 +0000
+++ namedSrc/net/minecraft/block/NyliumBlock.java	2024-09-25 08:02:07.624229198 +0000
@@ -105,14 +105,13 @@
     */
    private void generate(
       Registry<ConfiguredFeature<?, ?>> registry,
-      RegistryKey<ConfiguredFeature<?, ?>> registryKey,
+      RegistryKey<ConfiguredFeature<?, ?>> arg2,
       ServerWorld world,
       ChunkGenerator chunkGenerator,
       RandomGenerator random,
       BlockPos pos
    ) {
-      registry.getHolder(registryKey)
-         .ifPresent(registryKeyHolder -> ((ConfiguredFeature)registryKeyHolder.value()).generate(world, chunkGenerator, random, pos));
+      registry.getHolder(arg2).ifPresent(registryKeyHolder -> ((ConfiguredFeature)registryKeyHolder.value()).generate(world, chunkGenerator, random, pos));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/StemBlock.java namedSrc/net/minecraft/block/StemBlock.java
--- namedTargetSrc/net/minecraft/block/StemBlock.java	2024-09-25 08:03:15.126542009 +0000
+++ namedSrc/net/minecraft/block/StemBlock.java	2024-09-25 08:02:07.805230072 +0000
@@ -34,9 +34,9 @@
     */
    public static final MapCodec<StemBlock> CODEC = RecordCodecBuilder.mapCodec(
       instance -> instance.group(
-               RegistryKey.codec(RegistryKeys.BLOCK).fieldOf("fruit").forGetter(arg -> arg.gourdBlock),
-               RegistryKey.codec(RegistryKeys.BLOCK).fieldOf("attached_stem").forGetter(arg -> arg.attachedStem),
-               RegistryKey.codec(RegistryKeys.ITEM).fieldOf("seed").forGetter(arg -> arg.seed),
+               RegistryKey.createCodec(RegistryKeys.BLOCK).fieldOf("fruit").forGetter(arg -> arg.gourdBlock),
+               RegistryKey.createCodec(RegistryKeys.BLOCK).fieldOf("attached_stem").forGetter(arg -> arg.attachedStem),
+               RegistryKey.createCodec(RegistryKeys.ITEM).fieldOf("seed").forGetter(arg -> arg.seed),
                getSettingsCodec()
             )
             .apply(instance, StemBlock::new)
diff -bur namedTargetSrc/net/minecraft/block/TrialSpawnerConfig.java namedSrc/net/minecraft/block/TrialSpawnerConfig.java
--- namedTargetSrc/net/minecraft/block/TrialSpawnerConfig.java	2024-09-25 08:03:15.162542179 +0000
+++ namedSrc/net/minecraft/block/TrialSpawnerConfig.java	2024-09-25 08:02:07.838230231 +0000
@@ -51,10 +51,10 @@
                   .optionalFieldOf("ticks_between_spawn", DEFAULT_INSTANCE.ticksBetweenSpawn)
                   .forGetter(TrialSpawnerConfig::ticksBetweenSpawn),
                MobSpawnerEntry.DATA_POOL_CODEC.optionalFieldOf("spawn_potentials", DataPool.empty()).forGetter(TrialSpawnerConfig::spawnPotentialsDefinition),
-               DataPool.wrapCodecToAllowEmpty(RegistryKey.codec(RegistryKeys.LOOT_TABLE))
+               DataPool.wrapCodecToAllowEmpty(RegistryKey.createCodec(RegistryKeys.LOOT_TABLE))
                   .optionalFieldOf("loot_tables_to_eject", DEFAULT_INSTANCE.lootTablesToEject)
                   .forGetter(TrialSpawnerConfig::lootTablesToEject),
-               RegistryKey.codec(RegistryKeys.LOOT_TABLE)
+               RegistryKey.createCodec(RegistryKeys.LOOT_TABLE)
                   .optionalFieldOf("items_to_drop_when_ominous", DEFAULT_INSTANCE.itemsToDropWhenOminous)
                   .forGetter(TrialSpawnerConfig::itemsToDropWhenOminous)
             )
@@ -137,10 +137,9 @@
          .add(LootTables.TRIAL_CHAMBER_KEY_SPAWNER)
          .build();
       /**
-       * @mapping {@literal hashed f_reubvwnb Lnet/minecraft/unmapped/C_pocjjnjk$C_vnrwaphu;f_reubvwnb:Lnet/minecraft/unmapped/C_xhhleach;}
-       * @mapping {@literal named registryKey Lnet/minecraft/block/TrialSpawnerConfig$C_vnrwaphu;registryKey:Lnet/minecraft/registry/RegistryKey;}
+       * Mapping not found
        */
-      private RegistryKey<LootTable> registryKey = LootTables.TRIAL_CHAMBER_ITEMS_TO_DROP_WHEN_OMINOUS_SPAWNER;
+      private RegistryKey<LootTable> f_reubvwnb = LootTables.TRIAL_CHAMBER_ITEMS_TO_DROP_WHEN_OMINOUS_SPAWNER;
 
       /**
        * Mapping not found
@@ -207,11 +206,10 @@
       }
 
       /**
-       * @mapping {@literal hashed m_djzmjbrp Lnet/minecraft/unmapped/C_pocjjnjk$C_vnrwaphu;m_djzmjbrp(Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_pocjjnjk$C_vnrwaphu;}
-       * @mapping {@literal named m_djzmjbrp Lnet/minecraft/block/TrialSpawnerConfig$C_vnrwaphu;m_djzmjbrp(Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/block/TrialSpawnerConfig$C_vnrwaphu;}
+       * Mapping not found
        */
-      public TrialSpawnerConfig.C_vnrwaphu m_djzmjbrp(RegistryKey<LootTable> registryKey) {
-         this.registryKey = registryKey;
+      public TrialSpawnerConfig.C_vnrwaphu m_djzmjbrp(RegistryKey<LootTable> arg) {
+         this.f_reubvwnb = arg;
          return this;
       }
 
@@ -228,7 +226,7 @@
             this.f_jgmutzza,
             this.f_jgjwrvli,
             this.f_gurbcovz,
-            this.registryKey
+            this.f_reubvwnb
          );
       }
    }
diff -bur namedTargetSrc/net/minecraft/block/TrialSpawnerData.java namedSrc/net/minecraft/block/TrialSpawnerData.java
--- namedTargetSrc/net/minecraft/block/TrialSpawnerData.java	2024-09-25 08:03:15.115541957 +0000
+++ namedSrc/net/minecraft/block/TrialSpawnerData.java	2024-09-25 08:02:07.793230014 +0000
@@ -84,7 +84,7 @@
                Codec.LONG.lenientOptionalFieldOf("next_mob_spawns_at", Long.valueOf(0L)).forGetter(data -> data.nextMobSpawnTime),
                Codec.intRange(0, Integer.MAX_VALUE).lenientOptionalFieldOf("total_mobs_spawned", 0).forGetter(data -> data.totalMobsSpawned),
                MobSpawnerEntry.CODEC.lenientOptionalFieldOf("spawn_data").forGetter(data -> data.spawnData),
-               RegistryKey.codec(RegistryKeys.LOOT_TABLE).lenientOptionalFieldOf("ejecting_loot_table").forGetter(data -> data.ejectingLootTable)
+               RegistryKey.createCodec(RegistryKeys.LOOT_TABLE).lenientOptionalFieldOf("ejecting_loot_table").forGetter(data -> data.ejectingLootTable)
             )
             .apply(instance, TrialSpawnerData::new)
    );
diff -bur namedTargetSrc/net/minecraft/client/font/GlyphAtlasTexture.java namedSrc/net/minecraft/client/font/GlyphAtlasTexture.java
--- namedTargetSrc/net/minecraft/client/font/GlyphAtlasTexture.java	2024-09-25 08:03:14.995541390 +0000
+++ namedSrc/net/minecraft/client/font/GlyphAtlasTexture.java	2024-09-25 08:02:07.662229381 +0000
@@ -103,8 +103,8 @@
     * Mapping not found
     */
    @Override
-   public void saveTo(Identifier textureId, Path directoryPath) {
-      String string = textureId.toUnderscoreSeparatedString();
+   public void saveTo(Identifier id, Path directoryPath) {
+      String string = id.toUnderscoreSeparatedString();
       TextureUtil.writeAsPNG(directoryPath, string, this.getGlId(), 0, 256, 256, i -> (i & 0xFF000000) == 0 ? -16777216 : i);
    }
 
diff -bur namedTargetSrc/net/minecraft/client/font/UnihexFont.java namedSrc/net/minecraft/client/font/UnihexFont.java
--- namedTargetSrc/net/minecraft/client/font/UnihexFont.java	2024-09-25 08:03:15.123541995 +0000
+++ namedSrc/net/minecraft/client/font/UnihexFont.java	2024-09-25 08:02:07.803230062 +0000
@@ -304,8 +304,8 @@
        * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_pxvlatlk$C_mxikwcxh;<init>(Lnet/minecraft/unmapped/C_ncpywfca;Ljava/util/List;)V}
        * @mapping {@literal named <init> Lnet/minecraft/client/font/UnihexFont$Definition;<init>(Lnet/minecraft/util/Identifier;Ljava/util/List;)V}
        */
-      private Definition(Identifier hexFile, List<UnihexFont.DimensionOverride> sizeOverrides) {
-         this.hexFile = hexFile;
+      private Definition(Identifier id, List<UnihexFont.DimensionOverride> sizeOverrides) {
+         this.hexFile = id;
          this.sizeOverrides = sizeOverrides;
       }
 
diff -bur namedTargetSrc/net/minecraft/client/gl/PostProcessShader.java namedSrc/net/minecraft/client/gl/PostProcessShader.java
--- namedTargetSrc/net/minecraft/client/gl/PostProcessShader.java	2024-09-25 08:03:15.146542104 +0000
+++ namedSrc/net/minecraft/client/gl/PostProcessShader.java	2024-09-25 08:02:07.823230159 +0000
@@ -38,9 +38,10 @@
     */
    private final C_kfcjpoxm f_pxocueop;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_htnpkodd Lnet/minecraft/unmapped/C_ihtuvtqd;f_htnpkodd:Lnet/minecraft/unmapped/C_ncpywfca;}
+    * @mapping {@literal named id Lnet/minecraft/client/gl/PostProcessShader;id:Lnet/minecraft/util/Identifier;}
     */
-   private final Identifier f_htnpkodd;
+   private final Identifier id;
    /**
     * Mapping not found
     */
@@ -54,10 +55,10 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_ihtuvtqd;<init>(Ljava/lang/String;Lnet/minecraft/unmapped/C_kfcjpoxm;Lnet/minecraft/unmapped/C_ncpywfca;Ljava/util/List;)V}
     * @mapping {@literal named <init> Lnet/minecraft/client/gl/PostProcessShader;<init>(Ljava/lang/String;Lnet/minecraft/unmapped/C_kfcjpoxm;Lnet/minecraft/util/Identifier;Ljava/util/List;)V}
     */
-   public PostProcessShader(String string, C_kfcjpoxm arg, Identifier arg2, List<ShaderEffectConfig.Uniform> list) {
+   public PostProcessShader(String string, C_kfcjpoxm arg, Identifier id, List<ShaderEffectConfig.Uniform> list) {
       this.f_fergtmpa = string;
       this.f_pxocueop = arg;
-      this.f_htnpkodd = arg2;
+      this.id = id;
       this.f_bhpobmrp = list;
    }
 
@@ -78,9 +79,9 @@
          lv2.m_apnahyct(lv, map);
       }
 
-      Handle<Framebuffer> lv3 = (Handle<Framebuffer>)map.computeIfPresent(this.f_htnpkodd, (arg2, arg3) -> lv.readsAndWrites(arg3));
+      Handle<Framebuffer> lv3 = (Handle<Framebuffer>)map.computeIfPresent(this.id, (id, arg3) -> lv.readsAndWrites(arg3));
       if (lv3 == null) {
-         throw new IllegalStateException("Missing handle for target " + this.f_htnpkodd);
+         throw new IllegalStateException("Missing handle for target " + this.id);
       } else {
          lv.executes(() -> {
             Framebuffer lvx = lv3.get();
diff -bur namedTargetSrc/net/minecraft/client/gui/GuiAtlasManager.java namedSrc/net/minecraft/client/gui/GuiAtlasManager.java
--- namedTargetSrc/net/minecraft/client/gui/GuiAtlasManager.java	2024-09-25 08:03:15.196542340 +0000
+++ namedSrc/net/minecraft/client/gui/GuiAtlasManager.java	2024-09-25 08:02:07.872230395 +0000
@@ -36,8 +36,8 @@
     * Mapping not found
     */
    @Override
-   public Sprite getSprite(Identifier objectId) {
-      return super.getSprite(objectId);
+   public Sprite getSprite(Identifier id) {
+      return super.getSprite(id);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/GuiGraphics.java namedSrc/net/minecraft/client/gui/GuiGraphics.java
--- namedTargetSrc/net/minecraft/client/gui/GuiGraphics.java	2024-09-25 08:03:14.929541078 +0000
+++ namedSrc/net/minecraft/client/gui/GuiGraphics.java	2024-09-25 08:02:07.579228981 +0000
@@ -465,17 +465,19 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_rixppaza Lnet/minecraft/unmapped/C_sedilmty;m_rixppaza(Ljava/util/function/Function;Lnet/minecraft/unmapped/C_ncpywfca;IIII)V}
+    * @mapping {@literal named m_rixppaza Lnet/minecraft/client/gui/GuiGraphics;m_rixppaza(Ljava/util/function/Function;Lnet/minecraft/util/Identifier;IIII)V}
     */
-   public void m_rixppaza(Function<Identifier, RenderLayer> function, Identifier arg, int i, int j, int k, int l) {
-      this.m_kpwmfaru(function, arg, i, j, k, l, -1);
+   public void m_rixppaza(Function<Identifier, RenderLayer> function, Identifier id, int i, int j, int k, int l) {
+      this.m_kpwmfaru(function, id, i, j, k, l, -1);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_kpwmfaru Lnet/minecraft/unmapped/C_sedilmty;m_kpwmfaru(Ljava/util/function/Function;Lnet/minecraft/unmapped/C_ncpywfca;IIIII)V}
+    * @mapping {@literal named m_kpwmfaru Lnet/minecraft/client/gui/GuiGraphics;m_kpwmfaru(Ljava/util/function/Function;Lnet/minecraft/util/Identifier;IIIII)V}
     */
-   public void m_kpwmfaru(Function<Identifier, RenderLayer> function, Identifier arg, int i, int j, int k, int l, int m) {
-      Sprite lv = this.guiAtlasManager.getSprite(arg);
+   public void m_kpwmfaru(Function<Identifier, RenderLayer> function, Identifier id, int i, int j, int k, int l, int m) {
+      Sprite lv = this.guiAtlasManager.getSprite(id);
       SpriteScaling lv2 = this.guiAtlasManager.getScaling(lv);
       if (lv2 instanceof SpriteScaling.Stretch) {
          this.m_qvdirkns(function, lv, i, j, k, l, m);
@@ -487,10 +489,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_zrsopato Lnet/minecraft/unmapped/C_sedilmty;m_zrsopato(Ljava/util/function/Function;Lnet/minecraft/unmapped/C_ncpywfca;IIIIIIII)V}
+    * @mapping {@literal named m_zrsopato Lnet/minecraft/client/gui/GuiGraphics;m_zrsopato(Ljava/util/function/Function;Lnet/minecraft/util/Identifier;IIIIIIII)V}
     */
-   public void m_zrsopato(Function<Identifier, RenderLayer> function, Identifier arg, int i, int j, int k, int l, int m, int n, int o, int p) {
-      Sprite lv = this.guiAtlasManager.getSprite(arg);
+   public void m_zrsopato(Function<Identifier, RenderLayer> function, Identifier id, int i, int j, int k, int l, int m, int n, int o, int p) {
+      Sprite lv = this.guiAtlasManager.getSprite(id);
       SpriteScaling lv2 = this.guiAtlasManager.getScaling(lv);
       if (lv2 instanceof SpriteScaling.Stretch) {
          this.m_vbnoxrxs(function, lv, i, j, k, l, m, n, o, p, -1);
@@ -732,22 +735,24 @@
     * @mapping {@literal hashed m_olrwwnbg Lnet/minecraft/unmapped/C_sedilmty;m_olrwwnbg(Ljava/util/function/Function;Lnet/minecraft/unmapped/C_ncpywfca;IIFFIIIII)V}
     * @mapping {@literal named m_olrwwnbg Lnet/minecraft/client/gui/GuiGraphics;m_olrwwnbg(Ljava/util/function/Function;Lnet/minecraft/util/Identifier;IIFFIIIII)V}
     */
-   public void m_olrwwnbg(Function<Identifier, RenderLayer> function, Identifier arg, int i, int j, float f, float g, int k, int l, int m, int n, int argb) {
-      this.m_fgoqvxux(function, arg, i, j, f, g, k, l, k, l, m, n, argb);
+   public void m_olrwwnbg(Function<Identifier, RenderLayer> function, Identifier id, int i, int j, float f, float g, int k, int l, int m, int n, int argb) {
+      this.m_fgoqvxux(function, id, i, j, f, g, k, l, k, l, m, n, argb);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_tobhyohl Lnet/minecraft/unmapped/C_sedilmty;m_tobhyohl(Ljava/util/function/Function;Lnet/minecraft/unmapped/C_ncpywfca;IIFFIIII)V}
+    * @mapping {@literal named m_tobhyohl Lnet/minecraft/client/gui/GuiGraphics;m_tobhyohl(Ljava/util/function/Function;Lnet/minecraft/util/Identifier;IIFFIIII)V}
     */
-   public void m_tobhyohl(Function<Identifier, RenderLayer> function, Identifier arg, int i, int j, float f, float g, int k, int l, int m, int n) {
-      this.m_qynojiod(function, arg, i, j, f, g, k, l, k, l, m, n);
+   public void m_tobhyohl(Function<Identifier, RenderLayer> function, Identifier id, int i, int j, float f, float g, int k, int l, int m, int n) {
+      this.m_qynojiod(function, id, i, j, f, g, k, l, k, l, m, n);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_qynojiod Lnet/minecraft/unmapped/C_sedilmty;m_qynojiod(Ljava/util/function/Function;Lnet/minecraft/unmapped/C_ncpywfca;IIFFIIIIII)V}
+    * @mapping {@literal named m_qynojiod Lnet/minecraft/client/gui/GuiGraphics;m_qynojiod(Ljava/util/function/Function;Lnet/minecraft/util/Identifier;IIFFIIIIII)V}
     */
-   public void m_qynojiod(Function<Identifier, RenderLayer> function, Identifier arg, int i, int j, float f, float g, int k, int l, int m, int n, int o, int p) {
-      this.m_fgoqvxux(function, arg, i, j, f, g, k, l, m, n, o, p, -1);
+   public void m_qynojiod(Function<Identifier, RenderLayer> function, Identifier id, int i, int j, float f, float g, int k, int l, int m, int n, int o, int p) {
+      this.m_fgoqvxux(function, id, i, j, f, g, k, l, m, n, o, p, -1);
    }
 
    /**
@@ -755,10 +760,10 @@
     * @mapping {@literal named m_fgoqvxux Lnet/minecraft/client/gui/GuiGraphics;m_fgoqvxux(Ljava/util/function/Function;Lnet/minecraft/util/Identifier;IIFFIIIIIII)V}
     */
    public void m_fgoqvxux(
-      Function<Identifier, RenderLayer> function, Identifier arg, int i, int j, float f, float g, int k, int l, int m, int n, int o, int p, int argb
+      Function<Identifier, RenderLayer> function, Identifier id, int i, int j, float f, float g, int k, int l, int m, int n, int o, int p, int argb
    ) {
       this.m_oikvgwpo(
-         function, arg, i, i + k, j, j + l, (f + 0.0F) / (float)o, (f + (float)m) / (float)o, (g + 0.0F) / (float)p, (g + (float)n) / (float)p, argb
+         function, id, i, i + k, j, j + l, (f + 0.0F) / (float)o, (f + (float)m) / (float)o, (g + 0.0F) / (float)p, (g + (float)n) / (float)p, argb
       );
    }
 
@@ -766,8 +771,8 @@
     * @mapping {@literal hashed m_oikvgwpo Lnet/minecraft/unmapped/C_sedilmty;m_oikvgwpo(Ljava/util/function/Function;Lnet/minecraft/unmapped/C_ncpywfca;IIIIFFFFI)V}
     * @mapping {@literal named m_oikvgwpo Lnet/minecraft/client/gui/GuiGraphics;m_oikvgwpo(Ljava/util/function/Function;Lnet/minecraft/util/Identifier;IIIIFFFFI)V}
     */
-   private void m_oikvgwpo(Function<Identifier, RenderLayer> function, Identifier arg, int i, int j, int k, int l, float f, float g, float h, float m, int argb) {
-      RenderLayer lv = (RenderLayer)function.apply(arg);
+   private void m_oikvgwpo(Function<Identifier, RenderLayer> function, Identifier id, int i, int j, int k, int l, float f, float g, float h, float m, int argb) {
+      RenderLayer lv = (RenderLayer)function.apply(id);
       Matrix4f matrix4f = this.matrices.peek().getModel();
       VertexConsumer lv2 = this.vertexConsumers.getBuffer(lv);
       lv2.xyz(matrix4f, (float)i, (float)k, 0.0F).uv0(f, h).color(argb);
@@ -953,10 +958,10 @@
     * @mapping {@literal hashed m_efbfrifx Lnet/minecraft/unmapped/C_sedilmty;m_efbfrifx(Lnet/minecraft/unmapped/C_mavozmpp;Ljava/util/List;Ljava/util/Optional;IILnet/minecraft/unmapped/C_ncpywfca;)V}
     * @mapping {@literal named m_efbfrifx Lnet/minecraft/client/gui/GuiGraphics;m_efbfrifx(Lnet/minecraft/client/font/TextRenderer;Ljava/util/List;Ljava/util/Optional;IILnet/minecraft/util/Identifier;)V}
     */
-   public void m_efbfrifx(TextRenderer textRenderer, List<Text> list, Optional<TooltipData> optional, int x, int y, @Nullable Identifier arg2) {
+   public void m_efbfrifx(TextRenderer textRenderer, List<Text> list, Optional<TooltipData> optional, int x, int y, @Nullable Identifier id) {
       List<TooltipComponent> list2 = (List<TooltipComponent>)list.stream().map(Text::asOrderedText).map(TooltipComponent::of).collect(Util.toArrayList());
       optional.ifPresent(arg -> list2.add(list2.isEmpty() ? 0 : 1, TooltipComponent.of(arg)));
-      this.drawTooltip(textRenderer, list2, x, y, DefaultTooltipPositioner.INSTANCE, arg2);
+      this.drawTooltip(textRenderer, list2, x, y, DefaultTooltipPositioner.INSTANCE, id);
    }
 
    /**
@@ -971,8 +976,8 @@
     * @mapping {@literal hashed m_ztaqdhir Lnet/minecraft/unmapped/C_sedilmty;m_ztaqdhir(Lnet/minecraft/unmapped/C_mavozmpp;Lnet/minecraft/unmapped/C_rdaqiwdt;IILnet/minecraft/unmapped/C_ncpywfca;)V}
     * @mapping {@literal named m_ztaqdhir Lnet/minecraft/client/gui/GuiGraphics;m_ztaqdhir(Lnet/minecraft/client/font/TextRenderer;Lnet/minecraft/text/Text;IILnet/minecraft/util/Identifier;)V}
     */
-   public void m_ztaqdhir(TextRenderer textRenderer, Text arg2, int x, int y, @Nullable Identifier arg3) {
-      this.m_fzrxeqoz(textRenderer, List.of(arg2.asOrderedText()), x, y, arg3);
+   public void m_ztaqdhir(TextRenderer textRenderer, Text arg2, int x, int y, @Nullable Identifier id) {
+      this.m_fzrxeqoz(textRenderer, List.of(arg2.asOrderedText()), x, y, id);
    }
 
    /**
@@ -987,8 +992,8 @@
     * @mapping {@literal hashed m_trxugygo Lnet/minecraft/unmapped/C_sedilmty;m_trxugygo(Lnet/minecraft/unmapped/C_mavozmpp;Ljava/util/List;IILnet/minecraft/unmapped/C_ncpywfca;)V}
     * @mapping {@literal named m_trxugygo Lnet/minecraft/client/gui/GuiGraphics;m_trxugygo(Lnet/minecraft/client/font/TextRenderer;Ljava/util/List;IILnet/minecraft/util/Identifier;)V}
     */
-   public void m_trxugygo(TextRenderer textRenderer, List<Text> list, int x, int y, @Nullable Identifier arg2) {
-      this.drawTooltip(textRenderer, list.stream().map(Text::asOrderedText).map(TooltipComponent::of).toList(), x, y, DefaultTooltipPositioner.INSTANCE, arg2);
+   public void m_trxugygo(TextRenderer textRenderer, List<Text> list, int x, int y, @Nullable Identifier id) {
+      this.drawTooltip(textRenderer, list.stream().map(Text::asOrderedText).map(TooltipComponent::of).toList(), x, y, DefaultTooltipPositioner.INSTANCE, id);
    }
 
    /**
@@ -1003,14 +1008,14 @@
     * @mapping {@literal hashed m_fzrxeqoz Lnet/minecraft/unmapped/C_sedilmty;m_fzrxeqoz(Lnet/minecraft/unmapped/C_mavozmpp;Ljava/util/List;IILnet/minecraft/unmapped/C_ncpywfca;)V}
     * @mapping {@literal named m_fzrxeqoz Lnet/minecraft/client/gui/GuiGraphics;m_fzrxeqoz(Lnet/minecraft/client/font/TextRenderer;Ljava/util/List;IILnet/minecraft/util/Identifier;)V}
     */
-   public void m_fzrxeqoz(TextRenderer textRenderer, List<? extends OrderedText> list, int x, int y, @Nullable Identifier arg2) {
+   public void m_fzrxeqoz(TextRenderer textRenderer, List<? extends OrderedText> list, int x, int y, @Nullable Identifier id) {
       this.drawTooltip(
          textRenderer,
          (List<TooltipComponent>)list.stream().map(TooltipComponent::of).collect(Collectors.toList()),
          x,
          y,
          DefaultTooltipPositioner.INSTANCE,
-         arg2
+         id
       );
    }
 
@@ -1026,7 +1031,7 @@
     * @mapping {@literal hashed m_zpgnewud Lnet/minecraft/unmapped/C_sedilmty;m_zpgnewud(Lnet/minecraft/unmapped/C_mavozmpp;Ljava/util/List;IILnet/minecraft/unmapped/C_imjripdz;Lnet/minecraft/unmapped/C_ncpywfca;)V}
     * @mapping {@literal named drawTooltip Lnet/minecraft/client/gui/GuiGraphics;drawTooltip(Lnet/minecraft/client/font/TextRenderer;Ljava/util/List;IILnet/minecraft/client/gui/tooltip/TooltipPositioner;Lnet/minecraft/util/Identifier;)V}
     */
-   private void drawTooltip(TextRenderer textRenderer, List<TooltipComponent> tooltip, int x, int y, TooltipPositioner positioner, @Nullable Identifier arg3) {
+   private void drawTooltip(TextRenderer textRenderer, List<TooltipComponent> tooltip, int x, int y, TooltipPositioner positioner, @Nullable Identifier id) {
       if (!tooltip.isEmpty()) {
          int k = 0;
          int l = tooltip.size() == 1 ? -2 : 0;
@@ -1047,7 +1052,7 @@
          int q = vector2ic.y();
          this.matrices.push();
          int r = 400;
-         TooltipRenderHelper.renderBackground(this, p, q, k, l, 400, arg3);
+         TooltipRenderHelper.renderBackground(this, p, q, k, l, 400, id);
          this.matrices.translate(0.0F, 0.0F, 400.0F);
          int s = q;
 
diff -bur namedTargetSrc/net/minecraft/client/gui/hud/debug/DebugHud.java namedSrc/net/minecraft/client/gui/hud/debug/DebugHud.java
--- namedTargetSrc/net/minecraft/client/gui/hud/debug/DebugHud.java	2024-09-25 08:03:15.178542255 +0000
+++ namedSrc/net/minecraft/client/gui/hud/debug/DebugHud.java	2024-09-25 08:02:07.852230299 +0000
@@ -579,7 +579,7 @@
     * @mapping {@literal named getBiomeString Lnet/minecraft/client/gui/hud/debug/DebugHud;getBiomeString(Lnet/minecraft/registry/Holder;)Ljava/lang/String;}
     */
    private static String getBiomeString(Holder<Biome> biome) {
-      return biome.unwrap().map(registryKey -> registryKey.getValue().toString(), arg -> "[unregistered " + arg + "]");
+      return biome.unwrap().map(arg -> arg.getValue().toString(), arg -> "[unregistered " + arg + "]");
    }
 
    /**
@@ -685,7 +685,7 @@
                list.add(this.propertyToString(entry));
             }
 
-            lv2.streamTags().map(arg -> "#" + arg.id()).forEach(list::add);
+            lv2.streamTags().map(tag -> "#" + tag.id()).forEach(list::add);
          }
 
          if (this.fluidHit.getType() == HitResult.Type.BLOCK) {
diff -bur namedTargetSrc/net/minecraft/client/gui/hud/in_game/InGameHud.java namedSrc/net/minecraft/client/gui/hud/in_game/InGameHud.java
--- namedTargetSrc/net/minecraft/client/gui/hud/in_game/InGameHud.java	2024-09-25 08:03:15.034541574 +0000
+++ namedSrc/net/minecraft/client/gui/hud/in_game/InGameHud.java	2024-09-25 08:02:07.696229545 +0000
@@ -1550,7 +1550,7 @@
       float h = 0.2F * delta;
       float k = 0.4F * delta;
       float l = 0.2F * delta;
-      graphics.m_olrwwnbg(arg -> RenderLayer.getGuiNauseaOverlay(), f_vqdthxci, 0, 0, 0.0F, 0.0F, i, j, i, j, ArgbHelper.color(1.0F, h, k, l));
+      graphics.m_olrwwnbg(id -> RenderLayer.getGuiNauseaOverlay(), f_vqdthxci, 0, 0, 0.0F, 0.0F, i, j, i, j, ArgbHelper.color(1.0F, h, k, l));
       graphics.getMatrices().pop();
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/PlayerFaceRenderer.java namedSrc/net/minecraft/client/gui/PlayerFaceRenderer.java
--- namedTargetSrc/net/minecraft/client/gui/PlayerFaceRenderer.java	2024-09-25 08:03:15.026541536 +0000
+++ namedSrc/net/minecraft/client/gui/PlayerFaceRenderer.java	2024-09-25 08:02:07.688229507 +0000
@@ -83,12 +83,12 @@
     * @mapping {@literal hashed m_durbuulr Lnet/minecraft/unmapped/C_vefskfru;m_durbuulr(Lnet/minecraft/unmapped/C_sedilmty;Lnet/minecraft/unmapped/C_ncpywfca;IIIZZI)V}
     * @mapping {@literal named m_durbuulr Lnet/minecraft/client/gui/PlayerFaceRenderer;m_durbuulr(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/util/Identifier;IIIZZI)V}
     */
-   public static void m_durbuulr(GuiGraphics graphics, Identifier arg2, int i, int j, int k, boolean bl, boolean bl2, int l) {
+   public static void m_durbuulr(GuiGraphics graphics, Identifier id, int i, int j, int k, boolean bl, boolean bl2, int l) {
       int m = 8 + (bl2 ? 8 : 0);
       int n = 8 * (bl2 ? -1 : 1);
-      graphics.m_fgoqvxux(RenderLayer::getGuiTextured, arg2, i, j, 8.0F, (float)m, k, k, 8, n, 64, 64, l);
+      graphics.m_fgoqvxux(RenderLayer::getGuiTextured, id, i, j, 8.0F, (float)m, k, k, 8, n, 64, 64, l);
       if (bl) {
-         drawHat(graphics, arg2, i, j, k, bl2, l);
+         drawHat(graphics, id, i, j, k, bl2, l);
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/CustomizeBuffetWorldScreen.java namedSrc/net/minecraft/client/gui/screen/CustomizeBuffetWorldScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/CustomizeBuffetWorldScreen.java	2024-09-25 08:03:15.055541673 +0000
+++ namedSrc/net/minecraft/client/gui/screen/CustomizeBuffetWorldScreen.java	2024-09-25 08:02:07.722229671 +0000
@@ -86,7 +86,7 @@
       this.parent = parent;
       this.onDone = onDone;
       this.biomeRegistry = worldCreationContext.getWorldgenRegistryManager().getLookupOrThrow(RegistryKeys.BIOME);
-      Holder<Biome> lv = (Holder<Biome>)this.biomeRegistry.getHolder(Biomes.PLAINS).or(() -> this.biomeRegistry.holders().findAny()).orElseThrow();
+      Holder<Biome> lv = (Holder<Biome>)this.biomeRegistry.getHolder(Biomes.PLAINS).or(() -> this.biomeRegistry.streamHolders().findAny()).orElseThrow();
       this.biome = (Holder<Biome>)worldCreationContext.selectedDimensions()
          .getOverworldChunkGenerator()
          .getBiomeSource()
@@ -164,7 +164,7 @@
          super(CustomizeBuffetWorldScreen.this.client, CustomizeBuffetWorldScreen.this.width, CustomizeBuffetWorldScreen.this.height - 77, 40, 16);
          Collator collator = Collator.getInstance(Locale.getDefault());
          CustomizeBuffetWorldScreen.this.biomeRegistry
-            .holders()
+            .streamHolders()
             .map(holder -> new CustomizeBuffetWorldScreen.BuffetBiomesListWidget.BuffetBiomeItem(holder))
             .sorted(Comparator.comparing(item -> item.text.getString(), collator))
             .forEach(entry -> this.addEntry(entry));
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/BeaconScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/BeaconScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/BeaconScreen.java	2024-09-25 08:03:14.966541253 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/BeaconScreen.java	2024-09-25 08:02:07.625229203 +0000
@@ -497,9 +497,9 @@
        * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_askpskli$C_fyxmlizu;<init>(IILnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_rdaqiwdt;)V}
        * @mapping {@literal named <init> Lnet/minecraft/client/gui/screen/ingame/BeaconScreen$IconButtonWidget;<init>(IILnet/minecraft/util/Identifier;Lnet/minecraft/text/Text;)V}
        */
-      protected IconButtonWidget(int x, int y, Identifier texture, Text message) {
+      protected IconButtonWidget(int x, int y, Identifier id, Text message) {
          super(x, y, message);
-         this.texture = texture;
+         this.texture = id;
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.java	2024-09-25 08:03:14.966541253 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.java	2024-09-25 08:02:07.625229203 +0000
@@ -633,7 +633,7 @@
          predicate = idx -> idx.getNamespace().contains(string2) && idx.getPath().contains(string3);
       }
 
-      Registries.ITEM.getTags().map(HolderSet.NamedSet::getKey).filter(tag -> predicate.test(tag.id())).forEach(this.searchResultTags::add);
+      Registries.ITEM.streamBoundTags().map(HolderSet.NamedSet::getKey).filter(tag -> predicate.test(tag.id())).forEach(this.searchResultTags::add);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/EnchantmentScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/EnchantmentScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/EnchantmentScreen.java	2024-09-25 08:03:14.998541404 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/EnchantmentScreen.java	2024-09-25 08:02:07.666229401 +0000
@@ -264,7 +264,7 @@
             .world
             .getRegistryManager()
             .getLookupOrThrow(RegistryKeys.ENCHANTMENT)
-            .m_iotvxcay(this.handler.enchantmentId[l]);
+            .find(this.handler.enchantmentId[l]);
          if (!optional.isEmpty()) {
             int n = this.handler.enchantmentLevel[l];
             int o = l + 1;
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/PresetsScreen.java namedSrc/net/minecraft/client/gui/screen/PresetsScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/PresetsScreen.java	2024-09-25 08:03:15.114541952 +0000
+++ namedSrc/net/minecraft/client/gui/screen/PresetsScreen.java	2024-09-25 08:02:07.792230009 +0000
@@ -379,7 +379,7 @@
                PresetsScreen.LOGGER
                   .info(
                      "Discarding flat world preset {} since it contains experimental blocks {}",
-                     lv.getKey().map(registryKey -> registryKey.getValue().toString()).orElse("<unknown>"),
+                     lv.getKey().map(argx -> argx.getValue().toString()).orElse("<unknown>"),
                      set
                   );
             } else {
@@ -442,7 +442,7 @@
          public SuperflatPresetEntry(final Holder<FlatWorldGeneratorPreset> preset) {
             this.preset = preset.value();
             this.name = (Text)preset.getKey()
-               .map(registryKey -> Text.translatable(registryKey.getValue().toTranslationKey("flat_world_preset")))
+               .map(argx -> Text.translatable(argx.getValue().toTranslationKey("flat_world_preset")))
                .orElse(PresetsScreen.UNKNOWN_PRESET);
          }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/realms/RealmsResetWorldScreen.java namedSrc/net/minecraft/client/gui/screen/realms/RealmsResetWorldScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/realms/RealmsResetWorldScreen.java	2024-09-25 08:03:14.941541135 +0000
+++ namedSrc/net/minecraft/client/gui/screen/realms/RealmsResetWorldScreen.java	2024-09-25 08:02:07.597229068 +0000
@@ -470,9 +470,9 @@
        * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_jpqqwpue$C_awtthljb;<init>(Lnet/minecraft/unmapped/C_jpqqwpue;Lnet/minecraft/unmapped/C_mavozmpp;Lnet/minecraft/unmapped/C_rdaqiwdt;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_buwziidm$C_zlxjklbn;)V}
        * @mapping {@literal named <init> Lnet/minecraft/client/gui/screen/realms/RealmsResetWorldScreen$FrameButton;<init>(Lnet/minecraft/client/gui/screen/realms/RealmsResetWorldScreen;Lnet/minecraft/client/font/TextRenderer;Lnet/minecraft/text/Text;Lnet/minecraft/util/Identifier;Lnet/minecraft/client/gui/widget/button/ButtonWidget$PressAction;)V}
        */
-      FrameButton(final TextRenderer textRenderer, final Text message, final Identifier image, final ButtonWidget.PressAction onPress) {
+      FrameButton(final TextRenderer textRenderer, final Text message, final Identifier id, final ButtonWidget.PressAction onPress) {
          super(0, 0, 60, 60 + 9, message, onPress, DEFAULT_NARRATION);
-         this.image = image;
+         this.image = id;
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/SplashOverlay.java namedSrc/net/minecraft/client/gui/screen/SplashOverlay.java
--- namedTargetSrc/net/minecraft/client/gui/screen/SplashOverlay.java	2024-09-25 08:03:15.024541527 +0000
+++ namedSrc/net/minecraft/client/gui/screen/SplashOverlay.java	2024-09-25 08:02:07.686229497 +0000
@@ -202,8 +202,8 @@
       double e = d * 4.0;
       int z = (int)(e * 0.5);
       int aa = ArgbHelper.white(o);
-      graphics.m_fgoqvxux(arg -> RenderLayer.getMojangLogo(), LOGO, w - z, x - y, -0.0625F, 0.0F, z, (int)d, 120, 60, 120, 120, aa);
-      graphics.m_fgoqvxux(arg -> RenderLayer.getMojangLogo(), LOGO, w, x - y, 0.0625F, 60.0F, z, (int)d, 120, 60, 120, 120, aa);
+      graphics.m_fgoqvxux(id -> RenderLayer.getMojangLogo(), LOGO, w - z, x - y, -0.0625F, 0.0F, z, (int)d, 120, 60, 120, 120, aa);
+      graphics.m_fgoqvxux(id -> RenderLayer.getMojangLogo(), LOGO, w, x - y, 0.0625F, 60.0F, z, (int)d, 120, 60, 120, 120, aa);
       int ab = (int)((double)graphics.getScaledWindowHeight() * 0.8325);
       float ac = this.reload.getProgress();
       this.progress = MathHelper.clamp(this.progress * 0.95F + ac * 0.050000012F, 0.0F, 1.0F);
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/world/CreateWorldScreen.java namedSrc/net/minecraft/client/gui/screen/world/CreateWorldScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/world/CreateWorldScreen.java	2024-09-25 08:03:14.949541173 +0000
+++ namedSrc/net/minecraft/client/gui/screen/world/CreateWorldScreen.java	2024-09-25 08:02:07.606229111 +0000
@@ -267,7 +267,7 @@
       @Nullable Screen parent,
       Function<WorldLoader.DataLoadContext, GeneratorOptions> function,
       C_zugbgokk arg3,
-      RegistryKey<GeneratorType> registryKey,
+      RegistryKey<GeneratorType> value,
       C_vuympcpz arg5
    ) {
       showMessage(client, PREPARING);
@@ -284,9 +284,7 @@
          client
       );
       client.runTasks(completableFuture::isDone);
-      client.setScreen(
-         new CreateWorldScreen(client, parent, (WorldCreationContext)completableFuture.join(), Optional.of(registryKey), OptionalLong.empty(), arg5)
-      );
+      client.setScreen(new CreateWorldScreen(client, parent, (WorldCreationContext)completableFuture.join(), Optional.of(value), OptionalLong.empty(), arg5));
    }
 
    /**
@@ -409,7 +407,7 @@
       WorldDimensions.Baked lv2 = lv.selectedDimensions().bake(lv.datapackDimensions());
       LayeredRegistryManager<ServerRegistryLayer> lv3 = lv.worldgenRegistries().withReplacedLayers(ServerRegistryLayer.DIMENSIONS, lv2.toRegistryManager());
       Lifecycle lifecycle = FeatureFlags.containsDefault(lv.dataConfiguration().enabledFeatures()) ? Lifecycle.experimental() : Lifecycle.stable();
-      Lifecycle lifecycle2 = lv3.getCompositeManager().m_hlpdjttt();
+      Lifecycle lifecycle2 = lv3.getCompositeManager().getLifecycle();
       Lifecycle lifecycle3 = lifecycle2.add(lifecycle);
       boolean bl = !this.reopened && lifecycle2 == Lifecycle.stable();
       WorldInfo lv4 = this.createWorldInfo(lv2.specialWorldProperty() == WorldSaveProperties.WorldType.DEBUG);
@@ -622,9 +620,9 @@
       WorldLoader.<C_axyvksml, WorldCreationContext>load(
             lv,
             arg -> {
-               if (arg.datapackWorldgen().getLookupOrThrow(RegistryKeys.GENERATOR_TYPE).holders().findAny().isEmpty()) {
+               if (arg.datapackWorldgen().getLookupOrThrow(RegistryKeys.GENERATOR_TYPE).streamHolders().findAny().isEmpty()) {
                   throw new IllegalStateException("Needs at least one world preset to continue");
-               } else if (arg.datapackWorldgen().getLookupOrThrow(RegistryKeys.BIOME).holders().findAny().isEmpty()) {
+               } else if (arg.datapackWorldgen().getLookupOrThrow(RegistryKeys.BIOME).streamHolders().findAny().isEmpty()) {
                   throw new IllegalStateException("Needs at least one biome continue");
                } else {
                   WorldCreationContext lvx = this.worldCreator.getContext();

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

View the diff here (2/3): 
diff -bur namedTargetSrc/net/minecraft/client/gui/tooltip/TooltipRenderHelper.java namedSrc/net/minecraft/client/gui/tooltip/TooltipRenderHelper.java
--- namedTargetSrc/net/minecraft/client/gui/tooltip/TooltipRenderHelper.java	2024-09-25 08:03:15.066541725 +0000
+++ namedSrc/net/minecraft/client/gui/tooltip/TooltipRenderHelper.java	2024-09-25 08:02:07.737229743 +0000
@@ -61,29 +61,31 @@
     * @mapping {@literal hashed m_fvwksfuw Lnet/minecraft/unmapped/C_mkqzadhs;m_fvwksfuw(Lnet/minecraft/unmapped/C_sedilmty;IIIIILnet/minecraft/unmapped/C_ncpywfca;)V}
     * @mapping {@literal named renderBackground Lnet/minecraft/client/gui/tooltip/TooltipRenderHelper;renderBackground(Lnet/minecraft/client/gui/GuiGraphics;IIIIILnet/minecraft/util/Identifier;)V}
     */
-   public static void renderBackground(GuiGraphics graphics, int x, int y, int width, int height, int z, @Nullable Identifier arg2) {
+   public static void renderBackground(GuiGraphics graphics, int x, int y, int width, int height, int z, @Nullable Identifier id) {
       int n = x - 3 - 9;
       int o = y - 3 - 9;
       int p = width + 3 + 3 + 18;
       int q = height + 3 + 3 + 18;
       graphics.getMatrices().push();
       graphics.getMatrices().translate(0.0F, 0.0F, (float)z);
-      graphics.m_rixppaza(RenderLayer::getGuiTextured, m_lnrrnjvy(arg2), n, o, p, q);
-      graphics.m_rixppaza(RenderLayer::getGuiTextured, m_psgxchiu(arg2), n, o, p, q);
+      graphics.m_rixppaza(RenderLayer::getGuiTextured, m_lnrrnjvy(id), n, o, p, q);
+      graphics.m_rixppaza(RenderLayer::getGuiTextured, m_psgxchiu(id), n, o, p, q);
       graphics.getMatrices().pop();
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_lnrrnjvy Lnet/minecraft/unmapped/C_mkqzadhs;m_lnrrnjvy(Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_ncpywfca;}
+    * @mapping {@literal named m_lnrrnjvy Lnet/minecraft/client/gui/tooltip/TooltipRenderHelper;m_lnrrnjvy(Lnet/minecraft/util/Identifier;)Lnet/minecraft/util/Identifier;}
     */
-   private static Identifier m_lnrrnjvy(@Nullable Identifier arg) {
-      return arg == null ? f_cnbacymt : arg.withPath((UnaryOperator<String>)(string -> "tooltip/" + string + "_background"));
+   private static Identifier m_lnrrnjvy(@Nullable Identifier id) {
+      return id == null ? f_cnbacymt : id.withPath((UnaryOperator<String>)(string -> "tooltip/" + string + "_background"));
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_psgxchiu Lnet/minecraft/unmapped/C_mkqzadhs;m_psgxchiu(Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_ncpywfca;}
+    * @mapping {@literal named m_psgxchiu Lnet/minecraft/client/gui/tooltip/TooltipRenderHelper;m_psgxchiu(Lnet/minecraft/util/Identifier;)Lnet/minecraft/util/Identifier;}
     */
-   private static Identifier m_psgxchiu(@Nullable Identifier arg) {
-      return arg == null ? f_uqzlklzm : arg.withPath((UnaryOperator<String>)(string -> "tooltip/" + string + "_frame"));
+   private static Identifier m_psgxchiu(@Nullable Identifier id) {
+      return id == null ? f_uqzlklzm : id.withPath((UnaryOperator<String>)(string -> "tooltip/" + string + "_frame"));
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/button/LockButtonWidget.java namedSrc/net/minecraft/client/gui/widget/button/LockButtonWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/button/LockButtonWidget.java	2024-09-25 08:03:15.148542113 +0000
+++ namedSrc/net/minecraft/client/gui/widget/button/LockButtonWidget.java	2024-09-25 08:02:07.824230164 +0000
@@ -120,8 +120,8 @@
        * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_jjobpetg$C_hsyjefoi;<init>(Ljava/lang/String;ILnet/minecraft/unmapped/C_ncpywfca;)V}
        * @mapping {@literal named <init> Lnet/minecraft/client/gui/widget/button/LockButtonWidget$IconLocation;<init>(Ljava/lang/String;ILnet/minecraft/util/Identifier;)V}
        */
-      private IconLocation(final Identifier location) {
-         this.location = location;
+      private IconLocation(final Identifier id) {
+         this.location = id;
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/button/SpriteButtonWidget.java namedSrc/net/minecraft/client/gui/widget/button/SpriteButtonWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/button/SpriteButtonWidget.java	2024-09-25 08:03:15.180542264 +0000
+++ namedSrc/net/minecraft/client/gui/widget/button/SpriteButtonWidget.java	2024-09-25 08:02:07.854230308 +0000
@@ -192,9 +192,9 @@
        * @mapping {@literal named <init> Lnet/minecraft/client/gui/widget/button/SpriteButtonWidget$SpriteMessageButtonWidget;<init>(IILnet/minecraft/text/Text;IILnet/minecraft/util/Identifier;Lnet/minecraft/client/gui/widget/button/ButtonWidget$PressAction;Lnet/minecraft/client/gui/widget/button/ButtonWidget$NarrationFactory;)V}
        */
       protected SpriteMessageButtonWidget(
-         int i, int j, Text arg, int k, int l, Identifier arg2, ButtonWidget.PressAction arg3, @Nullable ButtonWidget.NarrationFactory arg4
+         int i, int j, Text arg, int k, int l, Identifier id, ButtonWidget.PressAction arg3, @Nullable ButtonWidget.NarrationFactory arg4
       ) {
-         super(i, j, arg, k, l, arg2, arg3, arg4);
+         super(i, j, arg, k, l, id, arg3, arg4);
       }
 
       /**
@@ -231,9 +231,9 @@
        * @mapping {@literal named <init> Lnet/minecraft/client/gui/widget/button/SpriteButtonWidget$SpriteOnlyButtonWidget;<init>(IILnet/minecraft/text/Text;IILnet/minecraft/util/Identifier;Lnet/minecraft/client/gui/widget/button/ButtonWidget$PressAction;Lnet/minecraft/client/gui/widget/button/ButtonWidget$NarrationFactory;)V}
        */
       protected SpriteOnlyButtonWidget(
-         int i, int j, Text arg, int k, int l, Identifier arg2, ButtonWidget.PressAction arg3, @Nullable ButtonWidget.NarrationFactory arg4
+         int i, int j, Text arg, int k, int l, Identifier id, ButtonWidget.PressAction arg3, @Nullable ButtonWidget.NarrationFactory arg4
       ) {
-         super(i, j, arg, k, l, arg2, arg3, arg4);
+         super(i, j, arg, k, l, id, arg3, arg4);
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/TexturedWidget.java namedSrc/net/minecraft/client/gui/widget/TexturedWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/TexturedWidget.java	2024-09-25 08:03:15.206542387 +0000
+++ namedSrc/net/minecraft/client/gui/widget/TexturedWidget.java	2024-09-25 08:02:07.881230439 +0000
@@ -89,9 +89,9 @@
        * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_zayqaxpx$C_dtwosnbx;<init>(IIIILnet/minecraft/unmapped/C_ncpywfca;)V}
        * @mapping {@literal named <init> Lnet/minecraft/client/gui/widget/TexturedWidget$Sprite;<init>(IIIILnet/minecraft/util/Identifier;)V}
        */
-      public Sprite(int x, int y, int width, int height, Identifier texture) {
+      public Sprite(int x, int y, int width, int height, Identifier id) {
          super(x, y, width, height);
-         this.texture = texture;
+         this.texture = id;
       }
 
       /**
@@ -129,9 +129,9 @@
        * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_zayqaxpx$C_wtzjlhrg;<init>(IIIILnet/minecraft/unmapped/C_ncpywfca;II)V}
        * @mapping {@literal named <init> Lnet/minecraft/client/gui/widget/TexturedWidget$Texture;<init>(IIIILnet/minecraft/util/Identifier;II)V}
        */
-      public Texture(int x, int y, int width, int height, Identifier texture, int textureWidth, int textureHeight) {
+      public Texture(int x, int y, int width, int height, Identifier id, int textureWidth, int textureHeight) {
          super(x, y, width, height);
-         this.texture = texture;
+         this.texture = id;
          this.textureWidth = textureWidth;
          this.textureHeight = textureHeight;
       }
diff -bur namedTargetSrc/net/minecraft/client/MinecraftClient.java namedSrc/net/minecraft/client/MinecraftClient.java
--- namedTargetSrc/net/minecraft/client/MinecraftClient.java	2024-09-25 08:03:14.983541333 +0000
+++ namedSrc/net/minecraft/client/MinecraftClient.java	2024-09-25 08:02:07.643229290 +0000
@@ -1753,7 +1753,7 @@
          }
       }
 
-      Registries.ITEM.holders().forEach(arg -> {
+      Registries.ITEM.streamHolders().forEach(arg -> {
          Item lvx = (Item)arg.value();
          String string = lvx.m_eryjwjll();
          String string2 = Text.translatable(string).getString();
diff -bur namedTargetSrc/net/minecraft/client/network/ClientCommandSource.java namedSrc/net/minecraft/client/network/ClientCommandSource.java
--- namedTargetSrc/net/minecraft/client/network/ClientCommandSource.java	2024-09-25 08:03:15.150542122 +0000
+++ namedSrc/net/minecraft/client/network/ClientCommandSource.java	2024-09-25 08:02:07.826230173 +0000
@@ -149,9 +149,9 @@
     */
    @Override
    public CompletableFuture<Suggestions> suggestRegistryElements(
-      RegistryKey<? extends Registry<?>> registryKey, CommandSource.ElementSuggestionType suggestionType, SuggestionsBuilder builder, CommandContext<?> context
+      RegistryKey<? extends Registry<?>> key, CommandSource.ElementSuggestionType suggestionType, SuggestionsBuilder builder, CommandContext<?> context
    ) {
-      return (CompletableFuture<Suggestions>)this.getRegistryManager().getLookup(registryKey).map(registry -> {
+      return (CompletableFuture<Suggestions>)this.getRegistryManager().getLookup(key).map(registry -> {
          this.suggestRegistryElements(registry, suggestionType, builder);
          return builder.buildFuture();
       }).orElseGet(() -> this.getCompletions(context));
diff -bur namedTargetSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java namedSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java
--- namedTargetSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java	2024-09-25 08:03:15.189542307 +0000
+++ namedSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java	2024-09-25 08:02:07.865230362 +0000
@@ -1918,11 +1918,11 @@
 
    /**
     * @mapping {@literal hashed m_rqcfgrmg Lnet/minecraft/unmapped/C_nuofrxvi;m_rqcfgrmg(Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_mnjlaveb$C_mlxyrlwl;)Lnet/minecraft/unmapped/C_tqxyjqsk$C_dbbudibo;}
-    * @mapping {@literal named m_rqcfgrmg Lnet/minecraft/client/network/ClientPlayNetworkHandler;m_rqcfgrmg(Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/registry/tag/TagNetworkSerialization$NetworkPayload;)Lnet/minecraft/registry/Registry$C_dbbudibo;}
+    * @mapping {@literal named m_rqcfgrmg Lnet/minecraft/client/network/ClientPlayNetworkHandler;m_rqcfgrmg(Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/registry/tag/TagNetworkSerialization$NetworkPayload;)Lnet/minecraft/registry/Registry$PendingTags;}
     */
-   private <T> Registry.C_dbbudibo<T> m_rqcfgrmg(RegistryKey<? extends Registry<? extends T>> registryKey, TagNetworkSerialization.NetworkPayload arg2) {
-      Registry<T> lv = this.clientRegistryManager.getLookupOrThrow(registryKey);
-      return lv.m_prsibeni(arg2.m_dvimurkf(lv));
+   private <T> Registry.PendingTags<T> m_rqcfgrmg(RegistryKey<? extends Registry<? extends T>> arg, TagNetworkSerialization.NetworkPayload payload) {
+      Registry<T> lv = this.clientRegistryManager.getLookupOrThrow(arg);
+      return lv.startTagReload(payload.deserialize(lv));
    }
 
    /**
@@ -1931,14 +1931,14 @@
    @Override
    public void onTagsSynchronization(TagsSynchronizationS2CPacket packet) {
       NetworkThreadUtils.forceMainThread(packet, this, this.client);
-      List<Registry.C_dbbudibo<?>> list = new ArrayList(packet.getGroups().size());
+      List<Registry.PendingTags<?>> list = new ArrayList(packet.getGroups().size());
       boolean bl = this.connection.isLocal();
-      packet.getGroups().forEach((registryKey, arg2) -> {
-         if (!bl || DynamicRegistrySync.m_wzlxyjqc(registryKey)) {
-            list.add(this.m_rqcfgrmg(registryKey, arg2));
+      packet.getGroups().forEach((arg, payload) -> {
+         if (!bl || DynamicRegistrySync.isSynced(arg)) {
+            list.add(this.m_rqcfgrmg(arg, payload));
          }
       });
-      list.forEach(Registry.C_dbbudibo::m_lucdhycj);
+      list.forEach(Registry.PendingTags::bind);
       this.f_vdcgenve = C_smdnyqwx.m_qszhlppm(this.clientRegistryManager, this.enabledFlags);
       List<ItemStack> list2 = List.copyOf(ItemGroups.getSearchGroup().getOrInitTabStacks());
       this.f_yzsmztuz.m_zndcnouo(list2);
diff -bur namedTargetSrc/net/minecraft/client/realms/RealmsWorldGeneratorType.java namedSrc/net/minecraft/client/realms/RealmsWorldGeneratorType.java
--- namedTargetSrc/net/minecraft/client/realms/RealmsWorldGeneratorType.java	2024-09-25 08:03:15.177542250 +0000
+++ namedSrc/net/minecraft/client/realms/RealmsWorldGeneratorType.java	2024-09-25 08:02:07.850230289 +0000
@@ -49,9 +49,9 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_oynhlvsg;<init>(Ljava/lang/String;IILnet/minecraft/unmapped/C_xhhleach;)V}
     * @mapping {@literal named <init> Lnet/minecraft/client/realms/RealmsWorldGeneratorType;<init>(Ljava/lang/String;IILnet/minecraft/registry/RegistryKey;)V}
     */
-   private RealmsWorldGeneratorType(final int id, final RegistryKey<GeneratorType> registryKey) {
+   private RealmsWorldGeneratorType(final int id, final RegistryKey<GeneratorType> arg) {
       this.id = id;
-      this.text = Text.translatable(registryKey.getValue().toTranslationKey("generator"));
+      this.text = Text.translatable(arg.getValue().toTranslationKey("generator"));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/render/debug/GameEventDebugRenderer.java namedSrc/net/minecraft/client/render/debug/GameEventDebugRenderer.java
--- namedTargetSrc/net/minecraft/client/render/debug/GameEventDebugRenderer.java	2024-09-25 08:03:15.024541527 +0000
+++ namedSrc/net/minecraft/client/render/debug/GameEventDebugRenderer.java	2024-09-25 08:02:07.686229497 +0000
@@ -162,8 +162,8 @@
     * @mapping {@literal hashed m_nvqidnmt Lnet/minecraft/unmapped/C_kgxeykxx;m_nvqidnmt(Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_vgpupfxx;)V}
     * @mapping {@literal named addEvent Lnet/minecraft/client/render/debug/GameEventDebugRenderer;addEvent(Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/util/math/Vec3d;)V}
     */
-   public void addEvent(RegistryKey<GameEvent> registryKey, Vec3d pos) {
-      this.entries.add(new GameEventDebugRenderer.Entry(Util.getMeasuringTimeMs(), registryKey, pos));
+   public void addEvent(RegistryKey<GameEvent> event, Vec3d pos) {
+      this.entries.add(new GameEventDebugRenderer.Entry(Util.getMeasuringTimeMs(), event, pos));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/render/debug/StructureDebugRenderer.java namedSrc/net/minecraft/client/render/debug/StructureDebugRenderer.java
--- namedTargetSrc/net/minecraft/client/render/debug/StructureDebugRenderer.java	2024-09-25 08:03:15.187542297 +0000
+++ namedSrc/net/minecraft/client/render/debug/StructureDebugRenderer.java	2024-09-25 08:02:07.863230352 +0000
@@ -138,10 +138,10 @@
     * @mapping {@literal hashed m_tmeqhmbo Lnet/minecraft/unmapped/C_jneftvkt;m_tmeqhmbo(Lnet/minecraft/unmapped/C_hmqypqzz;Ljava/util/List;Lnet/minecraft/unmapped/C_xhhleach;)V}
     * @mapping {@literal named addStructure Lnet/minecraft/client/render/debug/StructureDebugRenderer;addStructure(Lnet/minecraft/util/math/BlockBox;Ljava/util/List;Lnet/minecraft/registry/RegistryKey;)V}
     */
-   public void addStructure(BlockBox boundingBox, List<StructuresDebugPayload.Piece> piecesBoundingBoxes, RegistryKey<World> registryKey) {
-      ((Map)this.structureBoundingBoxes.computeIfAbsent(registryKey, registryKeyx -> new HashMap())).put(boundingBox.toString(), boundingBox);
+   public void addStructure(BlockBox boundingBox, List<StructuresDebugPayload.Piece> piecesBoundingBoxes, RegistryKey<World> key) {
+      ((Map)this.structureBoundingBoxes.computeIfAbsent(key, arg -> new HashMap())).put(boundingBox.toString(), boundingBox);
       Map<String, StructuresDebugPayload.Piece> map = (Map<String, StructuresDebugPayload.Piece>)this.boundingBoxPieces
-         .computeIfAbsent(registryKey, registryKeyx -> new HashMap());
+         .computeIfAbsent(key, arg -> new HashMap());
 
       for (StructuresDebugPayload.Piece lv : piecesBoundingBoxes) {
          map.put(lv.boundingBox().toString(), lv);
diff -bur namedTargetSrc/net/minecraft/client/render/entity/BoatEntityRenderer.java namedSrc/net/minecraft/client/render/entity/BoatEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/BoatEntityRenderer.java	2024-09-25 08:03:14.930541083 +0000
+++ namedSrc/net/minecraft/client/render/entity/BoatEntityRenderer.java	2024-09-25 08:02:07.579228981 +0000
@@ -52,7 +52,7 @@
          .collect(
             ImmutableMap.toImmutableMap(boatVariant -> boatVariant, variant -> Pair.of(m_cjkpqrnq(variant, isChest), this.getModel(context, variant, isChest)))
          );
-      this.f_aliiyrap = new Model.C_ihzqypnt(context.getPart(EntityModelLayers.BOAT), arg -> RenderLayer.getWaterMask());
+      this.f_aliiyrap = new Model.C_ihzqypnt(context.getPart(EntityModelLayers.BOAT), id -> RenderLayer.getWaterMask());
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/render/entity/feature/LlamaDecorFeatureRenderer.java namedSrc/net/minecraft/client/render/entity/feature/LlamaDecorFeatureRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/feature/LlamaDecorFeatureRenderer.java	2024-09-25 08:03:14.956541206 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/LlamaDecorFeatureRenderer.java	2024-09-25 08:02:07.615229154 +0000
@@ -65,9 +65,9 @@
     * @mapping {@literal hashed m_mfgrmedl Lnet/minecraft/unmapped/C_smzkjmlx;m_mfgrmedl(Lnet/minecraft/unmapped/C_cnszsxvd;Lnet/minecraft/unmapped/C_igrgeffe;Lnet/minecraft/unmapped/C_ivvdyrnm;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_ncpywfca;I)V}
     * @mapping {@literal named m_mfgrmedl Lnet/minecraft/client/render/entity/feature/LlamaDecorFeatureRenderer;m_mfgrmedl(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;Lnet/minecraft/unmapped/C_ivvdyrnm;Lnet/minecraft/item/ItemStack;Lnet/minecraft/util/Identifier;I)V}
     */
-   private void m_mfgrmedl(MatrixStack matrices, VertexConsumerProvider vertexConsumers, C_ivvdyrnm arg3, ItemStack stack, Identifier arg5, int i) {
+   private void m_mfgrmedl(MatrixStack matrices, VertexConsumerProvider vertexConsumers, C_ivvdyrnm arg3, ItemStack stack, Identifier id, int i) {
       LlamaEntityModel lv = arg3.f_vetzpkzw ? this.f_vgmqtflz : this.f_gwhswcjl;
       lv.setAngles(arg3);
-      this.f_cdikxozv.m_gzffgizr(C_mgbzsqdv.C_otwvbrdf.LLAMA_BODY, arg5, lv, stack, RenderLayer::getEntityCutoutNoCull, matrices, vertexConsumers, i);
+      this.f_cdikxozv.m_gzffgizr(C_mgbzsqdv.C_otwvbrdf.LLAMA_BODY, id, lv, stack, RenderLayer::getEntityCutoutNoCull, matrices, vertexConsumers, i);
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/render/entity/feature/SaddleFeatureRenderer.java namedSrc/net/minecraft/client/render/entity/feature/SaddleFeatureRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/feature/SaddleFeatureRenderer.java	2024-09-25 08:03:14.940541130 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/SaddleFeatureRenderer.java	2024-09-25 08:02:07.595229058 +0000
@@ -36,11 +36,11 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_wgzeroan;<init>(Lnet/minecraft/unmapped/C_mjeyymcw;Lnet/minecraft/unmapped/C_fouvqrqy;Lnet/minecraft/unmapped/C_fouvqrqy;Lnet/minecraft/unmapped/C_ncpywfca;)V}
     * @mapping {@literal named <init> Lnet/minecraft/client/render/entity/feature/SaddleFeatureRenderer;<init>(Lnet/minecraft/client/render/entity/feature/FeatureRendererContext;Lnet/minecraft/client/render/entity/model/EntityModel;Lnet/minecraft/client/render/entity/model/EntityModel;Lnet/minecraft/util/Identifier;)V}
     */
-   public SaddleFeatureRenderer(FeatureRendererContext<S, M> context, M arg2, M arg3, Identifier texture) {
+   public SaddleFeatureRenderer(FeatureRendererContext<S, M> context, M arg2, M arg3, Identifier id) {
       super(context);
       this.f_nkjsqulb = arg2;
       this.f_gxdscefv = arg3;
-      this.texture = texture;
+      this.texture = id;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/render/entity/feature/StuckObjectsFeatureRenderer.java namedSrc/net/minecraft/client/render/entity/feature/StuckObjectsFeatureRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/feature/StuckObjectsFeatureRenderer.java	2024-09-25 08:03:15.084541810 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/StuckObjectsFeatureRenderer.java	2024-09-25 08:02:07.757229840 +0000
@@ -26,9 +26,10 @@
     */
    private final Model f_ozfkfzvs;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_ovkqbzwt Lnet/minecraft/unmapped/C_puicivlk;f_ovkqbzwt:Lnet/minecraft/unmapped/C_ncpywfca;}
+    * @mapping {@literal named id Lnet/minecraft/client/render/entity/feature/StuckObjectsFeatureRenderer;id:Lnet/minecraft/util/Identifier;}
     */
-   private final Identifier f_ovkqbzwt;
+   private final Identifier id;
    /**
     * Mapping not found
     */
@@ -38,10 +39,10 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_puicivlk;<init>(Lnet/minecraft/unmapped/C_nbjmhtws;Lnet/minecraft/unmapped/C_lzwtpfka;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_puicivlk$C_muueptna;)V}
     * @mapping {@literal named <init> Lnet/minecraft/client/render/entity/feature/StuckObjectsFeatureRenderer;<init>(Lnet/minecraft/client/render/entity/LivingEntityRenderer;Lnet/minecraft/client/model/Model;Lnet/minecraft/util/Identifier;Lnet/minecraft/client/render/entity/feature/StuckObjectsFeatureRenderer$C_muueptna;)V}
     */
-   public StuckObjectsFeatureRenderer(LivingEntityRenderer<?, C_pkqgufgx, M> context, Model arg2, Identifier arg3, StuckObjectsFeatureRenderer.C_muueptna arg4) {
+   public StuckObjectsFeatureRenderer(LivingEntityRenderer<?, C_pkqgufgx, M> context, Model arg2, Identifier id, StuckObjectsFeatureRenderer.C_muueptna arg4) {
       super(context);
       this.f_ozfkfzvs = arg2;
-      this.f_ovkqbzwt = arg3;
+      this.id = id;
       this.f_iatkbbib = arg4;
    }
 
@@ -61,7 +62,7 @@
       float l = (float)(Math.atan2((double)directionY, (double)j) * 180.0F / (float)Math.PI);
       matrices.rotate(Axis.Y_POSITIVE.rotationDegrees(k - 90.0F));
       matrices.rotate(Axis.Z_POSITIVE.rotationDegrees(l));
-      this.f_ozfkfzvs.m_tivdiufh(matrices, vertexConsumers.getBuffer(this.f_ozfkfzvs.getLayer(this.f_ovkqbzwt)), light, OverlayTexture.DEFAULT_UV);
+      this.f_ozfkfzvs.m_tivdiufh(matrices, vertexConsumers.getBuffer(this.f_ozfkfzvs.getLayer(this.id)), light, OverlayTexture.DEFAULT_UV);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/render/entity/feature/VillagerClothingFeatureRenderer.java namedSrc/net/minecraft/client/render/entity/feature/VillagerClothingFeatureRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/feature/VillagerClothingFeatureRenderer.java	2024-09-25 08:03:15.208542396 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/VillagerClothingFeatureRenderer.java	2024-09-25 08:02:07.883230448 +0000
@@ -118,9 +118,9 @@
       Object2ObjectMap<K, VillagerResourceMetadata.HatType> hatLookUp, String keyType, DefaultedRegistry<K> registry, K key
    ) {
       return hatLookUp.computeIfAbsent(
-         key, object2 -> (VillagerResourceMetadata.HatType)this.resourceManager.getResource(this.findTexture(keyType, registry.getId(key))).flatMap(argx -> {
+         key, object2 -> (VillagerResourceMetadata.HatType)this.resourceManager.getResource(this.findTexture(keyType, registry.getId(key))).flatMap(arg -> {
                try {
-                  return argx.getMetadata().readSection(VillagerResourceMetadata.READER).map(VillagerResourceMetadata::getHatType);
+                  return arg.getMetadata().readSection(VillagerResourceMetadata.READER).map(VillagerResourceMetadata::getHatType);
                } catch (IOException var2) {
                   return Optional.empty();
                }
diff -bur namedTargetSrc/net/minecraft/client/render/entity/PlayerEntityRenderer.java namedSrc/net/minecraft/client/render/entity/PlayerEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/PlayerEntityRenderer.java	2024-09-25 08:03:15.167542203 +0000
+++ namedSrc/net/minecraft/client/render/entity/PlayerEntityRenderer.java	2024-09-25 08:02:07.843230255 +0000
@@ -299,23 +299,23 @@
     * @mapping {@literal hashed m_skywttwi Lnet/minecraft/unmapped/C_glzopqgl;m_skywttwi(Lnet/minecraft/unmapped/C_cnszsxvd;Lnet/minecraft/unmapped/C_igrgeffe;ILnet/minecraft/unmapped/C_ncpywfca;Z)V}
     * @mapping {@literal named renderRightArm Lnet/minecraft/client/render/entity/PlayerEntityRenderer;renderRightArm(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/util/Identifier;Z)V}
     */
-   public void renderRightArm(MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, Identifier texture, boolean bl) {
-      this.renderArm(matrices, vertexConsumers, light, texture, this.model.rightArm, bl);
+   public void renderRightArm(MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, Identifier id, boolean bl) {
+      this.renderArm(matrices, vertexConsumers, light, id, this.model.rightArm, bl);
    }
 
    /**
     * @mapping {@literal hashed m_spaomvdp Lnet/minecraft/unmapped/C_glzopqgl;m_spaomvdp(Lnet/minecraft/unmapped/C_cnszsxvd;Lnet/minecraft/unmapped/C_igrgeffe;ILnet/minecraft/unmapped/C_ncpywfca;Z)V}
     * @mapping {@literal named renderLeftArm Lnet/minecraft/client/render/entity/PlayerEntityRenderer;renderLeftArm(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/util/Identifier;Z)V}
     */
-   public void renderLeftArm(MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, Identifier texture, boolean bl) {
-      this.renderArm(matrices, vertexConsumers, light, texture, this.model.leftArm, bl);
+   public void renderLeftArm(MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, Identifier id, boolean bl) {
+      this.renderArm(matrices, vertexConsumers, light, id, this.model.leftArm, bl);
    }
 
    /**
     * @mapping {@literal hashed m_cxsilwbo Lnet/minecraft/unmapped/C_glzopqgl;m_cxsilwbo(Lnet/minecraft/unmapped/C_cnszsxvd;Lnet/minecraft/unmapped/C_igrgeffe;ILnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_rglqxnbw;Z)V}
     * @mapping {@literal named renderArm Lnet/minecraft/client/render/entity/PlayerEntityRenderer;renderArm(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/util/Identifier;Lnet/minecraft/client/model/ModelPart;Z)V}
     */
-   private void renderArm(MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, Identifier texture, ModelPart arm, boolean bl) {
+   private void renderArm(MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, Identifier id, ModelPart arm, boolean bl) {
       PlayerEntityModel lv = this.getModel();
       arm.resetTransform();
       arm.visible = true;
@@ -323,7 +323,7 @@
       lv.rightSleeve.visible = bl;
       lv.leftArm.roll = -0.1F;
       lv.rightArm.roll = 0.1F;
-      arm.render(matrices, vertexConsumers.getBuffer(RenderLayer.getEntityTranslucent(texture)), light, OverlayTexture.DEFAULT_UV);
+      arm.render(matrices, vertexConsumers.getBuffer(RenderLayer.getEntityTranslucent(id)), light, OverlayTexture.DEFAULT_UV);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/render/GameRenderer.java namedSrc/net/minecraft/client/render/GameRenderer.java
--- namedTargetSrc/net/minecraft/client/render/GameRenderer.java	2024-09-25 08:03:14.974541291 +0000
+++ namedSrc/net/minecraft/client/render/GameRenderer.java	2024-09-25 08:02:07.635229251 +0000
@@ -354,10 +354,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_svxrrlqv Lnet/minecraft/unmapped/C_sktkdoun;m_svxrrlqv(Lnet/minecraft/unmapped/C_ncpywfca;)V}
+    * @mapping {@literal named m_svxrrlqv Lnet/minecraft/client/render/GameRenderer;m_svxrrlqv(Lnet/minecraft/util/Identifier;)V}
     */
-   private void m_svxrrlqv(Identifier arg) {
-      this.f_xgsslhwt = arg;
+   private void m_svxrrlqv(Identifier id) {
+      this.f_xgsslhwt = id;
       this.shadersEnabled = true;
    }
 
diff -bur namedTargetSrc/net/minecraft/client/render/item/ItemModels.java namedSrc/net/minecraft/client/render/item/ItemModels.java
--- namedTargetSrc/net/minecraft/client/render/item/ItemModels.java	2024-09-25 08:03:15.106541914 +0000
+++ namedSrc/net/minecraft/client/render/item/ItemModels.java	2024-09-25 08:02:07.782229961 +0000
@@ -38,7 +38,7 @@
     */
    public ItemModels(BakedModelManager modelManager) {
       this.f_wisehwxj = modelManager::getMissingModel;
-      this.f_qrvogklc = arg2 -> modelManager.getModel(ModelIdentifier.inventory(arg2));
+      this.f_qrvogklc = id -> modelManager.getModel(ModelIdentifier.inventory(id));
    }
 
    /**
@@ -54,8 +54,8 @@
     * @mapping {@literal hashed m_tmglgggd Lnet/minecraft/unmapped/C_mcmbqsvm;m_tmglgggd(Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_nnhmhkbv;}
     * @mapping {@literal named m_tmglgggd Lnet/minecraft/client/render/item/ItemModels;m_tmglgggd(Lnet/minecraft/util/Identifier;)Lnet/minecraft/client/render/model/BakedModel;}
     */
-   public BakedModel m_tmglgggd(Identifier key) {
-      return (BakedModel)this.f_vmlyzphr.computeIfAbsent(key, this.f_qrvogklc);
+   public BakedModel m_tmglgggd(Identifier id) {
+      return (BakedModel)this.f_vmlyzphr.computeIfAbsent(id, this.f_qrvogklc);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/render/model/ModelLoader.java namedSrc/net/minecraft/client/render/model/ModelLoader.java
--- namedTargetSrc/net/minecraft/client/render/model/ModelLoader.java	2024-09-25 08:03:14.961541229 +0000
+++ namedSrc/net/minecraft/client/render/model/ModelLoader.java	2024-09-25 08:02:07.620229179 +0000
@@ -198,12 +198,13 @@
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_zeazndgo Lnet/minecraft/unmapped/C_gjnplkfz$C_qnxaydxn;m_zeazndgo(Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_nrqwmhri;}
+       * @mapping {@literal named m_zeazndgo Lnet/minecraft/client/render/model/ModelLoader$ModelLoaderBaker;m_zeazndgo(Lnet/minecraft/util/Identifier;)Lnet/minecraft/client/render/model/UnbakedModel;}
        */
-      private UnbakedModel m_zeazndgo(Identifier arg) {
-         UnbakedModel lv = (UnbakedModel)ModelLoader.this.f_fdoembiv.get(arg);
+      private UnbakedModel m_zeazndgo(Identifier id) {
+         UnbakedModel lv = (UnbakedModel)ModelLoader.this.f_fdoembiv.get(id);
          if (lv == null) {
-            ModelLoader.LOGGER.warn("Requested a model that was not discovered previously: {}", arg);
+            ModelLoader.LOGGER.warn("Requested a model that was not discovered previously: {}", id);
             return ModelLoader.this.model;
          } else {
             return lv;
diff -bur namedTargetSrc/net/minecraft/client/render/model/UnbakedModel.java namedSrc/net/minecraft/client/render/model/UnbakedModel.java
--- namedTargetSrc/net/minecraft/client/render/model/UnbakedModel.java	2024-09-25 08:03:14.954541196 +0000
+++ namedSrc/net/minecraft/client/render/model/UnbakedModel.java	2024-09-25 08:02:07.613229145 +0000
@@ -31,8 +31,9 @@
    @Environment(EnvType.CLIENT)
    public interface C_qnhehnbx {
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_ukijhnlq Lnet/minecraft/unmapped/C_nrqwmhri$C_qnhehnbx;m_ukijhnlq(Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_nrqwmhri;}
+       * @mapping {@literal named m_ukijhnlq Lnet/minecraft/client/render/model/UnbakedModel$C_qnhehnbx;m_ukijhnlq(Lnet/minecraft/util/Identifier;)Lnet/minecraft/client/render/model/UnbakedModel;}
        */
-      UnbakedModel m_ukijhnlq(Identifier arg);
+      UnbakedModel m_ukijhnlq(Identifier id);
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/render/RenderLayer.java namedSrc/net/minecraft/client/render/RenderLayer.java
--- namedTargetSrc/net/minecraft/client/render/RenderLayer.java	2024-09-25 08:03:15.145542099 +0000
+++ namedSrc/net/minecraft/client/render/RenderLayer.java	2024-09-25 08:02:07.822230154 +0000
@@ -929,13 +929,13 @@
     * @mapping {@literal named GUI_TEXTURED_OVERLAY Lnet/minecraft/client/render/RenderLayer;GUI_TEXTURED_OVERLAY:Ljava/util/function/Function;}
     */
    private static final Function<Identifier, RenderLayer> GUI_TEXTURED_OVERLAY = Util.memoize(
-      (Function<Identifier, RenderLayer>)(arg -> of(
+      (Function<Identifier, RenderLayer>)(id -> of(
             "gui_textured_overlay",
             VertexFormats.POSITION_TEXTURE_COLOR,
             VertexFormat.DrawMode.QUADS,
             1536,
             RenderLayer.MultiPhaseParameters.builder()
-               .texture(new RenderPhase.Texture(arg, TriState.DEFAULT, false))
+               .texture(new RenderPhase.Texture(id, TriState.DEFAULT, false))
                .shader(POSITION_TEX_COLOR_SHADER)
                .transparency(TRANSLUCENT_TRANSPARENCY)
                .depthTest(ALWAYS_DEPTH_TEST)
@@ -1378,7 +1378,7 @@
     * @mapping {@literal hashed m_soqxdpvf Lnet/minecraft/unmapped/C_tizlwnnv;m_soqxdpvf(Lnet/minecraft/unmapped/C_ncpywfca;FF)Lnet/minecraft/unmapped/C_tizlwnnv;}
     * @mapping {@literal named getBreezeWind Lnet/minecraft/client/render/RenderLayer;getBreezeWind(Lnet/minecraft/util/Identifier;FF)Lnet/minecraft/client/render/RenderLayer;}
     */
-   public static RenderLayer getBreezeWind(Identifier value, float x, float y) {
+   public static RenderLayer getBreezeWind(Identifier id, float x, float y) {
       return of(
          "breeze_wind",
          VertexFormats.POSITION_COLOR_TEXTURE_OVERLAY_LIGHT_NORMAL,
@@ -1388,7 +1388,7 @@
          true,
          RenderLayer.MultiPhaseParameters.builder()
             .shader(BREEZE_WIND_SHADER)
-            .texture(new RenderPhase.Texture(value, TriState.FALSE, false))
+            .texture(new RenderPhase.Texture(id, TriState.FALSE, false))
             .texturing(new RenderPhase.OffsetTexturing(x, y))
             .transparency(TRANSLUCENT_TRANSPARENCY)
             .cull(DISABLE_CULLING)
diff -bur namedTargetSrc/net/minecraft/client/render/RenderPhase.java namedSrc/net/minecraft/client/render/RenderPhase.java
--- namedTargetSrc/net/minecraft/client/render/RenderPhase.java	2024-09-25 08:03:15.064541716 +0000
+++ namedSrc/net/minecraft/client/render/RenderPhase.java	2024-09-25 08:02:07.733229724 +0000
@@ -1037,15 +1037,15 @@
        * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_yzzfidwp$C_litwwlrq;<init>(Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_jkoyijul;Z)V}
        * @mapping {@literal named <init> Lnet/minecraft/client/render/RenderPhase$Texture;<init>(Lnet/minecraft/util/Identifier;Lnet/minecraft/util/TriState;Z)V}
        */
-      public Texture(Identifier value, TriState blur, boolean mipmap) {
+      public Texture(Identifier id, TriState blur, boolean mipmap) {
          super(() -> {
             TextureManager lv = MinecraftClient.getInstance().getTextureManager();
-            AbstractTexture lv2 = lv.getTexture(value);
+            AbstractTexture lv2 = lv.getTexture(id);
             lv2.setFilter(blur.toBoolean(lv2.m_rrvkeoqf()), mipmap);
-            RenderSystem.setShaderTexture(0, value);
+            RenderSystem.setShaderTexture(0, id);
          }, () -> {
          });
-         this.id = Optional.of(value);
+         this.id = Optional.of(id);
          this.blur = blur;
          this.mipmap = mipmap;
       }
diff -bur namedTargetSrc/net/minecraft/client/render/TexturedRenderLayers.java namedSrc/net/minecraft/client/render/TexturedRenderLayers.java
--- namedTargetSrc/net/minecraft/client/render/TexturedRenderLayers.java	2024-09-25 08:03:15.113541947 +0000
+++ namedSrc/net/minecraft/client/render/TexturedRenderLayers.java	2024-09-25 08:02:07.790229999 +0000
@@ -179,7 +179,7 @@
     * @mapping {@literal named DECORATED_POT_PATTERN_TEXTURES Lnet/minecraft/client/render/TexturedRenderLayers;DECORATED_POT_PATTERN_TEXTURES:Ljava/util/Map;}
     */
    public static final Map<RegistryKey<DecoratedPotPattern>, Material> DECORATED_POT_PATTERN_TEXTURES = (Map<RegistryKey<DecoratedPotPattern>, Material>)Registries.DECORATED_POT_PATTERN
-      .holders()
+      .streamHolders()
       .collect(
          Collectors.toMap(Holder.Reference::getRegistryKey, pattern -> createDecoratedPotPatternTextureId(((DecoratedPotPattern)pattern.value()).assetId()))
       );
@@ -415,8 +415,8 @@
     * @mapping {@literal named getDecoratedPotPatternTextureId Lnet/minecraft/client/render/TexturedRenderLayers;getDecoratedPotPatternTextureId(Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/client/resource/Material;}
     */
    @Nullable
-   public static Material getDecoratedPotPatternTextureId(@Nullable RegistryKey<DecoratedPotPattern> registryKey) {
-      return registryKey == null ? null : (Material)DECORATED_POT_PATTERN_TEXTURES.get(registryKey);
+   public static Material getDecoratedPotPatternTextureId(@Nullable RegistryKey<DecoratedPotPattern> arg) {
+      return arg == null ? null : (Material)DECORATED_POT_PATTERN_TEXTURES.get(arg);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/texture/NativeImageBackedTexture.java namedSrc/net/minecraft/client/texture/NativeImageBackedTexture.java
--- namedTargetSrc/net/minecraft/client/texture/NativeImageBackedTexture.java	2024-09-25 08:03:14.943541144 +0000
+++ namedSrc/net/minecraft/client/texture/NativeImageBackedTexture.java	2024-09-25 08:02:07.600229082 +0000
@@ -115,9 +115,9 @@
     * Mapping not found
     */
    @Override
-   public void saveTo(Identifier textureId, Path directoryPath) throws IOException {
+   public void saveTo(Identifier id, Path directoryPath) throws IOException {
       if (this.image != null) {
-         String string = textureId.toUnderscoreSeparatedString() + ".png";
+         String string = id.toUnderscoreSeparatedString() + ".png";
          Path path2 = directoryPath.resolve(string);
          this.image.writeFile(path2);
       }
diff -bur namedTargetSrc/net/minecraft/client/texture/SpriteAtlasTexture.java namedSrc/net/minecraft/client/texture/SpriteAtlasTexture.java
--- namedTargetSrc/net/minecraft/client/texture/SpriteAtlasTexture.java	2024-09-25 08:03:15.155542146 +0000
+++ namedSrc/net/minecraft/client/texture/SpriteAtlasTexture.java	2024-09-25 08:02:07.830230192 +0000
@@ -156,8 +156,8 @@
     * Mapping not found
     */
    @Override
-   public void saveTo(Identifier textureId, Path directoryPath) throws IOException {
-      String string = textureId.toUnderscoreSeparatedString();
+   public void saveTo(Identifier id, Path directoryPath) throws IOException {
+      String string = id.toUnderscoreSeparatedString();
       TextureUtil.writeAsPng(directoryPath, string, this.getGlId(), this.mipLevel, this.width, this.height);
       dumpSpriteInfo(directoryPath, string, this.sprites);
    }
diff -bur namedTargetSrc/net/minecraft/client/texture/TextureManager.java namedSrc/net/minecraft/client/texture/TextureManager.java
--- namedTargetSrc/net/minecraft/client/texture/TextureManager.java	2024-09-25 08:03:15.040541603 +0000
+++ namedSrc/net/minecraft/client/texture/TextureManager.java	2024-09-25 08:02:07.703229579 +0000
@@ -279,12 +279,12 @@
          return;
       }
 
-      this.textures.forEach((arg, arg2) -> {
+      this.textures.forEach((id, arg2) -> {
          if (arg2 instanceof DumpableTexture lv) {
             try {
-               lv.saveTo(arg, path);
+               lv.saveTo(id, path);
             } catch (IOException var5) {
-               LOGGER.error("Failed to dump texture {}", arg, var5);
+               LOGGER.error("Failed to dump texture {}", id, var5);
             }
          }
       });
diff -bur namedTargetSrc/net/minecraft/client/toast/TutorialToast.java namedSrc/net/minecraft/client/toast/TutorialToast.java
--- namedTargetSrc/net/minecraft/client/toast/TutorialToast.java	2024-09-25 08:03:15.086541820 +0000
+++ namedSrc/net/minecraft/client/toast/TutorialToast.java	2024-09-25 08:02:07.758229845 +0000
@@ -18,9 +18,10 @@
 @Environment(EnvType.CLIENT)
 public class TutorialToast implements Toast {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_uqbarera Lnet/minecraft/unmapped/C_fbzposnd;f_uqbarera:Lnet/minecraft/unmapped/C_ncpywfca;}
+    * @mapping {@literal named ID Lnet/minecraft/client/toast/TutorialToast;ID:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier f_uqbarera = Identifier.ofDefault("toast/tutorial");
+   private static final Identifier ID = Identifier.ofDefault("toast/tutorial");
    /**
     * @mapping {@literal hashed f_uhgjtpsh Lnet/minecraft/unmapped/C_fbzposnd;f_uhgjtpsh:I}
     * @mapping {@literal named PROGRESS_BAR_WIDTH Lnet/minecraft/client/toast/TutorialToast;PROGRESS_BAR_WIDTH:I}
@@ -136,7 +137,7 @@
     */
    @Override
    public void draw(GuiGraphics graphics, TextRenderer textRenderer, long startTime) {
-      graphics.m_rixppaza(RenderLayer::getGuiTextured, f_uqbarera, 0, 0, this.getWidth(), this.getHeight());
+      graphics.m_rixppaza(RenderLayer::getGuiTextured, ID, 0, 0, this.getWidth(), this.getHeight());
       this.type.drawIcon(graphics, 6, 6);
       if (this.description == null) {
          graphics.drawText(textRenderer, this.title, 30, 12, -11534256, false);
@@ -217,16 +218,17 @@
       RIGHT_CLICK(Identifier.ofDefault("toast/right_click"));
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_axxeqmtb Lnet/minecraft/unmapped/C_fbzposnd$C_paqxhvoo;f_axxeqmtb:Lnet/minecraft/unmapped/C_ncpywfca;}
+       * @mapping {@literal named id Lnet/minecraft/client/toast/TutorialToast$Type;id:Lnet/minecraft/util/Identifier;}
        */
-      private final Identifier f_axxeqmtb;
+      private final Identifier id;
 
       /**
        * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_fbzposnd$C_paqxhvoo;<init>(Ljava/lang/String;ILnet/minecraft/unmapped/C_ncpywfca;)V}
        * @mapping {@literal named <init> Lnet/minecraft/client/toast/TutorialToast$Type;<init>(Ljava/lang/String;ILnet/minecraft/util/Identifier;)V}
        */
-      private Type(final Identifier arg) {
-         this.f_axxeqmtb = arg;
+      private Type(final Identifier id) {
+         this.id = id;
       }
 
       /**
@@ -234,7 +236,7 @@
        * @mapping {@literal named drawIcon Lnet/minecraft/client/toast/TutorialToast$Type;drawIcon(Lnet/minecraft/client/gui/GuiGraphics;II)V}
        */
       public void drawIcon(GuiGraphics graphics, int x, int y) {
-         graphics.m_rixppaza(RenderLayer::getGuiTextured, this.f_axxeqmtb, x, y, 20, 20);
+         graphics.m_rixppaza(RenderLayer::getGuiTextured, this.id, x, y, 20, 20);
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/world/GeneratorType.java namedSrc/net/minecraft/client/world/GeneratorType.java
--- namedTargetSrc/net/minecraft/client/world/GeneratorType.java	2024-09-25 08:03:15.120541981 +0000
+++ namedSrc/net/minecraft/client/world/GeneratorType.java	2024-09-25 08:02:07.800230048 +0000
@@ -26,7 +26,7 @@
     */
    public static final Codec<GeneratorType> DIRECT_CODEC = RecordCodecBuilder.<GeneratorType>create(
          instance -> instance.group(
-                  Codec.unboundedMap(RegistryKey.codec(RegistryKeys.DIMENSION), DimensionOptions.CODEC)
+                  Codec.unboundedMap(RegistryKey.createCodec(RegistryKeys.DIMENSION), DimensionOptions.CODEC)
                      .fieldOf("dimensions")
                      .forGetter(type -> type.dimensions)
                )
@@ -57,10 +57,10 @@
     */
    private ImmutableMap<RegistryKey<DimensionOptions>, DimensionOptions> m_jnmoajbr() {
       Builder<RegistryKey<DimensionOptions>, DimensionOptions> builder = ImmutableMap.builder();
-      WorldDimensions.streamInOrder(this.dimensions.keySet().stream()).forEach(registryKey -> {
-         DimensionOptions lv = (DimensionOptions)this.dimensions.get(registryKey);
+      WorldDimensions.streamInOrder(this.dimensions.keySet().stream()).forEach(arg -> {
+         DimensionOptions lv = (DimensionOptions)this.dimensions.get(arg);
          if (lv != null) {
-            builder.put(registryKey, lv);
+            builder.put(arg, lv);
          }
       });
       return builder.build();
diff -bur namedTargetSrc/net/minecraft/client/world/WorldCreator.java namedSrc/net/minecraft/client/world/WorldCreator.java
--- namedTargetSrc/net/minecraft/client/world/WorldCreator.java	2024-09-25 08:03:14.934541102 +0000
+++ namedSrc/net/minecraft/client/world/WorldCreator.java	2024-09-25 08:02:07.586229014 +0000
@@ -131,9 +131,7 @@
       context.initialWorldCreationOptions().disabledGameRules().forEach(arg -> this.gameRules.<GameRules.BooleanGameRule>get(arg).setValue(false, null));
       Optional.ofNullable(context.initialWorldCreationOptions().flatLevelPreset())
          .flatMap(
-            registryKey -> context.getWorldgenRegistryManager()
-                  .getLookup(RegistryKeys.FLAT_WORLD_GENERATOR_PRESET)
-                  .flatMap(registry -> registry.getHolder(registryKey))
+            arg2 -> context.getWorldgenRegistryManager().getLookup(RegistryKeys.FLAT_WORLD_GENERATOR_PRESET).flatMap(registry -> registry.getHolder(arg2))
          )
          .map(arg -> ((FlatWorldGeneratorPreset)arg.value()).generatorConfig())
          .ifPresent(arg -> this.updateContext(WorldScreenProvider.createFlatWorldModifier(arg)));
@@ -440,7 +438,7 @@
       Registry<GeneratorType> lv = this.getContext().getWorldgenRegistryManager().getLookupOrThrow(RegistryKeys.GENERATOR_TYPE);
       this.normalWorldTypes.clear();
       this.normalWorldTypes
-         .addAll((Collection)getWorldPresetList(lv, WorldPresetTags.NORMAL).orElseGet(() -> lv.holders().map(WorldCreator.WorldTypeEntry::new).toList()));
+         .addAll((Collection)getWorldPresetList(lv, WorldPresetTags.NORMAL).orElseGet(() -> lv.streamHolders().map(WorldCreator.WorldTypeEntry::new).toList()));
       this.extendedWorldTypes.clear();
       this.extendedWorldTypes.addAll((Collection)getWorldPresetList(lv, WorldPresetTags.EXTENDED).orElse(this.normalWorldTypes));
       Holder<GeneratorType> lv2 = this.worldType.preset();
@@ -456,7 +454,7 @@
     * @mapping {@literal named getWorldPreset Lnet/minecraft/client/world/WorldCreator;getWorldPreset(Lnet/minecraft/client/world/WorldCreationContext;Ljava/util/Optional;)Ljava/util/Optional;}
     */
    private static Optional<Holder<GeneratorType>> getWorldPreset(WorldCreationContext context, Optional<RegistryKey<GeneratorType>> generatorType) {
-      return generatorType.flatMap(registryKey -> context.getWorldgenRegistryManager().getLookupOrThrow(RegistryKeys.GENERATOR_TYPE).getHolder(registryKey));
+      return generatorType.flatMap(arg2 -> context.getWorldgenRegistryManager().getLookupOrThrow(RegistryKeys.GENERATOR_TYPE).getHolder(arg2));
    }
 
    /**
@@ -565,7 +563,7 @@
       public Text getName() {
          return (Text)Optional.ofNullable(this.preset)
             .flatMap(Holder::getKey)
-            .map(registryKey -> Text.translatable(registryKey.getValue().toTranslationKey("generator")))
+            .map(arg -> Text.translatable(arg.getValue().toTranslationKey("generator")))
             .orElse(CUSTOM);
       }
 
@@ -574,7 +572,7 @@
        * @mapping {@literal named isAmplified Lnet/minecraft/client/world/WorldCreator$WorldTypeEntry;isAmplified()Z}
        */
       public boolean isAmplified() {
-         return Optional.ofNullable(this.preset).flatMap(Holder::getKey).filter(registryKey -> registryKey.equals(GeneratorTypes.AMPLIFIED)).isPresent();
+         return Optional.ofNullable(this.preset).flatMap(Holder::getKey).filter(arg -> arg.equals(GeneratorTypes.AMPLIFIED)).isPresent();
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/world/WorldEventHandler.java namedSrc/net/minecraft/client/world/WorldEventHandler.java
--- namedTargetSrc/net/minecraft/client/world/WorldEventHandler.java	2024-09-25 08:03:14.942541139 +0000
+++ namedSrc/net/minecraft/client/world/WorldEventHandler.java	2024-09-25 08:02:07.598229072 +0000
@@ -139,7 +139,7 @@
             }
             break;
          case 1010:
-            this.world.getRegistryManager().getLookupOrThrow(RegistryKeys.JUKEBOX_SONG).m_iotvxcay(j).ifPresent(arg2 -> this.m_iawlkoaw(arg2, pos));
+            this.world.getRegistryManager().getLookupOrThrow(RegistryKeys.JUKEBOX_SONG).find(j).ifPresent(arg2 -> this.m_iawlkoaw(arg2, pos));
             break;
          case 1011:
             this.m_zcxlfcvo(pos);
diff -bur namedTargetSrc/net/minecraft/command/argument/ItemPredicateArgumentType.java namedSrc/net/minecraft/command/argument/ItemPredicateArgumentType.java
--- namedTargetSrc/net/minecraft/command/argument/ItemPredicateArgumentType.java	2024-09-25 08:03:14.940541130 +0000
+++ namedSrc/net/minecraft/command/argument/ItemPredicateArgumentType.java	2024-09-25 08:02:07.595229058 +0000
@@ -232,10 +232,10 @@
        * @mapping {@literal hashed m_efgkntvn Lnet/minecraft/unmapped/C_zelyotsz$C_wadhfwgl;m_efgkntvn(Lcom/mojang/brigadier/ImmutableStringReader;Lnet/minecraft/unmapped/C_ncpywfca;)Ljava/util/function/Predicate;}
        * @mapping {@literal named m_efgkntvn Lnet/minecraft/command/argument/ItemPredicateArgumentType$C_wadhfwgl;m_efgkntvn(Lcom/mojang/brigadier/ImmutableStringReader;Lnet/minecraft/util/Identifier;)Ljava/util/function/Predicate;}
        */
-      public Predicate<ItemStack> m_efgkntvn(ImmutableStringReader immutableStringReader, Identifier arg) throws CommandSyntaxException {
+      public Predicate<ItemStack> m_efgkntvn(ImmutableStringReader immutableStringReader, Identifier id) throws CommandSyntaxException {
          Holder.Reference<Item> lv = (Holder.Reference<Item>)this.f_xwwieyfc
-            .getHolder(RegistryKey.of(RegistryKeys.ITEM, arg))
-            .orElseThrow(() -> ItemPredicateArgumentType.ITEM_ID_INVALID_EXCEPTION.createWithContext(immutableStringReader, arg));
+            .getHolder(RegistryKey.of(RegistryKeys.ITEM, id))
+            .orElseThrow(() -> ItemPredicateArgumentType.ITEM_ID_INVALID_EXCEPTION.createWithContext(immutableStringReader, id));
          return stack -> stack.matches(lv);
       }
 
@@ -243,10 +243,10 @@
        * @mapping {@literal hashed m_wvjoubgz Lnet/minecraft/unmapped/C_zelyotsz$C_wadhfwgl;m_wvjoubgz(Lcom/mojang/brigadier/ImmutableStringReader;Lnet/minecraft/unmapped/C_ncpywfca;)Ljava/util/function/Predicate;}
        * @mapping {@literal named m_wvjoubgz Lnet/minecraft/command/argument/ItemPredicateArgumentType$C_wadhfwgl;m_wvjoubgz(Lcom/mojang/brigadier/ImmutableStringReader;Lnet/minecraft/util/Identifier;)Ljava/util/function/Predicate;}
        */
-      public Predicate<ItemStack> m_wvjoubgz(ImmutableStringReader immutableStringReader, Identifier arg) throws CommandSyntaxException {
+      public Predicate<ItemStack> m_wvjoubgz(ImmutableStringReader immutableStringReader, Identifier id) throws CommandSyntaxException {
          HolderSet<Item> lv = (HolderSet<Item>)this.f_xwwieyfc
-            .getTag(TagKey.of(RegistryKeys.ITEM, arg))
-            .orElseThrow(() -> ItemPredicateArgumentType.ITEM_TAG_UNKNOWN_EXCEPTION.createWithContext(immutableStringReader, arg));
+            .getTag(TagKey.of(RegistryKeys.ITEM, id))
+            .orElseThrow(() -> ItemPredicateArgumentType.ITEM_TAG_UNKNOWN_EXCEPTION.createWithContext(immutableStringReader, id));
          return stack -> stack.isIn(lv);
       }
 
@@ -254,16 +254,16 @@
        * @mapping {@literal hashed m_cnoyypou Lnet/minecraft/unmapped/C_zelyotsz$C_wadhfwgl;m_cnoyypou(Lcom/mojang/brigadier/ImmutableStringReader;Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_zelyotsz$C_weudnhcg;}
        * @mapping {@literal named m_tgelloxw Lnet/minecraft/command/argument/ItemPredicateArgumentType$C_wadhfwgl;m_tgelloxw(Lcom/mojang/brigadier/ImmutableStringReader;Lnet/minecraft/util/Identifier;)Lnet/minecraft/command/argument/ItemPredicateArgumentType$C_weudnhcg;}
        */
-      public ItemPredicateArgumentType.C_weudnhcg m_tgelloxw(ImmutableStringReader immutableStringReader, Identifier arg) throws CommandSyntaxException {
-         ItemPredicateArgumentType.C_weudnhcg lv = (ItemPredicateArgumentType.C_weudnhcg)ItemPredicateArgumentType.f_toutwicj.get(arg);
+      public ItemPredicateArgumentType.C_weudnhcg m_tgelloxw(ImmutableStringReader immutableStringReader, Identifier id) throws CommandSyntaxException {
+         ItemPredicateArgumentType.C_weudnhcg lv = (ItemPredicateArgumentType.C_weudnhcg)ItemPredicateArgumentType.f_toutwicj.get(id);
          if (lv != null) {
             return lv;
          } else {
             DataComponentType<?> lv2 = (DataComponentType<?>)this.f_jcaowuwh
-               .getHolder(RegistryKey.of(RegistryKeys.DATA_COMPONENT_TYPE, arg))
+               .getHolder(RegistryKey.of(RegistryKeys.DATA_COMPONENT_TYPE, id))
                .map(Holder::value)
-               .orElseThrow(() -> ItemPredicateArgumentType.ITEM_COMPONENT_UNKNOWN_EXCEPTION.createWithContext(immutableStringReader, arg));
-            return ItemPredicateArgumentType.C_weudnhcg.m_rkstoiss(immutableStringReader, arg, lv2);
+               .orElseThrow(() -> ItemPredicateArgumentType.ITEM_COMPONENT_UNKNOWN_EXCEPTION.createWithContext(immutableStringReader, id));
+            return ItemPredicateArgumentType.C_weudnhcg.m_rkstoiss(immutableStringReader, id, lv2);
          }
       }
 
@@ -287,14 +287,14 @@
        * @mapping {@literal hashed m_lbaihcsq Lnet/minecraft/unmapped/C_zelyotsz$C_wadhfwgl;m_lbaihcsq(Lcom/mojang/brigadier/ImmutableStringReader;Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_zelyotsz$C_vvlghner;}
        * @mapping {@literal named m_ylsaofiw Lnet/minecraft/command/argument/ItemPredicateArgumentType$C_wadhfwgl;m_ylsaofiw(Lcom/mojang/brigadier/ImmutableStringReader;Lnet/minecraft/util/Identifier;)Lnet/minecraft/command/argument/ItemPredicateArgumentType$C_vvlghner;}
        */
-      public ItemPredicateArgumentType.C_vvlghner m_ylsaofiw(ImmutableStringReader immutableStringReader, Identifier arg) throws CommandSyntaxException {
-         ItemPredicateArgumentType.C_vvlghner lv = (ItemPredicateArgumentType.C_vvlghner)ItemPredicateArgumentType.f_bljoiblj.get(arg);
+      public ItemPredicateArgumentType.C_vvlghner m_ylsaofiw(ImmutableStringReader immutableStringReader, Identifier id) throws CommandSyntaxException {
+         ItemPredicateArgumentType.C_vvlghner lv = (ItemPredicateArgumentType.C_vvlghner)ItemPredicateArgumentType.f_bljoiblj.get(id);
          return lv != null
             ? lv
             : (ItemPredicateArgumentType.C_vvlghner)this.f_jubyyvxm
-               .getHolder(RegistryKey.of(RegistryKeys.ITEM_SUB_PREDICATE_TYPE, arg))
+               .getHolder(RegistryKey.of(RegistryKeys.ITEM_SUB_PREDICATE_TYPE, id))
                .map(ItemPredicateArgumentType.C_vvlghner::new)
-               .orElseThrow(() -> ItemPredicateArgumentType.ITEM_PREDICATE_UNKNOWN_EXCEPTION.createWithContext(immutableStringReader, arg));
+               .orElseThrow(() -> ItemPredicateArgumentType.ITEM_PREDICATE_UNKNOWN_EXCEPTION.createWithContext(immutableStringReader, id));
       }
 
       /**
@@ -329,7 +329,7 @@
          return Stream.concat(
             ItemPredicateArgumentType.f_toutwicj.keySet().stream(),
             this.f_jcaowuwh
-               .holders()
+               .streamHolders()
                .filter(reference -> !((DataComponentType)reference.value()).isTransient())
                .map(reference -> reference.getRegistryKey().getValue())
          );
diff -bur namedTargetSrc/net/minecraft/command/argument/ItemStringReader.java namedSrc/net/minecraft/command/argument/ItemStringReader.java
--- namedTargetSrc/net/minecraft/command/argument/ItemStringReader.java	2024-09-25 08:03:15.109541929 +0000
+++ namedSrc/net/minecraft/command/argument/ItemStringReader.java	2024-09-25 08:02:07.785229975 +0000
@@ -380,7 +380,7 @@
          } else {
             int i = reader.getCursor();
             Identifier lv = Identifier.fromCommandInput(reader);
-            DataComponentType<?> lv2 = Registries.DATA_COMPONENT_TYPE.m_kxeijgiq(lv);
+            DataComponentType<?> lv2 = Registries.DATA_COMPONENT_TYPE.get(lv);
             if (lv2 != null && !lv2.isTransient()) {
                return lv2;
             } else {
diff -bur namedTargetSrc/net/minecraft/command/argument/RegistryEntryArgumentType.java namedSrc/net/minecraft/command/argument/RegistryEntryArgumentType.java
--- namedTargetSrc/net/minecraft/command/argument/RegistryEntryArgumentType.java	2024-09-25 08:03:15.083541806 +0000
+++ namedSrc/net/minecraft/command/argument/RegistryEntryArgumentType.java	2024-09-25 08:02:07.756229835 +0000
@@ -205,7 +205,7 @@
        * @mapping {@literal named serializeToNetwork Lnet/minecraft/command/argument/RegistryEntryArgumentType$TypeInfo;serializeToNetwork(Lnet/minecraft/command/argument/RegistryEntryArgumentType$TypeInfo$Template;Lnet/minecraft/network/PacketByteBuf;)V}
        */
       public void serializeToNetwork(RegistryEntryArgumentType.TypeInfo<T>.Template arg, PacketByteBuf buf) {
-         buf.writeRegistryKey(arg.registryKey);
+         buf.writeRegistryKey(arg.f_ruebpfes);
       }
 
       /**
@@ -221,7 +221,7 @@
        * @mapping {@literal named serializeToJson Lnet/minecraft/command/argument/RegistryEntryArgumentType$TypeInfo;serializeToJson(Lnet/minecraft/command/argument/RegistryEntryArgumentType$TypeInfo$Template;Lcom/google/gson/JsonObject;)V}
        */
       public void serializeToJson(RegistryEntryArgumentType.TypeInfo<T>.Template arg, JsonObject jsonObject) {
-         jsonObject.addProperty("registry", arg.registryKey.getValue().toString());
+         jsonObject.addProperty("registry", arg.f_ruebpfes.getValue().toString());
       }
 
       /**
@@ -238,17 +238,16 @@
        */
       public final class Template implements ArgumentTypeInfo.Template<RegistryEntryArgumentType<T>> {
          /**
-          * @mapping {@literal hashed f_ruebpfes Lnet/minecraft/unmapped/C_mymnmzsx$C_ipydwopz$C_bgcoghfg;f_ruebpfes:Lnet/minecraft/unmapped/C_xhhleach;}
-          * @mapping {@literal named registryKey Lnet/minecraft/command/argument/RegistryEntryArgumentType$TypeInfo$Template;registryKey:Lnet/minecraft/registry/RegistryKey;}
+          * Mapping not found
           */
-         final RegistryKey<? extends Registry<T>> registryKey;
+         final RegistryKey<? extends Registry<T>> f_ruebpfes;
 
          /**
           * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_mymnmzsx$C_ipydwopz$C_bgcoghfg;<init>(Lnet/minecraft/unmapped/C_mymnmzsx$C_ipydwopz;Lnet/minecraft/unmapped/C_xhhleach;)V}
           * @mapping {@literal named <init> Lnet/minecraft/command/argument/RegistryEntryArgumentType$TypeInfo$Template;<init>(Lnet/minecraft/command/argument/RegistryEntryArgumentType$TypeInfo;Lnet/minecraft/registry/RegistryKey;)V}
           */
-         Template(final RegistryKey<? extends Registry<T>> registryKey) {
-            this.registryKey = registryKey;
+         Template(final RegistryKey<? extends Registry<T>> arg2) {
+            this.f_ruebpfes = arg2;
          }
 
          /**
@@ -256,7 +255,7 @@
           * @mapping {@literal named instantiate Lnet/minecraft/command/argument/RegistryEntryArgumentType$TypeInfo$Template;instantiate(Lnet/minecraft/command/CommandBuildContext;)Lnet/minecraft/command/argument/RegistryEntryArgumentType;}
           */
          public RegistryEntryArgumentType<T> instantiate(CommandBuildContext arg) {
-            return new RegistryEntryArgumentType<>(arg, this.registryKey);
+            return new RegistryEntryArgumentType<>(arg, this.f_ruebpfes);
          }
 
          /**

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

View the diff here (3/3): 
diff -bur namedTargetSrc/net/minecraft/command/argument/RegistryEntryOrTagArgument.java namedSrc/net/minecraft/command/argument/RegistryEntryOrTagArgument.java
--- namedTargetSrc/net/minecraft/command/argument/RegistryEntryOrTagArgument.java	2024-09-25 08:03:14.922541045 +0000
+++ namedSrc/net/minecraft/command/argument/RegistryEntryOrTagArgument.java	2024-09-25 08:02:07.568228928 +0000
@@ -58,43 +58,40 @@
     */
    private final HolderLookup<T> lookup;
    /**
-    * @mapping {@literal hashed f_nbxmxsnf Lnet/minecraft/unmapped/C_bwiwqfgl;f_nbxmxsnf:Lnet/minecraft/unmapped/C_xhhleach;}
-    * @mapping {@literal named registryKey Lnet/minecraft/command/argument/RegistryEntryOrTagArgument;registryKey:Lnet/minecraft/registry/RegistryKey;}
+    * Mapping not found
     */
-   final RegistryKey<? extends Registry<T>> registryKey;
+   final RegistryKey<? extends Registry<T>> f_nbxmxsnf;
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_bwiwqfgl;<init>(Lnet/minecraft/unmapped/C_bprdujxm;Lnet/minecraft/unmapped/C_xhhleach;)V}
     * @mapping {@literal named <init> Lnet/minecraft/command/argument/RegistryEntryOrTagArgument;<init>(Lnet/minecraft/command/CommandBuildContext;Lnet/minecraft/registry/RegistryKey;)V}
     */
-   public RegistryEntryOrTagArgument(CommandBuildContext context, RegistryKey<? extends Registry<T>> registryKey) {
-      this.registryKey = registryKey;
-      this.lookup = context.getLookupOrThrow(registryKey);
+   public RegistryEntryOrTagArgument(CommandBuildContext context, RegistryKey<? extends Registry<T>> arg2) {
+      this.f_nbxmxsnf = arg2;
+      this.lookup = context.getLookupOrThrow(arg2);
    }
 
    /**
     * @mapping {@literal hashed m_kfwauvon Lnet/minecraft/unmapped/C_bwiwqfgl;m_kfwauvon(Lnet/minecraft/unmapped/C_bprdujxm;Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_bwiwqfgl;}
     * @mapping {@literal named create Lnet/minecraft/command/argument/RegistryEntryOrTagArgument;create(Lnet/minecraft/command/CommandBuildContext;Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/command/argument/RegistryEntryOrTagArgument;}
     */
-   public static <T> RegistryEntryOrTagArgument<T> create(CommandBuildContext context, RegistryKey<? extends Registry<T>> registryKey) {
-      return new RegistryEntryOrTagArgument<>(context, registryKey);
+   public static <T> RegistryEntryOrTagArgument<T> create(CommandBuildContext context, RegistryKey<? extends Registry<T>> arg2) {
+      return new RegistryEntryOrTagArgument<>(context, arg2);
    }
 
    /**
     * @mapping {@literal hashed m_vnamvtuc Lnet/minecraft/unmapped/C_bwiwqfgl;m_vnamvtuc(Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_bwiwqfgl$C_vxeoztnt;}
     * @mapping {@literal named getResult Lnet/minecraft/command/argument/RegistryEntryOrTagArgument;getResult(Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/command/argument/RegistryEntryOrTagArgument$Result;}
     */
-   public static <T> RegistryEntryOrTagArgument.Result<T> getResult(
-      CommandContext<ServerCommandSource> context, String name, RegistryKey<Registry<T>> registryKey
-   ) throws CommandSyntaxException {
+   public static <T> RegistryEntryOrTagArgument.Result<T> getResult(CommandContext<ServerCommandSource> context, String name, RegistryKey<Registry<T>> arg) throws CommandSyntaxException {
       RegistryEntryOrTagArgument.Result<?> lv = context.getArgument(name, RegistryEntryOrTagArgument.Result.class);
-      Optional<RegistryEntryOrTagArgument.Result<T>> optional = lv.castTo(registryKey);
+      Optional<RegistryEntryOrTagArgument.Result<T>> optional = lv.castTo(arg);
       return (RegistryEntryOrTagArgument.Result<T>)optional.orElseThrow(() -> lv.getResultValue().map(reference -> {
             RegistryKey<?> lvx = reference.getRegistryKey();
-            return RegistryEntryArgumentType.INVALID_REGISTRY_ENTRY_TYPE_EXCEPTION.create(lvx.getValue(), lvx.getRegistry(), registryKey.getValue());
+            return RegistryEntryArgumentType.INVALID_REGISTRY_ENTRY_TYPE_EXCEPTION.create(lvx.getValue(), lvx.getRegistry(), arg.getValue());
          }, namedSet -> {
             TagKey<?> lvx = namedSet.getKey();
-            return INVALID_TAG_EXCEPTION.create(lvx.id(), lvx.registry(), registryKey.getValue());
+            return INVALID_TAG_EXCEPTION.create(lvx.id(), lvx.registry(), arg.getValue());
          }));
    }
 
@@ -109,10 +106,10 @@
          try {
             reader.skip();
             Identifier lv = Identifier.fromCommandInput(reader);
-            TagKey<T> lv2 = TagKey.of(this.registryKey, lv);
+            TagKey<T> lv2 = TagKey.of(this.f_nbxmxsnf, lv);
             HolderSet.NamedSet<T> lv3 = (HolderSet.NamedSet<T>)this.lookup
                .getTag(lv2)
-               .orElseThrow(() -> NOT_FOUND_EXCEPTION.createWithContext(reader, lv, this.registryKey.getValue()));
+               .orElseThrow(() -> NOT_FOUND_EXCEPTION.createWithContext(reader, lv, this.f_nbxmxsnf.getValue()));
             return new RegistryEntryOrTagArgument.TagResult<>(lv3);
          } catch (CommandSyntaxException var6) {
             reader.setCursor(i);
@@ -120,10 +117,10 @@
          }
       } else {
          Identifier lv4 = Identifier.fromCommandInput(reader);
-         RegistryKey<T> lv5 = RegistryKey.of(this.registryKey, lv4);
+         RegistryKey<T> lv5 = RegistryKey.of(this.f_nbxmxsnf, lv4);
          Holder.Reference<T> lv6 = (Holder.Reference<T>)this.lookup
             .getHolder(lv5)
-            .orElseThrow(() -> RegistryEntryArgumentType.REGISTRY_ENTRY_NOT_FOUND_EXCEPTION.createWithContext(reader, lv4, this.registryKey.getValue()));
+            .orElseThrow(() -> RegistryEntryArgumentType.REGISTRY_ENTRY_NOT_FOUND_EXCEPTION.createWithContext(reader, lv4, this.f_nbxmxsnf.getValue()));
          return new RegistryEntryOrTagArgument.HolderResult<>(lv6);
       }
    }
@@ -164,8 +161,8 @@
        * Mapping not found
        */
       @Override
-      public <E> Optional<RegistryEntryOrTagArgument.Result<E>> castTo(RegistryKey<? extends Registry<E>> registryKey) {
-         return this.value.getRegistryKey().isOf(registryKey) ? Optional.of(this) : Optional.empty();
+      public <E> Optional<RegistryEntryOrTagArgument.Result<E>> castTo(RegistryKey<? extends Registry<E>> arg) {
+         return this.value.getRegistryKey().isOf(arg) ? Optional.of(this) : Optional.empty();
       }
 
       /**
@@ -195,7 +192,7 @@
        * @mapping {@literal named serializeToNetwork Lnet/minecraft/command/argument/RegistryEntryOrTagArgument$Info;serializeToNetwork(Lnet/minecraft/command/argument/RegistryEntryOrTagArgument$Info$Template;Lnet/minecraft/network/PacketByteBuf;)V}
        */
       public void serializeToNetwork(RegistryEntryOrTagArgument.Info<T>.Template arg, PacketByteBuf buf) {
-         buf.writeRegistryKey(arg.registryKey);
+         buf.writeRegistryKey(arg.f_qzhhszwx);
       }
 
       /**
@@ -211,7 +208,7 @@
        * @mapping {@literal named serializeToJson Lnet/minecraft/command/argument/RegistryEntryOrTagArgument$Info;serializeToJson(Lnet/minecraft/command/argument/RegistryEntryOrTagArgument$Info$Template;Lcom/google/gson/JsonObject;)V}
        */
       public void serializeToJson(RegistryEntryOrTagArgument.Info<T>.Template arg, JsonObject jsonObject) {
-         jsonObject.addProperty("registry", arg.registryKey.getValue().toString());
+         jsonObject.addProperty("registry", arg.f_qzhhszwx.getValue().toString());
       }
 
       /**
@@ -219,7 +216,7 @@
        * @mapping {@literal named unpack Lnet/minecraft/command/argument/RegistryEntryOrTagArgument$Info;unpack(Lnet/minecraft/command/argument/RegistryEntryOrTagArgument;)Lnet/minecraft/command/argument/RegistryEntryOrTagArgument$Info$Template;}
        */
       public RegistryEntryOrTagArgument.Info<T>.Template unpack(RegistryEntryOrTagArgument<T> arg) {
-         return new RegistryEntryOrTagArgument.Info.Template(arg.registryKey);
+         return new RegistryEntryOrTagArgument.Info.Template(arg.f_nbxmxsnf);
       }
 
       /**
@@ -228,17 +225,16 @@
        */
       public final class Template implements ArgumentTypeInfo.Template<RegistryEntryOrTagArgument<T>> {
          /**
-          * @mapping {@literal hashed f_qzhhszwx Lnet/minecraft/unmapped/C_bwiwqfgl$C_yhjqhzlk$C_itwjidak;f_qzhhszwx:Lnet/minecraft/unmapped/C_xhhleach;}
-          * @mapping {@literal named registryKey Lnet/minecraft/command/argument/RegistryEntryOrTagArgument$Info$Template;registryKey:Lnet/minecraft/registry/RegistryKey;}
+          * Mapping not found
           */
-         final RegistryKey<? extends Registry<T>> registryKey;
+         final RegistryKey<? extends Registry<T>> f_qzhhszwx;
 
          /**
           * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_bwiwqfgl$C_yhjqhzlk$C_itwjidak;<init>(Lnet/minecraft/unmapped/C_bwiwqfgl$C_yhjqhzlk;Lnet/minecraft/unmapped/C_xhhleach;)V}
           * @mapping {@literal named <init> Lnet/minecraft/command/argument/RegistryEntryOrTagArgument$Info$Template;<init>(Lnet/minecraft/command/argument/RegistryEntryOrTagArgument$Info;Lnet/minecraft/registry/RegistryKey;)V}
           */
-         Template(final RegistryKey<? extends Registry<T>> registryKey) {
-            this.registryKey = registryKey;
+         Template(final RegistryKey<? extends Registry<T>> arg2) {
+            this.f_qzhhszwx = arg2;
          }
 
          /**
@@ -246,7 +242,7 @@
           * @mapping {@literal named instantiate Lnet/minecraft/command/argument/RegistryEntryOrTagArgument$Info$Template;instantiate(Lnet/minecraft/command/CommandBuildContext;)Lnet/minecraft/command/argument/RegistryEntryOrTagArgument;}
           */
          public RegistryEntryOrTagArgument<T> instantiate(CommandBuildContext arg) {
-            return new RegistryEntryOrTagArgument<>(arg, this.registryKey);
+            return new RegistryEntryOrTagArgument<>(arg, this.f_qzhhszwx);
          }
 
          /**
@@ -274,7 +270,7 @@
        * @mapping {@literal hashed m_lkvgzdgo Lnet/minecraft/unmapped/C_bwiwqfgl$C_vxeoztnt;m_lkvgzdgo(Lnet/minecraft/unmapped/C_xhhleach;)Ljava/util/Optional;}
        * @mapping {@literal named castTo Lnet/minecraft/command/argument/RegistryEntryOrTagArgument$Result;castTo(Lnet/minecraft/registry/RegistryKey;)Ljava/util/Optional;}
        */
-      <E> Optional<RegistryEntryOrTagArgument.Result<E>> castTo(RegistryKey<? extends Registry<E>> registryKey);
+      <E> Optional<RegistryEntryOrTagArgument.Result<E>> castTo(RegistryKey<? extends Registry<E>> arg);
 
       /**
        * @mapping {@literal hashed m_wnaoukry Lnet/minecraft/unmapped/C_bwiwqfgl$C_vxeoztnt;m_wnaoukry()Ljava/lang/String;}
@@ -300,8 +296,8 @@
        * Mapping not found
        */
       @Override
-      public <E> Optional<RegistryEntryOrTagArgument.Result<E>> castTo(RegistryKey<? extends Registry<E>> registryKey) {
-         return this.tag.getKey().isOfRegistry(registryKey) ? Optional.of(this) : Optional.empty();
+      public <E> Optional<RegistryEntryOrTagArgument.Result<E>> castTo(RegistryKey<? extends Registry<E>> arg) {
+         return this.tag.getKey().isOfRegistry(arg) ? Optional.of(this) : Optional.empty();
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/command/argument/RegistryKeyOrTagKeyResult.java namedSrc/net/minecraft/command/argument/RegistryKeyOrTagKeyResult.java
--- namedTargetSrc/net/minecraft/command/argument/RegistryKeyOrTagKeyResult.java	2024-09-25 08:03:15.102541896 +0000
+++ namedSrc/net/minecraft/command/argument/RegistryKeyOrTagKeyResult.java	2024-09-25 08:02:07.778229941 +0000
@@ -35,25 +35,24 @@
     */
    private static final Collection<String> EXAMPLES = Arrays.asList("foo", "foo:bar", "012", "#skeletons", "#minecraft:skeletons");
    /**
-    * @mapping {@literal hashed f_zqlvjvdr Lnet/minecraft/unmapped/C_ybgoyqmh;f_zqlvjvdr:Lnet/minecraft/unmapped/C_xhhleach;}
-    * @mapping {@literal named registryKey Lnet/minecraft/command/argument/RegistryKeyOrTagKeyResult;registryKey:Lnet/minecraft/registry/RegistryKey;}
+    * Mapping not found
     */
-   final RegistryKey<? extends Registry<T>> registryKey;
+   final RegistryKey<? extends Registry<T>> f_zqlvjvdr;
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_ybgoyqmh;<init>(Lnet/minecraft/unmapped/C_xhhleach;)V}
     * @mapping {@literal named <init> Lnet/minecraft/command/argument/RegistryKeyOrTagKeyResult;<init>(Lnet/minecraft/registry/RegistryKey;)V}
     */
-   public RegistryKeyOrTagKeyResult(RegistryKey<? extends Registry<T>> registryKey) {
-      this.registryKey = registryKey;
+   public RegistryKeyOrTagKeyResult(RegistryKey<? extends Registry<T>> arg) {
+      this.f_zqlvjvdr = arg;
    }
 
    /**
     * @mapping {@literal hashed m_tvljewfq Lnet/minecraft/unmapped/C_ybgoyqmh;m_tvljewfq(Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_ybgoyqmh;}
     * @mapping {@literal named create Lnet/minecraft/command/argument/RegistryKeyOrTagKeyResult;create(Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/command/argument/RegistryKeyOrTagKeyResult;}
     */
-   public static <T> RegistryKeyOrTagKeyResult<T> create(RegistryKey<? extends Registry<T>> registryKey) {
-      return new RegistryKeyOrTagKeyResult<>(registryKey);
+   public static <T> RegistryKeyOrTagKeyResult<T> create(RegistryKey<? extends Registry<T>> arg) {
+      return new RegistryKeyOrTagKeyResult<>(arg);
    }
 
    /**
@@ -61,10 +60,10 @@
     * @mapping {@literal named getResult Lnet/minecraft/command/argument/RegistryKeyOrTagKeyResult;getResult(Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;Lnet/minecraft/registry/RegistryKey;Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;)Lnet/minecraft/command/argument/RegistryKeyOrTagKeyResult$Result;}
     */
    public static <T> RegistryKeyOrTagKeyResult.Result<T> getResult(
-      CommandContext<ServerCommandSource> context, String name, RegistryKey<Registry<T>> registryKey, DynamicCommandExceptionType exception
+      CommandContext<ServerCommandSource> context, String name, RegistryKey<Registry<T>> arg, DynamicCommandExceptionType exception
    ) throws CommandSyntaxException {
       RegistryKeyOrTagKeyResult.Result<?> lv = context.getArgument(name, RegistryKeyOrTagKeyResult.Result.class);
-      Optional<RegistryKeyOrTagKeyResult.Result<T>> optional = lv.castTo(registryKey);
+      Optional<RegistryKeyOrTagKeyResult.Result<T>> optional = lv.castTo(arg);
       return (RegistryKeyOrTagKeyResult.Result<T>)optional.orElseThrow(() -> exception.create(lv));
    }
 
@@ -79,14 +78,14 @@
          try {
             reader.skip();
             Identifier lv = Identifier.fromCommandInput(reader);
-            return new RegistryKeyOrTagKeyResult.TagResult<>(TagKey.of(this.registryKey, lv));
+            return new RegistryKeyOrTagKeyResult.TagResult<>(TagKey.of(this.f_zqlvjvdr, lv));
          } catch (CommandSyntaxException var4) {
             reader.setCursor(i);
             throw var4;
          }
       } else {
          Identifier lv2 = Identifier.fromCommandInput(reader);
-         return new RegistryKeyOrTagKeyResult.RegistryKeyResult<>(RegistryKey.of(this.registryKey, lv2));
+         return new RegistryKeyOrTagKeyResult.RegistryKeyResult<>(RegistryKey.of(this.f_zqlvjvdr, lv2));
       }
    }
 
@@ -97,7 +96,7 @@
    @Override
    public <S> CompletableFuture<Suggestions> listSuggestions(CommandContext<S> context, SuggestionsBuilder builder) {
       return context.getSource() instanceof CommandSource lv
-         ? lv.suggestRegistryElements(this.registryKey, CommandSource.ElementSuggestionType.ALL, builder, context)
+         ? lv.suggestRegistryElements(this.f_zqlvjvdr, CommandSource.ElementSuggestionType.ALL, builder, context)
          : builder.buildFuture();
    }
 
@@ -120,7 +119,7 @@
        * @mapping {@literal named serializeToNetwork Lnet/minecraft/command/argument/RegistryKeyOrTagKeyResult$Info;serializeToNetwork(Lnet/minecraft/command/argument/RegistryKeyOrTagKeyResult$Info$Template;Lnet/minecraft/network/PacketByteBuf;)V}
        */
       public void serializeToNetwork(RegistryKeyOrTagKeyResult.Info<T>.Template arg, PacketByteBuf buf) {
-         buf.writeRegistryKey(arg.registryKey);
+         buf.writeRegistryKey(arg.f_osltangg);
       }
 
       /**
@@ -136,7 +135,7 @@
        * @mapping {@literal named serializeToJson Lnet/minecraft/command/argument/RegistryKeyOrTagKeyResult$Info;serializeToJson(Lnet/minecraft/command/argument/RegistryKeyOrTagKeyResult$Info$Template;Lcom/google/gson/JsonObject;)V}
        */
       public void serializeToJson(RegistryKeyOrTagKeyResult.Info<T>.Template arg, JsonObject jsonObject) {
-         jsonObject.addProperty("registry", arg.registryKey.getValue().toString());
+         jsonObject.addProperty("registry", arg.f_osltangg.getValue().toString());
       }
 
       /**
@@ -144,7 +143,7 @@
        * @mapping {@literal named unpack Lnet/minecraft/command/argument/RegistryKeyOrTagKeyResult$Info;unpack(Lnet/minecraft/command/argument/RegistryKeyOrTagKeyResult;)Lnet/minecraft/command/argument/RegistryKeyOrTagKeyResult$Info$Template;}
        */
       public RegistryKeyOrTagKeyResult.Info<T>.Template unpack(RegistryKeyOrTagKeyResult<T> arg) {
-         return new RegistryKeyOrTagKeyResult.Info.Template(arg.registryKey);
+         return new RegistryKeyOrTagKeyResult.Info.Template(arg.f_zqlvjvdr);
       }
 
       /**
@@ -153,17 +152,16 @@
        */
       public final class Template implements ArgumentTypeInfo.Template<RegistryKeyOrTagKeyResult<T>> {
          /**
-          * @mapping {@literal hashed f_osltangg Lnet/minecraft/unmapped/C_ybgoyqmh$C_mdlaqxgp$C_lwhxrgaj;f_osltangg:Lnet/minecraft/unmapped/C_xhhleach;}
-          * @mapping {@literal named registryKey Lnet/minecraft/command/argument/RegistryKeyOrTagKeyResult$Info$Template;registryKey:Lnet/minecraft/registry/RegistryKey;}
+          * Mapping not found
           */
-         final RegistryKey<? extends Registry<T>> registryKey;
+         final RegistryKey<? extends Registry<T>> f_osltangg;
 
          /**
           * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_ybgoyqmh$C_mdlaqxgp$C_lwhxrgaj;<init>(Lnet/minecraft/unmapped/C_ybgoyqmh$C_mdlaqxgp;Lnet/minecraft/unmapped/C_xhhleach;)V}
           * @mapping {@literal named <init> Lnet/minecraft/command/argument/RegistryKeyOrTagKeyResult$Info$Template;<init>(Lnet/minecraft/command/argument/RegistryKeyOrTagKeyResult$Info;Lnet/minecraft/registry/RegistryKey;)V}
           */
-         Template(final RegistryKey<? extends Registry<T>> registryKey) {
-            this.registryKey = registryKey;
+         Template(final RegistryKey<? extends Registry<T>> arg2) {
+            this.f_osltangg = arg2;
          }
 
          /**
@@ -171,7 +169,7 @@
           * @mapping {@literal named instantiate Lnet/minecraft/command/argument/RegistryKeyOrTagKeyResult$Info$Template;instantiate(Lnet/minecraft/command/CommandBuildContext;)Lnet/minecraft/command/argument/RegistryKeyOrTagKeyResult;}
           */
          public RegistryKeyOrTagKeyResult<T> instantiate(CommandBuildContext arg) {
-            return new RegistryKeyOrTagKeyResult<>(this.registryKey);
+            return new RegistryKeyOrTagKeyResult<>(this.f_osltangg);
          }
 
          /**
@@ -201,8 +199,8 @@
        * Mapping not found
        */
       @Override
-      public <E> Optional<RegistryKeyOrTagKeyResult.Result<E>> castTo(RegistryKey<? extends Registry<E>> registryKey) {
-         return this.key.cast(registryKey).map(RegistryKeyOrTagKeyResult.RegistryKeyResult::new);
+      public <E> Optional<RegistryKeyOrTagKeyResult.Result<E>> castTo(RegistryKey<? extends Registry<E>> arg) {
+         return this.key.cast(arg).map(RegistryKeyOrTagKeyResult.RegistryKeyResult::new);
       }
 
       /**
@@ -237,7 +235,7 @@
        * @mapping {@literal hashed m_ynmuoeuc Lnet/minecraft/unmapped/C_ybgoyqmh$C_rckobmqr;m_ynmuoeuc(Lnet/minecraft/unmapped/C_xhhleach;)Ljava/util/Optional;}
        * @mapping {@literal named castTo Lnet/minecraft/command/argument/RegistryKeyOrTagKeyResult$Result;castTo(Lnet/minecraft/registry/RegistryKey;)Ljava/util/Optional;}
        */
-      <E> Optional<RegistryKeyOrTagKeyResult.Result<E>> castTo(RegistryKey<? extends Registry<E>> registryKey);
+      <E> Optional<RegistryKeyOrTagKeyResult.Result<E>> castTo(RegistryKey<? extends Registry<E>> arg);
 
       /**
        * @mapping {@literal hashed m_uysvgqki Lnet/minecraft/unmapped/C_ybgoyqmh$C_rckobmqr;m_uysvgqki()Ljava/lang/String;}
@@ -263,8 +261,8 @@
        * Mapping not found
        */
       @Override
-      public <E> Optional<RegistryKeyOrTagKeyResult.Result<E>> castTo(RegistryKey<? extends Registry<E>> registryKey) {
-         return this.key.cast(registryKey).map(RegistryKeyOrTagKeyResult.TagResult::new);
+      public <E> Optional<RegistryKeyOrTagKeyResult.Result<E>> castTo(RegistryKey<? extends Registry<E>> arg) {
+         return this.key.cast(arg).map(RegistryKeyOrTagKeyResult.TagResult::new);
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/command/argument/ResourceKeyArgument.java namedSrc/net/minecraft/command/argument/ResourceKeyArgument.java
--- namedTargetSrc/net/minecraft/command/argument/ResourceKeyArgument.java	2024-09-25 08:03:15.078541782 +0000
+++ namedSrc/net/minecraft/command/argument/ResourceKeyArgument.java	2024-09-25 08:02:07.752229816 +0000
@@ -84,10 +84,10 @@
     * @mapping {@literal named getKey Lnet/minecraft/command/argument/ResourceKeyArgument;getKey(Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;Lnet/minecraft/registry/RegistryKey;Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;)Lnet/minecraft/registry/RegistryKey;}
     */
    private static <T> RegistryKey<T> getKey(
-      CommandContext<ServerCommandSource> context, String id, RegistryKey<Registry<T>> registryKey, DynamicCommandExceptionType exception
+      CommandContext<ServerCommandSource> context, String id, RegistryKey<Registry<T>> registry, DynamicCommandExceptionType exception
    ) throws CommandSyntaxException {
       RegistryKey<?> lv = context.getArgument(id, RegistryKey.class);
-      Optional<RegistryKey<T>> optional = lv.cast(registryKey);
+      Optional<RegistryKey<T>> optional = lv.cast(registry);
       return (RegistryKey<T>)optional.orElseThrow(() -> exception.create(lv));
    }
 
@@ -104,10 +104,10 @@
     * @mapping {@literal named get Lnet/minecraft/command/argument/ResourceKeyArgument;get(Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;Lnet/minecraft/registry/RegistryKey;Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;)Lnet/minecraft/registry/Holder$Reference;}
     */
    private static <T> Holder.Reference<T> get(
-      CommandContext<ServerCommandSource> context, String id, RegistryKey<Registry<T>> registryKey, DynamicCommandExceptionType exception
+      CommandContext<ServerCommandSource> context, String id, RegistryKey<Registry<T>> arg, DynamicCommandExceptionType exception
    ) throws CommandSyntaxException {
-      RegistryKey<T> lv = getKey(context, id, registryKey, exception);
-      return (Holder.Reference<T>)getRegistry(context, registryKey).getHolder(lv).orElseThrow(() -> exception.create(lv.getValue()));
+      RegistryKey<T> lv = getKey(context, id, arg, exception);
+      return (Holder.Reference<T>)getRegistry(context, arg).getHolder(lv).orElseThrow(() -> exception.create(lv.getValue()));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/command/CommandBuildContext.java namedSrc/net/minecraft/command/CommandBuildContext.java
--- namedTargetSrc/net/minecraft/command/CommandBuildContext.java	2024-09-25 08:03:15.090541839 +0000
+++ namedSrc/net/minecraft/command/CommandBuildContext.java	2024-09-25 08:02:07.762229864 +0000
@@ -22,8 +22,8 @@
           * Mapping not found
           */
          @Override
-         public Stream<RegistryKey<? extends Registry<?>>> m_vwprjgpp() {
-            return provider.m_vwprjgpp();
+         public Stream<RegistryKey<? extends Registry<?>>> streamRegistryKeys() {
+            return provider.streamRegistryKeys();
          }
 
          /**
diff -bur namedTargetSrc/net/minecraft/command/CommandSource.java namedSrc/net/minecraft/command/CommandSource.java
--- namedTargetSrc/net/minecraft/command/CommandSource.java	2024-09-25 08:03:15.124541999 +0000
+++ namedSrc/net/minecraft/command/CommandSource.java	2024-09-25 08:02:07.804230067 +0000
@@ -114,7 +114,7 @@
     */
    default void suggestRegistryElements(Registry<?> registry, CommandSource.ElementSuggestionType suggestionType, SuggestionsBuilder builder) {
       if (suggestionType.shouldSuggestTags()) {
-         suggestResource(registry.getTags().map(arg -> arg.getKey().id()), builder, "#");
+         suggestResource(registry.streamBoundTags().map(arg -> arg.getKey().id()), builder, "#");
       }
 
       if (suggestionType.shouldSuggestElements()) {
@@ -196,7 +196,7 @@
     */
    static CompletableFuture<Suggestions> suggestIdentifiers(Iterable<Identifier> candidates, SuggestionsBuilder builder) {
       String string = builder.getRemaining().toLowerCase(Locale.ROOT);
-      forEachMatching(candidates, string, id -> id, arg -> builder.suggest(arg.toString()));
+      forEachMatching(candidates, string, id -> id, id -> builder.suggest(id.toString()));
       return builder.buildFuture();
    }
 
diff -bur namedTargetSrc/net/minecraft/command/EntitySelectorOptions.java namedSrc/net/minecraft/command/EntitySelectorOptions.java
--- namedTargetSrc/net/minecraft/command/EntitySelectorOptions.java	2024-09-25 08:03:15.173542231 +0000
+++ namedSrc/net/minecraft/command/EntitySelectorOptions.java	2024-09-25 08:02:07.848230279 +0000
@@ -315,10 +315,10 @@
          putOption("type", arg -> {
             arg.setSuggestionProvider((builder, consumer) -> {
                CommandSource.suggestIdentifiers(Registries.ENTITY_TYPE.getIds(), builder, String.valueOf('!'));
-               CommandSource.suggestResource(Registries.ENTITY_TYPE.getTags().map(argxx -> argxx.getKey().id()), builder, "!#");
+               CommandSource.suggestResource(Registries.ENTITY_TYPE.streamBoundTags().map(argxx -> argxx.getKey().id()), builder, "!#");
                if (!arg.excludesEntityType()) {
                   CommandSource.suggestIdentifiers(Registries.ENTITY_TYPE.getIds(), builder);
-                  CommandSource.suggestResource(Registries.ENTITY_TYPE.getTags().map(argxx -> argxx.getKey().id()), builder, String.valueOf('#'));
+                  CommandSource.suggestResource(Registries.ENTITY_TYPE.streamBoundTags().map(argxx -> argxx.getKey().id()), builder, String.valueOf('#'));
                }
 
                return builder.buildFuture();
diff -bur namedTargetSrc/net/minecraft/component/DataComponentPatch.java namedSrc/net/minecraft/component/DataComponentPatch.java
--- namedTargetSrc/net/minecraft/component/DataComponentPatch.java	2024-09-25 08:03:15.137542061 +0000
+++ namedSrc/net/minecraft/component/DataComponentPatch.java	2024-09-25 08:02:07.814230115 +0000
@@ -383,7 +383,7 @@
                }
 
                Identifier lv = Identifier.tryParse(string);
-               DataComponentType<?> lv2 = Registries.DATA_COMPONENT_TYPE.m_kxeijgiq(lv);
+               DataComponentType<?> lv2 = Registries.DATA_COMPONENT_TYPE.get(lv);
                if (lv2 == null) {
                   return DataResult.error(() -> "No component with type: '" + lv + "'");
                } else {
diff -bur namedTargetSrc/net/minecraft/component/type/BannerPatternsComponent.java namedSrc/net/minecraft/component/type/BannerPatternsComponent.java
--- namedTargetSrc/net/minecraft/component/type/BannerPatternsComponent.java	2024-09-25 08:03:15.131542033 +0000
+++ namedSrc/net/minecraft/component/type/BannerPatternsComponent.java	2024-09-25 08:02:07.810230096 +0000
@@ -72,10 +72,10 @@
        * @mapping {@literal named add Lnet/minecraft/component/type/BannerPatternsComponent$Builder;add(Lnet/minecraft/registry/HolderProvider;Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/util/DyeColor;)Lnet/minecraft/component/type/BannerPatternsComponent$Builder;}
        */
       @Deprecated
-      public BannerPatternsComponent.Builder add(HolderProvider<BannerPattern> pattern, RegistryKey<BannerPattern> registryKey, DyeColor color) {
-         Optional<Holder.Reference<BannerPattern>> optional = pattern.getHolder(registryKey);
+      public BannerPatternsComponent.Builder add(HolderProvider<BannerPattern> pattern, RegistryKey<BannerPattern> key, DyeColor color) {
+         Optional<Holder.Reference<BannerPattern>> optional = pattern.getHolder(key);
          if (optional.isEmpty()) {
-            BannerPatternsComponent.LOGGER.warn("Unable to find banner pattern with id: '{}'", registryKey.getValue());
+            BannerPatternsComponent.LOGGER.warn("Unable to find banner pattern with id: '{}'", key.getValue());
             return this;
          } else {
             return this.add((Holder<BannerPattern>)optional.get(), color);
diff -bur namedTargetSrc/net/minecraft/component/type/ContainerLootComponent.java namedSrc/net/minecraft/component/type/ContainerLootComponent.java
--- namedTargetSrc/net/minecraft/component/type/ContainerLootComponent.java	2024-09-25 08:03:15.178542255 +0000
+++ namedSrc/net/minecraft/component/type/ContainerLootComponent.java	2024-09-25 08:02:07.851230294 +0000
@@ -17,7 +17,7 @@
     */
    public static final Codec<ContainerLootComponent> CODEC = RecordCodecBuilder.create(
       instance -> instance.group(
-               RegistryKey.codec(RegistryKeys.LOOT_TABLE).fieldOf("loot_table").forGetter(ContainerLootComponent::lootTable),
+               RegistryKey.createCodec(RegistryKeys.LOOT_TABLE).fieldOf("loot_table").forGetter(ContainerLootComponent::lootTable),
                Codec.LONG.optionalFieldOf("seed", Long.valueOf(0L)).forGetter(ContainerLootComponent::seed)
             )
             .apply(instance, ContainerLootComponent::new)
diff -bur namedTargetSrc/net/minecraft/component/type/ItemEnchantmentsComponent.java namedSrc/net/minecraft/component/type/ItemEnchantmentsComponent.java
--- namedTargetSrc/net/minecraft/component/type/ItemEnchantmentsComponent.java	2024-09-25 08:03:15.111541938 +0000
+++ namedSrc/net/minecraft/component/type/ItemEnchantmentsComponent.java	2024-09-25 08:02:07.787229985 +0000
@@ -142,9 +142,9 @@
     * @mapping {@literal hashed m_rwfsmcfy Lnet/minecraft/unmapped/C_qlclfxvn;m_rwfsmcfy(Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_ednuhnnn;)Lnet/minecraft/unmapped/C_odfnijdo;}
     * @mapping {@literal named getTagOrEmpty Lnet/minecraft/component/type/ItemEnchantmentsComponent;getTagOrEmpty(Lnet/minecraft/registry/HolderLookup$Provider;Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/registry/tag/TagKey;)Lnet/minecraft/registry/HolderSet;}
     */
-   private static <T> HolderSet<T> getTagOrEmpty(@Nullable HolderLookup.Provider lookup, RegistryKey<Registry<T>> registryKey, TagKey<T> tag) {
+   private static <T> HolderSet<T> getTagOrEmpty(@Nullable HolderLookup.Provider lookup, RegistryKey<Registry<T>> arg2, TagKey<T> tag) {
       if (lookup != null) {
-         Optional<HolderSet.NamedSet<T>> optional = lookup.getLookupOrThrow(registryKey).getTag(tag);
+         Optional<HolderSet.NamedSet<T>> optional = lookup.getLookupOrThrow(arg2).getTag(tag);
          if (optional.isPresent()) {
             return (HolderSet<T>)optional.get();
          }
diff -bur namedTargetSrc/net/minecraft/data/client/ItemModelGenerator.java namedSrc/net/minecraft/data/client/ItemModelGenerator.java
--- namedTargetSrc/net/minecraft/data/client/ItemModelGenerator.java	2024-09-25 08:03:15.195542335 +0000
+++ namedSrc/net/minecraft/data/client/ItemModelGenerator.java	2024-09-25 08:02:07.871230390 +0000
@@ -167,7 +167,7 @@
     * @mapping {@literal hashed m_mppeudhx Lnet/minecraft/unmapped/C_cfvrpkog;m_mppeudhx(Lnet/minecraft/unmapped/C_vorddnax;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_mgbzsqdv;Lnet/minecraft/unmapped/C_yuycoehb;)V}
     * @mapping {@literal named registerArmor Lnet/minecraft/data/client/ItemModelGenerator;registerArmor(Lnet/minecraft/item/Item;Lnet/minecraft/util/Identifier;Lnet/minecraft/unmapped/C_mgbzsqdv;Lnet/minecraft/entity/EquipmentSlot;)V}
     */
-   private void registerArmor(Item arg, Identifier arg2, C_mgbzsqdv arg3, EquipmentSlot arg4) {
+   private void registerArmor(Item arg, Identifier id, C_mgbzsqdv arg3, EquipmentSlot arg4) {
       List<C_mgbzsqdv.C_jyzwvubc> list = arg3.m_jyfxgynh(C_mgbzsqdv.C_otwvbrdf.HUMANOID);
       if (!list.isEmpty()) {
          boolean bl = list.size() == 2 && ((C_mgbzsqdv.C_jyzwvubc)list.getFirst()).dyeable().isPresent();
@@ -175,9 +175,9 @@
          Identifier lv2 = Texture.getId(arg);
          Identifier lv3 = Texture.getSubId(arg, "_overlay");
          if (bl) {
-            Models.DOUBLE_LAYER_ITEM.upload(lv, Texture.doubleLayer(lv2, lv3), this.writer, (arg2x, map) -> this.createArmorJson(arg2x, map, arg2));
+            Models.DOUBLE_LAYER_ITEM.upload(lv, Texture.doubleLayer(lv2, lv3), this.writer, (arg2, map) -> this.createArmorJson(arg2, map, id));
          } else {
-            Models.SINGLE_LAYER_ITEM.upload(lv, Texture.layer0(lv2), this.writer, (arg2x, map) -> this.createArmorJson(arg2x, map, arg2));
+            Models.SINGLE_LAYER_ITEM.upload(lv, Texture.layer0(lv2), this.writer, (arg2, map) -> this.createArmorJson(arg2, map, id));
          }
          String string = switch (arg4) {
             case HEAD -> "helmet";
@@ -188,7 +188,7 @@
          };
 
          for (ItemModelGenerator.TrimModelData lv4 : TRIM_MATERIALS) {
-            String string2 = lv4.m_qfpygivh(arg2);
+            String string2 = lv4.m_qfpygivh(id);
             Identifier lv5 = this.suffixTrim(lv, string2);
             String string3 = string + "_trim_" + string2;
             Identifier lv6 = Identifier.ofDefault(string3).withPrefix("trims/items/");
@@ -539,8 +539,8 @@
        * @mapping {@literal hashed m_qfpygivh Lnet/minecraft/unmapped/C_cfvrpkog$C_cutcputf;m_qfpygivh(Lnet/minecraft/unmapped/C_ncpywfca;)Ljava/lang/String;}
        * @mapping {@literal named m_qfpygivh Lnet/minecraft/data/client/ItemModelGenerator$TrimModelData;m_qfpygivh(Lnet/minecraft/util/Identifier;)Ljava/lang/String;}
        */
-      public String m_qfpygivh(Identifier key) {
-         return (String)this.overrideArmorMaterials.getOrDefault(key, this.name);
+      public String m_qfpygivh(Identifier id) {
+         return (String)this.overrideArmorMaterials.getOrDefault(id, this.name);
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/data/DataPackOutput.java namedSrc/net/minecraft/data/DataPackOutput.java
--- namedTargetSrc/net/minecraft/data/DataPackOutput.java	2024-09-25 08:03:14.995541390 +0000
+++ namedSrc/net/minecraft/data/DataPackOutput.java	2024-09-25 08:02:07.661229377 +0000
@@ -53,16 +53,16 @@
     * @mapping {@literal hashed m_jgqgnctt Lnet/minecraft/unmapped/C_ugkmwocs;m_jgqgnctt(Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_ugkmwocs$C_ehniswvc;}
     * @mapping {@literal named m_jgqgnctt Lnet/minecraft/data/DataPackOutput;m_jgqgnctt(Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/data/DataPackOutput$PathResolver;}
     */
-   public DataPackOutput.PathResolver m_jgqgnctt(RegistryKey<? extends Registry<?>> registryKey) {
-      return this.createPathResolver(DataPackOutput.Type.DATA_PACK, RegistryKeys.getDirectory(registryKey));
+   public DataPackOutput.PathResolver m_jgqgnctt(RegistryKey<? extends Registry<?>> registry) {
+      return this.createPathResolver(DataPackOutput.Type.DATA_PACK, RegistryKeys.getDirectory(registry));
    }
 
    /**
     * @mapping {@literal hashed m_cxqnkpjt Lnet/minecraft/unmapped/C_ugkmwocs;m_cxqnkpjt(Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_ugkmwocs$C_ehniswvc;}
     * @mapping {@literal named m_cxqnkpjt Lnet/minecraft/data/DataPackOutput;m_cxqnkpjt(Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/data/DataPackOutput$PathResolver;}
     */
-   public DataPackOutput.PathResolver m_cxqnkpjt(RegistryKey<? extends Registry<?>> registryKey) {
-      return this.createPathResolver(DataPackOutput.Type.DATA_PACK, RegistryKeys.getTagDirectory(registryKey));
+   public DataPackOutput.PathResolver m_cxqnkpjt(RegistryKey<? extends Registry<?>> registry) {
+      return this.createPathResolver(DataPackOutput.Type.DATA_PACK, RegistryKeys.getTagDirectory(registry));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/data/report/BiomeParametersProvider.java namedSrc/net/minecraft/data/report/BiomeParametersProvider.java
--- namedTargetSrc/net/minecraft/data/report/BiomeParametersProvider.java	2024-09-25 08:03:14.916541017 +0000
+++ namedSrc/net/minecraft/data/report/BiomeParametersProvider.java	2024-09-25 08:02:07.556228870 +0000
@@ -48,7 +48,7 @@
     * @mapping {@literal hashed f_iubheypa Lnet/minecraft/unmapped/C_wwetinhi;f_iubheypa:Lcom/mojang/serialization/MapCodec;}
     * @mapping {@literal named ENTRY_CODEC Lnet/minecraft/data/report/BiomeParametersProvider;ENTRY_CODEC:Lcom/mojang/serialization/MapCodec;}
     */
-   private static final MapCodec<RegistryKey<Biome>> ENTRY_CODEC = RegistryKey.codec(RegistryKeys.BIOME).fieldOf("biome");
+   private static final MapCodec<RegistryKey<Biome>> ENTRY_CODEC = RegistryKey.createCodec(RegistryKeys.BIOME).fieldOf("biome");
    /**
     * @mapping {@literal hashed f_tjqcsbiq Lnet/minecraft/unmapped/C_wwetinhi;f_tjqcsbiq:Lcom/mojang/serialization/Codec;}
     * @mapping {@literal named CODEC Lnet/minecraft/data/report/BiomeParametersProvider;CODEC:Lcom/mojang/serialization/Codec;}
diff -bur namedTargetSrc/net/minecraft/data/report/BlockListProvider.java namedSrc/net/minecraft/data/report/BlockListProvider.java
--- namedTargetSrc/net/minecraft/data/report/BlockListProvider.java	2024-09-25 08:03:14.969541267 +0000
+++ namedSrc/net/minecraft/data/report/BlockListProvider.java	2024-09-25 08:02:07.628229217 +0000
@@ -55,7 +55,7 @@
                JsonObject jsonObject = new JsonObject();
                RegistryOps<JsonElement> lv = arg2.createSerializationContext(JsonOps.INSTANCE);
                arg2.getLookupOrThrow(RegistryKeys.BLOCK)
-                  .holders()
+                  .streamHolders()
                   .forEach(
                      arg2x -> {
                         JsonObject jsonObject2 = new JsonObject();
diff -bur namedTargetSrc/net/minecraft/data/report/ItemListProvider.java namedSrc/net/minecraft/data/report/ItemListProvider.java
--- namedTargetSrc/net/minecraft/data/report/ItemListProvider.java	2024-09-25 08:03:15.182542274 +0000
+++ namedSrc/net/minecraft/data/report/ItemListProvider.java	2024-09-25 08:02:07.858230328 +0000
@@ -49,7 +49,7 @@
                JsonObject jsonObject = new JsonObject();
                RegistryOps<JsonElement> lv = arg2.createSerializationContext(JsonOps.INSTANCE);
                arg2.getLookupOrThrow(RegistryKeys.ITEM)
-                  .holders()
+                  .streamHolders()
                   .forEach(
                      arg2x -> {
                         JsonObject jsonObject2 = new JsonObject();
diff -bur namedTargetSrc/net/minecraft/data/report/RegistriesDataPackProvider.java namedSrc/net/minecraft/data/report/RegistriesDataPackProvider.java
--- namedTargetSrc/net/minecraft/data/report/RegistriesDataPackProvider.java	2024-09-25 08:03:15.153542137 +0000
+++ namedSrc/net/minecraft/data/report/RegistriesDataPackProvider.java	2024-09-25 08:02:07.829230188 +0000
@@ -72,7 +72,7 @@
             lookup -> {
                DataPackOutput.PathResolver lvx = this.output.m_jgqgnctt(lv);
                return CompletableFuture.allOf(
-                  (CompletableFuture[])lookup.holders()
+                  (CompletableFuture[])lookup.streamHolders()
                      .map(
                         reference -> writeToPath(
                               lvx.resolveJsonFile(reference.getRegistryKey().getValue()), writer, ops, data.elementCodec(), (T)reference.value()
diff -bur namedTargetSrc/net/minecraft/data/report/RegistryDumpProvider.java namedSrc/net/minecraft/data/report/RegistryDumpProvider.java
--- namedTargetSrc/net/minecraft/data/report/RegistryDumpProvider.java	2024-09-25 08:03:15.072541754 +0000
+++ namedSrc/net/minecraft/data/report/RegistryDumpProvider.java	2024-09-25 08:02:07.745229782 +0000
@@ -37,7 +37,7 @@
    @Override
    public CompletableFuture<?> run(DataWriter writer) {
       JsonObject jsonObject = new JsonObject();
-      Registries.ROOT.holders().forEach(holder -> jsonObject.add(holder.getRegistryKey().getValue().toString(), toJson((Registry)holder.value())));
+      Registries.ROOT.streamHolders().forEach(holder -> jsonObject.add(holder.getRegistryKey().getValue().toString(), toJson((Registry)holder.value())));
       Path path = this.output.resolvePath(DataPackOutput.Type.REPORTS).resolve("registries.json");
       return DataProvider.writeToPath(writer, jsonObject, path);
    }
@@ -56,7 +56,7 @@
       int i = Registries.ROOT.getRawId(registry);
       jsonObject.addProperty("protocol_id", i);
       JsonObject jsonObject2 = new JsonObject();
-      registry.holders().forEach(holder -> {
+      registry.streamHolders().forEach(holder -> {
          T object = (T)holder.value();
          int ix = registry.getRawId(object);
          JsonObject jsonObject2x = new JsonObject();
diff -bur namedTargetSrc/net/minecraft/data/server/advancement/AdventureAdvancementTabGenerator.java namedSrc/net/minecraft/data/server/advancement/AdventureAdvancementTabGenerator.java
--- namedTargetSrc/net/minecraft/data/server/advancement/AdventureAdvancementTabGenerator.java	2024-09-25 08:03:15.161542174 +0000
+++ namedSrc/net/minecraft/data/server/advancement/AdventureAdvancementTabGenerator.java	2024-09-25 08:02:07.837230226 +0000
@@ -438,7 +438,7 @@
       AdvancementHolder lv12 = Advancement.Builder.create()
          .parent(lv4)
          .display(
-            Raid.m_pbwmgtdj(lv11),
+            Raid.createOminousBanner(lv11),
             Text.translatable("advancements.adventure.voluntary_exile.title"),
             Text.translatable("advancements.adventure.voluntary_exile.description"),
             null,
@@ -457,7 +457,7 @@
       Advancement.Builder.create()
          .parent(lv12)
          .display(
-            Raid.m_pbwmgtdj(lv11),
+            Raid.createOminousBanner(lv11),
             Text.translatable("advancements.adventure.hero_of_the_village.title"),
             Text.translatable("advancements.adventure.hero_of_the_village.description"),
             null,
diff -bur namedTargetSrc/net/minecraft/data/server/advancement/HusbandryAdvancementTabGenerator.java namedSrc/net/minecraft/data/server/advancement/HusbandryAdvancementTabGenerator.java
--- namedTargetSrc/net/minecraft/data/server/advancement/HusbandryAdvancementTabGenerator.java	2024-09-25 08:03:14.966541253 +0000
+++ namedSrc/net/minecraft/data/server/advancement/HusbandryAdvancementTabGenerator.java	2024-09-25 08:02:07.625229203 +0000
@@ -664,7 +664,7 @@
                               .m_vxhuvbxd(
                                  ItemPredicate.Builder.create()
                                     .m_xdlacdbp(lv2, Items.WOLF_ARMOR)
-                                    .m_rmnqrshz(DataComponentPredicate.builder().m_paqnuexm(DataComponentTypes.DAMAGE, 0).build())
+                                    .m_rmnqrshz(DataComponentPredicate.builder().add(DataComponentTypes.DAMAGE, 0).build())
                               )
                         )
                   )
@@ -707,7 +707,7 @@
     */
    private static Advancement.Builder appendLeashAllFrogTypesCriterion(HolderProvider<EntityType<?>> arg, HolderProvider<Item> arg2, Advancement.Builder task) {
       Registries.FROG_VARIANT
-         .holders()
+         .streamHolders()
          .forEach(
             arg4 -> task.putCriteria(
                   arg4.getRegistryKey().getValue().toString(),
@@ -798,7 +798,7 @@
     */
    private static Advancement.Builder appendTameAllCatVariantsCriterion(Advancement.Builder task) {
       Registries.CAT_VARIANT
-         .holders()
+         .streamHolders()
          .sorted(Comparator.comparing(arg -> arg.getRegistryKey().getValue()))
          .forEach(
             arg2 -> task.putCriteria(
@@ -818,10 +818,10 @@
       lv.streamElementKeys()
          .sorted(Comparator.comparing(RegistryKey::getValue))
          .forEach(
-            registryKey -> {
-               Holder<WolfVariant> lvx = lv.getHolderOrThrow(registryKey);
+            arg3 -> {
+               Holder<WolfVariant> lvx = lv.getHolderOrThrow(arg3);
                task.putCriteria(
-                  registryKey.getValue().toString(),
+                  arg3.getValue().toString(),
                   TameAnimalCriterionTrigger.Conditions.create(
                      EntityPredicate.Builder.create().typeSpecific(EntitySubPredicateTypes.m_kfwccmwu(HolderSet.createDirect(lvx)))
                   )
diff -bur namedTargetSrc/net/minecraft/data/server/loot_table/BlockLootTableGenerator.java namedSrc/net/minecraft/data/server/loot_table/BlockLootTableGenerator.java
--- namedTargetSrc/net/minecraft/data/server/loot_table/BlockLootTableGenerator.java	2024-09-25 08:03:14.926541064 +0000
+++ namedSrc/net/minecraft/data/server/loot_table/BlockLootTableGenerator.java	2024-09-25 08:02:07.573228952 +0000
@@ -859,16 +859,16 @@
          if (lv.enabledIn(this.enabledFeatures)) {
             lv.getLootTableId()
                .ifPresent(
-                  registryKey -> {
-                     if (set.add(registryKey)) {
-                        LootTable.Builder lvx = (LootTable.Builder)this.lootTables.remove(registryKey);
+                  arg2 -> {
+                     if (set.add(arg2)) {
+                        LootTable.Builder lvx = (LootTable.Builder)this.lootTables.remove(arg2);
                         if (lvx == null) {
                            throw new IllegalStateException(
-                              String.format(Locale.ROOT, "Missing loottable '%s' for '%s'", registryKey.getValue(), Registries.BLOCK.getId(lv))
+                              String.format(Locale.ROOT, "Missing loottable '%s' for '%s'", arg2.getValue(), Registries.BLOCK.getId(lv))
                            );
                         }
 
-                        biConsumer.accept(registryKey, lvx);
+                        biConsumer.accept(arg2, lvx);
                      }
                   }
                );
diff -bur namedTargetSrc/net/minecraft/data/server/loot_table/EntityLootTableGenerator.java namedSrc/net/minecraft/data/server/loot_table/EntityLootTableGenerator.java
--- namedTargetSrc/net/minecraft/data/server/loot_table/EntityLootTableGenerator.java	2024-09-25 08:03:15.116541962 +0000
+++ namedSrc/net/minecraft/data/server/loot_table/EntityLootTableGenerator.java	2024-09-25 08:02:07.795230023 +0000
@@ -147,7 +147,7 @@
       this.generate();
       Set<RegistryKey<LootTable>> set = new HashSet();
       Registries.ENTITY_TYPE
-         .holders()
+         .streamHolders()
          .forEach(
             arg -> {
                EntityType<?> lv = (EntityType<?>)arg.value();
@@ -163,13 +163,13 @@
 
                      if (map != null) {
                         map.forEach(
-                           (registryKey, arg3) -> {
-                              if (!set.add(registryKey)) {
+                           (arg2, arg3) -> {
+                              if (!set.add(arg2)) {
                                  throw new IllegalStateException(
-                                    String.format(Locale.ROOT, "Duplicate loottable '%s' for '%s'", registryKey, arg.getRegistryKey().getValue())
+                                    String.format(Locale.ROOT, "Duplicate loottable '%s' for '%s'", arg2, arg.getRegistryKey().getValue())
                                  );
                               } else {
-                                 biConsumer.accept(registryKey, arg3);
+                                 biConsumer.accept(arg2, arg3);
                               }
                            }
                         );
@@ -181,7 +181,7 @@
                            String.format(
                               Locale.ROOT,
                               "Weird loottables '%s' for '%s', not a LivingEntity so should not have loot",
-                              map2.keySet().stream().map(registryKey -> registryKey.getValue().toString()).collect(Collectors.joining(",")),
+                              map2.keySet().stream().map(argx -> argx.getValue().toString()).collect(Collectors.joining(",")),
                               arg.getRegistryKey().getValue()
                            )
                         );
@@ -209,13 +209,13 @@
     * @mapping {@literal hashed m_vtkdidok Lnet/minecraft/unmapped/C_egeqzyvk;m_vtkdidok(Lnet/minecraft/unmapped/C_pzdchrcy;Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_vqkczpuv$C_cjvmpogn;}
     * @mapping {@literal named variantSpecificFrogDamageSource Lnet/minecraft/data/server/loot_table/EntityLootTableGenerator;variantSpecificFrogDamageSource(Lnet/minecraft/registry/HolderProvider;Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/loot/condition/LootCondition$Builder;}
     */
-   protected LootCondition.Builder variantSpecificFrogDamageSource(HolderProvider<EntityType<?>> arg, RegistryKey<FrogVariant> registryKey) {
+   protected LootCondition.Builder variantSpecificFrogDamageSource(HolderProvider<EntityType<?>> arg, RegistryKey<FrogVariant> arg2) {
       return DamageSourcePropertiesLootCondition.builder(
          DamageSourcePredicate.Builder.create()
             .setSourceEntity(
                EntityPredicate.Builder.create()
                   .m_fbzdlqtk(arg, EntityType.FROG)
-                  .typeSpecific(EntitySubPredicateTypes.m_hopoaxal(Registries.FROG_VARIANT.getHolderOrThrow(registryKey)))
+                  .typeSpecific(EntitySubPredicateTypes.m_hopoaxal(Registries.FROG_VARIANT.getHolderOrThrow(arg2)))
             )
       );
    }
@@ -234,7 +234,7 @@
     * @mapping {@literal hashed m_znlvnkkb Lnet/minecraft/unmapped/C_egeqzyvk;m_znlvnkkb(Lnet/minecraft/unmapped/C_ogavsvbr;Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_inwsuliy$C_daaljsfu;)V}
     * @mapping {@literal named m_znlvnkkb Lnet/minecraft/data/server/loot_table/EntityLootTableGenerator;m_znlvnkkb(Lnet/minecraft/entity/EntityType;Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/loot/LootTable$Builder;)V}
     */
-   protected void m_znlvnkkb(EntityType<?> key, RegistryKey<LootTable> registryKey, LootTable.Builder arg3) {
-      ((Map)this.lootTables.computeIfAbsent(key, arg -> new HashMap())).put(registryKey, arg3);
+   protected void m_znlvnkkb(EntityType<?> key, RegistryKey<LootTable> arg2, LootTable.Builder arg3) {
+      ((Map)this.lootTables.computeIfAbsent(key, arg -> new HashMap())).put(arg2, arg3);
    }
 }
diff -bur namedTargetSrc/net/minecraft/data/server/LootTablesProvider.java namedSrc/net/minecraft/data/server/LootTablesProvider.java
--- namedTargetSrc/net/minecraft/data/server/LootTablesProvider.java	2024-09-25 08:03:14.975541295 +0000
+++ namedSrc/net/minecraft/data/server/LootTablesProvider.java	2024-09-25 08:02:07.634229246 +0000
@@ -96,19 +96,19 @@
    private CompletableFuture<?> m_cvuljxmh(DataWriter writer, HolderLookup.Provider arg2) {
       MutableRegistry<LootTable> lv = new SimpleRegistry<>(RegistryKeys.LOOT_TABLE, Lifecycle.experimental());
       Map<RandomSeed.Seed, Identifier> map = new Object2ObjectOpenHashMap<>();
-      this.lootTypeGenerators.forEach(arg3 -> ((LootTableGenerator)arg3.provider().apply(arg2)).generate((registryKey, arg4) -> {
-            Identifier lvx = m_ttdjbgbz(registryKey);
+      this.lootTypeGenerators.forEach(arg3 -> ((LootTableGenerator)arg3.provider().apply(arg2)).generate((arg3x, arg4) -> {
+            Identifier lvx = m_ttdjbgbz(arg3x);
             Identifier lv2x = (Identifier)map.put(RandomSequence.createSeed(lvx), lvx);
             if (lv2x != null) {
-               Util.logAndPause("Loot table random sequence seed collision on " + lv2x + " and " + registryKey.getValue());
+               Util.logAndPause("Loot table random sequence seed collision on " + lv2x + " and " + arg3x.getValue());
             }
 
             arg4.randomSequence(lvx);
             LootTable lv3x = arg4.type(arg3.paramSet).build();
-            lv.register(registryKey, lv3x, RegistrationInfo.DEFAULT);
+            lv.register(arg3x, lv3x, RegistrationInfo.DEFAULT);
          }));
       lv.freeze();
-      ErrorReporter.Impl lv2 = new ErrorReporter.Impl();
+      ErrorReporter.Collector lv2 = new ErrorReporter.Collector();
       HolderProvider.Provider lv3 = new DynamicRegistryManager.ImmutableRegistryManager(List.of(lv)).freeze();
       LootTableReporter lv4 = new LootTableReporter(lv2, LootContextTypes.GENERIC, lv3);
 
@@ -116,14 +116,14 @@
          lv2.report("Missing built-in table: " + lv5.getValue());
       }
 
-      lv.holders()
+      lv.streamHolders()
          .forEach(
             arg2x -> ((LootTable)arg2x.value())
                   .validate(
                      lv4.withContextType(((LootTable)arg2x.value()).getType()).makeChild("{" + arg2x.getRegistryKey().getValue() + "}", arg2x.getRegistryKey())
                   )
          );
-      Multimap<String, String> multimap = lv2.copyErrors();
+      Multimap<String, String> multimap = lv2.copyErrorsByPath();
       if (!multimap.isEmpty()) {
          multimap.forEach((string, string2) -> LOGGER.warn("Found validation problem in {}: {}", string, string2));
          throw new IllegalStateException("Failed to validate loot tables, see logs");
@@ -138,11 +138,10 @@
    }
 
    /**
-    * @mapping {@literal hashed m_ttdjbgbz Lnet/minecraft/unmapped/C_rriyyrek;m_ttdjbgbz(Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_ncpywfca;}
-    * @mapping {@literal named m_ttdjbgbz Lnet/minecraft/data/server/LootTablesProvider;m_ttdjbgbz(Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/util/Identifier;}
+    * Mapping not found
     */
-   private static Identifier m_ttdjbgbz(RegistryKey<LootTable> registryKey) {
-      return registryKey.getValue();
+   private static Identifier m_ttdjbgbz(RegistryKey<LootTable> arg) {
+      return arg.getValue();
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/data/server/recipe/CookingRecipeJsonFactory.java namedSrc/net/minecraft/data/server/recipe/CookingRecipeJsonFactory.java
--- namedTargetSrc/net/minecraft/data/server/recipe/CookingRecipeJsonFactory.java	2024-09-25 08:03:15.200542359 +0000
+++ namedSrc/net/minecraft/data/server/recipe/CookingRecipeJsonFactory.java	2024-09-25 08:02:07.876230414 +0000
@@ -183,11 +183,11 @@
     * Mapping not found
     */
    @Override
-   public void offerTo(RecipeExporter exporter, Identifier recipeId) {
-      this.validate(recipeId);
+   public void offerTo(RecipeExporter exporter, Identifier id) {
+      this.validate(id);
       Advancement.Builder lv = exporter.accept()
-         .putCriteria("has_the_recipe", RecipeUnlockedCriterionTrigger.create(recipeId))
-         .rewards(AdvancementRewards.Builder.recipe(recipeId))
+         .putCriteria("has_the_recipe", RecipeUnlockedCriterionTrigger.create(id))
+         .rewards(AdvancementRewards.Builder.recipe(id))
          .merger(AdvancementRequirements.RequirementMerger.ANY);
       this.criteria.forEach(lv::putCriteria);
       AbstractCookingRecipe lv2 = this.recipe
@@ -199,7 +199,7 @@
             this.experience,
             this.cookingTime
          );
-      exporter.accept(recipeId, lv2, lv.build(recipeId.withPrefix("recipes/" + this.category.getName() + "/")));
+      exporter.accept(id, lv2, lv.build(id.withPrefix("recipes/" + this.category.getName() + "/")));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/data/server/recipe/ShapedRecipeJsonFactory.java namedSrc/net/minecraft/data/server/recipe/ShapedRecipeJsonFactory.java
--- namedTargetSrc/net/minecraft/data/server/recipe/ShapedRecipeJsonFactory.java	2024-09-25 08:03:15.038541593 +0000
+++ namedSrc/net/minecraft/data/server/recipe/ShapedRecipeJsonFactory.java	2024-09-25 08:02:07.700229565 +0000
@@ -184,11 +184,11 @@
     * Mapping not found
     */
    @Override
-   public void offerTo(RecipeExporter exporter, Identifier recipeId) {
-      ShapedRecipePattern lv = this.validate(recipeId);
+   public void offerTo(RecipeExporter exporter, Identifier id) {
+      ShapedRecipePattern lv = this.validate(id);
       Advancement.Builder lv2 = exporter.accept()
-         .putCriteria("has_the_recipe", RecipeUnlockedCriterionTrigger.create(recipeId))
-         .rewards(AdvancementRewards.Builder.recipe(recipeId))
+         .putCriteria("has_the_recipe", RecipeUnlockedCriterionTrigger.create(id))
+         .rewards(AdvancementRewards.Builder.recipe(id))
          .merger(AdvancementRequirements.RequirementMerger.ANY);
       this.criteria.forEach(lv2::putCriteria);
       ShapedRecipe lv3 = new ShapedRecipe(
@@ -198,7 +198,7 @@
          new ItemStack(this.result, this.resultCount),
          this.showNotification
       );
-      exporter.accept(recipeId, lv3, lv2.build(recipeId.withPrefix("recipes/" + this.category.getName() + "/")));
+      exporter.accept(id, lv3, lv2.build(id.withPrefix("recipes/" + this.category.getName() + "/")));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/data/server/recipe/ShapelessRecipeJsonFactory.java namedSrc/net/minecraft/data/server/recipe/ShapelessRecipeJsonFactory.java
--- namedTargetSrc/net/minecraft/data/server/recipe/ShapelessRecipeJsonFactory.java	2024-09-25 08:03:15.048541640 +0000
+++ namedSrc/net/minecraft/data/server/recipe/ShapelessRecipeJsonFactory.java	2024-09-25 08:02:07.713229628 +0000
@@ -169,17 +169,17 @@
     * Mapping not found
     */
    @Override
-   public void offerTo(RecipeExporter exporter, Identifier recipeId) {
-      this.validate(recipeId);
+   public void offerTo(RecipeExporter exporter, Identifier id) {
+      this.validate(id);
       Advancement.Builder lv = exporter.accept()
-         .putCriteria("has_the_recipe", RecipeUnlockedCriterionTrigger.create(recipeId))
-         .rewards(AdvancementRewards.Builder.recipe(recipeId))
+         .putCriteria("has_the_recipe", RecipeUnlockedCriterionTrigger.create(id))
+         .rewards(AdvancementRewards.Builder.recipe(id))
          .merger(AdvancementRequirements.RequirementMerger.ANY);
       this.criteria.forEach(lv::putCriteria);
       ShapelessRecipe lv2 = new ShapelessRecipe(
          (String)Objects.requireNonNullElse(this.group, ""), RecipeJsonFactory.getCraftingCategory(this.category), this.result, this.ingredients
       );
-      exporter.accept(recipeId, lv2, lv.build(recipeId.withPrefix("recipes/" + this.category.getName() + "/")));
+      exporter.accept(id, lv2, lv.build(id.withPrefix("recipes/" + this.category.getName() + "/")));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/data/server/recipe/SingleItemRecipeJsonFactory.java namedSrc/net/minecraft/data/server/recipe/SingleItemRecipeJsonFactory.java
--- namedTargetSrc/net/minecraft/data/server/recipe/SingleItemRecipeJsonFactory.java	2024-09-25 08:03:14.974541291 +0000
+++ namedSrc/net/minecraft/data/server/recipe/SingleItemRecipeJsonFactory.java	2024-09-25 08:02:07.633229241 +0000
@@ -120,16 +120,16 @@
     * Mapping not found
     */
    @Override
-   public void offerTo(RecipeExporter exporter, Identifier recipeId) {
-      this.validate(recipeId);
+   public void offerTo(RecipeExporter exporter, Identifier id) {
+      this.validate(id);
       Advancement.Builder lv = exporter.accept()
-         .putCriteria("has_the_recipe", RecipeUnlockedCriterionTrigger.create(recipeId))
-         .rewards(AdvancementRewards.Builder.recipe(recipeId))
+         .putCriteria("has_the_recipe", RecipeUnlockedCriterionTrigger.create(id))
+         .rewards(AdvancementRewards.Builder.recipe(id))
          .merger(AdvancementRequirements.RequirementMerger.ANY);
       this.criteria.forEach(lv::putCriteria);
       CuttingRecipe lv2 = this.recipeFactory
          .create((String)Objects.requireNonNullElse(this.group, ""), this.ingredient, new ItemStack(this.result, this.count));
-      exporter.accept(recipeId, lv2, lv.build(recipeId.withPrefix("recipes/" + this.category.getName() + "/")));
+      exporter.accept(id, lv2, lv.build(id.withPrefix("recipes/" + this.category.getName() + "/")));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/data/server/RecipesProvider.java namedSrc/net/minecraft/data/server/RecipesProvider.java
--- namedTargetSrc/net/minecraft/data/server/RecipesProvider.java	2024-09-25 08:03:15.189542307 +0000
+++ namedSrc/net/minecraft/data/server/RecipesProvider.java	2024-09-25 08:02:07.865230362 +0000
@@ -977,8 +977,8 @@
     * @mapping {@literal hashed m_hgqabtqe Lnet/minecraft/unmapped/C_hwlnmobw;m_hgqabtqe(Lnet/minecraft/unmapped/C_ednuhnnn;)Lnet/minecraft/unmapped/C_rzypsigz;}
     * @mapping {@literal named conditionsFromTag Lnet/minecraft/data/server/RecipesProvider;conditionsFromTag(Lnet/minecraft/registry/tag/TagKey;)Lnet/minecraft/advancement/AdvancementCriterion;}
     */
-   protected AdvancementCriterion<InventoryChangedCriterionTrigger.Conditions> conditionsFromTag(TagKey<Item> tagKey) {
-      return conditionsFromItemPredicates(ItemPredicate.Builder.create().m_lubfxdrb(this.f_vvimmxmt, tagKey));
+   protected AdvancementCriterion<InventoryChangedCriterionTrigger.Conditions> conditionsFromTag(TagKey<Item> tag) {
+      return conditionsFromItemPredicates(ItemPredicate.Builder.create().m_lubfxdrb(this.f_vvimmxmt, tag));
    }
 
    /**
@@ -1054,8 +1054,8 @@
     * @mapping {@literal hashed m_gckzgpoa Lnet/minecraft/unmapped/C_hwlnmobw;m_gckzgpoa(Lnet/minecraft/unmapped/C_ednuhnnn;)Lnet/minecraft/unmapped/C_tcpsydrv;}
     * @mapping {@literal named m_gckzgpoa Lnet/minecraft/data/server/RecipesProvider;m_gckzgpoa(Lnet/minecraft/registry/tag/TagKey;)Lnet/minecraft/recipe/Ingredient;}
     */
-   protected Ingredient m_gckzgpoa(TagKey<Item> tagKey) {
-      return Ingredient.m_owdzpelq(this.f_vvimmxmt.getTagOrThrow(tagKey));
+   protected Ingredient m_gckzgpoa(TagKey<Item> tag) {
+      return Ingredient.m_owdzpelq(this.f_vvimmxmt.getTagOrThrow(tag));
    }
 
    /**
@@ -1182,10 +1182,11 @@
                      }
 
                      /**
-                      * Mapping not found
+                      * @mapping {@literal hashed m_xrefjdzc Lnet/minecraft/unmapped/C_hwlnmobw$C_ujfsvkmt$C_iscsdmnx;m_xrefjdzc(Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_awrmdwqd;)V}
+                      * @mapping {@literal named m_xrefjdzc Lnet/minecraft/data/server/RecipesProvider$C_ujfsvkmt$C_iscsdmnx;m_xrefjdzc(Lnet/minecraft/util/Identifier;Lnet/minecraft/recipe/Recipe;)V}
                       */
-                     private void m_xrefjdzc(Identifier arg, Recipe<?> arg2) {
-                        list.add(DataProvider.m_oiidqwdo(writer, arg2, Recipe.CODEC, arg2, lv.resolveJsonFile(arg)));
+                     private void m_xrefjdzc(Identifier id, Recipe<?> arg2) {
+                        list.add(DataProvider.m_oiidqwdo(writer, arg2, Recipe.CODEC, arg2, lv.resolveJsonFile(id)));
                      }
 
                      /**


The remaining diff is too long!

Please sign in to comment.