From f30442e020155fd071b46d2bf894528b78e5b68a Mon Sep 17 00:00:00 2001 From: Max Gurela Date: Thu, 25 Aug 2016 09:18:42 -0700 Subject: [PATCH] Map nd -> ConsoleCommandSender (#42) * Map nd -> ConsoleCommandSender net.minecraft.server.dedicated.ConsoleCommandSender * Map executeCommand in IServer * Clarify with CommandFeedback --- .../block/tile/impl/TileEntitySign.mapping | 6 ++++++ .../client/player/EntityPlayerClient.mapping | 2 ++ .../minecraft/command/ICommandSender.mapping | 3 +++ .../command/impl/CommandExecute.mapping | 3 +++ mappings/net/minecraft/entity/Entity.mapping | 3 +++ .../entity/player/EntityPlayer.mapping | 1 + .../entity/player/EntityPlayerServer.mapping | 2 ++ mappings/net/minecraft/network/IServer.mapping | 2 ++ .../minecraft/server/MinecraftServer.mapping | 3 +++ .../dedicated/ConsoleCommandSender.mapping | 17 +++++++++++++++++ .../server/dedicated/DedicatedServer.mapping | 3 +++ mappings/none/aij.mapping | 3 +++ mappings/none/bof.mapping | 2 ++ mappings/none/nd.mapping | 8 -------- mappings/none/o.mapping | 3 +++ 15 files changed, 53 insertions(+), 8 deletions(-) create mode 100644 mappings/net/minecraft/server/dedicated/ConsoleCommandSender.mapping delete mode 100644 mappings/none/nd.mapping diff --git a/mappings/net/minecraft/block/tile/impl/TileEntitySign.mapping b/mappings/net/minecraft/block/tile/impl/TileEntitySign.mapping index 5038fded41..318babad17 100644 --- a/mappings/net/minecraft/block/tile/impl/TileEntitySign.mapping +++ b/mappings/net/minecraft/block/tile/impl/TileEntitySign.mapping @@ -1,5 +1,7 @@ CLASS none/art net/minecraft/block/tile/impl/TileEntitySign CLASS none/art$1 + METHOD a appendCommandFeedback (Lnone/fa;)V + ARG 0 component METHOD c getBlockPos ()Lnone/cn; METHOD d getPos ()Lnone/bcs; METHOD e getWorld ()Lnone/aiu; @@ -7,7 +9,10 @@ CLASS none/art net/minecraft/block/tile/impl/TileEntitySign METHOD h getServer ()Lnet/minecraft/server/MinecraftServer; METHOD h_ getName ()Ljava/lang/String; METHOD i_ getNameComponent ()Lnone/fa; + METHOD y_ shouldEchoCommandFeedback ()Z CLASS none/art$2 + METHOD a appendCommandFeedback (Lnone/fa;)V + ARG 0 component METHOD c getBlockPos ()Lnone/cn; METHOD d getPos ()Lnone/bcs; METHOD e getWorld ()Lnone/aiu; @@ -15,6 +20,7 @@ CLASS none/art net/minecraft/block/tile/impl/TileEntitySign METHOD h getServer ()Lnet/minecraft/server/MinecraftServer; METHOD h_ getName ()Ljava/lang/String; METHOD i_ getNameComponent ()Lnone/fa; + METHOD y_ shouldEchoCommandFeedback ()Z FIELD a text [Lnone/fa; METHOD C_ getUpdatePacket ()Lnone/fy; METHOD a deserializeTag (Lnone/dt;)V diff --git a/mappings/net/minecraft/client/player/EntityPlayerClient.mapping b/mappings/net/minecraft/client/player/EntityPlayerClient.mapping index 0733f6295f..adffcb5787 100644 --- a/mappings/net/minecraft/client/player/EntityPlayerClient.mapping +++ b/mappings/net/minecraft/client/player/EntityPlayerClient.mapping @@ -1,5 +1,7 @@ CLASS none/boe net/minecraft/client/player/EntityPlayerClient FIELD d networkHandler Lnone/bmc; + METHOD a appendCommandFeedback (Lnone/fa;)V + ARG 0 component METHOD a addChatMsg (Lnone/fa;Z)V METHOD a onTrackedDataSet (Lnone/kj;)V METHOD a swingHand (Lnone/qz;)V diff --git a/mappings/net/minecraft/command/ICommandSender.mapping b/mappings/net/minecraft/command/ICommandSender.mapping index 9a0e119616..b74f83d64b 100644 --- a/mappings/net/minecraft/command/ICommandSender.mapping +++ b/mappings/net/minecraft/command/ICommandSender.mapping @@ -1,4 +1,6 @@ CLASS none/n net/minecraft/command/ICommandSender + METHOD a appendCommandFeedback (Lnone/fa;)V + ARG 0 component METHOD c getBlockPos ()Lnone/cn; METHOD d getPos ()Lnone/bcs; METHOD e getWorld ()Lnone/aiu; @@ -6,3 +8,4 @@ CLASS none/n net/minecraft/command/ICommandSender METHOD h getServer ()Lnet/minecraft/server/MinecraftServer; METHOD h_ getName ()Ljava/lang/String; METHOD i_ getNameComponent ()Lnone/fa; + METHOD y_ shouldEchoCommandFeedback ()Z diff --git a/mappings/net/minecraft/command/impl/CommandExecute.mapping b/mappings/net/minecraft/command/impl/CommandExecute.mapping index 79e8155ed0..093bbd21cb 100644 --- a/mappings/net/minecraft/command/impl/CommandExecute.mapping +++ b/mappings/net/minecraft/command/impl/CommandExecute.mapping @@ -1,5 +1,7 @@ CLASS none/ae net/minecraft/command/impl/CommandExecute CLASS none/ae$1 + METHOD a appendCommandFeedback (Lnone/fa;)V + ARG 0 component METHOD c getBlockPos ()Lnone/cn; METHOD d getPos ()Lnone/bcs; METHOD e getWorld ()Lnone/aiu; @@ -7,6 +9,7 @@ CLASS none/ae net/minecraft/command/impl/CommandExecute METHOD h getServer ()Lnet/minecraft/server/MinecraftServer; METHOD h_ getName ()Ljava/lang/String; METHOD i_ getNameComponent ()Lnone/fa; + METHOD y_ shouldEchoCommandFeedback ()Z METHOD a getMinPermissionLevel ()I METHOD a execute (Lnet/minecraft/server/MinecraftServer;Lnone/n;[Ljava/lang/String;)V METHOD a getTabCompletionList (Lnet/minecraft/server/MinecraftServer;Lnone/n;[Ljava/lang/String;Lnone/cn;)Ljava/util/List; diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 3d95219630..83ad141124 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -53,6 +53,8 @@ CLASS none/se net/minecraft/entity/Entity ARG 2 pitch METHOD a deserializeEntityTag (Lnone/dt;)V ARG 0 tagCompound + METHOD a appendCommandFeedback (Lnone/fa;)V + ARG 0 component METHOD a onTrackedDataSet (Lnone/kj;)V METHOD a toTagList ([D)Lnone/dz; ARG 0 values @@ -129,3 +131,4 @@ CLASS none/se net/minecraft/entity/Entity METHOD o_ getPistonBehavior ()Lnone/ayr; METHOD w hasPassenger (Lnone/se;)Z ARG 0 entity + METHOD y_ shouldEchoCommandFeedback ()Z diff --git a/mappings/net/minecraft/entity/player/EntityPlayer.mapping b/mappings/net/minecraft/entity/player/EntityPlayer.mapping index 67c01a139e..cb6bb61184 100644 --- a/mappings/net/minecraft/entity/player/EntityPlayer.mapping +++ b/mappings/net/minecraft/entity/player/EntityPlayer.mapping @@ -48,3 +48,4 @@ CLASS none/aak net/minecraft/entity/player/EntityPlayer METHOD h_ getName ()Ljava/lang/String; METHOD i_ getNameComponent ()Lnone/fa; METHOD m update ()V + METHOD y_ shouldEchoCommandFeedback ()Z diff --git a/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping b/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping index 856d76b3d3..58d8ce5034 100644 --- a/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping +++ b/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping @@ -3,6 +3,8 @@ CLASS none/lw net/minecraft/entity/player/EntityPlayerServer METHOD a trySleep (Lnone/cn;)Lnone/aak$a; ARG 0 pos METHOD a deserializeEntityTag (Lnone/dt;)V + METHOD a appendCommandFeedback (Lnone/fa;)V + ARG 0 component METHOD a addChatMsg (Lnone/fa;Z)V METHOD a swingHand (Lnone/qz;)V ARG 0 hand diff --git a/mappings/net/minecraft/network/IServer.mapping b/mappings/net/minecraft/network/IServer.mapping index b58581dde1..4c79fbedc5 100644 --- a/mappings/net/minecraft/network/IServer.mapping +++ b/mappings/net/minecraft/network/IServer.mapping @@ -13,6 +13,8 @@ CLASS none/la net/minecraft/network/IServer METHOD a getString (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; ARG 0 key ARG 1 defaultValue + METHOD a_ executeCommand (Ljava/lang/String;)Ljava/lang/String; + ARG 0 command METHOD b getPropertiesFilename ()Ljava/lang/String; METHOD d_ getHostname ()Ljava/lang/String; METHOD e getInfo (Ljava/lang/String;)V diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index 5b8081ebea..6e37a6c872 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -46,6 +46,8 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer ARG 0 value METHOD a setGameMode (Lnone/ais;)V ARG 0 gameMode + METHOD a appendCommandFeedback (Lnone/fa;)V + ARG 0 component METHOD a loadServerIcon (Lnone/ke;)V METHOD a getSpawnRadius (Lnone/lu;)I ARG 0 world @@ -134,4 +136,5 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer METHOD v getServerIp ()Ljava/lang/String; METHOD w isRunning ()Z METHOD x stop ()V + METHOD y_ shouldEchoCommandFeedback ()Z METHOD z getIconFile ()Ljava/io/File; diff --git a/mappings/net/minecraft/server/dedicated/ConsoleCommandSender.mapping b/mappings/net/minecraft/server/dedicated/ConsoleCommandSender.mapping new file mode 100644 index 0000000000..4985fd4360 --- /dev/null +++ b/mappings/net/minecraft/server/dedicated/ConsoleCommandSender.mapping @@ -0,0 +1,17 @@ +CLASS none/nd net/minecraft/server/dedicated/ConsoleCommandSender + FIELD a buffer Ljava/lang/StringBuffer; + FIELD b server Lnet/minecraft/server/MinecraftServer; + METHOD (Lnet/minecraft/server/MinecraftServer;)V + ARG 0 server + METHOD a appendCommandFeedback (Lnone/fa;)V + ARG 0 component + METHOD c getBlockPos ()Lnone/cn; + METHOD d getPos ()Lnone/bcs; + METHOD e getWorld ()Lnone/aiu; + METHOD f getEntity ()Lnone/se; + METHOD h getServer ()Lnet/minecraft/server/MinecraftServer; + METHOD h_ getName ()Ljava/lang/String; + METHOD i clearCommandFeedback ()V + METHOD i_ getNameComponent ()Lnone/fa; + METHOD j toString ()Ljava/lang/String; + METHOD y_ shouldEchoCommandFeedback ()Z diff --git a/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping b/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping index aa9fc40d1d..5170bf6b66 100644 --- a/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping +++ b/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping @@ -1,5 +1,6 @@ CLASS none/lf net/minecraft/server/dedicated/DedicatedServer FIELD k LOGGER Lorg/apache/logging/log4j/Logger; + FIELD o commandSender Lnone/nd; FIELD q serverProps Lnone/lc; FIELD r eulaReader Lnone/kw; FIELD s generateStructures Z @@ -25,6 +26,8 @@ CLASS none/lf net/minecraft/server/dedicated/DedicatedServer METHOD aD getMaxWorldBorderRadius ()I METHOD aF getNetworkCompressionThreshold ()I METHOD aP getMaximumTickTime ()J + METHOD a_ executeCommand (Ljava/lang/String;)Ljava/lang/String; + ARG 0 command METHOD aa isDedicated ()Z METHOD ae isUsingNativeTransport ()Z METHOD ah areCommandBlocksEnabled ()Z diff --git a/mappings/none/aij.mapping b/mappings/none/aij.mapping index 0e478c539e..bf63e24c30 100644 --- a/mappings/none/aij.mapping +++ b/mappings/none/aij.mapping @@ -1,3 +1,6 @@ CLASS none/aij + METHOD a appendCommandFeedback (Lnone/fa;)V + ARG 0 component METHOD h_ getName ()Ljava/lang/String; METHOD i_ getNameComponent ()Lnone/fa; + METHOD y_ shouldEchoCommandFeedback ()Z diff --git a/mappings/none/bof.mapping b/mappings/none/bof.mapping index 9c724e55a8..585dca3141 100644 --- a/mappings/none/bof.mapping +++ b/mappings/none/bof.mapping @@ -1,3 +1,5 @@ CLASS none/bof + METHOD a appendCommandFeedback (Lnone/fa;)V + ARG 0 component METHOD c getBlockPos ()Lnone/cn; METHOD m update ()V diff --git a/mappings/none/nd.mapping b/mappings/none/nd.mapping deleted file mode 100644 index 76c14f7a6e..0000000000 --- a/mappings/none/nd.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS none/nd - METHOD c getBlockPos ()Lnone/cn; - METHOD d getPos ()Lnone/bcs; - METHOD e getWorld ()Lnone/aiu; - METHOD f getEntity ()Lnone/se; - METHOD h getServer ()Lnet/minecraft/server/MinecraftServer; - METHOD h_ getName ()Ljava/lang/String; - METHOD i_ getNameComponent ()Lnone/fa; diff --git a/mappings/none/o.mapping b/mappings/none/o.mapping index 7eb73cdfe7..26793490db 100644 --- a/mappings/none/o.mapping +++ b/mappings/none/o.mapping @@ -1,5 +1,7 @@ CLASS none/o CLASS none/o$1 + METHOD a appendCommandFeedback (Lnone/fa;)V + ARG 0 component METHOD c getBlockPos ()Lnone/cn; METHOD d getPos ()Lnone/bcs; METHOD e getWorld ()Lnone/aiu; @@ -7,3 +9,4 @@ CLASS none/o METHOD h getServer ()Lnet/minecraft/server/MinecraftServer; METHOD h_ getName ()Ljava/lang/String; METHOD i_ getNameComponent ()Lnone/fa; + METHOD y_ shouldEchoCommandFeedback ()Z