Skip to content

Commit

Permalink
re-complete DispenserBehavior
Browse files Browse the repository at this point in the history 
rename DefaultDispenserBehavior dispenseSilently -> dispenseImpl and correct its old pointer param name
  • Loading branch information
@supersaiyansubtlety
supersaiyansubtlety committed Dec 3, 2024
1 parent 2d4e8bf commit f95f53f
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 2 deletions.
4 changes: 2 additions & 2 deletions mappings/net/minecraft/block/dispenser/DefaultDispenserBehavior.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ CLASS net/minecraft/unmapped/C_dnfsxzwl net/minecraft/block/dispenser/DefaultDis
METHOD m_bzvzsacf spawnParticles (Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_xpuuihxf;)V
ARG 1 context
ARG 2 side
METHOD m_clhynwvb dispenseSilently (Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_sddaxwyk;
ARG 1 pointer
METHOD m_clhynwvb dispenseImpl (Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_sddaxwyk;
ARG 1 context
ARG 2 stack
METHOD m_fhxczazc insertAndSpawnExcess (Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_sddaxwyk;)V
ARG 1 block
Expand Down
21 changes: 21 additions & 0 deletions mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,32 @@
CLASS net/minecraft/unmapped/C_ooeeaffg net/minecraft/block/dispenser/DispenserBehavior
FIELD f_qafvtfzb LOGGER Lorg/slf4j/Logger;
FIELD f_szadkszc NOOP Lnet/minecraft/unmapped/C_ooeeaffg;
METHOD dispense (Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_sddaxwyk;
ARG 1 context
METHOD m_ujgviwhs doDispense (Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_sddaxwyk;
ARG 0 context
ARG 1 stack
METHOD m_ummkrstn bootstrap ()V
CLASS C_genfnnji
FIELD f_rnenkqvi fallbackBehavior Lnet/minecraft/unmapped/C_dnfsxzwl;
CLASS C_gwoiejxt
METHOD m_fbmpzyvo (Lnet/minecraft/unmapped/C_vorddnax;)V
ARG 0 unused
CLASS C_hbfucibf
METHOD m_idvddspb (Lnet/minecraft/unmapped/C_javurlgg;)Z
ARG 0 donkey
CLASS C_ivungvuf
FIELD f_guppwqen fallbackBehavior Lnet/minecraft/unmapped/C_dnfsxzwl;
CLASS C_kaaebxym
METHOD m_nisfpukw (Lnet/minecraft/unmapped/C_xpuuihxf;Lnet/minecraft/unmapped/C_nknvrhfn;)V
ARG 1 armorStand
CLASS C_pgomfdlr
METHOD m_yngxetbi (Lnet/minecraft/unmapped/C_vorddnax;)V
ARG 0 unused
CLASS C_wocbrvrh
METHOD m_eihslyjq consumeBottle (Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_sddaxwyk;
ARG 1 context
ARG 2 dispensedStack
ARG 3 remainder
METHOD m_fsqwlyud (Lnet/minecraft/unmapped/C_triydqro$C_eibemhky;)Z
ARG 0 state

2 comments on commit f95f53f

@github-actions
Copy link

Choose a reason for hiding this comment

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

With commit f95f53f, 33 file(s) were updated with 243 line(s) added and 244 removed compared to the latest Quilt Mappings version.

View the diff here (1/2): 
diff -bur namedTargetSrc/net/minecraft/block/cauldron/CauldronBehavior.java namedSrc/net/minecraft/block/cauldron/CauldronBehavior.java
--- namedTargetSrc/net/minecraft/block/cauldron/CauldronBehavior.java	2024-12-03 00:26:46.384125874 +0000
+++ namedSrc/net/minecraft/block/cauldron/CauldronBehavior.java	2024-12-03 00:25:38.143638164 +0000
@@ -83,13 +83,13 @@
     * @mapping {@literal hashed interact Lnet/minecraft/unmapped/C_hwbtrnnh;interact(Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_laxmzoqs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_ozuepbyj;}
     * @mapping {@literal named interact Lnet/minecraft/block/cauldron/CauldronBehavior;interact(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/util/Hand;Lnet/minecraft/item/ItemStack;)Lnet/minecraft/util/ActionResult;}
     */
-   ActionResult interact(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand arg5, ItemStack stack);
+   ActionResult interact(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, ItemStack stack);
 
    /**
     * @mapping {@literal hashed m_ucoeawqp Lnet/minecraft/unmapped/C_hwbtrnnh;m_ucoeawqp()V}
-    * @mapping {@literal named registerBehavior Lnet/minecraft/block/cauldron/CauldronBehavior;registerBehavior()V}
+    * @mapping {@literal named bootstrap Lnet/minecraft/block/cauldron/CauldronBehavior;bootstrap()V}
     */
-   static void registerBehavior() {
+   static void bootstrap() {
       Map<Item, CauldronBehavior> map = EMPTY_CAULDRON_BEHAVIOR.map();
       registerBucketBehavior(map);
       map.put(Items.POTION, (CauldronBehavior)(state, world, pos, player, hand, stack) -> {
diff -bur namedTargetSrc/net/minecraft/block/CrafterBlock.java namedSrc/net/minecraft/block/CrafterBlock.java
--- namedTargetSrc/net/minecraft/block/CrafterBlock.java	2024-12-03 00:26:46.420126138 +0000
+++ namedSrc/net/minecraft/block/CrafterBlock.java	2024-12-03 00:25:38.187638489 +0000
@@ -3,7 +3,7 @@
 import com.mojang.serialization.MapCodec;
 import java.util.Optional;
 import net.minecraft.advancement.criterion.Criteria;
-import net.minecraft.block.dispenser.ItemDispenserBehavior;
+import net.minecraft.block.dispenser.DefaultDispenserBehavior;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.block.entity.BlockEntityTicker;
 import net.minecraft.block.entity.BlockEntityType;
@@ -305,7 +305,7 @@
       if (!lv3.isEmpty()) {
          Vec3d lv6 = Vec3d.ofCenter(pos);
          Vec3d lv7 = lv6.relative(lv, 0.7);
-         ItemDispenserBehavior.spawnItem(world, lv3, 6, lv, lv7);
+         DefaultDispenserBehavior.spawnItem(world, lv3, 6, lv, lv7);
 
          for (ServerPlayerEntity lv8 : world.getNonSpectatingEntities(ServerPlayerEntity.class, Box.of(lv6, 17.0, 17.0, 17.0))) {
             Criteria.CRAFTER_RECIPE_CRAFTED.trigger(lv8, recipe.id(), blockEntity.getStacks());
diff -bur namedTargetSrc/net/minecraft/block/dispenser/BlockPlacementDispenserBehavior.java namedSrc/net/minecraft/block/dispenser/BlockPlacementDispenserBehavior.java
--- namedTargetSrc/net/minecraft/block/dispenser/BlockPlacementDispenserBehavior.java	2024-12-03 00:26:46.588127373 +0000
+++ namedSrc/net/minecraft/block/dispenser/BlockPlacementDispenserBehavior.java	2024-12-03 00:25:38.399640056 +0000
@@ -5,7 +5,6 @@
 import net.minecraft.item.BlockItem;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.math.BlockPointer;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import org.slf4j.Logger;
@@ -14,7 +13,7 @@
  * @mapping {@literal hashed net/minecraft/unmapped/C_zfetylnm}
  * @mapping {@literal named net/minecraft/block/dispenser/BlockPlacementDispenserBehavior}
  */
-public class BlockPlacementDispenserBehavior extends FallibleItemDispenserBehavior {
+public class BlockPlacementDispenserBehavior extends FallibleDispenserBehavior {
    /**
     * @mapping {@literal hashed f_thlcxmle Lnet/minecraft/unmapped/C_zfetylnm;f_thlcxmle:Lorg/slf4j/Logger;}
     * @mapping {@literal named LOGGER Lnet/minecraft/block/dispenser/BlockPlacementDispenserBehavior;LOGGER:Lorg/slf4j/Logger;}
@@ -25,16 +24,16 @@
     * Mapping not found
     */
    @Override
-   protected ItemStack dispenseSilently(BlockPointer pointer, ItemStack stack) {
+   protected ItemStack dispenseImpl(DispenserContext context, ItemStack stack) {
       this.setSuccess(false);
       Item lv = stack.getItem();
       if (lv instanceof BlockItem) {
-         Direction lv2 = pointer.state().getOrThrow(DispenserBlock.FACING);
-         BlockPos lv3 = pointer.pos().offset(lv2);
-         Direction lv4 = pointer.world().isAir(lv3.down()) ? lv2 : Direction.UP;
+         Direction lv2 = context.state().getOrThrow(DispenserBlock.FACING);
+         BlockPos lv3 = context.pos().offset(lv2);
+         Direction lv4 = context.world().isAir(lv3.down()) ? lv2 : Direction.UP;
 
          try {
-            this.setSuccess(((BlockItem)lv).place(new AutomaticItemPlacementContext(pointer.world(), lv3, lv2, stack, lv4)).isAccepted());
+            this.setSuccess(((BlockItem)lv).place(new AutomaticItemPlacementContext(context.world(), lv3, lv2, stack, lv4)).isAccepted());
          } catch (Exception var8) {
             LOGGER.error("Error trying to place shulker box at {}", lv3, var8);
          }
diff -bur namedTargetSrc/net/minecraft/block/dispenser/BoatDispenserBehavior.java namedSrc/net/minecraft/block/dispenser/BoatDispenserBehavior.java
--- namedTargetSrc/net/minecraft/block/dispenser/BoatDispenserBehavior.java	2024-12-03 00:26:46.572127255 +0000
+++ namedSrc/net/minecraft/block/dispenser/BoatDispenserBehavior.java	2024-12-03 00:25:38.375639878 +0000
@@ -6,7 +6,6 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.registry.tag.FluidTags;
 import net.minecraft.server.world.ServerWorld;
-import net.minecraft.util.math.BlockPointer;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.Vec3d;
@@ -16,12 +15,12 @@
  * @mapping {@literal hashed net/minecraft/unmapped/C_hzrcnxyg}
  * @mapping {@literal named net/minecraft/block/dispenser/BoatDispenserBehavior}
  */
-public class BoatDispenserBehavior extends ItemDispenserBehavior {
+public class BoatDispenserBehavior extends DefaultDispenserBehavior {
    /**
     * @mapping {@literal hashed f_msafscgy Lnet/minecraft/unmapped/C_hzrcnxyg;f_msafscgy:Lnet/minecraft/unmapped/C_dnfsxzwl;}
-    * @mapping {@literal named itemDispenser Lnet/minecraft/block/dispenser/BoatDispenserBehavior;itemDispenser:Lnet/minecraft/block/dispenser/ItemDispenserBehavior;}
+    * @mapping {@literal named itemDispenser Lnet/minecraft/block/dispenser/BoatDispenserBehavior;itemDispenser:Lnet/minecraft/block/dispenser/DefaultDispenserBehavior;}
     */
-   private final ItemDispenserBehavior itemDispenser = new ItemDispenserBehavior();
+   private final DefaultDispenserBehavior itemDispenser = new DefaultDispenserBehavior();
    /**
     * @mapping {@literal hashed f_iqvprvdq Lnet/minecraft/unmapped/C_hzrcnxyg;f_iqvprvdq:Lnet/minecraft/unmapped/C_ogavsvbr;}
     * @mapping {@literal named boatType Lnet/minecraft/block/dispenser/BoatDispenserBehavior;boatType:Lnet/minecraft/entity/EntityType;}
@@ -40,21 +39,21 @@
     * Mapping not found
     */
    @Override
-   public ItemStack dispenseSilently(BlockPointer pointer, ItemStack stack) {
-      Direction lv = pointer.state().getOrThrow(DispenserBlock.FACING);
-      ServerWorld lv2 = pointer.world();
-      Vec3d lv3 = pointer.center();
+   public ItemStack dispenseImpl(DispenserContext context, ItemStack stack) {
+      Direction lv = context.state().getOrThrow(DispenserBlock.FACING);
+      ServerWorld lv2 = context.world();
+      Vec3d lv3 = context.center();
       double d = 0.5625 + (double)this.boatType.getWidth() / 2.0;
       double e = lv3.getX() + (double)lv.getOffsetX() * d;
       double f = lv3.getY() + (double)((float)lv.getOffsetY() * 1.125F);
       double g = lv3.getZ() + (double)lv.getOffsetZ() * d;
-      BlockPos lv4 = pointer.pos().offset(lv);
+      BlockPos lv4 = context.pos().offset(lv);
       double h;
       if (lv2.getFluidState(lv4).isIn(FluidTags.WATER)) {
          h = 1.0;
       } else {
          if (!lv2.getBlockState(lv4).isAir() || !lv2.getFluidState(lv4.down()).isIn(FluidTags.WATER)) {
-            return this.itemDispenser.dispense(pointer, stack);
+            return this.itemDispenser.dispense(context, stack);
          }
 
          h = 0.0;
@@ -76,7 +75,7 @@
     * Mapping not found
     */
    @Override
-   protected void playSound(BlockPointer pointer) {
-      pointer.world().syncWorldEvent(WorldEvents.DISPENSER_DISPENSES, pointer.pos(), 0);
+   protected void playSound(DispenserContext context) {
+      context.world().syncWorldEvent(WorldEvents.DISPENSER_DISPENSES, context.pos(), 0);
    }
 }
Only in namedSrc/net/minecraft/block/dispenser: DefaultDispenserBehavior.java
diff -bur namedTargetSrc/net/minecraft/block/dispenser/DispenserBehavior.java namedSrc/net/minecraft/block/dispenser/DispenserBehavior.java
--- namedTargetSrc/net/minecraft/block/dispenser/DispenserBehavior.java	2024-12-03 00:26:46.496126696 +0000
+++ namedSrc/net/minecraft/block/dispenser/DispenserBehavior.java	2024-12-03 00:25:38.287639228 +0000
@@ -48,10 +48,7 @@
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.state.property.Properties;
-import net.minecraft.unmapped.C_grwaorwt;
-import net.minecraft.unmapped.C_ueplrtkn;
 import net.minecraft.util.DyeColor;
-import net.minecraft.util.math.BlockPointer;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Box;
 import net.minecraft.util.math.Direction;
@@ -76,19 +73,19 @@
     * @mapping {@literal hashed f_szadkszc Lnet/minecraft/unmapped/C_ooeeaffg;f_szadkszc:Lnet/minecraft/unmapped/C_ooeeaffg;}
     * @mapping {@literal named NOOP Lnet/minecraft/block/dispenser/DispenserBehavior;NOOP:Lnet/minecraft/block/dispenser/DispenserBehavior;}
     */
-   DispenserBehavior NOOP = (pointer, stack) -> stack;
+   DispenserBehavior NOOP = (context, stack) -> stack;
 
    /**
     * @mapping {@literal hashed dispense Lnet/minecraft/unmapped/C_ooeeaffg;dispense(Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_sddaxwyk;}
-    * @mapping {@literal named dispense Lnet/minecraft/block/dispenser/DispenserBehavior;dispense(Lnet/minecraft/util/math/BlockPointer;Lnet/minecraft/item/ItemStack;)Lnet/minecraft/item/ItemStack;}
+    * @mapping {@literal named dispense Lnet/minecraft/block/dispenser/DispenserBehavior;dispense(Lnet/minecraft/block/dispenser/DispenserContext;Lnet/minecraft/item/ItemStack;)Lnet/minecraft/item/ItemStack;}
     */
-   ItemStack dispense(BlockPointer arg, ItemStack stack);
+   ItemStack dispense(DispenserContext context, ItemStack stack);
 
    /**
     * @mapping {@literal hashed m_ummkrstn Lnet/minecraft/unmapped/C_ooeeaffg;m_ummkrstn()V}
-    * @mapping {@literal named registerDefaults Lnet/minecraft/block/dispenser/DispenserBehavior;registerDefaults()V}
+    * @mapping {@literal named bootstrap Lnet/minecraft/block/dispenser/DispenserBehavior;bootstrap()V}
     */
-   static void registerDefaults() {
+   static void bootstrap() {
       DispenserBlock.registerBehavior(Items.ARROW);
       DispenserBlock.registerBehavior(Items.TIPPED_ARROW);
       DispenserBlock.registerBehavior(Items.SPECTRAL_ARROW);
@@ -100,24 +97,24 @@
       DispenserBlock.registerBehavior(Items.FIREWORK_ROCKET);
       DispenserBlock.registerBehavior(Items.FIRE_CHARGE);
       DispenserBlock.registerBehavior(Items.WIND_CHARGE);
-      ItemDispenserBehavior lv = new ItemDispenserBehavior() {
+      DefaultDispenserBehavior lv = new DefaultDispenserBehavior() {
          /**
           * Mapping not found
           */
          @Override
-         public ItemStack dispenseSilently(BlockPointer pointer, ItemStack stack) {
-            Direction lv = pointer.state().getOrThrow(DispenserBlock.FACING);
-            EntityType<?> lv2 = ((SpawnEggItem)stack.getItem()).getEntityType(pointer.world().getRegistryManager(), stack);
+         public ItemStack dispenseImpl(DispenserContext context, ItemStack stack) {
+            Direction lv = context.state().getOrThrow(DispenserBlock.FACING);
+            EntityType<?> lv2 = ((SpawnEggItem)stack.getItem()).getEntityType(context.world().getRegistryManager(), stack);
 
             try {
-               lv2.spawn(pointer.world(), stack, null, pointer.pos().offset(lv), SpawnReason.DISPENSER, lv != Direction.UP, false);
+               lv2.spawn(context.world(), stack, null, context.pos().offset(lv), SpawnReason.DISPENSER, lv != Direction.UP, false);
             } catch (Exception var6) {
-               LOGGER.error("Error while dispensing spawn egg from dispenser at {}", pointer.pos(), var6);
+               LOGGER.error("Error while dispensing spawn egg from dispenser at {}", context.pos(), var6);
                return ItemStack.EMPTY;
             }
 
             stack.decrement(1);
-            pointer.world().emitGameEvent(null, GameEvent.ENTITY_PLACE, pointer.pos());
+            context.world().emitGameEvent(null, GameEvent.ENTITY_PLACE, context.pos());
             return stack;
          }
       };
@@ -126,16 +123,16 @@
          DispenserBlock.registerBehavior(lv2, lv);
       }
 
-      DispenserBlock.registerBehavior(Items.ARMOR_STAND, new ItemDispenserBehavior() {
+      DispenserBlock.registerBehavior(Items.ARMOR_STAND, new DefaultDispenserBehavior() {
          /**
           * Mapping not found
           */
          @Override
-         public ItemStack dispenseSilently(BlockPointer pointer, ItemStack stack) {
-            Direction lv = pointer.state().getOrThrow(DispenserBlock.FACING);
-            BlockPos lv2 = pointer.pos().offset(lv);
-            ServerWorld lv3 = pointer.world();
-            Consumer<ArmorStandEntity> consumer = EntityType.appendDefaultStackSpawnConfig(arg2 -> arg2.setYaw(lv.asRotation()), lv3, stack, null);
+         public ItemStack dispenseImpl(DispenserContext context, ItemStack stack) {
+            Direction lv = context.state().getOrThrow(DispenserBlock.FACING);
+            BlockPos lv2 = context.pos().offset(lv);
+            ServerWorld lv3 = context.world();
+            Consumer<ArmorStandEntity> consumer = EntityType.appendDefaultStackSpawnConfig(armorStand -> armorStand.setYaw(lv.asRotation()), lv3, stack, null);
             ArmorStandEntity lv4 = EntityType.ARMOR_STAND.spawn(lv3, consumer, lv2, SpawnReason.DISPENSER, false, false);
             if (lv4 != null) {
                stack.decrement(1);
@@ -146,14 +143,14 @@
       });
       DispenserBlock.registerBehavior(
          Items.SADDLE,
-         new FallibleItemDispenserBehavior() {
+         new FallibleDispenserBehavior() {
             /**
              * Mapping not found
              */
             @Override
-            public ItemStack dispenseSilently(BlockPointer pointer, ItemStack stack) {
-               BlockPos lv = pointer.pos().offset(pointer.state().getOrThrow(DispenserBlock.FACING));
-               List<LivingEntity> list = pointer.world()
+            public ItemStack dispenseImpl(DispenserContext context, ItemStack stack) {
+               BlockPos lv = context.pos().offset(context.state().getOrThrow(DispenserBlock.FACING));
+               List<LivingEntity> list = context.world()
                   .getEntitiesByClass(
                      LivingEntity.class, new Box(lv), entity -> !(entity instanceof Saddleable lvx) ? false : !lvx.isSaddled() && lvx.canBeSaddled()
                   );
@@ -162,23 +159,23 @@
                   this.setSuccess(true);
                   return stack;
                } else {
-                  return super.dispenseSilently(pointer, stack);
+                  return super.dispenseImpl(context, stack);
                }
             }
          }
       );
       DispenserBlock.registerBehavior(
          Items.CHEST,
-         new FallibleItemDispenserBehavior() {
+         new FallibleDispenserBehavior() {
             /**
              * Mapping not found
              */
             @Override
-            public ItemStack dispenseSilently(BlockPointer pointer, ItemStack stack) {
-               BlockPos lv = pointer.pos().offset(pointer.state().getOrThrow(DispenserBlock.FACING));
+            public ItemStack dispenseImpl(DispenserContext context, ItemStack stack) {
+               BlockPos lv = context.pos().offset(context.state().getOrThrow(DispenserBlock.FACING));
 
-               for (AbstractDonkeyEntity lv2 : pointer.world()
-                  .getEntitiesByClass(AbstractDonkeyEntity.class, new Box(lv), arg -> arg.isAlive() && !arg.hasChest())) {
+               for (AbstractDonkeyEntity lv2 : context.world()
+                  .getEntitiesByClass(AbstractDonkeyEntity.class, new Box(lv), donkey -> donkey.isAlive() && !donkey.hasChest())) {
                   if (lv2.isTame() && lv2.getStackReference(499).set(stack)) {
                      stack.decrement(1);
                      this.setSuccess(true);
@@ -186,7 +183,7 @@
                   }
                }
 
-               return super.dispenseSilently(pointer, stack);
+               return super.dispenseImpl(context, stack);
             }
          }
       );
@@ -210,25 +207,26 @@
       DispenserBlock.registerBehavior(Items.MANGROVE_CHEST_BOAT, new BoatDispenserBehavior(EntityType.MANGROVE_CHEST_BOAT));
       DispenserBlock.registerBehavior(Items.PALE_OAK_CHEST_BOAT, new BoatDispenserBehavior(EntityType.PALE_OAK_CHEST_BOAT));
       DispenserBlock.registerBehavior(Items.BAMBOO_CHEST_RAFT, new BoatDispenserBehavior(EntityType.BAMBOO_CHEST_RAFT));
-      DispenserBehavior lv3 = new ItemDispenserBehavior() {
+      DispenserBehavior lv3 = new DefaultDispenserBehavior() {
          /**
-          * Mapping not found
+          * @mapping {@literal hashed f_guppwqen Lnet/minecraft/unmapped/C_ooeeaffg$C_ivungvuf;f_guppwqen:Lnet/minecraft/unmapped/C_dnfsxzwl;}
+          * @mapping {@literal named fallbackBehavior Lnet/minecraft/block/dispenser/DispenserBehavior$C_ivungvuf;fallbackBehavior:Lnet/minecraft/block/dispenser/DefaultDispenserBehavior;}
           */
-         private final ItemDispenserBehavior f_guppwqen = new ItemDispenserBehavior();
+         private final DefaultDispenserBehavior fallbackBehavior = new DefaultDispenserBehavior();
 
          /**
           * Mapping not found
           */
          @Override
-         public ItemStack dispenseSilently(BlockPointer pointer, ItemStack stack) {
+         public ItemStack dispenseImpl(DispenserContext context, ItemStack stack) {
             FluidModificationItem lv = (FluidModificationItem)stack.getItem();
-            BlockPos lv2 = pointer.pos().offset(pointer.state().getOrThrow(DispenserBlock.FACING));
-            World lv3 = pointer.world();
+            BlockPos lv2 = context.pos().offset(context.state().getOrThrow(DispenserBlock.FACING));
+            World lv3 = context.world();
             if (lv.placeFluid(null, lv3, lv2, null)) {
                lv.onEmptied(null, lv3, stack, lv2);
-               return this.consumeWithRemainder(pointer, stack, new ItemStack(Items.BUCKET));
+               return this.consumeWithRemainder(context, stack, new ItemStack(Items.BUCKET));
             } else {
-               return this.f_guppwqen.dispense(pointer, stack);
+               return this.fallbackBehavior.dispense(context, stack);
             }
          }
       };
@@ -241,39 +239,39 @@
       DispenserBlock.registerBehavior(Items.TROPICAL_FISH_BUCKET, lv3);
       DispenserBlock.registerBehavior(Items.AXOLOTL_BUCKET, lv3);
       DispenserBlock.registerBehavior(Items.TADPOLE_BUCKET, lv3);
-      DispenserBlock.registerBehavior(Items.BUCKET, new ItemDispenserBehavior() {
+      DispenserBlock.registerBehavior(Items.BUCKET, new DefaultDispenserBehavior() {
          /**
           * Mapping not found
           */
          @Override
-         public ItemStack dispenseSilently(BlockPointer pointer, ItemStack stack) {
-            WorldAccess lv = pointer.world();
-            BlockPos lv2 = pointer.pos().offset(pointer.state().getOrThrow(DispenserBlock.FACING));
+         public ItemStack dispenseImpl(DispenserContext context, ItemStack stack) {
+            WorldAccess lv = context.world();
+            BlockPos lv2 = context.pos().offset(context.state().getOrThrow(DispenserBlock.FACING));
             BlockState lv3 = lv.getBlockState(lv2);
             if (lv3.getBlock() instanceof FluidDrainable lv5) {
                ItemStack lv6 = lv5.tryDrainFluid(null, lv, lv2, lv3);
                if (lv6.isEmpty()) {
-                  return super.dispenseSilently(pointer, stack);
+                  return super.dispenseImpl(context, stack);
                } else {
                   lv.emitGameEvent(null, GameEvent.FLUID_PICKUP, lv2);
                   Item lv7 = lv6.getItem();
-                  return this.consumeWithRemainder(pointer, stack, new ItemStack(lv7));
+                  return this.consumeWithRemainder(context, stack, new ItemStack(lv7));
                }
             } else {
-               return super.dispenseSilently(pointer, stack);
+               return super.dispenseImpl(context, stack);
             }
          }
       });
-      DispenserBlock.registerBehavior(Items.FLINT_AND_STEEL, new FallibleItemDispenserBehavior() {
+      DispenserBlock.registerBehavior(Items.FLINT_AND_STEEL, new FallibleDispenserBehavior() {
          /**
           * Mapping not found
           */
          @Override
-         protected ItemStack dispenseSilently(BlockPointer pointer, ItemStack stack) {
-            ServerWorld lv = pointer.world();
+         protected ItemStack dispenseImpl(DispenserContext context, ItemStack stack) {
+            ServerWorld lv = context.world();
             this.setSuccess(true);
-            Direction lv2 = pointer.state().getOrThrow(DispenserBlock.FACING);
-            BlockPos lv3 = pointer.pos().offset(lv2);
+            Direction lv2 = context.state().getOrThrow(DispenserBlock.FACING);
+            BlockPos lv3 = context.pos().offset(lv2);
             BlockState lv4 = lv.getBlockState(lv3);
             if (AbstractFireBlock.canPlaceAt(lv, lv3, lv2)) {
                lv.setBlockState(lv3, AbstractFireBlock.getState(lv, lv3));
@@ -289,22 +287,22 @@
             }
 
             if (this.isSuccess()) {
-               stack.damageEquipment(1, lv, null, arg -> {
+               stack.damageEquipment(1, lv, null, unused -> {
                });
             }
 
             return stack;
          }
       });
-      DispenserBlock.registerBehavior(Items.BONE_MEAL, new FallibleItemDispenserBehavior() {
+      DispenserBlock.registerBehavior(Items.BONE_MEAL, new FallibleDispenserBehavior() {
          /**
           * Mapping not found
           */
          @Override
-         protected ItemStack dispenseSilently(BlockPointer pointer, ItemStack stack) {
+         protected ItemStack dispenseImpl(DispenserContext context, ItemStack stack) {
             this.setSuccess(true);
-            World lv = pointer.world();
-            BlockPos lv2 = pointer.pos().offset(pointer.state().getOrThrow(DispenserBlock.FACING));
+            World lv = context.world();
+            BlockPos lv2 = context.pos().offset(context.state().getOrThrow(DispenserBlock.FACING));
             if (!BoneMealItem.useOnFertilizable(stack, lv, lv2) && !BoneMealItem.useOnGround(stack, lv, lv2, null)) {
                this.setSuccess(false);
             } else if (!lv.isClient) {
@@ -314,14 +312,14 @@
             return stack;
          }
       });
-      DispenserBlock.registerBehavior(Blocks.TNT, new ItemDispenserBehavior() {
+      DispenserBlock.registerBehavior(Blocks.TNT, new DefaultDispenserBehavior() {
          /**
           * Mapping not found
           */
          @Override
-         protected ItemStack dispenseSilently(BlockPointer pointer, ItemStack stack) {
-            World lv = pointer.world();
-            BlockPos lv2 = pointer.pos().offset(pointer.state().getOrThrow(DispenserBlock.FACING));
+         protected ItemStack dispenseImpl(DispenserContext context, ItemStack stack) {
+            World lv = context.world();
+            BlockPos lv2 = context.pos().offset(context.state().getOrThrow(DispenserBlock.FACING));
             TntEntity lv3 = new TntEntity(lv, (double)lv2.getX() + 0.5, (double)lv2.getY(), (double)lv2.getZ() + 0.5, null);
             lv.spawnEntity(lv3);
             lv.playSound(null, lv3.getX(), lv3.getY(), lv3.getZ(), SoundEvents.ENTITY_TNT_PRIMED, SoundCategory.BLOCKS, 1.0F, 1.0F);
@@ -332,15 +330,15 @@
       });
       DispenserBlock.registerBehavior(
          Items.WITHER_SKELETON_SKULL,
-         new FallibleItemDispenserBehavior() {
+         new FallibleDispenserBehavior() {
             /**
              * Mapping not found
              */
             @Override
-            protected ItemStack dispenseSilently(BlockPointer pointer, ItemStack stack) {
-               World lv = pointer.world();
-               Direction lv2 = pointer.state().getOrThrow(DispenserBlock.FACING);
-               BlockPos lv3 = pointer.pos().offset(lv2);
+            protected ItemStack dispenseImpl(DispenserContext context, ItemStack stack) {
+               World lv = context.world();
+               Direction lv2 = context.state().getOrThrow(DispenserBlock.FACING);
+               BlockPos lv3 = context.pos().offset(lv2);
                if (lv.isAir(lv3) && WitherSkullBlock.canDispense(lv, lv3, stack)) {
                   lv.setBlockState(
                      lv3,
@@ -356,21 +354,21 @@
                   stack.decrement(1);
                   this.setSuccess(true);
                } else {
-                  this.setSuccess(C_grwaorwt.m_rnoitqxu(pointer, stack));
+                  this.setSuccess(EquipmentDispenserBehavior.tryDispensingEquipment(context, stack));
                }
 
                return stack;
             }
          }
       );
-      DispenserBlock.registerBehavior(Blocks.CARVED_PUMPKIN, new FallibleItemDispenserBehavior() {
+      DispenserBlock.registerBehavior(Blocks.CARVED_PUMPKIN, new FallibleDispenserBehavior() {
          /**
           * Mapping not found
           */
          @Override
-         protected ItemStack dispenseSilently(BlockPointer pointer, ItemStack stack) {
-            World lv = pointer.world();
-            BlockPos lv2 = pointer.pos().offset(pointer.state().getOrThrow(DispenserBlock.FACING));
+         protected ItemStack dispenseImpl(DispenserContext context, ItemStack stack) {
+            World lv = context.world();
+            BlockPos lv2 = context.pos().offset(context.state().getOrThrow(DispenserBlock.FACING));
             CarvedPumpkinBlock lv3 = (CarvedPumpkinBlock)Blocks.CARVED_PUMPKIN;
             if (lv.isAir(lv2) && lv3.canDispense(lv, lv2)) {
                if (!lv.isClient) {
@@ -381,7 +379,7 @@
                stack.decrement(1);
                this.setSuccess(true);
             } else {
-               this.setSuccess(C_grwaorwt.m_rnoitqxu(pointer, stack));
+               this.setSuccess(EquipmentDispenserBehavior.tryDispensingEquipment(context, stack));
             }
 
             return stack;
@@ -395,47 +393,48 @@
 
       DispenserBlock.registerBehavior(
          Items.GLASS_BOTTLE.asItem(),
-         new FallibleItemDispenserBehavior() {
+         new FallibleDispenserBehavior() {
             /**
-             * Mapping not found
+             * @mapping {@literal hashed m_eihslyjq Lnet/minecraft/unmapped/C_ooeeaffg$C_wocbrvrh;m_eihslyjq(Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_sddaxwyk;}
+             * @mapping {@literal named consumeBottle Lnet/minecraft/block/dispenser/DispenserBehavior$C_wocbrvrh;consumeBottle(Lnet/minecraft/block/dispenser/DispenserContext;Lnet/minecraft/item/ItemStack;Lnet/minecraft/item/ItemStack;)Lnet/minecraft/item/ItemStack;}
              */
-            private ItemStack m_eihslyjq(BlockPointer arg, ItemStack arg2, ItemStack arg3) {
-               arg.world().emitGameEvent(null, GameEvent.FLUID_PICKUP, arg.pos());
-               return this.consumeWithRemainder(arg, arg2, arg3);
+            private ItemStack consumeBottle(DispenserContext context, ItemStack dispensedStack, ItemStack remainder) {
+               context.world().emitGameEvent(null, GameEvent.FLUID_PICKUP, context.pos());
+               return this.consumeWithRemainder(context, dispensedStack, remainder);
             }
 
             /**
              * Mapping not found
              */
             @Override
-            public ItemStack dispenseSilently(BlockPointer pointer, ItemStack stack) {
+            public ItemStack dispenseImpl(DispenserContext context, ItemStack stack) {
                this.setSuccess(false);
-               ServerWorld lv = pointer.world();
-               BlockPos lv2 = pointer.pos().offset(pointer.state().getOrThrow(DispenserBlock.FACING));
+               ServerWorld lv = context.world();
+               BlockPos lv2 = context.pos().offset(context.state().getOrThrow(DispenserBlock.FACING));
                BlockState lv3 = lv.getBlockState(lv2);
-               if (lv3.isInAndMatches(BlockTags.BEEHIVES, arg -> arg.contains(BeehiveBlock.HONEY_LEVEL) && arg.getBlock() instanceof BeehiveBlock)
+               if (lv3.isInAndMatches(BlockTags.BEEHIVES, state -> state.contains(BeehiveBlock.HONEY_LEVEL) && state.getBlock() instanceof BeehiveBlock)
                   && (Integer)lv3.getOrThrow(BeehiveBlock.HONEY_LEVEL) >= 5) {
                   ((BeehiveBlock)lv3.getBlock()).takeHoney(lv, lv3, lv2, null, BeehiveBlockEntity.BeeState.BEE_RELEASED);
                   this.setSuccess(true);
-                  return this.m_eihslyjq(pointer, stack, new ItemStack(Items.HONEY_BOTTLE));
+                  return this.consumeBottle(context, stack, new ItemStack(Items.HONEY_BOTTLE));
                } else if (lv.getFluidState(lv2).isIn(FluidTags.WATER)) {
                   this.setSuccess(true);
-                  return this.m_eihslyjq(pointer, stack, PotionContentsComponent.createStack(Items.POTION, Potions.WATER));
+                  return this.consumeBottle(context, stack, PotionContentsComponent.createStack(Items.POTION, Potions.WATER));
                } else {
-                  return super.dispenseSilently(pointer, stack);
+                  return super.dispenseImpl(context, stack);
                }
             }
          }
       );
-      DispenserBlock.registerBehavior(Items.GLOWSTONE, new FallibleItemDispenserBehavior() {
+      DispenserBlock.registerBehavior(Items.GLOWSTONE, new FallibleDispenserBehavior() {
          /**
           * Mapping not found
           */
          @Override
-         public ItemStack dispenseSilently(BlockPointer pointer, ItemStack stack) {
-            Direction lv = pointer.state().getOrThrow(DispenserBlock.FACING);
-            BlockPos lv2 = pointer.pos().offset(lv);
-            World lv3 = pointer.world();
+         public ItemStack dispenseImpl(DispenserContext context, ItemStack stack) {
+            Direction lv = context.state().getOrThrow(DispenserBlock.FACING);
+            BlockPos lv2 = context.pos().offset(lv);
+            World lv3 = context.world();
             BlockState lv4 = lv3.getBlockState(lv2);
             this.setSuccess(true);
             if (lv4.isOf(Blocks.RESPAWN_ANCHOR)) {
@@ -448,19 +447,19 @@
 
                return stack;
             } else {
-               return super.dispenseSilently(pointer, stack);
+               return super.dispenseImpl(context, stack);
             }
          }
       });
       DispenserBlock.registerBehavior(Items.SHEARS.asItem(), new ShearsDispenserBehavior());
-      DispenserBlock.registerBehavior(Items.BRUSH.asItem(), new FallibleItemDispenserBehavior() {
+      DispenserBlock.registerBehavior(Items.BRUSH.asItem(), new FallibleDispenserBehavior() {
          /**
           * Mapping not found
           */
          @Override
-         protected ItemStack dispenseSilently(BlockPointer pointer, ItemStack stack) {
-            ServerWorld lv = pointer.world();
-            BlockPos lv2 = pointer.pos().offset(pointer.state().getOrThrow(DispenserBlock.FACING));
+         protected ItemStack dispenseImpl(DispenserContext context, ItemStack stack) {
+            ServerWorld lv = context.world();
+            BlockPos lv2 = context.pos().offset(context.state().getOrThrow(DispenserBlock.FACING));
             List<ArmadilloEntity> list = lv.getEntitiesByClass(ArmadilloEntity.class, new Box(lv2), EntityPredicates.EXCEPT_SPECTATOR);
             if (list.isEmpty()) {
                this.setSuccess(false);
@@ -468,7 +467,7 @@
             } else {
                for (ArmadilloEntity lv3 : list) {
                   if (lv3.onBrushed()) {
-                     stack.damageEquipment(16, lv, null, arg -> {
+                     stack.damageEquipment(16, lv, null, unused -> {
                      });
                      return stack;
                   }
@@ -479,14 +478,14 @@
             }
          }
       });
-      DispenserBlock.registerBehavior(Items.HONEYCOMB, new FallibleItemDispenserBehavior() {
+      DispenserBlock.registerBehavior(Items.HONEYCOMB, new FallibleDispenserBehavior() {
          /**
           * Mapping not found
           */
          @Override
-         public ItemStack dispenseSilently(BlockPointer pointer, ItemStack stack) {
-            BlockPos lv = pointer.pos().offset(pointer.state().getOrThrow(DispenserBlock.FACING));
-            World lv2 = pointer.world();
+         public ItemStack dispenseImpl(DispenserContext context, ItemStack stack) {
+            BlockPos lv = context.pos().offset(context.state().getOrThrow(DispenserBlock.FACING));
+            World lv2 = context.world();
             BlockState lv3 = lv2.getBlockState(lv);
             Optional<BlockState> optional = HoneycombItem.getWaxedState(lv3);
             if (optional.isPresent()) {
@@ -496,32 +495,33 @@
                this.setSuccess(true);
                return stack;
             } else {
-               return super.dispenseSilently(pointer, stack);
+               return super.dispenseImpl(context, stack);
             }
          }
       });
       DispenserBlock.registerBehavior(
          Items.POTION,
-         new ItemDispenserBehavior() {
+         new DefaultDispenserBehavior() {
             /**
-             * Mapping not found
+             * @mapping {@literal hashed f_rnenkqvi Lnet/minecraft/unmapped/C_ooeeaffg$C_genfnnji;f_rnenkqvi:Lnet/minecraft/unmapped/C_dnfsxzwl;}
+             * @mapping {@literal named fallbackBehavior Lnet/minecraft/block/dispenser/DispenserBehavior$C_genfnnji;fallbackBehavior:Lnet/minecraft/block/dispenser/DefaultDispenserBehavior;}
              */
-            private final ItemDispenserBehavior f_rnenkqvi = new ItemDispenserBehavior();
+            private final DefaultDispenserBehavior fallbackBehavior = new DefaultDispenserBehavior();
 
             /**
              * Mapping not found
              */
             @Override
-            public ItemStack dispenseSilently(BlockPointer pointer, ItemStack stack) {
+            public ItemStack dispenseImpl(DispenserContext context, ItemStack stack) {
                PotionContentsComponent lv = stack.getOrDefault(DataComponentTypes.POTION_CONTENTS, PotionContentsComponent.DEFAULT);
                if (!lv.matches(Potions.WATER)) {
-                  return this.f_rnenkqvi.dispense(pointer, stack);
+                  return this.fallbackBehavior.dispense(context, stack);
                } else {
-                  ServerWorld lv2 = pointer.world();
-                  BlockPos lv3 = pointer.pos();
-                  BlockPos lv4 = pointer.pos().offset(pointer.state().getOrThrow(DispenserBlock.FACING));
+                  ServerWorld lv2 = context.world();
+                  BlockPos lv3 = context.pos();
+                  BlockPos lv4 = context.pos().offset(context.state().getOrThrow(DispenserBlock.FACING));
                   if (!lv2.getBlockState(lv4).isIn(BlockTags.CONVERTABLE_TO_MUD)) {
-                     return this.f_rnenkqvi.dispense(pointer, stack);
+                     return this.fallbackBehavior.dispense(context, stack);
                   } else {
                      if (!lv2.isClient) {
                         for (int i = 0; i < 5; i++) {
@@ -542,17 +542,17 @@
                      lv2.playSound(null, lv3, SoundEvents.ITEM_BOTTLE_EMPTY, SoundCategory.BLOCKS, 1.0F, 1.0F);
                      lv2.emitGameEvent(null, GameEvent.FLUID_PLACE, lv3);
                      lv2.setBlockState(lv4, Blocks.MUD.getDefaultState());
-                     return this.consumeWithRemainder(pointer, stack, new ItemStack(Items.GLASS_BOTTLE));
+                     return this.consumeWithRemainder(context, stack, new ItemStack(Items.GLASS_BOTTLE));
                   }
                }
             }
          }
       );
-      DispenserBlock.registerBehavior(Items.MINECART, new C_ueplrtkn(EntityType.MINECART));
-      DispenserBlock.registerBehavior(Items.CHEST_MINECART, new C_ueplrtkn(EntityType.CHEST_MINECART));
-      DispenserBlock.registerBehavior(Items.FURNACE_MINECART, new C_ueplrtkn(EntityType.FURNACE_MINECART));
-      DispenserBlock.registerBehavior(Items.TNT_MINECART, new C_ueplrtkn(EntityType.TNT_MINECART));
-      DispenserBlock.registerBehavior(Items.HOPPER_MINECART, new C_ueplrtkn(EntityType.HOPPER_MINECART));
-      DispenserBlock.registerBehavior(Items.COMMAND_BLOCK_MINECART, new C_ueplrtkn(EntityType.COMMAND_BLOCK_MINECART));
+      DispenserBlock.registerBehavior(Items.MINECART, new MinecartDispenserBehavior(EntityType.MINECART));
+      DispenserBlock.registerBehavior(Items.CHEST_MINECART, new MinecartDispenserBehavior(EntityType.CHEST_MINECART));
+      DispenserBlock.registerBehavior(Items.FURNACE_MINECART, new MinecartDispenserBehavior(EntityType.FURNACE_MINECART));
+      DispenserBlock.registerBehavior(Items.TNT_MINECART, new MinecartDispenserBehavior(EntityType.TNT_MINECART));
+      DispenserBlock.registerBehavior(Items.HOPPER_MINECART, new MinecartDispenserBehavior(EntityType.HOPPER_MINECART));
+      DispenserBlock.registerBehavior(Items.COMMAND_BLOCK_MINECART, new MinecartDispenserBehavior(EntityType.COMMAND_BLOCK_MINECART));
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/dispenser/DispenserBlock.java namedSrc/net/minecraft/block/dispenser/DispenserBlock.java
--- namedTargetSrc/net/minecraft/block/dispenser/DispenserBlock.java	2024-12-03 00:26:46.452126373 +0000
+++ namedSrc/net/minecraft/block/dispenser/DispenserBlock.java	2024-12-03 00:25:38.231638814 +0000
@@ -26,13 +26,11 @@
 import net.minecraft.state.property.BooleanProperty;
 import net.minecraft.state.property.EnumProperty;
 import net.minecraft.state.property.Properties;
-import net.minecraft.unmapped.C_grwaorwt;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.BlockMirror;
 import net.minecraft.util.BlockRotation;
 import net.minecraft.util.ItemScatterer;
 import net.minecraft.util.hit.BlockHitResult;
-import net.minecraft.util.math.BlockPointer;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.Position;
@@ -72,9 +70,9 @@
    public static final BooleanProperty TRIGGERED = Properties.TRIGGERED;
    /**
     * @mapping {@literal hashed f_xxtgryhz Lnet/minecraft/unmapped/C_sridforj;f_xxtgryhz:Lnet/minecraft/unmapped/C_dnfsxzwl;}
-    * @mapping {@literal named DEFAULT_BEHAVIOR Lnet/minecraft/block/dispenser/DispenserBlock;DEFAULT_BEHAVIOR:Lnet/minecraft/block/dispenser/ItemDispenserBehavior;}
+    * @mapping {@literal named DEFAULT_BEHAVIOR Lnet/minecraft/block/dispenser/DispenserBlock;DEFAULT_BEHAVIOR:Lnet/minecraft/block/dispenser/DefaultDispenserBehavior;}
     */
-   private static final ItemDispenserBehavior DEFAULT_BEHAVIOR = new ItemDispenserBehavior();
+   private static final DefaultDispenserBehavior DEFAULT_BEHAVIOR = new DefaultDispenserBehavior();
    /**
     * @mapping {@literal hashed f_bkwqoovv Lnet/minecraft/unmapped/C_sridforj;f_bkwqoovv:Ljava/util/Map;}
     * @mapping {@literal named BEHAVIORS Lnet/minecraft/block/dispenser/DispenserBlock;BEHAVIORS:Ljava/util/Map;}
@@ -141,14 +139,14 @@
       if (lv == null) {
          LOGGER.warn("Ignoring dispensing attempt for Dispenser without matching block entity at {}", pos);
       } else {
-         BlockPointer lv2 = new BlockPointer(world, pos, state, lv);
+         DispenserContext lv2 = new DispenserContext(world, pos, state, lv);
          int i = lv.chooseNonEmptySlot(world.random);
          if (i < 0) {
             world.syncWorldEvent(WorldEvents.DISPENSER_FAILS, pos, 0);
             world.emitGameEvent(GameEvent.BLOCK_ACTIVATE, pos, GameEvent.Context.create(lv.getCachedState()));
          } else {
             ItemStack lv3 = lv.getStack(i);
-            DispenserBehavior lv4 = this.getBehaviorForItem(world, lv3);
+            DispenserBehavior lv4 = this.getBehavior(world, lv3);
             if (lv4 != DispenserBehavior.NOOP) {
                lv.setStack(i, lv4.dispense(lv2, lv3));
             }
@@ -158,23 +156,23 @@
 
    /**
     * @mapping {@literal hashed m_fnobacze Lnet/minecraft/unmapped/C_sridforj;m_fnobacze(Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_ooeeaffg;}
-    * @mapping {@literal named getBehaviorForItem Lnet/minecraft/block/dispenser/DispenserBlock;getBehaviorForItem(Lnet/minecraft/world/World;Lnet/minecraft/item/ItemStack;)Lnet/minecraft/block/dispenser/DispenserBehavior;}
+    * @mapping {@literal named getBehavior Lnet/minecraft/block/dispenser/DispenserBlock;getBehavior(Lnet/minecraft/world/World;Lnet/minecraft/item/ItemStack;)Lnet/minecraft/block/dispenser/DispenserBehavior;}
     */
-   protected DispenserBehavior getBehaviorForItem(World world, ItemStack stack) {
+   protected DispenserBehavior getBehavior(World world, ItemStack stack) {
       if (!stack.isEnabled(world.getEnabledFlags())) {
          return DEFAULT_BEHAVIOR;
       } else {
          DispenserBehavior lv = (DispenserBehavior)BEHAVIORS.get(stack.getItem());
-         return lv != null ? lv : m_pktcfwfi(stack);
+         return lv != null ? lv : getBehavior(stack);
       }
    }
 
    /**
     * @mapping {@literal hashed m_pktcfwfi Lnet/minecraft/unmapped/C_sridforj;m_pktcfwfi(Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_ooeeaffg;}
-    * @mapping {@literal named m_pktcfwfi Lnet/minecraft/block/dispenser/DispenserBlock;m_pktcfwfi(Lnet/minecraft/item/ItemStack;)Lnet/minecraft/block/dispenser/DispenserBehavior;}
+    * @mapping {@literal named getBehavior Lnet/minecraft/block/dispenser/DispenserBlock;getBehavior(Lnet/minecraft/item/ItemStack;)Lnet/minecraft/block/dispenser/DispenserBehavior;}
     */
-   private static DispenserBehavior m_pktcfwfi(ItemStack stack) {
-      return (DispenserBehavior)(stack.contains(DataComponentTypes.EQUIPPABLE) ? C_grwaorwt.f_fngceafg : DEFAULT_BEHAVIOR);
+   private static DispenserBehavior getBehavior(ItemStack stack) {
+      return (DispenserBehavior)(stack.contains(DataComponentTypes.EQUIPPABLE) ? EquipmentDispenserBehavior.INSTANCE : DEFAULT_BEHAVIOR);
    }
 
    /**
@@ -227,17 +225,17 @@
 
    /**
     * @mapping {@literal hashed m_tfzksanp Lnet/minecraft/unmapped/C_sridforj;m_tfzksanp(Lnet/minecraft/unmapped/C_wzdnszcs;)Lnet/minecraft/unmapped/C_ogbhoqwb;}
-    * @mapping {@literal named getDispensePos Lnet/minecraft/block/dispenser/DispenserBlock;getDispensePos(Lnet/minecraft/util/math/BlockPointer;)Lnet/minecraft/util/math/Position;}
+    * @mapping {@literal named getDispensePos Lnet/minecraft/block/dispenser/DispenserBlock;getDispensePos(Lnet/minecraft/block/dispenser/DispenserContext;)Lnet/minecraft/util/math/Position;}
     */
-   public static Position getDispensePos(BlockPointer block) {
+   public static Position getDispensePos(DispenserContext block) {
       return getDispensePos(block, 0.7, Vec3d.ZERO);
    }
 
    /**
     * @mapping {@literal hashed m_kmtowdxh Lnet/minecraft/unmapped/C_sridforj;m_kmtowdxh(Lnet/minecraft/unmapped/C_wzdnszcs;DLnet/minecraft/unmapped/C_vgpupfxx;)Lnet/minecraft/unmapped/C_ogbhoqwb;}
-    * @mapping {@literal named getDispensePos Lnet/minecraft/block/dispenser/DispenserBlock;getDispensePos(Lnet/minecraft/util/math/BlockPointer;DLnet/minecraft/util/math/Vec3d;)Lnet/minecraft/util/math/Position;}
+    * @mapping {@literal named getDispensePos Lnet/minecraft/block/dispenser/DispenserBlock;getDispensePos(Lnet/minecraft/block/dispenser/DispenserContext;DLnet/minecraft/util/math/Vec3d;)Lnet/minecraft/util/math/Position;}
     */
-   public static Position getDispensePos(BlockPointer block, double baseOffsetFactor, Vec3d offset) {
+   public static Position getDispensePos(DispenserContext block, double baseOffsetFactor, Vec3d offset) {
       Direction lv = block.state().getOrThrow(FACING);
       return block.center()
          .add(
Only in namedSrc/net/minecraft/block/dispenser: DispenserContext.java
Only in namedSrc/net/minecraft/block/dispenser: EquipmentDispenserBehavior.java
Only in namedSrc/net/minecraft/block/dispenser: FallibleDispenserBehavior.java
Only in namedTargetSrc/net/minecraft/block/dispenser: FallibleItemDispenserBehavior.java
Only in namedTargetSrc/net/minecraft/block/dispenser: ItemDispenserBehavior.java
Only in namedSrc/net/minecraft/block/dispenser: MinecartDispenserBehavior.java
diff -bur namedTargetSrc/net/minecraft/block/dispenser/ProjectileDispenserBehavior.java namedSrc/net/minecraft/block/dispenser/ProjectileDispenserBehavior.java
--- namedTargetSrc/net/minecraft/block/dispenser/ProjectileDispenserBehavior.java	2024-12-03 00:26:46.508126785 +0000
+++ namedSrc/net/minecraft/block/dispenser/ProjectileDispenserBehavior.java	2024-12-03 00:25:38.303639346 +0000
@@ -5,7 +5,6 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.ProjectileItem;
 import net.minecraft.server.world.ServerWorld;
-import net.minecraft.util.math.BlockPointer;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.Position;
 
@@ -13,7 +12,7 @@
  * @mapping {@literal hashed net/minecraft/unmapped/C_bcbkqaaq}
  * @mapping {@literal named net/minecraft/block/dispenser/ProjectileDispenserBehavior}
  */
-public class ProjectileDispenserBehavior extends ItemDispenserBehavior {
+public class ProjectileDispenserBehavior extends DefaultDispenserBehavior {
    /**
     * @mapping {@literal hashed f_lnvxbzxz Lnet/minecraft/unmapped/C_bcbkqaaq;f_lnvxbzxz:Lnet/minecraft/unmapped/C_dokwmwgh;}
     * @mapping {@literal named projectile Lnet/minecraft/block/dispenser/ProjectileDispenserBehavior;projectile:Lnet/minecraft/item/ProjectileItem;}
@@ -42,10 +41,10 @@
     * Mapping not found
     */
    @Override
-   public ItemStack dispenseSilently(BlockPointer pointer, ItemStack stack) {
-      ServerWorld lv = pointer.world();
-      Direction lv2 = pointer.state().getOrThrow(DispenserBlock.FACING);
-      Position lv3 = this.config.positionFunction().getDispensePosition(pointer, lv2);
+   public ItemStack dispenseImpl(DispenserContext context, ItemStack stack) {
+      ServerWorld lv = context.world();
+      Direction lv2 = context.state().getOrThrow(DispenserBlock.FACING);
+      Position lv3 = this.config.positionFunction().getDispensePosition(context, lv2);
       ProjectileEntity.spawn(
          this.projectile.createEntity(lv, lv3, stack, lv2),
          lv,
@@ -64,7 +63,7 @@
     * Mapping not found
     */
    @Override
-   protected void playSound(BlockPointer pointer) {
-      pointer.world().syncWorldEvent(this.config.overrideDispenseEvent().orElse(1002), pointer.pos(), 0);
+   protected void playSound(DispenserContext context) {
+      context.world().syncWorldEvent(this.config.overrideDispenseEvent().orElse(1002), context.pos(), 0);
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/dispenser/ShearsDispenserBehavior.java namedSrc/net/minecraft/block/dispenser/ShearsDispenserBehavior.java
--- namedTargetSrc/net/minecraft/block/dispenser/ShearsDispenserBehavior.java	2024-12-03 00:26:46.472126520 +0000
+++ namedSrc/net/minecraft/block/dispenser/ShearsDispenserBehavior.java	2024-12-03 00:25:38.263639051 +0000
@@ -11,7 +11,6 @@
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.util.math.BlockPointer;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Box;
 import net.minecraft.world.event.GameEvent;
@@ -20,15 +19,15 @@
  * @mapping {@literal hashed net/minecraft/unmapped/C_lrfsbejz}
  * @mapping {@literal named net/minecraft/block/dispenser/ShearsDispenserBehavior}
  */
-public class ShearsDispenserBehavior extends FallibleItemDispenserBehavior {
+public class ShearsDispenserBehavior extends FallibleDispenserBehavior {
    /**
     * Mapping not found
     */
    @Override
-   protected ItemStack dispenseSilently(BlockPointer pointer, ItemStack stack) {
-      ServerWorld lv = pointer.world();
+   protected ItemStack dispenseImpl(DispenserContext context, ItemStack stack) {
+      ServerWorld lv = context.world();
       if (!lv.isClient()) {
-         BlockPos lv2 = pointer.pos().offset(pointer.state().getOrThrow(DispenserBlock.FACING));
+         BlockPos lv2 = context.pos().offset(context.state().getOrThrow(DispenserBlock.FACING));
          this.setSuccess(tryShearBlock(lv, lv2) || tryShearEntity(lv, lv2, stack));
          if (this.isSuccess()) {
             stack.damageEquipment(1, lv, null, arg -> {
diff -bur namedTargetSrc/net/minecraft/block/DropperBlock.java namedSrc/net/minecraft/block/DropperBlock.java
--- namedTargetSrc/net/minecraft/block/DropperBlock.java	2024-12-03 00:26:46.340125551 +0000
+++ namedSrc/net/minecraft/block/DropperBlock.java	2024-12-03 00:25:38.095637809 +0000
@@ -2,9 +2,10 @@
 
 import com.mojang.logging.LogUtils;
 import com.mojang.serialization.MapCodec;
+import net.minecraft.block.dispenser.DefaultDispenserBehavior;
 import net.minecraft.block.dispenser.DispenserBehavior;
 import net.minecraft.block.dispenser.DispenserBlock;
-import net.minecraft.block.dispenser.ItemDispenserBehavior;
+import net.minecraft.block.dispenser.DispenserContext;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.block.entity.BlockEntityType;
 import net.minecraft.block.entity.DispenserBlockEntity;
@@ -13,7 +14,6 @@
 import net.minecraft.inventory.Inventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.server.world.ServerWorld;
-import net.minecraft.util.math.BlockPointer;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.world.World;
@@ -39,7 +39,7 @@
     * @mapping {@literal hashed f_qszvhweg Lnet/minecraft/unmapped/C_cplhxlhk;f_qszvhweg:Lnet/minecraft/unmapped/C_ooeeaffg;}
     * @mapping {@literal named BEHAVIOR Lnet/minecraft/block/DropperBlock;BEHAVIOR:Lnet/minecraft/block/dispenser/DispenserBehavior;}
     */
-   private static final DispenserBehavior BEHAVIOR = new ItemDispenserBehavior();
+   private static final DispenserBehavior BEHAVIOR = new DefaultDispenserBehavior();
 
    /**
     * Mapping not found
@@ -61,7 +61,7 @@
     * Mapping not found
     */
    @Override
-   protected DispenserBehavior getBehaviorForItem(World world, ItemStack stack) {
+   protected DispenserBehavior getBehavior(World world, ItemStack stack) {
       return BEHAVIOR;
    }
 
@@ -82,7 +82,7 @@
       if (lv == null) {
          LOGGER.warn("Ignoring dispensing attempt for Dropper without matching block entity at {}", pos);
       } else {
-         BlockPointer lv2 = new BlockPointer(world, pos, state, lv);
+         DispenserContext lv2 = new DispenserContext(world, pos, state, lv);
          int i = lv.chooseNonEmptySlot(world.random);
          if (i < 0) {
             world.syncWorldEvent(WorldEvents.DISPENSER_FAILS, pos, 0);
diff -bur namedTargetSrc/net/minecraft/block/enums/VaultState.java namedSrc/net/minecraft/block/enums/VaultState.java
--- namedTargetSrc/net/minecraft/block/enums/VaultState.java	2024-12-03 00:26:46.448126344 +0000
+++ namedSrc/net/minecraft/block/enums/VaultState.java	2024-12-03 00:25:38.231638814 +0000
@@ -1,6 +1,6 @@
 package net.minecraft.block.enums;
 
-import net.minecraft.block.dispenser.ItemDispenserBehavior;
+import net.minecraft.block.dispenser.DefaultDispenserBehavior;
 import net.minecraft.block.entity.vault.VaultBlockEntity;
 import net.minecraft.block.entity.vault.VaultConfig;
 import net.minecraft.block.entity.vault.VaultServerData;
@@ -211,7 +211,7 @@
     * @mapping {@literal named ejectItem Lnet/minecraft/block/enums/VaultState;ejectItem(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/item/ItemStack;F)V}
     */
    private void ejectItem(ServerWorld world, BlockPos pos, ItemStack stack, float ejectionProgress) {
-      ItemDispenserBehavior.spawnItem(world, stack, 2, Direction.UP, Vec3d.ofBottomCenter(pos).relative(Direction.UP, 1.2));
+      DefaultDispenserBehavior.spawnItem(world, stack, 2, Direction.UP, Vec3d.ofBottomCenter(pos).relative(Direction.UP, 1.2));
       world.syncWorldEvent(WorldEvents.VAULT_EJECTS_ITEM, pos, 0);
       world.playSound(null, pos, SoundEvents.BLOCK_VAULT_EJECT_ITEM, SoundCategory.BLOCKS, 1.0F, 0.8F + 0.4F * ejectionProgress);
    }
diff -bur namedTargetSrc/net/minecraft/Bootstrap.java namedSrc/net/minecraft/Bootstrap.java
--- namedTargetSrc/net/minecraft/Bootstrap.java	2024-12-03 00:26:46.396125962 +0000
+++ namedSrc/net/minecraft/Bootstrap.java	2024-12-03 00:25:38.159638282 +0000
@@ -46,9 +46,9 @@
    public static final PrintStream SYSOUT = System.out;
    /**
     * @mapping {@literal hashed f_jltdqkzo Lnet/minecraft/unmapped/C_ntskruzf;f_jltdqkzo:Z}
-    * @mapping {@literal named initialized Lnet/minecraft/Bootstrap;initialized:Z}
+    * @mapping {@literal named bootstrapped Lnet/minecraft/Bootstrap;bootstrapped:Z}
     */
-   private static volatile boolean initialized;
+   private static volatile boolean bootstrapped;
    /**
     * @mapping {@literal hashed f_ngridedi Lnet/minecraft/unmapped/C_ntskruzf;f_ngridedi:Lorg/slf4j/Logger;}
     * @mapping {@literal named LOGGER Lnet/minecraft/Bootstrap;LOGGER:Lorg/slf4j/Logger;}
@@ -62,11 +62,11 @@
 
    /**
     * @mapping {@literal hashed m_prdfbylm Lnet/minecraft/unmapped/C_ntskruzf;m_prdfbylm()V}
-    * @mapping {@literal named initialize Lnet/minecraft/Bootstrap;initialize()V}
+    * @mapping {@literal named bootstrap Lnet/minecraft/Bootstrap;bootstrap()V}
     */
-   public static void initialize() {
-      if (!initialized) {
-         initialized = true;
+   public static void bootstrap() {
+      if (!bootstrapped) {
+         bootstrapped = true;
          Instant instant = Instant.now();
          if (Registries.ROOT.getIds().isEmpty()) {
             throw new IllegalStateException("Unable to load registries");
@@ -76,9 +76,9 @@
             if (EntityType.getId(EntityType.PLAYER) == null) {
                throw new IllegalStateException("Failed loading EntityTypes");
             } else {
-               EntitySelectorOptions.register();
-               DispenserBehavior.registerDefaults();
-               CauldronBehavior.registerBehavior();
+               EntitySelectorOptions.bootstrap();
+               DispenserBehavior.bootstrap();
+               CauldronBehavior.bootstrap();
                Registries.bootstrap();
                ItemGroups.bootstrap();
                setOutputStreams();
@@ -143,7 +143,7 @@
     * @mapping {@literal named ensureBootstrapped Lnet/minecraft/Bootstrap;ensureBootstrapped(Ljava/util/function/Supplier;)V}
     */
    public static void ensureBootstrapped(Supplier<String> callerGetter) {
-      if (!initialized) {
+      if (!bootstrapped) {
          throw createNotBootstrappedException(callerGetter);
       }
    }
diff -bur namedTargetSrc/net/minecraft/client/data/Main.java namedSrc/net/minecraft/client/data/Main.java
--- namedTargetSrc/net/minecraft/client/data/Main.java	2024-12-03 00:26:46.556127137 +0000
+++ namedSrc/net/minecraft/client/data/Main.java	2024-12-03 00:25:38.351639701 +0000
@@ -43,7 +43,7 @@
          Path path = Paths.get(optionSpec4.value(optionSet));
          boolean bl = optionSet.has(optionSpec3);
          boolean bl2 = bl || optionSet.has(optionSpec2);
-         Bootstrap.initialize();
+         Bootstrap.bootstrap();
          C_mxjvbxye.m_xbkpoihl();
          DataGenerator lv = new DataGenerator(path, SharedConstants.getGameVersion(), true);
          m_qauxwzrc(lv, bl2);
diff -bur namedTargetSrc/net/minecraft/client/main/Main.java namedSrc/net/minecraft/client/main/Main.java
--- namedTargetSrc/net/minecraft/client/main/Main.java	2024-12-03 00:26:46.456126403 +0000
+++ namedSrc/net/minecraft/client/main/Main.java	2024-12-03 00:25:38.243638903 +0000
@@ -131,7 +131,7 @@
          CrashReport.initCrashReport();
          logger = LogUtils.getLogger();
          string2 = "Bootstrap";
-         Bootstrap.initialize();
+         Bootstrap.bootstrap();
          C_mxjvbxye.m_xbkpoihl();
          GameLoadTimesEvent.INSTANCE.setBootstrapTime(Bootstrap.bootstrapTime.get());
          Bootstrap.logMissing();
diff -bur namedTargetSrc/net/minecraft/client/network/ClientPlayerInteractionManager.java namedSrc/net/minecraft/client/network/ClientPlayerInteractionManager.java
--- namedTargetSrc/net/minecraft/client/network/ClientPlayerInteractionManager.java	2024-12-03 00:26:46.360125697 +0000
+++ namedSrc/net/minecraft/client/network/ClientPlayerInteractionManager.java	2024-12-03 00:25:38.119637987 +0000
@@ -388,7 +388,7 @@
       } else {
          MutableObject<ActionResult> mutableObject = new MutableObject<>();
          this.sendActionPacket(this.client.world, actionIndex -> {
-            mutableObject.setValue(this.doInteractBlock(player, hand, hitResult));
+            mutableObject.setValue(this.interactBlockImpl(player, hand, hitResult));
             return new PlayerInteractionWithBlockC2SPacket(hand, hitResult, actionIndex);
          });
          return mutableObject.getValue();
@@ -397,9 +397,9 @@
 
    /**
     * @mapping {@literal hashed m_wiqrsdhj Lnet/minecraft/unmapped/C_uxbydbcj;m_wiqrsdhj(Lnet/minecraft/unmapped/C_jlopmfei;Lnet/minecraft/unmapped/C_laxmzoqs;Lnet/minecraft/unmapped/C_jdakttms;)Lnet/minecraft/unmapped/C_ozuepbyj;}
-    * @mapping {@literal named doInteractBlock Lnet/minecraft/client/network/ClientPlayerInteractionManager;doInteractBlock(Lnet/minecraft/client/network/ClientPlayerEntity;Lnet/minecraft/util/Hand;Lnet/minecraft/util/hit/BlockHitResult;)Lnet/minecraft/util/ActionResult;}
+    * @mapping {@literal named interactBlockImpl Lnet/minecraft/client/network/ClientPlayerInteractionManager;interactBlockImpl(Lnet/minecraft/client/network/ClientPlayerEntity;Lnet/minecraft/util/Hand;Lnet/minecraft/util/hit/BlockHitResult;)Lnet/minecraft/util/ActionResult;}
     */
-   private ActionResult doInteractBlock(ClientPlayerEntity player, Hand hand, BlockHitResult hitResult) {
+   private ActionResult interactBlockImpl(ClientPlayerEntity player, Hand hand, BlockHitResult hitResult) {
       BlockPos lv = hitResult.getBlockPos();
       ItemStack lv2 = player.getStackInHand(hand);
       if (this.gameMode == GameMode.SPECTATOR) {
diff -bur namedTargetSrc/net/minecraft/client/render/entity/BipedEntityRenderer.java namedSrc/net/minecraft/client/render/entity/BipedEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/BipedEntityRenderer.java	2024-12-03 00:26:46.528126932 +0000
+++ namedSrc/net/minecraft/client/render/entity/BipedEntityRenderer.java	2024-12-03 00:25:38.327639523 +0000
@@ -92,7 +92,7 @@
       arg2.f_sdxrnzyp = entity.getHandSwingProgress(f);
       arg2.f_tzfpeidw = entity.getLeaningPitch(f);
       arg2.f_ngqocagn = m_wnojferc(entity);
-      arg2.f_hdimbuaf = entity.getActiveHand();
+      arg2.hand = entity.getActiveHand();
       arg2.f_pepbakja = (float)CrossbowItem.getLoadingTime(entity.getActiveItem(), entity);
       arg2.f_jamiehth = entity.getItemUseTime();
       arg2.f_vdjfqfsy = entity.isUsingItem();
diff -bur namedTargetSrc/net/minecraft/client/render/entity/feature/PlayerHeldItemFeatureRenderer.java namedSrc/net/minecraft/client/render/entity/feature/PlayerHeldItemFeatureRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/feature/PlayerHeldItemFeatureRenderer.java	2024-12-03 00:26:46.496126696 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/PlayerHeldItemFeatureRenderer.java	2024-12-03 00:25:38.287639228 +0000
@@ -47,7 +47,7 @@
    protected void renderItem(S arg, C_hvackyip arg2, Arm arg3, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int i) {
       if (!arg2.m_sairbzkx()) {
          Hand lv = arg3 == arg.f_ebgtydpc ? Hand.MAIN_HAND : Hand.OFF_HAND;
-         if (arg.f_vdjfqfsy && arg.f_hdimbuaf == lv && arg.f_sdxrnzyp < 1.0E-5F && !arg.f_sizjtzzh.m_sairbzkx()) {
+         if (arg.f_vdjfqfsy && arg.hand == lv && arg.f_sdxrnzyp < 1.0E-5F && !arg.f_sizjtzzh.m_sairbzkx()) {
             this.m_lyiljvdc(arg.f_sizjtzzh, arg3, matrices, vertexConsumers, i);
          } else {
             super.renderItem(arg, arg2, arg3, matrices, vertexConsumers, i);
diff -bur namedTargetSrc/net/minecraft/client/render/entity/model/BipedEntityModel.java namedSrc/net/minecraft/client/render/entity/model/BipedEntityModel.java
--- namedTargetSrc/net/minecraft/client/render/entity/model/BipedEntityModel.java	2024-12-03 00:26:46.408126050 +0000
+++ namedSrc/net/minecraft/client/render/entity/model/BipedEntityModel.java	2024-12-03 00:25:38.171638371 +0000
@@ -258,7 +258,7 @@
 
       boolean bl2 = arg.f_ebgtydpc == Arm.RIGHT;
       if (arg.f_vdjfqfsy) {
-         boolean bl3 = arg.f_hdimbuaf == Hand.MAIN_HAND;
+         boolean bl3 = arg.hand == Hand.MAIN_HAND;
          if (bl3 == bl2) {
             this.positionRightArm(arg, lv2);
          } else {

@github-actions
Copy link

Choose a reason for hiding this comment

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

View the diff here (2/2): 
diff -bur namedTargetSrc/net/minecraft/client/render/entity/PlayerEntityRenderer.java namedSrc/net/minecraft/client/render/entity/PlayerEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/PlayerEntityRenderer.java	2024-12-03 00:26:46.572127255 +0000
+++ namedSrc/net/minecraft/client/render/entity/PlayerEntityRenderer.java	2024-12-03 00:25:38.375639878 +0000
@@ -114,11 +114,11 @@
     * @mapping {@literal hashed m_yqkrpoah Lnet/minecraft/unmapped/C_glzopqgl;m_yqkrpoah(Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_laxmzoqs;)Lnet/minecraft/unmapped/C_kbsahqug$C_vzwxknxx;}
     * @mapping {@literal named m_yqkrpoah Lnet/minecraft/client/render/entity/PlayerEntityRenderer;m_yqkrpoah(Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/item/ItemStack;Lnet/minecraft/util/Hand;)Lnet/minecraft/client/render/entity/model/BipedEntityModel$ArmPose;}
     */
-   private static BipedEntityModel.ArmPose m_yqkrpoah(PlayerEntity player, ItemStack stack, Hand arg3) {
+   private static BipedEntityModel.ArmPose m_yqkrpoah(PlayerEntity player, ItemStack stack, Hand hand) {
       if (stack.isEmpty()) {
          return BipedEntityModel.ArmPose.EMPTY;
       } else {
-         if (player.getActiveHand() == arg3 && player.getItemUseTimeLeft() > 0) {
+         if (player.getActiveHand() == hand && player.getItemUseTimeLeft() > 0) {
             UseAnimation lv = stack.getUseAction();
             if (lv == UseAnimation.BLOCK) {
                return BipedEntityModel.ArmPose.BLOCK;
@@ -239,7 +239,7 @@
       arg2.f_nttzjmbo = arg.getGameProfile().getName();
       arg2.f_sizjtzzh.m_aiejqtpc();
       if (arg2.f_vdjfqfsy) {
-         ItemStack lv5 = arg.getStackInHand(arg2.f_hdimbuaf);
+         ItemStack lv5 = arg.getStackInHand(arg2.hand);
          if (lv5.isOf(Items.SPYGLASS)) {
             this.f_sivmkaii.m_fjswdkhe(arg2.f_sizjtzzh, lv5, ModelTransformationMode.HEAD, false, arg);
          }
diff -bur namedTargetSrc/net/minecraft/client/render/GameRenderer.java namedSrc/net/minecraft/client/render/GameRenderer.java
--- namedTargetSrc/net/minecraft/client/render/GameRenderer.java	2024-12-03 00:26:46.404126021 +0000
+++ namedSrc/net/minecraft/client/render/GameRenderer.java	2024-12-03 00:25:38.167638341 +0000
@@ -492,7 +492,7 @@
       if (!lv.withinRange(pos, range)) {
          Vec3d lv2 = hit.getPos();
          Direction lv3 = Direction.getFacing(lv2.x - pos.x, lv2.y - pos.y, lv2.z - pos.z);
-         return BlockHitResult.createMissed(lv2, lv3, BlockPos.fromPosition(lv2));
+         return BlockHitResult.missOf(lv2, lv3, BlockPos.fromPosition(lv2));
       } else {
          return hit;
       }
diff -bur namedTargetSrc/net/minecraft/command/EntitySelectorOptions.java namedSrc/net/minecraft/command/EntitySelectorOptions.java
--- namedTargetSrc/net/minecraft/command/EntitySelectorOptions.java	2024-12-03 00:26:46.576127285 +0000
+++ namedSrc/net/minecraft/command/EntitySelectorOptions.java	2024-12-03 00:25:38.383639938 +0000
@@ -123,9 +123,9 @@
 
    /**
     * @mapping {@literal hashed m_otjwzrqy Lnet/minecraft/unmapped/C_pgmsoxco;m_otjwzrqy()V}
-    * @mapping {@literal named register Lnet/minecraft/command/EntitySelectorOptions;register()V}
+    * @mapping {@literal named bootstrap Lnet/minecraft/command/EntitySelectorOptions;bootstrap()V}
     */
-   public static void register() {
+   public static void bootstrap() {
       if (OPTIONS.isEmpty()) {
          putOption("name", reader -> {
             int i = reader.getReader().getCursor();
diff -bur namedTargetSrc/net/minecraft/data/DataGenerator.java namedSrc/net/minecraft/data/DataGenerator.java
--- namedTargetSrc/net/minecraft/data/DataGenerator.java	2024-12-03 00:26:46.572127255 +0000
+++ namedSrc/net/minecraft/data/DataGenerator.java	2024-12-03 00:25:38.375639878 +0000
@@ -110,7 +110,7 @@
     * Mapping not found
     */
    static {
-      Bootstrap.initialize();
+      Bootstrap.bootstrap();
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/item/FireworkRocketItem.java namedSrc/net/minecraft/item/FireworkRocketItem.java
--- namedTargetSrc/net/minecraft/item/FireworkRocketItem.java	2024-12-03 00:26:46.512126814 +0000
+++ namedSrc/net/minecraft/item/FireworkRocketItem.java	2024-12-03 00:25:38.307639376 +0000
@@ -1,6 +1,7 @@
 package net.minecraft.item;
 
 import java.util.List;
+import net.minecraft.block.dispenser.DispenserContext;
 import net.minecraft.client.item.TooltipConfig;
 import net.minecraft.component.DataComponentTypes;
 import net.minecraft.component.type.FireworksComponent;
@@ -12,7 +13,6 @@
 import net.minecraft.text.Text;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
-import net.minecraft.util.math.BlockPointer;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.Position;
 import net.minecraft.util.math.Vec3d;
@@ -123,9 +123,9 @@
 
    /**
     * @mapping {@literal hashed m_tsyqtajk Lnet/minecraft/unmapped/C_gulyzcrd;m_tsyqtajk(Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_xpuuihxf;)Lnet/minecraft/unmapped/C_vgpupfxx;}
-    * @mapping {@literal named getDispensationPos Lnet/minecraft/item/FireworkRocketItem;getDispensationPos(Lnet/minecraft/util/math/BlockPointer;Lnet/minecraft/util/math/Direction;)Lnet/minecraft/util/math/Vec3d;}
+    * @mapping {@literal named getDispensationPos Lnet/minecraft/item/FireworkRocketItem;getDispensationPos(Lnet/minecraft/block/dispenser/DispenserContext;Lnet/minecraft/util/math/Direction;)Lnet/minecraft/util/math/Vec3d;}
     */
-   private static Vec3d getDispensationPos(BlockPointer pointer, Direction direction) {
+   private static Vec3d getDispensationPos(DispenserContext pointer, Direction direction) {
       return pointer.center()
          .add(
             (double)direction.getOffsetX() * 0.5000099999997474,
diff -bur namedTargetSrc/net/minecraft/item/ItemPlacementContext.java namedSrc/net/minecraft/item/ItemPlacementContext.java
--- namedTargetSrc/net/minecraft/item/ItemPlacementContext.java	2024-12-03 00:26:46.528126932 +0000
+++ namedSrc/net/minecraft/item/ItemPlacementContext.java	2024-12-03 00:25:38.323639494 +0000
@@ -45,8 +45,8 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_aiootljq;<init>(Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_laxmzoqs;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_jdakttms;)V}
     * @mapping {@literal named <init> Lnet/minecraft/item/ItemPlacementContext;<init>(Lnet/minecraft/world/World;Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/util/Hand;Lnet/minecraft/item/ItemStack;Lnet/minecraft/util/hit/BlockHitResult;)V}
     */
-   protected ItemPlacementContext(World world, @Nullable PlayerEntity player, Hand arg3, ItemStack stack, BlockHitResult result) {
-      super(world, player, arg3, stack, result);
+   protected ItemPlacementContext(World world, @Nullable PlayerEntity player, Hand hand, ItemStack stack, BlockHitResult result) {
+      super(world, player, hand, stack, result);
       this.placementPos = result.getBlockPos().offset(result.getSide());
       this.canReplaceExisting = world.getBlockState(result.getBlockPos()).canReplace(this);
    }
diff -bur namedTargetSrc/net/minecraft/item/ProjectileItem.java namedSrc/net/minecraft/item/ProjectileItem.java
--- namedTargetSrc/net/minecraft/item/ProjectileItem.java	2024-12-03 00:26:46.508126785 +0000
+++ namedSrc/net/minecraft/item/ProjectileItem.java	2024-12-03 00:25:38.303639346 +0000
@@ -2,8 +2,8 @@
 
 import java.util.OptionalInt;
 import net.minecraft.block.dispenser.DispenserBlock;
+import net.minecraft.block.dispenser.DispenserContext;
 import net.minecraft.entity.projectile.ProjectileEntity;
-import net.minecraft.util.math.BlockPointer;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.Position;
 import net.minecraft.util.math.Vec3d;
@@ -137,8 +137,8 @@
    public interface PositionFunction {
       /**
        * @mapping {@literal hashed getDispensePosition Lnet/minecraft/unmapped/C_dokwmwgh$C_lbgeddve;getDispensePosition(Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_xpuuihxf;)Lnet/minecraft/unmapped/C_ogbhoqwb;}
-       * @mapping {@literal named getDispensePosition Lnet/minecraft/item/ProjectileItem$PositionFunction;getDispensePosition(Lnet/minecraft/util/math/BlockPointer;Lnet/minecraft/util/math/Direction;)Lnet/minecraft/util/math/Position;}
+       * @mapping {@literal named getDispensePosition Lnet/minecraft/item/ProjectileItem$PositionFunction;getDispensePosition(Lnet/minecraft/block/dispenser/DispenserContext;Lnet/minecraft/util/math/Direction;)Lnet/minecraft/util/math/Position;}
        */
-      Position getDispensePosition(BlockPointer arg, Direction direction);
+      Position getDispensePosition(DispenserContext arg, Direction direction);
    }
 }
diff -bur namedTargetSrc/net/minecraft/network/packet/c2s/play/PlayerInteractionWithEntityC2SPacket.java namedSrc/net/minecraft/network/packet/c2s/play/PlayerInteractionWithEntityC2SPacket.java
--- namedTargetSrc/net/minecraft/network/packet/c2s/play/PlayerInteractionWithEntityC2SPacket.java	2024-12-03 00:26:46.488126638 +0000
+++ namedSrc/net/minecraft/network/packet/c2s/play/PlayerInteractionWithEntityC2SPacket.java	2024-12-03 00:25:38.279639169 +0000
@@ -175,13 +175,13 @@
        * @mapping {@literal hashed m_hhhtebqy Lnet/minecraft/unmapped/C_ckudzhjz$C_hnsvyeyq;m_hhhtebqy(Lnet/minecraft/unmapped/C_laxmzoqs;)V}
        * @mapping {@literal named interact Lnet/minecraft/network/packet/c2s/play/PlayerInteractionWithEntityC2SPacket$Handler;interact(Lnet/minecraft/util/Hand;)V}
        */
-      void interact(Hand arg);
+      void interact(Hand hand);
 
       /**
        * @mapping {@literal hashed m_tbjrkofl Lnet/minecraft/unmapped/C_ckudzhjz$C_hnsvyeyq;m_tbjrkofl(Lnet/minecraft/unmapped/C_laxmzoqs;Lnet/minecraft/unmapped/C_vgpupfxx;)V}
        * @mapping {@literal named interactAt Lnet/minecraft/network/packet/c2s/play/PlayerInteractionWithEntityC2SPacket$Handler;interactAt(Lnet/minecraft/util/Hand;Lnet/minecraft/util/math/Vec3d;)V}
        */
-      void interactAt(Hand arg, Vec3d arg2);
+      void interactAt(Hand hand, Vec3d arg2);
 
       /**
        * @mapping {@literal hashed m_haaxwwid Lnet/minecraft/unmapped/C_ckudzhjz$C_hnsvyeyq;m_haaxwwid()V}
diff -bur namedTargetSrc/net/minecraft/server/Main.java namedSrc/net/minecraft/server/Main.java
--- namedTargetSrc/net/minecraft/server/Main.java	2024-12-03 00:26:46.556127137 +0000
+++ namedSrc/net/minecraft/server/Main.java	2024-12-03 00:25:38.355639731 +0000
@@ -117,7 +117,7 @@
             JvmProfiler.INSTANCE.start(RecordingSide.SERVER);
          }
 
-         Bootstrap.initialize();
+         Bootstrap.bootstrap();
          Bootstrap.logMissing();
          Util.startTimerHack();
          Path path2 = Paths.get("server.properties");
diff -bur namedTargetSrc/net/minecraft/server/network/ServerPlayNetworkHandler.java namedSrc/net/minecraft/server/network/ServerPlayNetworkHandler.java
--- namedTargetSrc/net/minecraft/server/network/ServerPlayNetworkHandler.java	2024-12-03 00:26:46.480126579 +0000
+++ namedSrc/net/minecraft/server/network/ServerPlayNetworkHandler.java	2024-12-03 00:25:38.271639110 +0000
@@ -2051,17 +2051,18 @@
                packet.handle(
                   new PlayerInteractionWithEntityC2SPacket.Handler() {
                      /**
-                      * Mapping not found
+                      * @mapping {@literal hashed m_nfofyziw Lnet/minecraft/unmapped/C_hwbabymg$C_wsexhymd;m_nfofyziw(Lnet/minecraft/unmapped/C_laxmzoqs;Lnet/minecraft/unmapped/C_hwbabymg$C_svuahxut;)V}
+                      * @mapping {@literal named m_nfofyziw Lnet/minecraft/server/network/ServerPlayNetworkHandler$C_wsexhymd;m_nfofyziw(Lnet/minecraft/util/Hand;Lnet/minecraft/server/network/ServerPlayNetworkHandler$Interaction;)V}
                       */
-                     private void m_nfofyziw(Hand arg, ServerPlayNetworkHandler.Interaction arg2) {
-                        ItemStack lv = ServerPlayNetworkHandler.this.player.getStackInHand(arg);
+                     private void m_nfofyziw(Hand hand, ServerPlayNetworkHandler.Interaction arg2) {
+                        ItemStack lv = ServerPlayNetworkHandler.this.player.getStackInHand(hand);
                         if (lv.isEnabled(lv.getEnabledFlags())) {
                            ItemStack lv2 = lv.copy();
-                           if (arg2.run(ServerPlayNetworkHandler.this.player, lv2, arg) instanceof ActionResult.Success lv4) {
+                           if (arg2.run(ServerPlayNetworkHandler.this.player, lv2, hand) instanceof ActionResult.Success lv4) {
                               ItemStack lv5 = lv4.wasItemInteraction() ? lv2 : ItemStack.EMPTY;
                               Criteria.PLAYER_INTERACTED_WITH_ENTITY.trigger(ServerPlayNetworkHandler.this.player, lv5, lv2);
                               if (lv4.swingSource() == ActionResult.Source.SERVER) {
-                                 ServerPlayNetworkHandler.this.player.swingHand(arg, true);
+                                 ServerPlayNetworkHandler.this.player.swingHand(hand, true);
                               }
                            }
                         }
@@ -2071,16 +2072,16 @@
                       * Mapping not found
                       */
                      @Override
-                     public void interact(Hand arg) {
-                        this.m_nfofyziw(arg, PlayerEntity::interact);
+                     public void interact(Hand hand) {
+                        this.m_nfofyziw(hand, PlayerEntity::interact);
                      }
 
                      /**
                       * Mapping not found
                       */
                      @Override
-                     public void interactAt(Hand arg, Vec3d arg2) {
-                        this.m_nfofyziw(arg, (player, entity, arg4) -> entity.interactAt(player, arg2, arg4));
+                     public void interactAt(Hand hand, Vec3d arg2) {
+                        this.m_nfofyziw(hand, (player, entity, handx) -> entity.interactAt(player, arg2, handx));
                      }
 
                      /**
@@ -2475,6 +2476,6 @@
        * @mapping {@literal hashed run Lnet/minecraft/unmapped/C_hwbabymg$C_svuahxut;run(Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_laxmzoqs;)Lnet/minecraft/unmapped/C_ozuepbyj;}
        * @mapping {@literal named run Lnet/minecraft/server/network/ServerPlayNetworkHandler$Interaction;run(Lnet/minecraft/server/network/ServerPlayerEntity;Lnet/minecraft/entity/Entity;Lnet/minecraft/util/Hand;)Lnet/minecraft/util/ActionResult;}
        */
-      ActionResult run(ServerPlayerEntity player, Entity entity, Hand arg3);
+      ActionResult run(ServerPlayerEntity player, Entity entity, Hand hand);
    }
 }
diff -bur namedTargetSrc/net/minecraft/unmapped/C_btosngnd.java namedSrc/net/minecraft/unmapped/C_btosngnd.java
--- namedTargetSrc/net/minecraft/unmapped/C_btosngnd.java	2024-12-03 00:26:46.432126226 +0000
+++ namedSrc/net/minecraft/unmapped/C_btosngnd.java	2024-12-03 00:25:38.207638637 +0000
@@ -7,7 +7,8 @@
 import net.minecraft.util.Hand;
 
 /**
- * Mapping not found
+ * @mapping {@literal hashed net/minecraft/unmapped/C_btosngnd}
+ * @mapping {@literal named net/minecraft/unmapped/C_btosngnd}
  */
 @Environment(EnvType.CLIENT)
 public class C_btosngnd extends C_pxfrsrjs {
@@ -36,9 +37,10 @@
     */
    public Arm f_ngqocagn = Arm.RIGHT;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_hdimbuaf Lnet/minecraft/unmapped/C_btosngnd;f_hdimbuaf:Lnet/minecraft/unmapped/C_laxmzoqs;}
+    * @mapping {@literal named hand Lnet/minecraft/unmapped/C_btosngnd;hand:Lnet/minecraft/util/Hand;}
     */
-   public Hand f_hdimbuaf = Hand.MAIN_HAND;
+   public Hand hand = Hand.MAIN_HAND;
    /**
     * Mapping not found
     */
Only in namedTargetSrc/net/minecraft/unmapped: C_grwaorwt.java
diff -bur namedTargetSrc/net/minecraft/unmapped/C_mljrmdmv.java namedSrc/net/minecraft/unmapped/C_mljrmdmv.java
--- namedTargetSrc/net/minecraft/unmapped/C_mljrmdmv.java	2024-12-03 00:26:46.440126285 +0000
+++ namedSrc/net/minecraft/unmapped/C_mljrmdmv.java	2024-12-03 00:25:38.215638696 +0000
@@ -25,7 +25,7 @@
     */
    public static void m_euqttjnh(String[] strings) throws IOException {
       SharedConstants.setGameVersion(MinecraftVersion.GAME_VERSION);
-      Bootstrap.initialize();
+      Bootstrap.bootstrap();
 
       for (String string : strings) {
          m_ctsjfvtz(string);
Only in namedTargetSrc/net/minecraft/unmapped: C_ueplrtkn.java
diff -bur namedTargetSrc/net/minecraft/util/hit/BlockHitResult.java namedSrc/net/minecraft/util/hit/BlockHitResult.java
--- namedTargetSrc/net/minecraft/util/hit/BlockHitResult.java	2024-12-03 00:26:46.476126550 +0000
+++ namedSrc/net/minecraft/util/hit/BlockHitResult.java	2024-12-03 00:25:38.267639080 +0000
@@ -37,9 +37,9 @@
 
    /**
     * @mapping {@literal hashed m_bvfnqjyq Lnet/minecraft/unmapped/C_jdakttms;m_bvfnqjyq(Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_xpuuihxf;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_jdakttms;}
-    * @mapping {@literal named createMissed Lnet/minecraft/util/hit/BlockHitResult;createMissed(Lnet/minecraft/util/math/Vec3d;Lnet/minecraft/util/math/Direction;Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/util/hit/BlockHitResult;}
+    * @mapping {@literal named missOf Lnet/minecraft/util/hit/BlockHitResult;missOf(Lnet/minecraft/util/math/Vec3d;Lnet/minecraft/util/math/Direction;Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/util/hit/BlockHitResult;}
     */
-   public static BlockHitResult createMissed(Vec3d pos, Direction side, BlockPos blockPos) {
+   public static BlockHitResult missOf(Vec3d pos, Direction side, BlockPos blockPos) {
       return new BlockHitResult(true, pos, side, blockPos, false, false);
    }
 
@@ -55,18 +55,18 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_jdakttms;<init>(Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_xpuuihxf;Lnet/minecraft/unmapped/C_hynzadkk;ZZ)V}
     * @mapping {@literal named <init> Lnet/minecraft/util/hit/BlockHitResult;<init>(Lnet/minecraft/util/math/Vec3d;Lnet/minecraft/util/math/Direction;Lnet/minecraft/util/math/BlockPos;ZZ)V}
     */
-   public BlockHitResult(Vec3d pos, Direction direction, BlockPos blockPos, boolean insideBlock, boolean hitWorldBorder) {
-      this(false, pos, direction, blockPos, insideBlock, hitWorldBorder);
+   public BlockHitResult(Vec3d pos, Direction side, BlockPos blockPos, boolean insideBlock, boolean hitWorldBorder) {
+      this(false, pos, side, blockPos, insideBlock, hitWorldBorder);
    }
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_jdakttms;<init>(ZLnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_xpuuihxf;Lnet/minecraft/unmapped/C_hynzadkk;ZZ)V}
     * @mapping {@literal named <init> Lnet/minecraft/util/hit/BlockHitResult;<init>(ZLnet/minecraft/util/math/Vec3d;Lnet/minecraft/util/math/Direction;Lnet/minecraft/util/math/BlockPos;ZZ)V}
     */
-   private BlockHitResult(boolean missed, Vec3d pos, Direction direction, BlockPos blockPos, boolean insideBlock, boolean hitWorldBorder) {
+   private BlockHitResult(boolean missed, Vec3d pos, Direction side, BlockPos blockPos, boolean insideBlock, boolean hitWorldBorder) {
       super(pos);
       this.missed = missed;
-      this.side = direction;
+      this.side = side;
       this.blockPos = blockPos;
       this.insideBlock = insideBlock;
       this.hitWorldBorder = hitWorldBorder;
@@ -89,9 +89,10 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_rzuzqmeh Lnet/minecraft/unmapped/C_jdakttms;m_rzuzqmeh()Lnet/minecraft/unmapped/C_jdakttms;}
+    * @mapping {@literal named withHitWorldBorder Lnet/minecraft/util/hit/BlockHitResult;withHitWorldBorder()Lnet/minecraft/util/hit/BlockHitResult;}
     */
-   public BlockHitResult m_rzuzqmeh() {
+   public BlockHitResult withHitWorldBorder() {
       return new BlockHitResult(this.missed, this.pos, this.side, this.blockPos, this.insideBlock, true);
    }
 
Only in namedTargetSrc/net/minecraft/util/math: BlockPointer.java
diff -bur namedTargetSrc/net/minecraft/world/BlockView.java namedSrc/net/minecraft/world/BlockView.java
--- namedTargetSrc/net/minecraft/world/BlockView.java	2024-12-03 00:26:46.336125521 +0000
+++ namedSrc/net/minecraft/world/BlockView.java	2024-12-03 00:25:38.087637750 +0000
@@ -28,9 +28,10 @@
  */
 public interface BlockView extends HeightLimitView {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_evjnqixv Lnet/minecraft/unmapped/C_peaveboq;f_evjnqixv:I}
+    * @mapping {@literal named MAX_COLLISION_COLLECTION_BLOCK_ITERATIONS Lnet/minecraft/world/BlockView;MAX_COLLISION_COLLECTION_BLOCK_ITERATIONS:I}
     */
-   int f_evjnqixv = 16;
+   int MAX_COLLISION_COLLECTION_BLOCK_ITERATIONS = 16;
 
    /**
     * @mapping {@literal hashed m_jakjlsko Lnet/minecraft/unmapped/C_peaveboq;m_jakjlsko(Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_kvegafmh;}
@@ -94,7 +95,7 @@
          },
          contextx -> {
             Vec3d lv = contextx.getStart().subtract(contextx.getEnd());
-            return BlockHitResult.createMissed(contextx.getEnd(), Direction.getFacing(lv.x, lv.y, lv.z), BlockPos.fromPosition(contextx.getEnd()));
+            return BlockHitResult.missOf(contextx.getEnd(), Direction.getFacing(lv.x, lv.y, lv.z), BlockPos.fromPosition(contextx.getEnd()));
          }
       );
    }
@@ -118,7 +119,7 @@
          return d <= e ? lv6 : lv8;
       }, contextx -> {
          Vec3d lv = contextx.getStart().subtract(contextx.getEnd());
-         return BlockHitResult.createMissed(contextx.getEnd(), Direction.getFacing(lv.x, lv.y, lv.z), BlockPos.fromPosition(contextx.getEnd()));
+         return BlockHitResult.missOf(contextx.getEnd(), Direction.getFacing(lv.x, lv.y, lv.z), BlockPos.fromPosition(contextx.getEnd()));
       });
    }
 
diff -bur namedTargetSrc/net/minecraft/world/TrialSpawnerLogic.java namedSrc/net/minecraft/world/TrialSpawnerLogic.java
--- namedTargetSrc/net/minecraft/world/TrialSpawnerLogic.java	2024-12-03 00:26:46.344125580 +0000
+++ namedSrc/net/minecraft/world/TrialSpawnerLogic.java	2024-12-03 00:25:38.099637839 +0000
@@ -11,7 +11,7 @@
 import net.minecraft.block.TrialSpawnerBlock;
 import net.minecraft.block.TrialSpawnerConfig;
 import net.minecraft.block.TrialSpawnerData;
-import net.minecraft.block.dispenser.ItemDispenserBehavior;
+import net.minecraft.block.dispenser.DefaultDispenserBehavior;
 import net.minecraft.block.enums.TrialSpawnerState;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityType;
@@ -413,7 +413,7 @@
       ObjectArrayList<ItemStack> objectArrayList = lv.generateLoot(lv2);
       if (!objectArrayList.isEmpty()) {
          for (ItemStack lv3 : objectArrayList) {
-            ItemDispenserBehavior.spawnItem(world, lv3, 2, Direction.UP, Vec3d.ofBottomCenter(pos).relative(Direction.UP, 1.2));
+            DefaultDispenserBehavior.spawnItem(world, lv3, 2, Direction.UP, Vec3d.ofBottomCenter(pos).relative(Direction.UP, 1.2));
          }
 
          world.syncWorldEvent(WorldEvents.TRIAL_SPAWNER_EJECTS_ITEM, pos, 0);
diff -bur namedTargetSrc/net/minecraft/world/WorldEvents.java namedSrc/net/minecraft/world/WorldEvents.java
--- namedTargetSrc/net/minecraft/world/WorldEvents.java	2024-12-03 00:26:46.556127137 +0000
+++ namedSrc/net/minecraft/world/WorldEvents.java	2024-12-03 00:25:38.355639731 +0000
@@ -24,8 +24,8 @@
     * A Dispenser dispenses an item.
     * <br>Plays the dispensing sound event.
     * <p>Called by {@link net.minecraft.block.dispenser.BoatDispenserBehavior#playSound(net.minecraft.util.math.BlockPointer) BoatDispenserBehavior#playSound},
-    * {@link net.minecraft.block.dispenser.FallibleItemDispenserBehavior#playSound(net.minecraft.util.math.BlockPointer) FallibleItemDispenserBehavior#playSound},
-    * and {@link net.minecraft.block.dispenser.ItemDispenserBehavior#playSound(net.minecraft.util.math.BlockPointer) ItemDispenserBehavior#playSound}
+    * {@link net.minecraft.block.dispenser.FallibleDispenserBehavior#playSound(net.minecraft.util.math.BlockPointer) FallibleDispenserBehavior#playSound},
+    * and {@link net.minecraft.block.dispenser.DefaultDispenserBehavior#playSound(net.minecraft.util.math.BlockPointer) DefaultDispenserBehavior#playSound}
     * 
     * @mapping {@literal hashed f_hcwfwxmp Lnet/minecraft/unmapped/C_kkbhcwdu;f_hcwfwxmp:I}
     * @mapping {@literal named DISPENSER_DISPENSES Lnet/minecraft/world/WorldEvents;DISPENSER_DISPENSES:I}
@@ -36,7 +36,7 @@
     * <br>Plays the dispenser fail sound event.
     * <p>Called by {@link net.minecraft.block.dispenser.DispenserBlock#dispense(net.minecraft.server.world.ServerWorld, net.minecraft.block.BlockState, net.minecraft.util.math.BlockPos) DispenserBlock#dispense},
     * {@link net.minecraft.block.DropperBlock#dispense(net.minecraft.server.world.ServerWorld, net.minecraft.block.BlockState, net.minecraft.util.math.BlockPos) DropperBlock#dispense},
-    * and {@link net.minecraft.block.dispenser.FallibleItemDispenserBehavior#playSound(net.minecraft.util.math.BlockPointer) FallibleItemDispenserBehavior#playSound}
+    * and {@link net.minecraft.block.dispenser.FallibleDispenserBehavior#playSound(net.minecraft.util.math.BlockPointer) FallibleDispenserBehavior#playSound}
     * 
     * @mapping {@literal hashed f_cmdwanmo Lnet/minecraft/unmapped/C_kkbhcwdu;f_cmdwanmo:I}
     * @mapping {@literal named DISPENSER_FAILS Lnet/minecraft/world/WorldEvents;DISPENSER_FAILS:I}
@@ -449,7 +449,7 @@
     * Bone meal is used.
     * <br>Plays the bone meal item used sound event and spawns happy villager particles.
     * <p>Called by {@link net.minecraft.item.BoneMealItem#useOnBlock(net.minecraft.item.ItemUsageContext) BoneMealItem#useOnBlock},
-    * an anonymus class in {@link net.minecraft.block.dispenser.DispenserBehavior#registerDefaults() DispenserBehavior#registerDefaults},
+    * an anonymus class in {@link net.minecraft.block.dispenser.DispenserBehavior#bootstrap() DispenserBehavior#bootstrap},
     * and {@link net.minecraft.entity.ai.brain.task.BoneMealTask#keepRunning(net.minecraft.server.world.ServerWorld, net.minecraft.entity.passive.VillagerEntity, long) BoneMealTask#keepRunning}
     * 
     * @mapping {@literal hashed f_mqdhxafm Lnet/minecraft/unmapped/C_kkbhcwdu;f_mqdhxafm:I}

Please sign in to comment.