From 052ba93b9b638c39e91d2826e6b7bf9421a3e98e Mon Sep 17 00:00:00 2001 From: iamgreaser Date: Tue, 20 Sep 2016 14:31:38 +0000 Subject: [PATCH] Vec3d fully mapped; Polar2f identified (#88) * Vec3d fully mapped; Polar2d identified * s/coerce/fromPolar/g * Vec3i fully mapped * BlockPos fully mapped also demapped a method in Vec3i that may cause issues (I suspect Enigma has a bug) * review round 1 closes #87 * Vec3i s/ORIGIN/ZERO/g * dammit when will you all take a linear algebra course --- .../net/minecraft/util/math/BlockPos.mapping | 29 +++++++++++++-- .../net/minecraft/util/math/Polar2f.mapping | 6 ++++ .../net/minecraft/util/math/Vec3d.mapping | 35 ++++++++++++++++--- .../net/minecraft/util/math/Vec3i.mapping | 12 ++++--- 4 files changed, 69 insertions(+), 13 deletions(-) create mode 100644 mappings/net/minecraft/util/math/Polar2f.mapping diff --git a/mappings/net/minecraft/util/math/BlockPos.mapping b/mappings/net/minecraft/util/math/BlockPos.mapping index 5e09add417..2cfcc9ed4a 100644 --- a/mappings/net/minecraft/util/math/BlockPos.mapping +++ b/mappings/net/minecraft/util/math/BlockPos.mapping @@ -1,4 +1,10 @@ CLASS none/cn net/minecraft/util/math/BlockPos + CLASS none/cn$1 + CLASS none/cn$1$1 + FIELD b pos Lnone/cn; + CLASS none/cn$2 + CLASS none/cn$2$1 + FIELD b pos Lnone/cn$a; CLASS none/cn$a Mutable FIELD b x I FIELD c y I @@ -24,6 +30,8 @@ CLASS none/cn net/minecraft/util/math/BlockPos METHOD c setOffset (Lnone/cu;I)Lnone/cn$a; ARG 0 facing ARG 1 distance + METHOD d crossProduct (Lnone/dk;)Lnone/dk; + ARG 0 vec METHOD g set (Lnone/dk;)Lnone/cn$a; ARG 0 vec METHOD h toImmutable ()Lnone/cn; @@ -72,6 +80,14 @@ CLASS none/cn net/minecraft/util/math/BlockPos METHOD t free ()V FIELD a ORIGIN Lnone/cn; FIELD b LOGGER Lorg/apache/logging/log4j/Logger; + FIELD c BITS_X I + FIELD d BITS_Z I + FIELD f BITS_Y I + FIELD g SHIFT_Y I + FIELD h SHIFT_X I + FIELD i MASK_X J + FIELD j MASK_Y J + FIELD k MASK_Z J METHOD (DDD)V ARG 0 x ARG 1 y @@ -97,6 +113,9 @@ CLASS none/cn net/minecraft/util/math/BlockPos ARG 2 z METHOD a fromLong (J)Lnone/cn; ARG 0 l + METHOD a iterateBoxPositions (Lnone/cn;Lnone/cn;)Ljava/lang/Iterable; + ARG 0 pos1 + ARG 1 pos2 METHOD a offset (Lnone/cu;)Lnone/cn; ARG 0 facing METHOD a offset (Lnone/cu;I)Lnone/cn; @@ -107,17 +126,21 @@ CLASS none/cn net/minecraft/util/math/BlockPos METHOD b down ()Lnone/cn; METHOD b up (I)Lnone/cn; ARG 0 distance - METHOD b (Lnone/cn;Lnone/cn;)Ljava/lang/Iterable; - ARG 0 min - ARG 1 max + METHOD b iterateBoxPositionsMutable (Lnone/cn;Lnone/cn;)Ljava/lang/Iterable; + ARG 0 pos1 + ARG 1 pos2 METHOD b subtract (Lnone/dk;)Lnone/cn; ARG 0 vec METHOD c north ()Lnone/cn; METHOD c down (I)Lnone/cn; ARG 0 distance + METHOD c crossProduct (Lnone/dk;)Lnone/cn; + ARG 0 vec METHOD d south ()Lnone/cn; METHOD d north (I)Lnone/cn; ARG 0 distance + METHOD d crossProduct (Lnone/dk;)Lnone/dk; + ARG 0 vec METHOD e west ()Lnone/cn; METHOD e south (I)Lnone/cn; ARG 0 distance diff --git a/mappings/net/minecraft/util/math/Polar2f.mapping b/mappings/net/minecraft/util/math/Polar2f.mapping new file mode 100644 index 0000000000..2f291cdf25 --- /dev/null +++ b/mappings/net/minecraft/util/math/Polar2f.mapping @@ -0,0 +1,6 @@ +CLASS none/bct net/minecraft/util/math/Polar2f + FIELD i pitch F + FIELD j yaw F + METHOD (FF)V + ARG 0 pitch + ARG 1 yaw diff --git a/mappings/net/minecraft/util/math/Vec3d.mapping b/mappings/net/minecraft/util/math/Vec3d.mapping index 3b607855a5..346fca19d0 100644 --- a/mappings/net/minecraft/util/math/Vec3d.mapping +++ b/mappings/net/minecraft/util/math/Vec3d.mapping @@ -1,5 +1,5 @@ CLASS none/bcu net/minecraft/util/math/Vec3d - FIELD a ORIGIN Lnone/bcu; + FIELD a ZERO Lnone/bcu; FIELD b x D FIELD c y D FIELD d z D @@ -9,29 +9,54 @@ CLASS none/bcu net/minecraft/util/math/Vec3d ARG 2 z METHOD (Lnone/dk;)V ARG 0 vec + METHOD a normalize ()Lnone/bcu; METHOD a multiply (D)Lnone/bcu; ARG 0 scale METHOD a subtract (DDD)Lnone/bcu; ARG 0 x ARG 1 y ARG 2 z - METHOD a (Lnone/bcu;)Lnone/bcu; + METHOD a rotateX (F)Lnone/bcu; + ARG 0 radians + METHOD a fromPolar (FF)Lnone/bcu; + ARG 0 pitch + ARG 1 yaw + METHOD a fromPolar (Lnone/bct;)Lnone/bcu; + ARG 0 polar + METHOD a reverseSubtract (Lnone/bcu;)Lnone/bcu; ARG 0 vec + METHOD a castByX (Lnone/bcu;D)Lnone/bcu; + ARG 0 target + ARG 1 newX + METHOD b length ()D METHOD b add (DDD)Lnone/bcu; ARG 0 x ARG 1 y ARG 2 z - METHOD c getSquaredDistanceTo (DDD)D + METHOD b rotateY (F)Lnone/bcu; + ARG 0 radians + METHOD b dotProduct (Lnone/bcu;)D + ARG 0 vec + METHOD b castByY (Lnone/bcu;D)Lnone/bcu; + ARG 0 target + ARG 1 newY + METHOD c lengthSquared ()D + METHOD c squaredDistanceTo (DDD)D ARG 0 x ARG 1 y ARG 2 z + METHOD c crossProduct (Lnone/bcu;)Lnone/bcu; + ARG 0 vec + METHOD c castByZ (Lnone/bcu;D)Lnone/bcu; + ARG 0 target + ARG 1 newZ METHOD d subtract (Lnone/bcu;)Lnone/bcu; ARG 0 vec METHOD e add (Lnone/bcu;)Lnone/bcu; ARG 0 vec METHOD equals (Ljava/lang/Object;)Z ARG 0 other - METHOD f getDistanceTo (Lnone/bcu;)D + METHOD f distanceTo (Lnone/bcu;)D ARG 0 vec - METHOD g getSquaredDistanceTo (Lnone/bcu;)D + METHOD g squaredDistanceTo (Lnone/bcu;)D ARG 0 vec diff --git a/mappings/net/minecraft/util/math/Vec3i.mapping b/mappings/net/minecraft/util/math/Vec3i.mapping index 9f56132dc9..d87b40d99b 100644 --- a/mappings/net/minecraft/util/math/Vec3i.mapping +++ b/mappings/net/minecraft/util/math/Vec3i.mapping @@ -2,7 +2,7 @@ CLASS none/dk net/minecraft/util/math/Vec3i FIELD a x I FIELD b y I FIELD c z I - FIELD e ORIGIN Lnone/dk; + FIELD e ZERO Lnone/dk; METHOD (DDD)V ARG 0 x ARG 1 y @@ -11,21 +11,23 @@ CLASS none/dk net/minecraft/util/math/Vec3i ARG 0 x ARG 1 y ARG 2 z + METHOD d crossProduct (Lnone/dk;)Lnone/dk; + ARG 0 vec METHOD equals (Ljava/lang/Object;)Z ARG 0 other - METHOD f getSquaredDistanceTo (DDD)D + METHOD f squaredDistanceTo (DDD)D ARG 0 x ARG 1 y ARG 2 z - METHOD g getSquaredDistanceToCenter (DDD)D + METHOD g squaredDistanceToCenter (DDD)D ARG 0 x ARG 1 y ARG 2 z - METHOD h getDistanceTo (III)D + METHOD h distanceTo (III)D ARG 0 x ARG 1 y ARG 2 z - METHOD n getSquaredDistanceTo (Lnone/dk;)D + METHOD n squaredDistanceTo (Lnone/dk;)D ARG 0 vec METHOD p getX ()I METHOD q getY ()I