From 476b5d351e42fb67213785ac85189ee06ca1d1bd Mon Sep 17 00:00:00 2001 From: i509VCB Date: Thu, 18 Jun 2020 12:16:49 -0700 Subject: [PATCH] ServerCommandOutput -> RconCommandOutput and a bunch of assorted parameter names (#1475) --- mappings/net/minecraft/entity/Entity.mapping | 2 ++ mappings/net/minecraft/server/PlayerManager.mapping | 2 ++ .../server/dedicated/DedicatedPlayerManager.mapping | 4 ++++ .../server/dedicated/DedicatedServerWatchdog.mapping | 2 ++ .../server/dedicated/gui/DedicatedServerGui.mapping | 1 + .../server/dedicated/gui/PlayerListGui.mapping | 2 ++ .../server/dedicated/gui/PlayerStatsGui.mapping | 2 ++ .../integrated/IntegratedPlayerManager.mapping | 4 ++++ .../server/network/EntityTrackerEntry.mapping | 1 + .../server/network/ServerPlayNetworkHandler.mapping | 12 ++++++++++++ .../server/network/ServerPlayerEntity.mapping | 2 ++ .../network/ServerPlayerInteractionManager.mapping | 7 +++++++ .../RconCommandOutput.mapping} | 3 ++- .../net/minecraft/server/world/ServerWorld.mapping | 5 +++++ mappings/net/minecraft/world/World.mapping | 1 + 15 files changed, 49 insertions(+), 1 deletion(-) rename mappings/net/minecraft/server/{dedicated/ServerCommandOutput.mapping => rcon/RconCommandOutput.mapping} (72%) diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 54e343492c..a915dffc5a 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -429,6 +429,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 2 value METHOD method_5730 setOnFireFromLava ()V METHOD method_5731 changeDimension (Lnet/minecraft/class_3218;)Lnet/minecraft/class_1297; + ARG 1 destination METHOD method_5732 isAttackable ()Z METHOD method_5733 shouldRenderName ()Z METHOD method_5734 playSwimSound (F)V @@ -659,6 +660,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 cursorDeltaX ARG 3 cursorDeltaY METHOD method_5873 startRiding (Lnet/minecraft/class_1297;Z)Z + ARG 1 entity ARG 2 force METHOD method_5874 onKilledOther (Lnet/minecraft/class_1309;)V ARG 1 other diff --git a/mappings/net/minecraft/server/PlayerManager.mapping b/mappings/net/minecraft/server/PlayerManager.mapping index 0f7f438294..1596b3b14e 100644 --- a/mappings/net/minecraft/server/PlayerManager.mapping +++ b/mappings/net/minecraft/server/PlayerManager.mapping @@ -66,6 +66,8 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager METHOD method_14584 getOpNames ()[Ljava/lang/String; METHOD method_14585 getIpBanList ()Lnet/minecraft/class_3317; METHOD method_14586 checkCanJoin (Ljava/net/SocketAddress;Lcom/mojang/authlib/GameProfile;)Lnet/minecraft/class_2561; + ARG 1 address + ARG 2 profile METHOD method_14587 isWhitelisted (Lcom/mojang/authlib/GameProfile;)Z ARG 1 profile METHOD method_14588 sendScoreboard (Lnet/minecraft/class_2995;Lnet/minecraft/class_3222;)V diff --git a/mappings/net/minecraft/server/dedicated/DedicatedPlayerManager.mapping b/mappings/net/minecraft/server/dedicated/DedicatedPlayerManager.mapping index 246e222fc2..7d7862965c 100644 --- a/mappings/net/minecraft/server/dedicated/DedicatedPlayerManager.mapping +++ b/mappings/net/minecraft/server/dedicated/DedicatedPlayerManager.mapping @@ -1,5 +1,9 @@ CLASS net/minecraft/class_3174 net/minecraft/server/dedicated/DedicatedPlayerManager FIELD field_13804 LOGGER Lorg/apache/logging/log4j/Logger; + METHOD (Lnet/minecraft/class_3176;Lnet/minecraft/class_5318$class_5319;Lnet/minecraft/class_29;)V + ARG 1 server + ARG 2 tracker + ARG 3 saveHandler METHOD method_13930 saveUserBanList ()V METHOD method_13931 loadIpBanList ()V METHOD method_13932 saveIpBanList ()V diff --git a/mappings/net/minecraft/server/dedicated/DedicatedServerWatchdog.mapping b/mappings/net/minecraft/server/dedicated/DedicatedServerWatchdog.mapping index 1b87155114..dd623e6184 100644 --- a/mappings/net/minecraft/server/dedicated/DedicatedServerWatchdog.mapping +++ b/mappings/net/minecraft/server/dedicated/DedicatedServerWatchdog.mapping @@ -2,4 +2,6 @@ CLASS net/minecraft/class_3178 net/minecraft/server/dedicated/DedicatedServerWat FIELD field_13823 server Lnet/minecraft/class_3176; FIELD field_13824 maxTickTime J FIELD field_13825 LOGGER Lorg/apache/logging/log4j/Logger; + METHOD (Lnet/minecraft/class_3176;)V + ARG 1 server METHOD method_13954 shutdown ()V diff --git a/mappings/net/minecraft/server/dedicated/gui/DedicatedServerGui.mapping b/mappings/net/minecraft/server/dedicated/gui/DedicatedServerGui.mapping index fb06f1ae53..67d1a5d71e 100644 --- a/mappings/net/minecraft/server/dedicated/gui/DedicatedServerGui.mapping +++ b/mappings/net/minecraft/server/dedicated/gui/DedicatedServerGui.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/class_3182 net/minecraft/server/dedicated/gui/DedicatedServe METHOD (Lnet/minecraft/class_3176;)V ARG 1 server METHOD method_13969 create (Lnet/minecraft/class_3176;)Lnet/minecraft/class_3182; + ARG 0 server METHOD method_13970 appendToConsole (Ljavax/swing/JTextArea;Ljavax/swing/JScrollPane;Ljava/lang/String;)V ARG 1 textArea ARG 2 scrollPane diff --git a/mappings/net/minecraft/server/dedicated/gui/PlayerListGui.mapping b/mappings/net/minecraft/server/dedicated/gui/PlayerListGui.mapping index b03fc01e1f..ab22086ca2 100644 --- a/mappings/net/minecraft/server/dedicated/gui/PlayerListGui.mapping +++ b/mappings/net/minecraft/server/dedicated/gui/PlayerListGui.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_3184 net/minecraft/server/dedicated/gui/PlayerListGui FIELD field_13843 tick I FIELD field_13844 server Lnet/minecraft/server/MinecraftServer; + METHOD (Lnet/minecraft/server/MinecraftServer;)V + ARG 1 server METHOD method_18700 tick ()V diff --git a/mappings/net/minecraft/server/dedicated/gui/PlayerStatsGui.mapping b/mappings/net/minecraft/server/dedicated/gui/PlayerStatsGui.mapping index 872ceb810b..a76c943066 100644 --- a/mappings/net/minecraft/server/dedicated/gui/PlayerStatsGui.mapping +++ b/mappings/net/minecraft/server/dedicated/gui/PlayerStatsGui.mapping @@ -5,6 +5,8 @@ CLASS net/minecraft/class_3186 net/minecraft/server/dedicated/gui/PlayerStatsGui FIELD field_13848 memoryusePctPos I FIELD field_13849 server Lnet/minecraft/server/MinecraftServer; FIELD field_16858 timer Ljavax/swing/Timer; + METHOD (Lnet/minecraft/server/MinecraftServer;)V + ARG 1 server METHOD method_13980 average ([J)D METHOD method_13982 update ()V METHOD method_16751 stop ()V diff --git a/mappings/net/minecraft/server/integrated/IntegratedPlayerManager.mapping b/mappings/net/minecraft/server/integrated/IntegratedPlayerManager.mapping index d975a836ee..5569df3bc1 100644 --- a/mappings/net/minecraft/server/integrated/IntegratedPlayerManager.mapping +++ b/mappings/net/minecraft/server/integrated/IntegratedPlayerManager.mapping @@ -1,2 +1,6 @@ CLASS net/minecraft/class_1130 net/minecraft/server/integrated/IntegratedPlayerManager FIELD field_5514 userData Lnet/minecraft/class_2487; + METHOD (Lnet/minecraft/class_1132;Lnet/minecraft/class_5318$class_5319;Lnet/minecraft/class_29;)V + ARG 1 server + ARG 2 tracker + ARG 3 saveHandler diff --git a/mappings/net/minecraft/server/network/EntityTrackerEntry.mapping b/mappings/net/minecraft/server/network/EntityTrackerEntry.mapping index debffe9289..dca3cd8cf7 100644 --- a/mappings/net/minecraft/server/network/EntityTrackerEntry.mapping +++ b/mappings/net/minecraft/server/network/EntityTrackerEntry.mapping @@ -32,6 +32,7 @@ CLASS net/minecraft/class_3231 net/minecraft/server/network/EntityTrackerEntry ARG 1 sender METHOD method_18758 sendSyncPacket (Lnet/minecraft/class_2596;)V COMMENT Sends a packet for synchronization with watcher and tracked player (if applicable) + ARG 1 packet METHOD method_18759 getLastPos ()Lnet/minecraft/class_243; COMMENT Decodes lastX/Y/Z into a position vector METHOD method_18760 startTracking (Lnet/minecraft/class_3222;)V diff --git a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping index dae763ce81..949d8cfb4a 100644 --- a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping @@ -43,6 +43,7 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan ARG 7 yaw ARG 8 pitch METHOD method_14362 validatePlayerMove (Lnet/minecraft/class_2828;)Z + ARG 0 packet METHOD method_14363 requestTeleport (DDDFF)V ARG 1 x ARG 3 y @@ -50,12 +51,23 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan ARG 7 yaw ARG 8 pitch METHOD method_14364 sendPacket (Lnet/minecraft/class_2596;)V + ARG 1 packet METHOD method_14367 disconnect (Lnet/minecraft/class_2561;)V ARG 1 reason METHOD method_14369 sendPacket (Lnet/minecraft/class_2596;Lio/netty/util/concurrent/GenericFutureListener;)V + ARG 1 packet + ARG 2 listener METHOD method_14370 executeCommand (Ljava/lang/String;)V + ARG 1 input METHOD method_14371 validateVehicleMove (Lnet/minecraft/class_2833;)Z + ARG 0 packet METHOD method_14372 syncWithPlayerPosition ()V METHOD method_18784 tick ()V METHOD method_19507 isHost ()Z METHOD method_20630 isPlayerNotCollidingWithBlocks (Lnet/minecraft/class_4538;Lnet/minecraft/class_238;)Z + METHOD method_27913 canPlace (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;)Z + COMMENT Checks if a player can place a block or fluid from a bucket. + COMMENT + COMMENT

For this to return true, the player must not be actively cooling down. + ARG 0 player + ARG 1 stack diff --git a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping index be0c10cf7d..84d54c6cd4 100644 --- a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping @@ -47,6 +47,7 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity METHOD method_14204 openHandledScreen (Lnet/minecraft/class_1703;)V ARG 1 handler METHOD method_14205 sendInitialChunkPackets (Lnet/minecraft/class_1923;Lnet/minecraft/class_2596;Lnet/minecraft/class_2596;)V + METHOD method_14206 getPlayerListName ()Lnet/minecraft/class_2561; METHOD method_14207 handleFall (DZ)V ARG 1 heightDifference ARG 3 onGround @@ -58,6 +59,7 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity ARG 1 criterion ARG 2 score METHOD method_14213 setClientSettings (Lnet/minecraft/class_2803;)V + ARG 1 packet METHOD method_14216 sendBlockEntityUpdate (Lnet/minecraft/class_2586;)V ARG 1 blockEntity METHOD method_14217 markHealthDirty ()V diff --git a/mappings/net/minecraft/server/network/ServerPlayerInteractionManager.mapping b/mappings/net/minecraft/server/network/ServerPlayerInteractionManager.mapping index 93d9c5ab84..7c22948bf3 100644 --- a/mappings/net/minecraft/server/network/ServerPlayerInteractionManager.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayerInteractionManager.mapping @@ -14,6 +14,7 @@ CLASS net/minecraft/class_3225 net/minecraft/server/network/ServerPlayerInteract 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; + ARG 1 player ARG 2 world ARG 3 stack ARG 4 hand @@ -23,6 +24,7 @@ CLASS net/minecraft/class_3225 net/minecraft/server/network/ServerPlayerInteract METHOD method_14260 setGameModeIfNotPresent (Lnet/minecraft/class_1934;)V METHOD method_14261 setGameMode (Lnet/minecraft/class_1934;Lnet/minecraft/class_1934;)V 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 ARG 3 stack ARG 4 hand @@ -34,8 +36,13 @@ CLASS net/minecraft/class_3225 net/minecraft/server/network/ServerPlayerInteract ARG 4 worldHeight METHOD method_14264 update ()V METHOD method_14266 tryBreakBlock (Lnet/minecraft/class_2338;)Z + ARG 1 pos METHOD method_14267 isSurvivalLike ()Z METHOD method_14268 isCreative ()Z METHOD method_21716 continueMining (Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;I)F + ARG 1 state + ARG 2 pos METHOD method_21717 finishMining (Lnet/minecraft/class_2338;Lnet/minecraft/class_2846$class_2847;Ljava/lang/String;)V + ARG 1 pos + ARG 2 action ARG 3 reason diff --git a/mappings/net/minecraft/server/dedicated/ServerCommandOutput.mapping b/mappings/net/minecraft/server/rcon/RconCommandOutput.mapping similarity index 72% rename from mappings/net/minecraft/server/dedicated/ServerCommandOutput.mapping rename to mappings/net/minecraft/server/rcon/RconCommandOutput.mapping index b45a865b19..344d1dd980 100644 --- a/mappings/net/minecraft/server/dedicated/ServerCommandOutput.mapping +++ b/mappings/net/minecraft/server/rcon/RconCommandOutput.mapping @@ -1,6 +1,7 @@ -CLASS net/minecraft/class_3350 net/minecraft/server/dedicated/ServerCommandOutput +CLASS net/minecraft/class_3350 net/minecraft/server/rcon/RconCommandOutput FIELD field_14404 buffer Ljava/lang/StringBuffer; FIELD field_14405 server Lnet/minecraft/server/MinecraftServer; + FIELD field_25146 RCON_NAME Lnet/minecraft/class_2585; METHOD (Lnet/minecraft/server/MinecraftServer;)V ARG 1 server METHOD method_14700 createReconCommandSource ()Lnet/minecraft/class_2168; diff --git a/mappings/net/minecraft/server/world/ServerWorld.mapping b/mappings/net/minecraft/server/world/ServerWorld.mapping index 62245bc604..5cddc42fa5 100644 --- a/mappings/net/minecraft/server/world/ServerWorld.mapping +++ b/mappings/net/minecraft/server/world/ServerWorld.mapping @@ -19,6 +19,7 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld FIELD field_23787 structureAccessor Lnet/minecraft/class_5138; FIELD field_24624 serverChunkManager Lnet/minecraft/class_3215; FIELD field_25142 enderDragonFight Lnet/minecraft/class_2881; + FIELD field_25144 END_SPAWN_POS Lnet/minecraft/class_2338; METHOD (Lnet/minecraft/server/MinecraftServer;Ljava/util/concurrent/Executor;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_5268;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;Lnet/minecraft/class_2874;Lnet/minecraft/class_3949;Lnet/minecraft/class_2794;ZJLjava/util/List;Z)V ARG 1 server ARG 2 workerExecutor @@ -162,6 +163,10 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld METHOD method_27056 getStructureAccessor ()Lnet/minecraft/class_5138; METHOD method_27909 iterateEntities ()Ljava/lang/Iterable; METHOD method_27911 getSpawnPos ()Lnet/minecraft/class_2338; + METHOD method_28125 isFlat ()Z + METHOD method_29198 getEnderDragonFight ()Lnet/minecraft/class_2881; + METHOD method_29200 createEndSpawnPlatform (Lnet/minecraft/class_3218;)V + ARG 0 world METHOD method_29203 tickTime ()V METHOD method_8448 updateSleepingPlayers ()V METHOD method_8487 locateStructure (Lnet/minecraft/class_3195;Lnet/minecraft/class_2338;IZ)Lnet/minecraft/class_2338; diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index f34973b30e..443c35994b 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -196,6 +196,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 1 pos ARG 2 direction METHOD method_8500 getWorldChunk (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2818; + ARG 1 pos METHOD method_8501 setBlockState (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z ARG 1 pos ARG 2 state