diff --git a/mappings/mx.mapping b/mappings/mx.mapping deleted file mode 100644 index fd7edc78d7..0000000000 --- a/mappings/mx.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS mx - METHOD a read (Liq;)V - METHOD a apply (Lit;)V - METHOD a apply (Ljr;)V - METHOD b write (Liq;)V diff --git a/mappings/my.mapping b/mappings/my.mapping deleted file mode 100644 index c5d8a79e6b..0000000000 --- a/mappings/my.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS my - METHOD a read (Liq;)V - METHOD a apply (Lit;)V - METHOD a apply (Ljr;)V - METHOD b write (Liq;)V diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping index 735deb00c5..f285f8e3fe 100644 --- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping @@ -41,7 +41,7 @@ CLASS czh net/minecraft/client/network/ClientPlayNetworkHandler METHOD a onGuiSlotUpdate (Lkp;)V METHOD a onCooldownUpdate (Lkq;)V METHOD a onCustomPayload (Lkr;)V - METHOD a onSoundPlayName (Lks;)V + METHOD a onPlaySoundId (Lks;)V METHOD a onDisconnect (Lkt;)V METHOD a onEntityStatus (Lku;)V METHOD a onExplosion (Lkv;)V @@ -56,13 +56,13 @@ CLASS czh net/minecraft/client/network/ClientPlayNetworkHandler METHOD a onVehicleMove (Llg;)V METHOD a onSignEditorOpen (Llh;)V METHOD a onPlayerAbilities (Llj;)V - METHOD a onEventCombat (Llk;)V + METHOD a onCombatEvent (Llk;)V METHOD a onPlayerList (Lll;)V METHOD a onPlayerPositionLook (Lln;)V METHOD a onPlayerUseBed (Llo;)V METHOD a onUnlockRecipes (Llp;)V METHOD a onEntitiesDestroy (Llq;)V - METHOD a onEntityEffectRemove (Llr;)V + METHOD a onRemoveEntityEffect (Llr;)V METHOD a onResourcePackSend (Lls;)V METHOD a onPlayerRespawn (Llt;)V METHOD a onEntitySetHeadYaw (Llu;)V @@ -89,6 +89,9 @@ CLASS czh net/minecraft/client/network/ClientPlayNetworkHandler METHOD a onAdvancements (Lmu;)V METHOD a onEntityAttributes (Lmv;)V METHOD a onEntityPotionEffect (Lmw;)V + METHOD a onSynchronizeRecipes (Lmx;)V + ARG 1 packet + METHOD a onSynchronizeTags (Lmy;)V METHOD b getCommandSource ()Lczi; METHOD b validateResourcePackUrl (Ljava/lang/String;)Z METHOD d getRecipeManager ()Laxz; diff --git a/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping b/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping index fea1e10ecf..e2adb8f078 100644 --- a/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping @@ -11,8 +11,10 @@ CLASS dbn net/minecraft/client/network/ClientPlayerEntity METHOD V_ stopRiding ()V METHOD a setClientPermissionLevel (I)V METHOD a openInventory (Laev;)V + ARG 1 inventory METHOD a swingHand (Lafb;)V METHOD a openContainer (Lafc;)V + ARG 1 provider METHOD a damage (Lafr;F)Z ARG 1 source METHOD a copyEntityData (Lagi;)V diff --git a/mappings/net/minecraft/client/network/packet/EventCombatClientPacket.mapping b/mappings/net/minecraft/client/network/packet/CombatEventClientPacket.mapping similarity index 84% rename from mappings/net/minecraft/client/network/packet/EventCombatClientPacket.mapping rename to mappings/net/minecraft/client/network/packet/CombatEventClientPacket.mapping index 6880b98ba2..09a36daabc 100644 --- a/mappings/net/minecraft/client/network/packet/EventCombatClientPacket.mapping +++ b/mappings/net/minecraft/client/network/packet/CombatEventClientPacket.mapping @@ -1,4 +1,4 @@ -CLASS lk net/minecraft/client/network/packet/EventCombatClientPacket +CLASS lk net/minecraft/client/network/packet/CombatEventClientPacket CLASS lk$a Type FIELD a BEGIN Llk$a; FIELD b END Llk$a; diff --git a/mappings/net/minecraft/client/network/packet/EntityEffectRemoveClientPacket.mapping b/mappings/net/minecraft/client/network/packet/RemoveEntityEffectClientPacket.mapping similarity index 80% rename from mappings/net/minecraft/client/network/packet/EntityEffectRemoveClientPacket.mapping rename to mappings/net/minecraft/client/network/packet/RemoveEntityEffectClientPacket.mapping index 5c7ed83431..195efc9fdc 100644 --- a/mappings/net/minecraft/client/network/packet/EntityEffectRemoveClientPacket.mapping +++ b/mappings/net/minecraft/client/network/packet/RemoveEntityEffectClientPacket.mapping @@ -1,4 +1,4 @@ -CLASS lr net/minecraft/client/network/packet/EntityEffectRemoveClientPacket +CLASS lr net/minecraft/client/network/packet/RemoveEntityEffectClientPacket FIELD a entityId I FIELD b effectType Laga; METHOD (ILaga;)V diff --git a/mappings/net/minecraft/client/network/packet/SynchronizeRecipesClientPacket.mapping b/mappings/net/minecraft/client/network/packet/SynchronizeRecipesClientPacket.mapping new file mode 100644 index 0000000000..fa9edb09f5 --- /dev/null +++ b/mappings/net/minecraft/client/network/packet/SynchronizeRecipesClientPacket.mapping @@ -0,0 +1,7 @@ +CLASS mx net/minecraft/client/network/packet/SynchronizeRecipesClientPacket + FIELD a recipes Ljava/util/List; + METHOD a read (Liq;)V + METHOD a apply (Lit;)V + METHOD a apply (Ljr;)V + METHOD b getRecipes ()Ljava/util/List; + METHOD b write (Liq;)V diff --git a/mappings/net/minecraft/client/network/packet/SynchronizeTagsClientPacket.mapping b/mappings/net/minecraft/client/network/packet/SynchronizeTagsClientPacket.mapping new file mode 100644 index 0000000000..497e23d395 --- /dev/null +++ b/mappings/net/minecraft/client/network/packet/SynchronizeTagsClientPacket.mapping @@ -0,0 +1,7 @@ +CLASS my net/minecraft/client/network/packet/SynchronizeTagsClientPacket + FIELD a tagManager Lxz; + METHOD a read (Liq;)V + METHOD a apply (Lit;)V + METHOD a apply (Ljr;)V + METHOD b getTagManager ()Lxz; + METHOD b write (Liq;)V diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 7513ece129..fd24ef458d 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -123,6 +123,7 @@ CLASS agi net/minecraft/entity/Entity METHOD a applyRotation (Lbka;)F METHOD a onBlockCollision (Lboj;)V METHOD a changeDimension (Lbrc;)Lagi; + ARG 1 type METHOD a addCrashReportDetails (Lc;)V METHOD a setBoundingBox (Lckl;)V METHOD a squaredDistanceTo (Lckp;)D diff --git a/mappings/net/minecraft/entity/ItemEntity.mapping b/mappings/net/minecraft/entity/ItemEntity.mapping index cf1b906ba3..e2dbaa9bb0 100644 --- a/mappings/net/minecraft/entity/ItemEntity.mapping +++ b/mappings/net/minecraft/entity/ItemEntity.mapping @@ -12,6 +12,7 @@ CLASS aol net/minecraft/entity/ItemEntity ARG 1 source METHOD a tryMerge (Laol;)Z METHOD a changeDimension (Lbrc;)Lagi; + ARG 1 type METHOD a readCustomDataFromTag (Lhp;)V ARG 1 tag METHOD b setStack (Lavs;)V diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index 4588728799..2d0262d90f 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -48,7 +48,9 @@ CLASS aqj net/minecraft/entity/player/PlayerEntity METHOD Z getMaxPortalTime ()I METHOD a addExhaustion (F)V METHOD a openInventory (Laev;)V + ARG 1 inventory METHOD a openContainer (Lafc;)V + ARG 1 provider METHOD a canUnlock (Lafg;)Z METHOD a onDeath (Lafr;)V METHOD a damage (Lafr;F)Z diff --git a/mappings/net/minecraft/entity/thrown/ThrownEnderpearlEntity.mapping b/mappings/net/minecraft/entity/thrown/ThrownEnderpearlEntity.mapping index 54aeb5a4e8..d047fe20af 100644 --- a/mappings/net/minecraft/entity/thrown/ThrownEnderpearlEntity.mapping +++ b/mappings/net/minecraft/entity/thrown/ThrownEnderpearlEntity.mapping @@ -2,4 +2,5 @@ CLASS are net/minecraft/entity/thrown/ThrownEnderpearlEntity FIELD e owner Lagr; METHOD U_ update ()V METHOD a changeDimension (Lbrc;)Lagi; + ARG 1 type METHOD a onCollision (Lckm;)V diff --git a/mappings/net/minecraft/entity/vehicle/StorageMinecartEntity.mapping b/mappings/net/minecraft/entity/vehicle/StorageMinecartEntity.mapping index a218576ad8..9a60003c12 100644 --- a/mappings/net/minecraft/entity/vehicle/StorageMinecartEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/StorageMinecartEntity.mapping @@ -18,6 +18,7 @@ CLASS aro net/minecraft/entity/vehicle/StorageMinecartEntity METHOD a dropItems (Lafr;)V METHOD a canPlayerUseInv (Laqj;)Z METHOD a changeDimension (Lbrc;)Lagi; + ARG 1 type METHOD a readCustomDataFromTag (Lhp;)V ARG 1 tag METHOD a setLootTable (Lpy;J)V diff --git a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping index 2b14384224..ea7b8d973f 100644 --- a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping @@ -25,7 +25,7 @@ CLASS jr net/minecraft/network/listener/ClientPlayPacketListener METHOD a onGuiSlotUpdate (Lkp;)V METHOD a onCooldownUpdate (Lkq;)V METHOD a onCustomPayload (Lkr;)V - METHOD a onSoundPlayName (Lks;)V + METHOD a onPlaySoundId (Lks;)V METHOD a onDisconnect (Lkt;)V METHOD a onEntityStatus (Lku;)V METHOD a onExplosion (Lkv;)V @@ -40,13 +40,13 @@ CLASS jr net/minecraft/network/listener/ClientPlayPacketListener METHOD a onVehicleMove (Llg;)V METHOD a onSignEditorOpen (Llh;)V METHOD a onPlayerAbilities (Llj;)V - METHOD a onEventCombat (Llk;)V + METHOD a onCombatEvent (Llk;)V METHOD a onPlayerList (Lll;)V METHOD a onPlayerPositionLook (Lln;)V METHOD a onPlayerUseBed (Llo;)V METHOD a onUnlockRecipes (Llp;)V METHOD a onEntitiesDestroy (Llq;)V - METHOD a onEntityEffectRemove (Llr;)V + METHOD a onRemoveEntityEffect (Llr;)V METHOD a onResourcePackSend (Lls;)V METHOD a onPlayerRespawn (Llt;)V METHOD a onEntitySetHeadYaw (Llu;)V @@ -73,3 +73,6 @@ CLASS jr net/minecraft/network/listener/ClientPlayPacketListener METHOD a onAdvancements (Lmu;)V METHOD a onEntityAttributes (Lmv;)V METHOD a onEntityPotionEffect (Lmw;)V + METHOD a onSynchronizeRecipes (Lmx;)V + ARG 1 packet + METHOD a onSynchronizeTags (Lmy;)V diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index d9f45309f7..417d5f1f04 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -34,6 +34,7 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer FIELD al commandFunctionManager Lql; FIELD ap forceWorldUpgrade Z FIELD c lastTickLengths [J + FIELD e serverThread Ljava/lang/Thread; FIELD g LOGGER Lorg/apache/logging/log4j/Logger; FIELD h levelStorage Lcgx; FIELD i snooper Lafl; @@ -43,6 +44,7 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer FIELD m networkIO Luy; FIELD n metadata Lpi; FIELD o random Ljava/util/Random; + FIELD p dataFixer Lcom/mojang/datafixers/DataFixer; FIELD q serverIp Ljava/lang/String; FIELD r serverPort I FIELD s worlds Ljava/util/Map; @@ -95,6 +97,8 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer METHOD a stop (Z)V METHOD aA getServerStartTime ()J METHOD aB getMainThread ()Ljava/lang/Thread; + METHOD aC getDataFixer ()Lcom/mojang/datafixers/DataFixer; + METHOD aD getAdvancementManager ()Lqk; METHOD aE getCommandFunctionManager ()Lql; METHOD aG getDataManager ()Lwa; METHOD aK getCommandManager ()Lcb; diff --git a/mappings/net/minecraft/server/PlayerManager.mapping b/mappings/net/minecraft/server/PlayerManager.mapping index cdba386ebd..456c4d4e71 100644 --- a/mappings/net/minecraft/server/PlayerManager.mapping +++ b/mappings/net/minecraft/server/PlayerManager.mapping @@ -38,6 +38,7 @@ CLASS wm net/minecraft/server/PlayerManager FIELD m ops Lwn; FIELD n whitelist Lwt; FIELD o statisticsMap Ljava/util/Map; + FIELD p advancementManagerMap Ljava/util/Map; FIELD r whitelistEnabled Z FIELD s viewDistance I FIELD t gameMode Lban; @@ -93,4 +94,5 @@ CLASS wm net/minecraft/server/PlayerManager METHOD s getUserData ()Lhp; METHOD t disconnectAllPlayers ()V METHOD u getPlayerList ()Ljava/util/List; + METHOD v onDataPacksReloaded ()V METHOD w areCheatsAllowed ()Z diff --git a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping index 92a00c08ab..6ed9234d78 100644 --- a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping @@ -2,18 +2,24 @@ CLASS ul net/minecraft/server/network/ServerPlayerEntity FIELD a networkHandler Luz; FIELD b server Lnet/minecraft/server/MinecraftServer; FIELD cA enteredNetherPos Lckp; + FIELD cD containerSyncId I FIELD c interactionManager Lum; FIELD ca LOGGER_PLAYER Lorg/apache/logging/log4j/Logger; + FIELD cd advancementManager Lqi; FIELD cv seenCredits Z FIELD cw recipeBook Lxk; METHOD B getRecipeBook ()Lxk; METHOD C updatePotionVisibility ()V METHOD E updatePortalCooldown ()V + METHOD L getAdvancementManager ()Lqi; + METHOD M getEnteredNetherPosition ()Lckp; METHOD U_ update ()V METHOD V_ stopRiding ()V METHOD a openInventory (Laev;)V + ARG 1 inventory METHOD a swingHand (Lafb;)V METHOD a openContainer (Lafc;)V + ARG 1 provider METHOD a onDeath (Lafr;)V METHOD a damage (Lafr;F)Z ARG 1 source @@ -35,10 +41,12 @@ CLASS ul net/minecraft/server/network/ServerPlayerEntity METHOD a openBookEditor (Lavs;Lafb;)V METHOD a openVillagerGui (Lazu;)V METHOD a setGameMode (Lban;)V + METHOD a sendBlockEntityUpdate (Lbmn;)V METHOD a openCommandBlock (Lbmr;)V METHOD a openSignEditor (Lbnj;)V METHOD a onBlockCollision (Lboj;)V METHOD a changeDimension (Lbrc;)Lagi; + ARG 1 type METHOD a trySleep (Let;)Laqj$a; METHOD a readCustomDataFromTag (Lhp;)V ARG 1 tag @@ -53,6 +61,7 @@ CLASS ul net/minecraft/server/network/ServerPlayerEntity METHOD b writeCustomDataToTag (Lhp;)V ARG 1 tag METHOD d addExperience (I)V + METHOD dR incrementContainerSyncId ()V METHOD f attack (Lagi;)V METHOD g createCooldownManager ()Lavo; METHOD m closeContainer ()V diff --git a/mappings/xl.mapping b/mappings/xl.mapping new file mode 100644 index 0000000000..9c84219310 --- /dev/null +++ b/mappings/xl.mapping @@ -0,0 +1,4 @@ +CLASS xl + FIELD b LOGGER Lorg/apache/logging/log4j/Logger; + FIELD c server Lnet/minecraft/server/MinecraftServer; + FIELD d file Ljava/io/File;