complete some things, simple type names, misc (#643) · QuiltMC/quilt-mappings@5f11ce6

github-actions · 2024-10-03T00:20:36Z

With commit 5f11ce6, 825 file(s) were updated with 6719 line(s) added and 6332 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-10-03 00:20:34.720436517 +0000
+++ namedSrc/net/minecraft/advancement/AdvancementRewards.java	2024-10-03 00:19:28.123757813 +0000
@@ -14,17 +14,17 @@
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.RegistryKeys;
 import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.function.FunctionGetter;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.unmapped.C_uxzryfxv;
 import net.minecraft.util.Identifier;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_wptigggq}
  * @mapping {@literal named net/minecraft/advancement/AdvancementRewards}
  */
-public record AdvancementRewards(int experience, List<RegistryKey<LootTable>> loot, List<Identifier> recipes, Optional<C_uxzryfxv> function) {
+public record AdvancementRewards(int experience, List<RegistryKey<LootTable>> loot, List<Identifier> recipes, Optional<FunctionGetter> function) {
    /**
     * @mapping {@literal hashed f_zzsxbauv Lnet/minecraft/unmapped/C_wptigggq;f_zzsxbauv:Lcom/mojang/serialization/Codec;}
     * @mapping {@literal named CODEC Lnet/minecraft/advancement/AdvancementRewards;CODEC:Lcom/mojang/serialization/Codec;}
@@ -32,9 +32,9 @@
    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)
+               FunctionGetter.CODEC.optionalFieldOf("function").forGetter(AdvancementRewards::function)
             )
             .apply(instance, AdvancementRewards::new)
    );
@@ -91,7 +91,7 @@
 
       MinecraftServer minecraftServer = player.server;
       this.function
-         .flatMap(arg -> arg.m_ecdplsxc(minecraftServer.getCommandFunctionManager()))
+         .flatMap(arg -> arg.get(minecraftServer.getCommandFunctionManager()))
          .ifPresent(arg2 -> minecraftServer.getCommandFunctionManager().m_gozicqhp(arg2, player.m_jdnfjiqa().withSilent().withLevel(2)));
    }
 
@@ -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> loot) {
+         return new AdvancementRewards.Builder().addLoot(loot);
       }
 
       /**
        * @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> loot) {
+         this.loot.add(loot);
          return this;
       }
 
@@ -194,7 +194,7 @@
        * @mapping {@literal named build Lnet/minecraft/advancement/AdvancementRewards$Builder;build()Lnet/minecraft/advancement/AdvancementRewards;}
        */
       public AdvancementRewards build() {
-         return new AdvancementRewards(this.experience, this.loot.build(), this.recipes.build(), this.function.map(C_uxzryfxv::new));
+         return new AdvancementRewards(this.experience, this.loot.build(), this.recipes.build(), this.function.map(FunctionGetter::new));
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/ChangedDimensionCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/ChangedDimensionCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/ChangedDimensionCriterionTrigger.java	2024-10-03 00:20:34.571435168 +0000
+++ namedSrc/net/minecraft/advancement/criterion/ChangedDimensionCriterionTrigger.java	2024-10-03 00:19:27.945755875 +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/EnterBlockCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/EnterBlockCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/EnterBlockCriterionTrigger.java	2024-10-03 00:20:34.642435810 +0000
+++ namedSrc/net/minecraft/advancement/criterion/EnterBlockCriterionTrigger.java	2024-10-03 00:19:28.025756746 +0000
@@ -63,7 +63,7 @@
          return (DataResult<EnterBlockCriterionTrigger.Conditions>)conditions.block
             .flatMap(
                arg2 -> conditions.state
-                     .flatMap(arg2x -> arg2x.m_flzybrzb(((Block)arg2.value()).getStateManager()))
+                     .flatMap(arg2x -> arg2x.m_flzybrzb(((Block)arg2.getValue()).getStateManager()))
                      .map(string -> DataResult.error(() -> "Block" + arg2 + " has no property " + string))
             )
             .orElseGet(() -> DataResult.success(conditions));
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterionTrigger.java	2024-10-03 00:20:34.640435792 +0000
+++ namedSrc/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterionTrigger.java	2024-10-03 00:19:28.023756724 +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> lootTable) {
+      this.trigger(player, conditions -> conditions.matches(lootTable));
    }
 
    /**
@@ -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> lootTable) {
+         return this.lootTable == lootTable;
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/SlideDownBlockCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/SlideDownBlockCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/SlideDownBlockCriterionTrigger.java	2024-10-03 00:20:34.742436716 +0000
+++ namedSrc/net/minecraft/advancement/criterion/SlideDownBlockCriterionTrigger.java	2024-10-03 00:19:28.142758020 +0000
@@ -63,7 +63,7 @@
          return (DataResult<SlideDownBlockCriterionTrigger.Conditions>)conditions.block
             .flatMap(
                arg2 -> conditions.state
-                     .flatMap(arg2x -> arg2x.m_flzybrzb(((Block)arg2.value()).getStateManager()))
+                     .flatMap(arg2x -> arg2x.m_flzybrzb(((Block)arg2.getValue()).getStateManager()))
                      .map(string -> DataResult.error(() -> "Block" + arg2 + " has no property " + string))
             )
             .orElseGet(() -> DataResult.success(conditions));
diff -bur namedTargetSrc/net/minecraft/block/AbstractBlock.java namedSrc/net/minecraft/block/AbstractBlock.java
--- namedTargetSrc/net/minecraft/block/AbstractBlock.java	2024-10-03 00:20:34.560435068 +0000
+++ namedSrc/net/minecraft/block/AbstractBlock.java	2024-10-03 00:19:27.928755690 +0000
@@ -867,9 +867,9 @@
       private boolean hasRandomTicks;
       /**
        * @mapping {@literal hashed f_xxewnzdk Lnet/minecraft/unmapped/C_triydqro$C_eibemhky;f_xxewnzdk:Z}
-       * @mapping {@literal named isFullCube Lnet/minecraft/block/AbstractBlock$AbstractBlockState;isFullCube:Z}
+       * @mapping {@literal named opaqueFullCube Lnet/minecraft/block/AbstractBlock$AbstractBlockState;opaqueFullCube:Z}
        */
-      private boolean isFullCube;
+      private boolean opaqueFullCube;
       /**
        * @mapping {@literal hashed f_bsbhmsca Lnet/minecraft/unmapped/C_triydqro$C_eibemhky;f_bsbhmsca:Lnet/minecraft/unmapped/C_zscvhwbd;}
        * @mapping {@literal named cullingShape Lnet/minecraft/block/AbstractBlock$AbstractBlockState;cullingShape:Lnet/minecraft/util/shape/VoxelShape;}
@@ -954,10 +954,10 @@
 
          this.solid = this.checkSolid();
          this.cullingShape = this.opaque ? this.owner.getCullingShape(this.asBlockState()) : VoxelShapes.empty();
-         this.isFullCube = Block.isShapeFullCube(this.cullingShape);
+         this.opaqueFullCube = Block.isShapeFullCube(this.cullingShape);
          if (this.cullingShape.isEmpty()) {
             this.cullingFaces = EMPTY_OCCLUSION_SHAPES;
-         } else if (this.isFullCube) {
+         } else if (this.opaqueFullCube) {
             this.cullingFaces = FULL_BLOCK_OCCLUSION_SHAPES;
          } else {
             this.cullingFaces = new VoxelShape[DIRECTIONS.length];
@@ -1222,7 +1222,7 @@
        * @mapping {@literal named isOpaqueFullCube Lnet/minecraft/block/AbstractBlock$AbstractBlockState;isOpaqueFullCube()Z}
        */
       public boolean isOpaqueFullCube() {
-         return this.isFullCube;
+         return this.opaqueFullCube;
       }
 
       /**
@@ -1618,7 +1618,7 @@
        * @mapping {@literal named isOf Lnet/minecraft/block/AbstractBlock$AbstractBlockState;isOf(Lnet/minecraft/registry/Holder;)Z}
        */
       public boolean isOf(Holder<Block> block) {
-         return this.isOf(block.value());
+         return this.isOf(block.getValue());
       }
 
       /**
@@ -1668,8 +1668,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> key) {
+         return this.getBlock().getBuiltInRegistryHolder().isRegistryKey(key);
       }
 
       /**
@@ -1965,21 +1965,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 {@literal named key Lnet/minecraft/block/AbstractBlock$Settings;key:Lnet/minecraft/registry/RegistryKey;}
        */
       @Nullable
-      private RegistryKey<Block> registryKey;
+      private RegistryKey<Block> key;
       /**
        * @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 = key -> Optional.of(
+            RegistryKey.of(RegistryKeys.LOOT_TABLE, key.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}
@@ -2325,7 +2325,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.key, "Block id not set"));
       }
 
       /**
@@ -2540,10 +2540,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 {@literal named key Lnet/minecraft/block/AbstractBlock$Settings;key(Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/block/AbstractBlock$Settings;}
        */
-      public AbstractBlock.Settings m_vuvrdzlb(RegistryKey<Block> registryKey) {
-         this.registryKey = registryKey;
+      public AbstractBlock.Settings key(RegistryKey<Block> key) {
+         this.key = key;
          return this;
       }
 
@@ -2559,7 +2559,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.key, "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-10-03 00:20:34.752436806 +0000
+++ namedSrc/net/minecraft/block/AttachedStemBlock.java	2024-10-03 00:19:28.152758129 +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/BedBlock.java namedSrc/net/minecraft/block/BedBlock.java
--- namedTargetSrc/net/minecraft/block/BedBlock.java	2024-10-03 00:20:34.656435937 +0000
+++ namedSrc/net/minecraft/block/BedBlock.java	2024-10-03 00:19:28.040756910 +0000
@@ -456,8 +456,8 @@
     * Mapping not found
     */
    @Override
-   public void onPlaced(World world, BlockPos pos, BlockState state, @Nullable LivingEntity placer, ItemStack stack) {
-      super.onPlaced(world, pos, state, placer, stack);
+   public void onPlaced(World world, BlockPos pos, BlockState state, @Nullable LivingEntity entity, ItemStack stack) {
+      super.onPlaced(world, pos, state, entity, stack);
       if (!world.isClient) {
          BlockPos lv = pos.offset(state.get(FACING));
          world.setBlockState(lv, state.with(PART, BedPart.HEAD), Block.NOTIFY_ALL);
diff -bur namedTargetSrc/net/minecraft/block/Blocks.java namedSrc/net/minecraft/block/Blocks.java
--- namedTargetSrc/net/minecraft/block/Blocks.java	2024-10-03 00:20:34.608435503 +0000
+++ namedSrc/net/minecraft/block/Blocks.java	2024-10-03 00:19:27.982756278 +0000
@@ -3360,7 +3360,7 @@
     * @mapping {@literal hashed f_cyinnipu Lnet/minecraft/unmapped/C_jricjyva;f_cyinnipu:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named PUMPKIN Lnet/minecraft/block/Blocks;PUMPKIN:Lnet/minecraft/block/Block;}
     */
-   public static final Block PUMPKIN = m_cptpfson(
+   public static final Block PUMPKIN = register(
       BlockRegistryKeys.PUMPKIN,
       PumpkinBlock::new,
       AbstractBlock.Settings.create()
@@ -3374,7 +3374,7 @@
     * @mapping {@literal hashed f_fqkzrnro Lnet/minecraft/unmapped/C_jricjyva;f_fqkzrnro:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named MELON Lnet/minecraft/block/Blocks;MELON:Lnet/minecraft/block/Block;}
     */
-   public static final Block MELON = m_vfpzuwtj(
+   public static final Block MELON = register(
       BlockRegistryKeys.MELON,
       AbstractBlock.Settings.create().mapColor(MapColor.LIME).strength(1.0F).sounds(BlockSoundGroup.WOOD).pistonBehavior(PistonBehavior.DESTROY)
    );
@@ -3382,7 +3382,7 @@
     * @mapping {@literal hashed f_ryluqxrm Lnet/minecraft/unmapped/C_jricjyva;f_ryluqxrm:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named ATTACHED_PUMPKIN_STEM Lnet/minecraft/block/Blocks;ATTACHED_PUMPKIN_STEM:Lnet/minecraft/block/Block;}
     */
-   public static final Block ATTACHED_PUMPKIN_STEM = m_cptpfson(
+   public static final Block ATTACHED_PUMPKIN_STEM = register(
       BlockRegistryKeys.ATTACHED_PUMPKIN_STEM,
       settings -> new AttachedStemBlock(BlockRegistryKeys.PUMPKIN_STEM, BlockRegistryKeys.PUMPKIN, ItemKeys.PUMPKIN_SEEDS, settings),
       AbstractBlock.Settings.create()
@@ -3396,7 +3396,7 @@
     * @mapping {@literal hashed f_ykctbjyx Lnet/minecraft/unmapped/C_jricjyva;f_ykctbjyx:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named ATTACHED_MELON_STEM Lnet/minecraft/block/Blocks;ATTACHED_MELON_STEM:Lnet/minecraft/block/Block;}
     */
-   public static final Block ATTACHED_MELON_STEM = m_cptpfson(
+   public static final Block ATTACHED_MELON_STEM = register(
       BlockRegistryKeys.ATTACHED_MELON_STEM,
       settings -> new AttachedStemBlock(BlockRegistryKeys.MELON_STEM, BlockRegistryKeys.MELON, ItemKeys.MELON_SEEDS, settings),
       AbstractBlock.Settings.create()
@@ -3410,7 +3410,7 @@
     * @mapping {@literal hashed f_domkrbru Lnet/minecraft/unmapped/C_jricjyva;f_domkrbru:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named PUMPKIN_STEM Lnet/minecraft/block/Blocks;PUMPKIN_STEM:Lnet/minecraft/block/Block;}
     */
-   public static final Block PUMPKIN_STEM = m_cptpfson(
+   public static final Block PUMPKIN_STEM = register(
       BlockRegistryKeys.PUMPKIN_STEM,
       settings -> new StemBlock(BlockRegistryKeys.PUMPKIN, BlockRegistryKeys.ATTACHED_PUMPKIN_STEM, ItemKeys.PUMPKIN_SEEDS, settings),
       AbstractBlock.Settings.create()
@@ -3425,7 +3425,7 @@
     * @mapping {@literal hashed f_bgazwcmd Lnet/minecraft/unmapped/C_jricjyva;f_bgazwcmd:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named MELON_STEM Lnet/minecraft/block/Blocks;MELON_STEM:Lnet/minecraft/block/Block;}
     */
-   public static final Block MELON_STEM = m_cptpfson(
+   public static final Block MELON_STEM = register(
       BlockRegistryKeys.MELON_STEM,
       settings -> new StemBlock(BlockRegistryKeys.MELON, BlockRegistryKeys.ATTACHED_MELON_STEM, ItemKeys.MELON_SEEDS, settings),
       AbstractBlock.Settings.create()
@@ -10678,19 +10678,19 @@
 
    /**
     * @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;}
+    * @mapping {@literal named register Lnet/minecraft/block/Blocks;register(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 register(RegistryKey<Block> key, Function<AbstractBlock.Settings, Block> function, AbstractBlock.Settings settings) {
+      Block lv = (Block)function.apply(settings.key(key));
+      return Registry.register(Registries.BLOCK, key, 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;}
+    * @mapping {@literal named register Lnet/minecraft/block/Blocks;register(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 register(RegistryKey<Block> key, AbstractBlock.Settings settings) {
+      return register(key, Block::new, settings);
    }
 
    /**
@@ -10706,7 +10706,7 @@
     * @mapping {@literal named m_sfaglezr Lnet/minecraft/block/Blocks;m_sfaglezr(Ljava/lang/String;Ljava/util/function/Function;Lnet/minecraft/block/AbstractBlock$Settings;)Lnet/minecraft/block/Block;}
     */
    private static Block m_sfaglezr(String path, Function<AbstractBlock.Settings, Block> function, AbstractBlock.Settings settings) {
-      return m_cptpfson(m_asxurasr(path), function, settings);
+      return register(m_asxurasr(path), function, settings);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/CarvedPumpkinBlock.java namedSrc/net/minecraft/block/CarvedPumpkinBlock.java
--- namedTargetSrc/net/minecraft/block/CarvedPumpkinBlock.java	2024-10-03 00:20:34.619435602 +0000
+++ namedSrc/net/minecraft/block/CarvedPumpkinBlock.java	2024-10-03 00:19:27.999756463 +0000
@@ -8,6 +8,7 @@
 import net.minecraft.block.pattern.CachedBlockPosition;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityType;
+import net.minecraft.entity.SpawnReason;
 import net.minecraft.entity.passive.IronGolemEntity;
 import net.minecraft.entity.passive.SnowGolemEntity;
 import net.minecraft.item.ItemPlacementContext;
@@ -15,7 +16,6 @@
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.state.StateManager;
 import net.minecraft.state.property.EnumProperty;
-import net.minecraft.unmapped.C_bhyaesep;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.world.World;
@@ -111,14 +111,14 @@
    private void trySpawnEntity(World world, BlockPos pos) {
       BlockPattern.Result lv = this.getSnowGolemPattern().searchAround(world, pos);
       if (lv != null) {
-         SnowGolemEntity lv2 = EntityType.SNOW_GOLEM.m_oebfrxli(world, C_bhyaesep.TRIGGERED);
+         SnowGolemEntity lv2 = EntityType.SNOW_GOLEM.m_oebfrxli(world, SpawnReason.TRIGGERED);
          if (lv2 != null) {
             spawnGolem(world, lv, lv2, lv.translate(0, 2, 0).getBlockPos());
          }
       } else {
          BlockPattern.Result lv3 = this.getIronGolemPattern().searchAround(world, pos);
          if (lv3 != null) {
-            IronGolemEntity lv4 = EntityType.IRON_GOLEM.m_oebfrxli(world, C_bhyaesep.TRIGGERED);
+            IronGolemEntity lv4 = EntityType.IRON_GOLEM.m_oebfrxli(world, SpawnReason.TRIGGERED);
             if (lv4 != null) {
                lv4.setPlayerCreated(true);
                spawnGolem(world, lv3, lv4, lv3.translate(1, 2, 0).getBlockPos());
diff -bur namedTargetSrc/net/minecraft/block/CommandBlock.java namedSrc/net/minecraft/block/CommandBlock.java
--- namedTargetSrc/net/minecraft/block/CommandBlock.java	2024-10-03 00:20:34.687436218 +0000
+++ namedSrc/net/minecraft/block/CommandBlock.java	2024-10-03 00:19:28.079757334 +0000
@@ -205,7 +205,7 @@
     * Mapping not found
     */
    @Override
-   public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack stack) {
+   public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity entity, ItemStack stack) {
       if (world.getBlockEntity(pos) instanceof CommandBlockBlockEntity lv2) {
          CommandBlockExecutor lv4 = lv2.getCommandExecutor();
          if (world instanceof ServerWorld lv5) {
diff -bur namedTargetSrc/net/minecraft/block/CrafterBlock.java namedSrc/net/minecraft/block/CrafterBlock.java
--- namedTargetSrc/net/minecraft/block/CrafterBlock.java	2024-10-03 00:20:34.576435213 +0000
+++ namedSrc/net/minecraft/block/CrafterBlock.java	2024-10-03 00:19:27.951755940 +0000
@@ -201,7 +201,7 @@
     * Mapping not found
     */
    @Override
-   public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack stack) {
+   public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity entity, ItemStack stack) {
       if ((Boolean)state.get(TRIGGERED)) {
          world.m_rpovjsym(pos, this, 4);
       }
diff -bur namedTargetSrc/net/minecraft/block/dispenser/BoatDispenserBehavior.java namedSrc/net/minecraft/block/dispenser/BoatDispenserBehavior.java
--- namedTargetSrc/net/minecraft/block/dispenser/BoatDispenserBehavior.java	2024-10-03 00:20:34.744436734 +0000
+++ namedSrc/net/minecraft/block/dispenser/BoatDispenserBehavior.java	2024-10-03 00:19:28.143758031 +0000
@@ -1,10 +1,10 @@
 package net.minecraft.block.dispenser;
 
 import net.minecraft.entity.EntityType;
+import net.minecraft.entity.SpawnReason;
 import net.minecraft.item.ItemStack;
 import net.minecraft.registry.tag.FluidTags;
 import net.minecraft.server.world.ServerWorld;
-import net.minecraft.unmapped.C_bhyaesep;
 import net.minecraft.unmapped.C_sfpofsgc;
 import net.minecraft.util.math.BlockPointer;
 import net.minecraft.util.math.BlockPos;
@@ -60,7 +60,7 @@
          h = 0.0;
       }
 
-      C_sfpofsgc lv5 = this.boatType.m_oebfrxli(lv2, C_bhyaesep.DISPENSER);
+      C_sfpofsgc lv5 = this.boatType.m_oebfrxli(lv2, SpawnReason.DISPENSER);
       if (lv5 != null) {
          lv5.m_busvmoue(e, f + h, g);
          EntityType.createDefaultStackSpawnConfig(lv2, stack, null).accept(lv5);
diff -bur namedTargetSrc/net/minecraft/block/dispenser/DispenserBehavior.java namedSrc/net/minecraft/block/dispenser/DispenserBehavior.java
--- namedTargetSrc/net/minecraft/block/dispenser/DispenserBehavior.java	2024-10-03 00:20:34.666436028 +0000
+++ namedSrc/net/minecraft/block/dispenser/DispenserBehavior.java	2024-10-03 00:19:28.050757018 +0000
@@ -27,6 +27,7 @@
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.Saddleable;
+import net.minecraft.entity.SpawnReason;
 import net.minecraft.entity.TntEntity;
 import net.minecraft.entity.decoration.ArmorStandEntity;
 import net.minecraft.entity.passive.AbstractDonkeyEntity;
@@ -48,7 +49,6 @@
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.state.properties.RotationSegment;
 import net.minecraft.state.property.Properties;
-import net.minecraft.unmapped.C_bhyaesep;
 import net.minecraft.unmapped.C_grwaorwt;
 import net.minecraft.unmapped.C_ueplrtkn;
 import net.minecraft.util.DyeColor;
@@ -110,7 +110,7 @@
             EntityType<?> lv2 = ((SpawnEggItem)stack.getItem()).getEntityType(stack);
 
             try {
-               lv2.m_gmedtjoz(pointer.world(), stack, null, pointer.pos().offset(lv), C_bhyaesep.DISPENSER, lv != Direction.UP, false);
+               lv2.m_gmedtjoz(pointer.world(), stack, null, pointer.pos().offset(lv), SpawnReason.DISPENSER, lv != Direction.UP, false);
             } catch (Exception var6) {
                LOGGER.error("Error while dispensing spawn egg from dispenser at {}", pointer.pos(), var6);
                return ItemStack.EMPTY;
@@ -136,7 +136,7 @@
             BlockPos lv2 = pointer.pos().offset(lv);
             ServerWorld lv3 = pointer.world();
             Consumer<ArmorStandEntity> consumer = EntityType.appendDefaultStackSpawnConfig(arg2 -> arg2.setYaw(lv.asRotation()), lv3, stack, null);
-            ArmorStandEntity lv4 = EntityType.ARMOR_STAND.m_nmoiyemp(lv3, consumer, lv2, C_bhyaesep.DISPENSER, false, false);
+            ArmorStandEntity lv4 = EntityType.ARMOR_STAND.m_nmoiyemp(lv3, consumer, lv2, SpawnReason.DISPENSER, false, false);
             if (lv4 != null) {
                stack.decrement(1);
             }
@@ -154,7 +154,9 @@
             public ItemStack dispenseSilently(BlockPointer pointer, ItemStack stack) {
                BlockPos lv = pointer.pos().offset(pointer.state().get(DispenserBlock.FACING));
                List<LivingEntity> list = pointer.world()
-                  .getEntitiesByClass(LivingEntity.class, new Box(lv), arg -> !(arg instanceof Saddleable lvx) ? false : !lvx.isSaddled() && lvx.canBeSaddled());
+                  .getEntitiesByClass(
+                     LivingEntity.class, new Box(lv), entity -> !(entity instanceof Saddleable lvx) ? false : !lvx.isSaddled() && lvx.canBeSaddled()
+                  );
                if (!list.isEmpty()) {
                   ((Saddleable)list.get(0)).saddle(stack.split(1), SoundCategory.BLOCKS);
                   this.setSuccess(true);
diff -bur namedTargetSrc/net/minecraft/block/DoorBlock.java namedSrc/net/minecraft/block/DoorBlock.java
--- namedTargetSrc/net/minecraft/block/DoorBlock.java	2024-10-03 00:20:34.720436517 +0000
+++ namedSrc/net/minecraft/block/DoorBlock.java	2024-10-03 00:19:28.123757813 +0000
@@ -240,7 +240,7 @@
     * Mapping not found
     */
    @Override
-   public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack stack) {
+   public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity entity, ItemStack stack) {
       world.setBlockState(pos.up(), state.with(HALF, DoubleBlockHalf.UPPER), Block.NOTIFY_ALL);
    }
 
diff -bur namedTargetSrc/net/minecraft/block/entity/BeaconBlockEntity.java namedSrc/net/minecraft/block/entity/BeaconBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/BeaconBlockEntity.java	2024-10-03 00:20:34.636435756 +0000
+++ namedSrc/net/minecraft/block/entity/BeaconBlockEntity.java	2024-10-03 00:19:28.019756681 +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/BeehiveBlockEntity.java namedSrc/net/minecraft/block/entity/BeehiveBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/BeehiveBlockEntity.java	2024-10-03 00:20:34.659435964 +0000
+++ namedSrc/net/minecraft/block/entity/BeehiveBlockEntity.java	2024-10-03 00:19:28.044756953 +0000
@@ -17,6 +17,7 @@
 import net.minecraft.component.type.NbtComponent;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityType;
+import net.minecraft.entity.SpawnReason;
 import net.minecraft.entity.passive.BeeEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.nbt.NbtCompound;
@@ -31,7 +32,6 @@
 import net.minecraft.server.network.DebugInfoSender;
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.unmapped.C_bhyaesep;
 import net.minecraft.util.annotation.Debug;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
@@ -597,7 +597,7 @@
       public Entity loadEntity(World world, BlockPos pos) {
          NbtCompound lv = this.entityData.copy();
          BeehiveBlockEntity.IRRELEVANT_BEE_NBT_KEYS.forEach(lv::remove);
-         Entity lv2 = EntityType.loadEntityWithPassengers(lv, world, C_bhyaesep.LOAD, entity -> entity);
+         Entity lv2 = EntityType.loadEntityWithPassengers(lv, world, SpawnReason.LOAD, entity -> entity);
          if (lv2 != null && lv2.getType().isIn(EntityTypeTags.BEEHIVE_INHABITORS)) {
             lv2.setNoGravity(true);
             if (lv2 instanceof BeeEntity lv3) {
diff -bur namedTargetSrc/net/minecraft/block/entity/BrushableBlockEntity.java namedSrc/net/minecraft/block/entity/BrushableBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/BrushableBlockEntity.java	2024-10-03 00:20:34.694436281 +0000
+++ namedSrc/net/minecraft/block/entity/BrushableBlockEntity.java	2024-10-03 00:19:28.089757443 +0000
@@ -106,10 +106,10 @@
    private Direction hitDirection;
    /**
     * @mapping {@literal hashed f_xskjyxrz Lnet/minecraft/unmapped/C_tlzeicbt;f_xskjyxrz:Lnet/minecraft/unmapped/C_xhhleach;}
-    * @mapping {@literal named lootTableId Lnet/minecraft/block/entity/BrushableBlockEntity;lootTableId:Lnet/minecraft/registry/RegistryKey;}
+    * @mapping {@literal named lootTable Lnet/minecraft/block/entity/BrushableBlockEntity;lootTable:Lnet/minecraft/registry/RegistryKey;}
     */
    @Nullable
-   private RegistryKey<LootTable> lootTableId;
+   private RegistryKey<LootTable> lootTable;
    /**
     * @mapping {@literal hashed f_dkmrtmhi Lnet/minecraft/unmapped/C_tlzeicbt;f_dkmrtmhi:J}
     * @mapping {@literal named lootTableSeed Lnet/minecraft/block/entity/BrushableBlockEntity;lootTableSeed:J}
@@ -162,10 +162,10 @@
     * @mapping {@literal named checkLootInteraction Lnet/minecraft/block/entity/BrushableBlockEntity;checkLootInteraction(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/item/ItemStack;)V}
     */
    private void checkLootInteraction(ServerWorld world, PlayerEntity player, ItemStack stack) {
-      if (this.lootTableId != null) {
-         LootTable lv = world.getServer().m_bilggnfr().getLootTable(this.lootTableId);
+      if (this.lootTable != null) {
+         LootTable lv = world.getServer().m_bilggnfr().getLootTable(this.lootTable);
          if (player instanceof ServerPlayerEntity lv2) {
-            Criteria.PLAYER_GENERATES_CONTAINER_LOOT.trigger(lv2, this.lootTableId);
+            Criteria.PLAYER_GENERATES_CONTAINER_LOOT.trigger(lv2, this.lootTable);
          }
 
          LootContextParameterSet lv3 = new LootContextParameterSet.Builder(world)
@@ -180,11 +180,11 @@
             case 0 -> ItemStack.EMPTY;
             case 1 -> (ItemStack)objectArrayList.getFirst();
             default -> {
-               LOGGER.warn("Expected max 1 loot from loot table {}, but got {}", this.lootTableId.getValue(), objectArrayList.size());
+               LOGGER.warn("Expected max 1 loot from loot table {}, but got {}", this.lootTable.getValue(), objectArrayList.size());
                yield (ItemStack)objectArrayList.getFirst();
             }
          };
-         this.lootTableId = null;
+         this.lootTable = null;
          this.markDirty();
       }
    }
@@ -261,7 +261,7 @@
     */
    private boolean deserializeLootTable(NbtCompound nbt) {
       if (nbt.contains("LootTable", NbtElement.STRING_TYPE)) {
-         this.lootTableId = RegistryKey.of(RegistryKeys.LOOT_TABLE, Identifier.parse(nbt.getString("LootTable")));
+         this.lootTable = RegistryKey.of(RegistryKeys.LOOT_TABLE, Identifier.parse(nbt.getString("LootTable")));
          this.lootTableSeed = nbt.getLong("LootTableSeed");
          return true;
       } else {
@@ -274,10 +274,10 @@
     * @mapping {@literal named serializeLootTable Lnet/minecraft/block/entity/BrushableBlockEntity;serializeLootTable(Lnet/minecraft/nbt/NbtCompound;)Z}
     */
    private boolean serializeLootTable(NbtCompound nbt) {
-      if (this.lootTableId == null) {
+      if (this.lootTable == null) {
          return false;
       } else {
-         nbt.putString("LootTable", this.lootTableId.getValue().toString());
+         nbt.putString("LootTable", this.lootTable.getValue().toString());
          if (this.lootTableSeed != 0L) {
             nbt.putLong("LootTableSeed", this.lootTableSeed);
          }
@@ -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> lootTable, long lootTableSeed) {
+      this.lootTable = lootTable;
       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-10-03 00:20:34.707436399 +0000
+++ namedSrc/net/minecraft/block/entity/DecoratedPotBlockEntity.java	2024-10-03 00:19:28.104757606 +0000
@@ -63,10 +63,10 @@
    private ItemStack stack = ItemStack.EMPTY;
    /**
     * @mapping {@literal hashed f_dwwkwusv Lnet/minecraft/unmapped/C_snnddtnv;f_dwwkwusv:Lnet/minecraft/unmapped/C_xhhleach;}
-    * @mapping {@literal named lootTableId Lnet/minecraft/block/entity/DecoratedPotBlockEntity;lootTableId:Lnet/minecraft/registry/RegistryKey;}
+    * @mapping {@literal named lootTable Lnet/minecraft/block/entity/DecoratedPotBlockEntity;lootTable:Lnet/minecraft/registry/RegistryKey;}
     */
    @Nullable
-   protected RegistryKey<LootTable> lootTableId;
+   protected RegistryKey<LootTable> lootTable;
    /**
     * @mapping {@literal hashed f_skwmykui Lnet/minecraft/unmapped/C_snnddtnv;f_skwmykui:J}
     * @mapping {@literal named lootTableSeed Lnet/minecraft/block/entity/DecoratedPotBlockEntity;lootTableSeed:J}
@@ -175,16 +175,16 @@
     */
    @Nullable
    @Override
-   public RegistryKey<LootTable> getLootTableId() {
-      return this.lootTableId;
+   public RegistryKey<LootTable> getLootTable() {
+      return this.lootTable;
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void setLootTable(@Nullable RegistryKey<LootTable> registryKey) {
-      this.lootTableId = registryKey;
+   public void setLootTable(@Nullable RegistryKey<LootTable> lootTable) {
+      this.lootTable = lootTable;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/entity/EndGatewayBlockEntity.java namedSrc/net/minecraft/block/entity/EndGatewayBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/EndGatewayBlockEntity.java	2024-10-03 00:20:34.769436960 +0000
+++ namedSrc/net/minecraft/block/entity/EndGatewayBlockEntity.java	2024-10-03 00:19:28.165758271 +0000
@@ -274,7 +274,7 @@
             .getLookup(RegistryKeys.CONFIGURED_FEATURE)
             .flatMap(registry -> registry.getHolder(EndConfiguredFeatures.END_ISLAND))
             .ifPresent(
-               arg3 -> ((ConfiguredFeature)arg3.value())
+               arg3 -> ((ConfiguredFeature)arg3.getValue())
                      .generate(world, world.getChunkManager().getChunkGenerator(), RandomGenerator.createLegacy(lv4.asLong()), lv4)
             );
          lv3 = lv4;
diff -bur namedTargetSrc/net/minecraft/block/entity/FuelTimes.java namedSrc/net/minecraft/block/entity/FuelTimes.java
--- namedTargetSrc/net/minecraft/block/entity/FuelTimes.java	2024-10-03 00:20:34.699436326 +0000
+++ namedSrc/net/minecraft/block/entity/FuelTimes.java	2024-10-03 00:19:28.096757519 +0000
@@ -190,7 +190,7 @@
       public FuelTimes.Builder add(TagKey<Item> tag, int fuelTime) {
          this.lookup.getTag(tag).ifPresent(item -> {
             for (Holder<Item> lv : item) {
-               this.add(fuelTime, lv.value());
+               this.add(fuelTime, lv.getValue());
             }
          });
          return this;
diff -bur namedTargetSrc/net/minecraft/block/entity/JukeboxBlockEntity.java namedSrc/net/minecraft/block/entity/JukeboxBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/JukeboxBlockEntity.java	2024-10-03 00:20:34.696436299 +0000
+++ namedSrc/net/minecraft/block/entity/JukeboxBlockEntity.java	2024-10-03 00:19:28.093757486 +0000
@@ -115,7 +115,7 @@
     * @mapping {@literal named getComparatorOutput Lnet/minecraft/block/entity/JukeboxBlockEntity;getComparatorOutput()I}
     */
    public int getComparatorOutput() {
-      return (Integer)JukeboxSong.fromStack(this.world.getRegistryManager(), this.record).map(Holder::value).map(JukeboxSong::comparatorOutput).orElse(0);
+      return (Integer)JukeboxSong.fromStack(this.world.getRegistryManager(), this.record).map(Holder::getValue).map(JukeboxSong::comparatorOutput).orElse(0);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/entity/LootableContainerBlockEntity.java namedSrc/net/minecraft/block/entity/LootableContainerBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/LootableContainerBlockEntity.java	2024-10-03 00:20:34.575435204 +0000
+++ namedSrc/net/minecraft/block/entity/LootableContainerBlockEntity.java	2024-10-03 00:19:27.949755919 +0000
@@ -22,10 +22,10 @@
 public abstract class LootableContainerBlockEntity extends LockableContainerBlockEntity implements LootableInventory {
    /**
     * @mapping {@literal hashed f_jpgmzqwu Lnet/minecraft/unmapped/C_awquuxeb;f_jpgmzqwu:Lnet/minecraft/unmapped/C_xhhleach;}
-    * @mapping {@literal named lootTableId Lnet/minecraft/block/entity/LootableContainerBlockEntity;lootTableId:Lnet/minecraft/registry/RegistryKey;}
+    * @mapping {@literal named lootTable Lnet/minecraft/block/entity/LootableContainerBlockEntity;lootTable:Lnet/minecraft/registry/RegistryKey;}
     */
    @Nullable
-   protected RegistryKey<LootTable> lootTableId;
+   protected RegistryKey<LootTable> lootTable;
    /**
     * @mapping {@literal hashed f_tbxnycjm Lnet/minecraft/unmapped/C_awquuxeb;f_tbxnycjm:J}
     * @mapping {@literal named lootTableSeed Lnet/minecraft/block/entity/LootableContainerBlockEntity;lootTableSeed:J}
@@ -45,16 +45,16 @@
     */
    @Nullable
    @Override
-   public RegistryKey<LootTable> getLootTableId() {
-      return this.lootTableId;
+   public RegistryKey<LootTable> getLootTable() {
+      return this.lootTable;
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void setLootTable(@Nullable RegistryKey<LootTable> registryKey) {
-      this.lootTableId = registryKey;
+   public void setLootTable(@Nullable RegistryKey<LootTable> lootTable) {
+      this.lootTable = lootTable;
    }
 
    /**
@@ -123,7 +123,7 @@
     */
    @Override
    public boolean checkUnlocked(PlayerEntity player) {
-      return super.checkUnlocked(player) && (this.lootTableId == null || !player.isSpectator());
+      return super.checkUnlocked(player) && (this.lootTable == null || !player.isSpectator());
    }
 
    /**
@@ -149,7 +149,7 @@
       super.readComponents(access);
       ContainerLootComponent lv = access.get(DataComponentTypes.CONTAINER_LOOT);
       if (lv != null) {
-         this.lootTableId = lv.lootTable();
+         this.lootTable = lv.lootTable();
          this.lootTableSeed = lv.seed();
       }
    }
@@ -160,8 +160,8 @@
    @Override
    protected void addComponents(DataComponentMap.Builder builder) {
       super.addComponents(builder);
-      if (this.lootTableId != null) {
-         builder.put(DataComponentTypes.CONTAINER_LOOT, new ContainerLootComponent(this.lootTableId, this.lootTableSeed));
+      if (this.lootTable != null) {
+         builder.put(DataComponentTypes.CONTAINER_LOOT, new ContainerLootComponent(this.lootTable, this.lootTableSeed));
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/block/entity/SculkShriekerBlockEntity.java namedSrc/net/minecraft/block/entity/SculkShriekerBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/SculkShriekerBlockEntity.java	2024-10-03 00:20:34.734436643 +0000
+++ namedSrc/net/minecraft/block/entity/SculkShriekerBlockEntity.java	2024-10-03 00:19:28.135757944 +0000
@@ -12,6 +12,7 @@
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.ItemEntity;
 import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.SpawnReason;
 import net.minecraft.entity.mob.warden.WardenEntity;
 import net.minecraft.entity.projectile.ProjectileEntity;
 import net.minecraft.nbt.NbtCompound;
@@ -27,7 +28,6 @@
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.unmapped.C_bhyaesep;
 import net.minecraft.util.SpawnUtil;
 import net.minecraft.util.Util;
 import net.minecraft.util.math.BlockPos;
@@ -292,7 +292,7 @@
    private boolean trySpawnWarden(ServerWorld world) {
       return this.warningLevel < 4
          ? false
-         : SpawnUtil.m_vmxczuhc(EntityType.WARDEN, C_bhyaesep.TRIGGERED, world, this.getPos(), 20, 5, 6, SpawnUtil.Strategy.f_guwflhua).isPresent();
+         : SpawnUtil.m_vmxczuhc(EntityType.WARDEN, SpawnReason.TRIGGERED, world, this.getPos(), 20, 5, 6, SpawnUtil.Strategy.f_guwflhua).isPresent();
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/entity/vault/VaultBlockEntity.java namedSrc/net/minecraft/block/entity/vault/VaultBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/vault/VaultBlockEntity.java	2024-10-03 00:20:34.642435810 +0000
+++ namedSrc/net/minecraft/block/entity/vault/VaultBlockEntity.java	2024-10-03 00:19:28.026756757 +0000
@@ -468,8 +468,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 getRandomDisplayItem Lnet/minecraft/block/entity/vault/VaultBlockEntity$Server;getRandomDisplayItem(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/item/ItemStack;}
        */
-      private static ItemStack getRandomDisplayItem(ServerWorld world, BlockPos pos, RegistryKey<LootTable> registryKey) {
-         LootTable lv = world.getServer().m_bilggnfr().getLootTable(registryKey);
+      private static ItemStack getRandomDisplayItem(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/entity/vault/VaultConfig.java namedSrc/net/minecraft/block/entity/vault/VaultConfig.java
--- namedTargetSrc/net/minecraft/block/entity/vault/VaultConfig.java	2024-10-03 00:20:34.751436797 +0000
+++ namedSrc/net/minecraft/block/entity/vault/VaultConfig.java	2024-10-03 00:19:28.150758107 +0000
@@ -41,7 +41,9 @@
     */
    static Codec<VaultConfig> codec = RecordCodecBuilder.<VaultConfig>create(
          instance -> instance.group(
-                  RegistryKey.codec(RegistryKeys.LOOT_TABLE).lenientOptionalFieldOf("loot_table", defaultConfig.lootTable()).forGetter(VaultConfig::lootTable),
+                  RegistryKey.createCodec(RegistryKeys.LOOT_TABLE)
+                     .lenientOptionalFieldOf("loot_table", defaultConfig.lootTable())
+                     .forGetter(VaultConfig::lootTable),
                   Codec.DOUBLE
                      .lenientOptionalFieldOf("activation_range", Double.valueOf(defaultConfig.activationRange()))
                      .forGetter(VaultConfig::activationRange),
@@ -49,7 +51,7 @@
                      .lenientOptionalFieldOf("deactivation_range", Double.valueOf(defaultConfig.deactivationRange()))
                      .forGetter(VaultConfig::deactivationRange),
                   ItemStack.m_nphkgyhm("key_item").forGetter(VaultConfig::keyItem),
-                  RegistryKey.codec(RegistryKeys.LOOT_TABLE)
+                  RegistryKey.createCodec(RegistryKeys.LOOT_TABLE)
                      .lenientOptionalFieldOf("override_loot_table_to_display")
                      .forGetter(VaultConfig::overrideLootTableToDisplay)
                )
@@ -78,13 +80,13 @@
     * @mapping {@literal named <init> Lnet/minecraft/block/entity/vault/VaultConfig;<init>(Lnet/minecraft/registry/RegistryKey;DDLnet/minecraft/item/ItemStack;Ljava/util/Optional;)V}
     */
    public VaultConfig(
-      RegistryKey<LootTable> registryKey,
+      RegistryKey<LootTable> lootTable,
       double activationRange,
       double deactivationRange,
       ItemStack stack,
       Optional<RegistryKey<LootTable>> overrideLootTableToDisplay
    ) {
-      this(registryKey, activationRange, deactivationRange, stack, overrideLootTableToDisplay, defaultConfig.detector(), defaultConfig.entitySelector());
+      this(lootTable, activationRange, deactivationRange, stack, overrideLootTableToDisplay, defaultConfig.detector(), defaultConfig.entitySelector());
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/enums/TrialSpawnerState.java namedSrc/net/minecraft/block/enums/TrialSpawnerState.java
--- namedTargetSrc/net/minecraft/block/enums/TrialSpawnerState.java	2024-10-03 00:20:34.749436779 +0000
+++ namedSrc/net/minecraft/block/enums/TrialSpawnerState.java	2024-10-03 00:19:28.148758085 +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/FrogSpawnBlock.java namedSrc/net/minecraft/block/FrogSpawnBlock.java
--- namedTargetSrc/net/minecraft/block/FrogSpawnBlock.java	2024-10-03 00:20:34.596435394 +0000
+++ namedSrc/net/minecraft/block/FrogSpawnBlock.java	2024-10-03 00:19:27.973756180 +0000
@@ -4,6 +4,7 @@
 import com.mojang.serialization.MapCodec;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityType;
+import net.minecraft.entity.SpawnReason;
 import net.minecraft.entity.passive.TadpoleEntity;
 import net.minecraft.fluid.FluidState;
 import net.minecraft.fluid.Fluids;
@@ -11,7 +12,6 @@
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.unmapped.C_adoatlrf;
-import net.minecraft.unmapped.C_bhyaesep;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.MathHelper;
@@ -192,7 +192,7 @@
       int i = random.range(2, 6);
 
       for (int j = 1; j <= i; j++) {
-         TadpoleEntity lv = EntityType.TADPOLE.m_oebfrxli(world, C_bhyaesep.BREEDING);
+         TadpoleEntity lv = EntityType.TADPOLE.m_oebfrxli(world, SpawnReason.BREEDING);
          if (lv != null) {
             double d = (double)pos.getX() + this.getSpawnPosition(random);
             double e = (double)pos.getZ() + this.getSpawnPosition(random);
diff -bur namedTargetSrc/net/minecraft/block/FungusBlock.java namedSrc/net/minecraft/block/FungusBlock.java
--- namedTargetSrc/net/minecraft/block/FungusBlock.java	2024-10-03 00:20:34.758436861 +0000
+++ namedSrc/net/minecraft/block/FungusBlock.java	2024-10-03 00:19:28.156758172 +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;
    }
 
@@ -120,6 +120,6 @@
    @Override
    public void fertilize(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
       this.getFeatureHolder(world)
-         .ifPresent(arg4 -> ((ConfiguredFeature)arg4.value()).generate(world, world.getChunkManager().getChunkGenerator(), random, pos));
+         .ifPresent(arg4 -> ((ConfiguredFeature)arg4.getValue()).generate(world, world.getChunkManager().getChunkGenerator(), random, pos));
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/GrassBlock.java namedSrc/net/minecraft/block/GrassBlock.java
--- namedTargetSrc/net/minecraft/block/GrassBlock.java	2024-10-03 00:20:34.744436734 +0000
+++ namedSrc/net/minecraft/block/GrassBlock.java	2024-10-03 00:19:28.143758031 +0000
@@ -91,7 +91,7 @@
          if (lv4.isAir()) {
             Holder<PlacedFeature> lv6;
             if (random.nextInt(8) == 0) {
-               List<ConfiguredFeature<?, ?>> list = world.getBiome(lv3).value().getGenerationSettings().getFlowerFeatures();
+               List<ConfiguredFeature<?, ?>> list = world.getBiome(lv3).getValue().getGenerationSettings().getFlowerFeatures();
                if (list.isEmpty()) {
                   continue;
                }
@@ -105,7 +105,7 @@
                lv6 = (Holder<PlacedFeature>)optional.get();
             }
 
-            lv6.value().place(world, world.getChunkManager().getChunkGenerator(), random, lv3);
+            lv6.getValue().place(world, world.getChunkManager().getChunkGenerator(), random, lv3);
          }
       }
    }
diff -bur namedTargetSrc/net/minecraft/block/InfestedBlock.java namedSrc/net/minecraft/block/InfestedBlock.java
--- namedTargetSrc/net/minecraft/block/InfestedBlock.java	2024-10-03 00:20:34.584435285 +0000
+++ namedSrc/net/minecraft/block/InfestedBlock.java	2024-10-03 00:19:27.960756038 +0000
@@ -7,13 +7,13 @@
 import java.util.function.Supplier;
 import net.minecraft.enchantment.EnchantmentHelper;
 import net.minecraft.entity.EntityType;
+import net.minecraft.entity.SpawnReason;
 import net.minecraft.entity.mob.SilverfishEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.tag.EnchantmentTags;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.state.property.Property;
-import net.minecraft.unmapped.C_bhyaesep;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.GameRules;
 
@@ -95,7 +95,7 @@
     * @mapping {@literal named spawnSilverfish Lnet/minecraft/block/InfestedBlock;spawnSilverfish(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/util/math/BlockPos;)V}
     */
    private void spawnSilverfish(ServerWorld world, BlockPos pos) {
-      SilverfishEntity lv = EntityType.SILVERFISH.m_oebfrxli(world, C_bhyaesep.TRIGGERED);
+      SilverfishEntity lv = EntityType.SILVERFISH.m_oebfrxli(world, SpawnReason.TRIGGERED);
       if (lv != null) {
          lv.refreshPositionAndAngles((double)pos.getX() + 0.5, (double)pos.getY(), (double)pos.getZ() + 0.5, 0.0F, 0.0F);
          world.spawnEntity(lv);
diff -bur namedTargetSrc/net/minecraft/block/JukeboxBlock.java namedSrc/net/minecraft/block/JukeboxBlock.java
--- namedTargetSrc/net/minecraft/block/JukeboxBlock.java	2024-10-03 00:20:34.582435267 +0000
+++ namedSrc/net/minecraft/block/JukeboxBlock.java	2024-10-03 00:19:27.958756017 +0000
@@ -60,8 +60,8 @@
     * Mapping not found
     */
    @Override
-   public void onPlaced(World world, BlockPos pos, BlockState state, @Nullable LivingEntity placer, ItemStack stack) {
-      super.onPlaced(world, pos, state, placer, stack);
+   public void onPlaced(World world, BlockPos pos, BlockState state, @Nullable LivingEntity entity, ItemStack stack) {
+      super.onPlaced(world, pos, state, entity, stack);
       NbtComponent lv = stack.getOrDefault(DataComponentTypes.BLOCK_ENTITY_DATA, NbtComponent.DEFAULT);
       if (lv.containsKey("RecordItem")) {
          world.setBlockState(pos, state.with(HAS_RECORD, Boolean.valueOf(true)), Block.NOTIFY_LISTENERS);
diff -bur namedTargetSrc/net/minecraft/block/MossBlock.java namedSrc/net/minecraft/block/MossBlock.java
--- namedTargetSrc/net/minecraft/block/MossBlock.java	2024-10-03 00:20:34.708436408 +0000
+++ namedSrc/net/minecraft/block/MossBlock.java	2024-10-03 00:19:28.105757617 +0000
@@ -61,7 +61,7 @@
       world.getRegistryManager()
          .getLookup(RegistryKeys.CONFIGURED_FEATURE)
          .flatMap(registry -> registry.getHolder(UndergroundConfiguredFeatures.MOSS_PATCH_BONE_MEAL))
-         .ifPresent(arg4 -> ((ConfiguredFeature)arg4.value()).generate(world, world.getChunkManager().getChunkGenerator(), random, pos.up()));
+         .ifPresent(arg4 -> ((ConfiguredFeature)arg4.getValue()).generate(world, world.getChunkManager().getChunkGenerator(), random, pos.up()));
    }
 
    /**

github-actions · 2024-10-03T00:20:37Z

View the diff here (2/3):

diff -bur namedTargetSrc/net/minecraft/block/MushroomPlantBlock.java namedSrc/net/minecraft/block/MushroomPlantBlock.java
--- namedTargetSrc/net/minecraft/block/MushroomPlantBlock.java	2024-10-03 00:20:34.637435765 +0000
+++ namedSrc/net/minecraft/block/MushroomPlantBlock.java	2024-10-03 00:19:28.020756692 +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;
    }
 
    /**
@@ -133,7 +133,7 @@
          return false;
       } else {
          world.removeBlock(pos, false);
-         if (((ConfiguredFeature)((Holder)optional.get()).value()).generate(world, world.getChunkManager().getChunkGenerator(), random, pos)) {
+         if (((ConfiguredFeature)((Holder)optional.get()).getValue()).generate(world, world.getChunkManager().getChunkGenerator(), random, pos)) {
             return true;
          } else {
             world.setBlockState(pos, state, Block.NOTIFY_ALL);
diff -bur namedTargetSrc/net/minecraft/block/NetherPortalBlock.java namedSrc/net/minecraft/block/NetherPortalBlock.java
--- namedTargetSrc/net/minecraft/block/NetherPortalBlock.java	2024-10-03 00:20:34.717436489 +0000
+++ namedSrc/net/minecraft/block/NetherPortalBlock.java	2024-10-03 00:19:28.119757770 +0000
@@ -6,6 +6,7 @@
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityDimensions;
 import net.minecraft.entity.EntityType;
+import net.minecraft.entity.SpawnReason;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.particle.ParticleTypes;
@@ -17,7 +18,6 @@
 import net.minecraft.state.property.EnumProperty;
 import net.minecraft.state.property.Properties;
 import net.minecraft.unmapped.C_adoatlrf;
-import net.minecraft.unmapped.C_bhyaesep;
 import net.minecraft.unmapped.C_crougwaz;
 import net.minecraft.util.BlockRotation;
 import net.minecraft.util.math.BlockPos;
@@ -117,7 +117,7 @@
          }
 
          if (world.getBlockState(pos).allowsSpawning(world, pos, EntityType.ZOMBIFIED_PIGLIN)) {
-            Entity lv = EntityType.ZOMBIFIED_PIGLIN.m_tqxwdyaw(world, pos.up(), C_bhyaesep.STRUCTURE);
+            Entity lv = EntityType.ZOMBIFIED_PIGLIN.m_tqxwdyaw(world, pos.up(), SpawnReason.STRUCTURE);
             if (lv != null) {
                lv.resetNetherPortalCooldown();
                Entity lv2 = lv.getVehicle();
diff -bur namedTargetSrc/net/minecraft/block/NyliumBlock.java namedSrc/net/minecraft/block/NyliumBlock.java
--- namedTargetSrc/net/minecraft/block/NyliumBlock.java	2024-10-03 00:20:34.554435014 +0000
+++ namedSrc/net/minecraft/block/NyliumBlock.java	2024-10-03 00:19:27.922755625 +0000
@@ -105,14 +105,14 @@
     */
    private void generate(
       Registry<ConfiguredFeature<?, ?>> registry,
-      RegistryKey<ConfiguredFeature<?, ?>> registryKey,
+      RegistryKey<ConfiguredFeature<?, ?>> feature,
       ServerWorld world,
       ChunkGenerator chunkGenerator,
       RandomGenerator random,
       BlockPos pos
    ) {
-      registry.getHolder(registryKey)
-         .ifPresent(registryKeyHolder -> ((ConfiguredFeature)registryKeyHolder.value()).generate(world, chunkGenerator, random, pos));
+      registry.getHolder(feature)
+         .ifPresent(registryKeyHolder -> ((ConfiguredFeature)registryKeyHolder.getValue()).generate(world, chunkGenerator, random, pos));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/piston/PistonBlock.java namedSrc/net/minecraft/block/piston/PistonBlock.java
--- namedTargetSrc/net/minecraft/block/piston/PistonBlock.java	2024-10-03 00:20:34.607435494 +0000
+++ namedSrc/net/minecraft/block/piston/PistonBlock.java	2024-10-03 00:19:27.986756321 +0000
@@ -163,7 +163,7 @@
     * Mapping not found
     */
    @Override
-   public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack stack) {
+   public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity entity, ItemStack stack) {
       if (!world.isClient) {
          this.tryMove(world, pos, state);
       }
diff -bur namedTargetSrc/net/minecraft/block/PitcherCropBlock.java namedSrc/net/minecraft/block/PitcherCropBlock.java
--- namedTargetSrc/net/minecraft/block/PitcherCropBlock.java	2024-10-03 00:20:34.725436562 +0000
+++ namedSrc/net/minecraft/block/PitcherCropBlock.java	2024-10-03 00:19:28.128757868 +0000
@@ -206,7 +206,7 @@
     * Mapping not found
     */
    @Override
-   public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack stack) {
+   public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity entity, ItemStack stack) {
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/RedstoneDiodeBlock.java namedSrc/net/minecraft/block/RedstoneDiodeBlock.java
--- namedTargetSrc/net/minecraft/block/RedstoneDiodeBlock.java	2024-10-03 00:20:34.553435005 +0000
+++ namedSrc/net/minecraft/block/RedstoneDiodeBlock.java	2024-10-03 00:19:27.921755614 +0000
@@ -218,7 +218,7 @@
     * Mapping not found
     */
    @Override
-   public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack stack) {
+   public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity entity, ItemStack stack) {
       if (this.shouldBePowered(world, pos, state)) {
          world.m_rpovjsym(pos, this, 1);
       }
diff -bur namedTargetSrc/net/minecraft/block/sapling/TreeGrower.java namedSrc/net/minecraft/block/sapling/TreeGrower.java
--- namedTargetSrc/net/minecraft/block/sapling/TreeGrower.java	2024-10-03 00:20:34.756436842 +0000
+++ namedSrc/net/minecraft/block/sapling/TreeGrower.java	2024-10-03 00:19:28.154758151 +0000
@@ -238,7 +238,7 @@
             for (int i = 0; i >= -1; i--) {
                for (int j = 0; j >= -1; j--) {
                   if (canGenerateLargeTree(state, world, pos, i, j)) {
-                     ConfiguredFeature<?, ?> lv3 = lv2.value();
+                     ConfiguredFeature<?, ?> lv3 = lv2.getValue();
                      BlockState lv4 = Blocks.AIR.getDefaultState();
                      world.setBlockState(pos.add(i, 0, j), lv4, Block.NO_REDRAW);
                      world.setBlockState(pos.add(i + 1, 0, j), lv4, Block.NO_REDRAW);
@@ -270,7 +270,7 @@
          if (lv6 == null) {
             return false;
          } else {
-            ConfiguredFeature<?, ?> lv7 = lv6.value();
+            ConfiguredFeature<?, ?> lv7 = lv6.getValue();
             BlockState lv8 = world.getFluidState(pos).getBlockState();
             world.setBlockState(pos, lv8, Block.NO_REDRAW);
             if (lv7.generate(world, generator, random, pos)) {
diff -bur namedTargetSrc/net/minecraft/block/SmallDripleafBlock.java namedSrc/net/minecraft/block/SmallDripleafBlock.java
--- namedTargetSrc/net/minecraft/block/SmallDripleafBlock.java	2024-10-03 00:20:34.713436453 +0000
+++ namedSrc/net/minecraft/block/SmallDripleafBlock.java	2024-10-03 00:19:28.112757693 +0000
@@ -106,7 +106,7 @@
     * Mapping not found
     */
    @Override
-   public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack stack) {
+   public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity entity, ItemStack stack) {
       if (!world.isClient()) {
          BlockPos lv = pos.up();
          BlockState lv2 = TallPlantBlock.withWaterloggedState(
diff -bur namedTargetSrc/net/minecraft/block/SnifferEggBlock.java namedSrc/net/minecraft/block/SnifferEggBlock.java
--- namedTargetSrc/net/minecraft/block/SnifferEggBlock.java	2024-10-03 00:20:34.662435992 +0000
+++ namedSrc/net/minecraft/block/SnifferEggBlock.java	2024-10-03 00:19:28.046756975 +0000
@@ -2,6 +2,7 @@
 
 import com.mojang.serialization.MapCodec;
 import net.minecraft.entity.EntityType;
+import net.minecraft.entity.SpawnReason;
 import net.minecraft.entity.ai.pathing.NavigationType;
 import net.minecraft.entity.passive.SnifferEntity;
 import net.minecraft.registry.tag.BlockTags;
@@ -11,7 +12,6 @@
 import net.minecraft.state.StateManager;
 import net.minecraft.state.property.IntProperty;
 import net.minecraft.state.property.Properties;
-import net.minecraft.unmapped.C_bhyaesep;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
@@ -123,7 +123,7 @@
       } else {
          world.playSound(null, pos, SoundEvents.BLOCK_SNIFFER_EGG_HATCH, SoundCategory.BLOCKS, 0.7F, 0.9F + random.nextFloat() * 0.2F);
          world.breakBlock(pos, false);
-         SnifferEntity lv = EntityType.SNIFFER.m_oebfrxli(world, C_bhyaesep.BREEDING);
+         SnifferEntity lv = EntityType.SNIFFER.m_oebfrxli(world, SpawnReason.BREEDING);
          if (lv != null) {
             Vec3d lv2 = pos.ofCenter();
             lv.setBaby(true);
diff -bur namedTargetSrc/net/minecraft/block/StemBlock.java namedSrc/net/minecraft/block/StemBlock.java
--- namedTargetSrc/net/minecraft/block/StemBlock.java	2024-10-03 00:20:34.706436390 +0000
+++ namedSrc/net/minecraft/block/StemBlock.java	2024-10-03 00:19:28.103757596 +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/StructureBlock.java namedSrc/net/minecraft/block/StructureBlock.java
--- namedTargetSrc/net/minecraft/block/StructureBlock.java	2024-10-03 00:20:34.596435394 +0000
+++ namedSrc/net/minecraft/block/StructureBlock.java	2024-10-03 00:19:27.973756180 +0000
@@ -76,12 +76,12 @@
     * Mapping not found
     */
    @Override
-   public void onPlaced(World world, BlockPos pos, BlockState state, @Nullable LivingEntity placer, ItemStack stack) {
+   public void onPlaced(World world, BlockPos pos, BlockState state, @Nullable LivingEntity entity, ItemStack stack) {
       if (!world.isClient) {
-         if (placer != null) {
+         if (entity != null) {
             BlockEntity lv = world.getBlockEntity(pos);
             if (lv instanceof StructureBlockBlockEntity) {
-               ((StructureBlockBlockEntity)lv).setAuthor(placer);
+               ((StructureBlockBlockEntity)lv).setAuthor(entity);
             }
          }
       }
diff -bur namedTargetSrc/net/minecraft/block/TallPlantBlock.java namedSrc/net/minecraft/block/TallPlantBlock.java
--- namedTargetSrc/net/minecraft/block/TallPlantBlock.java	2024-10-03 00:20:34.594435376 +0000
+++ namedSrc/net/minecraft/block/TallPlantBlock.java	2024-10-03 00:19:27.971756158 +0000
@@ -96,7 +96,7 @@
     * Mapping not found
     */
    @Override
-   public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack stack) {
+   public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity entity, ItemStack stack) {
       BlockPos lv = pos.up();
       world.setBlockState(lv, withWaterloggedState(world, lv, this.getDefaultState().with(HALF, DoubleBlockHalf.UPPER)), Block.NOTIFY_ALL);
    }
diff -bur namedTargetSrc/net/minecraft/block/TrialSpawnerConfig.java namedSrc/net/minecraft/block/TrialSpawnerConfig.java
--- namedTargetSrc/net/minecraft/block/TrialSpawnerConfig.java	2024-10-03 00:20:34.739436688 +0000
+++ namedSrc/net/minecraft/block/TrialSpawnerConfig.java	2024-10-03 00:19:28.139757987 +0000
@@ -30,11 +30,12 @@
     * @mapping {@literal hashed f_ykrjgiui Lnet/minecraft/unmapped/C_pocjjnjk;f_ykrjgiui:Lnet/minecraft/unmapped/C_pocjjnjk;}
     * @mapping {@literal named DEFAULT_INSTANCE Lnet/minecraft/block/TrialSpawnerConfig;DEFAULT_INSTANCE:Lnet/minecraft/block/TrialSpawnerConfig;}
     */
-   public static final TrialSpawnerConfig DEFAULT_INSTANCE = m_akovexzz().m_uitredfl();
+   public static final TrialSpawnerConfig DEFAULT_INSTANCE = builder().build();
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_vbllmfpg Lnet/minecraft/unmapped/C_pocjjnjk;f_vbllmfpg:Lcom/mojang/serialization/Codec;}
+    * @mapping {@literal named CODEC Lnet/minecraft/block/TrialSpawnerConfig;CODEC:Lcom/mojang/serialization/Codec;}
     */
-   public static final Codec<TrialSpawnerConfig> f_vbllmfpg = RecordCodecBuilder.create(
+   public static final Codec<TrialSpawnerConfig> CODEC = RecordCodecBuilder.create(
       instance -> instance.group(
                Codec.intRange(1, 128).optionalFieldOf("spawn_range", DEFAULT_INSTANCE.spawnRange).forGetter(TrialSpawnerConfig::spawnRange),
                Codec.floatRange(0.0F, Float.MAX_VALUE).optionalFieldOf("total_mobs", DEFAULT_INSTANCE.totalMobs).forGetter(TrialSpawnerConfig::totalMobs),
@@ -51,19 +52,20 @@
                   .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)
             )
             .apply(instance, TrialSpawnerConfig::new)
    );
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_mqsazqov Lnet/minecraft/unmapped/C_pocjjnjk;f_mqsazqov:Lcom/mojang/serialization/Codec;}
+    * @mapping {@literal named HOLDER_CODEC Lnet/minecraft/block/TrialSpawnerConfig;HOLDER_CODEC:Lcom/mojang/serialization/Codec;}
     */
-   public static final Codec<Holder<TrialSpawnerConfig>> f_mqsazqov = RegistryElementCodec.of(RegistryKeys.TRIAL_SPAWNER, f_vbllmfpg);
+   public static final Codec<Holder<TrialSpawnerConfig>> HOLDER_CODEC = RegistryElementCodec.of(RegistryKeys.TRIAL_SPAWNER, CODEC);
 
    /**
     * @mapping {@literal hashed m_snjxtjjk Lnet/minecraft/unmapped/C_pocjjnjk;m_snjxtjjk(I)I}
@@ -90,145 +92,163 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_akovexzz Lnet/minecraft/unmapped/C_pocjjnjk;m_akovexzz()Lnet/minecraft/unmapped/C_pocjjnjk$C_vnrwaphu;}
+    * @mapping {@literal named builder Lnet/minecraft/block/TrialSpawnerConfig;builder()Lnet/minecraft/block/TrialSpawnerConfig$Builder;}
     */
-   public static TrialSpawnerConfig.C_vnrwaphu m_akovexzz() {
-      return new TrialSpawnerConfig.C_vnrwaphu();
+   public static TrialSpawnerConfig.Builder builder() {
+      return new TrialSpawnerConfig.Builder();
    }
 
    /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_pocjjnjk$C_vnrwaphu}
-    * @mapping {@literal named net/minecraft/block/TrialSpawnerConfig$C_vnrwaphu}
+    * @mapping {@literal named net/minecraft/block/TrialSpawnerConfig$Builder}
     */
-   public static class C_vnrwaphu {
+   public static class Builder {
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_tmgwtcsf Lnet/minecraft/unmapped/C_pocjjnjk$C_vnrwaphu;f_tmgwtcsf:I}
+       * @mapping {@literal named spawnRange Lnet/minecraft/block/TrialSpawnerConfig$Builder;spawnRange:I}
        */
-      private int f_tmgwtcsf = 4;
+      private int spawnRange = 4;
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_vfxijlzt Lnet/minecraft/unmapped/C_pocjjnjk$C_vnrwaphu;f_vfxijlzt:F}
+       * @mapping {@literal named totalMobs Lnet/minecraft/block/TrialSpawnerConfig$Builder;totalMobs:F}
        */
-      private float f_vfxijlzt = 6.0F;
+      private float totalMobs = 6.0F;
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_grofsmmd Lnet/minecraft/unmapped/C_pocjjnjk$C_vnrwaphu;f_grofsmmd:F}
+       * @mapping {@literal named simultaneousMobs Lnet/minecraft/block/TrialSpawnerConfig$Builder;simultaneousMobs:F}
        */
-      private float f_grofsmmd = 2.0F;
+      private float simultaneousMobs = 2.0F;
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_nblcrtjb Lnet/minecraft/unmapped/C_pocjjnjk$C_vnrwaphu;f_nblcrtjb:F}
+       * @mapping {@literal named totalMobsAddedPerPlayer Lnet/minecraft/block/TrialSpawnerConfig$Builder;totalMobsAddedPerPlayer:F}
        */
-      private float f_nblcrtjb = 2.0F;
+      private float totalMobsAddedPerPlayer = 2.0F;
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_jqtdptyp Lnet/minecraft/unmapped/C_pocjjnjk$C_vnrwaphu;f_jqtdptyp:F}
+       * @mapping {@literal named simultaneousMobsAddedPerPlayer Lnet/minecraft/block/TrialSpawnerConfig$Builder;simultaneousMobsAddedPerPlayer:F}
        */
-      private float f_jqtdptyp = 1.0F;
+      private float simultaneousMobsAddedPerPlayer = 1.0F;
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_jgmutzza Lnet/minecraft/unmapped/C_pocjjnjk$C_vnrwaphu;f_jgmutzza:I}
+       * @mapping {@literal named ticksBetweenSpawn Lnet/minecraft/block/TrialSpawnerConfig$Builder;ticksBetweenSpawn:I}
        */
-      private int f_jgmutzza = 40;
+      private int ticksBetweenSpawn = 40;
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_jgjwrvli Lnet/minecraft/unmapped/C_pocjjnjk$C_vnrwaphu;f_jgjwrvli:Lnet/minecraft/unmapped/C_owfsqzhr;}
+       * @mapping {@literal named spawnPotentialsDefinition Lnet/minecraft/block/TrialSpawnerConfig$Builder;spawnPotentialsDefinition:Lnet/minecraft/util/collection/DataPool;}
        */
-      private DataPool<MobSpawnerEntry> f_jgjwrvli = DataPool.empty();
+      private DataPool<MobSpawnerEntry> spawnPotentialsDefinition = DataPool.empty();
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_gurbcovz Lnet/minecraft/unmapped/C_pocjjnjk$C_vnrwaphu;f_gurbcovz:Lnet/minecraft/unmapped/C_owfsqzhr;}
+       * @mapping {@literal named lootTablesToEject Lnet/minecraft/block/TrialSpawnerConfig$Builder;lootTablesToEject:Lnet/minecraft/util/collection/DataPool;}
        */
-      private DataPool<RegistryKey<LootTable>> f_gurbcovz = DataPool.<RegistryKey<LootTable>>builder()
+      private DataPool<RegistryKey<LootTable>> lootTablesToEject = DataPool.<RegistryKey<LootTable>>builder()
          .add(LootTables.TRIAL_CHAMBER_CONSUMABLES_SPAWNER)
          .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 {@literal named itemsToDropWhenOminous Lnet/minecraft/block/TrialSpawnerConfig$Builder;itemsToDropWhenOminous:Lnet/minecraft/registry/RegistryKey;}
        */
-      private RegistryKey<LootTable> registryKey = LootTables.TRIAL_CHAMBER_ITEMS_TO_DROP_WHEN_OMINOUS_SPAWNER;
+      private RegistryKey<LootTable> itemsToDropWhenOminous = LootTables.TRIAL_CHAMBER_ITEMS_TO_DROP_WHEN_OMINOUS_SPAWNER;
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_bdhifmhg Lnet/minecraft/unmapped/C_pocjjnjk$C_vnrwaphu;m_bdhifmhg(I)Lnet/minecraft/unmapped/C_pocjjnjk$C_vnrwaphu;}
+       * @mapping {@literal named spawnRange Lnet/minecraft/block/TrialSpawnerConfig$Builder;spawnRange(I)Lnet/minecraft/block/TrialSpawnerConfig$Builder;}
        */
-      public TrialSpawnerConfig.C_vnrwaphu m_bdhifmhg(int i) {
-         this.f_tmgwtcsf = i;
+      public TrialSpawnerConfig.Builder spawnRange(int range) {
+         this.spawnRange = range;
          return this;
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_cappnuim Lnet/minecraft/unmapped/C_pocjjnjk$C_vnrwaphu;m_cappnuim(F)Lnet/minecraft/unmapped/C_pocjjnjk$C_vnrwaphu;}
+       * @mapping {@literal named totalMobs Lnet/minecraft/block/TrialSpawnerConfig$Builder;totalMobs(F)Lnet/minecraft/block/TrialSpawnerConfig$Builder;}
        */
-      public TrialSpawnerConfig.C_vnrwaphu m_cappnuim(float f) {
-         this.f_vfxijlzt = f;
+      public TrialSpawnerConfig.Builder totalMobs(float total) {
+         this.totalMobs = total;
          return this;
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_ukbjwlwe Lnet/minecraft/unmapped/C_pocjjnjk$C_vnrwaphu;m_ukbjwlwe(F)Lnet/minecraft/unmapped/C_pocjjnjk$C_vnrwaphu;}
+       * @mapping {@literal named simultaneousMobs Lnet/minecraft/block/TrialSpawnerConfig$Builder;simultaneousMobs(F)Lnet/minecraft/block/TrialSpawnerConfig$Builder;}
        */
-      public TrialSpawnerConfig.C_vnrwaphu m_ukbjwlwe(float f) {
-         this.f_grofsmmd = f;
+      public TrialSpawnerConfig.Builder simultaneousMobs(float simultaneus) {
+         this.simultaneousMobs = simultaneus;
          return this;
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_rmwakhzj Lnet/minecraft/unmapped/C_pocjjnjk$C_vnrwaphu;m_rmwakhzj(F)Lnet/minecraft/unmapped/C_pocjjnjk$C_vnrwaphu;}
+       * @mapping {@literal named totalMobsAddedPerPlayer Lnet/minecraft/block/TrialSpawnerConfig$Builder;totalMobsAddedPerPlayer(F)Lnet/minecraft/block/TrialSpawnerConfig$Builder;}
        */
-      public TrialSpawnerConfig.C_vnrwaphu m_rmwakhzj(float f) {
-         this.f_nblcrtjb = f;
+      public TrialSpawnerConfig.Builder totalMobsAddedPerPlayer(float total) {
+         this.totalMobsAddedPerPlayer = total;
          return this;
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_eqnyjcak Lnet/minecraft/unmapped/C_pocjjnjk$C_vnrwaphu;m_eqnyjcak(F)Lnet/minecraft/unmapped/C_pocjjnjk$C_vnrwaphu;}
+       * @mapping {@literal named simultaneousMobsAddedPerPlayer Lnet/minecraft/block/TrialSpawnerConfig$Builder;simultaneousMobsAddedPerPlayer(F)Lnet/minecraft/block/TrialSpawnerConfig$Builder;}
        */
-      public TrialSpawnerConfig.C_vnrwaphu m_eqnyjcak(float f) {
-         this.f_jqtdptyp = f;
+      public TrialSpawnerConfig.Builder simultaneousMobsAddedPerPlayer(float simultaneous) {
+         this.simultaneousMobsAddedPerPlayer = simultaneous;
          return this;
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_kavdpwjp Lnet/minecraft/unmapped/C_pocjjnjk$C_vnrwaphu;m_kavdpwjp(I)Lnet/minecraft/unmapped/C_pocjjnjk$C_vnrwaphu;}
+       * @mapping {@literal named ticksBetweenSpawn Lnet/minecraft/block/TrialSpawnerConfig$Builder;ticksBetweenSpawn(I)Lnet/minecraft/block/TrialSpawnerConfig$Builder;}
        */
-      public TrialSpawnerConfig.C_vnrwaphu m_kavdpwjp(int i) {
-         this.f_jgmutzza = i;
+      public TrialSpawnerConfig.Builder ticksBetweenSpawn(int ticks) {
+         this.ticksBetweenSpawn = ticks;
          return this;
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_atarftzm Lnet/minecraft/unmapped/C_pocjjnjk$C_vnrwaphu;m_atarftzm(Lnet/minecraft/unmapped/C_owfsqzhr;)Lnet/minecraft/unmapped/C_pocjjnjk$C_vnrwaphu;}
+       * @mapping {@literal named spawnPotentialDefinition Lnet/minecraft/block/TrialSpawnerConfig$Builder;spawnPotentialDefinition(Lnet/minecraft/util/collection/DataPool;)Lnet/minecraft/block/TrialSpawnerConfig$Builder;}
        */
-      public TrialSpawnerConfig.C_vnrwaphu m_atarftzm(DataPool<MobSpawnerEntry> arg) {
-         this.f_jgjwrvli = arg;
+      public TrialSpawnerConfig.Builder spawnPotentialDefinition(DataPool<MobSpawnerEntry> definition) {
+         this.spawnPotentialsDefinition = definition;
          return this;
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_oindwyhl Lnet/minecraft/unmapped/C_pocjjnjk$C_vnrwaphu;m_oindwyhl(Lnet/minecraft/unmapped/C_owfsqzhr;)Lnet/minecraft/unmapped/C_pocjjnjk$C_vnrwaphu;}
+       * @mapping {@literal named lootTablesToEject Lnet/minecraft/block/TrialSpawnerConfig$Builder;lootTablesToEject(Lnet/minecraft/util/collection/DataPool;)Lnet/minecraft/block/TrialSpawnerConfig$Builder;}
        */
-      public TrialSpawnerConfig.C_vnrwaphu m_oindwyhl(DataPool<RegistryKey<LootTable>> arg) {
-         this.f_gurbcovz = arg;
+      public TrialSpawnerConfig.Builder lootTablesToEject(DataPool<RegistryKey<LootTable>> lootTables) {
+         this.lootTablesToEject = lootTables;
          return this;
       }
 
       /**
        * @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 {@literal named itemsToDropWhenOminous Lnet/minecraft/block/TrialSpawnerConfig$Builder;itemsToDropWhenOminous(Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/block/TrialSpawnerConfig$Builder;}
        */
-      public TrialSpawnerConfig.C_vnrwaphu m_djzmjbrp(RegistryKey<LootTable> registryKey) {
-         this.registryKey = registryKey;
+      public TrialSpawnerConfig.Builder itemsToDropWhenOminous(RegistryKey<LootTable> items) {
+         this.itemsToDropWhenOminous = items;
          return this;
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_uitredfl Lnet/minecraft/unmapped/C_pocjjnjk$C_vnrwaphu;m_uitredfl()Lnet/minecraft/unmapped/C_pocjjnjk;}
+       * @mapping {@literal named build Lnet/minecraft/block/TrialSpawnerConfig$Builder;build()Lnet/minecraft/block/TrialSpawnerConfig;}
        */
-      public TrialSpawnerConfig m_uitredfl() {
+      public TrialSpawnerConfig build() {
          return new TrialSpawnerConfig(
-            this.f_tmgwtcsf,
-            this.f_vfxijlzt,
-            this.f_grofsmmd,
-            this.f_nblcrtjb,
-            this.f_jqtdptyp,
-            this.f_jgmutzza,
-            this.f_jgjwrvli,
-            this.f_gurbcovz,
-            this.registryKey
+            this.spawnRange,
+            this.totalMobs,
+            this.simultaneousMobs,
+            this.totalMobsAddedPerPlayer,
+            this.simultaneousMobsAddedPerPlayer,
+            this.ticksBetweenSpawn,
+            this.spawnPotentialsDefinition,
+            this.lootTablesToEject,
+            this.itemsToDropWhenOminous
          );
       }
    }
diff -bur namedTargetSrc/net/minecraft/block/TrialSpawnerData.java namedSrc/net/minecraft/block/TrialSpawnerData.java
--- namedTargetSrc/net/minecraft/block/TrialSpawnerData.java	2024-10-03 00:20:34.695436290 +0000
+++ namedSrc/net/minecraft/block/TrialSpawnerData.java	2024-10-03 00:19:28.090757454 +0000
@@ -16,6 +16,7 @@
 import net.minecraft.block.enums.TrialSpawnerState;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityType;
+import net.minecraft.entity.SpawnReason;
 import net.minecraft.entity.effect.StatusEffect;
 import net.minecraft.entity.effect.StatusEffectInstance;
 import net.minecraft.entity.effect.StatusEffects;
@@ -33,7 +34,6 @@
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.RegistryKeys;
 import net.minecraft.server.world.ServerWorld;
-import net.minecraft.unmapped.C_bhyaesep;
 import net.minecraft.util.Util;
 import net.minecraft.util.UuidUtil;
 import net.minecraft.util.collection.DataPool;
@@ -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)
    );
@@ -411,7 +411,7 @@
          if (this.displayEntity == null) {
             NbtCompound lv = this.getOrCreateNextSpawnData(spawnerLogic, world.getRandom()).getEntityToSpawn();
             if (lv.contains("id", NbtElement.STRING_TYPE)) {
-               this.displayEntity = EntityType.loadEntityWithPassengers(lv, world, C_bhyaesep.TRIAL_SPAWNER, Function.identity());
+               this.displayEntity = EntityType.loadEntityWithPassengers(lv, world, SpawnReason.TRIAL_SPAWNER, Function.identity());
             }
          }
 
diff -bur namedTargetSrc/net/minecraft/block/TripwireHookBlock.java namedSrc/net/minecraft/block/TripwireHookBlock.java
--- namedTargetSrc/net/minecraft/block/TripwireHookBlock.java	2024-10-03 00:20:34.711436435 +0000
+++ namedSrc/net/minecraft/block/TripwireHookBlock.java	2024-10-03 00:19:28.110757672 +0000
@@ -189,7 +189,7 @@
     * Mapping not found
     */
    @Override
-   public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack stack) {
+   public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity entity, ItemStack stack) {
       update(world, pos, state, false, false, -1, null);
    }
 
diff -bur namedTargetSrc/net/minecraft/block/TurtleEggBlock.java namedSrc/net/minecraft/block/TurtleEggBlock.java
--- namedTargetSrc/net/minecraft/block/TurtleEggBlock.java	2024-10-03 00:20:34.714436462 +0000
+++ namedSrc/net/minecraft/block/TurtleEggBlock.java	2024-10-03 00:19:28.115757726 +0000
@@ -5,6 +5,7 @@
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.SpawnReason;
 import net.minecraft.entity.mob.ZombieEntity;
 import net.minecraft.entity.passive.BatEntity;
 import net.minecraft.entity.passive.TurtleEntity;
@@ -18,7 +19,6 @@
 import net.minecraft.state.StateManager;
 import net.minecraft.state.property.IntProperty;
 import net.minecraft.state.property.Properties;
-import net.minecraft.unmapped.C_bhyaesep;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.random.RandomGenerator;
 import net.minecraft.util.shape.VoxelShape;
@@ -160,7 +160,7 @@
 
             for (int j = 0; j < state.get(EGGS); j++) {
                world.syncWorldEvent(WorldEvents.BLOCK_BROKEN, pos, Block.getRawIdFromState(state));
-               TurtleEntity lv = EntityType.TURTLE.m_oebfrxli(world, C_bhyaesep.BREEDING);
+               TurtleEntity lv = EntityType.TURTLE.m_oebfrxli(world, SpawnReason.BREEDING);
                if (lv != null) {
                   lv.setBreedingAge(-24000);
                   lv.setHomePos(pos);
diff -bur namedTargetSrc/net/minecraft/block/WitherSkeletonWallSkullBlock.java namedSrc/net/minecraft/block/WitherSkeletonWallSkullBlock.java
--- namedTargetSrc/net/minecraft/block/WitherSkeletonWallSkullBlock.java	2024-10-03 00:20:34.749436779 +0000
+++ namedSrc/net/minecraft/block/WitherSkeletonWallSkullBlock.java	2024-10-03 00:19:28.149758096 +0000
@@ -38,7 +38,7 @@
     * Mapping not found
     */
    @Override
-   public void onPlaced(World world, BlockPos pos, BlockState state, @Nullable LivingEntity placer, ItemStack stack) {
+   public void onPlaced(World world, BlockPos pos, BlockState state, @Nullable LivingEntity entity, ItemStack stack) {
       WitherSkullBlock.onPlaced(world, pos);
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/WitherSkullBlock.java namedSrc/net/minecraft/block/WitherSkullBlock.java
--- namedTargetSrc/net/minecraft/block/WitherSkullBlock.java	2024-10-03 00:20:34.753436815 +0000
+++ namedSrc/net/minecraft/block/WitherSkullBlock.java	2024-10-03 00:19:28.152758129 +0000
@@ -8,13 +8,13 @@
 import net.minecraft.block.pattern.CachedBlockPosition;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.SpawnReason;
 import net.minecraft.entity.boss.WitherEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import net.minecraft.predicate.block.BlockStatePredicate;
 import net.minecraft.registry.tag.BlockTags;
 import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.unmapped.C_bhyaesep;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.world.Difficulty;
@@ -64,7 +64,7 @@
     * Mapping not found
     */
    @Override
-   public void onPlaced(World world, BlockPos pos, BlockState state, @Nullable LivingEntity placer, ItemStack stack) {
+   public void onPlaced(World world, BlockPos pos, BlockState state, @Nullable LivingEntity entity, ItemStack stack) {
       onPlaced(world, pos);
    }
 
@@ -89,7 +89,7 @@
          if (bl && pos.getY() >= world.getBottomY() && world.getDifficulty() != Difficulty.PEACEFUL) {
             BlockPattern.Result lv2 = getWitherBossPattern().searchAround(world, pos);
             if (lv2 != null) {
-               WitherEntity lv3 = EntityType.WITHER.m_oebfrxli(world, C_bhyaesep.TRIGGERED);
+               WitherEntity lv3 = EntityType.WITHER.m_oebfrxli(world, SpawnReason.TRIGGERED);
                if (lv3 != null) {
                   CarvedPumpkinBlock.replaceBlocks(world, lv2);
                   BlockPos lv4 = lv2.translate(1, 2, 0).getBlockPos();
diff -bur namedTargetSrc/net/minecraft/client/font/GlyphAtlasTexture.java namedSrc/net/minecraft/client/font/GlyphAtlasTexture.java
--- namedTargetSrc/net/minecraft/client/font/GlyphAtlasTexture.java	2024-10-03 00:20:34.584435285 +0000
+++ namedSrc/net/minecraft/client/font/GlyphAtlasTexture.java	2024-10-03 00:19:27.960756038 +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-10-03 00:20:34.703436363 +0000
+++ namedSrc/net/minecraft/client/font/UnihexFont.java	2024-10-03 00:19:28.100757563 +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-10-03 00:20:34.723436544 +0000
+++ namedSrc/net/minecraft/client/gl/PostProcessShader.java	2024-10-03 00:19:28.126757846 +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-10-03 00:20:34.770436969 +0000
+++ namedSrc/net/minecraft/client/gui/GuiAtlasManager.java	2024-10-03 00:19:28.166758281 +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-10-03 00:20:34.519434697 +0000
+++ namedSrc/net/minecraft/client/gui/GuiGraphics.java	2024-10-03 00:19:27.882755189 +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-10-03 00:20:34.753436815 +0000
+++ namedSrc/net/minecraft/client/gui/hud/debug/DebugHud.java	2024-10-03 00:19:28.152758129 +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-10-03 00:20:34.618435593 +0000
+++ namedSrc/net/minecraft/client/gui/hud/in_game/InGameHud.java	2024-10-03 00:19:27.998756452 +0000
@@ -807,7 +807,7 @@
                   l += 15;
                }
 
-               if (lv3.value().isBeneficial()) {
+               if (lv3.getValue().isBeneficial()) {
                   i++;
                   k -= 25 * i;
                } else {
@@ -1012,7 +1012,7 @@
    private void renderHeldItemTooltip(GuiGraphics graphics) {
       C_xuophqnt.m_yaecfwdp().push("selectedItemName");
       if (this.heldItemTooltipFade > 0 && !this.currentStack.isEmpty()) {
-         MutableText lv = Text.empty().append(this.currentStack.getName()).formatted(this.currentStack.getRarity().m_waqdxpfx());
+         MutableText lv = Text.empty().append(this.currentStack.getName()).formatted(this.currentStack.getRarity().getFormatting());
          if (this.currentStack.contains(DataComponentTypes.CUSTOM_NAME)) {
             lv.formatted(Formatting.ITALIC);
          }
@@ -1545,7 +1545,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-10-03 00:20:34.610435521 +0000
+++ namedSrc/net/minecraft/client/gui/PlayerFaceRenderer.java	2024-10-03 00:19:27.988756343 +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-10-03 00:20:34.638435774 +0000
+++ namedSrc/net/minecraft/client/gui/screen/CustomizeBuffetWorldScreen.java	2024-10-03 00:19:28.021756703 +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-10-03 00:20:34.555435023 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/BeaconScreen.java	2024-10-03 00:19:27.923755635 +0000
@@ -436,7 +436,7 @@
        * @mapping {@literal named getEffectName Lnet/minecraft/client/gui/screen/ingame/BeaconScreen$EffectButtonWidget;getEffectName(Lnet/minecraft/registry/Holder;)Lnet/minecraft/text/MutableText;}
        */
       protected MutableText getEffectName(Holder<StatusEffect> effect) {
-         return Text.translatable(effect.value().getTranslationKey());
+         return Text.translatable(effect.getValue().getTranslationKey());
       }
 
       /**
@@ -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;
       }
 
       /**
@@ -530,7 +530,7 @@
        */
       @Override
       protected MutableText getEffectName(Holder<StatusEffect> effect) {
-         return Text.translatable(effect.value().getTranslationKey()).append(" II");
+         return Text.translatable(effect.getValue().getTranslationKey()).append(" II");
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/CrafterScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/CrafterScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/CrafterScreen.java	2024-10-03 00:20:34.587435313 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/CrafterScreen.java	2024-10-03 00:19:27.963756071 +0000
@@ -119,7 +119,7 @@
       this.handler.setSlotEnabled(slot, enabled);
       super.onSlotChangedState(slot, this.handler.syncId, enabled);
       float f = enabled ? 1.0F : 0.75F;
-      this.player.playSound(SoundEvents.UI_BUTTON_CLICK.value(), 0.4F, f);
+      this.player.playSound(SoundEvents.UI_BUTTON_CLICK.getValue(), 0.4F, f);
    }
 
    /**
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-10-03 00:20:34.553435005 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.java	2024-10-03 00:19:27.922755625 +0000
@@ -639,7 +639,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-10-03 00:20:34.588435322 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/EnchantmentScreen.java	2024-10-03 00:19:27.964756082 +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/ingame/SmithingScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/SmithingScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/SmithingScreen.java	2024-10-03 00:20:34.679436145 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/SmithingScreen.java	2024-10-03 00:19:28.066757193 +0000
@@ -232,7 +232,7 @@
     */
    private void displayStack(ItemStack stack) {
       if (this.display != null) {
-         for (EquipmentSlot lv : EquipmentSlot.f_exxszrbt) {
+         for (EquipmentSlot lv : EquipmentSlot.VALUES) {
             this.display.equipStack(lv, ItemStack.EMPTY);
          }

github-actions · 2024-10-03T00:20:38Z

View the diff here (3/3):

diff -bur namedTargetSrc/net/minecraft/client/gui/screen/multiplayer/ServerLinksScreen.java namedSrc/net/minecraft/client/gui/screen/multiplayer/ServerLinksScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/multiplayer/ServerLinksScreen.java	2024-10-03 00:20:34.761436888 +0000
+++ namedSrc/net/minecraft/client/gui/screen/multiplayer/ServerLinksScreen.java	2024-10-03 00:19:28.158758194 +0000
@@ -121,7 +121,7 @@
        * @mapping {@literal named <init> Lnet/minecraft/client/gui/screen/multiplayer/ServerLinksScreen$Entry;<init>(Lnet/minecraft/client/gui/screen/Screen;Lnet/minecraft/util/ServerLinks$UriEntry;)V}
        */
       Entry(Screen parent, ServerLinks.UriEntry link) {
-         this.button = ButtonWidget.builder(link.asText(), ConfirmLinkScreen.createOpenAction(parent, link.link(), false)).width(310).build();
+         this.button = ButtonWidget.builder(link.asText(), ConfirmLinkScreen.createOpenAction(parent, link.uri(), false)).width(310).build();
       }
 
       /**
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-10-03 00:20:34.694436281 +0000
+++ namedSrc/net/minecraft/client/gui/screen/PresetsScreen.java	2024-10-03 00:19:28.089757443 +0000
@@ -184,7 +184,7 @@
          LOGGER.error("Error while parsing flat world string => Unknown block, {}", string2);
          return null;
       } else {
-         return new FlatChunkGeneratorLayer(m, (Block)((Holder.Reference)optional.get()).value());
+         return new FlatChunkGeneratorLayer(m, (Block)((Holder.Reference)optional.get()).getValue());
       }
    }
 
@@ -368,7 +368,7 @@
 
          for (Holder<FlatWorldGeneratorPreset> lv : registryManager.getLookupOrThrow(RegistryKeys.FLAT_WORLD_GENERATOR_PRESET)
             .getTagOrEmpty(FlatWorldGeneratorPresetTags.VISIBLE)) {
-            Set<Block> set = (Set<Block>)lv.value()
+            Set<Block> set = (Set<Block>)lv.getValue()
                .generatorConfig()
                .getLayers()
                .stream()
@@ -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 {
@@ -440,9 +440,9 @@
           * @mapping {@literal named <init> Lnet/minecraft/client/gui/screen/PresetsScreen$SuperflatPresetsListWidget$SuperflatPresetEntry;<init>(Lnet/minecraft/client/gui/screen/PresetsScreen$SuperflatPresetsListWidget;Lnet/minecraft/registry/Holder;)V}
           */
          public SuperflatPresetEntry(final Holder<FlatWorldGeneratorPreset> preset) {
-            this.preset = preset.value();
+            this.preset = preset.getValue();
             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);
          }
 
@@ -453,7 +453,7 @@
          public void render(
             GuiGraphics graphics, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta
          ) {
-            this.renderIcon(graphics, x, y, this.preset.displayItem().value());
+            this.renderIcon(graphics, x, y, this.preset.displayItem().getValue());
             graphics.drawText(PresetsScreen.this.textRenderer, this.name, x + 18 + 5, y + 6, 16777215, false);
          }
 
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-10-03 00:20:34.530434796 +0000
+++ namedSrc/net/minecraft/client/gui/screen/realms/RealmsResetWorldScreen.java	2024-10-03 00:19:27.896755341 +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-10-03 00:20:34.606435485 +0000
+++ namedSrc/net/minecraft/client/gui/screen/SplashOverlay.java	2024-10-03 00:19:27.985756311 +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-10-03 00:20:34.537434860 +0000
+++ namedSrc/net/minecraft/client/gui/screen/world/CreateWorldScreen.java	2024-10-03 00:19:27.905755440 +0000
@@ -267,7 +267,7 @@
       @Nullable Screen parent,
       Function<WorldLoader.DataLoadContext, GeneratorOptions> function,
       C_zugbgokk arg3,
-      RegistryKey<GeneratorType> registryKey,
+      RegistryKey<GeneratorType> generatorType,
       C_vuympcpz arg5
    ) {
       showMessage(client, PREPARING);
@@ -285,7 +285,7 @@
       );
       client.runTasks(completableFuture::isDone);
       client.setScreen(
-         new CreateWorldScreen(client, parent, (WorldCreationContext)completableFuture.join(), Optional.of(registryKey), OptionalLong.empty(), arg5)
+         new CreateWorldScreen(client, parent, (WorldCreationContext)completableFuture.join(), Optional.of(generatorType), OptionalLong.empty(), arg5)
       );
    }
 
@@ -409,7 +409,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 +622,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();
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-10-03 00:20:34.649435874 +0000
+++ namedSrc/net/minecraft/client/gui/tooltip/TooltipRenderHelper.java	2024-10-03 00:19:28.034756844 +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-10-03 00:20:34.724436553 +0000
+++ namedSrc/net/minecraft/client/gui/widget/button/LockButtonWidget.java	2024-10-03 00:19:28.127757857 +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-10-03 00:20:34.755436833 +0000
+++ namedSrc/net/minecraft/client/gui/widget/button/SpriteButtonWidget.java	2024-10-03 00:19:28.153758140 +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-10-03 00:20:34.778437042 +0000
+++ namedSrc/net/minecraft/client/gui/widget/TexturedWidget.java	2024-10-03 00:19:28.175758379 +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/item/ModelPredicateProviderRegistry.java namedSrc/net/minecraft/client/item/ModelPredicateProviderRegistry.java
--- namedTargetSrc/net/minecraft/client/item/ModelPredicateProviderRegistry.java	2024-10-03 00:20:34.672436082 +0000
+++ namedSrc/net/minecraft/client/item/ModelPredicateProviderRegistry.java	2024-10-03 00:19:28.057757094 +0000
@@ -145,7 +145,7 @@
       );
       UnclampedModelPredicateProvider lv = (stack, world, entity, seed) -> {
          ArmorTrimPermutation lvx = stack.get(DataComponentTypes.TRIM);
-         return lvx != null ? lvx.material().value().itemModelIndex() : Float.NEGATIVE_INFINITY;
+         return lvx != null ? lvx.material().getValue().itemModelIndex() : Float.NEGATIVE_INFINITY;
       };
       register(ItemModelGenerator.TRIM_TYPE, lv);
       register(Identifier.ofDefault("broken"), (stack, world, entity, seed) -> stack.m_abowndct() ? 1.0F : 0.0F);
@@ -169,7 +169,7 @@
          Identifier.ofDefault("pulling"),
          (stack, world, entity, seed) -> entity != null && entity.isUsingItem() && entity.getActiveItem() == stack ? 1.0F : 0.0F
       );
-      register(Items.BUNDLE, Identifier.ofDefault("filled"), (stack, world, arg3, i) -> BundleItem.getAmountFilled(stack));
+      register(Items.BUNDLE, Identifier.ofDefault("filled"), (stack, world, entity, i) -> BundleItem.getAmountFilled(stack));
       register(
          Items.CLOCK,
          Identifier.ofDefault("time"),
@@ -195,8 +195,8 @@
              * @mapping {@literal named unclampedCall Lnet/minecraft/client/item/ModelPredicateProviderRegistry$C_dxecmdav;unclampedCall(Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/world/ClientWorld;Lnet/minecraft/entity/LivingEntity;I)F}
              */
             @Override
-            public float unclampedCall(ItemStack stack, @Nullable ClientWorld world, @Nullable LivingEntity arg3, int i) {
-               Entity lv = (Entity)(arg3 != null ? arg3 : stack.getEntityHolder());
+            public float unclampedCall(ItemStack stack, @Nullable ClientWorld world, @Nullable LivingEntity entity, int i) {
+               Entity lv = (Entity)(entity != null ? entity : stack.getEntityHolder());
                if (lv == null) {
                   return 0.0F;
                } else {
@@ -245,7 +245,7 @@
       register(
          Items.RECOVERY_COMPASS,
          Identifier.ofDefault("angle"),
-         new C_mkgnfzob((world, stack, arg3) -> arg3 instanceof PlayerEntity lvx ? (GlobalPos)lvx.getLastDeathPos().orElse(null) : null)
+         new C_mkgnfzob((world, stack, entity) -> entity instanceof PlayerEntity lvx ? (GlobalPos)lvx.getLastDeathPos().orElse(null) : null)
       );
       register(
          Items.CROSSBOW,
@@ -305,7 +305,7 @@
          Identifier.ofDefault("tooting"),
          (stack, world, entity, seed) -> entity != null && entity.isUsingItem() && entity.getActiveItem() == stack ? 1.0F : 0.0F
       );
-      register(Items.BEE_NEST, Identifier.ofDefault("honey_level"), (stack, world, arg3, i) -> (float)m_dlhrotnj(stack));
-      register(Items.BEEHIVE, Identifier.ofDefault("honey_level"), (stack, world, arg3, i) -> (float)m_dlhrotnj(stack));
+      register(Items.BEE_NEST, Identifier.ofDefault("honey_level"), (stack, world, entity, i) -> (float)m_dlhrotnj(stack));
+      register(Items.BEEHIVE, Identifier.ofDefault("honey_level"), (stack, world, entity, i) -> (float)m_dlhrotnj(stack));
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/item/UnclampedModelPredicateProvider.java namedSrc/net/minecraft/client/item/UnclampedModelPredicateProvider.java
--- namedTargetSrc/net/minecraft/client/item/UnclampedModelPredicateProvider.java	2024-10-03 00:20:34.738436679 +0000
+++ namedSrc/net/minecraft/client/item/UnclampedModelPredicateProvider.java	2024-10-03 00:19:28.138757977 +0000
@@ -20,8 +20,8 @@
     */
    @Deprecated
    @Override
-   default float call(ItemStack stack, @Nullable ClientWorld world, @Nullable LivingEntity arg3, int i) {
-      return MathHelper.clamp(this.unclampedCall(stack, world, arg3, i), 0.0F, 1.0F);
+   default float call(ItemStack stack, @Nullable ClientWorld world, @Nullable LivingEntity entity, int i) {
+      return MathHelper.clamp(this.unclampedCall(stack, world, entity, i), 0.0F, 1.0F);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/MinecraftClient.java namedSrc/net/minecraft/client/MinecraftClient.java
--- namedTargetSrc/net/minecraft/client/MinecraftClient.java	2024-10-03 00:20:34.572435177 +0000
+++ namedSrc/net/minecraft/client/MinecraftClient.java	2024-10-03 00:19:27.941755832 +0000
@@ -1753,8 +1753,8 @@
          }
       }
 
-      Registries.ITEM.holders().forEach(arg -> {
-         Item lvx = (Item)arg.value();
+      Registries.ITEM.streamHolders().forEach(arg -> {
+         Item lvx = (Item)arg.getValue();
          String string = lvx.m_eryjwjll();
          String string2 = Text.translatable(string).getString();
          if (string2.toLowerCase(Locale.ROOT).equals(lvx.m_eryjwjll())) {
@@ -3600,7 +3600,7 @@
                      && this.player.getAbilities().creativeMode
                      && this.player.getAbilities().allowFlying
                   ? MusicType.CREATIVE
-                  : (MusicSound)lv2.value().getMusic().orElse(MusicType.GAME);
+                  : (MusicSound)lv2.getValue().getMusic().orElse(MusicType.GAME);
             } else {
                return MusicType.UNDERWATER;
             }
diff -bur namedTargetSrc/net/minecraft/client/network/AbstractClientNetworkHandler.java namedSrc/net/minecraft/client/network/AbstractClientNetworkHandler.java
--- namedTargetSrc/net/minecraft/client/network/AbstractClientNetworkHandler.java	2024-10-03 00:20:34.663436001 +0000
+++ namedSrc/net/minecraft/client/network/AbstractClientNetworkHandler.java	2024-10-03 00:19:28.047756986 +0000
@@ -166,7 +166,7 @@
       LOGGER.error("Failed to handle packet {}, disconnecting", packet, cause);
       ClientCommonPacketListener.super.onPacketException(packet, cause);
       Optional<Path> optional = this.m_yuakheuk(packet, cause);
-      Optional<URI> optional2 = this.serverLinks.findByType(ServerLinks.KnownServerLinkType.BUG_REPORT).map(ServerLinks.UriEntry::link);
+      Optional<URI> optional2 = this.serverLinks.findByType(ServerLinks.KnownServerLinkType.BUG_REPORT).map(ServerLinks.UriEntry::uri);
       this.connection.disconnect(new DisconnectionDetails(Text.translatable("disconnect.packetError"), optional, optional2));
    }
 
@@ -176,7 +176,7 @@
    @Override
    public DisconnectionDetails createDisconnectionDetails(Text reason, Throwable cause) {
       Optional<Path> optional = this.m_yuakheuk(null, cause);
-      Optional<URI> optional2 = this.serverLinks.findByType(ServerLinks.KnownServerLinkType.BUG_REPORT).map(ServerLinks.UriEntry::link);
+      Optional<URI> optional2 = this.serverLinks.findByType(ServerLinks.KnownServerLinkType.BUG_REPORT).map(ServerLinks.UriEntry::uri);
       return new DisconnectionDetails(reason, optional, optional2);
    }
 
@@ -190,7 +190,7 @@
       Path path = this.client.runDirectory.toPath().resolve("debug");
       Path path2 = path.resolve("disconnect-" + Util.getFileNameFormattedDateTime() + "-client.txt");
       Optional<ServerLinks.UriEntry> optional = this.serverLinks.findByType(ServerLinks.KnownServerLinkType.BUG_REPORT);
-      List<String> list = (List<String>)optional.map(arg -> List.of("Server bug reporting link: " + arg.link())).orElse(List.of());
+      List<String> list = (List<String>)optional.map(arg -> List.of("Server bug reporting link: " + arg.uri())).orElse(List.of());
       return lv.m_jipyzcdw(path2, C_ccpekhhb.MINECRAFT_NETWORK_PROTOCOL_ERROR_REPORT, list) ? Optional.of(path2) : Optional.empty();
    }
 
diff -bur namedTargetSrc/net/minecraft/client/network/ClientCommandSource.java namedSrc/net/minecraft/client/network/ClientCommandSource.java
--- namedTargetSrc/net/minecraft/client/network/ClientCommandSource.java	2024-10-03 00:20:34.726436571 +0000
+++ namedSrc/net/minecraft/client/network/ClientCommandSource.java	2024-10-03 00:19:28.129757879 +0000
@@ -149,10 +149,10 @@
     */
    @Override
    public CompletableFuture<Suggestions> suggestRegistryElements(
-      RegistryKey<? extends Registry<?>> registryKey, CommandSource.ElementSuggestionType suggestionType, SuggestionsBuilder builder, CommandContext<?> context
+      RegistryKey<? extends Registry<?>> registry, CommandSource.ElementSuggestionType suggestionType, SuggestionsBuilder builder, CommandContext<?> context
    ) {
-      return (CompletableFuture<Suggestions>)this.getRegistryManager().getLookup(registryKey).map(registry -> {
-         this.suggestRegistryElements(registry, suggestionType, builder);
+      return (CompletableFuture<Suggestions>)this.getRegistryManager().getLookup(registry).map(registryx -> {
+         this.suggestRegistryElements(registryx, suggestionType, builder);
          return builder.buildFuture();
       }).orElseGet(() -> this.getCompletions(context));
    }
diff -bur namedTargetSrc/net/minecraft/client/network/ClientPlayerEntity.java namedSrc/net/minecraft/client/network/ClientPlayerEntity.java
--- namedTargetSrc/net/minecraft/client/network/ClientPlayerEntity.java	2024-10-03 00:20:34.676436118 +0000
+++ namedSrc/net/minecraft/client/network/ClientPlayerEntity.java	2024-10-03 00:19:28.062757149 +0000
@@ -966,16 +966,16 @@
     * Mapping not found
     */
    @Override
-   public void addCritParticles(Entity target) {
-      this.client.particleManager.addEmitter(target, ParticleTypes.CRIT);
+   public void addCritParticles(Entity entity) {
+      this.client.particleManager.addEmitter(entity, ParticleTypes.CRIT);
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void addEnchantedHitParticles(Entity target) {
-      this.client.particleManager.addEmitter(target, ParticleTypes.ENCHANTED_HIT);
+   public void addEnchantedHitParticles(Entity entity) {
+      this.client.particleManager.addEmitter(entity, ParticleTypes.ENCHANTED_HIT);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java namedSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java
--- namedTargetSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java	2024-10-03 00:20:34.764436915 +0000
+++ namedSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java	2024-10-03 00:19:28.162758238 +0000
@@ -72,6 +72,7 @@
 import net.minecraft.entity.Leashable;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.PacketPositionCodec;
+import net.minecraft.entity.SpawnReason;
 import net.minecraft.entity.attribute.AttributeContainer;
 import net.minecraft.entity.attribute.EntityAttributeInstance;
 import net.minecraft.entity.attribute.EntityAttributeModifier;
@@ -284,7 +285,6 @@
 import net.minecraft.stat.Stat;
 import net.minecraft.stat.StatHandler;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_bhyaesep;
 import net.minecraft.unmapped.C_btculrky;
 import net.minecraft.unmapped.C_dxakxzow;
 import net.minecraft.unmapped.C_hgofpcxx;
@@ -673,7 +673,7 @@
             return new OtherClientPlayerEntity(this.world, lv2.getProfile());
          }
       } else {
-         return lv.m_oebfrxli(this.world, C_bhyaesep.LOAD);
+         return lv.m_oebfrxli(this.world, SpawnReason.LOAD);
       }
    }
 
@@ -1451,7 +1451,7 @@
             lv.getX(),
             lv.getY(),
             lv.getZ(),
-            packet.explosionSound().value(),
+            packet.explosionSound().getValue(),
             SoundCategory.BLOCKS,
             4.0F,
             (1.0F + (this.client.world.random.nextFloat() - this.client.world.random.nextFloat()) * 0.2F) * 0.7F,
@@ -1915,11 +1915,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>> registry, TagNetworkSerialization.NetworkPayload payload) {
+      Registry<T> lv = this.clientRegistryManager.getLookupOrThrow(registry);
+      return lv.startTagReload(payload.deserialize(lv));
    }
 
    /**
@@ -1928,14 +1928,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 = FuelTimes.create(this.clientRegistryManager, this.enabledFlags);
       List<ItemStack> list2 = List.copyOf(ItemGroups.getSearchGroup().getOrInitTabStacks());
       this.f_yzsmztuz.m_zndcnouo(list2);
diff -bur namedTargetSrc/net/minecraft/client/option/AttackIndicator.java namedSrc/net/minecraft/client/option/AttackIndicator.java
--- namedTargetSrc/net/minecraft/client/option/AttackIndicator.java	2024-10-03 00:20:34.689436236 +0000
+++ namedSrc/net/minecraft/client/option/AttackIndicator.java	2024-10-03 00:19:28.082757367 +0000
@@ -30,9 +30,9 @@
 
    /**
     * @mapping {@literal hashed f_biuwndyo Lnet/minecraft/unmapped/C_qkksfeqi;f_biuwndyo:Ljava/util/function/IntFunction;}
-    * @mapping {@literal named VALUES Lnet/minecraft/client/option/AttackIndicator;VALUES:Ljava/util/function/IntFunction;}
+    * @mapping {@literal named BY_ID Lnet/minecraft/client/option/AttackIndicator;BY_ID:Ljava/util/function/IntFunction;}
     */
-   private static final IntFunction<AttackIndicator> VALUES = IdListUtil.sortArray(AttackIndicator::getId, values(), IdListUtil.OutOfBoundsHandler.WRAP);
+   private static final IntFunction<AttackIndicator> BY_ID = IdListUtil.createByIdGetter(AttackIndicator::getId, values(), IdListUtil.OutOfBoundsHandler.WRAP);
    /**
     * @mapping {@literal hashed f_ybcrnvze Lnet/minecraft/unmapped/C_qkksfeqi;f_ybcrnvze:I}
     * @mapping {@literal named id Lnet/minecraft/client/option/AttackIndicator;id:I}
@@ -74,6 +74,6 @@
     * @mapping {@literal named byId Lnet/minecraft/client/option/AttackIndicator;byId(I)Lnet/minecraft/client/option/AttackIndicator;}
     */
    public static AttackIndicator byId(int id) {
-      return (AttackIndicator)VALUES.apply(id);
+      return (AttackIndicator)BY_ID.apply(id);
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/option/ChatVisibility.java namedSrc/net/minecraft/client/option/ChatVisibility.java
--- namedTargetSrc/net/minecraft/client/option/ChatVisibility.java	2024-10-03 00:20:34.672436082 +0000
+++ namedSrc/net/minecraft/client/option/ChatVisibility.java	2024-10-03 00:19:28.057757094 +0000
@@ -27,9 +27,9 @@
 
    /**
     * @mapping {@literal hashed f_zqqalhdk Lnet/minecraft/unmapped/C_wafwmsvb;f_zqqalhdk:Ljava/util/function/IntFunction;}
-    * @mapping {@literal named VALUES Lnet/minecraft/client/option/ChatVisibility;VALUES:Ljava/util/function/IntFunction;}
+    * @mapping {@literal named BY_ID Lnet/minecraft/client/option/ChatVisibility;BY_ID:Ljava/util/function/IntFunction;}
     */
-   private static final IntFunction<ChatVisibility> VALUES = IdListUtil.sortArray(ChatVisibility::getId, values(), IdListUtil.OutOfBoundsHandler.WRAP);
+   private static final IntFunction<ChatVisibility> BY_ID = IdListUtil.createByIdGetter(ChatVisibility::getId, values(), IdListUtil.OutOfBoundsHandler.WRAP);
    /**
     * @mapping {@literal hashed f_zzwzstvf Lnet/minecraft/unmapped/C_wafwmsvb;f_zzwzstvf:I}
     * @mapping {@literal named id Lnet/minecraft/client/option/ChatVisibility;id:I}
@@ -71,6 +71,6 @@
     * @mapping {@literal named byId Lnet/minecraft/client/option/ChatVisibility;byId(I)Lnet/minecraft/client/option/ChatVisibility;}
     */
    public static ChatVisibility byId(int id) {
-      return (ChatVisibility)VALUES.apply(id);
+      return (ChatVisibility)BY_ID.apply(id);
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/option/ChunkUpdatesPrioritization.java namedSrc/net/minecraft/client/option/ChunkUpdatesPrioritization.java
--- namedTargetSrc/net/minecraft/client/option/ChunkUpdatesPrioritization.java	2024-10-03 00:20:34.706436390 +0000
+++ namedSrc/net/minecraft/client/option/ChunkUpdatesPrioritization.java	2024-10-03 00:19:28.103757596 +0000
@@ -30,9 +30,9 @@
 
    /**
     * @mapping {@literal hashed f_quwymauq Lnet/minecraft/unmapped/C_acpywlie;f_quwymauq:Ljava/util/function/IntFunction;}
-    * @mapping {@literal named VALUES Lnet/minecraft/client/option/ChunkUpdatesPrioritization;VALUES:Ljava/util/function/IntFunction;}
+    * @mapping {@literal named BY_ID Lnet/minecraft/client/option/ChunkUpdatesPrioritization;BY_ID:Ljava/util/function/IntFunction;}
     */
-   private static final IntFunction<ChunkUpdatesPrioritization> VALUES = IdListUtil.sortArray(
+   private static final IntFunction<ChunkUpdatesPrioritization> BY_ID = IdListUtil.createByIdGetter(
       ChunkUpdatesPrioritization::getId, values(), IdListUtil.OutOfBoundsHandler.WRAP
    );
    /**
@@ -73,9 +73,9 @@
 
    /**
     * @mapping {@literal hashed m_azahvtif Lnet/minecraft/unmapped/C_acpywlie;m_azahvtif(I)Lnet/minecraft/unmapped/C_acpywlie;}
-    * @mapping {@literal named fromId Lnet/minecraft/client/option/ChunkUpdatesPrioritization;fromId(I)Lnet/minecraft/client/option/ChunkUpdatesPrioritization;}
+    * @mapping {@literal named byId Lnet/minecraft/client/option/ChunkUpdatesPrioritization;byId(I)Lnet/minecraft/client/option/ChunkUpdatesPrioritization;}
     */
-   public static ChunkUpdatesPrioritization fromId(int id) {
-      return (ChunkUpdatesPrioritization)VALUES.apply(id);
+   public static ChunkUpdatesPrioritization byId(int id) {
+      return (ChunkUpdatesPrioritization)BY_ID.apply(id);
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/option/GameOptions.java namedSrc/net/minecraft/client/option/GameOptions.java
--- namedTargetSrc/net/minecraft/client/option/GameOptions.java	2024-10-03 00:20:34.737436670 +0000
+++ namedSrc/net/minecraft/client/option/GameOptions.java	2024-10-03 00:19:28.138757977 +0000
@@ -357,7 +357,7 @@
       },
       Option.optionEnumText(),
       new Option.EnumValueSet<>(
-         Arrays.asList(ChunkUpdatesPrioritization.values()), Codec.INT.xmap(ChunkUpdatesPrioritization::fromId, ChunkUpdatesPrioritization::getId)
+         Arrays.asList(ChunkUpdatesPrioritization.values()), Codec.INT.xmap(ChunkUpdatesPrioritization::byId, ChunkUpdatesPrioritization::getId)
       ),
       ChunkUpdatesPrioritization.NONE,
       arg -> {
diff -bur namedTargetSrc/net/minecraft/client/option/GraphicsMode.java namedSrc/net/minecraft/client/option/GraphicsMode.java
--- namedTargetSrc/net/minecraft/client/option/GraphicsMode.java	2024-10-03 00:20:34.729436598 +0000
+++ namedSrc/net/minecraft/client/option/GraphicsMode.java	2024-10-03 00:19:28.132757911 +0000
@@ -30,9 +30,9 @@
 
    /**
     * @mapping {@literal hashed f_tpfeaisz Lnet/minecraft/unmapped/C_inrattee;f_tpfeaisz:Ljava/util/function/IntFunction;}
-    * @mapping {@literal named VALUES Lnet/minecraft/client/option/GraphicsMode;VALUES:Ljava/util/function/IntFunction;}
+    * @mapping {@literal named BY_ID Lnet/minecraft/client/option/GraphicsMode;BY_ID:Ljava/util/function/IntFunction;}
     */
-   private static final IntFunction<GraphicsMode> VALUES = IdListUtil.sortArray(GraphicsMode::getId, values(), IdListUtil.OutOfBoundsHandler.WRAP);
+   private static final IntFunction<GraphicsMode> BY_ID = IdListUtil.createByIdGetter(GraphicsMode::getId, values(), IdListUtil.OutOfBoundsHandler.WRAP);
    /**
     * @mapping {@literal hashed f_hyeaecff Lnet/minecraft/unmapped/C_inrattee;f_hyeaecff:I}
     * @mapping {@literal named id Lnet/minecraft/client/option/GraphicsMode;id:I}
@@ -86,6 +86,6 @@
     * @mapping {@literal named byId Lnet/minecraft/client/option/GraphicsMode;byId(I)Lnet/minecraft/client/option/GraphicsMode;}
     */
    public static GraphicsMode byId(int id) {
-      return (GraphicsMode)VALUES.apply(id);
+      return (GraphicsMode)BY_ID.apply(id);
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/option/NarratorMode.java namedSrc/net/minecraft/client/option/NarratorMode.java
--- namedTargetSrc/net/minecraft/client/option/NarratorMode.java	2024-10-03 00:20:34.560435068 +0000
+++ namedSrc/net/minecraft/client/option/NarratorMode.java	2024-10-03 00:19:27.927755679 +0000
@@ -35,9 +35,9 @@
 
    /**
     * @mapping {@literal hashed f_qtvfmgny Lnet/minecraft/unmapped/C_ekczyczh;f_qtvfmgny:Ljava/util/function/IntFunction;}
-    * @mapping {@literal named VALUES Lnet/minecraft/client/option/NarratorMode;VALUES:Ljava/util/function/IntFunction;}
+    * @mapping {@literal named BY_ID Lnet/minecraft/client/option/NarratorMode;BY_ID:Ljava/util/function/IntFunction;}
     */
-   private static final IntFunction<NarratorMode> VALUES = IdListUtil.sortArray(NarratorMode::getId, values(), IdListUtil.OutOfBoundsHandler.WRAP);
+   private static final IntFunction<NarratorMode> BY_ID = IdListUtil.createByIdGetter(NarratorMode::getId, values(), IdListUtil.OutOfBoundsHandler.WRAP);
    /**
     * @mapping {@literal hashed f_nikdsyso Lnet/minecraft/unmapped/C_ekczyczh;f_nikdsyso:I}
     * @mapping {@literal named id Lnet/minecraft/client/option/NarratorMode;id:I}
@@ -53,9 +53,9 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_ekczyczh;<init>(Ljava/lang/String;IILjava/lang/String;)V}
     * @mapping {@literal named <init> Lnet/minecraft/client/option/NarratorMode;<init>(Ljava/lang/String;IILjava/lang/String;)V}
     */
-   private NarratorMode(final int id, final String name) {
+   private NarratorMode(final int id, final String translationKey) {
       this.id = id;
-      this.name = Text.translatable(name);
+      this.name = Text.translatable(translationKey);
    }
 
    /**
@@ -79,7 +79,7 @@
     * @mapping {@literal named byId Lnet/minecraft/client/option/NarratorMode;byId(I)Lnet/minecraft/client/option/NarratorMode;}
     */
    public static NarratorMode byId(int id) {
-      return (NarratorMode)VALUES.apply(id);
+      return (NarratorMode)BY_ID.apply(id);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/option/ParticlesMode.java namedSrc/net/minecraft/client/option/ParticlesMode.java
--- namedTargetSrc/net/minecraft/client/option/ParticlesMode.java	2024-10-03 00:20:34.624435648 +0000
+++ namedSrc/net/minecraft/client/option/ParticlesMode.java	2024-10-03 00:19:28.004756518 +0000
@@ -27,9 +27,9 @@
 
    /**
     * @mapping {@literal hashed f_zkrtmlae Lnet/minecraft/unmapped/C_ohzhuhsr;f_zkrtmlae:Ljava/util/function/IntFunction;}
-    * @mapping {@literal named VALUES Lnet/minecraft/client/option/ParticlesMode;VALUES:Ljava/util/function/IntFunction;}
+    * @mapping {@literal named BY_ID Lnet/minecraft/client/option/ParticlesMode;BY_ID:Ljava/util/function/IntFunction;}
     */
-   private static final IntFunction<ParticlesMode> VALUES = IdListUtil.sortArray(ParticlesMode::getId, values(), IdListUtil.OutOfBoundsHandler.WRAP);
+   private static final IntFunction<ParticlesMode> BY_ID = IdListUtil.createByIdGetter(ParticlesMode::getId, values(), IdListUtil.OutOfBoundsHandler.WRAP);
    /**
     * @mapping {@literal hashed f_qjewekah Lnet/minecraft/unmapped/C_ohzhuhsr;f_qjewekah:I}
     * @mapping {@literal named id Lnet/minecraft/client/option/ParticlesMode;id:I}
@@ -71,6 +71,6 @@
     * @mapping {@literal named byId Lnet/minecraft/client/option/ParticlesMode;byId(I)Lnet/minecraft/client/option/ParticlesMode;}
     */
    public static ParticlesMode byId(int id) {
-      return (ParticlesMode)VALUES.apply(id);
+      return (ParticlesMode)BY_ID.apply(id);
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/realms/RealmsWorldGeneratorType.java namedSrc/net/minecraft/client/realms/RealmsWorldGeneratorType.java
--- namedTargetSrc/net/minecraft/client/realms/RealmsWorldGeneratorType.java	2024-10-03 00:20:34.751436797 +0000
+++ namedSrc/net/minecraft/client/realms/RealmsWorldGeneratorType.java	2024-10-03 00:19:28.151758118 +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> type) {
       this.id = id;
-      this.text = Text.translatable(registryKey.getValue().toTranslationKey("generator"));
+      this.text = Text.translatable(type.getValue().toTranslationKey("generator"));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/render/BackgroundRenderer.java namedSrc/net/minecraft/client/render/BackgroundRenderer.java
--- namedTargetSrc/net/minecraft/client/render/BackgroundRenderer.java	2024-10-03 00:20:34.536434851 +0000
+++ namedSrc/net/minecraft/client/render/BackgroundRenderer.java	2024-10-03 00:19:27.902755407 +0000
@@ -81,7 +81,7 @@
       float w;
       if (lv == CameraSubmersionType.WATER) {
          long l = Util.getMeasuringTimeMs();
-         int j = world.getBiome(BlockPos.fromPosition(camera.getPos())).value().getWaterFogColor();
+         int j = world.getBiome(BlockPos.fromPosition(camera.getPos())).getValue().getWaterFogColor();
          if (lastWaterFogColorUpdateTime < 0L) {
             waterFogColor = j;
             nextWaterFogColor = j;
@@ -127,7 +127,7 @@
          BiomeAccess lv3 = world.getBiomeAccess();
          Vec3d lv4 = camera.getPos().subtract(2.0, 2.0, 2.0).multiply(0.25);
          Vec3d lv5 = CubicSampler.sampleVec3d(
-            lv4, (x, y, z) -> world.getSkyProperties().adjustFogColor(Vec3d.unpackRgb(lv3.getBiomeForNoiseGen(x, y, z).value().getFogColor()), ai)
+            lv4, (x, y, z) -> world.getSkyProperties().adjustFogColor(Vec3d.unpackRgb(lv3.getBiomeForNoiseGen(x, y, z).getValue().getFogColor()), ai)
          );
          u = (float)lv5.getX();
          v = (float)lv5.getY();
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-10-03 00:20:34.607435494 +0000
+++ namedSrc/net/minecraft/client/render/debug/GameEventDebugRenderer.java	2024-10-03 00:19:27.986756321 +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-10-03 00:20:34.764436915 +0000
+++ namedSrc/net/minecraft/client/render/debug/StructureDebugRenderer.java	2024-10-03 00:19:28.160758216 +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> world) {
+      ((Map)this.structureBoundingBoxes.computeIfAbsent(world, unused -> new HashMap())).put(boundingBox.toString(), boundingBox);
       Map<String, StructuresDebugPayload.Piece> map = (Map<String, StructuresDebugPayload.Piece>)this.boundingBoxPieces
-         .computeIfAbsent(registryKey, registryKeyx -> new HashMap());
+         .computeIfAbsent(world, unused -> new HashMap());
 
       for (StructuresDebugPayload.Piece lv : piecesBoundingBoxes) {
          map.put(lv.boundingBox().toString(), lv);
diff -bur namedTargetSrc/net/minecraft/client/render/entity/AxolotlEntityRenderer.java namedSrc/net/minecraft/client/render/entity/AxolotlEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/AxolotlEntityRenderer.java	2024-10-03 00:20:34.635435747 +0000
+++ namedSrc/net/minecraft/client/render/entity/AxolotlEntityRenderer.java	2024-10-03 00:19:28.017756659 +0000
@@ -25,7 +25,7 @@
     */
    private static final Map<AxolotlEntity.Variant, Identifier> TEXTURES = Util.make(Maps.<AxolotlEntity.Variant, Identifier>newHashMap(), variants -> {
       for (AxolotlEntity.Variant lv : AxolotlEntity.Variant.values()) {
-         variants.put(lv, Identifier.ofDefault(String.format(Locale.ROOT, "textures/entity/axolotl/axolotl_%s.png", lv.key())));
+         variants.put(lv, Identifier.ofDefault(String.format(Locale.ROOT, "textures/entity/axolotl/axolotl_%s.png", lv.getName())));
       }
    });
 
diff -bur namedTargetSrc/net/minecraft/client/render/entity/BipedEntityRenderer.java namedSrc/net/minecraft/client/render/entity/BipedEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/BipedEntityRenderer.java	2024-10-03 00:20:34.698436317 +0000
+++ namedSrc/net/minecraft/client/render/entity/BipedEntityRenderer.java	2024-10-03 00:19:28.094757497 +0000
@@ -58,16 +58,17 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_smedlblp Lnet/minecraft/unmapped/C_gzpqfpdh;m_smedlblp(Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_btosngnd;F)V}
+    * @mapping {@literal named m_smedlblp Lnet/minecraft/client/render/entity/BipedEntityRenderer;m_smedlblp(Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/unmapped/C_btosngnd;F)V}
     */
-   public static void m_smedlblp(LivingEntity arg, C_btosngnd arg2, float f) {
-      arg2.f_izsgwgvo = arg.isInSneakingPose();
-      arg2.f_ixynocei = arg.isFallFlying();
-      arg2.f_uglhwwif = arg.isInSwimmingPose();
-      arg2.f_cxhwipqz = arg.hasVehicle();
+   public static void m_smedlblp(LivingEntity entity, C_btosngnd arg2, float f) {
+      arg2.f_izsgwgvo = entity.isInSneakingPose();
+      arg2.f_ixynocei = entity.isFallFlying();
+      arg2.f_uglhwwif = entity.isInSwimmingPose();
+      arg2.f_cxhwipqz = entity.hasVehicle();
       arg2.f_japuhxir = 1.0F;
       if (arg2.f_ixynocei) {
-         arg2.f_japuhxir = (float)arg.getVelocity().lengthSquared();
+         arg2.f_japuhxir = (float)entity.getVelocity().lengthSquared();
          arg2.f_japuhxir /= 0.2F;
          arg2.f_japuhxir = arg2.f_japuhxir * arg2.f_japuhxir * arg2.f_japuhxir;
       }
@@ -76,26 +77,27 @@
          arg2.f_japuhxir = 1.0F;
       }
 
-      arg2.f_sdxrnzyp = arg.getHandSwingProgress(f);
-      arg2.f_tzfpeidw = arg.getLeaningPitch(f);
-      arg2.f_ngqocagn = m_wnojferc(arg);
-      arg2.f_hdimbuaf = arg.getActiveHand();
-      arg2.f_pepbakja = (float)CrossbowItem.getLoadingTime(arg.getActiveItem(), arg);
-      arg2.f_jamiehth = arg.getItemUseTime();
-      arg2.f_vdjfqfsy = arg.isUsingItem();
-      arg2.f_qolsfybw = arg.f_aydtoono.m_srnvybfn(f);
-      arg2.f_cyxaecyl = arg.f_aydtoono.m_krukcnbc(f);
-      arg2.f_zsxuvwrs = arg.f_aydtoono.m_hbtboris(f);
-      arg2.f_yculljvb = arg.getEquippedStack(EquipmentSlot.CHEST).copy();
-      arg2.f_zczpquho = arg.getEquippedStack(EquipmentSlot.LEGS).copy();
-      arg2.f_njlfynem = arg.getEquippedStack(EquipmentSlot.FEET).copy();
+      arg2.f_sdxrnzyp = entity.getHandSwingProgress(f);
+      arg2.f_tzfpeidw = entity.getLeaningPitch(f);
+      arg2.f_ngqocagn = m_wnojferc(entity);
+      arg2.f_hdimbuaf = entity.getActiveHand();
+      arg2.f_pepbakja = (float)CrossbowItem.getLoadingTime(entity.getActiveItem(), entity);
+      arg2.f_jamiehth = entity.getItemUseTime();
+      arg2.f_vdjfqfsy = entity.isUsingItem();
+      arg2.f_qolsfybw = entity.f_aydtoono.m_srnvybfn(f);
+      arg2.f_cyxaecyl = entity.f_aydtoono.m_krukcnbc(f);
+      arg2.f_zsxuvwrs = entity.f_aydtoono.m_hbtboris(f);
+      arg2.f_yculljvb = entity.getEquippedStack(EquipmentSlot.CHEST).copy();
+      arg2.f_zczpquho = entity.getEquippedStack(EquipmentSlot.LEGS).copy();
+      arg2.f_njlfynem = entity.getEquippedStack(EquipmentSlot.FEET).copy();
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_wnojferc Lnet/minecraft/unmapped/C_gzpqfpdh;m_wnojferc(Lnet/minecraft/unmapped/C_usxaxydn;)Lnet/minecraft/unmapped/C_njjnizsa;}
+    * @mapping {@literal named m_wnojferc Lnet/minecraft/client/render/entity/BipedEntityRenderer;m_wnojferc(Lnet/minecraft/entity/LivingEntity;)Lnet/minecraft/util/Arm;}
     */
-   private static Arm m_wnojferc(LivingEntity arg) {
-      Arm lv = arg.getMainArm();
-      return arg.preferredHand == Hand.MAIN_HAND ? lv : lv.getOpposite();
+   private static Arm m_wnojferc(LivingEntity entity) {
+      Arm lv = entity.getMainArm();
+      return entity.preferredHand == Hand.MAIN_HAND ? lv : lv.getOpposite();
    }
 }
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-10-03 00:20:34.518434688 +0000
+++ namedSrc/net/minecraft/client/render/entity/BoatEntityRenderer.java	2024-10-03 00:19:27.882755189 +0000
@@ -27,9 +27,10 @@
     */
    private final Model f_aliiyrap;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_yqurweyg Lnet/minecraft/unmapped/C_gkybhjrd;f_yqurweyg:Lnet/minecraft/unmapped/C_ncpywfca;}
+    * @mapping {@literal named id Lnet/minecraft/client/render/entity/BoatEntityRenderer;id:Lnet/minecraft/util/Identifier;}
     */
-   private final Identifier f_yqurweyg;
+   private final Identifier id;
    /**
     * Mapping not found
     */
@@ -41,8 +42,8 @@
     */
    public BoatEntityRenderer(EntityRendererFactory.Context arg, EntityModelLayer layer) {
       super(arg);
-      this.f_yqurweyg = layer.model().withPath((UnaryOperator<String>)(string -> "textures/entity/" + string + ".png"));
-      this.f_aliiyrap = new Model.C_ihzqypnt(arg.getPart(EntityModelLayers.BOAT), argx -> RenderLayer.getWaterMask());
+      this.id = layer.model().withPath((UnaryOperator<String>)(string -> "textures/entity/" + string + ".png"));
+      this.f_aliiyrap = new Model.C_ihzqypnt(arg.getPart(EntityModelLayers.BOAT), id -> RenderLayer.getWaterMask());
       this.f_bcpnzwbk = new BoatEntityModel(arg.getPart(layer));
    }
 
@@ -59,7 +60,7 @@
     */
    @Override
    protected RenderLayer m_cainxsfo() {
-      return this.f_bcpnzwbk.getLayer(this.f_yqurweyg);
+      return this.f_bcpnzwbk.getLayer(this.id);
    }
 
    /**
@@ -69,7 +70,7 @@
    @Override
    protected void m_ylkemjlg(C_gnceuhfj arg, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int i) {
       if (!arg.f_urkdladx) {
-         this.f_aliiyrap.m_tivdiufh(matrices, vertexConsumers.getBuffer(this.f_aliiyrap.getLayer(this.f_yqurweyg)), i, OverlayTexture.DEFAULT_UV);
+         this.f_aliiyrap.m_tivdiufh(matrices, vertexConsumers.getBuffer(this.f_aliiyrap.getLayer(this.id)), i, OverlayTexture.DEFAULT_UV);
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/render/entity/CatEntityRenderer.java namedSrc/net/minecraft/client/render/entity/CatEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/CatEntityRenderer.java	2024-10-03 00:20:34.603435457 +0000
+++ namedSrc/net/minecraft/client/render/entity/CatEntityRenderer.java	2024-10-03 00:19:27.981756267 +0000
@@ -50,14 +50,14 @@
     */
    public void m_uigfpsip(CatEntity arg, C_nrfmfqlz arg2, float f) {
       super.m_tskwgjqs(arg, arg2, f);
-      arg2.f_ocjazwxy = arg.getVariant().value().texture();
+      arg2.f_ocjazwxy = arg.getVariant().getValue().texture();
       arg2.f_eeirjrvq = arg.isInSneakingPose();
       arg2.f_zrininai = arg.isSprinting();
       arg2.f_lbhbwoin = arg.isInSittingPose();
       arg2.f_qdbzwjvy = arg.getSleepAnimation(f);
       arg2.f_aebfnwvm = arg.getTailCurlAnimation(f);
       arg2.f_rfgvdldt = arg.getHeadDownAnimation(f);
-      arg2.f_ownggvkd = arg.m_jmkrmfxa();
+      arg2.f_ownggvkd = arg.isNearSleepingPlayer();
       arg2.f_szaqjnte = arg.isTamed() ? arg.getCollarColor() : null;
    }
 
diff -bur namedTargetSrc/net/minecraft/client/render/entity/EntityRenderDispatcher.java namedSrc/net/minecraft/client/render/entity/EntityRenderDispatcher.java
--- namedTargetSrc/net/minecraft/client/render/entity/EntityRenderDispatcher.java	2024-10-03 00:20:34.518434688 +0000
+++ namedSrc/net/minecraft/client/render/entity/EntityRenderDispatcher.java	2024-10-03 00:19:27.882755189 +0000
@@ -269,10 +269,10 @@
     * @mapping {@literal named m_lxhutgph Lnet/minecraft/client/render/entity/EntityRenderDispatcher;m_lxhutgph(Lnet/minecraft/entity/Entity;DDDFLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;I)V}
     */
    public <E extends Entity> void m_lxhutgph(
-      E arg, double d, double e, double f, float g, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light
+      E entity, double d, double e, double f, float g, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light
    ) {
-      EntityRenderer<? super E, ?> lv = this.getRenderer(arg);
-      this.m_dlztfonf(arg, d, e, f, g, matrices, vertexConsumers, light, lv);
+      EntityRenderer<? super E, ?> lv = this.getRenderer(entity);
+      this.m_dlztfonf(entity, d, e, f, g, matrices, vertexConsumers, light, lv);
    }
 
    /**
@@ -280,10 +280,18 @@
     * @mapping {@literal named m_dlztfonf Lnet/minecraft/client/render/entity/EntityRenderDispatcher;m_dlztfonf(Lnet/minecraft/entity/Entity;DDDFLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/client/render/entity/EntityRenderer;)V}
     */
    private <E extends Entity, S extends C_vptppxob> void m_dlztfonf(
-      E arg, double d, double e, double f, float g, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, EntityRenderer<? super E, S> arg4
+      E entity,
+      double d,
+      double e,
+      double f,
+      float g,
+      MatrixStack matrices,
+      VertexConsumerProvider vertexConsumers,
+      int light,
+      EntityRenderer<? super E, S> arg4
    ) {
       try {
-         S lv = arg4.m_sfqknpgp(arg, g);
+         S lv = arg4.m_sfqknpgp(entity, g);
          Vec3d lv2 = arg4.getPositionOffset(lv);
          double h = d + lv2.getX();
          double j = e + lv2.getY();
@@ -295,7 +303,7 @@
             this.renderFire(matrices, vertexConsumers, lv, MathHelper.m_nwkstayv(MathHelper.Y_AXIS, this.rotation, new Quaternionf()));
          }
 
-         if (arg instanceof PlayerEntity) {
+         if (entity instanceof PlayerEntity) {
             matrices.translate(-lv2.getX(), -lv2.getY(), -lv2.getZ());
          }
 
@@ -310,19 +318,19 @@
             }
          }
 
-         if (!(arg instanceof PlayerEntity)) {
+         if (!(entity instanceof PlayerEntity)) {
             matrices.translate(-lv2.getX(), -lv2.getY(), -lv2.getZ());
          }
 
          if (this.renderHitboxes && !lv.f_qcpkjxfw && !MinecraftClient.getInstance().hasReducedDebugInfo()) {
-            renderHitbox(matrices, vertexConsumers.getBuffer(RenderLayer.getLines()), arg, g, 1.0F, 1.0F, 1.0F);
+            renderHitbox(matrices, vertexConsumers.getBuffer(RenderLayer.getLines()), entity, g, 1.0F, 1.0F, 1.0F);
          }
 
          matrices.pop();
       } catch (Throwable var25) {
          CrashReport lv3 = CrashReport.create(var25, "Rendering entity in world");
          CrashReportSection lv4 = lv3.addElement("Entity being rendered");
-         arg.populateCrashReport(lv4);
+         entity.populateCrashReport(lv4);
          CrashReportSection lv5 = lv3.addElement("Renderer details");
          lv5.add("Assigned renderer", arg4);
          lv5.add("Location", CrashReportSection.createPositionString(this.world, d, e, f));
@@ -335,13 +343,13 @@
     * @mapping {@literal hashed m_eiojvvyd Lnet/minecraft/unmapped/C_gmkqxljo;m_eiojvvyd(Lnet/minecraft/unmapped/C_cnszsxvd;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_igrgeffe;)V}
     * @mapping {@literal named m_eiojvvyd Lnet/minecraft/client/render/entity/EntityRenderDispatcher;m_eiojvvyd(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/entity/Entity;Lnet/minecraft/client/render/VertexConsumerProvider;)V}
     */
-   private static void m_eiojvvyd(MatrixStack matrices, Entity arg2, VertexConsumerProvider vertexConsumers) {
-      Entity lv = m_kknlrsea(arg2);
+   private static void m_eiojvvyd(MatrixStack matrices, Entity entity, VertexConsumerProvider vertexConsumers) {
+      Entity lv = m_kknlrsea(entity);
       if (lv == null) {
-         DebugRenderer.drawString(matrices, vertexConsumers, "Missing", arg2.getX(), arg2.getBounds().maxY + 1.5, arg2.getZ(), -65536);
+         DebugRenderer.drawString(matrices, vertexConsumers, "Missing", entity.getX(), entity.getBounds().maxY + 1.5, entity.getZ(), -65536);
       } else {
          matrices.push();
-         matrices.translate(lv.getX() - arg2.getX(), lv.getY() - arg2.getY(), lv.getZ() - arg2.getZ());
+         matrices.translate(lv.getX() - entity.getX(), lv.getY() - entity.getY(), lv.getZ() - entity.getZ());
          renderHitbox(matrices, vertexConsumers.getBuffer(RenderLayer.getLines()), lv, 1.0F, 0.0F, 1.0F, 0.0F);
          ShapeRenderer.renderVector(matrices, vertexConsumers.getBuffer(RenderLayer.getLines()), new Vector3f(), lv.getVelocity(), -256);
          matrices.pop();
@@ -349,15 +357,16 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_kknlrsea Lnet/minecraft/unmapped/C_gmkqxljo;m_kknlrsea(Lnet/minecraft/unmapped/C_astfners;)Lnet/minecraft/unmapped/C_astfners;}
+    * @mapping {@literal named m_kknlrsea Lnet/minecraft/client/render/entity/EntityRenderDispatcher;m_kknlrsea(Lnet/minecraft/entity/Entity;)Lnet/minecraft/entity/Entity;}
     */
    @Nullable
-   private static Entity m_kknlrsea(Entity arg) {
+   private static Entity m_kknlrsea(Entity entity) {
       IntegratedServer lv = MinecraftClient.getInstance().getServer();
       if (lv != null) {
-         ServerWorld lv2 = lv.getWorld(arg.getWorld().getRegistryKey());
+         ServerWorld lv2 = lv.getWorld(entity.getWorld().getRegistryKey());
          if (lv2 != null) {
-            return lv2.getEntityById(arg.getId());
+            return lv2.getEntityById(entity.getId());
          }
       }
 


The remaining diff is too long!

-Original file line number
+Diff line change
@@ Expand Up / @@ -92,7 +92,6 @@ dependencies { @@
     	intermediary "net.fabricmc:intermediary:${minecraft_version}:v2"
     }
     import org.objectweb.asm.ClassVisitor
     import org.objectweb.asm.Opcodes
     import org.quiltmc.draftsman.asm.visitor.DraftsmanAdapterClassVisitor
@@ Expand All / @@ -116,9 +115,11 @@ clean.doFirst { @@
     tasks.build.dependsOn "compressTiny", "tinyJar", "v2UnmergedMappingsJar", "v2MergedMappingsJar"
     task insertAutoGeneratedMappings(dependsOn: [buildMappingsTiny, downloadPerVersionMappings], type: AddProposedMappingsTask) {
+    	final enigmaProfile = file("enigma_profile.json")
     	inputJar.set mappings.fileConstants.perVersionMappingsJar
     	inputMappings.set buildMappingsTiny.outputMappings
-    	profile.set file("enigma_profile.json")
+    	profile.set enigmaProfile
     }
     combineUnpickDefinitions {
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up / @@ -2,19 +2,30 @@ @@
     import java.io.BufferedWriter;
     import java.io.File;
+    import java.io.IOException;
     import java.io.PrintWriter;
     import java.io.Reader;
     import java.nio.charset.StandardCharsets;
     import java.nio.file.Files;
     import java.nio.file.Path;
     import java.util.ArrayList;
+    import java.util.Collection;
     import java.util.List;
     import java.util.Locale;
     import java.util.Objects;
+    import java.util.stream.Stream;
+    import org.gradle.api.GradleException;
+    import org.gradle.api.file.FileCollection;
+    import org.gradle.api.file.RegularFile;
+    import org.gradle.api.file.RegularFileProperty;
+    import org.gradle.api.tasks.InputFiles;
+    import org.gradle.api.tasks.Optional;
+    import org.jetbrains.annotations.NotNull;
     import org.quiltmc.enigma.api.Enigma;
     import org.quiltmc.enigma.api.EnigmaProfile;
     import org.quiltmc.enigma.api.EnigmaProject;
+    import org.quiltmc.enigma.api.service.JarIndexerService;
     import org.quiltmc.enigma.command.Command;
     import org.quiltmc.enigma.command.FillClassMappingsCommand;
     import org.quiltmc.enigma.command.CommandsUtil;
@@ Expand All / @@ -38,35 +49,63 @@ @@
     import quilt.internal.Constants;
     import quilt.internal.tasks.DefaultMappingsTask;
-    public class AddProposedMappingsTask extends DefaultMappingsTask {
+    import static org.quiltmc.enigma_plugin.Arguments.SIMPLE_TYPE_FIELD_NAMES_PATH;
+    public abstract class AddProposedMappingsTask extends DefaultMappingsTask {
+        private static Path getPath(RegularFileProperty fileProperty) {
+            return fileProperty.map(RegularFile::getAsFile).map(File::toPath).get();
+        }
         @OutputFile
         public File outputMappings;
         @InputFile
-        private final Property<File> inputJar;
+        public abstract RegularFileProperty getInputJar();
         @InputFile
-        private final Property<File> inputMappings;
+        public abstract RegularFileProperty getInputMappings();
         @InputFile
-        private final Property<File> profile;
+        public abstract RegularFileProperty getProfile();
+        @Optional
+        @InputFiles
+        protected abstract Property<FileCollection> getSimpleTypeFieldNames();
         public AddProposedMappingsTask() {
             super(Constants.Groups.BUILD_MAPPINGS_GROUP);
-            outputMappings = new File(fileConstants.buildDir, getName() + ".tiny");
-            inputJar = getProject().getObjects().property(File.class);
-            inputMappings = getProject().getObjects().property(File.class);
-            profile = getProject().getObjects().property(File.class);
+            this.outputMappings = new File(fileConstants.buildDir, getName() + ".tiny");
+            this.getSimpleTypeFieldNames().set(
+                this.getProfile()
+                    .map(RegularFile::getAsFile)
+                    .map(File::toPath)
+                    .map(profilePath -> {
+                        try {
+                            return this.getProject().files(
+                                EnigmaProfile.read(profilePath).getServiceProfiles(JarIndexerService.TYPE).stream()
+                                    .flatMap(service -> service.getArgument(SIMPLE_TYPE_FIELD_NAMES_PATH).stream())
+                                    .map(stringOrStrings -> stringOrStrings.mapBoth(Stream::of, Collection::stream))
+                                    .flatMap(bothStringStreams ->
+                                        bothStringStreams.left().orElseGet(bothStringStreams::rightOrThrow)
+                                    )
+                                    .toList()
+                            );
+                        } catch (IOException e) {
+                            throw new GradleException("Failed to read enigma profile", e);
+                        }
+                    })
+            );
         }
         @TaskAction
         public void addProposedMappings() throws Exception {
             getLogger().lifecycle(":seeking auto-mappable entries");
-            Path input = inputMappings.get().toPath();
+            Path input = getPath(this.getInputMappings());
             Path output = outputMappings.toPath();
-            Path jar = inputJar.get().toPath();
-            Path profilePath = profile.map(File::toPath).get();
+            Path jar = getPath(this.getInputJar());
+            Path profilePath = getPath(this.getProfile());
             addProposedMappings(input, output, fileConstants.tempDir.toPath(), jar, profilePath);
         }
@@ Expand Down Expand Up / @@ -204,16 +243,4 @@ public File getOutputMappings() { @@
         public void setOutputMappings(File outputMappings) {
             this.outputMappings = outputMappings;
         }
-        public Property<File> getInputJar() {
-            return inputJar;
-        }
-        public Property<File> getInputMappings() {
-            return inputMappings;
-        }
-        public Property<File> getProfile() {
-            return profile;
-        }
     }

-Original file line number
+Diff line change
@@ Expand Up / @@ -516,6 +516,7 @@ unicode @@
     // registry
     memoize
+    memoized
     unregister
     // javadoc
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up @@
     	FIELD f_cpvbggkb RESOURCE_GENERATION_DEBUG_OVERRIDE Z
     	FIELD f_croffrlr ENABLE_WORLD_RECREATION_DEBUGGER Z
     	FIELD f_cwtltrpn ENABLE_GOAL_SELECTOR_DEBUGGER Z
+    	FIELD f_czwrerlm DEBUG_EXPERIMENTAL_REDSTONE_WIRE_UPDATE_ORDER Z
     	FIELD f_daxksksq generateSquareTerrainWithoutNoise Z
     	FIELD f_dwxtvjnd DEBUG_FEATURE_COUNT Z
     	FIELD f_dzwzxzvb DISABLE_LIQUID_SPREADING Z
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up @@
     		METHOD m_rkbrzuwh addRecipe (Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_wptigggq$C_wbctdknv;
     			ARG 1 recipe
     		METHOD m_sbnvjevi loot (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_wptigggq$C_wbctdknv;
+    			ARG 0 loot
     		METHOD m_xgembxfc function (Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_wptigggq$C_wbctdknv;
     			ARG 0 function
     		METHOD m_xltlznvb addLoot (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_wptigggq$C_wbctdknv;
+    			ARG 1 loot

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Commit

There are no files selected for viewing

3 comments on commit `5f11ce6`

github-actions bot commented on `5f11ce6` Oct 3, 2024

github-actions bot commented on `5f11ce6` Oct 3, 2024

github-actions bot commented on `5f11ce6` Oct 3, 2024

Commit

There are no files selected for viewing

3 comments on commit 5f11ce6

github-actions bot commented on 5f11ce6 Oct 3, 2024

Choose a reason for hiding this comment

github-actions bot commented on 5f11ce6 Oct 3, 2024

Choose a reason for hiding this comment

github-actions bot commented on 5f11ce6 Oct 3, 2024

Choose a reason for hiding this comment

3 comments on commit `5f11ce6`

github-actions bot commented on `5f11ce6` Oct 3, 2024

github-actions bot commented on `5f11ce6` Oct 3, 2024

github-actions bot commented on `5f11ce6` Oct 3, 2024