Skip to content

Commit

Permalink
add some more mappings
Browse files Browse the repository at this point in the history
  • Loading branch information
@ix0rai
ix0rai committed May 29, 2024
1 parent ad96755 commit 4c901ec
Show file tree
Hide file tree
Showing 8 changed files with 39 additions and 0 deletions.
1 change: 1 addition & 0 deletions mappings/net/minecraft/recipe/BrewingRecipeRegistry.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ CLASS net/minecraft/unmapped/C_ilssplzn net/minecraft/recipe/BrewingRecipeRegist
FIELD f_cumxoxtw potionTypes Ljava/util/List;
FIELD f_exnloijq itemRecipes Ljava/util/List;
FIELD f_qqsssiby potionRecipes Ljava/util/List;
FIELD f_szfgeigs features Lnet/minecraft/unmapped/C_czxxrbcp;
METHOD <init> (Lnet/minecraft/unmapped/C_czxxrbcp;)V
ARG 1 features
METHOD m_ilqhdtus build ()Lnet/minecraft/unmapped/C_ilssplzn;
Expand Down
6 changes: 6 additions & 0 deletions mappings/net/minecraft/recipe/CraftingRecipeInput.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,10 @@ CLASS net/minecraft/unmapped/C_euomljmv net/minecraft/recipe/CraftingRecipeInput
METHOD m_ogdredzm getStacks ()Ljava/util/List;
METHOD m_plfjjrel getHeight ()I
METHOD m_stcmggrk getStackCount ()I
METHOD m_uywbpkmo createPositioned (IILjava/util/List;)Lnet/minecraft/unmapped/C_euomljmv$C_yjgdhrsl;
ARG 0 width
ARG 1 height
ARG 2 stacks
METHOD m_xankaukl getRecipeMatcher ()Lnet/minecraft/unmapped/C_nyagoaau;
CLASS C_yjgdhrsl Positioned
FIELD f_azxqobux EMPTY Lnet/minecraft/unmapped/C_euomljmv$C_yjgdhrsl;
4 changes: 4 additions & 0 deletions mappings/net/minecraft/recipe/InputSlotFiller.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,13 @@ CLASS net/minecraft/unmapped/C_rqdekljo net/minecraft/recipe/InputSlotFiller
FIELD f_mmlmkitf inventory Lnet/minecraft/unmapped/C_sxzqocrm;
FIELD f_mykbaanb handler Lnet/minecraft/unmapped/C_mugvwvfp;
FIELD f_qrfjlbyk matcher Lnet/minecraft/unmapped/C_nyagoaau;
FIELD f_tqmjruaz ITEM_NOT_FOUND I
METHOD <init> (Lnet/minecraft/unmapped/C_mugvwvfp;)V
ARG 1 handler
METHOD m_eludjpso returnInputs ()V
METHOD m_mnhwpoca fillInputSlot (Lnet/minecraft/unmapped/C_nhvqfffd;Lnet/minecraft/unmapped/C_sddaxwyk;I)I
ARG 1 slot
ARG 3 amount
METHOD m_ohlssgdj getFreeInventorySlots ()I
METHOD m_qwrqexeh getAmountToFill (ZIZ)I
ARG 1 craftAll
Expand Down
2 changes: 2 additions & 0 deletions mappings/net/minecraft/recipe/MapExtendingRecipe.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
CLASS net/minecraft/unmapped/C_cdhgeyop net/minecraft/recipe/MapExtendingRecipe
METHOD <init> (Lnet/minecraft/unmapped/C_aodytokc;)V
ARG 1 category
METHOD m_gfiwlaty findFilledMap (Lnet/minecraft/unmapped/C_euomljmv;)Lnet/minecraft/unmapped/C_sddaxwyk;
ARG 0 input
7 changes: 7 additions & 0 deletions mappings/net/minecraft/recipe/Recipe.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ CLASS net/minecraft/unmapped/C_awrmdwqd net/minecraft/recipe/Recipe
COMMENT <p>
COMMENT The returned stack should not be modified. To obtain the actual output,
COMMENT call {@link #craft(Inventory, DynamicRegistryManager)}.
ARG 1 lookupProvider
METHOD m_jjsxdttb matches (Lnet/minecraft/unmapped/C_cxmcihwl;Lnet/minecraft/unmapped/C_cdctfzbn;)Z
ARG 1 input
METHOD m_njccjhdt getIngredients ()Lnet/minecraft/unmapped/C_rnrfftze;
COMMENT {@return the ingredients accepted as inputs for this recipe} Used by the recipe book
COMMENT when displaying a ghost form of this recipe on the crafting grid as well as for
Expand All @@ -37,12 +40,16 @@ CLASS net/minecraft/unmapped/C_awrmdwqd net/minecraft/recipe/Recipe
COMMENT the width of the input inventory
ARG 2 height
COMMENT the height of the input inventory
METHOD m_pyffiody getRemainder (Lnet/minecraft/unmapped/C_cxmcihwl;)Lnet/minecraft/unmapped/C_rnrfftze;
ARG 1 input
METHOD m_qqucltqj showNotification ()Z
COMMENT {@return whenever this recipe should show a toast notification on being unlocked or not}
METHOD m_qzlhmcik isEmpty ()Z
COMMENT {@return whether this recipe has no ingredient or has any empty ingredient}
COMMENT The recipe book uses this to ignore recipes for display.
METHOD m_tikgmnde craft (Lnet/minecraft/unmapped/C_cxmcihwl;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_sddaxwyk;
ARG 1 input
ARG 2 lookupProvider
METHOD m_ttbvwfef getType ()Lnet/minecraft/unmapped/C_rhnqznys;
COMMENT {@return the type of this recipe}
COMMENT
Expand Down
12 changes: 12 additions & 0 deletions mappings/net/minecraft/recipe/RecipeCache.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,18 @@ CLASS net/minecraft/unmapped/C_edmnjlch net/minecraft/recipe/RecipeCache
FIELD f_ziakvpmc recipeManager Ljava/lang/ref/WeakReference;
METHOD <init> (I)V
ARG 1 size
METHOD m_cwdmboht compute (Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/unmapped/C_cdctfzbn;)Ljava/util/Optional;
ARG 1 input
METHOD m_gsxudlwe cache (Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/unmapped/C_dscbrwbj;)V
ARG 1 input
ARG 2 recipe
METHOD m_lxnjadgw validateRecipeManager (Lnet/minecraft/unmapped/C_cdctfzbn;)V
METHOD m_qifbizlb moveToFront (I)V
ARG 1 index
METHOD m_tipfbwpi get (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_euomljmv;)Ljava/util/Optional;
ARG 2 input
CLASS C_raahqxfc CachedRecipe
FIELD f_sdhpultj recipe Lnet/minecraft/unmapped/C_dscbrwbj;
METHOD m_nnriquoq recipe ()Lnet/minecraft/unmapped/C_dscbrwbj;
METHOD m_ocoodxth matches (Lnet/minecraft/unmapped/C_euomljmv;)Z
ARG 1 input
6 changes: 6 additions & 0 deletions mappings/net/minecraft/recipe/RecipeGridAligner.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,9 @@ CLASS net/minecraft/unmapped/C_wuyfqgmj net/minecraft/recipe/RecipeGridAligner
ARG 4 recipe
ARG 5 inputs
ARG 6 amount
METHOD m_vnshednj acceptAlignedInput (Ljava/lang/Object;IIII)V
ARG 1 input
ARG 2 index
ARG 3 amount
ARG 4 y
ARG 5 x
1 change: 1 addition & 0 deletions mappings/net/minecraft/recipe/SingleStackRecipeInput.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CLASS net/minecraft/unmapped/C_hsoxiypb net/minecraft/recipe/SingleStackRecipeInput

3 comments on commit 4c901ec

@github-actions
Copy link

Choose a reason for hiding this comment

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

With commit 4c901ec, 101 file(s) were updated with 674 line(s) added and 684 removed compared to the latest Quilt Mappings version.

View the diff here (1/3): 
diff -bur namedTargetSrc/net/minecraft/block/AbstractRailBlock.java namedSrc/net/minecraft/block/AbstractRailBlock.java
--- namedTargetSrc/net/minecraft/block/AbstractRailBlock.java	2024-05-29 02:40:39.225173513 +0000
+++ namedSrc/net/minecraft/block/AbstractRailBlock.java	2024-05-29 02:39:30.245413517 +0000
@@ -39,9 +39,9 @@
    public static final BooleanProperty WATERLOGGED = Properties.WATERLOGGED;
    /**
     * @mapping {@literal hashed f_afdevxyp Lnet/minecraft/unmapped/C_mgkftsgg;f_afdevxyp:Z}
-    * @mapping {@literal named uncurvable Lnet/minecraft/block/AbstractRailBlock;uncurvable:Z}
+    * @mapping {@literal named allowCurves Lnet/minecraft/block/AbstractRailBlock;allowCurves:Z}
     */
-   private final boolean uncurvable;
+   private final boolean allowCurves;
 
    /**
     * @mapping {@literal hashed m_qihoxnqf Lnet/minecraft/unmapped/C_mgkftsgg;m_qihoxnqf(Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;)Z}
@@ -63,9 +63,9 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_mgkftsgg;<init>(ZLnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;)V}
     * @mapping {@literal named <init> Lnet/minecraft/block/AbstractRailBlock;<init>(ZLnet/minecraft/block/AbstractBlock$Settings;)V}
     */
-   protected AbstractRailBlock(boolean uncurvable, AbstractBlock.Settings settings) {
+   protected AbstractRailBlock(boolean allowCurves, AbstractBlock.Settings settings) {
       super(settings);
-      this.uncurvable = uncurvable;
+      this.allowCurves = allowCurves;
    }
 
    /**
@@ -76,10 +76,10 @@
 
    /**
     * @mapping {@literal hashed m_gnxvkdbi Lnet/minecraft/unmapped/C_mgkftsgg;m_gnxvkdbi()Z}
-    * @mapping {@literal named isUncurvable Lnet/minecraft/block/AbstractRailBlock;isUncurvable()Z}
+    * @mapping {@literal named canMakeCurves Lnet/minecraft/block/AbstractRailBlock;canMakeCurves()Z}
     */
-   public boolean isUncurvable() {
-      return this.uncurvable;
+   public boolean canMakeCurves() {
+      return this.allowCurves;
    }
 
    /**
@@ -115,7 +115,7 @@
     */
    protected BlockState updateCurves(BlockState state, World world, BlockPos pos, boolean notify) {
       state = this.updateBlockState(world, pos, state, true);
-      if (this.uncurvable) {
+      if (this.allowCurves) {
          world.updateNeighbor(state, pos, this, pos, notify);
       }
 
@@ -129,7 +129,7 @@
    protected void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, BlockPos fromPos, boolean notify) {
       if (!world.isClient && world.getBlockState(pos).isOf(this)) {
          RailShape lv = state.get(this.getShapeProperty());
-         if (shouldBreak(pos, world, lv)) {
+         if (shouldDropRail(pos, world, lv)) {
             dropStacks(state, world, pos);
             world.removeBlock(pos, notify);
          } else {
@@ -139,15 +139,16 @@
    }
 
    /**
-    * Checks if this rail should break.
+    * Checks if this rail should be dropped.
     * 
-    * @return {@code true} if the block below has no top rim or if {@code shape} is ascending
-    * toward a block with no top rim, or {@code false} otherwise
+    * <p>This method will return true if:
+    * <ul><li>The rail block is ascending.</li>
+    * <li>The block in the direction of ascent does not have a top rim.</li></ul>
     * 
     * @mapping {@literal hashed m_oyknusit Lnet/minecraft/unmapped/C_mgkftsgg;m_oyknusit(Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_wqmdpcsg;)Z}
-    * @mapping {@literal named shouldBreak Lnet/minecraft/block/AbstractRailBlock;shouldBreak(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/world/World;Lnet/minecraft/block/enums/RailShape;)Z}
+    * @mapping {@literal named shouldDropRail Lnet/minecraft/block/AbstractRailBlock;shouldDropRail(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/world/World;Lnet/minecraft/block/enums/RailShape;)Z}
     */
-   private static boolean shouldBreak(BlockPos pos, World world, RailShape shape) {
+   private static boolean shouldDropRail(BlockPos pos, World world, RailShape shape) {
       if (!hasTopRim(world, pos.down())) {
          return true;
       } else {
@@ -182,7 +183,7 @@
          return state;
       } else {
          RailShape lv = state.get(this.getShapeProperty());
-         return new RailShaper(world, pos, state).updateBlockState(world.isReceivingRedstonePower(pos), forceUpdate, lv).getState();
+         return new RailPlacementHelper(world, pos, state).updateBlockState(world.isReceivingRedstonePower(pos), forceUpdate, lv).getBlockState();
       }
    }
 
@@ -197,7 +198,7 @@
             world.updateNeighborsAlways(pos.up(), this);
          }
 
-         if (this.uncurvable) {
+         if (this.allowCurves) {
             world.updateNeighborsAlways(pos, this);
             world.updateNeighborsAlways(pos.down(), this);
          }
diff -bur namedTargetSrc/net/minecraft/block/CrafterBlock.java namedSrc/net/minecraft/block/CrafterBlock.java
--- namedTargetSrc/net/minecraft/block/CrafterBlock.java	2024-05-29 02:40:39.209173587 +0000
+++ namedSrc/net/minecraft/block/CrafterBlock.java	2024-05-29 02:39:30.225413591 +0000
@@ -16,6 +16,7 @@
 import net.minecraft.item.ItemPlacementContext;
 import net.minecraft.item.ItemStack;
 import net.minecraft.recipe.CraftingRecipe;
+import net.minecraft.recipe.CraftingRecipeInput;
 import net.minecraft.recipe.RecipeCache;
 import net.minecraft.recipe.RecipeHolder;
 import net.minecraft.server.network.ServerPlayerEntity;
@@ -24,7 +25,6 @@
 import net.minecraft.state.property.BooleanProperty;
 import net.minecraft.state.property.EnumProperty;
 import net.minecraft.state.property.Properties;
-import net.minecraft.unmapped.C_euomljmv;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.BlockMirror;
 import net.minecraft.util.BlockRotation;
@@ -238,7 +238,7 @@
     */
    protected void craft(BlockState state, ServerWorld world, BlockPos pos) {
       if (world.getBlockEntity(pos) instanceof CrafterBlockEntity lv) {
-         C_euomljmv var11 = lv.m_tegcmbjp();
+         CraftingRecipeInput var11 = lv.m_tegcmbjp();
          Optional<RecipeHolder<CraftingRecipe>> optional = m_jtimyngh(world, var11);
          if (optional.isEmpty()) {
             world.syncWorldEvent(WorldEvents.CRAFTER_FAIL, pos, 0);
@@ -253,7 +253,7 @@
                lv5.onCraft(world);
                this.craft(world, pos, lv, lv5, state, lv4);
 
-               for (ItemStack lv6 : lv4.value().m_pyffiody(var11)) {
+               for (ItemStack lv6 : lv4.value().getRemainder(var11)) {
                   if (!lv6.isEmpty()) {
                      this.craft(world, pos, lv, lv6, state, lv4);
                   }
@@ -272,10 +272,10 @@
 
    /**
     * @mapping {@literal hashed m_jtimyngh Lnet/minecraft/unmapped/C_dmnruvyr;m_jtimyngh(Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_euomljmv;)Ljava/util/Optional;}
-    * @mapping {@literal named m_jtimyngh Lnet/minecraft/block/CrafterBlock;m_jtimyngh(Lnet/minecraft/world/World;Lnet/minecraft/unmapped/C_euomljmv;)Ljava/util/Optional;}
+    * @mapping {@literal named m_jtimyngh Lnet/minecraft/block/CrafterBlock;m_jtimyngh(Lnet/minecraft/world/World;Lnet/minecraft/recipe/CraftingRecipeInput;)Ljava/util/Optional;}
     */
-   public static Optional<RecipeHolder<CraftingRecipe>> m_jtimyngh(World world, C_euomljmv arg2) {
-      return RECIPE_CACHE.m_tipfbwpi(world, arg2);
+   public static Optional<RecipeHolder<CraftingRecipe>> m_jtimyngh(World world, CraftingRecipeInput input) {
+      return RECIPE_CACHE.get(world, input);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/DetectorRailBlock.java namedSrc/net/minecraft/block/DetectorRailBlock.java
--- namedTargetSrc/net/minecraft/block/DetectorRailBlock.java	2024-05-29 02:40:39.321173077 +0000
+++ namedSrc/net/minecraft/block/DetectorRailBlock.java	2024-05-29 02:39:30.381413019 +0000
@@ -85,7 +85,7 @@
    protected void onEntityCollision(BlockState state, World world, BlockPos pos, Entity entity) {
       if (!world.isClient) {
          if (!(Boolean)state.get(POWERED)) {
-            this.updatePowered(world, pos, state);
+            this.updatePoweredStatus(world, pos, state);
          }
       }
    }
@@ -96,7 +96,7 @@
    @Override
    protected void scheduledTick(BlockState state, ServerWorld world, BlockPos pos, RandomGenerator random) {
       if ((Boolean)state.get(POWERED)) {
-         this.updatePowered(world, pos, state);
+         this.updatePoweredStatus(world, pos, state);
       }
    }
 
@@ -122,9 +122,9 @@
 
    /**
     * @mapping {@literal hashed m_wvmxinfs Lnet/minecraft/unmapped/C_zqpbsygh;m_wvmxinfs(Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;)V}
-    * @mapping {@literal named updatePowered Lnet/minecraft/block/DetectorRailBlock;updatePowered(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)V}
+    * @mapping {@literal named updatePoweredStatus Lnet/minecraft/block/DetectorRailBlock;updatePoweredStatus(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)V}
     */
-   private void updatePowered(World world, BlockPos pos, BlockState state) {
+   private void updatePoweredStatus(World world, BlockPos pos, BlockState state) {
       if (this.canPlaceAt(state, world, pos)) {
          boolean bl = (Boolean)state.get(POWERED);
          boolean bl2 = false;
@@ -136,7 +136,7 @@
          if (bl2 && !bl) {
             BlockState lv = state.with(POWERED, Boolean.valueOf(true));
             world.setBlockState(pos, lv, Block.NOTIFY_ALL);
-            this.updateNeighboringRails(world, pos, lv, true);
+            this.updateNearbyRails(world, pos, lv, true);
             world.updateNeighborsAlways(pos, this);
             world.updateNeighborsAlways(pos.down(), this);
             world.scheduleBlockRerenderIfNeeded(pos, state, lv);
@@ -145,7 +145,7 @@
          if (!bl2 && bl) {
             BlockState lv2 = state.with(POWERED, Boolean.valueOf(false));
             world.setBlockState(pos, lv2, Block.NOTIFY_ALL);
-            this.updateNeighboringRails(world, pos, lv2, false);
+            this.updateNearbyRails(world, pos, lv2, false);
             world.updateNeighborsAlways(pos, this);
             world.updateNeighborsAlways(pos.down(), this);
             world.scheduleBlockRerenderIfNeeded(pos, state, lv2);
@@ -161,10 +161,10 @@
 
    /**
     * @mapping {@literal hashed m_eipmlwqv Lnet/minecraft/unmapped/C_zqpbsygh;m_eipmlwqv(Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;Z)V}
-    * @mapping {@literal named updateNeighboringRails Lnet/minecraft/block/DetectorRailBlock;updateNeighboringRails(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;Z)V}
+    * @mapping {@literal named updateNearbyRails Lnet/minecraft/block/DetectorRailBlock;updateNearbyRails(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;Z)V}
     */
-   protected void updateNeighboringRails(World world, BlockPos pos, BlockState state, boolean unpowering) {
-      RailShaper lv = new RailShaper(world, pos, state);
+   protected void updateNearbyRails(World world, BlockPos pos, BlockState state, boolean unpowering) {
+      RailPlacementHelper lv = new RailPlacementHelper(world, pos, state);
 
       for (BlockPos lv2 : lv.getNeighbors()) {
          BlockState lv3 = world.getBlockState(lv2);
@@ -179,7 +179,7 @@
    protected void onBlockAdded(BlockState state, World world, BlockPos pos, BlockState oldState, boolean notify) {
       if (!oldState.isOf(state.getBlock())) {
          BlockState lv = this.updateCurves(state, world, pos, notify);
-         this.updatePowered(world, pos, lv);
+         this.updatePoweredStatus(world, pos, lv);
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/block/entity/AbstractFurnaceBlockEntity.java namedSrc/net/minecraft/block/entity/AbstractFurnaceBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/AbstractFurnaceBlockEntity.java	2024-05-29 02:40:39.209173587 +0000
+++ namedSrc/net/minecraft/block/entity/AbstractFurnaceBlockEntity.java	2024-05-29 02:39:30.229413576 +0000
@@ -26,6 +26,7 @@
 import net.minecraft.recipe.RecipeManager;
 import net.minecraft.recipe.RecipeMatcher;
 import net.minecraft.recipe.RecipeType;
+import net.minecraft.recipe.SingleStackRecipeInput;
 import net.minecraft.registry.DynamicRegistryManager;
 import net.minecraft.registry.Holder;
 import net.minecraft.registry.HolderLookup;
@@ -35,7 +36,6 @@
 import net.minecraft.screen.PropertyDelegate;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.server.world.ServerWorld;
-import net.minecraft.unmapped.C_hsoxiypb;
 import net.minecraft.unmapped.C_mudajugr;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Util;
@@ -209,7 +209,7 @@
     * @mapping {@literal hashed f_rhexgeen Lnet/minecraft/unmapped/C_dlxbwxyf;f_rhexgeen:Lnet/minecraft/unmapped/C_hjseusrb$C_bvtkxdyi;}
     * @mapping {@literal named recipeCache Lnet/minecraft/block/entity/AbstractFurnaceBlockEntity;recipeCache:Lnet/minecraft/recipe/RecipeManager$CachedCheck;}
     */
-   private final RecipeManager.CachedCheck<C_hsoxiypb, ? extends AbstractCookingRecipe> recipeCache;
+   private final RecipeManager.CachedCheck<SingleStackRecipeInput, ? extends AbstractCookingRecipe> recipeCache;
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_dlxbwxyf;<init>(Lnet/minecraft/unmapped/C_wgqvodus;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_rhnqznys;)V}
@@ -406,7 +406,7 @@
       if (blockEntity.isBurning() || bl4 && bl3) {
          RecipeHolder<?> lv3;
          if (bl3) {
-            lv3 = (RecipeHolder<?>)blockEntity.recipeCache.m_ltqsvwgf(new C_hsoxiypb(lv2), world).orElse(null);
+            lv3 = (RecipeHolder<?>)blockEntity.recipeCache.m_ltqsvwgf(new SingleStackRecipeInput(lv2), world).orElse(null);
          } else {
             lv3 = null;
          }
@@ -527,7 +527,7 @@
     * @mapping {@literal named getCookTime Lnet/minecraft/block/entity/AbstractFurnaceBlockEntity;getCookTime(Lnet/minecraft/world/World;Lnet/minecraft/block/entity/AbstractFurnaceBlockEntity;)I}
     */
    private static int getCookTime(World world, AbstractFurnaceBlockEntity blockEntity) {
-      C_hsoxiypb lv = new C_hsoxiypb(blockEntity.getStack(0));
+      SingleStackRecipeInput lv = new SingleStackRecipeInput(blockEntity.getStack(0));
       return (Integer)blockEntity.recipeCache.m_ltqsvwgf(lv, world).map(recipe -> ((AbstractCookingRecipe)recipe.value()).getCookTime()).orElse(200);
    }
 
diff -bur namedTargetSrc/net/minecraft/block/entity/BrewingStandBlockEntity.java namedSrc/net/minecraft/block/entity/BrewingStandBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/BrewingStandBlockEntity.java	2024-05-29 02:40:39.269173313 +0000
+++ namedSrc/net/minecraft/block/entity/BrewingStandBlockEntity.java	2024-05-29 02:39:30.305413297 +0000
@@ -325,7 +325,7 @@
    @Override
    public boolean isValid(int slot, ItemStack stack) {
       if (slot == 3) {
-         BrewingRecipeRegistry lv = this.world != null ? this.world.m_gbuudpbq() : BrewingRecipeRegistry.f_rhvjiasu;
+         BrewingRecipeRegistry lv = this.world != null ? this.world.m_gbuudpbq() : BrewingRecipeRegistry.EMPTY;
          return lv.isValidIngredient(stack);
       } else {
          return slot == 4
diff -bur namedTargetSrc/net/minecraft/block/entity/CampfireBlockEntity.java namedSrc/net/minecraft/block/entity/CampfireBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/CampfireBlockEntity.java	2024-05-29 02:40:39.141173896 +0000
+++ namedSrc/net/minecraft/block/entity/CampfireBlockEntity.java	2024-05-29 02:39:30.129413928 +0000
@@ -18,8 +18,8 @@
 import net.minecraft.recipe.RecipeHolder;
 import net.minecraft.recipe.RecipeManager;
 import net.minecraft.recipe.RecipeType;
+import net.minecraft.recipe.SingleStackRecipeInput;
 import net.minecraft.registry.HolderLookup;
-import net.minecraft.unmapped.C_hsoxiypb;
 import net.minecraft.util.Clearable;
 import net.minecraft.util.ItemScatterer;
 import net.minecraft.util.collection.DefaultedList;
@@ -65,7 +65,7 @@
     * @mapping {@literal hashed f_sjgmjpuy Lnet/minecraft/unmapped/C_wmubauif;f_sjgmjpuy:Lnet/minecraft/unmapped/C_hjseusrb$C_bvtkxdyi;}
     * @mapping {@literal named recipeCache Lnet/minecraft/block/entity/CampfireBlockEntity;recipeCache:Lnet/minecraft/recipe/RecipeManager$CachedCheck;}
     */
-   private final RecipeManager.CachedCheck<C_hsoxiypb, CampfireCookingRecipe> recipeCache = RecipeManager.createCheck(RecipeType.CAMPFIRE_COOKING);
+   private final RecipeManager.CachedCheck<SingleStackRecipeInput, CampfireCookingRecipe> recipeCache = RecipeManager.createCheck(RecipeType.CAMPFIRE_COOKING);
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_wmubauif;<init>(Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;)V}
@@ -88,7 +88,7 @@
             bl = true;
             campfire.cookingTimes[i]++;
             if (campfire.cookingTimes[i] >= campfire.cookingTotalTimes[i]) {
-               C_hsoxiypb lv2 = new C_hsoxiypb(lv);
+               SingleStackRecipeInput lv2 = new SingleStackRecipeInput(lv);
                ItemStack lv3 = (ItemStack)campfire.recipeCache
                   .m_ltqsvwgf(lv2, world)
                   .map(arg3 -> ((CampfireCookingRecipe)arg3.value()).craft(lv2, world.getRegistryManager()))
@@ -217,7 +217,9 @@
     * @mapping {@literal named getRecipeFor Lnet/minecraft/block/entity/CampfireBlockEntity;getRecipeFor(Lnet/minecraft/item/ItemStack;)Ljava/util/Optional;}
     */
    public Optional<RecipeHolder<CampfireCookingRecipe>> getRecipeFor(ItemStack item) {
-      return this.itemsBeingCooked.stream().noneMatch(ItemStack::isEmpty) ? Optional.empty() : this.recipeCache.m_ltqsvwgf(new C_hsoxiypb(item), this.world);
+      return this.itemsBeingCooked.stream().noneMatch(ItemStack::isEmpty)
+         ? Optional.empty()
+         : this.recipeCache.m_ltqsvwgf(new SingleStackRecipeInput(item), this.world);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/ExperienceDroppingBlock.java namedSrc/net/minecraft/block/ExperienceDroppingBlock.java
--- namedTargetSrc/net/minecraft/block/ExperienceDroppingBlock.java	2024-05-29 02:40:39.301173168 +0000
+++ namedSrc/net/minecraft/block/ExperienceDroppingBlock.java	2024-05-29 02:39:30.353413122 +0000
@@ -17,7 +17,7 @@
     * @mapping {@literal named CODEC Lnet/minecraft/block/ExperienceDroppingBlock;CODEC:Lcom/mojang/serialization/MapCodec;}
     */
    public static final MapCodec<ExperienceDroppingBlock> CODEC = RecordCodecBuilder.mapCodec(
-      instance -> instance.group(IntProvider.m_aloorybd(0, 10).fieldOf("experience").forGetter(arg -> arg.experienceProvider), getSettingsCodec())
+      instance -> instance.group(IntProvider.createValidatingCodec(0, 10).fieldOf("experience").forGetter(arg -> arg.experienceProvider), getSettingsCodec())
             .apply(instance, ExperienceDroppingBlock::new)
    );
    /**
diff -bur namedTargetSrc/net/minecraft/block/FrogSpawnBlock.java namedSrc/net/minecraft/block/FrogSpawnBlock.java
--- namedTargetSrc/net/minecraft/block/FrogSpawnBlock.java	2024-05-29 02:40:39.229173496 +0000
+++ namedSrc/net/minecraft/block/FrogSpawnBlock.java	2024-05-29 02:39:30.253413488 +0000
@@ -111,7 +111,7 @@
     * @mapping {@literal named getSpawnTicks Lnet/minecraft/block/FrogSpawnBlock;getSpawnTicks(Lnet/minecraft/util/random/RandomGenerator;)I}
     */
    private static int getSpawnTicks(RandomGenerator random) {
-      return random.range(minSpawnTicks, maxSpawnTicks);
+      return random.rangeClosed(minSpawnTicks, maxSpawnTicks);
    }
 
    /**
@@ -181,14 +181,14 @@
     * @mapping {@literal named spawnTadpoles Lnet/minecraft/block/FrogSpawnBlock;spawnTadpoles(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/random/RandomGenerator;)V}
     */
    private void spawnTadpoles(ServerWorld world, BlockPos pos, RandomGenerator random) {
-      int i = random.range(2, 6);
+      int i = random.rangeClosed(2, 6);
 
       for (int j = 1; j <= i; j++) {
          TadpoleEntity lv = EntityType.TADPOLE.create(world);
          if (lv != null) {
             double d = (double)pos.getX() + this.getSpawnPosition(random);
             double e = (double)pos.getZ() + this.getSpawnPosition(random);
-            int k = random.range(1, 361);
+            int k = random.rangeClosed(1, 361);
             lv.refreshPositionAndAngles(d, (double)pos.getY() - 0.5, e, (float)k, 0.0F);
             lv.setPersistent();
             world.spawnEntity(lv);
diff -bur namedTargetSrc/net/minecraft/block/PoweredRailBlock.java namedSrc/net/minecraft/block/PoweredRailBlock.java
--- namedTargetSrc/net/minecraft/block/PoweredRailBlock.java	2024-05-29 02:40:39.261173350 +0000
+++ namedSrc/net/minecraft/block/PoweredRailBlock.java	2024-05-29 02:39:30.293413342 +0000
@@ -56,7 +56,7 @@
     * @mapping {@literal hashed m_ckktskbm Lnet/minecraft/unmapped/C_kgjmyjbt;m_ckktskbm(Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;ZI)Z}
     * @mapping {@literal named isPoweredByOtherRails Lnet/minecraft/block/PoweredRailBlock;isPoweredByOtherRails(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;ZI)Z}
     */
-   protected boolean isPoweredByOtherRails(World world, BlockPos pos, BlockState state, boolean towardSouthWest, int distance) {
+   protected boolean isPoweredByOtherRails(World world, BlockPos pos, BlockState state, boolean bl, int distance) {
       if (distance >= 8) {
          return false;
       } else {
@@ -67,21 +67,21 @@
          RailShape lv = state.get(SHAPE);
          switch (lv) {
             case NORTH_SOUTH:
-               if (towardSouthWest) {
+               if (bl) {
                   l++;
                } else {
                   l--;
                }
                break;
             case EAST_WEST:
-               if (towardSouthWest) {
+               if (bl) {
                   j--;
                } else {
                   j++;
                }
                break;
             case ASCENDING_EAST:
-               if (towardSouthWest) {
+               if (bl) {
                   j--;
                } else {
                   j++;
@@ -92,7 +92,7 @@
                lv = RailShape.EAST_WEST;
                break;
             case ASCENDING_WEST:
-               if (towardSouthWest) {
+               if (bl) {
                   j--;
                   k++;
                   bl2 = false;
@@ -103,7 +103,7 @@
                lv = RailShape.EAST_WEST;
                break;
             case ASCENDING_NORTH:
-               if (towardSouthWest) {
+               if (bl) {
                   l++;
                } else {
                   l--;
@@ -114,7 +114,7 @@
                lv = RailShape.NORTH_SOUTH;
                break;
             case ASCENDING_SOUTH:
-               if (towardSouthWest) {
+               if (bl) {
                   l++;
                   k++;
                   bl2 = false;
@@ -125,9 +125,9 @@
                lv = RailShape.NORTH_SOUTH;
          }
 
-         return this.isPoweredByOtherRails(world, new BlockPos(j, k, l), towardSouthWest, distance, lv)
+         return this.isPoweredByOtherRails(world, new BlockPos(j, k, l), bl, distance, lv)
             ? true
-            : bl2 && this.isPoweredByOtherRails(world, new BlockPos(j, k - 1, l), towardSouthWest, distance, lv);
+            : bl2 && this.isPoweredByOtherRails(world, new BlockPos(j, k - 1, l), bl, distance, lv);
       }
    }
 
@@ -135,7 +135,7 @@
     * @mapping {@literal hashed m_thcgcfzo Lnet/minecraft/unmapped/C_kgjmyjbt;m_thcgcfzo(Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;ZILnet/minecraft/unmapped/C_wqmdpcsg;)Z}
     * @mapping {@literal named isPoweredByOtherRails Lnet/minecraft/block/PoweredRailBlock;isPoweredByOtherRails(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;ZILnet/minecraft/block/enums/RailShape;)Z}
     */
-   protected boolean isPoweredByOtherRails(World world, BlockPos pos, boolean towardSouthWest, int distance, RailShape shape) {
+   protected boolean isPoweredByOtherRails(World world, BlockPos pos, boolean bl, int distance, RailShape shape) {
       BlockState lv = world.getBlockState(pos);
       if (!lv.isOf(this)) {
          return false;
@@ -146,7 +146,7 @@
                if (!(Boolean)lv.get(POWERED)) {
                   return false;
                } else {
-                  return world.isReceivingRedstonePower(pos) ? true : this.isPoweredByOtherRails(world, pos, lv, towardSouthWest, distance + 1);
+                  return world.isReceivingRedstonePower(pos) ? true : this.isPoweredByOtherRails(world, pos, lv, bl, distance + 1);
                }
             } else {
                return false;
diff -bur namedTargetSrc/net/minecraft/block/RailBlock.java namedSrc/net/minecraft/block/RailBlock.java
--- namedTargetSrc/net/minecraft/block/RailBlock.java	2024-05-29 02:40:39.349172949 +0000
+++ namedSrc/net/minecraft/block/RailBlock.java	2024-05-29 02:39:30.413412902 +0000
@@ -49,7 +49,7 @@
     */
    @Override
    protected void updateBlockState(BlockState state, World world, BlockPos pos, Block block) {
-      if (block.getDefaultState().isRedstonePowerSource() && new RailShaper(world, pos, state).getNeighborCount() == 3) {
+      if (block.getDefaultState().isRedstonePowerSource() && new RailPlacementHelper(world, pos, state).getNeighborCount() == 3) {
          this.updateBlockState(world, pos, state, false);
       }
    }
Only in namedSrc/net/minecraft/block: RailPlacementHelper.java
Only in namedTargetSrc/net/minecraft/block: RailShaper.java
diff -bur namedTargetSrc/net/minecraft/client/gui/ParentElement.java namedSrc/net/minecraft/client/gui/ParentElement.java
--- namedTargetSrc/net/minecraft/client/gui/ParentElement.java	2024-05-29 02:40:39.257173368 +0000
+++ namedSrc/net/minecraft/client/gui/ParentElement.java	2024-05-29 02:39:30.285413371 +0000
@@ -153,7 +153,7 @@
     * Mapping not found
     */
    @Override
-   default void setFocused(boolean focused) {
+   default void setFocused(boolean bl) {
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/realms/RealmsMainScreen.java namedSrc/net/minecraft/client/gui/screen/realms/RealmsMainScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/realms/RealmsMainScreen.java	2024-05-29 02:40:39.345172968 +0000
+++ namedSrc/net/minecraft/client/gui/screen/realms/RealmsMainScreen.java	2024-05-29 02:39:30.409412916 +0000
@@ -1500,9 +1500,9 @@
        * Mapping not found
        */
       @Override
-      public void setFocused(boolean focused) {
-         super.setFocused(focused);
-         this.button.setFocused(focused);
+      public void setFocused(boolean bl) {
+         super.setFocused(bl);
+         this.button.setFocused(bl);
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/ClickableWidget.java namedSrc/net/minecraft/client/gui/widget/ClickableWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/ClickableWidget.java	2024-05-29 02:40:39.365172877 +0000
+++ namedSrc/net/minecraft/client/gui/widget/ClickableWidget.java	2024-05-29 02:39:30.429412843 +0000
@@ -440,8 +440,8 @@
     * Mapping not found
     */
    @Override
-   public void setFocused(boolean focused) {
-      this.focused = focused;
+   public void setFocused(boolean bl) {
+      this.focused = bl;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/DraggingWidget.java namedSrc/net/minecraft/client/gui/widget/DraggingWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/DraggingWidget.java	2024-05-29 02:40:39.261173350 +0000
+++ namedSrc/net/minecraft/client/gui/widget/DraggingWidget.java	2024-05-29 02:39:30.293413342 +0000
@@ -120,7 +120,7 @@
     * Mapping not found
     */
    @Override
-   public void setFocused(boolean focused) {
-      ParentElement.super.setFocused(focused);
+   public void setFocused(boolean bl) {
+      ParentElement.super.setFocused(bl);
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/EditBoxWidget.java namedSrc/net/minecraft/client/gui/widget/EditBoxWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/EditBoxWidget.java	2024-05-29 02:40:39.333173022 +0000
+++ namedSrc/net/minecraft/client/gui/widget/EditBoxWidget.java	2024-05-29 02:39:30.393412975 +0000
@@ -341,9 +341,9 @@
     * Mapping not found
     */
    @Override
-   public void setFocused(boolean focused) {
-      super.setFocused(focused);
-      if (focused) {
+   public void setFocused(boolean bl) {
+      super.setFocused(bl);
+      if (bl) {
          this.focusTime = Util.getMeasuringTimeMs();
       }
    }
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/HeaderBar.java namedSrc/net/minecraft/client/gui/widget/HeaderBar.java
--- namedTargetSrc/net/minecraft/client/gui/widget/HeaderBar.java	2024-05-29 02:40:39.405172694 +0000
+++ namedSrc/net/minecraft/client/gui/widget/HeaderBar.java	2024-05-29 02:39:30.469412696 +0000
@@ -122,10 +122,10 @@
     * Mapping not found
     */
    @Override
-   public void setFocused(boolean focused) {
-      super.setFocused(focused);
+   public void setFocused(boolean bl) {
+      super.setFocused(bl);
       if (this.getFocused() != null) {
-         this.getFocused().setFocused(focused);
+         this.getFocused().setFocused(bl);
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/list/EntryListWidget.java namedSrc/net/minecraft/client/gui/widget/list/EntryListWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/list/EntryListWidget.java	2024-05-29 02:40:39.181173715 +0000
+++ namedSrc/net/minecraft/client/gui/widget/list/EntryListWidget.java	2024-05-29 02:39:30.189413720 +0000
@@ -884,7 +884,7 @@
        * @mapping {@literal named setFocused Lnet/minecraft/client/gui/widget/list/EntryListWidget$Entry;setFocused(Z)V}
        */
       @Override
-      public void setFocused(boolean focused) {
+      public void setFocused(boolean bl) {
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget.java namedSrc/net/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget.java	2024-05-29 02:40:39.265173332 +0000
+++ namedSrc/net/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget.java	2024-05-29 02:39:30.293413342 +0000
@@ -291,7 +291,7 @@
     * Mapping not found
     */
    @Override
-   public void setFocused(boolean focused) {
+   public void setFocused(boolean bl) {
    }
 
    /**
@@ -357,9 +357,9 @@
 
       /**
        * @mapping {@literal hashed m_cpnwngig Lnet/minecraft/unmapped/C_ngptzlri$C_kjtjquer;m_cpnwngig(Lnet/minecraft/unmapped/C_tcpsydrv;IIII)V}
-       * @mapping {@literal named m_vnshednj Lnet/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget$AlternativeButtonWidget;m_vnshednj(Lnet/minecraft/recipe/Ingredient;IIII)V}
+       * @mapping {@literal named acceptAlignedInput Lnet/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget$AlternativeButtonWidget;acceptAlignedInput(Lnet/minecraft/recipe/Ingredient;IIII)V}
        */
-      public void m_vnshednj(Ingredient arg, int i, int j, int k, int l) {
+      public void acceptAlignedInput(Ingredient arg, int i, int j, int k, int l) {
          ItemStack[] lvs = arg.getMatchingStacks();
          if (lvs.length != 0) {
             this.slots.add(new RecipeAlternativesWidget.AlternativeButtonWidget.InputSlot(3 + k * 7, 3 + l * 7, lvs));
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/recipe_book/RecipeBookWidget.java namedSrc/net/minecraft/client/gui/widget/recipe_book/RecipeBookWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/recipe_book/RecipeBookWidget.java	2024-05-29 02:40:39.373172840 +0000
+++ namedSrc/net/minecraft/client/gui/widget/recipe_book/RecipeBookWidget.java	2024-05-29 02:39:30.437412814 +0000
@@ -645,7 +645,7 @@
     * Mapping not found
     */
    @Override
-   public void setFocused(boolean focused) {
+   public void setFocused(boolean bl) {
    }
 
    /**
@@ -738,9 +738,9 @@
 
    /**
     * @mapping {@literal hashed m_neaqjobd Lnet/minecraft/unmapped/C_xaybmvwz;m_neaqjobd(Lnet/minecraft/unmapped/C_tcpsydrv;IIII)V}
-    * @mapping {@literal named m_vnshednj Lnet/minecraft/client/gui/widget/recipe_book/RecipeBookWidget;m_vnshednj(Lnet/minecraft/recipe/Ingredient;IIII)V}
+    * @mapping {@literal named acceptAlignedInput Lnet/minecraft/client/gui/widget/recipe_book/RecipeBookWidget;acceptAlignedInput(Lnet/minecraft/recipe/Ingredient;IIII)V}
     */
-   public void m_vnshednj(Ingredient arg, int i, int j, int k, int l) {
+   public void acceptAlignedInput(Ingredient arg, int i, int j, int k, int l) {
       if (!arg.isEmpty()) {
          Slot lv = this.craftingScreenHandler.slots.get(i);
          this.ghostSlots.addSlot(arg, lv.x, lv.y);
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/SliderWidget.java namedSrc/net/minecraft/client/gui/widget/SliderWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/SliderWidget.java	2024-05-29 02:40:39.169173769 +0000
+++ namedSrc/net/minecraft/client/gui/widget/SliderWidget.java	2024-05-29 02:39:30.177413761 +0000
@@ -145,9 +145,9 @@
     * Mapping not found
     */
    @Override
-   public void setFocused(boolean focused) {
-      super.setFocused(focused);
-      if (!focused) {
+   public void setFocused(boolean bl) {
+      super.setFocused(bl);
+      if (!bl) {
          this.mutable = false;
       } else {
          InputType lv = MinecraftClient.getInstance().getLastInputType();
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/TextFieldWidget.java namedSrc/net/minecraft/client/gui/widget/TextFieldWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/TextFieldWidget.java	2024-05-29 02:40:39.201173623 +0000
+++ namedSrc/net/minecraft/client/gui/widget/TextFieldWidget.java	2024-05-29 02:39:30.217413620 +0000
@@ -734,10 +734,10 @@
     * Mapping not found
     */
    @Override
-   public void setFocused(boolean focused) {
-      if (this.focusUnlocked || focused) {
-         super.setFocused(focused);
-         if (focused) {
+   public void setFocused(boolean bl) {
+      if (this.focusUnlocked || bl) {
+         super.setFocused(bl);
+         if (bl) {
             this.f_ddgsctui = Util.getMeasuringTimeMs();
          }
       }
diff -bur namedTargetSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java namedSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java
--- namedTargetSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java	2024-05-29 02:40:39.385172785 +0000
+++ namedSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java	2024-05-29 02:39:30.449412770 +0000
@@ -523,7 +523,7 @@
          client.inGameHud.getChatHud().m_zbmekjfc(arg3.chatState());
       }
 
-      this.f_lkckyryk = BrewingRecipeRegistry.m_bwccxzca(this.enabledFlags);
+      this.f_lkckyryk = BrewingRecipeRegistry.create(this.enabledFlags);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/data/server/recipe/ShapedRecipeJsonFactory.java namedSrc/net/minecraft/data/server/recipe/ShapedRecipeJsonFactory.java
--- namedTargetSrc/net/minecraft/data/server/recipe/ShapedRecipeJsonFactory.java	2024-05-29 02:40:39.257173368 +0000
+++ namedSrc/net/minecraft/data/server/recipe/ShapedRecipeJsonFactory.java	2024-05-29 02:39:30.285413371 +0000
@@ -17,8 +17,8 @@
 import net.minecraft.recipe.Ingredient;
 import net.minecraft.recipe.RecipeCategory;
 import net.minecraft.recipe.ShapedRecipe;
+import net.minecraft.recipe.ShapedRecipePattern;
 import net.minecraft.registry.tag.TagKey;
-import net.minecraft.unmapped.C_vhpbjodz;
 import net.minecraft.util.Identifier;
 import org.jetbrains.annotations.Nullable;
 
@@ -179,7 +179,7 @@
     */
    @Override
    public void offerTo(RecipeExporter exporter, Identifier recipeId) {
-      C_vhpbjodz lv = this.validate(recipeId);
+      ShapedRecipePattern lv = this.validate(recipeId);
       Advancement.Builder lv2 = exporter.accept()
          .putCriteria("has_the_recipe", RecipeUnlockedCriterionTrigger.create(recipeId))
          .rewards(AdvancementRewards.Builder.recipe(recipeId))
@@ -197,13 +197,13 @@
 
    /**
     * @mapping {@literal hashed m_buxptdun Lnet/minecraft/unmapped/C_gfkvrxou;m_buxptdun(Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_vhpbjodz;}
-    * @mapping {@literal named validate Lnet/minecraft/data/server/recipe/ShapedRecipeJsonFactory;validate(Lnet/minecraft/util/Identifier;)Lnet/minecraft/unmapped/C_vhpbjodz;}
+    * @mapping {@literal named validate Lnet/minecraft/data/server/recipe/ShapedRecipeJsonFactory;validate(Lnet/minecraft/util/Identifier;)Lnet/minecraft/recipe/ShapedRecipePattern;}
     */
-   private C_vhpbjodz validate(Identifier recipeId) {
+   private ShapedRecipePattern validate(Identifier recipeId) {
       if (this.criteria.isEmpty()) {
          throw new IllegalStateException("No way of obtaining recipe " + recipeId);
       } else {
-         return C_vhpbjodz.m_sdpqfess(this.ingredients, this.pattern);
+         return ShapedRecipePattern.create(this.ingredients, this.pattern);
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/entity/mob/BreezeEntity.java namedSrc/net/minecraft/entity/mob/BreezeEntity.java
--- namedTargetSrc/net/minecraft/entity/mob/BreezeEntity.java	2024-05-29 02:40:39.169173769 +0000
+++ namedSrc/net/minecraft/entity/mob/BreezeEntity.java	2024-05-29 02:39:30.177413761 +0000
@@ -234,7 +234,7 @@
          this.slidingState.stop();
       }
 
-      this.ticksUntilWhirlSound = this.ticksUntilWhirlSound == 0 ? this.random.rangeInclusive(1, 80) : this.ticksUntilWhirlSound - 1;
+      this.ticksUntilWhirlSound = this.ticksUntilWhirlSound == 0 ? this.random.range(1, 80) : this.ticksUntilWhirlSound - 1;
       if (this.ticksUntilWhirlSound == 0) {
          this.playWhirlSound();
       }
diff -bur namedTargetSrc/net/minecraft/entity/OminousItemSpawnerEntity.java namedSrc/net/minecraft/entity/OminousItemSpawnerEntity.java
--- namedTargetSrc/net/minecraft/entity/OminousItemSpawnerEntity.java	2024-05-29 02:40:39.201173623 +0000
+++ namedSrc/net/minecraft/entity/OminousItemSpawnerEntity.java	2024-05-29 02:39:30.213413635 +0000
@@ -73,7 +73,7 @@
     */
    public static OminousItemSpawnerEntity create(World world, ItemStack stack) {
       OminousItemSpawnerEntity lv = new OminousItemSpawnerEntity(EntityType.OMINOUS_ITEM_SPAWNER, world);
-      lv.spawnItemAfterTicks = (long)world.random.rangeInclusive(60, 120);
+      lv.spawnItemAfterTicks = (long)world.random.range(60, 120);
       lv.setItem(stack);
       return lv;
    }
@@ -222,7 +222,7 @@
     */
    public void addParticles() {
       Vec3d lv = this.getPos();
-      int i = this.random.rangeInclusive(1, 3);
+      int i = this.random.range(1, 3);
 
       for (int j = 0; j < i; j++) {
          double d = 0.4;
diff -bur namedTargetSrc/net/minecraft/entity/passive/ArmadilloBrain.java namedSrc/net/minecraft/entity/passive/ArmadilloBrain.java
--- namedTargetSrc/net/minecraft/entity/passive/ArmadilloBrain.java	2024-05-29 02:40:39.401172713 +0000
+++ namedSrc/net/minecraft/entity/passive/ArmadilloBrain.java	2024-05-29 02:39:30.465412711 +0000
@@ -349,7 +349,7 @@
        * @mapping {@literal named calculateTicksUntilPeek Lnet/minecraft/entity/passive/ArmadilloBrain$RollUpTask;calculateTicksUntilPeek(Lnet/minecraft/entity/passive/ArmadilloEntity;)I}
        */
       private int calculateTicksUntilPeek(ArmadilloEntity armadillo) {
-         return ArmadilloEntity.State.SCARED.getLengthTicks() + armadillo.m_dlwxaobh().rangeInclusive(100, 400);
+         return ArmadilloEntity.State.SCARED.getLengthTicks() + armadillo.m_dlwxaobh().range(100, 400);
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/entity/passive/SheepEntity.java namedSrc/net/minecraft/entity/passive/SheepEntity.java
--- namedTargetSrc/net/minecraft/entity/passive/SheepEntity.java	2024-05-29 02:40:39.205173605 +0000
+++ namedSrc/net/minecraft/entity/passive/SheepEntity.java	2024-05-29 02:39:30.221413605 +0000
@@ -39,6 +39,7 @@
 import net.minecraft.loot.LootTables;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.recipe.CraftingRecipe;
+import net.minecraft.recipe.CraftingRecipeInput;
 import net.minecraft.recipe.RecipeType;
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.tag.ItemTags;
@@ -46,7 +47,6 @@
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.unmapped.C_euomljmv;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.DyeColor;
 import net.minecraft.util.Hand;
@@ -483,7 +483,7 @@
    private DyeColor getChildColor(AnimalEntity firstParent, AnimalEntity secondParent) {
       DyeColor lv = ((SheepEntity)firstParent).m_zzglaoyq();
       DyeColor lv2 = ((SheepEntity)secondParent).m_zzglaoyq();
-      C_euomljmv lv3 = m_nksmjbqk(lv, lv2);
+      CraftingRecipeInput lv3 = m_nksmjbqk(lv, lv2);
       return (DyeColor)this.getWorld()
          .getRecipeManager()
          .m_omtmmszf(RecipeType.CRAFTING, lv3, this.getWorld())
@@ -498,7 +498,7 @@
    /**
     * Mapping not found
     */
-   private static C_euomljmv m_nksmjbqk(DyeColor arg, DyeColor arg2) {
-      return C_euomljmv.m_dyulubbb(2, 1, List.of(new ItemStack(DyeItem.byColor(arg)), new ItemStack(DyeItem.byColor(arg2))));
+   private static CraftingRecipeInput m_nksmjbqk(DyeColor arg, DyeColor arg2) {
+      return CraftingRecipeInput.create(2, 1, List.of(new ItemStack(DyeItem.byColor(arg)), new ItemStack(DyeItem.byColor(arg2))));
    }
 }
diff -bur namedTargetSrc/net/minecraft/entity/passive/TameableEntity.java namedSrc/net/minecraft/entity/passive/TameableEntity.java
--- namedTargetSrc/net/minecraft/entity/passive/TameableEntity.java	2024-05-29 02:40:39.237173459 +0000
+++ namedSrc/net/minecraft/entity/passive/TameableEntity.java	2024-05-29 02:39:30.257413474 +0000
@@ -364,10 +364,10 @@
     */
    private void m_thjcypav(BlockPos pos) {
       for (int i = 0; i < 10; i++) {
-         int j = this.random.rangeInclusive(-3, 3);
-         int k = this.random.rangeInclusive(-3, 3);
+         int j = this.random.range(-3, 3);
+         int k = this.random.range(-3, 3);
          if (Math.abs(j) >= 2 || Math.abs(k) >= 2) {
-            int l = this.random.rangeInclusive(-1, 1);
+            int l = this.random.range(-1, 1);
             if (this.m_gdpxayae(pos.getX() + j, pos.getY() + l, pos.getZ() + k)) {
                return;
             }
diff -bur namedTargetSrc/net/minecraft/inventory/RecipeInputInventory.java namedSrc/net/minecraft/inventory/RecipeInputInventory.java
--- namedTargetSrc/net/minecraft/inventory/RecipeInputInventory.java	2024-05-29 02:40:39.345172968 +0000
+++ namedSrc/net/minecraft/inventory/RecipeInputInventory.java	2024-05-29 02:39:30.409412916 +0000
@@ -2,8 +2,8 @@
 
 import java.util.List;
 import net.minecraft.item.ItemStack;
+import net.minecraft.recipe.CraftingRecipeInput;
 import net.minecraft.recipe.RecipeInputProvider;
-import net.minecraft.unmapped.C_euomljmv;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_fcvwjvlq}
@@ -31,14 +31,14 @@
    /**
     * Mapping not found
     */
-   default C_euomljmv m_tegcmbjp() {
+   default CraftingRecipeInput m_tegcmbjp() {
       return this.m_mjhyecbx().input();
    }
 
    /**
     * Mapping not found
     */
-   default C_euomljmv.C_yjgdhrsl m_mjhyecbx() {
-      return C_euomljmv.m_uywbpkmo(this.getWidth(), this.getHeight(), this.getInvStack());
+   default CraftingRecipeInput.Positioned m_mjhyecbx() {
+      return CraftingRecipeInput.createPositioned(this.getWidth(), this.getHeight(), this.getInvStack());
    }
 }
diff -bur namedTargetSrc/net/minecraft/item/BrushItem.java namedSrc/net/minecraft/item/BrushItem.java
--- namedTargetSrc/net/minecraft/item/BrushItem.java	2024-05-29 02:40:39.273173296 +0000
+++ namedSrc/net/minecraft/item/BrushItem.java	2024-05-29 02:39:30.313413268 +0000
@@ -136,7 +136,7 @@
    private void spawnDustParticles(World world, BlockHitResult blockHitResult, BlockState state, Vec3d pos, Arm arm) {
       double d = 3.0;
       int i = arm == Arm.RIGHT ? 1 : -1;
-      int j = world.getRandom().range(7, 12);
+      int j = world.getRandom().rangeClosed(7, 12);
       BlockStateParticleEffect lv = new BlockStateParticleEffect(ParticleTypes.BLOCK, state);
       Direction lv2 = blockHitResult.getSide();
       BrushItem.DustParticleDelta lv3 = BrushItem.DustParticleDelta.create(pos, lv2);
diff -bur namedTargetSrc/net/minecraft/loot/function/FurnaceSmeltLootFunction.java namedSrc/net/minecraft/loot/function/FurnaceSmeltLootFunction.java
--- namedTargetSrc/net/minecraft/loot/function/FurnaceSmeltLootFunction.java	2024-05-29 02:40:39.161173805 +0000
+++ namedSrc/net/minecraft/loot/function/FurnaceSmeltLootFunction.java	2024-05-29 02:39:30.165413803 +0000
@@ -10,8 +10,8 @@
 import net.minecraft.loot.context.LootContext;
 import net.minecraft.recipe.RecipeHolder;
 import net.minecraft.recipe.RecipeType;
+import net.minecraft.recipe.SingleStackRecipeInput;
 import net.minecraft.recipe.SmeltingRecipe;
-import net.minecraft.unmapped.C_hsoxiypb;
 import org.slf4j.Logger;
 
 /**
@@ -58,7 +58,7 @@
       } else {
          Optional<RecipeHolder<SmeltingRecipe>> optional = context.getWorld()
             .getRecipeManager()
-            .m_omtmmszf(RecipeType.SMELTING, new C_hsoxiypb(stack), context.getWorld());
+            .m_omtmmszf(RecipeType.SMELTING, new SingleStackRecipeInput(stack), context.getWorld());
          if (optional.isPresent()) {
             ItemStack lv = ((SmeltingRecipe)((RecipeHolder)optional.get()).value()).getResult(context.getWorld().getRegistryManager());
             if (!lv.isEmpty()) {
diff -bur namedTargetSrc/net/minecraft/recipe/AbstractCookingRecipe.java namedSrc/net/minecraft/recipe/AbstractCookingRecipe.java
--- namedTargetSrc/net/minecraft/recipe/AbstractCookingRecipe.java	2024-05-29 02:40:39.369172858 +0000
+++ namedSrc/net/minecraft/recipe/AbstractCookingRecipe.java	2024-05-29 02:39:30.433412829 +0000
@@ -2,7 +2,6 @@
 
 import net.minecraft.item.ItemStack;
 import net.minecraft.registry.HolderLookup;
-import net.minecraft.unmapped.C_hsoxiypb;
 import net.minecraft.util.collection.DefaultedList;
 import net.minecraft.world.World;
 
@@ -10,7 +9,7 @@
  * @mapping {@literal hashed net/minecraft/unmapped/C_hpjdwiwu}
  * @mapping {@literal named net/minecraft/recipe/AbstractCookingRecipe}
  */
-public abstract class AbstractCookingRecipe implements Recipe<C_hsoxiypb> {
+public abstract class AbstractCookingRecipe implements Recipe<SingleStackRecipeInput> {
    /**
     * @mapping {@literal hashed f_kzmcrahk Lnet/minecraft/unmapped/C_hpjdwiwu;f_kzmcrahk:Lnet/minecraft/unmapped/C_rhnqznys;}
     * @mapping {@literal named type Lnet/minecraft/recipe/AbstractCookingRecipe;type:Lnet/minecraft/recipe/RecipeType;}
@@ -64,18 +63,18 @@
    }
 
    /**
-    * @mapping {@literal hashed m_jjsxdttb Lnet/minecraft/unmapped/C_hpjdwiwu;m_jjsxdttb(Lnet/minecraft/unmapped/C_hsoxiypb;Lnet/minecraft/unmapped/C_cdctfzbn;)Z}
-    * @mapping {@literal named m_jjsxdttb Lnet/minecraft/recipe/AbstractCookingRecipe;m_jjsxdttb(Lnet/minecraft/unmapped/C_hsoxiypb;Lnet/minecraft/world/World;)Z}
+    * @mapping {@literal hashed m_pbprkkvo Lnet/minecraft/unmapped/C_hpjdwiwu;m_pbprkkvo(Lnet/minecraft/unmapped/C_hsoxiypb;Lnet/minecraft/unmapped/C_cdctfzbn;)Z}
+    * @mapping {@literal named matches Lnet/minecraft/recipe/AbstractCookingRecipe;matches(Lnet/minecraft/recipe/SingleStackRecipeInput;Lnet/minecraft/world/World;)Z}
     */
-   public boolean m_jjsxdttb(C_hsoxiypb arg, World world) {
+   public boolean matches(SingleStackRecipeInput arg, World world) {
       return this.ingredient.test(arg.item());
    }
 
    /**
     * @mapping {@literal hashed m_yijglwyj Lnet/minecraft/unmapped/C_hpjdwiwu;m_yijglwyj(Lnet/minecraft/unmapped/C_hsoxiypb;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_sddaxwyk;}
-    * @mapping {@literal named craft Lnet/minecraft/recipe/AbstractCookingRecipe;craft(Lnet/minecraft/unmapped/C_hsoxiypb;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/item/ItemStack;}
+    * @mapping {@literal named craft Lnet/minecraft/recipe/AbstractCookingRecipe;craft(Lnet/minecraft/recipe/SingleStackRecipeInput;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/item/ItemStack;}
     */
-   public ItemStack craft(C_hsoxiypb arg, HolderLookup.Provider arg2) {
+   public ItemStack craft(SingleStackRecipeInput arg, HolderLookup.Provider arg2) {
       return this.result.copy();
    }
 
@@ -109,7 +108,7 @@
     * Mapping not found
     */
    @Override
-   public ItemStack getResult(HolderLookup.Provider arg) {
+   public ItemStack getResult(HolderLookup.Provider lookupProvider) {
       return this.result;
    }
 
diff -bur namedTargetSrc/net/minecraft/recipe/ArmorDyeRecipe.java namedSrc/net/minecraft/recipe/ArmorDyeRecipe.java
--- namedTargetSrc/net/minecraft/recipe/ArmorDyeRecipe.java	2024-05-29 02:40:39.341172985 +0000
+++ namedSrc/net/minecraft/recipe/ArmorDyeRecipe.java	2024-05-29 02:39:30.405412931 +0000
@@ -7,7 +7,6 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.registry.HolderLookup;
 import net.minecraft.registry.tag.ItemTags;
-import net.minecraft.unmapped.C_euomljmv;
 import net.minecraft.world.World;
 
 /**
@@ -23,15 +22,15 @@
    }
 
    /**
-    * @mapping {@literal hashed m_jjsxdttb Lnet/minecraft/unmapped/C_efmveflh;m_jjsxdttb(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/unmapped/C_cdctfzbn;)Z}
-    * @mapping {@literal named m_jjsxdttb Lnet/minecraft/recipe/ArmorDyeRecipe;m_jjsxdttb(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/world/World;)Z}
+    * @mapping {@literal hashed m_pobdwhfn Lnet/minecraft/unmapped/C_efmveflh;m_pobdwhfn(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/unmapped/C_cdctfzbn;)Z}
+    * @mapping {@literal named matches Lnet/minecraft/recipe/ArmorDyeRecipe;matches(Lnet/minecraft/recipe/CraftingRecipeInput;Lnet/minecraft/world/World;)Z}
     */
-   public boolean m_jjsxdttb(C_euomljmv arg, World world) {
+   public boolean matches(CraftingRecipeInput arg, World world) {
       ItemStack lv = ItemStack.EMPTY;
       List<ItemStack> list = Lists.<ItemStack>newArrayList();
 
-      for (int i = 0; i < arg.m_gptaeput(); i++) {
-         ItemStack lv2 = arg.m_hhjzrppb(i);
+      for (int i = 0; i < arg.size(); i++) {
+         ItemStack lv2 = arg.getStack(i);
          if (!lv2.isEmpty()) {
             if (lv2.isIn(ItemTags.DYEABLE)) {
                if (!lv.isEmpty()) {
@@ -54,14 +53,14 @@
 
    /**
     * @mapping {@literal hashed m_pdxzjwce Lnet/minecraft/unmapped/C_efmveflh;m_pdxzjwce(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_sddaxwyk;}
-    * @mapping {@literal named craft Lnet/minecraft/recipe/ArmorDyeRecipe;craft(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/item/ItemStack;}
+    * @mapping {@literal named craft Lnet/minecraft/recipe/ArmorDyeRecipe;craft(Lnet/minecraft/recipe/CraftingRecipeInput;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/item/ItemStack;}
     */
-   public ItemStack craft(C_euomljmv arg, HolderLookup.Provider arg2) {
+   public ItemStack craft(CraftingRecipeInput arg, HolderLookup.Provider arg2) {
       List<DyeItem> list = Lists.<DyeItem>newArrayList();
       ItemStack lv = ItemStack.EMPTY;
 
-      for (int i = 0; i < arg.m_gptaeput(); i++) {
-         ItemStack lv2 = arg.m_hhjzrppb(i);
+      for (int i = 0; i < arg.size(); i++) {
+         ItemStack lv2 = arg.getStack(i);
          if (!lv2.isEmpty()) {
             if (lv2.isIn(ItemTags.DYEABLE)) {
                if (!lv.isEmpty()) {
diff -bur namedTargetSrc/net/minecraft/recipe/BannerDuplicateRecipe.java namedSrc/net/minecraft/recipe/BannerDuplicateRecipe.java
--- namedTargetSrc/net/minecraft/recipe/BannerDuplicateRecipe.java	2024-05-29 02:40:39.253173386 +0000
+++ namedSrc/net/minecraft/recipe/BannerDuplicateRecipe.java	2024-05-29 02:39:30.281413385 +0000
@@ -6,7 +6,6 @@
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.registry.HolderLookup;
-import net.minecraft.unmapped.C_euomljmv;
 import net.minecraft.util.DyeColor;
 import net.minecraft.util.collection.DefaultedList;
 import net.minecraft.world.World;
@@ -25,15 +24,15 @@
 
    /**
     * @mapping {@literal hashed m_ejmyxret Lnet/minecraft/unmapped/C_kkioeysc;m_ejmyxret(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/unmapped/C_cdctfzbn;)Z}
-    * @mapping {@literal named m_jjsxdttb Lnet/minecraft/recipe/BannerDuplicateRecipe;m_jjsxdttb(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/world/World;)Z}
+    * @mapping {@literal named matches Lnet/minecraft/recipe/BannerDuplicateRecipe;matches(Lnet/minecraft/recipe/CraftingRecipeInput;Lnet/minecraft/world/World;)Z}
     */
-   public boolean m_jjsxdttb(C_euomljmv arg, World world) {
+   public boolean matches(CraftingRecipeInput arg, World world) {
       DyeColor lv = null;
       ItemStack lv2 = null;
       ItemStack lv3 = null;
 
-      for (int i = 0; i < arg.m_gptaeput(); i++) {
-         ItemStack lv4 = arg.m_hhjzrppb(i);
+      for (int i = 0; i < arg.size(); i++) {
+         ItemStack lv4 = arg.getStack(i);
          if (!lv4.isEmpty()) {
             Item lv5 = lv4.getItem();
             if (!(lv5 instanceof BannerItem)) {
@@ -73,11 +72,11 @@
 
    /**
     * @mapping {@literal hashed m_kfxlmfqs Lnet/minecraft/unmapped/C_kkioeysc;m_kfxlmfqs(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_sddaxwyk;}
-    * @mapping {@literal named craft Lnet/minecraft/recipe/BannerDuplicateRecipe;craft(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/item/ItemStack;}
+    * @mapping {@literal named craft Lnet/minecraft/recipe/BannerDuplicateRecipe;craft(Lnet/minecraft/recipe/CraftingRecipeInput;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/item/ItemStack;}
     */
-   public ItemStack craft(C_euomljmv arg, HolderLookup.Provider arg2) {
-      for (int i = 0; i < arg.m_gptaeput(); i++) {
-         ItemStack lv = arg.m_hhjzrppb(i);
+   public ItemStack craft(CraftingRecipeInput arg, HolderLookup.Provider arg2) {
+      for (int i = 0; i < arg.size(); i++) {
+         ItemStack lv = arg.getStack(i);
          if (!lv.isEmpty()) {
             int j = lv.getOrDefault(DataComponentTypes.BANNER_PATTERNS, BannerPatternsComponent.DEFAULT).layers().size();
             if (j > 0 && j <= 6) {
@@ -91,13 +90,13 @@
 
    /**
     * @mapping {@literal hashed m_kudbflqi Lnet/minecraft/unmapped/C_kkioeysc;m_kudbflqi(Lnet/minecraft/unmapped/C_euomljmv;)Lnet/minecraft/unmapped/C_rnrfftze;}
-    * @mapping {@literal named m_pyffiody Lnet/minecraft/recipe/BannerDuplicateRecipe;m_pyffiody(Lnet/minecraft/unmapped/C_euomljmv;)Lnet/minecraft/util/collection/DefaultedList;}
+    * @mapping {@literal named getRemainder Lnet/minecraft/recipe/BannerDuplicateRecipe;getRemainder(Lnet/minecraft/recipe/CraftingRecipeInput;)Lnet/minecraft/util/collection/DefaultedList;}
     */
-   public DefaultedList<ItemStack> m_pyffiody(C_euomljmv arg) {
-      DefaultedList<ItemStack> lv = DefaultedList.ofSize(arg.m_gptaeput(), ItemStack.EMPTY);
+   public DefaultedList<ItemStack> getRemainder(CraftingRecipeInput arg) {
+      DefaultedList<ItemStack> lv = DefaultedList.ofSize(arg.size(), ItemStack.EMPTY);
 
       for (int i = 0; i < lv.size(); i++) {
-         ItemStack lv2 = arg.m_hhjzrppb(i);
+         ItemStack lv2 = arg.getStack(i);
          if (!lv2.isEmpty()) {
             if (lv2.getItem().hasRecipeRemainder()) {
                lv.set(i, new ItemStack(lv2.getItem().getRecipeRemainder()));
diff -bur namedTargetSrc/net/minecraft/recipe/BookCloningRecipe.java namedSrc/net/minecraft/recipe/BookCloningRecipe.java
--- namedTargetSrc/net/minecraft/recipe/BookCloningRecipe.java	2024-05-29 02:40:39.317173094 +0000
+++ namedSrc/net/minecraft/recipe/BookCloningRecipe.java	2024-05-29 02:39:30.369413063 +0000
@@ -6,7 +6,6 @@
 import net.minecraft.item.Items;
 import net.minecraft.item.WrittenBookItem;
 import net.minecraft.registry.HolderLookup;
-import net.minecraft.unmapped.C_euomljmv;
 import net.minecraft.util.collection.DefaultedList;
 import net.minecraft.world.World;
 
@@ -23,15 +22,15 @@
    }
 
    /**
-    * @mapping {@literal hashed m_jjsxdttb Lnet/minecraft/unmapped/C_cgvcavkp;m_jjsxdttb(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/unmapped/C_cdctfzbn;)Z}
-    * @mapping {@literal named m_jjsxdttb Lnet/minecraft/recipe/BookCloningRecipe;m_jjsxdttb(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/world/World;)Z}
+    * @mapping {@literal hashed m_ppyfbkgs Lnet/minecraft/unmapped/C_cgvcavkp;m_ppyfbkgs(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/unmapped/C_cdctfzbn;)Z}
+    * @mapping {@literal named matches Lnet/minecraft/recipe/BookCloningRecipe;matches(Lnet/minecraft/recipe/CraftingRecipeInput;Lnet/minecraft/world/World;)Z}
     */
-   public boolean m_jjsxdttb(C_euomljmv arg, World world) {
+   public boolean matches(CraftingRecipeInput arg, World world) {
       int i = 0;
       ItemStack lv = ItemStack.EMPTY;
 
-      for (int j = 0; j < arg.m_gptaeput(); j++) {
-         ItemStack lv2 = arg.m_hhjzrppb(j);
+      for (int j = 0; j < arg.size(); j++) {
+         ItemStack lv2 = arg.getStack(j);
          if (!lv2.isEmpty()) {
             if (lv2.isOf(Items.WRITTEN_BOOK)) {
                if (!lv.isEmpty()) {
@@ -54,14 +53,14 @@
 
    /**
     * @mapping {@literal hashed m_fglmpuho Lnet/minecraft/unmapped/C_cgvcavkp;m_fglmpuho(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_sddaxwyk;}
-    * @mapping {@literal named craft Lnet/minecraft/recipe/BookCloningRecipe;craft(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/item/ItemStack;}
+    * @mapping {@literal named craft Lnet/minecraft/recipe/BookCloningRecipe;craft(Lnet/minecraft/recipe/CraftingRecipeInput;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/item/ItemStack;}
     */
-   public ItemStack craft(C_euomljmv arg, HolderLookup.Provider arg2) {
+   public ItemStack craft(CraftingRecipeInput arg, HolderLookup.Provider arg2) {
       int i = 0;
       ItemStack lv = ItemStack.EMPTY;
 
-      for (int j = 0; j < arg.m_gptaeput(); j++) {
-         ItemStack lv2 = arg.m_hhjzrppb(j);
+      for (int j = 0; j < arg.size(); j++) {
+         ItemStack lv2 = arg.getStack(j);
          if (!lv2.isEmpty()) {
             if (lv2.isOf(Items.WRITTEN_BOOK)) {
                if (!lv.isEmpty()) {
@@ -96,13 +95,13 @@
 
    /**
     * @mapping {@literal hashed m_khkautmy Lnet/minecraft/unmapped/C_cgvcavkp;m_khkautmy(Lnet/minecraft/unmapped/C_euomljmv;)Lnet/minecraft/unmapped/C_rnrfftze;}
-    * @mapping {@literal named m_pyffiody Lnet/minecraft/recipe/BookCloningRecipe;m_pyffiody(Lnet/minecraft/unmapped/C_euomljmv;)Lnet/minecraft/util/collection/DefaultedList;}
+    * @mapping {@literal named getRemainder Lnet/minecraft/recipe/BookCloningRecipe;getRemainder(Lnet/minecraft/recipe/CraftingRecipeInput;)Lnet/minecraft/util/collection/DefaultedList;}
     */
-   public DefaultedList<ItemStack> m_pyffiody(C_euomljmv arg) {
-      DefaultedList<ItemStack> lv = DefaultedList.ofSize(arg.m_gptaeput(), ItemStack.EMPTY);
+   public DefaultedList<ItemStack> getRemainder(CraftingRecipeInput arg) {
+      DefaultedList<ItemStack> lv = DefaultedList.ofSize(arg.size(), ItemStack.EMPTY);
 
       for (int i = 0; i < lv.size(); i++) {
-         ItemStack lv2 = arg.m_hhjzrppb(i);
+         ItemStack lv2 = arg.getStack(i);
          if (lv2.getItem().hasRecipeRemainder()) {
             lv.set(i, new ItemStack(lv2.getItem().getRecipeRemainder()));
          } else if (lv2.getItem() instanceof WrittenBookItem) {

@github-actions
Copy link

Choose a reason for hiding this comment

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

View the diff here (2/3): 
diff -bur namedTargetSrc/net/minecraft/recipe/BrewingRecipeRegistry.java namedSrc/net/minecraft/recipe/BrewingRecipeRegistry.java
--- namedTargetSrc/net/minecraft/recipe/BrewingRecipeRegistry.java	2024-05-29 02:40:39.257173368 +0000
+++ namedSrc/net/minecraft/recipe/BrewingRecipeRegistry.java	2024-05-29 02:39:30.285413371 +0000
@@ -26,29 +26,36 @@
     */
    public static final int BREWING_TIME_SECONDS = 20;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_rhvjiasu Lnet/minecraft/unmapped/C_ilssplzn;f_rhvjiasu:Lnet/minecraft/unmapped/C_ilssplzn;}
+    * @mapping {@literal named EMPTY Lnet/minecraft/recipe/BrewingRecipeRegistry;EMPTY:Lnet/minecraft/recipe/BrewingRecipeRegistry;}
     */
-   public static final BrewingRecipeRegistry f_rhvjiasu = new BrewingRecipeRegistry(List.of(), List.of(), List.of());
+   public static final BrewingRecipeRegistry EMPTY = new BrewingRecipeRegistry(List.of(), List.of(), List.of());
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_mxpxplfe Lnet/minecraft/unmapped/C_ilssplzn;f_mxpxplfe:Ljava/util/List;}
+    * @mapping {@literal named potionTypes Lnet/minecraft/recipe/BrewingRecipeRegistry;potionTypes:Ljava/util/List;}
     */
-   private final List<Ingredient> f_mxpxplfe;
+   private final List<Ingredient> potionTypes;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_aruotgdf Lnet/minecraft/unmapped/C_ilssplzn;f_aruotgdf:Ljava/util/List;}
+    * @mapping {@literal named potionRecipes Lnet/minecraft/recipe/BrewingRecipeRegistry;potionRecipes:Ljava/util/List;}
     */
-   private final List<BrewingRecipeRegistry.Recipe<Potion>> f_aruotgdf;
+   private final List<BrewingRecipeRegistry.Recipe<Potion>> potionRecipes;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_dhquiuxe Lnet/minecraft/unmapped/C_ilssplzn;f_dhquiuxe:Ljava/util/List;}
+    * @mapping {@literal named itemRecipes Lnet/minecraft/recipe/BrewingRecipeRegistry;itemRecipes:Ljava/util/List;}
     */
-   private final List<BrewingRecipeRegistry.Recipe<Item>> f_dhquiuxe;
+   private final List<BrewingRecipeRegistry.Recipe<Item>> itemRecipes;
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_ilssplzn;<init>(Ljava/util/List;Ljava/util/List;Ljava/util/List;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/recipe/BrewingRecipeRegistry;<init>(Ljava/util/List;Ljava/util/List;Ljava/util/List;)V}
     */
-   BrewingRecipeRegistry(List<Ingredient> list, List<BrewingRecipeRegistry.Recipe<Potion>> list2, List<BrewingRecipeRegistry.Recipe<Item>> list3) {
-      this.f_mxpxplfe = list;
-      this.f_aruotgdf = list2;
-      this.f_dhquiuxe = list3;
+   BrewingRecipeRegistry(
+      List<Ingredient> potionTypes, List<BrewingRecipeRegistry.Recipe<Potion>> potionRecipes, List<BrewingRecipeRegistry.Recipe<Item>> itemRecipes
+   ) {
+      this.potionTypes = potionTypes;
+      this.potionRecipes = potionRecipes;
+      this.itemRecipes = itemRecipes;
    }
 
    /**
@@ -61,10 +68,10 @@
 
    /**
     * @mapping {@literal hashed m_kdcuqyob Lnet/minecraft/unmapped/C_ilssplzn;m_kdcuqyob(Lnet/minecraft/unmapped/C_sddaxwyk;)Z}
-    * @mapping {@literal named m_kdcuqyob Lnet/minecraft/recipe/BrewingRecipeRegistry;m_kdcuqyob(Lnet/minecraft/item/ItemStack;)Z}
+    * @mapping {@literal named isPotionType Lnet/minecraft/recipe/BrewingRecipeRegistry;isPotionType(Lnet/minecraft/item/ItemStack;)Z}
     */
-   private boolean m_kdcuqyob(ItemStack stack) {
-      for (Ingredient lv : this.f_mxpxplfe) {
+   private boolean isPotionType(ItemStack stack) {
+      for (Ingredient lv : this.potionTypes) {
          if (lv.test(stack)) {
             return true;
          }
@@ -78,7 +85,7 @@
     * @mapping {@literal named isItemRecipeIngredient Lnet/minecraft/recipe/BrewingRecipeRegistry;isItemRecipeIngredient(Lnet/minecraft/item/ItemStack;)Z}
     */
    public boolean isItemRecipeIngredient(ItemStack stack) {
-      for (BrewingRecipeRegistry.Recipe<Item> lv : this.f_dhquiuxe) {
+      for (BrewingRecipeRegistry.Recipe<Item> lv : this.itemRecipes) {
          if (lv.ingredient.test(stack)) {
             return true;
          }
@@ -92,7 +99,7 @@
     * @mapping {@literal named isPotionRecipeIngredient Lnet/minecraft/recipe/BrewingRecipeRegistry;isPotionRecipeIngredient(Lnet/minecraft/item/ItemStack;)Z}
     */
    public boolean isPotionRecipeIngredient(ItemStack stack) {
-      for (BrewingRecipeRegistry.Recipe<Potion> lv : this.f_aruotgdf) {
+      for (BrewingRecipeRegistry.Recipe<Potion> lv : this.potionRecipes) {
          if (lv.ingredient.test(stack)) {
             return true;
          }
@@ -105,9 +112,9 @@
     * @mapping {@literal hashed m_ngyngnto Lnet/minecraft/unmapped/C_ilssplzn;m_ngyngnto(Lnet/minecraft/unmapped/C_cjzoxshv;)Z}
     * @mapping {@literal named isBrewable Lnet/minecraft/recipe/BrewingRecipeRegistry;isBrewable(Lnet/minecraft/registry/Holder;)Z}
     */
-   public boolean isBrewable(Holder<Potion> arg) {
-      for (BrewingRecipeRegistry.Recipe<Potion> lv : this.f_aruotgdf) {
-         if (lv.output.matches(arg)) {
+   public boolean isBrewable(Holder<Potion> potion) {
+      for (BrewingRecipeRegistry.Recipe<Potion> lv : this.potionRecipes) {
+         if (lv.output.matches(potion)) {
             return true;
          }
       }
@@ -119,17 +126,17 @@
     * @mapping {@literal hashed m_wrviwmkr Lnet/minecraft/unmapped/C_ilssplzn;m_wrviwmkr(Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_sddaxwyk;)Z}
     * @mapping {@literal named hasRecipe Lnet/minecraft/recipe/BrewingRecipeRegistry;hasRecipe(Lnet/minecraft/item/ItemStack;Lnet/minecraft/item/ItemStack;)Z}
     */
-   public boolean hasRecipe(ItemStack ingredient, ItemStack arg2) {
-      return !this.m_kdcuqyob(ingredient) ? false : this.hasItemRecipe(ingredient, arg2) || this.hasPotionRecipe(ingredient, arg2);
+   public boolean hasRecipe(ItemStack input, ItemStack ingredient) {
+      return !this.isPotionType(input) ? false : this.hasItemRecipe(input, ingredient) || this.hasPotionRecipe(input, ingredient);
    }
 
    /**
     * @mapping {@literal hashed m_fdkgeuuc Lnet/minecraft/unmapped/C_ilssplzn;m_fdkgeuuc(Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_sddaxwyk;)Z}
     * @mapping {@literal named hasItemRecipe Lnet/minecraft/recipe/BrewingRecipeRegistry;hasItemRecipe(Lnet/minecraft/item/ItemStack;Lnet/minecraft/item/ItemStack;)Z}
     */
-   public boolean hasItemRecipe(ItemStack ingredient, ItemStack arg2) {
-      for (BrewingRecipeRegistry.Recipe<Item> lv : this.f_dhquiuxe) {
-         if (ingredient.matches(lv.input) && lv.ingredient.test(arg2)) {
+   public boolean hasItemRecipe(ItemStack input, ItemStack ingredient) {
+      for (BrewingRecipeRegistry.Recipe<Item> lv : this.itemRecipes) {
+         if (input.matches(lv.input) && lv.ingredient.test(ingredient)) {
             return true;
          }
       }
@@ -141,13 +148,13 @@
     * @mapping {@literal hashed m_ngonaytv Lnet/minecraft/unmapped/C_ilssplzn;m_ngonaytv(Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_sddaxwyk;)Z}
     * @mapping {@literal named hasPotionRecipe Lnet/minecraft/recipe/BrewingRecipeRegistry;hasPotionRecipe(Lnet/minecraft/item/ItemStack;Lnet/minecraft/item/ItemStack;)Z}
     */
-   public boolean hasPotionRecipe(ItemStack ingredient, ItemStack arg2) {
-      Optional<Holder<Potion>> optional = ingredient.getOrDefault(DataComponentTypes.POTION_CONTENTS, PotionContentsComponent.DEFAULT).potion();
+   public boolean hasPotionRecipe(ItemStack input, ItemStack ingredient) {
+      Optional<Holder<Potion>> optional = input.getOrDefault(DataComponentTypes.POTION_CONTENTS, PotionContentsComponent.DEFAULT).potion();
       if (optional.isEmpty()) {
          return false;
       } else {
-         for (BrewingRecipeRegistry.Recipe<Potion> lv : this.f_aruotgdf) {
-            if (lv.input.matches((Holder<Potion>)optional.get()) && lv.ingredient.test(arg2)) {
+         for (BrewingRecipeRegistry.Recipe<Potion> lv : this.potionRecipes) {
+            if (lv.input.matches((Holder<Potion>)optional.get()) && lv.ingredient.test(ingredient)) {
                return true;
             }
          }
@@ -160,188 +167,200 @@
     * @mapping {@literal hashed m_cwnwpxhs Lnet/minecraft/unmapped/C_ilssplzn;m_cwnwpxhs(Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_sddaxwyk;}
     * @mapping {@literal named craft Lnet/minecraft/recipe/BrewingRecipeRegistry;craft(Lnet/minecraft/item/ItemStack;Lnet/minecraft/item/ItemStack;)Lnet/minecraft/item/ItemStack;}
     */
-   public ItemStack craft(ItemStack input, ItemStack arg2) {
-      if (arg2.isEmpty()) {
-         return arg2;
+   public ItemStack craft(ItemStack ingredient, ItemStack input) {
+      if (input.isEmpty()) {
+         return input;
       } else {
-         Optional<Holder<Potion>> optional = arg2.getOrDefault(DataComponentTypes.POTION_CONTENTS, PotionContentsComponent.DEFAULT).potion();
+         Optional<Holder<Potion>> optional = input.getOrDefault(DataComponentTypes.POTION_CONTENTS, PotionContentsComponent.DEFAULT).potion();
          if (optional.isEmpty()) {
-            return arg2;
+            return input;
          } else {
-            for (BrewingRecipeRegistry.Recipe<Item> lv : this.f_dhquiuxe) {
-               if (arg2.matches(lv.input) && lv.ingredient.test(input)) {
+            for (BrewingRecipeRegistry.Recipe<Item> lv : this.itemRecipes) {
+               if (input.matches(lv.input) && lv.ingredient.test(ingredient)) {
                   return PotionContentsComponent.createStack(lv.output.value(), (Holder<Potion>)optional.get());
                }
             }
 
-            for (BrewingRecipeRegistry.Recipe<Potion> lv2 : this.f_aruotgdf) {
-               if (lv2.input.matches((Holder<Potion>)optional.get()) && lv2.ingredient.test(input)) {
-                  return PotionContentsComponent.createStack(arg2.getItem(), lv2.output);
-               }
-            }
-
-            return arg2;
+            for (BrewingRecipeRegistry.Recipe<Potion> lv2 : this.potionRecipes) {
+               if (lv2.input.matches((Holder<Potion>)optional.get()) && lv2.ingredient.test(ingredient)) {
+                  return PotionContentsComponent.createStack(input.getItem(), lv2.output);
+               }
+            }
+
+            return input;
          }
       }
    }
 
    /**
-    * Mapping not found
-    */
-   public static BrewingRecipeRegistry m_bwccxzca(FeatureFlagBitSet arg) {
-      BrewingRecipeRegistry.C_anvszzom lv = new BrewingRecipeRegistry.C_anvszzom(arg);
-      m_cugqmywj(lv);
-      return lv.m_ilqhdtus();
-   }
-
-   /**
-    * Mapping not found
-    */
-   public static void m_cugqmywj(BrewingRecipeRegistry.C_anvszzom arg) {
-      arg.m_pdipybln(Items.POTION);
-      arg.m_pdipybln(Items.SPLASH_POTION);
-      arg.m_pdipybln(Items.LINGERING_POTION);
-      arg.m_kjbtjqbn(Items.POTION, Items.GUNPOWDER, Items.SPLASH_POTION);
-      arg.m_kjbtjqbn(Items.SPLASH_POTION, Items.DRAGON_BREATH, Items.LINGERING_POTION);
-      arg.m_sieojnmp(Potions.WATER, Items.GLOWSTONE_DUST, Potions.THICK);
-      arg.m_sieojnmp(Potions.WATER, Items.REDSTONE, Potions.MUNDANE);
-      arg.m_sieojnmp(Potions.WATER, Items.NETHER_WART, Potions.AWKWARD);
-      arg.m_omxvxkhk(Items.BREEZE_ROD, Potions.WIND_CHARGED);
-      arg.m_omxvxkhk(Items.SLIME_BLOCK, Potions.OOZING);
-      arg.m_omxvxkhk(Items.STONE, Potions.INFESTED);
-      arg.m_omxvxkhk(Items.COBWEB, Potions.WEAVING);
-      arg.m_sieojnmp(Potions.AWKWARD, Items.GOLDEN_CARROT, Potions.NIGHT_VISION);
-      arg.m_sieojnmp(Potions.NIGHT_VISION, Items.REDSTONE, Potions.LONG_NIGHT_VISION);
-      arg.m_sieojnmp(Potions.NIGHT_VISION, Items.FERMENTED_SPIDER_EYE, Potions.INVISIBILITY);
-      arg.m_sieojnmp(Potions.LONG_NIGHT_VISION, Items.FERMENTED_SPIDER_EYE, Potions.LONG_INVISIBILITY);
-      arg.m_sieojnmp(Potions.INVISIBILITY, Items.REDSTONE, Potions.LONG_INVISIBILITY);
-      arg.m_omxvxkhk(Items.MAGMA_CREAM, Potions.FIRE_RESISTANCE);
-      arg.m_sieojnmp(Potions.FIRE_RESISTANCE, Items.REDSTONE, Potions.LONG_FIRE_RESISTANCE);
-      arg.m_omxvxkhk(Items.RABBIT_FOOT, Potions.LEAPING);
-      arg.m_sieojnmp(Potions.LEAPING, Items.REDSTONE, Potions.LONG_LEAPING);
-      arg.m_sieojnmp(Potions.LEAPING, Items.GLOWSTONE_DUST, Potions.STRONG_LEAPING);
-      arg.m_sieojnmp(Potions.LEAPING, Items.FERMENTED_SPIDER_EYE, Potions.SLOWNESS);
-      arg.m_sieojnmp(Potions.LONG_LEAPING, Items.FERMENTED_SPIDER_EYE, Potions.LONG_SLOWNESS);
-      arg.m_sieojnmp(Potions.SLOWNESS, Items.REDSTONE, Potions.LONG_SLOWNESS);
-      arg.m_sieojnmp(Potions.SLOWNESS, Items.GLOWSTONE_DUST, Potions.STRONG_SLOWNESS);
-      arg.m_sieojnmp(Potions.AWKWARD, Items.TURTLE_HELMET, Potions.TURTLE_MASTER);
-      arg.m_sieojnmp(Potions.TURTLE_MASTER, Items.REDSTONE, Potions.LONG_TURTLE_MASTER);
-      arg.m_sieojnmp(Potions.TURTLE_MASTER, Items.GLOWSTONE_DUST, Potions.STRONG_TURTLE_MASTER);
-      arg.m_sieojnmp(Potions.SWIFTNESS, Items.FERMENTED_SPIDER_EYE, Potions.SLOWNESS);
-      arg.m_sieojnmp(Potions.LONG_SWIFTNESS, Items.FERMENTED_SPIDER_EYE, Potions.LONG_SLOWNESS);
-      arg.m_omxvxkhk(Items.SUGAR, Potions.SWIFTNESS);
-      arg.m_sieojnmp(Potions.SWIFTNESS, Items.REDSTONE, Potions.LONG_SWIFTNESS);
-      arg.m_sieojnmp(Potions.SWIFTNESS, Items.GLOWSTONE_DUST, Potions.STRONG_SWIFTNESS);
-      arg.m_sieojnmp(Potions.AWKWARD, Items.PUFFERFISH, Potions.WATER_BREATHING);
-      arg.m_sieojnmp(Potions.WATER_BREATHING, Items.REDSTONE, Potions.LONG_WATER_BREATHING);
-      arg.m_omxvxkhk(Items.GLISTERING_MELON_SLICE, Potions.HEALING);
-      arg.m_sieojnmp(Potions.HEALING, Items.GLOWSTONE_DUST, Potions.STRONG_HEALING);
-      arg.m_sieojnmp(Potions.HEALING, Items.FERMENTED_SPIDER_EYE, Potions.HARMING);
-      arg.m_sieojnmp(Potions.STRONG_HEALING, Items.FERMENTED_SPIDER_EYE, Potions.STRONG_HARMING);
-      arg.m_sieojnmp(Potions.HARMING, Items.GLOWSTONE_DUST, Potions.STRONG_HARMING);
-      arg.m_sieojnmp(Potions.POISON, Items.FERMENTED_SPIDER_EYE, Potions.HARMING);
-      arg.m_sieojnmp(Potions.LONG_POISON, Items.FERMENTED_SPIDER_EYE, Potions.HARMING);
-      arg.m_sieojnmp(Potions.STRONG_POISON, Items.FERMENTED_SPIDER_EYE, Potions.STRONG_HARMING);
-      arg.m_omxvxkhk(Items.SPIDER_EYE, Potions.POISON);
-      arg.m_sieojnmp(Potions.POISON, Items.REDSTONE, Potions.LONG_POISON);
-      arg.m_sieojnmp(Potions.POISON, Items.GLOWSTONE_DUST, Potions.STRONG_POISON);
-      arg.m_omxvxkhk(Items.GHAST_TEAR, Potions.REGENERATION);
-      arg.m_sieojnmp(Potions.REGENERATION, Items.REDSTONE, Potions.LONG_REGENERATION);
-      arg.m_sieojnmp(Potions.REGENERATION, Items.GLOWSTONE_DUST, Potions.STRONG_REGENERATION);
-      arg.m_omxvxkhk(Items.BLAZE_POWDER, Potions.STRENGTH);
-      arg.m_sieojnmp(Potions.STRENGTH, Items.REDSTONE, Potions.LONG_STRENGTH);
-      arg.m_sieojnmp(Potions.STRENGTH, Items.GLOWSTONE_DUST, Potions.STRONG_STRENGTH);
-      arg.m_sieojnmp(Potions.WATER, Items.FERMENTED_SPIDER_EYE, Potions.WEAKNESS);
-      arg.m_sieojnmp(Potions.WEAKNESS, Items.REDSTONE, Potions.LONG_WEAKNESS);
-      arg.m_sieojnmp(Potions.AWKWARD, Items.PHANTOM_MEMBRANE, Potions.SLOW_FALLING);
-      arg.m_sieojnmp(Potions.SLOW_FALLING, Items.REDSTONE, Potions.LONG_SLOW_FALLING);
+    * @mapping {@literal hashed m_bwccxzca Lnet/minecraft/unmapped/C_ilssplzn;m_bwccxzca(Lnet/minecraft/unmapped/C_czxxrbcp;)Lnet/minecraft/unmapped/C_ilssplzn;}
+    * @mapping {@literal named create Lnet/minecraft/recipe/BrewingRecipeRegistry;create(Lnet/minecraft/feature_flags/FeatureFlagBitSet;)Lnet/minecraft/recipe/BrewingRecipeRegistry;}
+    */
+   public static BrewingRecipeRegistry create(FeatureFlagBitSet features) {
+      BrewingRecipeRegistry.Builder lv = new BrewingRecipeRegistry.Builder(features);
+      registerDefaults(lv);
+      return lv.build();
+   }
+
+   /**
+    * @mapping {@literal hashed m_cugqmywj Lnet/minecraft/unmapped/C_ilssplzn;m_cugqmywj(Lnet/minecraft/unmapped/C_ilssplzn$C_anvszzom;)V}
+    * @mapping {@literal named registerDefaults Lnet/minecraft/recipe/BrewingRecipeRegistry;registerDefaults(Lnet/minecraft/recipe/BrewingRecipeRegistry$Builder;)V}
+    */
+   public static void registerDefaults(BrewingRecipeRegistry.Builder builder) {
+      builder.registerPotionType(Items.POTION);
+      builder.registerPotionType(Items.SPLASH_POTION);
+      builder.registerPotionType(Items.LINGERING_POTION);
+      builder.registerItemRecipe(Items.POTION, Items.GUNPOWDER, Items.SPLASH_POTION);
+      builder.registerItemRecipe(Items.SPLASH_POTION, Items.DRAGON_BREATH, Items.LINGERING_POTION);
+      builder.registerPotionRecipe(Potions.WATER, Items.GLOWSTONE_DUST, Potions.THICK);
+      builder.registerPotionRecipe(Potions.WATER, Items.REDSTONE, Potions.MUNDANE);
+      builder.registerPotionRecipe(Potions.WATER, Items.NETHER_WART, Potions.AWKWARD);
+      builder.registerRecipes(Items.BREEZE_ROD, Potions.WIND_CHARGED);
+      builder.registerRecipes(Items.SLIME_BLOCK, Potions.OOZING);
+      builder.registerRecipes(Items.STONE, Potions.INFESTED);
+      builder.registerRecipes(Items.COBWEB, Potions.WEAVING);
+      builder.registerPotionRecipe(Potions.AWKWARD, Items.GOLDEN_CARROT, Potions.NIGHT_VISION);
+      builder.registerPotionRecipe(Potions.NIGHT_VISION, Items.REDSTONE, Potions.LONG_NIGHT_VISION);
+      builder.registerPotionRecipe(Potions.NIGHT_VISION, Items.FERMENTED_SPIDER_EYE, Potions.INVISIBILITY);
+      builder.registerPotionRecipe(Potions.LONG_NIGHT_VISION, Items.FERMENTED_SPIDER_EYE, Potions.LONG_INVISIBILITY);
+      builder.registerPotionRecipe(Potions.INVISIBILITY, Items.REDSTONE, Potions.LONG_INVISIBILITY);
+      builder.registerRecipes(Items.MAGMA_CREAM, Potions.FIRE_RESISTANCE);
+      builder.registerPotionRecipe(Potions.FIRE_RESISTANCE, Items.REDSTONE, Potions.LONG_FIRE_RESISTANCE);
+      builder.registerRecipes(Items.RABBIT_FOOT, Potions.LEAPING);
+      builder.registerPotionRecipe(Potions.LEAPING, Items.REDSTONE, Potions.LONG_LEAPING);
+      builder.registerPotionRecipe(Potions.LEAPING, Items.GLOWSTONE_DUST, Potions.STRONG_LEAPING);
+      builder.registerPotionRecipe(Potions.LEAPING, Items.FERMENTED_SPIDER_EYE, Potions.SLOWNESS);
+      builder.registerPotionRecipe(Potions.LONG_LEAPING, Items.FERMENTED_SPIDER_EYE, Potions.LONG_SLOWNESS);
+      builder.registerPotionRecipe(Potions.SLOWNESS, Items.REDSTONE, Potions.LONG_SLOWNESS);
+      builder.registerPotionRecipe(Potions.SLOWNESS, Items.GLOWSTONE_DUST, Potions.STRONG_SLOWNESS);
+      builder.registerPotionRecipe(Potions.AWKWARD, Items.TURTLE_HELMET, Potions.TURTLE_MASTER);
+      builder.registerPotionRecipe(Potions.TURTLE_MASTER, Items.REDSTONE, Potions.LONG_TURTLE_MASTER);
+      builder.registerPotionRecipe(Potions.TURTLE_MASTER, Items.GLOWSTONE_DUST, Potions.STRONG_TURTLE_MASTER);
+      builder.registerPotionRecipe(Potions.SWIFTNESS, Items.FERMENTED_SPIDER_EYE, Potions.SLOWNESS);
+      builder.registerPotionRecipe(Potions.LONG_SWIFTNESS, Items.FERMENTED_SPIDER_EYE, Potions.LONG_SLOWNESS);
+      builder.registerRecipes(Items.SUGAR, Potions.SWIFTNESS);
+      builder.registerPotionRecipe(Potions.SWIFTNESS, Items.REDSTONE, Potions.LONG_SWIFTNESS);
+      builder.registerPotionRecipe(Potions.SWIFTNESS, Items.GLOWSTONE_DUST, Potions.STRONG_SWIFTNESS);
+      builder.registerPotionRecipe(Potions.AWKWARD, Items.PUFFERFISH, Potions.WATER_BREATHING);
+      builder.registerPotionRecipe(Potions.WATER_BREATHING, Items.REDSTONE, Potions.LONG_WATER_BREATHING);
+      builder.registerRecipes(Items.GLISTERING_MELON_SLICE, Potions.HEALING);
+      builder.registerPotionRecipe(Potions.HEALING, Items.GLOWSTONE_DUST, Potions.STRONG_HEALING);
+      builder.registerPotionRecipe(Potions.HEALING, Items.FERMENTED_SPIDER_EYE, Potions.HARMING);
+      builder.registerPotionRecipe(Potions.STRONG_HEALING, Items.FERMENTED_SPIDER_EYE, Potions.STRONG_HARMING);
+      builder.registerPotionRecipe(Potions.HARMING, Items.GLOWSTONE_DUST, Potions.STRONG_HARMING);
+      builder.registerPotionRecipe(Potions.POISON, Items.FERMENTED_SPIDER_EYE, Potions.HARMING);
+      builder.registerPotionRecipe(Potions.LONG_POISON, Items.FERMENTED_SPIDER_EYE, Potions.HARMING);
+      builder.registerPotionRecipe(Potions.STRONG_POISON, Items.FERMENTED_SPIDER_EYE, Potions.STRONG_HARMING);
+      builder.registerRecipes(Items.SPIDER_EYE, Potions.POISON);
+      builder.registerPotionRecipe(Potions.POISON, Items.REDSTONE, Potions.LONG_POISON);
+      builder.registerPotionRecipe(Potions.POISON, Items.GLOWSTONE_DUST, Potions.STRONG_POISON);
+      builder.registerRecipes(Items.GHAST_TEAR, Potions.REGENERATION);
+      builder.registerPotionRecipe(Potions.REGENERATION, Items.REDSTONE, Potions.LONG_REGENERATION);
+      builder.registerPotionRecipe(Potions.REGENERATION, Items.GLOWSTONE_DUST, Potions.STRONG_REGENERATION);
+      builder.registerRecipes(Items.BLAZE_POWDER, Potions.STRENGTH);
+      builder.registerPotionRecipe(Potions.STRENGTH, Items.REDSTONE, Potions.LONG_STRENGTH);
+      builder.registerPotionRecipe(Potions.STRENGTH, Items.GLOWSTONE_DUST, Potions.STRONG_STRENGTH);
+      builder.registerPotionRecipe(Potions.WATER, Items.FERMENTED_SPIDER_EYE, Potions.WEAKNESS);
+      builder.registerPotionRecipe(Potions.WEAKNESS, Items.REDSTONE, Potions.LONG_WEAKNESS);
+      builder.registerPotionRecipe(Potions.AWKWARD, Items.PHANTOM_MEMBRANE, Potions.SLOW_FALLING);
+      builder.registerPotionRecipe(Potions.SLOW_FALLING, Items.REDSTONE, Potions.LONG_SLOW_FALLING);
    }
 
    /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_ilssplzn$C_anvszzom}
-    * @mapping {@literal named net/minecraft/recipe/BrewingRecipeRegistry$C_anvszzom}
+    * @mapping {@literal named net/minecraft/recipe/BrewingRecipeRegistry$Builder}
     */
-   public static class C_anvszzom {
+   public static class Builder {
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_cumxoxtw Lnet/minecraft/unmapped/C_ilssplzn$C_anvszzom;f_cumxoxtw:Ljava/util/List;}
+       * @mapping {@literal named potionTypes Lnet/minecraft/recipe/BrewingRecipeRegistry$Builder;potionTypes:Ljava/util/List;}
        */
-      private final List<Ingredient> f_cumxoxtw = new ArrayList();
+      private final List<Ingredient> potionTypes = new ArrayList();
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_qqsssiby Lnet/minecraft/unmapped/C_ilssplzn$C_anvszzom;f_qqsssiby:Ljava/util/List;}
+       * @mapping {@literal named potionRecipes Lnet/minecraft/recipe/BrewingRecipeRegistry$Builder;potionRecipes:Ljava/util/List;}
        */
-      private final List<BrewingRecipeRegistry.Recipe<Potion>> f_qqsssiby = new ArrayList();
+      private final List<BrewingRecipeRegistry.Recipe<Potion>> potionRecipes = new ArrayList();
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_exnloijq Lnet/minecraft/unmapped/C_ilssplzn$C_anvszzom;f_exnloijq:Ljava/util/List;}
+       * @mapping {@literal named itemRecipes Lnet/minecraft/recipe/BrewingRecipeRegistry$Builder;itemRecipes:Ljava/util/List;}
        */
-      private final List<BrewingRecipeRegistry.Recipe<Item>> f_exnloijq = new ArrayList();
+      private final List<BrewingRecipeRegistry.Recipe<Item>> itemRecipes = new ArrayList();
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_szfgeigs Lnet/minecraft/unmapped/C_ilssplzn$C_anvszzom;f_szfgeigs:Lnet/minecraft/unmapped/C_czxxrbcp;}
+       * @mapping {@literal named features Lnet/minecraft/recipe/BrewingRecipeRegistry$Builder;features:Lnet/minecraft/feature_flags/FeatureFlagBitSet;}
        */
-      private final FeatureFlagBitSet f_szfgeigs;
+      private final FeatureFlagBitSet features;
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_ilssplzn$C_anvszzom;<init>(Lnet/minecraft/unmapped/C_czxxrbcp;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/recipe/BrewingRecipeRegistry$Builder;<init>(Lnet/minecraft/feature_flags/FeatureFlagBitSet;)V}
        */
-      public C_anvszzom(FeatureFlagBitSet arg) {
-         this.f_szfgeigs = arg;
+      public Builder(FeatureFlagBitSet features) {
+         this.features = features;
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_uovaqaoc Lnet/minecraft/unmapped/C_ilssplzn$C_anvszzom;m_uovaqaoc(Lnet/minecraft/unmapped/C_vorddnax;)V}
+       * @mapping {@literal named assertIsPotion Lnet/minecraft/recipe/BrewingRecipeRegistry$Builder;assertIsPotion(Lnet/minecraft/item/Item;)V}
        */
-      private static void m_uovaqaoc(Item arg) {
-         if (!(arg instanceof PotionItem)) {
-            throw new IllegalArgumentException("Expected a potion, got: " + Registries.ITEM.getId(arg));
+      private static void assertIsPotion(Item potion) {
+         if (!(potion instanceof PotionItem)) {
+            throw new IllegalArgumentException("Expected a potion, got: " + Registries.ITEM.getId(potion));
          }
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_kjbtjqbn Lnet/minecraft/unmapped/C_ilssplzn$C_anvszzom;m_kjbtjqbn(Lnet/minecraft/unmapped/C_vorddnax;Lnet/minecraft/unmapped/C_vorddnax;Lnet/minecraft/unmapped/C_vorddnax;)V}
+       * @mapping {@literal named registerItemRecipe Lnet/minecraft/recipe/BrewingRecipeRegistry$Builder;registerItemRecipe(Lnet/minecraft/item/Item;Lnet/minecraft/item/Item;Lnet/minecraft/item/Item;)V}
        */
-      public void m_kjbtjqbn(Item arg, Item arg2, Item arg3) {
-         if (arg.enabledIn(this.f_szfgeigs) && arg2.enabledIn(this.f_szfgeigs) && arg3.enabledIn(this.f_szfgeigs)) {
-            m_uovaqaoc(arg);
-            m_uovaqaoc(arg3);
-            this.f_exnloijq.add(new BrewingRecipeRegistry.Recipe<>(arg.getBuiltInRegistryHolder(), Ingredient.ofItems(arg2), arg3.getBuiltInRegistryHolder()));
+      public void registerItemRecipe(Item input, Item ingredient, Item output) {
+         if (input.enabledIn(this.features) && ingredient.enabledIn(this.features) && output.enabledIn(this.features)) {
+            assertIsPotion(input);
+            assertIsPotion(output);
+            this.itemRecipes
+               .add(new BrewingRecipeRegistry.Recipe<>(input.getBuiltInRegistryHolder(), Ingredient.ofItems(ingredient), output.getBuiltInRegistryHolder()));
          }
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_pdipybln Lnet/minecraft/unmapped/C_ilssplzn$C_anvszzom;m_pdipybln(Lnet/minecraft/unmapped/C_vorddnax;)V}
+       * @mapping {@literal named registerPotionType Lnet/minecraft/recipe/BrewingRecipeRegistry$Builder;registerPotionType(Lnet/minecraft/item/Item;)V}
        */
-      public void m_pdipybln(Item arg) {
-         if (arg.enabledIn(this.f_szfgeigs)) {
-            m_uovaqaoc(arg);
-            this.f_cumxoxtw.add(Ingredient.ofItems(arg));
+      public void registerPotionType(Item potion) {
+         if (potion.enabledIn(this.features)) {
+            assertIsPotion(potion);
+            this.potionTypes.add(Ingredient.ofItems(potion));
          }
       }
 
       /**
        * @mapping {@literal hashed m_sieojnmp Lnet/minecraft/unmapped/C_ilssplzn$C_anvszzom;m_sieojnmp(Lnet/minecraft/unmapped/C_cjzoxshv;Lnet/minecraft/unmapped/C_vorddnax;Lnet/minecraft/unmapped/C_cjzoxshv;)V}
-       * @mapping {@literal named m_sieojnmp Lnet/minecraft/recipe/BrewingRecipeRegistry$C_anvszzom;m_sieojnmp(Lnet/minecraft/registry/Holder;Lnet/minecraft/item/Item;Lnet/minecraft/registry/Holder;)V}
+       * @mapping {@literal named registerPotionRecipe Lnet/minecraft/recipe/BrewingRecipeRegistry$Builder;registerPotionRecipe(Lnet/minecraft/registry/Holder;Lnet/minecraft/item/Item;Lnet/minecraft/registry/Holder;)V}
        */
-      public void m_sieojnmp(Holder<Potion> input, Item arg2, Holder<Potion> output) {
-         if (input.value().enabledIn(this.f_szfgeigs) && arg2.enabledIn(this.f_szfgeigs) && output.value().enabledIn(this.f_szfgeigs)) {
-            this.f_qqsssiby.add(new BrewingRecipeRegistry.Recipe<>(input, Ingredient.ofItems(arg2), output));
+      public void registerPotionRecipe(Holder<Potion> input, Item ingredient, Holder<Potion> output) {
+         if (input.value().enabledIn(this.features) && ingredient.enabledIn(this.features) && output.value().enabledIn(this.features)) {
+            this.potionRecipes.add(new BrewingRecipeRegistry.Recipe<>(input, Ingredient.ofItems(ingredient), output));
          }
       }
 
       /**
        * @mapping {@literal hashed m_omxvxkhk Lnet/minecraft/unmapped/C_ilssplzn$C_anvszzom;m_omxvxkhk(Lnet/minecraft/unmapped/C_vorddnax;Lnet/minecraft/unmapped/C_cjzoxshv;)V}
-       * @mapping {@literal named m_omxvxkhk Lnet/minecraft/recipe/BrewingRecipeRegistry$C_anvszzom;m_omxvxkhk(Lnet/minecraft/item/Item;Lnet/minecraft/registry/Holder;)V}
+       * @mapping {@literal named registerRecipes Lnet/minecraft/recipe/BrewingRecipeRegistry$Builder;registerRecipes(Lnet/minecraft/item/Item;Lnet/minecraft/registry/Holder;)V}
        */
-      public void m_omxvxkhk(Item arg, Holder<Potion> output) {
-         if (output.value().enabledIn(this.f_szfgeigs)) {
-            this.m_sieojnmp(Potions.WATER, arg, Potions.MUNDANE);
-            this.m_sieojnmp(Potions.AWKWARD, arg, output);
+      public void registerRecipes(Item ingredient, Holder<Potion> output) {
+         if (output.value().enabledIn(this.features)) {
+            this.registerPotionRecipe(Potions.WATER, ingredient, Potions.MUNDANE);
+            this.registerPotionRecipe(Potions.AWKWARD, ingredient, output);
          }
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_ilqhdtus Lnet/minecraft/unmapped/C_ilssplzn$C_anvszzom;m_ilqhdtus()Lnet/minecraft/unmapped/C_ilssplzn;}
+       * @mapping {@literal named build Lnet/minecraft/recipe/BrewingRecipeRegistry$Builder;build()Lnet/minecraft/recipe/BrewingRecipeRegistry;}
        */
-      public BrewingRecipeRegistry m_ilqhdtus() {
-         return new BrewingRecipeRegistry(List.copyOf(this.f_cumxoxtw), List.copyOf(this.f_qqsssiby), List.copyOf(this.f_exnloijq));
+      public BrewingRecipeRegistry build() {
+         return new BrewingRecipeRegistry(List.copyOf(this.potionTypes), List.copyOf(this.potionRecipes), List.copyOf(this.itemRecipes));
       }
    }
 
Only in namedSrc/net/minecraft/recipe: CraftingRecipeInput.java
diff -bur namedTargetSrc/net/minecraft/recipe/CraftingRecipe.java namedSrc/net/minecraft/recipe/CraftingRecipe.java
--- namedTargetSrc/net/minecraft/recipe/CraftingRecipe.java	2024-05-29 02:40:39.249173405 +0000
+++ namedSrc/net/minecraft/recipe/CraftingRecipe.java	2024-05-29 02:39:30.273413415 +0000
@@ -1,12 +1,10 @@
 package net.minecraft.recipe;
 
-import net.minecraft.unmapped.C_euomljmv;
-
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_pvphvxig}
  * @mapping {@literal named net/minecraft/recipe/CraftingRecipe}
  */
-public interface CraftingRecipe extends Recipe<C_euomljmv> {
+public interface CraftingRecipe extends Recipe<CraftingRecipeInput> {
    /**
     * Mapping not found
     */
diff -bur namedTargetSrc/net/minecraft/recipe/CuttingRecipe.java namedSrc/net/minecraft/recipe/CuttingRecipe.java
--- namedTargetSrc/net/minecraft/recipe/CuttingRecipe.java	2024-05-29 02:40:39.305173149 +0000
+++ namedSrc/net/minecraft/recipe/CuttingRecipe.java	2024-05-29 02:39:30.357413107 +0000
@@ -8,7 +8,6 @@
 import net.minecraft.network.codec.PacketCodec;
 import net.minecraft.network.codec.PacketCodecs;
 import net.minecraft.registry.HolderLookup;
-import net.minecraft.unmapped.C_hsoxiypb;
 import net.minecraft.util.collection.DefaultedList;
 
 /**
@@ -18,7 +17,7 @@
  * @mapping {@literal hashed net/minecraft/unmapped/C_ziizojwa}
  * @mapping {@literal named net/minecraft/recipe/CuttingRecipe}
  */
-public abstract class CuttingRecipe implements Recipe<C_hsoxiypb> {
+public abstract class CuttingRecipe implements Recipe<SingleStackRecipeInput> {
    /**
     * @mapping {@literal hashed f_vebxlouq Lnet/minecraft/unmapped/C_ziizojwa;f_vebxlouq:Lnet/minecraft/unmapped/C_tcpsydrv;}
     * @mapping {@literal named ingredient Lnet/minecraft/recipe/CuttingRecipe;ingredient:Lnet/minecraft/recipe/Ingredient;}
@@ -85,7 +84,7 @@
     * Mapping not found
     */
    @Override
-   public ItemStack getResult(HolderLookup.Provider arg) {
+   public ItemStack getResult(HolderLookup.Provider lookupProvider) {
       return this.result;
    }
 
@@ -109,9 +108,9 @@
 
    /**
     * @mapping {@literal hashed m_xyefcsus Lnet/minecraft/unmapped/C_ziizojwa;m_xyefcsus(Lnet/minecraft/unmapped/C_hsoxiypb;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_sddaxwyk;}
-    * @mapping {@literal named craft Lnet/minecraft/recipe/CuttingRecipe;craft(Lnet/minecraft/unmapped/C_hsoxiypb;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/item/ItemStack;}
+    * @mapping {@literal named craft Lnet/minecraft/recipe/CuttingRecipe;craft(Lnet/minecraft/recipe/SingleStackRecipeInput;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/item/ItemStack;}
     */
-   public ItemStack craft(C_hsoxiypb arg, HolderLookup.Provider arg2) {
+   public ItemStack craft(SingleStackRecipeInput arg, HolderLookup.Provider arg2) {
       return this.result.copy();
    }
 
diff -bur namedTargetSrc/net/minecraft/recipe/DecoratedPotRecipe.java namedSrc/net/minecraft/recipe/DecoratedPotRecipe.java
--- namedTargetSrc/net/minecraft/recipe/DecoratedPotRecipe.java	2024-05-29 02:40:39.325173058 +0000
+++ namedSrc/net/minecraft/recipe/DecoratedPotRecipe.java	2024-05-29 02:39:30.381413019 +0000
@@ -6,7 +6,6 @@
 import net.minecraft.item.Items;
 import net.minecraft.registry.HolderLookup;
 import net.minecraft.registry.tag.ItemTags;
-import net.minecraft.unmapped.C_euomljmv;
 import net.minecraft.world.World;
 
 /**
@@ -22,15 +21,15 @@
    }
 
    /**
-    * @mapping {@literal hashed m_jjsxdttb Lnet/minecraft/unmapped/C_wcabtfez;m_jjsxdttb(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/unmapped/C_cdctfzbn;)Z}
-    * @mapping {@literal named m_jjsxdttb Lnet/minecraft/recipe/DecoratedPotRecipe;m_jjsxdttb(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/world/World;)Z}
+    * @mapping {@literal hashed m_suwttirf Lnet/minecraft/unmapped/C_wcabtfez;m_suwttirf(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/unmapped/C_cdctfzbn;)Z}
+    * @mapping {@literal named matches Lnet/minecraft/recipe/DecoratedPotRecipe;matches(Lnet/minecraft/recipe/CraftingRecipeInput;Lnet/minecraft/world/World;)Z}
     */
-   public boolean m_jjsxdttb(C_euomljmv arg, World world) {
-      if (!this.fits(arg.m_dhcnljxm(), arg.m_plfjjrel())) {
+   public boolean matches(CraftingRecipeInput arg, World world) {
+      if (!this.fits(arg.getWidth(), arg.getHeight())) {
          return false;
       } else {
-         for (int i = 0; i < arg.m_gptaeput(); i++) {
-            ItemStack lv = arg.m_hhjzrppb(i);
+         for (int i = 0; i < arg.size(); i++) {
+            ItemStack lv = arg.getStack(i);
             switch (i) {
                case 1:
                case 3:
@@ -56,10 +55,10 @@
 
    /**
     * @mapping {@literal hashed m_dpqqqjvi Lnet/minecraft/unmapped/C_wcabtfez;m_dpqqqjvi(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_sddaxwyk;}
-    * @mapping {@literal named craft Lnet/minecraft/recipe/DecoratedPotRecipe;craft(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/item/ItemStack;}
+    * @mapping {@literal named craft Lnet/minecraft/recipe/DecoratedPotRecipe;craft(Lnet/minecraft/recipe/CraftingRecipeInput;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/item/ItemStack;}
     */
-   public ItemStack craft(C_euomljmv arg, HolderLookup.Provider arg2) {
-      Sherds lv = new Sherds(arg.m_hhjzrppb(1).getItem(), arg.m_hhjzrppb(3).getItem(), arg.m_hhjzrppb(5).getItem(), arg.m_hhjzrppb(7).getItem());
+   public ItemStack craft(CraftingRecipeInput arg, HolderLookup.Provider arg2) {
+      Sherds lv = new Sherds(arg.getStack(1).getItem(), arg.getStack(3).getItem(), arg.getStack(5).getItem(), arg.getStack(7).getItem());
       return DecoratedPotBlockEntity.m_qjeeptjd(lv);
    }
 
diff -bur namedTargetSrc/net/minecraft/recipe/FireworkRocketRecipe.java namedSrc/net/minecraft/recipe/FireworkRocketRecipe.java
--- namedTargetSrc/net/minecraft/recipe/FireworkRocketRecipe.java	2024-05-29 02:40:39.229173496 +0000
+++ namedSrc/net/minecraft/recipe/FireworkRocketRecipe.java	2024-05-29 02:39:30.249413503 +0000
@@ -8,7 +8,6 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import net.minecraft.registry.HolderLookup;
-import net.minecraft.unmapped.C_euomljmv;
 import net.minecraft.world.World;
 
 /**
@@ -40,15 +39,15 @@
    }
 
    /**
-    * @mapping {@literal hashed m_jjsxdttb Lnet/minecraft/unmapped/C_hubnseit;m_jjsxdttb(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/unmapped/C_cdctfzbn;)Z}
-    * @mapping {@literal named m_jjsxdttb Lnet/minecraft/recipe/FireworkRocketRecipe;m_jjsxdttb(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/world/World;)Z}
+    * @mapping {@literal hashed m_uhvbwfzg Lnet/minecraft/unmapped/C_hubnseit;m_uhvbwfzg(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/unmapped/C_cdctfzbn;)Z}
+    * @mapping {@literal named matches Lnet/minecraft/recipe/FireworkRocketRecipe;matches(Lnet/minecraft/recipe/CraftingRecipeInput;Lnet/minecraft/world/World;)Z}
     */
-   public boolean m_jjsxdttb(C_euomljmv arg, World world) {
+   public boolean matches(CraftingRecipeInput arg, World world) {
       boolean bl = false;
       int i = 0;
 
-      for (int j = 0; j < arg.m_gptaeput(); j++) {
-         ItemStack lv = arg.m_hhjzrppb(j);
+      for (int j = 0; j < arg.size(); j++) {
+         ItemStack lv = arg.getStack(j);
          if (!lv.isEmpty()) {
             if (PAPER.test(lv)) {
                if (bl) {
@@ -71,14 +70,14 @@
 
    /**
     * @mapping {@literal hashed m_gjdaerye Lnet/minecraft/unmapped/C_hubnseit;m_gjdaerye(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_sddaxwyk;}
-    * @mapping {@literal named craft Lnet/minecraft/recipe/FireworkRocketRecipe;craft(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/item/ItemStack;}
+    * @mapping {@literal named craft Lnet/minecraft/recipe/FireworkRocketRecipe;craft(Lnet/minecraft/recipe/CraftingRecipeInput;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/item/ItemStack;}
     */
-   public ItemStack craft(C_euomljmv arg, HolderLookup.Provider arg2) {
+   public ItemStack craft(CraftingRecipeInput arg, HolderLookup.Provider arg2) {
       List<FireworkExplosionComponent> list = new ArrayList();
       int i = 0;
 
-      for (int j = 0; j < arg.m_gptaeput(); j++) {
-         ItemStack lv = arg.m_hhjzrppb(j);
+      for (int j = 0; j < arg.size(); j++) {
+         ItemStack lv = arg.getStack(j);
          if (!lv.isEmpty()) {
             if (DURATION_MODIFIER.test(lv)) {
                i++;
@@ -108,7 +107,7 @@
     * Mapping not found
     */
    @Override
-   public ItemStack getResult(HolderLookup.Provider arg) {
+   public ItemStack getResult(HolderLookup.Provider lookupProvider) {
       return new ItemStack(Items.FIREWORK_ROCKET);
    }
 
diff -bur namedTargetSrc/net/minecraft/recipe/FireworkStarFadeRecipe.java namedSrc/net/minecraft/recipe/FireworkStarFadeRecipe.java
--- namedTargetSrc/net/minecraft/recipe/FireworkStarFadeRecipe.java	2024-05-29 02:40:39.245173423 +0000
+++ namedSrc/net/minecraft/recipe/FireworkStarFadeRecipe.java	2024-05-29 02:39:30.269413430 +0000
@@ -9,7 +9,6 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import net.minecraft.registry.HolderLookup;
-import net.minecraft.unmapped.C_euomljmv;
 import net.minecraft.world.World;
 
 /**
@@ -32,14 +31,14 @@
 
    /**
     * @mapping {@literal hashed m_hfznqoez Lnet/minecraft/unmapped/C_nzmfepck;m_hfznqoez(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/unmapped/C_cdctfzbn;)Z}
-    * @mapping {@literal named m_jjsxdttb Lnet/minecraft/recipe/FireworkStarFadeRecipe;m_jjsxdttb(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/world/World;)Z}
+    * @mapping {@literal named matches Lnet/minecraft/recipe/FireworkStarFadeRecipe;matches(Lnet/minecraft/recipe/CraftingRecipeInput;Lnet/minecraft/world/World;)Z}
     */
-   public boolean m_jjsxdttb(C_euomljmv arg, World world) {
+   public boolean matches(CraftingRecipeInput arg, World world) {
       boolean bl = false;
       boolean bl2 = false;
 
-      for (int i = 0; i < arg.m_gptaeput(); i++) {
-         ItemStack lv = arg.m_hhjzrppb(i);
+      for (int i = 0; i < arg.size(); i++) {
+         ItemStack lv = arg.getStack(i);
          if (!lv.isEmpty()) {
             if (lv.getItem() instanceof DyeItem) {
                bl = true;
@@ -62,14 +61,14 @@
 
    /**
     * @mapping {@literal hashed m_climrflf Lnet/minecraft/unmapped/C_nzmfepck;m_climrflf(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_sddaxwyk;}
-    * @mapping {@literal named craft Lnet/minecraft/recipe/FireworkStarFadeRecipe;craft(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/item/ItemStack;}
+    * @mapping {@literal named craft Lnet/minecraft/recipe/FireworkStarFadeRecipe;craft(Lnet/minecraft/recipe/CraftingRecipeInput;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/item/ItemStack;}
     */
-   public ItemStack craft(C_euomljmv arg, HolderLookup.Provider arg2) {
+   public ItemStack craft(CraftingRecipeInput arg, HolderLookup.Provider arg2) {
       IntList intList = new IntArrayList();
       ItemStack lv = null;
 
-      for (int i = 0; i < arg.m_gptaeput(); i++) {
-         ItemStack lv2 = arg.m_hhjzrppb(i);
+      for (int i = 0; i < arg.size(); i++) {
+         ItemStack lv2 = arg.getStack(i);
          Item lv3 = lv2.getItem();
          if (lv3 instanceof DyeItem) {
             intList.add(((DyeItem)lv3).getColor().getFireworkColor());
diff -bur namedTargetSrc/net/minecraft/recipe/FireworkStarRecipe.java namedSrc/net/minecraft/recipe/FireworkStarRecipe.java
--- namedTargetSrc/net/minecraft/recipe/FireworkStarRecipe.java	2024-05-29 02:40:39.189173678 +0000
+++ namedSrc/net/minecraft/recipe/FireworkStarRecipe.java	2024-05-29 02:39:30.201413678 +0000
@@ -11,7 +11,6 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import net.minecraft.registry.HolderLookup;
-import net.minecraft.unmapped.C_euomljmv;
 import net.minecraft.util.Util;
 import net.minecraft.world.World;
 
@@ -79,17 +78,17 @@
 
    /**
     * @mapping {@literal hashed m_ifbcxllh Lnet/minecraft/unmapped/C_opvqgusi;m_ifbcxllh(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/unmapped/C_cdctfzbn;)Z}
-    * @mapping {@literal named m_jjsxdttb Lnet/minecraft/recipe/FireworkStarRecipe;m_jjsxdttb(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/world/World;)Z}
+    * @mapping {@literal named matches Lnet/minecraft/recipe/FireworkStarRecipe;matches(Lnet/minecraft/recipe/CraftingRecipeInput;Lnet/minecraft/world/World;)Z}
     */
-   public boolean m_jjsxdttb(C_euomljmv arg, World world) {
+   public boolean matches(CraftingRecipeInput arg, World world) {
       boolean bl = false;
       boolean bl2 = false;
       boolean bl3 = false;
       boolean bl4 = false;
       boolean bl5 = false;
 
-      for (int i = 0; i < arg.m_gptaeput(); i++) {
-         ItemStack lv = arg.m_hhjzrppb(i);
+      for (int i = 0; i < arg.size(); i++) {
+         ItemStack lv = arg.getStack(i);
          if (!lv.isEmpty()) {
             if (TYPE_MODIFIER.test(lv)) {
                if (bl3) {
@@ -130,16 +129,16 @@
 
    /**
     * @mapping {@literal hashed m_kyglqppz Lnet/minecraft/unmapped/C_opvqgusi;m_kyglqppz(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_sddaxwyk;}
-    * @mapping {@literal named craft Lnet/minecraft/recipe/FireworkStarRecipe;craft(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/item/ItemStack;}
+    * @mapping {@literal named craft Lnet/minecraft/recipe/FireworkStarRecipe;craft(Lnet/minecraft/recipe/CraftingRecipeInput;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/item/ItemStack;}
     */
-   public ItemStack craft(C_euomljmv arg, HolderLookup.Provider arg2) {
+   public ItemStack craft(CraftingRecipeInput arg, HolderLookup.Provider arg2) {
       FireworkExplosionComponent.Shape lv = FireworkExplosionComponent.Shape.SMALL_BALL;
       boolean bl = false;
       boolean bl2 = false;
       IntList intList = new IntArrayList();
 
-      for (int i = 0; i < arg.m_gptaeput(); i++) {
-         ItemStack lv2 = arg.m_hhjzrppb(i);
+      for (int i = 0; i < arg.size(); i++) {
+         ItemStack lv2 = arg.getStack(i);
          if (!lv2.isEmpty()) {
             if (TYPE_MODIFIER.test(lv2)) {
                lv = (FireworkExplosionComponent.Shape)TYPE_MODIFIERS.get(lv2.getItem());
@@ -170,7 +169,7 @@
     * Mapping not found
     */
    @Override
-   public ItemStack getResult(HolderLookup.Provider arg) {
+   public ItemStack getResult(HolderLookup.Provider lookupProvider) {
       return new ItemStack(Items.FIREWORK_STAR);
    }
 
diff -bur namedTargetSrc/net/minecraft/recipe/InputSlotFiller.java namedSrc/net/minecraft/recipe/InputSlotFiller.java
--- namedTargetSrc/net/minecraft/recipe/InputSlotFiller.java	2024-05-29 02:40:39.337173004 +0000
+++ namedSrc/net/minecraft/recipe/InputSlotFiller.java	2024-05-29 02:39:30.397412961 +0000
@@ -10,18 +10,18 @@
 import net.minecraft.screen.AbstractRecipeScreenHandler;
 import net.minecraft.screen.slot.Slot;
 import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.unmapped.C_cxmcihwl;
 import org.jetbrains.annotations.Nullable;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_rqdekljo}
  * @mapping {@literal named net/minecraft/recipe/InputSlotFiller}
  */
-public class InputSlotFiller<I extends C_cxmcihwl, R extends Recipe<I>> implements RecipeGridAligner<Integer> {
+public class InputSlotFiller<I extends RecipeInput, R extends Recipe<I>> implements RecipeGridAligner<Integer> {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_tqmjruaz Lnet/minecraft/unmapped/C_rqdekljo;f_tqmjruaz:I}
+    * @mapping {@literal named ITEM_NOT_FOUND Lnet/minecraft/recipe/InputSlotFiller;ITEM_NOT_FOUND:I}
     */
-   private static final int f_tqmjruaz = -1;
+   private static final int ITEM_NOT_FOUND = -1;
    /**
     * @mapping {@literal hashed f_qrfjlbyk Lnet/minecraft/unmapped/C_rqdekljo;f_qrfjlbyk:Lnet/minecraft/unmapped/C_nyagoaau;}
     * @mapping {@literal named matcher Lnet/minecraft/recipe/InputSlotFiller;matcher:Lnet/minecraft/recipe/RecipeMatcher;}
@@ -129,16 +129,16 @@
 
    /**
     * @mapping {@literal hashed m_aofqgcvh Lnet/minecraft/unmapped/C_rqdekljo;m_aofqgcvh(Ljava/lang/Integer;IIII)V}
-    * @mapping {@literal named m_vnshednj Lnet/minecraft/recipe/InputSlotFiller;m_vnshednj(Ljava/lang/Integer;IIII)V}
+    * @mapping {@literal named acceptAlignedInput Lnet/minecraft/recipe/InputSlotFiller;acceptAlignedInput(Ljava/lang/Integer;IIII)V}
     */
-   public void m_vnshednj(Integer integer, int i, int j, int k, int l) {
+   public void acceptAlignedInput(Integer integer, int i, int j, int k, int l) {
       Slot lv = this.handler.getSlot(i);
       ItemStack lv2 = RecipeMatcher.getStackFromId(integer);
       if (!lv2.isEmpty()) {
          int m = j;
 
          while (m > 0) {
-            m = this.m_mnhwpoca(lv, lv2, m);
+            m = this.fillInputSlot(lv, lv2, m);
             if (m == -1) {
                return;
             }
@@ -176,30 +176,30 @@
 
    /**
     * @mapping {@literal hashed m_mnhwpoca Lnet/minecraft/unmapped/C_rqdekljo;m_mnhwpoca(Lnet/minecraft/unmapped/C_nhvqfffd;Lnet/minecraft/unmapped/C_sddaxwyk;I)I}
-    * @mapping {@literal named m_mnhwpoca Lnet/minecraft/recipe/InputSlotFiller;m_mnhwpoca(Lnet/minecraft/screen/slot/Slot;Lnet/minecraft/item/ItemStack;I)I}
+    * @mapping {@literal named fillInputSlot Lnet/minecraft/recipe/InputSlotFiller;fillInputSlot(Lnet/minecraft/screen/slot/Slot;Lnet/minecraft/item/ItemStack;I)I}
     */
-   protected int m_mnhwpoca(Slot arg, ItemStack stack, int i) {
+   protected int fillInputSlot(Slot slot, ItemStack stack, int amount) {
       int j = this.inventory.indexOf(stack);
       if (j == -1) {
          return -1;
       } else {
          ItemStack lv = this.inventory.getStack(j);
          int k;
-         if (i < lv.getCount()) {
-            this.inventory.removeStack(j, i);
-            k = i;
+         if (amount < lv.getCount()) {
+            this.inventory.removeStack(j, amount);
+            k = amount;
          } else {
             this.inventory.removeStack(j);
             k = lv.getCount();
          }
 
-         if (arg.getStack().isEmpty()) {
-            arg.setStack(lv.copyWithCount(k));
+         if (slot.getStack().isEmpty()) {
+            slot.setStack(lv.copyWithCount(k));
          } else {
-            arg.getStack().increment(k);
+            slot.getStack().increment(k);
          }
 
-         return i - k;
+         return amount - k;
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/recipe/MapCloningRecipe.java namedSrc/net/minecraft/recipe/MapCloningRecipe.java
--- namedTargetSrc/net/minecraft/recipe/MapCloningRecipe.java	2024-05-29 02:40:39.321173077 +0000
+++ namedSrc/net/minecraft/recipe/MapCloningRecipe.java	2024-05-29 02:39:30.373413049 +0000
@@ -3,7 +3,6 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import net.minecraft.registry.HolderLookup;
-import net.minecraft.unmapped.C_euomljmv;
 import net.minecraft.world.World;
 
 /**
@@ -20,14 +19,14 @@
 
    /**
     * @mapping {@literal hashed m_ducndpxk Lnet/minecraft/unmapped/C_adfeunnm;m_ducndpxk(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/unmapped/C_cdctfzbn;)Z}
-    * @mapping {@literal named m_jjsxdttb Lnet/minecraft/recipe/MapCloningRecipe;m_jjsxdttb(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/world/World;)Z}
+    * @mapping {@literal named matches Lnet/minecraft/recipe/MapCloningRecipe;matches(Lnet/minecraft/recipe/CraftingRecipeInput;Lnet/minecraft/world/World;)Z}
     */
-   public boolean m_jjsxdttb(C_euomljmv arg, World world) {
+   public boolean matches(CraftingRecipeInput arg, World world) {
       int i = 0;
       ItemStack lv = ItemStack.EMPTY;
 
-      for (int j = 0; j < arg.m_gptaeput(); j++) {
-         ItemStack lv2 = arg.m_hhjzrppb(j);
+      for (int j = 0; j < arg.size(); j++) {
+         ItemStack lv2 = arg.getStack(j);
          if (!lv2.isEmpty()) {
             if (lv2.isOf(Items.FILLED_MAP)) {
                if (!lv.isEmpty()) {
@@ -50,14 +49,14 @@
 
    /**
     * @mapping {@literal hashed m_bstzvvmv Lnet/minecraft/unmapped/C_adfeunnm;m_bstzvvmv(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_sddaxwyk;}
-    * @mapping {@literal named craft Lnet/minecraft/recipe/MapCloningRecipe;craft(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/item/ItemStack;}
+    * @mapping {@literal named craft Lnet/minecraft/recipe/MapCloningRecipe;craft(Lnet/minecraft/recipe/CraftingRecipeInput;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/item/ItemStack;}
     */
-   public ItemStack craft(C_euomljmv arg, HolderLookup.Provider arg2) {
+   public ItemStack craft(CraftingRecipeInput arg, HolderLookup.Provider arg2) {
       int i = 0;
       ItemStack lv = ItemStack.EMPTY;
 
-      for (int j = 0; j < arg.m_gptaeput(); j++) {
-         ItemStack lv2 = arg.m_hhjzrppb(j);
+      for (int j = 0; j < arg.size(); j++) {
+         ItemStack lv2 = arg.getStack(j);
          if (!lv2.isEmpty()) {
             if (lv2.isOf(Items.FILLED_MAP)) {
                if (!lv.isEmpty()) {
diff -bur namedTargetSrc/net/minecraft/recipe/MapExtendingRecipe.java namedSrc/net/minecraft/recipe/MapExtendingRecipe.java
--- namedTargetSrc/net/minecraft/recipe/MapExtendingRecipe.java	2024-05-29 02:40:39.241173441 +0000
+++ namedSrc/net/minecraft/recipe/MapExtendingRecipe.java	2024-05-29 02:39:30.265413444 +0000
@@ -8,8 +8,6 @@
 import net.minecraft.item.Items;
 import net.minecraft.item.map.MapState;
 import net.minecraft.registry.HolderLookup;
-import net.minecraft.unmapped.C_euomljmv;
-import net.minecraft.unmapped.C_vhpbjodz;
 import net.minecraft.world.World;
 
 /**
@@ -25,21 +23,21 @@
       super(
          "",
          category,
-         C_vhpbjodz.m_stiknasv(Map.of('#', Ingredient.ofItems(Items.PAPER), 'x', Ingredient.ofItems(Items.FILLED_MAP)), "###", "#x#", "###"),
+         ShapedRecipePattern.create(Map.of('#', Ingredient.ofItems(Items.PAPER), 'x', Ingredient.ofItems(Items.FILLED_MAP)), "###", "#x#", "###"),
          new ItemStack(Items.MAP)
       );
    }
 
    /**
-    * @mapping {@literal hashed m_jjsxdttb Lnet/minecraft/unmapped/C_cdhgeyop;m_jjsxdttb(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/unmapped/C_cdctfzbn;)Z}
-    * @mapping {@literal named m_jjsxdttb Lnet/minecraft/recipe/MapExtendingRecipe;m_jjsxdttb(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/world/World;)Z}
+    * @mapping {@literal hashed m_qncnzzjd Lnet/minecraft/unmapped/C_cdhgeyop;m_qncnzzjd(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/unmapped/C_cdctfzbn;)Z}
+    * @mapping {@literal named matches Lnet/minecraft/recipe/MapExtendingRecipe;matches(Lnet/minecraft/recipe/CraftingRecipeInput;Lnet/minecraft/world/World;)Z}
     */
    @Override
-   public boolean m_jjsxdttb(C_euomljmv arg, World world) {
-      if (!super.m_jjsxdttb(arg, world)) {
+   public boolean matches(CraftingRecipeInput arg, World world) {
+      if (!super.matches(arg, world)) {
          return false;
       } else {
-         ItemStack lv = m_gfiwlaty(arg);
+         ItemStack lv = findFilledMap(arg);
          if (lv.isEmpty()) {
             return false;
          } else {
@@ -55,21 +53,22 @@
 
    /**
     * @mapping {@literal hashed m_ugbdqroc Lnet/minecraft/unmapped/C_cdhgeyop;m_ugbdqroc(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_sddaxwyk;}
-    * @mapping {@literal named craft Lnet/minecraft/recipe/MapExtendingRecipe;craft(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/item/ItemStack;}
+    * @mapping {@literal named craft Lnet/minecraft/recipe/MapExtendingRecipe;craft(Lnet/minecraft/recipe/CraftingRecipeInput;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/item/ItemStack;}
     */
    @Override
-   public ItemStack craft(C_euomljmv arg, HolderLookup.Provider arg2) {
-      ItemStack lv = m_gfiwlaty(arg).copyWithCount(1);
+   public ItemStack craft(CraftingRecipeInput arg, HolderLookup.Provider arg2) {
+      ItemStack lv = findFilledMap(arg).copyWithCount(1);
       lv.set(DataComponentTypes.MAP_POST_PROCESSING, MapPostProcessingComponent.SCALE);
       return lv;
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_gfiwlaty Lnet/minecraft/unmapped/C_cdhgeyop;m_gfiwlaty(Lnet/minecraft/unmapped/C_euomljmv;)Lnet/minecraft/unmapped/C_sddaxwyk;}
+    * @mapping {@literal named findFilledMap Lnet/minecraft/recipe/MapExtendingRecipe;findFilledMap(Lnet/minecraft/recipe/CraftingRecipeInput;)Lnet/minecraft/item/ItemStack;}
     */
-   private static ItemStack m_gfiwlaty(C_euomljmv arg) {
-      for (int i = 0; i < arg.m_gptaeput(); i++) {
-         ItemStack lv = arg.m_hhjzrppb(i);
+   private static ItemStack findFilledMap(CraftingRecipeInput input) {
+      for (int i = 0; i < input.size(); i++) {
+         ItemStack lv = input.getStack(i);
          if (lv.isOf(Items.FILLED_MAP)) {
             return lv;
          }
diff -bur namedTargetSrc/net/minecraft/recipe/RecipeCache.java namedSrc/net/minecraft/recipe/RecipeCache.java
--- namedTargetSrc/net/minecraft/recipe/RecipeCache.java	2024-05-29 02:40:39.225173513 +0000
+++ namedSrc/net/minecraft/recipe/RecipeCache.java	2024-05-29 02:39:30.245413517 +0000
@@ -4,7 +4,6 @@
 import java.util.Arrays;
 import java.util.Optional;
 import net.minecraft.item.ItemStack;
-import net.minecraft.unmapped.C_euomljmv;
 import net.minecraft.util.collection.DefaultedList;
 import net.minecraft.world.World;
 import org.jetbrains.annotations.Nullable;
@@ -35,31 +34,31 @@
 
    /**
     * @mapping {@literal hashed m_tipfbwpi Lnet/minecraft/unmapped/C_edmnjlch;m_tipfbwpi(Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_euomljmv;)Ljava/util/Optional;}
-    * @mapping {@literal named m_tipfbwpi Lnet/minecraft/recipe/RecipeCache;m_tipfbwpi(Lnet/minecraft/world/World;Lnet/minecraft/unmapped/C_euomljmv;)Ljava/util/Optional;}
+    * @mapping {@literal named get Lnet/minecraft/recipe/RecipeCache;get(Lnet/minecraft/world/World;Lnet/minecraft/recipe/CraftingRecipeInput;)Ljava/util/Optional;}
     */
-   public Optional<RecipeHolder<CraftingRecipe>> m_tipfbwpi(World world, C_euomljmv arg2) {
-      if (arg2.m_wuqjkela()) {
+   public Optional<RecipeHolder<CraftingRecipe>> get(World world, CraftingRecipeInput input) {
+      if (input.isEmpty()) {
          return Optional.empty();
       } else {
-         this.m_lxnjadgw(world);
+         this.validateRecipeManager(world);
 
          for (int i = 0; i < this.recipeCache.length; i++) {
             RecipeCache.CachedRecipe lv = this.recipeCache[i];
-            if (lv != null && lv.m_ocoodxth(arg2)) {
-               this.m_qifbizlb(i);
+            if (lv != null && lv.matches(input)) {
+               this.moveToFront(i);
                return Optional.ofNullable(lv.recipe());
             }
          }
 
-         return this.m_cwdmboht(arg2, world);
+         return this.compute(input, world);
       }
    }
 
    /**
     * @mapping {@literal hashed m_lxnjadgw Lnet/minecraft/unmapped/C_edmnjlch;m_lxnjadgw(Lnet/minecraft/unmapped/C_cdctfzbn;)V}
-    * @mapping {@literal named m_lxnjadgw Lnet/minecraft/recipe/RecipeCache;m_lxnjadgw(Lnet/minecraft/world/World;)V}
+    * @mapping {@literal named validateRecipeManager Lnet/minecraft/recipe/RecipeCache;validateRecipeManager(Lnet/minecraft/world/World;)V}
     */
-   private void m_lxnjadgw(World world) {
+   private void validateRecipeManager(World world) {
       RecipeManager lv = world.getRecipeManager();
       if (lv != this.recipeManager.get()) {
          this.recipeManager = new WeakReference(lv);
@@ -69,37 +68,39 @@
 
    /**
     * @mapping {@literal hashed m_cwdmboht Lnet/minecraft/unmapped/C_edmnjlch;m_cwdmboht(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/unmapped/C_cdctfzbn;)Ljava/util/Optional;}
-    * @mapping {@literal named m_cwdmboht Lnet/minecraft/recipe/RecipeCache;m_cwdmboht(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/world/World;)Ljava/util/Optional;}
+    * @mapping {@literal named compute Lnet/minecraft/recipe/RecipeCache;compute(Lnet/minecraft/recipe/CraftingRecipeInput;Lnet/minecraft/world/World;)Ljava/util/Optional;}
     */
-   private Optional<RecipeHolder<CraftingRecipe>> m_cwdmboht(C_euomljmv arg, World world) {
-      Optional<RecipeHolder<CraftingRecipe>> optional = world.getRecipeManager().m_omtmmszf(RecipeType.CRAFTING, arg, world);
-      this.m_gsxudlwe(arg, (RecipeHolder<CraftingRecipe>)optional.orElse(null));
+   private Optional<RecipeHolder<CraftingRecipe>> compute(CraftingRecipeInput input, World world) {
+      Optional<RecipeHolder<CraftingRecipe>> optional = world.getRecipeManager().m_omtmmszf(RecipeType.CRAFTING, input, world);
+      this.cache(input, (RecipeHolder<CraftingRecipe>)optional.orElse(null));
       return optional;
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_qifbizlb Lnet/minecraft/unmapped/C_edmnjlch;m_qifbizlb(I)V}
+    * @mapping {@literal named moveToFront Lnet/minecraft/recipe/RecipeCache;moveToFront(I)V}
     */
-   private void m_qifbizlb(int i) {
-      if (i > 0) {
-         RecipeCache.CachedRecipe lv = this.recipeCache[i];
-         System.arraycopy(this.recipeCache, 0, this.recipeCache, 1, i);
+   private void moveToFront(int index) {
+      if (index > 0) {
+         RecipeCache.CachedRecipe lv = this.recipeCache[index];
+         System.arraycopy(this.recipeCache, 0, this.recipeCache, 1, index);
          this.recipeCache[0] = lv;
       }
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_gsxudlwe Lnet/minecraft/unmapped/C_edmnjlch;m_gsxudlwe(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/unmapped/C_dscbrwbj;)V}
+    * @mapping {@literal named cache Lnet/minecraft/recipe/RecipeCache;cache(Lnet/minecraft/recipe/CraftingRecipeInput;Lnet/minecraft/recipe/RecipeHolder;)V}
     */
-   private void m_gsxudlwe(C_euomljmv arg, @Nullable RecipeHolder<CraftingRecipe> arg2) {
-      DefaultedList<ItemStack> lv = DefaultedList.ofSize(arg.m_gptaeput(), ItemStack.EMPTY);
+   private void cache(CraftingRecipeInput input, @Nullable RecipeHolder<CraftingRecipe> recipe) {
+      DefaultedList<ItemStack> lv = DefaultedList.ofSize(input.size(), ItemStack.EMPTY);
 
-      for (int i = 0; i < arg.m_gptaeput(); i++) {
-         lv.set(i, arg.m_hhjzrppb(i).copyWithCount(1));
+      for (int i = 0; i < input.size(); i++) {
+         lv.set(i, input.getStack(i).copyWithCount(1));
       }
 
       System.arraycopy(this.recipeCache, 0, this.recipeCache, 1, this.recipeCache.length - 1);
-      this.recipeCache[0] = new RecipeCache.CachedRecipe(lv, arg.m_dhcnljxm(), arg.m_plfjjrel(), arg2);
+      this.recipeCache[0] = new RecipeCache.CachedRecipe(lv, input.getWidth(), input.getHeight(), recipe);
    }
 
    /**
@@ -108,12 +109,13 @@
     */
    static record CachedRecipe(DefaultedList<ItemStack> key, int width, int height, @Nullable RecipeHolder<CraftingRecipe> recipe) {
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_ocoodxth Lnet/minecraft/unmapped/C_edmnjlch$C_raahqxfc;m_ocoodxth(Lnet/minecraft/unmapped/C_euomljmv;)Z}
+       * @mapping {@literal named matches Lnet/minecraft/recipe/RecipeCache$CachedRecipe;matches(Lnet/minecraft/recipe/CraftingRecipeInput;)Z}
        */
-      public boolean m_ocoodxth(C_euomljmv arg) {
-         if (this.width == arg.m_dhcnljxm() && this.height == arg.m_plfjjrel()) {
+      public boolean matches(CraftingRecipeInput input) {
+         if (this.width == input.getWidth() && this.height == input.getHeight()) {
             for (int i = 0; i < this.key.size(); i++) {
-               if (!ItemStack.itemsAndComponentsMatch(this.key.get(i), arg.m_hhjzrppb(i))) {
+               if (!ItemStack.itemsAndComponentsMatch(this.key.get(i), input.getStack(i))) {
                   return false;
                }
             }

@github-actions
Copy link

Choose a reason for hiding this comment

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

View the diff here (3/3): 
diff -bur namedTargetSrc/net/minecraft/recipe/RecipeGridAligner.java namedSrc/net/minecraft/recipe/RecipeGridAligner.java
--- namedTargetSrc/net/minecraft/recipe/RecipeGridAligner.java	2024-05-29 02:40:39.409172675 +0000
+++ namedSrc/net/minecraft/recipe/RecipeGridAligner.java	2024-05-29 02:39:30.477412667 +0000
@@ -49,7 +49,7 @@
             }
 
             if (bl2) {
-               this.m_vnshednj((T)inputs.next(), o, amount, r, p);
+               this.acceptAlignedInput((T)inputs.next(), o, amount, r, p);
             } else if (s == r) {
                o += gridWidth - r;
                break;
@@ -61,7 +61,8 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_vnshednj Lnet/minecraft/unmapped/C_wuyfqgmj;m_vnshednj(Ljava/lang/Object;IIII)V}
+    * @mapping {@literal named acceptAlignedInput Lnet/minecraft/recipe/RecipeGridAligner;acceptAlignedInput(Ljava/lang/Object;IIII)V}
     */
-   void m_vnshednj(T object, int i, int j, int k, int l);
+   void acceptAlignedInput(T input, int index, int amount, int y, int x);
 }
Only in namedSrc/net/minecraft/recipe: RecipeInput.java
diff -bur namedTargetSrc/net/minecraft/recipe/Recipe.java namedSrc/net/minecraft/recipe/Recipe.java
--- namedTargetSrc/net/minecraft/recipe/Recipe.java	2024-05-29 02:40:39.373172840 +0000
+++ namedSrc/net/minecraft/recipe/Recipe.java	2024-05-29 02:39:30.437412814 +0000
@@ -10,7 +10,6 @@
 import net.minecraft.registry.HolderLookup;
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.RegistryKeys;
-import net.minecraft.unmapped.C_cxmcihwl;
 import net.minecraft.util.collection.DefaultedList;
 import net.minecraft.world.World;
 
@@ -30,7 +29,7 @@
  * @mapping {@literal hashed net/minecraft/unmapped/C_awrmdwqd}
  * @mapping {@literal named net/minecraft/recipe/Recipe}
  */
-public interface Recipe<T extends C_cxmcihwl> {
+public interface Recipe<T extends RecipeInput> {
    /**
     * @mapping {@literal hashed f_tsmsbfuq Lnet/minecraft/unmapped/C_awrmdwqd;f_tsmsbfuq:Lcom/mojang/serialization/Codec;}
     * @mapping {@literal named CODEC Lnet/minecraft/recipe/Recipe;CODEC:Lcom/mojang/serialization/Codec;}
@@ -45,15 +44,15 @@
 
    /**
     * @mapping {@literal hashed m_jjsxdttb Lnet/minecraft/unmapped/C_awrmdwqd;m_jjsxdttb(Lnet/minecraft/unmapped/C_cxmcihwl;Lnet/minecraft/unmapped/C_cdctfzbn;)Z}
-    * @mapping {@literal named m_jjsxdttb Lnet/minecraft/recipe/Recipe;m_jjsxdttb(Lnet/minecraft/unmapped/C_cxmcihwl;Lnet/minecraft/world/World;)Z}
+    * @mapping {@literal named matches Lnet/minecraft/recipe/Recipe;matches(Lnet/minecraft/recipe/RecipeInput;Lnet/minecraft/world/World;)Z}
     */
-   boolean m_jjsxdttb(T arg, World world);
+   boolean matches(T input, World world);
 
    /**
     * @mapping {@literal hashed m_tikgmnde Lnet/minecraft/unmapped/C_awrmdwqd;m_tikgmnde(Lnet/minecraft/unmapped/C_cxmcihwl;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_sddaxwyk;}
-    * @mapping {@literal named craft Lnet/minecraft/recipe/Recipe;craft(Lnet/minecraft/unmapped/C_cxmcihwl;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/item/ItemStack;}
+    * @mapping {@literal named craft Lnet/minecraft/recipe/Recipe;craft(Lnet/minecraft/recipe/RecipeInput;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/item/ItemStack;}
     */
-   ItemStack craft(T arg, HolderLookup.Provider arg2);
+   ItemStack craft(T input, HolderLookup.Provider lookupProvider);
 
    /**
     * {@return whether this recipe will fit into the given grid size}
@@ -77,16 +76,17 @@
     * @mapping {@literal hashed m_edscftkq Lnet/minecraft/unmapped/C_awrmdwqd;m_edscftkq(Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_sddaxwyk;}
     * @mapping {@literal named getResult Lnet/minecraft/recipe/Recipe;getResult(Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/item/ItemStack;}
     */
-   ItemStack getResult(HolderLookup.Provider arg);
+   ItemStack getResult(HolderLookup.Provider lookupProvider);
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_pyffiody Lnet/minecraft/unmapped/C_awrmdwqd;m_pyffiody(Lnet/minecraft/unmapped/C_cxmcihwl;)Lnet/minecraft/unmapped/C_rnrfftze;}
+    * @mapping {@literal named getRemainder Lnet/minecraft/recipe/Recipe;getRemainder(Lnet/minecraft/recipe/RecipeInput;)Lnet/minecraft/util/collection/DefaultedList;}
     */
-   default DefaultedList<ItemStack> m_pyffiody(T arg) {
-      DefaultedList<ItemStack> lv = DefaultedList.ofSize(arg.m_gptaeput(), ItemStack.EMPTY);
+   default DefaultedList<ItemStack> getRemainder(T input) {
+      DefaultedList<ItemStack> lv = DefaultedList.ofSize(input.size(), ItemStack.EMPTY);
 
       for (int i = 0; i < lv.size(); i++) {
-         Item lv2 = arg.m_hhjzrppb(i).getItem();
+         Item lv2 = input.getStack(i).getItem();
          if (lv2.hasRecipeRemainder()) {
             lv.set(i, new ItemStack(lv2.getRecipeRemainder()));
          }
diff -bur namedTargetSrc/net/minecraft/recipe/RecipeManager.java namedSrc/net/minecraft/recipe/RecipeManager.java
--- namedTargetSrc/net/minecraft/recipe/RecipeManager.java	2024-05-29 02:40:39.217173551 +0000
+++ namedSrc/net/minecraft/recipe/RecipeManager.java	2024-05-29 02:39:30.237413547 +0000
@@ -26,7 +26,6 @@
 import net.minecraft.registry.RegistryOps;
 import net.minecraft.resource.JsonDataLoader;
 import net.minecraft.resource.ResourceManager;
-import net.minecraft.unmapped.C_cxmcihwl;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.collection.DefaultedList;
 import net.minecraft.util.profiler.Profiler;
@@ -124,34 +123,34 @@
 
    /**
     * @mapping {@literal hashed m_omtmmszf Lnet/minecraft/unmapped/C_hjseusrb;m_omtmmszf(Lnet/minecraft/unmapped/C_rhnqznys;Lnet/minecraft/unmapped/C_cxmcihwl;Lnet/minecraft/unmapped/C_cdctfzbn;)Ljava/util/Optional;}
-    * @mapping {@literal named m_omtmmszf Lnet/minecraft/recipe/RecipeManager;m_omtmmszf(Lnet/minecraft/recipe/RecipeType;Lnet/minecraft/unmapped/C_cxmcihwl;Lnet/minecraft/world/World;)Ljava/util/Optional;}
+    * @mapping {@literal named m_omtmmszf Lnet/minecraft/recipe/RecipeManager;m_omtmmszf(Lnet/minecraft/recipe/RecipeType;Lnet/minecraft/recipe/RecipeInput;Lnet/minecraft/world/World;)Ljava/util/Optional;}
     */
-   public <I extends C_cxmcihwl, T extends Recipe<I>> Optional<RecipeHolder<T>> m_omtmmszf(RecipeType<T> arg, I arg2, World world) {
-      return this.m_igyegyvq(arg, arg2, world, (RecipeHolder<T>)null);
+   public <I extends RecipeInput, T extends Recipe<I>> Optional<RecipeHolder<T>> m_omtmmszf(RecipeType<T> arg, I input, World world) {
+      return this.m_igyegyvq(arg, input, world, (RecipeHolder<T>)null);
    }
 
    /**
     * @mapping {@literal hashed m_oegdnaun Lnet/minecraft/unmapped/C_hjseusrb;m_oegdnaun(Lnet/minecraft/unmapped/C_rhnqznys;Lnet/minecraft/unmapped/C_cxmcihwl;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_ncpywfca;)Ljava/util/Optional;}
-    * @mapping {@literal named m_oegdnaun Lnet/minecraft/recipe/RecipeManager;m_oegdnaun(Lnet/minecraft/recipe/RecipeType;Lnet/minecraft/unmapped/C_cxmcihwl;Lnet/minecraft/world/World;Lnet/minecraft/util/Identifier;)Ljava/util/Optional;}
+    * @mapping {@literal named m_oegdnaun Lnet/minecraft/recipe/RecipeManager;m_oegdnaun(Lnet/minecraft/recipe/RecipeType;Lnet/minecraft/recipe/RecipeInput;Lnet/minecraft/world/World;Lnet/minecraft/util/Identifier;)Ljava/util/Optional;}
     */
-   public <I extends C_cxmcihwl, T extends Recipe<I>> Optional<RecipeHolder<T>> m_oegdnaun(RecipeType<T> arg, I arg2, World world, @Nullable Identifier arg4) {
+   public <I extends RecipeInput, T extends Recipe<I>> Optional<RecipeHolder<T>> m_oegdnaun(RecipeType<T> arg, I arg2, World world, @Nullable Identifier arg4) {
       RecipeHolder<T> lv = arg4 != null ? this.m_jgeojtch(arg, arg4) : null;
       return this.m_igyegyvq(arg, arg2, world, lv);
    }
 
    /**
     * @mapping {@literal hashed m_igyegyvq Lnet/minecraft/unmapped/C_hjseusrb;m_igyegyvq(Lnet/minecraft/unmapped/C_rhnqznys;Lnet/minecraft/unmapped/C_cxmcihwl;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_dscbrwbj;)Ljava/util/Optional;}
-    * @mapping {@literal named m_igyegyvq Lnet/minecraft/recipe/RecipeManager;m_igyegyvq(Lnet/minecraft/recipe/RecipeType;Lnet/minecraft/unmapped/C_cxmcihwl;Lnet/minecraft/world/World;Lnet/minecraft/recipe/RecipeHolder;)Ljava/util/Optional;}
+    * @mapping {@literal named m_igyegyvq Lnet/minecraft/recipe/RecipeManager;m_igyegyvq(Lnet/minecraft/recipe/RecipeType;Lnet/minecraft/recipe/RecipeInput;Lnet/minecraft/world/World;Lnet/minecraft/recipe/RecipeHolder;)Ljava/util/Optional;}
     */
-   public <I extends C_cxmcihwl, T extends Recipe<I>> Optional<RecipeHolder<T>> m_igyegyvq(
-      RecipeType<T> arg, I arg2, World world, @Nullable RecipeHolder<T> value
+   public <I extends RecipeInput, T extends Recipe<I>> Optional<RecipeHolder<T>> m_igyegyvq(
+      RecipeType<T> arg, I input, World world, @Nullable RecipeHolder<T> value
    ) {
-      if (arg2.m_wuqjkela()) {
+      if (input.isEmpty()) {
          return Optional.empty();
       } else {
-         return value != null && value.value().m_jjsxdttb(arg2, world)
+         return value != null && value.value().matches(input, world)
             ? Optional.of(value)
-            : this.getAllOfType(arg).stream().filter(arg3 -> arg3.value().m_jjsxdttb(arg2, world)).findFirst();
+            : this.getAllOfType(arg).stream().filter(arg3 -> arg3.value().matches(input, world)).findFirst();
       }
    }
 
@@ -169,18 +168,18 @@
     * @mapping {@literal hashed m_ardwasqa Lnet/minecraft/unmapped/C_hjseusrb;m_ardwasqa(Lnet/minecraft/unmapped/C_rhnqznys;)Ljava/util/List;}
     * @mapping {@literal named listAllOfType Lnet/minecraft/recipe/RecipeManager;listAllOfType(Lnet/minecraft/recipe/RecipeType;)Ljava/util/List;}
     */
-   public <I extends C_cxmcihwl, T extends Recipe<I>> List<RecipeHolder<T>> listAllOfType(RecipeType<T> type) {
+   public <I extends RecipeInput, T extends Recipe<I>> List<RecipeHolder<T>> listAllOfType(RecipeType<T> type) {
       return List.copyOf(this.getAllOfType(type));
    }
 
    /**
     * @mapping {@literal hashed m_hrukhdkd Lnet/minecraft/unmapped/C_hjseusrb;m_hrukhdkd(Lnet/minecraft/unmapped/C_rhnqznys;Lnet/minecraft/unmapped/C_cxmcihwl;Lnet/minecraft/unmapped/C_cdctfzbn;)Ljava/util/List;}
-    * @mapping {@literal named m_hrukhdkd Lnet/minecraft/recipe/RecipeManager;m_hrukhdkd(Lnet/minecraft/recipe/RecipeType;Lnet/minecraft/unmapped/C_cxmcihwl;Lnet/minecraft/world/World;)Ljava/util/List;}
+    * @mapping {@literal named m_hrukhdkd Lnet/minecraft/recipe/RecipeManager;m_hrukhdkd(Lnet/minecraft/recipe/RecipeType;Lnet/minecraft/recipe/RecipeInput;Lnet/minecraft/world/World;)Ljava/util/List;}
     */
-   public <I extends C_cxmcihwl, T extends Recipe<I>> List<RecipeHolder<T>> m_hrukhdkd(RecipeType<T> type, I arg2, World world) {
+   public <I extends RecipeInput, T extends Recipe<I>> List<RecipeHolder<T>> m_hrukhdkd(RecipeType<T> type, I arg2, World world) {
       return (List<RecipeHolder<T>>)this.getAllOfType(type)
          .stream()
-         .filter(arg3 -> arg3.value().m_jjsxdttb(arg2, world))
+         .filter(arg3 -> arg3.value().matches(arg2, world))
          .sorted(Comparator.comparing(arg2x -> arg2x.value().getResult(world.getRegistryManager()).getTranslationKey()))
          .collect(Collectors.toList());
    }
@@ -189,23 +188,23 @@
     * @mapping {@literal hashed m_xkivhqgi Lnet/minecraft/unmapped/C_hjseusrb;m_xkivhqgi(Lnet/minecraft/unmapped/C_rhnqznys;)Ljava/util/Collection;}
     * @mapping {@literal named getAllOfType Lnet/minecraft/recipe/RecipeManager;getAllOfType(Lnet/minecraft/recipe/RecipeType;)Ljava/util/Collection;}
     */
-   private <I extends C_cxmcihwl, T extends Recipe<I>> Collection<RecipeHolder<T>> getAllOfType(RecipeType<T> type) {
+   private <I extends RecipeInput, T extends Recipe<I>> Collection<RecipeHolder<T>> getAllOfType(RecipeType<T> type) {
       return (Collection<RecipeHolder<T>>)this.f_nkouqikk.get(type);
    }
 
    /**
     * @mapping {@literal hashed m_pgjmabyy Lnet/minecraft/unmapped/C_hjseusrb;m_pgjmabyy(Lnet/minecraft/unmapped/C_rhnqznys;Lnet/minecraft/unmapped/C_cxmcihwl;Lnet/minecraft/unmapped/C_cdctfzbn;)Lnet/minecraft/unmapped/C_rnrfftze;}
-    * @mapping {@literal named m_pgjmabyy Lnet/minecraft/recipe/RecipeManager;m_pgjmabyy(Lnet/minecraft/recipe/RecipeType;Lnet/minecraft/unmapped/C_cxmcihwl;Lnet/minecraft/world/World;)Lnet/minecraft/util/collection/DefaultedList;}
+    * @mapping {@literal named m_pgjmabyy Lnet/minecraft/recipe/RecipeManager;m_pgjmabyy(Lnet/minecraft/recipe/RecipeType;Lnet/minecraft/recipe/RecipeInput;Lnet/minecraft/world/World;)Lnet/minecraft/util/collection/DefaultedList;}
     */
-   public <I extends C_cxmcihwl, T extends Recipe<I>> DefaultedList<ItemStack> m_pgjmabyy(RecipeType<T> arg, I arg2, World world) {
+   public <I extends RecipeInput, T extends Recipe<I>> DefaultedList<ItemStack> m_pgjmabyy(RecipeType<T> arg, I arg2, World world) {
       Optional<RecipeHolder<T>> optional = this.m_omtmmszf(arg, arg2, world);
       if (optional.isPresent()) {
-         return ((RecipeHolder)optional.get()).value().m_pyffiody(arg2);
+         return ((RecipeHolder)optional.get()).value().getRemainder(arg2);
       } else {
-         DefaultedList<ItemStack> lv = DefaultedList.ofSize(arg2.m_gptaeput(), ItemStack.EMPTY);
+         DefaultedList<ItemStack> lv = DefaultedList.ofSize(arg2.size(), ItemStack.EMPTY);
 
          for (int i = 0; i < lv.size(); i++) {
-            lv.set(i, arg2.m_hhjzrppb(i));
+            lv.set(i, arg2.getStack(i));
          }
 
          return lv;
@@ -320,7 +319,7 @@
     * @mapping {@literal hashed m_oqvxqpcm Lnet/minecraft/unmapped/C_hjseusrb;m_oqvxqpcm(Lnet/minecraft/unmapped/C_rhnqznys;)Lnet/minecraft/unmapped/C_hjseusrb$C_bvtkxdyi;}
     * @mapping {@literal named createCheck Lnet/minecraft/recipe/RecipeManager;createCheck(Lnet/minecraft/recipe/RecipeType;)Lnet/minecraft/recipe/RecipeManager$CachedCheck;}
     */
-   public static <I extends C_cxmcihwl, T extends Recipe<I>> RecipeManager.CachedCheck<I, T> createCheck(RecipeType<T> type) {
+   public static <I extends RecipeInput, T extends Recipe<I>> RecipeManager.CachedCheck<I, T> createCheck(RecipeType<T> type) {
       return new RecipeManager.CachedCheck<I, T>() {
          /**
           * @mapping {@literal hashed f_kspyemsz Lnet/minecraft/unmapped/C_hjseusrb$C_ioxglbpe;f_kspyemsz:Lnet/minecraft/unmapped/C_ncpywfca;}
@@ -331,7 +330,7 @@
 
          /**
           * @mapping {@literal hashed m_ltqsvwgf Lnet/minecraft/unmapped/C_hjseusrb$C_ioxglbpe;m_ltqsvwgf(Lnet/minecraft/unmapped/C_cxmcihwl;Lnet/minecraft/unmapped/C_cdctfzbn;)Ljava/util/Optional;}
-          * @mapping {@literal named m_ltqsvwgf Lnet/minecraft/recipe/RecipeManager$C_ioxglbpe;m_ltqsvwgf(Lnet/minecraft/unmapped/C_cxmcihwl;Lnet/minecraft/world/World;)Ljava/util/Optional;}
+          * @mapping {@literal named m_ltqsvwgf Lnet/minecraft/recipe/RecipeManager$C_ioxglbpe;m_ltqsvwgf(Lnet/minecraft/recipe/RecipeInput;Lnet/minecraft/world/World;)Ljava/util/Optional;}
           */
          @Override
          public Optional<RecipeHolder<T>> m_ltqsvwgf(I arg, World world) {
@@ -352,10 +351,10 @@
     * @mapping {@literal hashed net/minecraft/unmapped/C_hjseusrb$C_bvtkxdyi}
     * @mapping {@literal named net/minecraft/recipe/RecipeManager$CachedCheck}
     */
-   public interface CachedCheck<I extends C_cxmcihwl, T extends Recipe<I>> {
+   public interface CachedCheck<I extends RecipeInput, T extends Recipe<I>> {
       /**
        * @mapping {@literal hashed m_ltqsvwgf Lnet/minecraft/unmapped/C_hjseusrb$C_bvtkxdyi;m_ltqsvwgf(Lnet/minecraft/unmapped/C_cxmcihwl;Lnet/minecraft/unmapped/C_cdctfzbn;)Ljava/util/Optional;}
-       * @mapping {@literal named m_ltqsvwgf Lnet/minecraft/recipe/RecipeManager$CachedCheck;m_ltqsvwgf(Lnet/minecraft/unmapped/C_cxmcihwl;Lnet/minecraft/world/World;)Ljava/util/Optional;}
+       * @mapping {@literal named m_ltqsvwgf Lnet/minecraft/recipe/RecipeManager$CachedCheck;m_ltqsvwgf(Lnet/minecraft/recipe/RecipeInput;Lnet/minecraft/world/World;)Ljava/util/Optional;}
        */
       Optional<RecipeHolder<T>> m_ltqsvwgf(I arg, World world);
    }
diff -bur namedTargetSrc/net/minecraft/recipe/RepairItemRecipe.java namedSrc/net/minecraft/recipe/RepairItemRecipe.java
--- namedTargetSrc/net/minecraft/recipe/RepairItemRecipe.java	2024-05-29 02:40:39.365172877 +0000
+++ namedSrc/net/minecraft/recipe/RepairItemRecipe.java	2024-05-29 02:39:30.429412843 +0000
@@ -8,7 +8,6 @@
 import net.minecraft.registry.HolderLookup;
 import net.minecraft.registry.RegistryKeys;
 import net.minecraft.registry.tag.EnchantmentTags;
-import net.minecraft.unmapped.C_euomljmv;
 import net.minecraft.world.World;
 import org.jetbrains.annotations.Nullable;
 
@@ -28,12 +27,12 @@
     * Mapping not found
     */
    @Nullable
-   private Pair<ItemStack, ItemStack> m_tsxbkugn(C_euomljmv arg) {
+   private Pair<ItemStack, ItemStack> m_tsxbkugn(CraftingRecipeInput arg) {
       ItemStack lv = null;
       ItemStack lv2 = null;
 
-      for (int i = 0; i < arg.m_gptaeput(); i++) {
-         ItemStack lv3 = arg.m_hhjzrppb(i);
+      for (int i = 0; i < arg.size(); i++) {
+         ItemStack lv3 = arg.getStack(i);
          if (!lv3.isEmpty()) {
             if (lv == null) {
                lv = lv3;
@@ -65,17 +64,17 @@
 
    /**
     * @mapping {@literal hashed m_acvczvow Lnet/minecraft/unmapped/C_oeuthbtr;m_acvczvow(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/unmapped/C_cdctfzbn;)Z}
-    * @mapping {@literal named m_jjsxdttb Lnet/minecraft/recipe/RepairItemRecipe;m_jjsxdttb(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/world/World;)Z}
+    * @mapping {@literal named matches Lnet/minecraft/recipe/RepairItemRecipe;matches(Lnet/minecraft/recipe/CraftingRecipeInput;Lnet/minecraft/world/World;)Z}
     */
-   public boolean m_jjsxdttb(C_euomljmv arg, World world) {
+   public boolean matches(CraftingRecipeInput arg, World world) {
       return this.m_tsxbkugn(arg) != null;
    }
 
    /**
     * @mapping {@literal hashed m_xxywdnjz Lnet/minecraft/unmapped/C_oeuthbtr;m_xxywdnjz(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_sddaxwyk;}
-    * @mapping {@literal named craft Lnet/minecraft/recipe/RepairItemRecipe;craft(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/item/ItemStack;}
+    * @mapping {@literal named craft Lnet/minecraft/recipe/RepairItemRecipe;craft(Lnet/minecraft/recipe/CraftingRecipeInput;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/item/ItemStack;}
     */
-   public ItemStack craft(C_euomljmv arg, HolderLookup.Provider arg2) {
+   public ItemStack craft(CraftingRecipeInput arg, HolderLookup.Provider arg2) {
       Pair<ItemStack, ItemStack> pair = this.m_tsxbkugn(arg);
       if (pair == null) {
          return ItemStack.EMPTY;
diff -bur namedTargetSrc/net/minecraft/recipe/ShapedRecipe.java namedSrc/net/minecraft/recipe/ShapedRecipe.java
--- namedTargetSrc/net/minecraft/recipe/ShapedRecipe.java	2024-05-29 02:40:39.201173623 +0000
+++ namedSrc/net/minecraft/recipe/ShapedRecipe.java	2024-05-29 02:39:30.213413635 +0000
@@ -7,8 +7,6 @@
 import net.minecraft.network.RegistryByteBuf;
 import net.minecraft.network.codec.PacketCodec;
 import net.minecraft.registry.HolderLookup;
-import net.minecraft.unmapped.C_euomljmv;
-import net.minecraft.unmapped.C_vhpbjodz;
 import net.minecraft.util.collection.DefaultedList;
 import net.minecraft.world.World;
 
@@ -20,7 +18,7 @@
    /**
     * Mapping not found
     */
-   final C_vhpbjodz f_ojflzowa;
+   final ShapedRecipePattern f_ojflzowa;
    /**
     * @mapping {@literal hashed f_vgraaxco Lnet/minecraft/unmapped/C_svdvbdmc;f_vgraaxco:Lnet/minecraft/unmapped/C_sddaxwyk;}
     * @mapping {@literal named result Lnet/minecraft/recipe/ShapedRecipe;result:Lnet/minecraft/item/ItemStack;}
@@ -44,9 +42,9 @@
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_svdvbdmc;<init>(Ljava/lang/String;Lnet/minecraft/unmapped/C_aodytokc;Lnet/minecraft/unmapped/C_vhpbjodz;Lnet/minecraft/unmapped/C_sddaxwyk;Z)V}
-    * @mapping {@literal named <init> Lnet/minecraft/recipe/ShapedRecipe;<init>(Ljava/lang/String;Lnet/minecraft/recipe/CraftingCategory;Lnet/minecraft/unmapped/C_vhpbjodz;Lnet/minecraft/item/ItemStack;Z)V}
+    * @mapping {@literal named <init> Lnet/minecraft/recipe/ShapedRecipe;<init>(Ljava/lang/String;Lnet/minecraft/recipe/CraftingCategory;Lnet/minecraft/recipe/ShapedRecipePattern;Lnet/minecraft/item/ItemStack;Z)V}
     */
-   public ShapedRecipe(String group, CraftingCategory category, C_vhpbjodz arg2, ItemStack result, boolean showNotification) {
+   public ShapedRecipe(String group, CraftingCategory category, ShapedRecipePattern arg2, ItemStack result, boolean showNotification) {
       this.group = group;
       this.category = category;
       this.f_ojflzowa = arg2;
@@ -56,9 +54,9 @@
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_svdvbdmc;<init>(Ljava/lang/String;Lnet/minecraft/unmapped/C_aodytokc;Lnet/minecraft/unmapped/C_vhpbjodz;Lnet/minecraft/unmapped/C_sddaxwyk;)V}
-    * @mapping {@literal named <init> Lnet/minecraft/recipe/ShapedRecipe;<init>(Ljava/lang/String;Lnet/minecraft/recipe/CraftingCategory;Lnet/minecraft/unmapped/C_vhpbjodz;Lnet/minecraft/item/ItemStack;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/recipe/ShapedRecipe;<init>(Ljava/lang/String;Lnet/minecraft/recipe/CraftingCategory;Lnet/minecraft/recipe/ShapedRecipePattern;Lnet/minecraft/item/ItemStack;)V}
     */
-   public ShapedRecipe(String group, CraftingCategory category, C_vhpbjodz arg2, ItemStack result) {
+   public ShapedRecipe(String group, CraftingCategory category, ShapedRecipePattern arg2, ItemStack result) {
       this(group, category, arg2, result, true);
    }
 
@@ -90,7 +88,7 @@
     * Mapping not found
     */
    @Override
-   public ItemStack getResult(HolderLookup.Provider arg) {
+   public ItemStack getResult(HolderLookup.Provider lookupProvider) {
       return this.result;
    }
 
@@ -99,7 +97,7 @@
     */
    @Override
    public DefaultedList<Ingredient> getIngredients() {
-      return this.f_ojflzowa.m_jwyaufas();
+      return this.f_ojflzowa.getIngredients();
    }
 
    /**
@@ -115,22 +113,22 @@
     */
    @Override
    public boolean fits(int width, int height) {
-      return width >= this.f_ojflzowa.m_jlmohzhk() && height >= this.f_ojflzowa.m_tgsmprvg();
+      return width >= this.f_ojflzowa.getWidth() && height >= this.f_ojflzowa.getHeight();
    }
 
    /**
-    * @mapping {@literal hashed m_jjsxdttb Lnet/minecraft/unmapped/C_svdvbdmc;m_jjsxdttb(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/unmapped/C_cdctfzbn;)Z}
-    * @mapping {@literal named m_jjsxdttb Lnet/minecraft/recipe/ShapedRecipe;m_jjsxdttb(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/world/World;)Z}
+    * @mapping {@literal hashed m_qncnzzjd Lnet/minecraft/unmapped/C_svdvbdmc;m_qncnzzjd(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/unmapped/C_cdctfzbn;)Z}
+    * @mapping {@literal named matches Lnet/minecraft/recipe/ShapedRecipe;matches(Lnet/minecraft/recipe/CraftingRecipeInput;Lnet/minecraft/world/World;)Z}
     */
-   public boolean m_jjsxdttb(C_euomljmv arg, World world) {
-      return this.f_ojflzowa.m_mxwtbrsc(arg);
+   public boolean matches(CraftingRecipeInput arg, World world) {
+      return this.f_ojflzowa.matches(arg);
    }
 
    /**
     * @mapping {@literal hashed m_ugbdqroc Lnet/minecraft/unmapped/C_svdvbdmc;m_ugbdqroc(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_sddaxwyk;}
-    * @mapping {@literal named craft Lnet/minecraft/recipe/ShapedRecipe;craft(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/item/ItemStack;}
+    * @mapping {@literal named craft Lnet/minecraft/recipe/ShapedRecipe;craft(Lnet/minecraft/recipe/CraftingRecipeInput;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/item/ItemStack;}
     */
-   public ItemStack craft(C_euomljmv arg, HolderLookup.Provider arg2) {
+   public ItemStack craft(CraftingRecipeInput arg, HolderLookup.Provider arg2) {
       return this.getResult(arg2).copy();
    }
 
@@ -139,7 +137,7 @@
     * @mapping {@literal named getWidth Lnet/minecraft/recipe/ShapedRecipe;getWidth()I}
     */
    public int getWidth() {
-      return this.f_ojflzowa.m_jlmohzhk();
+      return this.f_ojflzowa.getWidth();
    }
 
    /**
@@ -147,7 +145,7 @@
     * @mapping {@literal named getHeight Lnet/minecraft/recipe/ShapedRecipe;getHeight()I}
     */
    public int getHeight() {
-      return this.f_ojflzowa.m_tgsmprvg();
+      return this.f_ojflzowa.getHeight();
    }
 
    /**
@@ -172,7 +170,7 @@
          instance -> instance.group(
                   Codec.STRING.optionalFieldOf("group", "").forGetter(arg -> arg.group),
                   CraftingCategory.CODEC.fieldOf("category").orElse(CraftingCategory.MISC).forGetter(arg -> arg.category),
-                  C_vhpbjodz.CODEC.forGetter(arg -> arg.f_ojflzowa),
+                  ShapedRecipePattern.CODEC.forGetter(arg -> arg.f_ojflzowa),
                   ItemStack.f_gwlvilfo.fieldOf("result").forGetter(arg -> arg.result),
                   Codec.BOOL.optionalFieldOf("show_notification", Boolean.valueOf(true)).forGetter(arg -> arg.showNotification)
                )
@@ -209,7 +207,7 @@
       private static ShapedRecipe read(RegistryByteBuf buf) {
          String string = buf.readString();
          CraftingCategory lv = buf.readEnumConstant(CraftingCategory.class);
-         C_vhpbjodz lv2 = C_vhpbjodz.PACKET_CODEC.decode(buf);
+         ShapedRecipePattern lv2 = ShapedRecipePattern.PACKET_CODEC.decode(buf);
          ItemStack lv3 = ItemStack.PACKET_CODEC.decode(buf);
          boolean bl = buf.readBoolean();
          return new ShapedRecipe(string, lv, lv2, lv3, bl);
@@ -222,7 +220,7 @@
       private static void write(RegistryByteBuf buf, ShapedRecipe recipe) {
          buf.writeString(recipe.group);
          buf.writeEnumConstant(recipe.category);
-         C_vhpbjodz.PACKET_CODEC.encode(buf, recipe.f_ojflzowa);
+         ShapedRecipePattern.PACKET_CODEC.encode(buf, recipe.f_ojflzowa);
          ItemStack.PACKET_CODEC.encode(buf, recipe.result);
          buf.writeBoolean(recipe.showNotification);
       }
Only in namedSrc/net/minecraft/recipe: ShapedRecipePattern.java
diff -bur namedTargetSrc/net/minecraft/recipe/ShapelessRecipe.java namedSrc/net/minecraft/recipe/ShapelessRecipe.java
--- namedTargetSrc/net/minecraft/recipe/ShapelessRecipe.java	2024-05-29 02:40:39.189173678 +0000
+++ namedSrc/net/minecraft/recipe/ShapelessRecipe.java	2024-05-29 02:39:30.201413678 +0000
@@ -8,7 +8,6 @@
 import net.minecraft.network.RegistryByteBuf;
 import net.minecraft.network.codec.PacketCodec;
 import net.minecraft.registry.HolderLookup;
-import net.minecraft.unmapped.C_euomljmv;
 import net.minecraft.util.collection.DefaultedList;
 import net.minecraft.world.World;
 
@@ -77,7 +76,7 @@
     * Mapping not found
     */
    @Override
-   public ItemStack getResult(HolderLookup.Provider arg) {
+   public ItemStack getResult(HolderLookup.Provider lookupProvider) {
       return this.result;
    }
 
@@ -91,23 +90,23 @@
 
    /**
     * @mapping {@literal hashed m_cdcmpzha Lnet/minecraft/unmapped/C_puwbbocg;m_cdcmpzha(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/unmapped/C_cdctfzbn;)Z}
-    * @mapping {@literal named m_jjsxdttb Lnet/minecraft/recipe/ShapelessRecipe;m_jjsxdttb(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/world/World;)Z}
+    * @mapping {@literal named matches Lnet/minecraft/recipe/ShapelessRecipe;matches(Lnet/minecraft/recipe/CraftingRecipeInput;Lnet/minecraft/world/World;)Z}
     */
-   public boolean m_jjsxdttb(C_euomljmv arg, World world) {
-      if (arg.m_stcmggrk() != this.ingredients.size()) {
+   public boolean matches(CraftingRecipeInput arg, World world) {
+      if (arg.getStackCount() != this.ingredients.size()) {
          return false;
       } else {
-         return arg.m_gptaeput() == 1 && this.ingredients.size() == 1
-            ? ((Ingredient)this.ingredients.getFirst()).test(arg.m_hhjzrppb(0))
-            : arg.m_xankaukl().match(this, null);
+         return arg.size() == 1 && this.ingredients.size() == 1
+            ? ((Ingredient)this.ingredients.getFirst()).test(arg.getStack(0))
+            : arg.getRecipeMatcher().match(this, null);
       }
    }
 
    /**
     * @mapping {@literal hashed m_pfhhdste Lnet/minecraft/unmapped/C_puwbbocg;m_pfhhdste(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_sddaxwyk;}
-    * @mapping {@literal named craft Lnet/minecraft/recipe/ShapelessRecipe;craft(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/item/ItemStack;}
+    * @mapping {@literal named craft Lnet/minecraft/recipe/ShapelessRecipe;craft(Lnet/minecraft/recipe/CraftingRecipeInput;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/item/ItemStack;}
     */
-   public ItemStack craft(C_euomljmv arg, HolderLookup.Provider arg2) {
+   public ItemStack craft(CraftingRecipeInput arg, HolderLookup.Provider arg2) {
       return this.result.copy();
    }
 
diff -bur namedTargetSrc/net/minecraft/recipe/ShieldDecorationRecipe.java namedSrc/net/minecraft/recipe/ShieldDecorationRecipe.java
--- namedTargetSrc/net/minecraft/recipe/ShieldDecorationRecipe.java	2024-05-29 02:40:39.185173696 +0000
+++ namedSrc/net/minecraft/recipe/ShieldDecorationRecipe.java	2024-05-29 02:39:30.193413706 +0000
@@ -6,7 +6,6 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import net.minecraft.registry.HolderLookup;
-import net.minecraft.unmapped.C_euomljmv;
 import net.minecraft.world.World;
 
 /**
@@ -22,15 +21,15 @@
    }
 
    /**
-    * @mapping {@literal hashed m_jjsxdttb Lnet/minecraft/unmapped/C_kwjafoyl;m_jjsxdttb(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/unmapped/C_cdctfzbn;)Z}
-    * @mapping {@literal named m_jjsxdttb Lnet/minecraft/recipe/ShieldDecorationRecipe;m_jjsxdttb(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/world/World;)Z}
+    * @mapping {@literal hashed m_npkrqxbw Lnet/minecraft/unmapped/C_kwjafoyl;m_npkrqxbw(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/unmapped/C_cdctfzbn;)Z}
+    * @mapping {@literal named matches Lnet/minecraft/recipe/ShieldDecorationRecipe;matches(Lnet/minecraft/recipe/CraftingRecipeInput;Lnet/minecraft/world/World;)Z}
     */
-   public boolean m_jjsxdttb(C_euomljmv arg, World world) {
+   public boolean matches(CraftingRecipeInput arg, World world) {
       ItemStack lv = ItemStack.EMPTY;
       ItemStack lv2 = ItemStack.EMPTY;
 
-      for (int i = 0; i < arg.m_gptaeput(); i++) {
-         ItemStack lv3 = arg.m_hhjzrppb(i);
+      for (int i = 0; i < arg.size(); i++) {
+         ItemStack lv3 = arg.getStack(i);
          if (!lv3.isEmpty()) {
             if (lv3.getItem() instanceof BannerItem) {
                if (!lv2.isEmpty()) {
@@ -62,14 +61,14 @@
 
    /**
     * @mapping {@literal hashed m_evzmbmzb Lnet/minecraft/unmapped/C_kwjafoyl;m_evzmbmzb(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_sddaxwyk;}
-    * @mapping {@literal named craft Lnet/minecraft/recipe/ShieldDecorationRecipe;craft(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/item/ItemStack;}
+    * @mapping {@literal named craft Lnet/minecraft/recipe/ShieldDecorationRecipe;craft(Lnet/minecraft/recipe/CraftingRecipeInput;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/item/ItemStack;}
     */
-   public ItemStack craft(C_euomljmv arg, HolderLookup.Provider arg2) {
+   public ItemStack craft(CraftingRecipeInput arg, HolderLookup.Provider arg2) {
       ItemStack lv = ItemStack.EMPTY;
       ItemStack lv2 = ItemStack.EMPTY;
 
-      for (int i = 0; i < arg.m_gptaeput(); i++) {
-         ItemStack lv3 = arg.m_hhjzrppb(i);
+      for (int i = 0; i < arg.size(); i++) {
+         ItemStack lv3 = arg.getStack(i);
          if (!lv3.isEmpty()) {
             if (lv3.getItem() instanceof BannerItem) {
                lv = lv3;
diff -bur namedTargetSrc/net/minecraft/recipe/ShulkerBoxColoringRecipe.java namedSrc/net/minecraft/recipe/ShulkerBoxColoringRecipe.java
--- namedTargetSrc/net/minecraft/recipe/ShulkerBoxColoringRecipe.java	2024-05-29 02:40:39.261173350 +0000
+++ namedSrc/net/minecraft/recipe/ShulkerBoxColoringRecipe.java	2024-05-29 02:39:30.289413356 +0000
@@ -7,7 +7,6 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import net.minecraft.registry.HolderLookup;
-import net.minecraft.unmapped.C_euomljmv;
 import net.minecraft.world.World;
 
 /**
@@ -23,15 +22,15 @@
    }
 
    /**
-    * @mapping {@literal hashed m_jjsxdttb Lnet/minecraft/unmapped/C_eghkxdob;m_jjsxdttb(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/unmapped/C_cdctfzbn;)Z}
-    * @mapping {@literal named m_jjsxdttb Lnet/minecraft/recipe/ShulkerBoxColoringRecipe;m_jjsxdttb(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/world/World;)Z}
+    * @mapping {@literal hashed m_obbgnrtk Lnet/minecraft/unmapped/C_eghkxdob;m_obbgnrtk(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/unmapped/C_cdctfzbn;)Z}
+    * @mapping {@literal named matches Lnet/minecraft/recipe/ShulkerBoxColoringRecipe;matches(Lnet/minecraft/recipe/CraftingRecipeInput;Lnet/minecraft/world/World;)Z}
     */
-   public boolean m_jjsxdttb(C_euomljmv arg, World world) {
+   public boolean matches(CraftingRecipeInput arg, World world) {
       int i = 0;
       int j = 0;
 
-      for (int k = 0; k < arg.m_gptaeput(); k++) {
-         ItemStack lv = arg.m_hhjzrppb(k);
+      for (int k = 0; k < arg.size(); k++) {
+         ItemStack lv = arg.getStack(k);
          if (!lv.isEmpty()) {
             if (Block.getBlockFromItem(lv.getItem()) instanceof ShulkerBoxBlock) {
                i++;
@@ -54,14 +53,14 @@
 
    /**
     * @mapping {@literal hashed m_hjsyuiqt Lnet/minecraft/unmapped/C_eghkxdob;m_hjsyuiqt(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_sddaxwyk;}
-    * @mapping {@literal named craft Lnet/minecraft/recipe/ShulkerBoxColoringRecipe;craft(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/item/ItemStack;}
+    * @mapping {@literal named craft Lnet/minecraft/recipe/ShulkerBoxColoringRecipe;craft(Lnet/minecraft/recipe/CraftingRecipeInput;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/item/ItemStack;}
     */
-   public ItemStack craft(C_euomljmv arg, HolderLookup.Provider arg2) {
+   public ItemStack craft(CraftingRecipeInput arg, HolderLookup.Provider arg2) {
       ItemStack lv = ItemStack.EMPTY;
       DyeItem lv2 = (DyeItem)Items.WHITE_DYE;
 
-      for (int i = 0; i < arg.m_gptaeput(); i++) {
-         ItemStack lv3 = arg.m_hhjzrppb(i);
+      for (int i = 0; i < arg.size(); i++) {
+         ItemStack lv3 = arg.getStack(i);
          if (!lv3.isEmpty()) {
             Item lv4 = lv3.getItem();
             if (Block.getBlockFromItem(lv4) instanceof ShulkerBoxBlock) {
Only in namedSrc/net/minecraft/recipe: SingleStackRecipeInput.java
diff -bur namedTargetSrc/net/minecraft/recipe/SpecialCraftingRecipe.java namedSrc/net/minecraft/recipe/SpecialCraftingRecipe.java
--- namedTargetSrc/net/minecraft/recipe/SpecialCraftingRecipe.java	2024-05-29 02:40:39.177173732 +0000
+++ namedSrc/net/minecraft/recipe/SpecialCraftingRecipe.java	2024-05-29 02:39:30.185413734 +0000
@@ -34,7 +34,7 @@
     * Mapping not found
     */
    @Override
-   public ItemStack getResult(HolderLookup.Provider arg) {
+   public ItemStack getResult(HolderLookup.Provider lookupProvider) {
       return ItemStack.EMPTY;
    }
 
diff -bur namedTargetSrc/net/minecraft/recipe/StonecuttingRecipe.java namedSrc/net/minecraft/recipe/StonecuttingRecipe.java
--- namedTargetSrc/net/minecraft/recipe/StonecuttingRecipe.java	2024-05-29 02:40:39.173173751 +0000
+++ namedSrc/net/minecraft/recipe/StonecuttingRecipe.java	2024-05-29 02:39:30.177413761 +0000
@@ -2,7 +2,6 @@
 
 import net.minecraft.block.Blocks;
 import net.minecraft.item.ItemStack;
-import net.minecraft.unmapped.C_hsoxiypb;
 import net.minecraft.world.World;
 
 /**
@@ -19,10 +18,10 @@
    }
 
    /**
-    * @mapping {@literal hashed m_jjsxdttb Lnet/minecraft/unmapped/C_nqhkwtnf;m_jjsxdttb(Lnet/minecraft/unmapped/C_hsoxiypb;Lnet/minecraft/unmapped/C_cdctfzbn;)Z}
-    * @mapping {@literal named m_jjsxdttb Lnet/minecraft/recipe/StonecuttingRecipe;m_jjsxdttb(Lnet/minecraft/unmapped/C_hsoxiypb;Lnet/minecraft/world/World;)Z}
+    * @mapping {@literal hashed m_uasryfzj Lnet/minecraft/unmapped/C_nqhkwtnf;m_uasryfzj(Lnet/minecraft/unmapped/C_hsoxiypb;Lnet/minecraft/unmapped/C_cdctfzbn;)Z}
+    * @mapping {@literal named matches Lnet/minecraft/recipe/StonecuttingRecipe;matches(Lnet/minecraft/recipe/SingleStackRecipeInput;Lnet/minecraft/world/World;)Z}
     */
-   public boolean m_jjsxdttb(C_hsoxiypb arg, World world) {
+   public boolean matches(SingleStackRecipeInput arg, World world) {
       return this.ingredient.test(arg.item());
    }
 
diff -bur namedTargetSrc/net/minecraft/recipe/SuspiciousStewRecipe.java namedSrc/net/minecraft/recipe/SuspiciousStewRecipe.java
--- namedTargetSrc/net/minecraft/recipe/SuspiciousStewRecipe.java	2024-05-29 02:40:39.345172968 +0000
+++ namedSrc/net/minecraft/recipe/SuspiciousStewRecipe.java	2024-05-29 02:39:30.409412916 +0000
@@ -7,7 +7,6 @@
 import net.minecraft.item.SuspiciousStewEffectContainer;
 import net.minecraft.registry.HolderLookup;
 import net.minecraft.registry.tag.ItemTags;
-import net.minecraft.unmapped.C_euomljmv;
 import net.minecraft.world.World;
 
 /**
@@ -23,17 +22,17 @@
    }
 
    /**
-    * @mapping {@literal hashed m_jjsxdttb Lnet/minecraft/unmapped/C_ljyvsjck;m_jjsxdttb(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/unmapped/C_cdctfzbn;)Z}
-    * @mapping {@literal named m_jjsxdttb Lnet/minecraft/recipe/SuspiciousStewRecipe;m_jjsxdttb(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/world/World;)Z}
+    * @mapping {@literal hashed m_ntquzebp Lnet/minecraft/unmapped/C_ljyvsjck;m_ntquzebp(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/unmapped/C_cdctfzbn;)Z}
+    * @mapping {@literal named matches Lnet/minecraft/recipe/SuspiciousStewRecipe;matches(Lnet/minecraft/recipe/CraftingRecipeInput;Lnet/minecraft/world/World;)Z}
     */
-   public boolean m_jjsxdttb(C_euomljmv arg, World world) {
+   public boolean matches(CraftingRecipeInput arg, World world) {
       boolean bl = false;
       boolean bl2 = false;
       boolean bl3 = false;
       boolean bl4 = false;
 
-      for (int i = 0; i < arg.m_gptaeput(); i++) {
-         ItemStack lv = arg.m_hhjzrppb(i);
+      for (int i = 0; i < arg.size(); i++) {
+         ItemStack lv = arg.getStack(i);
          if (!lv.isEmpty()) {
             if (lv.isOf(Blocks.BROWN_MUSHROOM.asItem()) && !bl3) {
                bl3 = true;
@@ -56,13 +55,13 @@
 
    /**
     * @mapping {@literal hashed m_tgzqnegd Lnet/minecraft/unmapped/C_ljyvsjck;m_tgzqnegd(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_sddaxwyk;}
-    * @mapping {@literal named craft Lnet/minecraft/recipe/SuspiciousStewRecipe;craft(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/item/ItemStack;}
+    * @mapping {@literal named craft Lnet/minecraft/recipe/SuspiciousStewRecipe;craft(Lnet/minecraft/recipe/CraftingRecipeInput;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/item/ItemStack;}
     */
-   public ItemStack craft(C_euomljmv arg, HolderLookup.Provider arg2) {
+   public ItemStack craft(CraftingRecipeInput arg, HolderLookup.Provider arg2) {
       ItemStack lv = new ItemStack(Items.SUSPICIOUS_STEW, 1);
 
-      for (int i = 0; i < arg.m_gptaeput(); i++) {
-         ItemStack lv2 = arg.m_hhjzrppb(i);
+      for (int i = 0; i < arg.size(); i++) {
+         ItemStack lv2 = arg.getStack(i);
          if (!lv2.isEmpty()) {
             SuspiciousStewEffectContainer lv3 = SuspiciousStewEffectContainer.getContainer(lv2.getItem());
             if (lv3 != null) {
diff -bur namedTargetSrc/net/minecraft/recipe/TippedArrowRecipe.java namedSrc/net/minecraft/recipe/TippedArrowRecipe.java
--- namedTargetSrc/net/minecraft/recipe/TippedArrowRecipe.java	2024-05-29 02:40:39.345172968 +0000
+++ namedSrc/net/minecraft/recipe/TippedArrowRecipe.java	2024-05-29 02:39:30.409412916 +0000
@@ -4,7 +4,6 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import net.minecraft.registry.HolderLookup;
-import net.minecraft.unmapped.C_euomljmv;
 import net.minecraft.world.World;
 
 /**
@@ -20,14 +19,14 @@
    }
 
    /**
-    * @mapping {@literal hashed m_jjsxdttb Lnet/minecraft/unmapped/C_cpyfjwkn;m_jjsxdttb(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/unmapped/C_cdctfzbn;)Z}
-    * @mapping {@literal named m_jjsxdttb Lnet/minecraft/recipe/TippedArrowRecipe;m_jjsxdttb(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/world/World;)Z}
+    * @mapping {@literal hashed m_znqcdsrj Lnet/minecraft/unmapped/C_cpyfjwkn;m_znqcdsrj(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/unmapped/C_cdctfzbn;)Z}
+    * @mapping {@literal named matches Lnet/minecraft/recipe/TippedArrowRecipe;matches(Lnet/minecraft/recipe/CraftingRecipeInput;Lnet/minecraft/world/World;)Z}
     */
-   public boolean m_jjsxdttb(C_euomljmv arg, World world) {
-      if (arg.m_dhcnljxm() == 3 && arg.m_plfjjrel() == 3) {
-         for (int i = 0; i < arg.m_plfjjrel(); i++) {
-            for (int j = 0; j < arg.m_dhcnljxm(); j++) {
-               ItemStack lv = arg.m_oajnzqrl(j, i);
+   public boolean matches(CraftingRecipeInput arg, World world) {
+      if (arg.getWidth() == 3 && arg.getHeight() == 3) {
+         for (int i = 0; i < arg.getHeight(); i++) {
+            for (int j = 0; j < arg.getWidth(); j++) {
+               ItemStack lv = arg.getStack(j, i);
                if (lv.isEmpty()) {
                   return false;
                }
@@ -50,10 +49,10 @@
 
    /**
     * @mapping {@literal hashed m_kvxbubsd Lnet/minecraft/unmapped/C_cpyfjwkn;m_kvxbubsd(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_sddaxwyk;}
-    * @mapping {@literal named craft Lnet/minecraft/recipe/TippedArrowRecipe;craft(Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/item/ItemStack;}
+    * @mapping {@literal named craft Lnet/minecraft/recipe/TippedArrowRecipe;craft(Lnet/minecraft/recipe/CraftingRecipeInput;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/item/ItemStack;}
     */
-   public ItemStack craft(C_euomljmv arg, HolderLookup.Provider arg2) {
-      ItemStack lv = arg.m_oajnzqrl(1, 1);
+   public ItemStack craft(CraftingRecipeInput arg, HolderLookup.Provider arg2) {
+      ItemStack lv = arg.getStack(1, 1);
       if (!lv.isOf(Items.LINGERING_POTION)) {
          return ItemStack.EMPTY;
       } else {
diff -bur namedTargetSrc/net/minecraft/recipe/TransformSmithingRecipe.java namedSrc/net/minecraft/recipe/TransformSmithingRecipe.java
--- namedTargetSrc/net/minecraft/recipe/TransformSmithingRecipe.java	2024-05-29 02:40:39.217173551 +0000
+++ namedSrc/net/minecraft/recipe/TransformSmithingRecipe.java	2024-05-29 02:39:30.237413547 +0000
@@ -49,9 +49,9 @@
 
    /**
     * @mapping {@literal hashed m_bxuiruug Lnet/minecraft/unmapped/C_lsbkbfik;m_bxuiruug(Lnet/minecraft/unmapped/C_lirxnobg;Lnet/minecraft/unmapped/C_cdctfzbn;)Z}
-    * @mapping {@literal named m_jjsxdttb Lnet/minecraft/recipe/TransformSmithingRecipe;m_jjsxdttb(Lnet/minecraft/unmapped/C_lirxnobg;Lnet/minecraft/world/World;)Z}
+    * @mapping {@literal named matches Lnet/minecraft/recipe/TransformSmithingRecipe;matches(Lnet/minecraft/unmapped/C_lirxnobg;Lnet/minecraft/world/World;)Z}
     */
-   public boolean m_jjsxdttb(C_lirxnobg arg, World world) {
+   public boolean matches(C_lirxnobg arg, World world) {
       return this.template.test(arg.template()) && this.base.test(arg.base()) && this.addition.test(arg.addition());
    }
 
@@ -69,7 +69,7 @@
     * Mapping not found
     */
    @Override
-   public ItemStack getResult(HolderLookup.Provider arg) {
+   public ItemStack getResult(HolderLookup.Provider lookupProvider) {
       return this.result;
    }
 
diff -bur namedTargetSrc/net/minecraft/recipe/TrimSmithingRecipe.java namedSrc/net/minecraft/recipe/TrimSmithingRecipe.java
--- namedTargetSrc/net/minecraft/recipe/TrimSmithingRecipe.java	2024-05-29 02:40:39.265173332 +0000
+++ namedSrc/net/minecraft/recipe/TrimSmithingRecipe.java	2024-05-29 02:39:30.297413327 +0000
@@ -52,10 +52,10 @@
    }
 
    /**
-    * @mapping {@literal hashed m_jjsxdttb Lnet/minecraft/unmapped/C_ngeyonui;m_jjsxdttb(Lnet/minecraft/unmapped/C_lirxnobg;Lnet/minecraft/unmapped/C_cdctfzbn;)Z}
-    * @mapping {@literal named m_jjsxdttb Lnet/minecraft/recipe/TrimSmithingRecipe;m_jjsxdttb(Lnet/minecraft/unmapped/C_lirxnobg;Lnet/minecraft/world/World;)Z}
+    * @mapping {@literal hashed m_sdrlirpj Lnet/minecraft/unmapped/C_ngeyonui;m_sdrlirpj(Lnet/minecraft/unmapped/C_lirxnobg;Lnet/minecraft/unmapped/C_cdctfzbn;)Z}
+    * @mapping {@literal named matches Lnet/minecraft/recipe/TrimSmithingRecipe;matches(Lnet/minecraft/unmapped/C_lirxnobg;Lnet/minecraft/world/World;)Z}
     */
-   public boolean m_jjsxdttb(C_lirxnobg arg, World world) {
+   public boolean matches(C_lirxnobg arg, World world) {
       return this.template.test(arg.template()) && this.base.test(arg.base()) && this.addition.test(arg.addition());
    }
 
@@ -87,10 +87,11 @@
     * Mapping not found
     */
    @Override
-   public ItemStack getResult(HolderLookup.Provider arg) {
+   public ItemStack getResult(HolderLookup.Provider lookupProvider) {
       ItemStack lv = new ItemStack(Items.IRON_CHESTPLATE);
-      Optional<Holder.Reference<ArmorTrimPattern>> optional = arg.getLookupOrThrow(RegistryKeys.TRIM_PATTERN).holders().findFirst();
-      Optional<Holder.Reference<ArmorTrimMaterial>> optional2 = arg.getLookupOrThrow(RegistryKeys.TRIM_MATERIAL).getHolder(ArmorTrimMaterials.REDSTONE);
+      Optional<Holder.Reference<ArmorTrimPattern>> optional = lookupProvider.getLookupOrThrow(RegistryKeys.TRIM_PATTERN).holders().findFirst();
+      Optional<Holder.Reference<ArmorTrimMaterial>> optional2 = lookupProvider.getLookupOrThrow(RegistryKeys.TRIM_MATERIAL)
+         .getHolder(ArmorTrimMaterials.REDSTONE);
       if (optional.isPresent() && optional2.isPresent()) {
          lv.set(DataComponentTypes.TRIM, new ArmorTrimPermutation((Holder<ArmorTrimMaterial>)optional2.get(), (Holder<ArmorTrimPattern>)optional.get()));
       }
diff -bur namedTargetSrc/net/minecraft/screen/AbstractFurnaceScreenHandler.java namedSrc/net/minecraft/screen/AbstractFurnaceScreenHandler.java
--- namedTargetSrc/net/minecraft/screen/AbstractFurnaceScreenHandler.java	2024-05-29 02:40:39.277173277 +0000
+++ namedSrc/net/minecraft/screen/AbstractFurnaceScreenHandler.java	2024-05-29 02:39:30.317413254 +0000
@@ -11,11 +11,11 @@
 import net.minecraft.recipe.RecipeInputProvider;
 import net.minecraft.recipe.RecipeMatcher;
 import net.minecraft.recipe.RecipeType;
+import net.minecraft.recipe.SingleStackRecipeInput;
 import net.minecraft.recipe.book.RecipeBookCategory;
 import net.minecraft.screen.slot.FurnaceFuelSlot;
 import net.minecraft.screen.slot.FurnaceOutputSlot;
 import net.minecraft.screen.slot.Slot;
-import net.minecraft.unmapped.C_hsoxiypb;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.World;
 
@@ -23,7 +23,7 @@
  * @mapping {@literal hashed net/minecraft/unmapped/C_hgcbvrbw}
  * @mapping {@literal named net/minecraft/screen/AbstractFurnaceScreenHandler}
  */
-public abstract class AbstractFurnaceScreenHandler extends AbstractRecipeScreenHandler<C_hsoxiypb, AbstractCookingRecipe> {
+public abstract class AbstractFurnaceScreenHandler extends AbstractRecipeScreenHandler<SingleStackRecipeInput, AbstractCookingRecipe> {
    /**
     * @mapping {@literal hashed f_mowsrkrf Lnet/minecraft/unmapped/C_hgcbvrbw;f_mowsrkrf:I}
     * @mapping {@literal named INGREDIENT_SLOT Lnet/minecraft/screen/AbstractFurnaceScreenHandler;INGREDIENT_SLOT:I}
@@ -171,7 +171,7 @@
     */
    @Override
    public boolean matches(RecipeHolder<AbstractCookingRecipe> recipe) {
-      return recipe.value().m_jjsxdttb(new C_hsoxiypb(this.inventory.getStack(0)), this.world);
+      return recipe.value().matches(new SingleStackRecipeInput(this.inventory.getStack(0)), this.world);
    }
 
    /**
@@ -271,7 +271,7 @@
     * @mapping {@literal named isSmeltable Lnet/minecraft/screen/AbstractFurnaceScreenHandler;isSmeltable(Lnet/minecraft/item/ItemStack;)Z}
     */
    protected boolean isSmeltable(ItemStack itemStack) {
-      return this.world.getRecipeManager().m_omtmmszf(this.recipeType, new C_hsoxiypb(itemStack), this.world).isPresent();
+      return this.world.getRecipeManager().m_omtmmszf(this.recipeType, new SingleStackRecipeInput(itemStack), this.world).isPresent();
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/screen/AbstractRecipeScreenHandler.java namedSrc/net/minecraft/screen/AbstractRecipeScreenHandler.java
--- namedTargetSrc/net/minecraft/screen/AbstractRecipeScreenHandler.java	2024-05-29 02:40:39.349172949 +0000
+++ namedSrc/net/minecraft/screen/AbstractRecipeScreenHandler.java	2024-05-29 02:39:30.409412916 +0000
@@ -3,16 +3,16 @@
 import net.minecraft.recipe.InputSlotFiller;
 import net.minecraft.recipe.Recipe;
 import net.minecraft.recipe.RecipeHolder;
+import net.minecraft.recipe.RecipeInput;
 import net.minecraft.recipe.RecipeMatcher;
 import net.minecraft.recipe.book.RecipeBookCategory;
 import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.unmapped.C_cxmcihwl;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_mugvwvfp}
  * @mapping {@literal named net/minecraft/screen/AbstractRecipeScreenHandler}
  */
-public abstract class AbstractRecipeScreenHandler<I extends C_cxmcihwl, R extends Recipe<I>> extends ScreenHandler {
+public abstract class AbstractRecipeScreenHandler<I extends RecipeInput, R extends Recipe<I>> extends ScreenHandler {
    /**
     * Mapping not found
     */
diff -bur namedTargetSrc/net/minecraft/screen/CrafterScreenHandler.java namedSrc/net/minecraft/screen/CrafterScreenHandler.java
--- namedTargetSrc/net/minecraft/screen/CrafterScreenHandler.java	2024-05-29 02:40:39.293173204 +0000
+++ namedSrc/net/minecraft/screen/CrafterScreenHandler.java	2024-05-29 02:39:30.341413165 +0000
@@ -9,11 +9,11 @@
 import net.minecraft.inventory.RecipeInputInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.recipe.CraftingRecipe;
+import net.minecraft.recipe.CraftingRecipeInput;
 import net.minecraft.screen.slot.CrafterOutputSlot;
 import net.minecraft.screen.slot.CrafterSlot;
 import net.minecraft.screen.slot.Slot;
 import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.unmapped.C_euomljmv;
 import net.minecraft.world.World;
 
 /**
@@ -196,7 +196,7 @@
    private void update() {
       if (this.player instanceof ServerPlayerEntity lv) {
          World lv2 = lv.getWorld();
-         C_euomljmv lv3 = this.inventory.m_tegcmbjp();
+         CraftingRecipeInput lv3 = this.inventory.m_tegcmbjp();
          ItemStack lv4 = (ItemStack)CrafterBlock.m_jtimyngh(lv2, lv3)
             .map(arg3 -> ((CraftingRecipe)arg3.value()).craft(lv3, lv2.getRegistryManager()))
             .orElse(ItemStack.EMPTY);
diff -bur namedTargetSrc/net/minecraft/screen/CraftingScreenHandler.java namedSrc/net/minecraft/screen/CraftingScreenHandler.java
--- namedTargetSrc/net/minecraft/screen/CraftingScreenHandler.java	2024-05-29 02:40:39.161173805 +0000
+++ namedSrc/net/minecraft/screen/CraftingScreenHandler.java	2024-05-29 02:39:30.165413803 +0000
@@ -11,6 +11,7 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.network.packet.s2c.play.ScreenHandlerSlotUpdateS2CPacket;
 import net.minecraft.recipe.CraftingRecipe;
+import net.minecraft.recipe.CraftingRecipeInput;
 import net.minecraft.recipe.RecipeHolder;
 import net.minecraft.recipe.RecipeMatcher;
 import net.minecraft.recipe.RecipeType;
@@ -18,7 +19,6 @@
 import net.minecraft.screen.slot.CraftingResultSlot;
 import net.minecraft.screen.slot.Slot;
 import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.unmapped.C_euomljmv;
 import net.minecraft.world.World;
 import org.jetbrains.annotations.Nullable;
 
@@ -26,7 +26,7 @@
  * @mapping {@literal hashed net/minecraft/unmapped/C_pzocurxr}
  * @mapping {@literal named net/minecraft/screen/CraftingScreenHandler}
  */
-public class CraftingScreenHandler extends AbstractRecipeScreenHandler<C_euomljmv, CraftingRecipe> {
+public class CraftingScreenHandler extends AbstractRecipeScreenHandler<CraftingRecipeInput, CraftingRecipe> {
    /**
     * @mapping {@literal hashed f_juvnlzdq Lnet/minecraft/unmapped/C_pzocurxr;f_juvnlzdq:I}
     * @mapping {@literal named RESULT_SLOT Lnet/minecraft/screen/CraftingScreenHandler;RESULT_SLOT:I}
@@ -135,7 +135,7 @@
       @Nullable RecipeHolder<CraftingRecipe> value
    ) {
       if (!world.isClient) {
-         C_euomljmv lv = arg4.m_tegcmbjp();
+         CraftingRecipeInput lv = arg4.m_tegcmbjp();
          ServerPlayerEntity lv2 = (ServerPlayerEntity)player;
          ItemStack lv3 = ItemStack.EMPTY;
          Optional<RecipeHolder<CraftingRecipe>> optional = world.getServer().getRecipeManager().m_igyegyvq(RecipeType.CRAFTING, lv, world, value);
@@ -205,7 +205,7 @@
     */
    @Override
    public boolean matches(RecipeHolder<CraftingRecipe> recipe) {
-      return recipe.value().m_jjsxdttb(this.input.m_tegcmbjp(), this.player.getWorld());
+      return recipe.value().matches(this.input.m_tegcmbjp(), this.player.getWorld());
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/screen/PlayerScreenHandler.java namedSrc/net/minecraft/screen/PlayerScreenHandler.java
--- namedTargetSrc/net/minecraft/screen/PlayerScreenHandler.java	2024-05-29 02:40:39.325173058 +0000
+++ namedSrc/net/minecraft/screen/PlayerScreenHandler.java	2024-05-29 02:39:30.381413019 +0000
@@ -11,12 +11,12 @@
 import net.minecraft.inventory.RecipeInputInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.recipe.CraftingRecipe;
+import net.minecraft.recipe.CraftingRecipeInput;
 import net.minecraft.recipe.RecipeHolder;
 import net.minecraft.recipe.RecipeMatcher;
 import net.minecraft.recipe.book.RecipeBookCategory;
 import net.minecraft.screen.slot.CraftingResultSlot;
 import net.minecraft.screen.slot.Slot;
-import net.minecraft.unmapped.C_euomljmv;
 import net.minecraft.unmapped.C_juhuipme;
 import net.minecraft.util.Identifier;
 
@@ -24,7 +24,7 @@
  * @mapping {@literal hashed net/minecraft/unmapped/C_wgehrbdx}
  * @mapping {@literal named net/minecraft/screen/PlayerScreenHandler}
  */
-public class PlayerScreenHandler extends AbstractRecipeScreenHandler<C_euomljmv, CraftingRecipe> {
+public class PlayerScreenHandler extends AbstractRecipeScreenHandler<CraftingRecipeInput, CraftingRecipe> {
    /**
     * @mapping {@literal hashed f_nbvmvvaf Lnet/minecraft/unmapped/C_wgehrbdx;f_nbvmvvaf:I}
     * @mapping {@literal named CONTAINER_ID Lnet/minecraft/screen/PlayerScreenHandler;CONTAINER_ID:I}
@@ -241,7 +241,7 @@
     */
    @Override
    public boolean matches(RecipeHolder<CraftingRecipe> recipe) {
-      return recipe.value().m_jjsxdttb(this.craftingInput.m_tegcmbjp(), this.owner.getWorld());
+      return recipe.value().matches(this.craftingInput.m_tegcmbjp(), this.owner.getWorld());
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/screen/slot/CraftingResultSlot.java namedSrc/net/minecraft/screen/slot/CraftingResultSlot.java
--- namedTargetSrc/net/minecraft/screen/slot/CraftingResultSlot.java	2024-05-29 02:40:39.369172858 +0000
+++ namedSrc/net/minecraft/screen/slot/CraftingResultSlot.java	2024-05-29 02:39:30.433412829 +0000
@@ -4,8 +4,8 @@
 import net.minecraft.inventory.Inventory;
 import net.minecraft.inventory.RecipeInputInventory;
 import net.minecraft.item.ItemStack;
+import net.minecraft.recipe.CraftingRecipeInput;
 import net.minecraft.recipe.RecipeType;
-import net.minecraft.unmapped.C_euomljmv;
 import net.minecraft.unmapped.C_mudajugr;
 import net.minecraft.util.collection.DefaultedList;
 
@@ -99,17 +99,17 @@
    @Override
    public void onTakeItem(PlayerEntity player, ItemStack stack) {
       this.onCrafted(stack);
-      C_euomljmv.C_yjgdhrsl lv = this.input.m_mjhyecbx();
-      C_euomljmv lv2 = lv.input();
+      CraftingRecipeInput.Positioned lv = this.input.m_mjhyecbx();
+      CraftingRecipeInput lv2 = lv.input();
       int i = lv.left();
       int j = lv.top();
       DefaultedList<ItemStack> lv3 = player.getWorld().getRecipeManager().m_pgjmabyy(RecipeType.CRAFTING, lv2, player.getWorld());
 
-      for (int k = 0; k < lv2.m_plfjjrel(); k++) {
-         for (int l = 0; l < lv2.m_dhcnljxm(); l++) {
+      for (int k = 0; k < lv2.getHeight(); k++) {
+         for (int l = 0; l < lv2.getWidth(); l++) {
             int m = l + i + (k + j) * this.input.getWidth();
             ItemStack lv4 = this.input.getStack(m);
-            ItemStack lv5 = lv3.get(l + k * lv2.m_dhcnljxm());
+            ItemStack lv5 = lv3.get(l + k * lv2.getWidth());
             if (!lv4.isEmpty()) {
                this.input.removeStack(m, 1);
                lv4 = this.input.getStack(m);
diff -bur namedTargetSrc/net/minecraft/screen/SmithingScreenHandler.java namedSrc/net/minecraft/screen/SmithingScreenHandler.java
--- namedTargetSrc/net/minecraft/screen/SmithingScreenHandler.java	2024-05-29 02:40:39.365172877 +0000
+++ namedSrc/net/minecraft/screen/SmithingScreenHandler.java	2024-05-29 02:39:30.429412843 +0000
@@ -128,7 +128,7 @@
     */
    @Override
    protected boolean canTakeOutput(PlayerEntity player, boolean present) {
-      return this.currentRecipe != null && this.currentRecipe.value().m_jjsxdttb(this.m_frcbzqrh(), this.world);
+      return this.currentRecipe != null && this.currentRecipe.value().matches(this.m_frcbzqrh(), this.world);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/screen/StonecutterScreenHandler.java namedSrc/net/minecraft/screen/StonecutterScreenHandler.java
--- namedTargetSrc/net/minecraft/screen/StonecutterScreenHandler.java	2024-05-29 02:40:39.161173805 +0000
+++ namedSrc/net/minecraft/screen/StonecutterScreenHandler.java	2024-05-29 02:39:30.165413803 +0000
@@ -12,11 +12,11 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.recipe.RecipeHolder;
 import net.minecraft.recipe.RecipeType;
+import net.minecraft.recipe.SingleStackRecipeInput;
 import net.minecraft.recipe.StonecuttingRecipe;
 import net.minecraft.screen.slot.Slot;
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.unmapped.C_hsoxiypb;
 import net.minecraft.world.World;
 
 /**
@@ -267,8 +267,8 @@
    /**
     * Mapping not found
     */
-   private static C_hsoxiypb m_jpkcfkpc(Inventory arg) {
-      return new C_hsoxiypb(arg.getStack(0));
+   private static SingleStackRecipeInput m_jpkcfkpc(Inventory arg) {
+      return new SingleStackRecipeInput(arg.getStack(0));
    }
 
    /**
@@ -351,7 +351,7 @@
             if (!this.insertItem(lv3, 2, 38, false)) {
                return ItemStack.EMPTY;
             }
-         } else if (this.world.getRecipeManager().m_omtmmszf(RecipeType.STONECUTTING, new C_hsoxiypb(lv3), this.world).isPresent()) {
+         } else if (this.world.getRecipeManager().m_omtmmszf(RecipeType.STONECUTTING, new SingleStackRecipeInput(lv3), this.world).isPresent()) {
             if (!this.insertItem(lv3, 0, 1, false)) {
                return ItemStack.EMPTY;
             }
diff -bur namedTargetSrc/net/minecraft/server/MinecraftServer.java namedSrc/net/minecraft/server/MinecraftServer.java
--- namedTargetSrc/net/minecraft/server/MinecraftServer.java	2024-05-29 02:40:39.357172913 +0000
+++ namedSrc/net/minecraft/server/MinecraftServer.java	2024-05-29 02:39:30.421412873 +0000
@@ -658,7 +658,7 @@
          this.structureTemplateManager = new StructureTemplateManager(worldStem.resourceManager(), session, dataFixer, lv);
          this.serverThread = serverThread;
          this.workerExecutor = Util.getMainWorkerExecutor();
-         this.f_vssobraf = BrewingRecipeRegistry.m_bwccxzca(this.saveProperties.getEnabledFlags());
+         this.f_vssobraf = BrewingRecipeRegistry.create(this.saveProperties.getEnabledFlags());
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/structure/DesertTempleGenerator.java namedSrc/net/minecraft/structure/DesertTempleGenerator.java
--- namedTargetSrc/net/minecraft/structure/DesertTempleGenerator.java	2024-05-29 02:40:39.213173568 +0000
+++ namedSrc/net/minecraft/structure/DesertTempleGenerator.java	2024-05-29 02:39:30.233413562 +0000
@@ -485,8 +485,8 @@
       }
 
       RandomGenerator lv = RandomGenerator.createLegacy(world.getSeed()).createPositionalRandomFactory().create(this.offsetPos(startX, y, startZ));
-      int p = lv.rangeInclusive(startX, endX);
-      int q = lv.rangeInclusive(startZ, endZ);
+      int p = lv.range(startX, endX);
+      int q = lv.range(startZ, endZ);
       this.pos = new BlockPos(this.applyXTransform(p, q), this.applyYTransform(y), this.applyZTransform(p, q));
    }
 
diff -bur namedTargetSrc/net/minecraft/test/TestServer.java namedSrc/net/minecraft/test/TestServer.java
--- namedTargetSrc/net/minecraft/test/TestServer.java	2024-05-29 02:40:39.269173313 +0000
+++ namedSrc/net/minecraft/test/TestServer.java	2024-05-29 02:39:30.305413297 +0000
@@ -299,7 +299,7 @@
     * @mapping {@literal named runTestBatches Lnet/minecraft/test/TestServer;runTestBatches(Lnet/minecraft/server/world/ServerWorld;)V}
     */
    private void runTestBatches(ServerWorld world) {
-      BlockPos lv = new BlockPos(world.random.rangeInclusive(-14999992, 14999992), -59, world.random.rangeInclusive(-14999992, 14999992));
+      BlockPos lv = new BlockPos(world.random.range(-14999992, 14999992), -59, world.random.range(-14999992, 14999992));
       TestUtil lv2 = TestUtil.C_hbopzgyi.m_mdhvlunx(this.batches, world).m_emzufvnb(new C_iajlwkhz(lv, 8)).m_abbbvkwq();
       Collection<GameTestState> collection = lv2.m_ienkpsmb();
       this.testSet = new TestSet(collection);
Only in namedTargetSrc/net/minecraft/unmapped: C_cxmcihwl.java
Only in namedTargetSrc/net/minecraft/unmapped: C_euomljmv.java
Only in namedTargetSrc/net/minecraft/unmapped: C_hsoxiypb.java


The remaining diff is too long!

Please sign in to comment.