From b83a1075435e429d3d9448a71698bffa9994d4d8 Mon Sep 17 00:00:00 2001 From: enbrain <69905075+enbrain@users.noreply.github.com> Date: Sat, 12 Sep 2020 02:43:03 +0900 Subject: [PATCH] Add game mode mappings (#1742) --- .../client/network/ClientPlayerInteractionManager.mapping | 1 + .../network/packet/s2c/play/PlayerRespawnS2CPacket.mapping | 5 +++++ .../server/network/ServerPlayerInteractionManager.mapping | 7 +++++++ 3 files changed, 13 insertions(+) diff --git a/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping b/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping index 0595063b58..f01d2c4e7c 100644 --- a/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping @@ -105,3 +105,4 @@ CLASS net/minecraft/class_636 net/minecraft/client/network/ClientPlayerInteracti ARG 1 world ARG 2 statHandler ARG 3 recipeBook + METHOD method_30108 setPreviousGameMode (Lnet/minecraft/class_1934;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket.mapping index 2813e10d8e..7b30fbb825 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket.mapping @@ -5,9 +5,14 @@ CLASS net/minecraft/class_2724 net/minecraft/network/packet/s2c/play/PlayerRespa FIELD field_24451 keepPlayerAttributes Z FIELD field_24620 debugWorld Z FIELD field_24621 flatWorld Z + FIELD field_25714 previousGameMode Lnet/minecraft/class_1934; + METHOD (Lnet/minecraft/class_2874;Lnet/minecraft/class_5321;JLnet/minecraft/class_1934;Lnet/minecraft/class_1934;ZZZ)V + ARG 5 gameMode + ARG 6 previousGameMode METHOD method_11779 getDimension ()Lnet/minecraft/class_5321; METHOD method_11780 getGameMode ()Lnet/minecraft/class_1934; METHOD method_22425 getSha256Seed ()J METHOD method_27904 shouldKeepPlayerAttributes ()Z METHOD method_28120 isDebugWorld ()Z METHOD method_28121 isFlatWorld ()Z + METHOD method_30117 getPreviousGameMode ()Lnet/minecraft/class_1934; diff --git a/mappings/net/minecraft/server/network/ServerPlayerInteractionManager.mapping b/mappings/net/minecraft/server/network/ServerPlayerInteractionManager.mapping index 7c22948bf3..76039ce05c 100644 --- a/mappings/net/minecraft/server/network/ServerPlayerInteractionManager.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayerInteractionManager.mapping @@ -11,6 +11,7 @@ CLASS net/minecraft/class_3225 net/minecraft/server/network/ServerPlayerInteract FIELD field_20329 failedMiningPos Lnet/minecraft/class_2338; FIELD field_20330 failedStartMiningTime I FIELD field_20331 blockBreakingProgress I + FIELD field_25715 previousGameMode Lnet/minecraft/class_1934; METHOD (Lnet/minecraft/class_3218;)V ARG 1 world METHOD method_14256 interactItem (Lnet/minecraft/class_3222;Lnet/minecraft/class_1937;Lnet/minecraft/class_1799;Lnet/minecraft/class_1268;)Lnet/minecraft/class_1269; @@ -22,7 +23,10 @@ CLASS net/minecraft/class_3225 net/minecraft/server/network/ServerPlayerInteract METHOD method_14259 setWorld (Lnet/minecraft/class_3218;)V ARG 1 world METHOD method_14260 setGameModeIfNotPresent (Lnet/minecraft/class_1934;)V + ARG 1 gameMode METHOD method_14261 setGameMode (Lnet/minecraft/class_1934;Lnet/minecraft/class_1934;)V + ARG 1 gameMode + ARG 2 previousGameMode METHOD method_14262 interactBlock (Lnet/minecraft/class_3222;Lnet/minecraft/class_1937;Lnet/minecraft/class_1799;Lnet/minecraft/class_1268;Lnet/minecraft/class_3965;)Lnet/minecraft/class_1269; ARG 1 player ARG 2 world @@ -46,3 +50,6 @@ CLASS net/minecraft/class_3225 net/minecraft/server/network/ServerPlayerInteract ARG 1 pos ARG 2 action ARG 3 reason + METHOD method_30118 setGameMode (Lnet/minecraft/class_1934;)V + ARG 1 gameMode + METHOD method_30119 getPreviousGameMode ()Lnet/minecraft/class_1934;