diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 1412e1a231..3c880f452b 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -47,7 +47,7 @@ CLASS cnv net/minecraft/client/MinecraftClient FIELD ax blockColorMap Lcoe; FIELD ay itemColorMap Lcoh; FIELD az framebuffer Lcmd; - FIELD e playerCapabilities Lczj; + FIELD e interactionManager Lczj; FIELD g window Lcms; FIELD h world Lczk; FIELD i renderer Ldcg; diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping index 952cbaaa49..735deb00c5 100644 --- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping @@ -1,6 +1,7 @@ CLASS czh net/minecraft/client/network/ClientPlayNetworkHandler FIELD a LOGGER Lorg/apache/logging/log4j/Logger; FIELD b connection Lio; + FIELD c profile Lcom/mojang/authlib/GameProfile; FIELD e client Lcnv; FIELD f world Lczk; FIELD i advancementHandler Lcze; diff --git a/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping b/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping index 69b8950fb6..f0a3b515d5 100644 --- a/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping @@ -11,16 +11,21 @@ CLASS czj net/minecraft/client/network/ClientPlayerInteractionManager METHOD a hasStatusBars ()Z METHOD a copyAbilities (Laqj;)V METHOD a attackEntity (Laqj;Lagi;)V - METHOD a useEntity (Laqj;Lagi;Lafb;)Lafd; - METHOD a useEntityLocation (Laqj;Lagi;Lckm;Lafb;)Lafd; - METHOD a useItem (Laqj;Lbaq;Lafb;)Lafd; + METHOD a interactEntity (Laqj;Lagi;Lafb;)Lafd; + METHOD a interactEntityAtLocation (Laqj;Lagi;Lckm;Lafb;)Lafd; + METHOD a interactItem (Laqj;Lbaq;Lafb;)Lafd; + ARG 1 player + ARG 2 world + ARG 3 hand METHOD a setGameMode (Lban;)V - METHOD a useBlock (Ldbn;Lczk;Let;Ley;Lckp;Lafb;)Lafd; + METHOD a createPlayer (Lbaq;Lxq;Lcno;)Ldbn; + METHOD a interactBlock (Ldbn;Lczk;Let;Ley;Lckp;Lafb;)Lafd; ARG 1 player ARG 2 world ARG 3 pos ARG 4 facing ARG 5 hitLocation + ARG 6 hand METHOD a breakBlock (Let;)Z METHOD a attackBlock (Let;Ley;)Z ARG 1 pos diff --git a/mappings/net/minecraft/entity/vehicle/HopperMinecartEntity.mapping b/mappings/net/minecraft/entity/vehicle/HopperMinecartEntity.mapping index 6414a72f75..c0f4e63694 100644 --- a/mappings/net/minecraft/entity/vehicle/HopperMinecartEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/HopperMinecartEntity.mapping @@ -4,7 +4,7 @@ CLASS aru net/minecraft/entity/vehicle/HopperMinecartEntity FIELD f currentBlockPos Let; METHOD B getDefaultBlockOffset ()I METHOD D isEnabled ()Z - METHOD F getHopperWorld ()Lbaq; + METHOD F getWorld ()Lbaq; METHOD G getHopperX ()D METHOD H getHopperY ()D METHOD I getHopperZ ()D diff --git a/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping b/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping index 125ad566fa..d8f4bfd18e 100644 --- a/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping @@ -3,4 +3,9 @@ CLASS mz net/minecraft/network/listener/ServerPlayPacketListener METHOD a onGuiClose (Lnj;)V METHOD a onCustomPayload (Lnk;)V METHOD a onBookUpdate (Lnl;)V + METHOD a onPlayerInteractEntity (Lnn;)V METHOD a onPlayerAction (Lnv;)V + METHOD a onPlayerInteractBlock (Lon;)V + ARG 1 packet + METHOD a onPlayerInteractItem (Loo;)V + ARG 1 packet diff --git a/mappings/net/minecraft/server/network/DemoServerPlayerInteractionManager.mapping b/mappings/net/minecraft/server/network/DemoServerPlayerInteractionManager.mapping new file mode 100644 index 0000000000..a509022851 --- /dev/null +++ b/mappings/net/minecraft/server/network/DemoServerPlayerInteractionManager.mapping @@ -0,0 +1,17 @@ +CLASS ub net/minecraft/server/network/DemoServerPlayerInteractionManager + METHOD (Lbaq;)V + ARG 1 world + METHOD a update ()V + METHOD a interactItem (Laqj;Lbaq;Lavs;Lafb;)Lafd; + METHOD a interactBlock (Laqj;Lbaq;Lavs;Lafb;Let;Ley;FFF)Lafd; + ARG 1 player + ARG 2 world + ARG 3 stack + ARG 4 hand + ARG 5 pos + ARG 6 facing + ARG 7 hitX + ARG 8 hitY + ARG 9 hitZ + METHOD b tryBreakBlock (Let;)Z + ARG 1 pos diff --git a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping index 73865af6f5..f4f263fdfb 100644 --- a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping @@ -11,6 +11,19 @@ CLASS uz net/minecraft/server/network/ServerPlayNetworkHandler METHOD a onGuiClose (Lnj;)V METHOD a onCustomPayload (Lnk;)V METHOD a onBookUpdate (Lnl;)V + METHOD a onPlayerInteractEntity (Lnn;)V METHOD a onPlayerAction (Lnv;)V + METHOD a onPlayerInteractBlock (Lon;)V + ARG 1 packet + ARG 2 world + ARG 3 hand + ARG 4 stack + ARG 5 pos + ARG 6 facing + METHOD a onPlayerInteractItem (Loo;)V + ARG 1 packet + ARG 2 world + ARG 3 hand + ARG 4 stack METHOD ab_ tick ()V METHOD c executeCommand (Ljava/lang/String;)V diff --git a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping index 4447885370..fe76551c5f 100644 --- a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping @@ -2,6 +2,7 @@ CLASS ul net/minecraft/server/network/ServerPlayerEntity FIELD a networkHandler Luz; FIELD b server Lnet/minecraft/server/MinecraftServer; FIELD cA enteredNetherPos Lckp; + FIELD c interactionManager Lum; FIELD ca LOGGER_PLAYER Lorg/apache/logging/log4j/Logger; FIELD cv seenCredits Z FIELD cw recipeBook Lxk; diff --git a/mappings/net/minecraft/server/network/ServerPlayerInteractionManager.mapping b/mappings/net/minecraft/server/network/ServerPlayerInteractionManager.mapping index a07d96dcd3..7ba7df3272 100644 --- a/mappings/net/minecraft/server/network/ServerPlayerInteractionManager.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayerInteractionManager.mapping @@ -2,10 +2,29 @@ CLASS um net/minecraft/server/network/ServerPlayerInteractionManager FIELD a world Lbaq; FIELD b player Lul; FIELD c gameMode Lban; + METHOD (Lbaq;)V + ARG 1 world METHOD a update ()V + METHOD a interactItem (Laqj;Lbaq;Lavs;Lafb;)Lafd; + METHOD a interactBlock (Laqj;Lbaq;Lavs;Lafb;Let;Ley;FFF)Lafd; + ARG 1 player + ARG 2 world + ARG 3 stack + ARG 4 hand + ARG 5 pos + ARG 6 facing + ARG 7 hitX + ARG 8 hitY + ARG 9 hitZ + ARG 10 state METHOD a setGameMode (Lban;)V METHOD a setWorld (Luj;)V + ARG 1 world METHOD b getGameMode ()Lban; METHOD b setGameModeIfNotPresent (Lban;)V + METHOD b tryBreakBlock (Let;)Z + ARG 1 pos METHOD c isSurvivalLike ()Z + METHOD c destroyBlock (Let;)Z + ARG 1 pos METHOD d isCreative ()Z diff --git a/mappings/net/minecraft/server/network/packet/PlayerInteractBlockServerPacket.mapping b/mappings/net/minecraft/server/network/packet/PlayerInteractBlockServerPacket.mapping new file mode 100644 index 0000000000..cfe931089f --- /dev/null +++ b/mappings/net/minecraft/server/network/packet/PlayerInteractBlockServerPacket.mapping @@ -0,0 +1,17 @@ +CLASS on net/minecraft/server/network/packet/PlayerInteractBlockServerPacket + FIELD a pos Let; + FIELD b facing Ley; + FIELD c hand Lafb; + FIELD d hitX F + FIELD e hitY F + FIELD f hitZ F + METHOD a read (Liq;)V + METHOD a apply (Lit;)V + METHOD a apply (Lmz;)V + METHOD b getPos ()Let; + METHOD b write (Liq;)V + METHOD c getFacing ()Ley; + METHOD d getHand ()Lafb; + METHOD e getHitX ()F + METHOD f getHitY ()F + METHOD g getHitZ ()F diff --git a/mappings/net/minecraft/server/network/packet/PlayerInteractEntityServerPacket.mapping b/mappings/net/minecraft/server/network/packet/PlayerInteractEntityServerPacket.mapping new file mode 100644 index 0000000000..9387b054b3 --- /dev/null +++ b/mappings/net/minecraft/server/network/packet/PlayerInteractEntityServerPacket.mapping @@ -0,0 +1,15 @@ +CLASS nn net/minecraft/server/network/packet/PlayerInteractEntityServerPacket + CLASS nn$a InteractionType + FIELD a entityId I + FIELD b type Lnn$a; + FIELD c hitPos Lckp; + FIELD d hand Lafb; + METHOD a getEntity (Lbaq;)Lagi; + ARG 1 world + METHOD a read (Liq;)V + METHOD a apply (Lit;)V + METHOD a apply (Lmz;)V + METHOD b getType ()Lnn$a; + METHOD b write (Liq;)V + METHOD c getHand ()Lafb; + METHOD d getHitPosition ()Lckp; diff --git a/mappings/net/minecraft/server/network/packet/PlayerInteractItemServerPacket.mapping b/mappings/net/minecraft/server/network/packet/PlayerInteractItemServerPacket.mapping new file mode 100644 index 0000000000..cd550ef2a0 --- /dev/null +++ b/mappings/net/minecraft/server/network/packet/PlayerInteractItemServerPacket.mapping @@ -0,0 +1,7 @@ +CLASS oo net/minecraft/server/network/packet/PlayerInteractItemServerPacket + FIELD a hand Lafb; + METHOD a read (Liq;)V + METHOD a apply (Lit;)V + METHOD a apply (Lmz;)V + METHOD b getHand ()Lafb; + METHOD b write (Liq;)V diff --git a/mappings/net/minecraft/sortme/Hopper.mapping b/mappings/net/minecraft/sortme/Hopper.mapping index 83e0246a33..c01ca5ca78 100644 --- a/mappings/net/minecraft/sortme/Hopper.mapping +++ b/mappings/net/minecraft/sortme/Hopper.mapping @@ -1,5 +1,9 @@ CLASS bna net/minecraft/sortme/Hopper - METHOD F getHopperWorld ()Lbaq; + FIELD a SHAPE_INSIDE Lclj; + FIELD b SHAPE_ABOVE Lclj; + FIELD c SHAPE_INPUT Lclj; + METHOD F getWorld ()Lbaq; METHOD G getHopperX ()D METHOD H getHopperY ()D METHOD I getHopperZ ()D + METHOD i getInputAreaShape ()Lclj; diff --git a/mappings/nn.mapping b/mappings/nn.mapping deleted file mode 100644 index 03eedc655a..0000000000 --- a/mappings/nn.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS nn - METHOD a read (Liq;)V - METHOD a apply (Lit;)V - METHOD a apply (Lmz;)V - METHOD b write (Liq;)V - METHOD c getHand ()Lafb; diff --git a/mappings/on.mapping b/mappings/on.mapping deleted file mode 100644 index 3dfe83c860..0000000000 --- a/mappings/on.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS on - METHOD a read (Liq;)V - METHOD a apply (Lit;)V - METHOD a apply (Lmz;)V - METHOD b write (Liq;)V diff --git a/mappings/oo.mapping b/mappings/oo.mapping deleted file mode 100644 index ae8e64e437..0000000000 --- a/mappings/oo.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS oo - METHOD a read (Liq;)V - METHOD a apply (Lit;)V - METHOD a apply (Lmz;)V - METHOD b write (Liq;)V diff --git a/mappings/ub.mapping b/mappings/ub.mapping deleted file mode 100644 index 685f3d5631..0000000000 --- a/mappings/ub.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS ub - METHOD a update ()V