Catches any errors that occur when triggering events.

It is pretty annoying for the game to crash because of a GUI mod. This should reduce that.

src/main/java/markil3/immersive_hud/mixin/ClientPlayerHook.java

@@ -21,6 +21,8 @@ import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.util.Hand;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -38,6 +40,9 @@ import markil3.immersive_hud.TimerUtils;
 @Mixin(ClientPlayerEntity.class)
 public class ClientPlayerHook
 {
+    private static final Logger LOGGER =
+            LogManager.getLogger(ClientPlayerHook.class);
+
     /**
      * Updates hand timing every time an attack is initiated.
      *
@@ -48,9 +53,20 @@ public class ClientPlayerHook
      */
     @Inject(method = "swingHand", at = @At(value = "TAIL"))
     public void swingHand(Hand hand, CallbackInfo callbackInfo)
+    {
+        try
         {
             TimerUtils.onClick(hand, hand == null);
         }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.network" +
+                            ".ClientPlayerEntity#swingHand " +
+                            "event",
+                    e);
+        }
+    }
 
     /**
      * Updates hand timing every time an item is used.
@@ -62,9 +78,20 @@ public class ClientPlayerHook
      */
     @Inject(method = "setCurrentHand", at = @At(value = "TAIL"))
     public void setCurrentHand(Hand hand, CallbackInfo callbackInfo)
+    {
+        try
         {
             TimerUtils.onClick(hand, hand == null);
         }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.network" +
+                            ".ClientPlayerEntity#setCurrentHand " +
+                            "event",
+                    e);
+        }
+    }
 
     /**
      * Updates hand timing every the hand is no longer being used.
@@ -75,6 +102,8 @@ public class ClientPlayerHook
      */
     @Inject(method = "clearActiveItem", at = @At(value = "HEAD"))
     public void clearActiveItem(CallbackInfo callbackInfo)
+    {
+        try
         {
             if (MinecraftClient.getInstance().cameraEntity instanceof LivingEntity)
             {
@@ -82,4 +111,13 @@ public class ClientPlayerHook
                         .getActiveHand(), true);
             }
         }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.network" +
+                            ".ClientPlayerEntity#clearActiveItem " +
+                            "event",
+                    e);
+        }
+    }
 }

src/main/java/markil3/immersive_hud/mixin/HeldItemHook.java

@@ -21,6 +21,8 @@ import net.minecraft.client.render.FirstPersonRenderer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.Hand;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -38,6 +40,8 @@ import markil3.immersive_hud.TimerUtils;
 @Mixin(FirstPersonRenderer.class)
 public class HeldItemHook
 {
+    private static final Logger LOGGER = LogManager.getLogger(HeldItemHook.class);
+
     /**
      * Determines whether or not to render a certain hand.
      *
@@ -60,11 +64,22 @@ public class HeldItemHook
                            ItemStack itemStack,
                            float i,
                            CallbackInfo callbackInfo)
+    {
+        try
         {
         if (TimerUtils.onRenderHand(hand, f))
         {
             callbackInfo.cancel();
         }
         }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.render" +
+                            ".FirstPersonRenderer#renderFirstPersonItem " +
+                            "event",
+                    e);
+        }
+    }
 
 }

src/main/java/markil3/immersive_hud/mixin/HudHook.java

@@ -44,7 +44,7 @@ import markil3.immersive_hud.TimerUtils;
 @Mixin(InGameHud.class)
 public class HudHook
 {
-    private static final Logger logger = LogManager.getLogger(HudHook.class);
+    private static final Logger LOGGER = LogManager.getLogger(HudHook.class);
 
     private StatusEffectInstance currentEffect;
 
@@ -60,13 +60,24 @@ public class HudHook
             cancellable = true)
     public void startCrosshair(CallbackInfo callbackInfo)
     {
-        logger.debug("Starting crosshair");
+        LOGGER.debug("Starting crosshair");
+        try
+        {
             if (TimerUtils.drawCrosshair(MinecraftClient.getInstance()
                     .getTickDelta()))
             {
                 callbackInfo.cancel();
             }
         }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.gui.hud" +
+                            ".InGameHud#renderCrosshair " +
+                            "event",
+                    e);
+        }
+    }
 
     /**
      * Resets any changes from drawing the crosshair.
@@ -79,12 +90,23 @@ public class HudHook
     @Inject(method = "renderCrosshair", at = @At(value = "TAIL"))
     public void finishCrosshair(CallbackInfo callbackInfo)
     {
-        logger.debug("Finishing crosshair");
+        LOGGER.debug("Finishing crosshair");
+        try
+        {
             /*
              * Resets the color so that nothing else is bothered.
              */
             TimerUtils.resetAlpha();
         }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.gui.hud" +
