Fixed ping counting as being off screen, when very close to the origi…

…n position of the ping
GirafiStudios · Jun 10, 2019 · c906393 · c906393
1 parent 6e92661
commit c906393
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/build.gradle b/build.gradle
@@ -20,7 +20,7 @@ group = "dmillerw.ping"
 archivesBaseName = "Ping"
 
 minecraft {
-    mappings channel: 'snapshot', version: '20190608-1.14.2'
+    mappings channel: 'snapshot', version: '20190609-1.14.2'
 
     runs {
         client = {

diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 minecraft_version=1.14.2
-forge_version=26.0.12
-mod_version=1.6.0
+forge_version=26.0.14
+mod_version=1.6.1
 
 org.gradle.jvmargs=-Xmx4G
 org.gradle.daemon=false
diff --git a/src/main/java/dmillerw/ping/client/KeyHandler.java b/src/main/java/dmillerw/ping/client/KeyHandler.java
@@ -37,7 +37,7 @@ public static void onClientTick(TickEvent.ClientTickEvent event) {
         }
 
         long handle = Minecraft.getInstance().mainWindow.getHandle();
-        boolean keyPressed = (KEY_BINDING.getKey().getKeyCode() >= 0 ? InputMappings.func_216506_a(handle, KEY_BINDING.getKey().getKeyCode()) : InputMappings.func_216506_a(handle, KEY_BINDING.getKey().getKeyCode() + 100));
+        boolean keyPressed = (KEY_BINDING.getKey().getKeyCode() >= 0 ? InputMappings.isKeyDown(handle, KEY_BINDING.getKey().getKeyCode()) : InputMappings.isKeyDown(handle, KEY_BINDING.getKey().getKeyCode() + 100));
 
         if (keyPressed != lastKeyState) {
             if (keyPressed) {
@@ -67,6 +67,7 @@ public static void onClientTick(TickEvent.ClientTickEvent event) {
     }
 
     private static boolean canSendQuickPing(KeyBinding keyBinding) {
+
         return keyBinding.isKeyDown() && !keyBinding.isPressed();
     }
 }
diff --git a/src/main/java/dmillerw/ping/client/PingHandler.java b/src/main/java/dmillerw/ping/client/PingHandler.java
@@ -61,16 +61,16 @@ public static void onRenderWorld(RenderWorldLastEvent event) {
         Entity renderEntity = mc.getRenderViewEntity();
         if (renderEntity == null) return;
         double interpX = renderEntity.prevPosX + (renderEntity.posX - renderEntity.prevPosX) * event.getPartialTicks();
-        double interpY = renderEntity.prevPosY + (renderEntity.posY - renderEntity.prevPosY) * event.getPartialTicks();
+        double interpY = (renderEntity.prevPosY + (renderEntity.posY - renderEntity.prevPosY) * event.getPartialTicks()) + 1;
         double interpZ = renderEntity.prevPosZ + (renderEntity.posZ - renderEntity.prevPosZ) * event.getPartialTicks();
 
         Frustum camera = new Frustum();
         camera.setPosition(interpX, interpY, interpZ);
 
         for (PingWrapper ping : active_pings) {
-            double px = ping.pos.getX() + 0.5 - interpX;
-            double py = ping.pos.getY() + 0.5 - interpY - renderEntity.getEyeHeight();
-            double pz = ping.pos.getZ() + 0.5 - interpZ;
+            double px = ping.pos.getX() + 0.5D - interpX;
+            double py = ping.pos.getY() + 0.5D - interpY + 1 - renderEntity.getEyeHeight();
+            double pz = ping.pos.getZ() + 0.5D - interpZ;
 
             if (camera.isBoundingBoxInFrustum(ping.getAABB())) {
                 ping.isOffscreen = false;

diff --git a/src/main/java/dmillerw/ping/data/PingWrapper.java b/src/main/java/dmillerw/ping/data/PingWrapper.java
@@ -31,7 +31,7 @@ public PingWrapper(BlockPos pos, int color, PingType type) {
     }
 
     public AxisAlignedBB getAABB() {
-        return new AxisAlignedBB(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5);
+        return new AxisAlignedBB(pos.getX(), pos.getY(), pos.getZ(), pos.getX(), pos.getY(), pos.getZ());
     }
 
     public void writeToBuffer(ByteBuf buffer) {