Skip to content

Commit

Permalink
*nearly* polish off net.minecraft.server (#454)
Browse files Browse the repository at this point in the history 
* some mapping

* more wip mappings

* update 3

* update 4: locate biome!

* revert enigma update

* whoops forgot a file

* fix errors

* Update mappings/net/minecraft/server/network/ServerPlayerEntity.mapping

Co-authored-by: LambdAurora <[email protected]>

* Update mappings/net/minecraft/entity/Entity.mapping

Co-authored-by: LambdAurora <[email protected]>

* address review comments

---------

Co-authored-by: LambdAurora <[email protected]>
  • Loading branch information
@ix0rai @LambdAurora
ix0rai and LambdAurora authored Jul 1, 2023
1 parent 8b57baa commit 83b3b24
Show file tree
Hide file tree
Showing 43 changed files with 388 additions and 11 deletions.
4 changes: 4 additions & 0 deletions mappings/net/minecraft/advancement/AdvancementVisibilityEvaluator.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
CLASS net/minecraft/unmapped/C_hrhneqyx net/minecraft/advancement/AdvancementVisibilityEvaluator
METHOD m_exegzdua (Lnet/minecraft/unmapped/C_kdwyuhdb;Z)Lnet/minecraft/unmapped/C_hrhneqyx$C_bfuhkkvt;
ARG 0 advancement
ARG 1 alwaysShowIfPossible
4 changes: 4 additions & 0 deletions mappings/net/minecraft/advancement/PlayerAdvancementTracker.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,16 @@ CLASS net/minecraft/unmapped/C_hyeqtgvx net/minecraft/advancement/PlayerAdvancem
METHOD m_pfzhwboq initProgress (Lnet/minecraft/unmapped/C_kdwyuhdb;Lnet/minecraft/unmapped/C_rpzbknxp;)V
ARG 1 advancement
ARG 2 progress
METHOD m_pptrdaxw (Lnet/minecraft/unmapped/C_kdwyuhdb;)V
ARG 1 advancement
METHOD m_qiwsgxef beginTracking (Lnet/minecraft/unmapped/C_kdwyuhdb;)V
ARG 1 advancement
METHOD m_rsgkbelj load (Lnet/minecraft/unmapped/C_fktoyupt;)V
ARG 1 advancementLoader
METHOD m_yjaqlufb beginTrackingAllAdvancements (Lnet/minecraft/unmapped/C_fktoyupt;)V
ARG 1 advancementLoader
METHOD m_ysccbrhp (Lnet/minecraft/unmapped/C_fktoyupt;Ljava/util/Map$Entry;)V
ARG 2 entry
METHOD m_ywfhjcpi grantCriterion (Lnet/minecraft/unmapped/C_kdwyuhdb;Ljava/lang/String;)Z
ARG 1 advancement
ARG 2 criterionName
Expand Down
2 changes: 2 additions & 0 deletions mappings/net/minecraft/block/AbstractBlock.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock
ARG 2 mirror
METHOD m_tgwcmyam getDroppedStacks (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_nzsnkdtl$C_oqhigtaq;)Ljava/util/List;
ARG 1 state
ARG 2 lootParameterBuilder
METHOD m_tmlkosuh neighborUpdate (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_hynzadkk;Z)V
ARG 1 state
ARG 2 world
Expand Down Expand Up @@ -388,6 +389,7 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock
ARG 2 blockStatePredicate
COMMENT the block state predicate to match against
METHOD m_meigdamn getDroppedStacks (Lnet/minecraft/unmapped/C_nzsnkdtl$C_oqhigtaq;)Ljava/util/List;
ARG 1 lootParameterBuilder
METHOD m_mheuwasn scheduledTick (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_rlomrsco;)V
ARG 1 world
ARG 2 pos
Expand Down
3 changes: 3 additions & 0 deletions mappings/net/minecraft/block/DecoratedPotBlock.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ CLASS net/minecraft/unmapped/C_bnspifpc net/minecraft/block/DecoratedPotBlock
FIELD f_cjrquyuv CRACKED Lnet/minecraft/unmapped/C_xhwijdsd;
FIELD f_egywafcb WATERLOGGED Lnet/minecraft/unmapped/C_xhwijdsd;
FIELD f_fehlkmmz FACING Lnet/minecraft/unmapped/C_tcujuvjb;
FIELD f_tohwohru SHERDS Lnet/minecraft/unmapped/C_ncpywfca;
FIELD f_xkbierxx SHAPE Lnet/minecraft/unmapped/C_zscvhwbd;
METHOD m_ohbemeep (Ljava/util/List;Lnet/minecraft/unmapped/C_vorddnax;)V
ARG 1 item
METHOD m_saxfcody (Lnet/minecraft/unmapped/C_snnddtnv;Ljava/util/function/Consumer;)V
ARG 1 consumer
3 changes: 3 additions & 0 deletions mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ CLASS net/minecraft/unmapped/C_bfrzytnu net/minecraft/block/entity/StructureBloc
ARG 1 pos
METHOD m_fkacmxuv place (Lnet/minecraft/unmapped/C_bdwnwhiu;ZLnet/minecraft/unmapped/C_abvlwuej;)Z
ARG 1 world
ARG 2 mustMatchSize
ARG 3 structure
METHOD m_foojekdb (Lnet/minecraft/unmapped/C_kvegafmh;)Z
ARG 0 blockEntity
Expand Down Expand Up @@ -60,6 +61,7 @@ CLASS net/minecraft/unmapped/C_bfrzytnu net/minecraft/block/entity/StructureBloc
METHOD m_mgveadpg setShowBoundingBox (Z)V
ARG 1 showBoundingBox
METHOD m_mjmqymso saveStructure (Z)Z
ARG 1 saveToTemplateManager
METHOD m_ngzpofdm updateBlockMode ()V
METHOD m_ocgsmzzf getSize ()Lnet/minecraft/unmapped/C_ceivtqhh;
METHOD m_ohdbwume shouldShowBoundingBox ()Z
Expand Down Expand Up @@ -96,6 +98,7 @@ CLASS net/minecraft/unmapped/C_bfrzytnu net/minecraft/block/entity/StructureBloc
METHOD m_yysglcxw getMirror ()Lnet/minecraft/unmapped/C_qomzaqud;
METHOD m_zecrtggw loadStructure (Lnet/minecraft/unmapped/C_bdwnwhiu;Z)Z
ARG 1 world
ARG 2 mustMatchSize
METHOD m_zjifcxyj unloadStructure ()V
METHOD m_zjuwopzo loadStructure (Lnet/minecraft/unmapped/C_bdwnwhiu;)Z
ARG 1 world
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/block/enums/NoteBlockInstrument.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ CLASS net/minecraft/unmapped/C_onjtjtsi net/minecraft/block/enums/NoteBlockInstr
METHOD m_fpitbupy isSourceCustom ()Z
METHOD m_iiibjwbs isSourceBaseBlock ()Z
METHOD m_khokobjm getSound ()Lnet/minecraft/unmapped/C_cjzoxshv;
METHOD m_yesjwtta canPlayAboveNoteBlock ()Z
CLASS C_pixccosc SourceType
2 changes: 1 addition & 1 deletion mappings/net/minecraft/entity/Entity.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity
METHOD m_bzrtaquy getVehicle ()Lnet/minecraft/unmapped/C_astfners;
METHOD m_bzveerey collides ()Z
METHOD m_cckfyxyf fall (DZLnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_hynzadkk;)V
ARG 1 heightDifference
ARG 1 fallDistance
ARG 3 onGround
ARG 4 landedState
ARG 5 landedPosition
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/network/encryption/PublicChatSession.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ CLASS net/minecraft/unmapped/C_sdodhjzp net/minecraft/network/encryption/PublicC
METHOD <init> (Ljava/util/UUID;Lnet/minecraft/unmapped/C_psbzgaqf;)V
ARG 1 sessionId
ARG 2 profilePublicKey
METHOD m_ccxgkdwf isExpired ()Z
METHOD m_emmynybu createUnpacker (Ljava/util/UUID;)Lnet/minecraft/unmapped/C_bwznvpye$C_wefdvhmx;
ARG 1 sender
METHOD m_fnyxsnjf profilePublicKey ()Lnet/minecraft/unmapped/C_psbzgaqf;
Expand Down
7 changes: 7 additions & 0 deletions mappings/net/minecraft/network/encryption/SignatureValidator.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,19 @@ CLASS net/minecraft/unmapped/C_yvuwcvkm net/minecraft/network/encryption/Signatu
METHOD m_bxnidfja createPublicKeyValidator (Ljava/security/PublicKey;Ljava/lang/String;)Lnet/minecraft/unmapped/C_yvuwcvkm;
ARG 0 publicKey
ARG 1 signatureAlgorithm
METHOD m_dkohjnkg create (Lcom/mojang/authlib/yggdrasil/ServicesKeySet;Lcom/mojang/authlib/yggdrasil/ServicesKeyType;)Lnet/minecraft/unmapped/C_yvuwcvkm;
ARG 0 servicesKeySet
ARG 1 servicesKeyType
METHOD m_dwtmyptc (Lnet/minecraft/unmapped/C_bfuzddzp;[BLcom/mojang/authlib/yggdrasil/ServicesKeyInfo;)Z
ARG 0 updater
ARG 1 signature
ARG 2 info
METHOD m_lsscogpc (Lnet/minecraft/unmapped/C_bfuzddzp;[B)Z
ARG 0 updater
ARG 1 signature
METHOD m_proeokvf (Ljava/util/Collection;Lnet/minecraft/unmapped/C_bfuzddzp;[B)Z
ARG 1 updater
ARG 2 signatureBytes
METHOD m_tcepaxsm verifySignature (Lnet/minecraft/unmapped/C_bfuzddzp;[BLjava/security/Signature;)Z
ARG 0 updater
ARG 1 signatureBytes
Expand Down
5 changes: 5 additions & 0 deletions mappings/net/minecraft/registry/DynamicRegistryManager.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,14 @@ CLASS net/minecraft/unmapped/C_wqxmvzdq net/minecraft/registry/DynamicRegistryMa
ARG 1 key
METHOD m_lxobzcah fromRegistryOfRegistries (Lnet/minecraft/unmapped/C_tqxyjqsk;)Lnet/minecraft/unmapped/C_wqxmvzdq$C_ggmzysrd;
ARG 0 key
METHOD m_oaaznaix (Lnet/minecraft/unmapped/C_wqxmvzdq$C_rsrqqoeq;)Lcom/mojang/serialization/Lifecycle;
ARG 0 registry
METHOD m_sloxobqt freeze ()Lnet/minecraft/unmapped/C_wqxmvzdq$C_ggmzysrd;
METHOD m_vutgtdyk registries ()Ljava/util/stream/Stream;
METHOD m_xcyamnji getLifecycleForAllRegistries ()Lcom/mojang/serialization/Lifecycle;
CLASS C_fckcsnok
METHOD <init> (Lnet/minecraft/unmapped/C_wqxmvzdq;Ljava/util/stream/Stream;)V
ARG 2 entries
CLASS C_ggmzysrd Frozen
CLASS C_gmaxoias ImmutableRegistryManager
FIELD f_mekoridj registries Ljava/util/Map;
Expand Down
8 changes: 6 additions & 2 deletions mappings/net/minecraft/server/Main.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/server/Main
CLASS net/minecraft/server/Main net/minecraft/server/Main
FIELD f_raofjkac LOGGER Lorg/slf4j/Logger;
METHOD m_cxlmnihb createInitConfig (Lnet/minecraft/unmapped/C_kefepfwh;Lnet/minecraft/unmapped/C_bpwagnit$C_unecclfw;ZLnet/minecraft/unmapped/C_dqfyacfy;)Lnet/minecraft/unmapped/C_kjxfcecs$C_kculhjuh;
ARG 0 propertiesHandler
Expand All @@ -10,7 +10,11 @@ CLASS net/minecraft/server/Main
ARG 1 dataFixer
ARG 2 eraseCache
ARG 3 shouldContinue
METHOD m_tfvlovpc (Lnet/minecraft/unmapped/C_bpwagnit$C_unecclfw;Lnet/minecraft/unmapped/C_dqfyacfy;Lnet/minecraft/unmapped/C_tljyhzqp;Lnet/minecraft/unmapped/C_veyxvrwr;Lnet/minecraft/unmapped/C_vmxvaoqe;Ljoptsimple/OptionSet;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljava/lang/Thread;)Lnet/minecraft/unmapped/C_buaiqtuw;
ARG 12 serverThread
METHOD m_twlqdaql (Lnet/minecraft/unmapped/C_kjxfcecs$C_kculhjuh;Lnet/minecraft/unmapped/C_bpwagnit$C_unecclfw;Ljoptsimple/OptionSet;Ljoptsimple/OptionSpec;Lnet/minecraft/unmapped/C_veyxvrwr;Ljoptsimple/OptionSpec;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;
ARG 6 applyExecutor
METHOD main ([Ljava/lang/String;)V
METHOD m_wiejzgin writePid (Ljava/nio/file/Path;)V
ARG 0 path
METHOD main main ([Ljava/lang/String;)V
ARG 0 args
7 changes: 7 additions & 0 deletions mappings/net/minecraft/server/MinecraftServer.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer
METHOD m_ccqjjrlt getCommandSource ()Lnet/minecraft/unmapped/C_pennblrk;
COMMENT Creates a command source which represents this Minecraft server instance.
METHOD m_cddoazwa getSessionService ()Lcom/mojang/authlib/minecraft/MinecraftSessionService;
METHOD m_cjkzikqh sendWorldTimeUpdate (Lnet/minecraft/unmapped/C_bdwnwhiu;)V
METHOD m_cjlzmhmu getDataCommandStorage ()Lnet/minecraft/unmapped/C_hrsnudrk;
METHOD m_ckjomijt isOnlineMode ()Z
COMMENT {@return whether this Minecraft server authenticates players logging in with the
Expand All @@ -132,6 +133,8 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer
COMMENT @see net.minecraft.server.network.ServerLoginNetworkHandler
METHOD m_cpahzimu isStopping ()Z
METHOD m_cuuhdoqu syncChunkWrites ()Z
METHOD m_cvtpuakg (Lnet/minecraft/unmapped/C_lvnjxuwi;)Ljava/lang/String;
ARG 0 profile
METHOD m_dajeggfi getResourceManager ()Lnet/minecraft/unmapped/C_tmnrpasf;
METHOD m_dbtaxkzj updateMobSpawnOptions ()V
METHOD m_ddlaxvao getServerResourcePackProperties ()Ljava/util/Optional;
Expand Down Expand Up @@ -223,6 +226,7 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer
METHOD m_iiseoobd kickNonWhitelistedPlayers (Lnet/minecraft/unmapped/C_pennblrk;)V
ARG 1 source
METHOD m_imunhrtd shouldSpawnAnimals ()Z
METHOD m_ioqdmdme createSignatureValidator ()Lnet/minecraft/unmapped/C_yvuwcvkm;
METHOD m_iqernmfn requireResourcePack ()Z
METHOD m_ixudjtvq setDefaultGameMode (Lnet/minecraft/unmapped/C_lghcpyvl;)V
ARG 1 gameMode
Expand Down Expand Up @@ -290,6 +294,7 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer
ARG 0 path
METHOD m_opevzklp getDataFixer ()Lcom/mojang/datafixers/DataFixer;
METHOD m_opjlzrwc getDataPackManager ()Lnet/minecraft/unmapped/C_dqfyacfy;
METHOD m_orlnkvix syncTime ()V
METHOD m_ouowsdpz getIconFile ()Ljava/util/Optional;
METHOD m_oxkyjubk logChatMessage (Lnet/minecraft/unmapped/C_rdaqiwdt;Lnet/minecraft/unmapped/C_hasnsypd$C_iocvgdxe;Ljava/lang/String;)V
ARG 1 content
Expand All @@ -311,6 +316,8 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer
METHOD m_qekqyjho shouldBroadcastRconToOps ()Z
METHOD m_qjvaquxt getWorlds ()Ljava/lang/Iterable;
METHOD m_quqvcwgc isRemote ()Z
METHOD m_qvjtygrg (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_ebcmvjwj;Lnet/minecraft/unmapped/C_gjwbvqct;Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec;)V
ARG 3 bonusChestFeature
METHOD m_qwvotguk setHostProfile (Lcom/mojang/authlib/GameProfile;)V
COMMENT Sets the game profile of the single-player host of this server.
COMMENT <p>
Expand Down
3 changes: 3 additions & 0 deletions mappings/net/minecraft/server/ServerAdvancementLoader.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
CLASS net/minecraft/unmapped/C_fktoyupt net/minecraft/server/ServerAdvancementLoader
FIELD f_kvdcxlvl LOGGER Lorg/slf4j/Logger;
FIELD f_kzsznscx lootManager Lnet/minecraft/unmapped/C_uxsnhxlb;
FIELD f_lwpauehw GSON Lcom/google/gson/Gson;
FIELD f_vxkmvuet manager Lnet/minecraft/unmapped/C_zidtcriy;
METHOD <init> (Lnet/minecraft/unmapped/C_uxsnhxlb;)V
ARG 1 lootManager
METHOD m_blvqagoa getAdvancements ()Ljava/util/Collection;
METHOD m_mmmugsea get (Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_kdwyuhdb;
ARG 1 id
Expand Down
8 changes: 8 additions & 0 deletions mappings/net/minecraft/server/ServerReloadableResources.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
CLASS net/minecraft/unmapped/C_migzkpst net/minecraft/server/ServerReloadableResources
COMMENT Represents the server reloadable resources.
FIELD f_aafiafdg lootManager Lnet/minecraft/unmapped/C_uxsnhxlb;
FIELD f_cqvnljsk recipes Lnet/minecraft/unmapped/C_hjseusrb;
FIELD f_egatpqbd commandBuildContext Lnet/minecraft/unmapped/C_bprdujxm$C_rguunmyd;
FIELD f_izcsyrwb functions Lnet/minecraft/unmapped/C_coevuhwv;
FIELD f_jpdcebur commands Lnet/minecraft/unmapped/C_rieemtgi;
FIELD f_nupmvkrd tagLoader Lnet/minecraft/unmapped/C_urxtamub;
FIELD f_tcegvcns advancements Lnet/minecraft/unmapped/C_fktoyupt;
FIELD f_xgqmoaaw INITIAL_DATA_RELOAD_TASK Ljava/util/concurrent/CompletableFuture;
METHOD <init> (Lnet/minecraft/unmapped/C_wqxmvzdq$C_ggmzysrd;Lnet/minecraft/unmapped/C_czxxrbcp;Lnet/minecraft/unmapped/C_rieemtgi$C_vypaxkxj;I)V
ARG 1 registryManager
ARG 2 featureFlags
ARG 3 environment
ARG 4 level
METHOD m_arswxfre getCommands ()Lnet/minecraft/unmapped/C_rieemtgi;
METHOD m_bjfjrecc updateRegistryTags (Lnet/minecraft/unmapped/C_wqxmvzdq;Lnet/minecraft/unmapped/C_urxtamub$C_rbziadam;)V
ARG 0 registryManager
Expand All @@ -21,6 +27,7 @@ CLASS net/minecraft/unmapped/C_migzkpst net/minecraft/server/ServerReloadableRes
ARG 0 entry
METHOD m_phzgjlfn (Lnet/minecraft/unmapped/C_xhhleach;Ljava/util/Map$Entry;)Lnet/minecraft/unmapped/C_ednuhnnn;
ARG 1 entry
METHOD m_qhooynop getLootManager ()Lnet/minecraft/unmapped/C_uxsnhxlb;
METHOD m_qobkrmhz getReloaders ()Ljava/util/List;
COMMENT {@return the server-specific resource reloaders}
METHOD m_qzzzeens getRecipes ()Lnet/minecraft/unmapped/C_hjseusrb;
Expand All @@ -29,6 +36,7 @@ CLASS net/minecraft/unmapped/C_migzkpst net/minecraft/server/ServerReloadableRes
METHOD m_xlzbyznn loadResources (Lnet/minecraft/unmapped/C_tmnrpasf;Lnet/minecraft/unmapped/C_wqxmvzdq$C_ggmzysrd;Lnet/minecraft/unmapped/C_czxxrbcp;Lnet/minecraft/unmapped/C_rieemtgi$C_vypaxkxj;ILjava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;
ARG 0 resources
ARG 1 registry
ARG 2 featureFlags
ARG 3 environment
ARG 4 level
ARG 5 prepareExecutor
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/server/Services.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ CLASS net/minecraft/unmapped/C_vmxvaoqe net/minecraft/server/Services
METHOD equals (Ljava/lang/Object;)Z
ARG 1 o
METHOD m_fyzajpzg profileRepository ()Lcom/mojang/authlib/GameProfileRepository;
METHOD m_hduyrfue createSignatureValidator ()Lnet/minecraft/unmapped/C_yvuwcvkm;
METHOD m_hpiedqsh userCache ()Lnet/minecraft/unmapped/C_jyqwslie;
METHOD m_qgomqagb sessionService ()Lcom/mojang/authlib/minecraft/MinecraftSessionService;
METHOD m_xulfupon create (Lcom/mojang/authlib/yggdrasil/YggdrasilAuthenticationService;Ljava/io/File;)Lnet/minecraft/unmapped/C_vmxvaoqe;
Expand Down
12 changes: 12 additions & 0 deletions mappings/net/minecraft/server/WorldLoader.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,25 @@
CLASS net/minecraft/unmapped/C_kjxfcecs net/minecraft/server/WorldLoader
METHOD m_bgqlykde loadRegistryLayer (Lnet/minecraft/unmapped/C_tmnrpasf;Lnet/minecraft/unmapped/C_bcpxdrik;Lnet/minecraft/unmapped/C_tmgtemxc;Ljava/util/List;)Lnet/minecraft/unmapped/C_wqxmvzdq$C_ggmzysrd;
ARG 1 registryManager
ARG 2 registryLayer
ARG 3 decodingData
METHOD m_duxzwian (Lnet/minecraft/unmapped/C_carvbxzj;Lnet/minecraft/unmapped/C_migzkpst;Ljava/lang/Throwable;)V
ARG 2 error
METHOD m_gudxzsln withLoadedLayer (Lnet/minecraft/unmapped/C_tmnrpasf;Lnet/minecraft/unmapped/C_bcpxdrik;Lnet/minecraft/unmapped/C_tmgtemxc;Ljava/util/List;)Lnet/minecraft/unmapped/C_bcpxdrik;
ARG 1 registryManager
ARG 2 registryLayer
ARG 3 decodingData
METHOD m_tsqgbbos load (Lnet/minecraft/unmapped/C_kjxfcecs$C_kculhjuh;Lnet/minecraft/unmapped/C_kjxfcecs$C_ueybpquh;Lnet/minecraft/unmapped/C_kjxfcecs$C_cknyxhnl;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;
ARG 0 initConfig
ARG 1 loadContextSupplier
ARG 2 applierFactory
ARG 3 prepareExecutor
ARG 4 applyExecutor
CLASS C_cknyxhnl ApplierFactory
METHOD create create (Lnet/minecraft/unmapped/C_carvbxzj;Lnet/minecraft/unmapped/C_migzkpst;Lnet/minecraft/unmapped/C_bcpxdrik;Ljava/lang/Object;)Ljava/lang/Object;
ARG 3 registryManager
ARG 4 data
CLASS C_hkmknvtj DataLoadContext
CLASS C_ijyqofsr DataLoadOutput
CLASS C_kculhjuh InitConfig
FIELD f_gjusgdae environment Lnet/minecraft/unmapped/C_rieemtgi$C_vypaxkxj;
Expand All @@ -25,3 +35,5 @@ CLASS net/minecraft/unmapped/C_kjxfcecs net/minecraft/server/WorldLoader
COMMENT @return the updated data-pack settings and the resource manager
METHOD m_mifacpek packManager ()Lnet/minecraft/unmapped/C_dqfyacfy;
CLASS C_ueybpquh LoadContextSupplier
METHOD get get (Lnet/minecraft/unmapped/C_kjxfcecs$C_hkmknvtj;)Lnet/minecraft/unmapped/C_kjxfcecs$C_ijyqofsr;
ARG 1 context
5 changes: 5 additions & 0 deletions mappings/net/minecraft/server/command/DataCommand.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ CLASS net/minecraft/unmapped/C_runmekgk net/minecraft/server/command/DataCommand
FIELD f_bacblakr SOURCE_OBJECT_TYPES Ljava/util/List;
FIELD f_gqntdrbs MERGE_FAILED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType;
FIELD f_ijzhchry GET_MULTIPLE_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType;
FIELD f_jyfgqakd MODIFY_INVALID_SUBSTRING_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType;
FIELD f_kfnontvz OBJECT_TYPE_FACTORIES Ljava/util/List;
FIELD f_nibntpnd TARGET_OBJECT_TYPES Ljava/util/List;
FIELD f_oowlzkev GET_INVALID_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
Expand Down Expand Up @@ -73,6 +74,7 @@ CLASS net/minecraft/unmapped/C_runmekgk net/minecraft/server/command/DataCommand
ARG 1 type
METHOD m_sufmbujz (Lnet/minecraft/unmapped/C_runmekgk$C_zbamutva;Lnet/minecraft/unmapped/C_runmekgk$C_ceumtqan;Lcom/mojang/brigadier/context/CommandContext;)I
ARG 1 modifyOperation
ARG 2 context
METHOD m_uqnrtdyf (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
ARG 0 path
METHOD m_utjbcvev (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/unmapped/C_hhlwcnih;Lnet/minecraft/unmapped/C_xondkbcs$C_rgpfrkey;Ljava/util/List;)I
Expand Down Expand Up @@ -105,6 +107,9 @@ CLASS net/minecraft/unmapped/C_runmekgk net/minecraft/server/command/DataCommand
CLASS C_dgfqqfje ModifyArgumentCreator
METHOD create create (Lnet/minecraft/unmapped/C_runmekgk$C_ceumtqan;)Lcom/mojang/brigadier/builder/ArgumentBuilder;
ARG 1 modifier
CLASS C_gcrgsjks Processor
METHOD process process (Ljava/lang/String;)Ljava/lang/String;
ARG 1 input
CLASS C_zbamutva ObjectType
METHOD m_oelajppe addArgumentsToBuilder (Lcom/mojang/brigadier/builder/ArgumentBuilder;Ljava/util/function/Function;)Lcom/mojang/brigadier/builder/ArgumentBuilder;
ARG 1 argument
Expand Down
11 changes: 11 additions & 0 deletions mappings/net/minecraft/server/network/EntityTrackerEntry.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
CLASS net/minecraft/unmapped/C_yagtbmmk net/minecraft/server/network/EntityTrackerEntry
FIELD f_afmemlns tickInterval I
FIELD f_azdezkau positionCodec Lnet/minecraft/unmapped/C_kfofqpqr;
FIELD f_etjcgfpa trackingTick I
FIELD f_fcnnwugt lastHeadPitch I
FIELD f_ghninrwd lastYaw I
FIELD f_hfbzwigq receiver Ljava/util/function/Consumer;
FIELD f_jsyknaxw ROTATION_TOLERANCE_LEVEL I
FIELD f_kqffoygs alwaysUpdateVelocity Z
FIELD f_kqnuyquf trackedDataValues Ljava/util/List;
FIELD f_ntqyhxlt hadVehicle Z
FIELD f_pzmmdjvd lastPitch I
FIELD f_rrkfrdzn velocity Lnet/minecraft/unmapped/C_vgpupfxx;
Expand All @@ -21,14 +24,22 @@ CLASS net/minecraft/unmapped/C_yagtbmmk net/minecraft/server/network/EntityTrack
ARG 4 alwaysUpdateVelocity
ARG 5 receiver
METHOD m_acqaqxfb sendPackets (Lnet/minecraft/unmapped/C_mxrobsgg;Ljava/util/function/Consumer;)V
ARG 1 player
ARG 2 sender
METHOD m_acwzlrjk sendSyncPacket (Lnet/minecraft/unmapped/C_zyjtrjrl;)V
COMMENT Sends a packet for synchronization with watcher and tracked player (if applicable)
ARG 1 packet
METHOD m_dlxmtkps syncEntityData ()V
COMMENT Synchronizes tracked data and attributes
METHOD m_eszryakz streamRemovedPassengers (Ljava/util/List;Ljava/util/List;)Ljava/util/stream/Stream;
ARG 0 passengers
ARG 1 lastPassengers
METHOD m_mvnvigmx tick ()V
METHOD m_njjxygjo stopTracking (Lnet/minecraft/unmapped/C_mxrobsgg;)V
ARG 1 player
METHOD m_rkxayulq startTracking (Lnet/minecraft/unmapped/C_mxrobsgg;)V
ARG 1 player
METHOD m_vkpuoeqj (Lnet/minecraft/unmapped/C_astfners;)V
ARG 0 entity
METHOD m_vwyonfvn (Ljava/util/List;Lnet/minecraft/unmapped/C_astfners;)Z
ARG 1 entity
Loading

3 comments on commit 83b3b24

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

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

With commit 83b3b24, 179 file(s) were updated with 1341 line(s) added and 1092 removed compared to the latest Quilt Mappings version.

View the diff here (1/3): 
diff -bur namedTargetSrc/com/mojang/blaze3d/vertex/OverlayVertexConsumer.java namedSrc/com/mojang/blaze3d/vertex/OverlayVertexConsumer.java
--- namedTargetSrc/com/mojang/blaze3d/vertex/OverlayVertexConsumer.java	2023-07-01 17:59:06.742679865 +0000
+++ namedSrc/com/mojang/blaze3d/vertex/OverlayVertexConsumer.java	2023-07-01 17:57:40.191468198 +0000
@@ -81,13 +81,14 @@
    private float normalZ;
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_hfcesdco;<init>(Lnet/minecraft/unmapped/C_igthdzux;Lorg/joml/Matrix4f;Lorg/joml/Matrix3f;F)V}
+    * @mapping {@literal named <init> Lcom/mojang/blaze3d/vertex/OverlayVertexConsumer;<init>(Lcom/mojang/blaze3d/vertex/VertexConsumer;Lorg/joml/Matrix4f;Lorg/joml/Matrix3f;F)V}
     */
-   public OverlayVertexConsumer(VertexConsumer arg, Matrix4f matrix4f, Matrix3f matrix3f, float f) {
-      this.delegate = arg;
+   public OverlayVertexConsumer(VertexConsumer delegate, Matrix4f matrix4f, Matrix3f matrix3f, float scale) {
+      this.delegate = delegate;
       this.cameraInverseMatrix = new Matrix4f(matrix4f).invert();
       this.normalInverseMatrix = new Matrix3f(matrix3f).invert();
-      this.scale = f;
+      this.scale = scale;
       this.reset();
    }
 
Only in namedSrc/net/minecraft/advancement: AdvancementVisibilityEvaluator.java
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/BeeNestDestroyedCriterion.java namedSrc/net/minecraft/advancement/criterion/BeeNestDestroyedCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/BeeNestDestroyedCriterion.java	2023-07-01 17:59:06.726680010 +0000
+++ namedSrc/net/minecraft/advancement/criterion/BeeNestDestroyedCriterion.java	2023-07-01 17:57:40.171468378 +0000
@@ -94,11 +94,11 @@
        * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_eyqqwstf$C_vzisdrlj;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_afravpde;Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb;)V}
        * @mapping {@literal named <init> Lnet/minecraft/advancement/criterion/BeeNestDestroyedCriterion$Conditions;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/block/Block;Lnet/minecraft/predicate/item/ItemPredicate;Lnet/minecraft/predicate/NumberRange$IntRange;)V}
        */
-      public Conditions(C_ctsfmifk arg, @Nullable Block block, ItemPredicate arg3, NumberRange.IntRange arg4) {
+      public Conditions(C_ctsfmifk arg, @Nullable Block block, ItemPredicate item, NumberRange.IntRange beeCount) {
          super(BeeNestDestroyedCriterion.ID, arg);
          this.block = block;
-         this.item = arg3;
-         this.beeCount = arg4;
+         this.item = item;
+         this.beeCount = beeCount;
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/BredAnimalsCriterion.java namedSrc/net/minecraft/advancement/criterion/BredAnimalsCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/BredAnimalsCriterion.java	2023-07-01 17:59:06.658680626 +0000
+++ namedSrc/net/minecraft/advancement/criterion/BredAnimalsCriterion.java	2023-07-01 17:57:40.083469172 +0000
@@ -75,13 +75,14 @@
       private final C_ctsfmifk child;
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_mvevuwjm$C_avoywuag;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_ctsfmifk;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/advancement/criterion/BredAnimalsCriterion$Conditions;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_ctsfmifk;)V}
        */
-      public Conditions(C_ctsfmifk arg, C_ctsfmifk arg2, C_ctsfmifk arg3, C_ctsfmifk arg4) {
+      public Conditions(C_ctsfmifk arg, C_ctsfmifk parent, C_ctsfmifk partner, C_ctsfmifk child) {
          super(BredAnimalsCriterion.ID, arg);
-         this.parent = arg2;
-         this.partner = arg3;
-         this.child = arg4;
+         this.parent = parent;
+         this.partner = partner;
+         this.child = child;
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/BrewedPotionCriterion.java namedSrc/net/minecraft/advancement/criterion/BrewedPotionCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/BrewedPotionCriterion.java	2023-07-01 17:59:06.678680445 +0000
+++ namedSrc/net/minecraft/advancement/criterion/BrewedPotionCriterion.java	2023-07-01 17:57:40.107468956 +0000
@@ -66,11 +66,12 @@
       private final Potion potion;
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_opfhzgki$C_nhlhuijz;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_almkolgw;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/advancement/criterion/BrewedPotionCriterion$Conditions;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/potion/Potion;)V}
        */
-      public Conditions(C_ctsfmifk arg, @Nullable Potion arg2) {
+      public Conditions(C_ctsfmifk arg, @Nullable Potion potion) {
          super(BrewedPotionCriterion.ID, arg);
-         this.potion = arg2;
+         this.potion = potion;
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/ChangedDimensionCriterion.java namedSrc/net/minecraft/advancement/criterion/ChangedDimensionCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/ChangedDimensionCriterion.java	2023-07-01 17:59:06.674680481 +0000
+++ namedSrc/net/minecraft/advancement/criterion/ChangedDimensionCriterion.java	2023-07-01 17:57:40.099469028 +0000
@@ -68,12 +68,13 @@
       private final RegistryKey<World> to;
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_nxnnvhrs$C_zmkqrnzi;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_xhhleach;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/advancement/criterion/ChangedDimensionCriterion$Conditions;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/registry/RegistryKey;)V}
        */
-      public Conditions(C_ctsfmifk arg, @Nullable RegistryKey<World> arg2, @Nullable RegistryKey<World> arg3) {
+      public Conditions(C_ctsfmifk arg, @Nullable RegistryKey<World> from, @Nullable RegistryKey<World> to) {
          super(ChangedDimensionCriterion.ID, arg);
-         this.from = arg2;
-         this.to = arg3;
+         this.from = from;
+         this.to = to;
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/ChanneledLightningCriterion.java namedSrc/net/minecraft/advancement/criterion/ChanneledLightningCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/ChanneledLightningCriterion.java	2023-07-01 17:59:06.706680191 +0000
+++ namedSrc/net/minecraft/advancement/criterion/ChanneledLightningCriterion.java	2023-07-01 17:57:40.147468595 +0000
@@ -65,11 +65,12 @@
       private final C_ctsfmifk[] victims;
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_ekmkxenz$C_hbabyqbh;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;[Lnet/minecraft/unmapped/C_ctsfmifk;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/advancement/criterion/ChanneledLightningCriterion$Conditions;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;[Lnet/minecraft/unmapped/C_ctsfmifk;)V}
        */
-      public Conditions(C_ctsfmifk arg, C_ctsfmifk[] args) {
+      public Conditions(C_ctsfmifk arg, C_ctsfmifk[] victims) {
          super(ChanneledLightningCriterion.ID, arg);
-         this.victims = args;
+         this.victims = victims;
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/ConstructBeaconCriterion.java namedSrc/net/minecraft/advancement/criterion/ConstructBeaconCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/ConstructBeaconCriterion.java	2023-07-01 17:59:06.654680663 +0000
+++ namedSrc/net/minecraft/advancement/criterion/ConstructBeaconCriterion.java	2023-07-01 17:57:40.079469208 +0000
@@ -56,11 +56,12 @@
       private final NumberRange.IntRange level;
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_bbkpvqdm$C_enauomuk;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/advancement/criterion/ConstructBeaconCriterion$Conditions;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/predicate/NumberRange$IntRange;)V}
        */
-      public Conditions(C_ctsfmifk arg, NumberRange.IntRange arg2) {
+      public Conditions(C_ctsfmifk arg, NumberRange.IntRange level) {
          super(ConstructBeaconCriterion.ID, arg);
-         this.level = arg2;
+         this.level = level;
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/ConsumeItemCriterion.java namedSrc/net/minecraft/advancement/criterion/ConsumeItemCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/ConsumeItemCriterion.java	2023-07-01 17:59:06.726680010 +0000
+++ namedSrc/net/minecraft/advancement/criterion/ConsumeItemCriterion.java	2023-07-01 17:57:40.167468414 +0000
@@ -61,11 +61,12 @@
       private final ItemPredicate item;
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_jffbmlem$C_bzfkzlig;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_afravpde;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/advancement/criterion/ConsumeItemCriterion$Conditions;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/predicate/item/ItemPredicate;)V}
        */
-      public Conditions(C_ctsfmifk arg, ItemPredicate arg2) {
+      public Conditions(C_ctsfmifk arg, ItemPredicate item) {
          super(ConsumeItemCriterion.ID, arg);
-         this.item = arg2;
+         this.item = item;
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.java namedSrc/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.java	2023-07-01 17:59:06.718680083 +0000
+++ namedSrc/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.java	2023-07-01 17:57:40.159468487 +0000
@@ -67,12 +67,13 @@
       private final C_ctsfmifk villager;
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_urcewduq$C_izcpkdrl;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_ctsfmifk;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/advancement/criterion/CuredZombieVillagerCriterion$Conditions;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_ctsfmifk;)V}
        */
-      public Conditions(C_ctsfmifk arg, C_ctsfmifk arg2, C_ctsfmifk arg3) {
+      public Conditions(C_ctsfmifk arg, C_ctsfmifk zombie, C_ctsfmifk villager) {
          super(CuredZombieVillagerCriterion.ID, arg);
-         this.zombie = arg2;
-         this.villager = arg3;
+         this.zombie = zombie;
+         this.villager = villager;
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/EffectsChangedCriterion.java namedSrc/net/minecraft/advancement/criterion/EffectsChangedCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/EffectsChangedCriterion.java	2023-07-01 17:59:06.738679901 +0000
+++ namedSrc/net/minecraft/advancement/criterion/EffectsChangedCriterion.java	2023-07-01 17:57:40.187468234 +0000
@@ -68,12 +68,13 @@
       private final C_ctsfmifk source;
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_frltmexa$C_nuklejcd;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_nysuqcvh;Lnet/minecraft/unmapped/C_ctsfmifk;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/advancement/criterion/EffectsChangedCriterion$Conditions;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/predicate/entity/EntityEffectPredicate;Lnet/minecraft/unmapped/C_ctsfmifk;)V}
        */
-      public Conditions(C_ctsfmifk arg, EntityEffectPredicate arg2, C_ctsfmifk arg3) {
+      public Conditions(C_ctsfmifk arg, EntityEffectPredicate effects, C_ctsfmifk source) {
          super(EffectsChangedCriterion.ID, arg);
-         this.effects = arg2;
-         this.source = arg3;
+         this.effects = effects;
+         this.source = source;
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/EnchantedItemCriterion.java namedSrc/net/minecraft/advancement/criterion/EnchantedItemCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/EnchantedItemCriterion.java	2023-07-01 17:59:06.690680336 +0000
+++ namedSrc/net/minecraft/advancement/criterion/EnchantedItemCriterion.java	2023-07-01 17:57:40.123468811 +0000
@@ -64,12 +64,13 @@
       private final NumberRange.IntRange levels;
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_sszdquwf$C_kscasjsf;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_afravpde;Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/advancement/criterion/EnchantedItemCriterion$Conditions;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/predicate/item/ItemPredicate;Lnet/minecraft/predicate/NumberRange$IntRange;)V}
        */
-      public Conditions(C_ctsfmifk arg, ItemPredicate arg2, NumberRange.IntRange arg3) {
+      public Conditions(C_ctsfmifk arg, ItemPredicate item, NumberRange.IntRange levels) {
          super(EnchantedItemCriterion.ID, arg);
-         this.item = arg2;
-         this.levels = arg3;
+         this.item = item;
+         this.levels = levels;
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/EnterBlockCriterion.java namedSrc/net/minecraft/advancement/criterion/EnterBlockCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/EnterBlockCriterion.java	2023-07-01 17:59:06.710680155 +0000
+++ namedSrc/net/minecraft/advancement/criterion/EnterBlockCriterion.java	2023-07-01 17:57:40.147468595 +0000
@@ -92,10 +92,10 @@
        * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_rvwlswnk$C_fcmyqfbr;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_fsjpkzrx;)V}
        * @mapping {@literal named <init> Lnet/minecraft/advancement/criterion/EnterBlockCriterion$Conditions;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/block/Block;Lnet/minecraft/predicate/StatePredicate;)V}
        */
-      public Conditions(C_ctsfmifk arg, @Nullable Block block, StatePredicate arg3) {
+      public Conditions(C_ctsfmifk arg, @Nullable Block block, StatePredicate state) {
          super(EnterBlockCriterion.ID, arg);
          this.block = block;
-         this.state = arg3;
+         this.state = state;
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.java namedSrc/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.java	2023-07-01 17:59:06.698680264 +0000
+++ namedSrc/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.java	2023-07-01 17:57:40.135468703 +0000
@@ -57,11 +57,12 @@
       private final DamagePredicate damage;
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_vteznemu$C_qcrjsemd;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_mzdoirue;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/advancement/criterion/EntityHurtPlayerCriterion$Conditions;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/predicate/DamagePredicate;)V}
        */
-      public Conditions(C_ctsfmifk arg, DamagePredicate arg2) {
+      public Conditions(C_ctsfmifk arg, DamagePredicate damage) {
          super(EntityHurtPlayerCriterion.ID, arg);
-         this.damage = arg2;
+         this.damage = damage;
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/FilledBucketCriterion.java namedSrc/net/minecraft/advancement/criterion/FilledBucketCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/FilledBucketCriterion.java	2023-07-01 17:59:06.726680010 +0000
+++ namedSrc/net/minecraft/advancement/criterion/FilledBucketCriterion.java	2023-07-01 17:57:40.167468414 +0000
@@ -57,11 +57,12 @@
       private final ItemPredicate item;
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_mhaudtdi$C_ewggyutx;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_afravpde;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/advancement/criterion/FilledBucketCriterion$Conditions;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/predicate/item/ItemPredicate;)V}
        */
-      public Conditions(C_ctsfmifk arg, ItemPredicate arg2) {
+      public Conditions(C_ctsfmifk arg, ItemPredicate item) {
          super(FilledBucketCriterion.ID, arg);
-         this.item = arg2;
+         this.item = item;
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/FishingRodHookedCriterion.java namedSrc/net/minecraft/advancement/criterion/FishingRodHookedCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/FishingRodHookedCriterion.java	2023-07-01 17:59:06.782679503 +0000
+++ namedSrc/net/minecraft/advancement/criterion/FishingRodHookedCriterion.java	2023-07-01 17:57:40.235467801 +0000
@@ -79,13 +79,14 @@
       private final ItemPredicate caughtItem;
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_wpdvydim$C_mnduyaqi;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_afravpde;Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_afravpde;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/advancement/criterion/FishingRodHookedCriterion$Conditions;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/predicate/item/ItemPredicate;Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/predicate/item/ItemPredicate;)V}
        */
-      public Conditions(C_ctsfmifk arg, ItemPredicate arg2, C_ctsfmifk arg3, ItemPredicate arg4) {
+      public Conditions(C_ctsfmifk arg, ItemPredicate rod, C_ctsfmifk hookedEntity, ItemPredicate caughtItem) {
          super(FishingRodHookedCriterion.ID, arg);
-         this.rod = arg2;
-         this.hookedEntity = arg3;
-         this.caughtItem = arg4;
+         this.rod = rod;
+         this.hookedEntity = hookedEntity;
+         this.caughtItem = caughtItem;
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/InventoryChangedCriterion.java namedSrc/net/minecraft/advancement/criterion/InventoryChangedCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/InventoryChangedCriterion.java	2023-07-01 17:59:06.706680191 +0000
+++ namedSrc/net/minecraft/advancement/criterion/InventoryChangedCriterion.java	2023-07-01 17:57:40.143468631 +0000
@@ -110,14 +110,15 @@
       private final ItemPredicate[] items;
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_wqesddch$C_bvmbsujf;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb;Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb;Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb;[Lnet/minecraft/unmapped/C_afravpde;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/advancement/criterion/InventoryChangedCriterion$Conditions;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/predicate/NumberRange$IntRange;Lnet/minecraft/predicate/NumberRange$IntRange;Lnet/minecraft/predicate/NumberRange$IntRange;[Lnet/minecraft/predicate/item/ItemPredicate;)V}
        */
-      public Conditions(C_ctsfmifk arg, NumberRange.IntRange arg2, NumberRange.IntRange arg3, NumberRange.IntRange arg4, ItemPredicate[] args) {
+      public Conditions(C_ctsfmifk arg, NumberRange.IntRange occupied, NumberRange.IntRange full, NumberRange.IntRange empty, ItemPredicate[] items) {
          super(InventoryChangedCriterion.ID, arg);
-         this.occupied = arg2;
-         this.full = arg3;
-         this.empty = arg4;
-         this.items = args;
+         this.occupied = occupied;
+         this.full = full;
+         this.empty = empty;
+         this.items = items;
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.java namedSrc/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.java	2023-07-01 17:59:06.786679467 +0000
+++ namedSrc/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.java	2023-07-01 17:57:40.239467765 +0000
@@ -70,13 +70,14 @@
       private final NumberRange.IntRange delta;
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_ekwvzgfo$C_sjpvdygp;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_afravpde;Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb;Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/advancement/criterion/ItemDurabilityChangedCriterion$Conditions;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/predicate/item/ItemPredicate;Lnet/minecraft/predicate/NumberRange$IntRange;Lnet/minecraft/predicate/NumberRange$IntRange;)V}
        */
-      public Conditions(C_ctsfmifk arg, ItemPredicate arg2, NumberRange.IntRange arg3, NumberRange.IntRange arg4) {
+      public Conditions(C_ctsfmifk arg, ItemPredicate item, NumberRange.IntRange durability, NumberRange.IntRange delta) {
          super(ItemDurabilityChangedCriterion.ID, arg);
-         this.item = arg2;
-         this.durability = arg3;
-         this.delta = arg4;
+         this.item = item;
+         this.durability = durability;
+         this.delta = delta;
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.java namedSrc/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.java	2023-07-01 17:59:06.726680010 +0000
+++ namedSrc/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.java	2023-07-01 17:57:40.167468414 +0000
@@ -80,12 +80,13 @@
       private final NumberRange.IntRange uniqueEntityTypes;
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_thhqzygp$C_jbfosyao;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;[Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/advancement/criterion/KilledByCrossbowCriterion$Conditions;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;[Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/predicate/NumberRange$IntRange;)V}
        */
-      public Conditions(C_ctsfmifk arg, C_ctsfmifk[] args, NumberRange.IntRange arg2) {
+      public Conditions(C_ctsfmifk arg, C_ctsfmifk[] victims, NumberRange.IntRange uniqueEntityTypes) {
          super(KilledByCrossbowCriterion.ID, arg);
-         this.victims = args;
-         this.uniqueEntityTypes = arg2;
+         this.victims = victims;
+         this.uniqueEntityTypes = uniqueEntityTypes;
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/LevitationCriterion.java namedSrc/net/minecraft/advancement/criterion/LevitationCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/LevitationCriterion.java	2023-07-01 17:59:06.678680445 +0000
+++ namedSrc/net/minecraft/advancement/criterion/LevitationCriterion.java	2023-07-01 17:57:40.107468956 +0000
@@ -64,12 +64,13 @@
       private final NumberRange.IntRange duration;
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_mhjgbxyr$C_kxdzjcen;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_ullximxc;Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/advancement/criterion/LevitationCriterion$Conditions;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/predicate/entity/DistancePredicate;Lnet/minecraft/predicate/NumberRange$IntRange;)V}
        */
-      public Conditions(C_ctsfmifk arg, DistancePredicate arg2, NumberRange.IntRange arg3) {
+      public Conditions(C_ctsfmifk arg, DistancePredicate distance, NumberRange.IntRange duration) {
          super(LevitationCriterion.ID, arg);
-         this.distance = arg2;
-         this.duration = arg3;
+         this.distance = distance;
+         this.duration = duration;
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/LightningStrikeCriterion.java namedSrc/net/minecraft/advancement/criterion/LightningStrikeCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/LightningStrikeCriterion.java	2023-07-01 17:59:06.694680300 +0000
+++ namedSrc/net/minecraft/advancement/criterion/LightningStrikeCriterion.java	2023-07-01 17:57:40.127468775 +0000
@@ -71,12 +71,13 @@
       private final C_ctsfmifk bystander;
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_ujdwetcx$C_nyevovia;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_ctsfmifk;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/advancement/criterion/LightningStrikeCriterion$Conditions;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_ctsfmifk;)V}
        */
-      public Conditions(C_ctsfmifk arg, C_ctsfmifk arg2, C_ctsfmifk arg3) {
+      public Conditions(C_ctsfmifk arg, C_ctsfmifk lightning, C_ctsfmifk bystander) {
          super(LightningStrikeCriterion.ID, arg);
-         this.lightning = arg2;
-         this.bystander = arg3;
+         this.lightning = lightning;
+         this.bystander = bystander;
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/OnKilledCriterion.java namedSrc/net/minecraft/advancement/criterion/OnKilledCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/OnKilledCriterion.java	2023-07-01 17:59:06.694680300 +0000
+++ namedSrc/net/minecraft/advancement/criterion/OnKilledCriterion.java	2023-07-01 17:57:40.131468739 +0000
@@ -75,12 +75,13 @@
       private final DamageSourcePredicate killingBlow;
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_hqkuepng$C_zknwqjsw;<init>(Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_pbkrjvwn;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/advancement/criterion/OnKilledCriterion$Conditions;<init>(Lnet/minecraft/util/Identifier;Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/predicate/entity/DamageSourcePredicate;)V}
        */
-      public Conditions(Identifier arg, C_ctsfmifk arg2, C_ctsfmifk arg3, DamageSourcePredicate arg4) {
+      public Conditions(Identifier arg, C_ctsfmifk arg2, C_ctsfmifk entity, DamageSourcePredicate killingBlow) {
          super(arg, arg2);
-         this.entity = arg3;
-         this.killingBlow = arg4;
+         this.entity = entity;
+         this.killingBlow = killingBlow;
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/PickedUpThrownItemCriterion.java namedSrc/net/minecraft/advancement/criterion/PickedUpThrownItemCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/PickedUpThrownItemCriterion.java	2023-07-01 17:59:06.734679938 +0000
+++ namedSrc/net/minecraft/advancement/criterion/PickedUpThrownItemCriterion.java	2023-07-01 17:57:40.179468306 +0000
@@ -76,12 +76,13 @@
       private final C_ctsfmifk pickedUp;
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_mntpixlf$C_oqopxfol;<init>(Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_afravpde;Lnet/minecraft/unmapped/C_ctsfmifk;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/advancement/criterion/PickedUpThrownItemCriterion$Conditions;<init>(Lnet/minecraft/util/Identifier;Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/predicate/item/ItemPredicate;Lnet/minecraft/unmapped/C_ctsfmifk;)V}
        */
-      public Conditions(Identifier arg, C_ctsfmifk arg2, ItemPredicate arg3, C_ctsfmifk arg4) {
+      public Conditions(Identifier arg, C_ctsfmifk arg2, ItemPredicate item, C_ctsfmifk pickedUp) {
          super(arg, arg2);
-         this.item = arg3;
-         this.pickedUp = arg4;
+         this.item = item;
+         this.pickedUp = pickedUp;
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion.java namedSrc/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion.java	2023-07-01 17:59:06.706680191 +0000
+++ namedSrc/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion.java	2023-07-01 17:57:40.147468595 +0000
@@ -58,11 +58,12 @@
       private final Identifier lootTable;
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_ccuyenqy$C_jvilurms;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_ncpywfca;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion$Conditions;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/util/Identifier;)V}
        */
-      public Conditions(C_ctsfmifk arg, Identifier arg2) {
+      public Conditions(C_ctsfmifk arg, Identifier lootTable) {
          super(PlayerGeneratesContainerLootCriterion.ID, arg);
-         this.lootTable = arg2;
+         this.lootTable = lootTable;
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.java namedSrc/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.java	2023-07-01 17:59:06.666680554 +0000
+++ namedSrc/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.java	2023-07-01 17:57:40.087469136 +0000
@@ -67,12 +67,13 @@
       private final C_ctsfmifk entity;
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_cufgrabk$C_eldrleys;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_mzdoirue;Lnet/minecraft/unmapped/C_ctsfmifk;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/advancement/criterion/PlayerHurtEntityCriterion$Conditions;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/predicate/DamagePredicate;Lnet/minecraft/unmapped/C_ctsfmifk;)V}
        */
-      public Conditions(C_ctsfmifk arg, DamagePredicate arg2, C_ctsfmifk arg3) {
+      public Conditions(C_ctsfmifk arg, DamagePredicate damage, C_ctsfmifk entity) {
          super(PlayerHurtEntityCriterion.ID, arg);
-         this.damage = arg2;
-         this.entity = arg3;
+         this.damage = damage;
+         this.entity = entity;
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterion.java namedSrc/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterion.java	2023-07-01 17:59:06.690680336 +0000
+++ namedSrc/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterion.java	2023-07-01 17:57:40.123468811 +0000
@@ -69,12 +69,13 @@
       private final C_ctsfmifk entity;
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_bvljsgzr$C_dwldgxex;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_afravpde;Lnet/minecraft/unmapped/C_ctsfmifk;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterion$Conditions;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/predicate/item/ItemPredicate;Lnet/minecraft/unmapped/C_ctsfmifk;)V}
        */
-      public Conditions(C_ctsfmifk arg, ItemPredicate arg2, C_ctsfmifk arg3) {
+      public Conditions(C_ctsfmifk arg, ItemPredicate item, C_ctsfmifk entity) {
          super(PlayerInteractedWithEntityCriterion.ID, arg);
-         this.item = arg2;
-         this.entity = arg3;
+         this.item = item;
+         this.entity = entity;
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.java namedSrc/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.java	2023-07-01 17:59:06.786679467 +0000
+++ namedSrc/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.java	2023-07-01 17:57:40.239467765 +0000
@@ -65,11 +65,12 @@
       private final Identifier recipe;
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_myulluhr$C_zzjwgfkt;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_ncpywfca;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/advancement/criterion/RecipeUnlockedCriterion$Conditions;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/util/Identifier;)V}
        */
-      public Conditions(C_ctsfmifk arg, Identifier arg2) {
+      public Conditions(C_ctsfmifk arg, Identifier recipe) {
          super(RecipeUnlockedCriterion.ID, arg);
-         this.recipe = arg2;
+         this.recipe = recipe;
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/ShotCrossbowCriterion.java namedSrc/net/minecraft/advancement/criterion/ShotCrossbowCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/ShotCrossbowCriterion.java	2023-07-01 17:59:06.690680336 +0000
+++ namedSrc/net/minecraft/advancement/criterion/ShotCrossbowCriterion.java	2023-07-01 17:57:40.115468883 +0000
@@ -58,11 +58,12 @@
       private final ItemPredicate item;
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_ucuoichm$C_pjsuhcqx;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_afravpde;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/advancement/criterion/ShotCrossbowCriterion$Conditions;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/predicate/item/ItemPredicate;)V}
        */
-      public Conditions(C_ctsfmifk arg, ItemPredicate arg2) {
+      public Conditions(C_ctsfmifk arg, ItemPredicate item) {
          super(ShotCrossbowCriterion.ID, arg);
-         this.item = arg2;
+         this.item = item;
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/SlideDownBlockCriterion.java namedSrc/net/minecraft/advancement/criterion/SlideDownBlockCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/SlideDownBlockCriterion.java	2023-07-01 17:59:06.762679684 +0000
+++ namedSrc/net/minecraft/advancement/criterion/SlideDownBlockCriterion.java	2023-07-01 17:57:40.215467981 +0000
@@ -92,10 +92,10 @@
        * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_guvqoceu$C_rzzwrqgc;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_fsjpkzrx;)V}
        * @mapping {@literal named <init> Lnet/minecraft/advancement/criterion/SlideDownBlockCriterion$Conditions;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/block/Block;Lnet/minecraft/predicate/StatePredicate;)V}
        */
-      public Conditions(C_ctsfmifk arg, @Nullable Block block, StatePredicate arg3) {
+      public Conditions(C_ctsfmifk arg, @Nullable Block block, StatePredicate state) {
          super(SlideDownBlockCriterion.ID, arg);
          this.block = block;
-         this.state = arg3;
+         this.state = state;
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/SummonedEntityCriterion.java namedSrc/net/minecraft/advancement/criterion/SummonedEntityCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/SummonedEntityCriterion.java	2023-07-01 17:59:06.706680191 +0000
+++ namedSrc/net/minecraft/advancement/criterion/SummonedEntityCriterion.java	2023-07-01 17:57:40.147468595 +0000
@@ -59,11 +59,12 @@
       private final C_ctsfmifk entity;
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_ckqxcepo$C_rpttlyon;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_ctsfmifk;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/advancement/criterion/SummonedEntityCriterion$Conditions;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_ctsfmifk;)V}
        */
-      public Conditions(C_ctsfmifk arg, C_ctsfmifk arg2) {
+      public Conditions(C_ctsfmifk arg, C_ctsfmifk entity) {
          super(SummonedEntityCriterion.ID, arg);
-         this.entity = arg2;
+         this.entity = entity;
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/TameAnimalCriterion.java namedSrc/net/minecraft/advancement/criterion/TameAnimalCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/TameAnimalCriterion.java	2023-07-01 17:59:06.734679938 +0000
+++ namedSrc/net/minecraft/advancement/criterion/TameAnimalCriterion.java	2023-07-01 17:57:40.179468306 +0000
@@ -59,11 +59,12 @@
       private final C_ctsfmifk entity;
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_aaelkaim$C_sbyfjkts;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_ctsfmifk;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/advancement/criterion/TameAnimalCriterion$Conditions;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_ctsfmifk;)V}
        */
-      public Conditions(C_ctsfmifk arg, C_ctsfmifk arg2) {
+      public Conditions(C_ctsfmifk arg, C_ctsfmifk entity) {
          super(TameAnimalCriterion.ID, arg);
-         this.entity = arg2;
+         this.entity = entity;
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/TargetHitCriterion.java namedSrc/net/minecraft/advancement/criterion/TargetHitCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/TargetHitCriterion.java	2023-07-01 17:59:06.750679793 +0000
+++ namedSrc/net/minecraft/advancement/criterion/TargetHitCriterion.java	2023-07-01 17:57:40.203468090 +0000
@@ -67,12 +67,13 @@
       private final C_ctsfmifk projectile;
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_vqqxzpxi$C_xwywjnst;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb;Lnet/minecraft/unmapped/C_ctsfmifk;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/advancement/criterion/TargetHitCriterion$Conditions;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/predicate/NumberRange$IntRange;Lnet/minecraft/unmapped/C_ctsfmifk;)V}
        */
-      public Conditions(C_ctsfmifk arg, NumberRange.IntRange arg2, C_ctsfmifk arg3) {
+      public Conditions(C_ctsfmifk arg, NumberRange.IntRange signalStrength, C_ctsfmifk projectile) {
          super(TargetHitCriterion.ID, arg);
-         this.signalStrength = arg2;
-         this.projectile = arg3;
+         this.signalStrength = signalStrength;
+         this.projectile = projectile;
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/TravelCriterion.java namedSrc/net/minecraft/advancement/criterion/TravelCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/TravelCriterion.java	2023-07-01 17:59:06.766679648 +0000
+++ namedSrc/net/minecraft/advancement/criterion/TravelCriterion.java	2023-07-01 17:57:40.219467945 +0000
@@ -75,12 +75,13 @@
       private final DistancePredicate distance;
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_ntathoag$C_mnjnxtmp;<init>(Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_ypvebgnl;Lnet/minecraft/unmapped/C_ullximxc;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/advancement/criterion/TravelCriterion$Conditions;<init>(Lnet/minecraft/util/Identifier;Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/predicate/entity/LocationPredicate;Lnet/minecraft/predicate/entity/DistancePredicate;)V}
        */
-      public Conditions(Identifier arg, C_ctsfmifk arg2, LocationPredicate arg3, DistancePredicate arg4) {
+      public Conditions(Identifier arg, C_ctsfmifk arg2, LocationPredicate startPos, DistancePredicate distance) {
          super(arg, arg2);
-         this.startPos = arg3;
-         this.distance = arg4;
+         this.startPos = startPos;
+         this.distance = distance;
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/UsedTotemCriterion.java namedSrc/net/minecraft/advancement/criterion/UsedTotemCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/UsedTotemCriterion.java	2023-07-01 17:59:06.770679612 +0000
+++ namedSrc/net/minecraft/advancement/criterion/UsedTotemCriterion.java	2023-07-01 17:57:40.223467909 +0000
@@ -58,11 +58,12 @@
       private final ItemPredicate item;
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_clwnikrb$C_xpcxkzoa;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_afravpde;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/advancement/criterion/UsedTotemCriterion$Conditions;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/predicate/item/ItemPredicate;)V}
        */
-      public Conditions(C_ctsfmifk arg, ItemPredicate arg2) {
+      public Conditions(C_ctsfmifk arg, ItemPredicate item) {
          super(UsedTotemCriterion.ID, arg);
-         this.item = arg2;
+         this.item = item;
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/UsingItemCriterion.java namedSrc/net/minecraft/advancement/criterion/UsingItemCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/UsingItemCriterion.java	2023-07-01 17:59:06.750679793 +0000
+++ namedSrc/net/minecraft/advancement/criterion/UsingItemCriterion.java	2023-07-01 17:57:40.199468126 +0000
@@ -58,11 +58,12 @@
       private final ItemPredicate item;
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_jtrqmgsq$C_nenbghty;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_afravpde;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/advancement/criterion/UsingItemCriterion$Conditions;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/predicate/item/ItemPredicate;)V}
        */
-      public Conditions(C_ctsfmifk arg, ItemPredicate arg2) {
+      public Conditions(C_ctsfmifk arg, ItemPredicate item) {
          super(UsingItemCriterion.ID, arg);
-         this.item = arg2;
+         this.item = item;
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/VillagerTradeCriterion.java namedSrc/net/minecraft/advancement/criterion/VillagerTradeCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/VillagerTradeCriterion.java	2023-07-01 17:59:06.698680264 +0000
+++ namedSrc/net/minecraft/advancement/criterion/VillagerTradeCriterion.java	2023-07-01 17:57:40.131468739 +0000
@@ -67,12 +67,13 @@
       private final ItemPredicate item;
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_yddyhqpp$C_roruwsnz;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_afravpde;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/advancement/criterion/VillagerTradeCriterion$Conditions;<init>(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/predicate/item/ItemPredicate;)V}
        */
-      public Conditions(C_ctsfmifk arg, C_ctsfmifk arg2, ItemPredicate arg3) {
+      public Conditions(C_ctsfmifk arg, C_ctsfmifk villager, ItemPredicate item) {
          super(VillagerTradeCriterion.ID, arg);
-         this.villager = arg2;
-         this.item = arg3;
+         this.villager = villager;
+         this.item = item;
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/PlayerAdvancementTracker.java namedSrc/net/minecraft/advancement/PlayerAdvancementTracker.java
--- namedTargetSrc/net/minecraft/advancement/PlayerAdvancementTracker.java	2023-07-01 17:59:06.666680554 +0000
+++ namedSrc/net/minecraft/advancement/PlayerAdvancementTracker.java	2023-07-01 17:57:40.091469100 +0000
@@ -35,7 +35,6 @@
 import net.minecraft.server.ServerAdvancementLoader;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_hrhneqyx;
 import net.minecraft.util.FileNameUtil;
 import net.minecraft.util.Identifier;
 import net.minecraft.world.GameRules;
@@ -340,10 +339,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_pptrdaxw Lnet/minecraft/unmapped/C_hyeqtgvx;m_pptrdaxw(Lnet/minecraft/unmapped/C_kdwyuhdb;)V}
+    * @mapping {@literal named m_pptrdaxw Lnet/minecraft/advancement/PlayerAdvancementTracker;m_pptrdaxw(Lnet/minecraft/advancement/Advancement;)V}
     */
-   private void m_pptrdaxw(Advancement arg) {
-      this.f_ivqxewak.add(arg.getRoot());
+   private void m_pptrdaxw(Advancement advancement) {
+      this.f_ivqxewak.add(advancement.getRoot());
    }
 
    /**
@@ -464,7 +464,7 @@
     * Mapping not found
     */
    private void m_czdclwkv(Advancement arg, Set<Advancement> set, Set<Identifier> set2) {
-      C_hrhneqyx.m_jmvvzccl(arg, argx -> this.getProgress(argx).isDone(), (argx, bl) -> {
+      AdvancementVisibilityEvaluator.m_jmvvzccl(arg, argx -> this.getProgress(argx).isDone(), (argx, bl) -> {
          if (bl) {
             if (this.visibleAdvancements.add(argx)) {
                set.add(argx);
diff -bur namedTargetSrc/net/minecraft/block/AbstractBlock.java namedSrc/net/minecraft/block/AbstractBlock.java
--- namedTargetSrc/net/minecraft/block/AbstractBlock.java	2023-07-01 17:59:06.670680518 +0000
+++ namedSrc/net/minecraft/block/AbstractBlock.java	2023-07-01 17:57:40.095469064 +0000
@@ -387,12 +387,12 @@
     * @mapping {@literal named getDroppedStacks Lnet/minecraft/block/AbstractBlock;getDroppedStacks(Lnet/minecraft/block/BlockState;Lnet/minecraft/loot/context/LootContextParameterSet$Builder;)Ljava/util/List;}
     */
    @Deprecated
-   public List<ItemStack> getDroppedStacks(BlockState state, LootContextParameterSet.Builder arg2) {
+   public List<ItemStack> getDroppedStacks(BlockState state, LootContextParameterSet.Builder lootParameterBuilder) {
       Identifier lv = this.getLootTableId();
       if (lv == LootTables.EMPTY) {
          return Collections.emptyList();
       } else {
-         LootContextParameterSet lv2 = arg2.add(LootContextParameters.BLOCK_STATE, state).build(LootContextTypes.BLOCK);
+         LootContextParameterSet lv2 = lootParameterBuilder.add(LootContextParameters.BLOCK_STATE, state).build(LootContextTypes.BLOCK);
          ServerWorld lv3 = lv2.getWorld();
          LootTable lv4 = lv3.getServer().getLootManager().getLootTable(lv);
          return lv4.generateLoot(lv2);
@@ -1326,8 +1326,8 @@
        * @mapping {@literal hashed m_meigdamn Lnet/minecraft/unmapped/C_triydqro$C_eibemhky;m_meigdamn(Lnet/minecraft/unmapped/C_nzsnkdtl$C_oqhigtaq;)Ljava/util/List;}
        * @mapping {@literal named getDroppedStacks Lnet/minecraft/block/AbstractBlock$AbstractBlockState;getDroppedStacks(Lnet/minecraft/loot/context/LootContextParameterSet$Builder;)Ljava/util/List;}
        */
-      public List<ItemStack> getDroppedStacks(LootContextParameterSet.Builder arg) {
-         return this.getBlock().getDroppedStacks(this.asBlockState(), arg);
+      public List<ItemStack> getDroppedStacks(LootContextParameterSet.Builder lootParameterBuilder) {
+         return this.getBlock().getDroppedStacks(this.asBlockState(), lootParameterBuilder);
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/block/BeehiveBlock.java namedSrc/net/minecraft/block/BeehiveBlock.java
--- namedTargetSrc/net/minecraft/block/BeehiveBlock.java	2023-07-01 17:59:06.734679938 +0000
+++ namedSrc/net/minecraft/block/BeehiveBlock.java	2023-07-01 17:57:40.175468342 +0000
@@ -373,20 +373,20 @@
     * Mapping not found
     */
    @Override
-   public List<ItemStack> getDroppedStacks(BlockState state, LootContextParameterSet.Builder arg2) {
-      Entity lv = arg2.getOptionalParameter(LootContextParameters.THIS_ENTITY);
+   public List<ItemStack> getDroppedStacks(BlockState state, LootContextParameterSet.Builder lootParameterBuilder) {
+      Entity lv = lootParameterBuilder.getOptionalParameter(LootContextParameters.THIS_ENTITY);
       if (lv instanceof TntEntity
          || lv instanceof CreeperEntity
          || lv instanceof WitherSkullEntity
          || lv instanceof WitherEntity
          || lv instanceof TntMinecartEntity) {
-         BlockEntity lv2 = arg2.getOptionalParameter(LootContextParameters.BLOCK_ENTITY);
+         BlockEntity lv2 = lootParameterBuilder.getOptionalParameter(LootContextParameters.BLOCK_ENTITY);
          if (lv2 instanceof BeehiveBlockEntity lv3) {
             lv3.angerBees(null, state, BeehiveBlockEntity.BeeState.EMERGENCY);
          }
       }
 
-      return super.getDroppedStacks(state, arg2);
+      return super.getDroppedStacks(state, lootParameterBuilder);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/DecoratedPotBlock.java namedSrc/net/minecraft/block/DecoratedPotBlock.java
--- namedTargetSrc/net/minecraft/block/DecoratedPotBlock.java	2023-07-01 17:59:06.662680590 +0000
+++ namedSrc/net/minecraft/block/DecoratedPotBlock.java	2023-07-01 17:57:40.087469136 +0000
@@ -40,9 +40,10 @@
  */
 public class DecoratedPotBlock extends BlockWithEntity implements Waterloggable {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_tohwohru Lnet/minecraft/unmapped/C_bnspifpc;f_tohwohru:Lnet/minecraft/unmapped/C_ncpywfca;}
+    * @mapping {@literal named SHERDS Lnet/minecraft/block/DecoratedPotBlock;SHERDS:Lnet/minecraft/util/Identifier;}
     */
-   public static final Identifier f_tohwohru = new Identifier("sherds");
+   public static final Identifier SHERDS = new Identifier("sherds");
    /**
     * @mapping {@literal hashed f_xkbierxx Lnet/minecraft/unmapped/C_bnspifpc;f_xkbierxx:Lnet/minecraft/unmapped/C_zscvhwbd;}
     * @mapping {@literal named SHAPE Lnet/minecraft/block/DecoratedPotBlock;SHAPE:Lnet/minecraft/util/shape/VoxelShape;}
@@ -137,13 +138,13 @@
     * Mapping not found
     */
    @Override
-   public List<ItemStack> getDroppedStacks(BlockState state, LootContextParameterSet.Builder arg2) {
-      BlockEntity lv = arg2.getOptionalParameter(LootContextParameters.BLOCK_ENTITY);
+   public List<ItemStack> getDroppedStacks(BlockState state, LootContextParameterSet.Builder lootParameterBuilder) {
+      BlockEntity lv = lootParameterBuilder.getOptionalParameter(LootContextParameters.BLOCK_ENTITY);
       if (lv instanceof DecoratedPotBlockEntity lv2) {
-         arg2.withDynamicDrop(f_tohwohru, consumer -> lv2.getSherds().getItems().map(Item::getDefaultStack).forEach(consumer));
+         lootParameterBuilder.withDynamicDrop(SHERDS, consumer -> lv2.getSherds().getItems().map(Item::getDefaultStack).forEach(consumer));
       }
 
-      return super.getDroppedStacks(state, arg2);
+      return super.getDroppedStacks(state, lootParameterBuilder);
    }
 
    /**
@@ -187,7 +188,7 @@
       if (!lv.equals(DecoratedPotBlockEntity.Sherds.DEFAULT)) {
          tooltip.add(CommonTexts.EMPTY);
          Stream.of(lv.front(), lv.left(), lv.right(), lv.back())
-            .forEach(arg -> tooltip.add(new ItemStack(arg, 1).getName().copyContentOnly().formatted(Formatting.GRAY)));
+            .forEach(item -> tooltip.add(new ItemStack(item, 1).getName().copyContentOnly().formatted(Formatting.GRAY)));
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/entity/StructureBlockBlockEntity.java namedSrc/net/minecraft/block/entity/StructureBlockBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/StructureBlockBlockEntity.java	2023-07-01 17:59:06.758679720 +0000
+++ namedSrc/net/minecraft/block/entity/StructureBlockBlockEntity.java	2023-07-01 17:57:40.207468054 +0000
@@ -534,7 +534,7 @@
     * @mapping {@literal hashed m_mjmqymso Lnet/minecraft/unmapped/C_bfrzytnu;m_mjmqymso(Z)Z}
     * @mapping {@literal named saveStructure Lnet/minecraft/block/entity/StructureBlockBlockEntity;saveStructure(Z)Z}
     */
-   public boolean saveStructure(boolean bl) {
+   public boolean saveStructure(boolean saveToTemplateManager) {
       if (this.mode == StructureBlockMode.SAVE && !this.world.isClient && this.structureName != null) {
          BlockPos lv = this.getPos().add(this.offset);
          ServerWorld lv2 = (ServerWorld)this.world;
@@ -549,7 +549,7 @@
 
          lv4.saveFromWorld(this.world, lv, this.size, !this.ignoreEntities, Blocks.STRUCTURE_VOID);
          lv4.setAuthor(this.author);
-         if (bl) {
+         if (saveToTemplateManager) {
             try {
                return lv3.saveStructure(this.structureName);
             } catch (InvalidIdentifierException var7) {
@@ -583,7 +583,7 @@
     * @mapping {@literal hashed m_zecrtggw Lnet/minecraft/unmapped/C_bfrzytnu;m_zecrtggw(Lnet/minecraft/unmapped/C_bdwnwhiu;Z)Z}
     * @mapping {@literal named loadStructure Lnet/minecraft/block/entity/StructureBlockBlockEntity;loadStructure(Lnet/minecraft/server/world/ServerWorld;Z)Z}
     */
-   public boolean loadStructure(ServerWorld world, boolean bl) {
+   public boolean loadStructure(ServerWorld world, boolean mustMatchSize) {
       if (this.mode == StructureBlockMode.LOAD && this.structureName != null) {
          StructureTemplateManager lv = world.getStructureTemplateManager();
 
@@ -594,7 +594,7 @@
             return false;
          }
 
-         return !optional.isPresent() ? false : this.place(world, bl, (Structure)optional.get());
+         return !optional.isPresent() ? false : this.place(world, mustMatchSize, (Structure)optional.get());
       } else {
          return false;
       }
@@ -604,7 +604,7 @@
     * @mapping {@literal hashed m_fkacmxuv Lnet/minecraft/unmapped/C_bfrzytnu;m_fkacmxuv(Lnet/minecraft/unmapped/C_bdwnwhiu;ZLnet/minecraft/unmapped/C_abvlwuej;)Z}
     * @mapping {@literal named place Lnet/minecraft/block/entity/StructureBlockBlockEntity;place(Lnet/minecraft/server/world/ServerWorld;ZLnet/minecraft/structure/Structure;)Z}
     */
-   public boolean place(ServerWorld world, boolean bl, Structure structure) {
+   public boolean place(ServerWorld world, boolean mustMatchSize, Structure structure) {
       BlockPos lv = this.getPos();
       if (!ChatUtil.isEmpty(structure.getAuthor())) {
          this.author = structure.getAuthor();
@@ -619,7 +619,7 @@
          world.updateListeners(lv, lv3, lv3, Block.NOTIFY_ALL);
       }
 
-      if (bl && !bl2) {
+      if (mustMatchSize && !bl2) {
          return false;
       } else {
          StructurePlacementData lv4 = new StructurePlacementData().setMirror(this.mirror).setRotation(this.rotation).setIgnoreEntities(this.ignoreEntities);
diff -bur namedTargetSrc/net/minecraft/block/enums/NoteBlockInstrument.java namedSrc/net/minecraft/block/enums/NoteBlockInstrument.java
--- namedTargetSrc/net/minecraft/block/enums/NoteBlockInstrument.java	2023-07-01 17:59:06.738679901 +0000
+++ namedSrc/net/minecraft/block/enums/NoteBlockInstrument.java	2023-07-01 17:57:40.183468270 +0000
@@ -185,9 +185,10 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_yesjwtta Lnet/minecraft/unmapped/C_onjtjtsi;m_yesjwtta()Z}
+    * @mapping {@literal named canPlayAboveNoteBlock Lnet/minecraft/block/enums/NoteBlockInstrument;canPlayAboveNoteBlock()Z}
     */
-   public boolean m_yesjwtta() {
+   public boolean canPlayAboveNoteBlock() {
       return this.sourceType != NoteBlockInstrument.SourceType.BASE_BLOCK;
    }
 
diff -bur namedTargetSrc/net/minecraft/block/FluidBlock.java namedSrc/net/minecraft/block/FluidBlock.java
--- namedTargetSrc/net/minecraft/block/FluidBlock.java	2023-07-01 17:59:06.706680191 +0000
+++ namedSrc/net/minecraft/block/FluidBlock.java	2023-07-01 17:57:40.143468631 +0000
@@ -150,7 +150,7 @@
     * Mapping not found
     */
    @Override
-   public List<ItemStack> getDroppedStacks(BlockState state, LootContextParameterSet.Builder arg2) {
+   public List<ItemStack> getDroppedStacks(BlockState state, LootContextParameterSet.Builder lootParameterBuilder) {
       return Collections.emptyList();
    }
 
diff -bur namedTargetSrc/net/minecraft/block/NoteBlock.java namedSrc/net/minecraft/block/NoteBlock.java
--- namedTargetSrc/net/minecraft/block/NoteBlock.java	2023-07-01 17:59:06.738679901 +0000
+++ namedSrc/net/minecraft/block/NoteBlock.java	2023-07-01 17:57:40.187468234 +0000
@@ -71,11 +71,11 @@
     */
    private BlockState getStateWithInstrument(WorldAccess worldAccess, BlockPos pos, BlockState state) {
       NoteBlockInstrument lv = worldAccess.getBlockState(pos.up()).getInstrument();
-      if (lv.m_yesjwtta()) {
+      if (lv.canPlayAboveNoteBlock()) {
          return state.with(INSTRUMENT, lv);
       } else {
          NoteBlockInstrument lv2 = worldAccess.getBlockState(pos.down()).getInstrument();
-         NoteBlockInstrument lv3 = lv2.m_yesjwtta() ? NoteBlockInstrument.HARP : lv2;
+         NoteBlockInstrument lv3 = lv2.canPlayAboveNoteBlock() ? NoteBlockInstrument.HARP : lv2;
          return state.with(INSTRUMENT, lv3);
       }
    }
@@ -119,7 +119,7 @@
     * @mapping {@literal named playNote Lnet/minecraft/block/NoteBlock;playNote(Lnet/minecraft/entity/Entity;Lnet/minecraft/block/BlockState;Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;)V}
     */
    private void playNote(@Nullable Entity entity, BlockState state, World world, BlockPos pos) {
-      if (((NoteBlockInstrument)state.get(INSTRUMENT)).m_yesjwtta() || world.getBlockState(pos.up()).isAir()) {
+      if (((NoteBlockInstrument)state.get(INSTRUMENT)).canPlayAboveNoteBlock() || world.getBlockState(pos.up()).isAir()) {
          world.addSyncedBlockEvent(pos, this, 0, 0);
          world.emitGameEvent(entity, GameEvent.NOTE_BLOCK_PLAY, pos);
       }
diff -bur namedTargetSrc/net/minecraft/block/PistonExtensionBlock.java namedSrc/net/minecraft/block/PistonExtensionBlock.java
--- namedTargetSrc/net/minecraft/block/PistonExtensionBlock.java	2023-07-01 17:59:06.746679829 +0000
+++ namedSrc/net/minecraft/block/PistonExtensionBlock.java	2023-07-01 17:57:40.195468162 +0000
@@ -121,9 +121,11 @@
     * Mapping not found
     */
    @Override
-   public List<ItemStack> getDroppedStacks(BlockState state, LootContextParameterSet.Builder arg2) {
-      PistonBlockEntity lv = this.getPistonBlockEntity(arg2.getWorld(), BlockPos.fromPosition(arg2.getParameter(LootContextParameters.ORIGIN)));
-      return lv == null ? Collections.emptyList() : lv.getMovedBlockState().getDroppedStacks(arg2);
+   public List<ItemStack> getDroppedStacks(BlockState state, LootContextParameterSet.Builder lootParameterBuilder) {
+      PistonBlockEntity lv = this.getPistonBlockEntity(
+         lootParameterBuilder.getWorld(), BlockPos.fromPosition(lootParameterBuilder.getParameter(LootContextParameters.ORIGIN))
+      );
+      return lv == null ? Collections.emptyList() : lv.getMovedBlockState().getDroppedStacks(lootParameterBuilder);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/ShulkerBoxBlock.java namedSrc/net/minecraft/block/ShulkerBoxBlock.java
--- namedTargetSrc/net/minecraft/block/ShulkerBoxBlock.java	2023-07-01 17:59:06.726680010 +0000
+++ namedSrc/net/minecraft/block/ShulkerBoxBlock.java	2023-07-01 17:57:40.167468414 +0000
@@ -235,17 +235,17 @@
     * Mapping not found
     */
    @Override
-   public List<ItemStack> getDroppedStacks(BlockState state, LootContextParameterSet.Builder arg2) {
-      BlockEntity lv = arg2.getOptionalParameter(LootContextParameters.BLOCK_ENTITY);
+   public List<ItemStack> getDroppedStacks(BlockState state, LootContextParameterSet.Builder lootParameterBuilder) {
+      BlockEntity lv = lootParameterBuilder.getOptionalParameter(LootContextParameters.BLOCK_ENTITY);
       if (lv instanceof ShulkerBoxBlockEntity lv2) {
-         arg2 = arg2.withDynamicDrop(CONTENTS_DYNAMIC_DROP_ID, consumer -> {
+         lootParameterBuilder = lootParameterBuilder.withDynamicDrop(CONTENTS_DYNAMIC_DROP_ID, consumer -> {
             for (int i = 0; i < lv2.size(); ++i) {
                consumer.accept(lv2.getStack(i));
             }
          });
       }
 
-      return super.getDroppedStacks(state, arg2);
+      return super.getDroppedStacks(state, lootParameterBuilder);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/WallPlayerSkullBlock.java namedSrc/net/minecraft/block/WallPlayerSkullBlock.java
--- namedTargetSrc/net/minecraft/block/WallPlayerSkullBlock.java	2023-07-01 17:59:06.782679503 +0000
+++ namedSrc/net/minecraft/block/WallPlayerSkullBlock.java	2023-07-01 17:57:40.239467765 +0000
@@ -32,7 +32,7 @@
     * Mapping not found
     */
    @Override
-   public List<ItemStack> getDroppedStacks(BlockState state, LootContextParameterSet.Builder arg2) {
-      return Blocks.PLAYER_HEAD.getDroppedStacks(state, arg2);
+   public List<ItemStack> getDroppedStacks(BlockState state, LootContextParameterSet.Builder lootParameterBuilder) {
+      return Blocks.PLAYER_HEAD.getDroppedStacks(state, lootParameterBuilder);
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/font/BitmapFont.java namedSrc/net/minecraft/client/font/BitmapFont.java
--- namedTargetSrc/net/minecraft/client/font/BitmapFont.java	2023-07-01 17:59:06.722680046 +0000
+++ namedSrc/net/minecraft/client/font/BitmapFont.java	2023-07-01 17:57:40.167468414 +0000
@@ -49,11 +49,12 @@
    private final C_srmdcrvq<BitmapFont.BitmapFontGlyph> glyphs;
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_tfzxpuio;<init>(Lnet/minecraft/unmapped/C_ayikuhxa;Lnet/minecraft/unmapped/C_srmdcrvq;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/client/font/BitmapFont;<init>(Lcom/mojang/blaze3d/texture/NativeImage;Lnet/minecraft/unmapped/C_srmdcrvq;)V}
     */
-   BitmapFont(NativeImage arg, C_srmdcrvq<BitmapFont.BitmapFontGlyph> arg2) {
-      this.image = arg;
-      this.glyphs = arg2;
+   BitmapFont(NativeImage image, C_srmdcrvq<BitmapFont.BitmapFontGlyph> glyphs) {
+      this.image = image;
+      this.glyphs = glyphs;
    }
 
    /**

@github-actions
Copy link
Contributor

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/font/GlyphAtlasTexture.java namedSrc/net/minecraft/client/font/GlyphAtlasTexture.java
--- namedTargetSrc/net/minecraft/client/font/GlyphAtlasTexture.java	2023-07-01 17:59:06.682680409 +0000
+++ namedSrc/net/minecraft/client/font/GlyphAtlasTexture.java	2023-07-01 17:57:40.111468920 +0000
@@ -39,12 +39,13 @@
    private final GlyphAtlasTexture.Slot rootSlot;
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_lqjqkabz;<init>(Lnet/minecraft/unmapped/C_wrgwzztj;Z)V}
+    * @mapping {@literal named <init> Lnet/minecraft/client/font/GlyphAtlasTexture;<init>(Lnet/minecraft/client/font/FontRenderType;Z)V}
     */
-   public GlyphAtlasTexture(FontRenderType arg, boolean bl) {
-      this.hasColor = bl;
+   public GlyphAtlasTexture(FontRenderType arg, boolean hasColor) {
+      this.hasColor = hasColor;
       this.rootSlot = new GlyphAtlasTexture.Slot(0, 0, 256, 256);
-      TextureUtil.prepareImage(bl ? NativeImage.GLFormat.ABGR : NativeImage.GLFormat.RED, this.getGlId(), 256, 256);
+      TextureUtil.prepareImage(hasColor ? NativeImage.GLFormat.ABGR : NativeImage.GLFormat.RED, this.getGlId(), 256, 256);
       this.f_opyzrrup = arg;
    }
 
diff -bur namedTargetSrc/net/minecraft/client/font/GlyphRenderer.java namedSrc/net/minecraft/client/font/GlyphRenderer.java
--- namedTargetSrc/net/minecraft/client/font/GlyphRenderer.java	2023-07-01 17:59:06.690680336 +0000
+++ namedSrc/net/minecraft/client/font/GlyphRenderer.java	2023-07-01 17:57:40.115468883 +0000
@@ -58,18 +58,19 @@
    private final float maxY;
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_wrqtxozz;<init>(Lnet/minecraft/unmapped/C_wrgwzztj;FFFFFFFF)V}
+    * @mapping {@literal named <init> Lnet/minecraft/client/font/GlyphRenderer;<init>(Lnet/minecraft/client/font/FontRenderType;FFFFFFFF)V}
     */
-   public GlyphRenderer(FontRenderType arg, float f, float g, float h, float i, float j, float k, float l, float m) {
+   public GlyphRenderer(FontRenderType arg, float minU, float maxU, float minV, float maxV, float minX, float maxX, float minY, float maxY) {
       this.f_kagavzdk = arg;
-      this.minU = f;
-      this.maxU = g;
-      this.minV = h;
-      this.maxV = i;
-      this.minX = j;
-      this.maxX = k;
-      this.minY = l;
-      this.maxY = m;
+      this.minU = minU;
+      this.maxU = maxU;
+      this.minV = minV;
+      this.maxV = maxV;
+      this.minX = minX;
+      this.maxX = maxX;
+      this.minY = minY;
+      this.maxY = maxY;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/CustomizeBuffetWorldScreen.java namedSrc/net/minecraft/client/gui/screen/CustomizeBuffetWorldScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/CustomizeBuffetWorldScreen.java	2023-07-01 17:59:06.706680191 +0000
+++ namedSrc/net/minecraft/client/gui/screen/CustomizeBuffetWorldScreen.java	2023-07-01 17:57:40.147468595 +0000
@@ -139,7 +139,8 @@
    @Environment(EnvType.CLIENT)
    class BuffetBiomesListWidget extends AlwaysSelectedEntryListWidget<CustomizeBuffetWorldScreen.BuffetBiomesListWidget.BuffetBiomeItem> {
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_ymxzwktm$C_cueunujs;<init>(Lnet/minecraft/unmapped/C_ymxzwktm;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/client/gui/screen/CustomizeBuffetWorldScreen$BuffetBiomesListWidget;<init>(Lnet/minecraft/client/gui/screen/CustomizeBuffetWorldScreen;)V}
        */
       BuffetBiomesListWidget() {
          super(
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/world/OptimizeWorldScreen.java namedSrc/net/minecraft/client/gui/screen/world/OptimizeWorldScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/world/OptimizeWorldScreen.java	2023-07-01 17:59:06.686680373 +0000
+++ namedSrc/net/minecraft/client/gui/screen/world/OptimizeWorldScreen.java	2023-07-01 17:57:40.115468883 +0000
@@ -92,10 +92,10 @@
     * @mapping {@literal named <init> Lnet/minecraft/client/gui/screen/world/OptimizeWorldScreen;<init>(Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/world/storage/WorldSaveStorage$Session;Lnet/minecraft/world/WorldInfo;ZLnet/minecraft/registry/Registry;)V}
     */
    private OptimizeWorldScreen(
-      BooleanConsumer booleanConsumer, DataFixer dataFixer, WorldSaveStorage.Session arg, WorldInfo arg2, boolean bl, Registry<DimensionOptions> registry
+      BooleanConsumer callback, DataFixer dataFixer, WorldSaveStorage.Session arg, WorldInfo arg2, boolean bl, Registry<DimensionOptions> registry
    ) {
       super(Text.translatable("optimizeWorld.title", arg2.getLevelName()));
-      this.callback = booleanConsumer;
+      this.callback = callback;
       this.updater = new WorldUpdater(arg, dataFixer, registry, bl);
    }
 
diff -bur namedTargetSrc/net/minecraft/client/MinecraftClient.java namedSrc/net/minecraft/client/MinecraftClient.java
--- namedTargetSrc/net/minecraft/client/MinecraftClient.java	2023-07-01 17:59:06.674680481 +0000
+++ namedSrc/net/minecraft/client/MinecraftClient.java	2023-07-01 17:57:40.099469028 +0000
@@ -4051,7 +4051,7 @@
     */
    @Nullable
    public SignatureValidator m_yknnrfie() {
-      return SignatureValidator.m_dkohjnkg(this.authService.getServicesKeySet(), ServicesKeyType.PROFILE_KEY);
+      return SignatureValidator.create(this.authService.getServicesKeySet(), ServicesKeyType.PROFILE_KEY);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/particle/BubblePopParticle.java namedSrc/net/minecraft/client/particle/BubblePopParticle.java
--- namedTargetSrc/net/minecraft/client/particle/BubblePopParticle.java	2023-07-01 17:59:06.762679684 +0000
+++ namedSrc/net/minecraft/client/particle/BubblePopParticle.java	2023-07-01 17:57:40.215467981 +0000
@@ -21,15 +21,15 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_pocdpamg;<init>(Lnet/minecraft/unmapped/C_ghdnlrrw;DDDDDDLnet/minecraft/unmapped/C_audtngae;)V}
     * @mapping {@literal named <init> Lnet/minecraft/client/particle/BubblePopParticle;<init>(Lnet/minecraft/client/world/ClientWorld;DDDDDDLnet/minecraft/client/particle/SpriteProvider;)V}
     */
-   BubblePopParticle(ClientWorld world, double d, double e, double f, double g, double h, double i, SpriteProvider arg2) {
+   BubblePopParticle(ClientWorld world, double d, double e, double f, double velocityX, double velocityY, double velocityZ, SpriteProvider spriteProvider) {
       super(world, d, e, f);
-      this.spriteProvider = arg2;
+      this.spriteProvider = spriteProvider;
       this.maxAge = 4;
       this.gravityStrength = 0.008F;
-      this.velocityX = g;
-      this.velocityY = h;
-      this.velocityZ = i;
-      this.setSpriteForAge(arg2);
+      this.velocityX = velocityX;
+      this.velocityY = velocityY;
+      this.velocityZ = velocityZ;
+      this.setSpriteForAge(spriteProvider);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/particle/CampfireSmokeParticle.java namedSrc/net/minecraft/client/particle/CampfireSmokeParticle.java
--- namedTargetSrc/net/minecraft/client/particle/CampfireSmokeParticle.java	2023-07-01 17:59:06.782679503 +0000
+++ namedSrc/net/minecraft/client/particle/CampfireSmokeParticle.java	2023-07-01 17:57:40.239467765 +0000
@@ -15,7 +15,7 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_jrzyxolt;<init>(Lnet/minecraft/unmapped/C_ghdnlrrw;DDDDDDZ)V}
     * @mapping {@literal named <init> Lnet/minecraft/client/particle/CampfireSmokeParticle;<init>(Lnet/minecraft/client/world/ClientWorld;DDDDDDZ)V}
     */
-   CampfireSmokeParticle(ClientWorld world, double d, double e, double f, double g, double h, double i, boolean bl) {
+   CampfireSmokeParticle(ClientWorld world, double d, double e, double f, double velocityX, double h, double velocityZ, boolean bl) {
       super(world, d, e, f);
       this.scale(3.0F);
       this.setBoundingBoxSpacing(0.25F, 0.25F);
@@ -26,9 +26,9 @@
       }
 
       this.gravityStrength = 3.0E-6F;
-      this.velocityX = g;
+      this.velocityX = velocityX;
       this.velocityY = h + (double)(this.random.nextFloat() / 500.0F);
-      this.velocityZ = i;
+      this.velocityZ = velocityZ;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/particle/CloudParticle.java namedSrc/net/minecraft/client/particle/CloudParticle.java
--- namedTargetSrc/net/minecraft/client/particle/CloudParticle.java	2023-07-01 17:59:06.746679829 +0000
+++ namedSrc/net/minecraft/client/particle/CloudParticle.java	2023-07-01 17:57:40.195468162 +0000
@@ -23,10 +23,10 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_jvlqedpn;<init>(Lnet/minecraft/unmapped/C_ghdnlrrw;DDDDDDLnet/minecraft/unmapped/C_audtngae;)V}
     * @mapping {@literal named <init> Lnet/minecraft/client/particle/CloudParticle;<init>(Lnet/minecraft/client/world/ClientWorld;DDDDDDLnet/minecraft/client/particle/SpriteProvider;)V}
     */
-   CloudParticle(ClientWorld world, double d, double e, double f, double g, double h, double i, SpriteProvider arg2) {
+   CloudParticle(ClientWorld world, double d, double e, double f, double g, double h, double i, SpriteProvider spriteProvider) {
       super(world, d, e, f, 0.0, 0.0, 0.0);
       this.velocityMultiplier = 0.96F;
-      this.spriteProvider = arg2;
+      this.spriteProvider = spriteProvider;
       float j = 2.5F;
       this.velocityX *= 0.1F;
       this.velocityY *= 0.1F;
@@ -42,7 +42,7 @@
       int l = (int)(8.0 / (Math.random() * 0.8 + 0.3));
       this.maxAge = (int)Math.max((float)l * 2.5F, 1.0F);
       this.collidesWithWorld = false;
-      this.setSpriteForAge(arg2);
+      this.setSpriteForAge(spriteProvider);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/particle/EndRodParticle.java namedSrc/net/minecraft/client/particle/EndRodParticle.java
--- namedTargetSrc/net/minecraft/client/particle/EndRodParticle.java	2023-07-01 17:59:06.766679648 +0000
+++ namedSrc/net/minecraft/client/particle/EndRodParticle.java	2023-07-01 17:57:40.219467945 +0000
@@ -15,11 +15,11 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_rozhyhiq;<init>(Lnet/minecraft/unmapped/C_ghdnlrrw;DDDDDDLnet/minecraft/unmapped/C_audtngae;)V}
     * @mapping {@literal named <init> Lnet/minecraft/client/particle/EndRodParticle;<init>(Lnet/minecraft/client/world/ClientWorld;DDDDDDLnet/minecraft/client/particle/SpriteProvider;)V}
     */
-   EndRodParticle(ClientWorld world, double d, double e, double f, double g, double h, double i, SpriteProvider arg2) {
+   EndRodParticle(ClientWorld world, double d, double e, double f, double velocityX, double velocityY, double velocityZ, SpriteProvider arg2) {
       super(world, d, e, f, arg2, 0.0125F);
-      this.velocityX = g;
-      this.velocityY = h;
-      this.velocityZ = i;
+      this.velocityX = velocityX;
+      this.velocityY = velocityY;
+      this.velocityZ = velocityZ;
       this.scale *= 0.75F;
       this.maxAge = 60 + this.random.nextInt(12);
       this.setTargetColor(15916745);
diff -bur namedTargetSrc/net/minecraft/client/particle/FishingParticle.java namedSrc/net/minecraft/client/particle/FishingParticle.java
--- namedTargetSrc/net/minecraft/client/particle/FishingParticle.java	2023-07-01 17:59:06.710680155 +0000
+++ namedSrc/net/minecraft/client/particle/FishingParticle.java	2023-07-01 17:57:40.151468559 +0000
@@ -21,19 +21,19 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_fufqiwyv;<init>(Lnet/minecraft/unmapped/C_ghdnlrrw;DDDDDDLnet/minecraft/unmapped/C_audtngae;)V}
     * @mapping {@literal named <init> Lnet/minecraft/client/particle/FishingParticle;<init>(Lnet/minecraft/client/world/ClientWorld;DDDDDDLnet/minecraft/client/particle/SpriteProvider;)V}
     */
-   FishingParticle(ClientWorld world, double d, double e, double f, double g, double h, double i, SpriteProvider arg2) {
+   FishingParticle(ClientWorld world, double d, double e, double f, double velocityX, double velocityY, double velocityZ, SpriteProvider spriteProvider) {
       super(world, d, e, f, 0.0, 0.0, 0.0);
-      this.spriteProvider = arg2;
+      this.spriteProvider = spriteProvider;
       this.velocityX *= 0.3F;
       this.velocityY = Math.random() * 0.2F + 0.1F;
       this.velocityZ *= 0.3F;
       this.setBoundingBoxSpacing(0.01F, 0.01F);
       this.maxAge = (int)(8.0 / (Math.random() * 0.8 + 0.2));
-      this.setSpriteForAge(arg2);
+      this.setSpriteForAge(spriteProvider);
       this.gravityStrength = 0.0F;
-      this.velocityX = g;
-      this.velocityY = h;
-      this.velocityZ = i;
+      this.velocityX = velocityX;
+      this.velocityY = velocityY;
+      this.velocityZ = velocityZ;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/particle/SquidInkParticle.java namedSrc/net/minecraft/client/particle/SquidInkParticle.java
--- namedTargetSrc/net/minecraft/client/particle/SquidInkParticle.java	2023-07-01 17:59:06.746679829 +0000
+++ namedSrc/net/minecraft/client/particle/SquidInkParticle.java	2023-07-01 17:57:40.195468162 +0000
@@ -17,7 +17,7 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_gzqmrqog;<init>(Lnet/minecraft/unmapped/C_ghdnlrrw;DDDDDDILnet/minecraft/unmapped/C_audtngae;)V}
     * @mapping {@literal named <init> Lnet/minecraft/client/particle/SquidInkParticle;<init>(Lnet/minecraft/client/world/ClientWorld;DDDDDDILnet/minecraft/client/particle/SpriteProvider;)V}
     */
-   SquidInkParticle(ClientWorld world, double d, double e, double f, double g, double h, double i, int j, SpriteProvider arg2) {
+   SquidInkParticle(ClientWorld world, double d, double e, double f, double velocityX, double velocityY, double velocityZ, int j, SpriteProvider arg2) {
       super(world, d, e, f, arg2, 0.0F);
       this.velocityMultiplier = 0.92F;
       this.scale = 0.5F;
@@ -26,9 +26,9 @@
       this.maxAge = (int)((double)(this.scale * 12.0F) / (Math.random() * 0.8F + 0.2F));
       this.setSpriteForAge(arg2);
       this.collidesWithWorld = false;
-      this.velocityX = g;
-      this.velocityY = h;
-      this.velocityZ = i;
+      this.velocityX = velocityX;
+      this.velocityY = velocityY;
+      this.velocityZ = velocityZ;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/particle/SweepAttackParticle.java namedSrc/net/minecraft/client/particle/SweepAttackParticle.java
--- namedTargetSrc/net/minecraft/client/particle/SweepAttackParticle.java	2023-07-01 17:59:06.730679974 +0000
+++ namedSrc/net/minecraft/client/particle/SweepAttackParticle.java	2023-07-01 17:57:40.171468378 +0000
@@ -21,16 +21,16 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_rjdfviky;<init>(Lnet/minecraft/unmapped/C_ghdnlrrw;DDDDLnet/minecraft/unmapped/C_audtngae;)V}
     * @mapping {@literal named <init> Lnet/minecraft/client/particle/SweepAttackParticle;<init>(Lnet/minecraft/client/world/ClientWorld;DDDDLnet/minecraft/client/particle/SpriteProvider;)V}
     */
-   SweepAttackParticle(ClientWorld world, double d, double e, double f, double g, SpriteProvider arg2) {
+   SweepAttackParticle(ClientWorld world, double d, double e, double f, double g, SpriteProvider spriteProvider) {
       super(world, d, e, f, 0.0, 0.0, 0.0);
-      this.spriteProvider = arg2;
+      this.spriteProvider = spriteProvider;
       this.maxAge = 4;
       float h = this.random.nextFloat() * 0.6F + 0.4F;
       this.colorRed = h;
       this.colorGreen = h;
       this.colorBlue = h;
       this.scale = 1.0F - (float)g * 0.5F;
-      this.setSpriteForAge(arg2);
+      this.setSpriteForAge(spriteProvider);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/particle/TotemParticle.java namedSrc/net/minecraft/client/particle/TotemParticle.java
--- namedTargetSrc/net/minecraft/client/particle/TotemParticle.java	2023-07-01 17:59:06.666680554 +0000
+++ namedSrc/net/minecraft/client/particle/TotemParticle.java	2023-07-01 17:57:40.087469136 +0000
@@ -15,12 +15,12 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_zrqowkvq;<init>(Lnet/minecraft/unmapped/C_ghdnlrrw;DDDDDDLnet/minecraft/unmapped/C_audtngae;)V}
     * @mapping {@literal named <init> Lnet/minecraft/client/particle/TotemParticle;<init>(Lnet/minecraft/client/world/ClientWorld;DDDDDDLnet/minecraft/client/particle/SpriteProvider;)V}
     */
-   TotemParticle(ClientWorld world, double d, double e, double f, double g, double h, double i, SpriteProvider arg2) {
+   TotemParticle(ClientWorld world, double d, double e, double f, double velocityX, double velocityY, double velocityZ, SpriteProvider arg2) {
       super(world, d, e, f, arg2, 1.25F);
       this.velocityMultiplier = 0.6F;
-      this.velocityX = g;
-      this.velocityY = h;
-      this.velocityZ = i;
+      this.velocityX = velocityX;
+      this.velocityY = velocityY;
+      this.velocityZ = velocityZ;
       this.scale *= 0.75F;
       this.maxAge = 60 + this.random.nextInt(12);
       this.setSpriteForAge(arg2);
diff -bur namedTargetSrc/net/minecraft/client/particle/VibrationParticle.java namedSrc/net/minecraft/client/particle/VibrationParticle.java
--- namedTargetSrc/net/minecraft/client/particle/VibrationParticle.java	2023-07-01 17:59:06.742679865 +0000
+++ namedSrc/net/minecraft/client/particle/VibrationParticle.java	2023-07-01 17:57:40.191468198 +0000
@@ -45,11 +45,11 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_ydywaufp;<init>(Lnet/minecraft/unmapped/C_ghdnlrrw;DDDLnet/minecraft/unmapped/C_duzerrml;I)V}
     * @mapping {@literal named <init> Lnet/minecraft/client/particle/VibrationParticle;<init>(Lnet/minecraft/client/world/ClientWorld;DDDLnet/minecraft/world/event/PositionSource;I)V}
     */
-   VibrationParticle(ClientWorld world, double d, double e, double f, PositionSource arg2, int i) {
+   VibrationParticle(ClientWorld world, double d, double e, double f, PositionSource arg2, int maxAge) {
       super(world, d, e, f, 0.0, 0.0, 0.0);
       this.scale = 0.3F;
       this.f_wrgbfphf = arg2;
-      this.maxAge = i;
+      this.maxAge = maxAge;
       Optional<Vec3d> optional = arg2.getPos(world);
       if (optional.isPresent()) {
          Vec3d lv = (Vec3d)optional.get();
diff -bur namedTargetSrc/net/minecraft/client/realms/exception/RealmsDefaultUncaughtExceptionHandler.java namedSrc/net/minecraft/client/realms/exception/RealmsDefaultUncaughtExceptionHandler.java
--- namedTargetSrc/net/minecraft/client/realms/exception/RealmsDefaultUncaughtExceptionHandler.java	2023-07-01 17:59:06.730679974 +0000
+++ namedSrc/net/minecraft/client/realms/exception/RealmsDefaultUncaughtExceptionHandler.java	2023-07-01 17:57:40.175468342 +0000
@@ -18,7 +18,8 @@
    private final Logger logger;
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_dcgzntav;<init>(Lorg/slf4j/Logger;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/client/realms/exception/RealmsDefaultUncaughtExceptionHandler;<init>(Lorg/slf4j/Logger;)V}
     */
    public RealmsDefaultUncaughtExceptionHandler(Logger logger) {
       this.logger = logger;
diff -bur namedTargetSrc/net/minecraft/client/realms/gui/screen/RealmsClientOutdatedScreen.java namedSrc/net/minecraft/client/realms/gui/screen/RealmsClientOutdatedScreen.java
--- namedTargetSrc/net/minecraft/client/realms/gui/screen/RealmsClientOutdatedScreen.java	2023-07-01 17:59:06.674680481 +0000
+++ namedSrc/net/minecraft/client/realms/gui/screen/RealmsClientOutdatedScreen.java	2023-07-01 17:57:40.099469028 +0000
@@ -43,11 +43,12 @@
    private final Screen parent;
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_wymgylgm;<init>(Lnet/minecraft/unmapped/C_wrmtlwqx;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/client/realms/gui/screen/RealmsClientOutdatedScreen;<init>(Lnet/minecraft/client/gui/screen/Screen;)V}
     */
-   public RealmsClientOutdatedScreen(Screen arg) {
+   public RealmsClientOutdatedScreen(Screen parent) {
       super(INCOMPATIBLE_TITLE);
-      this.parent = arg;
+      this.parent = parent;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/realms/gui/screen/RealmsLongConfirmationScreen.java namedSrc/net/minecraft/client/realms/gui/screen/RealmsLongConfirmationScreen.java
--- namedTargetSrc/net/minecraft/client/realms/gui/screen/RealmsLongConfirmationScreen.java	2023-07-01 17:59:06.750679793 +0000
+++ namedSrc/net/minecraft/client/realms/gui/screen/RealmsLongConfirmationScreen.java	2023-07-01 17:57:40.199468126 +0000
@@ -144,11 +144,12 @@
       public final Text text;
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_iunqlfqo$C_ewjnbicl;<init>(Ljava/lang/String;ILnet/minecraft/unmapped/C_rdaqiwdt;I)V}
+       * @mapping {@literal named <init> Lnet/minecraft/client/realms/gui/screen/RealmsLongConfirmationScreen$Type;<init>(Ljava/lang/String;ILnet/minecraft/text/Text;I)V}
        */
-      private Type(Text arg, int j) {
-         this.text = arg;
-         this.colorCode = j;
+      private Type(Text text, int colorCode) {
+         this.text = text;
+         this.colorCode = colorCode;
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/realms/gui/screen/RealmsPendingInvitesScreen.java namedSrc/net/minecraft/client/realms/gui/screen/RealmsPendingInvitesScreen.java
--- namedTargetSrc/net/minecraft/client/realms/gui/screen/RealmsPendingInvitesScreen.java	2023-07-01 17:59:06.718680083 +0000
+++ namedSrc/net/minecraft/client/realms/gui/screen/RealmsPendingInvitesScreen.java	2023-07-01 17:57:40.163468451 +0000
@@ -96,11 +96,12 @@
    private ButtonWidget rejectButton;
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_qnfsqjgp;<init>(Lnet/minecraft/unmapped/C_wrmtlwqx;Lnet/minecraft/unmapped/C_rdaqiwdt;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/client/realms/gui/screen/RealmsPendingInvitesScreen;<init>(Lnet/minecraft/client/gui/screen/Screen;Lnet/minecraft/text/Text;)V}
     */
-   public RealmsPendingInvitesScreen(Screen arg, Text arg2) {
+   public RealmsPendingInvitesScreen(Screen parent, Text arg2) {
       super(arg2);
-      this.parent = arg;
+      this.parent = parent;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/realms/gui/screen/RealmsWorldGeneratorType.java namedSrc/net/minecraft/client/realms/gui/screen/RealmsWorldGeneratorType.java
--- namedTargetSrc/net/minecraft/client/realms/gui/screen/RealmsWorldGeneratorType.java	2023-07-01 17:59:06.766679648 +0000
+++ namedSrc/net/minecraft/client/realms/gui/screen/RealmsWorldGeneratorType.java	2023-07-01 17:57:40.223467909 +0000
@@ -49,8 +49,8 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_oynhlvsg;<init>(Ljava/lang/String;IILnet/minecraft/unmapped/C_xhhleach;)V}
     * @mapping {@literal named <init> Lnet/minecraft/client/realms/gui/screen/RealmsWorldGeneratorType;<init>(Ljava/lang/String;IILnet/minecraft/registry/RegistryKey;)V}
     */
-   private RealmsWorldGeneratorType(int j, RegistryKey<GeneratorType> registryKey) {
-      this.id = j;
+   private RealmsWorldGeneratorType(int id, RegistryKey<GeneratorType> registryKey) {
+      this.id = id;
       this.text = Text.translatable(registryKey.getValue().toTranslationKey("generator"));
    }
 
diff -bur namedTargetSrc/net/minecraft/client/render/model/json/ModelElement.java namedSrc/net/minecraft/client/render/model/json/ModelElement.java
--- namedTargetSrc/net/minecraft/client/render/model/json/ModelElement.java	2023-07-01 17:59:06.666680554 +0000
+++ namedSrc/net/minecraft/client/render/model/json/ModelElement.java	2023-07-01 17:57:40.091469100 +0000
@@ -67,14 +67,15 @@
    public final boolean shade;
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_hsydfaux;<init>(Lorg/joml/Vector3f;Lorg/joml/Vector3f;Ljava/util/Map;Lnet/minecraft/unmapped/C_rruqzaih;Z)V}
+    * @mapping {@literal named <init> Lnet/minecraft/client/render/model/json/ModelElement;<init>(Lorg/joml/Vector3f;Lorg/joml/Vector3f;Ljava/util/Map;Lnet/minecraft/client/render/model/json/ModelRotation;Z)V}
     */
-   public ModelElement(Vector3f vector3f, Vector3f vector3f2, Map<Direction, ModelElementFace> map, @Nullable ModelRotation arg, boolean bl) {
-      this.from = vector3f;
-      this.to = vector3f2;
-      this.faces = map;
-      this.rotation = arg;
-      this.shade = bl;
+   public ModelElement(Vector3f from, Vector3f to, Map<Direction, ModelElementFace> faces, @Nullable ModelRotation rotation, boolean shade) {
+      this.from = from;
+      this.to = to;
+      this.faces = faces;
+      this.rotation = rotation;
+      this.shade = shade;
       this.initTextures();
    }
 
diff -bur namedTargetSrc/net/minecraft/client/sound/Sound.java namedSrc/net/minecraft/client/sound/Sound.java
--- namedTargetSrc/net/minecraft/client/sound/Sound.java	2023-07-01 17:59:06.654680663 +0000
+++ namedSrc/net/minecraft/client/sound/Sound.java	2023-07-01 17:57:40.075469244 +0000
@@ -61,17 +61,27 @@
    private final int attenuation;
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_ranpgzkp;<init>(Ljava/lang/String;Lnet/minecraft/unmapped/C_idcjylid;Lnet/minecraft/unmapped/C_idcjylid;ILnet/minecraft/unmapped/C_ranpgzkp$C_nnuwwqqh;ZZI)V}
+    * @mapping {@literal named <init> Lnet/minecraft/client/sound/Sound;<init>(Ljava/lang/String;Lnet/minecraft/util/math/float_provider/FloatSupplier;Lnet/minecraft/util/math/float_provider/FloatSupplier;ILnet/minecraft/client/sound/Sound$RegistrationType;ZZI)V}
     */
-   public Sound(String string, FloatSupplier arg, FloatSupplier arg2, int i, Sound.RegistrationType arg3, boolean bl, boolean bl2, int j) {
+   public Sound(
+      String string,
+      FloatSupplier volume,
+      FloatSupplier pitch,
+      int weight,
+      Sound.RegistrationType registrationType,
+      boolean stream,
+      boolean preload,
+      int attenuation
+   ) {
       this.id = new Identifier(string);
-      this.volume = arg;
-      this.pitch = arg2;
-      this.weight = i;
-      this.registrationType = arg3;
-      this.stream = bl;
-      this.preload = bl2;
-      this.attenuation = j;
+      this.volume = volume;
+      this.pitch = pitch;
+      this.weight = weight;
+      this.registrationType = registrationType;
+      this.stream = stream;
+      this.preload = preload;
+      this.attenuation = attenuation;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/sound/SoundLoader.java namedSrc/net/minecraft/client/sound/SoundLoader.java
--- namedTargetSrc/net/minecraft/client/sound/SoundLoader.java	2023-07-01 17:59:06.674680481 +0000
+++ namedSrc/net/minecraft/client/sound/SoundLoader.java	2023-07-01 17:57:40.103468992 +0000
@@ -32,10 +32,11 @@
    private final Map<Identifier, CompletableFuture<StaticSound>> loadedSounds = Maps.<Identifier, CompletableFuture<StaticSound>>newHashMap();
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_gtusadmd;<init>(Lnet/minecraft/unmapped/C_xadhkzfq;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/client/sound/SoundLoader;<init>(Lnet/minecraft/resource/ResourceFactory;)V}
     */
-   public SoundLoader(ResourceFactory arg) {
-      this.resourceManager = arg;
+   public SoundLoader(ResourceFactory resourceManager) {
+      this.resourceManager = resourceManager;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/sound/SoundSystem.java namedSrc/net/minecraft/client/sound/SoundSystem.java
--- namedTargetSrc/net/minecraft/client/sound/SoundSystem.java	2023-07-01 17:59:06.778679539 +0000
+++ namedSrc/net/minecraft/client/sound/SoundSystem.java	2023-07-01 17:57:40.235467801 +0000
@@ -196,11 +196,12 @@
    private final List<Sound> preloadedSounds = Lists.<Sound>newArrayList();
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_stgbrlun;<init>(Lnet/minecraft/unmapped/C_hfmtwavd;Lnet/minecraft/unmapped/C_lscptbhn;Lnet/minecraft/unmapped/C_xadhkzfq;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/client/sound/SoundSystem;<init>(Lnet/minecraft/client/sound/SoundManager;Lnet/minecraft/client/option/GameOptions;Lnet/minecraft/resource/ResourceFactory;)V}
     */
-   public SoundSystem(SoundManager arg, GameOptions arg2, ResourceFactory arg3) {
-      this.loader = arg;
-      this.settings = arg2;
+   public SoundSystem(SoundManager loader, GameOptions settings, ResourceFactory arg3) {
+      this.loader = loader;
+      this.settings = settings;
       this.soundLoader = new SoundLoader(arg3);
    }
 
diff -bur namedTargetSrc/net/minecraft/client/toast/ToastManager.java namedSrc/net/minecraft/client/toast/ToastManager.java
--- namedTargetSrc/net/minecraft/client/toast/ToastManager.java	2023-07-01 17:59:06.734679938 +0000
+++ namedSrc/net/minecraft/client/toast/ToastManager.java	2023-07-01 17:57:40.175468342 +0000
@@ -207,10 +207,11 @@
       private Toast.Visibility visibility = Toast.Visibility.SHOW;
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_eqfjupcc$C_owidtlkk;<init>(Lnet/minecraft/unmapped/C_eqfjupcc;Lnet/minecraft/unmapped/C_zqhkdxaf;II)V}
+       * @mapping {@literal named <init> Lnet/minecraft/client/toast/ToastManager$Entry;<init>(Lnet/minecraft/client/toast/ToastManager;Lnet/minecraft/client/toast/Toast;II)V}
        */
-      Entry(T arg2, int i, int j) {
-         this.instance = arg2;
+      Entry(T instance, int i, int j) {
+         this.instance = instance;
          this.f_hcntplas = i;
          this.f_oqdewilb = j;
       }
diff -bur namedTargetSrc/net/minecraft/client/world/ClientEntityManager.java namedSrc/net/minecraft/client/world/ClientEntityManager.java
--- namedTargetSrc/net/minecraft/client/world/ClientEntityManager.java	2023-07-01 17:59:06.730679974 +0000
+++ namedSrc/net/minecraft/client/world/ClientEntityManager.java	2023-07-01 17:57:40.171468378 +0000
@@ -201,7 +201,7 @@
             lv3.add(this.entity);
             this.section = lv3;
             this.lastSectionPos = l;
-            ClientEntityManager.this.handler.m_aeoofqgi(this.entity);
+            ClientEntityManager.this.handler.updateLoadStatus(this.entity);
             if (!this.entity.isPlayer()) {
                boolean bl = lv2.shouldTick();
                boolean bl2 = lv3.getStatus().shouldTick();
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-01 17:59:06.742679865 +0000
+++ namedSrc/net/minecraft/client/world/ClientWorld.java	2023-07-01 17:57:40.191468198 +0000
@@ -1289,9 +1289,9 @@
 
       /**
        * @mapping {@literal hashed m_ktadfocu Lnet/minecraft/unmapped/C_ghdnlrrw$C_yvinczis;m_ktadfocu(Lnet/minecraft/unmapped/C_astfners;)V}
-       * @mapping {@literal named m_aeoofqgi Lnet/minecraft/client/world/ClientWorld$ClientEntityHandler;m_aeoofqgi(Lnet/minecraft/entity/Entity;)V}
+       * @mapping {@literal named updateLoadStatus Lnet/minecraft/client/world/ClientWorld$ClientEntityHandler;updateLoadStatus(Lnet/minecraft/entity/Entity;)V}
        */
-      public void m_aeoofqgi(Entity arg) {
+      public void updateLoadStatus(Entity arg) {
       }
    }
 
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-01 17:59:06.650680699 +0000
+++ namedSrc/net/minecraft/client/world/WorldCreator.java	2023-07-01 17:57:40.071469280 +0000
@@ -108,8 +108,8 @@
     * @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 path, WorldCreationContext context, Optional<RegistryKey<GeneratorType>> optional, OptionalLong optionalLong) {
-      this.worldSavesPath = path;
+   public WorldCreator(Path worldSavesPath, WorldCreationContext context, Optional<RegistryKey<GeneratorType>> optional, OptionalLong optionalLong) {
+      this.worldSavesPath = worldSavesPath;
       this.context = context;
       this.f_mxgdqqgs = new WorldCreator.C_jbuehfan((Holder<GeneratorType>)m_dvqxcggy(context, optional).orElse(null));
       this.m_qwzkvgzg();
diff -bur namedTargetSrc/net/minecraft/data/server/loot_table/BlockLootTableGenerator.java namedSrc/net/minecraft/data/server/loot_table/BlockLootTableGenerator.java
--- namedTargetSrc/net/minecraft/data/server/loot_table/BlockLootTableGenerator.java	2023-07-01 17:59:06.646680735 +0000
+++ namedSrc/net/minecraft/data/server/loot_table/BlockLootTableGenerator.java	2023-07-01 17:57:40.063469353 +0000
@@ -140,12 +140,13 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_qvbzxacb;<init>(Ljava/util/Set;Lnet/minecraft/unmapped/C_czxxrbcp;Ljava/util/Map;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/data/server/loot_table/BlockLootTableGenerator;<init>(Ljava/util/Set;Lnet/minecraft/feature_flags/FeatureFlagBitSet;Ljava/util/Map;)V}
     */
-   protected BlockLootTableGenerator(Set<Item> set, FeatureFlagBitSet arg, Map<Identifier, LootTable.Builder> map) {
-      this.explosionResistantItems = set;
-      this.enabledFeatures = arg;
-      this.lootTables = map;
+   protected BlockLootTableGenerator(Set<Item> explosionResistantItems, FeatureFlagBitSet enabledFeatures, Map<Identifier, LootTable.Builder> lootTables) {
+      this.explosionResistantItems = explosionResistantItems;
+      this.enabledFeatures = enabledFeatures;
+      this.lootTables = lootTables;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/data/server/loot_table/VanillaBlockLootTableGenerator.java namedSrc/net/minecraft/data/server/loot_table/VanillaBlockLootTableGenerator.java
--- namedTargetSrc/net/minecraft/data/server/loot_table/VanillaBlockLootTableGenerator.java	2023-07-01 17:59:06.718680083 +0000
+++ namedSrc/net/minecraft/data/server/loot_table/VanillaBlockLootTableGenerator.java	2023-07-01 17:57:40.159468487 +0000
@@ -1411,7 +1411,7 @@
             LootPool.builder()
                .rolls(ConstantLootNumberProvider.create(1.0F))
                .with(
-                  ((LeafEntry.Builder)((LeafEntry.Builder)DynamicEntry.builder(DecoratedPotBlock.f_tohwohru)
+                  ((LeafEntry.Builder)((LeafEntry.Builder)DynamicEntry.builder(DecoratedPotBlock.SHERDS)
                            .conditionally(MatchToolLootCondition.builder(ItemPredicate.Builder.create().tag(ItemTags.BREAKS_DECORATED_POTS))))
                         .conditionally(WITHOUT_SILK_TOUCH))
                      .alternatively(
diff -bur namedTargetSrc/net/minecraft/data/server/LootTablesProvider.java namedSrc/net/minecraft/data/server/LootTablesProvider.java
--- namedTargetSrc/net/minecraft/data/server/LootTablesProvider.java	2023-07-01 17:59:06.670680518 +0000
+++ namedSrc/net/minecraft/data/server/LootTablesProvider.java	2023-07-01 17:57:40.095469064 +0000
@@ -54,11 +54,12 @@
    private final List<LootTablesProvider.C_ujsjtlmo> lootTypeGenerators;
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_rriyyrek;<init>(Lnet/minecraft/unmapped/C_ugkmwocs;Ljava/util/Set;Ljava/util/List;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/data/server/LootTablesProvider;<init>(Lnet/minecraft/data/DataPackOutput;Ljava/util/Set;Ljava/util/List;)V}
     */
-   public LootTablesProvider(DataPackOutput arg, Set<Identifier> set, List<LootTablesProvider.C_ujsjtlmo> list) {
+   public LootTablesProvider(DataPackOutput arg, Set<Identifier> set, List<LootTablesProvider.C_ujsjtlmo> lootTypeGenerators) {
       this.f_xiwpsgvz = arg.createPathResolver(DataPackOutput.Type.DATA_PACK, "loot_tables");
-      this.lootTypeGenerators = list;
+      this.lootTypeGenerators = lootTypeGenerators;
       this.f_xcjyrvon = set;
    }
 
diff -bur namedTargetSrc/net/minecraft/data/server/tag/BaseItemTagsProvider.java namedSrc/net/minecraft/data/server/tag/BaseItemTagsProvider.java
--- namedTargetSrc/net/minecraft/data/server/tag/BaseItemTagsProvider.java	2023-07-01 17:59:06.670680518 +0000
+++ namedSrc/net/minecraft/data/server/tag/BaseItemTagsProvider.java	2023-07-01 17:57:40.095469064 +0000
@@ -14,14 +14,13 @@
  */
 public class BaseItemTagsProvider extends ItemTagsProvider {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_nhqtnrtm;<init>(Lnet/minecraft/unmapped/C_ugkmwocs;Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/data/server/tag/BaseItemTagsProvider;<init>(Lnet/minecraft/data/DataPackOutput;Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;)V}
     */
    public BaseItemTagsProvider(
-      DataPackOutput arg,
-      CompletableFuture<HolderLookup.Provider> completableFuture,
-      CompletableFuture<AbstractTagProvider.C_wyxvvqqq<Block>> completableFuture2
+      DataPackOutput arg, CompletableFuture<HolderLookup.Provider> completableFuture, CompletableFuture<AbstractTagProvider.C_wyxvvqqq<Block>> blockTags
    ) {
-      super(arg, completableFuture, completableFuture2);
+      super(arg, completableFuture, blockTags);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/data/server/tag/ItemTagsProvider.java namedSrc/net/minecraft/data/server/tag/ItemTagsProvider.java
--- namedTargetSrc/net/minecraft/data/server/tag/ItemTagsProvider.java	2023-07-01 17:59:06.762679684 +0000
+++ namedSrc/net/minecraft/data/server/tag/ItemTagsProvider.java	2023-07-01 17:57:40.215467981 +0000
@@ -28,28 +28,28 @@
    private final Map<TagKey<Block>, TagKey<Item>> f_hqsktqzf = new HashMap();
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_zhjvrfwx;<init>(Lnet/minecraft/unmapped/C_ugkmwocs;Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/data/server/tag/ItemTagsProvider;<init>(Lnet/minecraft/data/DataPackOutput;Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;)V}
     */
    public ItemTagsProvider(
-      DataPackOutput arg,
-      CompletableFuture<HolderLookup.Provider> completableFuture,
-      CompletableFuture<AbstractTagProvider.C_wyxvvqqq<Block>> completableFuture2
+      DataPackOutput arg, CompletableFuture<HolderLookup.Provider> completableFuture, CompletableFuture<AbstractTagProvider.C_wyxvvqqq<Block>> blockTags
    ) {
       super(arg, RegistryKeys.ITEM, completableFuture, argx -> argx.getBuiltInRegistryHolder().getRegistryKey());
-      this.blockTags = completableFuture2;
+      this.blockTags = blockTags;
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_zhjvrfwx;<init>(Lnet/minecraft/unmapped/C_ugkmwocs;Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/data/server/tag/ItemTagsProvider;<init>(Lnet/minecraft/data/DataPackOutput;Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;)V}
     */
    public ItemTagsProvider(
       DataPackOutput arg,
       CompletableFuture<HolderLookup.Provider> completableFuture,
       CompletableFuture<AbstractTagProvider.C_wyxvvqqq<Item>> completableFuture2,
-      CompletableFuture<AbstractTagProvider.C_wyxvvqqq<Block>> completableFuture3
+      CompletableFuture<AbstractTagProvider.C_wyxvvqqq<Block>> blockTags
    ) {
       super(arg, RegistryKeys.ITEM, completableFuture, completableFuture2, argx -> argx.getBuiltInRegistryHolder().getRegistryKey());
-      this.blockTags = completableFuture3;
+      this.blockTags = blockTags;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/data/server/tag/TagsProvider.java namedSrc/net/minecraft/data/server/tag/TagsProvider.java
--- namedTargetSrc/net/minecraft/data/server/tag/TagsProvider.java	2023-07-01 17:59:06.754679756 +0000
+++ namedSrc/net/minecraft/data/server/tag/TagsProvider.java	2023-07-01 17:57:40.203468090 +0000
@@ -44,10 +44,10 @@
       RegistryKey<? extends Registry<T>> registryKey,
       CompletableFuture<HolderLookup.Provider> completableFuture,
       CompletableFuture<AbstractTagProvider.C_wyxvvqqq<T>> completableFuture2,
-      Function<T, RegistryKey<T>> function
+      Function<T, RegistryKey<T>> valueToKey
    ) {
       super(arg, registryKey, completableFuture, completableFuture2);
-      this.valueToKey = function;
+      this.valueToKey = valueToKey;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/BlockPosLookTarget.java namedSrc/net/minecraft/entity/ai/brain/BlockPosLookTarget.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/BlockPosLookTarget.java	2023-07-01 17:59:06.714680119 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/BlockPosLookTarget.java	2023-07-01 17:57:40.155468523 +0000
@@ -30,11 +30,12 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_fuevqdfu;<init>(Lnet/minecraft/unmapped/C_vgpupfxx;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/entity/ai/brain/BlockPosLookTarget;<init>(Lnet/minecraft/util/math/Vec3d;)V}
     */
-   public BlockPosLookTarget(Vec3d arg) {
-      this.blockPos = BlockPos.fromPosition(arg);
-      this.pos = arg;
+   public BlockPosLookTarget(Vec3d pos) {
+      this.blockPos = BlockPos.fromPosition(pos);
+      this.pos = pos;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/GiveItemsToTargetTask.java namedSrc/net/minecraft/entity/ai/brain/task/GiveItemsToTargetTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/GiveItemsToTargetTask.java	2023-07-01 17:59:06.702680228 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/GiveItemsToTargetTask.java	2023-07-01 17:57:40.139468667 +0000
@@ -48,9 +48,10 @@
    private final float speedModifier;
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_swaljdod;<init>(Ljava/util/function/Function;FI)V}
+    * @mapping {@literal named <init> Lnet/minecraft/entity/ai/brain/task/GiveItemsToTargetTask;<init>(Ljava/util/function/Function;FI)V}
     */
-   public GiveItemsToTargetTask(Function<LivingEntity, Optional<LookTarget>> function, float f, int i) {
+   public GiveItemsToTargetTask(Function<LivingEntity, Optional<LookTarget>> targetPositionGetter, float speedModifier, int i) {
       super(
          Map.of(
             MemoryModuleType.LOOK_TARGET,
@@ -62,8 +63,8 @@
          ),
          i
       );
-      this.targetPositionGetter = function;
-      this.speedModifier = f;
+      this.targetPositionGetter = targetPositionGetter;
+      this.speedModifier = speedModifier;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/LongJumpTask.java namedSrc/net/minecraft/entity/ai/brain/task/LongJumpTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/LongJumpTask.java	2023-07-01 17:59:06.706680191 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/LongJumpTask.java	2023-07-01 17:57:40.143468631 +0000
@@ -136,9 +136,17 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_lorklvui;<init>(Lnet/minecraft/unmapped/C_hvilmtvi;IIFLjava/util/function/Function;Ljava/util/function/BiPredicate;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/entity/ai/brain/task/LongJumpTask;<init>(Lnet/minecraft/util/math/int_provider/UniformIntProvider;IIFLjava/util/function/Function;Ljava/util/function/BiPredicate;)V}
     */
-   public LongJumpTask(UniformIntProvider arg, int i, int j, float f, Function<E, SoundEvent> function, BiPredicate<E, BlockPos> biPredicate) {
+   public LongJumpTask(
+      UniformIntProvider cooldownRange,
+      int verticalRange,
+      int horizontalRange,
+      float maxRange,
+      Function<E, SoundEvent> jumpSound,
+      BiPredicate<E, BlockPos> validBlock
+   ) {
       super(
          ImmutableMap.of(
             MemoryModuleType.LOOK_TARGET,
@@ -150,12 +158,12 @@
          ),
          200
       );
-      this.cooldownRange = arg;
-      this.verticalRange = i;
-      this.horizontalRange = j;
-      this.maxRange = f;
-      this.jumpSound = function;
-      this.validBlock = biPredicate;
+      this.cooldownRange = cooldownRange;
+      this.verticalRange = verticalRange;
+      this.horizontalRange = horizontalRange;
+      this.maxRange = maxRange;
+      this.jumpSound = jumpSound;
+      this.validBlock = validBlock;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/LongJumpToPreferredBlockTask.java namedSrc/net/minecraft/entity/ai/brain/task/LongJumpToPreferredBlockTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/LongJumpToPreferredBlockTask.java	2023-07-01 17:59:06.702680228 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/LongJumpToPreferredBlockTask.java	2023-07-01 17:57:40.135468703 +0000
@@ -41,14 +41,22 @@
    private boolean shouldJump;
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_glkmjulj;<init>(Lnet/minecraft/unmapped/C_hvilmtvi;IIFLjava/util/function/Function;Lnet/minecraft/unmapped/C_ednuhnnn;FLjava/util/function/BiPredicate;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/entity/ai/brain/task/LongJumpToPreferredBlockTask;<init>(Lnet/minecraft/util/math/int_provider/UniformIntProvider;IIFLjava/util/function/Function;Lnet/minecraft/registry/tag/TagKey;FLjava/util/function/BiPredicate;)V}
     */
    public LongJumpToPreferredBlockTask(
-      UniformIntProvider arg, int i, int j, float f, Function<E, SoundEvent> function, TagKey<Block> arg2, float g, BiPredicate<E, BlockPos> biPredicate
+      UniformIntProvider arg,
+      int i,
+      int j,
+      float f,
+      Function<E, SoundEvent> function,
+      TagKey<Block> preferredBlocks,
+      float jumpChance,
+      BiPredicate<E, BlockPos> biPredicate
    ) {
       super(arg, i, j, f, function, biPredicate);
-      this.preferredBlocks = arg2;
-      this.jumpChance = g;
+      this.preferredBlocks = preferredBlocks;
+      this.jumpChance = jumpChance;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/RamImpactTask.java namedSrc/net/minecraft/entity/ai/brain/task/RamImpactTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/RamImpactTask.java	2023-07-01 17:59:06.750679793 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/RamImpactTask.java	2023-07-01 17:57:40.199468126 +0000
@@ -76,25 +76,26 @@
    private final Function<GoatEntity, SoundEvent> f_osbzikop;
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_mqbxlhpd;<init>(Ljava/util/function/Function;Lnet/minecraft/unmapped/C_cjtyhinh;FLjava/util/function/ToDoubleFunction;Ljava/util/function/Function;Ljava/util/function/Function;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/entity/ai/brain/task/RamImpactTask;<init>(Ljava/util/function/Function;Lnet/minecraft/entity/ai/TargetPredicate;FLjava/util/function/ToDoubleFunction;Ljava/util/function/Function;Ljava/util/function/Function;)V}
     */
    public RamImpactTask(
-      Function<GoatEntity, UniformIntProvider> function,
-      TargetPredicate arg,
-      float f,
-      ToDoubleFunction<GoatEntity> toDoubleFunction,
-      Function<GoatEntity, SoundEvent> function2,
+      Function<GoatEntity, UniformIntProvider> cooldownRangeFactory,
+      TargetPredicate targetPredicate,
+      float speed,
+      ToDoubleFunction<GoatEntity> strengthMultiplierFactory,
+      Function<GoatEntity, SoundEvent> soundFactory,
       Function<GoatEntity, SoundEvent> function3
    ) {
       super(
          ImmutableMap.of(MemoryModuleType.RAM_COOLDOWN_TICKS, MemoryModuleState.VALUE_ABSENT, MemoryModuleType.RAM_TARGET, MemoryModuleState.VALUE_PRESENT),
          200
       );
-      this.cooldownRangeFactory = function;
-      this.targetPredicate = arg;
-      this.speed = f;
-      this.strengthMultiplierFactory = toDoubleFunction;
-      this.soundFactory = function2;
+      this.cooldownRangeFactory = cooldownRangeFactory;
+      this.targetPredicate = targetPredicate;
+      this.speed = speed;
+      this.strengthMultiplierFactory = strengthMultiplierFactory;
+      this.soundFactory = soundFactory;
       this.f_osbzikop = function3;
       this.direction = Vec3d.ZERO;
    }
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/TemptTask.java namedSrc/net/minecraft/entity/ai/brain/task/TemptTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/TemptTask.java	2023-07-01 17:59:06.722680046 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/TemptTask.java	2023-07-01 17:57:40.163468451 +0000
@@ -50,9 +50,10 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_jazltyri;<init>(Ljava/util/function/Function;Ljava/util/function/Function;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/entity/ai/brain/task/TemptTask;<init>(Ljava/util/function/Function;Ljava/util/function/Function;)V}
     */
-   public TemptTask(Function<LivingEntity, Float> function, Function<LivingEntity, Double> function2) {
+   public TemptTask(Function<LivingEntity, Float> speed, Function<LivingEntity, Double> function2) {
       super(Util.make(() -> {
          Builder<MemoryModuleType<?>, MemoryModuleState> builder = ImmutableMap.builder();
          builder.put(MemoryModuleType.LOOK_TARGET, MemoryModuleState.REGISTERED);
@@ -64,7 +65,7 @@
          builder.put(MemoryModuleType.IS_PANICKING, MemoryModuleState.VALUE_ABSENT);
          return builder.build();
       }));
-      this.speed = function;
+      this.speed = speed;
       this.f_gctmighe = function2;
    }
 
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/WalkTask.java namedSrc/net/minecraft/entity/ai/brain/task/WalkTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/WalkTask.java	2023-07-01 17:59:06.722680046 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/WalkTask.java	2023-07-01 17:57:40.163468451 +0000
@@ -66,11 +66,12 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_uuyjertq;<init>(FLjava/util/function/Predicate;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/entity/ai/brain/task/WalkTask;<init>(FLjava/util/function/Predicate;)V}
     */
-   public WalkTask(float f, Predicate<PathAwareEntity> predicate) {
+   public WalkTask(float speed, Predicate<PathAwareEntity> predicate) {
       super(ImmutableMap.of(MemoryModuleType.IS_PANICKING, MemoryModuleState.REGISTERED, MemoryModuleType.HURT_BY, MemoryModuleState.VALUE_PRESENT), 100, 120);
-      this.speed = f;
+      this.speed = speed;
       this.f_upafsdcb = predicate;
    }
 
diff -bur namedTargetSrc/net/minecraft/entity/boss/dragon/EnderDragonEntity.java namedSrc/net/minecraft/entity/boss/dragon/EnderDragonEntity.java
--- namedTargetSrc/net/minecraft/entity/boss/dragon/EnderDragonEntity.java	2023-07-01 17:59:06.658680626 +0000
+++ namedSrc/net/minecraft/entity/boss/dragon/EnderDragonEntity.java	2023-07-01 17:57:40.079469208 +0000
@@ -371,7 +371,7 @@
       if (this.fight == null) {
          World i = this.getWorld();
          if (i instanceof ServerWorld lv) {
-            EnderDragonFight lv2 = lv.m_gqdupsiz();
+            EnderDragonFight lv2 = lv.getEnderDragonFight();
             if (lv2 != null && this.getUuid().equals(lv2.getDragonUuid())) {
                this.fight = lv2;
             }
diff -bur namedTargetSrc/net/minecraft/entity/boss/dragon/EnderDragonFight.java namedSrc/net/minecraft/entity/boss/dragon/EnderDragonFight.java
--- namedTargetSrc/net/minecraft/entity/boss/dragon/EnderDragonFight.java	2023-07-01 17:59:06.662680590 +0000
+++ namedSrc/net/minecraft/entity/boss/dragon/EnderDragonFight.java	2023-07-01 17:57:40.087469136 +0000
@@ -480,7 +480,7 @@
                }
 
                ChunkLoadStatus lv3 = ((WorldChunk)lv2).getLevelType();
-               if (!lv3.m_rvjdcoiw(ChunkLoadStatus.BLOCK_TICKING)) {
+               if (!lv3.matchesOrAfter(ChunkLoadStatus.BLOCK_TICKING)) {
                   return false;
                }
             }
diff -bur namedTargetSrc/net/minecraft/entity/decoration/EndCrystalEntity.java namedSrc/net/minecraft/entity/decoration/EndCrystalEntity.java
--- namedTargetSrc/net/minecraft/entity/decoration/EndCrystalEntity.java	2023-07-01 17:59:06.698680264 +0000
+++ namedSrc/net/minecraft/entity/decoration/EndCrystalEntity.java	2023-07-01 17:57:40.135468703 +0000
@@ -87,7 +87,7 @@
       ++this.endCrystalAge;
       if (this.getWorld() instanceof ServerWorld) {
          BlockPos lv = this.getBlockPos();
-         if (((ServerWorld)this.getWorld()).m_gqdupsiz() != null && this.getWorld().getBlockState(lv).isAir()) {
+         if (((ServerWorld)this.getWorld()).getEnderDragonFight() != null && this.getWorld().getBlockState(lv).isAir()) {
             this.getWorld().setBlockState(lv, AbstractFireBlock.getState(this.getWorld(), lv));
          }
       }
@@ -166,7 +166,7 @@
     */
    private void crystalDestroyed(DamageSource source) {
       if (this.getWorld() instanceof ServerWorld) {
-         EnderDragonFight lv = ((ServerWorld)this.getWorld()).m_gqdupsiz();
+         EnderDragonFight lv = ((ServerWorld)this.getWorld()).getEnderDragonFight();
          if (lv != null) {
             lv.crystalDestroyed(this, source);
          }
diff -bur namedTargetSrc/net/minecraft/entity/Entity.java namedSrc/net/minecraft/entity/Entity.java
--- namedTargetSrc/net/minecraft/entity/Entity.java	2023-07-01 17:59:06.746679829 +0000
+++ namedSrc/net/minecraft/entity/Entity.java	2023-07-01 17:57:40.195468162 +0000
@@ -2033,7 +2033,7 @@
     * @mapping {@literal hashed m_cckfyxyf Lnet/minecraft/unmapped/C_astfners;m_cckfyxyf(DZLnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_hynzadkk;)V}
     * @mapping {@literal named fall Lnet/minecraft/entity/Entity;fall(DZLnet/minecraft/block/BlockState;Lnet/minecraft/util/math/BlockPos;)V}
     */
-   protected void fall(double heightDifference, boolean onGround, BlockState landedState, BlockPos landedPosition) {
+   protected void fall(double fallDistance, boolean onGround, BlockState landedState, BlockPos landedPosition) {
       if (onGround) {
          if (this.fallDistance > 0.0F) {
             landedState.getBlock().onLandedUpon(this.getWorld(), landedState, landedPosition, this, this.fallDistance);
@@ -2046,8 +2046,8 @@
          }
 
          this.resetFallDistance();
-      } else if (heightDifference < 0.0) {
-         this.fallDistance -= (float)heightDifference;
+      } else if (fallDistance < 0.0) {
+         this.fallDistance -= (float)fallDistance;
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/entity/LivingEntity.java namedSrc/net/minecraft/entity/LivingEntity.java
--- namedTargetSrc/net/minecraft/entity/LivingEntity.java	2023-07-01 17:59:06.730679974 +0000
+++ namedSrc/net/minecraft/entity/LivingEntity.java	2023-07-01 17:57:40.171468378 +0000
@@ -744,7 +744,7 @@
     * Mapping not found
     */
    @Override
-   protected void fall(double heightDifference, boolean onGround, BlockState landedState, BlockPos landedPosition) {
+   protected void fall(double fallDistance, boolean onGround, BlockState landedState, BlockPos landedPosition) {
       if (!this.isTouchingWater()) {
          this.checkWaterState();
       }
@@ -773,7 +773,7 @@
          ((ServerWorld)this.getWorld()).spawnParticles(new BlockStateParticleEffect(ParticleTypes.BLOCK, landedState), e, f, g, m, 0.0, 0.0, 0.0, 0.15F);
       }
 
-      super.fall(heightDifference, onGround, landedState, landedPosition);
+      super.fall(fallDistance, onGround, landedState, landedPosition);
       if (onGround) {
          this.climbingPos = Optional.empty();
       }
diff -bur namedTargetSrc/net/minecraft/entity/mob/FlyingEntity.java namedSrc/net/minecraft/entity/mob/FlyingEntity.java
--- namedTargetSrc/net/minecraft/entity/mob/FlyingEntity.java	2023-07-01 17:59:06.702680228 +0000
+++ namedSrc/net/minecraft/entity/mob/FlyingEntity.java	2023-07-01 17:57:40.135468703 +0000
@@ -23,7 +23,7 @@
     * Mapping not found
     */
    @Override
-   protected void fall(double heightDifference, boolean onGround, BlockState landedState, BlockPos landedPosition) {
+   protected void fall(double fallDistance, boolean onGround, BlockState landedState, BlockPos landedPosition) {
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/passive/AllayEntity.java namedSrc/net/minecraft/entity/passive/AllayEntity.java
--- namedTargetSrc/net/minecraft/entity/passive/AllayEntity.java	2023-07-01 17:59:06.762679684 +0000
+++ namedSrc/net/minecraft/entity/passive/AllayEntity.java	2023-07-01 17:57:40.211468018 +0000
@@ -344,7 +344,7 @@
     * Mapping not found
     */
    @Override
-   protected void fall(double heightDifference, boolean onGround, BlockState landedState, BlockPos landedPosition) {
+   protected void fall(double fallDistance, boolean onGround, BlockState landedState, BlockPos landedPosition) {
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/passive/BatEntity.java namedSrc/net/minecraft/entity/passive/BatEntity.java
--- namedTargetSrc/net/minecraft/entity/passive/BatEntity.java	2023-07-01 17:59:06.730679974 +0000
+++ namedSrc/net/minecraft/entity/passive/BatEntity.java	2023-07-01 17:57:40.171468378 +0000
@@ -272,7 +272,7 @@
     * Mapping not found
     */
    @Override
-   protected void fall(double heightDifference, boolean onGround, BlockState landedState, BlockPos landedPosition) {
+   protected void fall(double fallDistance, boolean onGround, BlockState landedState, BlockPos landedPosition) {
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/passive/BeeEntity.java namedSrc/net/minecraft/entity/passive/BeeEntity.java
--- namedTargetSrc/net/minecraft/entity/passive/BeeEntity.java	2023-07-01 17:59:06.726680010 +0000
+++ namedSrc/net/minecraft/entity/passive/BeeEntity.java	2023-07-01 17:57:40.171468378 +0000
@@ -1017,7 +1017,7 @@
     * Mapping not found
     */
    @Override
-   protected void fall(double heightDifference, boolean onGround, BlockState landedState, BlockPos landedPosition) {
+   protected void fall(double fallDistance, boolean onGround, BlockState landedState, BlockPos landedPosition) {
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/passive/ParrotEntity.java namedSrc/net/minecraft/entity/passive/ParrotEntity.java
--- namedTargetSrc/net/minecraft/entity/passive/ParrotEntity.java	2023-07-01 17:59:06.746679829 +0000
+++ namedSrc/net/minecraft/entity/passive/ParrotEntity.java	2023-07-01 17:57:40.199468126 +0000
@@ -427,7 +427,7 @@
     * Mapping not found
     */
    @Override
-   protected void fall(double heightDifference, boolean onGround, BlockState landedState, BlockPos landedPosition) {
+   protected void fall(double fallDistance, boolean onGround, BlockState landedState, BlockPos landedPosition) {
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/passive/StriderEntity.java namedSrc/net/minecraft/entity/passive/StriderEntity.java
--- namedTargetSrc/net/minecraft/entity/passive/StriderEntity.java	2023-07-01 17:59:06.654680663 +0000
+++ namedSrc/net/minecraft/entity/passive/StriderEntity.java	2023-07-01 17:57:40.075469244 +0000
@@ -420,12 +420,12 @@
     * Mapping not found
     */
    @Override
-   protected void fall(double heightDifference, boolean onGround, BlockState landedState, BlockPos landedPosition) {
+   protected void fall(double fallDistance, boolean onGround, BlockState landedState, BlockPos landedPosition) {
       this.checkBlockCollision();
       if (this.isInLava()) {
          this.resetFallDistance();
       } else {
-         super.fall(heightDifference, onGround, landedState, landedPosition);
+         super.fall(fallDistance, onGround, landedState, landedPosition);
       }
    }
 
@@ -709,11 +709,12 @@
       private final StriderEntity strider;
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_mmxhtsxv$C_sncxqvur;<init>(Lnet/minecraft/unmapped/C_mmxhtsxv;D)V}
+       * @mapping {@literal named <init> Lnet/minecraft/entity/passive/StriderEntity$GoBackToLavaGoal;<init>(Lnet/minecraft/entity/passive/StriderEntity;D)V}
        */
-      GoBackToLavaGoal(StriderEntity arg, double d) {
-         super(arg, d, 8, 2);
-         this.strider = arg;
+      GoBackToLavaGoal(StriderEntity strider, double d) {
+         super(strider, d, 8, 2);
+         this.strider = strider;
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/entity/player/ItemCooldownManager.java namedSrc/net/minecraft/entity/player/ItemCooldownManager.java
--- namedTargetSrc/net/minecraft/entity/player/ItemCooldownManager.java	2023-07-01 17:59:06.682680409 +0000
+++ namedSrc/net/minecraft/entity/player/ItemCooldownManager.java	2023-07-01 17:57:40.111468920 +0000
@@ -113,11 +113,12 @@
       final int endTick;
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_kqeizhow$C_cptmddkj;<init>(II)V}
+       * @mapping {@literal named <init> Lnet/minecraft/entity/player/ItemCooldownManager$Entry;<init>(II)V}
        */
-      Entry(int i, int j) {
-         this.startTick = i;
-         this.endTick = j;
+      Entry(int startTick, int endTick) {
+         this.startTick = startTick;
+         this.endTick = endTick;
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/entity/vehicle/BoatEntity.java namedSrc/net/minecraft/entity/vehicle/BoatEntity.java
--- namedTargetSrc/net/minecraft/entity/vehicle/BoatEntity.java	2023-07-01 17:59:06.714680119 +0000
+++ namedSrc/net/minecraft/entity/vehicle/BoatEntity.java	2023-07-01 17:57:40.155468523 +0000
@@ -1077,7 +1077,7 @@
     * Mapping not found
     */
    @Override
-   protected void fall(double heightDifference, boolean onGround, BlockState landedState, BlockPos landedPosition) {
+   protected void fall(double fallDistance, boolean onGround, BlockState landedState, BlockPos landedPosition) {
       this.fallVelocity = this.getVelocity().y;
       if (!this.hasVehicle()) {
          if (onGround) {
@@ -1103,8 +1103,8 @@
             }
 
             this.resetFallDistance();
-         } else if (!this.getWorld().getFluidState(this.getBlockPos().down()).isIn(FluidTags.WATER) && heightDifference < 0.0) {
-            this.fallDistance -= (float)heightDifference;
+         } else if (!this.getWorld().getFluidState(this.getBlockPos().down()).isIn(FluidTags.WATER) && fallDistance < 0.0) {
+            this.fallDistance -= (float)fallDistance;
          }
       }
    }

@github-actions
Copy link
Contributor

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/item/EndCrystalItem.java namedSrc/net/minecraft/item/EndCrystalItem.java
--- namedTargetSrc/net/minecraft/item/EndCrystalItem.java	2023-07-01 17:59:06.682680409 +0000
+++ namedSrc/net/minecraft/item/EndCrystalItem.java	2023-07-01 17:57:40.111468920 +0000
@@ -52,7 +52,7 @@
                   lv5.setShowBottom(false);
                   lv.spawnEntity(lv5);
                   lv.emitGameEvent(context.getPlayer(), GameEvent.ENTITY_PLACE, lv4);
-                  EnderDragonFight lv6 = ((ServerWorld)lv).m_gqdupsiz();
+                  EnderDragonFight lv6 = ((ServerWorld)lv).getEnderDragonFight();
                   if (lv6 != null) {
                      lv6.respawnDragon();
                   }
diff -bur namedTargetSrc/net/minecraft/network/encryption/PublicChatSession.java namedSrc/net/minecraft/network/encryption/PublicChatSession.java
--- namedTargetSrc/net/minecraft/network/encryption/PublicChatSession.java	2023-07-01 17:59:06.698680264 +0000
+++ namedSrc/net/minecraft/network/encryption/PublicChatSession.java	2023-07-01 17:57:40.135468703 +0000
@@ -37,9 +37,10 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_ccxgkdwf Lnet/minecraft/unmapped/C_sdodhjzp;m_ccxgkdwf()Z}
+    * @mapping {@literal named isExpired Lnet/minecraft/network/encryption/PublicChatSession;isExpired()Z}
     */
-   public boolean m_ccxgkdwf() {
+   public boolean isExpired() {
       return this.profilePublicKey.data().isExpired();
    }
 
diff -bur namedTargetSrc/net/minecraft/network/encryption/SignatureValidator.java namedSrc/net/minecraft/network/encryption/SignatureValidator.java
--- namedTargetSrc/net/minecraft/network/encryption/SignatureValidator.java	2023-07-01 17:59:06.702680228 +0000
+++ namedSrc/net/minecraft/network/encryption/SignatureValidator.java	2023-07-01 17:57:40.135468703 +0000
@@ -68,16 +68,17 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_dkohjnkg Lnet/minecraft/unmapped/C_yvuwcvkm;m_dkohjnkg(Lcom/mojang/authlib/yggdrasil/ServicesKeySet;Lcom/mojang/authlib/yggdrasil/ServicesKeyType;)Lnet/minecraft/unmapped/C_yvuwcvkm;}
+    * @mapping {@literal named create Lnet/minecraft/network/encryption/SignatureValidator;create(Lcom/mojang/authlib/yggdrasil/ServicesKeySet;Lcom/mojang/authlib/yggdrasil/ServicesKeyType;)Lnet/minecraft/network/encryption/SignatureValidator;}
     */
    @Nullable
-   static SignatureValidator m_dkohjnkg(ServicesKeySet servicesKeySet, ServicesKeyType servicesKeyType) {
+   static SignatureValidator create(ServicesKeySet servicesKeySet, ServicesKeyType servicesKeyType) {
       Collection<ServicesKeyInfo> collection = servicesKeySet.keys(servicesKeyType);
-      return collection.isEmpty() ? null : (arg, bs) -> collection.stream().anyMatch(servicesKeyInfo -> {
-            Signature signaturex = servicesKeyInfo.signature();
+      return collection.isEmpty() ? null : (updater, signatureBytes) -> collection.stream().anyMatch(info -> {
+            Signature signaturex = info.signature();
 
             try {
-               return verifySignature(arg, bs, signaturex);
+               return verifySignature(updater, signatureBytes, signaturex);
             } catch (SignatureException var5) {
                LOGGER.error("Failed to verify Services signature", (Throwable)var5);
                return false;
diff -bur namedTargetSrc/net/minecraft/network/packet/s2c/play/ChunkDeltaUpdateS2CPacket.java namedSrc/net/minecraft/network/packet/s2c/play/ChunkDeltaUpdateS2CPacket.java
--- namedTargetSrc/net/minecraft/network/packet/s2c/play/ChunkDeltaUpdateS2CPacket.java	2023-07-01 17:59:06.650680699 +0000
+++ namedSrc/net/minecraft/network/packet/s2c/play/ChunkDeltaUpdateS2CPacket.java	2023-07-01 17:57:40.071469280 +0000
@@ -43,10 +43,11 @@
    private final BlockState[] blockStates;
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_gxacpmvt;<init>(Lnet/minecraft/unmapped/C_zubvmeye;Lit/unimi/dsi/fastutil/shorts/ShortSet;Lnet/minecraft/unmapped/C_aurosfgf;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/network/packet/s2c/play/ChunkDeltaUpdateS2CPacket;<init>(Lnet/minecraft/util/math/ChunkSectionPos;Lit/unimi/dsi/fastutil/shorts/ShortSet;Lnet/minecraft/world/chunk/ChunkSection;)V}
     */
-   public ChunkDeltaUpdateS2CPacket(ChunkSectionPos arg, ShortSet shortSet, ChunkSection arg2) {
-      this.sectionPos = arg;
+   public ChunkDeltaUpdateS2CPacket(ChunkSectionPos sectionPos, ShortSet shortSet, ChunkSection arg2) {
+      this.sectionPos = sectionPos;
       int i = shortSet.size();
       this.positions = new short[i];
       this.blockStates = new BlockState[i];
diff -bur namedTargetSrc/net/minecraft/network/packet/s2c/play/DeathMessageS2CPacket.java namedSrc/net/minecraft/network/packet/s2c/play/DeathMessageS2CPacket.java
--- namedTargetSrc/net/minecraft/network/packet/s2c/play/DeathMessageS2CPacket.java	2023-07-01 17:59:06.766679648 +0000
+++ namedSrc/net/minecraft/network/packet/s2c/play/DeathMessageS2CPacket.java	2023-07-01 17:57:40.219467945 +0000
@@ -22,11 +22,12 @@
    private final Text message;
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_lkozehxy;<init>(ILnet/minecraft/unmapped/C_rdaqiwdt;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/network/packet/s2c/play/DeathMessageS2CPacket;<init>(ILnet/minecraft/text/Text;)V}
     */
-   public DeathMessageS2CPacket(int i, Text arg) {
-      this.entityId = i;
-      this.message = arg;
+   public DeathMessageS2CPacket(int entityId, Text message) {
+      this.entityId = entityId;
+      this.message = message;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/network/packet/s2c/play/EndCombatS2CPacket.java namedSrc/net/minecraft/network/packet/s2c/play/EndCombatS2CPacket.java
--- namedTargetSrc/net/minecraft/network/packet/s2c/play/EndCombatS2CPacket.java	2023-07-01 17:59:06.678680445 +0000
+++ namedSrc/net/minecraft/network/packet/s2c/play/EndCombatS2CPacket.java	2023-07-01 17:57:40.103468992 +0000
@@ -25,10 +25,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_wqjfnprx;<init>(I)V}
+    * @mapping {@literal named <init> Lnet/minecraft/network/packet/s2c/play/EndCombatS2CPacket;<init>(I)V}
     */
-   public EndCombatS2CPacket(int i) {
-      this.timeSinceLastAttack = i;
+   public EndCombatS2CPacket(int timeSinceLastAttack) {
+      this.timeSinceLastAttack = timeSinceLastAttack;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/particle/DustColorTransitionParticleEffect.java namedSrc/net/minecraft/particle/DustColorTransitionParticleEffect.java
--- namedTargetSrc/net/minecraft/particle/DustColorTransitionParticleEffect.java	2023-07-01 17:59:06.770679612 +0000
+++ namedSrc/net/minecraft/particle/DustColorTransitionParticleEffect.java	2023-07-01 17:57:40.223467909 +0000
@@ -73,11 +73,12 @@
    private final Vector3f toColor;
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_dimfwbzx;<init>(Lorg/joml/Vector3f;Lorg/joml/Vector3f;F)V}
+    * @mapping {@literal named <init> Lnet/minecraft/particle/DustColorTransitionParticleEffect;<init>(Lorg/joml/Vector3f;Lorg/joml/Vector3f;F)V}
     */
-   public DustColorTransitionParticleEffect(Vector3f vector3f, Vector3f vector3f2, float f) {
+   public DustColorTransitionParticleEffect(Vector3f vector3f, Vector3f toColor, float f) {
       super(vector3f, f);
-      this.toColor = vector3f2;
+      this.toColor = toColor;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/predicate/entity/AdvancementEntityPredicateDeserializer.java namedSrc/net/minecraft/predicate/entity/AdvancementEntityPredicateDeserializer.java
--- namedTargetSrc/net/minecraft/predicate/entity/AdvancementEntityPredicateDeserializer.java	2023-07-01 17:59:06.666680554 +0000
+++ namedSrc/net/minecraft/predicate/entity/AdvancementEntityPredicateDeserializer.java	2023-07-01 17:57:40.091469100 +0000
@@ -37,10 +37,11 @@
    private final Gson gson = LootGsons.getConditionGsonBuilder().create();
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_gzewtdot;<init>(Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_uxsnhxlb;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/predicate/entity/AdvancementEntityPredicateDeserializer;<init>(Lnet/minecraft/util/Identifier;Lnet/minecraft/loot/LootManager;)V}
     */
-   public AdvancementEntityPredicateDeserializer(Identifier arg, LootManager arg2) {
-      this.advancementId = arg;
+   public AdvancementEntityPredicateDeserializer(Identifier advancementId, LootManager arg2) {
+      this.advancementId = advancementId;
       this.f_iiwdeppb = arg2;
    }
 
diff -bur namedTargetSrc/net/minecraft/predicate/entity/DamageSourcePredicate.java namedSrc/net/minecraft/predicate/entity/DamageSourcePredicate.java
--- namedTargetSrc/net/minecraft/predicate/entity/DamageSourcePredicate.java	2023-07-01 17:59:06.726680010 +0000
+++ namedSrc/net/minecraft/predicate/entity/DamageSourcePredicate.java	2023-07-01 17:57:40.167468414 +0000
@@ -43,12 +43,13 @@
    private final EntityPredicate sourceEntity;
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_pbkrjvwn;<init>(Ljava/util/List;Lnet/minecraft/unmapped/C_kvkvpjlm;Lnet/minecraft/unmapped/C_kvkvpjlm;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/predicate/entity/DamageSourcePredicate;<init>(Ljava/util/List;Lnet/minecraft/predicate/entity/EntityPredicate;Lnet/minecraft/predicate/entity/EntityPredicate;)V}
     */
-   public DamageSourcePredicate(List<TagPredicate<DamageType>> list, EntityPredicate arg, EntityPredicate arg2) {
+   public DamageSourcePredicate(List<TagPredicate<DamageType>> list, EntityPredicate directEntity, EntityPredicate sourceEntity) {
       this.f_lutnusdz = list;
-      this.directEntity = arg;
-      this.sourceEntity = arg2;
+      this.directEntity = directEntity;
+      this.sourceEntity = sourceEntity;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/registry/DynamicRegistryManager.java namedSrc/net/minecraft/registry/DynamicRegistryManager.java
--- namedTargetSrc/net/minecraft/registry/DynamicRegistryManager.java	2023-07-01 17:59:06.682680409 +0000
+++ namedSrc/net/minecraft/registry/DynamicRegistryManager.java	2023-07-01 17:57:40.111468920 +0000
@@ -114,8 +114,8 @@
           * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_wqxmvzdq$C_fckcsnok;<init>(Lnet/minecraft/unmapped/C_wqxmvzdq;Ljava/util/stream/Stream;)V}
           * @mapping {@literal named <init> Lnet/minecraft/registry/DynamicRegistryManager$C_fckcsnok;<init>(Lnet/minecraft/registry/DynamicRegistryManager;Ljava/util/stream/Stream;)V}
           */
-         protected C_fckcsnok(Stream<DynamicRegistryManager.RegistryEntry<?>> stream) {
-            super(stream);
+         protected C_fckcsnok(Stream<DynamicRegistryManager.RegistryEntry<?>> entries) {
+            super(entries);
          }
       }
 
@@ -127,7 +127,7 @@
     * @mapping {@literal named getLifecycleForAllRegistries Lnet/minecraft/registry/DynamicRegistryManager;getLifecycleForAllRegistries()Lcom/mojang/serialization/Lifecycle;}
     */
    default Lifecycle getLifecycleForAllRegistries() {
-      return (Lifecycle)this.registries().map(arg -> arg.value.getLifecycle()).reduce(Lifecycle.stable(), Lifecycle::add);
+      return (Lifecycle)this.registries().map(registry -> registry.value.getLifecycle()).reduce(Lifecycle.stable(), Lifecycle::add);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/server/command/DataCommand.java namedSrc/net/minecraft/server/command/DataCommand.java
--- namedTargetSrc/net/minecraft/server/command/DataCommand.java	2023-07-01 17:59:06.774679575 +0000
+++ namedSrc/net/minecraft/server/command/DataCommand.java	2023-07-01 17:57:40.231467837 +0000
@@ -78,9 +78,10 @@
       nbt -> Text.translatable("commands.data.modify.expected_value", nbt)
    );
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_jyfgqakd Lnet/minecraft/unmapped/C_runmekgk;f_jyfgqakd:Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType;}
+    * @mapping {@literal named MODIFY_INVALID_SUBSTRING_EXCEPTION Lnet/minecraft/server/command/DataCommand;MODIFY_INVALID_SUBSTRING_EXCEPTION:Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType;}
     */
-   private static final Dynamic2CommandExceptionType f_jyfgqakd = new Dynamic2CommandExceptionType(
+   private static final Dynamic2CommandExceptionType MODIFY_INVALID_SUBSTRING_EXCEPTION = new Dynamic2CommandExceptionType(
       (object, object2) -> Text.translatable("commands.data.modify.invalid_substring", object, object2)
    );
    /**
@@ -233,9 +234,9 @@
 
    /**
     * @mapping {@literal hashed m_wgvzizqu Lnet/minecraft/unmapped/C_runmekgk;m_wgvzizqu(Ljava/util/List;Lnet/minecraft/unmapped/C_runmekgk$C_gcrgsjks;)Ljava/util/List;}
-    * @mapping {@literal named nbtListToString Lnet/minecraft/server/command/DataCommand;nbtListToString(Ljava/util/List;Lnet/minecraft/server/command/DataCommand$C_gcrgsjks;)Ljava/util/List;}
+    * @mapping {@literal named nbtListToString Lnet/minecraft/server/command/DataCommand;nbtListToString(Ljava/util/List;Lnet/minecraft/server/command/DataCommand$Processor;)Ljava/util/List;}
     */
-   private static List<NbtElement> nbtListToString(List<NbtElement> nbtList, DataCommand.C_gcrgsjks arg) throws CommandSyntaxException {
+   private static List<NbtElement> nbtListToString(List<NbtElement> nbtList, DataCommand.Processor arg) throws CommandSyntaxException {
       List<NbtElement> list2 = new ArrayList(nbtList.size());
 
       for (NbtElement lv : nbtList) {
@@ -327,9 +328,9 @@
                subArgumentAdder.accept(
                   argumentBuilder2,
                   (DataCommand.ModifyArgumentCreator)arg2 -> CommandManager.literal("value")
-                        .then(CommandManager.argument("value", NbtElementArgumentType.nbtElement()).executes(commandContext -> {
-                           List<NbtElement> list = Collections.singletonList(NbtElementArgumentType.getNbtElement(commandContext, "value"));
-                           return executeModify(commandContext, lv, arg2, list);
+                        .then(CommandManager.argument("value", NbtElementArgumentType.nbtElement()).executes(context -> {
+                           List<NbtElement> list = Collections.singletonList(NbtElementArgumentType.getNbtElement(context, "value"));
+                           return executeModify(context, lv, arg2, list);
                         }))
                );
                return argumentBuilder.then(argumentBuilder2);
@@ -347,7 +348,7 @@
       if (i >= 0 && j <= string.length() && i <= j) {
          return string.substring(i, j);
       } else {
-         throw f_jyfgqakd.create(i, j);
+         throw MODIFY_INVALID_SUBSTRING_EXCEPTION.create(i, j);
       }
    }
 
@@ -517,18 +518,6 @@
    }
 
    /**
-    * @mapping {@literal hashed net/minecraft/unmapped/C_runmekgk$C_gcrgsjks}
-    * @mapping {@literal named net/minecraft/server/command/DataCommand$C_gcrgsjks}
-    */
-   @FunctionalInterface
-   interface C_gcrgsjks {
-      /**
-       * Mapping not found
-       */
-      String process(String string) throws CommandSyntaxException;
-   }
-
-   /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_runmekgk$C_dgfqqfje}
     * @mapping {@literal named net/minecraft/server/command/DataCommand$ModifyArgumentCreator}
     */
@@ -574,4 +563,17 @@
          Function<ArgumentBuilder<ServerCommandSource, ?>, ArgumentBuilder<ServerCommandSource, ?>> argumentAdder
       );
    }
+
+   /**
+    * @mapping {@literal hashed net/minecraft/unmapped/C_runmekgk$C_gcrgsjks}
+    * @mapping {@literal named net/minecraft/server/command/DataCommand$Processor}
+    */
+   @FunctionalInterface
+   interface Processor {
+      /**
+       * @mapping {@literal hashed process Lnet/minecraft/unmapped/C_runmekgk$C_gcrgsjks;process(Ljava/lang/String;)Ljava/lang/String;}
+       * @mapping {@literal named process Lnet/minecraft/server/command/DataCommand$Processor;process(Ljava/lang/String;)Ljava/lang/String;}
+       */
+      String process(String input) throws CommandSyntaxException;
+   }
 }
diff -bur namedTargetSrc/net/minecraft/server/command/LocateCommand.java namedSrc/net/minecraft/server/command/LocateCommand.java
--- namedTargetSrc/net/minecraft/server/command/LocateCommand.java	2023-07-01 17:59:06.762679684 +0000
+++ namedSrc/net/minecraft/server/command/LocateCommand.java	2023-07-01 17:57:40.215467981 +0000
@@ -171,7 +171,7 @@
    private static int locateBiome(ServerCommandSource source, RegistryEntryOrTagArgument.Result<Biome> result) throws CommandSyntaxException {
       BlockPos lv = BlockPos.fromPosition(source.getPosition());
       Stopwatch stopwatch = Stopwatch.createStarted(Util.TICKER);
-      Pair<BlockPos, Holder<Biome>> pair = source.getWorld().m_olxeedby(result, lv, 6400, 32, 64);
+      Pair<BlockPos, Holder<Biome>> pair = source.getWorld().locateBiome(result, lv, 6400, 32, 64);
       stopwatch.stop();
       if (pair == null) {
          throw BIOME_NOT_FOUND_EXCEPTION.create(result.getStringRepresentation());
diff -bur namedTargetSrc/net/minecraft/server/dedicated/MinecraftDedicatedServer.java namedSrc/net/minecraft/server/dedicated/MinecraftDedicatedServer.java
--- namedTargetSrc/net/minecraft/server/dedicated/MinecraftDedicatedServer.java	2023-07-01 17:59:06.670680518 +0000
+++ namedSrc/net/minecraft/server/dedicated/MinecraftDedicatedServer.java	2023-07-01 17:57:40.095469064 +0000
@@ -607,7 +607,7 @@
    @Override
    public boolean shouldEnforceSecureProfile() {
       ServerPropertiesHandler lv = this.getProperties();
-      return lv.enforceSecureProfile && lv.onlineMode && this.services.m_hduyrfue() != null;
+      return lv.enforceSecureProfile && lv.onlineMode && this.services.createSignatureValidator() != null;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/server/integrated/IntegratedServer.java namedSrc/net/minecraft/server/integrated/IntegratedServer.java
--- namedTargetSrc/net/minecraft/server/integrated/IntegratedServer.java	2023-07-01 17:59:06.718680083 +0000
+++ namedSrc/net/minecraft/server/integrated/IntegratedServer.java	2023-07-01 17:57:40.159468487 +0000
@@ -151,7 +151,7 @@
          this.incrementTotalWorldTimeStat();
       } else {
          if (bl && !this.paused) {
-            this.m_orlnkvix();
+            this.syncTime();
          }
 
          super.tick(shouldKeepTicking);
diff -bur namedTargetSrc/net/minecraft/server/Main.java namedSrc/net/minecraft/server/Main.java
--- namedTargetSrc/net/minecraft/server/Main.java	2023-07-01 17:59:06.754679756 +0000
+++ namedSrc/net/minecraft/server/Main.java	2023-07-01 17:57:40.207468054 +0000
@@ -106,7 +106,7 @@
 
          Path path = optionSet.valueOf(optionSpec15);
          if (path != null) {
-            m_wiejzgin(path);
+            writePid(path);
          }
 
          CrashReport.initCrashReport();
@@ -217,9 +217,9 @@
          SaveProperties lv12 = lv9.saveProperties();
          lv5.backupLevelDataFile(lv11, lv12);
          final MinecraftDedicatedServer lv13 = MinecraftServer.startServer(
-            threadx -> {
+            serverThread -> {
                MinecraftDedicatedServer lvx = new MinecraftDedicatedServer(
-                  threadx, lv5, lv7, lv9, lv, Schemas.getFixer(), lv3, WorldGenerationProgressLogger::new
+                  serverThread, lv5, lv7, lv9, lv, Schemas.getFixer(), lv3, WorldGenerationProgressLogger::new
                );
                lvx.setHostProfile(optionSet.has(optionSpec9) ? new GameProfile(null, optionSet.valueOf(optionSpec9)) : null);
                lvx.setServerPort(optionSet.valueOf(optionSpec12));
@@ -249,9 +249,10 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_wiejzgin Lnet/minecraft/server/Main;m_wiejzgin(Ljava/nio/file/Path;)V}
+    * @mapping {@literal named writePid Lnet/minecraft/server/Main;writePid(Ljava/nio/file/Path;)V}
     */
-   private static void m_wiejzgin(Path path) {
+   private static void writePid(Path path) {
       try {
          long l = ProcessHandle.current().pid();
          Files.writeString(path, Long.toString(l));
diff -bur namedTargetSrc/net/minecraft/server/MinecraftServer.java namedSrc/net/minecraft/server/MinecraftServer.java
--- namedTargetSrc/net/minecraft/server/MinecraftServer.java	2023-07-01 17:59:06.758679720 +0000
+++ namedSrc/net/minecraft/server/MinecraftServer.java	2023-07-01 17:57:40.207468054 +0000
@@ -804,7 +804,7 @@
                .getOptional(RegistryKeys.CONFIGURED_FEATURE)
                .flatMap(registry -> registry.getHolder(MiscConfiguredFeatures.BONUS_CHEST))
                .ifPresent(
-                  arg4 -> ((ConfiguredFeature)arg4.value())
+                  bonusChestFeature -> ((ConfiguredFeature)bonusChestFeature.value())
                         .generate(
                            world,
                            lv.getChunkGenerator(),
@@ -1380,7 +1380,7 @@
          this.profiler.push((Supplier<String>)(() -> lv + " " + lv.getRegistryKey().getValue()));
          if (this.ticks % 20 == 0) {
             this.profiler.push("timeSync");
-            this.m_cjkzikqh(lv);
+            this.sendWorldTimeUpdate(lv);
             this.profiler.pop();
          }
 
@@ -1417,9 +1417,9 @@
 
    /**
     * @mapping {@literal hashed m_cjkzikqh Lnet/minecraft/server/MinecraftServer;m_cjkzikqh(Lnet/minecraft/unmapped/C_bdwnwhiu;)V}
-    * @mapping {@literal named m_cjkzikqh Lnet/minecraft/server/MinecraftServer;m_cjkzikqh(Lnet/minecraft/server/world/ServerWorld;)V}
+    * @mapping {@literal named sendWorldTimeUpdate Lnet/minecraft/server/MinecraftServer;sendWorldTimeUpdate(Lnet/minecraft/server/world/ServerWorld;)V}
     */
-   private void m_cjkzikqh(ServerWorld world) {
+   private void sendWorldTimeUpdate(ServerWorld world) {
       this.playerManager
          .sendToDimension(
             new WorldTimeUpdateS2CPacket(world.getTime(), world.getTimeOfDay(), world.getGameRules().getBoolean(GameRules.DO_DAYLIGHT_CYCLE)),
@@ -1428,13 +1428,14 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_orlnkvix Lnet/minecraft/server/MinecraftServer;m_orlnkvix()V}
+    * @mapping {@literal named syncTime Lnet/minecraft/server/MinecraftServer;syncTime()V}
     */
-   public void m_orlnkvix() {
+   public void syncTime() {
       this.profiler.push("timeSync");
 
       for (ServerWorld lv : this.getWorlds()) {
-         this.m_cjkzikqh(lv);
+         this.sendWorldTimeUpdate(lv);
       }
 
       this.profiler.pop();
@@ -1578,7 +1579,7 @@
          (Supplier<String>)(() -> (String)this.dataPackManager
                .getEnabledProfiles()
                .stream()
-               .map(arg -> arg.getName() + (arg.getCompatibility().isCompatible() ? "" : " (incompatible)"))
+               .map(profile -> profile.getName() + (profile.getCompatibility().isCompatible() ? "" : " (incompatible)"))
                .collect(Collectors.joining(", ")))
       );
       details.addSection(
@@ -2102,11 +2103,12 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_ioqdmdme Lnet/minecraft/server/MinecraftServer;m_ioqdmdme()Lnet/minecraft/unmapped/C_yvuwcvkm;}
+    * @mapping {@literal named createSignatureValidator Lnet/minecraft/server/MinecraftServer;createSignatureValidator()Lnet/minecraft/network/encryption/SignatureValidator;}
     */
    @Nullable
-   public SignatureValidator m_ioqdmdme() {
-      return this.services.m_hduyrfue();
+   public SignatureValidator createSignatureValidator() {
+      return this.services.createSignatureValidator();
    }
 
    /**
@@ -2471,7 +2473,7 @@
     * @mapping {@literal named getLootManager Lnet/minecraft/server/MinecraftServer;getLootManager()Lnet/minecraft/loot/LootManager;}
     */
    public LootManager getLootManager() {
-      return this.serverResourceManager.resources.m_qhooynop();
+      return this.serverResourceManager.resources.getLootManager();
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/server/network/EntityTrackerEntry.java namedSrc/net/minecraft/server/network/EntityTrackerEntry.java
--- namedTargetSrc/net/minecraft/server/network/EntityTrackerEntry.java	2023-07-01 17:59:06.734679938 +0000
+++ namedSrc/net/minecraft/server/network/EntityTrackerEntry.java	2023-07-01 17:57:40.175468342 +0000
@@ -52,9 +52,10 @@
     */
    private static final Logger LOGGER = LogUtils.getLogger();
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_jsyknaxw Lnet/minecraft/unmapped/C_yagtbmmk;f_jsyknaxw:I}
+    * @mapping {@literal named ROTATION_TOLERANCE_LEVEL Lnet/minecraft/server/network/EntityTrackerEntry;ROTATION_TOLERANCE_LEVEL:I}
     */
-   private static final int f_jsyknaxw = 1;
+   private static final int ROTATION_TOLERANCE_LEVEL = 1;
    /**
     * @mapping {@literal hashed f_wiftijhh Lnet/minecraft/unmapped/C_yagtbmmk;f_wiftijhh:Lnet/minecraft/unmapped/C_bdwnwhiu;}
     * @mapping {@literal named world Lnet/minecraft/server/network/EntityTrackerEntry;world:Lnet/minecraft/server/world/ServerWorld;}
@@ -81,9 +82,10 @@
     */
    private final Consumer<Packet<?>> receiver;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_azdezkau Lnet/minecraft/unmapped/C_yagtbmmk;f_azdezkau:Lnet/minecraft/unmapped/C_kfofqpqr;}
+    * @mapping {@literal named positionCodec Lnet/minecraft/server/network/EntityTrackerEntry;positionCodec:Lnet/minecraft/entity/PacketPositionCodec;}
     */
-   private final PacketPositionCodec f_azdezkau = new PacketPositionCodec();
+   private final PacketPositionCodec positionCodec = new PacketPositionCodec();
    /**
     * @mapping {@literal hashed f_ghninrwd Lnet/minecraft/unmapped/C_yagtbmmk;f_ghninrwd:I}
     * @mapping {@literal named lastYaw Lnet/minecraft/server/network/EntityTrackerEntry;lastYaw:I}
@@ -130,10 +132,11 @@
     */
    private boolean lastOnGround;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_kqnuyquf Lnet/minecraft/unmapped/C_yagtbmmk;f_kqnuyquf:Ljava/util/List;}
+    * @mapping {@literal named trackedDataValues Lnet/minecraft/server/network/EntityTrackerEntry;trackedDataValues:Ljava/util/List;}
     */
    @Nullable
-   private List<DataTracker.SerializedEntry<?>> f_kqnuyquf;
+   private List<DataTracker.SerializedEntry<?>> trackedDataValues;
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_yagtbmmk;<init>(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_astfners;IZLjava/util/function/Consumer;)V}
@@ -145,12 +148,12 @@
       this.entity = entity;
       this.tickInterval = tickInterval;
       this.alwaysUpdateVelocity = alwaysUpdateVelocity;
-      this.f_azdezkau.setPos(entity.getAttachmentPos());
+      this.positionCodec.setPos(entity.getAttachmentPos());
       this.lastYaw = MathHelper.floor(entity.getYaw() * 256.0F / 360.0F);
       this.lastPitch = MathHelper.floor(entity.getPitch() * 256.0F / 360.0F);
       this.lastHeadPitch = MathHelper.floor(entity.getHeadYaw() * 256.0F / 360.0F);
       this.lastOnGround = entity.isOnGround();
-      this.f_kqnuyquf = entity.getDataTracker().serializeData();
+      this.trackedDataValues = entity.getDataTracker().serializeData();
    }
 
    /**
@@ -161,8 +164,8 @@
       List<Entity> list = this.entity.getPassengerList();
       if (!list.equals(this.lastPassengers)) {
          this.receiver.accept(new EntityPassengersUpdateS2CPacket(this.entity));
-         m_eszryakz(list, this.lastPassengers).forEach(arg -> {
-            if (arg instanceof ServerPlayerEntity lv) {
+         streamRemovedPassengers(list, this.lastPassengers).forEach(entity -> {
+            if (entity instanceof ServerPlayerEntity lv) {
                lv.networkHandler.requestTeleport(lv.getX(), lv.getY(), lv.getZ(), lv.getYaw(), lv.getPitch());
             }
          });
@@ -200,7 +203,7 @@
                this.lastPitch = j;
             }
 
-            this.f_azdezkau.setPos(this.entity.getAttachmentPos());
+            this.positionCodec.setPos(this.entity.getAttachmentPos());
             this.syncEntityData();
             this.hadVehicle = true;
          } else {
@@ -208,16 +211,16 @@
             int k = MathHelper.floor(this.entity.getYaw() * 256.0F / 360.0F);
             int l = MathHelper.floor(this.entity.getPitch() * 256.0F / 360.0F);
             Vec3d lv6 = this.entity.getAttachmentPos();
-            boolean bl2 = this.f_azdezkau.subtract(lv6).lengthSquared() >= 7.6293945E-6F;
+            boolean bl2 = this.positionCodec.subtract(lv6).lengthSquared() >= 7.6293945E-6F;
             Packet<?> lv7 = null;
             boolean bl3 = bl2 || this.trackingTick % 60 == 0;
             boolean bl4 = Math.abs(k - this.lastYaw) >= 1 || Math.abs(l - this.lastPitch) >= 1;
             boolean bl5 = false;
             boolean bl6 = false;
             if (this.trackingTick > 0 || this.entity instanceof PersistentProjectileEntity) {
-               long m = this.f_azdezkau.encodeX(lv6);
-               long n = this.f_azdezkau.encodeY(lv6);
-               long o = this.f_azdezkau.encodeZ(lv6);
+               long m = this.positionCodec.encodeX(lv6);
+               long n = this.positionCodec.encodeY(lv6);
+               long o = this.positionCodec.encodeZ(lv6);
                boolean bl7 = m < -32768L || m > 32767L || n < -32768L || n > 32767L || o < -32768L || o > 32767L;
                if (bl7 || this.updatesWithoutVehicle > 400 || this.hadVehicle || this.lastOnGround != this.entity.isOnGround()) {
                   this.lastOnGround = this.entity.isOnGround();
@@ -260,7 +263,7 @@
 
             this.syncEntityData();
             if (bl5) {
-               this.f_azdezkau.setPos(lv6);
+               this.positionCodec.setPos(lv6);
             }
 
             if (bl6) {
@@ -288,10 +291,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_eszryakz Lnet/minecraft/unmapped/C_yagtbmmk;m_eszryakz(Ljava/util/List;Ljava/util/List;)Ljava/util/stream/Stream;}
+    * @mapping {@literal named streamRemovedPassengers Lnet/minecraft/server/network/EntityTrackerEntry;streamRemovedPassengers(Ljava/util/List;Ljava/util/List;)Ljava/util/stream/Stream;}
     */
-   private static Stream<Entity> m_eszryakz(List<Entity> list, List<Entity> list2) {
-      return list2.stream().filter(arg -> !list.contains(arg));
+   private static Stream<Entity> streamRemovedPassengers(List<Entity> passengers, List<Entity> lastPassengers) {
+      return lastPassengers.stream().filter(entity -> !passengers.contains(entity));
    }
 
    /**
@@ -318,7 +322,7 @@
     * @mapping {@literal hashed m_acqaqxfb Lnet/minecraft/unmapped/C_yagtbmmk;m_acqaqxfb(Lnet/minecraft/unmapped/C_mxrobsgg;Ljava/util/function/Consumer;)V}
     * @mapping {@literal named sendPackets Lnet/minecraft/server/network/EntityTrackerEntry;sendPackets(Lnet/minecraft/server/network/ServerPlayerEntity;Ljava/util/function/Consumer;)V}
     */
-   public void sendPackets(ServerPlayerEntity arg, Consumer<Packet<ClientPlayPacketListener>> sender) {
+   public void sendPackets(ServerPlayerEntity player, Consumer<Packet<ClientPlayPacketListener>> sender) {
       if (this.entity.isRemoved()) {
          LOGGER.warn("Fetching packet for removed entity {}", this.entity);
       }
@@ -326,8 +330,8 @@
       Packet<ClientPlayPacketListener> lv = this.entity.createSpawnPacket();
       this.lastHeadPitch = MathHelper.floor(this.entity.getHeadYaw() * 256.0F / 360.0F);
       sender.accept(lv);
-      if (this.f_kqnuyquf != null) {
-         sender.accept(new EntityTrackerUpdateS2CPacket(this.entity.getId(), this.f_kqnuyquf));
+      if (this.trackedDataValues != null) {
+         sender.accept(new EntityTrackerUpdateS2CPacket(this.entity.getId(), this.trackedDataValues));
       }
 
       boolean bl = this.alwaysUpdateVelocity;
@@ -385,7 +389,7 @@
       DataTracker lv = this.entity.getDataTracker();
       List<DataTracker.SerializedEntry<?>> list = lv.getDirtyEntries();
       if (list != null) {
-         this.f_kqnuyquf = lv.serializeData();
+         this.trackedDataValues = lv.serializeData();
          this.sendSyncPacket(new EntityTrackerUpdateS2CPacket(this.entity.getId(), list));
       }
 
diff -bur namedTargetSrc/net/minecraft/server/network/ServerPlayerEntity.java namedSrc/net/minecraft/server/network/ServerPlayerEntity.java
--- namedTargetSrc/net/minecraft/server/network/ServerPlayerEntity.java	2023-07-01 17:59:06.750679793 +0000
+++ namedSrc/net/minecraft/server/network/ServerPlayerEntity.java	2023-07-01 17:57:40.199468126 +0000
@@ -950,8 +950,8 @@
       this.getWorld()
          .getEntitiesByClass(MobEntity.class, lv, EntityPredicates.EXCEPT_SPECTATOR)
          .stream()
-         .filter(arg -> arg instanceof Angerable)
-         .forEach(arg -> ((Angerable)arg).forgive(this));
+         .filter(entity -> entity instanceof Angerable)
+         .forEach(angerableEntity -> ((Angerable)angerableEntity).forgive(this));
    }
 
    /**
@@ -1232,7 +1232,7 @@
                   .getEntitiesByClass(
                      HostileEntity.class,
                      new Box(lv2.getX() - 8.0, lv2.getY() - 5.0, lv2.getZ() - 8.0, lv2.getX() + 8.0, lv2.getY() + 5.0, lv2.getZ() + 8.0),
-                     arg -> arg.isAngryAt(this)
+                     hostileEntity -> hostileEntity.isAngryAt(this)
                   );
                if (!list.isEmpty()) {
                   return Either.left(PlayerEntity.SleepFailureReason.NOT_SAFE);
@@ -1324,7 +1324,7 @@
     * Mapping not found
     */
    @Override
-   protected void fall(double heightDifference, boolean onGround, BlockState landedState, BlockPos landedPosition) {
+   protected void fall(double fallDistance, boolean onGround, BlockState landedState, BlockPos landedPosition) {
    }
 
    /**
@@ -1341,11 +1341,11 @@
     * @mapping {@literal hashed m_gynondrt Lnet/minecraft/unmapped/C_mxrobsgg;m_gynondrt(DDDZ)V}
     * @mapping {@literal named handleFall Lnet/minecraft/server/network/ServerPlayerEntity;handleFall(DDDZ)V}
     */
-   public void handleFall(double heightDifference, double e, double f, boolean onGround) {
+   public void handleFall(double xOffset, double fallDistance, double zOffset, boolean onGround) {
       if (!this.isRegionUnloaded()) {
-         this.updateSupportingBlock(onGround, new Vec3d(heightDifference, e, f));
+         this.updateSupportingBlock(onGround, new Vec3d(xOffset, fallDistance, zOffset));
          BlockPos lv = this.getLandingPosition();
-         super.fall(e, onGround, this.getWorld().getBlockState(lv), lv);
+         super.fall(fallDistance, onGround, this.getWorld().getBlockState(lv), lv);
       }
    }
 
@@ -1852,7 +1852,7 @@
     * @mapping {@literal named getIp Lnet/minecraft/server/network/ServerPlayerEntity;getIp()Ljava/lang/String;}
     */
    public String getIp() {
-      SocketAddress socketAddress = this.networkHandler.m_tqzfeqlf();
+      SocketAddress socketAddress = this.networkHandler.getAddress();
       return socketAddress instanceof InetSocketAddress inetSocketAddress ? InetAddresses.toAddrString(inetSocketAddress.getAddress()) : "<unknown>";
    }
 
@@ -2417,7 +2417,7 @@
     */
    @Nullable
    public PublicChatSession getChatSession() {
-      return this.chatSession != null && this.chatSession.m_ccxgkdwf() ? null : this.chatSession;
+      return this.chatSession != null && this.chatSession.isExpired() ? null : this.chatSession;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/server/network/ServerPlayNetworkHandler.java namedSrc/net/minecraft/server/network/ServerPlayNetworkHandler.java
--- namedTargetSrc/net/minecraft/server/network/ServerPlayNetworkHandler.java	2023-07-01 17:59:06.710680155 +0000
+++ namedSrc/net/minecraft/server/network/ServerPlayNetworkHandler.java	2023-07-01 17:57:40.151468559 +0000
@@ -215,9 +215,10 @@
     */
    private static final int f_uzarfiqj = 4096;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_ahcrdrys Lnet/minecraft/unmapped/C_hwbabymg;f_ahcrdrys:Lnet/minecraft/unmapped/C_rdaqiwdt;}
+    * @mapping {@literal named CHAT_VALIDATION_FAILED Lnet/minecraft/server/network/ServerPlayNetworkHandler;CHAT_VALIDATION_FAILED:Lnet/minecraft/text/Text;}
     */
-   private static final Text f_ahcrdrys = Text.translatable("multiplayer.disconnect.chat_validation_failed");
+   private static final Text CHAT_VALIDATION_FAILED = Text.translatable("multiplayer.disconnect.chat_validation_failed");
    /**
     * @mapping {@literal hashed f_burxyzoz Lnet/minecraft/unmapped/C_hwbabymg;f_burxyzoz:Lnet/minecraft/unmapped/C_oasmcckk;}
     * @mapping {@literal named connection Lnet/minecraft/server/network/ServerPlayNetworkHandler;connection:Lnet/minecraft/network/ClientConnection;}
@@ -1696,7 +1697,7 @@
          Optional<MessageSignatureList> optional = this.messageAcknowledgmentValidator.validate(acknowledgment);
          if (optional.isEmpty()) {
             LOGGER.warn("Failed to validate message acknowledgements from {}", this.player.getName().getString());
-            this.disconnect(f_ahcrdrys);
+            this.disconnect(CHAT_VALIDATION_FAILED);
          }
 
          return optional;
@@ -1769,7 +1770,7 @@
       synchronized (this.messageAcknowledgmentValidator) {
          if (!this.messageAcknowledgmentValidator.removeMessagesUntil(packet.offset())) {
             LOGGER.warn("Failed to validate message acknowledgements from {}", this.player.getName().getString());
-            this.disconnect(f_ahcrdrys);
+            this.disconnect(CHAT_VALIDATION_FAILED);
          }
       }
    }
@@ -1889,9 +1890,10 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_tqzfeqlf Lnet/minecraft/unmapped/C_hwbabymg;m_tqzfeqlf()Ljava/net/SocketAddress;}
+    * @mapping {@literal named getAddress Lnet/minecraft/server/network/ServerPlayNetworkHandler;getAddress()Ljava/net/SocketAddress;}
     */
-   public SocketAddress m_tqzfeqlf() {
+   public SocketAddress getAddress() {
       return this.connection.getAddress();
    }
 
@@ -2230,7 +2232,7 @@
             this.disconnect(PlayerPublicKey.EXPIRED_PUBLIC_KEY);
          } else {
             try {
-               SignatureValidator lv4 = this.server.m_ioqdmdme();
+               SignatureValidator lv4 = this.server.createSignatureValidator();
                if (lv4 == null) {
                   LOGGER.warn("Ignoring chat session from {} due to missing Services public key", this.player.getGameProfile().getName());
                   return;
diff -bur namedTargetSrc/net/minecraft/server/network/ServerQueryNetworkHandler.java namedSrc/net/minecraft/server/network/ServerQueryNetworkHandler.java
--- namedTargetSrc/net/minecraft/server/network/ServerQueryNetworkHandler.java	2023-07-01 17:59:06.714680119 +0000
+++ namedSrc/net/minecraft/server/network/ServerQueryNetworkHandler.java	2023-07-01 17:57:40.151468559 +0000
@@ -20,9 +20,10 @@
     */
    private static final Text REQUEST_HANDLED = Text.translatable("multiplayer.status.request_handled");
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_tdmfgayt Lnet/minecraft/unmapped/C_aqoyaoew;f_tdmfgayt:Lnet/minecraft/unmapped/C_bwttende;}
+    * @mapping {@literal named metadata Lnet/minecraft/server/network/ServerQueryNetworkHandler;metadata:Lnet/minecraft/server/ServerMetadata;}
     */
-   private final ServerMetadata f_tdmfgayt;
+   private final ServerMetadata metadata;
    /**
     * @mapping {@literal hashed f_cwdsbryg Lnet/minecraft/unmapped/C_aqoyaoew;f_cwdsbryg:Lnet/minecraft/unmapped/C_oasmcckk;}
     * @mapping {@literal named connection Lnet/minecraft/server/network/ServerQueryNetworkHandler;connection:Lnet/minecraft/network/ClientConnection;}
@@ -35,11 +36,12 @@
    private boolean responseSent;
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_aqoyaoew;<init>(Lnet/minecraft/unmapped/C_bwttende;Lnet/minecraft/unmapped/C_oasmcckk;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/server/network/ServerQueryNetworkHandler;<init>(Lnet/minecraft/server/ServerMetadata;Lnet/minecraft/network/ClientConnection;)V}
     */
-   public ServerQueryNetworkHandler(ServerMetadata arg, ClientConnection arg2) {
-      this.f_tdmfgayt = arg;
-      this.connection = arg2;
+   public ServerQueryNetworkHandler(ServerMetadata metadata, ClientConnection connection) {
+      this.metadata = metadata;
+      this.connection = connection;
    }
 
    /**
@@ -66,7 +68,7 @@
          this.connection.disconnect(REQUEST_HANDLED);
       } else {
          this.responseSent = true;
-         this.connection.send(new ServerMetadataS2CPacket(this.f_tdmfgayt));
+         this.connection.send(new ServerMetadataS2CPacket(this.metadata));
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/server/rcon/QueryResponseHandler.java namedSrc/net/minecraft/server/rcon/QueryResponseHandler.java
--- namedTargetSrc/net/minecraft/server/rcon/QueryResponseHandler.java	2023-07-01 17:59:06.746679829 +0000
+++ namedSrc/net/minecraft/server/rcon/QueryResponseHandler.java	2023-07-01 17:57:40.195468162 +0000
@@ -46,9 +46,10 @@
     */
    private static final long CLEAN_UP_THRESHOLD = 30000L;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_zykebbzy Lnet/minecraft/unmapped/C_hfrdwddv;f_zykebbzy:J}
+    * @mapping {@literal named RESPONSE_CACHE_TIME Lnet/minecraft/server/rcon/QueryResponseHandler;RESPONSE_CACHE_TIME:J}
     */
-   private static final long f_zykebbzy = 5000L;
+   private static final long RESPONSE_CACHE_TIME = 5000L;
    /**
     * @mapping {@literal hashed f_rwqdikjy Lnet/minecraft/unmapped/C_hfrdwddv;f_rwqdikjy:J}
     * @mapping {@literal named lastQueryTime Lnet/minecraft/server/rcon/QueryResponseHandler;lastQueryTime:J}
diff -bur namedTargetSrc/net/minecraft/server/ServerAdvancementLoader.java namedSrc/net/minecraft/server/ServerAdvancementLoader.java
--- namedTargetSrc/net/minecraft/server/ServerAdvancementLoader.java	2023-07-01 17:59:06.666680554 +0000
+++ namedSrc/net/minecraft/server/ServerAdvancementLoader.java	2023-07-01 17:57:40.091469100 +0000
@@ -42,16 +42,18 @@
     */
    private AdvancementManager manager = new AdvancementManager();
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_kzsznscx Lnet/minecraft/unmapped/C_fktoyupt;f_kzsznscx:Lnet/minecraft/unmapped/C_uxsnhxlb;}
+    * @mapping {@literal named lootManager Lnet/minecraft/server/ServerAdvancementLoader;lootManager:Lnet/minecraft/loot/LootManager;}
     */
-   private final LootManager f_kzsznscx;
+   private final LootManager lootManager;
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_fktoyupt;<init>(Lnet/minecraft/unmapped/C_uxsnhxlb;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/server/ServerAdvancementLoader;<init>(Lnet/minecraft/loot/LootManager;)V}
     */
-   public ServerAdvancementLoader(LootManager arg) {
+   public ServerAdvancementLoader(LootManager lootManager) {
       super(GSON, "advancements");
-      this.f_kzsznscx = arg;
+      this.lootManager = lootManager;
    }
 
    /**
@@ -63,7 +65,7 @@
       map.forEach((id, json) -> {
          try {
             JsonObject jsonObject = JsonHelper.asObject(json, "advancement");
-            Advancement.Task lvx = Advancement.Task.fromJson(jsonObject, new AdvancementEntityPredicateDeserializer(id, this.f_kzsznscx));
+            Advancement.Task lvx = Advancement.Task.fromJson(jsonObject, new AdvancementEntityPredicateDeserializer(id, this.lootManager));
             map2.put(id, lvx);
          } catch (Exception var6) {
             LOGGER.error("Parsing error loading custom advancement {}: {}", id, var6.getMessage());
diff -bur namedTargetSrc/net/minecraft/server/ServerReloadableResources.java namedSrc/net/minecraft/server/ServerReloadableResources.java
--- namedTargetSrc/net/minecraft/server/ServerReloadableResources.java	2023-07-01 17:59:06.666680554 +0000
+++ namedSrc/net/minecraft/server/ServerReloadableResources.java	2023-07-01 17:57:40.091469100 +0000
@@ -65,14 +65,15 @@
     */
    private final TagManagerLoader tagLoader;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_aafiafdg Lnet/minecraft/unmapped/C_migzkpst;f_aafiafdg:Lnet/minecraft/unmapped/C_uxsnhxlb;}
+    * @mapping {@literal named lootManager Lnet/minecraft/server/ServerReloadableResources;lootManager:Lnet/minecraft/loot/LootManager;}
     */
-   private final LootManager f_aafiafdg = new LootManager();
+   private final LootManager lootManager = new LootManager();
    /**
     * @mapping {@literal hashed f_tcegvcns Lnet/minecraft/unmapped/C_migzkpst;f_tcegvcns:Lnet/minecraft/unmapped/C_fktoyupt;}
     * @mapping {@literal named advancements Lnet/minecraft/server/ServerReloadableResources;advancements:Lnet/minecraft/server/ServerAdvancementLoader;}
     */
-   private final ServerAdvancementLoader advancements = new ServerAdvancementLoader(this.f_aafiafdg);
+   private final ServerAdvancementLoader advancements = new ServerAdvancementLoader(this.lootManager);
    /**
     * @mapping {@literal hashed f_izcsyrwb Lnet/minecraft/unmapped/C_migzkpst;f_izcsyrwb:Lnet/minecraft/unmapped/C_coevuhwv;}
     * @mapping {@literal named functions Lnet/minecraft/server/ServerReloadableResources;functions:Lnet/minecraft/server/function/FunctionLoader;}
@@ -80,14 +81,17 @@
    private final FunctionLoader functions;
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_migzkpst;<init>(Lnet/minecraft/unmapped/C_wqxmvzdq$C_ggmzysrd;Lnet/minecraft/unmapped/C_czxxrbcp;Lnet/minecraft/unmapped/C_rieemtgi$C_vypaxkxj;I)V}
+    * @mapping {@literal named <init> Lnet/minecraft/server/ServerReloadableResources;<init>(Lnet/minecraft/registry/DynamicRegistryManager$Frozen;Lnet/minecraft/feature_flags/FeatureFlagBitSet;Lnet/minecraft/server/command/CommandManager$RegistrationEnvironment;I)V}
     */
-   public ServerReloadableResources(DynamicRegistryManager.Frozen arg, FeatureFlagBitSet arg2, CommandManager.RegistrationEnvironment arg3, int i) {
-      this.tagLoader = new TagManagerLoader(arg);
-      this.commandBuildContext = CommandBuildContext.createConfigurable(arg, arg2);
-      this.commands = new CommandManager(arg3, this.commandBuildContext);
+   public ServerReloadableResources(
+      DynamicRegistryManager.Frozen registryManager, FeatureFlagBitSet featureFlags, CommandManager.RegistrationEnvironment environment, int level
+   ) {
+      this.tagLoader = new TagManagerLoader(registryManager);
+      this.commandBuildContext = CommandBuildContext.createConfigurable(registryManager, featureFlags);
+      this.commands = new CommandManager(environment, this.commandBuildContext);
       this.commandBuildContext.setMissingTagAccessPolicy(CommandBuildContext.MissingTagAccessPolicy.CREATE_NEW);
-      this.functions = new FunctionLoader(i, this.commands.getDispatcher());
+      this.functions = new FunctionLoader(level, this.commands.getDispatcher());
    }
 
    /**
@@ -99,10 +103,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_qhooynop Lnet/minecraft/unmapped/C_migzkpst;m_qhooynop()Lnet/minecraft/unmapped/C_uxsnhxlb;}
+    * @mapping {@literal named getLootManager Lnet/minecraft/server/ServerReloadableResources;getLootManager()Lnet/minecraft/loot/LootManager;}
     */
-   public LootManager m_qhooynop() {
-      return this.f_aafiafdg;
+   public LootManager getLootManager() {
+      return this.lootManager;
    }
 
    /**
@@ -136,7 +141,7 @@
     * @mapping {@literal named getReloaders Lnet/minecraft/server/ServerReloadableResources;getReloaders()Ljava/util/List;}
     */
    public List<ResourceReloader> getReloaders() {
-      return List.of(this.tagLoader, this.f_aafiafdg, this.recipes, this.functions, this.advancements);
+      return List.of(this.tagLoader, this.lootManager, this.recipes, this.functions, this.advancements);
    }
 
    /**
@@ -146,13 +151,13 @@
    public static CompletableFuture<ServerReloadableResources> loadResources(
       ResourceManager resources,
       DynamicRegistryManager.Frozen registry,
-      FeatureFlagBitSet arg3,
+      FeatureFlagBitSet featureFlags,
       CommandManager.RegistrationEnvironment environment,
       int level,
       Executor prepareExecutor,
       Executor applyExecutor
    ) {
-      ServerReloadableResources lv = new ServerReloadableResources(registry, arg3, environment, level);
+      ServerReloadableResources lv = new ServerReloadableResources(registry, featureFlags, environment, level);
       return SimpleResourceReload.create(resources, lv.getReloaders(), prepareExecutor, applyExecutor, INITIAL_DATA_RELOAD_TASK, LOGGER.isDebugEnabled())
          .whenComplete()
          .whenComplete((o, error) -> lv.commandBuildContext.setMissingTagAccessPolicy(CommandBuildContext.MissingTagAccessPolicy.FAIL))
diff -bur namedTargetSrc/net/minecraft/server/Services.java namedSrc/net/minecraft/server/Services.java
--- namedTargetSrc/net/minecraft/server/Services.java	2023-07-01 17:59:06.718680083 +0000
+++ namedSrc/net/minecraft/server/Services.java	2023-07-01 17:57:40.159468487 +0000
@@ -33,10 +33,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_hduyrfue Lnet/minecraft/unmapped/C_vmxvaoqe;m_hduyrfue()Lnet/minecraft/unmapped/C_yvuwcvkm;}
+    * @mapping {@literal named createSignatureValidator Lnet/minecraft/server/Services;createSignatureValidator()Lnet/minecraft/network/encryption/SignatureValidator;}
     */
    @Nullable
-   public SignatureValidator m_hduyrfue() {
-      return SignatureValidator.m_dkohjnkg(this.servicesKeySet, ServicesKeyType.PROFILE_KEY);
+   public SignatureValidator createSignatureValidator() {
+      return SignatureValidator.create(this.servicesKeySet, ServicesKeyType.PROFILE_KEY);
    }
 }


The remaining diff is too long!

Please sign in to comment.