Skip to content

Commit

Permalink
fix: update publish.yml to MuonMC-specific needs + small spelling fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@sylv256
sylv256 committed Jul 5, 2024
1 parent 4553e04 commit 4e9f00f
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/publish.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Publish
on: [push]
jobs:
publish:
if: ${{ github.repository_owner == 'QuiltMC' }}
if: ${{ github.repository_owner == 'MuonMC' }}
runs-on: ubuntu-latest
container:
image: eclipse-temurin:21
Expand All @@ -21,7 +21,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

# Generate the build number based on tags to allow per branch build numbers, not something github provides by default.
# Generate the build number based on tags to allow per branch build numbers, not something GitHub provides by default.
- name: Generate build number
id: buildnumber
uses: onyxmueller/build-tag-number@v1
Expand All @@ -37,9 +37,9 @@ jobs:
SNAPSHOTS_USERNAME: ${{ secrets.SNAPSHOTS_USERNAME }}
SNAPSHOTS_PASSWORD: ${{ secrets.SNAPSHOTS_PASSWORD }}
BRANCH_NAME: ${{ github.ref }}
- name: Update Quilt Meta
uses: quiltmc/update-quilt-meta@main
with:
b2-key-id: ${{ secrets.META_B2_KEY_ID }}
b2-key: ${{ secrets.META_B2_KEY }}
cf-key: ${{ secrets.META_CF_KEY }}
# - name: Update Quilt Meta
# uses: quiltmc/update-quilt-meta@main
# with:
# b2-key-id: ${{ secrets.META_B2_KEY_ID }}
# b2-key: ${{ secrets.META_B2_KEY }}
# cf-key: ${{ secrets.META_CF_KEY }}

2 comments on commit 4e9f00f

@github-actions
Copy link

Choose a reason for hiding this comment

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

With commit 4e9f00f, 44 file(s) were updated with 217 line(s) added and 199 removed compared to the latest Quilt Mappings version.

View the diff here (1/2): 
diff -bur namedTargetSrc/net/minecraft/block/EndGatewayBlock.java namedSrc/net/minecraft/block/EndGatewayBlock.java
--- namedTargetSrc/net/minecraft/block/EndGatewayBlock.java	2024-07-05 02:12:23.741133695 +0000
+++ namedSrc/net/minecraft/block/EndGatewayBlock.java	2024-07-05 02:11:09.732217489 +0000
@@ -12,10 +12,10 @@
 import net.minecraft.particle.ParticleTypes;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.unmapped.C_teerivzm;
-import net.minecraft.unmapped.C_zbvyjshu;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.random.RandomGenerator;
+import net.minecraft.world.DimensionTransition;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldView;
 import org.jetbrains.annotations.Nullable;
@@ -126,14 +126,16 @@
 
    /**
     * @mapping {@literal hashed m_ssylpsbj Lnet/minecraft/unmapped/C_pwjzqojt;m_ssylpsbj(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_zbvyjshu;}
-    * @mapping {@literal named m_ssylpsbj Lnet/minecraft/block/EndGatewayBlock;m_ssylpsbj(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/Entity;Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/unmapped/C_zbvyjshu;}
+    * @mapping {@literal named m_ssylpsbj Lnet/minecraft/block/EndGatewayBlock;m_ssylpsbj(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/Entity;Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/world/DimensionTransition;}
     */
    @Nullable
    @Override