+                            ".InGameHud#renderCrosshair " +
+                            "event",
+                    e);
+        }
+    }
 
     /**
      * Determines whether or not to draw the horse jump bar.
@@ -98,12 +120,24 @@ public class HudHook
             cancellable = true)
     public void startJumpbar(int x, CallbackInfo callbackInfo)
     {
-        logger.debug("Starting jumpbar");
+        LOGGER.debug("Starting jumpbar");
-        if (TimerUtils.drawJumpbar(MinecraftClient.getInstance().getTickDelta()))
+        try
+        {
+            if (TimerUtils.drawJumpbar(MinecraftClient.getInstance()
+                    .getTickDelta()))
             {
                 callbackInfo.cancel();
             }
         }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.gui.hud" +
+                            ".InGameHud#renderMountJumpBar " +
+                            "event",
+                    e);
+        }
+    }
 
     /**
      * Resets any changes from drawing the horse jump bar.
@@ -118,13 +152,24 @@ public class HudHook
             int x,
             CallbackInfo callbackInfo)
     {
-        logger.debug("Finishing jumpbar");
+        LOGGER.debug("Finishing jumpbar");
+        try
+        {
             GlStateManager.popMatrix();
             /*
              * Resets the color so that nothing else is bothered.
              */
             TimerUtils.resetAlpha();
         }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.gui.hud" +
+                            ".InGameHud#renderMountJumpBar " +
+                            "event",
+                    e);
+        }
+    }
 
     /**
      * Determines whether or not to draw the experience bar.
@@ -138,12 +183,24 @@ public class HudHook
             cancellable = true)
     public void startExperience(int x, CallbackInfo callbackInfo)
     {
-        logger.debug("Starting experience bar");
+        LOGGER.debug("Starting experience bar");
-        if (TimerUtils.drawExperience(MinecraftClient.getInstance().getTickDelta()))
+        try
+        {
+            if (TimerUtils.drawExperience(MinecraftClient.getInstance()
+                    .getTickDelta()))
             {
                 callbackInfo.cancel();
             }
         }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.gui.hud" +
+                            ".InGameHud#renderExperienceBar " +
+                            "event",
+                    e);
+        }
+    }
 
     /**
      * Resets any changes from drawing the experience bar.
@@ -156,27 +213,50 @@ public class HudHook
     @Inject(method = "renderExperienceBar", at = @At(value = "TAIL"))
     public void finishExperience(int x, CallbackInfo callbackInfo)
     {
-        logger.debug("Finishing experience bar");
+        LOGGER.debug("Finishing experience bar");
+        try
+        {
             GlStateManager.popMatrix();
             /*
              * Resets the color so that nothing else is bothered.
              */
             TimerUtils.resetAlpha();
         }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.gui.hud" +
+                            ".InGameHud#renderExperienceBar " +
+                            "event",
+                    e);
+        }
+    }
 
     /**
      * Changes the position of the status bars as the ones below them move up
      * and down.
      *
-     *
      * @return The same matrix stack, with a new matrix pushed onto it.
      */
     @Inject(method = "renderStatusBars", at = @At("HEAD"))
     public void startStatus(CallbackInfo info)
     {
-        logger.debug("Starting status bars");
+        LOGGER.debug("Starting status bars");
+        try
+        {
             GlStateManager.pushMatrix();
-        GlStateManager.translatef(0F, TimerUtils.getHealthTranslation(), 0F);
+            GlStateManager.translatef(0F,
+                    TimerUtils.getHealthTranslation(),
+                    0F);
+        }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.gui.hud" +
+                            ".InGameHud#renderStatusBars " +
+                            "event",
+                    e);
+        }
     }
 
     /**
@@ -190,12 +270,23 @@ public class HudHook
                     "(Ljava/lang/String;)V"))
     public void renderArmor(CallbackInfo callbackInfo)
     {
-        logger.debug("Rendering armor");
+        LOGGER.debug("Rendering armor");
+        try
+        {
             if (TimerUtils.drawArmor())
             {
                 TimerUtils.setAlpha(0F);
             }
         }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.gui.hud" +
+                            ".InGameHud#renderStatusBars " +
+                            "event",
+                    e);
+        }
+    }
 
     /**
      * Adjusts the health GUI.
@@ -209,61 +300,111 @@ public class HudHook
             ordinal = 0))
     public void renderHealth(CallbackInfo callbackInfo)
     {
-        logger.debug("Rendering health");
+        LOGGER.debug("Rendering health");
+        try
+        {
             /*
              * Resets the transparency from the previous call.
              */
             TimerUtils.setAlpha(1F);
