From d09892db9e37438acaa6a19ad04aba47a442e807 Mon Sep 17 00:00:00 2001 From: Juuxel Date: Mon, 14 Jan 2019 00:08:57 +0200 Subject: [PATCH] Coordinates and positions (#390) --- mappings/dj.mapping | 3 --- mappings/dp.mapping | 3 --- mappings/dq.mapping | 3 --- .../arguments/CoordinateArgument.mapping | 20 ++++++++++++++++ .../arguments/DefaultPosArgument.mapping | 23 +++++++++++++++++++ .../arguments/LookingPosArgument.mapping | 22 ++++++++++++++++++ .../command/arguments/PosArgument.mapping | 10 ++++++++ .../arguments/RotationArgumentType.mapping | 2 ++ .../server/command/TeleportCommand.mapping | 4 ++++ 9 files changed, 81 insertions(+), 9 deletions(-) delete mode 100644 mappings/dj.mapping delete mode 100644 mappings/dp.mapping delete mode 100644 mappings/dq.mapping create mode 100644 mappings/net/minecraft/command/arguments/CoordinateArgument.mapping create mode 100644 mappings/net/minecraft/command/arguments/DefaultPosArgument.mapping create mode 100644 mappings/net/minecraft/command/arguments/LookingPosArgument.mapping create mode 100644 mappings/net/minecraft/command/arguments/PosArgument.mapping diff --git a/mappings/dj.mapping b/mappings/dj.mapping deleted file mode 100644 index 5725f695a8..0000000000 --- a/mappings/dj.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS dj - METHOD equals (Ljava/lang/Object;)Z - ARG 1 o diff --git a/mappings/dp.mapping b/mappings/dp.mapping deleted file mode 100644 index 109cc9edbd..0000000000 --- a/mappings/dp.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS dp - METHOD equals (Ljava/lang/Object;)Z - ARG 1 o diff --git a/mappings/dq.mapping b/mappings/dq.mapping deleted file mode 100644 index 6822f45baa..0000000000 --- a/mappings/dq.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS dq - METHOD equals (Ljava/lang/Object;)Z - ARG 1 o diff --git a/mappings/net/minecraft/command/arguments/CoordinateArgument.mapping b/mappings/net/minecraft/command/arguments/CoordinateArgument.mapping new file mode 100644 index 0000000000..34a81a4f65 --- /dev/null +++ b/mappings/net/minecraft/command/arguments/CoordinateArgument.mapping @@ -0,0 +1,20 @@ +CLASS dp net/minecraft/command/arguments/CoordinateArgument + FIELD a MISSING_COORDINATE Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; + FIELD b MISSING_BLOCK_POSITION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; + FIELD c relative Z + FIELD d value D + METHOD (ZD)V + ARG 1 relative + ARG 2 value + METHOD a isRelative ()Z + METHOD a toAbsoluteCoordinate (D)D + ARG 1 offset + METHOD a parse (Lcom/mojang/brigadier/StringReader;)Ldp; + ARG 0 reader + METHOD a parse (Lcom/mojang/brigadier/StringReader;Z)Ldp; + ARG 0 reader + ARG 1 center + METHOD b isRelative (Lcom/mojang/brigadier/StringReader;)Z + ARG 0 reader + METHOD equals (Ljava/lang/Object;)Z + ARG 1 o diff --git a/mappings/net/minecraft/command/arguments/DefaultPosArgument.mapping b/mappings/net/minecraft/command/arguments/DefaultPosArgument.mapping new file mode 100644 index 0000000000..4996c55155 --- /dev/null +++ b/mappings/net/minecraft/command/arguments/DefaultPosArgument.mapping @@ -0,0 +1,23 @@ +CLASS dq net/minecraft/command/arguments/DefaultPosArgument + FIELD a x Ldp; + FIELD b y Ldp; + FIELD c z Ldp; + METHOD (Ldp;Ldp;Ldp;)V + ARG 1 x + ARG 2 y + ARG 3 z + METHOD a isXRelative ()Z + METHOD a toAbsolutePos (Lca;)Lcms; + ARG 1 source + METHOD a parse (Lcom/mojang/brigadier/StringReader;)Ldq; + ARG 0 reader + METHOD a parse (Lcom/mojang/brigadier/StringReader;Z)Ldq; + ARG 0 reader + ARG 1 centerHorizontally + METHOD b isYRelative ()Z + METHOD b toAbsoluteRotation (Lca;)Lcmr; + ARG 1 source + METHOD c isZRelative ()Z + METHOD d zero ()Ldq; + METHOD equals (Ljava/lang/Object;)Z + ARG 1 o diff --git a/mappings/net/minecraft/command/arguments/LookingPosArgument.mapping b/mappings/net/minecraft/command/arguments/LookingPosArgument.mapping new file mode 100644 index 0000000000..97910c1166 --- /dev/null +++ b/mappings/net/minecraft/command/arguments/LookingPosArgument.mapping @@ -0,0 +1,22 @@ +CLASS dj net/minecraft/command/arguments/LookingPosArgument + FIELD a x D + FIELD b y D + FIELD c z D + METHOD (DDD)V + ARG 1 x + ARG 3 y + ARG 5 z + METHOD a isXRelative ()Z + METHOD a toAbsolutePos (Lca;)Lcms; + ARG 1 source + METHOD a parse (Lcom/mojang/brigadier/StringReader;)Ldj; + ARG 0 reader + METHOD a readCoordinate (Lcom/mojang/brigadier/StringReader;I)D + ARG 0 reader + ARG 1 startingCursorPos + METHOD b isYRelative ()Z + METHOD b toAbsoluteRotation (Lca;)Lcmr; + ARG 1 source + METHOD c isZRelative ()Z + METHOD equals (Ljava/lang/Object;)Z + ARG 1 o diff --git a/mappings/net/minecraft/command/arguments/PosArgument.mapping b/mappings/net/minecraft/command/arguments/PosArgument.mapping new file mode 100644 index 0000000000..e697c5b9af --- /dev/null +++ b/mappings/net/minecraft/command/arguments/PosArgument.mapping @@ -0,0 +1,10 @@ +CLASS di net/minecraft/command/arguments/PosArgument + METHOD a isXRelative ()Z + METHOD a toAbsolutePos (Lca;)Lcms; + ARG 1 source + METHOD b isYRelative ()Z + METHOD b toAbsoluteRotation (Lca;)Lcmr; + ARG 1 source + METHOD c isZRelative ()Z + METHOD c toAbsoluteBlockPos (Lca;)Let; + ARG 1 source diff --git a/mappings/net/minecraft/command/arguments/RotationArgumentType.mapping b/mappings/net/minecraft/command/arguments/RotationArgumentType.mapping index bc6a448acc..d4fc8b8c72 100644 --- a/mappings/net/minecraft/command/arguments/RotationArgumentType.mapping +++ b/mappings/net/minecraft/command/arguments/RotationArgumentType.mapping @@ -3,3 +3,5 @@ CLASS dk net/minecraft/command/arguments/RotationArgumentType FIELD b EXAMPLES Ljava/util/Collection; METHOD a create ()Ldk; METHOD a getRotationArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Ldi; + ARG 0 context + ARG 1 argumentName diff --git a/mappings/net/minecraft/server/command/TeleportCommand.mapping b/mappings/net/minecraft/server/command/TeleportCommand.mapping index 188b218d70..9d9d35b3f6 100644 --- a/mappings/net/minecraft/server/command/TeleportCommand.mapping +++ b/mappings/net/minecraft/server/command/TeleportCommand.mapping @@ -1,2 +1,6 @@ CLASS tf net/minecraft/server/command/TeleportCommand + METHOD a (Lca;Ljava/util/Collection;Lut;Ldi;Ldi;Ltf$a;)I + ARG 2 world + ARG 3 pos + ARG 4 rotation METHOD a register (Lcom/mojang/brigadier/CommandDispatcher;)V