-   public C_zbvyjshu m_ssylpsbj(ServerWorld world, Entity arg2, BlockPos pos) {
+   public DimensionTransition m_ssylpsbj(ServerWorld world, Entity arg2, BlockPos pos) {
       if (world.getBlockEntity(pos) instanceof EndGatewayBlockEntity lv2) {
          Vec3d lv4 = lv2.m_shfarbmg(world, pos);
-         return lv4 != null ? new C_zbvyjshu(world, lv4, m_jeehjmdl(arg2), arg2.getYaw(), arg2.getPitch(), C_zbvyjshu.f_fbtpbgjw) : null;
+         return lv4 != null
+            ? new DimensionTransition(world, lv4, m_jeehjmdl(arg2), arg2.getYaw(), arg2.getPitch(), DimensionTransition.ADD_PORTAL_TICKET)
+            : null;
       } else {
          return null;
       }
diff -bur namedTargetSrc/net/minecraft/block/EndPortalBlock.java namedSrc/net/minecraft/block/EndPortalBlock.java
--- namedTargetSrc/net/minecraft/block/EndPortalBlock.java	2024-07-05 02:12:23.889135199 +0000
+++ namedSrc/net/minecraft/block/EndPortalBlock.java	2024-07-05 02:11:09.920219773 +0000
@@ -12,7 +12,6 @@
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.unmapped.C_idrtmfxf;
 import net.minecraft.unmapped.C_teerivzm;
-import net.minecraft.unmapped.C_zbvyjshu;
 import net.minecraft.util.function.BooleanBiFunction;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
@@ -21,6 +20,7 @@
 import net.minecraft.util.shape.VoxelShape;
 import net.minecraft.util.shape.VoxelShapes;
 import net.minecraft.world.BlockView;
+import net.minecraft.world.DimensionTransition;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldView;
 
@@ -94,10 +94,10 @@
 
    /**
     * @mapping {@literal hashed m_ssylpsbj Lnet/minecraft/unmapped/C_iqbzlnao;m_ssylpsbj(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_zbvyjshu;}
-    * @mapping {@literal named m_ssylpsbj Lnet/minecraft/block/EndPortalBlock;m_ssylpsbj(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/Entity;Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/unmapped/C_zbvyjshu;}
+    * @mapping {@literal named m_ssylpsbj Lnet/minecraft/block/EndPortalBlock;m_ssylpsbj(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/Entity;Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/world/DimensionTransition;}
     */
    @Override
-   public C_zbvyjshu m_ssylpsbj(ServerWorld world, Entity arg2, BlockPos pos) {
+   public DimensionTransition m_ssylpsbj(ServerWorld world, Entity arg2, BlockPos pos) {
       RegistryKey<World> lv = world.getRegistryKey() == World.END ? World.OVERWORLD : World.END;
       ServerWorld lv2 = world.getServer().getWorld(lv);
       if (lv2 == null) {
@@ -105,7 +105,7 @@
       } else {
          boolean bl = lv == World.END;
          BlockPos lv3 = bl ? ServerWorld.END_SPAWN_POS : lv2.getSpawnPos();
-         Vec3d lv4 = lv3.m_rtputfdg();
+         Vec3d lv4 = lv3.ofBottomCenter();
          float f = arg2.getYaw();
          if (bl) {
             C_idrtmfxf.m_narefewt(lv2, BlockPos.fromPosition(lv4).down(), true);
@@ -115,13 +115,15 @@
             }
          } else {
             if (arg2 instanceof ServerPlayerEntity lv5) {
-               return lv5.m_jpjsvuqt(false, C_zbvyjshu.f_jgwyllbi);
+               return lv5.m_jpjsvuqt(false, DimensionTransition.NONE);
             }
 
-            lv4 = arg2.m_vfbpgxfo(lv2, lv3).m_rtputfdg();
+            lv4 = arg2.calculateSpawnpoint(lv2, lv3).ofBottomCenter();
          }
 
-         return new C_zbvyjshu(lv2, lv4, arg2.getVelocity(), f, arg2.getPitch(), C_zbvyjshu.f_kidpbkzf.then(C_zbvyjshu.f_fbtpbgjw));
+         return new DimensionTransition(
+            lv2, lv4, arg2.getVelocity(), f, arg2.getPitch(), DimensionTransition.TRAVEL_THROUGH_PORTAL.then(DimensionTransition.ADD_PORTAL_TICKET)
+         );
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/block/entity/EndGatewayBlockEntity.java namedSrc/net/minecraft/block/entity/EndGatewayBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/EndGatewayBlockEntity.java	2024-07-05 02:12:24.001136338 +0000
+++ namedSrc/net/minecraft/block/entity/EndGatewayBlockEntity.java	2024-07-05 02:11:10.040221231 +0000
@@ -237,7 +237,7 @@
 
       if (this.exitPortalPos != null) {
          BlockPos lv2 = this.exactTeleport ? this.exitPortalPos : findBestPortalExitPos(world, this.exitPortalPos);
-         return lv2.m_rtputfdg();
+         return lv2.ofBottomCenter();
       } else {
          return null;
       }
diff -bur namedTargetSrc/net/minecraft/block/NetherPortalBlock.java namedSrc/net/minecraft/block/NetherPortalBlock.java
--- namedTargetSrc/net/minecraft/block/NetherPortalBlock.java	2024-07-05 02:12:23.949135809 +0000
+++ namedSrc/net/minecraft/block/NetherPortalBlock.java	2024-07-05 02:11:09.980220502 +0000
@@ -18,7 +18,6 @@
 import net.minecraft.state.property.EnumProperty;
 import net.minecraft.state.property.Properties;
 import net.minecraft.unmapped.C_teerivzm;
-import net.minecraft.unmapped.C_zbvyjshu;
 import net.minecraft.util.BlockRotation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
@@ -27,6 +26,7 @@
 import net.minecraft.util.shape.VoxelShape;
 import net.minecraft.world.BlockLocating;
 import net.minecraft.world.BlockView;
+import net.minecraft.world.DimensionTransition;
 import net.minecraft.world.GameRules;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldAccess;
@@ -167,11 +167,11 @@
 
    /**
     * @mapping {@literal hashed m_ssylpsbj Lnet/minecraft/unmapped/C_zpsdinym;m_ssylpsbj(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_zbvyjshu;}
-    * @mapping {@literal named m_ssylpsbj Lnet/minecraft/block/NetherPortalBlock;m_ssylpsbj(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/Entity;Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/unmapped/C_zbvyjshu;}
+    * @mapping {@literal named m_ssylpsbj Lnet/minecraft/block/NetherPortalBlock;m_ssylpsbj(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/Entity;Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/world/DimensionTransition;}
     */
    @Nullable
    @Override
-   public C_zbvyjshu m_ssylpsbj(ServerWorld world, Entity arg2, BlockPos pos) {
+   public DimensionTransition m_ssylpsbj(ServerWorld world, Entity arg2, BlockPos pos) {
       RegistryKey<World> lv = world.getRegistryKey() == World.NETHER ? World.OVERWORLD : World.NETHER;
       ServerWorld lv2 = world.getServer().getWorld(lv);
       if (lv2 == null) {
@@ -187,18 +187,18 @@
 
    /**
     * @mapping {@literal hashed m_cuetenod Lnet/minecraft/unmapped/C_zpsdinym;m_cuetenod(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_hynzadkk;ZLnet/minecraft/unmapped/C_pneibfez;)Lnet/minecraft/unmapped/C_zbvyjshu;}
-    * @mapping {@literal named m_cuetenod Lnet/minecraft/block/NetherPortalBlock;m_cuetenod(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/Entity;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/math/BlockPos;ZLnet/minecraft/world/border/WorldBorder;)Lnet/minecraft/unmapped/C_zbvyjshu;}
+    * @mapping {@literal named m_cuetenod Lnet/minecraft/block/NetherPortalBlock;m_cuetenod(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/Entity;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/math/BlockPos;ZLnet/minecraft/world/border/WorldBorder;)Lnet/minecraft/world/DimensionTransition;}
     */
    @Nullable
-   private C_zbvyjshu m_cuetenod(ServerWorld world, Entity arg2, BlockPos arg3, BlockPos arg4, boolean bl, WorldBorder arg5) {
+   private DimensionTransition m_cuetenod(ServerWorld world, Entity arg2, BlockPos arg3, BlockPos arg4, boolean bl, WorldBorder arg5) {
       Optional<BlockPos> optional = world.getPortalForcer().m_mpevuvcu(arg4, bl, arg5);
       BlockLocating.Rectangle lv3;
-      C_zbvyjshu.C_pytyshdn lv4;
+      DimensionTransition.PostTeleportEvent lv4;
       if (optional.isPresent()) {
          BlockPos lv = (BlockPos)optional.get();
          BlockState lv2 = world.getBlockState(lv);
          lv3 = BlockLocating.getLargestRectangle(lv, lv2.get(Properties.HORIZONTAL_AXIS), 21, Direction.Axis.Y, 21, pos -> world.getBlockState(pos) == lv2);
-         lv4 = C_zbvyjshu.f_kidpbkzf.then(arg2x -> arg2x.m_gykcjypz(lv));
+         lv4 = DimensionTransition.TRAVEL_THROUGH_PORTAL.then(arg2x -> arg2x.addPortalTicket(lv));
       } else {
          Direction.Axis lv5 = (Direction.Axis)arg2.getWorld().getBlockState(arg3).getOrEmpty(AXIS).orElse(Direction.Axis.X);
          Optional<BlockLocating.Rectangle> optional2 = world.getPortalForcer().createPortal(arg4, lv5);
@@ -208,7 +208,7 @@
          }
 
          lv3 = (BlockLocating.Rectangle)optional2.get();
-         lv4 = C_zbvyjshu.f_kidpbkzf.then(C_zbvyjshu.f_fbtpbgjw);
+         lv4 = DimensionTransition.TRAVEL_THROUGH_PORTAL.then(DimensionTransition.ADD_PORTAL_TICKET);
       }
 
       return m_kvaymgqu(arg2, arg3, lv3, world, lv4);
@@ -216,9 +216,11 @@
 
    /**
     * @mapping {@literal hashed m_kvaymgqu Lnet/minecraft/unmapped/C_zpsdinym;m_kvaymgqu(Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_wauhtoaq$C_tqypnjit;Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_zbvyjshu$C_pytyshdn;)Lnet/minecraft/unmapped/C_zbvyjshu;}
-    * @mapping {@literal named m_kvaymgqu Lnet/minecraft/block/NetherPortalBlock;m_kvaymgqu(Lnet/minecraft/entity/Entity;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/world/BlockLocating$Rectangle;Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/unmapped/C_zbvyjshu$C_pytyshdn;)Lnet/minecraft/unmapped/C_zbvyjshu;}
+    * @mapping {@literal named m_kvaymgqu Lnet/minecraft/block/NetherPortalBlock;m_kvaymgqu(Lnet/minecraft/entity/Entity;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/world/BlockLocating$Rectangle;Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/world/DimensionTransition$PostTeleportEvent;)Lnet/minecraft/world/DimensionTransition;}
     */
-   private static C_zbvyjshu m_kvaymgqu(Entity arg, BlockPos pos, BlockLocating.Rectangle arg3, ServerWorld world, C_zbvyjshu.C_pytyshdn arg5) {
+   private static DimensionTransition m_kvaymgqu(
+      Entity arg, BlockPos pos, BlockLocating.Rectangle arg3, ServerWorld world, DimensionTransition.PostTeleportEvent arg5
+   ) {
       BlockState lv = arg.getWorld().getBlockState(pos);
       Direction.Axis lv2;
       Vec3d lv4;
@@ -236,10 +238,18 @@
 
    /**
     * @mapping {@literal hashed m_fzuhemna Lnet/minecraft/unmapped/C_zpsdinym;m_fzuhemna(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_wauhtoaq$C_tqypnjit;Lnet/minecraft/unmapped/C_xpuuihxf$C_rmpfouoz;Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_vgpupfxx;FFLnet/minecraft/unmapped/C_zbvyjshu$C_pytyshdn;)Lnet/minecraft/unmapped/C_zbvyjshu;}
-    * @mapping {@literal named m_fzuhemna Lnet/minecraft/block/NetherPortalBlock;m_fzuhemna(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/world/BlockLocating$Rectangle;Lnet/minecraft/util/math/Direction$Axis;Lnet/minecraft/util/math/Vec3d;Lnet/minecraft/entity/Entity;Lnet/minecraft/util/math/Vec3d;FFLnet/minecraft/unmapped/C_zbvyjshu$C_pytyshdn;)Lnet/minecraft/unmapped/C_zbvyjshu;}
+    * @mapping {@literal named m_fzuhemna Lnet/minecraft/block/NetherPortalBlock;m_fzuhemna(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/world/BlockLocating$Rectangle;Lnet/minecraft/util/math/Direction$Axis;Lnet/minecraft/util/math/Vec3d;Lnet/minecraft/entity/Entity;Lnet/minecraft/util/math/Vec3d;FFLnet/minecraft/world/DimensionTransition$PostTeleportEvent;)Lnet/minecraft/world/DimensionTransition;}
     */
-   private static C_zbvyjshu m_fzuhemna(
-      ServerWorld world, BlockLocating.Rectangle arg2, Direction.Axis arg3, Vec3d arg4, Entity arg5, Vec3d arg6, float f, float g, C_zbvyjshu.C_pytyshdn arg7
+   private static DimensionTransition m_fzuhemna(
+      ServerWorld world,
+      BlockLocating.Rectangle arg2,
+      Direction.Axis arg3,
+      Vec3d arg4,
+      Entity arg5,
+      Vec3d arg6,
+      float f,
+      float g,
+      DimensionTransition.PostTeleportEvent arg7
    ) {
       BlockPos lv = arg2.lowerLeft;
       BlockState lv2 = world.getBlockState(lv);
@@ -255,7 +265,7 @@
       boolean bl = lv3 == Direction.Axis.X;
       Vec3d lv6 = new Vec3d((double)lv.getX() + (bl ? h : k), (double)lv.getY() + j, (double)lv.getZ() + (bl ? k : h));
       Vec3d lv7 = AreaHelper.findOpenPosition(lv6, world, arg5, lv4);
-      return new C_zbvyjshu(world, lv7, lv5, f + (float)i, g, arg7);
+      return new DimensionTransition(world, lv7, lv5, f + (float)i, g, arg7);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/ParentElement.java namedSrc/net/minecraft/client/gui/ParentElement.java
--- namedTargetSrc/net/minecraft/client/gui/ParentElement.java	2024-07-05 02:12:23.849134793 +0000
+++ namedSrc/net/minecraft/client/gui/ParentElement.java	2024-07-05 02:11:09.864219092 +0000
@@ -153,7 +153,7 @@
     * Mapping not found
     */
    @Override
-   default void setFocused(boolean bl) {
+   default void setFocused(boolean focused) {
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/DisconnectedScreen.java namedSrc/net/minecraft/client/gui/screen/DisconnectedScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/DisconnectedScreen.java	2024-07-05 02:12:23.805134346 +0000
+++ namedSrc/net/minecraft/client/gui/screen/DisconnectedScreen.java	2024-07-05 02:11:09.804218363 +0000
@@ -7,9 +7,9 @@
 import net.minecraft.client.gui.widget.layout.LinearLayoutWidget;
 import net.minecraft.client.gui.widget.text.MultilineTextWidget;
 import net.minecraft.client.gui.widget.text.TextWidget;
+import net.minecraft.server.network.DisconnectReason;
 import net.minecraft.text.CommonTexts;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_igbzvhln;
 import net.minecraft.util.Util;
 
 /**
@@ -44,7 +44,7 @@
    /**
     * Mapping not found
     */
-   private final C_igbzvhln f_kinjqdqw;
+   private final DisconnectReason f_kinjqdqw;
    /**
     * @mapping {@literal hashed f_rlcssznk Lnet/minecraft/unmapped/C_mluajnfe;f_rlcssznk:Lnet/minecraft/unmapped/C_rdaqiwdt;}
     * @mapping {@literal named returnText Lnet/minecraft/client/gui/screen/DisconnectedScreen;returnText:Lnet/minecraft/text/Text;}
@@ -61,7 +61,7 @@
     * @mapping {@literal named <init> Lnet/minecraft/client/gui/screen/DisconnectedScreen;<init>(Lnet/minecraft/client/gui/screen/Screen;Lnet/minecraft/text/Text;Lnet/minecraft/text/Text;)V}
     */
    public DisconnectedScreen(Screen parent, Text title, Text reason) {
-      this(parent, title, new C_igbzvhln(reason));
+      this(parent, title, new DisconnectReason(reason));
    }
 
    /**
@@ -69,22 +69,22 @@
     * @mapping {@literal named <init> Lnet/minecraft/client/gui/screen/DisconnectedScreen;<init>(Lnet/minecraft/client/gui/screen/Screen;Lnet/minecraft/text/Text;Lnet/minecraft/text/Text;Lnet/minecraft/text/Text;)V}
     */
    public DisconnectedScreen(Screen parent, Text title, Text reason, Text returnText) {
-      this(parent, title, new C_igbzvhln(reason), returnText);
+      this(parent, title, new DisconnectReason(reason), returnText);
    }
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_mluajnfe;<init>(Lnet/minecraft/unmapped/C_wrmtlwqx;Lnet/minecraft/unmapped/C_rdaqiwdt;Lnet/minecraft/unmapped/C_igbzvhln;)V}
-    * @mapping {@literal named <init> Lnet/minecraft/client/gui/screen/DisconnectedScreen;<init>(Lnet/minecraft/client/gui/screen/Screen;Lnet/minecraft/text/Text;Lnet/minecraft/unmapped/C_igbzvhln;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/client/gui/screen/DisconnectedScreen;<init>(Lnet/minecraft/client/gui/screen/Screen;Lnet/minecraft/text/Text;Lnet/minecraft/server/network/DisconnectReason;)V}
     */
-   public DisconnectedScreen(Screen parent, Text title, C_igbzvhln arg3) {
+   public DisconnectedScreen(Screen parent, Text title, DisconnectReason arg3) {
       this(parent, title, arg3, TO_MENU);
    }
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_mluajnfe;<init>(Lnet/minecraft/unmapped/C_wrmtlwqx;Lnet/minecraft/unmapped/C_rdaqiwdt;Lnet/minecraft/unmapped/C_igbzvhln;Lnet/minecraft/unmapped/C_rdaqiwdt;)V}
-    * @mapping {@literal named <init> Lnet/minecraft/client/gui/screen/DisconnectedScreen;<init>(Lnet/minecraft/client/gui/screen/Screen;Lnet/minecraft/text/Text;Lnet/minecraft/unmapped/C_igbzvhln;Lnet/minecraft/text/Text;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/client/gui/screen/DisconnectedScreen;<init>(Lnet/minecraft/client/gui/screen/Screen;Lnet/minecraft/text/Text;Lnet/minecraft/server/network/DisconnectReason;Lnet/minecraft/text/Text;)V}
     */
-   public DisconnectedScreen(Screen parent, Text title, C_igbzvhln arg3, Text returnText) {
+   public DisconnectedScreen(Screen parent, Text title, DisconnectReason arg3, Text returnText) {
       super(title);
       this.parent = parent;
       this.f_kinjqdqw = arg3;
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/realms/RealmsMainScreen.java namedSrc/net/minecraft/client/gui/screen/realms/RealmsMainScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/realms/RealmsMainScreen.java	2024-07-05 02:12:23.949135809 +0000
+++ namedSrc/net/minecraft/client/gui/screen/realms/RealmsMainScreen.java	2024-07-05 02:11:09.980220502 +0000
@@ -1500,9 +1500,9 @@
        * Mapping not found
        */
       @Override
-      public void setFocused(boolean bl) {
-         super.setFocused(bl);
-         this.button.setFocused(bl);
+      public void setFocused(boolean focused) {
+         super.setFocused(focused);
+         this.button.setFocused(focused);
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/ClickableWidget.java namedSrc/net/minecraft/client/gui/widget/ClickableWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/ClickableWidget.java	2024-07-05 02:12:23.973136054 +0000
+++ namedSrc/net/minecraft/client/gui/widget/ClickableWidget.java	2024-07-05 02:11:10.008220842 +0000
@@ -440,8 +440,8 @@
     * Mapping not found
     */
    @Override
-   public void setFocused(boolean bl) {
-      this.focused = bl;
+   public void setFocused(boolean focused) {
+      this.focused = focused;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/DraggingWidget.java namedSrc/net/minecraft/client/gui/widget/DraggingWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/DraggingWidget.java	2024-07-05 02:12:23.857134874 +0000
+++ namedSrc/net/minecraft/client/gui/widget/DraggingWidget.java	2024-07-05 02:11:09.872219189 +0000
@@ -120,7 +120,7 @@
     * Mapping not found
     */
    @Override
-   public void setFocused(boolean bl) {
-      ParentElement.super.setFocused(bl);
+   public void setFocused(boolean focused) {
+      ParentElement.super.setFocused(focused);
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/EditBoxWidget.java namedSrc/net/minecraft/client/gui/widget/EditBoxWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/EditBoxWidget.java	2024-07-05 02:12:23.937135688 +0000
+++ namedSrc/net/minecraft/client/gui/widget/EditBoxWidget.java	2024-07-05 02:11:09.960220259 +0000
@@ -341,9 +341,9 @@
     * Mapping not found
     */
    @Override
-   public void setFocused(boolean bl) {
-      super.setFocused(bl);
-      if (bl) {
+   public void setFocused(boolean focused) {
+      super.setFocused(focused);
+      if (focused) {
          this.focusTime = Util.getMeasuringTimeMs();
       }
    }
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/HeaderBar.java namedSrc/net/minecraft/client/gui/widget/HeaderBar.java
--- namedTargetSrc/net/minecraft/client/gui/widget/HeaderBar.java	2024-07-05 02:12:24.017136500 +0000
+++ namedSrc/net/minecraft/client/gui/widget/HeaderBar.java	2024-07-05 02:11:10.060221474 +0000
@@ -122,10 +122,10 @@
     * Mapping not found
     */
    @Override
-   public void setFocused(boolean bl) {
-      super.setFocused(bl);
+   public void setFocused(boolean focused) {
+      super.setFocused(focused);
       if (this.getFocused() != null) {
-         this.getFocused().setFocused(bl);
+         this.getFocused().setFocused(focused);
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/list/EntryListWidget.java namedSrc/net/minecraft/client/gui/widget/list/EntryListWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/list/EntryListWidget.java	2024-07-05 02:12:23.773134021 +0000
+++ namedSrc/net/minecraft/client/gui/widget/list/EntryListWidget.java	2024-07-05 02:11:09.772217975 +0000
@@ -883,7 +883,7 @@
        * @mapping {@literal named setFocused Lnet/minecraft/client/gui/widget/list/EntryListWidget$Entry;setFocused(Z)V}
        */
       @Override
-      public void setFocused(boolean bl) {
+      public void setFocused(boolean focused) {
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget.java namedSrc/net/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget.java	2024-07-05 02:12:23.857134874 +0000
+++ namedSrc/net/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget.java	2024-07-05 02:11:09.872219189 +0000
@@ -289,7 +289,7 @@
     * Mapping not found
     */
    @Override
-   public void setFocused(boolean bl) {
+   public void setFocused(boolean focused) {
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/recipe_book/RecipeBookWidget.java namedSrc/net/minecraft/client/gui/widget/recipe_book/RecipeBookWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/recipe_book/RecipeBookWidget.java	2024-07-05 02:12:23.981136134 +0000
+++ namedSrc/net/minecraft/client/gui/widget/recipe_book/RecipeBookWidget.java	2024-07-05 02:11:10.016220939 +0000
@@ -645,7 +645,7 @@
     * Mapping not found
     */
    @Override
-   public void setFocused(boolean bl) {
+   public void setFocused(boolean focused) {
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/SliderWidget.java namedSrc/net/minecraft/client/gui/widget/SliderWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/SliderWidget.java	2024-07-05 02:12:23.761133899 +0000
+++ namedSrc/net/minecraft/client/gui/widget/SliderWidget.java	2024-07-05 02:11:09.760217829 +0000
@@ -145,9 +145,9 @@
     * Mapping not found
     */
    @Override
-   public void setFocused(boolean bl) {
-      super.setFocused(bl);
-      if (!bl) {
+   public void setFocused(boolean focused) {
+      super.setFocused(focused);
+      if (!focused) {
          this.mutable = false;
       } else {
          InputType lv = MinecraftClient.getInstance().getLastInputType();
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/TextFieldWidget.java namedSrc/net/minecraft/client/gui/widget/TextFieldWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/TextFieldWidget.java	2024-07-05 02:12:23.797134264 +0000
+++ namedSrc/net/minecraft/client/gui/widget/TextFieldWidget.java	2024-07-05 02:11:09.792218218 +0000
@@ -734,10 +734,10 @@
     * Mapping not found
     */
    @Override
-   public void setFocused(boolean bl) {
-      if (this.focusUnlocked || bl) {
-         super.setFocused(bl);
-         if (bl) {
+   public void setFocused(boolean focused) {
+      if (this.focusUnlocked || focused) {
+         super.setFocused(focused);
+         if (focused) {
             this.f_ddgsctui = Util.getMeasuringTimeMs();
          }
       }
diff -bur namedTargetSrc/net/minecraft/client/network/AbstractClientNetworkHandler.java namedSrc/net/minecraft/client/network/AbstractClientNetworkHandler.java
--- namedTargetSrc/net/minecraft/client/network/AbstractClientNetworkHandler.java	2024-07-05 02:12:23.885135159 +0000
+++ namedSrc/net/minecraft/client/network/AbstractClientNetworkHandler.java	2024-07-05 02:11:09.912219675 +0000
@@ -52,10 +52,10 @@
 import net.minecraft.network.packet.s2c.payload.BrandPayload;
 import net.minecraft.network.packet.s2c.query.StoreCookieS2CPacket;
 import net.minecraft.network.packet.s2c.query.TransferS2CPacket;
+import net.minecraft.server.network.DisconnectReason;
 import net.minecraft.text.CommonTexts;
 import net.minecraft.text.Text;
 import net.minecraft.unmapped.C_ccpekhhb;
-import net.minecraft.unmapped.C_igbzvhln;
 import net.minecraft.unmapped.C_ouodvkzu;
 import net.minecraft.unmapped.C_qoushzky;
 import net.minecraft.unmapped.C_zaxzpkwd;
@@ -173,7 +173,7 @@
       Optional<Path> optional = this.m_yuakheuk(arg, exception);
       Optional<URI> optional2 = this.f_wjciyfll.m_gdegqnaz(C_ouodvkzu.C_ekdhaajb.BUG_REPORT).map(C_ouodvkzu.C_moygobps::link);
       if (this.f_ifbkjylc) {
-         this.connection.m_dzmcexuz(new C_igbzvhln(Text.translatable("disconnect.packetError"), optional, optional2));
+         this.connection.m_dzmcexuz(new DisconnectReason(Text.translatable("disconnect.packetError"), optional, optional2));
       }
    }
 
@@ -181,10 +181,10 @@
     * Mapping not found
     */
    @Override
-   public C_igbzvhln m_dfsclzjh(Text arg, Throwable throwable) {
+   public DisconnectReason m_dfsclzjh(Text arg, Throwable throwable) {
       Optional<Path> optional = this.m_yuakheuk(null, throwable);
       Optional<URI> optional2 = this.f_wjciyfll.m_gdegqnaz(C_ouodvkzu.C_ekdhaajb.BUG_REPORT).map(C_ouodvkzu.C_moygobps::link);
-      return new C_igbzvhln(arg, optional, optional2);
+      return new DisconnectReason(arg, optional, optional2);
    }
 
    /**
@@ -417,7 +417,7 @@
     * Mapping not found
     */
    @Override
-   public void onDisconnected(C_igbzvhln arg) {
+   public void onDisconnected(DisconnectReason arg) {
       this.telemetryManager.onDisconnect();
       this.client.m_ogfkcsgc(this.createDisconnectScreen(arg), this.f_zzouahkl);
       LOGGER.warn("Client disconnected with reason: {}", arg.reason().getString());
@@ -438,9 +438,9 @@
 
    /**
     * @mapping {@literal hashed m_zwgetqya Lnet/minecraft/unmapped/C_xcfjcqcn;m_zwgetqya(Lnet/minecraft/unmapped/C_igbzvhln;)Lnet/minecraft/unmapped/C_wrmtlwqx;}
-    * @mapping {@literal named createDisconnectScreen Lnet/minecraft/client/network/AbstractClientNetworkHandler;createDisconnectScreen(Lnet/minecraft/unmapped/C_igbzvhln;)Lnet/minecraft/client/gui/screen/Screen;}
+    * @mapping {@literal named createDisconnectScreen Lnet/minecraft/client/network/AbstractClientNetworkHandler;createDisconnectScreen(Lnet/minecraft/server/network/DisconnectReason;)Lnet/minecraft/client/gui/screen/Screen;}
     */
-   protected Screen createDisconnectScreen(C_igbzvhln arg) {
+   protected Screen createDisconnectScreen(DisconnectReason arg) {
       Screen lv = (Screen)Objects.requireNonNullElseGet(this.postDisconnectScreen, () -> new SelectServerScreen(new TitleScreen()));
       return (Screen)(this.serverInfo != null && this.serverInfo.isRealm()
          ? new DisconnectedRealmsScreen(lv, CONNECTION_LOST, arg.reason())
diff -bur namedTargetSrc/net/minecraft/client/network/ClientConfigurationNetworkHandler.java namedSrc/net/minecraft/client/network/ClientConfigurationNetworkHandler.java
--- namedTargetSrc/net/minecraft/client/network/ClientConfigurationNetworkHandler.java	2024-07-05 02:12:23.765133939 +0000
+++ namedSrc/net/minecraft/client/network/ClientConfigurationNetworkHandler.java	2024-07-05 02:11:09.764217877 +0000
@@ -29,7 +29,7 @@
 import net.minecraft.resource.AutoCloseableResourceManager;
 import net.minecraft.resource.ResourceFactory;
 import net.minecraft.resource.pack.KnownPack;
-import net.minecraft.unmapped.C_igbzvhln;
+import net.minecraft.server.network.DisconnectReason;
 import net.minecraft.unmapped.C_jcuvnmyx;
 import net.minecraft.unmapped.C_wvzzfswm;
 import org.jetbrains.annotations.Nullable;
@@ -221,7 +221,7 @@
     * Mapping not found
     */
    @Override
-   public void onDisconnected(C_igbzvhln arg) {
+   public void onDisconnected(DisconnectReason arg) {
       super.onDisconnected(arg);
       this.client.m_jfglektg();
    }
diff -bur namedTargetSrc/net/minecraft/client/network/ClientLoginNetworkHandler.java namedSrc/net/minecraft/client/network/ClientLoginNetworkHandler.java
--- namedTargetSrc/net/minecraft/client/network/ClientLoginNetworkHandler.java	2024-07-05 02:12:23.741133695 +0000
+++ namedSrc/net/minecraft/client/network/ClientLoginNetworkHandler.java	2024-07-05 02:11:09.736217537 +0000
@@ -47,9 +47,9 @@
 import net.minecraft.network.packet.s2c.login.LoginSuccessS2CPacket;
 import net.minecraft.network.packet.s2c.payload.BrandPayload;
 import net.minecraft.network.phase.ConfigurationPhases;
+import net.minecraft.server.network.DisconnectReason;
 import net.minecraft.text.CommonTexts;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_igbzvhln;
 import net.minecraft.unmapped.C_ouodvkzu;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Util;
@@ -291,7 +291,7 @@
     * Mapping not found
     */
    @Override
-   public void onDisconnected(C_igbzvhln arg) {
+   public void onDisconnected(DisconnectReason arg) {
       Text lv = this.f_bpdsyxzv ? CommonTexts.FAILED_TRANSFER : CommonTexts.CONNECT_FAILED;
       if (this.info != null && this.info.isRealm()) {
          this.client.setScreen(new DisconnectedRealmsScreen(this.parentScreen, lv, arg.reason()));
diff -bur namedTargetSrc/net/minecraft/client/network/MultiplayerServerListPinger.java namedSrc/net/minecraft/client/network/MultiplayerServerListPinger.java
--- namedTargetSrc/net/minecraft/client/network/MultiplayerServerListPinger.java	2024-07-05 02:12:23.813134427 +0000
+++ namedSrc/net/minecraft/client/network/MultiplayerServerListPinger.java	2024-07-05 02:11:09.812218460 +0000
@@ -28,10 +28,10 @@
 import net.minecraft.network.packet.s2c.query.QueryPongS2CPacket;
 import net.minecraft.network.packet.s2c.query.ServerMetadataS2CPacket;
 import net.minecraft.server.ServerMetadata;
+import net.minecraft.server.network.DisconnectReason;
 import net.minecraft.text.CommonTexts;
 import net.minecraft.text.Text;
 import net.minecraft.unmapped.C_fjukoybs;
-import net.minecraft.unmapped.C_igbzvhln;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Util;
 import org.slf4j.Logger;
@@ -155,7 +155,7 @@
              * Mapping not found
              */
             @Override
-            public void onDisconnected(C_igbzvhln arg) {
+            public void onDisconnected(DisconnectReason arg) {
                if (!this.sentQuery) {
                   MultiplayerServerListPinger.this.showError(arg.reason(), entry);
                   MultiplayerServerListPinger.this.ping(inetSocketAddress, lv, entry);
diff -bur namedTargetSrc/net/minecraft/client/option/HotbarStorage.java namedSrc/net/minecraft/client/option/HotbarStorage.java
--- namedTargetSrc/net/minecraft/client/option/HotbarStorage.java	2024-07-05 02:12:23.929135606 +0000
+++ namedSrc/net/minecraft/client/option/HotbarStorage.java	2024-07-05 02:11:09.956220210 +0000
@@ -70,7 +70,7 @@
     */
    private void load() {
       try {
-         NbtCompound lv = NbtIo.m_lwpolkuf(this.file);
+         NbtCompound lv = NbtIo.readFromFile(this.file);
          if (lv == null) {
             return;
          }
@@ -103,7 +103,7 @@
             lv.put(String.valueOf(i), dataResult.getOrThrow());
          }
 
-         NbtIo.m_kfuaemox(lv, this.file);
+         NbtIo.writeToFile(lv, this.file);
       } catch (Exception var5) {
          LOGGER.error("Failed to save creative mode options", (Throwable)var5);
       }
diff -bur namedTargetSrc/net/minecraft/client/option/ServerList.java namedSrc/net/minecraft/client/option/ServerList.java
--- namedTargetSrc/net/minecraft/client/option/ServerList.java	2024-07-05 02:12:23.917135484 +0000
+++ namedSrc/net/minecraft/client/option/ServerList.java	2024-07-05 02:11:09.940220016 +0000
@@ -71,7 +71,7 @@
       try {
          this.servers.clear();
          this.hiddenServers.clear();
-         NbtCompound lv = NbtIo.m_lwpolkuf(this.client.runDirectory.toPath().resolve("servers.dat"));
+         NbtCompound lv = NbtIo.readFromFile(this.client.runDirectory.toPath().resolve("servers.dat"));
          if (lv == null) {
             return;
          }
@@ -116,7 +116,7 @@
          lv6.put("servers", lv);
          Path path = this.client.runDirectory.toPath();
          Path path2 = Files.createTempFile(path, "servers", ".dat");
-         NbtIo.m_kfuaemox(lv6, path2);
+         NbtIo.writeToFile(lv6, path2);
          Path path3 = path.resolve("servers.dat_old");
          Path path4 = path.resolve("servers.dat");
          Util.backupAndReplace(path4, path2, path3);
diff -bur namedTargetSrc/net/minecraft/entity/Entity.java namedSrc/net/minecraft/entity/Entity.java
--- namedTargetSrc/net/minecraft/entity/Entity.java	2024-07-05 02:12:23.945135769 +0000
+++ namedSrc/net/minecraft/entity/Entity.java	2024-07-05 02:11:09.972220405 +0000
@@ -87,7 +87,6 @@
 import net.minecraft.unmapped.C_axrkcdro;
 import net.minecraft.unmapped.C_gbavazgo;
 import net.minecraft.unmapped.C_teerivzm;
-import net.minecraft.unmapped.C_zbvyjshu;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Arm;
 import net.minecraft.util.BlockMirror;
@@ -116,6 +115,7 @@
 import net.minecraft.util.shape.VoxelShapes;
 import net.minecraft.world.BlockLocating;
 import net.minecraft.world.BlockView;
+import net.minecraft.world.DimensionTransition;
 import net.minecraft.world.GameRules;
 import net.minecraft.world.Heightmap;
 import net.minecraft.world.RaycastContext;
@@ -1838,9 +1838,9 @@
 
    /**
     * @mapping {@literal hashed m_vfbpgxfo Lnet/minecraft/unmapped/C_astfners;m_vfbpgxfo(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_hynzadkk;}
-    * @mapping {@literal named m_vfbpgxfo Lnet/minecraft/entity/Entity;m_vfbpgxfo(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/util/math/BlockPos;}
+    * @mapping {@literal named calculateSpawnpoint Lnet/minecraft/entity/Entity;calculateSpawnpoint(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/util/math/BlockPos;}
     */
-   public BlockPos m_vfbpgxfo(ServerWorld world, BlockPos pos) {
+   public BlockPos calculateSpawnpoint(ServerWorld world, BlockPos pos) {
       BlockPos lv = world.getSpawnPos();
       Vec3d lv2 = lv.ofCenter();
       int i = world.getWorldChunk(lv).sampleHeightmap(Heightmap.Type.MOTION_BLOCKING_NO_LEAVES, lv.getX(), lv.getZ()) + 1;
@@ -2475,15 +2475,15 @@
     * @mapping {@literal named refreshPositionAndAngles Lnet/minecraft/entity/Entity;refreshPositionAndAngles(Lnet/minecraft/util/math/BlockPos;FF)V}
     */
    public void refreshPositionAndAngles(BlockPos pos, float yaw, float pitch) {
-      this.m_jntxmsea(pos.m_rtputfdg(), yaw, pitch);
+      this.refreshPositionAndAngles(pos.ofBottomCenter(), yaw, pitch);
    }
 
    /**
     * @mapping {@literal hashed m_jntxmsea Lnet/minecraft/unmapped/C_astfners;m_jntxmsea(Lnet/minecraft/unmapped/C_vgpupfxx;FF)V}
-    * @mapping {@literal named m_jntxmsea Lnet/minecraft/entity/Entity;m_jntxmsea(Lnet/minecraft/util/math/Vec3d;FF)V}
+    * @mapping {@literal named refreshPositionAndAngles Lnet/minecraft/entity/Entity;refreshPositionAndAngles(Lnet/minecraft/util/math/Vec3d;FF)V}
     */
-   public void m_jntxmsea(Vec3d arg, float yaw, float pitch) {
-      this.refreshPositionAndAngles(arg.x, arg.y, arg.z, yaw, pitch);
+   public void refreshPositionAndAngles(Vec3d position, float yaw, float pitch) {
+      this.refreshPositionAndAngles(position.x, position.y, position.z, yaw, pitch);
    }
 
    /**
@@ -3557,9 +3557,9 @@
             if (this.f_xunwzhqo.m_rxhstyml(lv, this, this.m_acybdbgv(false))) {
                lv.getProfiler().push("portal");
                this.resetNetherPortalCooldown();
-               C_zbvyjshu lv3 = this.f_xunwzhqo.m_ymrfhphm(lv, this);
+               DimensionTransition lv3 = this.f_xunwzhqo.m_ymrfhphm(lv, this);
                if (lv3 != null) {
-                  ServerWorld lv4 = lv3.newLevel();
+                  ServerWorld lv4 = lv3.getTargetWorld();
                   if (lv.getServer().m_cdgrehcj(lv4) && (lv4.getRegistryKey() == lv.getRegistryKey() || this.canUsePortals(lv, lv4))) {
                      this.moveToWorld(lv3);
                   }
@@ -4232,18 +4232,18 @@
     * @return the entity in the other world
     * 
     * @mapping {@literal hashed m_uwdepeht Lnet/minecraft/unmapped/C_astfners;m_uwdepeht(Lnet/minecraft/unmapped/C_zbvyjshu;)Lnet/minecraft/unmapped/C_astfners;}
-    * @mapping {@literal named moveToWorld Lnet/minecraft/entity/Entity;moveToWorld(Lnet/minecraft/unmapped/C_zbvyjshu;)Lnet/minecraft/entity/Entity;}
+    * @mapping {@literal named moveToWorld Lnet/minecraft/entity/Entity;moveToWorld(Lnet/minecraft/world/DimensionTransition;)Lnet/minecraft/entity/Entity;}
     */
    @Nullable
-   public Entity moveToWorld(C_zbvyjshu arg) {
+   public Entity moveToWorld(DimensionTransition transition) {
       if (this.getWorld() instanceof ServerWorld lv && !this.isRemoved()) {
-         ServerWorld lv3 = arg.newLevel();
+         ServerWorld lv3 = transition.getTargetWorld();
          List<Entity> list = this.getPassengerList();
          this.detach();
          List<Entity> list2 = new ArrayList();
 
          for (Entity lv4 : list) {
-            Entity lv5 = lv4.moveToWorld(arg);
+            Entity lv5 = lv4.moveToWorld(transition);
             if (lv5 != null) {
                list2.add(lv5);
             }
@@ -4257,8 +4257,10 @@
                this.removeFromDimension();
             }
 
-            lv6.refreshPositionAndAngles(arg.pos().x, arg.pos().y, arg.pos().z, arg.yRot(), lv6.getPitch());
-            lv6.setVelocity(arg.speed());
+            lv6.refreshPositionAndAngles(
+               transition.getPosition().x, transition.getPosition().y, transition.getPosition().z, transition.getYaw(), lv6.getPitch()
+            );
+            lv6.setVelocity(transition.getVelocity());
             if (this != lv6) {
                lv3.onDimensionChanged(lv6);
             }
@@ -4269,7 +4271,7 @@
 
             lv.resetIdleTimeout();
             lv3.resetIdleTimeout();
-            arg.postDimensionTransition().onTransition(lv6);
+            transition.getPostTeleportEvent().onTransition(lv6);
          }
 
          lv.getProfiler().pop();
@@ -4280,10 +4282,12 @@
    }
 
    /**
+    * Used by a nether portal to load chunks in the other dimension.
+    * 
     * @mapping {@literal hashed m_gykcjypz Lnet/minecraft/unmapped/C_astfners;m_gykcjypz(Lnet/minecraft/unmapped/C_hynzadkk;)V}
-    * @mapping {@literal named m_gykcjypz Lnet/minecraft/entity/Entity;m_gykcjypz(Lnet/minecraft/util/math/BlockPos;)V}
+    * @mapping {@literal named addPortalTicket Lnet/minecraft/entity/Entity;addPortalTicket(Lnet/minecraft/util/math/BlockPos;)V}
     */
-   public void m_gykcjypz(BlockPos pos) {
+   public void addPortalTicket(BlockPos pos) {
       if (this.getWorld() instanceof ServerWorld lv) {
          lv.getChunkManager().addTicket(ChunkTicketType.PORTAL, new ChunkPos(pos), 3, pos);
       }
diff -bur namedTargetSrc/net/minecraft/entity/FallingBlockEntity.java namedSrc/net/minecraft/entity/FallingBlockEntity.java
--- namedTargetSrc/net/minecraft/entity/FallingBlockEntity.java	2024-07-05 02:12:23.989136216 +0000
+++ namedSrc/net/minecraft/entity/FallingBlockEntity.java	2024-07-05 02:11:10.024221037 +0000
@@ -33,7 +33,6 @@
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.state.property.Properties;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_zbvyjshu;
 import net.minecraft.util.crash.CrashReportSection;
 import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.hit.HitResult;
@@ -41,6 +40,7 @@
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
+import net.minecraft.world.DimensionTransition;
 import net.minecraft.world.GameRules;
 import net.minecraft.world.RaycastContext;
 import net.minecraft.world.World;
@@ -487,11 +487,11 @@
     */
    @Nullable
    @Override
-   public Entity moveToWorld(C_zbvyjshu arg) {
-      RegistryKey<World> lv = arg.newLevel().getRegistryKey();
+   public Entity moveToWorld(DimensionTransition transition) {
+      RegistryKey<World> lv = transition.getTargetWorld().getRegistryKey();
       RegistryKey<World> lv2 = this.getWorld().getRegistryKey();
       boolean bl = (lv2 == World.END || lv == World.END) && lv2 != lv;
-      Entity lv3 = super.moveToWorld(arg);
+      Entity lv3 = super.moveToWorld(transition);
       this.f_cyhxihzh = lv3 != null && bl;
       return lv3;
    }
diff -bur namedTargetSrc/net/minecraft/entity/ItemEntity.java namedSrc/net/minecraft/entity/ItemEntity.java
--- namedTargetSrc/net/minecraft/entity/ItemEntity.java	2024-07-05 02:12:23.761133899 +0000
+++ namedSrc/net/minecraft/entity/ItemEntity.java	2024-07-05 02:11:09.764217877 +0000
@@ -21,10 +21,10 @@
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.stat.Stats;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_zbvyjshu;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
+import net.minecraft.world.DimensionTransition;
 import net.minecraft.world.World;
 import net.minecraft.world.event.GameEvent;
 import org.jetbrains.annotations.Nullable;
@@ -525,8 +525,8 @@
     */
    @Nullable
    @Override
-   public Entity moveToWorld(C_zbvyjshu arg) {
-      Entity lv = super.moveToWorld(arg);
+   public Entity moveToWorld(DimensionTransition transition) {
+      Entity lv = super.moveToWorld(transition);
       if (!this.getWorld().isClient && lv instanceof ItemEntity lv2) {
          lv2.tryMerge();
       }
diff -bur namedTargetSrc/net/minecraft/entity/passive/MerchantEntity.java namedSrc/net/minecraft/entity/passive/MerchantEntity.java
--- namedTargetSrc/net/minecraft/entity/passive/MerchantEntity.java	2024-07-05 02:12:23.953135850 +0000
+++ namedSrc/net/minecraft/entity/passive/MerchantEntity.java	2024-07-05 02:11:09.984220551 +0000
@@ -25,7 +25,6 @@
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.unmapped.C_zbvyjshu;
 import net.minecraft.util.Util;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
@@ -33,6 +32,7 @@
 import net.minecraft.village.TradeOffer;
 import net.minecraft.village.TradeOfferList;
 import net.minecraft.village.TradeOffers;
+import net.minecraft.world.DimensionTransition;
 import net.minecraft.world.LocalDifficulty;
 import net.minecraft.world.ServerWorldAccess;
 import net.minecraft.world.World;
@@ -292,9 +292,9 @@
     */
    @Nullable
    @Override
-   public Entity moveToWorld(C_zbvyjshu arg) {
+   public Entity moveToWorld(DimensionTransition transition) {
       this.resetCustomer();
-      return super.moveToWorld(arg);
+      return super.moveToWorld(transition);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/projectile/thrown/EnderPearlEntity.java namedSrc/net/minecraft/entity/projectile/thrown/EnderPearlEntity.java
--- namedTargetSrc/net/minecraft/entity/projectile/thrown/EnderPearlEntity.java	2024-07-05 02:12:23.993136257 +0000
+++ namedSrc/net/minecraft/entity/projectile/thrown/EnderPearlEntity.java	2024-07-05 02:11:10.032221134 +0000
@@ -13,10 +13,10 @@
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.unmapped.C_zbvyjshu;
 import net.minecraft.util.hit.EntityHitResult;
 import net.minecraft.util.hit.HitResult;
 import net.minecraft.util.math.Vec3d;
+import net.minecraft.world.DimensionTransition;
 import net.minecraft.world.GameRules;
 import net.minecraft.world.World;
 
@@ -95,14 +95,14 @@
                      }
                   }
 
-                  lv3.moveToWorld(new C_zbvyjshu(lv, this.getPos(), lv3.getVelocity(), lv3.getYaw(), lv3.getPitch(), C_zbvyjshu.f_jgwyllbi));
+                  lv3.moveToWorld(new DimensionTransition(lv, this.getPos(), lv3.getVelocity(), lv3.getYaw(), lv3.getPitch(), DimensionTransition.NONE));
                   lv3.resetFallDistance();
                   lv4.clearExplosionData();
                   lv3.damage(this.getDamageSources().fall(), 5.0F);
                   this.m_xkeukfpd(lv, this.getPos());
                }
             } else {
-               lv3.moveToWorld(new C_zbvyjshu(lv, this.getPos(), lv3.getVelocity(), lv3.getYaw(), lv3.getPitch(), C_zbvyjshu.f_jgwyllbi));
+               lv3.moveToWorld(new DimensionTransition(lv, this.getPos(), lv3.getVelocity(), lv3.getYaw(), lv3.getPitch(), DimensionTransition.NONE));
                lv3.resetFallDistance();
                this.m_xkeukfpd(lv, this.getPos());
             }
diff -bur namedTargetSrc/net/minecraft/entity/TntEntity.java namedSrc/net/minecraft/entity/TntEntity.java
--- namedTargetSrc/net/minecraft/entity/TntEntity.java	2024-07-05 02:12:23.765133939 +0000
+++ namedSrc/net/minecraft/entity/TntEntity.java	2024-07-05 02:11:09.764217877 +0000
@@ -12,9 +12,9 @@
 import net.minecraft.nbt.NbtHelper;
 import net.minecraft.particle.ParticleTypes;
 import net.minecraft.registry.RegistryKeys;
-import net.minecraft.unmapped.C_zbvyjshu;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.BlockView;
+import net.minecraft.world.DimensionTransition;
 import net.minecraft.world.World;
 import net.minecraft.world.explosion.Explosion;
 import net.minecraft.world.explosion.ExplosionBehavior;
@@ -271,8 +271,8 @@
     */
    @Nullable
    @Override
-   public Entity moveToWorld(C_zbvyjshu arg) {
-      Entity lv = super.moveToWorld(arg);
+   public Entity moveToWorld(DimensionTransition transition) {
+      Entity lv = super.moveToWorld(transition);
       if (lv instanceof TntEntity lv2) {
          lv2.m_mzqvctrw(true);
       }
diff -bur namedTargetSrc/net/minecraft/nbt/NbtIo.java namedSrc/net/minecraft/nbt/NbtIo.java
--- namedTargetSrc/net/minecraft/nbt/NbtIo.java	2024-07-05 02:12:23.773134021 +0000
+++ namedSrc/net/minecraft/nbt/NbtIo.java	2024-07-05 02:11:09.772217975 +0000
@@ -17,7 +17,6 @@
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
 import net.minecraft.nbt.scanner.NbtScanner;
-import net.minecraft.unmapped.C_hydfible;
 import net.minecraft.util.FastBufferedInputStream;
 import net.minecraft.util.Util;
 import net.minecraft.util.crash.CrashReport;
@@ -30,9 +29,10 @@
  */
 public class NbtIo {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_zwmbytoi Lnet/minecraft/unmapped/C_plrkqquc;f_zwmbytoi:[Ljava/nio/file/OpenOption;}
+    * @mapping {@literal named openOptions Lnet/minecraft/nbt/NbtIo;openOptions:[Ljava/nio/file/OpenOption;}
     */
-   private static final OpenOption[] f_zwmbytoi = new OpenOption[]{
+   private static final OpenOption[] openOptions = new OpenOption[]{
       StandardOpenOption.SYNC, StandardOpenOption.WRITE, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING
    };
 
@@ -195,7 +195,7 @@
     * @mapping {@literal named writeCompressed Lnet/minecraft/nbt/NbtIo;writeCompressed(Lnet/minecraft/nbt/NbtCompound;Ljava/nio/file/Path;)V}
     */
    public static void writeCompressed(NbtCompound compound, Path path) throws IOException {
-      OutputStream outputStream = Files.newOutputStream(path, f_zwmbytoi);
+      OutputStream outputStream = Files.newOutputStream(path, openOptions);
 
       try {
          OutputStream outputStream2 = new BufferedOutputStream(outputStream);
@@ -258,10 +258,10 @@
 
    /**
     * @mapping {@literal hashed m_kfuaemox Lnet/minecraft/unmapped/C_plrkqquc;m_kfuaemox(Lnet/minecraft/unmapped/C_hhlwcnih;Ljava/nio/file/Path;)V}
-    * @mapping {@literal named m_kfuaemox Lnet/minecraft/nbt/NbtIo;m_kfuaemox(Lnet/minecraft/nbt/NbtCompound;Ljava/nio/file/Path;)V}
+    * @mapping {@literal named writeToFile Lnet/minecraft/nbt/NbtIo;writeToFile(Lnet/minecraft/nbt/NbtCompound;Ljava/nio/file/Path;)V}
     */
-   public static void m_kfuaemox(NbtCompound compound, Path path) throws IOException {
-      OutputStream outputStream = Files.newOutputStream(path, f_zwmbytoi);
+   public static void writeToFile(NbtCompound compound, Path filePath) throws IOException {
+      OutputStream outputStream = Files.newOutputStream(filePath, openOptions);
 
       try {
          OutputStream outputStream2 = new BufferedOutputStream(outputStream);
@@ -311,14 +311,15 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_lwpolkuf Lnet/minecraft/unmapped/C_plrkqquc;m_lwpolkuf(Ljava/nio/file/Path;)Lnet/minecraft/unmapped/C_hhlwcnih;}
+    * @mapping {@literal named readFromFile Lnet/minecraft/nbt/NbtIo;readFromFile(Ljava/nio/file/Path;)Lnet/minecraft/nbt/NbtCompound;}
     */
    @Nullable
-   public static NbtCompound m_lwpolkuf(Path path) throws IOException {
-      if (!Files.exists(path, new LinkOption[0])) {
+   public static NbtCompound readFromFile(Path filePath) throws IOException {
+      if (!Files.exists(filePath, new LinkOption[0])) {
          return null;
       } else {
-         InputStream inputStream = Files.newInputStream(path);
+         InputStream inputStream = Files.newInputStream(filePath);
 
          NbtCompound var3;
          try {
@@ -448,21 +449,21 @@
     * @mapping {@literal hashed m_yicwdxov Lnet/minecraft/unmapped/C_plrkqquc;m_yicwdxov(Lnet/minecraft/unmapped/C_oivssbvb;Ljava/io/DataOutput;)V}
     * @mapping {@literal named m_yicwdxov Lnet/minecraft/nbt/NbtIo;m_yicwdxov(Lnet/minecraft/nbt/NbtElement;Ljava/io/DataOutput;)V}
     */
-   public static void m_yicwdxov(NbtElement nbt, DataOutput dataOutput) throws IOException {
-      write(nbt, new NbtIo.C_wbbhdkdn(dataOutput));
+   public static void m_yicwdxov(NbtElement nbt, DataOutput output) throws IOException {
+      write(nbt, new NbtIo.NbtStringOutput(output));
    }
 
    /**
     * @mapping {@literal hashed m_lvarbmqk Lnet/minecraft/unmapped/C_plrkqquc;m_lvarbmqk(Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)Lnet/minecraft/unmapped/C_oivssbvb;}
     * @mapping {@literal named m_lvarbmqk Lnet/minecraft/nbt/NbtIo;m_lvarbmqk(Ljava/io/DataInput;Lnet/minecraft/nbt/NbtTagSizeTracker;)Lnet/minecraft/nbt/NbtElement;}
     */
-   private static NbtElement m_lvarbmqk(DataInput dataInput, NbtTagSizeTracker tracker) throws IOException {
-      byte b = dataInput.readByte();
+   private static NbtElement m_lvarbmqk(DataInput input, NbtTagSizeTracker tracker) throws IOException {
+      byte b = input.readByte();
       if (b == 0) {
          return NbtNull.INSTANCE;
       } else {
-         NbtString.skipString(dataInput);
-         return m_jguziyiy(dataInput, tracker, b);
+         NbtString.skipString(input);
+         return m_jguziyiy(input, tracker, b);
       }
    }
 
@@ -483,13 +484,13 @@
 
    /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_plrkqquc$C_wbbhdkdn}
-    * @mapping {@literal named net/minecraft/nbt/NbtIo$C_wbbhdkdn}
+    * @mapping {@literal named net/minecraft/nbt/NbtIo$NbtStringOutput}
     */
-   public static class C_wbbhdkdn extends C_hydfible {
+   public static class NbtStringOutput extends NbtOutput {
       /**
        * Mapping not found
        */
-      public C_wbbhdkdn(DataOutput dataOutput) {
+      public NbtStringOutput(DataOutput dataOutput) {
          super(dataOutput);
       }
 
Only in namedSrc/net/minecraft/nbt: NbtOutput.java
diff -bur namedTargetSrc/net/minecraft/network/ClientConnection.java namedSrc/net/minecraft/network/ClientConnection.java
--- namedTargetSrc/net/minecraft/network/ClientConnection.java	2024-07-05 02:12:23.901135322 +0000
+++ namedSrc/net/minecraft/network/ClientConnection.java	2024-07-05 02:11:09.928219870 +0000
@@ -58,10 +58,10 @@
 import net.minecraft.network.phase.HandshakePhases;
 import net.minecraft.network.phase.LoginPhases;
 import net.minecraft.network.phase.StatusPhases;
+import net.minecraft.server.network.DisconnectReason;
 import net.minecraft.text.Text;
 import net.minecraft.unmapped.C_fycbslbv;
 import net.minecraft.unmapped.C_heojlrbj;
-import net.minecraft.unmapped.C_igbzvhln;
 import net.minecraft.unmapped.C_pwpucsml;
 import net.minecraft.unmapped.C_wkoxpylw;
 import net.minecraft.unmapped.C_ynrugunm;
@@ -187,7 +187,7 @@
     * Mapping not found
     */
    @Nullable
-   private C_igbzvhln f_zsqwmwtd;
+   private DisconnectReason f_zsqwmwtd;
    /**
     * @mapping {@literal hashed f_eatlkkxl Lnet/minecraft/unmapped/C_oasmcckk;f_eatlkkxl:Z}
     * @mapping {@literal named encrypted Lnet/minecraft/network/ClientConnection;encrypted:Z}
@@ -230,10 +230,10 @@
    private boolean errored;
    /**
     * @mapping {@literal hashed f_wfrrroev Lnet/minecraft/unmapped/C_oasmcckk;f_wfrrroev:Lnet/minecraft/unmapped/C_igbzvhln;}
-    * @mapping {@literal named pendingDisconnectReason Lnet/minecraft/network/ClientConnection;pendingDisconnectReason:Lnet/minecraft/unmapped/C_igbzvhln;}
+    * @mapping {@literal named pendingDisconnectReason Lnet/minecraft/network/ClientConnection;pendingDisconnectReason:Lnet/minecraft/server/network/DisconnectReason;}
     */
    @Nullable
-   private volatile C_igbzvhln pendingDisconnectReason;
+   private volatile DisconnectReason pendingDisconnectReason;
    /**
     * @mapping {@literal hashed f_jtpabmmi Lnet/minecraft/unmapped/C_oasmcckk;f_jtpabmmi:Lnet/minecraft/unmapped/C_gxhfclcm;}
     * @mapping {@literal named performanceSampleLog Lnet/minecraft/network/ClientConnection;performanceSampleLog:Lnet/minecraft/network/PacketSizeHandler;}
@@ -290,11 +290,11 @@
             } else {
                Text lv = Text.translatable("disconnect.genericReason", "Internal Exception: " + ex);
                PacketListener lv2 = this.packetListener;
-               C_igbzvhln lv3;
+               DisconnectReason lv3;
                if (lv2 != null) {
                   lv3 = lv2.m_dfsclzjh(lv, ex);
                } else {
-                  lv3 = new C_igbzvhln(lv);
+                  lv3 = new DisconnectReason(lv);
                }
 
                if (bl) {
@@ -664,13 +664,13 @@
     * @mapping {@literal named m_kykiqlcb Lnet/minecraft/network/ClientConnection;m_kykiqlcb(Lnet/minecraft/text/Text;)V}
     */
    public void m_kykiqlcb(Text reason) {
-      this.m_dzmcexuz(new C_igbzvhln(reason));
+      this.m_dzmcexuz(new DisconnectReason(reason));
    }
 
    /**
     * Mapping not found
     */
-   public void m_dzmcexuz(C_igbzvhln arg) {
+   public void m_dzmcexuz(DisconnectReason arg) {
       if (this.channel == null) {
          this.pendingDisconnectReason = arg;
       }
@@ -906,7 +906,7 @@
     * Mapping not found
     */
    @Nullable
-   public C_igbzvhln m_zebgvkek() {
+   public DisconnectReason m_zebgvkek() {
       return this.f_zsqwmwtd;
    }
 
@@ -973,8 +973,8 @@
             PacketListener lv = this.getPacketListener();
             PacketListener lv2 = lv != null ? lv : this.disconnectListener;
             if (lv2 != null) {
-               C_igbzvhln lv3 = (C_igbzvhln)Objects.requireNonNullElseGet(
-                  this.m_zebgvkek(), () -> new C_igbzvhln(Text.translatable("multiplayer.disconnect.generic"))
+               DisconnectReason lv3 = (DisconnectReason)Objects.requireNonNullElseGet(
+                  this.m_zebgvkek(), () -> new DisconnectReason(Text.translatable("multiplayer.disconnect.generic"))
                );
                lv2.onDisconnected(lv3);
             }
diff -bur namedTargetSrc/net/minecraft/network/listener/AbstractServerPacketHandler.java namedSrc/net/minecraft/network/listener/AbstractServerPacketHandler.java
--- namedTargetSrc/net/minecraft/network/listener/AbstractServerPacketHandler.java	2024-07-05 02:12:24.017136500 +0000
+++ namedSrc/net/minecraft/network/listener/AbstractServerPacketHandler.java	2024-07-05 02:11:10.060221474 +0000
@@ -16,8 +16,8 @@
 import net.minecraft.network.packet.s2c.common.KeepConnectionAliveS2CPacket;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.network.ClientInformation;
+import net.minecraft.server.network.DisconnectReason;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_igbzvhln;
 import net.minecraft.util.Util;
 import net.minecraft.util.annotation.Debug;
 import net.minecraft.util.crash.CrashCallable;
@@ -131,7 +131,7 @@
     * Mapping not found
     */
    @Override
-   public void onDisconnected(C_igbzvhln arg) {
+   public void onDisconnected(DisconnectReason arg) {
       if (this.isHost()) {
          LOGGER.info("Stopping singleplayer server as player logged out");
          this.server.stop(false);
@@ -273,13 +273,13 @@
     * @mapping {@literal named m_bcouuorw Lnet/minecraft/network/listener/AbstractServerPacketHandler;m_bcouuorw(Lnet/minecraft/text/Text;)V}
     */
    public void m_bcouuorw(Text reason) {
-      this.m_zpzqkmpz(new C_igbzvhln(reason));
+      this.m_zpzqkmpz(new DisconnectReason(reason));
    }
 
    /**
     * Mapping not found
     */
-   public void m_zpzqkmpz(C_igbzvhln arg) {
+   public void m_zpzqkmpz(DisconnectReason arg) {
       this.connection.send(new DisconnectS2CPacket(arg.reason()), PacketSendListener.alwaysRun(() -> this.connection.m_dzmcexuz(arg)));
       this.connection.disableAutoRead();
       this.server.submitAndJoin(this.connection::handleDisconnection);
diff -bur namedTargetSrc/net/minecraft/network/listener/PacketListener.java namedSrc/net/minecraft/network/listener/PacketListener.java
--- namedTargetSrc/net/minecraft/network/listener/PacketListener.java	2024-07-05 02:12:23.793134224 +0000
+++ namedSrc/net/minecraft/network/listener/PacketListener.java	2024-07-05 02:11:09.792218218 +0000
@@ -4,8 +4,8 @@
 import net.minecraft.network.NetworkState;
 import net.minecraft.network.NetworkThreadUtils;
 import net.minecraft.network.packet.Packet;
+import net.minecraft.server.network.DisconnectReason;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_igbzvhln;
 import net.minecraft.util.crash.CrashCallable;
 import net.minecraft.util.crash.CrashException;
 import net.minecraft.util.crash.CrashReport;
@@ -39,9 +39,9 @@
     * Can be used to display the disconnection reason.
     * 
     * @mapping {@literal hashed m_wtlhyems Lnet/minecraft/unmapped/C_tkgdawqw;m_wtlhyems(Lnet/minecraft/unmapped/C_igbzvhln;)V}
-    * @mapping {@literal named onDisconnected Lnet/minecraft/network/listener/PacketListener;onDisconnected(Lnet/minecraft/unmapped/C_igbzvhln;)V}
+    * @mapping {@literal named onDisconnected Lnet/minecraft/network/listener/PacketListener;onDisconnected(Lnet/minecraft/server/network/DisconnectReason;)V}
     */
-   void onDisconnected(C_igbzvhln arg);
+   void onDisconnected(DisconnectReason arg);
 
    /**
     * @mapping {@literal hashed m_jelicxwl Lnet/minecraft/unmapped/C_tkgdawqw;m_jelicxwl(Lnet/minecraft/unmapped/C_zyjtrjrl;Ljava/lang/Exception;)V}
@@ -53,10 +53,10 @@
 
    /**
     * @mapping {@literal hashed m_dfsclzjh Lnet/minecraft/unmapped/C_tkgdawqw;m_dfsclzjh(Lnet/minecraft/unmapped/C_rdaqiwdt;Ljava/lang/Throwable;)Lnet/minecraft/unmapped/C_igbzvhln;}
-    * @mapping {@literal named m_dfsclzjh Lnet/minecraft/network/listener/PacketListener;m_dfsclzjh(Lnet/minecraft/text/Text;Ljava/lang/Throwable;)Lnet/minecraft/unmapped/C_igbzvhln;}
+    * @mapping {@literal named m_dfsclzjh Lnet/minecraft/network/listener/PacketListener;m_dfsclzjh(Lnet/minecraft/text/Text;Ljava/lang/Throwable;)Lnet/minecraft/server/network/DisconnectReason;}
     */
-   default C_igbzvhln m_dfsclzjh(Text reason, Throwable throwable) {
-      return new C_igbzvhln(reason);
+   default DisconnectReason m_dfsclzjh(Text reason, Throwable throwable) {
+      return new DisconnectReason(reason);
    }
 
    /**
Only in namedSrc/net/minecraft/server/network: DisconnectReason.java
diff -bur namedTargetSrc/net/minecraft/server/network/LocalServerHandshakeNetworkHandler.java namedSrc/net/minecraft/server/network/LocalServerHandshakeNetworkHandler.java
--- namedTargetSrc/net/minecraft/server/network/LocalServerHandshakeNetworkHandler.java	2024-07-05 02:12:23.977136094 +0000
+++ namedSrc/net/minecraft/server/network/LocalServerHandshakeNetworkHandler.java	2024-07-05 02:11:10.012220891 +0000
@@ -6,7 +6,6 @@
 import net.minecraft.network.packet.c2s.handshake.HandshakeC2SPacket;
 import net.minecraft.network.phase.LoginPhases;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.unmapped.C_igbzvhln;
 
 /**
  * A server handshake network handler that exclusively handles local
@@ -58,7 +57,7 @@
     * Mapping not found
     */
    @Override
-   public void onDisconnected(C_igbzvhln arg) {
+   public void onDisconnected(DisconnectReason arg) {
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/server/network/ServerConfigurationNetworkHandler.java namedSrc/net/minecraft/server/network/ServerConfigurationNetworkHandler.java
--- namedTargetSrc/net/minecraft/server/network/ServerConfigurationNetworkHandler.java	2024-07-05 02:12:23.881135118 +0000
+++ namedSrc/net/minecraft/server/network/ServerConfigurationNetworkHandler.java	2024-07-05 02:11:09.908219627 +0000
@@ -32,7 +32,6 @@
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.PlayerManager;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_igbzvhln;
 import net.minecraft.unmapped.C_ouodvkzu;
 import net.minecraft.unmapped.C_qoushzky;
 import org.jetbrains.annotations.Nullable;
@@ -101,7 +100,7 @@
     * Mapping not found
     */
    @Override
-   public void onDisconnected(C_igbzvhln arg) {
+   public void onDisconnected(DisconnectReason arg) {
       LOGGER.info("{} lost connection: {}", this.playerProfile, arg.reason().getString());
       super.onDisconnected(arg);
    }

@github-actions
Copy link

Choose a reason for hiding this comment

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

View the diff here (2/2): 
diff -bur namedTargetSrc/net/minecraft/server/network/ServerHandshakeNetworkHandler.java namedSrc/net/minecraft/server/network/ServerHandshakeNetworkHandler.java
--- namedTargetSrc/net/minecraft/server/network/ServerHandshakeNetworkHandler.java	2024-07-05 02:12:23.949135809 +0000
+++ namedSrc/net/minecraft/server/network/ServerHandshakeNetworkHandler.java	2024-07-05 02:11:09.976220453 +0000
@@ -10,7 +10,6 @@
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.ServerMetadata;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_igbzvhln;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_kbyxragg}
@@ -99,7 +98,7 @@
     * Mapping not found
     */
    @Override
-   public void onDisconnected(C_igbzvhln arg) {
+   public void onDisconnected(DisconnectReason arg) {
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/server/network/ServerLoginNetworkHandler.java namedSrc/net/minecraft/server/network/ServerLoginNetworkHandler.java
--- namedTargetSrc/net/minecraft/server/network/ServerLoginNetworkHandler.java	2024-07-05 02:12:23.885135159 +0000
+++ namedSrc/net/minecraft/server/network/ServerLoginNetworkHandler.java	2024-07-05 02:11:09.912219675 +0000
@@ -35,7 +35,6 @@
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.PlayerManager;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_igbzvhln;
 import net.minecraft.util.ChatUtil;
 import net.minecraft.util.UuidUtil;
 import net.minecraft.util.crash.CrashCallable;
@@ -192,7 +191,7 @@
     * Mapping not found
     */
    @Override
-   public void onDisconnected(C_igbzvhln arg) {
+   public void onDisconnected(DisconnectReason arg) {
       LOGGER.info("{} lost connection: {}", this.getConnectionInfo(), arg.reason().getString());
    }
 
diff -bur namedTargetSrc/net/minecraft/server/network/ServerPlayerEntity.java namedSrc/net/minecraft/server/network/ServerPlayerEntity.java
--- namedTargetSrc/net/minecraft/server/network/ServerPlayerEntity.java	2024-07-05 02:12:23.953135850 +0000
+++ namedSrc/net/minecraft/server/network/ServerPlayerEntity.java	2024-07-05 02:11:09.980220502 +0000
@@ -132,7 +132,6 @@
 import net.minecraft.text.HoverEvent;
 import net.minecraft.text.Text;
 import net.minecraft.unmapped.C_niowvjqq;
-import net.minecraft.unmapped.C_zbvyjshu;
 import net.minecraft.util.Arm;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Hand;
@@ -153,6 +152,7 @@
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.random.RandomGenerator;
 import net.minecraft.village.TradeOfferList;
+import net.minecraft.world.DimensionTransition;
 import net.minecraft.world.GameMode;
 import net.minecraft.world.GameRules;
 import net.minecraft.world.World;
@@ -540,17 +540,16 @@
       this.server = server;
       this.statHandler = server.getPlayerManager().createStatHandler(this);
       this.advancementTracker = server.getPlayerManager().getAdvancementTracker(this);
-      this.m_jntxmsea(this.m_vfbpgxfo(world, world.getSpawnPos()).m_rtputfdg(), 0.0F, 0.0F);
+      this.refreshPositionAndAngles(this.calculateSpawnpoint(world, world.getSpawnPos()).ofBottomCenter(), 0.0F, 0.0F);
       this.setClientSettings(arg2);
       this.f_nntqutkk = null;
    }
 
    /**
-    * @mapping {@literal hashed m_vfbpgxfo Lnet/minecraft/unmapped/C_mxrobsgg;m_vfbpgxfo(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_hynzadkk;}
-    * @mapping {@literal named m_vfbpgxfo Lnet/minecraft/server/network/ServerPlayerEntity;m_vfbpgxfo(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/util/math/BlockPos;}
+    * Mapping not found
     */
    @Override
-   public BlockPos m_vfbpgxfo(ServerWorld world, BlockPos pos) {
+   public BlockPos calculateSpawnpoint(ServerWorld world, BlockPos pos) {
       Box lv = this.getDimensions(EntityPose.STANDING).getBoxAt(Vec3d.ZERO);
       BlockPos lv2 = pos;
       if (world.getDimension().hasSkyLight() && world.getServer().getSaveProperties().getGameMode() != GameMode.ADVENTURE) {
@@ -575,7 +574,7 @@
             int r = q % (i * 2 + 1);
             int s = q / (i * 2 + 1);
             lv2 = SpawnLocating.findOverworldSpawn(world, pos.getX() + r - i, pos.getZ() + s - i);
-            if (lv2 != null && world.isSpaceEmpty(this, lv.offset(lv2.m_rtputfdg()))) {
+            if (lv2 != null && world.isSpaceEmpty(this, lv.offset(lv2.ofBottomCenter()))) {
                return lv2;
             }
          }
@@ -583,11 +582,11 @@
          lv2 = pos;
       }
 
-      while (!world.isSpaceEmpty(this, lv.offset(lv2.m_rtputfdg())) && lv2.getY() < world.getTopY() - 1) {
+      while (!world.isSpaceEmpty(this, lv.offset(lv2.ofBottomCenter())) && lv2.getY() < world.getTopY() - 1) {
          lv2 = lv2.up();
       }
 
-      while (world.isSpaceEmpty(this, lv.offset(lv2.down().m_rtputfdg())) && lv2.getY() > world.getBottomY() + 1) {
+      while (world.isSpaceEmpty(this, lv.offset(lv2.down().ofBottomCenter())) && lv2.getY() > world.getBottomY() + 1) {
          lv2 = lv2.down();
       }
 
@@ -1135,23 +1134,24 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_jpjsvuqt Lnet/minecraft/unmapped/C_mxrobsgg;m_jpjsvuqt(ZLnet/minecraft/unmapped/C_zbvyjshu$C_pytyshdn;)Lnet/minecraft/unmapped/C_zbvyjshu;}
+    * @mapping {@literal named m_jpjsvuqt Lnet/minecraft/server/network/ServerPlayerEntity;m_jpjsvuqt(ZLnet/minecraft/world/DimensionTransition$PostTeleportEvent;)Lnet/minecraft/world/DimensionTransition;}
     */
-   public C_zbvyjshu m_jpjsvuqt(boolean bl, C_zbvyjshu.C_pytyshdn arg) {
+   public DimensionTransition m_jpjsvuqt(boolean alive, DimensionTransition.PostTeleportEvent postDimensionTransition) {
       BlockPos lv = this.getSpawnPointPosition();
       float f = this.getSpawnAngle();
       boolean bl2 = this.isSpawnPointSet();
       ServerWorld lv2 = this.server.getWorld(this.getSpawnPointDimension());
       if (lv2 != null && lv != null) {
-         Optional<ServerPlayerEntity.C_edsacgfr> optional = m_tcgfsciw(lv2, lv, f, bl2, bl);
+         Optional<ServerPlayerEntity.C_edsacgfr> optional = m_tcgfsciw(lv2, lv, f, bl2, alive);
          if (optional.isPresent()) {
             ServerPlayerEntity.C_edsacgfr lv3 = (ServerPlayerEntity.C_edsacgfr)optional.get();
-            return new C_zbvyjshu(lv2, lv3.position(), Vec3d.ZERO, lv3.yaw(), 0.0F, arg);
+            return new DimensionTransition(lv2, lv3.position(), Vec3d.ZERO, lv3.yaw(), 0.0F, postDimensionTransition);
          } else {
-            return C_zbvyjshu.m_kfblgmun(this.server.getOverworld(), this, arg);
+            return DimensionTransition.atSpawnpoint(this.server.getOverworld(), this, postDimensionTransition);
          }
       } else {
-         return new C_zbvyjshu(this.server.getOverworld(), this, arg);
+         return new DimensionTransition(this.server.getOverworld(), this, postDimensionTransition);
       }
    }
 
@@ -1202,21 +1202,22 @@
     */
    @Nullable
    @Override
-   public Entity moveToWorld(C_zbvyjshu arg) {
+   public Entity moveToWorld(DimensionTransition transition) {
       if (this.isRemoved()) {
          return null;
       } else {
-         if (arg.missingRespawnBlock()) {
+         if (transition.isMissingRespawnBlock()) {
             this.networkHandler.send(new GameStateUpdateS2CPacket(GameStateUpdateS2CPacket.NO_RESPAWN_BLOCK, 0.0F));
          }
 
-         ServerWorld lv = arg.newLevel();
+         ServerWorld lv = transition.getTargetWorld();
          ServerWorld lv2 = this.getServerWorld();
          RegistryKey<World> lv3 = lv2.getRegistryKey();
          if (lv.getRegistryKey() == lv3) {
-            this.networkHandler.requestTeleport(arg.pos().x, arg.pos().y, arg.pos().z, arg.yRot(), arg.xRot());
+            this.networkHandler
+               .requestTeleport(transition.getPosition().x, transition.getPosition().y, transition.getPosition().z, transition.getYaw(), transition.getPitch());
             this.networkHandler.syncWithPlayerPosition();
-            arg.postDimensionTransition().onTransition(this);
+            transition.getPostTeleportEvent().onTransition(this);
             return this;
          } else {
             this.inTeleportationState = true;
@@ -1235,7 +1236,8 @@
             lv2.getProfiler().pop();
             lv2.getProfiler().push("placing");
             this.setServerWorld(lv);
-            this.networkHandler.requestTeleport(arg.pos().x, arg.pos().y, arg.pos().z, arg.yRot(), arg.xRot());
+            this.networkHandler
+               .requestTeleport(transition.getPosition().x, transition.getPosition().y, transition.getPosition().z, transition.getYaw(), transition.getPitch());
             this.networkHandler.syncWithPlayerPosition();
             lv.onDimensionChanged(this);
             lv2.getProfiler().pop();
@@ -1244,7 +1246,7 @@
             lv5.sendWorldInfo(this, lv);
             lv5.sendPlayerStatus(this);
             lv5.m_liqihqht(this);
-            arg.postDimensionTransition().onTransition(this);
+            transition.getPostTeleportEvent().onTransition(this);
             this.syncedExperience = -1;
             this.syncedHealth = -1.0F;
             this.syncedFoodLevel = -1;
@@ -2317,7 +2319,7 @@
       if (targetWorld == this.getWorld()) {
          this.networkHandler.requestTeleport(x, y, z, yaw, pitch);
       } else {
-         this.moveToWorld(new C_zbvyjshu(targetWorld, new Vec3d(x, y, z), Vec3d.ZERO, yaw, pitch, C_zbvyjshu.f_jgwyllbi));
+         this.moveToWorld(new DimensionTransition(targetWorld, new Vec3d(x, y, z), Vec3d.ZERO, yaw, pitch, DimensionTransition.NONE));
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/server/network/ServerPlayNetworkHandler.java namedSrc/net/minecraft/server/network/ServerPlayNetworkHandler.java
--- namedTargetSrc/net/minecraft/server/network/ServerPlayNetworkHandler.java	2024-07-05 02:12:23.873135037 +0000
+++ namedSrc/net/minecraft/server/network/ServerPlayNetworkHandler.java	2024-07-05 02:11:09.896219481 +0000
@@ -165,7 +165,6 @@
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.text.Text;
 import net.minecraft.unmapped.C_gbgdqure;
-import net.minecraft.unmapped.C_igbzvhln;
 import net.minecraft.unmapped.C_lrkmarec;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.ChatUtil;
@@ -1478,7 +1477,7 @@
     * Mapping not found
     */
    @Override
-   public void onDisconnected(C_igbzvhln arg) {
+   public void onDisconnected(DisconnectReason arg) {
       LOGGER.info("{} lost connection: {}", this.player.getName().getString(), arg.reason().getString());
       this.removePlayerFromWorld();
       super.onDisconnected(arg);
diff -bur namedTargetSrc/net/minecraft/server/network/ServerQueryNetworkHandler.java namedSrc/net/minecraft/server/network/ServerQueryNetworkHandler.java
--- namedTargetSrc/net/minecraft/server/network/ServerQueryNetworkHandler.java	2024-07-05 02:12:23.873135037 +0000
+++ namedSrc/net/minecraft/server/network/ServerQueryNetworkHandler.java	2024-07-05 02:11:09.896219481 +0000
@@ -8,7 +8,6 @@
 import net.minecraft.network.packet.s2c.query.ServerMetadataS2CPacket;
 import net.minecraft.server.ServerMetadata;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_igbzvhln;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_aqoyaoew}
@@ -49,7 +48,7 @@
     * Mapping not found
     */
    @Override
-   public void onDisconnected(C_igbzvhln arg) {
+   public void onDisconnected(DisconnectReason arg) {
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/server/PlayerManager.java namedSrc/net/minecraft/server/PlayerManager.java
--- namedTargetSrc/net/minecraft/server/PlayerManager.java	2024-07-05 02:12:23.821134508 +0000
+++ namedSrc/net/minecraft/server/PlayerManager.java	2024-07-05 02:11:09.824218606 +0000
@@ -83,13 +83,13 @@
 import net.minecraft.stat.Stats;
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_zbvyjshu;
 import net.minecraft.util.FileNameUtil;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.UserCache;
 import net.minecraft.util.WorldSavePath;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
+import net.minecraft.world.DimensionTransition;
 import net.minecraft.world.GameRules;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldProperties;
@@ -608,14 +608,14 @@
    public ServerPlayerEntity respawnPlayer(ServerPlayerEntity player, boolean alive, Entity.RemovalReason reason) {
       this.players.remove(player);
       player.getServerWorld().removePlayer(player, reason);
-      C_zbvyjshu lv = player.m_jpjsvuqt(alive, C_zbvyjshu.f_jgwyllbi);
-      ServerWorld lv2 = lv.newLevel();
+      DimensionTransition lv = player.m_jpjsvuqt(alive, DimensionTransition.NONE);
+      ServerWorld lv2 = lv.getTargetWorld();
       ServerPlayerEntity lv3 = new ServerPlayerEntity(this.server, lv2, player.getGameProfile(), player.m_rtkbvrqw());
       lv3.networkHandler = player.networkHandler;
       lv3.copyFrom(player, alive);
       lv3.setId(player.getId());
       lv3.setMainArm(player.getMainArm());
-      if (!lv.missingRespawnBlock()) {
+      if (!lv.isMissingRespawnBlock()) {
          lv3.m_afrhtnjp(player);
       }
 
@@ -623,9 +623,9 @@
          lv3.addScoreboardTag(string);
       }
 
-      Vec3d lv4 = lv.pos();
-      lv3.refreshPositionAndAngles(lv4.x, lv4.y, lv4.z, lv.yRot(), lv.xRot());
-      if (lv.missingRespawnBlock()) {
+      Vec3d lv4 = lv.getPosition();
+      lv3.refreshPositionAndAngles(lv4.x, lv4.y, lv4.z, lv.getYaw(), lv.getPitch());
+      if (lv.isMissingRespawnBlock()) {
          lv3.networkHandler.send(new GameStateUpdateS2CPacket(GameStateUpdateS2CPacket.NO_RESPAWN_BLOCK, 0.0F));
       }
 
@@ -646,7 +646,7 @@
       lv3.onSpawn();
       lv3.setHealth(lv3.getHealth());
       if (!alive) {
-         BlockPos lv7 = BlockPos.fromPosition(lv.pos());
+         BlockPos lv7 = BlockPos.fromPosition(lv.getPosition());
          BlockState lv8 = lv2.getBlockState(lv7);
          if (lv8.isOf(Blocks.RESPAWN_ANCHOR)) {
             lv3.networkHandler
diff -bur namedTargetSrc/net/minecraft/unmapped/C_axrkcdro.java namedSrc/net/minecraft/unmapped/C_axrkcdro.java
--- namedTargetSrc/net/minecraft/unmapped/C_axrkcdro.java	2024-07-05 02:12:23.833134630 +0000
+++ namedSrc/net/minecraft/unmapped/C_axrkcdro.java	2024-07-05 02:11:09.844218849 +0000
@@ -3,6 +3,7 @@
 import net.minecraft.entity.Entity;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.DimensionTransition;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -54,10 +55,10 @@
 
    /**
     * @mapping {@literal hashed m_ymrfhphm Lnet/minecraft/unmapped/C_axrkcdro;m_ymrfhphm(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_astfners;)Lnet/minecraft/unmapped/C_zbvyjshu;}
-    * @mapping {@literal named m_ymrfhphm Lnet/minecraft/unmapped/C_axrkcdro;m_ymrfhphm(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/Entity;)Lnet/minecraft/unmapped/C_zbvyjshu;}
+    * @mapping {@literal named m_ymrfhphm Lnet/minecraft/unmapped/C_axrkcdro;m_ymrfhphm(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/Entity;)Lnet/minecraft/world/DimensionTransition;}
     */
    @Nullable
-   public C_zbvyjshu m_ymrfhphm(ServerWorld world, Entity arg2) {
+   public DimensionTransition m_ymrfhphm(ServerWorld world, Entity arg2) {
       return this.f_ardhqmll.m_ssylpsbj(world, arg2, this.pos);
    }
 
Only in namedTargetSrc/net/minecraft/unmapped: C_hydfible.java
Only in namedTargetSrc/net/minecraft/unmapped: C_igbzvhln.java
diff -bur namedTargetSrc/net/minecraft/unmapped/C_teerivzm.java namedSrc/net/minecraft/unmapped/C_teerivzm.java
--- namedTargetSrc/net/minecraft/unmapped/C_teerivzm.java	2024-07-05 02:12:23.977136094 +0000
+++ namedSrc/net/minecraft/unmapped/C_teerivzm.java	2024-07-05 02:11:10.012220891 +0000
@@ -3,6 +3,7 @@
 import net.minecraft.entity.Entity;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.DimensionTransition;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -20,10 +21,10 @@
 
    /**
     * @mapping {@literal hashed m_ssylpsbj Lnet/minecraft/unmapped/C_teerivzm;m_ssylpsbj(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_zbvyjshu;}
-    * @mapping {@literal named m_ssylpsbj Lnet/minecraft/unmapped/C_teerivzm;m_ssylpsbj(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/Entity;Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/unmapped/C_zbvyjshu;}
+    * @mapping {@literal named m_ssylpsbj Lnet/minecraft/unmapped/C_teerivzm;m_ssylpsbj(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/Entity;Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/world/DimensionTransition;}
     */
    @Nullable
-   C_zbvyjshu m_ssylpsbj(ServerWorld world, Entity arg2, BlockPos pos);
+   DimensionTransition m_ssylpsbj(ServerWorld world, Entity arg2, BlockPos pos);
 
    /**
     * Mapping not found
Only in namedTargetSrc/net/minecraft/unmapped: C_zbvyjshu.java
diff -bur namedTargetSrc/net/minecraft/util/math/BlockPos.java namedSrc/net/minecraft/util/math/BlockPos.java
--- namedTargetSrc/net/minecraft/util/math/BlockPos.java	2024-07-05 02:12:23.793134224 +0000
+++ namedSrc/net/minecraft/util/math/BlockPos.java	2024-07-05 02:11:09.788218169 +0000
@@ -265,9 +265,10 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_rtputfdg Lnet/minecraft/unmapped/C_hynzadkk;m_rtputfdg()Lnet/minecraft/unmapped/C_vgpupfxx;}
+    * @mapping {@literal named ofBottomCenter Lnet/minecraft/util/math/BlockPos;ofBottomCenter()Lnet/minecraft/util/math/Vec3d;}
     */
-   public Vec3d m_rtputfdg() {
+   public Vec3d ofBottomCenter() {
       return Vec3d.ofBottomCenter(this);
    }
 
Only in namedSrc/net/minecraft/world: DimensionTransition.java
diff -bur namedTargetSrc/net/minecraft/world/WorldEvents.java namedSrc/net/minecraft/world/WorldEvents.java
--- namedTargetSrc/net/minecraft/world/WorldEvents.java	2024-07-05 02:12:23.957135891 +0000
+++ namedSrc/net/minecraft/world/WorldEvents.java	2024-07-05 02:11:09.992220648 +0000
@@ -251,7 +251,7 @@
    /**
     * A Portal is traveled through.
     * <br>Plays the portal travel sound event directly through the client's sound manager.
-    * <p>Called by {@link net.minecraft.unmapped.C_zbvyjshu#m_ciosvisu(net.minecraft.entity.Entity) C_zbvyjshu#m_ciosvisu}
+    * <p>Called by {@link net.minecraft.world.DimensionTransition#travelThroughPortal(net.minecraft.entity.Entity) net.minecraft.world.DimensionTransition#travelThroughPortal}
     * 
     * @mapping {@literal hashed f_ptnwublh Lnet/minecraft/unmapped/C_kkbhcwdu;f_ptnwublh:I}
     * @mapping {@literal named TRAVEL_THROUGH_PORTAL Lnet/minecraft/world/WorldEvents;TRAVEL_THROUGH_PORTAL:I}

Please sign in to comment.