-        if (TimerUtils.drawHealth(MinecraftClient.getInstance().getTickDelta()))
+            if (TimerUtils.drawHealth(MinecraftClient.getInstance()
+                    .getTickDelta()))
             {
                 TimerUtils.setAlpha(0F);
             }
         }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.gui.hud" +
+                            ".InGameHud#renderStatusBars " +
+                            "event",
+                    e);
+        }
+    }
 
     /**
      * Adjusts the food GUI.
      *
      * @param callbackInfo
      */
-    @Inject(method = "renderStatusBars()V", at = @At(value = "INVOKE", target = "Lnet" +
+    @Inject(method = "renderStatusBars()V", at = @At(value = "INVOKE",
-            "/minecraft/util/profiler/Profiler;swap(Ljava/lang/String;)V",
+            target = "Lnet" +
+                    "/minecraft/util/profiler/Profiler;swap" +
+                    "(Ljava/lang/String;)V",
             ordinal = 1))
     public void renderFood(CallbackInfo callbackInfo)
     {
-        logger.debug("Rendering food");
+        LOGGER.debug("Rendering food");
+        try
+        {
             /*
              * Resets the transparency from the previous call.
              */
             TimerUtils.setAlpha(1F);
-        if (TimerUtils.drawHunger(MinecraftClient.getInstance().getTickDelta()))
+            if (TimerUtils.drawHunger(MinecraftClient.getInstance()
+                    .getTickDelta()))
             {
                 TimerUtils.setAlpha(0F);
             }
         }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.gui.hud" +
+                            ".InGameHud#renderStatusBars " +
+                            "event",
+                    e);
+        }
+    }
 
     /**
      * Resets the air GUI.
      *
      * @param callbackInfo
      */
-    @Inject(method = "renderStatusBars()V", at = @At(value = "INVOKE", target = "Lnet" +
+    @Inject(method = "renderStatusBars()V", at = @At(value = "INVOKE",
-            "/minecraft/util/profiler/Profiler;swap(Ljava/lang/String;)V",
+            target = "Lnet" +
+                    "/minecraft/util/profiler/Profiler;swap" +
+                    "(Ljava/lang/String;)V",
             ordinal = 2))
     public void renderAir(CallbackInfo callbackInfo)
     {
-        logger.debug("Rendering air");
+        LOGGER.debug("Rendering air");
+        try
+        {
             /*
              * Resets the color so that nothing else is bothered.
              */
             TimerUtils.setAlpha(1F);
         }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.gui.hud" +
+                            ".InGameHud#renderStatusBars " +
+                            "event",
+                    e);
+        }
+    }
 
     @Inject(method = "renderStatusBars", at = @At("TAIL"))
     public void finishStatus(CallbackInfo info)
     {
-        logger.debug("Finishing status bars");
+        LOGGER.debug("Finishing status bars");
+        try
+        {
             GlStateManager.popMatrix();
         }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.gui.hud" +
+                            ".InGameHud#renderStatusBars " +
+                            "event",
+                    e);
+        }
+    }
 
     /**
      * Determines whether or not to draw the mount's health.
@@ -277,13 +418,25 @@ public class HudHook
             cancellable = true)
     public void startMountHealth(CallbackInfo callbackInfo)
     {
-        if (TimerUtils.drawMountHealth(MinecraftClient.getInstance().getTickDelta()))
+        try
+        {
+            if (TimerUtils.drawMountHealth(MinecraftClient.getInstance()
+                    .getTickDelta()))
             {
                 callbackInfo.cancel();
             }
             else
             {
-            logger.debug("Starting mount health");
+                LOGGER.debug("Starting mount health");
+            }
+        }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.gui.hud" +
+                            ".InGameHud#renderMountHealth " +
+                            "event",
+                    e);
         }
     }
 
@@ -298,13 +451,24 @@ public class HudHook
     @Inject(method = "renderMountHealth", at = @At(value = "TAIL"))
     public void finishMountHealth(CallbackInfo callbackInfo)
     {
-        logger.debug("Finishing mount health");
+        LOGGER.debug("Finishing mount health");
+        try
+        {
             /*
              * Resets the color so that nothing else is bothered.
              */
             GlStateManager.popMatrix();
             TimerUtils.resetAlpha();
         }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.gui.hud" +
