complete for 1.21.2-pre1 and remove 'account' name · ix0rai/quilt-mappings@37ed413

github-actions · 2024-10-09T02:01:29Z

With commit 37ed413, 244 file(s) were updated with 2023 line(s) added and 1921 removed compared to the latest Quilt Mappings version.

View the diff here (1/3):

diff -bur namedTargetSrc/net/minecraft/advancement/criterion/CriterionValidator.java namedSrc/net/minecraft/advancement/criterion/CriterionValidator.java
--- namedTargetSrc/net/minecraft/advancement/criterion/CriterionValidator.java	2024-10-09 02:01:27.212385248 +0000
+++ namedSrc/net/minecraft/advancement/criterion/CriterionValidator.java	2024-10-09 02:00:18.187012026 +0000
@@ -6,8 +6,8 @@
 import net.minecraft.loot.context.LootContextTypes;
 import net.minecraft.predicate.ContextAwarePredicate;
 import net.minecraft.registry.HolderProvider;
-import net.minecraft.unmapped.C_ykthnceq;
 import net.minecraft.util.ErrorReporter;
+import net.minecraft.util.context.ContextKeySet;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_zybjffid}
@@ -60,16 +60,16 @@
 
    /**
     * @mapping {@literal hashed m_aeyodzvy Lnet/minecraft/unmapped/C_zybjffid;m_aeyodzvy(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_ykthnceq;Ljava/lang/String;)V}
-    * @mapping {@literal named m_aeyodzvy Lnet/minecraft/advancement/criterion/CriterionValidator;m_aeyodzvy(Lnet/minecraft/predicate/ContextAwarePredicate;Lnet/minecraft/unmapped/C_ykthnceq;Ljava/lang/String;)V}
+    * @mapping {@literal named m_aeyodzvy Lnet/minecraft/advancement/criterion/CriterionValidator;m_aeyodzvy(Lnet/minecraft/predicate/ContextAwarePredicate;Lnet/minecraft/util/context/ContextKeySet;Ljava/lang/String;)V}
     */
