Clean up screen packets (#1819)

* ConfirmGuiActionS2C -> ConfirmScreenActionS2C

* GuiCloseC2S -> CloseHandledScreenC2S

* Clarify screen handler closing methods in ServerPlayerEntity

* Fix package

* ConfirmGuiActionC2S -> ConfirmScreenActionC2S

* ClickWindowC2S -> ClickSlotC2S
This commit is contained in:
Juuxel 2020-11-03 20:16:53 +02:00 committed by GitHub
parent 0a9f3ddaba
commit 45057ca885
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 22 additions and 18 deletions

View File

@ -93,7 +93,7 @@ CLASS net/minecraft/class_2602 net/minecraft/network/listener/ClientPlayPacketLi
ARG 1 packet
METHOD method_11122 onHealthUpdate (Lnet/minecraft/class_2749;)V
ARG 1 packet
METHOD method_11123 onGuiActionConfirm (Lnet/minecraft/class_2644;)V
METHOD method_11123 onConfirmScreenAction (Lnet/minecraft/class_2644;)V
ARG 1 packet
METHOD method_11124 onExplosion (Lnet/minecraft/class_2664;)V
ARG 1 packet

View File

@ -18,7 +18,7 @@ CLASS net/minecraft/class_2792 net/minecraft/network/listener/ServerPlayPacketLi
ARG 1 packet
METHOD method_12053 onBookUpdate (Lnet/minecraft/class_2820;)V
ARG 1 packet
METHOD method_12054 onGuiClose (Lnet/minecraft/class_2815;)V
METHOD method_12054 onCloseHandledScreen (Lnet/minecraft/class_2815;)V
ARG 1 packet
METHOD method_12055 onButtonClick (Lnet/minecraft/class_2811;)V
ARG 1 packet
@ -62,13 +62,13 @@ CLASS net/minecraft/class_2792 net/minecraft/network/listener/ServerPlayPacketLi
ARG 1 packet
METHOD method_12075 onCustomPayload (Lnet/minecraft/class_2817;)V
ARG 1 packet
METHOD method_12076 onClickWindow (Lnet/minecraft/class_2813;)V
METHOD method_12076 onClickSlot (Lnet/minecraft/class_2813;)V
ARG 1 packet
METHOD method_12077 onUpdateCommandBlock (Lnet/minecraft/class_2870;)V
ARG 1 packet
METHOD method_12078 onVehicleMove (Lnet/minecraft/class_2833;)V
ARG 1 packet
METHOD method_12079 onConfirmTransaction (Lnet/minecraft/class_2809;)V
METHOD method_12079 onConfirmScreenAction (Lnet/minecraft/class_2809;)V
ARG 1 packet
METHOD method_12080 onMerchantTradeSelect (Lnet/minecraft/class_2863;)V
ARG 1 packet

View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_2813 net/minecraft/network/packet/c2s/play/ClickWindowC2SPacket
CLASS net/minecraft/class_2813 net/minecraft/network/packet/c2s/play/ClickSlotC2SPacket
FIELD field_12815 actionType Lnet/minecraft/class_1713;
FIELD field_12816 stack Lnet/minecraft/class_1799;
FIELD field_12817 clickData I

View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_2815 net/minecraft/network/packet/c2s/play/GuiCloseC2SPacket
FIELD field_12827 id I
CLASS net/minecraft/class_2815 net/minecraft/network/packet/c2s/play/CloseHandledScreenC2SPacket
FIELD field_12827 syncId I
METHOD <init> (I)V
ARG 1 id
ARG 1 syncId

View File

@ -1,10 +1,10 @@
CLASS net/minecraft/class_2809 net/minecraft/network/packet/c2s/play/ConfirmGuiActionC2SPacket
CLASS net/minecraft/class_2809 net/minecraft/network/packet/c2s/play/ConfirmScreenActionC2SPacket
FIELD field_12809 actionId S
FIELD field_12810 accepted Z
FIELD field_12811 windowId I
FIELD field_12811 syncId I
METHOD <init> (ISZ)V
ARG 1 windowId
ARG 1 syncId
ARG 2 actionId
ARG 3 accepted
METHOD method_12176 getSyncId ()S
METHOD method_12178 getWindowId ()I
METHOD method_12176 getActionId ()S
METHOD method_12178 getSyncId ()I

View File

@ -1,11 +1,11 @@
CLASS net/minecraft/class_2644 net/minecraft/network/packet/s2c/play/ConfirmGuiActionS2CPacket
CLASS net/minecraft/class_2644 net/minecraft/network/packet/s2c/play/ConfirmScreenActionS2CPacket
FIELD field_12134 actionId S
FIELD field_12135 accepted Z
FIELD field_12136 id I
FIELD field_12136 syncId I
METHOD <init> (ISZ)V
ARG 1 id
ARG 1 syncId
ARG 2 actionId
ARG 3 accepted
METHOD method_11423 getActionId ()S
METHOD method_11425 getId ()I
METHOD method_11425 getSyncId ()I
METHOD method_11426 wasAccepted ()Z

View File

@ -91,7 +91,9 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity
METHOD method_14245 moveToSpawn (Lnet/minecraft/class_3218;)V
ARG 1 world
METHOD method_14246 sendUnloadChunkPacket (Lnet/minecraft/class_1923;)V
METHOD method_14247 closeCurrentScreen ()V
METHOD method_14247 closeScreenHandler ()V
COMMENT Runs closing tasks for the current screen handler and
COMMENT sets it to the {@code playerScreenHandler}.
METHOD method_14248 getStatHandler ()Lnet/minecraft/class_3442;
METHOD method_14249 onStoppedTracking (Lnet/minecraft/class_1297;)V
ARG 1 entity
@ -137,3 +139,5 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity
ARG 1 world
ARG 2 centerPos
METHOD method_30631 getSpawnAngle ()F
METHOD method_7346 closeHandledScreen ()V
COMMENT Closes the current handled screen and sends a screen closing packet to the client.