+                            ".InGameHud#renderMountHealth " +
+                            "event",
+                    e);
+        }
+    }
 
     /**
      * Makes the actual adjustment to the hotbar as needed.
@@ -316,11 +480,22 @@ public class HudHook
     @At(value = "HEAD", shift = At.Shift.AFTER))
     public void startPotion(CallbackInfo info)
     {
-        logger.debug("Starting potions");
+        LOGGER.debug("Starting potions");
+        try
+        {
             TimerUtils.updatePotions(MinecraftClient.getInstance().cameraEntity instanceof ClientPlayerEntity ?
                                      ((ClientPlayerEntity) MinecraftClient.getInstance().cameraEntity) :
                                      null);
         }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.gui.hud" +
+                            ".InGameHud#renderStatusEffectOverlay " +
+                            "event",
+                    e);
+        }
+    }
 
     /**
      * Makes the actual adjustment to the hotbar as needed.
@@ -335,11 +510,23 @@ public class HudHook
                             "shouldShowIcon()Z"))
     public boolean shouldRenderPotion(StatusEffectInstance effect)
     {
-        logger.debug("Updating potions");
+        LOGGER.debug("Updating potions");
+        try
+        {
             currentEffect = effect;
             return TimerUtils.updatePotion(effect,
                     MinecraftClient.getInstance().getTickDelta());
         }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.gui.hud" +
+                            ".InGameHud#renderStatusEffectOverlay " +
+                            "event",
+                    e);
+        }
+        return true;
+    }
 
     /**
      * Makes the actual adjustment to the hotbar as needed.
@@ -353,9 +540,21 @@ public class HudHook
     @At(value = "STORE"))
     public float updatePotion(float f)
     {
-        logger.debug("Adjusting potions");
+        LOGGER.debug("Adjusting potions");
+        try
+        {
             return TimerUtils.getPotionAlpha(currentEffect);
         }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.gui.hud" +
+                            ".InGameHud#renderStatusEffectOverlay " +
+                            "event",
+                    e);
+        }
+        return 1F;
+    }
 
     /**
      * Resets any changes from drawing the potion effects.
@@ -368,12 +567,23 @@ public class HudHook
     @Inject(method = "renderStatusEffectOverlay", at = @At(value = "TAIL"))
     public void finishPotion(CallbackInfo callbackInfo)
     {
-        logger.debug("Finishing potions");
+        LOGGER.debug("Finishing potions");
+        try
+        {
             /*
              * Resets the color so that nothing else is bothered.
              */
             TimerUtils.resetAlpha();
         }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.gui.hud" +
+                            ".InGameHud#renderStatusEffectOverlay " +
+                            "event",
+                    e);
+        }
+    }
 
     /**
      * Determines whether or not to draw the hotbar.
@@ -389,12 +599,23 @@ public class HudHook
     public void startHotbar(float tickDelta,
                             CallbackInfo callbackInfo)
     {
-        logger.debug("Starting hotbar");
+        LOGGER.debug("Starting hotbar");
+        try
+        {
             if (TimerUtils.updateHotbar(tickDelta))
             {
                 callbackInfo.cancel();
             }
         }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.gui.hud" +
+                            ".InGameHud#renderHotbar " +
+                            "event",
+                    e);
+        }
+    }
 
     /**
      * Makes the actual adjustment to the hotbar as needed.
@@ -411,9 +632,20 @@ public class HudHook
     public void adjustHotbar(float tickDelta,
                              CallbackInfo callbackInfo)
     {
-        logger.debug("Adjusting hotbar");
+        LOGGER.debug("Adjusting hotbar");
+        try
+        {
             TimerUtils.recolorHotbar();
         }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.gui.hud" +
+                            ".InGameHud#renderHotbar " +
+                            "event",
+                    e);
+        }
+    }
 
     /**
      * Resets any changes from drawing the hotbar.
@@ -428,11 +660,21 @@ public class HudHook
     public void finishHotbar(float tickDelta,
                              CallbackInfo callbackInfo)
     {
-        logger.debug("Finishing hotbar");
+        LOGGER.debug("Finishing hotbar");
+        try
+        {
             GlStateManager.popMatrix();
             /*
              * Resets the color so that nothing else is bothered.
              */
             TimerUtils.resetAlpha();
         }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.gui.hud.InGameHud#renderHotbar " +
+                            "event",
+                    e);
+        }
+    }
 }