-   public void m_aeyodzvy(ContextAwarePredicate arg, C_ykthnceq arg2, String name) {
+   public void m_aeyodzvy(ContextAwarePredicate arg, ContextKeySet arg2, String name) {
       arg.validateConditions(new LootTableReporter(this.errorReporter.forChild(name), arg2, this.dataLookup));
    }
 
    /**
     * Mapping not found
     */
-   public void m_ubqpvaoy(List<ContextAwarePredicate> list, C_ykthnceq arg, String string) {
+   public void m_ubqpvaoy(List<ContextAwarePredicate> list, ContextKeySet arg, String string) {
       for (int i = 0; i < list.size(); i++) {
          ContextAwarePredicate lv = (ContextAwarePredicate)list.get(i);
          lv.validateConditions(new LootTableReporter(this.errorReporter.forChild(string + "[" + i + "]"), arg, this.dataLookup));
diff -bur namedTargetSrc/net/minecraft/advancement/PlayerAdvancementTracker.java namedSrc/net/minecraft/advancement/PlayerAdvancementTracker.java
--- namedTargetSrc/net/minecraft/advancement/PlayerAdvancementTracker.java	2024-10-09 02:01:27.044384316 +0000
+++ namedSrc/net/minecraft/advancement/PlayerAdvancementTracker.java	2024-10-09 02:00:18.015011071 +0000
@@ -301,7 +301,7 @@
          if (!bl2 && lv.isComplete()) {
             advancement.data().rewards().apply(this.owner);
             advancement.data().display().ifPresent(display -> {
-               if (display.shouldAnnounceToChat() && this.owner.getServerWorld().m_nendykdu().getBooleanValue(GameRules.ANNOUNCE_ADVANCEMENTS)) {
+               if (display.shouldAnnounceToChat() && this.owner.getServerWorld().getGameRules().getBooleanValue(GameRules.ANNOUNCE_ADVANCEMENTS)) {
                   this.playerManager.broadcastSystemMessage(display.getType().getFormatted(advancement, this.owner), false);
                }
             });
diff -bur namedTargetSrc/net/minecraft/block/BeehiveBlock.java namedSrc/net/minecraft/block/BeehiveBlock.java
--- namedTargetSrc/net/minecraft/block/BeehiveBlock.java	2024-10-09 02:01:27.183385087 +0000
+++ namedSrc/net/minecraft/block/BeehiveBlock.java	2024-10-09 02:00:18.164011898 +0000
@@ -377,7 +377,7 @@
    public BlockState onBreak(World world, BlockPos pos, BlockState state, PlayerEntity player) {
       if (world instanceof ServerWorld lv
          && player.isCreative()
-         && lv.m_nendykdu().getBooleanValue(GameRules.DO_TILE_DROPS)
+         && lv.getGameRules().getBooleanValue(GameRules.DO_TILE_DROPS)
          && world.getBlockEntity(pos) instanceof BeehiveBlockEntity lv3) {
          int i = (Integer)state.get(HONEY_LEVEL);
          boolean bl = !lv3.hasNoBees();
diff -bur namedTargetSrc/net/minecraft/block/Block.java namedSrc/net/minecraft/block/Block.java
--- namedTargetSrc/net/minecraft/block/Block.java	2024-10-09 02:01:27.290385681 +0000
+++ namedSrc/net/minecraft/block/Block.java	2024-10-09 02:00:18.262012442 +0000
@@ -590,7 +590,7 @@
     * @mapping {@literal named dropStack Lnet/minecraft/block/Block;dropStack(Lnet/minecraft/world/World;Ljava/util/function/Supplier;Lnet/minecraft/item/ItemStack;)V}
     */
    private static void dropStack(World world, Supplier<ItemEntity> itemEntitySupplier, ItemStack stack) {
-      if (world instanceof ServerWorld lv && !stack.isEmpty() && lv.m_nendykdu().getBooleanValue(GameRules.DO_TILE_DROPS)) {
+      if (world instanceof ServerWorld lv && !stack.isEmpty() && lv.getGameRules().getBooleanValue(GameRules.DO_TILE_DROPS)) {
          ItemEntity lv3 = (ItemEntity)itemEntitySupplier.get();
          lv3.setToDefaultPickupDelay();
          world.spawnEntity(lv3);
@@ -603,7 +603,7 @@
     * @mapping {@literal named dropExperience Lnet/minecraft/block/Block;dropExperience(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/util/math/BlockPos;I)V}
     */
    protected void dropExperience(ServerWorld world, BlockPos pos, int size) {
-      if (world.m_nendykdu().getBooleanValue(GameRules.DO_TILE_DROPS)) {
+      if (world.getGameRules().getBooleanValue(GameRules.DO_TILE_DROPS)) {
          ExperienceOrbEntity.spawn(world, Vec3d.ofCenter(pos), size);
       }
    }
diff -bur namedTargetSrc/net/minecraft/block/CampfireBlock.java namedSrc/net/minecraft/block/CampfireBlock.java
--- namedTargetSrc/net/minecraft/block/CampfireBlock.java	2024-10-09 02:01:27.198385170 +0000
+++ namedSrc/net/minecraft/block/CampfireBlock.java	2024-10-09 02:00:18.176011965 +0000
@@ -20,6 +20,7 @@
 import net.minecraft.particle.ParticleTypes;
 import net.minecraft.recipe.CampfireCookingRecipe;
 import net.minecraft.recipe.RecipeManager;
+import net.minecraft.recipe.RecipePropertySet;
 import net.minecraft.recipe.RecipeType;
 import net.minecraft.recipe.SingleRecipeInput;
 import net.minecraft.registry.tag.BlockTags;
@@ -31,7 +32,6 @@
 import net.minecraft.state.property.BooleanProperty;
 import net.minecraft.state.property.EnumProperty;
 import net.minecraft.state.property.Properties;
-import net.minecraft.unmapped.C_jgqrwysz;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.BlockMirror;
 import net.minecraft.util.BlockRotation;
@@ -150,7 +150,7 @@
    protected ActionResult onInteract(ItemStack stack, BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult result) {
       if (world.getBlockEntity(pos) instanceof CampfireBlockEntity lv2) {
          ItemStack lv3 = player.getStackInHand(hand);
-         if (world.m_mlvimbbc().m_kdokqbcz(C_jgqrwysz.CAMPFIRE_INPUT).m_dhkmmoeu(lv3)) {
+         if (world.m_mlvimbbc().getPropertySet(RecipePropertySet.CAMPFIRE_INPUT).test(lv3)) {
             if (world instanceof ServerWorld lv4 && lv2.addItem(lv4, player, lv3)) {
                player.incrementStat(Stats.INTERACT_WITH_CAMPFIRE);
                return ActionResult.SUCCESS_SERVER;
diff -bur namedTargetSrc/net/minecraft/block/CommandBlock.java namedSrc/net/minecraft/block/CommandBlock.java
--- namedTargetSrc/net/minecraft/block/CommandBlock.java	2024-10-09 02:01:27.181385076 +0000
+++ namedSrc/net/minecraft/block/CommandBlock.java	2024-10-09 02:00:18.163011892 +0000
@@ -210,7 +210,7 @@
          CommandBlockExecutor lv4 = lv2.getCommandExecutor();
          if (world instanceof ServerWorld lv5) {
             if (!stack.contains(DataComponentTypes.BLOCK_ENTITY_DATA)) {
-               lv4.setTrackingOutput(lv5.m_nendykdu().getBooleanValue(GameRules.SEND_COMMAND_FEEDBACK));
+               lv4.setTrackingOutput(lv5.getGameRules().getBooleanValue(GameRules.SEND_COMMAND_FEEDBACK));
                lv2.setAuto(this.auto);
             }
 
@@ -266,7 +266,7 @@
     */
    private static void executeCommandChain(ServerWorld world, BlockPos pos, Direction facing) {
       BlockPos.Mutable lv = pos.mutableCopy();
-      GameRules lv2 = world.m_nendykdu();
+      GameRules lv2 = world.getGameRules();
       int i = lv2.getIntValue(GameRules.MAX_COMMAND_CHAIN_LENGTH);
 
       while (i-- > 0) {
diff -bur namedTargetSrc/net/minecraft/block/CrafterBlock.java namedSrc/net/minecraft/block/CrafterBlock.java
--- namedTargetSrc/net/minecraft/block/CrafterBlock.java	2024-10-09 02:01:27.067384443 +0000
+++ namedSrc/net/minecraft/block/CrafterBlock.java	2024-10-09 02:00:18.041011216 +0000
@@ -249,7 +249,7 @@
                lv5.onCraft(world);
                this.craft(world, pos, lv, lv5, state, lv4);
 
-               for (ItemStack lv6 : lv4.value().m_gizwrcid(var11)) {
+               for (ItemStack lv6 : lv4.value().getRecipeRemainders(var11)) {
                   if (!lv6.isEmpty()) {
                      this.craft(world, pos, lv, lv6, state, lv4);
                   }
diff -bur namedTargetSrc/net/minecraft/block/CropBlock.java namedSrc/net/minecraft/block/CropBlock.java
--- namedTargetSrc/net/minecraft/block/CropBlock.java	2024-10-09 02:01:26.999384066 +0000
+++ namedSrc/net/minecraft/block/CropBlock.java	2024-10-09 02:00:17.959010761 +0000
@@ -242,7 +242,7 @@
     */
    @Override
    protected void onEntityCollision(BlockState state, World world, BlockPos pos, Entity entity) {
-      if (world instanceof ServerWorld lv && entity instanceof RavagerEntity && lv.m_nendykdu().getBooleanValue(GameRules.DO_MOB_GRIEFING)) {
+      if (world instanceof ServerWorld lv && entity instanceof RavagerEntity && lv.getGameRules().getBooleanValue(GameRules.DO_MOB_GRIEFING)) {
          lv.breakBlock(pos, true, entity);
       }
 
diff -bur namedTargetSrc/net/minecraft/block/entity/AbstractFurnaceBlockEntity.java namedSrc/net/minecraft/block/entity/AbstractFurnaceBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/AbstractFurnaceBlockEntity.java	2024-10-09 02:01:27.069384455 +0000
+++ namedSrc/net/minecraft/block/entity/AbstractFurnaceBlockEntity.java	2024-10-09 02:00:18.042011221 +0000
@@ -19,6 +19,7 @@
 import net.minecraft.recipe.AbstractCookingRecipe;
 import net.minecraft.recipe.CraftingHandler;
 import net.minecraft.recipe.Recipe;
+import net.minecraft.recipe.RecipeFinder;
 import net.minecraft.recipe.RecipeHolder;
 import net.minecraft.recipe.RecipeInputProvider;
 import net.minecraft.recipe.RecipeManager;
@@ -31,7 +32,6 @@
 import net.minecraft.screen.PropertyDelegate;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.server.world.ServerWorld;
-import net.minecraft.unmapped.C_fcquvjby;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.collection.DefaultedList;
 import net.minecraft.util.math.BlockPos;
@@ -294,7 +294,7 @@
                   Item lv6 = lv.getItem();
                   lv.decrement(1);
                   if (lv.isEmpty()) {
-                     blockEntity.inventory.set(1, lv6.m_kdfhbywf());
+                     blockEntity.inventory.set(1, lv6.getRecipeRemainder());
                   }
                }
             }
@@ -405,7 +405,7 @@
     */
    private static int getCookTime(ServerWorld world, AbstractFurnaceBlockEntity blockEntity) {
       SingleRecipeInput lv = new SingleRecipeInput(blockEntity.getStack(0));
-      return (Integer)blockEntity.recipeCache.getFirstMatch(lv, world).map(recipe -> ((AbstractCookingRecipe)recipe.value()).m_sdqrhyci()).orElse(200);
+      return (Integer)blockEntity.recipeCache.getFirstMatch(lv, world).map(recipe -> ((AbstractCookingRecipe)recipe.value()).getCookTime()).orElse(200);
    }
 
    /**
@@ -545,7 +545,7 @@
       for (Entry<RegistryKey<Recipe<?>>> entry : this.recipesUsed.reference2IntEntrySet()) {
          world.m_mlvimbbc().get((RegistryKey<Recipe<?>>)entry.getKey()).ifPresent(recipe -> {
             list.add(recipe);
-            dropExperience(world, pos, entry.getIntValue(), ((AbstractCookingRecipe)recipe.value()).m_tmbqodoo());
+            dropExperience(world, pos, entry.getIntValue(), ((AbstractCookingRecipe)recipe.value()).getExperience());
          });
       }
 
@@ -568,12 +568,12 @@
 
    /**
     * @mapping {@literal hashed fillStackedContents Lnet/minecraft/unmapped/C_dlxbwxyf;fillStackedContents(Lnet/minecraft/unmapped/C_fcquvjby;)V}
-    * @mapping {@literal named fillStackedContents Lnet/minecraft/block/entity/AbstractFurnaceBlockEntity;fillStackedContents(Lnet/minecraft/unmapped/C_fcquvjby;)V}
+    * @mapping {@literal named fillStackedContents Lnet/minecraft/block/entity/AbstractFurnaceBlockEntity;fillStackedContents(Lnet/minecraft/recipe/RecipeFinder;)V}
     */
    @Override
-   public void fillStackedContents(C_fcquvjby arg) {
+   public void fillStackedContents(RecipeFinder arg) {
       for (ItemStack lv : this.inventory) {
-         arg.m_hwvldlvh(lv);
+         arg.addInput(lv);
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/entity/BrewingStandBlockEntity.java namedSrc/net/minecraft/block/entity/BrewingStandBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/BrewingStandBlockEntity.java	2024-10-09 02:01:27.126384771 +0000
+++ namedSrc/net/minecraft/block/entity/BrewingStandBlockEntity.java	2024-10-09 02:00:18.107011582 +0000
@@ -193,7 +193,7 @@
          markDirty(world, pos, state);
       }
 
-      boolean bl = canCraft(world.m_gbuudpbq(), blockEntity.inventory);
+      boolean bl = canCraft(world.getBrewingRecipeRegistry(), blockEntity.inventory);
       boolean bl2 = blockEntity.brewTime > 0;
       ItemStack lv2 = blockEntity.inventory.get(3);
       if (bl2) {
@@ -273,14 +273,14 @@
     */
    private static void craft(World world, BlockPos pos, DefaultedList<ItemStack> slots) {
       ItemStack lv = slots.get(3);
-      BrewingRecipeRegistry lv2 = world.m_gbuudpbq();
+      BrewingRecipeRegistry lv2 = world.getBrewingRecipeRegistry();
 
       for (int i = 0; i < 3; i++) {
          slots.set(i, lv2.craft(lv, slots.get(i)));
       }
 
       lv.decrement(1);
-      ItemStack lv3 = lv.getItem().m_kdfhbywf();
+      ItemStack lv3 = lv.getItem().getRecipeRemainder();
       if (!lv3.isEmpty()) {
          if (lv.isEmpty()) {
             lv = lv3;
@@ -326,7 +326,7 @@
    @Override
    public boolean isValid(int slot, ItemStack stack) {
       if (slot == 3) {
-         BrewingRecipeRegistry lv = this.world != null ? this.world.m_gbuudpbq() : BrewingRecipeRegistry.EMPTY;
+         BrewingRecipeRegistry lv = this.world != null ? this.world.getBrewingRecipeRegistry() : BrewingRecipeRegistry.EMPTY;
          return lv.isTopIngredient(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-10-09 02:01:26.996384050 +0000
+++ namedSrc/net/minecraft/block/entity/CampfireBlockEntity.java	2024-10-09 02:00:17.954010733 +0000
@@ -223,7 +223,7 @@
                return false;
             }
 
-            this.cookingTotalTimes[i] = ((CampfireCookingRecipe)((RecipeHolder)optional.get()).value()).m_sdqrhyci();
+            this.cookingTotalTimes[i] = ((CampfireCookingRecipe)((RecipeHolder)optional.get()).value()).getCookTime();
             this.cookingTimes[i] = 0;
             this.itemsBeingCooked.set(i, item.copyAndConsume(1, source));
             world.emitGameEvent(GameEvent.BLOCK_CHANGE, this.getPos(), GameEvent.Context.create(source, this.getCachedState()));
diff -bur namedTargetSrc/net/minecraft/block/entity/CrafterBlockEntity.java namedSrc/net/minecraft/block/entity/CrafterBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/CrafterBlockEntity.java	2024-10-09 02:01:27.254385481 +0000
+++ namedSrc/net/minecraft/block/entity/CrafterBlockEntity.java	2024-10-09 02:00:18.226012242 +0000
@@ -13,12 +13,12 @@
 import net.minecraft.inventory.RecipeInputInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NbtCompound;
+import net.minecraft.recipe.RecipeFinder;
 import net.minecraft.registry.HolderLookup;
 import net.minecraft.screen.CrafterScreenHandler;
 import net.minecraft.screen.PropertyDelegate;
 import net.minecraft.screen.ScreenHandler;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_fcquvjby;
 import net.minecraft.util.collection.DefaultedList;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
@@ -322,12 +322,12 @@
 
    /**
     * @mapping {@literal hashed fillStackedContents Lnet/minecraft/unmapped/C_lamqkfie;fillStackedContents(Lnet/minecraft/unmapped/C_fcquvjby;)V}
-    * @mapping {@literal named fillStackedContents Lnet/minecraft/block/entity/CrafterBlockEntity;fillStackedContents(Lnet/minecraft/unmapped/C_fcquvjby;)V}
+    * @mapping {@literal named fillStackedContents Lnet/minecraft/block/entity/CrafterBlockEntity;fillStackedContents(Lnet/minecraft/recipe/RecipeFinder;)V}
     */
    @Override
-   public void fillStackedContents(C_fcquvjby arg) {
+   public void fillStackedContents(RecipeFinder arg) {
       for (ItemStack lv : this.inputStacks) {
-         arg.m_mgmvzctj(lv);
+         arg.addInputIfUsable(lv);
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/block/entity/SculkShriekerBlockEntity.java namedSrc/net/minecraft/block/entity/SculkShriekerBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/SculkShriekerBlockEntity.java	2024-10-09 02:01:27.235385376 +0000
+++ namedSrc/net/minecraft/block/entity/SculkShriekerBlockEntity.java	2024-10-09 02:00:18.207012136 +0000
@@ -253,7 +253,7 @@
    private boolean canWarn(ServerWorld world) {
       return (Boolean)this.getCachedState().get(SculkShriekerBlock.CAN_SUMMON)
          && world.getDifficulty() != Difficulty.PEACEFUL
-         && world.m_nendykdu().getBooleanValue(GameRules.DO_WARDEN_SPAWNING);
+         && world.getGameRules().getBooleanValue(GameRules.DO_WARDEN_SPAWNING);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/FarmlandBlock.java namedSrc/net/minecraft/block/FarmlandBlock.java
--- namedTargetSrc/net/minecraft/block/FarmlandBlock.java	2024-10-09 02:01:27.140384849 +0000
+++ namedSrc/net/minecraft/block/FarmlandBlock.java	2024-10-09 02:00:18.123011670 +0000
@@ -157,7 +157,7 @@
       if (world instanceof ServerWorld lv
          && world.random.nextFloat() < fallDistance - 0.5F
          && entity instanceof LivingEntity
-         && (entity instanceof PlayerEntity || lv.m_nendykdu().getBooleanValue(GameRules.DO_MOB_GRIEFING))
+         && (entity instanceof PlayerEntity || lv.getGameRules().getBooleanValue(GameRules.DO_MOB_GRIEFING))
          && entity.getWidth() * entity.getWidth() * entity.getHeight() > 0.512F) {
          setToDirt(entity, state, world, pos);
       }
diff -bur namedTargetSrc/net/minecraft/block/FireBlock.java namedSrc/net/minecraft/block/FireBlock.java
--- namedTargetSrc/net/minecraft/block/FireBlock.java	2024-10-09 02:01:27.107384665 +0000
+++ namedSrc/net/minecraft/block/FireBlock.java	2024-10-09 02:00:18.086011465 +0000
@@ -294,7 +294,7 @@
    @Override
    protected void scheduledTick(BlockState state, ServerWorld world, BlockPos pos, RandomGenerator random) {
       world.scheduleBlockTick(pos, this, getFireTickDelay(world.random));
-      if (world.m_nendykdu().getBooleanValue(GameRules.DO_FIRE_TICK)) {
+      if (world.getGameRules().getBooleanValue(GameRules.DO_FIRE_TICK)) {
          if (!state.canPlaceAt(world, pos)) {
             world.removeBlock(pos, false);
          }
diff -bur namedTargetSrc/net/minecraft/block/InfestedBlock.java namedSrc/net/minecraft/block/InfestedBlock.java
--- namedTargetSrc/net/minecraft/block/InfestedBlock.java	2024-10-09 02:01:27.075384488 +0000
+++ namedSrc/net/minecraft/block/InfestedBlock.java	2024-10-09 02:00:18.052011277 +0000
@@ -109,7 +109,7 @@
    @Override
    protected void onStacksDropped(BlockState state, ServerWorld world, BlockPos pos, ItemStack stack, boolean dropExperience) {
       super.onStacksDropped(state, world, pos, stack, dropExperience);
-      if (world.m_nendykdu().getBooleanValue(GameRules.DO_TILE_DROPS) && !EnchantmentHelper.hasTag(stack, EnchantmentTags.PREVENTS_INFESTED_SPAWNS)) {
+      if (world.getGameRules().getBooleanValue(GameRules.DO_TILE_DROPS) && !EnchantmentHelper.hasTag(stack, EnchantmentTags.PREVENTS_INFESTED_SPAWNS)) {
          this.spawnSilverfish(world, pos);
       }
    }
diff -bur namedTargetSrc/net/minecraft/block/NetherPortalBlock.java namedSrc/net/minecraft/block/NetherPortalBlock.java
--- namedTargetSrc/net/minecraft/block/NetherPortalBlock.java	2024-10-09 02:01:27.216385270 +0000
+++ namedSrc/net/minecraft/block/NetherPortalBlock.java	2024-10-09 02:00:18.191012048 +0000
@@ -110,7 +110,7 @@
    @Override
    protected void randomTick(BlockState state, ServerWorld world, BlockPos pos, RandomGenerator random) {
       if (world.getDimension().natural()
-         && world.m_nendykdu().getBooleanValue(GameRules.DO_MOB_SPAWNING)
+         && world.getGameRules().getBooleanValue(GameRules.DO_MOB_SPAWNING)
          && random.nextInt(2000) < world.getDifficulty().getId()) {
          while (world.getBlockState(pos).isOf(this)) {
             pos = pos.down();
@@ -169,7 +169,7 @@
       return entity instanceof PlayerEntity lv
          ? Math.max(
             0,
-            world.m_nendykdu()
+            world.getGameRules()
                .getIntValue(lv.getAbilities().invulnerable ? GameRules.PLAYERS_NETHER_PORTAL_CREATIVE_DELAY : GameRules.PLAYERS_NETHER_PORTAL_DEFAULT_DELAY)
          )
          : 0;
diff -bur namedTargetSrc/net/minecraft/block/PitcherCropBlock.java namedSrc/net/minecraft/block/PitcherCropBlock.java
--- namedTargetSrc/net/minecraft/block/PitcherCropBlock.java	2024-10-09 02:01:27.227385331 +0000
+++ namedSrc/net/minecraft/block/PitcherCropBlock.java	2024-10-09 02:00:18.200012098 +0000
@@ -187,7 +187,7 @@
     */
    @Override
    public void onEntityCollision(BlockState state, World world, BlockPos pos, Entity entity) {
-      if (world instanceof ServerWorld lv && entity instanceof RavagerEntity && lv.m_nendykdu().getBooleanValue(GameRules.DO_MOB_GRIEFING)) {
+      if (world instanceof ServerWorld lv && entity instanceof RavagerEntity && lv.getGameRules().getBooleanValue(GameRules.DO_MOB_GRIEFING)) {
          lv.breakBlock(pos, true, entity);
       }
 
diff -bur namedTargetSrc/net/minecraft/block/PowderSnowBlock.java namedSrc/net/minecraft/block/PowderSnowBlock.java
--- namedTargetSrc/net/minecraft/block/PowderSnowBlock.java	2024-10-09 02:01:27.055384377 +0000
+++ namedSrc/net/minecraft/block/PowderSnowBlock.java	2024-10-09 02:00:18.026011132 +0000
@@ -126,7 +126,7 @@
       entity.setInPowderSnow(true);
       if (world instanceof ServerWorld lv2) {
          if (entity.isOnFire()
-            && (lv2.m_nendykdu().getBooleanValue(GameRules.DO_MOB_GRIEFING) || entity instanceof PlayerEntity)
+            && (lv2.getGameRules().getBooleanValue(GameRules.DO_MOB_GRIEFING) || entity instanceof PlayerEntity)
             && entity.canModifyAt(lv2, pos)) {
             world.breakBlock(pos, false);
          }
diff -bur namedTargetSrc/net/minecraft/block/TurtleEggBlock.java namedSrc/net/minecraft/block/TurtleEggBlock.java
--- namedTargetSrc/net/minecraft/block/TurtleEggBlock.java	2024-10-09 02:01:27.213385254 +0000
+++ namedSrc/net/minecraft/block/TurtleEggBlock.java	2024-10-09 02:00:18.188012031 +0000
@@ -258,7 +258,7 @@
       if (entity instanceof TurtleEntity || entity instanceof BatEntity) {
          return false;
       } else {
-         return !(entity instanceof LivingEntity) ? false : entity instanceof PlayerEntity || world.m_nendykdu().getBooleanValue(GameRules.DO_MOB_GRIEFING);
+         return !(entity instanceof LivingEntity) ? false : entity instanceof PlayerEntity || world.getGameRules().getBooleanValue(GameRules.DO_MOB_GRIEFING);
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/VineBlock.java namedSrc/net/minecraft/block/VineBlock.java
--- namedTargetSrc/net/minecraft/block/VineBlock.java	2024-10-09 02:01:27.202385193 +0000
+++ namedSrc/net/minecraft/block/VineBlock.java	2024-10-09 02:00:18.179011981 +0000
@@ -298,7 +298,7 @@
     */
    @Override
    protected void randomTick(BlockState state, ServerWorld world, BlockPos pos, RandomGenerator random) {
-      if (world.m_nendykdu().getBooleanValue(GameRules.DO_VINES_SPREAD)) {
+      if (world.getGameRules().getBooleanValue(GameRules.DO_VINES_SPREAD)) {
          if (random.nextInt(4) == 0) {
             Direction lv = Direction.random(random);
             BlockPos lv2 = pos.up();
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/StonecutterScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/StonecutterScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/StonecutterScreen.java	2024-10-09 02:01:27.019384177 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/StonecutterScreen.java	2024-10-09 02:00:17.985010905 +0000
@@ -7,15 +7,15 @@
 import net.minecraft.client.render.RenderLayer;
 import net.minecraft.client.sound.PositionedSoundInstance;
 import net.minecraft.entity.player.PlayerInventory;
+import net.minecraft.recipe.SelectableRecipe;
 import net.minecraft.recipe.StonecuttingRecipe;
+import net.minecraft.recipe.display.SlotDisplay;
+import net.minecraft.recipe.display.SlotDisplayContext;
 import net.minecraft.screen.StonecutterScreenHandler;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_kuhmkefg;
-import net.minecraft.unmapped.C_lahbbtfn;
-import net.minecraft.unmapped.C_qzkacgwi;
-import net.minecraft.unmapped.C_zcrtzabd;
 import net.minecraft.util.Identifier;
+import net.minecraft.util.context.ContextMap;
 import net.minecraft.util.math.MathHelper;
 
 /**
@@ -167,16 +167,16 @@
          int k = this.x + 52;
          int l = this.y + 14;
          int m = this.scrollOffset + 12;
-         C_qzkacgwi.C_kvadugef<StonecuttingRecipe> lv = this.handler.m_facrzrpm();
+         SelectableRecipe.SingleInputSet<StonecuttingRecipe> lv = this.handler.m_facrzrpm();
 
-         for (int n = this.scrollOffset; n < m && n < lv.m_tckkhkkr(); n++) {
+         for (int n = this.scrollOffset; n < m && n < lv.size(); n++) {
             int o = n - this.scrollOffset;
             int p = k + o % 4 * 16;
             int q = l + o / 4 * 18 + 2;
             if (x >= p && x < p + 16 && y >= q && y < q + 18) {
-               C_zcrtzabd lv2 = C_kuhmkefg.m_wzcjjviu(this.client.world);
-               C_lahbbtfn lv3 = ((C_qzkacgwi.C_kkkkgrpx)lv.entries().get(n)).recipe().optionDisplay();
-               graphics.drawTooltip(this.textRenderer, lv3.m_hzkpthfi(lv2), x, y);
+               ContextMap lv2 = SlotDisplayContext.fromWorld(this.client.world);
+               SlotDisplay lv3 = ((SelectableRecipe.SingleInputEntry)lv.entries().get(n)).recipe().optionDisplay();
+               graphics.drawTooltip(this.textRenderer, lv3.resolveFirstStack(lv2), x, y);
             }
          }
       }
@@ -210,16 +210,16 @@
     * @mapping {@literal named renderRecipeIcons Lnet/minecraft/client/gui/screen/ingame/StonecutterScreen;renderRecipeIcons(Lnet/minecraft/client/gui/GuiGraphics;III)V}
     */
    private void renderRecipeIcons(GuiGraphics graphics, int x, int y, int scrollOffset) {
-      C_qzkacgwi.C_kvadugef<StonecuttingRecipe> lv = this.handler.m_facrzrpm();
-      C_zcrtzabd lv2 = C_kuhmkefg.m_wzcjjviu(this.client.world);
+      SelectableRecipe.SingleInputSet<StonecuttingRecipe> lv = this.handler.m_facrzrpm();
+      ContextMap lv2 = SlotDisplayContext.fromWorld(this.client.world);
 
-      for (int l = this.scrollOffset; l < scrollOffset && l < lv.m_tckkhkkr(); l++) {
+      for (int l = this.scrollOffset; l < scrollOffset && l < lv.size(); l++) {
          int m = l - this.scrollOffset;
          int n = x + m % 4 * 16;
          int o = m / 4;
          int p = y + o * 18 + 2;
-         C_lahbbtfn lv3 = ((C_qzkacgwi.C_kkkkgrpx)lv.entries().get(l)).recipe().optionDisplay();
-         graphics.drawItem(lv3.m_hzkpthfi(lv2), n, p);
+         SlotDisplay lv3 = ((SelectableRecipe.SingleInputEntry)lv.entries().get(l)).recipe().optionDisplay();
+         graphics.drawItem(lv3.resolveFirstStack(lv2), n, p);
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/recipe_book/RecipeBookProvider.java namedSrc/net/minecraft/client/gui/screen/recipe_book/RecipeBookProvider.java
--- namedTargetSrc/net/minecraft/client/gui/screen/recipe_book/RecipeBookProvider.java	2024-10-09 02:01:27.294385703 +0000
+++ namedSrc/net/minecraft/client/gui/screen/recipe_book/RecipeBookProvider.java	2024-10-09 02:00:18.267012469 +0000
@@ -2,7 +2,7 @@
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.minecraft.unmapped.C_vhhfbyhp;
+import net.minecraft.recipe.display.RecipeDisplay;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_mtfeisft}
@@ -19,5 +19,5 @@
    /**
     * Mapping not found
     */
-   void m_kzaqfzsb(C_vhhfbyhp arg);
+   void m_kzaqfzsb(RecipeDisplay arg);
 }
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/recipe_book/RecipeBookResults.java namedSrc/net/minecraft/client/gui/screen/recipe_book/RecipeBookResults.java
--- namedTargetSrc/net/minecraft/client/gui/screen/recipe_book/RecipeBookResults.java	2024-10-09 02:01:27.272385581 +0000
+++ namedSrc/net/minecraft/client/gui/screen/recipe_book/RecipeBookResults.java	2024-10-09 02:00:18.243012336 +0000
@@ -17,12 +17,12 @@
 import net.minecraft.client.recipe_book.ClientRecipeBook;
 import net.minecraft.component.DataComponentTypes;
 import net.minecraft.item.ItemStack;
+import net.minecraft.recipe.RecipeDisplayId;
+import net.minecraft.recipe.display.SlotDisplayContext;
 import net.minecraft.text.Text;
 import net.minecraft.unmapped.C_gjevllvc;
-import net.minecraft.unmapped.C_kuhmkefg;
-import net.minecraft.unmapped.C_tglmjehp;
-import net.minecraft.unmapped.C_zcrtzabd;
 import net.minecraft.util.Identifier;
+import net.minecraft.util.context.ContextMap;
 import org.jetbrains.annotations.Nullable;
 import org.lwjgl.glfw.GLFW;
 
@@ -108,10 +108,10 @@
    private ClientRecipeBook recipeBook;
    /**
     * @mapping {@literal hashed f_tincenzl Lnet/minecraft/unmapped/C_hbytyuck;f_tincenzl:Lnet/minecraft/unmapped/C_tglmjehp;}
-    * @mapping {@literal named lastClickedRecipe Lnet/minecraft/client/gui/screen/recipe_book/RecipeBookResults;lastClickedRecipe:Lnet/minecraft/unmapped/C_tglmjehp;}
+    * @mapping {@literal named lastClickedRecipe Lnet/minecraft/client/gui/screen/recipe_book/RecipeBookResults;lastClickedRecipe:Lnet/minecraft/recipe/RecipeDisplayId;}
     */
    @Nullable
-   private C_tglmjehp lastClickedRecipe;
+   private RecipeDisplayId lastClickedRecipe;
    /**
     * @mapping {@literal hashed f_rtknzstf Lnet/minecraft/unmapped/C_hbytyuck;f_rtknzstf:Lnet/minecraft/unmapped/C_ymmazfhq;}
     * @mapping {@literal named resultCollection Lnet/minecraft/client/gui/screen/recipe_book/RecipeBookResults;resultCollection:Lnet/minecraft/client/gui/screen/recipe_book/RecipeResultCollection;}
@@ -175,7 +175,7 @@
     */
    private void refreshResultButtons() {
       int i = 20 * this.currentPage;
-      C_zcrtzabd lv = C_kuhmkefg.m_wzcjjviu(this.client.world);
+      ContextMap lv = SlotDisplayContext.fromWorld(this.client.world);
 
       for (int j = 0; j < this.resultButtons.size(); j++) {
          AnimatedResultButton lv2 = (AnimatedResultButton)this.resultButtons.get(j);
@@ -239,10 +239,10 @@
 
    /**
     * @mapping {@literal hashed m_fjvrlghr Lnet/minecraft/unmapped/C_hbytyuck;m_fjvrlghr()Lnet/minecraft/unmapped/C_tglmjehp;}
-    * @mapping {@literal named getLastClickedRecipe Lnet/minecraft/client/gui/screen/recipe_book/RecipeBookResults;getLastClickedRecipe()Lnet/minecraft/unmapped/C_tglmjehp;}
+    * @mapping {@literal named getLastClickedRecipe Lnet/minecraft/client/gui/screen/recipe_book/RecipeBookResults;getLastClickedRecipe()Lnet/minecraft/recipe/RecipeDisplayId;}
     */
    @Nullable
-   public C_tglmjehp getLastClickedRecipe() {
+   public RecipeDisplayId getLastClickedRecipe() {
       return this.lastClickedRecipe;
    }
 
@@ -288,7 +288,7 @@
          this.refreshResultButtons();
          return true;
       } else {
-         C_zcrtzabd lv = C_kuhmkefg.m_wzcjjviu(this.client.world);
+         ContextMap lv = SlotDisplayContext.fromWorld(this.client.world);
 
          for (AnimatedResultButton lv2 : this.resultButtons) {
             if (lv2.mouseClicked(mouseX, mouseY, button)) {
@@ -320,7 +320,7 @@
    /**
     * Mapping not found
     */
-   public void m_bkosuckj(C_tglmjehp arg) {
+   public void m_bkosuckj(RecipeDisplayId arg) {
       this.f_tjellfdm.m_htznpflj(arg);
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/recipe_book/RecipeResultCollection.java namedSrc/net/minecraft/client/gui/screen/recipe_book/RecipeResultCollection.java
--- namedTargetSrc/net/minecraft/client/gui/screen/recipe_book/RecipeResultCollection.java	2024-10-09 02:01:27.262385526 +0000
+++ namedSrc/net/minecraft/client/gui/screen/recipe_book/RecipeResultCollection.java	2024-10-09 02:00:18.234012286 +0000
@@ -7,11 +7,11 @@
 import java.util.function.Predicate;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.minecraft.unmapped.C_dsptsoym;
-import net.minecraft.unmapped.C_fcquvjby;
-import net.minecraft.unmapped.C_lahbbtfn;
-import net.minecraft.unmapped.C_tglmjehp;
-import net.minecraft.unmapped.C_vhhfbyhp;
+import net.minecraft.recipe.RecipeDisplayEntry;
+import net.minecraft.recipe.RecipeDisplayId;
+import net.minecraft.recipe.RecipeFinder;
+import net.minecraft.recipe.display.RecipeDisplay;
+import net.minecraft.recipe.display.SlotDisplay;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_ymmazfhq}
@@ -22,7 +22,7 @@
    /**
     * Mapping not found
     */
-   private final List<C_dsptsoym> f_hqprznla;
+   private final List<RecipeDisplayEntry> f_hqprznla;
    /**
     * @mapping {@literal hashed f_hmhvlwhe Lnet/minecraft/unmapped/C_ymmazfhq;f_hmhvlwhe:Z}
     * @mapping {@literal named singleOutput Lnet/minecraft/client/gui/screen/recipe_book/RecipeResultCollection;singleOutput:Z}
@@ -32,17 +32,17 @@
     * @mapping {@literal hashed f_dkdnzrri Lnet/minecraft/unmapped/C_ymmazfhq;f_dkdnzrri:Ljava/util/Set;}
     * @mapping {@literal named craftableRecipes Lnet/minecraft/client/gui/screen/recipe_book/RecipeResultCollection;craftableRecipes:Ljava/util/Set;}
     */
-   private final Set<C_tglmjehp> craftableRecipes = new HashSet();
+   private final Set<RecipeDisplayId> craftableRecipes = new HashSet();
    /**
     * Mapping not found
     */
-   private final Set<C_tglmjehp> f_sxmyzmku = new HashSet();
+   private final Set<RecipeDisplayId> f_sxmyzmku = new HashSet();
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_ymmazfhq;<init>(Ljava/util/List;)V}
     * @mapping {@literal named <init> Lnet/minecraft/client/gui/screen/recipe_book/RecipeResultCollection;<init>(Ljava/util/List;)V}
     */
-   public RecipeResultCollection(List<C_dsptsoym> list) {
+   public RecipeResultCollection(List<RecipeDisplayEntry> list) {
       this.f_hqprznla = list;
       if (list.size() <= 1) {
          this.singleOutput = true;
@@ -55,12 +55,12 @@
     * @mapping {@literal hashed m_gmbypkbi Lnet/minecraft/unmapped/C_ymmazfhq;m_gmbypkbi(Ljava/util/List;)Z}
     * @mapping {@literal named shouldHaveSingleOutput Lnet/minecraft/client/gui/screen/recipe_book/RecipeResultCollection;shouldHaveSingleOutput(Ljava/util/List;)Z}
     */
-   private static boolean shouldHaveSingleOutput(List<C_dsptsoym> recipes) {
+   private static boolean shouldHaveSingleOutput(List<RecipeDisplayEntry> recipes) {
       int i = recipes.size();
-      C_lahbbtfn lv = ((C_dsptsoym)recipes.getFirst()).display().result();
+      SlotDisplay lv = ((RecipeDisplayEntry)recipes.getFirst()).display().result();
 
       for (int j = 1; j < i; j++) {
-         C_lahbbtfn lv2 = ((C_dsptsoym)recipes.get(j)).display().result();
+         SlotDisplay lv2 = ((RecipeDisplayEntry)recipes.get(j)).display().result();
          if (!lv2.equals(lv)) {
             return false;
          }
@@ -72,8 +72,8 @@
    /**
     * Mapping not found
     */
-   public void m_ohafphpo(C_fcquvjby arg, Predicate<C_vhhfbyhp> predicate) {
-      for (C_dsptsoym lv : this.f_hqprznla) {
+   public void m_ohafphpo(RecipeFinder arg, Predicate<RecipeDisplay> predicate) {
+      for (RecipeDisplayEntry lv : this.f_hqprznla) {
          boolean bl = predicate.test(lv.display());
          if (bl) {
             this.f_sxmyzmku.add(lv.id());
@@ -81,7 +81,7 @@
             this.f_sxmyzmku.remove(lv.id());
          }
 
-         if (bl && lv.m_dnksqbuz(arg)) {
+         if (bl && lv.isCraftable(arg)) {
             this.craftableRecipes.add(lv.id());
          } else {
             this.craftableRecipes.remove(lv.id());
@@ -91,9 +91,9 @@
 
    /**
     * @mapping {@literal hashed m_zzbnelll Lnet/minecraft/unmapped/C_ymmazfhq;m_zzbnelll(Lnet/minecraft/unmapped/C_tglmjehp;)Z}
-    * @mapping {@literal named isCraftable Lnet/minecraft/client/gui/screen/recipe_book/RecipeResultCollection;isCraftable(Lnet/minecraft/unmapped/C_tglmjehp;)Z}
+    * @mapping {@literal named isCraftable Lnet/minecraft/client/gui/screen/recipe_book/RecipeResultCollection;isCraftable(Lnet/minecraft/recipe/RecipeDisplayId;)Z}
     */
-   public boolean isCraftable(C_tglmjehp arg) {
+   public boolean isCraftable(RecipeDisplayId arg) {
       return this.craftableRecipes.contains(arg);
    }
 
@@ -115,22 +115,22 @@
    /**
     * Mapping not found
     */
-   public List<C_dsptsoym> m_fgwogjif() {
+   public List<RecipeDisplayEntry> m_fgwogjif() {
       return this.f_hqprznla;
    }
 
    /**
     * Mapping not found
     */
-   public List<C_dsptsoym> m_dbqhrjxo(RecipeResultCollection.C_zvqcnrlc arg) {
-      Predicate<C_tglmjehp> predicate = switch (arg) {
+   public List<RecipeDisplayEntry> m_dbqhrjxo(RecipeResultCollection.C_zvqcnrlc arg) {
+      Predicate<RecipeDisplayId> predicate = switch (arg) {
          case ANY -> this.f_sxmyzmku::contains;
          case CRAFTABLE -> this.craftableRecipes::contains;
          case NOT_CRAFTABLE -> argx -> this.f_sxmyzmku.contains(argx) && !this.craftableRecipes.contains(argx);
       };
-      List<C_dsptsoym> list = new ArrayList();
+      List<RecipeDisplayEntry> list = new ArrayList();
 
-      for (C_dsptsoym lv : this.f_hqprznla) {
+      for (RecipeDisplayEntry lv : this.f_hqprznla) {
          if (predicate.test(lv.id())) {
             list.add(lv);
          }
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/button/recipe/book/AnimatedResultButton.java namedSrc/net/minecraft/client/gui/widget/button/recipe/book/AnimatedResultButton.java
--- namedTargetSrc/net/minecraft/client/gui/widget/button/recipe/book/AnimatedResultButton.java	2024-10-09 02:01:27.158384948 +0000
+++ namedSrc/net/minecraft/client/gui/widget/button/recipe/book/AnimatedResultButton.java	2024-10-09 02:00:18.142011776 +0000
@@ -14,13 +14,13 @@
 import net.minecraft.client.gui.widget.ClickableWidget;
 import net.minecraft.client.render.RenderLayer;
 import net.minecraft.item.ItemStack;
+import net.minecraft.recipe.RecipeDisplayEntry;
+import net.minecraft.recipe.RecipeDisplayId;
 import net.minecraft.text.CommonTexts;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_dsptsoym;
 import net.minecraft.unmapped.C_gjevllvc;
-import net.minecraft.unmapped.C_tglmjehp;
-import net.minecraft.unmapped.C_zcrtzabd;
 import net.minecraft.util.Identifier;
+import net.minecraft.util.context.ContextMap;
 import org.lwjgl.glfw.GLFW;
 
 /**
@@ -94,13 +94,13 @@
 
    /**
     * @mapping {@literal hashed m_tpmtoqta Lnet/minecraft/unmapped/C_klcvwyjp;m_tpmtoqta(Lnet/minecraft/unmapped/C_ymmazfhq;ZLnet/minecraft/unmapped/C_hbytyuck;Lnet/minecraft/unmapped/C_zcrtzabd;)V}
-    * @mapping {@literal named showResultCollection Lnet/minecraft/client/gui/widget/button/recipe/book/AnimatedResultButton;showResultCollection(Lnet/minecraft/client/gui/screen/recipe_book/RecipeResultCollection;ZLnet/minecraft/client/gui/screen/recipe_book/RecipeBookResults;Lnet/minecraft/unmapped/C_zcrtzabd;)V}
+    * @mapping {@literal named showResultCollection Lnet/minecraft/client/gui/widget/button/recipe/book/AnimatedResultButton;showResultCollection(Lnet/minecraft/client/gui/screen/recipe_book/RecipeResultCollection;ZLnet/minecraft/client/gui/screen/recipe_book/RecipeBookResults;Lnet/minecraft/util/context/ContextMap;)V}
     */
-   public void showResultCollection(RecipeResultCollection resultCollection, boolean bl, RecipeBookResults results, C_zcrtzabd arg3) {
+   public void showResultCollection(RecipeResultCollection resultCollection, boolean bl, RecipeBookResults results, ContextMap arg3) {
       this.resultCollection = resultCollection;
-      List<C_dsptsoym> list = resultCollection.m_dbqhrjxo(bl ? RecipeResultCollection.C_zvqcnrlc.CRAFTABLE : RecipeResultCollection.C_zvqcnrlc.ANY);
-      this.f_rtemycrr = list.stream().map(arg2 -> new AnimatedResultButton.C_kuqnfeov(arg2.id(), arg2.m_gcmdljav(arg3))).toList();
-      List<C_tglmjehp> list2 = list.stream().map(C_dsptsoym::id).filter(results.getRecipeBook()::m_levormha).toList();
+      List<RecipeDisplayEntry> list = resultCollection.m_dbqhrjxo(bl ? RecipeResultCollection.C_zvqcnrlc.CRAFTABLE : RecipeResultCollection.C_zvqcnrlc.ANY);
+      this.f_rtemycrr = list.stream().map(arg2 -> new AnimatedResultButton.C_kuqnfeov(arg2.id(), arg2.getResults(arg3))).toList();
+      List<RecipeDisplayId> list2 = list.stream().map(RecipeDisplayEntry::id).filter(results.getRecipeBook()::m_levormha).toList();
       if (!list2.isEmpty()) {
          list2.forEach(results::m_bkosuckj);
          this.bounce = 15.0F;
@@ -175,7 +175,7 @@
    /**
     * Mapping not found
     */
-   public C_tglmjehp m_eniiovfb() {
+   public RecipeDisplayId m_eniiovfb() {
       int i = this.f_jnlbxamx.currentIndex() % this.f_rtemycrr.size();
       return ((AnimatedResultButton.C_kuqnfeov)this.f_rtemycrr.get(i)).id;
    }
@@ -238,7 +238,7 @@
     * @mapping {@literal named net/minecraft/client/gui/widget/button/recipe/book/AnimatedResultButton$C_kuqnfeov}
     */
    @Environment(EnvType.CLIENT)
-   static record C_kuqnfeov(C_tglmjehp id, List<ItemStack> displayItems) {
+   static record C_kuqnfeov(RecipeDisplayId id, List<ItemStack> displayItems) {
 
       /**
        * Mapping not found
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/button/recipe/book/RecipeGroupButtonWidget.java namedSrc/net/minecraft/client/gui/widget/button/recipe/book/RecipeGroupButtonWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/button/recipe/book/RecipeGroupButtonWidget.java	2024-10-09 02:01:27.291385686 +0000
+++ namedSrc/net/minecraft/client/gui/widget/button/recipe/book/RecipeGroupButtonWidget.java	2024-10-09 02:00:18.263012447 +0000
@@ -11,7 +11,7 @@
 import net.minecraft.client.recipe_book.ClientRecipeBook;
 import net.minecraft.client.render.RenderLayer;
 import net.minecraft.item.ItemStack;
-import net.minecraft.unmapped.C_dsptsoym;
+import net.minecraft.recipe.RecipeDisplayEntry;
 import net.minecraft.unmapped.C_tygcwhfl;
 import net.minecraft.util.Identifier;
 
@@ -61,7 +61,7 @@
       RecipeResultCollection.C_zvqcnrlc lv = bl ? RecipeResultCollection.C_zvqcnrlc.CRAFTABLE : RecipeResultCollection.C_zvqcnrlc.ANY;
 
       for (RecipeResultCollection lv2 : arg.getResultsForGroup(this.f_glkowyeg.category())) {
-         for (C_dsptsoym lv3 : lv2.m_dbqhrjxo(lv)) {
+         for (RecipeDisplayEntry lv3 : lv2.m_dbqhrjxo(lv)) {
             if (arg.m_levormha(lv3.id())) {
                this.bounce = 15.0F;
                return;
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-10-09 02:01:27.119384732 +0000
+++ namedSrc/net/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget.java	2024-10-09 02:00:18.100011543 +0000
@@ -15,18 +15,18 @@
 import net.minecraft.client.gui.widget.ClickableWidget;
 import net.minecraft.client.render.RenderLayer;
 import net.minecraft.item.ItemStack;
+import net.minecraft.recipe.RecipeDisplayEntry;
+import net.minecraft.recipe.RecipeDisplayId;
+import net.minecraft.recipe.RecipePlacementHelper;
+import net.minecraft.recipe.display.FurnaceRecipeDisplay;
+import net.minecraft.recipe.display.RecipeDisplay;
+import net.minecraft.recipe.display.ShapedCraftingRecipeDisplay;
+import net.minecraft.recipe.display.ShapelessCraftingRecipeDisplay;
+import net.minecraft.recipe.display.SlotDisplay;
 import net.minecraft.text.CommonTexts;
-import net.minecraft.unmapped.C_coojbyml;
-import net.minecraft.unmapped.C_cxwpjuid;
-import net.minecraft.unmapped.C_dsptsoym;
 import net.minecraft.unmapped.C_gjevllvc;
-import net.minecraft.unmapped.C_lahbbtfn;
-import net.minecraft.unmapped.C_ssetfehe;
-import net.minecraft.unmapped.C_tglmjehp;
-import net.minecraft.unmapped.C_vhhfbyhp;
-import net.minecraft.unmapped.C_wfacxbbm;
-import net.minecraft.unmapped.C_zcrtzabd;
 import net.minecraft.util.Identifier;
+import net.minecraft.util.context.ContextMap;
 import net.minecraft.util.math.MathHelper;
 import org.jetbrains.annotations.Nullable;
 
@@ -88,10 +88,10 @@
    private RecipeResultCollection resultCollection;
    /**
     * @mapping {@literal hashed f_lxcxvazz Lnet/minecraft/unmapped/C_ngptzlri;f_lxcxvazz:Lnet/minecraft/unmapped/C_tglmjehp;}
-    * @mapping {@literal named lastClickedRecipe Lnet/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget;lastClickedRecipe:Lnet/minecraft/unmapped/C_tglmjehp;}
+    * @mapping {@literal named lastClickedRecipe Lnet/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget;lastClickedRecipe:Lnet/minecraft/recipe/RecipeDisplayId;}
     */
    @Nullable
-   private C_tglmjehp lastClickedRecipe;
+   private RecipeDisplayId lastClickedRecipe;
    /**
     * Mapping not found
     */
@@ -113,14 +113,14 @@
 
    /**
     * @mapping {@literal hashed m_jmrolnpv Lnet/minecraft/unmapped/C_ngptzlri;m_jmrolnpv(Lnet/minecraft/unmapped/C_ymmazfhq;Lnet/minecraft/unmapped/C_zcrtzabd;ZIIIIF)V}
-    * @mapping {@literal named showAlternativesForResult Lnet/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget;showAlternativesForResult(Lnet/minecraft/client/gui/screen/recipe_book/RecipeResultCollection;Lnet/minecraft/unmapped/C_zcrtzabd;ZIIIIF)V}
+    * @mapping {@literal named showAlternativesForResult Lnet/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget;showAlternativesForResult(Lnet/minecraft/client/gui/screen/recipe_book/RecipeResultCollection;Lnet/minecraft/util/context/ContextMap;ZIIIIF)V}
     */
    public void showAlternativesForResult(
-      RecipeResultCollection results, C_zcrtzabd arg2, boolean bl, int buttonX, int buttonY, int areaCenterX, int areaCenterY, float delta
+      RecipeResultCollection results, ContextMap arg2, boolean bl, int buttonX, int buttonY, int areaCenterX, int areaCenterY, float delta
    ) {
       this.resultCollection = results;
-      List<C_dsptsoym> list = results.m_dbqhrjxo(RecipeResultCollection.C_zvqcnrlc.CRAFTABLE);
-      List<C_dsptsoym> list2 = bl ? Collections.emptyList() : results.m_dbqhrjxo(RecipeResultCollection.C_zvqcnrlc.NOT_CRAFTABLE);
+      List<RecipeDisplayEntry> list = results.m_dbqhrjxo(RecipeResultCollection.C_zvqcnrlc.CRAFTABLE);
+      List<RecipeDisplayEntry> list2 = bl ? Collections.emptyList() : results.m_dbqhrjxo(RecipeResultCollection.C_zvqcnrlc.NOT_CRAFTABLE);
       int m = list.size();
       int n = m + list2.size();
       int o = n <= 16 ? 4 : 5;
@@ -150,7 +150,7 @@
 
       for (int u = 0; u < n; u++) {
          boolean bl2 = u < m;
-         C_dsptsoym lv = bl2 ? (C_dsptsoym)list.get(u) : (C_dsptsoym)list2.get(u - m);
+         RecipeDisplayEntry lv = bl2 ? (RecipeDisplayEntry)list.get(u) : (RecipeDisplayEntry)list2.get(u - m);
          int v = this.buttonX + 4 + 25 * (u % o);
          int w = this.buttonY + 5 + 25 * (u / o);
          if (this.furnace) {
@@ -173,10 +173,10 @@
 
    /**
     * @mapping {@literal hashed m_qpsnwxnr Lnet/minecraft/unmapped/C_ngptzlri;m_qpsnwxnr()Lnet/minecraft/unmapped/C_tglmjehp;}
-    * @mapping {@literal named getLastClickedRecipe Lnet/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget;getLastClickedRecipe()Lnet/minecraft/unmapped/C_tglmjehp;}
+    * @mapping {@literal named getLastClickedRecipe Lnet/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget;getLastClickedRecipe()Lnet/minecraft/recipe/RecipeDisplayId;}
     */
    @Nullable
-   public C_tglmjehp getLastClickedRecipe() {
+   public RecipeDisplayId getLastClickedRecipe() {
       return this.lastClickedRecipe;
    }
 
@@ -268,9 +268,9 @@
    abstract class AlternativeButtonWidget extends ClickableWidget {
       /**
        * @mapping {@literal hashed f_ovqbgned Lnet/minecraft/unmapped/C_ngptzlri$C_kjtjquer;f_ovqbgned:Lnet/minecraft/unmapped/C_tglmjehp;}
-       * @mapping {@literal named recipe Lnet/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget$AlternativeButtonWidget;recipe:Lnet/minecraft/unmapped/C_tglmjehp;}
+       * @mapping {@literal named recipe Lnet/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget$AlternativeButtonWidget;recipe:Lnet/minecraft/recipe/RecipeDisplayId;}
        */
-      final C_tglmjehp recipe;
+      final RecipeDisplayId recipe;
       /**
        * @mapping {@literal hashed f_dnqileiy Lnet/minecraft/unmapped/C_ngptzlri$C_kjtjquer;f_dnqileiy:Z}
        * @mapping {@literal named craftable Lnet/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget$AlternativeButtonWidget;craftable:Z}
@@ -283,12 +283,12 @@
 
       /**
        * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_ngptzlri$C_kjtjquer;<init>(Lnet/minecraft/unmapped/C_ngptzlri;IILnet/minecraft/unmapped/C_tglmjehp;ZLjava/util/List;)V}
-       * @mapping {@literal named <init> Lnet/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget$AlternativeButtonWidget;<init>(Lnet/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget;IILnet/minecraft/unmapped/C_tglmjehp;ZLjava/util/List;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget$AlternativeButtonWidget;<init>(Lnet/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget;IILnet/minecraft/recipe/RecipeDisplayId;ZLjava/util/List;)V}
        */
       public AlternativeButtonWidget(
          final int x,
          final int y,
-         final C_tglmjehp recipe,
+         final RecipeDisplayId recipe,
          final boolean craftable,
          final List<RecipeAlternativesWidget.AlternativeButtonWidget.InputSlot> list
       ) {
@@ -426,34 +426,34 @@
 
       /**
        * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_ngptzlri$C_fadkhljc;<init>(Lnet/minecraft/unmapped/C_ngptzlri;IILnet/minecraft/unmapped/C_tglmjehp;Lnet/minecraft/unmapped/C_vhhfbyhp;Lnet/minecraft/unmapped/C_zcrtzabd;Z)V}
-       * @mapping {@literal named <init> Lnet/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget$C_fadkhljc;<init>(Lnet/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget;IILnet/minecraft/unmapped/C_tglmjehp;Lnet/minecraft/unmapped/C_vhhfbyhp;Lnet/minecraft/unmapped/C_zcrtzabd;Z)V}
+       * @mapping {@literal named <init> Lnet/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget$C_fadkhljc;<init>(Lnet/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget;IILnet/minecraft/recipe/RecipeDisplayId;Lnet/minecraft/recipe/display/RecipeDisplay;Lnet/minecraft/util/context/ContextMap;Z)V}
        */
-      public C_fadkhljc(final int x, final int y, final C_tglmjehp recipe, final C_vhhfbyhp obj, final C_zcrtzabd arg4, final boolean craftable) {
+      public C_fadkhljc(final int x, final int y, final RecipeDisplayId recipe, final RecipeDisplay obj, final ContextMap arg4, final boolean craftable) {
          super(x, y, recipe, craftable, m_nbcvutxn(obj, arg4));
       }
 
       /**
        * @mapping {@literal hashed m_nbcvutxn Lnet/minecraft/unmapped/C_ngptzlri$C_fadkhljc;m_nbcvutxn(Lnet/minecraft/unmapped/C_vhhfbyhp;Lnet/minecraft/unmapped/C_zcrtzabd;)Ljava/util/List;}
-       * @mapping {@literal named m_nbcvutxn Lnet/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget$C_fadkhljc;m_nbcvutxn(Lnet/minecraft/unmapped/C_vhhfbyhp;Lnet/minecraft/unmapped/C_zcrtzabd;)Ljava/util/List;}
+       * @mapping {@literal named m_nbcvutxn Lnet/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget$C_fadkhljc;m_nbcvutxn(Lnet/minecraft/recipe/display/RecipeDisplay;Lnet/minecraft/util/context/ContextMap;)Ljava/util/List;}
        */
-      private static List<RecipeAlternativesWidget.AlternativeButtonWidget.InputSlot> m_nbcvutxn(C_vhhfbyhp obj, C_zcrtzabd arg2) {
+      private static List<RecipeAlternativesWidget.AlternativeButtonWidget.InputSlot> m_nbcvutxn(RecipeDisplay obj, ContextMap arg2) {
          List<RecipeAlternativesWidget.AlternativeButtonWidget.InputSlot> list = new ArrayList();
          Objects.requireNonNull(obj);
          switch (obj) {
-            case C_cxwpjuid lv:
-               C_coojbyml.m_dtccadpi(3, 3, lv.width(), lv.height(), lv.ingredients(), (arg2x, ix, j, k) -> {
-                  List<ItemStack> list2x = arg2x.m_whqywntk(arg2);
+            case ShapedCraftingRecipeDisplay lv:
+               RecipePlacementHelper.placeRecipe(3, 3, lv.width(), lv.height(), lv.ingredients(), (arg2x, ix, j, k) -> {
+                  List<ItemStack> list2x = arg2x.resolveStacks(arg2);
                   if (!list2x.isEmpty()) {
                      list.add(m_dyepijgl(j, k, list2x));
                   }
                });
                break;
-            case C_ssetfehe lv2:
+            case ShapelessCraftingRecipeDisplay lv2:
                label19: {
-                  List<C_lahbbtfn> list2 = lv2.ingredients();
+                  List<SlotDisplay> list2 = lv2.ingredients();
 
                   for (int i = 0; i < list2.size(); i++) {
-                     List<ItemStack> list3 = ((C_lahbbtfn)list2.get(i)).m_whqywntk(arg2);
+                     List<ItemStack> list3 = ((SlotDisplay)list2.get(i)).resolveStacks(arg2);
                      if (!list3.isEmpty()) {
                         list.add(m_dyepijgl(i % 3, i / 3, list3));
                      }
@@ -503,20 +503,21 @@
 
       /**
        * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_ngptzlri$C_saqnuqje;<init>(Lnet/minecraft/unmapped/C_ngptzlri;IILnet/minecraft/unmapped/C_tglmjehp;Lnet/minecraft/unmapped/C_vhhfbyhp;Lnet/minecraft/unmapped/C_zcrtzabd;Z)V}
-       * @mapping {@literal named <init> Lnet/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget$FurnaceAlternativeButtonWidget;<init>(Lnet/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget;IILnet/minecraft/unmapped/C_tglmjehp;Lnet/minecraft/unmapped/C_vhhfbyhp;Lnet/minecraft/unmapped/C_zcrtzabd;Z)V}
+       * @mapping {@literal named <init> Lnet/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget$FurnaceAlternativeButtonWidget;<init>(Lnet/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget;IILnet/minecraft/recipe/RecipeDisplayId;Lnet/minecraft/recipe/display/RecipeDisplay;Lnet/minecraft/util/context/ContextMap;Z)V}
        */
       public FurnaceAlternativeButtonWidget(
-         final int x, final int y, final C_tglmjehp recipe, final C_vhhfbyhp arg3, final C_zcrtzabd arg4, final boolean craftable
+         final int x, final int y, final RecipeDisplayId recipe, final RecipeDisplay arg3, final ContextMap context, final boolean craftable
       ) {
-         super(x, y, recipe, craftable, m_teabxghg(arg3, arg4));
+         super(x, y, recipe, craftable, m_teabxghg(arg3, context));
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_teabxghg Lnet/minecraft/unmapped/C_ngptzlri$C_saqnuqje;m_teabxghg(Lnet/minecraft/unmapped/C_vhhfbyhp;Lnet/minecraft/unmapped/C_zcrtzabd;)Ljava/util/List;}
+       * @mapping {@literal named m_teabxghg Lnet/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget$FurnaceAlternativeButtonWidget;m_teabxghg(Lnet/minecraft/recipe/display/RecipeDisplay;Lnet/minecraft/util/context/ContextMap;)Ljava/util/List;}
        */
-      private static List<RecipeAlternativesWidget.AlternativeButtonWidget.InputSlot> m_teabxghg(C_vhhfbyhp arg, C_zcrtzabd arg2) {
-         if (arg instanceof C_wfacxbbm lv) {
-            List<ItemStack> list = lv.ingredient().m_whqywntk(arg2);
+      private static List<RecipeAlternativesWidget.AlternativeButtonWidget.InputSlot> m_teabxghg(RecipeDisplay arg, ContextMap context) {
+         if (arg instanceof FurnaceRecipeDisplay lv) {
+            List<ItemStack> list = lv.ingredient().resolveStacks(context);
             if (!list.isEmpty()) {
                return List.of(m_dyepijgl(1, 1, list));
             }

github-actions · 2024-10-09T02:01:29Z

View the diff here (2/3):

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-10-09 02:01:27.249385453 +0000
+++ namedSrc/net/minecraft/client/gui/widget/recipe_book/RecipeBookWidget.java	2024-10-09 02:00:18.220012209 +0000
@@ -36,23 +36,23 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import net.minecraft.network.packet.c2s.play.RecipeCategoryOptionUpdateC2SPacket;
+import net.minecraft.recipe.RecipeDisplayId;
+import net.minecraft.recipe.RecipeFinder;
 import net.minecraft.recipe.book.RecipeBookCategory;
+import net.minecraft.recipe.book.RecipeBookType;
+import net.minecraft.recipe.display.RecipeDisplay;
+import net.minecraft.recipe.display.SlotDisplayContext;
 import net.minecraft.screen.AbstractFurnaceScreenHandler;
 import net.minecraft.screen.AbstractRecipeScreenHandler;
 import net.minecraft.screen.slot.Slot;
 import net.minecraft.text.Text;
 import net.minecraft.unmapped.C_eeadosbl;
-import net.minecraft.unmapped.C_fcquvjby;
 import net.minecraft.unmapped.C_gjevllvc;
-import net.minecraft.unmapped.C_kuhmkefg;
-import net.minecraft.unmapped.C_loximogs;
 import net.minecraft.unmapped.C_pvjasgvj;
-import net.minecraft.unmapped.C_tglmjehp;
 import net.minecraft.unmapped.C_tygcwhfl;
-import net.minecraft.unmapped.C_vhhfbyhp;
-import net.minecraft.unmapped.C_zcrtzabd;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Identifier;
+import net.minecraft.util.context.ContextMap;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.World;
 import org.jetbrains.annotations.Nullable;
@@ -140,7 +140,7 @@
     * Mapping not found
     */
    @Nullable
-   private C_tglmjehp f_leusmwod;
+   private RecipeDisplayId f_leusmwod;
    /**
     * Mapping not found
     */
@@ -200,7 +200,7 @@
     * Mapping not found
     */
    @Nullable
-   private C_tglmjehp f_wvtevfmd;
+   private RecipeDisplayId f_wvtevfmd;
    /**
     * Mapping not found
     */
@@ -208,9 +208,9 @@
    private RecipeResultCollection f_omprsicj;
    /**
     * @mapping {@literal hashed f_zxniagpx Lnet/minecraft/unmapped/C_xaybmvwz;f_zxniagpx:Lnet/minecraft/unmapped/C_fcquvjby;}
-    * @mapping {@literal named recipeFinder Lnet/minecraft/client/gui/widget/recipe_book/RecipeBookWidget;recipeFinder:Lnet/minecraft/unmapped/C_fcquvjby;}
+    * @mapping {@literal named recipeFinder Lnet/minecraft/client/gui/widget/recipe_book/RecipeBookWidget;recipeFinder:Lnet/minecraft/recipe/RecipeFinder;}
     */
-   private final C_fcquvjby recipeFinder = new C_fcquvjby();
+   private final RecipeFinder recipeFinder = new RecipeFinder();
    /**
     * @mapping {@literal hashed f_kbqtsvtc Lnet/minecraft/unmapped/C_xaybmvwz;f_kbqtsvtc:I}
     * @mapping {@literal named cachedInvChangeCount Lnet/minecraft/client/gui/widget/recipe_book/RecipeBookWidget;cachedInvChangeCount:I}
@@ -275,7 +275,7 @@
       this.leftOffset = this.narrow ? 0 : 86;
       int i = this.m_botrofyk();
       int j = this.m_evsxtqet();
-      this.recipeFinder.m_bhcaqfpt();
+      this.recipeFinder.clear();
       this.client.player.getInventory().populateRecipeFinder(this.recipeFinder);
       this.craftingScreenHandler.populateRecipeFinder(this.recipeFinder);
       String string = this.searchField != null ? this.searchField.getText() : "";
@@ -423,7 +423,7 @@
    /**
     * Mapping not found
     */
-   protected abstract void m_ebripisb(RecipeResultCollection arg, C_fcquvjby arg2);
+   protected abstract void m_ebripisb(RecipeResultCollection arg, RecipeFinder arg2);
 
    /**
     * @mapping {@literal hashed m_twbffoto Lnet/minecraft/unmapped/C_xaybmvwz;m_twbffoto(ZZ)V}
@@ -495,7 +495,7 @@
     * @mapping {@literal named refreshInputs Lnet/minecraft/client/gui/widget/recipe_book/RecipeBookWidget;refreshInputs()V}
     */
    private void refreshInputs() {
-      this.recipeFinder.m_bhcaqfpt();
+      this.recipeFinder.clear();
       this.client.player.getInventory().populateRecipeFinder(this.recipeFinder);
       this.craftingScreenHandler.populateRecipeFinder(this.recipeFinder);
       this.refreshResults(false, this.m_zqhpothv());
@@ -505,7 +505,7 @@
     * Mapping not found
     */
    private boolean m_zqhpothv() {
-      return this.recipeBook.m_sztksdtu(this.craftingScreenHandler.getCategory());
+      return this.recipeBook.isFilteringCraftable(this.craftingScreenHandler.getCategory());
    }
 
    /**
@@ -567,7 +567,7 @@
    public boolean mouseClicked(double mouseX, double mouseY, int button) {
       if (this.isOpen() && !this.client.player.isSpectator()) {
          if (this.recipesArea.mouseClicked(mouseX, mouseY, button, this.m_botrofyk(), this.m_evsxtqet(), 147, 166)) {
-            C_tglmjehp lv = this.recipesArea.getLastClickedRecipe();
+            RecipeDisplayId lv = this.recipesArea.getLastClickedRecipe();
             RecipeResultCollection lv2 = this.recipesArea.getLastClickedResults();
             if (lv != null && lv2 != null) {
                if (!this.m_vxsrvair(lv2, lv)) {
@@ -628,7 +628,7 @@
    /**
     * Mapping not found
     */
-   private boolean m_vxsrvair(RecipeResultCollection arg, C_tglmjehp arg2) {
+   private boolean m_vxsrvair(RecipeResultCollection arg, RecipeDisplayId arg2) {
       if (!arg.isCraftable(arg2) && arg2.equals(this.f_leusmwod)) {
          return false;
       } else {
@@ -644,8 +644,8 @@
     * @mapping {@literal named toggleFilteringCraftable Lnet/minecraft/client/gui/widget/recipe_book/RecipeBookWidget;toggleFilteringCraftable()Z}
     */
    private boolean toggleFilteringCraftable() {
-      RecipeBookCategory lv = this.craftingScreenHandler.getCategory();
-      boolean bl = !this.recipeBook.m_sztksdtu(lv);
+      RecipeBookType lv = this.craftingScreenHandler.getCategory();
+      boolean bl = !this.recipeBook.isFilteringCraftable(lv);
       this.recipeBook.setFilteringCraftable(lv, bl);
       return bl;
    }
@@ -796,23 +796,23 @@
    /**
     * Mapping not found
     */
-   public void m_htznpflj(C_tglmjehp arg) {
+   public void m_htznpflj(RecipeDisplayId arg) {
       this.client.player.onRecipeDisplayed(arg);
    }
 
    /**
     * Mapping not found
     */
-   public void m_dlqouukn(C_vhhfbyhp arg) {
+   public void m_dlqouukn(RecipeDisplay arg) {
       this.f_jaklakhx.m_qfbpxgsm();
-      C_zcrtzabd lv = C_kuhmkefg.m_wzcjjviu((World)Objects.requireNonNull(this.client.world));
+      ContextMap lv = SlotDisplayContext.fromWorld((World)Objects.requireNonNull(this.client.world));
       this.m_bxxroqte(this.f_jaklakhx, arg, lv);
    }
 
    /**
     * Mapping not found
     */
-   protected abstract void m_bxxroqte(C_pvjasgvj arg, C_vhhfbyhp arg2, C_zcrtzabd arg3);
+   protected abstract void m_bxxroqte(C_pvjasgvj arg, RecipeDisplay arg2, ContextMap arg3);
 
    /**
     * @mapping {@literal hashed m_klldduvd Lnet/minecraft/unmapped/C_xaybmvwz;m_klldduvd()V}
@@ -820,7 +820,7 @@
     */
    protected void sendBookDataPacket() {
       if (this.client.getNetworkHandler() != null) {
-         RecipeBookCategory lv = this.craftingScreenHandler.getCategory();
+         RecipeBookType lv = this.craftingScreenHandler.getCategory();
          boolean bl = this.recipeBook.getOptions().isGuiOpen(lv);
          boolean bl2 = this.recipeBook.getOptions().isFilteringCraftable(lv);
          this.client.getNetworkHandler().send(new RecipeCategoryOptionUpdateC2SPacket(lv, bl, bl2));
@@ -871,17 +871,17 @@
 
       /**
        * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_xaybmvwz$C_qodamwli;<init>(Lnet/minecraft/unmapped/C_vorddnax;Lnet/minecraft/unmapped/C_loximogs;)V}
-       * @mapping {@literal named <init> Lnet/minecraft/client/gui/widget/recipe_book/RecipeBookWidget$C_qodamwli;<init>(Lnet/minecraft/item/Item;Lnet/minecraft/unmapped/C_loximogs;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/client/gui/widget/recipe_book/RecipeBookWidget$C_qodamwli;<init>(Lnet/minecraft/item/Item;Lnet/minecraft/recipe/book/RecipeBookCategory;)V}
        */
-      public C_qodamwli(Item item, C_loximogs category) {
+      public C_qodamwli(Item item, RecipeBookCategory category) {
          this(new ItemStack(item), Optional.empty(), category);
       }
 
       /**
        * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_xaybmvwz$C_qodamwli;<init>(Lnet/minecraft/unmapped/C_vorddnax;Lnet/minecraft/unmapped/C_vorddnax;Lnet/minecraft/unmapped/C_loximogs;)V}
-       * @mapping {@literal named <init> Lnet/minecraft/client/gui/widget/recipe_book/RecipeBookWidget$C_qodamwli;<init>(Lnet/minecraft/item/Item;Lnet/minecraft/item/Item;Lnet/minecraft/unmapped/C_loximogs;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/client/gui/widget/recipe_book/RecipeBookWidget$C_qodamwli;<init>(Lnet/minecraft/item/Item;Lnet/minecraft/item/Item;Lnet/minecraft/recipe/book/RecipeBookCategory;)V}
        */
-      public C_qodamwli(Item arg, Item arg2, C_loximogs category) {
+      public C_qodamwli(Item arg, Item arg2, RecipeBookCategory category) {
          this(new ItemStack(arg), Optional.of(new ItemStack(arg2)), category);
       }
    }
diff -bur namedTargetSrc/net/minecraft/client/network/ClientPlayerEntity.java namedSrc/net/minecraft/client/network/ClientPlayerEntity.java
--- namedTargetSrc/net/minecraft/client/network/ClientPlayerEntity.java	2024-10-09 02:01:27.166384993 +0000
+++ namedSrc/net/minecraft/client/network/ClientPlayerEntity.java	2024-10-09 02:00:18.149011815 +0000
@@ -66,6 +66,7 @@
 import net.minecraft.network.packet.c2s.play.RecipeBookUpdateC2SPacket;
 import net.minecraft.network.packet.c2s.play.VehicleMoveC2SPacket;
 import net.minecraft.particle.ParticleTypes;
+import net.minecraft.recipe.RecipeDisplayId;
 import net.minecraft.registry.Holder;
 import net.minecraft.registry.tag.FluidTags;
 import net.minecraft.sound.SoundCategory;
@@ -75,7 +76,6 @@
 import net.minecraft.text.Text;
 import net.minecraft.unmapped.C_bjnewvkq;
 import net.minecraft.unmapped.C_sfpofsgc;
-import net.minecraft.unmapped.C_tglmjehp;
 import net.minecraft.unmapped.C_zcisasac;
 import net.minecraft.util.Arm;
 import net.minecraft.util.ClickType;
@@ -662,9 +662,9 @@
 
    /**
     * @mapping {@literal hashed m_hfpiizip Lnet/minecraft/unmapped/C_jlopmfei;m_hfpiizip(Lnet/minecraft/unmapped/C_tglmjehp;)V}
-    * @mapping {@literal named onRecipeDisplayed Lnet/minecraft/client/network/ClientPlayerEntity;onRecipeDisplayed(Lnet/minecraft/unmapped/C_tglmjehp;)V}
+    * @mapping {@literal named onRecipeDisplayed Lnet/minecraft/client/network/ClientPlayerEntity;onRecipeDisplayed(Lnet/minecraft/recipe/RecipeDisplayId;)V}
     */
-   public void onRecipeDisplayed(C_tglmjehp arg) {
+   public void onRecipeDisplayed(RecipeDisplayId arg) {
       if (this.recipeBook.m_levormha(arg)) {
          this.recipeBook.m_aepzpbuh(arg);
          this.networkHandler.send(new RecipeBookUpdateC2SPacket(arg));
diff -bur namedTargetSrc/net/minecraft/client/network/ClientPlayerInteractionManager.java namedSrc/net/minecraft/client/network/ClientPlayerInteractionManager.java
--- namedTargetSrc/net/minecraft/client/network/ClientPlayerInteractionManager.java	2024-10-09 02:01:27.017384166 +0000
+++ namedSrc/net/minecraft/client/network/ClientPlayerInteractionManager.java	2024-10-09 02:00:17.983010894 +0000
@@ -37,13 +37,13 @@
 import net.minecraft.network.packet.c2s.play.SelectedSlotUpdateC2SPacket;
 import net.minecraft.network.packet.c2s.play.SlotChangedStateC2SPacket;
 import net.minecraft.network.packet.c2s.play.SlotClickC2SPacket;
+import net.minecraft.recipe.RecipeDisplayId;
 import net.minecraft.screen.ScreenHandler;
 import net.minecraft.screen.slot.Slot;
 import net.minecraft.screen.slot.SlotActionType;
 import net.minecraft.sound.BlockSoundGroup;
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.stat.StatHandler;
-import net.minecraft.unmapped.C_tglmjehp;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
 import net.minecraft.util.collection.DefaultedList;
@@ -566,9 +566,9 @@
 
    /**
     * @mapping {@literal hashed m_wsfmquvc Lnet/minecraft/unmapped/C_uxbydbcj;m_wsfmquvc(ILnet/minecraft/unmapped/C_tglmjehp;Z)V}
-    * @mapping {@literal named clickRecipe Lnet/minecraft/client/network/ClientPlayerInteractionManager;clickRecipe(ILnet/minecraft/unmapped/C_tglmjehp;Z)V}
+    * @mapping {@literal named clickRecipe Lnet/minecraft/client/network/ClientPlayerInteractionManager;clickRecipe(ILnet/minecraft/recipe/RecipeDisplayId;Z)V}
     */
-   public void clickRecipe(int syncId, C_tglmjehp recipe, boolean craftAll) {
+   public void clickRecipe(int syncId, RecipeDisplayId recipe, boolean craftAll) {
       this.networkHandler.send(new CraftRequestC2SPacket(syncId, recipe, craftAll));
    }
 
diff -bur namedTargetSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java namedSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java
--- namedTargetSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java	2024-10-09 02:01:27.268385559 +0000
+++ namedSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java	2024-10-09 02:00:18.239012314 +0000
@@ -260,6 +260,9 @@
 import net.minecraft.network.phase.ConfigurationPhaseProtocols;
 import net.minecraft.particle.ParticleTypes;
 import net.minecraft.recipe.BrewingRecipeRegistry;
+import net.minecraft.recipe.RecipeAccess;
+import net.minecraft.recipe.RecipeDisplayId;
+import net.minecraft.recipe.SelectableRecipe;
 import net.minecraft.registry.DynamicRegistryManager;
 import net.minecraft.registry.DynamicRegistrySync;
 import net.minecraft.registry.Holder;
@@ -293,15 +296,12 @@
 import net.minecraft.unmapped.C_lxgwrlck;
 import net.minecraft.unmapped.C_npripfjn;
 import net.minecraft.unmapped.C_poljqryj;
-import net.minecraft.unmapped.C_qzkacgwi;
 import net.minecraft.unmapped.C_rrcmfgnk;
 import net.minecraft.unmapped.C_sfpofsgc;
-import net.minecraft.unmapped.C_tglmjehp;
 import net.minecraft.unmapped.C_uepzhiii;
 import net.minecraft.unmapped.C_uqhumrao;
 import net.minecraft.unmapped.C_wkpqgkjo;
 import net.minecraft.unmapped.C_wuqdybfp;
-import net.minecraft.unmapped.C_wzaefoxm;
 import net.minecraft.unmapped.C_yjakgqnt;
 import net.minecraft.unmapped.C_yqhgaaca;
 import net.minecraft.unmapped.C_zqywhkdo;
@@ -432,7 +432,7 @@
    /**
     * Mapping not found
     */
-   private C_lxgwrlck f_umrfdpzl = new C_lxgwrlck(Map.of(), C_qzkacgwi.C_kvadugef.m_gwmqxzvv());
+   private C_lxgwrlck f_umrfdpzl = new C_lxgwrlck(Map.of(), SelectableRecipe.SingleInputSet.empty());
    /**
     * @mapping {@literal hashed f_apuckpwu Lnet/minecraft/unmapped/C_nuofrxvi;f_apuckpwu:Ljava/util/UUID;}
     * @mapping {@literal named sessionId Lnet/minecraft/client/network/ClientPlayNetworkHandler;sessionId:Ljava/util/UUID;}
@@ -589,7 +589,7 @@
    /**
     * Mapping not found
     */
-   public C_wzaefoxm m_zydgbtyw() {
+   public RecipeAccess m_zydgbtyw() {
       return this.f_umrfdpzl;
    }
 
@@ -1989,7 +1989,7 @@
       NetworkThreadUtils.forceMainThread(arg, this, this.client);
       ClientRecipeBook lv = this.client.player.getRecipeBook();
 
-      for (C_tglmjehp lv2 : arg.recipes()) {
+      for (RecipeDisplayId lv2 : arg.recipes()) {
          lv.m_vxnpqsmc(lv2);
       }
 
diff -bur namedTargetSrc/net/minecraft/client/recipe_book/ClientRecipeBook.java namedSrc/net/minecraft/client/recipe_book/ClientRecipeBook.java
--- namedTargetSrc/net/minecraft/client/recipe_book/ClientRecipeBook.java	2024-10-09 02:01:27.096384604 +0000
+++ namedSrc/net/minecraft/client/recipe_book/ClientRecipeBook.java	2024-10-09 02:00:18.075011404 +0000
@@ -15,11 +15,11 @@
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.gui.screen.recipe_book.RecipeResultCollection;
+import net.minecraft.recipe.RecipeDisplayEntry;
+import net.minecraft.recipe.RecipeDisplayId;
 import net.minecraft.recipe.book.RecipeBook;
-import net.minecraft.unmapped.C_dsptsoym;
+import net.minecraft.recipe.book.RecipeBookCategory;
 import net.minecraft.unmapped.C_eeadosbl;
-import net.minecraft.unmapped.C_loximogs;
-import net.minecraft.unmapped.C_tglmjehp;
 import net.minecraft.unmapped.C_tygcwhfl;
 
 /**
@@ -31,11 +31,11 @@
    /**
     * Mapping not found
     */
-   private final Map<C_tglmjehp, C_dsptsoym> f_ncbicesk = new HashMap();
+   private final Map<RecipeDisplayId, RecipeDisplayEntry> f_ncbicesk = new HashMap();
    /**
     * Mapping not found
     */
-   private final Set<C_tglmjehp> f_tclxrheu = new HashSet();
+   private final Set<RecipeDisplayId> f_tclxrheu = new HashSet();
    /**
     * @mapping {@literal hashed f_isptgmct Lnet/minecraft/unmapped/C_sjlfgpfd;f_isptgmct:Ljava/util/Map;}
     * @mapping {@literal named resultsByGroup Lnet/minecraft/client/recipe_book/ClientRecipeBook;resultsByGroup:Ljava/util/Map;}
@@ -50,14 +50,14 @@
    /**
     * Mapping not found
     */
-   public void m_rolghcaa(C_dsptsoym arg) {
+   public void m_rolghcaa(RecipeDisplayEntry arg) {
       this.f_ncbicesk.put(arg.id(), arg);
    }
 
    /**
     * Mapping not found
     */
-   public void m_vxnpqsmc(C_tglmjehp arg) {
+   public void m_vxnpqsmc(RecipeDisplayId arg) {
       this.f_ncbicesk.remove(arg);
       this.f_tclxrheu.remove(arg);
    }
@@ -73,21 +73,21 @@
    /**
     * Mapping not found
     */
-   public boolean m_levormha(C_tglmjehp arg) {
+   public boolean m_levormha(RecipeDisplayId arg) {
       return this.f_tclxrheu.contains(arg);
    }
 
    /**
     * Mapping not found
     */
-   public void m_aepzpbuh(C_tglmjehp arg) {
+   public void m_aepzpbuh(RecipeDisplayId arg) {
       this.f_tclxrheu.remove(arg);
    }
 
    /**
     * Mapping not found
     */
-   public void m_qpvxiwdw(C_tglmjehp arg) {
+   public void m_qpvxiwdw(RecipeDisplayId arg) {
       this.f_tclxrheu.add(arg);
    }
 
@@ -95,7 +95,7 @@
     * Mapping not found
     */
    public void m_atikfkye() {
-      Map<C_loximogs, List<List<C_dsptsoym>>> map = toGroupedMap(this.f_ncbicesk.values());
+      Map<RecipeBookCategory, List<List<RecipeDisplayEntry>>> map = toGroupedMap(this.f_ncbicesk.values());
       Map<C_tygcwhfl, List<RecipeResultCollection>> map2 = new HashMap();
       Builder<RecipeResultCollection> builder = ImmutableList.builder();
       map.forEach(
@@ -116,17 +116,17 @@
     * @mapping {@literal hashed m_poixgnwv Lnet/minecraft/unmapped/C_sjlfgpfd;m_poixgnwv(Ljava/lang/Iterable;)Ljava/util/Map;}
     * @mapping {@literal named toGroupedMap Lnet/minecraft/client/recipe_book/ClientRecipeBook;toGroupedMap(Ljava/lang/Iterable;)Ljava/util/Map;}
     */
-   private static Map<C_loximogs, List<List<C_dsptsoym>>> toGroupedMap(Iterable<C_dsptsoym> recipes) {
-      Map<C_loximogs, List<List<C_dsptsoym>>> map = new HashMap();
-      Table<C_loximogs, Integer, List<C_dsptsoym>> table = HashBasedTable.create();
+   private static Map<RecipeBookCategory, List<List<RecipeDisplayEntry>>> toGroupedMap(Iterable<RecipeDisplayEntry> recipes) {
+      Map<RecipeBookCategory, List<List<RecipeDisplayEntry>>> map = new HashMap();
+      Table<RecipeBookCategory, Integer, List<RecipeDisplayEntry>> table = HashBasedTable.create();
 
-      for (C_dsptsoym lv : recipes) {
-         C_loximogs lv2 = lv.category();
+      for (RecipeDisplayEntry lv : recipes) {
+         RecipeBookCategory lv2 = lv.category();
          OptionalInt optionalInt = lv.group();
          if (optionalInt.isEmpty()) {
             ((List)map.computeIfAbsent(lv2, arg -> new ArrayList())).add(List.of(lv));
          } else {
-            List<C_dsptsoym> list = table.get(lv2, optionalInt.getAsInt());
+            List<RecipeDisplayEntry> list = table.get(lv2, optionalInt.getAsInt());
             if (list == null) {
                list = new ArrayList();
                table.put(lv2, optionalInt.getAsInt(), list);
diff -bur namedTargetSrc/net/minecraft/client/toast/RecipeToast.java namedSrc/net/minecraft/client/toast/RecipeToast.java
--- namedTargetSrc/net/minecraft/client/toast/RecipeToast.java	2024-10-09 02:01:27.169385009 +0000
+++ namedSrc/net/minecraft/client/toast/RecipeToast.java	2024-10-09 02:00:18.151011826 +0000
@@ -8,12 +8,12 @@
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.render.RenderLayer;
 import net.minecraft.item.ItemStack;
+import net.minecraft.recipe.display.RecipeDisplay;
+import net.minecraft.recipe.display.SlotDisplayContext;
 import net.minecraft.text.Text;
 import net.minecraft.unmapped.C_cmucrpkc;
-import net.minecraft.unmapped.C_kuhmkefg;
-import net.minecraft.unmapped.C_vhhfbyhp;
-import net.minecraft.unmapped.C_zcrtzabd;
 import net.minecraft.util.Identifier;
+import net.minecraft.util.context.ContextMap;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_mjhdcwyb}
@@ -125,18 +125,18 @@
 
    /**
     * @mapping {@literal hashed m_ypqldzts Lnet/minecraft/unmapped/C_mjhdcwyb;m_ypqldzts(Lnet/minecraft/unmapped/C_cmucrpkc;Lnet/minecraft/unmapped/C_vhhfbyhp;)V}
-    * @mapping {@literal named show Lnet/minecraft/client/toast/RecipeToast;show(Lnet/minecraft/unmapped/C_cmucrpkc;Lnet/minecraft/unmapped/C_vhhfbyhp;)V}
+    * @mapping {@literal named show Lnet/minecraft/client/toast/RecipeToast;show(Lnet/minecraft/unmapped/C_cmucrpkc;Lnet/minecraft/recipe/display/RecipeDisplay;)V}
     */
-   public static void show(C_cmucrpkc arg, C_vhhfbyhp arg2) {
+   public static void show(C_cmucrpkc arg, RecipeDisplay arg2) {
       RecipeToast lv = arg.m_ujnferig(RecipeToast.class, NO_ID);
       if (lv == null) {
          lv = new RecipeToast();
          arg.m_ifuynxvc(lv);
       }
 
-      C_zcrtzabd lv2 = C_kuhmkefg.m_wzcjjviu(arg.m_gqhkcxmt().world);
-      ItemStack lv3 = arg2.craftingStation().m_hzkpthfi(lv2);
-      ItemStack lv4 = arg2.result().m_hzkpthfi(lv2);
+      ContextMap lv2 = SlotDisplayContext.fromWorld(arg.m_gqhkcxmt().world);
+      ItemStack lv3 = arg2.craftingStation().resolveFirstStack(lv2);
+      ItemStack lv4 = arg2.result().resolveFirstStack(lv2);
       lv.addRecipes(lv3, lv4);
    }
 
diff -bur namedTargetSrc/net/minecraft/client/world/ClientWorld.java namedSrc/net/minecraft/client/world/ClientWorld.java
--- namedTargetSrc/net/minecraft/client/world/ClientWorld.java	2024-10-09 02:01:27.198385170 +0000
+++ namedSrc/net/minecraft/client/world/ClientWorld.java	2024-10-09 02:00:18.177011970 +0000
@@ -46,6 +46,7 @@
 import net.minecraft.particle.ParticleEffect;
 import net.minecraft.particle.ParticleTypes;
 import net.minecraft.recipe.BrewingRecipeRegistry;
+import net.minecraft.recipe.RecipeAccess;
 import net.minecraft.registry.Holder;
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.RegistryKey;
@@ -56,7 +57,6 @@
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.text.Text;
 import net.minecraft.unmapped.C_faujnouj;
-import net.minecraft.unmapped.C_wzaefoxm;
 import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.util.ArgbHelper;
 import net.minecraft.util.CubicSampler;
@@ -791,7 +791,7 @@
     * Mapping not found
     */
    @Override
-   public C_wzaefoxm m_mlvimbbc() {
+   public RecipeAccess m_mlvimbbc() {
       return this.netHandler.m_zydgbtyw();
    }
 
@@ -1249,7 +1249,7 @@
     * Mapping not found
     */
    @Override
-   public BrewingRecipeRegistry m_gbuudpbq() {
+   public BrewingRecipeRegistry getBrewingRecipeRegistry() {
       return this.netHandler.m_kwiwijoi();
    }
 
diff -bur namedTargetSrc/net/minecraft/data/server/LootTablesProvider.java namedSrc/net/minecraft/data/server/LootTablesProvider.java
--- namedTargetSrc/net/minecraft/data/server/LootTablesProvider.java	2024-10-09 02:01:27.055384377 +0000
+++ namedSrc/net/minecraft/data/server/LootTablesProvider.java	2024-10-09 02:00:18.026011132 +0000
@@ -26,10 +26,10 @@
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.RegistryKeys;
 import net.minecraft.registry.SimpleRegistry;
-import net.minecraft.unmapped.C_ykthnceq;
 import net.minecraft.util.ErrorReporter;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Util;
+import net.minecraft.util.context.ContextKeySet;
 import net.minecraft.util.math.random.RandomSequence;
 import net.minecraft.util.random.RandomSeed;
 import org.slf4j.Logger;
@@ -157,6 +157,6 @@
     * @mapping {@literal hashed net/minecraft/unmapped/C_rriyyrek$C_ujsjtlmo}
     * @mapping {@literal named net/minecraft/data/server/LootTablesProvider$GeneratorEntry}
     */
-   public static record GeneratorEntry(Function<HolderLookup.Provider, LootTableGenerator> factory, C_ykthnceq paramSet) {
+   public static record GeneratorEntry(Function<HolderLookup.Provider, LootTableGenerator> factory, ContextKeySet paramSet) {
    }
 }
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-10-09 02:01:27.113384699 +0000
+++ namedSrc/net/minecraft/data/server/recipe/ShapedRecipeJsonFactory.java	2024-10-09 02:00:18.093011504 +0000
@@ -107,7 +107,7 @@
     * @mapping {@literal named ingredient Lnet/minecraft/data/server/recipe/ShapedRecipeJsonFactory;ingredient(Ljava/lang/Character;Lnet/minecraft/registry/tag/TagKey;)Lnet/minecraft/data/server/recipe/ShapedRecipeJsonFactory;}
     */
    public ShapedRecipeJsonFactory ingredient(Character c, TagKey<Item> ingredient) {
-      return this.ingredient(c, Ingredient.m_owdzpelq(this.f_gcyzwvkp.getTagOrThrow(ingredient)));
+      return this.ingredient(c, Ingredient.ofItems(this.f_gcyzwvkp.getTagOrThrow(ingredient)));
    }
 
    /**
@@ -115,7 +115,7 @@
     * @mapping {@literal named ingredient Lnet/minecraft/data/server/recipe/ShapedRecipeJsonFactory;ingredient(Ljava/lang/Character;Lnet/minecraft/item/ItemConvertible;)Lnet/minecraft/data/server/recipe/ShapedRecipeJsonFactory;}
     */
    public ShapedRecipeJsonFactory ingredient(Character c, ItemConvertible ingredientProvider) {
-      return this.ingredient(c, Ingredient.m_xqanmytq(ingredientProvider));
+      return this.ingredient(c, Ingredient.ofItem(ingredientProvider));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/data/server/recipe/ShapelessRecipeJsonFactory.java namedSrc/net/minecraft/data/server/recipe/ShapelessRecipeJsonFactory.java
--- namedTargetSrc/net/minecraft/data/server/recipe/ShapelessRecipeJsonFactory.java	2024-10-09 02:01:27.123384754 +0000
+++ namedSrc/net/minecraft/data/server/recipe/ShapelessRecipeJsonFactory.java	2024-10-09 02:00:18.103011560 +0000
@@ -97,7 +97,7 @@
     * @mapping {@literal named ingredient Lnet/minecraft/data/server/recipe/ShapelessRecipeJsonFactory;ingredient(Lnet/minecraft/registry/tag/TagKey;)Lnet/minecraft/data/server/recipe/ShapelessRecipeJsonFactory;}
     */
    public ShapelessRecipeJsonFactory ingredient(TagKey<Item> tag) {
-      return this.ingredient(Ingredient.m_owdzpelq(this.f_xwkmsswd.getTagOrThrow(tag)));
+      return this.ingredient(Ingredient.ofItems(this.f_xwkmsswd.getTagOrThrow(tag)));
    }
 
    /**
@@ -114,7 +114,7 @@
     */
    public ShapelessRecipeJsonFactory ingredient(ItemConvertible item, int amount) {
       for (int j = 0; j < amount; j++) {
-         this.ingredient(Ingredient.m_xqanmytq(item));
+         this.ingredient(Ingredient.ofItem(item));
       }
 
       return this;
diff -bur namedTargetSrc/net/minecraft/data/server/recipe/SingleItemRecipeJsonFactory.java namedSrc/net/minecraft/data/server/recipe/SingleItemRecipeJsonFactory.java
--- namedTargetSrc/net/minecraft/data/server/recipe/SingleItemRecipeJsonFactory.java	2024-10-09 02:01:27.055384377 +0000
+++ namedSrc/net/minecraft/data/server/recipe/SingleItemRecipeJsonFactory.java	2024-10-09 02:00:18.026011132 +0000
@@ -11,10 +11,10 @@
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemConvertible;
 import net.minecraft.item.ItemStack;
-import net.minecraft.recipe.CuttingRecipe;
 import net.minecraft.recipe.Ingredient;
 import net.minecraft.recipe.Recipe;
 import net.minecraft.recipe.RecipeCategory;
+import net.minecraft.recipe.SingleItemRecipe;
 import net.minecraft.recipe.StonecuttingRecipe;
 import net.minecraft.registry.RegistryKey;
 import org.jetbrains.annotations.Nullable;
@@ -57,16 +57,16 @@
    private String group;
    /**
     * @mapping {@literal hashed f_ggxalver Lnet/minecraft/unmapped/C_nuvqrpet;f_ggxalver:Lnet/minecraft/unmapped/C_ziizojwa$C_yunnfuov;}
-    * @mapping {@literal named recipeFactory Lnet/minecraft/data/server/recipe/SingleItemRecipeJsonFactory;recipeFactory:Lnet/minecraft/recipe/CuttingRecipe$RecipeFactory;}
+    * @mapping {@literal named recipeFactory Lnet/minecraft/data/server/recipe/SingleItemRecipeJsonFactory;recipeFactory:Lnet/minecraft/recipe/SingleItemRecipe$RecipeFactory;}
     */
-   private final CuttingRecipe.RecipeFactory<?> recipeFactory;
+   private final SingleItemRecipe.RecipeFactory<?> recipeFactory;
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_nuvqrpet;<init>(Lnet/minecraft/unmapped/C_ehjomvtz;Lnet/minecraft/unmapped/C_ziizojwa$C_yunnfuov;Lnet/minecraft/unmapped/C_tcpsydrv;Lnet/minecraft/unmapped/C_gmbqjnle;I)V}
-    * @mapping {@literal named <init> Lnet/minecraft/data/server/recipe/SingleItemRecipeJsonFactory;<init>(Lnet/minecraft/recipe/RecipeCategory;Lnet/minecraft/recipe/CuttingRecipe$RecipeFactory;Lnet/minecraft/recipe/Ingredient;Lnet/minecraft/item/ItemConvertible;I)V}
+    * @mapping {@literal named <init> Lnet/minecraft/data/server/recipe/SingleItemRecipeJsonFactory;<init>(Lnet/minecraft/recipe/RecipeCategory;Lnet/minecraft/recipe/SingleItemRecipe$RecipeFactory;Lnet/minecraft/recipe/Ingredient;Lnet/minecraft/item/ItemConvertible;I)V}
     */
    public SingleItemRecipeJsonFactory(
-      RecipeCategory category, CuttingRecipe.RecipeFactory<?> recipeFactory, Ingredient ingredient, ItemConvertible result, int count
+      RecipeCategory category, SingleItemRecipe.RecipeFactory<?> recipeFactory, Ingredient ingredient, ItemConvertible result, int count
    ) {
       this.category = category;
       this.recipeFactory = recipeFactory;
@@ -129,7 +129,7 @@
          .rewards(AdvancementRewards.Builder.recipe(arg2))
          .merger(AdvancementRequirements.RequirementMerger.ANY);
       this.criteria.forEach(lv::putCriteria);
-      CuttingRecipe lv2 = this.recipeFactory
+      SingleItemRecipe lv2 = this.recipeFactory
          .create((String)Objects.requireNonNullElse(this.group, ""), this.ingredient, new ItemStack(this.result, this.count));
       exporter.accept(arg2, lv2, lv.build(arg2.getValue().withPrefix("recipes/" + this.category.getName() + "/")));
    }
diff -bur namedTargetSrc/net/minecraft/data/server/RecipesProvider.java namedSrc/net/minecraft/data/server/RecipesProvider.java
--- namedTargetSrc/net/minecraft/data/server/RecipesProvider.java	2024-10-09 02:01:27.268385559 +0000
+++ namedSrc/net/minecraft/data/server/RecipesProvider.java	2024-10-09 02:00:18.239012314 +0000
@@ -85,26 +85,21 @@
     * @mapping {@literal named VARIANT_FACTORIES Lnet/minecraft/data/server/RecipesProvider;VARIANT_FACTORIES:Ljava/util/Map;}
     */
    private static final Map<BlockFamily.Variant, RecipesProvider.C_tavibkqh> VARIANT_FACTORIES = ImmutableMap.<BlockFamily.Variant, RecipesProvider.C_tavibkqh>builder()
-      .put(BlockFamily.Variant.BUTTON, (arg, arg2, arg3) -> arg.createTransmutationRecipe(arg2, Ingredient.m_xqanmytq(arg3)))
-      .put(BlockFamily.Variant.CHISELED, (arg, arg2, arg3) -> arg.createChiseledBlockRecipe(RecipeCategory.BUILDING_BLOCKS, arg2, Ingredient.m_xqanmytq(arg3)))
-      .put(BlockFamily.Variant.CUT, (arg, output, input) -> arg.createCutCopperRecipe(RecipeCategory.BUILDING_BLOCKS, output, Ingredient.m_xqanmytq(input)))
-      .put(BlockFamily.Variant.DOOR, (arg, output, input) -> arg.createDoorRecipe(output, Ingredient.m_xqanmytq(input)))
-      .put(BlockFamily.Variant.CUSTOM_FENCE, (arg, output, input) -> arg.createFenceRecipe(output, Ingredient.m_xqanmytq(input)))
-      .put(BlockFamily.Variant.FENCE, (arg, output, input) -> arg.createFenceRecipe(output, Ingredient.m_xqanmytq(input)))
-      .put(BlockFamily.Variant.CUSTOM_FENCE_GATE, (arg, output, input) -> arg.createFenceGateRecipe(output, Ingredient.m_xqanmytq(input)))
-      .put(BlockFamily.Variant.FENCE_GATE, (arg, output, input) -> arg.createFenceGateRecipe(output, Ingredient.m_xqanmytq(input)))
-      .put(BlockFamily.Variant.SIGN, (arg, output, input) -> arg.createSignRecipe(output, Ingredient.m_xqanmytq(input)))
-      .put(BlockFamily.Variant.SLAB, (arg, output, input) -> arg.createSlabRecipe(RecipeCategory.BUILDING_BLOCKS, output, Ingredient.m_xqanmytq(input)))
-      .put(BlockFamily.Variant.STAIRS, (arg, output, input) -> arg.createStairsRecipe(output, Ingredient.m_xqanmytq(input)))
-      .put(
-         BlockFamily.Variant.PRESSURE_PLATE,
-         (arg, output, input) -> arg.createPressurePlateRecipe(RecipeCategory.REDSTONE, output, Ingredient.m_xqanmytq(input))
-      )
-      .put(
-         BlockFamily.Variant.POLISHED, (arg, output, input) -> arg.createCondensingRecipe(RecipeCategory.BUILDING_BLOCKS, output, Ingredient.m_xqanmytq(input))
-      )
-      .put(BlockFamily.Variant.TRAPDOOR, (arg, output, input) -> arg.createTrapdoorRecipe(output, Ingredient.m_xqanmytq(input)))
-      .put(BlockFamily.Variant.WALL, (arg, output, input) -> arg.getWallRecipe(RecipeCategory.DECORATIONS, output, Ingredient.m_xqanmytq(input)))
+      .put(BlockFamily.Variant.BUTTON, (arg, arg2, arg3) -> arg.createTransmutationRecipe(arg2, Ingredient.ofItem(arg3)))
+      .put(BlockFamily.Variant.CHISELED, (arg, arg2, arg3) -> arg.createChiseledBlockRecipe(RecipeCategory.BUILDING_BLOCKS, arg2, Ingredient.ofItem(arg3)))
+      .put(BlockFamily.Variant.CUT, (arg, output, input) -> arg.createCutCopperRecipe(RecipeCategory.BUILDING_BLOCKS, output, Ingredient.ofItem(input)))
+      .put(BlockFamily.Variant.DOOR, (arg, output, input) -> arg.createDoorRecipe(output, Ingredient.ofItem(input)))
+      .put(BlockFamily.Variant.CUSTOM_FENCE, (arg, output, input) -> arg.createFenceRecipe(output, Ingredient.ofItem(input)))
+      .put(BlockFamily.Variant.FENCE, (arg, output, input) -> arg.createFenceRecipe(output, Ingredient.ofItem(input)))
+      .put(BlockFamily.Variant.CUSTOM_FENCE_GATE, (arg, output, input) -> arg.createFenceGateRecipe(output, Ingredient.ofItem(input)))
+      .put(BlockFamily.Variant.FENCE_GATE, (arg, output, input) -> arg.createFenceGateRecipe(output, Ingredient.ofItem(input)))
+      .put(BlockFamily.Variant.SIGN, (arg, output, input) -> arg.createSignRecipe(output, Ingredient.ofItem(input)))
+      .put(BlockFamily.Variant.SLAB, (arg, output, input) -> arg.createSlabRecipe(RecipeCategory.BUILDING_BLOCKS, output, Ingredient.ofItem(input)))
+      .put(BlockFamily.Variant.STAIRS, (arg, output, input) -> arg.createStairsRecipe(output, Ingredient.ofItem(input)))
+      .put(BlockFamily.Variant.PRESSURE_PLATE, (arg, output, input) -> arg.createPressurePlateRecipe(RecipeCategory.REDSTONE, output, Ingredient.ofItem(input)))
+      .put(BlockFamily.Variant.POLISHED, (arg, output, input) -> arg.createCondensingRecipe(RecipeCategory.BUILDING_BLOCKS, output, Ingredient.ofItem(input)))
+      .put(BlockFamily.Variant.TRAPDOOR, (arg, output, input) -> arg.createTrapdoorRecipe(output, Ingredient.ofItem(input)))
+      .put(BlockFamily.Variant.WALL, (arg, output, input) -> arg.getWallRecipe(RecipeCategory.DECORATIONS, output, Ingredient.ofItem(input)))
       .build();
 
    /**
@@ -182,7 +177,7 @@
       String baseIdString
    ) {
       for (ItemConvertible lv : inputs) {
-         CookingRecipeJsonFactory.create(Ingredient.m_xqanmytq(lv), category, output, experience, cookingTime, serializer, recipe)
+         CookingRecipeJsonFactory.create(Ingredient.ofItem(lv), category, output, experience, cookingTime, serializer, recipe)
             .group(group)
             .criterion(hasItem(lv), this.conditionsFromItem(lv))
             .offerTo(this.exporter, getItemPath(output) + baseIdString + "_" + getItemPath(lv));
@@ -195,8 +190,8 @@
     */
    protected void offerNetheriteUpgradeRecipe(Item output, RecipeCategory category, Item input) {
       TransformSmithingRecipeJsonFactory.create(
-            Ingredient.m_xqanmytq(Items.NETHERITE_UPGRADE_SMITHING_TEMPLATE),
-            Ingredient.m_xqanmytq(output),
+            Ingredient.ofItem(Items.NETHERITE_UPGRADE_SMITHING_TEMPLATE),
+            Ingredient.ofItem(output),
             this.m_gckzgpoa(ItemTags.NETHERITE_TOOL_MATERIALS),
             category,
             input
@@ -211,7 +206,7 @@
     */
    protected void offerTrimSmithingRecipe(Item template, RegistryKey<Recipe<?>> arg2) {
       TrimSmithingRecipeJsonFactory.create(
-            Ingredient.m_xqanmytq(template), this.m_gckzgpoa(ItemTags.TRIMMABLE_ARMOR), this.m_gckzgpoa(ItemTags.TRIM_MATERIALS), RecipeCategory.MISC
+            Ingredient.ofItem(template), this.m_gckzgpoa(ItemTags.TRIMMABLE_ARMOR), this.m_gckzgpoa(ItemTags.TRIM_MATERIALS), RecipeCategory.MISC
          )
          .criterion("has_smithing_trim_template", this.conditionsFromItem(template))
          .offerTo(this.exporter, arg2);
@@ -350,7 +345,7 @@
     * @mapping {@literal named createPressurePlateRecipe Lnet/minecraft/data/server/RecipesProvider;createPressurePlateRecipe(Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V}
     */
    protected void createPressurePlateRecipe(ItemConvertible output, ItemConvertible input) {
-      this.createPressurePlateRecipe(RecipeCategory.REDSTONE, output, Ingredient.m_xqanmytq(input))
+      this.createPressurePlateRecipe(RecipeCategory.REDSTONE, output, Ingredient.ofItem(input))
          .criterion(hasItem(input), this.conditionsFromItem(input))
          .offerTo(this.exporter);
    }
@@ -368,7 +363,7 @@
     * @mapping {@literal named offerSlabRecipe Lnet/minecraft/data/server/RecipesProvider;offerSlabRecipe(Lnet/minecraft/recipe/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V}
     */
    protected void offerSlabRecipe(RecipeCategory category, ItemConvertible output, ItemConvertible input) {
-      this.createSlabRecipe(category, output, Ingredient.m_xqanmytq(input)).criterion(hasItem(input), this.conditionsFromItem(input)).offerTo(this.exporter);
+      this.createSlabRecipe(category, output, Ingredient.ofItem(input)).criterion(hasItem(input), this.conditionsFromItem(input)).offerTo(this.exporter);
    }
 
    /**
@@ -594,7 +589,7 @@
     * @mapping {@literal named offerWallRecipe Lnet/minecraft/data/server/RecipesProvider;offerWallRecipe(Lnet/minecraft/recipe/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V}
     */
    protected void offerWallRecipe(RecipeCategory category, ItemConvertible output, ItemConvertible input) {
-      this.getWallRecipe(category, output, Ingredient.m_xqanmytq(input)).criterion(hasItem(input), this.conditionsFromItem(input)).offerTo(this.exporter);
+      this.getWallRecipe(category, output, Ingredient.ofItem(input)).criterion(hasItem(input), this.conditionsFromItem(input)).offerTo(this.exporter);
    }
 
    /**
@@ -610,9 +605,7 @@
     * @mapping {@literal named offerPolishedStoneRecipe Lnet/minecraft/data/server/RecipesProvider;offerPolishedStoneRecipe(Lnet/minecraft/recipe/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V}
     */
    protected void offerPolishedStoneRecipe(RecipeCategory category, ItemConvertible output, ItemConvertible input) {
-      this.createCondensingRecipe(category, output, Ingredient.m_xqanmytq(input))
-         .criterion(hasItem(input), this.conditionsFromItem(input))
-         .offerTo(this.exporter);
+      this.createCondensingRecipe(category, output, Ingredient.ofItem(input)).criterion(hasItem(input), this.conditionsFromItem(input)).offerTo(this.exporter);
    }
 
    /**
@@ -628,9 +621,7 @@
     * @mapping {@literal named offerCutCopperRecipe Lnet/minecraft/data/server/RecipesProvider;offerCutCopperRecipe(Lnet/minecraft/recipe/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V}
     */
    protected void offerCutCopperRecipe(RecipeCategory category, ItemConvertible output, ItemConvertible input) {
-      this.createCutCopperRecipe(category, output, Ingredient.m_xqanmytq(input))
-         .criterion(hasItem(input), this.conditionsFromItem(input))
-         .offerTo(this.exporter);
+      this.createCutCopperRecipe(category, output, Ingredient.ofItem(input)).criterion(hasItem(input), this.conditionsFromItem(input)).offerTo(this.exporter);
    }
 
    /**
@@ -646,7 +637,7 @@
     * @mapping {@literal named offerChiseledBlockRecipe Lnet/minecraft/data/server/RecipesProvider;offerChiseledBlockRecipe(Lnet/minecraft/recipe/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V}
     */
    protected void offerChiseledBlockRecipe(RecipeCategory category, ItemConvertible output, ItemConvertible input) {
-      this.createChiseledBlockRecipe(category, output, Ingredient.m_xqanmytq(input))
+      this.createChiseledBlockRecipe(category, output, Ingredient.ofItem(input))
          .criterion(hasItem(input), this.conditionsFromItem(input))
          .offerTo(this.exporter);
    }
@@ -685,7 +676,7 @@
     * @mapping {@literal named m_vxidcwfd Lnet/minecraft/data/server/RecipesProvider;m_vxidcwfd(Lnet/minecraft/recipe/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;I)V}
     */
    protected void m_vxidcwfd(RecipeCategory category, ItemConvertible arg2, ItemConvertible arg3, int count) {
-      SingleItemRecipeJsonFactory.createStonecuttingRecipe(Ingredient.m_xqanmytq(arg3), category, arg2, count)
+      SingleItemRecipeJsonFactory.createStonecuttingRecipe(Ingredient.ofItem(arg3), category, arg2, count)
          .criterion(hasItem(arg3), this.conditionsFromItem(arg3))
          .offerTo(this.exporter, convertBetween(arg2, arg3) + "_stonecutting");
    }
@@ -697,7 +688,7 @@
     * @mapping {@literal named offerCrackingRecipe Lnet/minecraft/data/server/RecipesProvider;offerCrackingRecipe(Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V}
     */
    private void offerCrackingRecipe(ItemConvertible output, ItemConvertible input) {
-      CookingRecipeJsonFactory.createSmelting(Ingredient.m_xqanmytq(input), RecipeCategory.BUILDING_BLOCKS, output, 0.1F, 200)
+      CookingRecipeJsonFactory.createSmelting(Ingredient.ofItem(input), RecipeCategory.BUILDING_BLOCKS, output, 0.1F, 200)
          .criterion(hasItem(input), this.conditionsFromItem(input))
          .offerTo(this.exporter);
    }
@@ -829,7 +820,7 @@
       ItemConvertible output,
       float experience
    ) {
-      CookingRecipeJsonFactory.create(Ingredient.m_xqanmytq(input), RecipeCategory.FOOD, output, experience, cookingTime, serializer, recipe)
+      CookingRecipeJsonFactory.create(Ingredient.ofItem(input), RecipeCategory.FOOD, output, experience, cookingTime, serializer, recipe)
          .criterion(hasItem(input), this.conditionsFromItem(input))
          .offerTo(this.exporter, getItemPath(output) + "_from_" + cooker);
    }
@@ -1056,7 +1047,7 @@
     * @mapping {@literal named m_gckzgpoa Lnet/minecraft/data/server/RecipesProvider;m_gckzgpoa(Lnet/minecraft/registry/tag/TagKey;)Lnet/minecraft/recipe/Ingredient;}
     */
    protected Ingredient m_gckzgpoa(TagKey<Item> tag) {
-      return Ingredient.m_owdzpelq(this.f_vvimmxmt.getTagOrThrow(tag));
+      return Ingredient.ofItems(this.f_vvimmxmt.getTagOrThrow(tag));
    }
 
    /**

github-actions · 2024-10-09T02:01:30Z

View the diff here (3/3):

diff -bur namedTargetSrc/net/minecraft/data/server/VanillaRecipesProvider.java namedSrc/net/minecraft/data/server/VanillaRecipesProvider.java
--- namedTargetSrc/net/minecraft/data/server/VanillaRecipesProvider.java	2024-10-09 02:01:27.187385109 +0000
+++ namedSrc/net/minecraft/data/server/VanillaRecipesProvider.java	2024-10-09 02:00:18.167011915 +0000
@@ -625,12 +625,12 @@
       this.offerBoatWithChestRecipe(Items.OAK_CHEST_BOAT, Items.OAK_BOAT);
       this.offerBoatWithChestRecipe(Items.SPRUCE_CHEST_BOAT, Items.SPRUCE_BOAT);
       this.offerBoatWithChestRecipe(Items.MANGROVE_CHEST_BOAT, Items.MANGROVE_BOAT);
-      this.createChiseledBlockRecipe(RecipeCategory.BUILDING_BLOCKS, Blocks.CHISELED_QUARTZ_BLOCK, Ingredient.m_xqanmytq(Blocks.QUARTZ_SLAB))
+      this.createChiseledBlockRecipe(RecipeCategory.BUILDING_BLOCKS, Blocks.CHISELED_QUARTZ_BLOCK, Ingredient.ofItem(Blocks.QUARTZ_SLAB))
          .criterion("has_chiseled_quartz_block", this.conditionsFromItem(Blocks.CHISELED_QUARTZ_BLOCK))
          .criterion("has_quartz_block", this.conditionsFromItem(Blocks.QUARTZ_BLOCK))
          .criterion("has_quartz_pillar", this.conditionsFromItem(Blocks.QUARTZ_PILLAR))
          .offerTo(this.exporter);
-      this.createChiseledBlockRecipe(RecipeCategory.BUILDING_BLOCKS, Blocks.CHISELED_STONE_BRICKS, Ingredient.m_xqanmytq(Blocks.STONE_BRICK_SLAB))
+      this.createChiseledBlockRecipe(RecipeCategory.BUILDING_BLOCKS, Blocks.CHISELED_STONE_BRICKS, Ingredient.ofItem(Blocks.STONE_BRICK_SLAB))
          .criterion("has_tag", this.conditionsFromTag(ItemTags.STONE_BRICKS))
          .offerTo(this.exporter);
       this.offerTwoByTwoCompactingRecipe(RecipeCategory.BUILDING_BLOCKS, Blocks.CLAY, Items.CLAY_BALL);
@@ -699,7 +699,7 @@
          .pattern("##")
          .criterion("has_string", this.conditionsFromItem(Items.STRING))
          .offerTo(this.exporter);
-      this.createChiseledBlockRecipe(RecipeCategory.BUILDING_BLOCKS, Blocks.CHISELED_RED_SANDSTONE, Ingredient.m_xqanmytq(Blocks.RED_SANDSTONE_SLAB))
+      this.createChiseledBlockRecipe(RecipeCategory.BUILDING_BLOCKS, Blocks.CHISELED_RED_SANDSTONE, Ingredient.ofItem(Blocks.RED_SANDSTONE_SLAB))
          .criterion("has_red_sandstone", this.conditionsFromItem(Blocks.RED_SANDSTONE))
          .criterion("has_chiseled_red_sandstone", this.conditionsFromItem(Blocks.CHISELED_RED_SANDSTONE))
          .criterion("has_cut_red_sandstone", this.conditionsFromItem(Blocks.CUT_RED_SANDSTONE))
@@ -1126,7 +1126,7 @@
          .pattern("XXX")
          .criterion("has_iron_ingot", this.conditionsFromItem(Items.IRON_INGOT))
          .offerTo(this.exporter);
-      this.createDoorRecipe(Blocks.IRON_DOOR, Ingredient.m_xqanmytq(Items.IRON_INGOT))
+      this.createDoorRecipe(Blocks.IRON_DOOR, Ingredient.ofItem(Items.IRON_INGOT))
          .criterion(hasItem(Items.IRON_INGOT), this.conditionsFromItem(Items.IRON_INGOT))
          .offerTo(this.exporter);
       this.m_hscxseig(RecipeCategory.COMBAT, Items.IRON_HELMET)
@@ -1722,10 +1722,10 @@
          .pattern(" #")
          .criterion("has_cobblestone", this.conditionsFromTag(ItemTags.STONE_TOOL_MATERIALS))
          .offerTo(this.exporter);
-      this.createSlabRecipe(RecipeCategory.BUILDING_BLOCKS, Blocks.STONE_BRICK_SLAB, Ingredient.m_xqanmytq(Blocks.STONE_BRICKS))
+      this.createSlabRecipe(RecipeCategory.BUILDING_BLOCKS, Blocks.STONE_BRICK_SLAB, Ingredient.ofItem(Blocks.STONE_BRICKS))
          .criterion("has_stone_bricks", this.conditionsFromTag(ItemTags.STONE_BRICKS))
          .offerTo(this.exporter);
-      this.createStairsRecipe(Blocks.STONE_BRICK_STAIRS, Ingredient.m_xqanmytq(Blocks.STONE_BRICKS))
+      this.createStairsRecipe(Blocks.STONE_BRICK_STAIRS, Ingredient.ofItem(Blocks.STONE_BRICKS))
          .criterion("has_stone_bricks", this.conditionsFromTag(ItemTags.STONE_BRICKS))
          .offerTo(this.exporter);
       this.m_hscxseig(RecipeCategory.TOOLS, Items.STONE_HOE)
@@ -2095,40 +2095,40 @@
       ComplexRecipeJsonFactory.create(RepairItemRecipe::new).offerTo(this.exporter, "repair_item");
       ComplexRecipeJsonFactory.create(ShieldDecorationRecipe::new).offerTo(this.exporter, "shield_decoration");
       ComplexRecipeJsonFactory.create(TippedArrowRecipe::new).offerTo(this.exporter, "tipped_arrow");
-      CookingRecipeJsonFactory.createSmelting(Ingredient.m_xqanmytq(Items.POTATO), RecipeCategory.FOOD, Items.BAKED_POTATO, 0.35F, 200)
+      CookingRecipeJsonFactory.createSmelting(Ingredient.ofItem(Items.POTATO), RecipeCategory.FOOD, Items.BAKED_POTATO, 0.35F, 200)
          .criterion("has_potato", this.conditionsFromItem(Items.POTATO))
          .offerTo(this.exporter);
-      CookingRecipeJsonFactory.createSmelting(Ingredient.m_xqanmytq(Items.CLAY_BALL), RecipeCategory.MISC, Items.BRICK, 0.3F, 200)
+      CookingRecipeJsonFactory.createSmelting(Ingredient.ofItem(Items.CLAY_BALL), RecipeCategory.MISC, Items.BRICK, 0.3F, 200)
          .criterion("has_clay_ball", this.conditionsFromItem(Items.CLAY_BALL))
          .offerTo(this.exporter);
       CookingRecipeJsonFactory.createSmelting(this.m_gckzgpoa(ItemTags.LOGS_THAT_BURN), RecipeCategory.MISC, Items.CHARCOAL, 0.15F, 200)
          .criterion("has_log", this.conditionsFromTag(ItemTags.LOGS_THAT_BURN))
          .offerTo(this.exporter);
-      CookingRecipeJsonFactory.createSmelting(Ingredient.m_xqanmytq(Items.CHORUS_FRUIT), RecipeCategory.MISC, Items.POPPED_CHORUS_FRUIT, 0.1F, 200)
+      CookingRecipeJsonFactory.createSmelting(Ingredient.ofItem(Items.CHORUS_FRUIT), RecipeCategory.MISC, Items.POPPED_CHORUS_FRUIT, 0.1F, 200)
          .criterion("has_chorus_fruit", this.conditionsFromItem(Items.CHORUS_FRUIT))
          .offerTo(this.exporter);
-      CookingRecipeJsonFactory.createSmelting(Ingredient.m_xqanmytq(Items.BEEF), RecipeCategory.FOOD, Items.COOKED_BEEF, 0.35F, 200)
+      CookingRecipeJsonFactory.createSmelting(Ingredient.ofItem(Items.BEEF), RecipeCategory.FOOD, Items.COOKED_BEEF, 0.35F, 200)
          .criterion("has_beef", this.conditionsFromItem(Items.BEEF))
          .offerTo(this.exporter);
-      CookingRecipeJsonFactory.createSmelting(Ingredient.m_xqanmytq(Items.CHICKEN), RecipeCategory.FOOD, Items.COOKED_CHICKEN, 0.35F, 200)
+      CookingRecipeJsonFactory.createSmelting(Ingredient.ofItem(Items.CHICKEN), RecipeCategory.FOOD, Items.COOKED_CHICKEN, 0.35F, 200)
          .criterion("has_chicken", this.conditionsFromItem(Items.CHICKEN))
          .offerTo(this.exporter);
-      CookingRecipeJsonFactory.createSmelting(Ingredient.m_xqanmytq(Items.COD), RecipeCategory.FOOD, Items.COOKED_COD, 0.35F, 200)
+      CookingRecipeJsonFactory.createSmelting(Ingredient.ofItem(Items.COD), RecipeCategory.FOOD, Items.COOKED_COD, 0.35F, 200)
          .criterion("has_cod", this.conditionsFromItem(Items.COD))
          .offerTo(this.exporter);
-      CookingRecipeJsonFactory.createSmelting(Ingredient.m_xqanmytq(Blocks.KELP), RecipeCategory.FOOD, Items.DRIED_KELP, 0.1F, 200)
+      CookingRecipeJsonFactory.createSmelting(Ingredient.ofItem(Blocks.KELP), RecipeCategory.FOOD, Items.DRIED_KELP, 0.1F, 200)
          .criterion("has_kelp", this.conditionsFromItem(Blocks.KELP))
          .offerTo(this.exporter, getSmeltingItemPath(Items.DRIED_KELP));
-      CookingRecipeJsonFactory.createSmelting(Ingredient.m_xqanmytq(Items.SALMON), RecipeCategory.FOOD, Items.COOKED_SALMON, 0.35F, 200)
+      CookingRecipeJsonFactory.createSmelting(Ingredient.ofItem(Items.SALMON), RecipeCategory.FOOD, Items.COOKED_SALMON, 0.35F, 200)
          .criterion("has_salmon", this.conditionsFromItem(Items.SALMON))
          .offerTo(this.exporter);
-      CookingRecipeJsonFactory.createSmelting(Ingredient.m_xqanmytq(Items.MUTTON), RecipeCategory.FOOD, Items.COOKED_MUTTON, 0.35F, 200)
+      CookingRecipeJsonFactory.createSmelting(Ingredient.ofItem(Items.MUTTON), RecipeCategory.FOOD, Items.COOKED_MUTTON, 0.35F, 200)
          .criterion("has_mutton", this.conditionsFromItem(Items.MUTTON))
          .offerTo(this.exporter);
-      CookingRecipeJsonFactory.createSmelting(Ingredient.m_xqanmytq(Items.PORKCHOP), RecipeCategory.FOOD, Items.COOKED_PORKCHOP, 0.35F, 200)
+      CookingRecipeJsonFactory.createSmelting(Ingredient.ofItem(Items.PORKCHOP), RecipeCategory.FOOD, Items.COOKED_PORKCHOP, 0.35F, 200)
          .criterion("has_porkchop", this.conditionsFromItem(Items.PORKCHOP))
          .offerTo(this.exporter);
-      CookingRecipeJsonFactory.createSmelting(Ingredient.m_xqanmytq(Items.RABBIT), RecipeCategory.FOOD, Items.COOKED_RABBIT, 0.35F, 200)
+      CookingRecipeJsonFactory.createSmelting(Ingredient.ofItem(Items.RABBIT), RecipeCategory.FOOD, Items.COOKED_RABBIT, 0.35F, 200)
          .criterion("has_rabbit", this.conditionsFromItem(Items.RABBIT))
          .offerTo(this.exporter);
       this.offerSmelting(COAL_ORES, RecipeCategory.MISC, Items.COAL, 0.1F, 200, "coal");
@@ -2145,10 +2145,10 @@
       CookingRecipeJsonFactory.createSmelting(this.m_gckzgpoa(ItemTags.SMELTS_TO_GLASS), RecipeCategory.BUILDING_BLOCKS, Blocks.GLASS.asItem(), 0.1F, 200)
          .criterion("has_smelts_to_glass", this.conditionsFromTag(ItemTags.SMELTS_TO_GLASS))
          .offerTo(this.exporter);
-      CookingRecipeJsonFactory.createSmelting(Ingredient.m_xqanmytq(Blocks.SEA_PICKLE), RecipeCategory.MISC, Items.LIME_DYE, 0.1F, 200)
+      CookingRecipeJsonFactory.createSmelting(Ingredient.ofItem(Blocks.SEA_PICKLE), RecipeCategory.MISC, Items.LIME_DYE, 0.1F, 200)
          .criterion("has_sea_pickle", this.conditionsFromItem(Blocks.SEA_PICKLE))
          .offerTo(this.exporter, getSmeltingItemPath(Items.LIME_DYE));
-      CookingRecipeJsonFactory.createSmelting(Ingredient.m_xqanmytq(Blocks.CACTUS.asItem()), RecipeCategory.MISC, Items.GREEN_DYE, 1.0F, 200)
+      CookingRecipeJsonFactory.createSmelting(Ingredient.ofItem(Blocks.CACTUS.asItem()), RecipeCategory.MISC, Items.GREEN_DYE, 1.0F, 200)
          .criterion("has_cactus", this.conditionsFromItem(Blocks.CACTUS))
          .offerTo(this.exporter);
       CookingRecipeJsonFactory.createSmelting(
@@ -2217,131 +2217,127 @@
          .criterion("has_chainmail_leggings", this.conditionsFromItem(Items.CHAINMAIL_LEGGINGS))
          .criterion("has_chainmail_boots", this.conditionsFromItem(Items.CHAINMAIL_BOOTS))
          .offerTo(this.exporter, getSmeltingItemPath(Items.IRON_NUGGET));
-      CookingRecipeJsonFactory.createSmelting(Ingredient.m_xqanmytq(Blocks.CLAY), RecipeCategory.BUILDING_BLOCKS, Blocks.TERRACOTTA.asItem(), 0.35F, 200)
+      CookingRecipeJsonFactory.createSmelting(Ingredient.ofItem(Blocks.CLAY), RecipeCategory.BUILDING_BLOCKS, Blocks.TERRACOTTA.asItem(), 0.35F, 200)
          .criterion("has_clay_block", this.conditionsFromItem(Blocks.CLAY))
          .offerTo(this.exporter);
-      CookingRecipeJsonFactory.createSmelting(Ingredient.m_xqanmytq(Blocks.NETHERRACK), RecipeCategory.MISC, Items.NETHER_BRICK, 0.1F, 200)
+      CookingRecipeJsonFactory.createSmelting(Ingredient.ofItem(Blocks.NETHERRACK), RecipeCategory.MISC, Items.NETHER_BRICK, 0.1F, 200)
          .criterion("has_netherrack", this.conditionsFromItem(Blocks.NETHERRACK))
          .offerTo(this.exporter);
-      CookingRecipeJsonFactory.createSmelting(Ingredient.m_xqanmytq(Blocks.NETHER_QUARTZ_ORE), RecipeCategory.MISC, Items.QUARTZ, 0.2F, 200)
+      CookingRecipeJsonFactory.createSmelting(Ingredient.ofItem(Blocks.NETHER_QUARTZ_ORE), RecipeCategory.MISC, Items.QUARTZ, 0.2F, 200)
          .criterion("has_nether_quartz_ore", this.conditionsFromItem(Blocks.NETHER_QUARTZ_ORE))
          .offerTo(this.exporter);
-      CookingRecipeJsonFactory.createSmelting(Ingredient.m_xqanmytq(Blocks.WET_SPONGE), RecipeCategory.BUILDING_BLOCKS, Blocks.SPONGE.asItem(), 0.15F, 200)
+      CookingRecipeJsonFactory.createSmelting(Ingredient.ofItem(Blocks.WET_SPONGE), RecipeCategory.BUILDING_BLOCKS, Blocks.SPONGE.asItem(), 0.15F, 200)
          .criterion("has_wet_sponge", this.conditionsFromItem(Blocks.WET_SPONGE))
          .offerTo(this.exporter);
-      CookingRecipeJsonFactory.createSmelting(Ingredient.m_xqanmytq(Blocks.COBBLESTONE), RecipeCategory.BUILDING_BLOCKS, Blocks.STONE.asItem(), 0.1F, 200)
+      CookingRecipeJsonFactory.createSmelting(Ingredient.ofItem(Blocks.COBBLESTONE), RecipeCategory.BUILDING_BLOCKS, Blocks.STONE.asItem(), 0.1F, 200)
          .criterion("has_cobblestone", this.conditionsFromItem(Blocks.COBBLESTONE))
          .offerTo(this.exporter);
-      CookingRecipeJsonFactory.createSmelting(Ingredient.m_xqanmytq(Blocks.STONE), RecipeCategory.BUILDING_BLOCKS, Blocks.SMOOTH_STONE.asItem(), 0.1F, 200)
+      CookingRecipeJsonFactory.createSmelting(Ingredient.ofItem(Blocks.STONE), RecipeCategory.BUILDING_BLOCKS, Blocks.SMOOTH_STONE.asItem(), 0.1F, 200)
          .criterion("has_stone", this.conditionsFromItem(Blocks.STONE))
          .offerTo(this.exporter);
-      CookingRecipeJsonFactory.createSmelting(
-            Ingredient.m_xqanmytq(Blocks.SANDSTONE), RecipeCategory.BUILDING_BLOCKS, Blocks.SMOOTH_SANDSTONE.asItem(), 0.1F, 200
-         )
+      CookingRecipeJsonFactory.createSmelting(Ingredient.ofItem(Blocks.SANDSTONE), RecipeCategory.BUILDING_BLOCKS, Blocks.SMOOTH_SANDSTONE.asItem(), 0.1F, 200)
          .criterion("has_sandstone", this.conditionsFromItem(Blocks.SANDSTONE))
          .offerTo(this.exporter);
       CookingRecipeJsonFactory.createSmelting(
-            Ingredient.m_xqanmytq(Blocks.RED_SANDSTONE), RecipeCategory.BUILDING_BLOCKS, Blocks.SMOOTH_RED_SANDSTONE.asItem(), 0.1F, 200
+            Ingredient.ofItem(Blocks.RED_SANDSTONE), RecipeCategory.BUILDING_BLOCKS, Blocks.SMOOTH_RED_SANDSTONE.asItem(), 0.1F, 200
          )
          .criterion("has_red_sandstone", this.conditionsFromItem(Blocks.RED_SANDSTONE))
          .offerTo(this.exporter);
-      CookingRecipeJsonFactory.createSmelting(
-            Ingredient.m_xqanmytq(Blocks.QUARTZ_BLOCK), RecipeCategory.BUILDING_BLOCKS, Blocks.SMOOTH_QUARTZ.asItem(), 0.1F, 200
-         )
+      CookingRecipeJsonFactory.createSmelting(Ingredient.ofItem(Blocks.QUARTZ_BLOCK), RecipeCategory.BUILDING_BLOCKS, Blocks.SMOOTH_QUARTZ.asItem(), 0.1F, 200)
          .criterion("has_quartz_block", this.conditionsFromItem(Blocks.QUARTZ_BLOCK))
          .offerTo(this.exporter);
       CookingRecipeJsonFactory.createSmelting(
-            Ingredient.m_xqanmytq(Blocks.STONE_BRICKS), RecipeCategory.BUILDING_BLOCKS, Blocks.CRACKED_STONE_BRICKS.asItem(), 0.1F, 200
+            Ingredient.ofItem(Blocks.STONE_BRICKS), RecipeCategory.BUILDING_BLOCKS, Blocks.CRACKED_STONE_BRICKS.asItem(), 0.1F, 200
          )
          .criterion("has_stone_bricks", this.conditionsFromItem(Blocks.STONE_BRICKS))
          .offerTo(this.exporter);
       CookingRecipeJsonFactory.createSmelting(
-            Ingredient.m_xqanmytq(Blocks.BLACK_TERRACOTTA), RecipeCategory.DECORATIONS, Blocks.BLACK_GLAZED_TERRACOTTA.asItem(), 0.1F, 200
+            Ingredient.ofItem(Blocks.BLACK_TERRACOTTA), RecipeCategory.DECORATIONS, Blocks.BLACK_GLAZED_TERRACOTTA.asItem(), 0.1F, 200
          )
          .criterion("has_black_terracotta", this.conditionsFromItem(Blocks.BLACK_TERRACOTTA))
          .offerTo(this.exporter);
       CookingRecipeJsonFactory.createSmelting(
-            Ingredient.m_xqanmytq(Blocks.BLUE_TERRACOTTA), RecipeCategory.DECORATIONS, Blocks.BLUE_GLAZED_TERRACOTTA.asItem(), 0.1F, 200
+            Ingredient.ofItem(Blocks.BLUE_TERRACOTTA), RecipeCategory.DECORATIONS, Blocks.BLUE_GLAZED_TERRACOTTA.asItem(), 0.1F, 200
          )
          .criterion("has_blue_terracotta", this.conditionsFromItem(Blocks.BLUE_TERRACOTTA))
          .offerTo(this.exporter);
       CookingRecipeJsonFactory.createSmelting(
-            Ingredient.m_xqanmytq(Blocks.BROWN_TERRACOTTA), RecipeCategory.DECORATIONS, Blocks.BROWN_GLAZED_TERRACOTTA.asItem(), 0.1F, 200
+            Ingredient.ofItem(Blocks.BROWN_TERRACOTTA), RecipeCategory.DECORATIONS, Blocks.BROWN_GLAZED_TERRACOTTA.asItem(), 0.1F, 200
          )
          .criterion("has_brown_terracotta", this.conditionsFromItem(Blocks.BROWN_TERRACOTTA))
          .offerTo(this.exporter);
       CookingRecipeJsonFactory.createSmelting(
-            Ingredient.m_xqanmytq(Blocks.CYAN_TERRACOTTA), RecipeCategory.DECORATIONS, Blocks.CYAN_GLAZED_TERRACOTTA.asItem(), 0.1F, 200
+            Ingredient.ofItem(Blocks.CYAN_TERRACOTTA), RecipeCategory.DECORATIONS, Blocks.CYAN_GLAZED_TERRACOTTA.asItem(), 0.1F, 200
          )
          .criterion("has_cyan_terracotta", this.conditionsFromItem(Blocks.CYAN_TERRACOTTA))
          .offerTo(this.exporter);
       CookingRecipeJsonFactory.createSmelting(
-            Ingredient.m_xqanmytq(Blocks.GRAY_TERRACOTTA), RecipeCategory.DECORATIONS, Blocks.GRAY_GLAZED_TERRACOTTA.asItem(), 0.1F, 200
+            Ingredient.ofItem(Blocks.GRAY_TERRACOTTA), RecipeCategory.DECORATIONS, Blocks.GRAY_GLAZED_TERRACOTTA.asItem(), 0.1F, 200
          )
          .criterion("has_gray_terracotta", this.conditionsFromItem(Blocks.GRAY_TERRACOTTA))
          .offerTo(this.exporter);
       CookingRecipeJsonFactory.createSmelting(
-            Ingredient.m_xqanmytq(Blocks.GREEN_TERRACOTTA), RecipeCategory.DECORATIONS, Blocks.GREEN_GLAZED_TERRACOTTA.asItem(), 0.1F, 200
+            Ingredient.ofItem(Blocks.GREEN_TERRACOTTA), RecipeCategory.DECORATIONS, Blocks.GREEN_GLAZED_TERRACOTTA.asItem(), 0.1F, 200
          )
          .criterion("has_green_terracotta", this.conditionsFromItem(Blocks.GREEN_TERRACOTTA))
          .offerTo(this.exporter);
       CookingRecipeJsonFactory.createSmelting(
-            Ingredient.m_xqanmytq(Blocks.LIGHT_BLUE_TERRACOTTA), RecipeCategory.DECORATIONS, Blocks.LIGHT_BLUE_GLAZED_TERRACOTTA.asItem(), 0.1F, 200
+            Ingredient.ofItem(Blocks.LIGHT_BLUE_TERRACOTTA), RecipeCategory.DECORATIONS, Blocks.LIGHT_BLUE_GLAZED_TERRACOTTA.asItem(), 0.1F, 200
          )
          .criterion("has_light_blue_terracotta", this.conditionsFromItem(Blocks.LIGHT_BLUE_TERRACOTTA))
          .offerTo(this.exporter);
       CookingRecipeJsonFactory.createSmelting(
-            Ingredient.m_xqanmytq(Blocks.LIGHT_GRAY_TERRACOTTA), RecipeCategory.DECORATIONS, Blocks.LIGHT_GRAY_GLAZED_TERRACOTTA.asItem(), 0.1F, 200
+            Ingredient.ofItem(Blocks.LIGHT_GRAY_TERRACOTTA), RecipeCategory.DECORATIONS, Blocks.LIGHT_GRAY_GLAZED_TERRACOTTA.asItem(), 0.1F, 200
          )
          .criterion("has_light_gray_terracotta", this.conditionsFromItem(Blocks.LIGHT_GRAY_TERRACOTTA))
          .offerTo(this.exporter);
       CookingRecipeJsonFactory.createSmelting(
-            Ingredient.m_xqanmytq(Blocks.LIME_TERRACOTTA), RecipeCategory.DECORATIONS, Blocks.LIME_GLAZED_TERRACOTTA.asItem(), 0.1F, 200
+            Ingredient.ofItem(Blocks.LIME_TERRACOTTA), RecipeCategory.DECORATIONS, Blocks.LIME_GLAZED_TERRACOTTA.asItem(), 0.1F, 200
          )
          .criterion("has_lime_terracotta", this.conditionsFromItem(Blocks.LIME_TERRACOTTA))
          .offerTo(this.exporter);
       CookingRecipeJsonFactory.createSmelting(
-            Ingredient.m_xqanmytq(Blocks.MAGENTA_TERRACOTTA), RecipeCategory.DECORATIONS, Blocks.MAGENTA_GLAZED_TERRACOTTA.asItem(), 0.1F, 200
+            Ingredient.ofItem(Blocks.MAGENTA_TERRACOTTA), RecipeCategory.DECORATIONS, Blocks.MAGENTA_GLAZED_TERRACOTTA.asItem(), 0.1F, 200
          )
          .criterion("has_magenta_terracotta", this.conditionsFromItem(Blocks.MAGENTA_TERRACOTTA))
          .offerTo(this.exporter);
       CookingRecipeJsonFactory.createSmelting(
-            Ingredient.m_xqanmytq(Blocks.ORANGE_TERRACOTTA), RecipeCategory.DECORATIONS, Blocks.ORANGE_GLAZED_TERRACOTTA.asItem(), 0.1F, 200
+            Ingredient.ofItem(Blocks.ORANGE_TERRACOTTA), RecipeCategory.DECORATIONS, Blocks.ORANGE_GLAZED_TERRACOTTA.asItem(), 0.1F, 200
          )
          .criterion("has_orange_terracotta", this.conditionsFromItem(Blocks.ORANGE_TERRACOTTA))
          .offerTo(this.exporter);
       CookingRecipeJsonFactory.createSmelting(
-            Ingredient.m_xqanmytq(Blocks.PINK_TERRACOTTA), RecipeCategory.DECORATIONS, Blocks.PINK_GLAZED_TERRACOTTA.asItem(), 0.1F, 200
+            Ingredient.ofItem(Blocks.PINK_TERRACOTTA), RecipeCategory.DECORATIONS, Blocks.PINK_GLAZED_TERRACOTTA.asItem(), 0.1F, 200
          )
          .criterion("has_pink_terracotta", this.conditionsFromItem(Blocks.PINK_TERRACOTTA))
          .offerTo(this.exporter);
       CookingRecipeJsonFactory.createSmelting(
-            Ingredient.m_xqanmytq(Blocks.PURPLE_TERRACOTTA), RecipeCategory.DECORATIONS, Blocks.PURPLE_GLAZED_TERRACOTTA.asItem(), 0.1F, 200
+            Ingredient.ofItem(Blocks.PURPLE_TERRACOTTA), RecipeCategory.DECORATIONS, Blocks.PURPLE_GLAZED_TERRACOTTA.asItem(), 0.1F, 200
          )
          .criterion("has_purple_terracotta", this.conditionsFromItem(Blocks.PURPLE_TERRACOTTA))
          .offerTo(this.exporter);
       CookingRecipeJsonFactory.createSmelting(
-            Ingredient.m_xqanmytq(Blocks.RED_TERRACOTTA), RecipeCategory.DECORATIONS, Blocks.RED_GLAZED_TERRACOTTA.asItem(), 0.1F, 200
+            Ingredient.ofItem(Blocks.RED_TERRACOTTA), RecipeCategory.DECORATIONS, Blocks.RED_GLAZED_TERRACOTTA.asItem(), 0.1F, 200
          )
          .criterion("has_red_terracotta", this.conditionsFromItem(Blocks.RED_TERRACOTTA))
          .offerTo(this.exporter);
       CookingRecipeJsonFactory.createSmelting(
-            Ingredient.m_xqanmytq(Blocks.WHITE_TERRACOTTA), RecipeCategory.DECORATIONS, Blocks.WHITE_GLAZED_TERRACOTTA.asItem(), 0.1F, 200
+            Ingredient.ofItem(Blocks.WHITE_TERRACOTTA), RecipeCategory.DECORATIONS, Blocks.WHITE_GLAZED_TERRACOTTA.asItem(), 0.1F, 200
          )
          .criterion("has_white_terracotta", this.conditionsFromItem(Blocks.WHITE_TERRACOTTA))
          .offerTo(this.exporter);
       CookingRecipeJsonFactory.createSmelting(
-            Ingredient.m_xqanmytq(Blocks.YELLOW_TERRACOTTA), RecipeCategory.DECORATIONS, Blocks.YELLOW_GLAZED_TERRACOTTA.asItem(), 0.1F, 200
+            Ingredient.ofItem(Blocks.YELLOW_TERRACOTTA), RecipeCategory.DECORATIONS, Blocks.YELLOW_GLAZED_TERRACOTTA.asItem(), 0.1F, 200
          )
          .criterion("has_yellow_terracotta", this.conditionsFromItem(Blocks.YELLOW_TERRACOTTA))
          .offerTo(this.exporter);
-      CookingRecipeJsonFactory.createSmelting(Ingredient.m_xqanmytq(Blocks.ANCIENT_DEBRIS), RecipeCategory.MISC, Items.NETHERITE_SCRAP, 2.0F, 200)
+      CookingRecipeJsonFactory.createSmelting(Ingredient.ofItem(Blocks.ANCIENT_DEBRIS), RecipeCategory.MISC, Items.NETHERITE_SCRAP, 2.0F, 200)
          .criterion("has_ancient_debris", this.conditionsFromItem(Blocks.ANCIENT_DEBRIS))
          .offerTo(this.exporter);
-      CookingRecipeJsonFactory.createSmelting(Ingredient.m_xqanmytq(Blocks.BASALT), RecipeCategory.BUILDING_BLOCKS, Blocks.SMOOTH_BASALT, 0.1F, 200)
+      CookingRecipeJsonFactory.createSmelting(Ingredient.ofItem(Blocks.BASALT), RecipeCategory.BUILDING_BLOCKS, Blocks.SMOOTH_BASALT, 0.1F, 200)
          .criterion("has_basalt", this.conditionsFromItem(Blocks.BASALT))
          .offerTo(this.exporter);
-      CookingRecipeJsonFactory.createSmelting(Ingredient.m_xqanmytq(Blocks.COBBLED_DEEPSLATE), RecipeCategory.BUILDING_BLOCKS, Blocks.DEEPSLATE, 0.1F, 200)
+      CookingRecipeJsonFactory.createSmelting(Ingredient.ofItem(Blocks.COBBLED_DEEPSLATE), RecipeCategory.BUILDING_BLOCKS, Blocks.DEEPSLATE, 0.1F, 200)
          .criterion("has_cobbled_deepslate", this.conditionsFromItem(Blocks.COBBLED_DEEPSLATE))
          .offerTo(this.exporter);
       this.offerBlasting(COAL_ORES, RecipeCategory.MISC, Items.COAL, 0.1F, 100, "coal");
@@ -2352,7 +2348,7 @@
       this.offerBlasting(LAPIS_ORES, RecipeCategory.MISC, Items.LAPIS_LAZULI, 0.2F, 100, "lapis_lazuli");
       this.offerBlasting(REDSTONE_ORES, RecipeCategory.REDSTONE, Items.REDSTONE, 0.7F, 100, "redstone");
       this.offerBlasting(EMERALD_ORES, RecipeCategory.MISC, Items.EMERALD, 1.0F, 100, "emerald");
-      CookingRecipeJsonFactory.createBlasting(Ingredient.m_xqanmytq(Blocks.NETHER_QUARTZ_ORE), RecipeCategory.MISC, Items.QUARTZ, 0.2F, 100)
+      CookingRecipeJsonFactory.createBlasting(Ingredient.ofItem(Blocks.NETHER_QUARTZ_ORE), RecipeCategory.MISC, Items.QUARTZ, 0.2F, 100)
          .criterion("has_nether_quartz_ore", this.conditionsFromItem(Blocks.NETHER_QUARTZ_ORE))
          .offerTo(this.exporter, getBlastingItemPath(Items.QUARTZ));
       CookingRecipeJsonFactory.createBlasting(
@@ -2421,7 +2417,7 @@
          .criterion("has_chainmail_leggings", this.conditionsFromItem(Items.CHAINMAIL_LEGGINGS))
          .criterion("has_chainmail_boots", this.conditionsFromItem(Items.CHAINMAIL_BOOTS))
          .offerTo(this.exporter, getBlastingItemPath(Items.IRON_NUGGET));
-      CookingRecipeJsonFactory.createBlasting(Ingredient.m_xqanmytq(Blocks.ANCIENT_DEBRIS), RecipeCategory.MISC, Items.NETHERITE_SCRAP, 2.0F, 100)
+      CookingRecipeJsonFactory.createBlasting(Ingredient.ofItem(Blocks.ANCIENT_DEBRIS), RecipeCategory.MISC, Items.NETHERITE_SCRAP, 2.0F, 100)
          .criterion("has_ancient_debris", this.conditionsFromItem(Blocks.ANCIENT_DEBRIS))
          .offerTo(this.exporter, getBlastingItemPath(Items.NETHERITE_SCRAP));
       this.generateCookingRecipes("smoking", RecipeSerializer.SMOKING, SmokingRecipe::new, 100);
@@ -2432,11 +2428,11 @@
       this.m_vxidcwfd(RecipeCategory.BUILDING_BLOCKS, Blocks.STONE_BRICK_SLAB, Blocks.STONE, 2);
       this.m_hbqrkbsu(RecipeCategory.BUILDING_BLOCKS, Blocks.STONE_BRICK_STAIRS, Blocks.STONE);
       SingleItemRecipeJsonFactory.createSingleOutputStonecuttingRecipe(
-            Ingredient.m_xqanmytq(Blocks.STONE), RecipeCategory.BUILDING_BLOCKS, Blocks.CHISELED_STONE_BRICKS
+            Ingredient.ofItem(Blocks.STONE), RecipeCategory.BUILDING_BLOCKS, Blocks.CHISELED_STONE_BRICKS
          )
          .criterion("has_stone", this.conditionsFromItem(Blocks.STONE))
          .offerTo(this.exporter, "chiseled_stone_bricks_stone_from_stonecutting");
-      SingleItemRecipeJsonFactory.createSingleOutputStonecuttingRecipe(Ingredient.m_xqanmytq(Blocks.STONE), RecipeCategory.DECORATIONS, Blocks.STONE_BRICK_WALL)
+      SingleItemRecipeJsonFactory.createSingleOutputStonecuttingRecipe(Ingredient.ofItem(Blocks.STONE), RecipeCategory.DECORATIONS, Blocks.STONE_BRICK_WALL)
          .criterion("has_stone", this.conditionsFromItem(Blocks.STONE))
          .offerTo(this.exporter, "stone_brick_walls_from_stone_stonecutting");
       this.m_hbqrkbsu(RecipeCategory.BUILDING_BLOCKS, Blocks.CUT_SANDSTONE, Blocks.SANDSTONE);
@@ -2453,7 +2449,7 @@
       this.m_hbqrkbsu(RecipeCategory.BUILDING_BLOCKS, Blocks.RED_SANDSTONE_STAIRS, Blocks.RED_SANDSTONE);
       this.m_hbqrkbsu(RecipeCategory.DECORATIONS, Blocks.RED_SANDSTONE_WALL, Blocks.RED_SANDSTONE);
       this.m_hbqrkbsu(RecipeCategory.BUILDING_BLOCKS, Blocks.CHISELED_RED_SANDSTONE, Blocks.RED_SANDSTONE);
-      SingleItemRecipeJsonFactory.createStonecuttingRecipe(Ingredient.m_xqanmytq(Blocks.QUARTZ_BLOCK), RecipeCategory.BUILDING_BLOCKS, Blocks.QUARTZ_SLAB, 2)
+      SingleItemRecipeJsonFactory.createStonecuttingRecipe(Ingredient.ofItem(Blocks.QUARTZ_BLOCK), RecipeCategory.BUILDING_BLOCKS, Blocks.QUARTZ_SLAB, 2)
          .criterion("has_quartz_block", this.conditionsFromItem(Blocks.QUARTZ_BLOCK))
          .offerTo(this.exporter, "quartz_slab_from_stonecutting");
       this.m_hbqrkbsu(RecipeCategory.BUILDING_BLOCKS, Blocks.QUARTZ_STAIRS, Blocks.QUARTZ_BLOCK);
@@ -2466,7 +2462,7 @@
       this.m_vxidcwfd(RecipeCategory.BUILDING_BLOCKS, Blocks.STONE_BRICK_SLAB, Blocks.STONE_BRICKS, 2);
       this.m_hbqrkbsu(RecipeCategory.BUILDING_BLOCKS, Blocks.STONE_BRICK_STAIRS, Blocks.STONE_BRICKS);
       SingleItemRecipeJsonFactory.createSingleOutputStonecuttingRecipe(
-            Ingredient.m_xqanmytq(Blocks.STONE_BRICKS), RecipeCategory.DECORATIONS, Blocks.STONE_BRICK_WALL
+            Ingredient.ofItem(Blocks.STONE_BRICKS), RecipeCategory.DECORATIONS, Blocks.STONE_BRICK_WALL
          )
          .criterion("has_stone_bricks", this.conditionsFromItem(Blocks.STONE_BRICKS))
          .offerTo(this.exporter, "stone_brick_wall_from_stone_bricks_stonecutting");
@@ -2491,12 +2487,12 @@
       this.m_hbqrkbsu(RecipeCategory.BUILDING_BLOCKS, Blocks.PRISMARINE_STAIRS, Blocks.PRISMARINE);
       this.m_hbqrkbsu(RecipeCategory.DECORATIONS, Blocks.PRISMARINE_WALL, Blocks.PRISMARINE);
       SingleItemRecipeJsonFactory.createStonecuttingRecipe(
-            Ingredient.m_xqanmytq(Blocks.PRISMARINE_BRICKS), RecipeCategory.BUILDING_BLOCKS, Blocks.PRISMARINE_BRICK_SLAB, 2
+            Ingredient.ofItem(Blocks.PRISMARINE_BRICKS), RecipeCategory.BUILDING_BLOCKS, Blocks.PRISMARINE_BRICK_SLAB, 2
          )
          .criterion("has_prismarine_brick", this.conditionsFromItem(Blocks.PRISMARINE_BRICKS))
          .offerTo(this.exporter, "prismarine_brick_slab_from_prismarine_stonecutting");
       SingleItemRecipeJsonFactory.createSingleOutputStonecuttingRecipe(
-            Ingredient.m_xqanmytq(Blocks.PRISMARINE_BRICKS), RecipeCategory.BUILDING_BLOCKS, Blocks.PRISMARINE_BRICK_STAIRS
+            Ingredient.ofItem(Blocks.PRISMARINE_BRICKS), RecipeCategory.BUILDING_BLOCKS, Blocks.PRISMARINE_BRICK_STAIRS
          )
          .criterion("has_prismarine_brick", this.conditionsFromItem(Blocks.PRISMARINE_BRICKS))
          .offerTo(this.exporter, "prismarine_brick_stairs_from_prismarine_stonecutting");
@@ -2528,17 +2524,17 @@
       this.m_vxidcwfd(RecipeCategory.BUILDING_BLOCKS, Blocks.POLISHED_DIORITE_SLAB, Blocks.POLISHED_DIORITE, 2);
       this.m_hbqrkbsu(RecipeCategory.BUILDING_BLOCKS, Blocks.POLISHED_DIORITE_STAIRS, Blocks.POLISHED_DIORITE);
       SingleItemRecipeJsonFactory.createStonecuttingRecipe(
-            Ingredient.m_xqanmytq(Blocks.MOSSY_STONE_BRICKS), RecipeCategory.BUILDING_BLOCKS, Blocks.MOSSY_STONE_BRICK_SLAB, 2
+            Ingredient.ofItem(Blocks.MOSSY_STONE_BRICKS), RecipeCategory.BUILDING_BLOCKS, Blocks.MOSSY_STONE_BRICK_SLAB, 2
          )
          .criterion("has_mossy_stone_bricks", this.conditionsFromItem(Blocks.MOSSY_STONE_BRICKS))
          .offerTo(this.exporter, "mossy_stone_brick_slab_from_mossy_stone_brick_stonecutting");
       SingleItemRecipeJsonFactory.createSingleOutputStonecuttingRecipe(
-            Ingredient.m_xqanmytq(Blocks.MOSSY_STONE_BRICKS), RecipeCategory.BUILDING_BLOCKS, Blocks.MOSSY_STONE_BRICK_STAIRS
+            Ingredient.ofItem(Blocks.MOSSY_STONE_BRICKS), RecipeCategory.BUILDING_BLOCKS, Blocks.MOSSY_STONE_BRICK_STAIRS
          )
          .criterion("has_mossy_stone_bricks", this.conditionsFromItem(Blocks.MOSSY_STONE_BRICKS))
          .offerTo(this.exporter, "mossy_stone_brick_stairs_from_mossy_stone_brick_stonecutting");
       SingleItemRecipeJsonFactory.createSingleOutputStonecuttingRecipe(
-            Ingredient.m_xqanmytq(Blocks.MOSSY_STONE_BRICKS), RecipeCategory.DECORATIONS, Blocks.MOSSY_STONE_BRICK_WALL
+            Ingredient.ofItem(Blocks.MOSSY_STONE_BRICKS), RecipeCategory.DECORATIONS, Blocks.MOSSY_STONE_BRICK_WALL
          )
          .criterion("has_mossy_stone_bricks", this.conditionsFromItem(Blocks.MOSSY_STONE_BRICKS))
          .offerTo(this.exporter, "mossy_stone_brick_wall_from_mossy_stone_brick_stonecutting");
@@ -2552,17 +2548,17 @@
       this.m_vxidcwfd(RecipeCategory.BUILDING_BLOCKS, Blocks.SMOOTH_QUARTZ_SLAB, Blocks.SMOOTH_QUARTZ, 2);
       this.m_hbqrkbsu(RecipeCategory.BUILDING_BLOCKS, Blocks.SMOOTH_QUARTZ_STAIRS, Blocks.SMOOTH_QUARTZ);
       SingleItemRecipeJsonFactory.createStonecuttingRecipe(
-            Ingredient.m_xqanmytq(Blocks.END_STONE_BRICKS), RecipeCategory.BUILDING_BLOCKS, Blocks.END_STONE_BRICK_SLAB, 2
+            Ingredient.ofItem(Blocks.END_STONE_BRICKS), RecipeCategory.BUILDING_BLOCKS, Blocks.END_STONE_BRICK_SLAB, 2
          )
          .criterion("has_end_stone_brick", this.conditionsFromItem(Blocks.END_STONE_BRICKS))
          .offerTo(this.exporter, "end_stone_brick_slab_from_end_stone_brick_stonecutting");
       SingleItemRecipeJsonFactory.createSingleOutputStonecuttingRecipe(
-            Ingredient.m_xqanmytq(Blocks.END_STONE_BRICKS), RecipeCategory.BUILDING_BLOCKS, Blocks.END_STONE_BRICK_STAIRS
+            Ingredient.ofItem(Blocks.END_STONE_BRICKS), RecipeCategory.BUILDING_BLOCKS, Blocks.END_STONE_BRICK_STAIRS
          )
          .criterion("has_end_stone_brick", this.conditionsFromItem(Blocks.END_STONE_BRICKS))
          .offerTo(this.exporter, "end_stone_brick_stairs_from_end_stone_brick_stonecutting");
       SingleItemRecipeJsonFactory.createSingleOutputStonecuttingRecipe(
-            Ingredient.m_xqanmytq(Blocks.END_STONE_BRICKS), RecipeCategory.DECORATIONS, Blocks.END_STONE_BRICK_WALL
+            Ingredient.ofItem(Blocks.END_STONE_BRICKS), RecipeCategory.DECORATIONS, Blocks.END_STONE_BRICK_WALL
          )
          .criterion("has_end_stone_brick", this.conditionsFromItem(Blocks.END_STONE_BRICKS))
          .offerTo(this.exporter, "end_stone_brick_wall_from_end_stone_brick_stonecutting");
@@ -2836,10 +2832,10 @@
          .criterion("has_breeze_rod", this.conditionsFromItem(Items.BREEZE_ROD))
          .criterion("has_heavy_core", this.conditionsFromItem(Blocks.HEAVY_CORE))
          .offerTo(this.exporter);
-      this.createDoorRecipe(Blocks.COPPER_DOOR, Ingredient.m_xqanmytq(Items.COPPER_INGOT))
+      this.createDoorRecipe(Blocks.COPPER_DOOR, Ingredient.ofItem(Items.COPPER_INGOT))
          .criterion(hasItem(Items.COPPER_INGOT), this.conditionsFromItem(Items.COPPER_INGOT))
          .offerTo(this.exporter);
-      this.createTrapdoorRecipe(Blocks.COPPER_TRAPDOOR, Ingredient.m_xqanmytq(Items.COPPER_INGOT))
+      this.createTrapdoorRecipe(Blocks.COPPER_TRAPDOOR, Ingredient.ofItem(Items.COPPER_INGOT))
          .criterion(hasItem(Items.COPPER_INGOT), this.conditionsFromItem(Items.COPPER_INGOT))
          .offerTo(this.exporter);
       this.m_hscxseig(RecipeCategory.TOOLS, Items.BUNDLE)
@@ -2891,7 +2887,7 @@
       Ingredient lv = this.m_gckzgpoa(ItemTags.SHULKER_BOXES);
 
       for (DyeColor lv2 : DyeColor.values()) {
-         C_qzdslxtp.m_ylegpokw(RecipeCategory.DECORATIONS, lv, Ingredient.m_xqanmytq(DyeItem.byColor(lv2)), ShulkerBoxBlock.get(lv2).asItem())
+         C_qzdslxtp.m_ylegpokw(RecipeCategory.DECORATIONS, lv, Ingredient.ofItem(DyeItem.byColor(lv2)), ShulkerBoxBlock.get(lv2).asItem())
             .group("shulker_box_dye")
             .criterion("has_shulker_box", this.conditionsFromTag(ItemTags.SHULKER_BOXES))
             .offerTo(this.exporter);
@@ -2906,7 +2902,7 @@
 
       for (DyeColor lv2 : DyeColor.values()) {
          DyeItem lv3 = DyeItem.byColor(lv2);
-         C_qzdslxtp.m_ylegpokw(RecipeCategory.TOOLS, lv, Ingredient.m_xqanmytq(lv3), BundleItem.m_optlhaxk(lv2))
+         C_qzdslxtp.m_ylegpokw(RecipeCategory.TOOLS, lv, Ingredient.ofItem(lv3), BundleItem.m_optlhaxk(lv2))
             .group("bundle_dye")
             .criterion(hasItem(lv3), this.conditionsFromItem(lv3))
             .offerTo(this.exporter);
diff -bur namedTargetSrc/net/minecraft/enchantment/effect/ConditionalEnchantmentEffect.java namedSrc/net/minecraft/enchantment/effect/ConditionalEnchantmentEffect.java
--- namedTargetSrc/net/minecraft/enchantment/effect/ConditionalEnchantmentEffect.java	2024-10-09 02:01:27.056384382 +0000
+++ namedSrc/net/minecraft/enchantment/effect/ConditionalEnchantmentEffect.java	2024-10-09 02:00:18.027011138 +0000
@@ -7,8 +7,8 @@
 import net.minecraft.loot.LootTableReporter;
 import net.minecraft.loot.condition.LootCondition;
 import net.minecraft.loot.context.LootContext;
-import net.minecraft.unmapped.C_ykthnceq;
 import net.minecraft.util.ErrorReporter;
+import net.minecraft.util.context.ContextKeySet;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_blsrbzwc}
@@ -17,9 +17,9 @@
 public record ConditionalEnchantmentEffect<T>(T effect, Optional<LootCondition> requirements) {
    /**
     * @mapping {@literal hashed m_hermtlnd Lnet/minecraft/unmapped/C_blsrbzwc;m_hermtlnd(Lnet/minecraft/unmapped/C_ykthnceq;)Lcom/mojang/serialization/Codec;}
-    * @mapping {@literal named createRequirementsCodec Lnet/minecraft/enchantment/effect/ConditionalEnchantmentEffect;createRequirementsCodec(Lnet/minecraft/unmapped/C_ykthnceq;)Lcom/mojang/serialization/Codec;}
+    * @mapping {@literal named createRequirementsCodec Lnet/minecraft/enchantment/effect/ConditionalEnchantmentEffect;createRequirementsCodec(Lnet/minecraft/util/context/ContextKeySet;)Lcom/mojang/serialization/Codec;}
     */
-   public static Codec<LootCondition> createRequirementsCodec(C_ykthnceq arg) {
+   public static Codec<LootCondition> createRequirementsCodec(ContextKeySet arg) {
       return LootCondition.f_ctdemqea
          .validate(
             arg2 -> {
@@ -35,9 +35,9 @@
 
    /**
     * @mapping {@literal hashed m_oxjhgupg Lnet/minecraft/unmapped/C_blsrbzwc;m_oxjhgupg(Lcom/mojang/serialization/Codec;Lnet/minecraft/unmapped/C_ykthnceq;)Lcom/mojang/serialization/Codec;}
-    * @mapping {@literal named createCodec Lnet/minecraft/enchantment/effect/ConditionalEnchantmentEffect;createCodec(Lcom/mojang/serialization/Codec;Lnet/minecraft/unmapped/C_ykthnceq;)Lcom/mojang/serialization/Codec;}
+    * @mapping {@literal named createCodec Lnet/minecraft/enchantment/effect/ConditionalEnchantmentEffect;createCodec(Lcom/mojang/serialization/Codec;Lnet/minecraft/util/context/ContextKeySet;)Lcom/mojang/serialization/Codec;}
     */
-   public static <T> Codec<ConditionalEnchantmentEffect<T>> createCodec(Codec<T> codec, C_ykthnceq arg) {
+   public static <T> Codec<ConditionalEnchantmentEffect<T>> createCodec(Codec<T> codec, ContextKeySet arg) {
       return RecordCodecBuilder.create(
          instance -> instance.group(
                   codec.fieldOf("effect").forGetter(ConditionalEnchantmentEffect::effect),
diff -bur namedTargetSrc/net/minecraft/enchantment/effect/TargetConditionalEnchantmentEffect.java namedSrc/net/minecraft/enchantment/effect/TargetConditionalEnchantmentEffect.java
--- namedTargetSrc/net/minecraft/enchantment/effect/TargetConditionalEnchantmentEffect.java	2024-10-09 02:01:27.120384738 +0000
+++ namedSrc/net/minecraft/enchantment/effect/TargetConditionalEnchantmentEffect.java	2024-10-09 02:00:18.099011537 +0000
@@ -6,7 +6,7 @@
 import java.util.Optional;
 import net.minecraft.loot.condition.LootCondition;
 import net.minecraft.loot.context.LootContext;
-import net.minecraft.unmapped.C_ykthnceq;
+import net.minecraft.util.context.ContextKeySet;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_idcxfrny}
@@ -17,9 +17,9 @@
 ) {
    /**
     * @mapping {@literal hashed m_lobkvims Lnet/minecraft/unmapped/C_idcxfrny;m_lobkvims(Lcom/mojang/serialization/Codec;Lnet/minecraft/unmapped/C_ykthnceq;)Lcom/mojang/serialization/Codec;}
-    * @mapping {@literal named createCodec Lnet/minecraft/enchantment/effect/TargetConditionalEnchantmentEffect;createCodec(Lcom/mojang/serialization/Codec;Lnet/minecraft/unmapped/C_ykthnceq;)Lcom/mojang/serialization/Codec;}
+    * @mapping {@literal named createCodec Lnet/minecraft/enchantment/effect/TargetConditionalEnchantmentEffect;createCodec(Lcom/mojang/serialization/Codec;Lnet/minecraft/util/context/ContextKeySet;)Lcom/mojang/serialization/Codec;}
     */
-   public static <S> Codec<TargetConditionalEnchantmentEffect<S>> createCodec(Codec<S> codec, C_ykthnceq arg) {
+   public static <S> Codec<TargetConditionalEnchantmentEffect<S>> createCodec(Codec<S> codec, ContextKeySet arg) {
       return RecordCodecBuilder.create(
          instance -> instance.group(
                   EnchantmentEffectTarget.CODEC.fieldOf("enchanted").forGetter(TargetConditionalEnchantmentEffect::enchanted),
@@ -35,9 +35,9 @@
 
    /**
     * @mapping {@literal hashed m_fxhflgcy Lnet/minecraft/unmapped/C_idcxfrny;m_fxhflgcy(Lcom/mojang/serialization/Codec;Lnet/minecraft/unmapped/C_ykthnceq;)Lcom/mojang/serialization/Codec;}
-    * @mapping {@literal named createEquipmentDropsCodec Lnet/minecraft/enchantment/effect/TargetConditionalEnchantmentEffect;createEquipmentDropsCodec(Lcom/mojang/serialization/Codec;Lnet/minecraft/unmapped/C_ykthnceq;)Lcom/mojang/serialization/Codec;}
+    * @mapping {@literal named createEquipmentDropsCodec Lnet/minecraft/enchantment/effect/TargetConditionalEnchantmentEffect;createEquipmentDropsCodec(Lcom/mojang/serialization/Codec;Lnet/minecraft/util/context/ContextKeySet;)Lcom/mojang/serialization/Codec;}
     */
-   public static <S> Codec<TargetConditionalEnchantmentEffect<S>> createEquipmentDropsCodec(Codec<S> codec, C_ykthnceq arg) {
+   public static <S> Codec<TargetConditionalEnchantmentEffect<S>> createEquipmentDropsCodec(Codec<S> codec, ContextKeySet arg) {
       return RecordCodecBuilder.create(
          instance -> instance.group(
                   EnchantmentEffectTarget.CODEC
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/DefeatTargetTask.java namedSrc/net/minecraft/entity/ai/brain/task/DefeatTargetTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/DefeatTargetTask.java	2024-10-09 02:01:27.243385420 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/DefeatTargetTask.java	2024-10-09 02:00:18.214012175 +0000
@@ -33,7 +33,7 @@
                         }
 
                         arg4.remember(lv.getBlockPos(), (long)celebrationDuration);
-                        if (lv.getType() != EntityType.PLAYER || world.m_nendykdu().getBooleanValue(GameRules.FORGIVE_DEAD_PLAYERS)) {
+                        if (lv.getType() != EntityType.PLAYER || world.getGameRules().getBooleanValue(GameRules.FORGIVE_DEAD_PLAYERS)) {
                            arg2.forget();
                            arg3.forget();
                         }
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/FarmerVillagerTask.java namedSrc/net/minecraft/entity/ai/brain/task/FarmerVillagerTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/FarmerVillagerTask.java	2024-10-09 02:01:27.290385681 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/FarmerVillagerTask.java	2024-10-09 02:00:18.262012442 +0000
@@ -84,7 +84,7 @@
     * @mapping {@literal named shouldRun Lnet/minecraft/entity/ai/brain/task/FarmerVillagerTask;shouldRun(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/passive/VillagerEntity;)Z}
     */
    protected boolean shouldRun(ServerWorld world, VillagerEntity arg2) {
-      if (!world.m_nendykdu().getBooleanValue(GameRules.DO_MOB_GRIEFING)) {
+      if (!world.getGameRules().getBooleanValue(GameRules.DO_MOB_GRIEFING)) {
          return false;
       } else if (arg2.getVillagerData().getProfession() != VillagerProfession.FARMER) {
          return false;
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/ForgetAngryAtTargetTask.java namedSrc/net/minecraft/entity/ai/brain/task/ForgetAngryAtTargetTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/ForgetAngryAtTargetTask.java	2024-10-09 02:01:27.269385565 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/ForgetAngryAtTargetTask.java	2024-10-09 02:00:18.240012320 +0000
@@ -24,7 +24,7 @@
                         Optional.ofNullable(world.getEntity(arg.getValue(arg2)))
                            .map(entityx -> entityx instanceof LivingEntity lv ? lv : null)
                            .filter(LivingEntity::isDead)
-                           .filter(entityx -> entityx.getType() != EntityType.PLAYER || world.m_nendykdu().getBooleanValue(GameRules.FORGIVE_DEAD_PLAYERS))
+                           .filter(entityx -> entityx.getType() != EntityType.PLAYER || world.getGameRules().getBooleanValue(GameRules.FORGIVE_DEAD_PLAYERS))
                            .ifPresent(entityx -> arg2.forget());
                         return true;
                      }
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/BreakDoorGoal.java namedSrc/net/minecraft/entity/ai/goal/BreakDoorGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/BreakDoorGoal.java	2024-10-09 02:01:27.260385515 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/BreakDoorGoal.java	2024-10-09 02:00:18.232012275 +0000
@@ -72,7 +72,7 @@
       if (!super.canStart()) {
          return false;
       } else {
-         return !m_stitijqs(this.mob).m_nendykdu().getBooleanValue(GameRules.DO_MOB_GRIEFING)
+         return !m_stitijqs(this.mob).getGameRules().getBooleanValue(GameRules.DO_MOB_GRIEFING)
             ? false
             : this.isDifficultySufficient(this.mob.getWorld().getDifficulty()) && !this.isDoorOpen();
       }
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/EatGrassGoal.java namedSrc/net/minecraft/entity/ai/goal/EatGrassGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/EatGrassGoal.java	2024-10-09 02:01:27.190385126 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/EatGrassGoal.java	2024-10-09 02:00:18.170011931 +0000
@@ -110,7 +110,7 @@
       if (this.timer == this.getTickCount(4)) {
          BlockPos lv = this.mob.getBlockPos();
          if (GRASS_PREDICATE.test(this.world.getBlockState(lv))) {
-            if (m_fvqcmini(this.world).m_nendykdu().getBooleanValue(GameRules.DO_MOB_GRIEFING)) {
+            if (m_fvqcmini(this.world).getGameRules().getBooleanValue(GameRules.DO_MOB_GRIEFING)) {
                this.world.breakBlock(lv, false);
             }
 
@@ -118,7 +118,7 @@
          } else {
             BlockPos lv2 = lv.down();
             if (this.world.getBlockState(lv2).isOf(Blocks.GRASS_BLOCK)) {
-               if (m_fvqcmini(this.world).m_nendykdu().getBooleanValue(GameRules.DO_MOB_GRIEFING)) {
+               if (m_fvqcmini(this.world).getGameRules().getBooleanValue(GameRules.DO_MOB_GRIEFING)) {
                   this.world.syncWorldEvent(WorldEvents.BLOCK_BROKEN, lv2, Block.getRawIdFromState(Blocks.GRASS_BLOCK.getDefaultState()));
                   this.world.setBlockState(lv2, Blocks.DIRT.getDefaultState(), Block.NOTIFY_LISTENERS);
                }
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/RevengeGoal.java namedSrc/net/minecraft/entity/ai/goal/RevengeGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/RevengeGoal.java	2024-10-09 02:01:27.291385686 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/RevengeGoal.java	2024-10-09 02:00:18.264012453 +0000
@@ -69,7 +69,7 @@
       int i = this.mob.getLastAttackedTime();
       LivingEntity lv = this.mob.getAttacker();
       if (i != this.lastAttackedTime && lv != null) {
-         if (lv.getType() == EntityType.PLAYER && m_stitijqs(this.mob).m_nendykdu().getBooleanValue(GameRules.UNIVERSAL_ANGER)) {
+         if (lv.getType() == EntityType.PLAYER && m_stitijqs(this.mob).getGameRules().getBooleanValue(GameRules.UNIVERSAL_ANGER)) {
             return false;
          } else {
             for (Class<?> lv2 : this.noRevengeTypes) {
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/StepAndDestroyBlockGoal.java namedSrc/net/minecraft/entity/ai/goal/StepAndDestroyBlockGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/StepAndDestroyBlockGoal.java	2024-10-09 02:01:27.109384676 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/StepAndDestroyBlockGoal.java	2024-10-09 02:00:18.088011476 +0000
@@ -62,7 +62,7 @@
     */
    @Override
    public boolean canStart() {
-      if (!m_stitijqs(this.stepAndDestroyMob).m_nendykdu().getBooleanValue(GameRules.DO_MOB_GRIEFING)) {
+      if (!m_stitijqs(this.stepAndDestroyMob).getGameRules().getBooleanValue(GameRules.DO_MOB_GRIEFING)) {
          return false;
       } else if (this.cooldown > 0) {
          this.cooldown--;
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/UniversalAngerGoal.java namedSrc/net/minecraft/entity/ai/goal/UniversalAngerGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/UniversalAngerGoal.java	2024-10-09 02:01:27.295385709 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/UniversalAngerGoal.java	2024-10-09 02:00:18.268012475 +0000
@@ -49,7 +49,7 @@
     */
    @Override
    public boolean canStart() {
-      return m_stitijqs(this.mob).m_nendykdu().getBooleanValue(GameRules.UNIVERSAL_ANGER) && this.canStartUniversalAnger();
+      return m_stitijqs(this.mob).getGameRules().getBooleanValue(GameRules.UNIVERSAL_ANGER) && this.canStartUniversalAnger();
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/boss/dragon/EnderDragonEntity.java namedSrc/net/minecraft/entity/boss/dragon/EnderDragonEntity.java
--- namedTargetSrc/net/minecraft/entity/boss/dragon/EnderDragonEntity.java	2024-10-09 02:01:27.027384221 +0000
+++ namedSrc/net/minecraft/entity/boss/dragon/EnderDragonEntity.java	2024-10-09 02:00:17.996010966 +0000
@@ -647,7 +647,7 @@
                BlockPos lv = new BlockPos(o, p, q);
                BlockState lv2 = world.getBlockState(lv);
                if (!lv2.isAir() && !lv2.isIn(BlockTags.DRAGON_TRANSPARENT)) {
-                  if (world.m_nendykdu().getBooleanValue(GameRules.DO_MOB_GRIEFING) && !lv2.isIn(BlockTags.DRAGON_IMMUNE)) {
+                  if (world.getGameRules().getBooleanValue(GameRules.DO_MOB_GRIEFING) && !lv2.isIn(BlockTags.DRAGON_IMMUNE)) {
                      bl2 = world.removeBlock(lv, false) || bl2;
                   } else {
                      bl = true;
@@ -757,7 +757,7 @@
       }
 
       if (this.getWorld() instanceof ServerWorld lv) {
-         if (this.ticksSinceDeath > 150 && this.ticksSinceDeath % 5 == 0 && lv.m_nendykdu().getBooleanValue(GameRules.DO_MOB_LOOT)) {
+         if (this.ticksSinceDeath > 150 && this.ticksSinceDeath % 5 == 0 && lv.getGameRules().getBooleanValue(GameRules.DO_MOB_LOOT)) {
             ExperienceOrbEntity.spawn(lv, this.getPos(), MathHelper.floor((float)i * 0.08F));
          }
 
@@ -768,7 +768,7 @@
 
       this.move(MovementType.SELF, new Vec3d(0.0, 0.1F, 0.0));
       if (this.ticksSinceDeath == 200 && this.getWorld() instanceof ServerWorld lv2) {
-         if (lv2.m_nendykdu().getBooleanValue(GameRules.DO_MOB_LOOT)) {
+         if (lv2.getGameRules().getBooleanValue(GameRules.DO_MOB_LOOT)) {
             ExperienceOrbEntity.spawn(lv2, this.getPos(), MathHelper.floor((float)i * 0.2F));
          }
 
diff -bur namedTargetSrc/net/minecraft/entity/boss/WitherEntity.java namedSrc/net/minecraft/entity/boss/WitherEntity.java
--- namedTargetSrc/net/minecraft/entity/boss/WitherEntity.java	2024-10-09 02:01:27.045384321 +0000
+++ namedSrc/net/minecraft/entity/boss/WitherEntity.java	2024-10-09 02:00:18.016011077 +0000
@@ -417,7 +417,7 @@
 
          if (this.blockBreakingCooldown > 0) {
             this.blockBreakingCooldown--;
-            if (this.blockBreakingCooldown == 0 && world.m_nendykdu().getBooleanValue(GameRules.DO_MOB_GRIEFING)) {
+            if (this.blockBreakingCooldown == 0 && world.getGameRules().getBooleanValue(GameRules.DO_MOB_GRIEFING)) {
                boolean bl = false;
                int l = MathHelper.floor(this.getWidth() / 2.0F + 1.0F);
                int m = MathHelper.floor(this.getHeight());
diff -bur namedTargetSrc/net/minecraft/entity/decoration/ArmorStandEntity.java namedSrc/net/minecraft/entity/decoration/ArmorStandEntity.java
--- namedTargetSrc/net/minecraft/entity/decoration/ArmorStandEntity.java	2024-10-09 02:01:27.167384998 +0000
+++ namedSrc/net/minecraft/entity/decoration/ArmorStandEntity.java	2024-10-09 02:00:18.149011815 +0000
@@ -630,7 +630,7 @@
    public boolean m_fuenwjjy(ServerWorld world, DamageSource arg2, float f) {
       if (this.isRemoved()) {
          return false;
-      } else if (!world.m_nendykdu().getBooleanValue(GameRules.DO_MOB_GRIEFING) && arg2.getAttacker() instanceof MobEntity) {
+      } else if (!world.getGameRules().getBooleanValue(GameRules.DO_MOB_GRIEFING) && arg2.getAttacker() instanceof MobEntity) {
          return false;
       } else if (arg2.isTypeIn(DamageTypeTags.BYPASSES_INVULNERABILITY)) {
          this.kill(world);
diff -bur namedTargetSrc/net/minecraft/entity/decoration/BlockAttachedEntity.java namedSrc/net/minecraft/entity/decoration/BlockAttachedEntity.java
--- namedTargetSrc/net/minecraft/entity/decoration/BlockAttachedEntity.java	2024-10-09 02:01:27.072384471 +0000
+++ namedSrc/net/minecraft/entity/decoration/BlockAttachedEntity.java	2024-10-09 02:00:18.046011243 +0000
@@ -121,7 +121,7 @@
    public boolean m_fuenwjjy(ServerWorld world, DamageSource arg2, float f) {
       if (this.m_rqhapnud(arg2)) {
          return false;
-      } else if (!world.m_nendykdu().getBooleanValue(GameRules.DO_MOB_GRIEFING) && arg2.getAttacker() instanceof MobEntity) {
+      } else if (!world.getGameRules().getBooleanValue(GameRules.DO_MOB_GRIEFING) && arg2.getAttacker() instanceof MobEntity) {
          return false;
       } else {
          if (!this.isRemoved()) {
diff -bur namedTargetSrc/net/minecraft/entity/decoration/ItemFrameEntity.java namedSrc/net/minecraft/entity/decoration/ItemFrameEntity.java
--- namedTargetSrc/net/minecraft/entity/decoration/ItemFrameEntity.java	2024-10-09 02:01:27.073384477 +0000
+++ namedSrc/net/minecraft/entity/decoration/ItemFrameEntity.java	2024-10-09 02:00:18.048011254 +0000
@@ -305,7 +305,7 @@
       if (!this.fixed) {
          ItemStack lv = this.getHeldItemStack();
          this.setHeldItemStack(ItemStack.EMPTY);
-         if (!world.m_nendykdu().getBooleanValue(GameRules.DO_ENTITY_DROPS)) {
+         if (!world.getGameRules().getBooleanValue(GameRules.DO_ENTITY_DROPS)) {
             if (entity == null) {
                this.removeFromFrame(lv);
             }
diff -bur namedTargetSrc/net/minecraft/entity/decoration/painting/PaintingEntity.java namedSrc/net/minecraft/entity/decoration/painting/PaintingEntity.java
--- namedTargetSrc/net/minecraft/entity/decoration/painting/PaintingEntity.java	2024-10-09 02:01:27.012384138 +0000
+++ namedSrc/net/minecraft/entity/decoration/painting/PaintingEntity.java	2024-10-09 02:00:17.976010855 +0000
@@ -218,7 +218,7 @@
     */
    @Override
    public void dropItem(ServerWorld world, @Nullable Entity entity) {
-      if (world.m_nendykdu().getBooleanValue(GameRules.DO_ENTITY_DROPS)) {
+      if (world.getGameRules().getBooleanValue(GameRules.DO_ENTITY_DROPS)) {
          this.playSound(SoundEvents.ENTITY_PAINTING_BREAK, 1.0F, 1.0F);
          if (entity instanceof PlayerEntity lv && lv.isInCreativeMode()) {
             return;
diff -bur namedTargetSrc/net/minecraft/entity/effect/OozingStatusEffect.java namedSrc/net/minecraft/entity/effect/OozingStatusEffect.java
--- namedTargetSrc/net/minecraft/entity/effect/OozingStatusEffect.java	2024-10-09 02:01:27.219385287 +0000
+++ namedSrc/net/minecraft/entity/effect/OozingStatusEffect.java	2024-10-09 02:00:18.194012064 +0000
@@ -62,7 +62,7 @@
    public void onEntityRemoved(ServerWorld world, LivingEntity entity, int amplifier, Entity.RemovalReason reason) {
       if (reason == Entity.RemovalReason.KILLED) {
          int j = this.slimeSpawnCountFunction.applyAsInt(entity.getRandom());
-         int k = world.m_nendykdu().getIntValue(GameRules.MAX_ENTITY_CRAMMING);
+         int k = world.getGameRules().getIntValue(GameRules.MAX_ENTITY_CRAMMING);
          int l = getSpawnedSlimeCount(k, OozingStatusEffect.SlimeCounter.collectNearby(entity), j);
 
          for (int m = 0; m < l; m++) {
diff -bur namedTargetSrc/net/minecraft/entity/effect/WeavingStatusEffect.java namedSrc/net/minecraft/entity/effect/WeavingStatusEffect.java
--- namedTargetSrc/net/minecraft/entity/effect/WeavingStatusEffect.java	2024-10-09 02:01:27.252385470 +0000
+++ namedSrc/net/minecraft/entity/effect/WeavingStatusEffect.java	2024-10-09 02:00:18.224012231 +0000
@@ -40,7 +40,7 @@
     */
    @Override
    public void onEntityRemoved(ServerWorld world, LivingEntity entity, int amplifier, Entity.RemovalReason reason) {
-      if (reason == Entity.RemovalReason.KILLED && (entity instanceof PlayerEntity || world.m_nendykdu().getBooleanValue(GameRules.DO_MOB_GRIEFING))) {
+      if (reason == Entity.RemovalReason.KILLED && (entity instanceof PlayerEntity || world.getGameRules().getBooleanValue(GameRules.DO_MOB_GRIEFING))) {
          this.spawnCobwebs(world, entity.getRandom(), entity.getBlockPos());
       }
    }
diff -bur namedTargetSrc/net/minecraft/entity/FallingBlockEntity.java namedSrc/net/minecraft/entity/FallingBlockEntity.java
--- namedTargetSrc/net/minecraft/entity/FallingBlockEntity.java	2024-10-09 02:01:27.259385509 +0000
+++ namedSrc/net/minecraft/entity/FallingBlockEntity.java	2024-10-09 02:00:18.231012270 +0000
@@ -257,7 +257,7 @@
 
             if (!this.isOnGround() && !bl2) {
                if (this.timeFalling > 100 && (lv3.getY() <= this.getWorld().getBottomY() || lv3.getY() > this.getWorld().getTopY()) || this.timeFalling > 600) {
-                  if (this.dropItem && lv2.m_nendykdu().getBooleanValue(GameRules.DO_ENTITY_DROPS)) {
+                  if (this.dropItem && lv2.getGameRules().getBooleanValue(GameRules.DO_ENTITY_DROPS)) {
                      this.m_xrhuexzc(lv2, lv);
                   }
 
@@ -304,14 +304,14 @@
                                  lv6.markDirty();
                               }
                            }
-                        } else if (this.dropItem && lv2.m_nendykdu().getBooleanValue(GameRules.DO_ENTITY_DROPS)) {
+                        } else if (this.dropItem && lv2.getGameRules().getBooleanValue(GameRules.DO_ENTITY_DROPS)) {
                            this.discard();
                            this.onDestroyedOnLanding(lv, lv3);
                            this.m_xrhuexzc(lv2, lv);
                         }
                      } else {
                         this.discard();
-                        if (this.dropItem && lv2.m_nendykdu().getBooleanValue(GameRules.DO_ENTITY_DROPS)) {
+                        if (this.dropItem && lv2.getGameRules().getBooleanValue(GameRules.DO_ENTITY_DROPS)) {
                            this.onDestroyedOnLanding(lv, lv3);
                            this.m_xrhuexzc(lv2, lv);
                         }
diff -bur namedTargetSrc/net/minecraft/entity/ItemEntity.java namedSrc/net/minecraft/entity/ItemEntity.java
--- namedTargetSrc/net/minecraft/entity/ItemEntity.java	2024-10-09 02:01:27.030384238 +0000
+++ namedSrc/net/minecraft/entity/ItemEntity.java	2024-10-09 02:00:17.998010977 +0000
@@ -433,7 +433,7 @@
    public final boolean m_fuenwjjy(ServerWorld world, DamageSource arg2, float f) {
       if (this.m_rqhapnud(arg2)) {
          return false;
-      } else if (!world.m_nendykdu().getBooleanValue(GameRules.DO_MOB_GRIEFING) && arg2.getAttacker() instanceof MobEntity) {
+      } else if (!world.getGameRules().getBooleanValue(GameRules.DO_MOB_GRIEFING) && arg2.getAttacker() instanceof MobEntity) {
          return false;
       } else if (!this.getStack().takesDamageFrom(arg2)) {
          return false;
diff -bur namedTargetSrc/net/minecraft/entity/Leashable.java namedSrc/net/minecraft/entity/Leashable.java
--- namedTargetSrc/net/minecraft/entity/Leashable.java	2024-10-09 02:01:27.181385076 +0000
+++ namedSrc/net/minecraft/entity/Leashable.java	2024-10-09 02:00:18.162011887 +0000
@@ -198,7 +198,7 @@
 
       if (lv != null && lv.leashHolder != null) {
          if (!entity.isAlive() || !lv.leashHolder.isAlive()) {
-            detachLeash(entity, true, world.m_nendykdu().getBooleanValue(GameRules.DO_ENTITY_DROPS));
+            detachLeash(entity, true, world.getGameRules().getBooleanValue(GameRules.DO_ENTITY_DROPS));
          }
 
          Entity lv2 = entity.getLeashHolder();
diff -bur namedTargetSrc/net/minecraft/entity/LightningEntity.java namedSrc/net/minecraft/entity/LightningEntity.java
--- namedTargetSrc/net/minecraft/entity/LightningEntity.java	2024-10-09 02:01:27.060384405 +0000
+++ namedSrc/net/minecraft/entity/LightningEntity.java	2024-10-09 02:00:18.034011177 +0000
@@ -247,7 +247,7 @@
     * @mapping {@literal named spawnFire Lnet/minecraft/entity/LightningEntity;spawnFire(I)V}
     */
    private void spawnFire(int spreadAttempts) {
-      if (!this.cosmetic && this.getWorld() instanceof ServerWorld lv && lv.m_nendykdu().getBooleanValue(GameRules.DO_FIRE_TICK)) {
+      if (!this.cosmetic && this.getWorld() instanceof ServerWorld lv && lv.getGameRules().getBooleanValue(GameRules.DO_FIRE_TICK)) {
          BlockPos lv3 = this.getBlockPos();
          BlockState lv4 = AbstractFireBlock.getState(this.getWorld(), lv3);
          if (this.getWorld().getBlockState(lv3).isAir() && lv4.canPlaceAt(this.getWorld(), lv3)) {
diff -bur namedTargetSrc/net/minecraft/entity/LivingEntity.java namedSrc/net/minecraft/entity/LivingEntity.java
--- namedTargetSrc/net/minecraft/entity/LivingEntity.java	2024-10-09 02:01:27.179385065 +0000
+++ namedSrc/net/minecraft/entity/LivingEntity.java	2024-10-09 02:00:18.161011881 +0000
@@ -2274,7 +2274,7 @@
       if (this.getWorld() instanceof ServerWorld lv) {
          boolean var6 = false;
          if (adversary instanceof WitherEntity) {
-            if (lv.m_nendykdu().getBooleanValue(GameRules.DO_MOB_GRIEFING)) {
+            if (lv.getGameRules().getBooleanValue(GameRules.DO_MOB_GRIEFING)) {
                BlockPos lv3 = this.getBlockPos();
                BlockState lv4 = Blocks.WITHER_ROSE.getDefaultState();
                if (this.getWorld().getBlockState(lv3).isAir() && lv4.canPlaceAt(this.getWorld(), lv3)) {
@@ -2297,7 +2297,7 @@
     */
    protected void drop(ServerWorld world, DamageSource source) {
       boolean bl = this.playerHitTimer > 0;
-      if (this.shouldDropLoot() && world.m_nendykdu().getBooleanValue(GameRules.DO_MOB_LOOT)) {
+      if (this.shouldDropLoot() && world.getGameRules().getBooleanValue(GameRules.DO_MOB_LOOT)) {
          this.m_oymopclz(world, source, bl);
          this.dropCustomLoot(world, source, bl);
       }
@@ -2319,7 +2319,7 @@
     */
    protected void dropXp(ServerWorld world, @Nullable Entity attacker) {
       if (!this.shouldSkipDroppingExperience()
-         && (this.shouldAlwaysDropXp() || this.playerHitTimer > 0 && this.shouldDropXp() && world.m_nendykdu().getBooleanValue(GameRules.DO_MOB_LOOT))) {
+         && (this.shouldAlwaysDropXp() || this.playerHitTimer > 0 && this.shouldDropXp() && world.getGameRules().getBooleanValue(GameRules.DO_MOB_LOOT))) {
          ExperienceOrbEntity.spawn(world, this.getPos(), this.getXpToDrop(world, attacker));
       }
    }
@@ -4302,7 +4302,7 @@
       } else {
          List<Entity> list = this.getWorld().getOtherEntities(this, this.getBounds(), EntityPredicates.canBePushedBy(this));
          if (!list.isEmpty()) {
-            int i = lv.m_nendykdu().getIntValue(GameRules.MAX_ENTITY_CRAMMING);
+            int i = lv.getGameRules().getIntValue(GameRules.MAX_ENTITY_CRAMMING);
             if (i > 0 && list.size() > i - 1 && this.random.nextInt(4) == 0) {
                int j = 0;
 
diff -bur namedTargetSrc/net/minecraft/entity/mob/Angerable.java namedSrc/net/minecraft/entity/mob/Angerable.java
--- namedTargetSrc/net/minecraft/entity/mob/Angerable.java	2024-10-09 02:01:27.112384693 +0000
+++ namedSrc/net/minecraft/entity/mob/Angerable.java	2024-10-09 02:00:18.091011493 +0000
@@ -139,7 +139,7 @@
     * @mapping {@literal named isUniversallyAngry Lnet/minecraft/entity/mob/Angerable;isUniversallyAngry(Lnet/minecraft/server/world/ServerWorld;)Z}
     */
    default boolean isUniversallyAngry(ServerWorld world) {
-      return world.m_nendykdu().getBooleanValue(GameRules.UNIVERSAL_ANGER) && this.hasAngerTime() && this.getAngryAt() == null;
+      return world.getGameRules().getBooleanValue(GameRules.UNIVERSAL_ANGER) && this.hasAngerTime() && this.getAngryAt() == null;
    }
 
    /**
@@ -155,7 +155,7 @@
     * @mapping {@literal named forgive Lnet/minecraft/entity/mob/Angerable;forgive(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/player/PlayerEntity;)V}
     */
    default void forgive(ServerWorld world, PlayerEntity player) {
-      if (world.m_nendykdu().getBooleanValue(GameRules.FORGIVE_DEAD_PLAYERS)) {
+      if (world.getGameRules().getBooleanValue(GameRules.FORGIVE_DEAD_PLAYERS)) {
          if (player.getUuid().equals(this.getAngryAt())) {
             this.stopAnger();
          }


The remaining diff is too long!

-Original file line number
+Diff line change
@@ -1 +1,9 @@
     CLASS net/minecraft/unmapped/C_wcabtfez net/minecraft/recipe/DecoratedPotRecipe
+    	METHOD m_gdtyamof getLeftItem (Lnet/minecraft/unmapped/C_euomljmv;)Lnet/minecraft/unmapped/C_sddaxwyk;
+    		ARG 0 input
+    	METHOD m_ivnypkcv getBackItem (Lnet/minecraft/unmapped/C_euomljmv;)Lnet/minecraft/unmapped/C_sddaxwyk;
+    		ARG 0 input
+    	METHOD m_mlzetyuf getRightItem (Lnet/minecraft/unmapped/C_euomljmv;)Lnet/minecraft/unmapped/C_sddaxwyk;
+    		ARG 0 input
+    	METHOD m_ywanumts getFrontItem (Lnet/minecraft/unmapped/C_euomljmv;)Lnet/minecraft/unmapped/C_sddaxwyk;
+    		ARG 0 input

-Original file line number
+Diff line change
@@ Expand Up @@
     	FIELD f_qqfxxlfb ENTRIES_CODEC Lcom/mojang/serialization/Codec;
     	FIELD f_wpamqjgv items Ljava/util/List;
     	METHOD m_hiksyixf getItems ()Ljava/util/List;
+    	METHOD m_kkrsbepq createOptionalSlotDisplay (Ljava/util/Optional;)Lnet/minecraft/unmapped/C_lahbbtfn;
+    		ARG 0 ingredient
     	METHOD m_lqlwthyg getSlotDisplay ()Lnet/minecraft/unmapped/C_lahbbtfn;
     	METHOD m_mpihdccy ofItems ([Lnet/minecraft/unmapped/C_gmbqjnle;)Lnet/minecraft/unmapped/C_tcpsydrv;
     		ARG 0 items
@@ Expand All @@
     	METHOD m_owdzpelq ofItems (Lnet/minecraft/unmapped/C_odfnijdo;)Lnet/minecraft/unmapped/C_tcpsydrv;
     	METHOD m_ssxtwbyt ofStacks (Ljava/util/stream/Stream;)Lnet/minecraft/unmapped/C_tcpsydrv;
     		ARG 0 stacks
+    	METHOD m_tmzbacdg createSingleItemDisplay (Lnet/minecraft/unmapped/C_cjzoxshv;)Lnet/minecraft/unmapped/C_lahbbtfn;
     	METHOD m_xqanmytq ofItem (Lnet/minecraft/unmapped/C_gmbqjnle;)Lnet/minecraft/unmapped/C_tcpsydrv;
     		ARG 0 item
     	METHOD test (Ljava/lang/Object;)Z
@@ Expand Down @@

-Original file line number
+Diff line change
@@ -0,0 +1,9 @@
+    CLASS net/minecraft/unmapped/C_fmiamsvu net/minecraft/recipe/ItemMapper
+    	CLASS C_euugwrmj RemainderMapper
+    		METHOD m_rxmsomtp addRemainder (Ljava/lang/Object;Ljava/util/List;)Ljava/lang/Object;
+    			ARG 1 input
+    			ARG 2 items
+    	CLASS C_uuovlzkm StackMapper
+    		METHOD m_ewvxfery addItem (Lnet/minecraft/unmapped/C_cjzoxshv;)Ljava/lang/Object;
+    		METHOD m_fuwtppcc addStack (Lnet/minecraft/unmapped/C_sddaxwyk;)Ljava/lang/Object;
+    		METHOD m_vuyqdfmh addItem (Lnet/minecraft/unmapped/C_vorddnax;)Ljava/lang/Object;

-Original file line number
+Diff line change
@@ Expand Up @@
     	COMMENT or recipe books. Users can have stub implementations if they do not use
     	COMMENT those functionalities.
     	FIELD f_mwhtvqku PACKET_CODEC Lnet/minecraft/unmapped/C_qsrmwluu;
+    	METHOD m_acqxyxru getRecipeBookCategory ()Lnet/minecraft/unmapped/C_loximogs;
     	METHOD m_acqxyxru getRecipeBookCategory ()Lnet/minecraft/unmapped/C_sxzvngst;
     	METHOD m_aphdsjxe getSerializer ()Lnet/minecraft/unmapped/C_xfxrkzjt;
     		COMMENT {@return the serializer associated with this recipe}
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up @@
     	METHOD m_dnksqbuz isCraftable (Lnet/minecraft/unmapped/C_fcquvjby;)Z
     		ARG 1 finder
     	METHOD m_gcmdljav resultItems (Lnet/minecraft/unmapped/C_lahbbtfn$C_ozrotgvv;)Ljava/util/List;
+    	METHOD m_gcmdljav getResults (Lnet/minecraft/unmapped/C_zcrtzabd;)Ljava/util/List;
+    		ARG 1 context

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Commit

There are no files selected for viewing

3 comments on commit `37ed413`

github-actions bot commented on `37ed413` Oct 9, 2024

github-actions bot commented on `37ed413` Oct 9, 2024

github-actions bot commented on `37ed413` Oct 9, 2024

-Original file line number
+Diff line change
@@ Expand Up @@
     	METHOD m_bhcaqfpt clear ()V
     	METHOD m_cidhvqrf createIngredientInfo (Ljava/util/stream/Stream;)Lnet/minecraft/unmapped/C_nyagoaau$C_yxyoqnti;
     		ARG 0 items
-    	METHOD m_hwvldlvh accountStack (Lnet/minecraft/unmapped/C_sddaxwyk;)V
+    	METHOD m_hwvldlvh addInput (Lnet/minecraft/unmapped/C_sddaxwyk;)V
     	METHOD m_maorrpzg countCrafts (Lnet/minecraft/unmapped/C_awrmdwqd;Lnet/minecraft/unmapped/C_nyagoaau$C_xftfxaqa;)I
-    	METHOD m_mgmvzctj accountStackIfUsable (Lnet/minecraft/unmapped/C_sddaxwyk;)V
+    	METHOD m_mgmvzctj addInputIfUsable (Lnet/minecraft/unmapped/C_sddaxwyk;)V
     	METHOD m_ocfwpwhp countCrafts (Lnet/minecraft/unmapped/C_awrmdwqd;ILnet/minecraft/unmapped/C_nyagoaau$C_xftfxaqa;)I
     		ARG 1 recipe
     	METHOD m_olpqguay isCraftable (Ljava/util/List;Lnet/minecraft/unmapped/C_nyagoaau$C_xftfxaqa;)Z
-    	METHOD m_ovblcbcp accountStack (Lnet/minecraft/unmapped/C_sddaxwyk;I)V
+    	METHOD m_ovblcbcp addInput (Lnet/minecraft/unmapped/C_sddaxwyk;I)V
     		ARG 2 maxCount
     	METHOD m_syqmxkya isCraftable (Lnet/minecraft/unmapped/C_awrmdwqd;ILnet/minecraft/unmapped/C_nyagoaau$C_xftfxaqa;)Z
     		ARG 1 recipe
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up @@
     	FIELD f_avfppxeg displays Ljava/util/List;
     	FIELD f_cfijlewf registries Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;
     	FIELD f_hqaaykcp LOGGER Lorg/slf4j/Logger;
+    	FIELD f_kczkpctf RECIPE_PROPERTY_SETS Ljava/util/Map;
     	FIELD f_lwdpgeem propertySets Ljava/util/Map;
     	FIELD f_qlhewmmf recipes Lnet/minecraft/unmapped/C_rrkbzyqf;
     	FIELD f_sbxhtycx stonecuttingRecipes Lnet/minecraft/unmapped/C_qzkacgwi$C_kvadugef;
     	FIELD f_yzfonsti displayByRecipe Ljava/util/Map;
+    	METHOD m_cuobwmoj createExtractorForSingleItemRecipe (Lnet/minecraft/unmapped/C_rhnqznys;)Lnet/minecraft/unmapped/C_hjseusrb$C_dpqqvooy;
+    		ARG 0 type
     	METHOD m_dsxpcpxk get (Lnet/minecraft/unmapped/C_xhhleach;)Ljava/util/Optional;
     		COMMENT {@return a recipe with the given {@code id}, or empty if there is no such recipe}
     	METHOD m_enpjndth filterDisabled (Lnet/minecraft/unmapped/C_czxxrbcp;Ljava/util/List;)Ljava/util/List;
@@ Expand Down Expand Up @@
     	CLASS C_bvtkxdyi CachedCheck
     		METHOD m_ltqsvwgf getFirstMatch (Lnet/minecraft/unmapped/C_cxmcihwl;Lnet/minecraft/unmapped/C_bdwnwhiu;)Ljava/util/Optional;
     			ARG 1 input
+    	CLASS C_dpqqvooy IngredientExtractor
+    		METHOD apply (Lnet/minecraft/unmapped/C_awrmdwqd;)Ljava/util/Optional;
+    			ARG 1 recipe
     	CLASS C_ioxglbpe
     		FIELD f_kspyemsz key Lnet/minecraft/unmapped/C_xhhleach;
     	CLASS C_oqjlukte ServerDisplayInfo
+    	CLASS C_xmfwsmdh IngredientCollector
+    		FIELD f_cicntgdd finder Lnet/minecraft/unmapped/C_hjseusrb$C_dpqqvooy;
+    		FIELD f_revcxqtv ingredients Ljava/util/List;
+    		FIELD f_ylmrfukx key Lnet/minecraft/unmapped/C_xhhleach;
+    		METHOD accept (Ljava/lang/Object;)V
+    			ARG 1 recipe
+    		METHOD m_jebcbuxt asPropertySet (Lnet/minecraft/unmapped/C_czxxrbcp;)Lnet/minecraft/unmapped/C_jgqrwysz;

-Original file line number
+Diff line change
@@ Expand Up @@
     	FIELD f_ibbkkedr addition Ljava/util/Optional;
     	FIELD f_nflteanq template Ljava/util/Optional;
     	FIELD f_wnvjvqod base Ljava/util/Optional;
+    	METHOD m_kfjljnfn applyTrim (Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_sddaxwyk;
+    		ARG 0 lookup
+    		ARG 1 base
+    		ARG 2 addition
+    		ARG 3 template
     	CLASS C_whzzarxp Serializer
     		FIELD f_xkkrzbdj PACKET_CODEC Lnet/minecraft/unmapped/C_qsrmwluu;
     		METHOD m_bzlovpfk (Lnet/minecraft/unmapped/C_ngeyonui;)Ljava/util/Optional;
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up @@
     	METHOD m_etiiiuiq resolve (Lnet/minecraft/unmapped/C_lahbbtfn$C_ozrotgvv;Ljava/util/function/Consumer;)V
     		ARG 2 consumer
     	METHOD m_hzkpthfi resolveFirstStack (Lnet/minecraft/unmapped/C_lahbbtfn$C_ozrotgvv;)Lnet/minecraft/unmapped/C_sddaxwyk;
+    	METHOD m_hzkpthfi resolveFirstStack (Lnet/minecraft/unmapped/C_zcrtzabd;)Lnet/minecraft/unmapped/C_sddaxwyk;
+    		ARG 1 context
     	METHOD m_lvfostcp isEnabled (Lnet/minecraft/unmapped/C_czxxrbcp;)Z
     		ARG 1 features
     	METHOD m_moncddlm resolveStacks (Lnet/minecraft/unmapped/C_lahbbtfn$C_ozrotgvv;)Ljava/util/List;
     	METHOD m_ozlrzzgw getType ()Lnet/minecraft/unmapped/C_lahbbtfn$C_bhpspplm;
     	METHOD m_uxrfsltr resolve (Lnet/minecraft/unmapped/C_lahbbtfn$C_ozrotgvv;Lnet/minecraft/unmapped/C_lahbbtfn$C_hcvhdsdg;)V
     		ARG 1 context
     		ARG 2 consumer
+    	METHOD m_uxrfsltr resolveItems (Lnet/minecraft/unmapped/C_zcrtzabd;Lnet/minecraft/unmapped/C_fmiamsvu;)Ljava/util/stream/Stream;
+    		ARG 1 context
+    		ARG 2 mapper
+    	METHOD m_whqywntk resolveStacks (Lnet/minecraft/unmapped/C_zcrtzabd;)Ljava/util/List;
+    		ARG 1 context
     	CLASS C_asnhtjgh FuelSlotDisplay
     		FIELD f_kvfeugrf INSTANCE Lnet/minecraft/unmapped/C_lahbbtfn$C_asnhtjgh;
     	CLASS C_bhpspplm Type
@@ Expand All @@
     		METHOD m_gyxiixtl accept (Lnet/minecraft/unmapped/C_vorddnax;)V
     			ARG 1 item
     		METHOD m_muzkpdkq accept (Lnet/minecraft/unmapped/C_sddaxwyk;)V
+    	CLASS C_hlornmej RemainderSlotDisplay
     	CLASS C_ozrotgvv ResolutionContext
     		METHOD m_dkuuvoci fuelTimes ()Lnet/minecraft/unmapped/C_smdnyqwx;
     		METHOD m_tooywucm create (Lnet/minecraft/unmapped/C_cdctfzbn;)Lnet/minecraft/unmapped/C_lahbbtfn$C_ozrotgvv;
@@ Expand All @@
     		METHOD <init> (Lnet/minecraft/unmapped/C_vorddnax;)V
     			ARG 1 item
     	CLASS C_twdqwrvw StackSlotDisplay
+    	CLASS C_vwvdmimr ItemStackMapper
+    		FIELD f_uavwlgel INSTANCE Lnet/minecraft/unmapped/C_lahbbtfn$C_vwvdmimr;
     	CLASS C_wilvedch SmithingTrimSlotDisplay
     		FIELD f_uzmpeglf INSTANCE Lnet/minecraft/unmapped/C_lahbbtfn$C_wilvedch;

-Original file line number
+Diff line change
@@ -0,0 +1,5 @@
+    CLASS net/minecraft/unmapped/C_kuhmkefg net/minecraft/recipe/display/SlotDisplayContext
+    	FIELD f_aoyfqrsq REGISTRIES Lnet/minecraft/unmapped/C_fwhrecir;
+    	FIELD f_ehjdieew CONTEXT Lnet/minecraft/unmapped/C_ykthnceq;
+    	FIELD f_mapwfaid FUEL_TIMES Lnet/minecraft/unmapped/C_fwhrecir;
+    	METHOD m_wzcjjviu fromWorld (Lnet/minecraft/unmapped/C_cdctfzbn;)Lnet/minecraft/unmapped/C_zcrtzabd;

-Original file line number
+Diff line change
@@ -0,0 +1,3 @@
+    CLASS net/minecraft/unmapped/C_fwhrecir net/minecraft/util/context/ContextKey
+    	METHOD m_gwhuraiv getId ()Lnet/minecraft/unmapped/C_ncpywfca;
+    	METHOD m_rginltte createDefault (Ljava/lang/String;)Lnet/minecraft/unmapped/C_fwhrecir;

-Original file line number
+Diff line change
@@ -0,0 +1,16 @@
+    CLASS net/minecraft/unmapped/C_ykthnceq net/minecraft/util/context/ContextKeySet
+    	FIELD f_bqqxiayl required Ljava/util/Set;
+    	FIELD f_iawmnflz allowed Ljava/util/Set;
+    	METHOD <init> (Ljava/util/Set;Ljava/util/Set;)V
+    		ARG 1 required
+    		ARG 2 allowed
+    	METHOD m_drjhihxt getAllowed ()Ljava/util/Set;
+    	METHOD m_rdrvykhr getRequired ()Ljava/util/Set;
+    	CLASS C_frcifljd Builder
+    		FIELD f_dzzvctzu allowed Ljava/util/Set;
+    		FIELD f_ugtotskb required Ljava/util/Set;
+    		METHOD m_frfpwkut require (Lnet/minecraft/unmapped/C_fwhrecir;)Lnet/minecraft/unmapped/C_ykthnceq$C_frcifljd;
+    			ARG 1 key
+    		METHOD m_phwovvlh build ()Lnet/minecraft/unmapped/C_ykthnceq;
+    		METHOD m_vzniwaxq allow (Lnet/minecraft/unmapped/C_fwhrecir;)Lnet/minecraft/unmapped/C_ykthnceq$C_frcifljd;
+    			ARG 1 key

-Original file line number
+Diff line change
@@ -0,0 +1,24 @@
+    CLASS net/minecraft/unmapped/C_zcrtzabd net/minecraft/util/context/ContextMap
+    	FIELD f_htsneqql params Ljava/util/Map;
+    	METHOD m_nlwivfes getOrDefault (Lnet/minecraft/unmapped/C_fwhrecir;Ljava/lang/Object;)Ljava/lang/Object;
+    	METHOD m_yhqbolpt get (Lnet/minecraft/unmapped/C_fwhrecir;)Ljava/lang/Object;
+    		ARG 1 key
+    	METHOD m_yqtpycln getOrThrow (Lnet/minecraft/unmapped/C_fwhrecir;)Ljava/lang/Object;
+    		ARG 1 key
+    	METHOD m_zjtjxnih contains (Lnet/minecraft/unmapped/C_fwhrecir;)Z
+    		ARG 1 key
+    	CLASS C_dyefrfxn Builder
+    		FIELD f_pizccflk params Ljava/util/Map;
+    		METHOD m_ebrmhhhg build (Lnet/minecraft/unmapped/C_ykthnceq;)Lnet/minecraft/unmapped/C_zcrtzabd;
+    			ARG 1 keySet
+    				COMMENT a key set to validate that all required parameters are present and all parameters are allowed
+    		METHOD m_qfvzikfa withOptionalParameter (Lnet/minecraft/unmapped/C_fwhrecir;Ljava/lang/Object;)Lnet/minecraft/unmapped/C_zcrtzabd$C_dyefrfxn;
+    			ARG 1 key
+    			ARG 2 param
+    		METHOD m_quncxtks getParameter (Lnet/minecraft/unmapped/C_fwhrecir;)Ljava/lang/Object;
+    			ARG 1 key
+    		METHOD m_upgpfdhs withParameter (Lnet/minecraft/unmapped/C_fwhrecir;Ljava/lang/Object;)Lnet/minecraft/unmapped/C_zcrtzabd$C_dyefrfxn;
+    			ARG 1 key
+    			ARG 2 param
+    		METHOD m_yzhkjsze getParameterOrThrow (Lnet/minecraft/unmapped/C_fwhrecir;)Ljava/lang/Object;
+    			ARG 1 key

-Original file line number
+Diff line change
@@ Expand Up / @@ -133,6 +133,14 @@ @@
         ]
       },
+      // Util
+      "net/minecraft/unmapped/C_fwhrecir": {
+        local_name: "key",
+        fallback: [
+          "contextKey"
+        ]
+      },
       // Village
       "net/minecraft/unmapped/C_argwryfu": { // TradeOffer
         local_name: "offer",
@@ Expand Down @@

Commit

There are no files selected for viewing

3 comments on commit 37ed413

github-actions bot commented on 37ed413 Oct 9, 2024

Choose a reason for hiding this comment

github-actions bot commented on 37ed413 Oct 9, 2024

Choose a reason for hiding this comment

github-actions bot commented on 37ed413 Oct 9, 2024

Choose a reason for hiding this comment

3 comments on commit `37ed413`

github-actions bot commented on `37ed413` Oct 9, 2024

github-actions bot commented on `37ed413` Oct 9, 2024

github-actions bot commented on `37ed413` Oct 9, 2024