Add a few checks to make pings not show under certain conditions

GirafiStudios · Jan 4, 2020 · ab78c45 · ab78c45
1 parent 4a5cf7b
commit ab78c45
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 minecraft_version=1.15.1
-forge_version=30.0.18
+forge_version=30.0.22
 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
@@ -44,7 +44,6 @@ public class PingHandler {
     public static final ResourceLocation TEXTURE = new ResourceLocation(Ping.MOD_ID, "textures/ping.png");
     private static final RenderType PING_RENDER = RenderType.func_228638_b_(TEXTURE);
     private static List<PingWrapper> active_pings = new ArrayList<>();
-    private static MatrixStack matrixStack;
 
     public void onPingPacket(ServerBroadcastPing packet) {
         Minecraft mc = Minecraft.getInstance();
@@ -94,7 +93,6 @@ public static void onRenderWorld(RenderWorldLastEvent event) {
                 renderPing(px, py, pz, event.getMatrixStack(), renderEntity, ping);
             } else {
                 ping.isOffscreen = true;
-                matrixStack = event.getMatrixStack();
                 translatePingCoordinates(px, py, pz, ping);
             }
         }
@@ -105,7 +103,7 @@ public static void renderPingOffscreen(RenderGameOverlayEvent.Post event) {
         Minecraft mc = Minecraft.getInstance();
         if (event.getType() == RenderGameOverlayEvent.ElementType.TEXT) {
             for (PingWrapper ping : active_pings) {
-                if (!ping.isOffscreen) {
+                if (!ping.isOffscreen || mc.currentScreen != null || mc.gameSettings.showDebugInfo) {
                     continue;
                 }
                 int width = mc.func_228018_at_().getWidth();
@@ -148,7 +146,7 @@ public static void renderPingOffscreen(RenderGameOverlayEvent.Post event) {
                 pingX += width * 0.5D;
                 pingY += height * 0.5D;
 
-                MatrixStack matrixStack = PingHandler.matrixStack;
+                MatrixStack matrixStack = new MatrixStack();
                 matrixStack.func_227860_a_();
                 MatrixStack.Entry matrixEntry = matrixStack.func_227866_c_();
                 Matrix4f matrix4f = matrixEntry.func_227870_a_();
@@ -174,7 +172,7 @@ public static void renderPingOffscreen(RenderGameOverlayEvent.Post event) {
                 VertexHelper.renderPosTexColor(vertexBuilder, matrix4f, matrix3f, min, min, PingType.BACKGROUND.minU, PingType.BACKGROUND.minV, r, g, b, 255);
 
                 // Ping Notice Icon
-                int alpha = ping.type == PingType.ALERT ? mc.world != null ? (int) (1.3F + Math.sin(mc.world.getDayTime())) : (int) 1.0F : (int) 1.0F;
+                float alpha = ping.type == PingType.ALERT ? mc.world != null ? (float) (1.3F + Math.sin(mc.world.getDayTime())) : 1.0F : 1.0F;
                 VertexHelper.renderPosTexColor(vertexBuilder, matrix4f, matrix3f, min, max, ping.type.minU, ping.type.maxV, 1.0F, 1.0F, 1.0F, alpha);
                 VertexHelper.renderPosTexColor(vertexBuilder, matrix4f, matrix3f, max, max, ping.type.maxU, ping.type.maxV, 1.0F, 1.0F, 1.0F, alpha);
                 VertexHelper.renderPosTexColor(vertexBuilder, matrix4f, matrix3f, max, min, ping.type.maxU, ping.type.minV, 1.0F, 1.0F, 1.0F, alpha);
@@ -235,7 +233,7 @@ private static void renderPing(double px, double py, double pz, MatrixStack matr
         VertexHelper.renderPosTexColor(vertexBuilder, matrix4f, matrix3f, min, min, PingType.BACKGROUND.minU, PingType.BACKGROUND.maxV, r, g, b, 255);
 
         // Block Overlay Icon
-        int alpha = ping.type == PingType.ALERT ? mc.world != null ? (int) (1.3F + Math.sin(mc.world.getDayTime())) : 175 : 175;
+        float alpha = ping.type == PingType.ALERT ? mc.world != null ? (float) (1.3F + Math.sin(mc.world.getDayTime())) : 0.68F : 0.68F;
         VertexHelper.renderPosTexColor(vertexBuilder, matrix4f, matrix3f, min, max, ping.type.minU, ping.type.maxV, 1.0F, 1.0F, 1.0F, alpha);
         VertexHelper.renderPosTexColor(vertexBuilder, matrix4f, matrix3f, max, max, ping.type.minU, ping.type.maxV, 1.0F, 1.0F, 1.0F, alpha);
         VertexHelper.renderPosTexColor(vertexBuilder, matrix4f, matrix3f, max, min, ping.type.minU, ping.type.maxV, 1.0F, 1.0F, 1.0F, alpha);