100% n.m.block (#635) · QuiltMC/quilt-mappings@8942d89

github-actions · 2024-08-29T20:04:32Z

With commit 8942d89, 123 file(s) were updated with 776 line(s) added and 733 removed compared to the latest Quilt Mappings version.

View the diff here (1/3):

diff -bur namedTargetSrc/net/minecraft/block/AbstractBlock.java namedSrc/net/minecraft/block/AbstractBlock.java
--- namedTargetSrc/net/minecraft/block/AbstractBlock.java	2024-08-29 20:04:30.276887677 +0000
+++ namedSrc/net/minecraft/block/AbstractBlock.java	2024-08-29 20:03:20.531809999 +0000
@@ -52,7 +52,6 @@
 import net.minecraft.sound.BlockSoundGroup;
 import net.minecraft.state.State;
 import net.minecraft.state.property.Property;
-import net.minecraft.unmapped.C_ctatbkvy;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.BlockMirror;
 import net.minecraft.util.BlockRotation;
@@ -75,6 +74,7 @@
 import net.minecraft.world.WorldAccess;
 import net.minecraft.world.WorldView;
 import net.minecraft.world.explosion.Explosion;
+import net.minecraft.world.logic.Orientation;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -249,9 +249,9 @@
 
    /**
     * @mapping {@literal hashed m_tmlkosuh Lnet/minecraft/unmapped/C_triydqro;m_tmlkosuh(Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_ctatbkvy;Z)V}
-    * @mapping {@literal named neighborUpdate Lnet/minecraft/block/AbstractBlock;neighborUpdate(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/Block;Lnet/minecraft/unmapped/C_ctatbkvy;Z)V}
+    * @mapping {@literal named neighborUpdate Lnet/minecraft/block/AbstractBlock;neighborUpdate(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/Block;Lnet/minecraft/world/logic/Orientation;Z)V}
     */
-   protected void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, @Nullable C_ctatbkvy arg5, boolean notify) {
+   protected void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, @Nullable Orientation orientation, boolean notify) {
    }
 
    /**
@@ -314,7 +314,7 @@
     * @mapping {@literal named onInteract Lnet/minecraft/block/AbstractBlock;onInteract(Lnet/minecraft/item/ItemStack;Lnet/minecraft/block/BlockState;Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/util/Hand;Lnet/minecraft/util/hit/BlockHitResult;)Lnet/minecraft/util/ActionResult;}
     */
    protected ActionResult onInteract(ItemStack stack, BlockState state, World world, BlockPos pos, PlayerEntity entity, Hand hand, BlockHitResult hitResult) {
-      return ActionResult.f_nwhanehc;
+      return ActionResult.EMPTY_HAND;
    }
 
    /**
@@ -705,17 +705,24 @@
     */
    public abstract static class AbstractBlockState extends State<Block, BlockState> {
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_gbcdxrgd Lnet/minecraft/unmapped/C_triydqro$C_eibemhky;f_gbcdxrgd:[Lnet/minecraft/unmapped/C_xpuuihxf;}
+       * @mapping {@literal named DIRECTIONS Lnet/minecraft/block/AbstractBlock$AbstractBlockState;DIRECTIONS:[Lnet/minecraft/util/math/Direction;}
        */
-      private static final Direction[] f_gbcdxrgd = Direction.values();
+      private static final Direction[] DIRECTIONS = Direction.values();
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_bvttwnii Lnet/minecraft/unmapped/C_triydqro$C_eibemhky;f_bvttwnii:[Lnet/minecraft/unmapped/C_zscvhwbd;}
+       * @mapping {@literal named EMPTY_OCCLUSION_SHAPES Lnet/minecraft/block/AbstractBlock$AbstractBlockState;EMPTY_OCCLUSION_SHAPES:[Lnet/minecraft/util/shape/VoxelShape;}
        */
-      private static final VoxelShape[] f_bvttwnii = Util.make(new VoxelShape[f_gbcdxrgd.length], args -> Arrays.fill(args, VoxelShapes.empty()));
+      private static final VoxelShape[] EMPTY_OCCLUSION_SHAPES = Util.make(
+         new VoxelShape[DIRECTIONS.length], directions -> Arrays.fill(directions, VoxelShapes.empty())
+      );
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_biaogsvo Lnet/minecraft/unmapped/C_triydqro$C_eibemhky;f_biaogsvo:[Lnet/minecraft/unmapped/C_zscvhwbd;}
+       * @mapping {@literal named FULL_BLOCK_OCCLUSION_SHAPES Lnet/minecraft/block/AbstractBlock$AbstractBlockState;FULL_BLOCK_OCCLUSION_SHAPES:[Lnet/minecraft/util/shape/VoxelShape;}
        */
-      private static final VoxelShape[] f_biaogsvo = Util.make(new VoxelShape[f_gbcdxrgd.length], args -> Arrays.fill(args, VoxelShapes.fullCube()));
+      private static final VoxelShape[] FULL_BLOCK_OCCLUSION_SHAPES = Util.make(
+         new VoxelShape[DIRECTIONS.length], directions -> Arrays.fill(directions, VoxelShapes.fullCube())
+      );
       /**
        * @mapping {@literal hashed f_wknecqnz Lnet/minecraft/unmapped/C_triydqro$C_eibemhky;f_wknecqnz:I}
        * @mapping {@literal named luminance Lnet/minecraft/block/AbstractBlock$AbstractBlockState;luminance:I}
@@ -836,25 +843,30 @@
        */
       private boolean hasRandomTicks;
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_xxewnzdk Lnet/minecraft/unmapped/C_triydqro$C_eibemhky;f_xxewnzdk:Z}
+       * @mapping {@literal named isFullCube Lnet/minecraft/block/AbstractBlock$AbstractBlockState;isFullCube:Z}
        */
-      private boolean f_xxewnzdk;
+      private boolean isFullCube;
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_bsbhmsca Lnet/minecraft/unmapped/C_triydqro$C_eibemhky;f_bsbhmsca:Lnet/minecraft/unmapped/C_zscvhwbd;}
+       * @mapping {@literal named cullingShape Lnet/minecraft/block/AbstractBlock$AbstractBlockState;cullingShape:Lnet/minecraft/util/shape/VoxelShape;}
        */
-      private VoxelShape f_bsbhmsca;
+      private VoxelShape cullingShape;
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_ycbjvypj Lnet/minecraft/unmapped/C_triydqro$C_eibemhky;f_ycbjvypj:[Lnet/minecraft/unmapped/C_zscvhwbd;}
+       * @mapping {@literal named cullingFaces Lnet/minecraft/block/AbstractBlock$AbstractBlockState;cullingFaces:[Lnet/minecraft/util/shape/VoxelShape;}
        */
-      private VoxelShape[] f_ycbjvypj;
+      private VoxelShape[] cullingFaces;
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_xogzmbzi Lnet/minecraft/unmapped/C_triydqro$C_eibemhky;f_xogzmbzi:Z}
+       * @mapping {@literal named isTransparent Lnet/minecraft/block/AbstractBlock$AbstractBlockState;isTransparent:Z}
        */
-      private boolean f_xogzmbzi;
+      private boolean isTransparent;
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_nsclhbdi Lnet/minecraft/unmapped/C_triydqro$C_eibemhky;f_nsclhbdi:I}
+       * @mapping {@literal named opacity Lnet/minecraft/block/AbstractBlock$AbstractBlockState;opacity:I}
        */
-      private int f_nsclhbdi;
+      private int opacity;
 
       /**
        * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_triydqro$C_eibemhky;<init>(Lnet/minecraft/unmapped/C_mmxmpdoq;Lit/unimi/dsi/fastutil/objects/Reference2ObjectArrayMap;Lcom/mojang/serialization/MapCodec;)V}
@@ -918,22 +930,22 @@
          }
 
          this.solid = this.checkSolid();
-         this.f_bsbhmsca = this.opaque ? this.owner.getCullingShape(this.asBlockState()) : VoxelShapes.empty();
-         this.f_xxewnzdk = Block.isShapeFullCube(this.f_bsbhmsca);
-         if (this.f_bsbhmsca.isEmpty()) {
-            this.f_ycbjvypj = f_bvttwnii;
-         } else if (this.f_xxewnzdk) {
-            this.f_ycbjvypj = f_biaogsvo;
+         this.cullingShape = this.opaque ? this.owner.getCullingShape(this.asBlockState()) : VoxelShapes.empty();
+         this.isFullCube = Block.isShapeFullCube(this.cullingShape);
+         if (this.cullingShape.isEmpty()) {
+            this.cullingFaces = EMPTY_OCCLUSION_SHAPES;
+         } else if (this.isFullCube) {
+            this.cullingFaces = FULL_BLOCK_OCCLUSION_SHAPES;
          } else {
-            this.f_ycbjvypj = new VoxelShape[f_gbcdxrgd.length];
+            this.cullingFaces = new VoxelShape[DIRECTIONS.length];
 
-            for (Direction lv : f_gbcdxrgd) {
-               this.f_ycbjvypj[lv.ordinal()] = this.f_bsbhmsca.getFace(lv);
+            for (Direction lv : DIRECTIONS) {
+               this.cullingFaces[lv.ordinal()] = this.cullingShape.getFace(lv);
             }
          }
 
-         this.f_xogzmbzi = this.owner.isTransparent(this.asBlockState());
-         this.f_nsclhbdi = this.owner.getOpacity(this.asBlockState());
+         this.isTransparent = this.owner.isTransparent(this.asBlockState());
+         this.opacity = this.owner.getOpacity(this.asBlockState());
       }
 
       /**
@@ -984,7 +996,7 @@
        * @mapping {@literal named isTransparent Lnet/minecraft/block/AbstractBlock$AbstractBlockState;isTransparent()Z}
        */
       public boolean isTransparent() {
-         return this.f_xogzmbzi;
+         return this.isTransparent;
       }
 
       /**
@@ -992,7 +1004,7 @@
        * @mapping {@literal named getOpacity Lnet/minecraft/block/AbstractBlock$AbstractBlockState;getOpacity()I}
        */
       public int getOpacity() {
-         return this.f_nsclhbdi;
+         return this.opacity;
       }
 
       /**
@@ -1000,7 +1012,7 @@
        * @mapping {@literal named getCullingFace Lnet/minecraft/block/AbstractBlock$AbstractBlockState;getCullingFace(Lnet/minecraft/util/math/Direction;)Lnet/minecraft/util/shape/VoxelShape;}
        */
       public VoxelShape getCullingFace(Direction direction) {
-         return this.f_ycbjvypj[direction.ordinal()];
+         return this.cullingFaces[direction.ordinal()];
       }
 
       /**
@@ -1008,7 +1020,7 @@
        * @mapping {@literal named getCullingShape Lnet/minecraft/block/AbstractBlock$AbstractBlockState;getCullingShape()Lnet/minecraft/util/shape/VoxelShape;}
        */
       public VoxelShape getCullingShape() {
-         return this.f_bsbhmsca;
+         return this.cullingShape;
       }
 
       /**
@@ -1187,7 +1199,7 @@
        * @mapping {@literal named isOpaqueFullCube Lnet/minecraft/block/AbstractBlock$AbstractBlockState;isOpaqueFullCube()Z}
        */
       public boolean isOpaqueFullCube() {
-         return this.f_xxewnzdk;
+         return this.isFullCube;
       }
 
       /**
@@ -1275,7 +1287,7 @@
        * @mapping {@literal named hasSolidTopSurface Lnet/minecraft/block/AbstractBlock$AbstractBlockState;hasSolidTopSurface(Lnet/minecraft/world/BlockView;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/entity/Entity;Lnet/minecraft/util/math/Direction;)Z}
        */
       public final boolean hasSolidTopSurface(BlockView world, BlockPos pos, Entity entity, Direction direction) {
-         return Block.isFaceFullSquare(this.getCollisionShape(world, pos, ShapeContext.m_xvebqowz(entity)), direction);
+         return Block.isFaceFullSquare(this.getCollisionShape(world, pos, ShapeContext.of(entity)), direction);
       }
 
       /**
@@ -1305,11 +1317,11 @@
 
       /**
        * @mapping {@literal hashed m_aeqyhmrr Lnet/minecraft/unmapped/C_triydqro$C_eibemhky;m_aeqyhmrr(Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_ctatbkvy;Z)V}
-       * @mapping {@literal named neighborUpdate Lnet/minecraft/block/AbstractBlock$AbstractBlockState;neighborUpdate(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/Block;Lnet/minecraft/unmapped/C_ctatbkvy;Z)V}
+       * @mapping {@literal named neighborUpdate Lnet/minecraft/block/AbstractBlock$AbstractBlockState;neighborUpdate(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/Block;Lnet/minecraft/world/logic/Orientation;Z)V}
        */
-      public void neighborUpdate(World world, BlockPos pos, Block block, @Nullable C_ctatbkvy arg4, boolean notify) {
+      public void neighborUpdate(World world, BlockPos pos, Block block, @Nullable Orientation orientation, boolean notify) {
          DebugInfoSender.sendNeighborUpdate(world, pos);
-         this.getBlock().neighborUpdate(this.asBlockState(), world, pos, block, arg4, notify);
+         this.getBlock().neighborUpdate(this.asBlockState(), world, pos, block, orientation, notify);
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/block/AbstractRailBlock.java namedSrc/net/minecraft/block/AbstractRailBlock.java
--- namedTargetSrc/net/minecraft/block/AbstractRailBlock.java	2024-08-29 20:04:30.304888116 +0000
+++ namedSrc/net/minecraft/block/AbstractRailBlock.java	2024-08-29 20:03:20.575810667 +0000
@@ -9,7 +9,6 @@
 import net.minecraft.state.property.BooleanProperty;
 import net.minecraft.state.property.Properties;
 import net.minecraft.state.property.Property;
-import net.minecraft.unmapped.C_ctatbkvy;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.shape.VoxelShape;
@@ -17,6 +16,7 @@
 import net.minecraft.world.World;
 import net.minecraft.world.WorldAccess;
 import net.minecraft.world.WorldView;
+import net.minecraft.world.logic.Orientation;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -90,7 +90,7 @@
    @Override
    protected VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) {
       RailShape lv = state.isOf(this) ? state.get(this.getShapeProperty()) : null;
-      return lv != null && lv.m_pgjcepuq() ? ASCENDING_SHAPE : STRAIGHT_SHAPE;
+      return lv != null && lv.isAscending() ? ASCENDING_SHAPE : STRAIGHT_SHAPE;
    }
 
    /**
@@ -128,7 +128,7 @@
     * Mapping not found
     */
    @Override
-   protected void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, @Nullable C_ctatbkvy arg5, boolean notify) {
+   protected void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, @Nullable Orientation orientation, boolean notify) {
       if (!world.isClient && world.getBlockState(pos).isOf(this)) {
          RailShape lv = state.get(this.getShapeProperty());
          if (shouldBreak(pos, world, lv)) {
@@ -195,7 +195,7 @@
    protected void onStateReplaced(BlockState state, World world, BlockPos pos, BlockState newState, boolean moved) {
       if (!moved) {
          super.onStateReplaced(state, world, pos, newState, moved);
-         if (((RailShape)state.get(this.getShapeProperty())).m_pgjcepuq()) {
+         if (((RailShape)state.get(this.getShapeProperty())).isAscending()) {
             world.m_uswxgsbt(pos.up(), this);
          }
 
diff -bur namedTargetSrc/net/minecraft/block/AbstractSkullBlock.java namedSrc/net/minecraft/block/AbstractSkullBlock.java
--- namedTargetSrc/net/minecraft/block/AbstractSkullBlock.java	2024-08-29 20:04:30.332888554 +0000
+++ namedSrc/net/minecraft/block/AbstractSkullBlock.java	2024-08-29 20:03:20.607811154 +0000
@@ -12,9 +12,9 @@
 import net.minecraft.state.StateManager;
 import net.minecraft.state.property.BooleanProperty;
 import net.minecraft.state.property.Properties;
-import net.minecraft.unmapped.C_ctatbkvy;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
+import net.minecraft.world.logic.Orientation;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -120,7 +120,7 @@
     * Mapping not found
     */
    @Override
-   protected void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, @Nullable C_ctatbkvy arg5, boolean notify) {
+   protected void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, @Nullable Orientation orientation, boolean notify) {
       if (!world.isClient) {
          boolean bl2 = world.isReceivingRedstonePower(pos);
          if (bl2 != (Boolean)state.get(POWERED)) {
diff -bur namedTargetSrc/net/minecraft/block/BedBlock.java namedSrc/net/minecraft/block/BedBlock.java
--- namedTargetSrc/net/minecraft/block/BedBlock.java	2024-08-29 20:04:30.360888992 +0000
+++ namedSrc/net/minecraft/block/BedBlock.java	2024-08-29 20:03:20.639811640 +0000
@@ -156,7 +156,7 @@
    @Override
    protected ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, BlockHitResult result) {
       if (world.isClient) {
-         return ActionResult.f_pkwbrwkg;
+         return ActionResult.SUCCESS_SERVER;
       } else {
          if (state.get(PART) != BedPart.HEAD) {
             pos = pos.offset(state.get(FACING));
@@ -175,20 +175,20 @@
 
             Vec3d lv2 = pos.ofCenter();
             world.m_hydwjjyu(null, world.getDamageSources().badRespawnPoint(lv2), null, lv2, 5.0F, true, World.ExplosionSourceType.BLOCK);
-            return ActionResult.f_pkwbrwkg;
+            return ActionResult.SUCCESS_SERVER;
          } else if ((Boolean)state.get(OCCUPIED)) {
             if (!this.wakeVillager(world, pos)) {
                player.sendMessage(Text.translatable("block.minecraft.bed.occupied"), true);
             }
 
-            return ActionResult.f_pkwbrwkg;
+            return ActionResult.SUCCESS_SERVER;
          } else {
             player.trySleep(pos).ifLeft(arg2 -> {
                if (arg2.toText() != null) {
                   player.sendMessage(arg2.toText(), true);
                }
             });
-            return ActionResult.f_pkwbrwkg;
+            return ActionResult.SUCCESS_SERVER;
          }
       }
    }
@@ -229,15 +229,14 @@
    }
 
    /**
-    * @mapping {@literal hashed m_oscwylqf Lnet/minecraft/unmapped/C_nvwxmqty;m_oscwylqf(Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_astfners;)V}
-    * @mapping {@literal named m_oscwylqf Lnet/minecraft/block/BedBlock;m_oscwylqf(Lnet/minecraft/world/BlockView;Lnet/minecraft/entity/Entity;)V}
+    * Mapping not found
     */
    @Override
-   public void m_oscwylqf(BlockView world, Entity arg2) {
-      if (arg2.bypassesLandingEffects()) {
-         super.m_oscwylqf(world, arg2);
+   public void updateEntityVelocityAfterFall(BlockView world, Entity entity) {
+      if (entity.bypassesLandingEffects()) {
+         super.updateEntityVelocityAfterFall(world, entity);
       } else {
-         this.bounceEntity(arg2);
+         this.bounceEntity(entity);
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/block/BellBlock.java namedSrc/net/minecraft/block/BellBlock.java
--- namedTargetSrc/net/minecraft/block/BellBlock.java	2024-08-29 20:04:30.340888679 +0000
+++ namedSrc/net/minecraft/block/BellBlock.java	2024-08-29 20:03:20.619811335 +0000
@@ -22,7 +22,6 @@
 import net.minecraft.state.property.DirectionProperty;
 import net.minecraft.state.property.EnumProperty;
 import net.minecraft.state.property.Properties;
-import net.minecraft.unmapped.C_ctatbkvy;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.BlockMirror;
 import net.minecraft.util.BlockRotation;
@@ -37,6 +36,7 @@
 import net.minecraft.world.WorldView;
 import net.minecraft.world.event.GameEvent;
 import net.minecraft.world.explosion.Explosion;
+import net.minecraft.world.logic.Orientation;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -153,7 +153,7 @@
     * Mapping not found
     */
    @Override
-   protected void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, @Nullable C_ctatbkvy arg5, boolean notify) {
+   protected void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, @Nullable Orientation orientation, boolean notify) {
       boolean bl2 = world.isReceivingRedstonePower(pos);
       if (bl2 != (Boolean)state.get(POWERED)) {
          if (bl2) {
diff -bur namedTargetSrc/net/minecraft/block/BigDripleafBlock.java namedSrc/net/minecraft/block/BigDripleafBlock.java
--- namedTargetSrc/net/minecraft/block/BigDripleafBlock.java	2024-08-29 20:04:30.364889055 +0000
+++ namedSrc/net/minecraft/block/BigDripleafBlock.java	2024-08-29 20:03:20.643811700 +0000
@@ -20,7 +20,6 @@
 import net.minecraft.state.property.BooleanProperty;
 import net.minecraft.state.property.EnumProperty;
 import net.minecraft.state.property.Properties;
-import net.minecraft.unmapped.C_ctatbkvy;
 import net.minecraft.util.Util;
 import net.minecraft.util.function.BooleanBiFunction;
 import net.minecraft.util.hit.BlockHitResult;
@@ -36,6 +35,7 @@
 import net.minecraft.world.WorldAccess;
 import net.minecraft.world.WorldView;
 import net.minecraft.world.event.GameEvent;
+import net.minecraft.world.logic.Orientation;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -323,7 +323,7 @@
     * Mapping not found
     */
    @Override
-   protected void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, @Nullable C_ctatbkvy arg5, boolean notify) {
+   protected void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, @Nullable Orientation orientation, boolean notify) {
       if (world.isReceivingRedstonePower(pos)) {
          resetTilt(state, world, pos);
       }
diff -bur namedTargetSrc/net/minecraft/block/Block.java namedSrc/net/minecraft/block/Block.java
--- namedTargetSrc/net/minecraft/block/Block.java	2024-08-29 20:04:30.492891058 +0000
+++ namedSrc/net/minecraft/block/Block.java	2024-08-29 20:03:20.775813706 +0000
@@ -171,9 +171,12 @@
     */
    public static final int MOVED = 64;
    /**
-    * Mapping not found
+    * Skips {@link AbstractBlock#getStateForNeighborUpdate} call for redstone wire.
+    * 
+    * @mapping {@literal hashed f_zobgxnry Lnet/minecraft/unmapped/C_mmxmpdoq;f_zobgxnry:I}
+    * @mapping {@literal named SKIP_UPDATE_FOR_REDSTONE_WIRE Lnet/minecraft/block/Block;SKIP_UPDATE_FOR_REDSTONE_WIRE:I}
     */
-   public static final int f_zobgxnry = 128;
+   public static final int SKIP_UPDATE_FOR_REDSTONE_WIRE = 128;
    /**
     * @mapping {@literal hashed f_egxohwli Lnet/minecraft/unmapped/C_mmxmpdoq;f_egxohwli:I}
     * @mapping {@literal named UPDATE_NONE Lnet/minecraft/block/Block;UPDATE_NONE:I}
@@ -237,8 +240,8 @@
     * @mapping {@literal hashed f_etbvyypx Lnet/minecraft/unmapped/C_mmxmpdoq;f_etbvyypx:Ljava/lang/ThreadLocal;}
     * @mapping {@literal named FACE_CULL_MAP Lnet/minecraft/block/Block;FACE_CULL_MAP:Ljava/lang/ThreadLocal;}
     */
-   private static final ThreadLocal<Object2ByteLinkedOpenHashMap<Block.C_epynadow>> FACE_CULL_MAP = ThreadLocal.withInitial(() -> {
-      Object2ByteLinkedOpenHashMap<Block.C_epynadow> object2ByteLinkedOpenHashMap = new Object2ByteLinkedOpenHashMap<Block.C_epynadow>(256, 0.25F) {
+   private static final ThreadLocal<Object2ByteLinkedOpenHashMap<Block.ShapePair>> FACE_CULL_MAP = ThreadLocal.withInitial(() -> {
+      Object2ByteLinkedOpenHashMap<Block.ShapePair> object2ByteLinkedOpenHashMap = new Object2ByteLinkedOpenHashMap<Block.ShapePair>(256, 0.25F) {
          /**
           * @mapping {@literal hashed rehash Lnet/minecraft/unmapped/C_mmxmpdoq$C_znvnetlf;rehash(I)V}
           * @mapping {@literal named rehash Lnet/minecraft/block/Block$C_znvnetlf;rehash(I)V}
@@ -419,11 +422,11 @@
     * @mapping {@literal hashed m_zpnlglhs Lnet/minecraft/unmapped/C_mmxmpdoq;m_zpnlglhs(Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_xpuuihxf;)Z}
     * @mapping {@literal named shouldDrawSide Lnet/minecraft/block/Block;shouldDrawSide(Lnet/minecraft/block/BlockState;Lnet/minecraft/block/BlockState;Lnet/minecraft/util/math/Direction;)Z}
     */
-   public static boolean shouldDrawSide(BlockState state, BlockState arg2, Direction side) {
-      VoxelShape lv = arg2.getCullingFace(side.getOpposite());
+   public static boolean shouldDrawSide(BlockState state, BlockState sideState, Direction side) {
+      VoxelShape lv = sideState.getCullingFace(side.getOpposite());
       if (lv == VoxelShapes.fullCube()) {
          return false;
-      } else if (state.isSideInvisible(arg2, side)) {
+      } else if (state.isSideInvisible(sideState, side)) {
          return false;
       } else if (lv == VoxelShapes.empty()) {
          return true;
@@ -432,8 +435,8 @@
          if (lv2 == VoxelShapes.empty()) {
             return true;
          } else {
-            Block.C_epynadow lv3 = new Block.C_epynadow(lv2, lv);
-            Object2ByteLinkedOpenHashMap<Block.C_epynadow> object2ByteLinkedOpenHashMap = (Object2ByteLinkedOpenHashMap<Block.C_epynadow>)FACE_CULL_MAP.get();
+            Block.ShapePair lv3 = new Block.ShapePair(lv2, lv);
+            Object2ByteLinkedOpenHashMap<Block.ShapePair> object2ByteLinkedOpenHashMap = (Object2ByteLinkedOpenHashMap<Block.ShapePair>)FACE_CULL_MAP.get();
             byte b = object2ByteLinkedOpenHashMap.getAndMoveToFirst(lv3);
             if (b != 127) {
                return b != 0;
@@ -708,10 +711,10 @@
 
    /**
     * @mapping {@literal hashed m_oscwylqf Lnet/minecraft/unmapped/C_mmxmpdoq;m_oscwylqf(Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_astfners;)V}
-    * @mapping {@literal named m_oscwylqf Lnet/minecraft/block/Block;m_oscwylqf(Lnet/minecraft/world/BlockView;Lnet/minecraft/entity/Entity;)V}
+    * @mapping {@literal named updateEntityVelocityAfterFall Lnet/minecraft/block/Block;updateEntityVelocityAfterFall(Lnet/minecraft/world/BlockView;Lnet/minecraft/entity/Entity;)V}
     */
-   public void m_oscwylqf(BlockView world, Entity arg2) {
-      arg2.setVelocity(arg2.getVelocity().multiply(1.0, 0.0, 1.0));
+   public void updateEntityVelocityAfterFall(BlockView world, Entity entity) {
+      entity.setVelocity(entity.getVelocity().multiply(1.0, 0.0, 1.0));
    }
 
    /**
@@ -915,32 +918,6 @@
    }
 
    /**
-    * @mapping {@literal hashed net/minecraft/unmapped/C_mmxmpdoq$C_epynadow}
-    * @mapping {@literal named net/minecraft/block/Block$C_epynadow}
-    */
-   static record C_epynadow(VoxelShape first, VoxelShape second) {
-      /**
-       * @mapping {@literal hashed equals Lnet/minecraft/unmapped/C_mmxmpdoq$C_epynadow;equals(Ljava/lang/Object;)Z}
-       * @mapping {@literal named equals Lnet/minecraft/block/Block$C_epynadow;equals(Ljava/lang/Object;)Z}
-       */
-      public boolean equals(Object o) {
-         if (o instanceof Block.C_epynadow lv && this.first == lv.first && this.second == lv.second) {
-            return true;
-         }
-
-         return false;
-      }
-
-      /**
-       * @mapping {@literal hashed hashCode Lnet/minecraft/unmapped/C_mmxmpdoq$C_epynadow;hashCode()I}
-       * @mapping {@literal named hashCode Lnet/minecraft/block/Block$C_epynadow;hashCode()I}
-       */
-      public int hashCode() {
-         return System.identityHashCode(this.first) * 31 + System.identityHashCode(this.second);
-      }
-   }
-
-   /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_mmxmpdoq$C_ysitskrk}
     * @mapping {@literal named net/minecraft/block/Block$NeighborGroup}
     */
@@ -993,4 +970,30 @@
          return 31 * i + this.facing.hashCode();
       }
    }
+
+   /**
+    * @mapping {@literal hashed net/minecraft/unmapped/C_mmxmpdoq$C_epynadow}
+    * @mapping {@literal named net/minecraft/block/Block$ShapePair}
+    */
+   static record ShapePair(VoxelShape first, VoxelShape second) {
+      /**
+       * @mapping {@literal hashed equals Lnet/minecraft/unmapped/C_mmxmpdoq$C_epynadow;equals(Ljava/lang/Object;)Z}
+       * @mapping {@literal named equals Lnet/minecraft/block/Block$ShapePair;equals(Ljava/lang/Object;)Z}
+       */
+      public boolean equals(Object o) {
+         if (o instanceof Block.ShapePair lv && this.first == lv.first && this.second == lv.second) {
+            return true;
+         }
+
+         return false;
+      }
+
+      /**
+       * @mapping {@literal hashed hashCode Lnet/minecraft/unmapped/C_mmxmpdoq$C_epynadow;hashCode()I}
+       * @mapping {@literal named hashCode Lnet/minecraft/block/Block$ShapePair;hashCode()I}
+       */
+      public int hashCode() {
+         return System.identityHashCode(this.first) * 31 + System.identityHashCode(this.second);
+      }
+   }
 }
diff -bur namedTargetSrc/net/minecraft/block/ButtonBlock.java namedSrc/net/minecraft/block/ButtonBlock.java
--- namedTargetSrc/net/minecraft/block/ButtonBlock.java	2024-08-29 20:04:30.320888366 +0000
+++ namedSrc/net/minecraft/block/ButtonBlock.java	2024-08-29 20:03:20.595810971 +0000
@@ -15,8 +15,6 @@
 import net.minecraft.state.StateManager;
 import net.minecraft.state.property.BooleanProperty;
 import net.minecraft.state.property.Properties;
-import net.minecraft.unmapped.C_ctatbkvy;
-import net.minecraft.unmapped.C_psmtqbgv;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.math.BlockPos;
@@ -28,6 +26,8 @@
 import net.minecraft.world.WorldAccess;
 import net.minecraft.world.event.GameEvent;
 import net.minecraft.world.explosion.Explosion;
+import net.minecraft.world.logic.ExperimentalRedstoneUtil;
+import net.minecraft.world.logic.Orientation;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -359,7 +359,7 @@
     */
    private void updateNeighbors(BlockState state, World world, BlockPos pos) {
       Direction lv = getDirection(state).getOpposite();
-      C_ctatbkvy lv2 = C_psmtqbgv.m_tsbkkwwq(world, lv, lv.getAxis().isHorizontal() ? Direction.UP : state.get(FACING));
+      Orientation lv2 = ExperimentalRedstoneUtil.initialOrientation(world, lv, lv.getAxis().isHorizontal() ? Direction.UP : state.get(FACING));
       world.m_hfhkmcni(pos, this, lv2);
       world.m_hfhkmcni(pos.offset(lv), this, lv2);
    }
diff -bur namedTargetSrc/net/minecraft/block/CakeBlock.java namedSrc/net/minecraft/block/CakeBlock.java
--- namedTargetSrc/net/minecraft/block/CakeBlock.java	2024-08-29 20:04:30.444890307 +0000
+++ namedSrc/net/minecraft/block/CakeBlock.java	2024-08-29 20:03:20.719812855 +0000
@@ -112,7 +112,7 @@
          player.incrementStat(Stats.USED.getOrCreateStat(lv));
          return ActionResult.SUCCESS;
       } else {
-         return ActionResult.f_nwhanehc;
+         return ActionResult.EMPTY_HAND;
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/block/CampfireBlock.java namedSrc/net/minecraft/block/CampfireBlock.java
--- namedTargetSrc/net/minecraft/block/CampfireBlock.java	2024-08-29 20:04:30.412889806 +0000
+++ namedSrc/net/minecraft/block/CampfireBlock.java	2024-08-29 20:03:20.687812369 +0000
@@ -149,14 +149,14 @@
          if (optional.isPresent()) {
             if (!world.isClient && lv2.addItem(player, lv3, ((CampfireCookingRecipe)((RecipeHolder)optional.get()).value()).getCookTime())) {
                player.incrementStat(Stats.INTERACT_WITH_CAMPFIRE);
-               return ActionResult.f_pkwbrwkg;
+               return ActionResult.SUCCESS_SERVER;
             }
 
             return ActionResult.CONSUME;
          }
       }
 
-      return ActionResult.f_nwhanehc;
+      return ActionResult.EMPTY_HAND;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/cauldron/CauldronBehavior.java namedSrc/net/minecraft/block/cauldron/CauldronBehavior.java
--- namedTargetSrc/net/minecraft/block/cauldron/CauldronBehavior.java	2024-08-29 20:04:30.264887490 +0000
+++ namedSrc/net/minecraft/block/cauldron/CauldronBehavior.java	2024-08-29 20:03:20.515809755 +0000
@@ -73,7 +73,7 @@
     */
    static CauldronBehavior.CauldronBehaviorMap createMap(String name) {
       Object2ObjectOpenHashMap<Item, CauldronBehavior> object2ObjectOpenHashMap = new Object2ObjectOpenHashMap<>();
-      object2ObjectOpenHashMap.defaultReturnValue((state, world, pos, player, hand, stack) -> ActionResult.f_nwhanehc);
+      object2ObjectOpenHashMap.defaultReturnValue((state, world, pos, player, hand, stack) -> ActionResult.EMPTY_HAND);
       CauldronBehavior.CauldronBehaviorMap lv = new CauldronBehavior.CauldronBehaviorMap(name, object2ObjectOpenHashMap);
       BEHAVIOR_MAPS.put(name, lv);
       return lv;
@@ -83,7 +83,7 @@
     * @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}
@@ -107,7 +107,7 @@
 
             return ActionResult.SUCCESS;
          } else {
-            return ActionResult.f_nwhanehc;
+            return ActionResult.EMPTY_HAND;
          }
       });
       Map<Item, CauldronBehavior> map2 = WATER_CAULDRON_BEHAVIOR.map();
@@ -141,7 +141,7 @@
       });
       map2.put(Items.POTION, (CauldronBehavior)(state, world, pos, player, hand, stack) -> {
          if ((Integer)state.get(LeveledCauldronBlock.LEVEL) == 3) {
-            return ActionResult.f_nwhanehc;
+            return ActionResult.EMPTY_HAND;
          } else {
             PotionContentsComponent lv = stack.get(DataComponentTypes.POTION_CONTENTS);
             if (lv != null && lv.matches(Potions.WATER)) {
@@ -156,48 +156,48 @@
 
                return ActionResult.SUCCESS;
             } else {
-               return ActionResult.f_nwhanehc;
+               return ActionResult.EMPTY_HAND;
             }
          }
       });
-      map2.put(Items.LEATHER_BOOTS, CauldronBehavior::m_vaydxxdu);
-      map2.put(Items.LEATHER_LEGGINGS, CauldronBehavior::m_vaydxxdu);
-      map2.put(Items.LEATHER_CHESTPLATE, CauldronBehavior::m_vaydxxdu);
-      map2.put(Items.LEATHER_HELMET, CauldronBehavior::m_vaydxxdu);
-      map2.put(Items.LEATHER_HORSE_ARMOR, CauldronBehavior::m_vaydxxdu);
-      map2.put(Items.WOLF_ARMOR, CauldronBehavior::m_vaydxxdu);
-      map2.put(Items.WHITE_BANNER, CauldronBehavior::m_qqxoejhi);
-      map2.put(Items.GRAY_BANNER, CauldronBehavior::m_qqxoejhi);
-      map2.put(Items.BLACK_BANNER, CauldronBehavior::m_qqxoejhi);
-      map2.put(Items.BLUE_BANNER, CauldronBehavior::m_qqxoejhi);
-      map2.put(Items.BROWN_BANNER, CauldronBehavior::m_qqxoejhi);
-      map2.put(Items.CYAN_BANNER, CauldronBehavior::m_qqxoejhi);
-      map2.put(Items.GREEN_BANNER, CauldronBehavior::m_qqxoejhi);
-      map2.put(Items.LIGHT_BLUE_BANNER, CauldronBehavior::m_qqxoejhi);
-      map2.put(Items.LIGHT_GRAY_BANNER, CauldronBehavior::m_qqxoejhi);
-      map2.put(Items.LIME_BANNER, CauldronBehavior::m_qqxoejhi);
-      map2.put(Items.MAGENTA_BANNER, CauldronBehavior::m_qqxoejhi);
-      map2.put(Items.ORANGE_BANNER, CauldronBehavior::m_qqxoejhi);
-      map2.put(Items.PINK_BANNER, CauldronBehavior::m_qqxoejhi);
-      map2.put(Items.PURPLE_BANNER, CauldronBehavior::m_qqxoejhi);
-      map2.put(Items.RED_BANNER, CauldronBehavior::m_qqxoejhi);
-      map2.put(Items.YELLOW_BANNER, CauldronBehavior::m_qqxoejhi);
-      map2.put(Items.WHITE_SHULKER_BOX, CauldronBehavior::m_ubhkjwij);
-      map2.put(Items.GRAY_SHULKER_BOX, CauldronBehavior::m_ubhkjwij);
-      map2.put(Items.BLACK_SHULKER_BOX, CauldronBehavior::m_ubhkjwij);
-      map2.put(Items.BLUE_SHULKER_BOX, CauldronBehavior::m_ubhkjwij);
-      map2.put(Items.BROWN_SHULKER_BOX, CauldronBehavior::m_ubhkjwij);
-      map2.put(Items.CYAN_SHULKER_BOX, CauldronBehavior::m_ubhkjwij);
-      map2.put(Items.GREEN_SHULKER_BOX, CauldronBehavior::m_ubhkjwij);
-      map2.put(Items.LIGHT_BLUE_SHULKER_BOX, CauldronBehavior::m_ubhkjwij);
-      map2.put(Items.LIGHT_GRAY_SHULKER_BOX, CauldronBehavior::m_ubhkjwij);
-      map2.put(Items.LIME_SHULKER_BOX, CauldronBehavior::m_ubhkjwij);
-      map2.put(Items.MAGENTA_SHULKER_BOX, CauldronBehavior::m_ubhkjwij);
-      map2.put(Items.ORANGE_SHULKER_BOX, CauldronBehavior::m_ubhkjwij);
-      map2.put(Items.PINK_SHULKER_BOX, CauldronBehavior::m_ubhkjwij);
-      map2.put(Items.PURPLE_SHULKER_BOX, CauldronBehavior::m_ubhkjwij);
-      map2.put(Items.RED_SHULKER_BOX, CauldronBehavior::m_ubhkjwij);
-      map2.put(Items.YELLOW_SHULKER_BOX, CauldronBehavior::m_ubhkjwij);
+      map2.put(Items.LEATHER_BOOTS, CauldronBehavior::cleanDyeable);
+      map2.put(Items.LEATHER_LEGGINGS, CauldronBehavior::cleanDyeable);
+      map2.put(Items.LEATHER_CHESTPLATE, CauldronBehavior::cleanDyeable);
+      map2.put(Items.LEATHER_HELMET, CauldronBehavior::cleanDyeable);
+      map2.put(Items.LEATHER_HORSE_ARMOR, CauldronBehavior::cleanDyeable);
+      map2.put(Items.WOLF_ARMOR, CauldronBehavior::cleanDyeable);
+      map2.put(Items.WHITE_BANNER, CauldronBehavior::cleanBanner);
+      map2.put(Items.GRAY_BANNER, CauldronBehavior::cleanBanner);
+      map2.put(Items.BLACK_BANNER, CauldronBehavior::cleanBanner);
+      map2.put(Items.BLUE_BANNER, CauldronBehavior::cleanBanner);
+      map2.put(Items.BROWN_BANNER, CauldronBehavior::cleanBanner);
+      map2.put(Items.CYAN_BANNER, CauldronBehavior::cleanBanner);
+      map2.put(Items.GREEN_BANNER, CauldronBehavior::cleanBanner);
+      map2.put(Items.LIGHT_BLUE_BANNER, CauldronBehavior::cleanBanner);
+      map2.put(Items.LIGHT_GRAY_BANNER, CauldronBehavior::cleanBanner);
+      map2.put(Items.LIME_BANNER, CauldronBehavior::cleanBanner);
+      map2.put(Items.MAGENTA_BANNER, CauldronBehavior::cleanBanner);
+      map2.put(Items.ORANGE_BANNER, CauldronBehavior::cleanBanner);
+      map2.put(Items.PINK_BANNER, CauldronBehavior::cleanBanner);
+      map2.put(Items.PURPLE_BANNER, CauldronBehavior::cleanBanner);
+      map2.put(Items.RED_BANNER, CauldronBehavior::cleanBanner);
+      map2.put(Items.YELLOW_BANNER, CauldronBehavior::cleanBanner);
+      map2.put(Items.WHITE_SHULKER_BOX, CauldronBehavior::cleanShulkerBox);
+      map2.put(Items.GRAY_SHULKER_BOX, CauldronBehavior::cleanShulkerBox);
+      map2.put(Items.BLACK_SHULKER_BOX, CauldronBehavior::cleanShulkerBox);
+      map2.put(Items.BLUE_SHULKER_BOX, CauldronBehavior::cleanShulkerBox);
+      map2.put(Items.BROWN_SHULKER_BOX, CauldronBehavior::cleanShulkerBox);
+      map2.put(Items.CYAN_SHULKER_BOX, CauldronBehavior::cleanShulkerBox);
+      map2.put(Items.GREEN_SHULKER_BOX, CauldronBehavior::cleanShulkerBox);
+      map2.put(Items.LIGHT_BLUE_SHULKER_BOX, CauldronBehavior::cleanShulkerBox);
+      map2.put(Items.LIGHT_GRAY_SHULKER_BOX, CauldronBehavior::cleanShulkerBox);
+      map2.put(Items.LIME_SHULKER_BOX, CauldronBehavior::cleanShulkerBox);
+      map2.put(Items.MAGENTA_SHULKER_BOX, CauldronBehavior::cleanShulkerBox);
+      map2.put(Items.ORANGE_SHULKER_BOX, CauldronBehavior::cleanShulkerBox);
+      map2.put(Items.PINK_SHULKER_BOX, CauldronBehavior::cleanShulkerBox);
+      map2.put(Items.PURPLE_SHULKER_BOX, CauldronBehavior::cleanShulkerBox);
+      map2.put(Items.RED_SHULKER_BOX, CauldronBehavior::cleanShulkerBox);
+      map2.put(Items.YELLOW_SHULKER_BOX, CauldronBehavior::cleanShulkerBox);
       Map<Item, CauldronBehavior> map3 = LAVA_CAULDRON_BEHAVIOR.map();
       map3.put(
          Items.BUCKET,
@@ -229,9 +229,9 @@
     * @mapping {@literal named registerBucketBehavior Lnet/minecraft/block/cauldron/CauldronBehavior;registerBucketBehavior(Ljava/util/Map;)V}
     */
    static void registerBucketBehavior(Map<Item, CauldronBehavior> behavior) {
-      behavior.put(Items.LAVA_BUCKET, CauldronBehavior::m_bqficzhz);
-      behavior.put(Items.WATER_BUCKET, CauldronBehavior::m_qajrbgzr);
-      behavior.put(Items.POWDER_SNOW_BUCKET, CauldronBehavior::m_mdtmwews);
+      behavior.put(Items.LAVA_BUCKET, CauldronBehavior::fillLavaCauldron);
+      behavior.put(Items.WATER_BUCKET, CauldronBehavior::fillWaterCauldron);
+      behavior.put(Items.POWDER_SNOW_BUCKET, CauldronBehavior::fillPowderSnowCauldron);
    }
 
    /**
@@ -250,7 +250,7 @@
       SoundEvent soundEvent
    ) {
       if (!predicate.test(state)) {
-         return ActionResult.f_nwhanehc;
+         return ActionResult.EMPTY_HAND;
       } else {
          if (!world.isClient) {
             Item lv = stack.getItem();
@@ -286,9 +286,9 @@
 
    /**
     * @mapping {@literal hashed m_qajrbgzr Lnet/minecraft/unmapped/C_hwbtrnnh;m_qajrbgzr(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 m_qajrbgzr Lnet/minecraft/block/cauldron/CauldronBehavior;m_qajrbgzr(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;}
+    * @mapping {@literal named fillWaterCauldron Lnet/minecraft/block/cauldron/CauldronBehavior;fillWaterCauldron(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;}
     */
-   private static ActionResult m_qajrbgzr(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, ItemStack stack) {
+   private static ActionResult fillWaterCauldron(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, ItemStack stack) {
       return fillCauldron(
          world,
          pos,
@@ -302,20 +302,20 @@
 
    /**
     * @mapping {@literal hashed m_bqficzhz Lnet/minecraft/unmapped/C_hwbtrnnh;m_bqficzhz(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 m_bqficzhz Lnet/minecraft/block/cauldron/CauldronBehavior;m_bqficzhz(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;}
+    * @mapping {@literal named fillLavaCauldron Lnet/minecraft/block/cauldron/CauldronBehavior;fillLavaCauldron(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;}
     */
-   private static ActionResult m_bqficzhz(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, ItemStack stack) {
-      return (ActionResult)(m_nrpzjycd(world, pos)
+   private static ActionResult fillLavaCauldron(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, ItemStack stack) {
+      return (ActionResult)(isUnderWater(world, pos)
          ? ActionResult.CONSUME
          : fillCauldron(world, pos, player, hand, stack, Blocks.LAVA_CAULDRON.getDefaultState(), SoundEvents.ITEM_BUCKET_EMPTY_LAVA));
    }
 
    /**
     * @mapping {@literal hashed m_mdtmwews Lnet/minecraft/unmapped/C_hwbtrnnh;m_mdtmwews(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 m_mdtmwews Lnet/minecraft/block/cauldron/CauldronBehavior;m_mdtmwews(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;}
+    * @mapping {@literal named fillPowderSnowCauldron Lnet/minecraft/block/cauldron/CauldronBehavior;fillPowderSnowCauldron(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;}
     */
-   private static ActionResult m_mdtmwews(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, ItemStack stack) {
-      return (ActionResult)(m_nrpzjycd(world, pos)
+   private static ActionResult fillPowderSnowCauldron(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, ItemStack stack) {
+      return (ActionResult)(isUnderWater(world, pos)
          ? ActionResult.CONSUME
          : fillCauldron(
             world,
@@ -330,16 +330,16 @@
 
    /**
     * @mapping {@literal hashed m_ubhkjwij Lnet/minecraft/unmapped/C_hwbtrnnh;m_ubhkjwij(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 m_ubhkjwij Lnet/minecraft/block/cauldron/CauldronBehavior;m_ubhkjwij(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;}
+    * @mapping {@literal named cleanShulkerBox Lnet/minecraft/block/cauldron/CauldronBehavior;cleanShulkerBox(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;}
     */
-   private static ActionResult m_ubhkjwij(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand arg5, ItemStack stack) {
+   private static ActionResult cleanShulkerBox(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, ItemStack stack) {
       Block lv = Block.getBlockFromItem(stack.getItem());
       if (!(lv instanceof ShulkerBoxBlock)) {
-         return ActionResult.f_nwhanehc;
+         return ActionResult.EMPTY_HAND;
       } else {
          if (!world.isClient) {
             ItemStack lv2 = stack.copyComponentsToNewStack(Blocks.SHULKER_BOX, 1);
-            player.setStackInHand(arg5, ItemUsage.exchangeStack(stack, player, lv2, false));
+            player.setStackInHand(hand, ItemUsage.exchangeStack(stack, player, lv2, false));
             player.incrementStat(Stats.CLEAN_SHULKER_BOX);
             LeveledCauldronBlock.decrementFluidLevel(state, world, pos);
          }
@@ -350,17 +350,17 @@
 
    /**
     * @mapping {@literal hashed m_qqxoejhi Lnet/minecraft/unmapped/C_hwbtrnnh;m_qqxoejhi(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 m_qqxoejhi Lnet/minecraft/block/cauldron/CauldronBehavior;m_qqxoejhi(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;}
+    * @mapping {@literal named cleanBanner Lnet/minecraft/block/cauldron/CauldronBehavior;cleanBanner(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;}
     */
-   private static ActionResult m_qqxoejhi(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand arg5, ItemStack stack) {
+   private static ActionResult cleanBanner(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, ItemStack stack) {
       BannerPatternsComponent lv = stack.getOrDefault(DataComponentTypes.BANNER_PATTERNS, BannerPatternsComponent.DEFAULT);
       if (lv.layers().isEmpty()) {
-         return ActionResult.f_nwhanehc;
+         return ActionResult.EMPTY_HAND;
       } else {
          if (!world.isClient) {
             ItemStack lv2 = stack.copyWithCount(1);
             lv2.set(DataComponentTypes.BANNER_PATTERNS, lv.removeLastLayer());
-            player.setStackInHand(arg5, ItemUsage.exchangeStack(stack, player, lv2, false));
+            player.setStackInHand(hand, ItemUsage.exchangeStack(stack, player, lv2, false));
             player.incrementStat(Stats.CLEAN_BANNER);
             LeveledCauldronBlock.decrementFluidLevel(state, world, pos);
          }
@@ -371,13 +371,13 @@
 
    /**
     * @mapping {@literal hashed m_vaydxxdu Lnet/minecraft/unmapped/C_hwbtrnnh;m_vaydxxdu(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 m_vaydxxdu Lnet/minecraft/block/cauldron/CauldronBehavior;m_vaydxxdu(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;}
+    * @mapping {@literal named cleanDyeable Lnet/minecraft/block/cauldron/CauldronBehavior;cleanDyeable(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;}
     */
-   private static ActionResult m_vaydxxdu(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand arg5, ItemStack stack) {
+   private static ActionResult cleanDyeable(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, ItemStack stack) {
       if (!stack.isIn(ItemTags.DYEABLE)) {
-         return ActionResult.f_nwhanehc;
+         return ActionResult.EMPTY_HAND;
       } else if (!stack.contains(DataComponentTypes.DYED_COLOR)) {
-         return ActionResult.f_nwhanehc;
+         return ActionResult.EMPTY_HAND;
       } else {
          if (!world.isClient) {
             stack.remove(DataComponentTypes.DYED_COLOR);
@@ -391,9 +391,9 @@
 
    /**
     * @mapping {@literal hashed m_nrpzjycd Lnet/minecraft/unmapped/C_hwbtrnnh;m_nrpzjycd(Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;)Z}
-    * @mapping {@literal named m_nrpzjycd Lnet/minecraft/block/cauldron/CauldronBehavior;m_nrpzjycd(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;)Z}
+    * @mapping {@literal named isUnderWater Lnet/minecraft/block/cauldron/CauldronBehavior;isUnderWater(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;)Z}
     */
-   private static boolean m_nrpzjycd(World world, BlockPos pos) {
+   private static boolean isUnderWater(World world, BlockPos pos) {
       FluidState lv = world.getFluidState(pos.up());
       return lv.isIn(FluidTags.WATER);
    }
diff -bur namedTargetSrc/net/minecraft/block/ChiseledBookshelfBlock.java namedSrc/net/minecraft/block/ChiseledBookshelfBlock.java
--- namedTargetSrc/net/minecraft/block/ChiseledBookshelfBlock.java	2024-08-29 20:04:30.232886989 +0000
+++ namedSrc/net/minecraft/block/ChiseledBookshelfBlock.java	2024-08-29 20:03:20.467809026 +0000
@@ -104,13 +104,13 @@
    protected ActionResult onInteract(ItemStack stack, BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult result) {
       if (world.getBlockEntity(pos) instanceof ChiseledBookshelfBlockEntity lv) {
          if (!stack.isIn(ItemTags.BOOKSHELF_BOOKS)) {
-            return ActionResult.f_nwhanehc;
+            return ActionResult.EMPTY_HAND;
          } else {
             OptionalInt optionalInt = this.getHitSlot(result, state);
             if (optionalInt.isEmpty()) {
                return ActionResult.PASS;
             } else if ((Boolean)state.get((Property)SLOT_OCCUPATION_PROPERTIES.get(optionalInt.getAsInt()))) {
-               return ActionResult.f_nwhanehc;
+               return ActionResult.EMPTY_HAND;
             } else {
                addBook(world, pos, player, lv, stack, optionalInt.getAsInt());
                return ActionResult.SUCCESS;
diff -bur namedTargetSrc/net/minecraft/block/CommandBlock.java namedSrc/net/minecraft/block/CommandBlock.java
--- namedTargetSrc/net/minecraft/block/CommandBlock.java	2024-08-29 20:04:30.396889556 +0000
+++ namedSrc/net/minecraft/block/CommandBlock.java	2024-08-29 20:03:20.671812126 +0000
@@ -16,7 +16,6 @@
 import net.minecraft.state.property.BooleanProperty;
 import net.minecraft.state.property.DirectionProperty;
 import net.minecraft.state.property.Properties;
-import net.minecraft.unmapped.C_ctatbkvy;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.BlockMirror;
 import net.minecraft.util.BlockRotation;
@@ -28,6 +27,7 @@
 import net.minecraft.world.CommandBlockExecutor;
 import net.minecraft.world.GameRules;
 import net.minecraft.world.World;
+import net.minecraft.world.logic.Orientation;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 
@@ -96,28 +96,28 @@
     * Mapping not found
     */
    @Override
-   protected void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, @Nullable C_ctatbkvy arg5, boolean notify) {
+   protected void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, @Nullable Orientation orientation, boolean notify) {
       if (!world.isClient) {
          if (world.getBlockEntity(pos) instanceof CommandBlockBlockEntity lv2) {
-            this.m_wewzxquc(world, pos, lv2, world.isReceivingRedstonePower(pos));
+            this.update(world, pos, lv2, world.isReceivingRedstonePower(pos));
          }
       }
    }
 
    /**
     * @mapping {@literal hashed m_wewzxquc Lnet/minecraft/unmapped/C_tngfqham;m_wewzxquc(Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_qpgfeghp;Z)V}
-    * @mapping {@literal named m_wewzxquc Lnet/minecraft/block/CommandBlock;m_wewzxquc(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/entity/CommandBlockBlockEntity;Z)V}
+    * @mapping {@literal named update Lnet/minecraft/block/CommandBlock;update(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/entity/CommandBlockBlockEntity;Z)V}
     */
-   private void m_wewzxquc(World world, BlockPos pos, CommandBlockBlockEntity arg3, boolean powered) {
-      boolean bl2 = arg3.isPowered();
+   private void update(World world, BlockPos pos, CommandBlockBlockEntity blockEntity, boolean powered) {
+      boolean bl2 = blockEntity.isPowered();
       if (powered != bl2) {
-         arg3.setPowered(powered);
+         blockEntity.setPowered(powered);
          if (powered) {
-            if (arg3.isAuto() || arg3.getCommandBlockType() == CommandBlockBlockEntity.Type.SEQUENCE) {
+            if (blockEntity.isAuto() || blockEntity.getCommandBlockType() == CommandBlockBlockEntity.Type.SEQUENCE) {
                return;
             }
 
-            arg3.updateConditionMet();
+            blockEntity.updateConditionMet();
             world.scheduleBlockTick(pos, this, 1);
          }
       }
@@ -215,7 +215,7 @@
             }
 
             boolean bl = world.isReceivingRedstonePower(pos);
-            this.m_wewzxquc(world, pos, lv2, bl);
+            this.update(world, pos, lv2, bl);
          }
       }
    }
diff -bur namedTargetSrc/net/minecraft/block/CrafterBlock.java namedSrc/net/minecraft/block/CrafterBlock.java
--- namedTargetSrc/net/minecraft/block/CrafterBlock.java	2024-08-29 20:04:30.292887928 +0000
+++ namedSrc/net/minecraft/block/CrafterBlock.java	2024-08-29 20:03:20.555810363 +0000
@@ -25,7 +25,6 @@
 import net.minecraft.state.property.BooleanProperty;
 import net.minecraft.state.property.EnumProperty;
 import net.minecraft.state.property.Properties;
-import net.minecraft.unmapped.C_ctatbkvy;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.BlockMirror;
 import net.minecraft.util.BlockRotation;
@@ -38,6 +37,7 @@
 import net.minecraft.util.random.RandomGenerator;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldEvents;
+import net.minecraft.world.logic.Orientation;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -129,7 +129,7 @@
     * Mapping not found
     */
    @Override
-   protected void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, @Nullable C_ctatbkvy arg5, boolean notify) {
+   protected void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, @Nullable Orientation orientation, boolean notify) {
       boolean bl2 = world.isReceivingRedstonePower(pos);
       boolean bl3 = (Boolean)state.get(TRIGGERED);
       BlockEntity lv = world.getBlockEntity(pos);
diff -bur namedTargetSrc/net/minecraft/block/DecoratedPotBlock.java namedSrc/net/minecraft/block/DecoratedPotBlock.java
--- namedTargetSrc/net/minecraft/block/DecoratedPotBlock.java	2024-08-29 20:04:30.264887490 +0000
+++ namedSrc/net/minecraft/block/DecoratedPotBlock.java	2024-08-29 20:03:20.519809817 +0000
@@ -169,7 +169,7 @@
                world.emitGameEvent(player, GameEvent.BLOCK_CHANGE, pos);
                return ActionResult.SUCCESS;
             } else {
-               return ActionResult.f_nwhanehc;
+               return ActionResult.EMPTY_HAND;
             }
          }
       } else {
diff -bur namedTargetSrc/net/minecraft/block/dispenser/DispenserBlock.java namedSrc/net/minecraft/block/dispenser/DispenserBlock.java
--- namedTargetSrc/net/minecraft/block/dispenser/DispenserBlock.java	2024-08-29 20:04:30.324888429 +0000
+++ namedSrc/net/minecraft/block/dispenser/DispenserBlock.java	2024-08-29 20:03:20.599811032 +0000
@@ -26,7 +26,6 @@
 import net.minecraft.state.property.BooleanProperty;
 import net.minecraft.state.property.DirectionProperty;
 import net.minecraft.state.property.Properties;
-import net.minecraft.unmapped.C_ctatbkvy;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.BlockMirror;
 import net.minecraft.util.BlockRotation;
@@ -42,6 +41,7 @@
 import net.minecraft.world.World;
 import net.minecraft.world.WorldEvents;
 import net.minecraft.world.event.GameEvent;
+import net.minecraft.world.logic.Orientation;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 
@@ -168,7 +168,7 @@
     * Mapping not found
     */
    @Override
-   protected void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, @Nullable C_ctatbkvy arg5, boolean notify) {
+   protected void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, @Nullable Orientation orientation, boolean notify) {
       boolean bl2 = world.isReceivingRedstonePower(pos) || world.isReceivingRedstonePower(pos.up());
       boolean bl3 = (Boolean)state.get(TRIGGERED);
       if (bl2 && !bl3) {
diff -bur namedTargetSrc/net/minecraft/block/DoorBlock.java namedSrc/net/minecraft/block/DoorBlock.java
--- namedTargetSrc/net/minecraft/block/DoorBlock.java	2024-08-29 20:04:30.432890119 +0000
+++ namedSrc/net/minecraft/block/DoorBlock.java	2024-08-29 20:03:20.707812672 +0000
@@ -18,7 +18,6 @@
 import net.minecraft.state.property.DirectionProperty;
 import net.minecraft.state.property.EnumProperty;
 import net.minecraft.state.property.Properties;
-import net.minecraft.unmapped.C_ctatbkvy;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.BlockMirror;
 import net.minecraft.util.BlockRotation;
@@ -34,6 +33,7 @@
 import net.minecraft.world.WorldView;
 import net.minecraft.world.event.GameEvent;
 import net.minecraft.world.explosion.Explosion;
+import net.minecraft.world.logic.Orientation;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -318,7 +318,7 @@
     * Mapping not found
     */
    @Override
-   protected void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, @Nullable C_ctatbkvy arg5, boolean notify) {
+   protected void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, @Nullable Orientation orientation, boolean notify) {
       boolean bl2 = world.isReceivingRedstonePower(pos)
          || world.isReceivingRedstonePower(pos.offset(state.get(HALF) == DoubleBlockHalf.LOWER ? Direction.UP : Direction.DOWN));
       if (!this.getDefaultState().isOf(block) && bl2 != (Boolean)state.get(POWERED)) {

github-actions · 2024-08-29T20:04:33Z

View the diff here (2/3):

diff -bur namedTargetSrc/net/minecraft/block/entity/AbstractFurnaceBlockEntity.java namedSrc/net/minecraft/block/entity/AbstractFurnaceBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/AbstractFurnaceBlockEntity.java	2024-08-29 20:04:30.292887928 +0000
+++ namedSrc/net/minecraft/block/entity/AbstractFurnaceBlockEntity.java	2024-08-29 20:03:20.559810424 +0000
@@ -29,7 +29,6 @@
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.unmapped.C_fcquvjby;
-import net.minecraft.unmapped.C_smdnyqwx;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.collection.DefaultedList;
 import net.minecraft.util.math.BlockPos;
@@ -110,9 +109,10 @@
     */
    public static final int BURN_DECAY_RATE = 2;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_rclefyez Lnet/minecraft/unmapped/C_dlxbwxyf;f_rclefyez:I}
+    * @mapping {@literal named UNKNOWN_LIT_DURATION Lnet/minecraft/block/entity/AbstractFurnaceBlockEntity;UNKNOWN_LIT_DURATION:I}
     */
-   public static final int f_rclefyez = 0;
+   public static final int UNKNOWN_LIT_DURATION = 0;
    /**
     * @mapping {@literal hashed f_ymhvwhvo Lnet/minecraft/unmapped/C_dlxbwxyf;f_ymhvwhvo:Lnet/minecraft/unmapped/C_rnrfftze;}
     * @mapping {@literal named inventory Lnet/minecraft/block/entity/AbstractFurnaceBlockEntity;inventory:Lnet/minecraft/util/collection/DefaultedList;}
@@ -270,7 +270,7 @@
       boolean bl3 = !lv2.isEmpty();
       boolean bl4 = !lv.isEmpty();
       if (blockEntity.fuelTime == 0) {
-         blockEntity.fuelTime = blockEntity.getFuelTime(world.m_cgohzhbh(), lv);
+         blockEntity.fuelTime = blockEntity.getFuelTime(world.getFuelTimes(), lv);
       }
 
       if (blockEntity.isBurning() || bl4 && bl3) {
@@ -283,7 +283,7 @@
 
          int i = blockEntity.getMaxCountPerStack();
          if (!blockEntity.isBurning() && canAcceptRecipeOutput(world.getRegistryManager(), lv3, blockEntity.inventory, i)) {
-            blockEntity.burnTime = blockEntity.getFuelTime(world.m_cgohzhbh(), lv);
+            blockEntity.burnTime = blockEntity.getFuelTime(world.getFuelTimes(), lv);
             blockEntity.fuelTime = blockEntity.burnTime;
             if (blockEntity.isBurning()) {
                bl2 = true;
@@ -381,10 +381,10 @@
 
    /**
     * @mapping {@literal hashed m_zeyvozgy Lnet/minecraft/unmapped/C_dlxbwxyf;m_zeyvozgy(Lnet/minecraft/unmapped/C_smdnyqwx;Lnet/minecraft/unmapped/C_sddaxwyk;)I}
-    * @mapping {@literal named getFuelTime Lnet/minecraft/block/entity/AbstractFurnaceBlockEntity;getFuelTime(Lnet/minecraft/unmapped/C_smdnyqwx;Lnet/minecraft/item/ItemStack;)I}
+    * @mapping {@literal named getFuelTime Lnet/minecraft/block/entity/AbstractFurnaceBlockEntity;getFuelTime(Lnet/minecraft/block/entity/FuelTimes;Lnet/minecraft/item/ItemStack;)I}
     */
-   protected int getFuelTime(C_smdnyqwx arg, ItemStack fuel) {
-      return arg.m_frvdpffp(fuel);
+   protected int getFuelTime(FuelTimes fuelTimes, ItemStack fuel) {
+      return fuelTimes.getFuelTime(fuel);
    }
 
    /**
@@ -475,7 +475,7 @@
          return true;
       } else {
          ItemStack lv = this.inventory.get(1);
-         return this.world.m_cgohzhbh().m_fgbydbbm(stack) || stack.isOf(Items.BUCKET) && !lv.isOf(Items.BUCKET);
+         return this.world.getFuelTimes().isFuel(stack) || stack.isOf(Items.BUCKET) && !lv.isOf(Items.BUCKET);
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/block/entity/BlastFurnaceBlockEntity.java namedSrc/net/minecraft/block/entity/BlastFurnaceBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/BlastFurnaceBlockEntity.java	2024-08-29 20:04:30.288887866 +0000
+++ namedSrc/net/minecraft/block/entity/BlastFurnaceBlockEntity.java	2024-08-29 20:03:20.551810303 +0000
@@ -7,7 +7,6 @@
 import net.minecraft.screen.BlastFurnaceScreenHandler;
 import net.minecraft.screen.ScreenHandler;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_smdnyqwx;
 import net.minecraft.util.math.BlockPos;
 
 /**
@@ -35,8 +34,8 @@
     * Mapping not found
     */
    @Override
-   protected int getFuelTime(C_smdnyqwx arg, ItemStack stack) {
-      return super.getFuelTime(arg, stack) / 2;
+   protected int getFuelTime(FuelTimes fuelTimes, ItemStack stack) {
+      return super.getFuelTime(fuelTimes, stack) / 2;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/entity/BlockEntity.java namedSrc/net/minecraft/block/entity/BlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/BlockEntity.java	2024-08-29 20:04:30.288887866 +0000
+++ namedSrc/net/minecraft/block/entity/BlockEntity.java	2024-08-29 20:03:20.551810303 +0000
@@ -77,25 +77,25 @@
    public BlockEntity(BlockEntityType<?> type, BlockPos pos, BlockState state) {
       this.type = type;
       this.pos = pos.toImmutable();
-      this.m_aezsotnt(state);
+      this.validate(state);
       this.cachedState = state;
    }
 
    /**
     * @mapping {@literal hashed m_aezsotnt Lnet/minecraft/unmapped/C_kvegafmh;m_aezsotnt(Lnet/minecraft/unmapped/C_txtbiemp;)V}
-    * @mapping {@literal named m_aezsotnt Lnet/minecraft/block/entity/BlockEntity;m_aezsotnt(Lnet/minecraft/block/BlockState;)V}
+    * @mapping {@literal named validate Lnet/minecraft/block/entity/BlockEntity;validate(Lnet/minecraft/block/BlockState;)V}
     */
-   private void m_aezsotnt(BlockState state) {
-      if (!this.m_ntnawmxi(state)) {
-         throw new IllegalStateException("Invalid block entity " + this.m_bczwkfko() + " state at " + this.pos + ", got " + state);
+   private void validate(BlockState state) {
+      if (!this.supportsState(state)) {
+         throw new IllegalStateException("Invalid block entity " + this.getName() + " state at " + this.pos + ", got " + state);
       }
    }
 
    /**
     * @mapping {@literal hashed m_ntnawmxi Lnet/minecraft/unmapped/C_kvegafmh;m_ntnawmxi(Lnet/minecraft/unmapped/C_txtbiemp;)Z}
-    * @mapping {@literal named m_ntnawmxi Lnet/minecraft/block/entity/BlockEntity;m_ntnawmxi(Lnet/minecraft/block/BlockState;)Z}
+    * @mapping {@literal named supportsState Lnet/minecraft/block/entity/BlockEntity;supportsState(Lnet/minecraft/block/BlockState;)Z}
     */
-   public boolean m_ntnawmxi(BlockState state) {
+   public boolean supportsState(BlockState state) {
       return this.type.supports(state);
    }
 
@@ -409,7 +409,7 @@
     * @mapping {@literal named populateCrashReport Lnet/minecraft/block/entity/BlockEntity;populateCrashReport(Lnet/minecraft/util/crash/CrashReportSection;)V}
     */
    public void populateCrashReport(CrashReportSection crashReportSection) {
-      crashReportSection.add("Name", this::m_bczwkfko);
+      crashReportSection.add("Name", this::getName);
       if (this.world != null) {
          CrashReportSection.addBlockInfo(crashReportSection, this.world, this.pos, this.getCachedState());
          CrashReportSection.addBlockInfo(crashReportSection, this.world, this.pos, this.world.getBlockState(this.pos));
@@ -417,9 +417,10 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_bczwkfko Lnet/minecraft/unmapped/C_kvegafmh;m_bczwkfko()Ljava/lang/String;}
+    * @mapping {@literal named getName Lnet/minecraft/block/entity/BlockEntity;getName()Ljava/lang/String;}
     */
-   private String m_bczwkfko() {
+   private String getName() {
       return Registries.BLOCK_ENTITY_TYPE.getId(this.getType()) + " // " + this.getClass().getCanonicalName();
    }
 
@@ -445,7 +446,7 @@
     */
    @Deprecated
    public void setCachedState(BlockState state) {
-      this.m_aezsotnt(state);
+      this.validate(state);
       this.cachedState = state;
    }
 
diff -bur namedTargetSrc/net/minecraft/block/entity/BlockEntityType.java namedSrc/net/minecraft/block/entity/BlockEntityType.java
--- namedTargetSrc/net/minecraft/block/entity/BlockEntityType.java	2024-08-29 20:04:30.384889368 +0000
+++ namedSrc/net/minecraft/block/entity/BlockEntityType.java	2024-08-29 20:03:20.663812004 +0000
@@ -5,6 +5,7 @@
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
+import net.minecraft.block.entity.vault.VaultBlockEntity;
 import net.minecraft.datafixer.TypeReferences;
 import net.minecraft.registry.Holder;
 import net.minecraft.registry.Registries;
@@ -430,13 +431,13 @@
     * @mapping {@literal hashed m_jzurwqld Lnet/minecraft/unmapped/C_wgqvodus;m_jzurwqld(Ljava/lang/String;Lnet/minecraft/unmapped/C_wgqvodus$C_fcfboksc;[Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_wgqvodus;}
     * @mapping {@literal named create Lnet/minecraft/block/entity/BlockEntityType;create(Ljava/lang/String;Lnet/minecraft/block/entity/BlockEntityType$BlockEntityFactory;[Lnet/minecraft/block/Block;)Lnet/minecraft/block/entity/BlockEntityType;}
     */
-   private static <T extends BlockEntity> BlockEntityType<T> create(String id, BlockEntityType.BlockEntityFactory<? extends T> arg, Block... args) {
-      if (args.length == 0) {
+   private static <T extends BlockEntity> BlockEntityType<T> create(String id, BlockEntityType.BlockEntityFactory<? extends T> factory, Block... blocks) {
+      if (blocks.length == 0) {
          LOGGER.warn("Block entity type {} requires at least one valid block to be defined!", id);
       }
 
       Util.getChoiceType(TypeReferences.BLOCK_ENTITY, id);
-      return Registry.register(Registries.BLOCK_ENTITY_TYPE, id, new BlockEntityType<>(arg, Set.of(args)));
+      return Registry.register(Registries.BLOCK_ENTITY_TYPE, id, new BlockEntityType<>(factory, Set.of(blocks)));
    }
 
    /**
Only in namedSrc/net/minecraft/block/entity: FuelTimes.java
diff -bur namedTargetSrc/net/minecraft/block/entity/PistonBlockEntity.java namedSrc/net/minecraft/block/entity/PistonBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/PistonBlockEntity.java	2024-08-29 20:04:30.460890558 +0000
+++ namedSrc/net/minecraft/block/entity/PistonBlockEntity.java	2024-08-29 20:03:20.739813158 +0000
@@ -19,7 +19,6 @@
 import net.minecraft.registry.RegistryKeys;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.state.property.Properties;
-import net.minecraft.unmapped.C_psmtqbgv;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Box;
 import net.minecraft.util.math.Boxes;
@@ -30,6 +29,7 @@
 import net.minecraft.util.shape.VoxelShapes;
 import net.minecraft.world.BlockView;
 import net.minecraft.world.World;
+import net.minecraft.world.logic.ExperimentalRedstoneUtil;
 
 /**
  * A piston block entity represents the block being pushed by a piston.
@@ -424,15 +424,16 @@
             }
 
             this.world.setBlockState(this.pos, lv, Block.NOTIFY_ALL);
-            this.world.m_hzulzelc(this.pos, lv.getBlock(), C_psmtqbgv.m_tsbkkwwq(this.world, this.m_hjvaaomv(), null));
+            this.world.m_hzulzelc(this.pos, lv.getBlock(), ExperimentalRedstoneUtil.initialOrientation(this.world, this.getExtensionDirection(), null));
          }
       }
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_hjvaaomv Lnet/minecraft/unmapped/C_wpearmnv;m_hjvaaomv()Lnet/minecraft/unmapped/C_xpuuihxf;}
+    * @mapping {@literal named getExtensionDirection Lnet/minecraft/block/entity/PistonBlockEntity;getExtensionDirection()Lnet/minecraft/util/math/Direction;}
     */
-   public Direction m_hjvaaomv() {
+   public Direction getExtensionDirection() {
       return this.extending ? this.facing : this.facing.getOpposite();
    }
 
@@ -460,7 +461,7 @@
                   }
 
                   world.setBlockState(pos, lv, Block.NOTIFY_ALL | Block.MOVED);
-                  world.m_hzulzelc(pos, lv.getBlock(), C_psmtqbgv.m_tsbkkwwq(world, blockEntity.m_hjvaaomv(), null));
+                  world.m_hzulzelc(pos, lv.getBlock(), ExperimentalRedstoneUtil.initialOrientation(world, blockEntity.getExtensionDirection(), null));
                }
             }
          }
diff -bur namedTargetSrc/net/minecraft/block/entity/SmokerBlockEntity.java namedSrc/net/minecraft/block/entity/SmokerBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/SmokerBlockEntity.java	2024-08-29 20:04:30.296887990 +0000
+++ namedSrc/net/minecraft/block/entity/SmokerBlockEntity.java	2024-08-29 20:03:20.563810485 +0000
@@ -7,7 +7,6 @@
 import net.minecraft.screen.ScreenHandler;
 import net.minecraft.screen.SmokerScreenHandler;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_smdnyqwx;
 import net.minecraft.util.math.BlockPos;
 
 /**
@@ -35,8 +34,8 @@
     * Mapping not found
     */
    @Override
-   protected int getFuelTime(C_smdnyqwx arg, ItemStack stack) {
-      return super.getFuelTime(arg, stack) / 2;
+   protected int getFuelTime(FuelTimes fuelTimes, ItemStack stack) {
+      return super.getFuelTime(fuelTimes, stack) / 2;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/entity/TrappedChestBlockEntity.java namedSrc/net/minecraft/block/entity/TrappedChestBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/TrappedChestBlockEntity.java	2024-08-29 20:04:30.340888679 +0000
+++ namedSrc/net/minecraft/block/entity/TrappedChestBlockEntity.java	2024-08-29 20:03:20.619811335 +0000
@@ -3,11 +3,11 @@
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.TrappedChestBlock;
-import net.minecraft.unmapped.C_ctatbkvy;
-import net.minecraft.unmapped.C_psmtqbgv;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.world.World;
+import net.minecraft.world.logic.ExperimentalRedstoneUtil;
+import net.minecraft.world.logic.Orientation;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_bsidvvmo}
@@ -29,7 +29,7 @@
    protected void onInvOpenOrClose(World world, BlockPos pos, BlockState state, int oldViewerCount, int newViewerCount) {
       super.onInvOpenOrClose(world, pos, state, oldViewerCount, newViewerCount);
       if (oldViewerCount != newViewerCount) {
-         C_ctatbkvy lv = C_psmtqbgv.m_tsbkkwwq(world, ((Direction)state.get(TrappedChestBlock.FACING)).getOpposite(), Direction.UP);
+         Orientation lv = ExperimentalRedstoneUtil.initialOrientation(world, ((Direction)state.get(TrappedChestBlock.FACING)).getOpposite(), Direction.UP);
          Block lv2 = state.getBlock();
          world.m_hfhkmcni(pos, lv2, lv);
          world.m_hfhkmcni(pos.down(), lv2, lv);
Only in namedSrc/net/minecraft/block/entity: vault
Only in namedTargetSrc/net/minecraft/block/entity: VaultBlockEntity.java
diff -bur namedTargetSrc/net/minecraft/block/EntityShapeContext.java namedSrc/net/minecraft/block/EntityShapeContext.java
--- namedTargetSrc/net/minecraft/block/EntityShapeContext.java	2024-08-29 20:04:30.324888429 +0000
+++ namedSrc/net/minecraft/block/EntityShapeContext.java	2024-08-29 20:03:20.599811032 +0000
@@ -74,13 +74,13 @@
     * @mapping {@literal named <init> Lnet/minecraft/block/EntityShapeContext;<init>(Lnet/minecraft/entity/Entity;Z)V}
     */
    @Deprecated
-   protected EntityShapeContext(Entity arg, boolean bl) {
+   protected EntityShapeContext(Entity entity, boolean collidesWithFluid) {
       this(
-         arg.isDescending(),
-         arg.getY(),
-         arg instanceof LivingEntity ? ((LivingEntity)arg).getMainHandStack() : ItemStack.EMPTY,
-         bl ? state -> true : (arg instanceof LivingEntity ? ((LivingEntity)arg)::canWalkOnFluid : state -> false),
-         arg
+         entity.isDescending(),
+         entity.getY(),
+         entity instanceof LivingEntity ? ((LivingEntity)entity).getMainHandStack() : ItemStack.EMPTY,
+         collidesWithFluid ? state -> true : (entity instanceof LivingEntity ? ((LivingEntity)entity)::canWalkOnFluid : state -> false),
+         entity
       );
    }
 
@@ -101,11 +101,10 @@
    }
 
    /**
-    * @mapping {@literal hashed m_jwyjjkqk Lnet/minecraft/unmapped/C_qyrslpru;m_jwyjjkqk(Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_vxzrjtdu;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_zscvhwbd;}
-    * @mapping {@literal named m_jwyjjkqk Lnet/minecraft/block/EntityShapeContext;m_jwyjjkqk(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/CollisionView;Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/util/shape/VoxelShape;}
+    * Mapping not found
     */
    @Override
-   public VoxelShape m_jwyjjkqk(BlockState state, CollisionView world, BlockPos pos) {
+   public VoxelShape getCollisionShape(BlockState state, CollisionView world, BlockPos pos) {
       return state.getCollisionShape(world, pos, this);
    }
 
diff -bur namedTargetSrc/net/minecraft/block/enums/RailShape.java namedSrc/net/minecraft/block/enums/RailShape.java
--- namedTargetSrc/net/minecraft/block/enums/RailShape.java	2024-08-29 20:04:30.268887552 +0000
+++ namedSrc/net/minecraft/block/enums/RailShape.java	2024-08-29 20:03:20.523809877 +0000
@@ -89,9 +89,10 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_pgjcepuq Lnet/minecraft/unmapped/C_wqmdpcsg;m_pgjcepuq()Z}
+    * @mapping {@literal named isAscending Lnet/minecraft/block/enums/RailShape;isAscending()Z}
     */
-   public boolean m_pgjcepuq() {
+   public boolean isAscending() {
       return this == ASCENDING_NORTH || this == ASCENDING_EAST || this == ASCENDING_SOUTH || this == ASCENDING_WEST;
    }
 
diff -bur namedTargetSrc/net/minecraft/block/enums/TrialSpawnerState.java namedSrc/net/minecraft/block/enums/TrialSpawnerState.java
--- namedTargetSrc/net/minecraft/block/enums/TrialSpawnerState.java	2024-08-29 20:04:30.460890558 +0000
+++ namedSrc/net/minecraft/block/enums/TrialSpawnerState.java	2024-08-29 20:03:20.739813158 +0000
@@ -134,7 +134,7 @@
          case INACTIVE -> lv.getOrCreateDisplayEntity(logic, world, WAITING_FOR_PLAYERS) == null ? this : WAITING_FOR_PLAYERS;
          case WAITING_FOR_PLAYERS -> {
             if (!logic.canSpawnMobs(world)) {
-               lv.m_tpuunqmz();
+               lv.resetStatistics();
                yield this;
             } else if (!lv.hasSpawnData(logic, world.random)) {
                yield INACTIVE;
@@ -145,7 +145,7 @@
          }
          case ACTIVE -> {
             if (!logic.canSpawnMobs(world)) {
-               lv.m_tpuunqmz();
+               lv.resetStatistics();
                yield WAITING_FOR_PLAYERS;
             } else if (!lv.hasSpawnData(logic, world.random)) {
                yield INACTIVE;
diff -bur namedTargetSrc/net/minecraft/block/enums/VaultState.java namedSrc/net/minecraft/block/enums/VaultState.java
--- namedTargetSrc/net/minecraft/block/enums/VaultState.java	2024-08-29 20:04:30.320888366 +0000
+++ namedSrc/net/minecraft/block/enums/VaultState.java	2024-08-29 20:03:20.595810971 +0000
@@ -1,14 +1,14 @@
 package net.minecraft.block.enums;
 
 import net.minecraft.block.dispenser.ItemDispenserBehavior;
-import net.minecraft.block.entity.VaultBlockEntity;
+import net.minecraft.block.entity.vault.VaultBlockEntity;
+import net.minecraft.block.entity.vault.VaultConfig;
+import net.minecraft.block.entity.vault.VaultServerData;
+import net.minecraft.block.entity.vault.VaultSharedData;
 import net.minecraft.item.ItemStack;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.unmapped.C_cudfnjix;
-import net.minecraft.unmapped.C_czyoqmgb;
-import net.minecraft.unmapped.C_nsbycoiv;
 import net.minecraft.util.StringIdentifiable;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
@@ -26,13 +26,12 @@
     */
    INACTIVE("inactive", VaultState.LightLevel.HALF_LIT) {
       /**
-       * @mapping {@literal hashed m_ursykhkw Lnet/minecraft/unmapped/C_oocnpsfc$C_xojtcdhk;m_ursykhkw(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_cudfnjix;Lnet/minecraft/unmapped/C_czyoqmgb;Z)V}
-       * @mapping {@literal named m_ursykhkw Lnet/minecraft/block/enums/VaultState$C_xojtcdhk;m_ursykhkw(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/unmapped/C_cudfnjix;Lnet/minecraft/unmapped/C_czyoqmgb;Z)V}
+       * Mapping not found
        */
       @Override
-      protected void m_ursykhkw(ServerWorld world, BlockPos pos, C_cudfnjix arg3, C_czyoqmgb arg4, boolean bl) {
-         arg4.m_hazdghto(ItemStack.EMPTY);
-         world.syncWorldEvent(WorldEvents.VAULT_DEACTIVATED, pos, bl ? 1 : 0);
+      protected void enter(ServerWorld world, BlockPos pos, VaultConfig config, VaultSharedData data, boolean ominous) {
+         data.setDisplayTime(ItemStack.EMPTY);
+         world.syncWorldEvent(WorldEvents.VAULT_DEACTIVATED, pos, ominous ? 1 : 0);
       }
    },
    /**
@@ -41,16 +40,15 @@
     */
    ACTIVE("active", VaultState.LightLevel.LIT) {
       /**
-       * @mapping {@literal hashed m_ursykhkw Lnet/minecraft/unmapped/C_oocnpsfc$C_ybwowntt;m_ursykhkw(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_cudfnjix;Lnet/minecraft/unmapped/C_czyoqmgb;Z)V}
-       * @mapping {@literal named m_ursykhkw Lnet/minecraft/block/enums/VaultState$C_ybwowntt;m_ursykhkw(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/unmapped/C_cudfnjix;Lnet/minecraft/unmapped/C_czyoqmgb;Z)V}
+       * Mapping not found
        */
       @Override
-      protected void m_ursykhkw(ServerWorld world, BlockPos pos, C_cudfnjix arg3, C_czyoqmgb arg4, boolean bl) {
-         if (!arg4.m_urrekdhr()) {
-            VaultBlockEntity.C_vucktnfd.m_quliyibc(world, this, arg3, arg4, pos);
+      protected void enter(ServerWorld world, BlockPos pos, VaultConfig config, VaultSharedData data, boolean ominous) {
+         if (!data.hasDisplayItem()) {
+            VaultBlockEntity.Server.cycleDisplayItem(world, this, config, data, pos);
          }
 
-         world.syncWorldEvent(WorldEvents.VAULT_ACTIVATED, pos, bl ? 1 : 0);
+         world.syncWorldEvent(WorldEvents.VAULT_ACTIVATED, pos, ominous ? 1 : 0);
       }
    },
    /**
@@ -59,11 +57,10 @@
     */
    UNLOCKING("unlocking", VaultState.LightLevel.LIT) {
       /**
-       * @mapping {@literal hashed m_ursykhkw Lnet/minecraft/unmapped/C_oocnpsfc$C_dfpyoxng;m_ursykhkw(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_cudfnjix;Lnet/minecraft/unmapped/C_czyoqmgb;Z)V}
-       * @mapping {@literal named m_ursykhkw Lnet/minecraft/block/enums/VaultState$C_dfpyoxng;m_ursykhkw(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/unmapped/C_cudfnjix;Lnet/minecraft/unmapped/C_czyoqmgb;Z)V}
+       * Mapping not found
        */
       @Override
-      protected void m_ursykhkw(ServerWorld world, BlockPos pos, C_cudfnjix arg3, C_czyoqmgb arg4, boolean bl) {
+      protected void enter(ServerWorld world, BlockPos pos, VaultConfig config, VaultSharedData data, boolean ominous) {
          world.playSound(null, pos, SoundEvents.BLOCK_VAULT_INSERT_ITEM, SoundCategory.BLOCKS);
       }
    },
@@ -73,56 +70,60 @@
     */
    EJECTING("ejecting", VaultState.LightLevel.LIT) {
       /**
-       * @mapping {@literal hashed m_ursykhkw Lnet/minecraft/unmapped/C_oocnpsfc$C_dppkduof;m_ursykhkw(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_cudfnjix;Lnet/minecraft/unmapped/C_czyoqmgb;Z)V}
-       * @mapping {@literal named m_ursykhkw Lnet/minecraft/block/enums/VaultState$C_dppkduof;m_ursykhkw(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/unmapped/C_cudfnjix;Lnet/minecraft/unmapped/C_czyoqmgb;Z)V}
+       * Mapping not found
        */
       @Override
-      protected void m_ursykhkw(ServerWorld world, BlockPos pos, C_cudfnjix arg3, C_czyoqmgb arg4, boolean bl) {
+      protected void enter(ServerWorld world, BlockPos pos, VaultConfig config, VaultSharedData data, boolean ominous) {
          world.playSound(null, pos, SoundEvents.BLOCK_VAULT_OPEN_SHUTTER, SoundCategory.BLOCKS);
       }
 
       /**
-       * @mapping {@literal hashed m_nqdxtdvx Lnet/minecraft/unmapped/C_oocnpsfc$C_dppkduof;m_nqdxtdvx(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_cudfnjix;Lnet/minecraft/unmapped/C_czyoqmgb;)V}
-       * @mapping {@literal named m_nqdxtdvx Lnet/minecraft/block/enums/VaultState$C_dppkduof;m_nqdxtdvx(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/unmapped/C_cudfnjix;Lnet/minecraft/unmapped/C_czyoqmgb;)V}
+       * Mapping not found
        */
       @Override
-      protected void m_nqdxtdvx(ServerWorld world, BlockPos pos, C_cudfnjix arg3, C_czyoqmgb arg4) {
+      protected void exit(ServerWorld world, BlockPos pos, VaultConfig config, VaultSharedData data) {
          world.playSound(null, pos, SoundEvents.BLOCK_VAULT_CLOSE_SHUTTER, SoundCategory.BLOCKS);
       }
    };
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_fuzvquig Lnet/minecraft/unmapped/C_oocnpsfc;f_fuzvquig:I}
+    * @mapping {@literal named UPDATE_CONNECTED_PLAYERS_RATE Lnet/minecraft/block/enums/VaultState;UPDATE_CONNECTED_PLAYERS_RATE:I}
     */
-   private static final int f_fuzvquig = 20;
+   private static final int UPDATE_CONNECTED_PLAYERS_RATE = 20;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_kgtlpqca Lnet/minecraft/unmapped/C_oocnpsfc;f_kgtlpqca:I}
+    * @mapping {@literal named DELAY_BETWEEN_EJECTIONS Lnet/minecraft/block/enums/VaultState;DELAY_BETWEEN_EJECTIONS:I}
     */
-   private static final int f_kgtlpqca = 20;
+   private static final int DELAY_BETWEEN_EJECTIONS = 20;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_mwvnuftv Lnet/minecraft/unmapped/C_oocnpsfc;f_mwvnuftv:I}
+    * @mapping {@literal named DELAY_AFTER_LAST_EJECTION Lnet/minecraft/block/enums/VaultState;DELAY_AFTER_LAST_EJECTION:I}
     */
-   private static final int f_mwvnuftv = 20;
+   private static final int DELAY_AFTER_LAST_EJECTION = 20;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_qvnkkvgz Lnet/minecraft/unmapped/C_oocnpsfc;f_qvnkkvgz:I}
+    * @mapping {@literal named DELAY_BEFORE_FIRST_EJECTION Lnet/minecraft/block/enums/VaultState;DELAY_BEFORE_FIRST_EJECTION:I}
     */
-   private static final int f_qvnkkvgz = 20;
+   private static final int DELAY_BEFORE_FIRST_EJECTION = 20;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_tknehqen Lnet/minecraft/unmapped/C_oocnpsfc;f_tknehqen:Ljava/lang/String;}
+    * @mapping {@literal named name Lnet/minecraft/block/enums/VaultState;name:Ljava/lang/String;}
     */
-   private final String f_tknehqen;
+   private final String name;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_buwylsjr Lnet/minecraft/unmapped/C_oocnpsfc;f_buwylsjr:Lnet/minecraft/unmapped/C_oocnpsfc$C_pxwqlhgg;}
+    * @mapping {@literal named lightLevel Lnet/minecraft/block/enums/VaultState;lightLevel:Lnet/minecraft/block/enums/VaultState$LightLevel;}
     */
-   private final VaultState.LightLevel f_buwylsjr;
+   private final VaultState.LightLevel lightLevel;
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_oocnpsfc;<init>(Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/unmapped/C_oocnpsfc$C_pxwqlhgg;)V}
     * @mapping {@literal named <init> Lnet/minecraft/block/enums/VaultState;<init>(Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/block/enums/VaultState$LightLevel;)V}
     */
-   VaultState(final String string2, final VaultState.LightLevel arg) {
-      this.f_tknehqen = string2;
-      this.f_buwylsjr = arg;
+   VaultState(final String name, final VaultState.LightLevel lightLevel) {
+      this.name = name;
+      this.lightLevel = lightLevel;
    }
 
    /**
@@ -130,7 +131,7 @@
     */
    @Override
    public String asString() {
-      return this.f_tknehqen;
+      return this.name;
    }
 
    /**
@@ -138,32 +139,32 @@
     * @mapping {@literal named getLightLevel Lnet/minecraft/block/enums/VaultState;getLightLevel()I}
     */
    public int getLightLevel() {
-      return this.f_buwylsjr.luminance;
+      return this.lightLevel.luminance;
    }
 
    /**
     * @mapping {@literal hashed m_pjcjyvtm Lnet/minecraft/unmapped/C_oocnpsfc;m_pjcjyvtm(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_cudfnjix;Lnet/minecraft/unmapped/C_nsbycoiv;Lnet/minecraft/unmapped/C_czyoqmgb;)Lnet/minecraft/unmapped/C_oocnpsfc;}
-    * @mapping {@literal named m_pjcjyvtm Lnet/minecraft/block/enums/VaultState;m_pjcjyvtm(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/unmapped/C_cudfnjix;Lnet/minecraft/unmapped/C_nsbycoiv;Lnet/minecraft/unmapped/C_czyoqmgb;)Lnet/minecraft/block/enums/VaultState;}
+    * @mapping {@literal named getNextState Lnet/minecraft/block/enums/VaultState;getNextState(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/entity/vault/VaultConfig;Lnet/minecraft/block/entity/vault/VaultServerData;Lnet/minecraft/block/entity/vault/VaultSharedData;)Lnet/minecraft/block/enums/VaultState;}
     */
-   public VaultState m_pjcjyvtm(ServerWorld world, BlockPos pos, C_cudfnjix arg3, C_nsbycoiv arg4, C_czyoqmgb arg5) {
+   public VaultState getNextState(ServerWorld world, BlockPos pos, VaultConfig config, VaultServerData serverData, VaultSharedData sharedData) {
       return switch (this) {
-         case INACTIVE -> m_ekopnsum(world, pos, arg3, arg4, arg5, arg3.activationRange());
-         case ACTIVE -> m_ekopnsum(world, pos, arg3, arg4, arg5, arg3.deactivationRange());
+         case INACTIVE -> checkConnectedPlayers(world, pos, config, serverData, sharedData, config.activationRange());
+         case ACTIVE -> checkConnectedPlayers(world, pos, config, serverData, sharedData, config.deactivationRange());
          case UNLOCKING -> {
-            arg4.m_tluakpxm(world.getTime() + 20L);
+            serverData.pauseUpdatingUntil(world.getTime() + 20L);
             yield EJECTING;
          }
          case EJECTING -> {
-            if (arg4.m_exoybmys().isEmpty()) {
-               arg4.m_cklpjupn();
-               yield m_ekopnsum(world, pos, arg3, arg4, arg5, arg3.deactivationRange());
+            if (serverData.getItemsToEject().isEmpty()) {
+               serverData.finishedEjecting();
+               yield checkConnectedPlayers(world, pos, config, serverData, sharedData, config.deactivationRange());
             } else {
-               float f = arg4.m_hklwoidq();
-               this.m_pqwuptlz(world, pos, arg4.m_rgnbkaxh(), f);
-               arg5.m_hazdghto(arg4.m_vptzlleh());
-               boolean bl = arg4.m_exoybmys().isEmpty();
+               float f = serverData.getEjectionProgress();
+               this.ejectItem(world, pos, serverData.removeNextItemToEject(), f);
+               sharedData.setDisplayTime(serverData.getNextTimeToEject());
+               boolean bl = serverData.getItemsToEject().isEmpty();
                int i = bl ? 20 : 20;
-               arg4.m_tluakpxm(world.getTime() + (long)i);
+               serverData.pauseUpdatingUntil(world.getTime() + (long)i);
                yield EJECTING;
             }
          }
@@ -172,45 +173,47 @@
 
    /**
     * @mapping {@literal hashed m_ekopnsum Lnet/minecraft/unmapped/C_oocnpsfc;m_ekopnsum(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_cudfnjix;Lnet/minecraft/unmapped/C_nsbycoiv;Lnet/minecraft/unmapped/C_czyoqmgb;D)Lnet/minecraft/unmapped/C_oocnpsfc;}
-    * @mapping {@literal named m_ekopnsum Lnet/minecraft/block/enums/VaultState;m_ekopnsum(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/unmapped/C_cudfnjix;Lnet/minecraft/unmapped/C_nsbycoiv;Lnet/minecraft/unmapped/C_czyoqmgb;D)Lnet/minecraft/block/enums/VaultState;}
+    * @mapping {@literal named checkConnectedPlayers Lnet/minecraft/block/enums/VaultState;checkConnectedPlayers(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/entity/vault/VaultConfig;Lnet/minecraft/block/entity/vault/VaultServerData;Lnet/minecraft/block/entity/vault/VaultSharedData;D)Lnet/minecraft/block/enums/VaultState;}
     */
-   private static VaultState m_ekopnsum(ServerWorld world, BlockPos pos, C_cudfnjix arg3, C_nsbycoiv arg4, C_czyoqmgb arg5, double radius) {
-      arg5.m_uflgzskl(world, pos, arg4, arg3, radius);
-      arg4.m_tluakpxm(world.getTime() + 20L);
-      return arg5.m_jamphmeb() ? ACTIVE : INACTIVE;
+   private static VaultState checkConnectedPlayers(
+      ServerWorld world, BlockPos pos, VaultConfig config, VaultServerData serverData, VaultSharedData sharedData, double radius
+   ) {
+      sharedData.updateConnectedPlayers(world, pos, serverData, config, radius);
+      serverData.pauseUpdatingUntil(world.getTime() + 20L);
+      return sharedData.hasConnectedPlayers() ? ACTIVE : INACTIVE;
    }
 
    /**
     * @mapping {@literal hashed m_mecavbto Lnet/minecraft/unmapped/C_oocnpsfc;m_mecavbto(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_oocnpsfc;Lnet/minecraft/unmapped/C_cudfnjix;Lnet/minecraft/unmapped/C_czyoqmgb;Z)V}
-    * @mapping {@literal named m_mecavbto Lnet/minecraft/block/enums/VaultState;m_mecavbto(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/enums/VaultState;Lnet/minecraft/unmapped/C_cudfnjix;Lnet/minecraft/unmapped/C_czyoqmgb;Z)V}
+    * @mapping {@literal named transitionTo Lnet/minecraft/block/enums/VaultState;transitionTo(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/enums/VaultState;Lnet/minecraft/block/entity/vault/VaultConfig;Lnet/minecraft/block/entity/vault/VaultSharedData;Z)V}
     */
-   public void m_mecavbto(ServerWorld world, BlockPos pos, VaultState vaultState, C_cudfnjix arg4, C_czyoqmgb arg5, boolean bl) {
-      this.m_nqdxtdvx(world, pos, arg4, arg5);
-      vaultState.m_ursykhkw(world, pos, arg4, arg5, bl);
+   public void transitionTo(ServerWorld world, BlockPos pos, VaultState vaultState, VaultConfig config, VaultSharedData data, boolean ominous) {
+      this.exit(world, pos, config, data);
+      vaultState.enter(world, pos, config, data, ominous);
    }
 
    /**
     * @mapping {@literal hashed m_ursykhkw Lnet/minecraft/unmapped/C_oocnpsfc;m_ursykhkw(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_cudfnjix;Lnet/minecraft/unmapped/C_czyoqmgb;Z)V}
-    * @mapping {@literal named m_ursykhkw Lnet/minecraft/block/enums/VaultState;m_ursykhkw(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/unmapped/C_cudfnjix;Lnet/minecraft/unmapped/C_czyoqmgb;Z)V}
+    * @mapping {@literal named enter Lnet/minecraft/block/enums/VaultState;enter(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/entity/vault/VaultConfig;Lnet/minecraft/block/entity/vault/VaultSharedData;Z)V}
     */
-   protected void m_ursykhkw(ServerWorld world, BlockPos pos, C_cudfnjix arg3, C_czyoqmgb arg4, boolean bl) {
+   protected void enter(ServerWorld world, BlockPos pos, VaultConfig config, VaultSharedData data, boolean ominous) {
    }
 
    /**
     * @mapping {@literal hashed m_nqdxtdvx Lnet/minecraft/unmapped/C_oocnpsfc;m_nqdxtdvx(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_cudfnjix;Lnet/minecraft/unmapped/C_czyoqmgb;)V}
-    * @mapping {@literal named m_nqdxtdvx Lnet/minecraft/block/enums/VaultState;m_nqdxtdvx(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/unmapped/C_cudfnjix;Lnet/minecraft/unmapped/C_czyoqmgb;)V}
+    * @mapping {@literal named exit Lnet/minecraft/block/enums/VaultState;exit(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/entity/vault/VaultConfig;Lnet/minecraft/block/entity/vault/VaultSharedData;)V}
     */
-   protected void m_nqdxtdvx(ServerWorld world, BlockPos pos, C_cudfnjix arg3, C_czyoqmgb arg4) {
+   protected void exit(ServerWorld world, BlockPos pos, VaultConfig config, VaultSharedData data) {
    }
 
    /**
     * @mapping {@literal hashed m_pqwuptlz Lnet/minecraft/unmapped/C_oocnpsfc;m_pqwuptlz(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_sddaxwyk;F)V}
-    * @mapping {@literal named m_pqwuptlz Lnet/minecraft/block/enums/VaultState;m_pqwuptlz(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/item/ItemStack;F)V}
+    * @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 m_pqwuptlz(ServerWorld world, BlockPos pos, ItemStack stack, float f) {
+   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));
       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 * f);
+      world.playSound(null, pos, SoundEvents.BLOCK_VAULT_EJECT_ITEM, SoundCategory.BLOCKS, 1.0F, 0.8F + 0.4F * ejectionProgress);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/FenceGateBlock.java namedSrc/net/minecraft/block/FenceGateBlock.java
--- namedTargetSrc/net/minecraft/block/FenceGateBlock.java	2024-08-29 20:04:30.476890808 +0000
+++ namedSrc/net/minecraft/block/FenceGateBlock.java	2024-08-29 20:03:20.755813402 +0000
@@ -13,7 +13,6 @@
 import net.minecraft.state.StateManager;
 import net.minecraft.state.property.BooleanProperty;
 import net.minecraft.state.property.Properties;
-import net.minecraft.unmapped.C_ctatbkvy;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.math.BlockPos;
@@ -25,6 +24,7 @@
 import net.minecraft.world.WorldAccess;
 import net.minecraft.world.event.GameEvent;
 import net.minecraft.world.explosion.Explosion;
+import net.minecraft.world.logic.Orientation;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -310,7 +310,7 @@
     * Mapping not found
     */
    @Override
-   protected void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, @Nullable C_ctatbkvy arg5, boolean notify) {
+   protected void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, @Nullable Orientation orientation, boolean notify) {
       if (!world.isClient) {
          boolean bl2 = world.isReceivingRedstonePower(pos);
          if ((Boolean)state.get(POWERED) != bl2) {
diff -bur namedTargetSrc/net/minecraft/block/FlowerPotBlock.java namedSrc/net/minecraft/block/FlowerPotBlock.java
--- namedTargetSrc/net/minecraft/block/FlowerPotBlock.java	2024-08-29 20:04:30.384889368 +0000
+++ namedSrc/net/minecraft/block/FlowerPotBlock.java	2024-08-29 20:03:20.659811943 +0000
@@ -90,7 +90,7 @@
       BlockState lv2 = (stack.getItem() instanceof BlockItem lv ? (Block)CONTENT_TO_POTTED.getOrDefault(lv.getBlock(), Blocks.AIR) : Blocks.AIR)
          .getDefaultState();
       if (lv2.isAir()) {
-         return ActionResult.f_nwhanehc;
+         return ActionResult.EMPTY_HAND;
       } else if (!this.isEmpty()) {
          return ActionResult.CONSUME;
       } else {
diff -bur namedTargetSrc/net/minecraft/block/FluidBlock.java namedSrc/net/minecraft/block/FluidBlock.java
--- namedTargetSrc/net/minecraft/block/FluidBlock.java	2024-08-29 20:04:30.344888742 +0000
+++ namedSrc/net/minecraft/block/FluidBlock.java	2024-08-29 20:03:20.627811457 +0000
@@ -22,7 +22,6 @@
 import net.minecraft.state.StateManager;
 import net.minecraft.state.property.IntProperty;
 import net.minecraft.state.property.Properties;
-import net.minecraft.unmapped.C_ctatbkvy;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.random.RandomGenerator;
@@ -32,6 +31,7 @@
 import net.minecraft.world.World;
 import net.minecraft.world.WorldAccess;
 import net.minecraft.world.WorldEvents;
+import net.minecraft.world.logic.Orientation;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -220,7 +220,7 @@
     * Mapping not found
     */
    @Override
-   protected void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, @Nullable C_ctatbkvy arg5, boolean notify) {
+   protected void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, @Nullable Orientation orientation, boolean notify) {
       if (this.receiveNeighborFluids(world, pos, state)) {
          world.scheduleFluidTick(pos, state.getFluidState().getFluid(), this.fluid.getTickRate(world));
       }
diff -bur namedTargetSrc/net/minecraft/block/FrostedIceBlock.java namedSrc/net/minecraft/block/FrostedIceBlock.java
--- namedTargetSrc/net/minecraft/block/FrostedIceBlock.java	2024-08-29 20:04:30.248887239 +0000
+++ namedSrc/net/minecraft/block/FrostedIceBlock.java	2024-08-29 20:03:20.495809452 +0000
@@ -6,7 +6,6 @@
 import net.minecraft.state.StateManager;
 import net.minecraft.state.property.IntProperty;
 import net.minecraft.state.property.Properties;
-import net.minecraft.unmapped.C_ctatbkvy;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.MathHelper;
@@ -14,6 +13,7 @@
 import net.minecraft.world.BlockView;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldView;
+import net.minecraft.world.logic.Orientation;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -113,12 +113,12 @@
     * Mapping not found
     */
    @Override
-   protected void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, @Nullable C_ctatbkvy arg5, boolean notify) {
+   protected void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, @Nullable Orientation orientation, boolean notify) {
       if (block.getDefaultState().isOf(this) && this.canMelt(world, pos, 2)) {
          this.melt(state, world, pos);
       }
 
-      super.neighborUpdate(state, world, pos, block, arg5, notify);
+      super.neighborUpdate(state, world, pos, block, orientation, notify);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/HeavyCoreBlock.java namedSrc/net/minecraft/block/HeavyCoreBlock.java
--- namedTargetSrc/net/minecraft/block/HeavyCoreBlock.java	2024-08-29 20:04:30.328888492 +0000
+++ namedSrc/net/minecraft/block/HeavyCoreBlock.java	2024-08-29 20:03:20.603811092 +0000
@@ -30,9 +30,10 @@
     */
    private static final VoxelShape SHAPE = Block.createCuboidShape(4.0, 0.0, 4.0, 12.0, 8.0, 12.0);
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_unuqrijj Lnet/minecraft/unmapped/C_zjbzveiy;f_unuqrijj:Lnet/minecraft/unmapped/C_xhwijdsd;}
+    * @mapping {@literal named WATERLOGGED Lnet/minecraft/block/HeavyCoreBlock;WATERLOGGED:Lnet/minecraft/state/property/BooleanProperty;}
     */
-   public static final BooleanProperty f_unuqrijj = Properties.WATERLOGGED;
+   public static final BooleanProperty WATERLOGGED = Properties.WATERLOGGED;
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_zjbzveiy;<init>(Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;)V}
@@ -40,7 +41,7 @@
     */
    public HeavyCoreBlock(AbstractBlock.Settings settings) {
       super(settings);
-      this.setDefaultState(this.stateManager.getDefaultState().with(f_unuqrijj, Boolean.valueOf(false)));
+      this.setDefaultState(this.stateManager.getDefaultState().with(WATERLOGGED, Boolean.valueOf(false)));
    }
 
    /**
@@ -56,7 +57,7 @@
     */
    @Override
    protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
-      builder.add(f_unuqrijj);
+      builder.add(WATERLOGGED);
    }
 
    /**
@@ -66,7 +67,7 @@
    protected BlockState getStateForNeighborUpdate(
       BlockState state, Direction direction, BlockState neighborState, WorldAccess world, BlockPos pos, BlockPos neighborPos
    ) {
-      if ((Boolean)state.get(f_unuqrijj)) {
+      if ((Boolean)state.get(WATERLOGGED)) {
          world.scheduleFluidTick(pos, Fluids.WATER, Fluids.WATER.getTickRate(world));
       }
 
@@ -78,7 +79,7 @@
     */
    @Override
    protected FluidState getFluidState(BlockState state) {
-      return state.get(f_unuqrijj) ? Fluids.WATER.getStill(false) : super.getFluidState(state);
+      return state.get(WATERLOGGED) ? Fluids.WATER.getStill(false) : super.getFluidState(state);
    }
 
    /**
@@ -87,7 +88,7 @@
    @Override
    public BlockState getPlacementState(ItemPlacementContext ctx) {
       FluidState lv = ctx.getWorld().getFluidState(ctx.getBlockPos());
-      return this.getDefaultState().with(f_unuqrijj, Boolean.valueOf(lv.isOf(Fluids.WATER)));
+      return this.getDefaultState().with(WATERLOGGED, Boolean.valueOf(lv.isOf(Fluids.WATER)));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/HopperBlock.java namedSrc/net/minecraft/block/HopperBlock.java
--- namedTargetSrc/net/minecraft/block/HopperBlock.java	2024-08-29 20:04:30.460890558 +0000
+++ namedSrc/net/minecraft/block/HopperBlock.java	2024-08-29 20:03:20.739813158 +0000
@@ -15,7 +15,6 @@
 import net.minecraft.state.property.BooleanProperty;
 import net.minecraft.state.property.DirectionProperty;
 import net.minecraft.state.property.Properties;
-import net.minecraft.unmapped.C_ctatbkvy;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.BlockMirror;
 import net.minecraft.util.BlockRotation;
@@ -28,6 +27,7 @@
 import net.minecraft.util.shape.VoxelShapes;
 import net.minecraft.world.BlockView;
 import net.minecraft.world.World;
+import net.minecraft.world.logic.Orientation;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -238,7 +238,7 @@
     * Mapping not found
     */
    @Override
-   protected void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, @Nullable C_ctatbkvy arg5, boolean notify) {
+   protected void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, @Nullable Orientation orientation, boolean notify) {
       this.updateEnabled(world, pos, state);
    }
 
diff -bur namedTargetSrc/net/minecraft/block/JukeboxBlock.java namedSrc/net/minecraft/block/JukeboxBlock.java
--- namedTargetSrc/net/minecraft/block/JukeboxBlock.java	2024-08-29 20:04:30.296887990 +0000
+++ namedSrc/net/minecraft/block/JukeboxBlock.java	2024-08-29 20:03:20.563810485 +0000
@@ -87,11 +87,11 @@
    @Override
    protected ActionResult onInteract(ItemStack stack, BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult result) {
       if ((Boolean)state.get(HAS_RECORD)) {
-         return ActionResult.f_nwhanehc;
+         return ActionResult.EMPTY_HAND;
       } else {
          ItemStack lv = player.getStackInHand(hand);
          ActionResult lv2 = JukeboxPlayableComponent.tryPlayStack(world, pos, lv, player);
-         return (ActionResult)(!lv2.isAccepted() ? ActionResult.f_nwhanehc : lv2);
+         return (ActionResult)(!lv2.isAccepted() ? ActionResult.EMPTY_HAND : lv2);
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/block/LecternBlock.java namedSrc/net/minecraft/block/LecternBlock.java
--- namedTargetSrc/net/minecraft/block/LecternBlock.java	2024-08-29 20:04:30.348888805 +0000
+++ namedSrc/net/minecraft/block/LecternBlock.java	2024-08-29 20:03:20.627811457 +0000
@@ -22,8 +22,6 @@
 import net.minecraft.state.property.BooleanProperty;
 import net.minecraft.state.property.DirectionProperty;
 import net.minecraft.state.property.Properties;
-import net.minecraft.unmapped.C_ctatbkvy;
-import net.minecraft.unmapped.C_psmtqbgv;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.BlockMirror;
 import net.minecraft.util.BlockRotation;
@@ -38,6 +36,8 @@
 import net.minecraft.world.World;
 import net.minecraft.world.WorldEvents;
 import net.minecraft.world.event.GameEvent;
+import net.minecraft.world.logic.ExperimentalRedstoneUtil;
+import net.minecraft.world.logic.Orientation;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -320,7 +320,7 @@
     * @mapping {@literal named updateNeighborAlways Lnet/minecraft/block/LecternBlock;updateNeighborAlways(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)V}
     */
    private static void updateNeighborAlways(World world, BlockPos pos, BlockState state) {
-      C_ctatbkvy lv = C_psmtqbgv.m_tsbkkwwq(world, ((Direction)state.get(FACING)).getOpposite(), Direction.UP);
+      Orientation lv = ExperimentalRedstoneUtil.initialOrientation(world, ((Direction)state.get(FACING)).getOpposite(), Direction.UP);
       world.m_hfhkmcni(pos.down(), state.getBlock(), lv);
    }
 
@@ -419,11 +419,11 @@
    @Override
    protected ActionResult onInteract(ItemStack stack, BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult result) {
       if ((Boolean)state.get(HAS_BOOK)) {
-         return ActionResult.f_nwhanehc;
+         return ActionResult.EMPTY_HAND;
       } else if (stack.isIn(ItemTags.LECTERN_BOOKS)) {
          return (ActionResult)(putBookIfAbsent(player, world, pos, state, stack) ? ActionResult.SUCCESS : ActionResult.PASS);
       } else {
-         return (ActionResult)(stack.isEmpty() && hand == Hand.MAIN_HAND ? ActionResult.PASS : ActionResult.f_nwhanehc);
+         return (ActionResult)(stack.isEmpty() && hand == Hand.MAIN_HAND ? ActionResult.PASS : ActionResult.EMPTY_HAND);
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/block/LeverBlock.java namedSrc/net/minecraft/block/LeverBlock.java
--- namedTargetSrc/net/minecraft/block/LeverBlock.java	2024-08-29 20:04:30.492891058 +0000
+++ namedSrc/net/minecraft/block/LeverBlock.java	2024-08-29 20:03:20.775813706 +0000
@@ -12,8 +12,6 @@
 import net.minecraft.state.StateManager;
 import net.minecraft.state.property.BooleanProperty;
 import net.minecraft.state.property.Properties;
-import net.minecraft.unmapped.C_ctatbkvy;
-import net.minecraft.unmapped.C_psmtqbgv;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.math.BlockPos;
@@ -25,6 +23,8 @@
 import net.minecraft.world.WorldAccess;
 import net.minecraft.world.event.GameEvent;
 import net.minecraft.world.explosion.Explosion;
+import net.minecraft.world.logic.ExperimentalRedstoneUtil;
+import net.minecraft.world.logic.Orientation;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -272,7 +272,7 @@
     */
    private void updateNeighbors(BlockState state, World world, BlockPos pos) {
       Direction lv = getDirection(state).getOpposite();
-      C_ctatbkvy lv2 = C_psmtqbgv.m_tsbkkwwq(world, lv, lv.getAxis().isHorizontal() ? Direction.UP : state.get(FACING));
+      Orientation lv2 = ExperimentalRedstoneUtil.initialOrientation(world, lv, lv.getAxis().isHorizontal() ? Direction.UP : state.get(FACING));
       world.m_hfhkmcni(pos, this, lv2);
       world.m_hfhkmcni(pos.offset(lv), this, lv2);
    }
diff -bur namedTargetSrc/net/minecraft/block/LightBlock.java namedSrc/net/minecraft/block/LightBlock.java
--- namedTargetSrc/net/minecraft/block/LightBlock.java	2024-08-29 20:04:30.364889055 +0000
+++ namedSrc/net/minecraft/block/LightBlock.java	2024-08-29 20:03:20.643811700 +0000
@@ -87,7 +87,7 @@
    protected ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, BlockHitResult result) {
       if (!world.isClient && player.isCreativeLevelTwoOp()) {
          world.setBlockState(pos, state.cycle(LEVEL_15), Block.NOTIFY_LISTENERS);
-         return ActionResult.f_pkwbrwkg;
+         return ActionResult.SUCCESS_SERVER;
       } else {
          return ActionResult.CONSUME;
       }
diff -bur namedTargetSrc/net/minecraft/block/LightningRodBlock.java namedSrc/net/minecraft/block/LightningRodBlock.java
--- namedTargetSrc/net/minecraft/block/LightningRodBlock.java	2024-08-29 20:04:30.240887114 +0000
+++ namedSrc/net/minecraft/block/LightningRodBlock.java	2024-08-29 20:03:20.475809148 +0000
@@ -10,7 +10,6 @@
 import net.minecraft.state.StateManager;
 import net.minecraft.state.property.BooleanProperty;
 import net.minecraft.state.property.Properties;
-import net.minecraft.unmapped.C_psmtqbgv;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.int_provider.UniformIntProvider;
@@ -20,6 +19,7 @@
 import net.minecraft.world.World;
 import net.minecraft.world.WorldAccess;
 import net.minecraft.world.WorldEvents;
+import net.minecraft.world.logic.ExperimentalRedstoneUtil;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_vhnebwfj}
@@ -145,7 +145,7 @@
     */
    private void updateNeighbors(BlockState state, World world, BlockPos pos) {
       Direction lv = ((Direction)state.get(FACING)).getOpposite();
-      world.m_hfhkmcni(pos.offset(lv), this, C_psmtqbgv.m_tsbkkwwq(world, lv, null));
+      world.m_hfhkmcni(pos.offset(lv), this, ExperimentalRedstoneUtil.initialOrientation(world, lv, null));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/NoteBlock.java namedSrc/net/minecraft/block/NoteBlock.java
--- namedTargetSrc/net/minecraft/block/NoteBlock.java	2024-08-29 20:04:30.412889806 +0000
+++ namedSrc/net/minecraft/block/NoteBlock.java	2024-08-29 20:03:20.687812369 +0000
@@ -18,7 +18,6 @@
 import net.minecraft.state.property.EnumProperty;
 import net.minecraft.state.property.IntProperty;
 import net.minecraft.state.property.Properties;
-import net.minecraft.unmapped.C_ctatbkvy;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
 import net.minecraft.util.Identifier;
@@ -28,6 +27,7 @@
 import net.minecraft.world.World;
 import net.minecraft.world.WorldAccess;
 import net.minecraft.world.event.GameEvent;
+import net.minecraft.world.logic.Orientation;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -118,7 +118,7 @@
     * Mapping not found
     */
    @Override
-   protected void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, @Nullable C_ctatbkvy arg5, boolean notify) {
+   protected void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, @Nullable Orientation orientation, boolean notify) {
       boolean bl2 = world.isReceivingRedstonePower(pos);
       if (bl2 != (Boolean)state.get(POWERED)) {
          if (bl2) {
diff -bur namedTargetSrc/net/minecraft/block/ObserverBlock.java namedSrc/net/minecraft/block/ObserverBlock.java
--- namedTargetSrc/net/minecraft/block/ObserverBlock.java	2024-08-29 20:04:30.400889618 +0000
+++ namedSrc/net/minecraft/block/ObserverBlock.java	2024-08-29 20:03:20.675812186 +0000
@@ -6,8 +6,6 @@
 import net.minecraft.state.StateManager;
 import net.minecraft.state.property.BooleanProperty;
 import net.minecraft.state.property.Properties;
-import net.minecraft.unmapped.C_ctatbkvy;
-import net.minecraft.unmapped.C_psmtqbgv;
 import net.minecraft.util.BlockMirror;
 import net.minecraft.util.BlockRotation;
 import net.minecraft.util.math.BlockPos;
@@ -16,6 +14,8 @@
 import net.minecraft.world.BlockView;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldAccess;
+import net.minecraft.world.logic.ExperimentalRedstoneUtil;
+import net.minecraft.world.logic.Orientation;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_vyejtyga}
@@ -120,7 +120,7 @@
    protected void updateNeighbors(World world, BlockPos pos, BlockState state) {
       Direction lv = state.get(FACING);
       BlockPos lv2 = pos.offset(lv.getOpposite());
-      C_ctatbkvy lv3 = C_psmtqbgv.m_tsbkkwwq(world, lv.getOpposite(), null);
+      Orientation lv3 = ExperimentalRedstoneUtil.initialOrientation(world, lv.getOpposite(), null);
       world.m_hzulzelc(lv2, this, lv3);
       world.updateNeighborsExcept(lv2, this, lv, lv3);
    }
diff -bur namedTargetSrc/net/minecraft/block/piston/PistonBlock.java namedSrc/net/minecraft/block/piston/PistonBlock.java
--- namedTargetSrc/net/minecraft/block/piston/PistonBlock.java	2024-08-29 20:04:30.320888366 +0000
+++ namedSrc/net/minecraft/block/piston/PistonBlock.java	2024-08-29 20:03:20.591810911 +0000
@@ -28,8 +28,6 @@
 import net.minecraft.state.StateManager;
 import net.minecraft.state.property.BooleanProperty;
 import net.minecraft.state.property.Properties;
-import net.minecraft.unmapped.C_ctatbkvy;
-import net.minecraft.unmapped.C_psmtqbgv;
 import net.minecraft.util.BlockMirror;
 import net.minecraft.util.BlockRotation;
 import net.minecraft.util.math.BlockPos;
@@ -40,6 +38,8 @@
 import net.minecraft.world.RedstonePowerView;
 import net.minecraft.world.World;
 import net.minecraft.world.event.GameEvent;
+import net.minecraft.world.logic.ExperimentalRedstoneUtil;
+import net.minecraft.world.logic.Orientation;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -173,7 +173,7 @@
     * Mapping not found
     */
    @Override
-   protected void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, @Nullable C_ctatbkvy arg5, boolean notify) {
+   protected void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, @Nullable Orientation orientation, boolean notify) {
       if (!world.isClient) {
          this.tryMove(world, pos, state);
       }
@@ -445,7 +445,7 @@
             lv15.prepare(world, lv17, 2);
          }
 
-         C_ctatbkvy lv19 = C_psmtqbgv.m_tsbkkwwq(world, lv2.getMovementDirection(), null);
+         Orientation lv19 = ExperimentalRedstoneUtil.initialOrientation(world, lv2.getMovementDirection(), null);
          i = 0;
 
          for (int l = list3.size() - 1; l >= 0; l--) {
diff -bur namedTargetSrc/net/minecraft/block/piston/PistonHeadBlock.java namedSrc/net/minecraft/block/piston/PistonHeadBlock.java
--- namedTargetSrc/net/minecraft/block/piston/PistonHeadBlock.java	2024-08-29 20:04:30.328888492 +0000
+++ namedSrc/net/minecraft/block/piston/PistonHeadBlock.java	2024-08-29 20:03:20.603811092 +0000
@@ -16,8 +16,6 @@
 import net.minecraft.state.property.BooleanProperty;
 import net.minecraft.state.property.EnumProperty;
 import net.minecraft.state.property.Properties;
-import net.minecraft.unmapped.C_ctatbkvy;
-import net.minecraft.unmapped.C_psmtqbgv;
 import net.minecraft.util.BlockMirror;
 import net.minecraft.util.BlockRotation;
 import net.minecraft.util.math.BlockPos;
@@ -28,6 +26,8 @@
 import net.minecraft.world.World;
 import net.minecraft.world.WorldAccess;
 import net.minecraft.world.WorldView;
+import net.minecraft.world.logic.ExperimentalRedstoneUtil;
+import net.minecraft.world.logic.Orientation;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -297,10 +297,12 @@
     * Mapping not found
     */
    @Override
-   protected void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, @Nullable C_ctatbkvy arg5, boolean notify) {
+   protected void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, @Nullable Orientation orientation, boolean notify) {
       if (state.canPlaceAt(world, pos)) {
          world.m_hzulzelc(
-            pos.offset(((Direction)state.get(FACING)).getOpposite()), block, C_psmtqbgv.m_rgctexqu(arg5, ((Direction)state.get(FACING)).getOpposite())
+            pos.offset(((Direction)state.get(FACING)).getOpposite()),
+            block,
+            ExperimentalRedstoneUtil.withFrom(orientation, ((Direction)state.get(FACING)).getOpposite())
          );
       }
    }
diff -bur namedTargetSrc/net/minecraft/block/PlantBlock.java namedSrc/net/minecraft/block/PlantBlock.java
--- namedTargetSrc/net/minecraft/block/PlantBlock.java	2024-08-29 20:04:30.232886989 +0000
+++ namedSrc/net/minecraft/block/PlantBlock.java	2024-08-29 20:03:20.467809026 +0000
@@ -59,7 +59,7 @@
     */
    @Override
    public boolean isFertilizable(WorldView world, BlockPos pos, BlockState state) {
-      return m_ufmfqmvb(state).getDefaultState().canPlaceAt(world, pos) && world.isAir(pos.up());
+      return getTallBlock(state).getDefaultState().canPlaceAt(world, pos) && world.isAir(pos.up());
    }
 
    /**
@@ -75,14 +75,14 @@
     */
    @Override
    public void fertilize(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
-      TallPlantBlock.placeAt(world, m_ufmfqmvb(state).getDefaultState(), pos, 2);
+      TallPlantBlock.placeAt(world, getTallBlock(state).getDefaultState(), pos, 2);
    }
 
    /**
     * @mapping {@literal hashed m_ufmfqmvb Lnet/minecraft/unmapped/C_bvcepqzm;m_ufmfqmvb(Lnet/minecraft/unmapped/C_txtbiemp;)Lnet/minecraft/unmapped/C_pomjjrfu;}
-    * @mapping {@literal named m_ufmfqmvb Lnet/minecraft/block/PlantBlock;m_ufmfqmvb(Lnet/minecraft/block/BlockState;)Lnet/minecraft/block/TallPlantBlock;}
+    * @mapping {@literal named getTallBlock Lnet/minecraft/block/PlantBlock;getTallBlock(Lnet/minecraft/block/BlockState;)Lnet/minecraft/block/TallPlantBlock;}
     */
-   private static TallPlantBlock m_ufmfqmvb(BlockState state) {
+   private static TallPlantBlock getTallBlock(BlockState state) {
       return (TallPlantBlock)(state.isOf(Blocks.FERN) ? Blocks.LARGE_FERN : Blocks.TALL_GRASS);
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/PoweredRailBlock.java namedSrc/net/minecraft/block/PoweredRailBlock.java
--- namedTargetSrc/net/minecraft/block/PoweredRailBlock.java	2024-08-29 20:04:30.336888617 +0000
+++ namedSrc/net/minecraft/block/PoweredRailBlock.java	2024-08-29 20:03:20.611811214 +0000
@@ -169,7 +169,7 @@
       if (bl2 != bl) {
          world.setBlockState(pos, state.with(POWERED, Boolean.valueOf(bl2)), Block.NOTIFY_ALL);
          world.m_uswxgsbt(pos.down(), this);
-         if (((RailShape)state.get(SHAPE)).m_pgjcepuq()) {
+         if (((RailShape)state.get(SHAPE)).isAscending()) {
             world.m_uswxgsbt(pos.up(), this);
          }
       }

github-actions · 2024-08-29T20:04:34Z

View the diff here (3/3):

diff -bur namedTargetSrc/net/minecraft/block/RedstoneDiodeBlock.java namedSrc/net/minecraft/block/RedstoneDiodeBlock.java
--- namedTargetSrc/net/minecraft/block/RedstoneDiodeBlock.java	2024-08-29 20:04:30.272887615 +0000
+++ namedSrc/net/minecraft/block/RedstoneDiodeBlock.java	2024-08-29 20:03:20.523809877 +0000
@@ -8,8 +8,6 @@
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.state.property.BooleanProperty;
 import net.minecraft.state.property.Properties;
-import net.minecraft.unmapped.C_ctatbkvy;
-import net.minecraft.unmapped.C_psmtqbgv;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.random.RandomGenerator;
@@ -19,6 +17,8 @@
 import net.minecraft.world.TickPriority;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldView;
+import net.minecraft.world.logic.ExperimentalRedstoneUtil;
+import net.minecraft.world.logic.Orientation;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -119,7 +119,7 @@
     * Mapping not found
     */
    @Override
-   protected void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, @Nullable C_ctatbkvy arg5, boolean notify) {
+   protected void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, @Nullable Orientation orientation, boolean notify) {
       if (state.canPlaceAt(world, pos)) {
          this.checkOutputLevel(world, pos, state);
       } else {
@@ -250,7 +250,7 @@
    protected void updateTarget(World world, BlockPos pos, BlockState state) {
       Direction lv = state.get(FACING);
       BlockPos lv2 = pos.offset(lv.getOpposite());
-      C_ctatbkvy lv3 = C_psmtqbgv.m_tsbkkwwq(world, lv.getOpposite(), Direction.UP);
+      Orientation lv3 = ExperimentalRedstoneUtil.initialOrientation(world, lv.getOpposite(), Direction.UP);
       world.m_hzulzelc(lv2, this, lv3);
       world.updateNeighborsExcept(lv2, this, lv, lv3);
    }
diff -bur namedTargetSrc/net/minecraft/block/RedstoneLampBlock.java namedSrc/net/minecraft/block/RedstoneLampBlock.java
--- namedTargetSrc/net/minecraft/block/RedstoneLampBlock.java	2024-08-29 20:04:30.488890996 +0000
+++ namedSrc/net/minecraft/block/RedstoneLampBlock.java	2024-08-29 20:03:20.767813584 +0000
@@ -5,10 +5,10 @@
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.state.StateManager;
 import net.minecraft.state.property.BooleanProperty;
-import net.minecraft.unmapped.C_ctatbkvy;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.random.RandomGenerator;
 import net.minecraft.world.World;
+import net.minecraft.world.logic.Orientation;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -57,7 +57,7 @@
     * Mapping not found
     */
    @Override
-   protected void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, @Nullable C_ctatbkvy arg5, boolean notify) {
+   protected void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, @Nullable Orientation orientation, boolean notify) {
       if (!world.isClient) {
          boolean bl2 = (Boolean)state.get(LIT);
          if (bl2 != world.isReceivingRedstonePower(pos)) {
diff -bur namedTargetSrc/net/minecraft/block/RedstoneTorchBlock.java namedSrc/net/minecraft/block/RedstoneTorchBlock.java
--- namedTargetSrc/net/minecraft/block/RedstoneTorchBlock.java	2024-08-29 20:04:30.240887114 +0000
+++ namedSrc/net/minecraft/block/RedstoneTorchBlock.java	2024-08-29 20:03:20.479809209 +0000
@@ -10,14 +10,14 @@
 import net.minecraft.state.StateManager;
 import net.minecraft.state.property.BooleanProperty;
 import net.minecraft.state.property.Properties;
-import net.minecraft.unmapped.C_ctatbkvy;
-import net.minecraft.unmapped.C_psmtqbgv;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.random.RandomGenerator;
 import net.minecraft.world.BlockView;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldEvents;
+import net.minecraft.world.logic.ExperimentalRedstoneUtil;
+import net.minecraft.world.logic.Orientation;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -83,18 +83,18 @@
     */
    @Override
    protected void onBlockAdded(BlockState state, World world, BlockPos pos, BlockState oldState, boolean notify) {
-      this.m_pquxpinh(world, pos, state);
+      this.updateNeighbors(world, pos, state);
    }
 
    /**
     * @mapping {@literal hashed m_pquxpinh Lnet/minecraft/unmapped/C_kohfizdm;m_pquxpinh(Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;)V}
-    * @mapping {@literal named m_pquxpinh Lnet/minecraft/block/RedstoneTorchBlock;m_pquxpinh(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)V}
+    * @mapping {@literal named updateNeighbors Lnet/minecraft/block/RedstoneTorchBlock;updateNeighbors(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)V}
     */
-   private void m_pquxpinh(World world, BlockPos pos, BlockState state) {
-      C_ctatbkvy lv = this.m_vrxftsww(world, state);
+   private void updateNeighbors(World world, BlockPos pos, BlockState state) {
+      Orientation lv = this.getOrientation(world, state);
 
       for (Direction lv2 : Direction.values()) {
-         world.m_hfhkmcni(pos.offset(lv2), this, C_psmtqbgv.m_rgctexqu(lv, lv2));
+         world.m_hfhkmcni(pos.offset(lv2), this, ExperimentalRedstoneUtil.withFrom(lv, lv2));
       }
    }
 
@@ -104,7 +104,7 @@
    @Override
    protected void onStateReplaced(BlockState state, World world, BlockPos pos, BlockState newState, boolean moved) {
       if (!moved) {
-         this.m_pquxpinh(world, pos, state);
+         this.updateNeighbors(world, pos, state);
       }
    }
 
@@ -153,7 +153,7 @@
     * Mapping not found
     */
    @Override
-   protected void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, @Nullable C_ctatbkvy arg5, boolean notify) {
+   protected void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, @Nullable Orientation orientation, boolean notify) {
       if ((Boolean)state.get(LIT) == this.shouldUnpower(world, pos, state) && !world.getBlockTickScheduler().willTick(pos, this)) {
          world.scheduleBlockTick(pos, this, 2);
       }
@@ -221,11 +221,11 @@
 
    /**
     * @mapping {@literal hashed m_vrxftsww Lnet/minecraft/unmapped/C_kohfizdm;m_vrxftsww(Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_txtbiemp;)Lnet/minecraft/unmapped/C_ctatbkvy;}
-    * @mapping {@literal named m_vrxftsww Lnet/minecraft/block/RedstoneTorchBlock;m_vrxftsww(Lnet/minecraft/world/World;Lnet/minecraft/block/BlockState;)Lnet/minecraft/unmapped/C_ctatbkvy;}
+    * @mapping {@literal named getOrientation Lnet/minecraft/block/RedstoneTorchBlock;getOrientation(Lnet/minecraft/world/World;Lnet/minecraft/block/BlockState;)Lnet/minecraft/world/logic/Orientation;}
     */
    @Nullable
-   protected C_ctatbkvy m_vrxftsww(World world, BlockState state) {
-      return C_psmtqbgv.m_tsbkkwwq(world, null, Direction.UP);
+   protected Orientation getOrientation(World world, BlockState state) {
+      return ExperimentalRedstoneUtil.initialOrientation(world, null, Direction.UP);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/RedstoneWallTorchBlock.java namedSrc/net/minecraft/block/RedstoneWallTorchBlock.java
--- namedTargetSrc/net/minecraft/block/RedstoneWallTorchBlock.java	2024-08-29 20:04:30.332888554 +0000
+++ namedSrc/net/minecraft/block/RedstoneWallTorchBlock.java	2024-08-29 20:03:20.607811154 +0000
@@ -6,8 +6,6 @@
 import net.minecraft.state.StateManager;
 import net.minecraft.state.property.BooleanProperty;
 import net.minecraft.state.property.DirectionProperty;
-import net.minecraft.unmapped.C_ctatbkvy;
-import net.minecraft.unmapped.C_psmtqbgv;
 import net.minecraft.util.BlockMirror;
 import net.minecraft.util.BlockRotation;
 import net.minecraft.util.math.BlockPos;
@@ -18,6 +16,8 @@
 import net.minecraft.world.World;
 import net.minecraft.world.WorldAccess;
 import net.minecraft.world.WorldView;
+import net.minecraft.world.logic.ExperimentalRedstoneUtil;
+import net.minecraft.world.logic.Orientation;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -159,12 +159,11 @@
    }
 
    /**
-    * @mapping {@literal hashed m_vrxftsww Lnet/minecraft/unmapped/C_kizmzysg;m_vrxftsww(Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_txtbiemp;)Lnet/minecraft/unmapped/C_ctatbkvy;}
-    * @mapping {@literal named m_vrxftsww Lnet/minecraft/block/RedstoneWallTorchBlock;m_vrxftsww(Lnet/minecraft/world/World;Lnet/minecraft/block/BlockState;)Lnet/minecraft/unmapped/C_ctatbkvy;}
+    * Mapping not found
     */
    @Nullable
    @Override
-   protected C_ctatbkvy m_vrxftsww(World world, BlockState state) {
-      return C_psmtqbgv.m_tsbkkwwq(world, ((Direction)state.get(FACING)).getOpposite(), Direction.UP);
+   protected Orientation getOrientation(World world, BlockState state) {
+      return ExperimentalRedstoneUtil.initialOrientation(world, ((Direction)state.get(FACING)).getOpposite(), Direction.UP);
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/RedstoneWireBlock.java namedSrc/net/minecraft/block/RedstoneWireBlock.java
--- namedTargetSrc/net/minecraft/block/RedstoneWireBlock.java	2024-08-29 20:04:30.252887302 +0000
+++ namedSrc/net/minecraft/block/RedstoneWireBlock.java	2024-08-29 20:03:20.503809574 +0000
@@ -14,10 +14,7 @@
 import net.minecraft.state.property.IntProperty;
 import net.minecraft.state.property.Properties;
 import net.minecraft.state.property.Property;
-import net.minecraft.unmapped.C_ctatbkvy;
-import net.minecraft.unmapped.C_lakkobyv;
 import net.minecraft.unmapped.C_pmtychdy;
-import net.minecraft.unmapped.C_psmtqbgv;
 import net.minecraft.unmapped.C_ucujhvez;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.ArgbHelper;
@@ -35,6 +32,9 @@
 import net.minecraft.world.World;
 import net.minecraft.world.WorldAccess;
 import net.minecraft.world.WorldView;
+import net.minecraft.world.logic.ExperimentalRedstoneUtil;
+import net.minecraft.world.logic.Orientation;
+import net.minecraft.world.logic.RedstoneController;
 import org.jetbrains.annotations.Nullable;
 import org.joml.Vector3f;
 
@@ -160,13 +160,13 @@
     * @mapping {@literal hashed f_laswtpnf Lnet/minecraft/unmapped/C_hbdlqish;f_laswtpnf:[Lorg/joml/Vector3f;}
     * @mapping {@literal named COLORS Lnet/minecraft/block/RedstoneWireBlock;COLORS:[Lorg/joml/Vector3f;}
     */
-   private static final Vector3f[] COLORS = Util.make(new Vector3f[16], vector3fs -> {
+   private static final Vector3f[] COLORS = Util.make(new Vector3f[16], colors -> {
       for (int i = 0; i <= 15; i++) {
          float f = (float)i / 15.0F;
          float g = f * 0.6F + (f > 0.0F ? 0.4F : 0.3F);
          float h = MathHelper.clamp(f * f * 0.7F - 0.5F, 0.0F, 1.0F);
          float j = MathHelper.clamp(f * f * 0.6F - 0.7F, 0.0F, 1.0F);
-         vector3fs[i] = new Vector3f(g, h, j);
+         colors[i] = new Vector3f(g, h, j);
       }
    });
    /**
@@ -180,9 +180,10 @@
     */
    private final BlockState dotState;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_qwcrdmpx Lnet/minecraft/unmapped/C_hbdlqish;f_qwcrdmpx:Lnet/minecraft/unmapped/C_lakkobyv;}
+    * @mapping {@literal named controller Lnet/minecraft/block/RedstoneWireBlock;controller:Lnet/minecraft/world/logic/RedstoneController;}
     */
-   private final C_lakkobyv f_qwcrdmpx = new C_ucujhvez(this);
+   private final RedstoneController controller = new C_ucujhvez(this);
    /**
     * @mapping {@literal hashed f_quuiddba Lnet/minecraft/unmapped/C_hbdlqish;f_quuiddba:Z}
     * @mapping {@literal named wiresGivePower Lnet/minecraft/block/RedstoneWireBlock;wiresGivePower:Z}
@@ -435,21 +436,21 @@
 
    /**
     * @mapping {@literal hashed m_pqfwfeyi Lnet/minecraft/unmapped/C_hbdlqish;m_pqfwfeyi(Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_ctatbkvy;Z)V}
-    * @mapping {@literal named update Lnet/minecraft/block/RedstoneWireBlock;update(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;Lnet/minecraft/unmapped/C_ctatbkvy;Z)V}
+    * @mapping {@literal named update Lnet/minecraft/block/RedstoneWireBlock;update(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;Lnet/minecraft/world/logic/Orientation;Z)V}
     */
-   private void update(World world, BlockPos pos, BlockState state, @Nullable C_ctatbkvy arg4, boolean bl) {
-      if (m_ugolbtvn(world)) {
-         new C_pmtychdy(this).m_wowduhxk(world, pos, state, arg4, bl);
+   private void update(World world, BlockPos pos, BlockState state, @Nullable Orientation orientation, boolean updateConnections) {
+      if (hasExperiments(world)) {
+         new C_pmtychdy(this).m_wowduhxk(world, pos, state, orientation, updateConnections);
       } else {
-         this.f_qwcrdmpx.m_wowduhxk(world, pos, state, arg4, bl);
+         this.controller.m_wowduhxk(world, pos, state, orientation, updateConnections);
       }
    }
 
    /**
     * @mapping {@literal hashed m_djyzrhjp Lnet/minecraft/unmapped/C_hbdlqish;m_djyzrhjp(Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;)I}
-    * @mapping {@literal named m_djyzrhjp Lnet/minecraft/block/RedstoneWireBlock;m_djyzrhjp(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;)I}
+    * @mapping {@literal named getStrongPower Lnet/minecraft/block/RedstoneWireBlock;getStrongPower(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;)I}
     */
-   public int m_djyzrhjp(World world, BlockPos pos) {
+   public int getStrongPower(World world, BlockPos pos) {
       this.wiresGivePower = false;
       int i = world.getReceivedRedstonePower(pos);
       this.wiresGivePower = true;
@@ -527,11 +528,11 @@
     * Mapping not found
     */
    @Override
-   protected void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, @Nullable C_ctatbkvy arg5, boolean notify) {
+   protected void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, @Nullable Orientation orientation, boolean notify) {
       if (!world.isClient) {
-         if (block != this || !m_ugolbtvn(world)) {
+         if (block != this || !hasExperiments(world)) {
             if (state.canPlaceAt(world, pos)) {
-               this.update(world, pos, state, arg5, false);
+               this.update(world, pos, state, orientation, false);
             } else {
                dropStacks(state, world, pos);
                world.removeBlock(pos, false);
@@ -542,10 +543,10 @@
 
    /**
     * @mapping {@literal hashed m_ugolbtvn Lnet/minecraft/unmapped/C_hbdlqish;m_ugolbtvn(Lnet/minecraft/unmapped/C_cdctfzbn;)Z}
-    * @mapping {@literal named m_ugolbtvn Lnet/minecraft/block/RedstoneWireBlock;m_ugolbtvn(Lnet/minecraft/world/World;)Z}
+    * @mapping {@literal named hasExperiments Lnet/minecraft/block/RedstoneWireBlock;hasExperiments(Lnet/minecraft/world/World;)Z}
     */
-   private static boolean m_ugolbtvn(World world) {
-      return world.getEnabledFlags().hasFlag(FeatureFlags.f_ttbawmfh);
+   private static boolean hasExperiments(World world) {
+      return world.getEnabledFlags().hasFlag(FeatureFlags.REDSTONE_EXPERIMENTS);
    }
 
    /**
@@ -740,14 +741,14 @@
     * @mapping {@literal named updateForNewState Lnet/minecraft/block/RedstoneWireBlock;updateForNewState(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;Lnet/minecraft/block/BlockState;)V}
     */
    private void updateForNewState(World world, BlockPos pos, BlockState oldState, BlockState newState) {
-      C_ctatbkvy lv = C_psmtqbgv.m_tsbkkwwq(world, null, Direction.UP);
+      Orientation lv = ExperimentalRedstoneUtil.initialOrientation(world, null, Direction.UP);
 
       for (Direction lv2 : Direction.Type.HORIZONTAL) {
          BlockPos lv3 = pos.offset(lv2);
          if (((WireConnection)oldState.get((Property)DIRECTION_TO_WIRE_CONNECTION_PROPERTY.get(lv2))).isConnected()
                != ((WireConnection)newState.get((Property)DIRECTION_TO_WIRE_CONNECTION_PROPERTY.get(lv2))).isConnected()
             && world.getBlockState(lv3).isSolidBlock(world, lv3)) {
-            world.updateNeighborsExcept(lv3, newState.getBlock(), lv2.getOpposite(), C_psmtqbgv.m_rgctexqu(lv, lv2));
+            world.updateNeighborsExcept(lv3, newState.getBlock(), lv2.getOpposite(), ExperimentalRedstoneUtil.withFrom(lv, lv2));
          }
       }
    }
diff -bur namedTargetSrc/net/minecraft/block/RespawnAnchorBlock.java namedSrc/net/minecraft/block/RespawnAnchorBlock.java
--- namedTargetSrc/net/minecraft/block/RespawnAnchorBlock.java	2024-08-29 20:04:30.436890182 +0000
+++ namedSrc/net/minecraft/block/RespawnAnchorBlock.java	2024-08-29 20:03:20.707812672 +0000
@@ -116,7 +116,7 @@
       } else {
          return (ActionResult)(hand == Hand.MAIN_HAND && isChargeItem(player.getStackInHand(Hand.OFF_HAND)) && canCharge(state)
             ? ActionResult.PASS
-            : ActionResult.f_nwhanehc);
+            : ActionResult.EMPTY_HAND);
       }
    }
 
@@ -148,7 +148,7 @@
                   1.0F,
                   1.0F
                );
-               return ActionResult.f_pkwbrwkg;
+               return ActionResult.SUCCESS_SERVER;
             }
          }
 
diff -bur namedTargetSrc/net/minecraft/block/ShapeContext.java namedSrc/net/minecraft/block/ShapeContext.java
--- namedTargetSrc/net/minecraft/block/ShapeContext.java	2024-08-29 20:04:30.488890996 +0000
+++ namedSrc/net/minecraft/block/ShapeContext.java	2024-08-29 20:03:20.767813584 +0000
@@ -24,22 +24,24 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_xvebqowz Lnet/minecraft/unmapped/C_pbfjvesm;m_xvebqowz(Lnet/minecraft/unmapped/C_astfners;)Lnet/minecraft/unmapped/C_pbfjvesm;}
+    * @mapping {@literal named of Lnet/minecraft/block/ShapeContext;of(Lnet/minecraft/entity/Entity;)Lnet/minecraft/block/ShapeContext;}
     */
-   static ShapeContext m_xvebqowz(Entity arg) {
-      Objects.requireNonNull(arg);
+   static ShapeContext of(Entity entity) {
+      Objects.requireNonNull(entity);
 
-      return (ShapeContext)(switch (arg) {
-         case AbstractMinecartEntity lv -> AbstractMinecartEntity.m_raaevxrz(lv.getWorld()) ? new C_izlsforw(lv, false) : new EntityShapeContext(arg, false);
-         default -> new EntityShapeContext(arg, false);
+      return (ShapeContext)(switch (entity) {
+         case AbstractMinecartEntity lv -> AbstractMinecartEntity.m_raaevxrz(lv.getWorld()) ? new C_izlsforw(lv, false) : new EntityShapeContext(entity, false);
+         default -> new EntityShapeContext(entity, false);
       });
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_fuhloafm Lnet/minecraft/unmapped/C_pbfjvesm;m_fuhloafm(Lnet/minecraft/unmapped/C_astfners;Z)Lnet/minecraft/unmapped/C_pbfjvesm;}
+    * @mapping {@literal named of Lnet/minecraft/block/ShapeContext;of(Lnet/minecraft/entity/Entity;Z)Lnet/minecraft/block/ShapeContext;}
     */
-   static ShapeContext m_fuhloafm(Entity arg, boolean bl) {
-      return new EntityShapeContext(arg, bl);
+   static ShapeContext of(Entity entity, boolean collidesWithFluid) {
+      return new EntityShapeContext(entity, collidesWithFluid);
    }
 
    /**
@@ -68,7 +70,7 @@
 
    /**
     * @mapping {@literal hashed m_jwyjjkqk Lnet/minecraft/unmapped/C_pbfjvesm;m_jwyjjkqk(Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_vxzrjtdu;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_zscvhwbd;}
-    * @mapping {@literal named m_jwyjjkqk Lnet/minecraft/block/ShapeContext;m_jwyjjkqk(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/CollisionView;Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/util/shape/VoxelShape;}
+    * @mapping {@literal named getCollisionShape Lnet/minecraft/block/ShapeContext;getCollisionShape(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/CollisionView;Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/util/shape/VoxelShape;}
     */
-   VoxelShape m_jwyjjkqk(BlockState state, CollisionView world, BlockPos pos);
+   VoxelShape getCollisionShape(BlockState state, CollisionView world, BlockPos pos);
 }
diff -bur namedTargetSrc/net/minecraft/block/sign/AbstractSignBlock.java namedSrc/net/minecraft/block/sign/AbstractSignBlock.java
--- namedTargetSrc/net/minecraft/block/sign/AbstractSignBlock.java	2024-08-29 20:04:30.460890558 +0000
+++ namedSrc/net/minecraft/block/sign/AbstractSignBlock.java	2024-08-29 20:03:20.739813158 +0000
@@ -137,10 +137,10 @@
                   stack.consume(1, player);
                   return ActionResult.SUCCESS;
                } else {
-                  return ActionResult.f_nwhanehc;
+                  return ActionResult.EMPTY_HAND;
                }
             } else {
-               return ActionResult.f_nwhanehc;
+               return ActionResult.EMPTY_HAND;
             }
          } else {
             return !bl && !lv.isWaxed() ? ActionResult.CONSUME : ActionResult.SUCCESS;
@@ -164,12 +164,12 @@
          boolean bl2 = lv.runCommandClickEvent(player, world, pos, bl);
          if (lv.isWaxed()) {
             world.playSound(null, lv.getPos(), lv.getInteractionFailSound(), SoundCategory.BLOCKS);
-            return ActionResult.f_pkwbrwkg;
+            return ActionResult.SUCCESS_SERVER;
          } else if (bl2) {
-            return ActionResult.f_pkwbrwkg;
+            return ActionResult.SUCCESS_SERVER;
          } else if (!this.isOtherPlayerEditing(player, lv) && player.canModifyBlocks() && this.hasEditableText(player, lv, bl)) {
             this.openEditScreen(player, lv, bl);
-            return ActionResult.f_pkwbrwkg;
+            return ActionResult.SUCCESS_SERVER;
          } else {
             return ActionResult.PASS;
          }
diff -bur namedTargetSrc/net/minecraft/block/SlimeBlock.java namedSrc/net/minecraft/block/SlimeBlock.java
--- namedTargetSrc/net/minecraft/block/SlimeBlock.java	2024-08-29 20:04:30.464890620 +0000
+++ namedSrc/net/minecraft/block/SlimeBlock.java	2024-08-29 20:03:20.747813280 +0000
@@ -48,15 +48,14 @@
    }
 
    /**
-    * @mapping {@literal hashed m_oscwylqf Lnet/minecraft/unmapped/C_yqcfvefn;m_oscwylqf(Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_astfners;)V}
-    * @mapping {@literal named m_oscwylqf Lnet/minecraft/block/SlimeBlock;m_oscwylqf(Lnet/minecraft/world/BlockView;Lnet/minecraft/entity/Entity;)V}
+    * Mapping not found
     */
    @Override
-   public void m_oscwylqf(BlockView world, Entity arg2) {
-      if (arg2.bypassesLandingEffects()) {
-         super.m_oscwylqf(world, arg2);
+   public void updateEntityVelocityAfterFall(BlockView world, Entity entity) {
+      if (entity.bypassesLandingEffects()) {
+         super.updateEntityVelocityAfterFall(world, entity);
       } else {
-         this.bounce(arg2);
+         this.bounce(entity);
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/block/SpongeBlock.java namedSrc/net/minecraft/block/SpongeBlock.java
--- namedTargetSrc/net/minecraft/block/SpongeBlock.java	2024-08-29 20:04:30.440890245 +0000
+++ namedSrc/net/minecraft/block/SpongeBlock.java	2024-08-29 20:03:20.715812794 +0000
@@ -6,10 +6,10 @@
 import net.minecraft.registry.tag.FluidTags;
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.unmapped.C_ctatbkvy;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.world.World;
+import net.minecraft.world.logic.Orientation;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -68,9 +68,9 @@
     * Mapping not found
     */
    @Override
-   protected void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, @Nullable C_ctatbkvy arg5, boolean notify) {
+   protected void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, @Nullable Orientation orientation, boolean notify) {
       this.update(world, pos);
-      super.neighborUpdate(state, world, pos, block, arg5, notify);
+      super.neighborUpdate(state, world, pos, block, orientation, notify);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/StructureBlock.java namedSrc/net/minecraft/block/StructureBlock.java
--- namedTargetSrc/net/minecraft/block/StructureBlock.java	2024-08-29 20:04:30.308888179 +0000
+++ namedSrc/net/minecraft/block/StructureBlock.java	2024-08-29 20:03:20.583810789 +0000
@@ -11,11 +11,11 @@
 import net.minecraft.state.StateManager;
 import net.minecraft.state.property.EnumProperty;
 import net.minecraft.state.property.Properties;
-import net.minecraft.unmapped.C_ctatbkvy;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
+import net.minecraft.world.logic.Orientation;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -107,7 +107,7 @@
     * Mapping not found
     */
    @Override
-   protected void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, @Nullable C_ctatbkvy arg5, boolean notify) {
+   protected void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, @Nullable Orientation orientation, boolean notify) {
       if (world instanceof ServerWorld) {
          if (world.getBlockEntity(pos) instanceof StructureBlockBlockEntity lv2) {
             boolean bl2 = world.isReceivingRedstonePower(pos);
diff -bur namedTargetSrc/net/minecraft/block/TntBlock.java namedSrc/net/minecraft/block/TntBlock.java
--- namedTargetSrc/net/minecraft/block/TntBlock.java	2024-08-29 20:04:30.456890495 +0000
+++ namedSrc/net/minecraft/block/TntBlock.java	2024-08-29 20:03:20.735813098 +0000
@@ -16,7 +16,6 @@
 import net.minecraft.state.StateManager;
 import net.minecraft.state.property.BooleanProperty;
 import net.minecraft.state.property.Properties;
-import net.minecraft.unmapped.C_ctatbkvy;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
 import net.minecraft.util.hit.BlockHitResult;
@@ -24,6 +23,7 @@
 import net.minecraft.world.World;
 import net.minecraft.world.event.GameEvent;
 import net.minecraft.world.explosion.Explosion;
+import net.minecraft.world.logic.Orientation;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -76,7 +76,7 @@
     * Mapping not found
     */
    @Override
-   protected void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, @Nullable C_ctatbkvy arg5, boolean notify) {
+   protected void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, @Nullable Orientation orientation, boolean notify) {
       if (world.isReceivingRedstonePower(pos)) {
          primeTnt(world, pos);
          world.removeBlock(pos, false);
diff -bur namedTargetSrc/net/minecraft/block/TrapdoorBlock.java namedSrc/net/minecraft/block/TrapdoorBlock.java
--- namedTargetSrc/net/minecraft/block/TrapdoorBlock.java	2024-08-29 20:04:30.436890182 +0000
+++ namedSrc/net/minecraft/block/TrapdoorBlock.java	2024-08-29 20:03:20.711812734 +0000
@@ -16,7 +16,6 @@
 import net.minecraft.state.property.BooleanProperty;
 import net.minecraft.state.property.EnumProperty;
 import net.minecraft.state.property.Properties;
-import net.minecraft.unmapped.C_ctatbkvy;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.math.BlockPos;
@@ -27,6 +26,7 @@
 import net.minecraft.world.WorldAccess;
 import net.minecraft.world.event.GameEvent;
 import net.minecraft.world.explosion.Explosion;
+import net.minecraft.world.logic.Orientation;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -227,7 +227,7 @@
     * Mapping not found
     */
    @Override
-   protected void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, @Nullable C_ctatbkvy arg5, boolean notify) {
+   protected void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, @Nullable Orientation orientation, boolean notify) {
       if (!world.isClient) {
          boolean bl2 = world.isReceivingRedstonePower(pos);
          if (bl2 != (Boolean)state.get(POWERED)) {
diff -bur namedTargetSrc/net/minecraft/block/TrialSpawnerData.java namedSrc/net/minecraft/block/TrialSpawnerData.java
--- namedTargetSrc/net/minecraft/block/TrialSpawnerData.java	2024-08-29 20:04:30.408889743 +0000
+++ namedSrc/net/minecraft/block/TrialSpawnerData.java	2024-08-29 20:03:20.679812247 +0000
@@ -183,13 +183,14 @@
    public void reset() {
       this.currentMobs.clear();
       this.spawnData = Optional.empty();
-      this.m_tpuunqmz();
+      this.resetStatistics();
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_tpuunqmz Lnet/minecraft/unmapped/C_kxkfzuix;m_tpuunqmz()V}
+    * @mapping {@literal named resetStatistics Lnet/minecraft/block/TrialSpawnerData;resetStatistics()V}
     */
-   public void m_tpuunqmz() {
+   public void resetStatistics() {
       this.registeredPlayers.clear();
       this.totalMobsSpawned = 0;
       this.nextMobSpawnTime = 0L;
diff -bur namedTargetSrc/net/minecraft/block/TripwireHookBlock.java namedSrc/net/minecraft/block/TripwireHookBlock.java
--- namedTargetSrc/net/minecraft/block/TripwireHookBlock.java	2024-08-29 20:04:30.420889932 +0000
+++ namedSrc/net/minecraft/block/TripwireHookBlock.java	2024-08-29 20:03:20.695812491 +0000
@@ -13,8 +13,6 @@
 import net.minecraft.state.property.BooleanProperty;
 import net.minecraft.state.property.DirectionProperty;
 import net.minecraft.state.property.Properties;
-import net.minecraft.unmapped.C_ctatbkvy;
-import net.minecraft.unmapped.C_psmtqbgv;
 import net.minecraft.util.BlockMirror;
 import net.minecraft.util.BlockRotation;
 import net.minecraft.util.math.BlockPos;
@@ -26,6 +24,8 @@
 import net.minecraft.world.WorldAccess;
 import net.minecraft.world.WorldView;
 import net.minecraft.world.event.GameEvent;
+import net.minecraft.world.logic.ExperimentalRedstoneUtil;
+import net.minecraft.world.logic.Orientation;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -298,7 +298,7 @@
     */
    private static void updateNeighborsOnAxis(Block block, World world, BlockPos pos, Direction direction) {
       Direction lv = direction.getOpposite();
-      C_ctatbkvy lv2 = C_psmtqbgv.m_tsbkkwwq(world, lv, Direction.UP);
+      Orientation lv2 = ExperimentalRedstoneUtil.initialOrientation(world, lv, Direction.UP);
       world.m_hfhkmcni(pos, block, lv2);
       world.m_hfhkmcni(pos.offset(lv), block, lv2);
    }
diff -bur namedTargetSrc/net/minecraft/block/VaultBlock.java namedSrc/net/minecraft/block/VaultBlock.java
--- namedTargetSrc/net/minecraft/block/VaultBlock.java	2024-08-29 20:04:30.480890871 +0000
+++ namedSrc/net/minecraft/block/VaultBlock.java	2024-08-29 20:03:20.763813523 +0000
@@ -4,7 +4,7 @@
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.block.entity.BlockEntityTicker;
 import net.minecraft.block.entity.BlockEntityType;
-import net.minecraft.block.entity.VaultBlockEntity;
+import net.minecraft.block.entity.vault.VaultBlockEntity;
 import net.minecraft.block.enums.VaultState;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemPlacementContext;
@@ -78,15 +78,15 @@
       if (!stack.isEmpty() && state.get(VAULT_STATE) == VaultState.ACTIVE) {
          if (world instanceof ServerWorld lv) {
             if (!(lv.getBlockEntity(pos) instanceof VaultBlockEntity lv2)) {
-               return ActionResult.f_nwhanehc;
+               return ActionResult.EMPTY_HAND;
             }
 
-            VaultBlockEntity.C_vucktnfd.m_vseniggs(lv, pos, state, lv2.m_sxksvmgb(), lv2.m_bmrroywl(), lv2.m_ksmzflqf(), player, stack);
+            VaultBlockEntity.Server.tryInsertKey(lv, pos, state, lv2.getConfig(), lv2.getServerData(), lv2.getSharedData(), player, stack);
          }
 
-         return ActionResult.f_pkwbrwkg;
+         return ActionResult.SUCCESS_SERVER;
       } else {
-         return ActionResult.f_nwhanehc;
+         return ActionResult.EMPTY_HAND;
       }
    }
 
@@ -117,12 +117,14 @@
          ? checkType(
             type,
             BlockEntityType.VAULT,
-            (arg2, pos, statex, arg5) -> VaultBlockEntity.C_vucktnfd.m_suqfgtrx(lv, pos, statex, arg5.m_sxksvmgb(), arg5.m_bmrroywl(), arg5.m_ksmzflqf())
+            (blockWorld, pos, blockState, entity) -> VaultBlockEntity.Server.tick(
+                  lv, pos, blockState, entity.getConfig(), entity.getServerData(), entity.getSharedData()
+               )
          )
          : checkType(
             type,
             BlockEntityType.VAULT,
-            (worldx, pos, statex, arg4) -> VaultBlockEntity.C_qktdibgk.m_gognnvjb(worldx, pos, statex, arg4.m_yvksvmlr(), arg4.m_ksmzflqf())
+            (blockWorld, pos, blockState, entity) -> VaultBlockEntity.Client.tick(blockWorld, pos, blockState, entity.getClientData(), entity.getSharedData())
          );
    }
 
diff -bur namedTargetSrc/net/minecraft/block/WaxedCopperBulbBlock.java namedSrc/net/minecraft/block/WaxedCopperBulbBlock.java
--- namedTargetSrc/net/minecraft/block/WaxedCopperBulbBlock.java	2024-08-29 20:04:30.416889869 +0000
+++ namedSrc/net/minecraft/block/WaxedCopperBulbBlock.java	2024-08-29 20:03:20.691812429 +0000
@@ -7,9 +7,9 @@
 import net.minecraft.state.StateManager;
 import net.minecraft.state.property.BooleanProperty;
 import net.minecraft.state.property.Properties;
-import net.minecraft.unmapped.C_ctatbkvy;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
+import net.minecraft.world.logic.Orientation;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -64,7 +64,7 @@
     * Mapping not found
     */
    @Override
-   protected void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, @Nullable C_ctatbkvy arg5, boolean notify) {
+   protected void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, @Nullable Orientation orientation, boolean notify) {
       if (world instanceof ServerWorld lv) {
          this.setState(state, lv, pos);
       }
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/option/AccessibilityOptionsScreen.java namedSrc/net/minecraft/client/gui/screen/option/AccessibilityOptionsScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/option/AccessibilityOptionsScreen.java	2024-08-29 20:04:30.472890745 +0000
+++ namedSrc/net/minecraft/client/gui/screen/option/AccessibilityOptionsScreen.java	2024-08-29 20:03:20.751813341 +0000
@@ -113,6 +113,6 @@
     * Mapping not found
     */
    private boolean m_dsbgfrff() {
-      return this.client.world != null && this.client.world.getEnabledFlags().hasFlag(FeatureFlags.f_bgdekufs);
+      return this.client.world != null && this.client.world.getEnabledFlags().hasFlag(FeatureFlags.MINECART_IMPROVEMENTS);
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/MinecraftClient.java namedSrc/net/minecraft/client/MinecraftClient.java
--- namedTargetSrc/net/minecraft/client/MinecraftClient.java	2024-08-29 20:04:30.284887803 +0000
+++ namedSrc/net/minecraft/client/MinecraftClient.java	2024-08-29 20:03:20.547810242 +0000
@@ -2427,8 +2427,8 @@
                            lv5 = this.interactionManager.interactEntity(this.player, lv4, lv);
                         }
 
-                        if (lv5 instanceof ActionResult.C_wrerqibd lv6) {
-                           if (lv6.swingSource() == ActionResult.C_xkenowvt.CLIENT) {
+                        if (lv5 instanceof ActionResult.Success lv6) {
+                           if (lv6.swingSource() == ActionResult.Source.CLIENT) {
                               this.player.swingHand(lv);
                            }
 
@@ -2439,8 +2439,8 @@
                         BlockHitResult lv7 = (BlockHitResult)this.crosshairTarget;
                         int i = lv2.getCount();
                         ActionResult lv8 = this.interactionManager.interactBlock(this.player, lv, lv7);
-                        if (lv8 instanceof ActionResult.C_wrerqibd lv9) {
-                           if (lv9.swingSource() == ActionResult.C_xkenowvt.CLIENT) {
+                        if (lv8 instanceof ActionResult.Success lv9) {
+                           if (lv9.swingSource() == ActionResult.Source.CLIENT) {
                               this.player.swingHand(lv);
                               if (!lv2.isEmpty() && (lv2.getCount() != i || this.interactionManager.hasCreativeInventory())) {
                                  this.gameRenderer.firstPersonRenderer.resetEquipProgress(lv);
@@ -2450,14 +2450,14 @@
                            return;
                         }
 
-                        if (lv8 instanceof ActionResult.C_xvqtmovy) {
+                        if (lv8 instanceof ActionResult.Fail) {
                            return;
                         }
                   }
                }
 
-               if (!lv2.isEmpty() && this.interactionManager.interactItem(this.player, lv) instanceof ActionResult.C_wrerqibd lv11) {
-                  if (lv11.swingSource() == ActionResult.C_xkenowvt.CLIENT) {
+               if (!lv2.isEmpty() && this.interactionManager.interactItem(this.player, lv) instanceof ActionResult.Success lv11) {
+                  if (lv11.swingSource() == ActionResult.Source.CLIENT) {
                      this.player.swingHand(lv);
                   }
 
diff -bur namedTargetSrc/net/minecraft/client/network/ClientPlayerEntity.java namedSrc/net/minecraft/client/network/ClientPlayerEntity.java
--- namedTargetSrc/net/minecraft/client/network/ClientPlayerEntity.java	2024-08-29 20:04:30.384889368 +0000
+++ namedSrc/net/minecraft/client/network/ClientPlayerEntity.java	2024-08-29 20:03:20.659811943 +0000
@@ -1377,7 +1377,7 @@
          Vec3d lv6 = this.getRotationVecClient();
          float o = (float)(lv6.x * lv5.x + lv6.z * lv5.z);
          if (!(o < -0.15F)) {
-            ShapeContext lv7 = ShapeContext.m_xvebqowz(this);
+            ShapeContext lv7 = ShapeContext.of(this);
             BlockPos lv8 = BlockPos.create(this.getX(), this.getBounds().maxY, this.getZ());
             BlockState lv9 = this.getWorld().getBlockState(lv8);
             if (lv9.getCollisionShape(this.getWorld(), lv8, lv7).isEmpty()) {
diff -bur namedTargetSrc/net/minecraft/client/network/ClientPlayerInteractionManager.java namedSrc/net/minecraft/client/network/ClientPlayerInteractionManager.java
--- namedTargetSrc/net/minecraft/client/network/ClientPlayerInteractionManager.java	2024-08-29 20:04:30.248887239 +0000
+++ namedSrc/net/minecraft/client/network/ClientPlayerInteractionManager.java	2024-08-29 20:03:20.491809391 +0000
@@ -415,7 +415,7 @@
                return lv4;
             }
 
-            if (lv4 instanceof ActionResult.C_rtqygjoo && hand == Hand.MAIN_HAND) {
+            if (lv4 instanceof ActionResult.EmptyHand && hand == Hand.MAIN_HAND) {
                ActionResult lv5 = lv3.onUse(this.client.world, player, hitResult);
                if (lv5.isAccepted()) {
                   return lv5;
@@ -460,8 +460,8 @@
             } else {
                ActionResult lv3 = lv2.use(this.client.world, player, hand);
                ItemStack lv5;
-               if (lv3 instanceof ActionResult.C_wrerqibd lv4) {
-                  lv5 = (ItemStack)Objects.requireNonNullElseGet(lv4.m_lhajzrla(), () -> player.getStackInHand(hand));
+               if (lv3 instanceof ActionResult.Success lv4) {
+                  lv5 = (ItemStack)Objects.requireNonNullElseGet(lv4.heldItemTransformedTo(), () -> player.getStackInHand(hand));
                } else {
                   lv5 = player.getStackInHand(hand);
                }
diff -bur namedTargetSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java namedSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java
--- namedTargetSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java	2024-08-29 20:04:30.472890745 +0000
+++ namedSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java	2024-08-29 20:03:20.755813402 +0000
@@ -27,6 +27,7 @@
 import net.minecraft.advancement.AdvancementHolder;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.entity.CommandBlockBlockEntity;
+import net.minecraft.block.entity.FuelTimes;
 import net.minecraft.block.entity.SignBlockEntity;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.hud.chat.ChatHud;
@@ -290,7 +291,6 @@
 import net.minecraft.unmapped.C_hgofpcxx;
 import net.minecraft.unmapped.C_poljqryj;
 import net.minecraft.unmapped.C_rrcmfgnk;
-import net.minecraft.unmapped.C_smdnyqwx;
 import net.minecraft.unmapped.C_uqhumrao;
 import net.minecraft.unmapped.C_wkpqgkjo;
 import net.minecraft.unmapped.C_wuqdybfp;
@@ -448,7 +448,7 @@
    /**
     * Mapping not found
     */
-   private C_smdnyqwx f_vdcgenve;
+   private FuelTimes f_vdcgenve;
    /**
     * @mapping {@literal hashed f_ocqqytjc Lnet/minecraft/unmapped/C_nuofrxvi;f_ocqqytjc:Lnet/minecraft/unmapped/C_ddivjabv;}
     * @mapping {@literal named chatSession Lnet/minecraft/client/network/ClientPlayNetworkHandler;chatSession:Lnet/minecraft/network/message/LocalChatSession;}
@@ -541,7 +541,7 @@
       }
 
       this.f_lkckyryk = BrewingRecipeRegistry.create(this.enabledFlags);
-      this.f_vdcgenve = C_smdnyqwx.m_qszhlppm(arg3.receivedRegistries(), this.enabledFlags);
+      this.f_vdcgenve = FuelTimes.create(arg3.receivedRegistries(), this.enabledFlags);
    }
 
    /**
@@ -2000,7 +2000,7 @@
          }
       });
       list.forEach(Registry.C_dbbudibo::m_lucdhycj);
-      this.f_vdcgenve = C_smdnyqwx.m_qszhlppm(this.clientRegistryManager, this.enabledFlags);
+      this.f_vdcgenve = FuelTimes.create(this.clientRegistryManager, this.enabledFlags);
       List<ItemStack> list2 = List.copyOf(ItemGroups.getSearchGroup().getOrInitTabStacks());
       this.f_yzsmztuz.m_zndcnouo(list2);
    }
@@ -3166,7 +3166,7 @@
    /**
     * Mapping not found
     */
-   public C_smdnyqwx m_bcsqfbjm() {
+   public FuelTimes m_bcsqfbjm() {
       return this.f_vdcgenve;
    }
 
diff -bur namedTargetSrc/net/minecraft/client/render/block/entity/VaultBlockEntityRenderer.java namedSrc/net/minecraft/client/render/block/entity/VaultBlockEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/block/entity/VaultBlockEntityRenderer.java	2024-08-29 20:04:30.272887615 +0000
+++ namedSrc/net/minecraft/client/render/block/entity/VaultBlockEntityRenderer.java	2024-08-29 20:03:20.531809999 +0000
@@ -2,13 +2,13 @@
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.minecraft.block.entity.VaultBlockEntity;
+import net.minecraft.block.entity.vault.VaultBlockEntity;
+import net.minecraft.block.entity.vault.VaultClientData;
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.entity.ItemEntityRenderer;
 import net.minecraft.client.render.item.ItemRenderer;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.item.ItemStack;
-import net.minecraft.unmapped.C_gyznndxk;
 import net.minecraft.util.math.Axis;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.random.RandomGenerator;
@@ -41,17 +41,17 @@
 
    /**
     * @mapping {@literal hashed m_espygxoh Lnet/minecraft/unmapped/C_jljykbqj;m_espygxoh(Lnet/minecraft/unmapped/C_xclnoluc;FLnet/minecraft/unmapped/C_cnszsxvd;Lnet/minecraft/unmapped/C_igrgeffe;II)V}
-    * @mapping {@literal named render Lnet/minecraft/client/render/block/entity/VaultBlockEntityRenderer;render(Lnet/minecraft/block/entity/VaultBlockEntity;FLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;II)V}
+    * @mapping {@literal named render Lnet/minecraft/client/render/block/entity/VaultBlockEntityRenderer;render(Lnet/minecraft/block/entity/vault/VaultBlockEntity;FLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;II)V}
     */
    public void render(VaultBlockEntity arg, float f, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int i, int j) {
-      if (VaultBlockEntity.C_qktdibgk.m_bwknapnq(arg.m_ksmzflqf())) {
+      if (VaultBlockEntity.Client.shouldDisplayItems(arg.getSharedData())) {
          World lv = arg.getWorld();
          if (lv != null) {
-            ItemStack lv2 = arg.m_ksmzflqf().m_peidteny();
+            ItemStack lv2 = arg.getSharedData().getDisplayItem();
             if (!lv2.isEmpty()) {
                this.random.setSeed((long)ItemEntityRenderer.getRandomSeed(lv2));
-               C_gyznndxk lv3 = arg.m_yvksvmlr();
-               renderItem(f, lv, matrices, vertexConsumers, i, lv2, this.renderer, lv3.m_lpfqwfru(), lv3.m_galflnte(), this.random);
+               VaultClientData lv3 = arg.getClientData();
+               renderItem(f, lv, matrices, vertexConsumers, i, lv2, this.renderer, lv3.getPreviousSpin(), lv3.getCurrentSpin(), this.random);
             }
          }
       }
diff -bur namedTargetSrc/net/minecraft/client/render/WorldRenderer.java namedSrc/net/minecraft/client/render/WorldRenderer.java
--- namedTargetSrc/net/minecraft/client/render/WorldRenderer.java	2024-08-29 20:04:30.276887677 +0000
+++ namedSrc/net/minecraft/client/render/WorldRenderer.java	2024-08-29 20:03:20.531809999 +0000
@@ -1502,7 +1502,7 @@
       ShapeRenderer.renderShape(
          matrices,
          consumer,
-         blockState.getOutlineShape(this.world, blockPos, ShapeContext.m_xvebqowz(entity)),
+         blockState.getOutlineShape(this.world, blockPos, ShapeContext.of(entity)),
          (double)blockPos.getX() - offsetX,
          (double)blockPos.getY() - offsetY,
          (double)blockPos.getZ() - offsetZ,
diff -bur namedTargetSrc/net/minecraft/client/world/ClientWorld.java namedSrc/net/minecraft/client/world/ClientWorld.java
--- namedTargetSrc/net/minecraft/client/world/ClientWorld.java	2024-08-29 20:04:30.412889806 +0000
+++ namedSrc/net/minecraft/client/world/ClientWorld.java	2024-08-29 20:03:20.687812369 +0000
@@ -16,6 +16,7 @@
 import net.fabricmc.api.Environment;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
+import net.minecraft.block.entity.FuelTimes;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.color.biome.BiomeColorProvider;
 import net.minecraft.client.color.world.BiomeColors;
@@ -55,7 +56,6 @@
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_smdnyqwx;
 import net.minecraft.util.ArgbHelper;
 import net.minecraft.util.CubicSampler;
 import net.minecraft.util.CuboidBlockIterator;
@@ -1265,7 +1265,7 @@
     * Mapping not found
     */
    @Override
-   public C_smdnyqwx m_cgohzhbh() {
+   public FuelTimes getFuelTimes() {
       return this.netHandler.m_bcsqfbjm();
    }
 
diff -bur namedTargetSrc/net/minecraft/client/world/WorldEventHandler.java namedSrc/net/minecraft/client/world/WorldEventHandler.java
--- namedTargetSrc/net/minecraft/client/world/WorldEventHandler.java	2024-08-29 20:04:30.252887302 +0000
+++ namedSrc/net/minecraft/client/world/WorldEventHandler.java	2024-08-29 20:03:20.499809512 +0000
@@ -11,7 +11,7 @@
 import net.minecraft.block.BrushableBlock;
 import net.minecraft.block.ComposterBlock;
 import net.minecraft.block.PointedDripstoneBlock;
-import net.minecraft.block.entity.VaultBlockEntity;
+import net.minecraft.block.entity.vault.VaultBlockEntity;
 import net.minecraft.block.sculk.SculkShriekerBlock;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.particle.Particle;
@@ -597,14 +597,14 @@
             break;
          case 3015:
             if (this.world.getBlockEntity(pos) instanceof VaultBlockEntity lv9) {
-               VaultBlockEntity.C_qktdibgk.m_hqwddzvl(
-                  this.world, lv9.getPos(), lv9.getCachedState(), lv9.m_ksmzflqf(), j == 0 ? ParticleTypes.SMALL_FLAME : ParticleTypes.SOUL_FIRE_FLAME
+               VaultBlockEntity.Client.emitActivationParticles(
+                  this.world, lv9.getPos(), lv9.getCachedState(), lv9.getSharedData(), j == 0 ? ParticleTypes.SMALL_FLAME : ParticleTypes.SOUL_FIRE_FLAME
                );
                this.world.playSound(pos, SoundEvents.BLOCK_VAULT_ACTIVATE, SoundCategory.BLOCKS, 1.0F, (lv.nextFloat() - lv.nextFloat()) * 0.2F + 1.0F, true);
             }
             break;
          case 3016:
-            VaultBlockEntity.C_qktdibgk.m_vclomjjx(this.world, pos, j == 0 ? ParticleTypes.SMALL_FLAME : ParticleTypes.SOUL_FIRE_FLAME);
+            VaultBlockEntity.Client.emitDeactivationParticles(this.world, pos, j == 0 ? ParticleTypes.SMALL_FLAME : ParticleTypes.SOUL_FIRE_FLAME);
             this.world.playSound(pos, SoundEvents.BLOCK_VAULT_DEACTIVATE, SoundCategory.BLOCKS, 1.0F, (lv.nextFloat() - lv.nextFloat()) * 0.2F + 1.0F, true);
             break;
          case 3017:
diff -bur namedTargetSrc/net/minecraft/component/type/JukeboxPlayableComponent.java namedSrc/net/minecraft/component/type/JukeboxPlayableComponent.java
--- namedTargetSrc/net/minecraft/component/type/JukeboxPlayableComponent.java	2024-08-29 20:04:30.304888116 +0000
+++ namedSrc/net/minecraft/component/type/JukeboxPlayableComponent.java	2024-08-29 20:03:20.575810667 +0000
@@ -89,7 +89,7 @@
    public static ActionResult tryPlayStack(World world, BlockPos pos, ItemStack stack, PlayerEntity player) {
       JukeboxPlayableComponent lv = stack.get(DataComponentTypes.JUKEBOX_PLAYABLE);
       if (lv == null) {
-         return ActionResult.f_nwhanehc;
+         return ActionResult.EMPTY_HAND;
       } else {
          BlockState lv2 = world.getBlockState(pos);
          if (lv2.isOf(Blocks.JUKEBOX) && !(Boolean)lv2.get(JukeboxBlock.HAS_RECORD)) {
@@ -105,7 +105,7 @@
 
             return ActionResult.SUCCESS;
          } else {
-            return ActionResult.f_nwhanehc;
+            return ActionResult.EMPTY_HAND;
          }
       }
    }
diff -bur namedTargetSrc/net/minecraft/data/Main.java namedSrc/net/minecraft/data/Main.java
--- namedTargetSrc/net/minecraft/data/Main.java	2024-08-29 20:04:30.352888867 +0000
+++ namedSrc/net/minecraft/data/Main.java	2024-08-29 20:03:20.631811518 +0000
@@ -194,13 +194,13 @@
       lv4 = lv.createDataPack(includeServer, "redstone_experiments");
       lv4.addProvider(
          arg -> PackMetadataProvider.create(
-               arg, Text.translatable("dataPack.redstone_experiments.description"), FeatureFlagBitSet.ofFlag(FeatureFlags.f_ttbawmfh)
+               arg, Text.translatable("dataPack.redstone_experiments.description"), FeatureFlagBitSet.ofFlag(FeatureFlags.REDSTONE_EXPERIMENTS)
             )
       );
       lv4 = lv.createDataPack(includeServer, "minecart_improvements");
       lv4.addProvider(
          arg -> PackMetadataProvider.create(
-               arg, Text.translatable("dataPack.minecart_improvements.description"), FeatureFlagBitSet.ofFlag(FeatureFlags.f_bgdekufs)
+               arg, Text.translatable("dataPack.minecart_improvements.description"), FeatureFlagBitSet.ofFlag(FeatureFlags.MINECART_IMPROVEMENTS)
             )
       );
       return lv;
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/FindLandNearWaterTask.java namedSrc/net/minecraft/entity/ai/brain/task/FindLandNearWaterTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/FindLandNearWaterTask.java	2024-08-29 20:04:30.272887615 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/FindLandNearWaterTask.java	2024-08-29 20:03:20.527809938 +0000
@@ -37,7 +37,7 @@
                            mutableLong.setValue(l + 40L);
                            return true;
                         } else {
-                           ShapeContext lv = ShapeContext.m_xvebqowz(arg4);
+                           ShapeContext lv = ShapeContext.of(arg4);
                            BlockPos lv2 = arg4.getBlockPos();
                            BlockPos.Mutable lv3 = new BlockPos.Mutable();
 
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/FindLandTask.java namedSrc/net/minecraft/entity/ai/brain/task/FindLandTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/FindLandTask.java	2024-08-29 20:04:30.440890245 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/FindLandTask.java	2024-08-29 20:03:20.715812794 +0000
@@ -46,7 +46,7 @@
                         } else {
                            BlockPos lv = arg4.getBlockPos();
                            BlockPos.Mutable lv2 = new BlockPos.Mutable();
-                           ShapeContext lv3 = ShapeContext.m_xvebqowz(arg4);
+                           ShapeContext lv3 = ShapeContext.of(arg4);
 
                            for (BlockPos lv4 : BlockPos.iterateOutwards(lv, range, range, range)) {
                               if (lv4.getX() != lv.getX() || lv4.getZ() != lv.getZ()) {
diff -bur namedTargetSrc/net/minecraft/entity/decoration/ArmorStandEntity.java namedSrc/net/minecraft/entity/decoration/ArmorStandEntity.java
--- namedTargetSrc/net/minecraft/entity/decoration/ArmorStandEntity.java	2024-08-29 20:04:30.384889368 +0000
+++ namedSrc/net/minecraft/entity/decoration/ArmorStandEntity.java	2024-08-29 20:03:20.659811943 +0000
@@ -542,14 +542,14 @@
       } else if (player.isSpectator()) {
          return ActionResult.SUCCESS;
       } else if (player.getWorld().isClient) {
-         return ActionResult.f_pkwbrwkg;
+         return ActionResult.SUCCESS_SERVER;
       } else {
          EquipmentSlot lv2 = this.getPreferredEquipmentSlot(lv);
          if (lv.isEmpty()) {
             EquipmentSlot lv3 = this.slotFromPosition(hitPos);
             EquipmentSlot lv4 = this.isSlotDisabled(lv3) ? lv2 : lv3;
             if (this.hasStackEquipped(lv4) && this.equip(player, lv4, lv, hand)) {
-               return ActionResult.f_pkwbrwkg;
+               return ActionResult.SUCCESS_SERVER;
             }
          } else {
             if (this.isSlotDisabled(lv2)) {
@@ -561,7 +561,7 @@
             }
 
             if (this.equip(player, lv2, lv, hand)) {
-               return ActionResult.f_pkwbrwkg;
+               return ActionResult.SUCCESS_SERVER;
             }
          }
 
diff -bur namedTargetSrc/net/minecraft/entity/Entity.java namedSrc/net/minecraft/entity/Entity.java
--- namedTargetSrc/net/minecraft/entity/Entity.java	2024-08-29 20:04:30.424889994 +0000
+++ namedSrc/net/minecraft/entity/Entity.java	2024-08-29 20:03:20.699812551 +0000
@@ -710,7 +710,7 @@
     * @mapping {@literal named collidesWithStateAtPos Lnet/minecraft/entity/Entity;collidesWithStateAtPos(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)Z}
     */
    public boolean collidesWithStateAtPos(BlockPos pos, BlockState state) {
-      VoxelShape lv = state.getCollisionShape(this.getWorld(), pos, ShapeContext.m_xvebqowz(this));
+      VoxelShape lv = state.getCollisionShape(this.getWorld(), pos, ShapeContext.of(this));
       VoxelShape lv2 = lv.offset((double)pos.getX(), (double)pos.getY(), (double)pos.getZ());
       return VoxelShapes.matchesAnywhere(lv2, VoxelShapes.cuboid(this.getBounds()), BooleanBiFunction.AND);
    }
@@ -1336,7 +1336,7 @@
             if (this.isLogicalSideForUpdatingMovement()) {
                Block lv6 = lv4.getBlock();
                if (movement.y != lv.y) {
-                  lv6.m_oscwylqf(this.getWorld(), this);
+                  lv6.updateEntityVelocityAfterFall(this.getWorld(), this);
                }
             }
 
diff -bur namedTargetSrc/net/minecraft/entity/mob/MobEntity.java namedSrc/net/minecraft/entity/mob/MobEntity.java
--- namedTargetSrc/net/minecraft/entity/mob/MobEntity.java	2024-08-29 20:04:30.356888930 +0000
+++ namedSrc/net/minecraft/entity/mob/MobEntity.java	2024-08-29 20:03:20.635811578 +0000
@@ -1816,7 +1816,7 @@
             }
          }
 
-         return ActionResult.f_pkwbrwkg;
+         return ActionResult.SUCCESS_SERVER;
       } else {
          return ActionResult.PASS;
       }
diff -bur namedTargetSrc/net/minecraft/entity/mob/ZombieVillagerEntity.java namedSrc/net/minecraft/entity/mob/ZombieVillagerEntity.java
--- namedTargetSrc/net/minecraft/entity/mob/ZombieVillagerEntity.java	2024-08-29 20:04:30.440890245 +0000
+++ namedSrc/net/minecraft/entity/mob/ZombieVillagerEntity.java	2024-08-29 20:03:20.715812794 +0000
@@ -224,7 +224,7 @@
                this.setConverting(player.getUuid(), this.random.nextInt(2401) + 3600);
             }
 
-            return ActionResult.f_pkwbrwkg;
+            return ActionResult.SUCCESS_SERVER;
          } else {
             return ActionResult.CONSUME;
          }
diff -bur namedTargetSrc/net/minecraft/entity/passive/AbstractHorseEntity.java namedSrc/net/minecraft/entity/passive/AbstractHorseEntity.java
--- namedTargetSrc/net/minecraft/entity/passive/AbstractHorseEntity.java	2024-08-29 20:04:30.248887239 +0000
+++ namedSrc/net/minecraft/entity/passive/AbstractHorseEntity.java	2024-08-29 20:03:20.491809391 +0000
@@ -835,7 +835,7 @@
          stack.consume(1, player);
       }
 
-      return (ActionResult)(!bl && !this.getWorld().isClient ? ActionResult.PASS : ActionResult.f_pkwbrwkg);
+      return (ActionResult)(!bl && !this.getWorld().isClient ? ActionResult.PASS : ActionResult.SUCCESS_SERVER);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/passive/AnimalEntity.java namedSrc/net/minecraft/entity/passive/AnimalEntity.java
--- namedTargetSrc/net/minecraft/entity/passive/AnimalEntity.java	2024-08-29 20:04:30.368889117 +0000
+++ namedSrc/net/minecraft/entity/passive/AnimalEntity.java	2024-08-29 20:03:20.643811700 +0000
@@ -202,7 +202,7 @@
             this.eat(player, hand, lv);
             this.lovePlayer(player);
             this.m_crfaarku();
-            return ActionResult.f_pkwbrwkg;
+            return ActionResult.SUCCESS_SERVER;
          }
 
          if (this.isBaby()) {
diff -bur namedTargetSrc/net/minecraft/entity/passive/PandaEntity.java namedSrc/net/minecraft/entity/passive/PandaEntity.java
--- namedTargetSrc/net/minecraft/entity/passive/PandaEntity.java	2024-08-29 20:04:30.448890370 +0000
+++ namedSrc/net/minecraft/entity/passive/PandaEntity.java	2024-08-29 20:03:20.723812915 +0000
@@ -997,7 +997,7 @@
             this.eat(player, hand, lv);
          }
 
-         return ActionResult.f_pkwbrwkg;
+         return ActionResult.SUCCESS_SERVER;
       } else {
          return ActionResult.PASS;
       }
diff -bur namedTargetSrc/net/minecraft/entity/passive/SheepEntity.java namedSrc/net/minecraft/entity/passive/SheepEntity.java
--- namedTargetSrc/net/minecraft/entity/passive/SheepEntity.java	2024-08-29 20:04:30.284887803 +0000
+++ namedSrc/net/minecraft/entity/passive/SheepEntity.java	2024-08-29 20:03:20.551810303 +0000
@@ -245,7 +245,7 @@
             this.sheared(SoundCategory.PLAYERS);
             this.emitGameEvent(GameEvent.SHEAR, player);
             lv.damageEquipment(1, player, getHand(hand));
-            return ActionResult.f_pkwbrwkg;
+            return ActionResult.SUCCESS_SERVER;
          } else {
             return ActionResult.CONSUME;
          }
diff -bur namedTargetSrc/net/minecraft/entity/passive/StriderEntity.java namedSrc/net/minecraft/entity/passive/StriderEntity.java
--- namedTargetSrc/net/minecraft/entity/passive/StriderEntity.java	2024-08-29 20:04:30.252887302 +0000
+++ namedSrc/net/minecraft/entity/passive/StriderEntity.java	2024-08-29 20:03:20.495809452 +0000
@@ -466,7 +466,7 @@
     */
    private void updateFloating() {
       if (this.isInLava()) {
-         ShapeContext lv = ShapeContext.m_xvebqowz(this);
+         ShapeContext lv = ShapeContext.of(this);
          if (lv.isAbove(FluidBlock.COLLISION_SHAPE, this.getBlockPos(), true) && !this.getWorld().getFluidState(this.getBlockPos().up()).isIn(FluidTags.LAVA)) {
             this.setOnGround(true);
          } else {
diff -bur namedTargetSrc/net/minecraft/entity/passive/WolfEntity.java namedSrc/net/minecraft/entity/passive/WolfEntity.java
--- namedTargetSrc/net/minecraft/entity/passive/WolfEntity.java	2024-08-29 20:04:30.244887177 +0000
+++ namedSrc/net/minecraft/entity/passive/WolfEntity.java	2024-08-29 20:03:20.483809269 +0000
@@ -637,7 +637,7 @@
                   this.jumping = false;
                   this.navigation.stop();
                   this.setTarget(null);
-                  return ActionResult.SUCCESS.m_glxhngrt();
+                  return ActionResult.SUCCESS.withoutStack();
                } else {
                   return lv8;
                }
@@ -646,7 +646,7 @@
       } else if (!this.getWorld().isClient && lv.isOf(Items.BONE) && !this.hasAngerTime()) {
          lv.consume(1, player);
          this.tryTame(player);
-         return ActionResult.f_pkwbrwkg;
+         return ActionResult.SUCCESS_SERVER;
       } else {
          return super.interactMob(player, hand);
       }
diff -bur namedTargetSrc/net/minecraft/entity/vehicle/AbstractMinecartEntity.java namedSrc/net/minecraft/entity/vehicle/AbstractMinecartEntity.java
--- namedTargetSrc/net/minecraft/entity/vehicle/AbstractMinecartEntity.java	2024-08-29 20:04:30.332888554 +0000
+++ namedSrc/net/minecraft/entity/vehicle/AbstractMinecartEntity.java	2024-08-29 20:03:20.607811154 +0000
@@ -861,7 +861,7 @@
     * @mapping {@literal named m_raaevxrz Lnet/minecraft/entity/vehicle/AbstractMinecartEntity;m_raaevxrz(Lnet/minecraft/world/World;)Z}
     */
    public static boolean m_raaevxrz(World world) {
-      return world.getEnabledFlags().hasFlag(FeatureFlags.f_bgdekufs);
+      return world.getEnabledFlags().hasFlag(FeatureFlags.MINECART_IMPROVEMENTS);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/feature_flags/FeatureFlags.java namedSrc/net/minecraft/feature_flags/FeatureFlags.java
--- namedTargetSrc/net/minecraft/feature_flags/FeatureFlags.java	2024-08-29 20:04:30.348888805 +0000
+++ namedSrc/net/minecraft/feature_flags/FeatureFlags.java	2024-08-29 20:03:20.627811457 +0000
@@ -26,13 +26,15 @@
     */
    public static final FeatureFlag TRADE_REBALANCE;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_ttbawmfh Lnet/minecraft/unmapped/C_ozbmlrmw;f_ttbawmfh:Lnet/minecraft/unmapped/C_kksdgidr;}
+    * @mapping {@literal named REDSTONE_EXPERIMENTS Lnet/minecraft/feature_flags/FeatureFlags;REDSTONE_EXPERIMENTS:Lnet/minecraft/feature_flags/FeatureFlag;}
     */
-   public static final FeatureFlag f_ttbawmfh;
+   public static final FeatureFlag REDSTONE_EXPERIMENTS;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_bgdekufs Lnet/minecraft/unmapped/C_ozbmlrmw;f_bgdekufs:Lnet/minecraft/unmapped/C_kksdgidr;}
+    * @mapping {@literal named MINECART_IMPROVEMENTS Lnet/minecraft/feature_flags/FeatureFlags;MINECART_IMPROVEMENTS:Lnet/minecraft/feature_flags/FeatureFlag;}
     */
-   public static final FeatureFlag f_bgdekufs;
+   public static final FeatureFlag MINECART_IMPROVEMENTS;
    /**
     * @mapping {@literal hashed f_xstdghyj Lnet/minecraft/unmapped/C_ozbmlrmw;f_xstdghyj:Lnet/minecraft/unmapped/C_asecsefi;}
     * @mapping {@literal named MAIN_REGISTRY Lnet/minecraft/feature_flags/FeatureFlags;MAIN_REGISTRY:Lnet/minecraft/feature_flags/FeatureFlagRegistry;}
@@ -89,8 +91,8 @@
       VANILLA = lv.createVanillaFlag("vanilla");
       BUNDLE = lv.createVanillaFlag("bundle");
       TRADE_REBALANCE = lv.createVanillaFlag("trade_rebalance");
-      f_ttbawmfh = lv.createVanillaFlag("redstone_experiments");
-      f_bgdekufs = lv.createVanillaFlag("minecart_improvements");
+      REDSTONE_EXPERIMENTS = lv.createVanillaFlag("redstone_experiments");
+      MINECART_IMPROVEMENTS = lv.createVanillaFlag("minecart_improvements");
       MAIN_REGISTRY = lv.build();
       CODEC = MAIN_REGISTRY.createCodec();
       DEFAULT_SET = FeatureFlagBitSet.ofFlag(VANILLA);


The remaining diff is too long!

-Original file line number
+Diff line change
@@ Expand Up @@
     		ARG 2 world
     		ARG 3 pos
     		ARG 4 block
+    		ARG 5 orientation
     		ARG 6 notify
     	METHOD m_umbsjste rotate (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_mboglirk;)Lnet/minecraft/unmapped/C_txtbiemp;
     		COMMENT Applies a block rotation to a block state.
@@ Expand Down Expand Up @@
     		ARG 3 pos
     		ARG 4 context
     	CLASS C_eibemhky AbstractBlockState
+    		FIELD f_biaogsvo FULL_BLOCK_OCCLUSION_SHAPES [Lnet/minecraft/unmapped/C_zscvhwbd;
+    		FIELD f_bsbhmsca cullingShape Lnet/minecraft/unmapped/C_zscvhwbd;
+    		FIELD f_bvttwnii EMPTY_OCCLUSION_SHAPES [Lnet/minecraft/unmapped/C_zscvhwbd;
     		FIELD f_ciiuhosx opaque Z
     		FIELD f_cmbiwnda hasSidedTransparency Z
+    		FIELD f_gbcdxrgd DIRECTIONS [Lnet/minecraft/unmapped/C_xpuuihxf;
     		FIELD f_jnxtuzdb hardness F
     		FIELD f_jvcpotqu isAir Z
     		FIELD f_lpessbtt pistonBehavior Lnet/minecraft/unmapped/C_mojvzhua;
     		FIELD f_lqzypovm spawnsDustParticles Z
     		FIELD f_mkfwgndk solidBlockPredicate Lnet/minecraft/unmapped/C_triydqro$C_izsedryc;
     		FIELD f_nijrkoes emissiveLightingPredicate Lnet/minecraft/unmapped/C_triydqro$C_izsedryc;
+    		FIELD f_nsclhbdi opacity I
     		FIELD f_ochxyzpr solid Z
     		FIELD f_omahusur liquid Z
     		FIELD f_rmmimkow replaceable Z
@@ Expand All @@
     		FIELD f_vskisdzk postProcessPredicate Lnet/minecraft/unmapped/C_triydqro$C_izsedryc;
     		FIELD f_wknecqnz luminance I
     		FIELD f_wvbmkgls suffocationPredicate Lnet/minecraft/unmapped/C_triydqro$C_izsedryc;
+    		FIELD f_xogzmbzi isTransparent Z
     		FIELD f_xwxdktuf hasRandomTicks Z
+    		FIELD f_xxewnzdk isFullCube Z
+    		FIELD f_ycbjvypj cullingFaces [Lnet/minecraft/unmapped/C_zscvhwbd;
     		FIELD f_yypdsdkn lavaIgnitable Z
     		FIELD f_zpvdfobl mapColor Lnet/minecraft/unmapped/C_mlrprqox;
     		FIELD f_zzuoeazs instrument Lnet/minecraft/unmapped/C_onjtjtsi;
     		METHOD m_aeqyhmrr neighborUpdate (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_ctatbkvy;Z)V
     			ARG 2 pos
+    			ARG 4 orientation
     			ARG 5 notify
     		METHOD m_alvmezvc getInstrument ()Lnet/minecraft/unmapped/C_onjtjtsi;
     		METHOD m_aoahmjkt getSoundGroup ()Lnet/minecraft/unmapped/C_aevintex;
@@ Expand Down Expand Up @@
     			COMMENT {@return whether this block state is an instance of the given block holder}
     			ARG 1 block
     				COMMENT the block holder to match
+    		METHOD m_fpkvjpml ([Lnet/minecraft/unmapped/C_zscvhwbd;)V
+    			ARG 0 directions
     		METHOD m_fuqgdrck isOf (Lnet/minecraft/unmapped/C_mmxmpdoq;)Z
     			COMMENT {@return whether this block state is an instance of the given block}
     			ARG 1 block
@@ Expand Down Expand Up @@
     			ARG 2 direction
     		METHOD m_pobwdefx exceedsCube ()Z
     		METHOD m_pppprjpr isTransparent ()Z
+    		METHOD m_ptlyqoli ([Lnet/minecraft/unmapped/C_zscvhwbd;)V
+    			ARG 0 directions
     		METHOD m_pvjmhzzb getOpacity ()I
     		METHOD m_qcyiqint hasComparatorOutput ()Z
     		METHOD m_qilylxum onUse (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_jdakttms;)Lnet/minecraft/unmapped/C_ozuepbyj;
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up @@
     	FIELD f_zatyqcqa CODEC Lcom/mojang/serialization/MapCodec;
     	FIELD f_zeveupfs NO_REDRAW I
     		COMMENT Used in conjunction with {@link #NOTIFY_LISTENERS} to suppress the render pass on clients.
+    	FIELD f_zobgxnry SKIP_UPDATE_FOR_REDSTONE_WIRE I
+    		COMMENT Skips {@link AbstractBlock#getStateForNeighborUpdate} call for redstone wire.
     	METHOD m_aqcetwet onSteppedOn (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_astfners;)V
     		COMMENT Called when an entity steps on this block.
     		ARG 1 world
@@ Expand Down Expand Up @@
     			COMMENT the bitwise flags for {@link net.minecraft.world.ModifiableWorld#setBlockState(BlockPos, BlockState, int, int)}
     		ARG 5 maxUpdateDepth
     			COMMENT the limit for the cascading block updates
+    	METHOD m_oscwylqf updateEntityVelocityAfterFall (Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_astfners;)V
+    		ARG 2 entity
     	METHOD m_pdzevtfw copyProperty (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_vzlztuyw;)Lnet/minecraft/unmapped/C_txtbiemp;
     		ARG 0 source
     		ARG 1 target
@@ Expand Down Expand Up @@
     		ARG 2 stack
     	METHOD m_zpnlglhs shouldDrawSide (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_xpuuihxf;)Z
     		ARG 0 state
+    		ARG 1 sideState
     		ARG 2 side
+    	CLASS C_epynadow ShapePair
     	CLASS C_miiagdeq
     		METHOD load (Ljava/lang/Object;)Ljava/lang/Object;
     			ARG 1 shape
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up @@
     		ARG 3 pos
     		ARG 4 executor
     		ARG 5 hasCommand
+    	METHOD m_jlkigzsj (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+    		ARG 0 instance
+    	METHOD m_wewzxquc update (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_qpgfeghp;Z)V
+    		ARG 3 blockEntity
     	METHOD m_xiigksjk (Lnet/minecraft/unmapped/C_tngfqham;)Ljava/lang/Boolean;
     		ARG 0 block

-Original file line number
+Diff line change
@@ Expand Up @@
     	FIELD f_sqzftxsg entity Lnet/minecraft/unmapped/C_astfners;
     	FIELD f_ulnpxoti heldItem Lnet/minecraft/unmapped/C_sddaxwyk;
     	FIELD f_wsgxxalk walkOnFluidPredicate Ljava/util/function/Predicate;
+    	METHOD <init> (Lnet/minecraft/unmapped/C_astfners;Z)V
+    		ARG 1 entity
+    		ARG 2 collidesWithFluid
     	METHOD <init> (ZDLnet/minecraft/unmapped/C_sddaxwyk;Ljava/util/function/Predicate;Lnet/minecraft/unmapped/C_astfners;)V
     		ARG 1 descending
     		ARG 2 minY
@@ Expand Down @@

-Original file line number
+Diff line change
@@ -1,2 +1,3 @@
     CLASS net/minecraft/unmapped/C_zjbzveiy net/minecraft/block/HeavyCoreBlock
     	FIELD f_ahnlwrmp SHAPE Lnet/minecraft/unmapped/C_zscvhwbd;
+    	FIELD f_unuqrijj WATERLOGGED Lnet/minecraft/unmapped/C_xhwijdsd;

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Commit

There are no files selected for viewing

3 comments on commit `8942d89`

github-actions bot commented on `8942d89` Aug 29, 2024

github-actions bot commented on `8942d89` Aug 29, 2024

github-actions bot commented on `8942d89` Aug 29, 2024

Commit

There are no files selected for viewing

3 comments on commit 8942d89

github-actions bot commented on 8942d89 Aug 29, 2024

Choose a reason for hiding this comment

github-actions bot commented on 8942d89 Aug 29, 2024

Choose a reason for hiding this comment

github-actions bot commented on 8942d89 Aug 29, 2024

Choose a reason for hiding this comment

3 comments on commit `8942d89`

github-actions bot commented on `8942d89` Aug 29, 2024

github-actions bot commented on `8942d89` Aug 29, 2024

github-actions bot commented on `8942d89` Aug 29, 2024