Skip to content

Commit

Permalink
reorganise blocks
Browse files Browse the repository at this point in the history
  • Loading branch information
@ix0rai
ix0rai committed Jul 28, 2023
1 parent 2bc27f7 commit 587748d
Show file tree
Hide file tree
Showing 19 changed files with 18 additions and 18 deletions.
1 change: 0 additions & 1 deletion mappings/net/minecraft/block/LavaCauldronBlock.mapping
View file

This file was deleted.

2 changes: 0 additions & 2 deletions mappings/net/minecraft/block/SignBlock.mapping
View file

This file was deleted.

2 changes: 1 addition & 1 deletion ...craft/block/AbstractCauldronBlock.mapping → ...ck/cauldron/AbstractCauldronBlock.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/unmapped/C_ukinmebz net/minecraft/block/AbstractCauldronBlock
CLASS net/minecraft/unmapped/C_ukinmebz net/minecraft/block/cauldron/AbstractCauldronBlock
FIELD f_cytxtxxd OUTLINE_SHAPE Lnet/minecraft/unmapped/C_zscvhwbd;
FIELD f_ewvwrjxo LEG_WIDTH I
FIELD f_oamzdawa SIDE_THICKNESS I
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/block/cauldron/LavaCauldronBlock.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CLASS net/minecraft/unmapped/C_rkbdhhnb net/minecraft/block/cauldron/LavaCauldronBlock
2 changes: 1 addition & 1 deletion ...et/minecraft/block/DispenserBlock.mapping → ...ft/block/dispenser/DispenserBlock.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/unmapped/C_sridforj net/minecraft/block/DispenserBlock
CLASS net/minecraft/unmapped/C_sridforj net/minecraft/block/dispenser/DispenserBlock
FIELD f_bkwqoovv BEHAVIORS Ljava/util/Map;
FIELD f_etrjkrot SCHEDULED_TICK_DELAY I
FIELD f_kigvivjn FACING Lnet/minecraft/unmapped/C_tcujuvjb;
Expand Down
2 changes: 1 addition & 1 deletion ...s/net/minecraft/block/PistonBlock.mapping → ...inecraft/block/piston/PistonBlock.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/unmapped/C_tpdcefvs net/minecraft/block/PistonBlock
CLASS net/minecraft/unmapped/C_tpdcefvs net/minecraft/block/piston/PistonBlock
FIELD f_ajnebgtk TRIGGER_DROP I
FIELD f_dtwjvhds TRIGGER_RETRACT I
FIELD f_fwvupsif EXTENDED_WEST_SHAPE Lnet/minecraft/unmapped/C_zscvhwbd;
Expand Down
2 changes: 1 addition & 1 deletion ...ecraft/block/PistonExtensionBlock.mapping → ...block/piston/PistonExtensionBlock.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/unmapped/C_yqbibfrg net/minecraft/block/PistonExtensionBlock
CLASS net/minecraft/unmapped/C_yqbibfrg net/minecraft/block/piston/PistonExtensionBlock
FIELD f_ffpotnhz TYPE Lnet/minecraft/unmapped/C_cgckxfsw;
FIELD f_xcreetym FACING Lnet/minecraft/unmapped/C_tcujuvjb;
METHOD m_llleflen getPistonBlockEntity (Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_wpearmnv;
Expand Down
2 changes: 1 addition & 1 deletion ...t/minecraft/block/PistonHeadBlock.mapping → ...raft/block/piston/PistonHeadBlock.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/unmapped/C_kovydcjx net/minecraft/block/PistonHeadBlock
CLASS net/minecraft/unmapped/C_kovydcjx net/minecraft/block/piston/PistonHeadBlock
FIELD f_acanyiod SHORT_DOWN_ARM_SHAPE Lnet/minecraft/unmapped/C_zscvhwbd;
FIELD f_exikhpdp WEST_HEAD_SHAPE Lnet/minecraft/unmapped/C_zscvhwbd;
FIELD f_fbtweryx NORTH_ARM_SHAPE Lnet/minecraft/unmapped/C_zscvhwbd;
Expand Down
2 changes: 1 addition & 1 deletion .../net/minecraft/block/SaplingBlock.mapping → ...ecraft/block/sapling/SaplingBlock.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/unmapped/C_zzbhjpvq net/minecraft/block/SaplingBlock
CLASS net/minecraft/unmapped/C_zzbhjpvq net/minecraft/block/sapling/SaplingBlock
FIELD f_cewxtiqp SHAPE_OFFSET F
FIELD f_tbvcakjw generator Lnet/minecraft/unmapped/C_zmhytkpk;
FIELD f_tqtogbrh SHAPE Lnet/minecraft/unmapped/C_zscvhwbd;
Expand Down
2 changes: 1 addition & 1 deletion ...gs/net/minecraft/block/SculkBlock.mapping → .../minecraft/block/sculk/SculkBlock.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/unmapped/C_jfiifxec net/minecraft/block/SculkBlock
CLASS net/minecraft/unmapped/C_jfiifxec net/minecraft/block/sculk/SculkBlock
METHOD m_cndtctvo canSpreadTo (Lnet/minecraft/unmapped/C_vdvbsyle;Lnet/minecraft/unmapped/C_hynzadkk;)Z
ARG 0 world
ARG 1 pos
Expand Down
2 changes: 1 addition & 1 deletion ...inecraft/block/SculkCatalystBlock.mapping → ...ft/block/sculk/SculkCatalystBlock.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
CLASS net/minecraft/unmapped/C_qqcyyscl net/minecraft/block/SculkCatalystBlock
CLASS net/minecraft/unmapped/C_qqcyyscl net/minecraft/block/sculk/SculkCatalystBlock
FIELD f_kqttjvnj BLOOM Lnet/minecraft/unmapped/C_xhwijdsd;
FIELD f_wlgjopre experienceProvider Lnet/minecraft/unmapped/C_macfejbg;
2 changes: 1 addition & 1 deletion .../minecraft/block/SculkSensorBlock.mapping → ...raft/block/sculk/SculkSensorBlock.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/unmapped/C_ecaydczd net/minecraft/block/SculkSensorBlock
CLASS net/minecraft/unmapped/C_ecaydczd net/minecraft/block/sculk/SculkSensorBlock
FIELD f_ctnilncr OUTLINE_SHAPE Lnet/minecraft/unmapped/C_zscvhwbd;
FIELD f_cvdnduhl RESONATION_NOTE_PITCHES [F
FIELD f_mdopchsr SCULK_SENSOR_PHASE Lnet/minecraft/unmapped/C_cgckxfsw;
Expand Down
2 changes: 1 addition & 1 deletion ...inecraft/block/SculkShriekerBlock.mapping → ...ft/block/sculk/SculkShriekerBlock.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/unmapped/C_wxvelcrz net/minecraft/block/SculkShriekerBlock
CLASS net/minecraft/unmapped/C_wxvelcrz net/minecraft/block/sculk/SculkShriekerBlock
FIELD f_iaexdaun SHAPE Lnet/minecraft/unmapped/C_zscvhwbd;
FIELD f_lfdezzzn WATERLOGGED Lnet/minecraft/unmapped/C_xhwijdsd;
FIELD f_reudzzme CAN_SUMMON Lnet/minecraft/unmapped/C_xhwijdsd;
Expand Down
2 changes: 1 addition & 1 deletion ...et/minecraft/block/SculkVeinBlock.mapping → ...ecraft/block/sculk/SculkVeinBlock.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/unmapped/C_bjvwjobf net/minecraft/block/SculkVeinBlock
CLASS net/minecraft/unmapped/C_bjvwjobf net/minecraft/block/sculk/SculkVeinBlock
FIELD f_lhdhlpuz samePosLichenSpreadBehavior Lnet/minecraft/unmapped/C_twpgwpwn;
FIELD f_pwsdtjjz lichenSpreadBehavior Lnet/minecraft/unmapped/C_twpgwpwn;
FIELD f_xpzepffk WATERLOGGED Lnet/minecraft/unmapped/C_xhwijdsd;
Expand Down
2 changes: 1 addition & 1 deletion ...minecraft/block/AbstractSignBlock.mapping → ...raft/block/sign/AbstractSignBlock.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/unmapped/C_siepybep net/minecraft/block/AbstractSignBlock
CLASS net/minecraft/unmapped/C_siepybep net/minecraft/block/sign/AbstractSignBlock
FIELD f_csmgbvyd SHAPE_OFFSET F
FIELD f_jhuobgwm SHAPE Lnet/minecraft/unmapped/C_zscvhwbd;
FIELD f_mryvqsio type Lnet/minecraft/unmapped/C_xlaykyai;
Expand Down
2 changes: 1 addition & 1 deletion ...aft/block/CeilingHangingSignBlock.mapping → ...lock/sign/CeilingHangingSignBlock.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/unmapped/C_vsqrirpz net/minecraft/block/CeilingHangingSignBlock
CLASS net/minecraft/unmapped/C_vsqrirpz net/minecraft/block/sign/CeilingHangingSignBlock
FIELD f_ddmznrkm SHAPE Lnet/minecraft/unmapped/C_zscvhwbd;
FIELD f_mofkwlez SHAPES Ljava/util/Map;
FIELD f_nvyebogo ROTATION Lnet/minecraft/unmapped/C_vltzvhxi;
Expand Down
2 changes: 2 additions & 0 deletions mappings/net/minecraft/block/sign/SignBlock.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
CLASS net/minecraft/unmapped/C_kkhuxlco net/minecraft/block/sign/SignBlock
FIELD f_vgyqsszu ROTATION Lnet/minecraft/unmapped/C_vltzvhxi;
2 changes: 1 addition & 1 deletion ...ecraft/block/WallHangingSignBlock.mapping → ...t/block/sign/WallHangingSignBlock.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/unmapped/C_hzvmpvoj net/minecraft/block/WallHangingSignBlock
CLASS net/minecraft/unmapped/C_hzvmpvoj net/minecraft/block/sign/WallHangingSignBlock
FIELD f_ajgnnuad SIGN_NORTH_SOUTH Lnet/minecraft/unmapped/C_zscvhwbd;
FIELD f_joxgcayp SIGN_EAST_WEST Lnet/minecraft/unmapped/C_zscvhwbd;
FIELD f_lwnocpar SHAPES Ljava/util/Map;
Expand Down
2 changes: 1 addition & 1 deletion ...net/minecraft/block/WallSignBlock.mapping → ...inecraft/block/sign/WallSignBlock.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/unmapped/C_rgitojot net/minecraft/block/WallSignBlock
CLASS net/minecraft/unmapped/C_rgitojot net/minecraft/block/sign/WallSignBlock
FIELD f_jlirgbrx FACING Lnet/minecraft/unmapped/C_tcujuvjb;
FIELD f_jsiraebb SHAPE_BOTTOM F
FIELD f_jwankqwl SHAPE_THICKNESS F
Expand Down

3 comments on commit 587748d

@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 587748d, 80 file(s) were updated with 674 line(s) added and 577 removed compared to the latest Quilt Mappings version.

View the diff here (1/3): 
Only in namedTargetSrc/net/minecraft/block: AbstractCauldronBlock.java
Only in namedTargetSrc/net/minecraft/block: AbstractSignBlock.java
diff -bur namedTargetSrc/net/minecraft/block/Blocks.java namedSrc/net/minecraft/block/Blocks.java
--- namedTargetSrc/net/minecraft/block/Blocks.java	2023-07-28 17:34:23.596986362 +0000
+++ namedSrc/net/minecraft/block/Blocks.java	2023-07-28 17:32:41.062390463 +0000
@@ -2,6 +2,8 @@
 
 import java.util.function.ToIntFunction;
 import net.minecraft.block.cauldron.CauldronBehavior;
+import net.minecraft.block.cauldron.LavaCauldronBlock;
+import net.minecraft.block.dispenser.DispenserBlock;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.block.entity.BlockEntityType;
 import net.minecraft.block.entity.ShulkerBoxBlockEntity;
@@ -9,13 +11,27 @@
 import net.minecraft.block.enums.NoteBlockInstrument;
 import net.minecraft.block.enums.SculkSensorPhase;
 import net.minecraft.block.piston.PistonBehavior;
+import net.minecraft.block.piston.PistonBlock;
+import net.minecraft.block.piston.PistonExtensionBlock;
+import net.minecraft.block.piston.PistonHeadBlock;
 import net.minecraft.block.sapling.AcaciaSaplingGenerator;
 import net.minecraft.block.sapling.BirchSaplingGenerator;
 import net.minecraft.block.sapling.CherrySaplingGenerator;
 import net.minecraft.block.sapling.DarkOakSaplingGenerator;
 import net.minecraft.block.sapling.JungleSaplingGenerator;
 import net.minecraft.block.sapling.OakSaplingGenerator;
+import net.minecraft.block.sapling.SaplingBlock;
 import net.minecraft.block.sapling.SpruceSaplingGenerator;
+import net.minecraft.block.sculk.SculkBlock;
+import net.minecraft.block.sculk.SculkCatalystBlock;
+import net.minecraft.block.sculk.SculkSensorBlock;
+import net.minecraft.block.sculk.SculkShriekerBlock;
+import net.minecraft.block.sculk.SculkVeinBlock;
+import net.minecraft.block.sign.CeilingHangingSignBlock;
+import net.minecraft.block.sign.SignBlock;
+import net.minecraft.block.sign.SignType;
+import net.minecraft.block.sign.WallHangingSignBlock;
+import net.minecraft.block.sign.WallSignBlock;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.effect.StatusEffects;
 import net.minecraft.feature_flags.FeatureFlag;
@@ -28,7 +44,6 @@
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.state.property.Properties;
 import net.minecraft.util.DyeColor;
-import net.minecraft.util.SignType;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.int_provider.UniformIntProvider;
@@ -11300,7 +11315,7 @@
 
    /**
     * @mapping {@literal hashed m_wbxhpkfm Lnet/minecraft/unmapped/C_qceyzrkd;m_wbxhpkfm(Z)Lnet/minecraft/unmapped/C_tpdcefvs;}
-    * @mapping {@literal named createPistonBlock Lnet/minecraft/block/Blocks;createPistonBlock(Z)Lnet/minecraft/block/PistonBlock;}
+    * @mapping {@literal named createPistonBlock Lnet/minecraft/block/Blocks;createPistonBlock(Z)Lnet/minecraft/block/piston/PistonBlock;}
     */
    private static PistonBlock createPistonBlock(boolean sticky) {
       AbstractBlock.ContextPredicate lv = (state, world, pos) -> !state.get(PistonBlock.EXTENDED);
diff -bur namedTargetSrc/net/minecraft/block/CalibratedSculkSensorBlock.java namedSrc/net/minecraft/block/CalibratedSculkSensorBlock.java
--- namedTargetSrc/net/minecraft/block/CalibratedSculkSensorBlock.java	2023-07-28 17:34:23.584986058 +0000
+++ namedSrc/net/minecraft/block/CalibratedSculkSensorBlock.java	2023-07-28 17:32:41.046390057 +0000
@@ -4,6 +4,7 @@
 import net.minecraft.block.entity.BlockEntityTicker;
 import net.minecraft.block.entity.BlockEntityType;
 import net.minecraft.block.entity.CalibratedSculkSensorBlockEntity;
+import net.minecraft.block.sculk.SculkSensorBlock;
 import net.minecraft.item.ItemPlacementContext;
 import net.minecraft.state.StateManager;
 import net.minecraft.state.property.DirectionProperty;
Only in namedSrc/net/minecraft/block/cauldron: AbstractCauldronBlock.java
Only in namedSrc/net/minecraft/block/cauldron: LavaCauldronBlock.java
diff -bur namedTargetSrc/net/minecraft/block/CauldronBlock.java namedSrc/net/minecraft/block/CauldronBlock.java
--- namedTargetSrc/net/minecraft/block/CauldronBlock.java	2023-07-28 17:34:23.588986159 +0000
+++ namedSrc/net/minecraft/block/CauldronBlock.java	2023-07-28 17:32:41.050390159 +0000
@@ -1,5 +1,6 @@
 package net.minecraft.block;
 
+import net.minecraft.block.cauldron.AbstractCauldronBlock;
 import net.minecraft.block.cauldron.CauldronBehavior;
 import net.minecraft.fluid.Fluid;
 import net.minecraft.fluid.Fluids;
Only in namedTargetSrc/net/minecraft/block: CeilingHangingSignBlock.java
diff -bur namedTargetSrc/net/minecraft/block/dispenser/BlockPlacementDispenserBehavior.java namedSrc/net/minecraft/block/dispenser/BlockPlacementDispenserBehavior.java
--- namedTargetSrc/net/minecraft/block/dispenser/BlockPlacementDispenserBehavior.java	2023-07-28 17:34:23.680988488 +0000
+++ namedSrc/net/minecraft/block/dispenser/BlockPlacementDispenserBehavior.java	2023-07-28 17:32:41.166393105 +0000
@@ -1,7 +1,6 @@
 package net.minecraft.block.dispenser;
 
 import com.mojang.logging.LogUtils;
-import net.minecraft.block.DispenserBlock;
 import net.minecraft.item.AutomaticItemPlacementContext;
 import net.minecraft.item.BlockItem;
 import net.minecraft.item.Item;
diff -bur namedTargetSrc/net/minecraft/block/dispenser/BoatDispenserBehavior.java namedSrc/net/minecraft/block/dispenser/BoatDispenserBehavior.java
--- namedTargetSrc/net/minecraft/block/dispenser/BoatDispenserBehavior.java	2023-07-28 17:34:23.672988286 +0000
+++ namedSrc/net/minecraft/block/dispenser/BoatDispenserBehavior.java	2023-07-28 17:32:41.154392800 +0000
@@ -1,6 +1,5 @@
 package net.minecraft.block.dispenser;
 
-import net.minecraft.block.DispenserBlock;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.vehicle.BoatEntity;
 import net.minecraft.entity.vehicle.ChestBoatEntity;
diff -bur namedTargetSrc/net/minecraft/block/dispenser/DispenserBehavior.java namedSrc/net/minecraft/block/dispenser/DispenserBehavior.java
--- namedTargetSrc/net/minecraft/block/dispenser/DispenserBehavior.java	2023-07-28 17:34:23.620986969 +0000
+++ namedSrc/net/minecraft/block/dispenser/DispenserBehavior.java	2023-07-28 17:32:41.090391175 +0000
@@ -13,7 +13,6 @@
 import net.minecraft.block.CandleBlock;
 import net.minecraft.block.CandleCakeBlock;
 import net.minecraft.block.CarvedPumpkinBlock;
-import net.minecraft.block.DispenserBlock;
 import net.minecraft.block.FluidDrainable;
 import net.minecraft.block.RespawnAnchorBlock;
 import net.minecraft.block.ShulkerBoxBlock;
Only in namedSrc/net/minecraft/block/dispenser: DispenserBlock.java
diff -bur namedTargetSrc/net/minecraft/block/dispenser/ItemDispenserBehavior.java namedSrc/net/minecraft/block/dispenser/ItemDispenserBehavior.java
--- namedTargetSrc/net/minecraft/block/dispenser/ItemDispenserBehavior.java	2023-07-28 17:34:23.548985146 +0000
+++ namedSrc/net/minecraft/block/dispenser/ItemDispenserBehavior.java	2023-07-28 17:32:41.002388939 +0000
@@ -1,6 +1,5 @@
 package net.minecraft.block.dispenser;
 
-import net.minecraft.block.DispenserBlock;
 import net.minecraft.entity.ItemEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPointer;
diff -bur namedTargetSrc/net/minecraft/block/dispenser/ProjectileDispenserBehavior.java namedSrc/net/minecraft/block/dispenser/ProjectileDispenserBehavior.java
--- namedTargetSrc/net/minecraft/block/dispenser/ProjectileDispenserBehavior.java	2023-07-28 17:34:23.680988488 +0000
+++ namedSrc/net/minecraft/block/dispenser/ProjectileDispenserBehavior.java	2023-07-28 17:32:41.166393105 +0000
@@ -1,6 +1,5 @@
 package net.minecraft.block.dispenser;
 
-import net.minecraft.block.DispenserBlock;
 import net.minecraft.entity.projectile.ProjectileEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPointer;
diff -bur namedTargetSrc/net/minecraft/block/dispenser/ShearsDispenserBehavior.java namedSrc/net/minecraft/block/dispenser/ShearsDispenserBehavior.java
--- namedTargetSrc/net/minecraft/block/dispenser/ShearsDispenserBehavior.java	2023-07-28 17:34:23.604986564 +0000
+++ namedSrc/net/minecraft/block/dispenser/ShearsDispenserBehavior.java	2023-07-28 17:32:41.074390768 +0000
@@ -2,7 +2,6 @@
 
 import net.minecraft.block.BeehiveBlock;
 import net.minecraft.block.BlockState;
-import net.minecraft.block.DispenserBlock;
 import net.minecraft.block.entity.BeehiveBlockEntity;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.Shearable;
Only in namedTargetSrc/net/minecraft/block: DispenserBlock.java
diff -bur namedTargetSrc/net/minecraft/block/DropperBlock.java namedSrc/net/minecraft/block/DropperBlock.java
--- namedTargetSrc/net/minecraft/block/DropperBlock.java	2023-07-28 17:34:23.520984437 +0000
+++ namedSrc/net/minecraft/block/DropperBlock.java	2023-07-28 17:32:40.970388127 +0000
@@ -1,6 +1,7 @@
 package net.minecraft.block;
 
 import net.minecraft.block.dispenser.DispenserBehavior;
+import net.minecraft.block.dispenser.DispenserBlock;
 import net.minecraft.block.dispenser.ItemDispenserBehavior;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.block.entity.DispenserBlockEntity;
diff -bur namedTargetSrc/net/minecraft/block/entity/PistonBlockEntity.java namedSrc/net/minecraft/block/entity/PistonBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/PistonBlockEntity.java	2023-07-28 17:34:23.672988286 +0000
+++ namedSrc/net/minecraft/block/entity/PistonBlockEntity.java	2023-07-28 17:32:41.158392902 +0000
@@ -5,10 +5,10 @@
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
-import net.minecraft.block.PistonBlock;
-import net.minecraft.block.PistonHeadBlock;
 import net.minecraft.block.enums.PistonType;
 import net.minecraft.block.piston.PistonBehavior;
+import net.minecraft.block.piston.PistonBlock;
+import net.minecraft.block.piston.PistonHeadBlock;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.MovementType;
 import net.minecraft.nbt.NbtCompound;
diff -bur namedTargetSrc/net/minecraft/block/entity/SculkCatalystBlockEntity.java namedSrc/net/minecraft/block/entity/SculkCatalystBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/SculkCatalystBlockEntity.java	2023-07-28 17:34:23.648987678 +0000
+++ namedSrc/net/minecraft/block/entity/SculkCatalystBlockEntity.java	2023-07-28 17:32:41.130392191 +0000
@@ -4,8 +4,8 @@
 import net.minecraft.advancement.criterion.Criteria;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
-import net.minecraft.block.SculkCatalystBlock;
 import net.minecraft.block.sculk.SculkBehavior;
+import net.minecraft.block.sculk.SculkCatalystBlock;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.damage.DamageSource;
diff -bur namedTargetSrc/net/minecraft/block/entity/SculkSensorBlockEntity.java namedSrc/net/minecraft/block/entity/SculkSensorBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/SculkSensorBlockEntity.java	2023-07-28 17:34:23.668988184 +0000
+++ namedSrc/net/minecraft/block/entity/SculkSensorBlockEntity.java	2023-07-28 17:32:41.150392699 +0000
@@ -4,7 +4,7 @@
 import com.mojang.serialization.Dynamic;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
-import net.minecraft.block.SculkSensorBlock;
+import net.minecraft.block.sculk.SculkSensorBlock;
 import net.minecraft.entity.Entity;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.nbt.NbtElement;
diff -bur namedTargetSrc/net/minecraft/block/entity/SculkShriekerBlockEntity.java namedSrc/net/minecraft/block/entity/SculkShriekerBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/SculkShriekerBlockEntity.java	2023-07-28 17:34:23.664988083 +0000
+++ namedSrc/net/minecraft/block/entity/SculkShriekerBlockEntity.java	2023-07-28 17:32:41.146392597 +0000
@@ -7,7 +7,7 @@
 import java.util.OptionalInt;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
-import net.minecraft.block.SculkShriekerBlock;
+import net.minecraft.block.sculk.SculkShriekerBlock;
 import net.minecraft.block.sculk.SculkShriekerWarningManager;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityType;
diff -bur namedTargetSrc/net/minecraft/block/entity/SignBlockEntity.java namedSrc/net/minecraft/block/entity/SignBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/SignBlockEntity.java	2023-07-28 17:34:23.688988691 +0000
+++ namedSrc/net/minecraft/block/entity/SignBlockEntity.java	2023-07-28 17:32:41.174393308 +0000
@@ -5,9 +5,9 @@
 import java.util.List;
 import java.util.UUID;
 import java.util.function.UnaryOperator;
-import net.minecraft.block.AbstractSignBlock;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
+import net.minecraft.block.sign.AbstractSignBlock;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.nbt.NbtOps;
diff -bur namedTargetSrc/net/minecraft/block/FarmlandBlock.java namedSrc/net/minecraft/block/FarmlandBlock.java
--- namedTargetSrc/net/minecraft/block/FarmlandBlock.java	2023-07-28 17:34:23.608986665 +0000
+++ namedSrc/net/minecraft/block/FarmlandBlock.java	2023-07-28 17:32:41.082390971 +0000
@@ -1,5 +1,6 @@
 package net.minecraft.block;
 
+import net.minecraft.block.piston.PistonExtensionBlock;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.ai.pathing.NavigationType;
diff -bur namedTargetSrc/net/minecraft/block/FenceGateBlock.java namedSrc/net/minecraft/block/FenceGateBlock.java
--- namedTargetSrc/net/minecraft/block/FenceGateBlock.java	2023-07-28 17:34:23.684988589 +0000
+++ namedSrc/net/minecraft/block/FenceGateBlock.java	2023-07-28 17:32:41.170393207 +0000
@@ -1,5 +1,6 @@
 package net.minecraft.block;
 
+import net.minecraft.block.sign.SignType;
 import net.minecraft.entity.ai.pathing.NavigationType;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemPlacementContext;
@@ -10,7 +11,6 @@
 import net.minecraft.state.property.Properties;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
-import net.minecraft.util.SignType;
 import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
@@ -111,13 +111,13 @@
    );
    /**
     * @mapping {@literal hashed f_whecgsjr Lnet/minecraft/unmapped/C_nfehypbw;f_whecgsjr:Lnet/minecraft/unmapped/C_xlaykyai;}
-    * @mapping {@literal named signType Lnet/minecraft/block/FenceGateBlock;signType:Lnet/minecraft/util/SignType;}
+    * @mapping {@literal named signType Lnet/minecraft/block/FenceGateBlock;signType:Lnet/minecraft/block/sign/SignType;}
     */
    private final SignType signType;
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_nfehypbw;<init>(Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;Lnet/minecraft/unmapped/C_xlaykyai;)V}
-    * @mapping {@literal named <init> Lnet/minecraft/block/FenceGateBlock;<init>(Lnet/minecraft/block/AbstractBlock$Settings;Lnet/minecraft/util/SignType;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/block/FenceGateBlock;<init>(Lnet/minecraft/block/AbstractBlock$Settings;Lnet/minecraft/block/sign/SignType;)V}
     */
    public FenceGateBlock(AbstractBlock.Settings settings, SignType signType) {
       super(settings.sounds(signType.soundType()));
Only in namedTargetSrc/net/minecraft/block: LavaCauldronBlock.java
diff -bur namedTargetSrc/net/minecraft/block/LeveledCauldronBlock.java namedSrc/net/minecraft/block/LeveledCauldronBlock.java
--- namedTargetSrc/net/minecraft/block/LeveledCauldronBlock.java	2023-07-28 17:34:23.612986767 +0000
+++ namedSrc/net/minecraft/block/LeveledCauldronBlock.java	2023-07-28 17:32:41.086391073 +0000
@@ -2,6 +2,7 @@
 
 import java.util.Map;
 import java.util.function.Predicate;
+import net.minecraft.block.cauldron.AbstractCauldronBlock;
 import net.minecraft.block.cauldron.CauldronBehavior;
 import net.minecraft.entity.Entity;
 import net.minecraft.fluid.Fluid;
diff -bur namedTargetSrc/net/minecraft/block/MangrovePropaguleBlock.java namedSrc/net/minecraft/block/MangrovePropaguleBlock.java
--- namedTargetSrc/net/minecraft/block/MangrovePropaguleBlock.java	2023-07-28 17:34:23.544985045 +0000
+++ namedSrc/net/minecraft/block/MangrovePropaguleBlock.java	2023-07-28 17:32:40.998388838 +0000
@@ -1,6 +1,7 @@
 package net.minecraft.block;
 
 import net.minecraft.block.sapling.MangroveSaplingGenerator;
+import net.minecraft.block.sapling.SaplingBlock;
 import net.minecraft.fluid.FluidState;
 import net.minecraft.fluid.Fluids;
 import net.minecraft.item.ItemPlacementContext;
Only in namedSrc/net/minecraft/block/piston: PistonBlock.java
Only in namedSrc/net/minecraft/block/piston: PistonExtensionBlock.java
diff -bur namedTargetSrc/net/minecraft/block/piston/PistonHandler.java namedSrc/net/minecraft/block/piston/PistonHandler.java
--- namedTargetSrc/net/minecraft/block/piston/PistonHandler.java	2023-07-28 17:34:23.556985349 +0000
+++ namedSrc/net/minecraft/block/piston/PistonHandler.java	2023-07-28 17:32:41.010389143 +0000
@@ -4,7 +4,6 @@
 import java.util.List;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
-import net.minecraft.block.PistonBlock;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.world.World;
Only in namedSrc/net/minecraft/block/piston: PistonHeadBlock.java
Only in namedTargetSrc/net/minecraft/block: PistonBlock.java
Only in namedTargetSrc/net/minecraft/block: PistonExtensionBlock.java
Only in namedTargetSrc/net/minecraft/block: PistonHeadBlock.java
diff -bur namedTargetSrc/net/minecraft/block/PointedDripstoneBlock.java namedSrc/net/minecraft/block/PointedDripstoneBlock.java
--- namedTargetSrc/net/minecraft/block/PointedDripstoneBlock.java	2023-07-28 17:34:23.572985754 +0000
+++ namedSrc/net/minecraft/block/PointedDripstoneBlock.java	2023-07-28 17:32:41.030389651 +0000
@@ -4,6 +4,7 @@
 import java.util.Optional;
 import java.util.function.BiPredicate;
 import java.util.function.Predicate;
+import net.minecraft.block.cauldron.AbstractCauldronBlock;
 import net.minecraft.block.enums.Thickness;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.FallingBlockEntity;
Only in namedSrc/net/minecraft/block/sapling: SaplingBlock.java
Only in namedTargetSrc/net/minecraft/block: SaplingBlock.java
diff -bur namedTargetSrc/net/minecraft/block/sculk/SculkBehavior.java namedSrc/net/minecraft/block/sculk/SculkBehavior.java
--- namedTargetSrc/net/minecraft/block/sculk/SculkBehavior.java	2023-07-28 17:34:23.616986868 +0000
+++ namedSrc/net/minecraft/block/sculk/SculkBehavior.java	2023-07-28 17:32:41.090391175 +0000
@@ -21,7 +21,6 @@
 import net.minecraft.block.AbstractLichenBlock;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
-import net.minecraft.block.SculkVeinBlock;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.nbt.NbtElement;
 import net.minecraft.nbt.NbtOps;
Only in namedSrc/net/minecraft/block/sculk: SculkBlock.java
Only in namedSrc/net/minecraft/block/sculk: SculkCatalystBlock.java
Only in namedSrc/net/minecraft/block/sculk: SculkSensorBlock.java
Only in namedSrc/net/minecraft/block/sculk: SculkShriekerBlock.java
Only in namedSrc/net/minecraft/block/sculk: SculkVeinBlock.java
diff -bur namedTargetSrc/net/minecraft/block/sculk/SculkVeinSpreader.java namedSrc/net/minecraft/block/sculk/SculkVeinSpreader.java
--- namedTargetSrc/net/minecraft/block/sculk/SculkVeinSpreader.java	2023-07-28 17:34:23.580985956 +0000
+++ namedSrc/net/minecraft/block/sculk/SculkVeinSpreader.java	2023-07-28 17:32:41.042389955 +0000
@@ -4,7 +4,6 @@
 import net.minecraft.block.AbstractLichenBlock;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
-import net.minecraft.block.SculkVeinBlock;
 import net.minecraft.fluid.Fluids;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
Only in namedTargetSrc/net/minecraft/block: SculkBlock.java
Only in namedTargetSrc/net/minecraft/block: SculkCatalystBlock.java
Only in namedTargetSrc/net/minecraft/block: SculkSensorBlock.java
Only in namedTargetSrc/net/minecraft/block: SculkShriekerBlock.java
Only in namedTargetSrc/net/minecraft/block: SculkVeinBlock.java
Only in namedSrc/net/minecraft/block: sign
Only in namedTargetSrc/net/minecraft/block: SignBlock.java
Only in namedTargetSrc/net/minecraft/block: WallHangingSignBlock.java
Only in namedTargetSrc/net/minecraft/block: WallSignBlock.java
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/AbstractSignEditScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/AbstractSignEditScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/AbstractSignEditScreen.java	2023-07-28 17:34:23.532984741 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/AbstractSignEditScreen.java	2023-07-28 17:32:40.986388533 +0000
@@ -4,10 +4,11 @@
 import java.util.stream.IntStream;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.minecraft.block.AbstractSignBlock;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.entity.SignBlockEntity;
 import net.minecraft.block.entity.SignText;
+import net.minecraft.block.sign.AbstractSignBlock;
+import net.minecraft.block.sign.SignType;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.ButtonWidget;
@@ -17,7 +18,6 @@
 import net.minecraft.network.packet.c2s.play.SignUpdateC2SPacket;
 import net.minecraft.text.CommonTexts;
 import net.minecraft.text.Text;
-import net.minecraft.util.SignType;
 import org.jetbrains.annotations.Nullable;
 import org.joml.Vector3f;
 import org.lwjgl.glfw.GLFW;
@@ -50,7 +50,7 @@
    private final boolean fromFront;
    /**
     * @mapping {@literal hashed f_xlaqfmub Lnet/minecraft/unmapped/C_dqqnwcwi;f_xlaqfmub:Lnet/minecraft/unmapped/C_xlaykyai;}
-    * @mapping {@literal named signType Lnet/minecraft/client/gui/screen/ingame/AbstractSignEditScreen;signType:Lnet/minecraft/util/SignType;}
+    * @mapping {@literal named signType Lnet/minecraft/client/gui/screen/ingame/AbstractSignEditScreen;signType:Lnet/minecraft/block/sign/SignType;}
     */
    protected final SignType signType;
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/SignEditScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/SignEditScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/SignEditScreen.java	2023-07-28 17:34:23.684988589 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/SignEditScreen.java	2023-07-28 17:32:41.170393207 +0000
@@ -4,8 +4,8 @@
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.block.BlockState;
-import net.minecraft.block.SignBlock;
 import net.minecraft.block.entity.SignBlockEntity;
+import net.minecraft.block.sign.SignBlock;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.render.OverlayTexture;
 import net.minecraft.client.render.TexturedRenderLayers;
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/OpenToLanScreen.java namedSrc/net/minecraft/client/gui/screen/OpenToLanScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/OpenToLanScreen.java	2023-07-28 17:34:23.696988893 +0000
+++ namedSrc/net/minecraft/client/gui/screen/OpenToLanScreen.java	2023-07-28 17:32:41.186393613 +0000
@@ -183,7 +183,7 @@
             if (this.localPort < 1024 || this.localPort > 65535) {
                return PORT_INVALID;
             } else {
-               return !NetworkUtils.m_wsltejex(this.localPort) ? PORT_UNAVAILABLE : null;
+               return !NetworkUtils.isPortAvailable(this.localPort) ? PORT_UNAVAILABLE : null;
             }
          } catch (NumberFormatException var3) {
             this.localPort = NetworkUtils.findLocalPort();
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/recipe/book/RecipeAlternativesWidget.java namedSrc/net/minecraft/client/gui/screen/recipe/book/RecipeAlternativesWidget.java
--- namedTargetSrc/net/minecraft/client/gui/screen/recipe/book/RecipeAlternativesWidget.java	2023-07-28 17:34:23.596986362 +0000
+++ namedSrc/net/minecraft/client/gui/screen/recipe/book/RecipeAlternativesWidget.java	2023-07-28 17:32:41.066390565 +0000
@@ -202,7 +202,7 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double d, double e) {
+   public boolean isMouseOver(double mouseX, double mouseY) {
       return false;
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/recipe/book/RecipeBookWidget.java namedSrc/net/minecraft/client/gui/screen/recipe/book/RecipeBookWidget.java
--- namedTargetSrc/net/minecraft/client/gui/screen/recipe/book/RecipeBookWidget.java	2023-07-28 17:34:23.672988286 +0000
+++ namedSrc/net/minecraft/client/gui/screen/recipe/book/RecipeBookWidget.java	2023-07-28 17:32:41.158392902 +0000
@@ -616,7 +616,7 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double d, double e) {
+   public boolean isMouseOver(double mouseX, double mouseY) {
       return false;
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/Screen.java namedSrc/net/minecraft/client/gui/screen/Screen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/Screen.java	2023-07-28 17:34:23.560985450 +0000
+++ namedSrc/net/minecraft/client/gui/screen/Screen.java	2023-07-28 17:32:41.014389244 +0000
@@ -727,7 +727,7 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double d, double e) {
+   public boolean isMouseOver(double mouseX, double mouseY) {
       return true;
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/TitleScreen.java namedSrc/net/minecraft/client/gui/screen/TitleScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/TitleScreen.java	2023-07-28 17:34:23.584986058 +0000
+++ namedSrc/net/minecraft/client/gui/screen/TitleScreen.java	2023-07-28 17:32:41.046390057 +0000
@@ -340,7 +340,7 @@
                   } else {
                      this.client
                         .createIntegratedServerLoader()
-                        .createAndStart("Demo_World", MinecraftServer.DEMO_LEVEL_INFO, WorldGeneratorOptions.DEFAULT, GeneratorTypes::m_grmkvtyw);
+                        .createAndStart("Demo_World", MinecraftServer.DEMO_LEVEL_INFO, WorldGeneratorOptions.DEFAULT, GeneratorTypes::getWorldDimensions);
                   }
                }
             )
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/world/CreateWorldScreen.java namedSrc/net/minecraft/client/gui/screen/world/CreateWorldScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/world/CreateWorldScreen.java	2023-07-28 17:34:23.544985045 +0000
+++ namedSrc/net/minecraft/client/gui/screen/world/CreateWorldScreen.java	2023-07-28 17:32:40.998388838 +0000
@@ -230,7 +230,8 @@
          lv2,
          arg -> new WorldLoader.DataLoadOutput<>(
                new CreateWorldScreen.WorldCreationSettings(
-                  new GeneratorOptions(WorldGeneratorOptions.withRandomSeed(), GeneratorTypes.m_grmkvtyw(arg.datapackWorldgen())), arg.dataConfiguration()
+                  new GeneratorOptions(WorldGeneratorOptions.withRandomSeed(), GeneratorTypes.getWorldDimensions(arg.datapackWorldgen())),
+                  arg.dataConfiguration()
                ),
                arg.datapackDimensions()
             ),
@@ -258,9 +259,9 @@
          client, parent, context, GeneratorTypes.getKey(context.selectedDimensions().dimensions()), OptionalLong.of(context.options().getSeed())
       );
       lv.reopened = true;
-      lv.worldCreator.m_ijqpixye(info.getLevelName());
-      lv.worldCreator.m_uuveagan(info.areCommandsAllowed());
-      lv.worldCreator.m_rltchgia(info.getDifficulty());
+      lv.worldCreator.setWorldName(info.getLevelName());
+      lv.worldCreator.setCheatsEnabled(info.areCommandsAllowed());
+      lv.worldCreator.setDifficulty(info.getDifficulty());
       lv.worldCreator.getGameRules().setAllValues(info.getGameRules(), null);
       if (info.isHardcore()) {
          lv.worldCreator.setGameMode(WorldCreator.GameMode.HARDCORE);
@@ -393,10 +394,10 @@
       } else {
          return new WorldInfo(
             string,
-            this.worldCreator.m_mswhmzta().mode,
+            this.worldCreator.getGameMode().mode,
             this.worldCreator.isHardcore(),
-            this.worldCreator.m_foaxpdkg(),
-            this.worldCreator.m_qsmcxzzu(),
+            this.worldCreator.getDifficulty(),
+            this.worldCreator.areCheatsEnabled(),
             this.worldCreator.getGameRules(),
             this.worldCreator.getContext().dataConfiguration()
          );
@@ -483,7 +484,7 @@
             this.dataPackTempDir = Files.createTempDirectory("mcworld-");
          } catch (IOException var2) {
             LOGGER.warn("Failed to create temporary dir", (Throwable)var2);
-            SystemToast.addPackCopyFailure(this.client, this.worldCreator.m_xirteeuv());
+            SystemToast.addPackCopyFailure(this.client, this.worldCreator.getSaveFolderName());
             this.onCloseScreen();
          }
       }
@@ -528,7 +529,7 @@
       FeatureAndDataSettings lv = new FeatureAndDataSettings(
          new DataPackSettings(list, list2), this.worldCreator.getContext().dataConfiguration().enabledFeatures()
       );
-      if (this.worldCreator.m_detzuxbw(lv)) {
+      if (this.worldCreator.updateContext(lv)) {
          this.client.setScreen(this);
       } else {
          FeatureFlagBitSet lv2 = dataPackManager.getRequestedFeatures();
@@ -578,7 +579,7 @@
             Util.getMainWorkerExecutor(),
             this.client
          )
-         .thenAcceptAsync(this.worldCreator::m_ujmxtpie, this.client)
+         .thenAcceptAsync(this.worldCreator::setContext, this.client)
          .handle(
             (arg, throwable) -> {
                if (throwable != null) {
@@ -675,7 +676,7 @@
     * @mapping {@literal named createStorageSession Lnet/minecraft/client/gui/screen/world/CreateWorldScreen;createStorageSession()Ljava/util/Optional;}
     */
    private Optional<WorldSaveStorage.Session> createStorageSession() {
-      String string = this.worldCreator.m_xirteeuv();
+      String string = this.worldCreator.getSaveFolderName();
 
       try {
          WorldSaveStorage.Session lv = this.client.getWorldStorage().createUncheckedSession(string);
@@ -829,44 +830,46 @@
             lv3.copyDefaultSettings().setPadding(1)
          );
          this.nameInput.setText(CreateWorldScreen.this.worldCreator.getWorldName());
-         this.nameInput.setChangedListener(CreateWorldScreen.this.worldCreator::m_ijqpixye);
+         this.nameInput.setChangedListener(CreateWorldScreen.this.worldCreator::setWorldName);
          CreateWorldScreen.this.worldCreator
-            .m_gshlcejd(
+            .addListener(
                argx -> this.nameInput
-                     .setTooltip(Tooltip.create(Text.translatable("selectWorld.targetFolder", Text.literal(argx.m_xirteeuv()).formatted(Formatting.ITALIC))))
+                     .setTooltip(
+                        Tooltip.create(Text.translatable("selectWorld.targetFolder", Text.literal(argx.getSaveFolderName()).formatted(Formatting.ITALIC)))
+                     )
             );
          CreateWorldScreen.this.setInitialFocus(this.nameInput);
          lv.add(lv3.getWidget(), lv.copyDefaultSettings().alignHorizontallyCenter());
          CyclingButtonWidget<WorldCreator.GameMode> lv4 = lv.add(
-            CyclingButtonWidget.<WorldCreator.GameMode>builder(argx -> argx.f_imjydtow)
+            CyclingButtonWidget.<WorldCreator.GameMode>builder(argx -> argx.name)
                .values(WorldCreator.GameMode.SURVIVAL, WorldCreator.GameMode.HARDCORE, WorldCreator.GameMode.CREATIVE)
                .build(0, 0, 210, 20, CreateWorldScreen.GAME_MODE, (argx, arg2) -> CreateWorldScreen.this.worldCreator.setGameMode(arg2)),
             lv2
          );
-         CreateWorldScreen.this.worldCreator.m_gshlcejd(arg2 -> {
-            lv4.setValue(arg2.m_mswhmzta());
-            lv4.active = !arg2.m_lxkbugsk();
-            lv4.setTooltip(Tooltip.create(arg2.m_mswhmzta().getInfo()));
+         CreateWorldScreen.this.worldCreator.addListener(arg2 -> {
+            lv4.setValue(arg2.getGameMode());
+            lv4.active = !arg2.isDebug();
+            lv4.setTooltip(Tooltip.create(arg2.getGameMode().getInfo()));
          });
          CyclingButtonWidget<Difficulty> lv5 = lv.add(
             CyclingButtonWidget.<Difficulty>builder(Difficulty::getTranslatableName)
                .values(Difficulty.values())
-               .build(0, 0, 210, 20, Text.translatable("options.difficulty"), (argx, arg2) -> CreateWorldScreen.this.worldCreator.m_rltchgia(arg2)),
+               .build(0, 0, 210, 20, Text.translatable("options.difficulty"), (argx, arg2) -> CreateWorldScreen.this.worldCreator.setDifficulty(arg2)),
             lv2
          );
-         CreateWorldScreen.this.worldCreator.m_gshlcejd(arg2 -> {
-            lv5.setValue(CreateWorldScreen.this.worldCreator.m_foaxpdkg());
+         CreateWorldScreen.this.worldCreator.addListener(arg2 -> {
+            lv5.setValue(CreateWorldScreen.this.worldCreator.getDifficulty());
             lv5.active = !CreateWorldScreen.this.worldCreator.isHardcore();
-            lv5.setTooltip(Tooltip.create(CreateWorldScreen.this.worldCreator.m_foaxpdkg().getInfoText()));
+            lv5.setTooltip(Tooltip.create(CreateWorldScreen.this.worldCreator.getDifficulty().getInfoText()));
          });
          CyclingButtonWidget<Boolean> lv6 = lv.add(
             CyclingButtonWidget.onOffBuilder()
                .tooltip(argx -> Tooltip.create(CreateWorldScreen.ALLOW_COMMANDS_INFO))
-               .build(0, 0, 210, 20, ALLOW_COMMANDS, (argx, arg2) -> CreateWorldScreen.this.worldCreator.m_uuveagan(arg2))
+               .build(0, 0, 210, 20, ALLOW_COMMANDS, (argx, arg2) -> CreateWorldScreen.this.worldCreator.setCheatsEnabled(arg2))
          );
-         CreateWorldScreen.this.worldCreator.m_gshlcejd(arg2 -> {
-            lv6.setValue(CreateWorldScreen.this.worldCreator.m_qsmcxzzu());
-            lv6.active = !CreateWorldScreen.this.worldCreator.m_lxkbugsk() && !CreateWorldScreen.this.worldCreator.isHardcore();
+         CreateWorldScreen.this.worldCreator.addListener(arg2 -> {
+            lv6.setValue(CreateWorldScreen.this.worldCreator.areCheatsEnabled());
+            lv6.active = !CreateWorldScreen.this.worldCreator.isDebug() && !CreateWorldScreen.this.worldCreator.isHardcore();
          });
          if (!SharedConstants.getGameVersion().isStable()) {
             lv.add(
@@ -942,7 +945,7 @@
       private void openGameRulesScreen() {
          CreateWorldScreen.this.client.setScreen(new EditGameRulesScreen(CreateWorldScreen.this.worldCreator.getGameRules().copy(), optional -> {
             CreateWorldScreen.this.client.setScreen(CreateWorldScreen.this);
-            optional.ifPresent(CreateWorldScreen.this.worldCreator::m_vgkmaenv);
+            optional.ifPresent(CreateWorldScreen.this.worldCreator::setGameRules);
          }));
       }
    }
@@ -1018,26 +1021,26 @@
       WorldTab() {
          super(WORLD_TAB_TITLE);
          GridWidget.AdditionHelper lv = this.grid.setColumnSpacing(10).setRowSpacing(8).createAdditionHelper(2);
-         CyclingButtonWidget<WorldCreator.C_jbuehfan> lv2 = lv.add(
-            CyclingButtonWidget.<WorldCreator.C_jbuehfan>builder(WorldCreator.C_jbuehfan::m_aylbuvaw)
+         CyclingButtonWidget<WorldCreator.WorldTypeEntry> lv2 = lv.add(
+            CyclingButtonWidget.<WorldCreator.WorldTypeEntry>builder(WorldCreator.WorldTypeEntry::getName)
                .values(this.createWorldTypeSupplier())
                .narration(CreateWorldScreen.WorldTab::createButtonNarration)
-               .build(0, 0, 150, 20, Text.translatable("selectWorld.mapType"), (argx, arg2) -> CreateWorldScreen.this.worldCreator.m_gythbeko(arg2))
+               .build(0, 0, 150, 20, Text.translatable("selectWorld.mapType"), (argx, arg2) -> CreateWorldScreen.this.worldCreator.setWorldType(arg2))
          );
-         lv2.setValue(CreateWorldScreen.this.worldCreator.m_dmnnomne());
-         CreateWorldScreen.this.worldCreator.m_gshlcejd(arg2 -> {
-            WorldCreator.C_jbuehfan lvx = arg2.m_dmnnomne();
+         lv2.setValue(CreateWorldScreen.this.worldCreator.getWorldType());
+         CreateWorldScreen.this.worldCreator.addListener(arg2 -> {
+            WorldCreator.WorldTypeEntry lvx = arg2.getWorldType();
             lv2.setValue(lvx);
-            if (lvx.m_ttszxefp()) {
+            if (lvx.isAmplified()) {
                lv2.setTooltip(Tooltip.create(AMPLIFIED_INFO));
             } else {
                lv2.setTooltip(null);
             }
 
-            lv2.active = CreateWorldScreen.this.worldCreator.m_dmnnomne().preset() != null;
+            lv2.active = CreateWorldScreen.this.worldCreator.getWorldType().preset() != null;
          });
          this.customizeTypeButton = lv.add(ButtonWidget.builder(Text.translatable("selectWorld.customizeType"), argx -> this.openPresetsScreen()).build());
-         CreateWorldScreen.this.worldCreator.m_gshlcejd(argx -> this.customizeTypeButton.active = !argx.m_lxkbugsk() && argx.getScreenProvider() != null);
+         CreateWorldScreen.this.worldCreator.addListener(argx -> this.customizeTypeButton.active = !argx.isDebug() && argx.getScreenProvider() != null);
          GridWidget.AdditionHelper lv3 = new GridWidget().setRowSpacing(4).createAdditionHelper(1);
          lv3.add(new TextWidget(ENTER_SEED, CreateWorldScreen.this.textRenderer).alignLeft());
          this.seedInput = lv3.add(new TextFieldWidget(CreateWorldScreen.this.textRenderer, 0, 0, 308, 20, Text.translatable("selectWorld.enterSeed")) {
@@ -1050,17 +1053,17 @@
             }
          }, lv.copyDefaultSettings().setPadding(1));
          this.seedInput.setHint(SEED_INFO);
-         this.seedInput.setText(CreateWorldScreen.this.worldCreator.m_yuhyzqip());
-         this.seedInput.setChangedListener(string -> CreateWorldScreen.this.worldCreator.m_hfdhfufg(this.seedInput.getText()));
+         this.seedInput.setText(CreateWorldScreen.this.worldCreator.getSeed());
+         this.seedInput.setChangedListener(string -> CreateWorldScreen.this.worldCreator.setSeed(this.seedInput.getText()));
          lv.add(lv3.getWidget(), 2);
          SwitchGrid.Builder lv4 = SwitchGrid.builder(310).leftPadding(1);
-         lv4.button(MAP_FEATURES, CreateWorldScreen.this.worldCreator::m_cwibfpjj, CreateWorldScreen.this.worldCreator::m_xgnefpuy)
-            .condition(() -> !CreateWorldScreen.this.worldCreator.m_lxkbugsk())
+         lv4.button(MAP_FEATURES, CreateWorldScreen.this.worldCreator::shouldGenerateStructures, CreateWorldScreen.this.worldCreator::setGenerateStructures)
+            .condition(() -> !CreateWorldScreen.this.worldCreator.isDebug())
             .info(MAP_FEATURES_INFO);
-         lv4.button(BONUS_ITEMS, CreateWorldScreen.this.worldCreator::m_jmqeorwf, CreateWorldScreen.this.worldCreator::m_wzhatoky)
-            .condition(() -> !CreateWorldScreen.this.worldCreator.isHardcore() && !CreateWorldScreen.this.worldCreator.m_lxkbugsk());
+         lv4.button(BONUS_ITEMS, CreateWorldScreen.this.worldCreator::isBonusChestEnabled, CreateWorldScreen.this.worldCreator::setBonusChestEnabled)
+            .condition(() -> !CreateWorldScreen.this.worldCreator.isHardcore() && !CreateWorldScreen.this.worldCreator.isDebug());
          SwitchGrid lv5 = lv4.build(arg2 -> lv.add(arg2, 2));
-         CreateWorldScreen.this.worldCreator.m_gshlcejd(arg2 -> lv5.updateStates());
+         CreateWorldScreen.this.worldCreator.addListener(arg2 -> lv5.updateStates());
       }
 
       /**
@@ -1078,24 +1081,24 @@
        * @mapping {@literal hashed m_awomnjir Lnet/minecraft/unmapped/C_ibkofvzc$C_emutyvqg;m_awomnjir()Lnet/minecraft/unmapped/C_ikfvpkkf$C_qjymjbvs;}
        * @mapping {@literal named createWorldTypeSupplier Lnet/minecraft/client/gui/screen/world/CreateWorldScreen$WorldTab;createWorldTypeSupplier()Lnet/minecraft/client/gui/widget/CyclingButtonWidget$Values;}
        */
-      private CyclingButtonWidget.Values<WorldCreator.C_jbuehfan> createWorldTypeSupplier() {
-         return new CyclingButtonWidget.Values<WorldCreator.C_jbuehfan>() {
+      private CyclingButtonWidget.Values<WorldCreator.WorldTypeEntry> createWorldTypeSupplier() {
+         return new CyclingButtonWidget.Values<WorldCreator.WorldTypeEntry>() {
             /**
              * Mapping not found
              */
             @Override
-            public List<WorldCreator.C_jbuehfan> getCurrent() {
+            public List<WorldCreator.WorldTypeEntry> getCurrent() {
                return CyclingButtonWidget.HAS_ALT_DOWN.getAsBoolean()
-                  ? CreateWorldScreen.this.worldCreator.m_xzgmbgqy()
-                  : CreateWorldScreen.this.worldCreator.m_cavqkcak();
+                  ? CreateWorldScreen.this.worldCreator.getExtendedWorldTypes()
+                  : CreateWorldScreen.this.worldCreator.getNormalWorldTypes();
             }
 
             /**
              * Mapping not found
              */
             @Override
-            public List<WorldCreator.C_jbuehfan> getDefaults() {
-               return CreateWorldScreen.this.worldCreator.m_cavqkcak();
+            public List<WorldCreator.WorldTypeEntry> getDefaults() {
+               return CreateWorldScreen.this.worldCreator.getNormalWorldTypes();
             }
          };
       }
@@ -1104,8 +1107,8 @@
        * @mapping {@literal hashed m_yuppgxdl Lnet/minecraft/unmapped/C_ibkofvzc$C_emutyvqg;m_yuppgxdl(Lnet/minecraft/unmapped/C_ikfvpkkf;)Lnet/minecraft/unmapped/C_npqneive;}
        * @mapping {@literal named createButtonNarration Lnet/minecraft/client/gui/screen/world/CreateWorldScreen$WorldTab;createButtonNarration(Lnet/minecraft/client/gui/widget/CyclingButtonWidget;)Lnet/minecraft/text/MutableText;}
        */
-      private static MutableText createButtonNarration(CyclingButtonWidget<WorldCreator.C_jbuehfan> button) {
-         return button.getValue().m_ttszxefp()
+      private static MutableText createButtonNarration(CyclingButtonWidget<WorldCreator.WorldTypeEntry> button) {
+         return button.getValue().isAmplified()
             ? CommonTexts.joinSentences(button.getGenericNarrationMessage(), AMPLIFIED_INFO)
             : button.getGenericNarrationMessage();
       }
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/world/WorldScreenProvider.java namedSrc/net/minecraft/client/gui/screen/world/WorldScreenProvider.java
--- namedTargetSrc/net/minecraft/client/gui/screen/world/WorldScreenProvider.java	2023-07-28 17:34:23.700988994 +0000
+++ namedSrc/net/minecraft/client/gui/screen/world/WorldScreenProvider.java	2023-07-28 17:32:41.190393714 +0000
@@ -47,13 +47,13 @@
          HolderProvider<PlacedFeature> lv5 = lv2.getLookupOrThrow(RegistryKeys.PLACED_FEATURE);
          return new CustomizeFlatWorldScreen(
             screen,
-            flatGeneratorConfig -> screen.getWorldCreator().m_zbhcqcxd(createFlatWorldModifier(flatGeneratorConfig)),
+            flatGeneratorConfig -> screen.getWorldCreator().updateContext(createFlatWorldModifier(flatGeneratorConfig)),
             lv instanceof FlatChunkGenerator ? ((FlatChunkGenerator)lv).getConfig() : FlatChunkGeneratorConfig.getDefaultConfig(lv3, lv4, lv5)
          );
       },
       Optional.of(GeneratorTypes.SINGLE_BIOME_SURFACE),
       (WorldScreenProvider)(screen, worldCreationContext) -> new CustomizeBuffetWorldScreen(
-            screen, worldCreationContext, modifier -> screen.getWorldCreator().m_zbhcqcxd(createFixedBiomeModifier(modifier))
+            screen, worldCreationContext, modifier -> screen.getWorldCreator().updateContext(createFixedBiomeModifier(modifier))
          )
    );
 
@@ -65,9 +65,9 @@
 
    /**
     * @mapping {@literal hashed m_pmtgmkbp Lnet/minecraft/unmapped/C_qfnmnrio;m_pmtgmkbp(Lnet/minecraft/unmapped/C_vacrgkna;)Lnet/minecraft/unmapped/C_njsjipmy$C_iucotkie;}
-    * @mapping {@literal named createFlatWorldModifier Lnet/minecraft/client/gui/screen/world/WorldScreenProvider;createFlatWorldModifier(Lnet/minecraft/world/gen/chunk/FlatChunkGeneratorConfig;)Lnet/minecraft/client/world/WorldCreationContext$C_iucotkie;}
+    * @mapping {@literal named createFlatWorldModifier Lnet/minecraft/client/gui/screen/world/WorldScreenProvider;createFlatWorldModifier(Lnet/minecraft/world/gen/chunk/FlatChunkGeneratorConfig;)Lnet/minecraft/client/world/WorldCreationContext$DimensionsUpdater;}
     */
-   private static WorldCreationContext.C_iucotkie createFlatWorldModifier(FlatChunkGeneratorConfig flatGeneratorConfig) {
+   private static WorldCreationContext.DimensionsUpdater createFlatWorldModifier(FlatChunkGeneratorConfig flatGeneratorConfig) {
       return (registryManager, arg3) -> {
          ChunkGenerator lv = new FlatChunkGenerator(flatGeneratorConfig);
          return arg3.replaceOverworldGenerator(registryManager, lv);
@@ -76,9 +76,9 @@
 
    /**
     * @mapping {@literal hashed m_vribatqy Lnet/minecraft/unmapped/C_qfnmnrio;m_vribatqy(Lnet/minecraft/unmapped/C_cjzoxshv;)Lnet/minecraft/unmapped/C_njsjipmy$C_iucotkie;}
-    * @mapping {@literal named createFixedBiomeModifier Lnet/minecraft/client/gui/screen/world/WorldScreenProvider;createFixedBiomeModifier(Lnet/minecraft/registry/Holder;)Lnet/minecraft/client/world/WorldCreationContext$C_iucotkie;}
+    * @mapping {@literal named createFixedBiomeModifier Lnet/minecraft/client/gui/screen/world/WorldScreenProvider;createFixedBiomeModifier(Lnet/minecraft/registry/Holder;)Lnet/minecraft/client/world/WorldCreationContext$DimensionsUpdater;}
     */
-   private static WorldCreationContext.C_iucotkie createFixedBiomeModifier(Holder<Biome> biome) {
+   private static WorldCreationContext.DimensionsUpdater createFixedBiomeModifier(Holder<Biome> biome) {
       return (registryManager, arg3) -> {
          Registry<ChunkGeneratorSettings> lv = registryManager.get(RegistryKeys.CHUNK_GENERATOR_SETTINGS);
          Holder<ChunkGeneratorSettings> lv2 = lv.getHolderOrThrow(ChunkGeneratorSettings.OVERWORLD);
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	2023-07-28 17:34:23.668988184 +0000
+++ namedSrc/net/minecraft/client/gui/widget/ClickableWidget.java	2023-07-28 17:32:41.154392800 +0000
@@ -406,13 +406,13 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double d, double e) {
+   public boolean isMouseOver(double mouseX, double mouseY) {
       return this.active
          && this.visible
-         && d >= (double)this.getX()
-         && e >= (double)this.getY()
-         && d < (double)(this.getX() + this.width)
-         && e < (double)(this.getY() + this.height);
+         && mouseX >= (double)this.getX()
+         && mouseY >= (double)this.getY()
+         && mouseX < (double)(this.getX() + this.width)
+         && mouseY < (double)(this.getY() + this.height);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/EntryListWidget.java namedSrc/net/minecraft/client/gui/widget/EntryListWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/EntryListWidget.java	2023-07-28 17:34:23.548985146 +0000
+++ namedSrc/net/minecraft/client/gui/widget/EntryListWidget.java	2023-07-28 17:32:41.006389041 +0000
@@ -683,8 +683,8 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double d, double e) {
-      return e >= (double)this.top && e <= (double)this.bottom && d >= (double)this.left && d <= (double)this.right;
+   public boolean isMouseOver(double mouseX, double mouseY) {
+      return mouseY >= (double)this.top && mouseY <= (double)this.bottom && mouseX >= (double)this.left && mouseX <= (double)this.right;
    }
 
    /**
@@ -957,8 +957,8 @@
        * @mapping {@literal named isMouseOver Lnet/minecraft/client/gui/widget/EntryListWidget$Entry;isMouseOver(DD)Z}
        */
       @Override
-      public boolean isMouseOver(double d, double e) {
-         return Objects.equals(this.parentList.getEntryAtPosition(d, e), this);
+      public boolean isMouseOver(double mouseX, double mouseY) {
+         return Objects.equals(this.parentList.getEntryAtPosition(mouseX, mouseY), this);
       }
    }
 }
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	2023-07-28 17:34:23.560985450 +0000
+++ namedSrc/net/minecraft/client/gui/widget/TextFieldWidget.java	2023-07-28 17:32:41.018389346 +0000
@@ -749,12 +749,12 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double d, double e) {
+   public boolean isMouseOver(double mouseX, double mouseY) {
       return this.visible
-         && d >= (double)this.getX()
-         && d < (double)(this.getX() + this.width)
-         && e >= (double)this.getY()
-         && e < (double)(this.getY() + this.height);
+         && mouseX >= (double)this.getX()
+         && mouseX < (double)(this.getX() + this.width)
+         && mouseY >= (double)this.getY()
+         && mouseY < (double)(this.getY() + this.height);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/main/Main.java namedSrc/net/minecraft/client/main/Main.java
--- namedTargetSrc/net/minecraft/client/main/Main.java	2023-07-28 17:34:23.592986260 +0000
+++ namedSrc/net/minecraft/client/main/Main.java	2023-07-28 17:32:41.058390362 +0000
@@ -32,9 +32,9 @@
 import net.minecraft.client.util.GlException;
 import net.minecraft.client.util.Session;
 import net.minecraft.client.util.telemetry.TelemetryProperty;
+import net.minecraft.client.util.telemetry.event.GameLoadTimesEvent;
 import net.minecraft.obfuscate.DontObfuscate;
 import net.minecraft.server.integrated.IntegratedServer;
-import net.minecraft.unmapped.C_znpzgoww;
 import net.minecraft.util.JsonHelper;
 import net.minecraft.util.Util;
 import net.minecraft.util.UuidUtil;
@@ -67,8 +67,8 @@
    public static void main(String[] args) {
       Stopwatch stopwatch = Stopwatch.createStarted(Ticker.systemTicker());
       Stopwatch stopwatch2 = Stopwatch.createStarted(Ticker.systemTicker());
-      C_znpzgoww.f_iwmkvmik.m_mjmctrta(TelemetryProperty.LOAD_TIME_TOTAL_TIME_MS, stopwatch);
-      C_znpzgoww.f_iwmkvmik.m_mjmctrta(TelemetryProperty.LOAD_TIME_PRE_WINDOW_MS, stopwatch2);
+      GameLoadTimesEvent.INSTANCE.addTimer(TelemetryProperty.LOAD_TIME_TOTAL_TIME_MS, stopwatch);
+      GameLoadTimesEvent.INSTANCE.addTimer(TelemetryProperty.LOAD_TIME_PRE_WINDOW_MS, stopwatch2);
       SharedConstants.createGameVersion();
       SharedConstants.enableDataFixerOptimizations();
       OptionParser optionParser = new OptionParser();
@@ -164,7 +164,7 @@
 
       CrashReport.initCrashReport();
       Bootstrap.initialize();
-      C_znpzgoww.f_iwmkvmik.m_azilswbo(Bootstrap.bootstrapTime.get());
+      GameLoadTimesEvent.INSTANCE.setBootstrapTime(Bootstrap.bootstrapTime.get());
       Bootstrap.logMissing();
       Util.startTimerHack();
       String string14 = optionSpec26.value(optionSet);
diff -bur namedTargetSrc/net/minecraft/client/MinecraftClient.java namedSrc/net/minecraft/client/MinecraftClient.java
--- namedTargetSrc/net/minecraft/client/MinecraftClient.java	2023-07-28 17:34:23.564985551 +0000
+++ namedSrc/net/minecraft/client/MinecraftClient.java	2023-07-28 17:32:41.018389346 +0000
@@ -165,6 +165,7 @@
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.client.util.telemetry.TelemetryManager;
 import net.minecraft.client.util.telemetry.TelemetryProperty;
+import net.minecraft.client.util.telemetry.event.GameLoadTimesEvent;
 import net.minecraft.client.world.ClientWorld;
 import net.minecraft.datafixer.Schemas;
 import net.minecraft.entity.Entity;
@@ -210,7 +211,6 @@
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
 import net.minecraft.text.component.KeyBindTextResolver;
-import net.minecraft.unmapped.C_znpzgoww;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.FileNameUtil;
 import net.minecraft.util.Formatting;
@@ -1044,7 +1044,7 @@
       this.windowProvider = new WindowProvider(this);
       this.window = this.windowProvider.createWindow(lv3, this.options.fullscreenResolution, this.getWindowTitle());
       this.onWindowFocusChanged(true);
-      C_znpzgoww.f_iwmkvmik.m_pynrxyat(TelemetryProperty.LOAD_TIME_PRE_WINDOW_MS);
+      GameLoadTimesEvent.INSTANCE.endStep(TelemetryProperty.LOAD_TIME_PRE_WINDOW_MS);
 
       try {
          this.window.setIcon(this.defaultResourcePack, SharedConstants.getGameVersion().isStable() ? WindowIcons.RELEASE : WindowIcons.SNAPSHOT);
@@ -1157,7 +1157,7 @@
       this.playerKeyPairManager = PlayerKeyPairManager.create(this.userApiService, this.session, path);
       this.realms32BitWarningChecker = new Realms32BitWarningChecker(this);
       this.chatNarratorManager = new ChatNarratorManager(this);
-      this.chatNarratorManager.m_sunuzqut(this.options.getNarrator().get() != NarratorMode.OFF);
+      this.chatNarratorManager.checkLibraryStatus(this.options.getNarrator().get() != NarratorMode.OFF);
       this.chatListener = new ChatListener(this);
       this.chatListener.setMessageDelay(this.options.getChatDelay().get());
       this.chatReportingContext = ChatReportingContext.create(ReportEnvironment.createLocal(), this.userApiService);
@@ -1165,14 +1165,14 @@
       List<ResourcePack> list = this.resourcePackManager.createResourcePacks();
       this.resourceReloadLogger.reload(ResourceReloadLogger.ReloadReason.INITIAL, list);
       ResourceReload lv8 = this.resourceManager.reload(Util.getMainWorkerExecutor(), this, COMPLETED_UNIT_FUTURE, list);
-      C_znpzgoww.f_iwmkvmik.m_micqzfkw(TelemetryProperty.LOAD_TIME_LOADING_OVERLAY_MS);
+      GameLoadTimesEvent.INSTANCE.startTimer(TelemetryProperty.LOAD_TIME_LOADING_OVERLAY_MS);
       this.setOverlay(new SplashOverlay(this, lv8, optional -> Util.ifPresentOrElse(optional, this::handleResourceReloadException, () -> {
             if (SharedConstants.isDevelopment) {
                this.checkGameData();
             }
 
             this.resourceReloadLogger.finish();
-            this.m_jvlajuse();
+            this.onGameLoaded();
          }), false));
       this.quickPlayLogger = QuickPlayLogger.create(args.quickPlay.path());
       if (this.shouldShowBanNotice()) {
@@ -1189,12 +1189,13 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_jvlajuse Lnet/minecraft/unmapped/C_ayfeobid;m_jvlajuse()V}
+    * @mapping {@literal named onGameLoaded Lnet/minecraft/client/MinecraftClient;onGameLoaded()V}
     */
-   private void m_jvlajuse() {
-      C_znpzgoww.f_iwmkvmik.m_pynrxyat(TelemetryProperty.LOAD_TIME_LOADING_OVERLAY_MS);
-      C_znpzgoww.f_iwmkvmik.m_pynrxyat(TelemetryProperty.LOAD_TIME_TOTAL_TIME_MS);
-      C_znpzgoww.f_iwmkvmik.m_cpwgnkoe(this.telemetryManager.m_muaatcpb());
+   private void onGameLoaded() {
+      GameLoadTimesEvent.INSTANCE.endStep(TelemetryProperty.LOAD_TIME_LOADING_OVERLAY_MS);
+      GameLoadTimesEvent.INSTANCE.endStep(TelemetryProperty.LOAD_TIME_TOTAL_TIME_MS);
+      GameLoadTimesEvent.INSTANCE.send(this.telemetryManager.getSender());
    }
 
    /**
@@ -4047,10 +4048,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_yknnrfie Lnet/minecraft/unmapped/C_ayfeobid;m_yknnrfie()Lnet/minecraft/unmapped/C_yvuwcvkm;}
+    * @mapping {@literal named createSignatureValidator Lnet/minecraft/client/MinecraftClient;createSignatureValidator()Lnet/minecraft/network/encryption/SignatureValidator;}
     */
    @Nullable
-   public SignatureValidator m_yknnrfie() {
+   public SignatureValidator createSignatureValidator() {
       return SignatureValidator.create(this.authService.getServicesKeySet(), ServicesKeyType.PROFILE_KEY);
    }
 
Only in namedSrc/net/minecraft/client/multiplayer: prediction
diff -bur namedTargetSrc/net/minecraft/client/network/ClientAdvancementManager.java namedSrc/net/minecraft/client/network/ClientAdvancementManager.java
--- namedTargetSrc/net/minecraft/client/network/ClientAdvancementManager.java	2023-07-28 17:34:23.556985349 +0000
+++ namedSrc/net/minecraft/client/network/ClientAdvancementManager.java	2023-07-28 17:32:41.014389244 +0000
@@ -95,7 +95,7 @@
 
             if (!packet.shouldClearCurrent() && lv2.isDone()) {
                if (this.client.world != null) {
-                  this.f_rxbgyhjm.m_ksbcmwmh(this.client.world, lv);
+                  this.f_rxbgyhjm.onAdvancementMade(this.client.world, lv);
                }
 
                if (lv.getDisplay() != null && lv.getDisplay().shouldShowToast()) {
diff -bur namedTargetSrc/net/minecraft/client/network/ClientLoginNetworkHandler.java namedSrc/net/minecraft/client/network/ClientLoginNetworkHandler.java
--- namedTargetSrc/net/minecraft/client/network/ClientLoginNetworkHandler.java	2023-07-28 17:34:23.528984640 +0000
+++ namedSrc/net/minecraft/client/network/ClientLoginNetworkHandler.java	2023-07-28 17:32:40.978388330 +0000
@@ -94,10 +94,11 @@
    @Nullable
    private final Duration worldLoadTime;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_cprgzlsx Lnet/minecraft/unmapped/C_nqcidrhe;f_cprgzlsx:Ljava/lang/String;}
+    * @mapping {@literal named minigameName Lnet/minecraft/client/network/ClientLoginNetworkHandler;minigameName:Ljava/lang/String;}
     */
    @Nullable
-   private String f_cprgzlsx;
+   private String minigameName;
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_nqcidrhe;<init>(Lnet/minecraft/unmapped/C_oasmcckk;Lnet/minecraft/unmapped/C_ayfeobid;Lnet/minecraft/unmapped/C_xotldzgg;Lnet/minecraft/unmapped/C_wrmtlwqx;ZLjava/time/Duration;Ljava/util/function/Consumer;)V}
@@ -205,7 +206,7 @@
                this.connection,
                this.info,
                this.profile,
-               this.client.getTelemetryManager().createWorldTelemetryManager(this.isNewWorld, this.worldLoadTime, this.f_cprgzlsx)
+               this.client.getTelemetryManager().createWorldTelemetryManager(this.isNewWorld, this.worldLoadTime, this.minigameName)
             )
          );
    }
@@ -258,9 +259,10 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_omrzsyoi Lnet/minecraft/unmapped/C_nqcidrhe;m_omrzsyoi(Ljava/lang/String;)V}
+    * @mapping {@literal named setMinigameName Lnet/minecraft/client/network/ClientLoginNetworkHandler;setMinigameName(Ljava/lang/String;)V}
     */
-   public void m_omrzsyoi(String string) {
-      this.f_cprgzlsx = string;
+   public void setMinigameName(String name) {
+      this.minigameName = name;
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/network/ClientPlayerInteractionManager.java namedSrc/net/minecraft/client/network/ClientPlayerInteractionManager.java
--- namedTargetSrc/net/minecraft/client/network/ClientPlayerInteractionManager.java	2023-07-28 17:34:23.536984843 +0000
+++ namedSrc/net/minecraft/client/network/ClientPlayerInteractionManager.java	2023-07-28 17:32:40.986388533 +0000
@@ -11,6 +11,7 @@
 import net.minecraft.block.BlockState;
 import net.minecraft.block.OperatorBlock;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.multiplayer.prediction.BlockStatePredictionManager;
 import net.minecraft.client.recipe_book.ClientRecipeBook;
 import net.minecraft.client.sound.PositionedSoundInstance;
 import net.minecraft.client.sound.SoundInstance;
@@ -41,7 +42,6 @@
 import net.minecraft.sound.BlockSoundGroup;
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.stat.StatHandler;
-import net.minecraft.unmapped.C_czisrdmd;
 import net.minecraft.unmapped.C_suesdakf;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
@@ -335,8 +335,8 @@
     * @mapping {@literal named m_vvsqjptk Lnet/minecraft/client/network/ClientPlayerInteractionManager;m_vvsqjptk(Lnet/minecraft/client/world/ClientWorld;Lnet/minecraft/unmapped/C_suesdakf;)V}
     */
    private void m_vvsqjptk(ClientWorld world, C_suesdakf arg2) {
-      try (C_czisrdmd lv = world.m_lvsrwztn().m_rhbdpkkw()) {
-         int i = lv.m_gqtwgmpw();
+      try (BlockStatePredictionManager lv = world.getBlockPredictionManager().startPredicting()) {
+         int i = lv.getSequence();
          Packet<ServerPlayPacketListener> lv2 = arg2.predict(i);
          this.networkHandler.sendPacket(lv2);
       }
diff -bur namedTargetSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java namedSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java
--- namedTargetSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java	2023-07-28 17:34:23.684988589 +0000
+++ namedSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java	2023-07-28 17:32:41.170393207 +0000
@@ -881,7 +881,7 @@
    @Override
    public void onChunkDeltaUpdate(ChunkDeltaUpdateS2CPacket packet) {
       NetworkThreadUtils.forceMainThread(packet, this, this.client);
-      packet.visitUpdates((pos, state) -> this.world.m_ftefeyzd(pos, state, 19));
+      packet.visitUpdates((pos, state) -> this.world.setVerifiedBlockState(pos, state, 19));
    }
 
    /**
@@ -994,7 +994,7 @@
    @Override
    public void onBlockUpdate(BlockUpdateS2CPacket packet) {
       NetworkThreadUtils.forceMainThread(packet, this, this.client);
-      this.world.m_ftefeyzd(packet.getPos(), packet.getState(), 19);
+      this.world.setVerifiedBlockState(packet.getPos(), packet.getState(), 19);
    }
 
    /**
@@ -1695,7 +1695,7 @@
       MapState lv2 = this.client.world.getMapState(string);
       if (lv2 == null) {
          lv2 = MapState.of(packet.getScale(), packet.isLocked(), this.client.world.getRegistryKey());
-         this.client.world.m_emdmfdsn(string, lv2);
+         this.client.world.overrideMapState(string, lv2);
       }
 
       packet.apply(lv2);
@@ -2222,7 +2222,7 @@
     */
    private void setChatSession(PlayerListS2CPacket.Entry playerEntry, PlayerListEntry playerListEntry) {
       GameProfile gameProfile = playerListEntry.getProfile();
-      SignatureValidator lv = this.client.m_yknnrfie();
+      SignatureValidator lv = this.client.createSignatureValidator();
       if (lv == null) {
          LOGGER.warn("Ignoring chat session from {} due to missing Services public key", gameProfile.getName());
          playerListEntry.setMessageVerifier(this.isSecureChatEnforced());
diff -bur namedTargetSrc/net/minecraft/client/realms/RealmsConnection.java namedSrc/net/minecraft/client/realms/RealmsConnection.java
--- namedTargetSrc/net/minecraft/client/realms/RealmsConnection.java	2023-07-28 17:34:23.680988488 +0000
+++ namedSrc/net/minecraft/client/realms/RealmsConnection.java	2023-07-28 17:32:41.166393105 +0000
@@ -94,7 +94,7 @@
                      }
                   );
                   if (server.worldType == RealmsServer.WorldType.MINIGAME) {
-                     lv.m_omrzsyoi(server.minigameName);
+                     lv.setMinigameName(server.minigameName);
                   }
    
                   RealmsConnection.this.connection.setPacketListener(lv);

@github-actions
Copy link

Choose a reason for hiding this comment

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

View the diff here (2/3): 
diff -bur namedTargetSrc/net/minecraft/client/render/block/entity/HangingSignBlockEntityRenderer.java namedSrc/net/minecraft/client/render/block/entity/HangingSignBlockEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/block/entity/HangingSignBlockEntityRenderer.java	2023-07-28 17:34:23.624987070 +0000
+++ namedSrc/net/minecraft/client/render/block/entity/HangingSignBlockEntityRenderer.java	2023-07-28 17:32:41.098391378 +0000
@@ -5,10 +5,11 @@
 import java.util.Map;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.minecraft.block.AbstractSignBlock;
 import net.minecraft.block.BlockState;
-import net.minecraft.block.CeilingHangingSignBlock;
 import net.minecraft.block.entity.SignBlockEntity;
+import net.minecraft.block.sign.AbstractSignBlock;
+import net.minecraft.block.sign.CeilingHangingSignBlock;
+import net.minecraft.block.sign.SignType;
 import net.minecraft.client.model.Model;
 import net.minecraft.client.model.ModelData;
 import net.minecraft.client.model.ModelPart;
@@ -23,7 +24,6 @@
 import net.minecraft.client.resource.Material;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.state.property.Properties;
-import net.minecraft.util.SignType;
 import net.minecraft.util.math.Axis;
 import net.minecraft.util.math.Vec3d;
 
diff -bur namedTargetSrc/net/minecraft/client/render/block/entity/PistonBlockEntityRenderer.java namedSrc/net/minecraft/client/render/block/entity/PistonBlockEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/block/entity/PistonBlockEntityRenderer.java	2023-07-28 17:34:23.592986260 +0000
+++ namedSrc/net/minecraft/client/render/block/entity/PistonBlockEntityRenderer.java	2023-07-28 17:32:41.054390260 +0000
@@ -5,10 +5,10 @@
 import net.fabricmc.api.Environment;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
-import net.minecraft.block.PistonBlock;
-import net.minecraft.block.PistonHeadBlock;
 import net.minecraft.block.entity.PistonBlockEntity;
 import net.minecraft.block.enums.PistonType;
+import net.minecraft.block.piston.PistonBlock;
+import net.minecraft.block.piston.PistonHeadBlock;
 import net.minecraft.client.render.RenderLayer;
 import net.minecraft.client.render.RenderLayers;
 import net.minecraft.client.render.VertexConsumerProvider;
diff -bur namedTargetSrc/net/minecraft/client/render/block/entity/SignBlockEntityRenderer.java namedSrc/net/minecraft/client/render/block/entity/SignBlockEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/block/entity/SignBlockEntityRenderer.java	2023-07-28 17:34:23.664988083 +0000
+++ namedSrc/net/minecraft/client/render/block/entity/SignBlockEntityRenderer.java	2023-07-28 17:32:41.146392597 +0000
@@ -6,11 +6,12 @@
 import java.util.Map;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.minecraft.block.AbstractSignBlock;
 import net.minecraft.block.BlockState;
-import net.minecraft.block.SignBlock;
 import net.minecraft.block.entity.SignBlockEntity;
 import net.minecraft.block.entity.SignText;
+import net.minecraft.block.sign.AbstractSignBlock;
+import net.minecraft.block.sign.SignBlock;
+import net.minecraft.block.sign.SignType;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.model.Model;
@@ -32,7 +33,6 @@
 import net.minecraft.entity.Entity;
 import net.minecraft.text.OrderedText;
 import net.minecraft.util.DyeColor;
-import net.minecraft.util.SignType;
 import net.minecraft.util.math.Axis;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
@@ -125,7 +125,7 @@
 
    /**
     * @mapping {@literal hashed m_rbmzplgv Lnet/minecraft/unmapped/C_dqmzvcln;m_rbmzplgv(Lnet/minecraft/unmapped/C_axouvzlg;Lnet/minecraft/unmapped/C_cnszsxvd;Lnet/minecraft/unmapped/C_igrgeffe;IILnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_siepybep;Lnet/minecraft/unmapped/C_xlaykyai;Lnet/minecraft/unmapped/C_lzwtpfka;)V}
-    * @mapping {@literal named render Lnet/minecraft/client/render/block/entity/SignBlockEntityRenderer;render(Lnet/minecraft/block/entity/SignBlockEntity;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;IILnet/minecraft/block/BlockState;Lnet/minecraft/block/AbstractSignBlock;Lnet/minecraft/util/SignType;Lnet/minecraft/client/model/Model;)V}
+    * @mapping {@literal named render Lnet/minecraft/client/render/block/entity/SignBlockEntityRenderer;render(Lnet/minecraft/block/entity/SignBlockEntity;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;IILnet/minecraft/block/BlockState;Lnet/minecraft/block/sign/AbstractSignBlock;Lnet/minecraft/block/sign/SignType;Lnet/minecraft/client/model/Model;)V}
     */
    void render(
       SignBlockEntity blockEntity,
@@ -178,7 +178,7 @@
 
    /**
     * @mapping {@literal hashed m_ulkbkhst Lnet/minecraft/unmapped/C_dqmzvcln;m_ulkbkhst(Lnet/minecraft/unmapped/C_cnszsxvd;Lnet/minecraft/unmapped/C_igrgeffe;IILnet/minecraft/unmapped/C_xlaykyai;Lnet/minecraft/unmapped/C_lzwtpfka;)V}
-    * @mapping {@literal named renderModel Lnet/minecraft/client/render/block/entity/SignBlockEntityRenderer;renderModel(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;IILnet/minecraft/util/SignType;Lnet/minecraft/client/model/Model;)V}
+    * @mapping {@literal named renderModel Lnet/minecraft/client/render/block/entity/SignBlockEntityRenderer;renderModel(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;IILnet/minecraft/block/sign/SignType;Lnet/minecraft/client/model/Model;)V}
     */
    void renderModel(MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay, SignType signType, Model model) {
       matrices.push();
@@ -201,7 +201,7 @@
 
    /**
     * @mapping {@literal hashed m_huhacyeq Lnet/minecraft/unmapped/C_dqmzvcln;m_huhacyeq(Lnet/minecraft/unmapped/C_xlaykyai;)Lnet/minecraft/unmapped/C_djlixbky;}
-    * @mapping {@literal named getSignTexture Lnet/minecraft/client/render/block/entity/SignBlockEntityRenderer;getSignTexture(Lnet/minecraft/util/SignType;)Lnet/minecraft/client/resource/Material;}
+    * @mapping {@literal named getSignTexture Lnet/minecraft/client/render/block/entity/SignBlockEntityRenderer;getSignTexture(Lnet/minecraft/block/sign/SignType;)Lnet/minecraft/client/resource/Material;}
     */
    Material getSignTexture(SignType signType) {
       return TexturedRenderLayers.getSignTextureId(signType);
@@ -309,7 +309,7 @@
 
    /**
     * @mapping {@literal hashed m_evwupjxx Lnet/minecraft/unmapped/C_dqmzvcln;m_evwupjxx(Lnet/minecraft/unmapped/C_qncyfzro;Lnet/minecraft/unmapped/C_xlaykyai;)Lnet/minecraft/unmapped/C_dqmzvcln$C_keslmkli;}
-    * @mapping {@literal named createSignModel Lnet/minecraft/client/render/block/entity/SignBlockEntityRenderer;createSignModel(Lnet/minecraft/client/render/entity/model/EntityModelLoader;Lnet/minecraft/util/SignType;)Lnet/minecraft/client/render/block/entity/SignBlockEntityRenderer$SignModel;}
+    * @mapping {@literal named createSignModel Lnet/minecraft/client/render/block/entity/SignBlockEntityRenderer;createSignModel(Lnet/minecraft/client/render/entity/model/EntityModelLoader;Lnet/minecraft/block/sign/SignType;)Lnet/minecraft/client/render/block/entity/SignBlockEntityRenderer$SignModel;}
     */
    public static SignBlockEntityRenderer.SignModel createSignModel(EntityModelLoader entityModelLoader, SignType type) {
       return new SignBlockEntityRenderer.SignModel(entityModelLoader.getModelPart(EntityModelLayers.createSign(type)));
diff -bur namedTargetSrc/net/minecraft/client/render/entity/model/EntityModelLayers.java namedSrc/net/minecraft/client/render/entity/model/EntityModelLayers.java
--- namedTargetSrc/net/minecraft/client/render/entity/model/EntityModelLayers.java	2023-07-28 17:34:23.580985956 +0000
+++ namedSrc/net/minecraft/client/render/entity/model/EntityModelLayers.java	2023-07-28 17:32:41.042389955 +0000
@@ -5,9 +5,9 @@
 import java.util.stream.Stream;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
+import net.minecraft.block.sign.SignType;
 import net.minecraft.entity.vehicle.BoatEntity;
 import net.minecraft.util.Identifier;
-import net.minecraft.util.SignType;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_ikhmhinf}
@@ -925,7 +925,7 @@
 
    /**
     * @mapping {@literal hashed m_wggqfugh Lnet/minecraft/unmapped/C_ikhmhinf;m_wggqfugh(Lnet/minecraft/unmapped/C_xlaykyai;)Lnet/minecraft/unmapped/C_rghfgwax;}
-    * @mapping {@literal named createSign Lnet/minecraft/client/render/entity/model/EntityModelLayers;createSign(Lnet/minecraft/util/SignType;)Lnet/minecraft/client/render/entity/model/EntityModelLayer;}
+    * @mapping {@literal named createSign Lnet/minecraft/client/render/entity/model/EntityModelLayers;createSign(Lnet/minecraft/block/sign/SignType;)Lnet/minecraft/client/render/entity/model/EntityModelLayer;}
     */
    public static EntityModelLayer createSign(SignType type) {
       return create("sign/" + type.getName(), "main");
@@ -933,7 +933,7 @@
 
    /**
     * @mapping {@literal hashed m_qkfhnizl Lnet/minecraft/unmapped/C_ikhmhinf;m_qkfhnizl(Lnet/minecraft/unmapped/C_xlaykyai;)Lnet/minecraft/unmapped/C_rghfgwax;}
-    * @mapping {@literal named createHangingSign Lnet/minecraft/client/render/entity/model/EntityModelLayers;createHangingSign(Lnet/minecraft/util/SignType;)Lnet/minecraft/client/render/entity/model/EntityModelLayer;}
+    * @mapping {@literal named createHangingSign Lnet/minecraft/client/render/entity/model/EntityModelLayers;createHangingSign(Lnet/minecraft/block/sign/SignType;)Lnet/minecraft/client/render/entity/model/EntityModelLayer;}
     */
    public static EntityModelLayer createHangingSign(SignType type) {
       return create("hanging_sign/" + type.getName(), "main");
diff -bur namedTargetSrc/net/minecraft/client/render/entity/model/EntityModels.java namedSrc/net/minecraft/client/render/entity/model/EntityModels.java
--- namedTargetSrc/net/minecraft/client/render/entity/model/EntityModels.java	2023-07-28 17:34:23.600986463 +0000
+++ namedSrc/net/minecraft/client/render/entity/model/EntityModels.java	2023-07-28 17:32:41.066390565 +0000
@@ -7,6 +7,7 @@
 import java.util.stream.Collectors;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
+import net.minecraft.block.sign.SignType;
 import net.minecraft.client.model.Dilation;
 import net.minecraft.client.model.TexturedModelData;
 import net.minecraft.client.render.block.entity.BannerBlockEntityRenderer;
@@ -25,7 +26,6 @@
 import net.minecraft.client.render.entity.WitherSkullEntityRenderer;
 import net.minecraft.client.render.entity.feature.TridentRiptideFeatureRenderer;
 import net.minecraft.entity.vehicle.BoatEntity;
-import net.minecraft.util.SignType;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_axenkkni}
diff -bur namedTargetSrc/net/minecraft/client/render/TexturedRenderLayers.java namedSrc/net/minecraft/client/render/TexturedRenderLayers.java
--- namedTargetSrc/net/minecraft/client/render/TexturedRenderLayers.java	2023-07-28 17:34:23.636987374 +0000
+++ namedSrc/net/minecraft/client/render/TexturedRenderLayers.java	2023-07-28 17:32:41.114391784 +0000
@@ -17,13 +17,13 @@
 import net.minecraft.block.entity.EnderChestBlockEntity;
 import net.minecraft.block.entity.TrappedChestBlockEntity;
 import net.minecraft.block.enums.ChestType;
+import net.minecraft.block.sign.SignType;
 import net.minecraft.client.resource.Material;
 import net.minecraft.client.texture.SpriteAtlasTexture;
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.util.DyeColor;
 import net.minecraft.util.Identifier;
-import net.minecraft.util.SignType;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -362,7 +362,7 @@
 
    /**
     * @mapping {@literal hashed m_tkhoovme Lnet/minecraft/unmapped/C_vkaoetfp;m_tkhoovme(Lnet/minecraft/unmapped/C_xlaykyai;)Lnet/minecraft/unmapped/C_djlixbky;}
-    * @mapping {@literal named createSignTextureId Lnet/minecraft/client/render/TexturedRenderLayers;createSignTextureId(Lnet/minecraft/util/SignType;)Lnet/minecraft/client/resource/Material;}
+    * @mapping {@literal named createSignTextureId Lnet/minecraft/client/render/TexturedRenderLayers;createSignTextureId(Lnet/minecraft/block/sign/SignType;)Lnet/minecraft/client/resource/Material;}
     */
    private static Material createSignTextureId(SignType type) {
       return new Material(SIGNS_ATLAS_TEXTURE, new Identifier("entity/signs/" + type.getName()));
@@ -370,7 +370,7 @@
 
    /**
     * @mapping {@literal hashed m_ealwunls Lnet/minecraft/unmapped/C_vkaoetfp;m_ealwunls(Lnet/minecraft/unmapped/C_xlaykyai;)Lnet/minecraft/unmapped/C_djlixbky;}
-    * @mapping {@literal named createHangingSignTextureId Lnet/minecraft/client/render/TexturedRenderLayers;createHangingSignTextureId(Lnet/minecraft/util/SignType;)Lnet/minecraft/client/resource/Material;}
+    * @mapping {@literal named createHangingSignTextureId Lnet/minecraft/client/render/TexturedRenderLayers;createHangingSignTextureId(Lnet/minecraft/block/sign/SignType;)Lnet/minecraft/client/resource/Material;}
     */
    private static Material createHangingSignTextureId(SignType type) {
       return new Material(SIGNS_ATLAS_TEXTURE, new Identifier("entity/signs/hanging/" + type.getName()));
@@ -378,7 +378,7 @@
 
    /**
     * @mapping {@literal hashed m_vaqmvmry Lnet/minecraft/unmapped/C_vkaoetfp;m_vaqmvmry(Lnet/minecraft/unmapped/C_xlaykyai;)Lnet/minecraft/unmapped/C_djlixbky;}
-    * @mapping {@literal named getSignTextureId Lnet/minecraft/client/render/TexturedRenderLayers;getSignTextureId(Lnet/minecraft/util/SignType;)Lnet/minecraft/client/resource/Material;}
+    * @mapping {@literal named getSignTextureId Lnet/minecraft/client/render/TexturedRenderLayers;getSignTextureId(Lnet/minecraft/block/sign/SignType;)Lnet/minecraft/client/resource/Material;}
     */
    public static Material getSignTextureId(SignType signType) {
       return (Material)SIGN_TEXTURES.get(signType);
@@ -386,7 +386,7 @@
 
    /**
     * @mapping {@literal hashed m_ezczexcd Lnet/minecraft/unmapped/C_vkaoetfp;m_ezczexcd(Lnet/minecraft/unmapped/C_xlaykyai;)Lnet/minecraft/unmapped/C_djlixbky;}
-    * @mapping {@literal named getHangingSignTextureId Lnet/minecraft/client/render/TexturedRenderLayers;getHangingSignTextureId(Lnet/minecraft/util/SignType;)Lnet/minecraft/client/resource/Material;}
+    * @mapping {@literal named getHangingSignTextureId Lnet/minecraft/client/render/TexturedRenderLayers;getHangingSignTextureId(Lnet/minecraft/block/sign/SignType;)Lnet/minecraft/client/resource/Material;}
     */
    public static Material getHangingSignTextureId(SignType type) {
       return (Material)HANGING_SIGN_TEXTURES.get(type);
diff -bur namedTargetSrc/net/minecraft/client/render/WorldRenderer.java namedSrc/net/minecraft/client/render/WorldRenderer.java
--- namedTargetSrc/net/minecraft/client/render/WorldRenderer.java	2023-07-28 17:34:23.556985349 +0000
+++ namedSrc/net/minecraft/client/render/WorldRenderer.java	2023-07-28 17:32:41.014389244 +0000
@@ -56,9 +56,9 @@
 import net.minecraft.block.CampfireBlock;
 import net.minecraft.block.ComposterBlock;
 import net.minecraft.block.PointedDripstoneBlock;
-import net.minecraft.block.SculkShriekerBlock;
 import net.minecraft.block.ShapeContext;
 import net.minecraft.block.entity.BlockEntity;
+import net.minecraft.block.sculk.SculkShriekerBlock;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gl.ShaderEffect;
 import net.minecraft.client.network.ClientPlayerEntity;
diff -bur namedTargetSrc/net/minecraft/client/util/ChatNarratorManager.java namedSrc/net/minecraft/client/util/ChatNarratorManager.java
--- namedTargetSrc/net/minecraft/client/util/ChatNarratorManager.java	2023-07-28 17:34:23.536984843 +0000
+++ namedSrc/net/minecraft/client/util/ChatNarratorManager.java	2023-07-28 17:32:40.990388635 +0000
@@ -191,10 +191,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_sunuzqut Lnet/minecraft/unmapped/C_qwmxzagq;m_sunuzqut(Z)V}
+    * @mapping {@literal named checkLibraryStatus Lnet/minecraft/client/util/ChatNarratorManager;checkLibraryStatus(Z)V}
     */
-   public void m_sunuzqut(boolean bl) {
-      if (bl
+   public void checkLibraryStatus(boolean narratorEnabled) {
+      if (narratorEnabled
          && !this.isActive()
          && !TinyFileDialogs.tinyfd_messageBox(
             "Minecraft",
@@ -203,20 +204,20 @@
             "error",
             true
          )) {
-         throw new ChatNarratorManager.C_jwlsjyea("Narrator library is not active");
+         throw new ChatNarratorManager.NarratorInitException("Narrator library is not active");
       }
    }
 
    /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_qwmxzagq$C_jwlsjyea}
-    * @mapping {@literal named net/minecraft/client/util/ChatNarratorManager$C_jwlsjyea}
+    * @mapping {@literal named net/minecraft/client/util/ChatNarratorManager$NarratorInitException}
     */
    @Environment(EnvType.CLIENT)
-   public static class C_jwlsjyea extends GlException {
+   public static class NarratorInitException extends GlException {
       /**
        * Mapping not found
        */
-      public C_jwlsjyea(String string) {
+      public NarratorInitException(String string) {
          super(string);
       }
    }
diff -bur namedTargetSrc/net/minecraft/client/util/NetworkUtils.java namedSrc/net/minecraft/client/util/NetworkUtils.java
--- namedTargetSrc/net/minecraft/client/util/NetworkUtils.java	2023-07-28 17:34:23.652987779 +0000
+++ namedSrc/net/minecraft/client/util/NetworkUtils.java	2023-07-28 17:32:41.130392191 +0000
@@ -207,16 +207,17 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_wsltejex Lnet/minecraft/unmapped/C_vposufsj;m_wsltejex(I)Z}
+    * @mapping {@literal named isPortAvailable Lnet/minecraft/client/util/NetworkUtils;isPortAvailable(I)Z}
     */
-   public static boolean m_wsltejex(int i) {
-      if (i >= 0 && i <= 65535) {
+   public static boolean isPortAvailable(int port) {
+      if (port >= 0 && port <= 65535) {
          try {
-            ServerSocket serverSocket = new ServerSocket(i);
+            ServerSocket serverSocket = new ServerSocket(port);
 
             boolean var2;
             try {
-               var2 = serverSocket.getLocalPort() == i;
+               var2 = serverSocket.getLocalPort() == port;
             } catch (Throwable var5) {
                try {
                   serverSocket.close();
diff -bur namedTargetSrc/net/minecraft/client/util/ParticleUtil.java namedSrc/net/minecraft/client/util/ParticleUtil.java
--- namedTargetSrc/net/minecraft/client/util/ParticleUtil.java	2023-07-28 17:34:23.620986969 +0000
+++ namedSrc/net/minecraft/client/util/ParticleUtil.java	2023-07-28 17:32:41.094391276 +0000
@@ -20,9 +20,9 @@
     * @mapping {@literal hashed m_ikrmjhua Lnet/minecraft/unmapped/C_hkabwoqt;m_ikrmjhua(Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_nqucohct;Lnet/minecraft/unmapped/C_macfejbg;)V}
     * @mapping {@literal named spawnParticle Lnet/minecraft/client/util/ParticleUtil;spawnParticle(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/particle/ParticleEffect;Lnet/minecraft/util/math/int_provider/IntProvider;)V}
     */
-   public static void spawnParticle(World world, BlockPos pos, ParticleEffect effect, IntProvider arg4) {
+   public static void spawnParticle(World world, BlockPos pos, ParticleEffect effect, IntProvider variance) {
       for (Direction lv : Direction.values()) {
-         spawnParticle(world, pos, effect, arg4, lv, () -> getRandomOffset(world.random), 0.55);
+         spawnParticle(world, pos, effect, variance, lv, () -> getRandomOffset(world.random), 0.55);
       }
    }
 
@@ -30,11 +30,13 @@
     * @mapping {@literal hashed m_jjtyixcy Lnet/minecraft/unmapped/C_hkabwoqt;m_jjtyixcy(Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_nqucohct;Lnet/minecraft/unmapped/C_macfejbg;Lnet/minecraft/unmapped/C_xpuuihxf;Ljava/util/function/Supplier;D)V}
     * @mapping {@literal named spawnParticle Lnet/minecraft/client/util/ParticleUtil;spawnParticle(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/particle/ParticleEffect;Lnet/minecraft/util/math/int_provider/IntProvider;Lnet/minecraft/util/math/Direction;Ljava/util/function/Supplier;D)V}
     */
-   public static void spawnParticle(World world, BlockPos pos, ParticleEffect effect, IntProvider arg4, Direction direction, Supplier<Vec3d> supplier, double d) {
-      int i = arg4.get(world.random);
+   public static void spawnParticle(
+      World world, BlockPos pos, ParticleEffect effect, IntProvider repeatCount, Direction direction, Supplier<Vec3d> velocity, double offsetMultiplier
+   ) {
+      int i = repeatCount.get(world.random);
 
       for (int j = 0; j < i; ++j) {
-         spawnParticle(world, pos, direction, effect, (Vec3d)supplier.get(), d);
+         spawnParticle(world, pos, direction, effect, (Vec3d)velocity.get(), offsetMultiplier);
       }
    }
 
@@ -72,14 +74,14 @@
     * @mapping {@literal hashed m_vlfizvpg Lnet/minecraft/unmapped/C_hkabwoqt;m_vlfizvpg(Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_xpuuihxf;Lnet/minecraft/unmapped/C_nqucohct;Lnet/minecraft/unmapped/C_vgpupfxx;D)V}
     * @mapping {@literal named spawnParticle Lnet/minecraft/client/util/ParticleUtil;spawnParticle(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/math/Direction;Lnet/minecraft/particle/ParticleEffect;Lnet/minecraft/util/math/Vec3d;D)V}
     */
-   public static void spawnParticle(World world, BlockPos pos, Direction direction, ParticleEffect effect, Vec3d velocity, double d) {
+   public static void spawnParticle(World world, BlockPos pos, Direction direction, ParticleEffect effect, Vec3d velocity, double offsetMultiplier) {
       Vec3d lv = Vec3d.ofCenter(pos);
       int i = direction.getOffsetX();
       int j = direction.getOffsetY();
       int k = direction.getOffsetZ();
-      double e = lv.x + (i == 0 ? MathHelper.nextDouble(world.random, -0.5, 0.5) : (double)i * d);
-      double f = lv.y + (j == 0 ? MathHelper.nextDouble(world.random, -0.5, 0.5) : (double)j * d);
-      double g = lv.z + (k == 0 ? MathHelper.nextDouble(world.random, -0.5, 0.5) : (double)k * d);
+      double e = lv.x + (i == 0 ? MathHelper.nextDouble(world.random, -0.5, 0.5) : (double)i * offsetMultiplier);
+      double f = lv.y + (j == 0 ? MathHelper.nextDouble(world.random, -0.5, 0.5) : (double)j * offsetMultiplier);
+      double g = lv.z + (k == 0 ? MathHelper.nextDouble(world.random, -0.5, 0.5) : (double)k * offsetMultiplier);
       double h = i == 0 ? velocity.getX() : 0.0;
       double l = j == 0 ? velocity.getY() : 0.0;
       double m = k == 0 ? velocity.getZ() : 0.0;
diff -bur namedTargetSrc/net/minecraft/client/util/ScreenshotRecorder.java namedSrc/net/minecraft/client/util/ScreenshotRecorder.java
--- namedTargetSrc/net/minecraft/client/util/ScreenshotRecorder.java	2023-07-28 17:34:23.560985450 +0000
+++ namedSrc/net/minecraft/client/util/ScreenshotRecorder.java	2023-07-28 17:32:41.018389346 +0000
@@ -34,9 +34,10 @@
     */
    private static final Logger LOGGER = LogUtils.getLogger();
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_ymjndgta Lnet/minecraft/unmapped/C_craqpqxw;f_ymjndgta:Ljava/lang/String;}
+    * @mapping {@literal named SCREENSHOTS_DIRECTORY Lnet/minecraft/client/util/ScreenshotRecorder;SCREENSHOTS_DIRECTORY:Ljava/lang/String;}
     */
-   public static final String f_ymjndgta = "screenshots";
+   public static final String SCREENSHOTS_DIRECTORY = "screenshots";
    /**
     * @mapping {@literal hashed f_kmvvfwwz Lnet/minecraft/unmapped/C_craqpqxw;f_kmvvfwwz:I}
     * @mapping {@literal named unitHeight Lnet/minecraft/client/util/ScreenshotRecorder;unitHeight:I}
@@ -110,7 +111,7 @@
                   lv.writeFile(file3);
                   Text lvx = Text.literal(file3.getName())
                      .formatted(Formatting.UNDERLINE)
-                     .styled(argx -> argx.withClickEvent(new ClickEvent(ClickEvent.Action.OPEN_FILE, file3.getAbsolutePath())));
+                     .styled(style -> style.withClickEvent(new ClickEvent(ClickEvent.Action.OPEN_FILE, file3.getAbsolutePath())));
                   messageReceiver.accept(Text.translatable("screenshot.success", lvx));
                } catch (Exception var7) {
                   LOGGER.warn("Couldn't save screenshot", (Throwable)var7);
Only in namedSrc/net/minecraft/client/util/telemetry/event: GameLoadTimesEvent.java
diff -bur namedTargetSrc/net/minecraft/client/util/telemetry/event/TelemetryEventType.java namedSrc/net/minecraft/client/util/telemetry/event/TelemetryEventType.java
--- namedTargetSrc/net/minecraft/client/util/telemetry/event/TelemetryEventType.java	2023-07-28 17:34:23.628987172 +0000
+++ namedSrc/net/minecraft/client/util/telemetry/event/TelemetryEventType.java	2023-07-28 17:32:41.102391479 +0000
@@ -102,18 +102,20 @@
       .appendProperty(TelemetryProperty.TICKS_SINCE_LOAD)
       .build();
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_qrtfgfgv Lnet/minecraft/unmapped/C_tmmyxvlq;f_qrtfgfgv:Lnet/minecraft/unmapped/C_tmmyxvlq;}
+    * @mapping {@literal named ADVANCEMENT_MADE Lnet/minecraft/client/util/telemetry/event/TelemetryEventType;ADVANCEMENT_MADE:Lnet/minecraft/client/util/telemetry/event/TelemetryEventType;}
     */
-   public static final TelemetryEventType f_qrtfgfgv = createBuilder("advancement_made", "AdvancementMade")
+   public static final TelemetryEventType ADVANCEMENT_MADE = createBuilder("advancement_made", "AdvancementMade")
       .appendProperties(WORLD_SESSION_PROPERTIES)
       .appendProperty(TelemetryProperty.ADVANCEMENT_ID)
       .appendProperty(TelemetryProperty.ADVANCEMENT_GAME_TIME)
       .setOptional()
       .build();
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_ehllagxi Lnet/minecraft/unmapped/C_tmmyxvlq;f_ehllagxi:Lnet/minecraft/unmapped/C_tmmyxvlq;}
+    * @mapping {@literal named GAME_LOAD_TIMES Lnet/minecraft/client/util/telemetry/event/TelemetryEventType;GAME_LOAD_TIMES:Lnet/minecraft/client/util/telemetry/event/TelemetryEventType;}
     */
-   public static final TelemetryEventType f_ehllagxi = createBuilder("game_load_times", "GameLoadTimes")
+   public static final TelemetryEventType GAME_LOAD_TIMES = createBuilder("game_load_times", "GameLoadTimes")
       .appendProperties(GAME_PROPERTIES)
       .appendProperty(TelemetryProperty.LOAD_TIME_TOTAL_TIME_MS)
       .appendProperty(TelemetryProperty.LOAD_TIME_PRE_WINDOW_MS)
@@ -156,7 +158,7 @@
       this.exportKey = exportKey;
       this.properties = properties;
       this.isOptional = isOptional;
-      this.codec = TelemetryPropertyMap.createCodec(properties).xmap(arg -> new TelemetryEventInstance(this, arg), TelemetryEventInstance::properties);
+      this.codec = TelemetryPropertyMap.createCodec(properties).xmap(map -> new TelemetryEventInstance(this, map), TelemetryEventInstance::properties);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/util/telemetry/event/WorldLoadEvent.java namedSrc/net/minecraft/client/util/telemetry/event/WorldLoadEvent.java
--- namedTargetSrc/net/minecraft/client/util/telemetry/event/WorldLoadEvent.java	2023-07-28 17:34:23.612986767 +0000
+++ namedSrc/net/minecraft/client/util/telemetry/event/WorldLoadEvent.java	2023-07-28 17:32:41.086391073 +0000
@@ -32,16 +32,18 @@
    @Nullable
    private String serverBrand;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_nggemfls Lnet/minecraft/unmapped/C_adyqesdt;f_nggemfls:Ljava/lang/String;}
+    * @mapping {@literal named minigameName Lnet/minecraft/client/util/telemetry/event/WorldLoadEvent;minigameName:Ljava/lang/String;}
     */
    @Nullable
-   private final String f_nggemfls;
+   private final String minigameName;
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_adyqesdt;<init>(Ljava/lang/String;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/client/util/telemetry/event/WorldLoadEvent;<init>(Ljava/lang/String;)V}
     */
-   public WorldLoadEvent(@Nullable String string) {
-      this.f_nggemfls = string;
+   public WorldLoadEvent(@Nullable String minigameName) {
+      this.minigameName = minigameName;
    }
 
    /**
@@ -81,8 +83,8 @@
          this.sent = true;
          sender.send(TelemetryEventType.WORLD_LOADED, propertyMapBuilder -> {
             propertyMapBuilder.addEntry(TelemetryProperty.GAME_MODE, this.gameMode);
-            if (this.f_nggemfls != null) {
-               propertyMapBuilder.addEntry(TelemetryProperty.REALMS_MAP_CONTENT, this.f_nggemfls);
+            if (this.minigameName != null) {
+               propertyMapBuilder.addEntry(TelemetryProperty.REALMS_MAP_CONTENT, this.minigameName);
             }
          });
          return true;
diff -bur namedTargetSrc/net/minecraft/client/util/telemetry/TelemetryManager.java namedSrc/net/minecraft/client/util/telemetry/TelemetryManager.java
--- namedTargetSrc/net/minecraft/client/util/telemetry/TelemetryManager.java	2023-07-28 17:34:23.580985956 +0000
+++ namedSrc/net/minecraft/client/util/telemetry/TelemetryManager.java	2023-07-28 17:32:41.042389955 +0000
@@ -67,9 +67,10 @@
     */
    private final CompletableFuture<Optional<TelemetryLogManager>> logManager;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_heodzugs Lnet/minecraft/unmapped/C_cgkxybww;f_heodzugs:Ljava/util/function/Supplier;}
+    * @mapping {@literal named sender Lnet/minecraft/client/util/telemetry/TelemetryManager;sender:Ljava/util/function/Supplier;}
     */
-   private final Supplier<TelemetryEventSender> f_heodzugs = Suppliers.memoize(this::m_qsixfwvb);
+   private final Supplier<TelemetryEventSender> sender = Suppliers.memoize(this::createEventSender);
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_cgkxybww;<init>(Lnet/minecraft/unmapped/C_ayfeobid;Lcom/mojang/authlib/minecraft/UserApiService;Lnet/minecraft/unmapped/C_cwfizcnb;)V}
@@ -85,7 +86,7 @@
       lv.addEntry(TelemetryProperty.OPERATING_SYSTEM, Util.getOperatingSystem().getName());
       lv.addEntry(TelemetryProperty.PLATFORM, System.getProperty("os.name"));
       lv.addEntry(TelemetryProperty.CLIENT_MODDED, MinecraftClient.getModStatus().isModded());
-      lv.m_mfccenqo(TelemetryProperty.LAUNCHER_NAME, System.getProperty("minecraft.launcher.brand"));
+      lv.addNullableEntry(TelemetryProperty.LAUNCHER_NAME, System.getProperty("minecraft.launcher.brand"));
       this.propertyMap = lv.build();
       this.logDirectory = client.runDirectory.toPath().resolve("logs/telemetry");
       this.logManager = TelemetryLogManager.attemptCreation(this.logDirectory);
@@ -95,21 +96,23 @@
     * @mapping {@literal hashed m_lsdtaxjn Lnet/minecraft/unmapped/C_cgkxybww;m_lsdtaxjn(ZLjava/time/Duration;Ljava/lang/String;)Lnet/minecraft/unmapped/C_bfepxqwf;}
     * @mapping {@literal named createWorldTelemetryManager Lnet/minecraft/client/util/telemetry/TelemetryManager;createWorldTelemetryManager(ZLjava/time/Duration;Ljava/lang/String;)Lnet/minecraft/client/util/telemetry/WorldTelemetryManager;}
     */
-   public WorldTelemetryManager createWorldTelemetryManager(boolean isNewWorld, @Nullable Duration worldLoadTime, @Nullable String string) {
-      return new WorldTelemetryManager(this.m_qsixfwvb(), isNewWorld, worldLoadTime, string);
+   public WorldTelemetryManager createWorldTelemetryManager(boolean isNewWorld, @Nullable Duration worldLoadTime, @Nullable String minigameName) {
+      return new WorldTelemetryManager(this.createEventSender(), isNewWorld, worldLoadTime, minigameName);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_muaatcpb Lnet/minecraft/unmapped/C_cgkxybww;m_muaatcpb()Lnet/minecraft/unmapped/C_wzhvxvch;}
+    * @mapping {@literal named getSender Lnet/minecraft/client/util/telemetry/TelemetryManager;getSender()Lnet/minecraft/client/util/telemetry/event/TelemetryEventSender;}
     */
-   public TelemetryEventSender m_muaatcpb() {
-      return (TelemetryEventSender)this.f_heodzugs.get();
+   public TelemetryEventSender getSender() {
+      return (TelemetryEventSender)this.sender.get();
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_qsixfwvb Lnet/minecraft/unmapped/C_cgkxybww;m_qsixfwvb()Lnet/minecraft/unmapped/C_wzhvxvch;}
+    * @mapping {@literal named createEventSender Lnet/minecraft/client/util/telemetry/TelemetryManager;createEventSender()Lnet/minecraft/client/util/telemetry/event/TelemetryEventSender;}
     */
-   private TelemetryEventSender m_qsixfwvb() {
+   private TelemetryEventSender createEventSender() {
       if (SharedConstants.isDevelopment) {
          return TelemetryEventSender.UNIMPLEMENTED_SENDER;
       } else {
@@ -154,6 +157,6 @@
     * Mapping not found
     */
    public void close() {
-      this.logManager.thenAccept(optional -> optional.ifPresent(TelemetryLogManager::close));
+      this.logManager.thenAccept(manager -> manager.ifPresent(TelemetryLogManager::close));
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/util/telemetry/TelemetryProperty.java namedSrc/net/minecraft/client/util/telemetry/TelemetryProperty.java
--- namedTargetSrc/net/minecraft/client/util/telemetry/TelemetryProperty.java	2023-07-28 17:34:23.692988792 +0000
+++ namedSrc/net/minecraft/client/util/telemetry/TelemetryProperty.java	2023-07-28 17:32:41.182393511 +0000
@@ -13,9 +13,9 @@
 import java.util.stream.Collectors;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
+import net.minecraft.client.util.telemetry.event.GameLoadTimesEvent;
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_znpzgoww;
 import net.minecraft.util.StringIdentifiable;
 import net.minecraft.util.UuidUtil;
 import net.minecraft.util.dynamic.Codecs;
@@ -86,10 +86,7 @@
     * @mapping {@literal named SERVER_TYPE Lnet/minecraft/client/util/telemetry/TelemetryProperty;SERVER_TYPE:Lnet/minecraft/client/util/telemetry/TelemetryProperty;}
     */
    public static final TelemetryProperty<TelemetryProperty.ServerType> SERVER_TYPE = create(
-      "server_type",
-      "serverType",
-      TelemetryProperty.ServerType.CODEC,
-      (telemetryPropertyContainer, string, arg) -> telemetryPropertyContainer.addProperty(string, arg.asString())
+      "server_type", "serverType", TelemetryProperty.ServerType.CODEC, (container, name, serverType) -> container.addProperty(name, serverType.asString())
    );
    /**
     * @mapping {@literal hashed f_dsvsamqy Lnet/minecraft/unmapped/C_vykgtyww;f_dsvsamqy:Lnet/minecraft/unmapped/C_vykgtyww;}
@@ -104,17 +101,14 @@
       "event_timestamp_utc",
       "eventTimestampUtc",
       Codecs.INSTANT,
-      (telemetryPropertyContainer, string, instant) -> telemetryPropertyContainer.addProperty(string, DATE_TIME_FORMATTER.format(instant))
+      (container, name, instant) -> container.addProperty(name, DATE_TIME_FORMATTER.format(instant))
    );
    /**
     * @mapping {@literal hashed f_qhttoyld Lnet/minecraft/unmapped/C_vykgtyww;f_qhttoyld:Lnet/minecraft/unmapped/C_vykgtyww;}
     * @mapping {@literal named GAME_MODE Lnet/minecraft/client/util/telemetry/TelemetryProperty;GAME_MODE:Lnet/minecraft/client/util/telemetry/TelemetryProperty;}
     */
    public static final TelemetryProperty<TelemetryProperty.GameMode> GAME_MODE = create(
-      "game_mode",
-      "playerGameMode",
-      TelemetryProperty.GameMode.CODEC,
-      (telemetryPropertyContainer, string, arg) -> telemetryPropertyContainer.addProperty(string, arg.id())
+      "game_mode", "playerGameMode", TelemetryProperty.GameMode.CODEC, (container, name, gameMode) -> container.addProperty(name, gameMode.id())
    );
    /**
     * @mapping {@literal hashed f_zevfzwgg Lnet/minecraft/unmapped/C_vykgtyww;f_zevfzwgg:Lnet/minecraft/unmapped/C_vykgtyww;}
@@ -175,22 +169,28 @@
     * @mapping {@literal hashed f_fojbxfry Lnet/minecraft/unmapped/C_vykgtyww;f_fojbxfry:Lnet/minecraft/unmapped/C_vykgtyww;}
     * @mapping {@literal named LOAD_TIME_TOTAL_TIME_MS Lnet/minecraft/client/util/telemetry/TelemetryProperty;LOAD_TIME_TOTAL_TIME_MS:Lnet/minecraft/client/util/telemetry/TelemetryProperty;}
     */
-   public static final TelemetryProperty<C_znpzgoww.C_wtksiulk> LOAD_TIME_TOTAL_TIME_MS = m_bvmbvvst("load_time_total_time_ms", "loadTimeTotalTimeMs");
+   public static final TelemetryProperty<GameLoadTimesEvent.Measurement> LOAD_TIME_TOTAL_TIME_MS = createMeasurement(
+      "load_time_total_time_ms", "loadTimeTotalTimeMs"
+   );
    /**
     * @mapping {@literal hashed f_swcjkdst Lnet/minecraft/unmapped/C_vykgtyww;f_swcjkdst:Lnet/minecraft/unmapped/C_vykgtyww;}
     * @mapping {@literal named LOAD_TIME_PRE_WINDOW_MS Lnet/minecraft/client/util/telemetry/TelemetryProperty;LOAD_TIME_PRE_WINDOW_MS:Lnet/minecraft/client/util/telemetry/TelemetryProperty;}
     */
-   public static final TelemetryProperty<C_znpzgoww.C_wtksiulk> LOAD_TIME_PRE_WINDOW_MS = m_bvmbvvst("load_time_pre_window_ms", "loadTimePreWindowMs");
+   public static final TelemetryProperty<GameLoadTimesEvent.Measurement> LOAD_TIME_PRE_WINDOW_MS = createMeasurement(
+      "load_time_pre_window_ms", "loadTimePreWindowMs"
+   );
    /**
     * @mapping {@literal hashed f_mxwjtpqq Lnet/minecraft/unmapped/C_vykgtyww;f_mxwjtpqq:Lnet/minecraft/unmapped/C_vykgtyww;}
     * @mapping {@literal named LOAD_TIME_BOOTSTRAP_MS Lnet/minecraft/client/util/telemetry/TelemetryProperty;LOAD_TIME_BOOTSTRAP_MS:Lnet/minecraft/client/util/telemetry/TelemetryProperty;}
     */
-   public static final TelemetryProperty<C_znpzgoww.C_wtksiulk> LOAD_TIME_BOOTSTRAP_MS = m_bvmbvvst("load_time_bootstrap_ms", "loadTimeBootstrapMs");
+   public static final TelemetryProperty<GameLoadTimesEvent.Measurement> LOAD_TIME_BOOTSTRAP_MS = createMeasurement(
+      "load_time_bootstrap_ms", "loadTimeBootstrapMs"
+   );
    /**
     * @mapping {@literal hashed f_qjyannlx Lnet/minecraft/unmapped/C_vykgtyww;f_qjyannlx:Lnet/minecraft/unmapped/C_vykgtyww;}
     * @mapping {@literal named LOAD_TIME_LOADING_OVERLAY_MS Lnet/minecraft/client/util/telemetry/TelemetryProperty;LOAD_TIME_LOADING_OVERLAY_MS:Lnet/minecraft/client/util/telemetry/TelemetryProperty;}
     */
-   public static final TelemetryProperty<C_znpzgoww.C_wtksiulk> LOAD_TIME_LOADING_OVERLAY_MS = m_bvmbvvst(
+   public static final TelemetryProperty<GameLoadTimesEvent.Measurement> LOAD_TIME_LOADING_OVERLAY_MS = createMeasurement(
       "load_time_loading_overlay_ms", "loadTimeLoadingOverlayMs"
    );
    /**
@@ -202,7 +202,7 @@
     * @mapping {@literal hashed f_gnfvikjm Lnet/minecraft/unmapped/C_vykgtyww;f_gnfvikjm:Lnet/minecraft/unmapped/C_vykgtyww;}
     * @mapping {@literal named ADVANCEMENT_GAME_TIME Lnet/minecraft/client/util/telemetry/TelemetryProperty;ADVANCEMENT_GAME_TIME:Lnet/minecraft/client/util/telemetry/TelemetryProperty;}
     */
-   public static final TelemetryProperty<Long> ADVANCEMENT_GAME_TIME = m_kfnpisdi("advancement_game_time", "advancementGameTime");
+   public static final TelemetryProperty<Long> ADVANCEMENT_GAME_TIME = createLong("advancement_game_time", "advancementGameTime");
 
    /**
     * @mapping {@literal hashed m_ulasainp Lnet/minecraft/unmapped/C_vykgtyww;m_ulasainp(Ljava/lang/String;Ljava/lang/String;Lcom/mojang/serialization/Codec;Lnet/minecraft/unmapped/C_vykgtyww$C_bqxexqea;)Lnet/minecraft/unmapped/C_vykgtyww;}
@@ -237,10 +237,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_kfnpisdi Lnet/minecraft/unmapped/C_vykgtyww;m_kfnpisdi(Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/unmapped/C_vykgtyww;}
+    * @mapping {@literal named createLong Lnet/minecraft/client/util/telemetry/TelemetryProperty;createLong(Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/client/util/telemetry/TelemetryProperty;}
     */
-   public static TelemetryProperty<Long> m_kfnpisdi(String string, String string2) {
-      return create(string, string2, Codec.LONG, TelemetryPropertyContainer::addProperty);
+   public static TelemetryProperty<Long> createLong(String id, String exportKey) {
+      return create(id, exportKey, Codec.LONG, TelemetryPropertyContainer::addProperty);
    }
 
    /**
@@ -248,21 +249,15 @@
     * @mapping {@literal named createUuid Lnet/minecraft/client/util/telemetry/TelemetryProperty;createUuid(Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/client/util/telemetry/TelemetryProperty;}
     */
    public static TelemetryProperty<UUID> createUuid(String id, String exportKey) {
-      return create(
-         id, exportKey, UuidUtil.STRING_CODEC, (telemetryPropertyContainer, string, uuid) -> telemetryPropertyContainer.addProperty(string, uuid.toString())
-      );
+      return create(id, exportKey, UuidUtil.STRING_CODEC, (container, name, uuid) -> container.addProperty(name, uuid.toString()));
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_bvmbvvst Lnet/minecraft/unmapped/C_vykgtyww;m_bvmbvvst(Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/unmapped/C_vykgtyww;}
+    * @mapping {@literal named createMeasurement Lnet/minecraft/client/util/telemetry/TelemetryProperty;createMeasurement(Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/client/util/telemetry/TelemetryProperty;}
     */
-   public static TelemetryProperty<C_znpzgoww.C_wtksiulk> m_bvmbvvst(String string, String string2) {
-      return create(
-         string,
-         string2,
-         C_znpzgoww.C_wtksiulk.CODEC,
-         (telemetryPropertyContainer, stringx, arg) -> telemetryPropertyContainer.addProperty(stringx, arg.millis())
-      );
+   public static TelemetryProperty<GameLoadTimesEvent.Measurement> createMeasurement(String id, String exportKey) {
+      return create(id, exportKey, GameLoadTimesEvent.Measurement.CODEC, (container, name, measurement) -> container.addProperty(name, measurement.millis()));
    }
 
    /**
@@ -274,9 +269,7 @@
          id,
          exportKey,
          Codec.LONG.listOf().xmap(LongArrayList::new, Function.identity()),
-         (telemetryPropertyContainer, string, longList) -> telemetryPropertyContainer.addProperty(
-               string, (String)longList.longStream().mapToObj(String::valueOf).collect(Collectors.joining(";"))
-            )
+         (container, name, list) -> container.addProperty(name, (String)list.longStream().mapToObj(String::valueOf).collect(Collectors.joining(";")))
       );
    }
 
diff -bur namedTargetSrc/net/minecraft/client/util/telemetry/TelemetryPropertyMap.java namedSrc/net/minecraft/client/util/telemetry/TelemetryPropertyMap.java
--- namedTargetSrc/net/minecraft/client/util/telemetry/TelemetryPropertyMap.java	2023-07-28 17:34:23.628987172 +0000
+++ namedSrc/net/minecraft/client/util/telemetry/TelemetryPropertyMap.java	2023-07-28 17:32:41.102391479 +0000
@@ -97,7 +97,7 @@
                T object = data.get(property.id());
                if (object != null) {
                   DataResult<V> dataResult2 = property.codec().parse(ops, object);
-                  return result.apply2stable((arg2, objectx) -> arg2.addEntry(property, (V)objectx), dataResult2);
+                  return result.apply2stable((map, value) -> map.addEntry(property, (V)value), dataResult2);
                } else {
                   return result;
                }
@@ -167,11 +167,12 @@
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_mfccenqo Lnet/minecraft/unmapped/C_tupaamrk$C_ivdfigoc;m_mfccenqo(Lnet/minecraft/unmapped/C_vykgtyww;Ljava/lang/Object;)Lnet/minecraft/unmapped/C_tupaamrk$C_ivdfigoc;}
+       * @mapping {@literal named addNullableEntry Lnet/minecraft/client/util/telemetry/TelemetryPropertyMap$Builder;addNullableEntry(Lnet/minecraft/client/util/telemetry/TelemetryProperty;Ljava/lang/Object;)Lnet/minecraft/client/util/telemetry/TelemetryPropertyMap$Builder;}
        */
-      public <T> TelemetryPropertyMap.Builder m_mfccenqo(TelemetryProperty<T> arg, @Nullable T object) {
-         if (object != null) {
-            this.propertyMap.put(arg, object);
+      public <T> TelemetryPropertyMap.Builder addNullableEntry(TelemetryProperty<T> property, @Nullable T value) {
+         if (value != null) {
+            this.propertyMap.put(property, value);
          }
 
          return this;
diff -bur namedTargetSrc/net/minecraft/client/util/telemetry/WorldTelemetryManager.java namedSrc/net/minecraft/client/util/telemetry/WorldTelemetryManager.java
--- namedTargetSrc/net/minecraft/client/util/telemetry/WorldTelemetryManager.java	2023-07-28 17:34:23.600986463 +0000
+++ namedSrc/net/minecraft/client/util/telemetry/WorldTelemetryManager.java	2023-07-28 17:32:41.070390667 +0000
@@ -54,13 +54,14 @@
    private final WorldLoadTimesEvent worldLoadTimes;
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_bfepxqwf;<init>(Lnet/minecraft/unmapped/C_wzhvxvch;ZLjava/time/Duration;Ljava/lang/String;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/client/util/telemetry/WorldTelemetryManager;<init>(Lnet/minecraft/client/util/telemetry/event/TelemetryEventSender;ZLjava/time/Duration;Ljava/lang/String;)V}
     */
-   public WorldTelemetryManager(TelemetryEventSender arg, boolean bl, @Nullable Duration duration, @Nullable String string) {
-      this.worldLoad = new WorldLoadEvent(string);
+   public WorldTelemetryManager(TelemetryEventSender sender, boolean newWorld, @Nullable Duration loadDuration, @Nullable String minigameName) {
+      this.worldLoad = new WorldLoadEvent(minigameName);
       this.performanceMetrics = new PerformanceMetricSamplerEvent();
-      this.worldLoadTimes = new WorldLoadTimesEvent(bl, duration);
-      this.sender = arg.decorate(propertyMapBuilder -> {
+      this.worldLoadTimes = new WorldLoadTimesEvent(newWorld, loadDuration);
+      this.sender = sender.decorate(propertyMapBuilder -> {
          this.worldLoad.addProperties(propertyMapBuilder);
          propertyMapBuilder.addEntry(TelemetryProperty.WORLD_SESSION_ID, this.uuid);
       });
@@ -124,15 +125,15 @@
 
    /**
     * @mapping {@literal hashed m_ksbcmwmh Lnet/minecraft/unmapped/C_bfepxqwf;m_ksbcmwmh(Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_kdwyuhdb;)V}
-    * @mapping {@literal named m_ksbcmwmh Lnet/minecraft/client/util/telemetry/WorldTelemetryManager;m_ksbcmwmh(Lnet/minecraft/world/World;Lnet/minecraft/advancement/Advancement;)V}
+    * @mapping {@literal named onAdvancementMade Lnet/minecraft/client/util/telemetry/WorldTelemetryManager;onAdvancementMade(Lnet/minecraft/world/World;Lnet/minecraft/advancement/Advancement;)V}
     */
-   public void m_ksbcmwmh(World world, Advancement arg2) {
-      Identifier lv = arg2.getId();
-      if (arg2.doesSendTelemetryEvent() && "minecraft".equals(lv.getNamespace())) {
+   public void onAdvancementMade(World world, Advancement advancement) {
+      Identifier lv = advancement.getId();
+      if (advancement.doesSendTelemetryEvent() && "minecraft".equals(lv.getNamespace())) {
          long l = world.getTime();
-         this.sender.send(TelemetryEventType.f_qrtfgfgv, arg2x -> {
-            arg2x.addEntry(TelemetryProperty.ADVANCEMENT_ID, lv.toString());
-            arg2x.addEntry(TelemetryProperty.ADVANCEMENT_GAME_TIME, l);
+         this.sender.send(TelemetryEventType.ADVANCEMENT_MADE, map -> {
+            map.addEntry(TelemetryProperty.ADVANCEMENT_ID, lv.toString());
+            map.addEntry(TelemetryProperty.ADVANCEMENT_GAME_TIME, l);
          });
       }
    }
diff -bur namedTargetSrc/net/minecraft/client/world/ClientWorld.java namedSrc/net/minecraft/client/world/ClientWorld.java
--- namedTargetSrc/net/minecraft/client/world/ClientWorld.java	2023-07-28 17:34:23.644987577 +0000
+++ namedSrc/net/minecraft/client/world/ClientWorld.java	2023-07-28 17:32:41.122391987 +0000
@@ -19,6 +19,7 @@
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.color.biome.BiomeColorProvider;
 import net.minecraft.client.color.world.BiomeColors;
+import net.minecraft.client.multiplayer.prediction.BlockStatePredictionManager;
 import net.minecraft.client.network.AbstractClientPlayerEntity;
 import net.minecraft.client.network.ClientPlayNetworkHandler;
 import net.minecraft.client.particle.FireworksSparkParticle;
@@ -51,7 +52,6 @@
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_czisrdmd;
 import net.minecraft.util.CubicSampler;
 import net.minecraft.util.CuboidBlockIterator;
 import net.minecraft.util.Util;
@@ -200,9 +200,10 @@
     */
    private int simulationDistance;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_ycswtnpc Lnet/minecraft/unmapped/C_ghdnlrrw;f_ycswtnpc:Lnet/minecraft/unmapped/C_czisrdmd;}
+    * @mapping {@literal named blockPredictionManager Lnet/minecraft/client/world/ClientWorld;blockPredictionManager:Lnet/minecraft/client/multiplayer/prediction/BlockStatePredictionManager;}
     */
-   private final C_czisrdmd f_ycswtnpc = new C_czisrdmd();
+   private final BlockStatePredictionManager blockPredictionManager = new BlockStatePredictionManager();
    /**
     * @mapping {@literal hashed f_fcmyqkjf Lnet/minecraft/unmapped/C_ghdnlrrw;f_fcmyqkjf:Ljava/util/Set;}
     * @mapping {@literal named MARKER_PARTICLE_ITEMS Lnet/minecraft/client/world/ClientWorld;MARKER_PARTICLE_ITEMS:Ljava/util/Set;}
@@ -213,40 +214,41 @@
     * @mapping {@literal hashed m_nsvkfxjo Lnet/minecraft/unmapped/C_ghdnlrrw;m_nsvkfxjo(I)V}
     * @mapping {@literal named onBlockChangeAcknowledgement Lnet/minecraft/client/world/ClientWorld;onBlockChangeAcknowledgement(I)V}
     */
-   public void onBlockChangeAcknowledgement(int i) {
-      this.f_ycswtnpc.m_vfahppjl(i, this);
+   public void onBlockChangeAcknowledgement(int sequence) {
+      this.blockPredictionManager.endPredictionsUntil(sequence, this);
    }
 
    /**
     * @mapping {@literal hashed m_ftefeyzd Lnet/minecraft/unmapped/C_ghdnlrrw;m_ftefeyzd(Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;I)V}
-    * @mapping {@literal named m_ftefeyzd Lnet/minecraft/client/world/ClientWorld;m_ftefeyzd(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;I)V}
+    * @mapping {@literal named setVerifiedBlockState Lnet/minecraft/client/world/ClientWorld;setVerifiedBlockState(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;I)V}
     */
-   public void m_ftefeyzd(BlockPos pos, BlockState state, int flags) {
-      if (!this.f_ycswtnpc.m_mmtdqsga(pos, state)) {
+   public void setVerifiedBlockState(BlockPos pos, BlockState state, int flags) {
+      if (!this.blockPredictionManager.updateKnownServerState(pos, state)) {
          super.setBlockState(pos, state, flags, 512);
       }
    }
 
    /**
     * @mapping {@literal hashed m_blplldfx Lnet/minecraft/unmapped/C_ghdnlrrw;m_blplldfx(Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_vgpupfxx;)V}
-    * @mapping {@literal named m_blplldfx Lnet/minecraft/client/world/ClientWorld;m_blplldfx(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;Lnet/minecraft/util/math/Vec3d;)V}
+    * @mapping {@literal named syncBlockState Lnet/minecraft/client/world/ClientWorld;syncBlockState(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;Lnet/minecraft/util/math/Vec3d;)V}
     */
-   public void m_blplldfx(BlockPos pos, BlockState state, Vec3d arg3) {
+   public void syncBlockState(BlockPos pos, BlockState state, Vec3d playerPos) {
       BlockState lv = this.getBlockState(pos);
       if (lv != state) {
          this.setBlockState(pos, state, Block.NOTIFY_ALL | Block.FORCE_STATE);
          PlayerEntity lv2 = this.client.player;
          if (this == lv2.getWorld() && lv2.collidesWithStateAtPos(pos, state)) {
-            lv2.updatePosition(arg3.x, arg3.y, arg3.z);
+            lv2.updatePosition(playerPos.x, playerPos.y, playerPos.z);
          }
       }
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_lvsrwztn Lnet/minecraft/unmapped/C_ghdnlrrw;m_lvsrwztn()Lnet/minecraft/unmapped/C_czisrdmd;}
+    * @mapping {@literal named getBlockPredictionManager Lnet/minecraft/client/world/ClientWorld;getBlockPredictionManager()Lnet/minecraft/client/multiplayer/prediction/BlockStatePredictionManager;}
     */
-   C_czisrdmd m_lvsrwztn() {
-      return this.f_ycswtnpc;
+   BlockStatePredictionManager getBlockPredictionManager() {
+      return this.blockPredictionManager;
    }
 
    /**
@@ -254,11 +256,11 @@
     */
    @Override
    public boolean setBlockState(BlockPos pos, BlockState state, int flags, int maxUpdateDepth) {
-      if (this.f_ycswtnpc.m_nssimvch()) {
+      if (this.blockPredictionManager.isPredicting()) {
          BlockState lv = this.getBlockState(pos);
          boolean bl = super.setBlockState(pos, state, flags, maxUpdateDepth);
          if (bl) {
-            this.f_ycswtnpc.m_plwiurco(pos, lv, this.client.player);
+            this.blockPredictionManager.retainKnownServerState(pos, lv, this.client.player);
          }
 
          return bl;
@@ -635,12 +637,12 @@
     * @mapping {@literal hashed m_pvimnyov Lnet/minecraft/unmapped/C_ghdnlrrw;m_pvimnyov(Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_nqucohct;Z)V}
     * @mapping {@literal named addParticle Lnet/minecraft/client/world/ClientWorld;addParticle(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;Lnet/minecraft/particle/ParticleEffect;Z)V}
     */
-   private void addParticle(BlockPos pos, BlockState state, ParticleEffect parameters, boolean bl) {
+   private void addParticle(BlockPos pos, BlockState state, ParticleEffect parameters, boolean solidBelow) {
       if (state.getFluidState().isEmpty()) {
          VoxelShape lv = state.getCollisionShape(this, pos);
          double d = lv.getMax(Direction.Axis.Y);
          if (d < 1.0) {
-            if (bl) {
+            if (solidBelow) {
                this.addParticle(
                   (double)pos.getX(), (double)(pos.getX() + 1), (double)pos.getZ(), (double)(pos.getZ() + 1), (double)(pos.getY() + 1) - 0.05, parameters
                );
@@ -815,10 +817,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_emdmfdsn Lnet/minecraft/unmapped/C_ghdnlrrw;m_emdmfdsn(Ljava/lang/String;Lnet/minecraft/unmapped/C_nvpllgmg;)V}
+    * @mapping {@literal named overrideMapState Lnet/minecraft/client/world/ClientWorld;overrideMapState(Ljava/lang/String;Lnet/minecraft/item/map/MapState;)V}
     */
-   public void m_emdmfdsn(String string, MapState arg) {
-      this.mapStates.put(string, arg);
+   public void overrideMapState(String id, MapState state) {
+      this.mapStates.put(id, state);
    }
 
    /**
@@ -1115,10 +1118,10 @@
     * @mapping {@literal hashed m_iesewwfc Lnet/minecraft/unmapped/C_ghdnlrrw;m_iesewwfc(Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_qodopjcw;)I}
     * @mapping {@literal named calculateColor Lnet/minecraft/client/world/ClientWorld;calculateColor(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/client/color/biome/BiomeColorProvider;)I}
     */
-   public int calculateColor(BlockPos pos, BiomeColorProvider arg2) {
+   public int calculateColor(BlockPos pos, BiomeColorProvider provider) {
       int i = MinecraftClient.getInstance().options.getBiomeBlendRadius().get();
       if (i == 0) {
-         return arg2.getColor(this.getBiome(pos).value(), (double)pos.getX(), (double)pos.getZ());
+         return provider.getColor(this.getBiome(pos).value(), (double)pos.getX(), (double)pos.getZ());
       } else {
          int j = (i * 2 + 1) * (i * 2 + 1);
          int k = 0;
@@ -1129,7 +1132,7 @@
          int n;
          for (BlockPos.Mutable lv2 = new BlockPos.Mutable(); lv.step(); m += n & 0xFF) {
             lv2.set(lv.getX(), lv.getY(), lv.getZ());
-            n = arg2.getColor(this.getBiome(lv2).value(), (double)lv2.getX(), (double)lv2.getZ());
+            n = provider.getColor(this.getBiome(lv2).value(), (double)lv2.getX(), (double)lv2.getZ());
             k += (n & 0xFF0000) >> 16;
             l += (n & 0xFF00) >> 8;
          }
diff -bur namedTargetSrc/net/minecraft/client/world/FlatWorldGeneratorPresets.java namedSrc/net/minecraft/client/world/FlatWorldGeneratorPresets.java
--- namedTargetSrc/net/minecraft/client/world/FlatWorldGeneratorPresets.java	2023-07-28 17:34:23.536984843 +0000
+++ namedSrc/net/minecraft/client/world/FlatWorldGeneratorPresets.java	2023-07-28 17:32:40.994388736 +0000
@@ -78,8 +78,8 @@
     * @mapping {@literal hashed m_sybrxjpq Lnet/minecraft/unmapped/C_brlntonw;m_sybrxjpq(Lnet/minecraft/unmapped/C_wlftclvz;)V}
     * @mapping {@literal named getHolder Lnet/minecraft/client/world/FlatWorldGeneratorPresets;getHolder(Lnet/minecraft/world/gen/BootstrapContext;)V}
     */
-   public static void getHolder(BootstrapContext<FlatWorldGeneratorPreset> arg) {
-      new FlatWorldGeneratorPresets.Bootstrap(arg).run();
+   public static void getHolder(BootstrapContext<FlatWorldGeneratorPreset> context) {
+      new FlatWorldGeneratorPresets.Bootstrap(context).run();
    }
 
    /**
@@ -96,15 +96,17 @@
     */
    static class Bootstrap {
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_nevetevc Lnet/minecraft/unmapped/C_brlntonw$C_gyvjwgmv;f_nevetevc:Lnet/minecraft/unmapped/C_wlftclvz;}
+       * @mapping {@literal named context Lnet/minecraft/client/world/FlatWorldGeneratorPresets$Bootstrap;context:Lnet/minecraft/world/gen/BootstrapContext;}
        */
-      private final BootstrapContext<FlatWorldGeneratorPreset> f_nevetevc;
+      private final BootstrapContext<FlatWorldGeneratorPreset> context;
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_brlntonw$C_gyvjwgmv;<init>(Lnet/minecraft/unmapped/C_wlftclvz;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/client/world/FlatWorldGeneratorPresets$Bootstrap;<init>(Lnet/minecraft/world/gen/BootstrapContext;)V}
        */
-      Bootstrap(BootstrapContext<FlatWorldGeneratorPreset> arg) {
-         this.f_nevetevc = arg;
+      Bootstrap(BootstrapContext<FlatWorldGeneratorPreset> context) {
+         this.context = context;
       }
 
       /**
@@ -120,9 +122,9 @@
          boolean enableLakes,
          FlatChunkGeneratorLayer... generatorLayers
       ) {
-         HolderProvider<StructureSet> lv = this.f_nevetevc.lookup(RegistryKeys.STRUCTURE_SET);
-         HolderProvider<PlacedFeature> lv2 = this.f_nevetevc.lookup(RegistryKeys.PLACED_FEATURE);
-         HolderProvider<Biome> lv3 = this.f_nevetevc.lookup(RegistryKeys.BIOME);
+         HolderProvider<StructureSet> lv = this.context.lookup(RegistryKeys.STRUCTURE_SET);
+         HolderProvider<PlacedFeature> lv2 = this.context.lookup(RegistryKeys.PLACED_FEATURE);
+         HolderProvider<Biome> lv3 = this.context.lookup(RegistryKeys.BIOME);
          HolderSet.DirectSet<StructureSet> lv4 = HolderSet.createDirect(
             (List<? extends Holder<StructureSet>>)structures.stream().map(lv::getHolderOrThrow).collect(Collectors.toList())
          );
@@ -139,7 +141,7 @@
             lv5.getLayers().add(generatorLayers[i]);
          }
 
-         this.f_nevetevc.register(key, new FlatWorldGeneratorPreset(icon.asItem().getBuiltInRegistryHolder(), lv5));
+         this.context.register(key, new FlatWorldGeneratorPreset(icon.asItem().getBuiltInRegistryHolder(), lv5));
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/client/world/GeneratorType.java namedSrc/net/minecraft/client/world/GeneratorType.java
--- namedTargetSrc/net/minecraft/client/world/GeneratorType.java	2023-07-28 17:34:23.644987577 +0000
+++ namedSrc/net/minecraft/client/world/GeneratorType.java	2023-07-28 17:32:41.122391987 +0000
@@ -35,7 +35,7 @@
                )
                .apply(instance, GeneratorType::new)
       ),
-      GeneratorType::m_lnppwtff
+      GeneratorType::requireOverworld
    );
    /**
     * @mapping {@literal hashed f_qxsrputl Lnet/minecraft/unmapped/C_uejfhynd;f_qxsrputl:Lcom/mojang/serialization/Codec;}
@@ -72,9 +72,10 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_tpfjotrl Lnet/minecraft/unmapped/C_uejfhynd;m_tpfjotrl()Lnet/minecraft/unmapped/C_oiwekzxo;}
+    * @mapping {@literal named getWorldDimensions Lnet/minecraft/client/world/GeneratorType;getWorldDimensions()Lnet/minecraft/world/dimension/WorldDimensions;}
     */
-   public WorldDimensions m_tpfjotrl() {
+   public WorldDimensions getWorldDimensions() {
       return new WorldDimensions(this.createDimensionOptionsRegistry());
    }
 
@@ -87,9 +88,10 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_lnppwtff Lnet/minecraft/unmapped/C_uejfhynd;m_lnppwtff(Lnet/minecraft/unmapped/C_uejfhynd;)Lcom/mojang/serialization/DataResult;}
+    * @mapping {@literal named requireOverworld Lnet/minecraft/client/world/GeneratorType;requireOverworld(Lnet/minecraft/client/world/GeneratorType;)Lcom/mojang/serialization/DataResult;}
     */
-   private static DataResult<GeneratorType> m_lnppwtff(GeneratorType arg) {
-      return arg.getOverworld().isEmpty() ? DataResult.error(() -> "Missing overworld dimension") : DataResult.success(arg, Lifecycle.stable());
+   private static DataResult<GeneratorType> requireOverworld(GeneratorType type) {
+      return type.getOverworld().isEmpty() ? DataResult.error(() -> "Missing overworld dimension") : DataResult.success(type, Lifecycle.stable());
    }
 }

@github-actions
Copy link

Choose a reason for hiding this comment

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

View the diff here (3/3): 
diff -bur namedTargetSrc/net/minecraft/client/world/GeneratorTypes.java namedSrc/net/minecraft/client/world/GeneratorTypes.java
--- namedTargetSrc/net/minecraft/client/world/GeneratorTypes.java	2023-07-28 17:34:23.696988893 +0000
+++ namedSrc/net/minecraft/client/world/GeneratorTypes.java	2023-07-28 17:32:41.186393613 +0000
@@ -71,8 +71,8 @@
     * @mapping {@literal hashed m_vtlthqfd Lnet/minecraft/unmapped/C_ogomnjoy;m_vtlthqfd(Lnet/minecraft/unmapped/C_wlftclvz;)V}
     * @mapping {@literal named getHolder Lnet/minecraft/client/world/GeneratorTypes;getHolder(Lnet/minecraft/world/gen/BootstrapContext;)V}
     */
-   public static void getHolder(BootstrapContext<GeneratorType> arg) {
-      new GeneratorTypes.Bootstrap(arg).m_gfaqqwev();
+   public static void getHolder(BootstrapContext<GeneratorType> context) {
+      new GeneratorTypes.Bootstrap(context).bootstrap();
    }
 
    /**
@@ -88,8 +88,8 @@
     * @mapping {@literal named getKey Lnet/minecraft/client/world/GeneratorTypes;getKey(Lnet/minecraft/registry/Registry;)Ljava/util/Optional;}
     */
    public static Optional<RegistryKey<GeneratorType>> getKey(Registry<DimensionOptions> registry) {
-      return registry.getOrEmpty(DimensionOptions.OVERWORLD).flatMap(arg -> {
-         ChunkGenerator lv = arg.getChunkGenerator();
+      return registry.getOrEmpty(DimensionOptions.OVERWORLD).flatMap(options -> {
+         ChunkGenerator lv = options.getChunkGenerator();
          if (lv instanceof FlatChunkGenerator) {
             return Optional.of(FLAT);
          } else {
@@ -100,10 +100,10 @@
 
    /**
     * @mapping {@literal hashed m_grmkvtyw Lnet/minecraft/unmapped/C_ogomnjoy;m_grmkvtyw(Lnet/minecraft/unmapped/C_wqxmvzdq;)Lnet/minecraft/unmapped/C_oiwekzxo;}
-    * @mapping {@literal named m_grmkvtyw Lnet/minecraft/client/world/GeneratorTypes;m_grmkvtyw(Lnet/minecraft/registry/DynamicRegistryManager;)Lnet/minecraft/world/dimension/WorldDimensions;}
+    * @mapping {@literal named getWorldDimensions Lnet/minecraft/client/world/GeneratorTypes;getWorldDimensions(Lnet/minecraft/registry/DynamicRegistryManager;)Lnet/minecraft/world/dimension/WorldDimensions;}
     */
-   public static WorldDimensions m_grmkvtyw(DynamicRegistryManager registryManager) {
-      return registryManager.get(RegistryKeys.GENERATOR_TYPE).getHolderOrThrow(NORMAL).value().m_tpfjotrl();
+   public static WorldDimensions getWorldDimensions(DynamicRegistryManager registryManager) {
+      return registryManager.get(RegistryKeys.GENERATOR_TYPE).getHolderOrThrow(NORMAL).value().getWorldDimensions();
    }
 
    /**
@@ -120,9 +120,10 @@
     */
    static class Bootstrap {
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_feuzwykz Lnet/minecraft/unmapped/C_ogomnjoy$C_fhucecjz;f_feuzwykz:Lnet/minecraft/unmapped/C_wlftclvz;}
+       * @mapping {@literal named context Lnet/minecraft/client/world/GeneratorTypes$Bootstrap;context:Lnet/minecraft/world/gen/BootstrapContext;}
        */
-      private final BootstrapContext<GeneratorType> f_feuzwykz;
+      private final BootstrapContext<GeneratorType> context;
       /**
        * @mapping {@literal hashed f_lczxbtbb Lnet/minecraft/unmapped/C_ogomnjoy$C_fhucecjz;f_lczxbtbb:Lnet/minecraft/unmapped/C_pzdchrcy;}
        * @mapping {@literal named chunkGeneratorSettings Lnet/minecraft/client/world/GeneratorTypes$Bootstrap;chunkGeneratorSettings:Lnet/minecraft/registry/HolderProvider;}
@@ -134,18 +135,20 @@
        */
       private final HolderProvider<Biome> biome;
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_osxonyab Lnet/minecraft/unmapped/C_ogomnjoy$C_fhucecjz;f_osxonyab:Lnet/minecraft/unmapped/C_pzdchrcy;}
+       * @mapping {@literal named placedFeature Lnet/minecraft/client/world/GeneratorTypes$Bootstrap;placedFeature:Lnet/minecraft/registry/HolderProvider;}
        */
-      private final HolderProvider<PlacedFeature> f_osxonyab;
+      private final HolderProvider<PlacedFeature> placedFeature;
       /**
        * @mapping {@literal hashed f_wlrmhbdd Lnet/minecraft/unmapped/C_ogomnjoy$C_fhucecjz;f_wlrmhbdd:Lnet/minecraft/unmapped/C_pzdchrcy;}
        * @mapping {@literal named structureSets Lnet/minecraft/client/world/GeneratorTypes$Bootstrap;structureSets:Lnet/minecraft/registry/HolderProvider;}
        */
       private final HolderProvider<StructureSet> structureSets;
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_hnemzeja Lnet/minecraft/unmapped/C_ogomnjoy$C_fhucecjz;f_hnemzeja:Lnet/minecraft/unmapped/C_pzdchrcy;}
+       * @mapping {@literal named multiNoiseBiomeSourceParameterList Lnet/minecraft/client/world/GeneratorTypes$Bootstrap;multiNoiseBiomeSourceParameterList:Lnet/minecraft/registry/HolderProvider;}
        */
-      private final HolderProvider<MultiNoiseBiomeSourceParameterList> f_hnemzeja;
+      private final HolderProvider<MultiNoiseBiomeSourceParameterList> multiNoiseBiomeSourceParameterList;
       /**
        * @mapping {@literal hashed f_sgqhsdyg Lnet/minecraft/unmapped/C_ogomnjoy$C_fhucecjz;f_sgqhsdyg:Lnet/minecraft/unmapped/C_cjzoxshv;}
        * @mapping {@literal named overworld Lnet/minecraft/client/world/GeneratorTypes$Bootstrap;overworld:Lnet/minecraft/registry/Holder;}
@@ -163,20 +166,22 @@
       private final DimensionOptions endDimension;
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_ogomnjoy$C_fhucecjz;<init>(Lnet/minecraft/unmapped/C_wlftclvz;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/client/world/GeneratorTypes$Bootstrap;<init>(Lnet/minecraft/world/gen/BootstrapContext;)V}
        */
-      Bootstrap(BootstrapContext<GeneratorType> arg) {
-         this.f_feuzwykz = arg;
-         HolderProvider<DimensionType> lv = arg.lookup(RegistryKeys.DIMENSION_TYPE);
-         this.chunkGeneratorSettings = arg.lookup(RegistryKeys.CHUNK_GENERATOR_SETTINGS);
-         this.biome = arg.lookup(RegistryKeys.BIOME);
-         this.f_osxonyab = arg.lookup(RegistryKeys.PLACED_FEATURE);
-         this.structureSets = arg.lookup(RegistryKeys.STRUCTURE_SET);
-         this.f_hnemzeja = arg.lookup(RegistryKeys.MULTI_NOISE_BIOME_SOURCE_PARAMETER_LIST);
+      Bootstrap(BootstrapContext<GeneratorType> context) {
+         this.context = context;
+         HolderProvider<DimensionType> lv = context.lookup(RegistryKeys.DIMENSION_TYPE);
+         this.chunkGeneratorSettings = context.lookup(RegistryKeys.CHUNK_GENERATOR_SETTINGS);
+         this.biome = context.lookup(RegistryKeys.BIOME);
+         this.placedFeature = context.lookup(RegistryKeys.PLACED_FEATURE);
+         this.structureSets = context.lookup(RegistryKeys.STRUCTURE_SET);
+         this.multiNoiseBiomeSourceParameterList = context.lookup(RegistryKeys.MULTI_NOISE_BIOME_SOURCE_PARAMETER_LIST);
          this.overworld = lv.getHolderOrThrow(DimensionTypes.OVERWORLD);
          Holder<DimensionType> lv2 = lv.getHolderOrThrow(DimensionTypes.THE_NETHER);
          Holder<ChunkGeneratorSettings> lv3 = this.chunkGeneratorSettings.getHolderOrThrow(ChunkGeneratorSettings.NETHER);
-         Holder.Reference<MultiNoiseBiomeSourceParameterList> lv4 = this.f_hnemzeja.getHolderOrThrow(MultiNoiseBiomeSourceParameterLists.NETHER);
+         Holder.Reference<MultiNoiseBiomeSourceParameterList> lv4 = this.multiNoiseBiomeSourceParameterList
+            .getHolderOrThrow(MultiNoiseBiomeSourceParameterLists.NETHER);
          this.netherDimension = new DimensionOptions(lv2, new NoiseChunkGenerator(MultiNoiseBiomeSource.create(lv4), lv3));
          Holder<DimensionType> lv5 = lv.getHolderOrThrow(DimensionTypes.THE_END);
          Holder<ChunkGeneratorSettings> lv6 = this.chunkGeneratorSettings.getHolderOrThrow(ChunkGeneratorSettings.END);
@@ -214,33 +219,36 @@
        * @mapping {@literal named addDimensionGenerator Lnet/minecraft/client/world/GeneratorTypes$Bootstrap;addDimensionGenerator(Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/world/dimension/DimensionOptions;)V}
        */
       private void addDimensionGenerator(RegistryKey<GeneratorType> generator, DimensionOptions dimension) {
-         this.f_feuzwykz.register(generator, this.createType(dimension));
+         this.context.register(generator, this.createType(dimension));
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_bmunbwen Lnet/minecraft/unmapped/C_ogomnjoy$C_fhucecjz;m_bmunbwen(Lnet/minecraft/unmapped/C_ajguowya;)V}
+       * @mapping {@literal named registerOverworlds Lnet/minecraft/client/world/GeneratorTypes$Bootstrap;registerOverworlds(Lnet/minecraft/world/biome/source/BiomeSource;)V}
        */
-      private void m_bmunbwen(BiomeSource arg) {
+      private void registerOverworlds(BiomeSource biomeSource) {
          Holder<ChunkGeneratorSettings> lv = this.chunkGeneratorSettings.getHolderOrThrow(ChunkGeneratorSettings.OVERWORLD);
-         this.addDimensionGenerator(GeneratorTypes.NORMAL, this.overworld(arg, lv));
+         this.addDimensionGenerator(GeneratorTypes.NORMAL, this.overworld(biomeSource, lv));
          Holder<ChunkGeneratorSettings> lv2 = this.chunkGeneratorSettings.getHolderOrThrow(ChunkGeneratorSettings.LARGE_BIOMES);
-         this.addDimensionGenerator(GeneratorTypes.LARGE_BIOMES, this.overworld(arg, lv2));
+         this.addDimensionGenerator(GeneratorTypes.LARGE_BIOMES, this.overworld(biomeSource, lv2));
          Holder<ChunkGeneratorSettings> lv3 = this.chunkGeneratorSettings.getHolderOrThrow(ChunkGeneratorSettings.AMPLIFIED);
-         this.addDimensionGenerator(GeneratorTypes.AMPLIFIED, this.overworld(arg, lv3));
+         this.addDimensionGenerator(GeneratorTypes.AMPLIFIED, this.overworld(biomeSource, lv3));
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_gfaqqwev Lnet/minecraft/unmapped/C_ogomnjoy$C_fhucecjz;m_gfaqqwev()V}
+       * @mapping {@literal named bootstrap Lnet/minecraft/client/world/GeneratorTypes$Bootstrap;bootstrap()V}
        */
-      public void m_gfaqqwev() {
-         Holder.Reference<MultiNoiseBiomeSourceParameterList> lv = this.f_hnemzeja.getHolderOrThrow(MultiNoiseBiomeSourceParameterLists.OVERWORLD);
-         this.m_bmunbwen(MultiNoiseBiomeSource.create(lv));
+      public void bootstrap() {
+         Holder.Reference<MultiNoiseBiomeSourceParameterList> lv = this.multiNoiseBiomeSourceParameterList
+            .getHolderOrThrow(MultiNoiseBiomeSourceParameterLists.OVERWORLD);
+         this.registerOverworlds(MultiNoiseBiomeSource.create(lv));
          Holder<ChunkGeneratorSettings> lv2 = this.chunkGeneratorSettings.getHolderOrThrow(ChunkGeneratorSettings.OVERWORLD);
          Holder.Reference<Biome> lv3 = this.biome.getHolderOrThrow(Biomes.PLAINS);
          this.addDimensionGenerator(GeneratorTypes.SINGLE_BIOME_SURFACE, this.overworld(new FixedBiomeSource(lv3), lv2));
          this.addDimensionGenerator(
             GeneratorTypes.FLAT,
-            this.createOverworld(new FlatChunkGenerator(FlatChunkGeneratorConfig.getDefaultConfig(this.biome, this.structureSets, this.f_osxonyab)))
+            this.createOverworld(new FlatChunkGenerator(FlatChunkGeneratorConfig.getDefaultConfig(this.biome, this.structureSets, this.placedFeature)))
          );
          this.addDimensionGenerator(GeneratorTypes.DEBUG_ALL_BLOCK_STATES, this.createOverworld(new DebugChunkGenerator(lv3)));
       }
diff -bur namedTargetSrc/net/minecraft/client/world/WorldCreationContext.java namedSrc/net/minecraft/client/world/WorldCreationContext.java
--- namedTargetSrc/net/minecraft/client/world/WorldCreationContext.java	2023-07-28 17:34:23.640987475 +0000
+++ namedSrc/net/minecraft/client/world/WorldCreationContext.java	2023-07-28 17:32:41.118391886 +0000
@@ -35,11 +35,11 @@
     */
    public WorldCreationContext(
       GeneratorOptions generatorOptions,
-      LayeredRegistryManager<ServerRegistryLayer> arg2,
+      LayeredRegistryManager<ServerRegistryLayer> registryManager,
       ServerReloadableResources resources,
       FeatureAndDataSettings featureAndDataSettings
    ) {
-      this(generatorOptions.options(), generatorOptions.getDimensions(), arg2, resources, featureAndDataSettings);
+      this(generatorOptions.options(), generatorOptions.getDimensions(), registryManager, resources, featureAndDataSettings);
    }
 
    /**
@@ -47,35 +47,37 @@
     * @mapping {@literal named <init> Lnet/minecraft/client/world/WorldCreationContext;<init>(Lnet/minecraft/world/gen/WorldGeneratorOptions;Lnet/minecraft/world/dimension/WorldDimensions;Lnet/minecraft/registry/LayeredRegistryManager;Lnet/minecraft/server/ServerReloadableResources;Lnet/minecraft/server/world/FeatureAndDataSettings;)V}
     */
    public WorldCreationContext(
-      WorldGeneratorOptions arg,
-      WorldDimensions arg2,
-      LayeredRegistryManager<ServerRegistryLayer> arg3,
+      WorldGeneratorOptions options,
+      WorldDimensions worldDimensions,
+      LayeredRegistryManager<ServerRegistryLayer> registryManager,
       ServerReloadableResources resources,
-      FeatureAndDataSettings arg5
+      FeatureAndDataSettings featureAndDataSettings
    ) {
       this(
-         arg,
-         arg3.getManager(ServerRegistryLayer.DIMENSIONS).get(RegistryKeys.DIMENSION),
-         arg2,
-         arg3.withReplacedLayers(ServerRegistryLayer.DIMENSIONS),
+         options,
+         registryManager.getManager(ServerRegistryLayer.DIMENSIONS).get(RegistryKeys.DIMENSION),
+         worldDimensions,
+         registryManager.withReplacedLayers(ServerRegistryLayer.DIMENSIONS),
          resources,
-         arg5
+         featureAndDataSettings
       );
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_ptgdwbnf Lnet/minecraft/unmapped/C_njsjipmy;m_ptgdwbnf(Lnet/minecraft/unmapped/C_naismckd;Lnet/minecraft/unmapped/C_oiwekzxo;)Lnet/minecraft/unmapped/C_njsjipmy;}
+    * @mapping {@literal named create Lnet/minecraft/client/world/WorldCreationContext;create(Lnet/minecraft/world/gen/WorldGeneratorOptions;Lnet/minecraft/world/dimension/WorldDimensions;)Lnet/minecraft/client/world/WorldCreationContext;}
     */
-   public WorldCreationContext m_ptgdwbnf(WorldGeneratorOptions arg, WorldDimensions arg2) {
-      return new WorldCreationContext(arg, this.datapackDimensions, arg2, this.worldgenRegistries, this.resources, this.dataConfiguration);
+   public WorldCreationContext create(WorldGeneratorOptions options, WorldDimensions worldDimensions) {
+      return new WorldCreationContext(options, this.datapackDimensions, worldDimensions, this.worldgenRegistries, this.resources, this.dataConfiguration);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_wtltvvtl Lnet/minecraft/unmapped/C_njsjipmy;m_wtltvvtl(Lnet/minecraft/unmapped/C_njsjipmy$C_ixwvvclr;)Lnet/minecraft/unmapped/C_njsjipmy;}
+    * @mapping {@literal named create Lnet/minecraft/client/world/WorldCreationContext;create(Lnet/minecraft/client/world/WorldCreationContext$OptionsModifier;)Lnet/minecraft/client/world/WorldCreationContext;}
     */
-   public WorldCreationContext m_wtltvvtl(WorldCreationContext.C_ixwvvclr arg) {
+   public WorldCreationContext create(WorldCreationContext.OptionsModifier modifier) {
       return new WorldCreationContext(
-         (WorldGeneratorOptions)arg.apply(this.options),
+         (WorldGeneratorOptions)modifier.apply(this.options),
          this.datapackDimensions,
          this.selectedDimensions,
          this.worldgenRegistries,
@@ -85,13 +87,14 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_zvxwfsao Lnet/minecraft/unmapped/C_njsjipmy;m_zvxwfsao(Lnet/minecraft/unmapped/C_njsjipmy$C_iucotkie;)Lnet/minecraft/unmapped/C_njsjipmy;}
+    * @mapping {@literal named create Lnet/minecraft/client/world/WorldCreationContext;create(Lnet/minecraft/client/world/WorldCreationContext$DimensionsUpdater;)Lnet/minecraft/client/world/WorldCreationContext;}
     */
-   public WorldCreationContext m_zvxwfsao(WorldCreationContext.C_iucotkie arg) {
+   public WorldCreationContext create(WorldCreationContext.DimensionsUpdater updater) {
       return new WorldCreationContext(
          this.options,
          this.datapackDimensions,
-         (WorldDimensions)arg.apply(this.getWorldgenRegistryManager(), this.selectedDimensions),
+         (WorldDimensions)updater.apply(this.getWorldgenRegistryManager(), this.selectedDimensions),
          this.worldgenRegistries,
          this.resources,
          this.dataConfiguration
@@ -108,18 +111,18 @@
 
    /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_njsjipmy$C_iucotkie}
-    * @mapping {@literal named net/minecraft/client/world/WorldCreationContext$C_iucotkie}
+    * @mapping {@literal named net/minecraft/client/world/WorldCreationContext$DimensionsUpdater}
     */
    @FunctionalInterface
    @Environment(EnvType.CLIENT)
-   public interface C_iucotkie extends BiFunction<DynamicRegistryManager.Frozen, WorldDimensions, WorldDimensions> {
+   public interface DimensionsUpdater extends BiFunction<DynamicRegistryManager.Frozen, WorldDimensions, WorldDimensions> {
    }
 
    /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_njsjipmy$C_ixwvvclr}
-    * @mapping {@literal named net/minecraft/client/world/WorldCreationContext$C_ixwvvclr}
+    * @mapping {@literal named net/minecraft/client/world/WorldCreationContext$OptionsModifier}
     */
    @Environment(EnvType.CLIENT)
-   public interface C_ixwvvclr extends UnaryOperator<WorldGeneratorOptions> {
+   public interface OptionsModifier extends UnaryOperator<WorldGeneratorOptions> {
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/world/WorldCreator.java namedSrc/net/minecraft/client/world/WorldCreator.java
--- namedTargetSrc/net/minecraft/client/world/WorldCreator.java	2023-07-28 17:34:23.532984741 +0000
+++ namedSrc/net/minecraft/client/world/WorldCreator.java	2023-07-28 17:32:40.986388533 +0000
@@ -38,9 +38,9 @@
    private static final Text DEFAULT_WORLD_NAME = Text.translatable("selectWorld.newWorld");
    /**
     * @mapping {@literal hashed f_nwmnwule Lnet/minecraft/unmapped/C_hypraqfe;f_nwmnwule:Ljava/util/List;}
-    * @mapping {@literal named consumers Lnet/minecraft/client/world/WorldCreator;consumers:Ljava/util/List;}
+    * @mapping {@literal named listeners Lnet/minecraft/client/world/WorldCreator;listeners:Ljava/util/List;}
     */
-   private final List<Consumer<WorldCreator>> consumers = new ArrayList();
+   private final List<Consumer<WorldCreator>> listeners = new ArrayList();
    /**
     * @mapping {@literal hashed f_hrqmvgvi Lnet/minecraft/unmapped/C_hypraqfe;f_hrqmvgvi:Ljava/lang/String;}
     * @mapping {@literal named worldName Lnet/minecraft/client/world/WorldCreator;worldName:Ljava/lang/String;}
@@ -57,73 +57,83 @@
     */
    private Difficulty difficulty = Difficulty.NORMAL;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_jmyxcove Lnet/minecraft/unmapped/C_hypraqfe;f_jmyxcove:Ljava/lang/Boolean;}
+    * @mapping {@literal named cheatsEnabled Lnet/minecraft/client/world/WorldCreator;cheatsEnabled:Ljava/lang/Boolean;}
     */
    @Nullable
-   private Boolean f_jmyxcove;
+   private Boolean cheatsEnabled;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_gjinmbjb Lnet/minecraft/unmapped/C_hypraqfe;f_gjinmbjb:Ljava/lang/String;}
+    * @mapping {@literal named seed Lnet/minecraft/client/world/WorldCreator;seed:Ljava/lang/String;}
     */
-   private String f_gjinmbjb;
+   private String seed;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_lakfutsq Lnet/minecraft/unmapped/C_hypraqfe;f_lakfutsq:Z}
+    * @mapping {@literal named generateStructures Lnet/minecraft/client/world/WorldCreator;generateStructures:Z}
     */
-   private boolean f_lakfutsq;
+   private boolean generateStructures;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_giiezriy Lnet/minecraft/unmapped/C_hypraqfe;f_giiezriy:Z}
+    * @mapping {@literal named hasBonusChest Lnet/minecraft/client/world/WorldCreator;hasBonusChest:Z}
     */
-   private boolean f_giiezriy;
+   private boolean hasBonusChest;
    /**
     * @mapping {@literal hashed f_gwbrsste Lnet/minecraft/unmapped/C_hypraqfe;f_gwbrsste:Ljava/nio/file/Path;}
     * @mapping {@literal named worldSavesPath Lnet/minecraft/client/world/WorldCreator;worldSavesPath:Ljava/nio/file/Path;}
     */
    private final Path worldSavesPath;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_dqjclmla Lnet/minecraft/unmapped/C_hypraqfe;f_dqjclmla:Ljava/lang/String;}
+    * @mapping {@literal named saveFolderName Lnet/minecraft/client/world/WorldCreator;saveFolderName:Ljava/lang/String;}
     */
-   private String f_dqjclmla;
+   private String saveFolderName;
    /**
     * @mapping {@literal hashed f_einkjnrv Lnet/minecraft/unmapped/C_hypraqfe;f_einkjnrv:Lnet/minecraft/unmapped/C_njsjipmy;}
     * @mapping {@literal named context Lnet/minecraft/client/world/WorldCreator;context:Lnet/minecraft/client/world/WorldCreationContext;}
     */
    private WorldCreationContext context;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_mxgdqqgs Lnet/minecraft/unmapped/C_hypraqfe;f_mxgdqqgs:Lnet/minecraft/unmapped/C_hypraqfe$C_jbuehfan;}
+    * @mapping {@literal named worldType Lnet/minecraft/client/world/WorldCreator;worldType:Lnet/minecraft/client/world/WorldCreator$WorldTypeEntry;}
     */
-   private WorldCreator.C_jbuehfan f_mxgdqqgs;
+   private WorldCreator.WorldTypeEntry worldType;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_doyaxhqe Lnet/minecraft/unmapped/C_hypraqfe;f_doyaxhqe:Ljava/util/List;}
+    * @mapping {@literal named normalWorldTypes Lnet/minecraft/client/world/WorldCreator;normalWorldTypes:Ljava/util/List;}
     */
-   private final List<WorldCreator.C_jbuehfan> f_doyaxhqe = new ArrayList();
+   private final List<WorldCreator.WorldTypeEntry> normalWorldTypes = new ArrayList();
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_sleyatvc Lnet/minecraft/unmapped/C_hypraqfe;f_sleyatvc:Ljava/util/List;}
+    * @mapping {@literal named extendedWorldTypes Lnet/minecraft/client/world/WorldCreator;extendedWorldTypes:Ljava/util/List;}
     */
-   private final List<WorldCreator.C_jbuehfan> f_sleyatvc = new ArrayList();
+   private final List<WorldCreator.WorldTypeEntry> extendedWorldTypes = new ArrayList();
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_mlubojta Lnet/minecraft/unmapped/C_hypraqfe;f_mlubojta:Lnet/minecraft/unmapped/C_xmldumst;}
+    * @mapping {@literal named gameRules Lnet/minecraft/client/world/WorldCreator;gameRules:Lnet/minecraft/world/GameRules;}
     */
-   private GameRules f_mlubojta = new GameRules();
+   private GameRules gameRules = new GameRules();
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_hypraqfe;<init>(Ljava/nio/file/Path;Lnet/minecraft/unmapped/C_njsjipmy;Ljava/util/Optional;Ljava/util/OptionalLong;)V}
     * @mapping {@literal named <init> Lnet/minecraft/client/world/WorldCreator;<init>(Ljava/nio/file/Path;Lnet/minecraft/client/world/WorldCreationContext;Ljava/util/Optional;Ljava/util/OptionalLong;)V}
     */
-   public WorldCreator(Path worldSavesPath, WorldCreationContext context, Optional<RegistryKey<GeneratorType>> optional, OptionalLong optionalLong) {
+   public WorldCreator(Path worldSavesPath, WorldCreationContext context, Optional<RegistryKey<GeneratorType>> defaultWorldType, OptionalLong seed) {
       this.worldSavesPath = worldSavesPath;
       this.context = context;
-      this.f_mxgdqqgs = new WorldCreator.C_jbuehfan((Holder<GeneratorType>)m_dvqxcggy(context, optional).orElse(null));
-      this.m_qwzkvgzg();
-      this.f_gjinmbjb = optionalLong.isPresent() ? Long.toString(optionalLong.getAsLong()) : "";
-      this.f_lakfutsq = context.options().hasFeatureGeneration();
-      this.f_giiezriy = context.options().hasBonusChest();
-      this.f_dqjclmla = this.getOrCreateSaveFolder(this.worldName);
+      this.worldType = new WorldCreator.WorldTypeEntry((Holder<GeneratorType>)getWorldPreset(context, defaultWorldType).orElse(null));
+      this.updateWorldTypeLists();
+      this.seed = seed.isPresent() ? Long.toString(seed.getAsLong()) : "";
+      this.generateStructures = context.options().hasFeatureGeneration();
+      this.hasBonusChest = context.options().hasBonusChest();
+      this.saveFolderName = this.getOrCreateSaveFolder(this.worldName);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_gshlcejd Lnet/minecraft/unmapped/C_hypraqfe;m_gshlcejd(Ljava/util/function/Consumer;)V}
+    * @mapping {@literal named addListener Lnet/minecraft/client/world/WorldCreator;addListener(Ljava/util/function/Consumer;)V}
     */
-   public void m_gshlcejd(Consumer<WorldCreator> consumer) {
-      this.consumers.add(consumer);
+   public void addListener(Consumer<WorldCreator> listener) {
+      this.listeners.add(listener);
    }
 
    /**
@@ -131,27 +141,28 @@
     * @mapping {@literal named generate Lnet/minecraft/client/world/WorldCreator;generate()V}
     */
    public void generate() {
-      boolean bl = this.m_jmqeorwf();
+      boolean bl = this.isBonusChestEnabled();
       if (bl != this.context.options().hasBonusChest()) {
-         this.context = this.context.m_wtltvvtl(arg -> arg.withBonusChest(bl));
+         this.context = this.context.create(options -> options.withBonusChest(bl));
       }
 
-      boolean bl2 = this.m_cwibfpjj();
+      boolean bl2 = this.shouldGenerateStructures();
       if (bl2 != this.context.options().hasFeatureGeneration()) {
-         this.context = this.context.m_wtltvvtl(arg -> arg.withFeatureGeneration(bl2));
+         this.context = this.context.create(options -> options.withFeatureGeneration(bl2));
       }
 
-      for (Consumer<WorldCreator> consumer : this.consumers) {
+      for (Consumer<WorldCreator> consumer : this.listeners) {
          consumer.accept(this);
       }
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_ijqpixye Lnet/minecraft/unmapped/C_hypraqfe;m_ijqpixye(Ljava/lang/String;)V}
+    * @mapping {@literal named setWorldName Lnet/minecraft/client/world/WorldCreator;setWorldName(Ljava/lang/String;)V}
     */
-   public void m_ijqpixye(String string) {
-      this.worldName = string;
-      this.f_dqjclmla = this.getOrCreateSaveFolder(string);
+   public void setWorldName(String worldName) {
+      this.worldName = worldName;
+      this.saveFolderName = this.getOrCreateSaveFolder(worldName);
       this.generate();
    }
 
@@ -182,40 +193,44 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_xirteeuv Lnet/minecraft/unmapped/C_hypraqfe;m_xirteeuv()Ljava/lang/String;}
+    * @mapping {@literal named getSaveFolderName Lnet/minecraft/client/world/WorldCreator;getSaveFolderName()Ljava/lang/String;}
     */
-   public String m_xirteeuv() {
-      return this.f_dqjclmla;
+   public String getSaveFolderName() {
+      return this.saveFolderName;
    }
 
    /**
     * @mapping {@literal hashed m_kaigmflw Lnet/minecraft/unmapped/C_hypraqfe;m_kaigmflw(Lnet/minecraft/unmapped/C_hypraqfe$C_ohbtvxdv;)V}
     * @mapping {@literal named setGameMode Lnet/minecraft/client/world/WorldCreator;setGameMode(Lnet/minecraft/client/world/WorldCreator$GameMode;)V}
     */
-   public void setGameMode(WorldCreator.GameMode arg) {
-      this.gameMode = arg;
+   public void setGameMode(WorldCreator.GameMode mode) {
+      this.gameMode = mode;
       this.generate();
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_mswhmzta Lnet/minecraft/unmapped/C_hypraqfe;m_mswhmzta()Lnet/minecraft/unmapped/C_hypraqfe$C_ohbtvxdv;}
+    * @mapping {@literal named getGameMode Lnet/minecraft/client/world/WorldCreator;getGameMode()Lnet/minecraft/client/world/WorldCreator$GameMode;}
     */
-   public WorldCreator.GameMode m_mswhmzta() {
-      return this.m_lxkbugsk() ? WorldCreator.GameMode.DEBUG : this.gameMode;
+   public WorldCreator.GameMode getGameMode() {
+      return this.isDebug() ? WorldCreator.GameMode.DEBUG : this.gameMode;
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_rltchgia Lnet/minecraft/unmapped/C_hypraqfe;m_rltchgia(Lnet/minecraft/unmapped/C_mpbjgxic;)V}
+    * @mapping {@literal named setDifficulty Lnet/minecraft/client/world/WorldCreator;setDifficulty(Lnet/minecraft/world/Difficulty;)V}
     */
-   public void m_rltchgia(Difficulty arg) {
-      this.difficulty = arg;
+   public void setDifficulty(Difficulty difficulty) {
+      this.difficulty = difficulty;
       this.generate();
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_foaxpdkg Lnet/minecraft/unmapped/C_hypraqfe;m_foaxpdkg()Lnet/minecraft/unmapped/C_mpbjgxic;}
+    * @mapping {@literal named getDifficulty Lnet/minecraft/client/world/WorldCreator;getDifficulty()Lnet/minecraft/world/Difficulty;}
     */
-   public Difficulty m_foaxpdkg() {
+   public Difficulty getDifficulty() {
       return this.isHardcore() ? Difficulty.HARD : this.difficulty;
    }
 
@@ -224,84 +239,93 @@
     * @mapping {@literal named isHardcore Lnet/minecraft/client/world/WorldCreator;isHardcore()Z}
     */
    public boolean isHardcore() {
-      return this.m_mswhmzta() == WorldCreator.GameMode.HARDCORE;
+      return this.getGameMode() == WorldCreator.GameMode.HARDCORE;
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_uuveagan Lnet/minecraft/unmapped/C_hypraqfe;m_uuveagan(Z)V}
+    * @mapping {@literal named setCheatsEnabled Lnet/minecraft/client/world/WorldCreator;setCheatsEnabled(Z)V}
     */
-   public void m_uuveagan(boolean bl) {
-      this.f_jmyxcove = bl;
+   public void setCheatsEnabled(boolean enabled) {
+      this.cheatsEnabled = enabled;
       this.generate();
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_qsmcxzzu Lnet/minecraft/unmapped/C_hypraqfe;m_qsmcxzzu()Z}
+    * @mapping {@literal named areCheatsEnabled Lnet/minecraft/client/world/WorldCreator;areCheatsEnabled()Z}
     */
-   public boolean m_qsmcxzzu() {
-      if (this.m_lxkbugsk()) {
+   public boolean areCheatsEnabled() {
+      if (this.isDebug()) {
          return true;
       } else if (this.isHardcore()) {
          return false;
-      } else if (this.f_jmyxcove == null) {
-         return this.m_mswhmzta() == WorldCreator.GameMode.CREATIVE;
+      } else if (this.cheatsEnabled == null) {
+         return this.getGameMode() == WorldCreator.GameMode.CREATIVE;
       } else {
-         return this.f_jmyxcove;
+         return this.cheatsEnabled;
       }
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_hfdhfufg Lnet/minecraft/unmapped/C_hypraqfe;m_hfdhfufg(Ljava/lang/String;)V}
+    * @mapping {@literal named setSeed Lnet/minecraft/client/world/WorldCreator;setSeed(Ljava/lang/String;)V}
     */
-   public void m_hfdhfufg(String string) {
-      this.f_gjinmbjb = string;
-      this.context = this.context.m_wtltvvtl(arg -> arg.withSeed(WorldGeneratorOptions.parseOptionalLong(this.m_yuhyzqip())));
+   public void setSeed(String seed) {
+      this.seed = seed;
+      this.context = this.context.create(options -> options.withSeed(WorldGeneratorOptions.parseOptionalLong(this.getSeed())));
       this.generate();
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_yuhyzqip Lnet/minecraft/unmapped/C_hypraqfe;m_yuhyzqip()Ljava/lang/String;}
+    * @mapping {@literal named getSeed Lnet/minecraft/client/world/WorldCreator;getSeed()Ljava/lang/String;}
     */
-   public String m_yuhyzqip() {
-      return this.f_gjinmbjb;
+   public String getSeed() {
+      return this.seed;
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_xgnefpuy Lnet/minecraft/unmapped/C_hypraqfe;m_xgnefpuy(Z)V}
+    * @mapping {@literal named setGenerateStructures Lnet/minecraft/client/world/WorldCreator;setGenerateStructures(Z)V}
     */
-   public void m_xgnefpuy(boolean bl) {
-      this.f_lakfutsq = bl;
+   public void setGenerateStructures(boolean generateStructures) {
+      this.generateStructures = generateStructures;
       this.generate();
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_cwibfpjj Lnet/minecraft/unmapped/C_hypraqfe;m_cwibfpjj()Z}
+    * @mapping {@literal named shouldGenerateStructures Lnet/minecraft/client/world/WorldCreator;shouldGenerateStructures()Z}
     */
-   public boolean m_cwibfpjj() {
-      return this.m_lxkbugsk() ? false : this.f_lakfutsq;
+   public boolean shouldGenerateStructures() {
+      return this.isDebug() ? false : this.generateStructures;
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_wzhatoky Lnet/minecraft/unmapped/C_hypraqfe;m_wzhatoky(Z)V}
+    * @mapping {@literal named setBonusChestEnabled Lnet/minecraft/client/world/WorldCreator;setBonusChestEnabled(Z)V}
     */
-   public void m_wzhatoky(boolean bl) {
-      this.f_giiezriy = bl;
+   public void setBonusChestEnabled(boolean enabled) {
+      this.hasBonusChest = enabled;
       this.generate();
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_jmqeorwf Lnet/minecraft/unmapped/C_hypraqfe;m_jmqeorwf()Z}
+    * @mapping {@literal named isBonusChestEnabled Lnet/minecraft/client/world/WorldCreator;isBonusChestEnabled()Z}
     */
-   public boolean m_jmqeorwf() {
-      return !this.m_lxkbugsk() && !this.isHardcore() ? this.f_giiezriy : false;
+   public boolean isBonusChestEnabled() {
+      return !this.isDebug() && !this.isHardcore() ? this.hasBonusChest : false;
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_ujmxtpie Lnet/minecraft/unmapped/C_hypraqfe;m_ujmxtpie(Lnet/minecraft/unmapped/C_njsjipmy;)V}
+    * @mapping {@literal named setContext Lnet/minecraft/client/world/WorldCreator;setContext(Lnet/minecraft/client/world/WorldCreationContext;)V}
     */
-   public void m_ujmxtpie(WorldCreationContext arg) {
-      this.context = arg;
-      this.m_qwzkvgzg();
+   public void setContext(WorldCreationContext context) {
+      this.context = context;
+      this.updateWorldTypeLists();
       this.generate();
    }
 
@@ -314,26 +338,29 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_zbhcqcxd Lnet/minecraft/unmapped/C_hypraqfe;m_zbhcqcxd(Lnet/minecraft/unmapped/C_njsjipmy$C_iucotkie;)V}
+    * @mapping {@literal named updateContext Lnet/minecraft/client/world/WorldCreator;updateContext(Lnet/minecraft/client/world/WorldCreationContext$DimensionsUpdater;)V}
     */
-   public void m_zbhcqcxd(WorldCreationContext.C_iucotkie arg) {
-      this.context = this.context.m_zvxwfsao(arg);
+   public void updateContext(WorldCreationContext.DimensionsUpdater dimensionsUpdater) {
+      this.context = this.context.create(dimensionsUpdater);
       this.generate();
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_detzuxbw Lnet/minecraft/unmapped/C_hypraqfe;m_detzuxbw(Lnet/minecraft/unmapped/C_yknpgzdr;)Z}
+    * @mapping {@literal named updateContext Lnet/minecraft/client/world/WorldCreator;updateContext(Lnet/minecraft/server/world/FeatureAndDataSettings;)Z}
     */
-   protected boolean m_detzuxbw(FeatureAndDataSettings arg) {
+   protected boolean updateContext(FeatureAndDataSettings featureAndDataSettings) {
       FeatureAndDataSettings lv = this.context.dataConfiguration();
-      if (lv.dataPacks().getEnabled().equals(arg.dataPacks().getEnabled()) && lv.enabledFeatures().equals(arg.enabledFeatures())) {
+      if (lv.dataPacks().getEnabled().equals(featureAndDataSettings.dataPacks().getEnabled())
+         && lv.enabledFeatures().equals(featureAndDataSettings.enabledFeatures())) {
          this.context = new WorldCreationContext(
             this.context.options(),
             this.context.datapackDimensions(),
             this.context.selectedDimensions(),
             this.context.worldgenRegistries(),
             this.context.resources(),
-            arg
+            featureAndDataSettings
          );
          return true;
       } else {
@@ -342,28 +369,31 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_lxkbugsk Lnet/minecraft/unmapped/C_hypraqfe;m_lxkbugsk()Z}
+    * @mapping {@literal named isDebug Lnet/minecraft/client/world/WorldCreator;isDebug()Z}
     */
-   public boolean m_lxkbugsk() {
+   public boolean isDebug() {
       return this.context.selectedDimensions().isDebug();
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_gythbeko Lnet/minecraft/unmapped/C_hypraqfe;m_gythbeko(Lnet/minecraft/unmapped/C_hypraqfe$C_jbuehfan;)V}
+    * @mapping {@literal named setWorldType Lnet/minecraft/client/world/WorldCreator;setWorldType(Lnet/minecraft/client/world/WorldCreator$WorldTypeEntry;)V}
     */
-   public void m_gythbeko(WorldCreator.C_jbuehfan arg) {
-      this.f_mxgdqqgs = arg;
-      Holder<GeneratorType> lv = arg.preset();
+   public void setWorldType(WorldCreator.WorldTypeEntry worldType) {
+      this.worldType = worldType;
+      Holder<GeneratorType> lv = worldType.preset();
       if (lv != null) {
-         this.m_zbhcqcxd((arg2, arg3) -> lv.value().m_tpfjotrl());
+         this.updateContext((registryManager, worldDimensions) -> lv.value().getWorldDimensions());
       }
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_dmnnomne Lnet/minecraft/unmapped/C_hypraqfe;m_dmnnomne()Lnet/minecraft/unmapped/C_hypraqfe$C_jbuehfan;}
+    * @mapping {@literal named getWorldType Lnet/minecraft/client/world/WorldCreator;getWorldType()Lnet/minecraft/client/world/WorldCreator$WorldTypeEntry;}
     */
-   public WorldCreator.C_jbuehfan m_dmnnomne() {
-      return this.f_mxgdqqgs;
+   public WorldCreator.WorldTypeEntry getWorldType() {
+      return this.worldType;
    }
 
    /**
@@ -372,61 +402,67 @@
     */
    @Nullable
    public WorldScreenProvider getScreenProvider() {
-      Holder<GeneratorType> lv = this.m_dmnnomne().preset();
+      Holder<GeneratorType> lv = this.getWorldType().preset();
       return lv != null ? (WorldScreenProvider)WorldScreenProvider.WORLD_PRESET_TO_SCREEN_PROVIDER.get(lv.getKey()) : null;
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_cavqkcak Lnet/minecraft/unmapped/C_hypraqfe;m_cavqkcak()Ljava/util/List;}
+    * @mapping {@literal named getNormalWorldTypes Lnet/minecraft/client/world/WorldCreator;getNormalWorldTypes()Ljava/util/List;}
     */
-   public List<WorldCreator.C_jbuehfan> m_cavqkcak() {
-      return this.f_doyaxhqe;
+   public List<WorldCreator.WorldTypeEntry> getNormalWorldTypes() {
+      return this.normalWorldTypes;
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_xzgmbgqy Lnet/minecraft/unmapped/C_hypraqfe;m_xzgmbgqy()Ljava/util/List;}
+    * @mapping {@literal named getExtendedWorldTypes Lnet/minecraft/client/world/WorldCreator;getExtendedWorldTypes()Ljava/util/List;}
     */
-   public List<WorldCreator.C_jbuehfan> m_xzgmbgqy() {
-      return this.f_sleyatvc;
+   public List<WorldCreator.WorldTypeEntry> getExtendedWorldTypes() {
+      return this.extendedWorldTypes;
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_qwzkvgzg Lnet/minecraft/unmapped/C_hypraqfe;m_qwzkvgzg()V}
+    * @mapping {@literal named updateWorldTypeLists Lnet/minecraft/client/world/WorldCreator;updateWorldTypeLists()V}
     */
-   private void m_qwzkvgzg() {
+   private void updateWorldTypeLists() {
       Registry<GeneratorType> lv = this.getContext().getWorldgenRegistryManager().get(RegistryKeys.GENERATOR_TYPE);
-      this.f_doyaxhqe.clear();
-      this.f_doyaxhqe.addAll((Collection)m_kunocypt(lv, WorldPresetTags.NORMAL).orElseGet(() -> lv.holders().map(WorldCreator.C_jbuehfan::new).toList()));
-      this.f_sleyatvc.clear();
-      this.f_sleyatvc.addAll((Collection)m_kunocypt(lv, WorldPresetTags.EXTENDED).orElse(this.f_doyaxhqe));
-      Holder<GeneratorType> lv2 = this.f_mxgdqqgs.preset();
+      this.normalWorldTypes.clear();
+      this.normalWorldTypes
+         .addAll((Collection)getWorldPresetList(lv, WorldPresetTags.NORMAL).orElseGet(() -> lv.holders().map(WorldCreator.WorldTypeEntry::new).toList()));
+      this.extendedWorldTypes.clear();
+      this.extendedWorldTypes.addAll((Collection)getWorldPresetList(lv, WorldPresetTags.EXTENDED).orElse(this.normalWorldTypes));
+      Holder<GeneratorType> lv2 = this.worldType.preset();
       if (lv2 != null) {
-         this.f_mxgdqqgs = (WorldCreator.C_jbuehfan)m_dvqxcggy(this.getContext(), lv2.getKey())
-            .map(WorldCreator.C_jbuehfan::new)
-            .orElse((WorldCreator.C_jbuehfan)this.f_doyaxhqe.get(0));
+         this.worldType = (WorldCreator.WorldTypeEntry)getWorldPreset(this.getContext(), lv2.getKey())
+            .map(WorldCreator.WorldTypeEntry::new)
+            .orElse((WorldCreator.WorldTypeEntry)this.normalWorldTypes.get(0));
       }
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_dvqxcggy Lnet/minecraft/unmapped/C_hypraqfe;m_dvqxcggy(Lnet/minecraft/unmapped/C_njsjipmy;Ljava/util/Optional;)Ljava/util/Optional;}
+    * @mapping {@literal named getWorldPreset Lnet/minecraft/client/world/WorldCreator;getWorldPreset(Lnet/minecraft/client/world/WorldCreationContext;Ljava/util/Optional;)Ljava/util/Optional;}
     */
-   private static Optional<Holder<GeneratorType>> m_dvqxcggy(WorldCreationContext arg, Optional<RegistryKey<GeneratorType>> optional) {
-      return optional.flatMap(registryKey -> arg.getWorldgenRegistryManager().get(RegistryKeys.GENERATOR_TYPE).getHolder(registryKey));
+   private static Optional<Holder<GeneratorType>> getWorldPreset(WorldCreationContext context, Optional<RegistryKey<GeneratorType>> generatorType) {
+      return generatorType.flatMap(registryKey -> context.getWorldgenRegistryManager().get(RegistryKeys.GENERATOR_TYPE).getHolder(registryKey));
    }
 
    /**
     * @mapping {@literal hashed m_kunocypt Lnet/minecraft/unmapped/C_hypraqfe;m_kunocypt(Lnet/minecraft/unmapped/C_tqxyjqsk;Lnet/minecraft/unmapped/C_ednuhnnn;)Ljava/util/Optional;}
-    * @mapping {@literal named m_kunocypt Lnet/minecraft/client/world/WorldCreator;m_kunocypt(Lnet/minecraft/registry/Registry;Lnet/minecraft/registry/tag/TagKey;)Ljava/util/Optional;}
+    * @mapping {@literal named getWorldPresetList Lnet/minecraft/client/world/WorldCreator;getWorldPresetList(Lnet/minecraft/registry/Registry;Lnet/minecraft/registry/tag/TagKey;)Ljava/util/Optional;}
     */
-   private static Optional<List<WorldCreator.C_jbuehfan>> m_kunocypt(Registry<GeneratorType> registry, TagKey<GeneratorType> arg2) {
-      return registry.getTag(arg2).map(arg -> arg.stream().map(WorldCreator.C_jbuehfan::new).toList()).filter(list -> !list.isEmpty());
+   private static Optional<List<WorldCreator.WorldTypeEntry>> getWorldPresetList(Registry<GeneratorType> registry, TagKey<GeneratorType> tag) {
+      return registry.getTag(tag).map(set -> set.stream().map(WorldCreator.WorldTypeEntry::new).toList()).filter(list -> !list.isEmpty());
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_vgkmaenv Lnet/minecraft/unmapped/C_hypraqfe;m_vgkmaenv(Lnet/minecraft/unmapped/C_xmldumst;)V}
+    * @mapping {@literal named setGameRules Lnet/minecraft/client/world/WorldCreator;setGameRules(Lnet/minecraft/world/GameRules;)V}
     */
-   public void m_vgkmaenv(GameRules arg) {
-      this.f_mlubojta = arg;
+   public void setGameRules(GameRules rules) {
+      this.gameRules = rules;
       this.generate();
    }
 
@@ -435,36 +471,7 @@
     * @mapping {@literal named getGameRules Lnet/minecraft/client/world/WorldCreator;getGameRules()Lnet/minecraft/world/GameRules;}
     */
    public GameRules getGameRules() {
-      return this.f_mlubojta;
-   }
-
-   /**
-    * @mapping {@literal hashed net/minecraft/unmapped/C_hypraqfe$C_jbuehfan}
-    * @mapping {@literal named net/minecraft/client/world/WorldCreator$C_jbuehfan}
-    */
-   @Environment(EnvType.CLIENT)
-   public static record C_jbuehfan(@Nullable Holder<GeneratorType> preset) {
-      /**
-       * Mapping not found
-       */
-      private static final Text f_yohsehtx = Text.translatable("generator.custom");
-
-      /**
-       * Mapping not found
-       */
-      public Text m_aylbuvaw() {
-         return (Text)Optional.ofNullable(this.preset)
-            .flatMap(Holder::getKey)
-            .map(registryKey -> Text.translatable(registryKey.getValue().toTranslationKey("generator")))
-            .orElse(f_yohsehtx);
-      }
-
-      /**
-       * Mapping not found
-       */
-      public boolean m_ttszxefp() {
-         return Optional.ofNullable(this.preset).flatMap(Holder::getKey).filter(registryKey -> registryKey.equals(GeneratorTypes.AMPLIFIED)).isPresent();
-      }
+      return this.gameRules;
    }
 
    /**
@@ -500,13 +507,15 @@
        */
       public final net.minecraft.world.GameMode mode;
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_imjydtow Lnet/minecraft/unmapped/C_hypraqfe$C_ohbtvxdv;f_imjydtow:Lnet/minecraft/unmapped/C_rdaqiwdt;}
+       * @mapping {@literal named name Lnet/minecraft/client/world/WorldCreator$GameMode;name:Lnet/minecraft/text/Text;}
        */
-      public final Text f_imjydtow;
+      public final Text name;
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_gteudrds Lnet/minecraft/unmapped/C_hypraqfe$C_ohbtvxdv;f_gteudrds:Lnet/minecraft/unmapped/C_rdaqiwdt;}
+       * @mapping {@literal named info Lnet/minecraft/client/world/WorldCreator$GameMode;info:Lnet/minecraft/text/Text;}
        */
-      private final Text f_gteudrds;
+      private final Text info;
 
       /**
        * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_hypraqfe$C_ohbtvxdv;<init>(Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/unmapped/C_lghcpyvl;)V}
@@ -514,8 +523,8 @@
        */
       private GameMode(String name, net.minecraft.world.GameMode mode) {
          this.mode = mode;
-         this.f_imjydtow = Text.translatable("selectWorld.gameMode." + name);
-         this.f_gteudrds = Text.translatable("selectWorld.gameMode." + name + ".info");
+         this.name = Text.translatable("selectWorld.gameMode." + name);
+         this.info = Text.translatable("selectWorld.gameMode." + name + ".info");
       }
 
       /**
@@ -523,7 +532,39 @@
        * @mapping {@literal named getInfo Lnet/minecraft/client/world/WorldCreator$GameMode;getInfo()Lnet/minecraft/text/Text;}
        */
       public Text getInfo() {
-         return this.f_gteudrds;
+         return this.info;
+      }
+   }
+
+   /**
+    * @mapping {@literal hashed net/minecraft/unmapped/C_hypraqfe$C_jbuehfan}
+    * @mapping {@literal named net/minecraft/client/world/WorldCreator$WorldTypeEntry}
+    */
+   @Environment(EnvType.CLIENT)
+   public static record WorldTypeEntry(@Nullable Holder<GeneratorType> preset) {
+      /**
+       * @mapping {@literal hashed f_yohsehtx Lnet/minecraft/unmapped/C_hypraqfe$C_jbuehfan;f_yohsehtx:Lnet/minecraft/unmapped/C_rdaqiwdt;}
+       * @mapping {@literal named CUSTOM Lnet/minecraft/client/world/WorldCreator$WorldTypeEntry;CUSTOM:Lnet/minecraft/text/Text;}
+       */
+      private static final Text CUSTOM = Text.translatable("generator.custom");
+
+      /**
+       * @mapping {@literal hashed m_aylbuvaw Lnet/minecraft/unmapped/C_hypraqfe$C_jbuehfan;m_aylbuvaw()Lnet/minecraft/unmapped/C_rdaqiwdt;}
+       * @mapping {@literal named getName Lnet/minecraft/client/world/WorldCreator$WorldTypeEntry;getName()Lnet/minecraft/text/Text;}
+       */
+      public Text getName() {
+         return (Text)Optional.ofNullable(this.preset)
+            .flatMap(Holder::getKey)
+            .map(registryKey -> Text.translatable(registryKey.getValue().toTranslationKey("generator")))
+            .orElse(CUSTOM);
+      }
+
+      /**
+       * @mapping {@literal hashed m_ttszxefp Lnet/minecraft/unmapped/C_hypraqfe$C_jbuehfan;m_ttszxefp()Z}
+       * @mapping {@literal named isAmplified Lnet/minecraft/client/world/WorldCreator$WorldTypeEntry;isAmplified()Z}
+       */
+      public boolean isAmplified() {
+         return Optional.ofNullable(this.preset).flatMap(Holder::getKey).filter(registryKey -> registryKey.equals(GeneratorTypes.AMPLIFIED)).isPresent();
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/item/ArmorItem.java namedSrc/net/minecraft/item/ArmorItem.java
--- namedTargetSrc/net/minecraft/item/ArmorItem.java	2023-07-28 17:34:23.632987273 +0000
+++ namedSrc/net/minecraft/item/ArmorItem.java	2023-07-28 17:32:41.106391581 +0000
@@ -6,8 +6,8 @@
 import java.util.EnumMap;
 import java.util.List;
 import java.util.UUID;
-import net.minecraft.block.DispenserBlock;
 import net.minecraft.block.dispenser.DispenserBehavior;
+import net.minecraft.block.dispenser.DispenserBlock;
 import net.minecraft.block.dispenser.ItemDispenserBehavior;
 import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.entity.LivingEntity;
diff -bur namedTargetSrc/net/minecraft/item/ElytraItem.java namedSrc/net/minecraft/item/ElytraItem.java
--- namedTargetSrc/net/minecraft/item/ElytraItem.java	2023-07-28 17:34:23.628987172 +0000
+++ namedSrc/net/minecraft/item/ElytraItem.java	2023-07-28 17:32:41.102391479 +0000
@@ -1,6 +1,6 @@
 package net.minecraft.item;
 
-import net.minecraft.block.DispenserBlock;
+import net.minecraft.block.dispenser.DispenserBlock;
 import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.sound.SoundEvent;
diff -bur namedTargetSrc/net/minecraft/item/HangingSignItem.java namedSrc/net/minecraft/item/HangingSignItem.java
--- namedTargetSrc/net/minecraft/item/HangingSignItem.java	2023-07-28 17:34:23.612986767 +0000
+++ namedSrc/net/minecraft/item/HangingSignItem.java	2023-07-28 17:32:41.086391073 +0000
@@ -2,7 +2,7 @@
 
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
-import net.minecraft.block.WallHangingSignBlock;
+import net.minecraft.block.sign.WallHangingSignBlock;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.world.WorldView;
diff -bur namedTargetSrc/net/minecraft/item/MinecartItem.java namedSrc/net/minecraft/item/MinecartItem.java
--- namedTargetSrc/net/minecraft/item/MinecartItem.java	2023-07-28 17:34:23.680988488 +0000
+++ namedSrc/net/minecraft/item/MinecartItem.java	2023-07-28 17:32:41.166393105 +0000
@@ -2,8 +2,8 @@
 
 import net.minecraft.block.AbstractRailBlock;
 import net.minecraft.block.BlockState;
-import net.minecraft.block.DispenserBlock;
 import net.minecraft.block.dispenser.DispenserBehavior;
+import net.minecraft.block.dispenser.DispenserBlock;
 import net.minecraft.block.dispenser.ItemDispenserBehavior;
 import net.minecraft.block.enums.RailShape;
 import net.minecraft.entity.vehicle.AbstractMinecartEntity;
diff -bur namedTargetSrc/net/minecraft/item/ShieldItem.java namedSrc/net/minecraft/item/ShieldItem.java
--- namedTargetSrc/net/minecraft/item/ShieldItem.java	2023-07-28 17:34:23.688988691 +0000
+++ namedSrc/net/minecraft/item/ShieldItem.java	2023-07-28 17:32:41.174393308 +0000
@@ -1,7 +1,7 @@
 package net.minecraft.item;
 
 import java.util.List;
-import net.minecraft.block.DispenserBlock;
+import net.minecraft.block.dispenser.DispenserBlock;
 import net.minecraft.client.item.TooltipContext;
 import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.entity.player.PlayerEntity;
diff -bur namedTargetSrc/net/minecraft/item/SignItem.java namedSrc/net/minecraft/item/SignItem.java
--- namedTargetSrc/net/minecraft/item/SignItem.java	2023-07-28 17:34:23.572985754 +0000
+++ namedSrc/net/minecraft/item/SignItem.java	2023-07-28 17:32:41.030389651 +0000
@@ -1,10 +1,10 @@
 package net.minecraft.item;
 
-import net.minecraft.block.AbstractSignBlock;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.block.entity.SignBlockEntity;
+import net.minecraft.block.sign.AbstractSignBlock;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
diff -bur namedTargetSrc/net/minecraft/server/dedicated/ServerPropertiesHandler.java namedSrc/net/minecraft/server/dedicated/ServerPropertiesHandler.java
--- namedTargetSrc/net/minecraft/server/dedicated/ServerPropertiesHandler.java	2023-07-28 17:34:23.572985754 +0000
+++ namedSrc/net/minecraft/server/dedicated/ServerPropertiesHandler.java	2023-07-28 17:32:41.030389651 +0000
@@ -478,7 +478,7 @@
                ServerPropertiesHandler.LOGGER.warn("Failed to parse level-type {}, defaulting to {}", this.generatorTypeId, lv2.getRegistryKey().getValue());
                return lv2;
             });
-         WorldDimensions lv4 = lv3.value().m_tpfjotrl();
+         WorldDimensions lv4 = lv3.value().getWorldDimensions();
          if (lv3.isRegistryKey(GeneratorTypes.FLAT)) {
             RegistryOps<JsonElement> lv5 = RegistryOps.create(JsonOps.INSTANCE, registryManager);
             Optional<FlatChunkGeneratorConfig> optional = FlatChunkGeneratorConfig.CODEC
diff -bur namedTargetSrc/net/minecraft/server/Main.java namedSrc/net/minecraft/server/Main.java
--- namedTargetSrc/net/minecraft/server/Main.java	2023-07-28 17:34:23.660987982 +0000
+++ namedSrc/net/minecraft/server/Main.java	2023-07-28 17:32:41.142392495 +0000
@@ -178,7 +178,7 @@
                               if (optionSet.has(optionSpec3)) {
                                  lv6x = MinecraftServer.DEMO_LEVEL_INFO;
                                  lv7x = WorldGeneratorOptions.DEFAULT;
-                                 lv4 = GeneratorTypes.m_grmkvtyw(arg3x.datapackWorldgen());
+                                 lv4 = GeneratorTypes.getWorldDimensions(arg3x.datapackWorldgen());
                               } else {
                                  ServerPropertiesHandler lv5x = lv.getPropertiesHandler();
                                  lv6x = new WorldInfo(
diff -bur namedTargetSrc/net/minecraft/state/properties/RotationSegment.java namedSrc/net/minecraft/state/properties/RotationSegment.java
--- namedTargetSrc/net/minecraft/state/properties/RotationSegment.java	2023-07-28 17:34:23.608986665 +0000
+++ namedSrc/net/minecraft/state/properties/RotationSegment.java	2023-07-28 17:32:41.082390971 +0000
@@ -17,7 +17,7 @@
     * @mapping {@literal hashed f_pxnbzxcs Lnet/minecraft/unmapped/C_bxkfmpse;f_pxnbzxcs:I}
     * @mapping {@literal named MAX_SEGMENT_INDEX Lnet/minecraft/state/properties/RotationSegment;MAX_SEGMENT_INDEX:I}
     */
-   private static final int MAX_SEGMENT_INDEX = f_waebpyul.m_cvwweghh();
+   private static final int MAX_SEGMENT_INDEX = f_waebpyul.getMask();
    /**
     * @mapping {@literal hashed f_refqeyqb Lnet/minecraft/unmapped/C_bxkfmpse;f_refqeyqb:I}
     * @mapping {@literal named NORTH Lnet/minecraft/state/properties/RotationSegment;NORTH:I}
@@ -52,7 +52,7 @@
     * @mapping {@literal named convertToSegment Lnet/minecraft/state/properties/RotationSegment;convertToSegment(Lnet/minecraft/util/math/Direction;)I}
     */
    public static int convertToSegment(Direction direction) {
-      return f_waebpyul.m_wuuhudnn(direction);
+      return f_waebpyul.toRotation(direction);
    }
 
    /**
@@ -60,7 +60,7 @@
     * @mapping {@literal named convertToSegment Lnet/minecraft/state/properties/RotationSegment;convertToSegment(F)I}
     */
    public static int convertToSegment(float angle) {
-      return f_waebpyul.m_mafvibbu(angle);
+      return f_waebpyul.toClampedRotation(angle);
    }
 
    /**
@@ -83,6 +83,6 @@
     * @mapping {@literal named convertToAngle Lnet/minecraft/state/properties/RotationSegment;convertToAngle(I)F}
     */
    public static float convertToAngle(int segment) {
-      return f_waebpyul.m_zlufpqdr(segment);
+      return f_waebpyul.toWrappedDegrees(segment);
    }
 }
diff -bur namedTargetSrc/net/minecraft/structure/JungleTempleGenerator.java namedSrc/net/minecraft/structure/JungleTempleGenerator.java
--- namedTargetSrc/net/minecraft/structure/JungleTempleGenerator.java	2023-07-28 17:34:23.524984539 +0000
+++ namedSrc/net/minecraft/structure/JungleTempleGenerator.java	2023-07-28 17:32:40.970388127 +0000
@@ -3,7 +3,6 @@
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
 import net.minecraft.block.LeverBlock;
-import net.minecraft.block.PistonBlock;
 import net.minecraft.block.RedstoneWireBlock;
 import net.minecraft.block.RepeaterBlock;
 import net.minecraft.block.StairsBlock;
@@ -12,6 +11,7 @@
 import net.minecraft.block.VineBlock;
 import net.minecraft.block.enums.WallMountLocation;
 import net.minecraft.block.enums.WireConnection;
+import net.minecraft.block.piston.PistonBlock;
 import net.minecraft.loot.LootTables;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.structure.piece.StructurePiece;
diff -bur namedTargetSrc/net/minecraft/structure/piece/StructurePiece.java namedSrc/net/minecraft/structure/piece/StructurePiece.java
--- namedTargetSrc/net/minecraft/structure/piece/StructurePiece.java	2023-07-28 17:34:23.592986260 +0000
+++ namedSrc/net/minecraft/structure/piece/StructurePiece.java	2023-07-28 17:32:41.058390362 +0000
@@ -8,8 +8,8 @@
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
-import net.minecraft.block.DispenserBlock;
 import net.minecraft.block.HorizontalFacingBlock;
+import net.minecraft.block.dispenser.DispenserBlock;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.block.entity.ChestBlockEntity;
 import net.minecraft.block.entity.DispenserBlockEntity;
diff -bur namedTargetSrc/net/minecraft/test/TestServer.java namedSrc/net/minecraft/test/TestServer.java
--- namedTargetSrc/net/minecraft/test/TestServer.java	2023-07-28 17:34:23.600986463 +0000
+++ namedSrc/net/minecraft/test/TestServer.java	2023-07-28 17:32:41.070390667 +0000
@@ -128,7 +128,7 @@
                               .get(RegistryKeys.GENERATOR_TYPE)
                               .getHolderOrThrow(GeneratorTypes.FLAT)
                               .value()
-                              .m_tpfjotrl()
+                              .getWorldDimensions()
                               .bake(lvx);
                            return new WorldLoader.DataLoadOutput<>(
                               new WorldSaveProperties(lv2, WORLD_GENERATOR_OPTIONS, lv2x.specialWorldProperty(), lv2x.getLifecycle()), lv2x.toRegistryManager()
Only in namedTargetSrc/net/minecraft/unmapped: C_czisrdmd.java
Only in namedTargetSrc/net/minecraft/unmapped: C_znpzgoww.java
diff -bur namedTargetSrc/net/minecraft/util/Graph.java namedSrc/net/minecraft/util/Graph.java
--- namedTargetSrc/net/minecraft/util/Graph.java	2023-07-28 17:34:23.576985855 +0000
+++ namedSrc/net/minecraft/util/Graph.java	2023-07-28 17:32:41.038389854 +0000
@@ -20,23 +20,23 @@
     * @mapping {@literal hashed m_wjyvsern Lnet/minecraft/unmapped/C_yrmbvdfi;m_wjyvsern(Ljava/util/Map;Ljava/util/Set;Ljava/util/Set;Ljava/util/function/Consumer;Ljava/lang/Object;)Z}
     * @mapping {@literal named depthFirstSearch Lnet/minecraft/util/Graph;depthFirstSearch(Ljava/util/Map;Ljava/util/Set;Ljava/util/Set;Ljava/util/function/Consumer;Ljava/lang/Object;)Z}
     */
-   public static <T> boolean depthFirstSearch(Map<T, Set<T>> map, Set<T> set, Set<T> set2, Consumer<T> consumer, T object) {
-      if (set.contains(object)) {
+   public static <T> boolean depthFirstSearch(Map<T, Set<T>> successors, Set<T> visited, Set<T> visiting, Consumer<T> reversedOrderConsumer, T now) {
+      if (visited.contains(now)) {
          return false;
-      } else if (set2.contains(object)) {
+      } else if (visiting.contains(now)) {
          return true;
       } else {
-         set2.add(object);
+         visiting.add(now);
 
-         for (T object2 : (Set)map.getOrDefault(object, ImmutableSet.of())) {
-            if (depthFirstSearch(map, set, set2, consumer, object2)) {
+         for (T object2 : (Set)successors.getOrDefault(now, ImmutableSet.of())) {
+            if (depthFirstSearch(successors, visited, visiting, reversedOrderConsumer, object2)) {
                return true;
             }
          }
 
-         set2.remove(object);
-         set.add(object);
-         consumer.accept(object);
+         visiting.remove(now);
+         visited.add(now);
+         reversedOrderConsumer.accept(now);
          return false;
       }
    }


The remaining diff is too long!

Please sign in to comment.