Fixed ping position

GirafiStudios · Dec 29, 2019 · e1958cc · e1958cc
1 parent 44ab3a4
commit e1958cc
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 minecraft_version=1.15.1
-forge_version=30.0.17
+forge_version=30.0.18
 mappings=20191221-1.14.3
 mod_version=1.6.4
 

diff --git a/src/main/java/dmillerw/ping/client/PingHandler.java b/src/main/java/dmillerw/ping/client/PingHandler.java
@@ -20,7 +20,6 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.SoundCategory;
-import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
 import net.minecraftforge.api.distmarker.Dist;
@@ -60,10 +59,9 @@ public static void onRenderWorld(RenderWorldLastEvent event) {
         Minecraft mc = Minecraft.getInstance();
         Entity renderEntity = mc.getRenderViewEntity();
         if (renderEntity == null) return;
-        BlockPos renderEntityPos = renderEntity.getPosition();
-        double interpX = renderEntity.prevPosX + (renderEntityPos.getX() - renderEntity.prevPosX) * event.getPartialTicks();
-        double interpY = (renderEntity.prevPosY + (renderEntityPos.getY() - renderEntity.prevPosY) * event.getPartialTicks()) + 1;
-        double interpZ = renderEntity.prevPosZ + (renderEntityPos.getZ() - renderEntity.prevPosZ) * event.getPartialTicks();
+        double interpX = renderEntity.prevPosX + (renderEntity.func_226277_ct_() - renderEntity.prevPosX) * event.getPartialTicks();
+        double interpY = (renderEntity.prevPosY + (renderEntity.func_226278_cu_() - renderEntity.prevPosY) * event.getPartialTicks()) + 1;
+        double interpZ = renderEntity.prevPosZ + (renderEntity.func_226281_cx_() - renderEntity.prevPosZ) * event.getPartialTicks();
 
         //Frustum camera = new Frustum();
         //camera.setPosition(interpX, interpY, interpZ);
@@ -78,8 +76,8 @@ public static void onRenderWorld(RenderWorldLastEvent event) {
                 if (Config.VISUAL.blockOverlay.get()) {
                     Vec3d staticPos = TileEntityRendererDispatcher.instance.renderInfo.getProjectedView();
                     renderPingOverlay(ping.pos.getX() - staticPos.getX(), ping.pos.getY() - staticPos.getY(), ping.pos.getZ() - staticPos.getZ(), ping);
+                    //renderPing(px, py, pz, renderEntity, ping);
                 }
-                renderPing(px, py, pz, renderEntity, ping);
             /*} else {
                 ping.isOffscreen = true;
                 translatePingCoordinates(px, py, pz, ping);
@@ -88,7 +86,7 @@ public static void onRenderWorld(RenderWorldLastEvent event) {
     }
 
     @SubscribeEvent
-    public static void onRenderOverlay(RenderGameOverlayEvent.Post event) {
+    public static void renderPingOffscreen(RenderGameOverlayEvent.Post event) {
         Minecraft mc = Minecraft.getInstance();
         if (event.getType() == RenderGameOverlayEvent.ElementType.TEXT) {
             for (PingWrapper ping : active_pings) {
@@ -196,9 +194,9 @@ public static void onClientTick(TickEvent.ClientTickEvent event) {
 
     private static void renderPing(double px, double py, double pz, Entity renderEntity, PingWrapper ping) {
         RenderSystem.pushMatrix();
-
         RenderSystem.disableDepthTest();
         RenderSystem.translated(px, py, pz);
+        //System.out.println("X:" + px + " Y:" + py + " Z:" + pz);
 
         RenderSystem.rotatef(-renderEntity.rotationYaw, 0.0F, 1.0F, 0.0F);
         RenderSystem.rotatef(renderEntity.rotationPitch, 1.0F, 0.0F, 0.0F);
@@ -243,6 +241,7 @@ private static void renderPingOverlay(double x, double y, double z, PingWrapper
         float padding = 0F + (0.20F * (float) ping.animationTimer / (float) 20);
         float box = 1 + padding + padding;
 
+        //System.out.println("X:" + x + " Y:" + y + " Z:" + z);
         RenderSystem.pushMatrix();
         RenderSystem.enableBlend();
         RenderSystem.blendFuncSeparate(770, 771, 1, 0);

diff --git a/src/main/java/dmillerw/ping/client/PingRenderHelper.java b/src/main/java/dmillerw/ping/client/PingRenderHelper.java
@@ -9,15 +9,15 @@
 
 public class PingRenderHelper {
 
-    public static void drawBlockOverlay(float width, float height, float length, TextureAtlasSprite icon, int func_225586_a_, int alpha) {
+    public static void drawBlockOverlay(float width, float height, float length, TextureAtlasSprite icon, int color, int alpha) {
         Minecraft mc = Minecraft.getInstance();
         Tessellator tessellator = Tessellator.getInstance();
         BufferBuilder bufferBuilder = tessellator.getBuffer();
 
         bufferBuilder.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
-        int r = func_225586_a_ >> 16 & 255;
-        int g = func_225586_a_ >> 8 & 255;
-        int b = func_225586_a_ & 255;
+        int r = color >> 16 & 255;
+        int g = color >> 8 & 255;
+        int b = color & 255;
 
         mc.getTextureManager().bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE);