Add obf helpers

patches/server/0042-Dont-send-useless-entity-packets.patch

@@ -1,15 +1,16 @@
-From fa1344452a898367f0a83109c7e17625139c7ce0 Mon Sep 17 00:00:00 2001
+From d215f19056052a7b6c97d08f4aeb7a0d4c96be5c Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 6 Jul 2019 17:00:04 -0500
 Subject: [PATCH] Dont send useless entity packets
 
 ---
  .../minecraft/server/EntityTrackerEntry.java    | 17 +++++++++++++++++
+ .../minecraft/server/PacketPlayOutEntity.java   | 10 +++++-----
  src/main/java/net/pl3x/purpur/PurpurConfig.java |  5 +++++
- 2 files changed, 22 insertions(+)
+ 3 files changed, 27 insertions(+), 5 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index 460c687d3..448602057 100644
+index 460c687d3..61af5a99f 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 @@ -162,6 +162,7 @@ public class EntityTrackerEntry {
@@ -25,15 +26,15 @@ index 460c687d3..448602057 100644
      }
  
 +    // Purpur start
-+    private boolean isUselessPacket(Packet<?> packet) {
++    private boolean isUselessPacket(Packet<?> possibleUselessPacket) {
-+        if (packet instanceof PacketPlayOutEntity) {
++        if (possibleUselessPacket instanceof PacketPlayOutEntity) {
-+            PacketPlayOutEntity p = (PacketPlayOutEntity) packet;
++            PacketPlayOutEntity packet = (PacketPlayOutEntity) possibleUselessPacket;
-+            if (packet instanceof PacketPlayOutEntity.PacketPlayOutRelEntityMove) {
++            if (possibleUselessPacket instanceof PacketPlayOutEntity.PacketPlayOutRelEntityMove) {
-+                return p.b == 0 && p.c == 0 && p.d == 0;
++                return packet.getX() == 0 && packet.getY() == 0 && packet.getZ() == 0;
-+            } else if (packet instanceof PacketPlayOutEntity.PacketPlayOutRelEntityMoveLook) {
++            } else if (possibleUselessPacket instanceof PacketPlayOutEntity.PacketPlayOutRelEntityMoveLook) {
-+                return p.b == 0 && p.c == 0 && p.d == 0 && p.e == 0 && p.f == 0;
++                return packet.getX() == 0 && packet.getY() == 0 && packet.getZ() == 0 && packet.getYaw() == 0 && packet.getPitch() == 0;
-+            } else if (packet instanceof PacketPlayOutEntity.PacketPlayOutEntityLook) {
++            } else if (possibleUselessPacket instanceof PacketPlayOutEntity.PacketPlayOutEntityLook) {
-+                return p.e == 0 && p.f == 0;
++                return packet.getYaw() == 0 && packet.getPitch() == 0;
 +            }
 +        }
 +        return false;
@@ -43,6 +44,27 @@ index 460c687d3..448602057 100644
      public void a(EntityPlayer entityplayer) {
          this.tracker.c(entityplayer);
          entityplayer.c(this.tracker);
+diff --git a/src/main/java/net/minecraft/server/PacketPlayOutEntity.java b/src/main/java/net/minecraft/server/PacketPlayOutEntity.java
+index 1a9802e75..4c5a52c80 100644
+--- a/src/main/java/net/minecraft/server/PacketPlayOutEntity.java
++++ b/src/main/java/net/minecraft/server/PacketPlayOutEntity.java
+@@ -5,11 +5,11 @@ import java.io.IOException;
+ public class PacketPlayOutEntity implements Packet<PacketListenerPlayOut> {
+ 
+     protected int a;
+-    protected short b;
+-    protected short c;
+-    protected short d;
+-    protected byte e;
+-    protected byte f;
++    protected short b; public short getX() { return b; } // Purpur - OBFHELPER
++    protected short c; public short getY() { return c; } // Purpur - OBFHELPER
++    protected short d; public short getZ() { return d; } // Purpur - OBFHELPER
++    protected byte e; public byte getYaw() { return e; } // Purpur - OBFHELPER
++    protected byte f; public byte getPitch() { return f; } // Purpur - OBFHELPER
+     protected boolean g;
+     protected boolean h;
+ 
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 index b4f8cca53..c0ae6accd 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java

patches/server/0043-Fix-item-position-desync-MC-4.patch

@@ -1,30 +1,48 @@
-From 1ad2c6ff752f602b69eda84ee39a2b65642d4c09 Mon Sep 17 00:00:00 2001
+From b789db7a834c56cb7413e2788adc4cc49b40ec9c Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 6 Jul 2019 21:12:58 -0500
-Subject: [PATCH] Fix item position desync
+Subject: [PATCH] Fix item position desync (MC-4)
 
 ---
- src/main/java/net/minecraft/server/EntityTrackerEntry.java | 6 ++++++
+ src/main/java/net/minecraft/server/EntityTrackerEntry.java  | 6 ++++++
- src/main/java/net/pl3x/purpur/PurpurConfig.java            | 5 +++++
+ src/main/java/net/minecraft/server/PacketPlayOutEntity.java | 2 ++
- 2 files changed, 11 insertions(+)
+ src/main/java/net/pl3x/purpur/PurpurConfig.java             | 5 +++++
+ 3 files changed, 13 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index 448602057..8885009ff 100644
+index 61af5a99f..b271e9ace 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 @@ -124,6 +124,12 @@ public class EntityTrackerEntry {
                  ++this.o;
                  i = MathHelper.d(this.tracker.yaw * 256.0F / 360.0F);
                  j = MathHelper.d(this.tracker.pitch * 256.0F / 360.0F);
-+                // Purpur start
++                // Purpur start - fixes MC-4
 +                if (net.pl3x.purpur.PurpurConfig.fixItemPositionDesync && this.tracker instanceof EntityItem) {
-+                    Vec3D v = PacketPlayOutEntity.a(PacketPlayOutEntity.a(tracker.locX), PacketPlayOutEntity.a(tracker.locY), PacketPlayOutEntity.a(tracker.locZ));
++                    Vec3D loc = PacketPlayOutEntity.decrypt(PacketPlayOutEntity.encrypt(tracker.locX), PacketPlayOutEntity.encrypt(tracker.locY), PacketPlayOutEntity.encrypt(tracker.locZ));
-+                    tracker.setPosition(v.x, v.y, v.z);
++                    tracker.setPosition(loc.getX(), loc.getY(), loc.getZ());
 +                }
 +                // Purpur end
                  Vec3D vec3d = (new Vec3D(this.tracker.locX, this.tracker.locY, this.tracker.locZ)).d(PacketPlayOutEntity.a(this.xLoc, this.yLoc, this.zLoc));
                  boolean flag1 = vec3d.g() >= 7.62939453125E-6D;
                  Packet<?> packet1 = null;
+diff --git a/src/main/java/net/minecraft/server/PacketPlayOutEntity.java b/src/main/java/net/minecraft/server/PacketPlayOutEntity.java
+index 4c5a52c80..9ec3495d5 100644
+--- a/src/main/java/net/minecraft/server/PacketPlayOutEntity.java
++++ b/src/main/java/net/minecraft/server/PacketPlayOutEntity.java
+@@ -13,10 +13,12 @@ public class PacketPlayOutEntity implements Packet<PacketListenerPlayOut> {
+     protected boolean g;
+     protected boolean h;
+ 
++    public static long encrypt(double d) { return a(d); } // Purpur - OBFHELPER
+     public static long a(double d0) {
+         return MathHelper.d(d0 * 4096.0D);
+     }
+ 
++    public static Vec3D decrypt(long x, long y, long z) { return a(x, y, z); } // Purpur - OBFHELPER
+     public static Vec3D a(long i, long j, long k) {
+         return (new Vec3D((double) i, (double) j, (double) k)).a(2.44140625E-4D);
+     }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 index c0ae6accd..c0f02edce 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java