Update gradle.properties

This is helpful if one is using Firework rockets to fly around the landscape

gradle.properties

@@ -12,6 +12,6 @@ modmenu_version=1.8.4+build.20
 autoconfig_version=2.2.0
 
 # Mod Properties
-	mod_version = 1.0
+	mod_version = 1.2
 	maven_group = markil3
 	archives_base_name = immersive_hud

src/main/java/markil3/immersive_hud/ConfigManager.java

@@ -1,11 +1,19 @@
 package markil3.immersive_hud;
 
+import net.minecraft.item.Item;
+import net.minecraft.item.Items;
+import net.minecraft.util.Identifier;
 import net.minecraft.util.math.MathHelper;
+import net.minecraft.util.registry.Registry;
 
 import me.sargunvohra.mcmods.autoconfig1u.AutoConfig;
 
 import static markil3.immersive_hud.Main.TICKS_PER_SECOND;
 
+import java.util.Arrays;
+import java.util.Set;
+import java.util.stream.Collectors;
+
 /**
  * Configuration manager of this mod, which reads from and writes to this mod's
  * configuration file.
@@ -82,10 +90,13 @@ public class ConfigManager
     private TimeValues hungerTime = new TimeValues();
     private TimeValues effectTime = new TimeValues();
     private int crosshairTime = 6 * TICKS_PER_SECOND;
+    private boolean hideCrosshair = true;
     private int handTime = 30 * TICKS_PER_SECOND;
+    private boolean hideHands = true;
     private boolean showArmor = true;
     private double minHealth = 0.5;
     private int minHunger = 17;
+    private Identifier[] ignoredItems = new Identifier[]{Registry.ITEM.getId(Items.FIREWORK_ROCKET)};
 
     /**
      * Returns the instance of this class.
@@ -184,6 +195,16 @@ public class ConfigManager
         return this.crosshairTime;
     }
 
+    /**
+     * Checks whether the crosshairs should be hidden after a period of time.
+     *
+     * @return - Whether or not crosshairs will be hidden.
+     */
+    public boolean hideCrosshair()
+    {
+        return this.hideCrosshair;
+    }
+
     /**
      * Obtains the time that the hands are allowed to display.
      *
@@ -194,6 +215,16 @@ public class ConfigManager
         return this.handTime;
     }
 
+    /**
+     * Checks whether hands should be hidden after a period of time.
+     *
+     * @return - Whether or not hands will be hidden.
+     */
+    public boolean hideHands()
+    {
+        return this.hideHands;
+    }
+
     /**
      * Checks whether the armor bar should render.
      *
@@ -226,6 +257,16 @@ public class ConfigManager
         return this.minHunger;
     }
 
+    /**
+     * Obtains a collection of items that won't cause hands and crosshairs to show when used.
+     *
+     * @return A set of ignored items.
+     */
+    public Set<Item> getIgnoredItems()
+    {
+        return Arrays.stream(ignoredItems).map(Registry.ITEM::get).collect(Collectors.toSet());
+    }
+
     /**
      * Sets the time that the hands are allowed to display.
      *
@@ -236,6 +277,16 @@ public class ConfigManager
         this.crosshairTime = time;
     }
 
+    /**
+     * Sets whether the crosshairs should be hidden after a period of time.
+     *
+     * @param hide - Whether or not crosshairs will be hidden.
+     */
+    public void hideCrosshair(boolean hide)
+    {
+        this.hideCrosshair = hide;
+    }
+
     /**
      * Sets the time that the hands are allowed to display.
      *
@@ -246,6 +297,16 @@ public class ConfigManager
         this.handTime = time;
     }
 
+    /**
+     * Sets whether hands should be hidden after a period of time.
+     *
+     * @param hide - Whether or not hands will be hidden.
+     */
+    public void hideHands(boolean hide)
+    {
+        this.hideHands = hide;
+    }
+
     /**
      * Determines whether the armor bar should render.
      *
@@ -277,6 +338,16 @@ public class ConfigManager
     {
         this.minHunger = MathHelper.clamp(boundary, 0, 20);
     }
+
+    /**
+     * Sets which items won't cause the hands and crosshairs to show when used.
+     *
+     * @param items - A set of ignored items.
+     */
+    public void setIgnoredItems(Item... items)
+    {
+        this.ignoredItems = Arrays.stream(items).map(Registry.ITEM::getId).toArray(Identifier[]::new);
+    }
 /**
      * Saves changes to this mod's configuration.
      */

src/main/java/markil3/immersive_hud/ModMenu.java

@@ -130,6 +130,14 @@ public class ModMenu implements ModMenuApi
                     .setSaveConsumer(val -> instance.setCrosshairTime((int) (val * TICKS_PER_SECOND)))
                     .build());
 
+            general.addEntry(entryBuilder.startBooleanToggle(
+                            "option.immersive_hud.hideCrosshair",
+                    instance.hideCrosshair())
+                    .setDefaultValue(true)
+                    .setTooltip("tooltip.immersive_hud.hideCrosshair")
+                    .setSaveConsumer(val -> instance.hideCrosshair(val))
+                    .build());
+
             general.addEntry(entryBuilder.startDoubleField(
                     "option.immersive_hud.handTime",
                     (float) instance.getHandTime() / TICKS_PER_SECOND)
@@ -138,6 +146,14 @@ public class ModMenu implements ModMenuApi
                     .setSaveConsumer(val -> instance.setHandTime((int) (val * TICKS_PER_SECOND)))
                     .build());
 
+            general.addEntry(entryBuilder.startBooleanToggle(
+                    "option.immersive_hud.hideHands",
+                    instance.hideHands())
+                    .setDefaultValue(true)
+                    .setTooltip("tooltip.immersive_hud.hideHands")
+                    .setSaveConsumer(val -> instance.hideHands(val))
+                    .build());
+
             general.addEntry(entryBuilder.startDoubleField(
                     "option.immersive_hud.minHealth",
                     instance.getMinHealth())

src/main/java/markil3/immersive_hud/TimerUtils.java

@@ -49,6 +49,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Optional;
+import java.util.Set;
 
 /**
  * Contains the logic for changing the HUD.
@@ -250,6 +251,8 @@ public class TimerUtils
                 ConfigManager.getInstance().getExperienceTime();
         ConfigManager.TimeValues jump =
                 ConfigManager.getInstance().getJumpTime();
+        ConfigManager.TimeValues healthTimes = ConfigManager.getInstance().getHealthTime();
+        ConfigManager.TimeValues hungerTimes = ConfigManager.getInstance().getHungerTime();
 
         float hotbarAlpha = Main.getAlpha(hotbarTime,
                 hotbar.getMaxTime(),
@@ -263,8 +266,21 @@ public class TimerUtils
                 jump.getMaxTime(),
                 jump.getFadeInTime(),
                 jump.getFadeOutTime());
+        float statusAlpha = Main.getAlpha(healthTime,
+                healthTimes.getMaxTime(),
+                healthTimes.getFadeInTime(),
+                healthTimes.getFadeOutTime());
+        statusAlpha = Math.max(statusAlpha, Main.getAlpha(hungerTime,
+                hungerTimes.getMaxTime(),
+                hungerTimes.getFadeInTime(),
+                hungerTimes.getFadeOutTime()));
+        /*
+         * Draw it in its standard location until it is completely transparent, then move it
+         * instantly.
+         */
+        statusAlpha = (float) Math.ceil(statusAlpha);
         return 7 * (1 - Math.max(experienceAlpha,
-                jumpAlpha)) + 22 * (1 - hotbarAlpha);
+                jumpAlpha)) + 22 * (1 - hotbarAlpha) + 42 * (1 - statusAlpha);
     }
 
     /**
@@ -272,9 +288,8 @@ public class TimerUtils
      * view, and briefly brings the health and hunger into view if the held item
      * is food.
      *
-     * @param hand - The hand being triggered
+     * @param hand  - The hand being triggered
      * @param clear - Whether the hand it being enabled or disabled.
-     *
      * @since 0.1-1.16.4-fabric
      */
     public static void onClick(Hand hand, boolean clear)
@@ -289,6 +304,7 @@ public class TimerUtils
         LivingEntity entity;
         Item item;
         Iterator<ItemStack> hands;
+        Set<Item> ignored;
         if (mc.getCameraEntity() instanceof LivingEntity)
         {
             entity = (LivingEntity) mc.getCameraEntity();
@@ -314,6 +330,14 @@ public class TimerUtils
                             .map(ItemStack::getItem)
                             .orElse(null);
         }
+        if (item != null)
+        {
+            ignored = ConfigManager.getInstance().getIgnoredItems();
+            if (ignored.contains(item))
+            {
+                return;
+            }
+        }
         crosshairTime = ConfigManager.getInstance().getCrosshairTime();
         if (hand == Hand.MAIN_HAND)
         {
@@ -330,11 +354,11 @@ public class TimerUtils
             if (item.isFood())
             {
                 healthTime = health.getMaxTime() - (healthTime > 0 ?
-                                                    health.getFadeInTime() :
+                        health.getFadeInTime() :
-                                                    0);
+                        0);
                 hungerTime = hunger.getMaxTime() - (hungerTime > 0 ?
-                                                    hunger.getFadeInTime() :
+                        hunger.getFadeInTime() :
-                                                    0);
+                        0);
             }
         }
     }
@@ -343,11 +367,9 @@ public class TimerUtils
      * Run whenever a hand is rendered in 1st person. This brings the player
      * hands into and out of view as needed.
      *
-     * @param hand - The hand being rendered.
+     * @param hand        - The hand being rendered.
      * @param matrixStack - The rendering stack.
-     *
      * @return If true, then don't render this hand at all.
-     *
      * @since 0.1-1.16.4-fabric
      */
     public static boolean onRenderHand(Hand hand,
@@ -356,50 +378,54 @@ public class TimerUtils
     {
         final float HAND_UP_TIME = 20F;
 
-        switch (hand)
+        boolean hideHands = ConfigManager.getInstance().hideHands();
+        if (hideHands)
         {
-        case OFF_HAND:
+            switch (hand)
-            if (offHandTime == 0 && !offHandLock)
             {
-                return true;
+            case OFF_HAND:
-            }
+                if (offHandTime == 0 && !offHandLock)
-            else if (!offHandLock && (mapLock & 0b01) == 0)
-            {
-                if (offHandTime > 0)
                 {
-                    offHandTime -= ticks;
+                    return true;
                 }
-                if (offHandTime < HAND_UP_TIME)
+                else if (!offHandLock && (mapLock & 0b01) == 0)
                 {
-                    matrixStack
+                    if (offHandTime > 0)
-                            .translate(0,
+                    {
-                                    -1.0F * (HAND_UP_TIME - offHandTime) /
+                        offHandTime -= ticks;
-                                            HAND_UP_TIME,
+                    }
-                                    0);
+                    if (offHandTime < HAND_UP_TIME)
+                    {
+                        matrixStack
+                                .translate(0,
+                                        -1.0F * (HAND_UP_TIME - offHandTime) /
+                                                HAND_UP_TIME,
+                                        0);
+                    }
                 }
-            }
+                break;
-            break;
+            case MAIN_HAND:
-        case MAIN_HAND:
+                if (mainHandTime == 0 && !mainHandLock)
-            if (mainHandTime == 0 && !mainHandLock)
-            {
-                return true;
-            }
-            else if (!mainHandLock && (mapLock & 0b10) == 0)
-            {
-                if (mainHandTime > 0)
                 {
-                    mainHandTime -= ticks;
+                    return true;
                 }
-                if (mainHandTime < HAND_UP_TIME)
+                else if (!mainHandLock && (mapLock & 0b10) == 0)
                 {
-                    matrixStack
+                    if (mainHandTime > 0)
-                            .translate(0,
+                    {
-                                    -1.0F * (HAND_UP_TIME - mainHandTime) /
+                        mainHandTime -= ticks;
-                                            HAND_UP_TIME,
+                    }
-                                    0);
+                    if (mainHandTime < HAND_UP_TIME)
+                    {
+                        matrixStack
+                                .translate(0,
+                                        -1.0F * (HAND_UP_TIME - mainHandTime) /
+                                                HAND_UP_TIME,
+                                        0);
+                    }
                 }
+                break;
             }
-            break;
         }
         return false;
     }
@@ -409,7 +435,6 @@ public class TimerUtils
      * needed.
      *
      * @return If true, then cancel drawing the crosshair.
-     *
      * @since 0.1-1.16.4-fabric
      */
     public static boolean drawCrosshair(float ticks)
@@ -422,37 +447,41 @@ public class TimerUtils
         boolean changed = false;
         boolean canceled = false;
 
-        if (mc.crosshairTarget != null && mc.crosshairTarget
+        boolean hideCrosshair = ConfigManager.getInstance().hideCrosshair();
-                .getType() != HitResult.Type.MISS)
+        if (hideCrosshair)
         {
-            if (mc.crosshairTarget.getType() == HitResult.Type
+            if (mc.crosshairTarget != null && mc.crosshairTarget
-                    .ENTITY)
+                    .getType() != HitResult.Type.MISS)
             {
-                if (((EntityHitResult) mc.crosshairTarget).getEntity() != entity
+                if (mc.crosshairTarget.getType() == HitResult.Type
-                        .getVehicle())
+                        .ENTITY)
+                {
+                    if (((EntityHitResult) mc.crosshairTarget).getEntity() != entity
+                            .getVehicle())
+                    {
+                        changed = true;
+                    }
+                }
+                else
                 {
                     changed = true;
                 }
             }
+            if (changed || mainHandLock || offHandLock || crosshairTime
+                    > 0)
+            {
+                setAlpha(Main.getAlpha(crosshairTime > 0 ?
+                        crosshairTime :
+                        CROSSHAIR_TIME, CROSSHAIR_TIME, 0, 0));
+            }
             else
             {
-                changed = true;
+                canceled = true;
+            }
+            if (crosshairTime > 0)
+            {
+                crosshairTime -= ticks;
             }
-        }
-        if (changed || mainHandLock || offHandLock || crosshairTime
-                > 0)
-        {
-            setAlpha(Main.getAlpha(crosshairTime > 0 ?
-                                   crosshairTime :
-                                   CROSSHAIR_TIME, CROSSHAIR_TIME, 0, 0));
-        }
-        else
-        {
-            canceled = true;
-        }
-        if (crosshairTime > 0)
-        {
-            crosshairTime -= ticks;
         }
         return canceled;
     }
@@ -462,7 +491,6 @@ public class TimerUtils
      * as needed.
      *
      * @return If true, then cancel drawing the mount health bar.
-     *
      * @since 0.1-1.16.4-fabric
      */
     public static boolean drawMountHealth(float ticks)
@@ -484,7 +512,7 @@ public class TimerUtils
         LivingEntity mount;
         boolean changed = false;
 
-        if (tmp == null)
+        if (tmp == null || !(tmp instanceof LivingEntity))
         {
             mountHealth = -1;
             mountMaxHealth = -1;
@@ -506,8 +534,8 @@ public class TimerUtils
         if (changed)
         {
             mountTime = healthTimes.getMaxTime() - (mountTime > 0 ?
-                                                    healthTimes.getFadeInTime() :
+                    healthTimes.getFadeInTime() :
-                                                    0);
+                    0);
         }
         else if (mountTime > 0)
         {
@@ -594,7 +622,6 @@ public class TimerUtils
      * Obtains how transparent
      *
      * @param effectinstance
-     *
      * @return
      */
     public static float getPotionAlpha(StatusEffectInstance effectinstance)
@@ -606,7 +633,8 @@ public class TimerUtils
         if (effectinstance.getDuration() <= BLINK_TIME)
         {
             effectAlpha =
-                    MathHelper.sin(7000F / (effectinstance.getDuration() + 16F * (float) Math.PI)) * 50F / (effectinstance
+                    MathHelper.sin(7000F / (effectinstance
+                            .getDuration() + 16F * (float) Math.PI)) * 50F / (effectinstance
                             .getDuration() + 100F) + 0.5F;
         }
         else if (effectinstance.getDuration() <= BLINK_TIME + potion.getFadeInTime())
@@ -631,7 +659,6 @@ public class TimerUtils
      * needed.
      *
      * @return If true, then cancel drawing the armor bar.
-     *
      * @since 0.1-1.16.4-fabric
      */
     public static boolean drawArmor()
@@ -659,7 +686,6 @@ public class TimerUtils
      * needed.
      *
      * @return If true, then cancel drawing the health.
-     *
      * @since 0.1-1.16.4-fabric
      */
     public static boolean drawHealth(float ticks)
@@ -703,8 +729,8 @@ public class TimerUtils
         if (changed)
         {
             healthTime = healthTimes.getMaxTime() - (healthTime > 0 ?
-                                                     healthTimes.getFadeInTime() :
+                    healthTimes.getFadeInTime() :
-                                                     0);
+                    0);
         }
         else if (healthTime > 0)
         {
@@ -735,7 +761,6 @@ public class TimerUtils
      * needed.
      *
      * @return If true, then cancel drawing the hunger bar.
-     *
      * @since 0.1-1.16.4-fabric
      */
     public static boolean drawHunger(float ticks)
@@ -782,8 +807,8 @@ public class TimerUtils
         if (changed)
         {
             hungerTime = hungerTimes.getMaxTime() - (hungerTime > 0 ?
-                                                     hungerTimes.getFadeInTime() :
+                    hungerTimes.getFadeInTime() :
-                                                     0);
+                    0);
         }
         else if (hungerTime > 0)
         {
@@ -814,7 +839,6 @@ public class TimerUtils
      * as needed.
      *
      * @return If true, then cancel drawing the jump bar.
-     *
      * @since 0.1-1.16.4-fabric
      */
     public static boolean drawJumpbar(float ticks)
@@ -836,8 +860,8 @@ public class TimerUtils
         if (entity.method_3151() > 0)
         {
             jumpTime = jump.getMaxTime() - (jumpTime > 0 ?
-                                            jump.getFadeInTime() :
+                    jump.getFadeInTime() :
-                                            0);
+                    0);
         }
         else if (jumpTime > 0)
         {
@@ -861,7 +885,6 @@ public class TimerUtils
      * as needed.
      *
      * @return If true, then cancel drawing the experience bar.
-     *
      * @since 0.1-1.16.4-fabric
      */
     public static boolean drawExperience(float ticks)
@@ -890,8 +913,8 @@ public class TimerUtils
         if (changed)
         {
             experienceTime = experience.getMaxTime() - (experienceTime > 0 ?
-                                                        experience.getFadeInTime() :
+                    experience.getFadeInTime() :
-                                                        0);
+                    0);
         }
         else if (experienceTime > 0)
         {
@@ -900,7 +923,9 @@ public class TimerUtils
         if (experienceTime > 0)
         {
             RenderSystem.pushMatrix();
-            RenderSystem.translatef(0F, TimerUtils.getExperienceTranslation(), 0F);
+            RenderSystem.translatef(0F,
+                    TimerUtils.getExperienceTranslation(),
+                    0F);
             setAlpha(Main.getAlpha(experienceTime,
                     experience.getMaxTime(),
                     experience.getFadeInTime(),
@@ -916,7 +941,6 @@ public class TimerUtils
      * or not to draw it.
      *
      * @return If true, then cancel drawing the hotbar.
-     *
      * @see #recolorHotbar()
      * @since 0.1-1.16.4-fabric
      */
@@ -1025,7 +1049,7 @@ public class TimerUtils
                 {
                     if (entity.isUsingItem() && entity
                             .getActiveHand() != null && entity.getActiveHand()
-                            .ordinal() == i)
+                                                              .ordinal() == i)
                     {
                         switch (i)
                         {
@@ -1088,11 +1112,11 @@ public class TimerUtils
                 if (item.isFood())
                 {
                     healthTime = health.getMaxTime() - (healthTime > 0 ?
-                                                        health.getFadeInTime() :
+                            health.getFadeInTime() :
-                                                        0);
+                            0);
                     hungerTime = hunger.getMaxTime() - (hungerTime > 0 ?
-                                                        hunger.getFadeInTime() :
+                            hunger.getFadeInTime() :
-                                                        0);
+                            0);
                 }
                 if (i == 0)
                 {
@@ -1121,8 +1145,8 @@ public class TimerUtils
         if (changed)
         {
             hotbarTime = hotbar.getMaxTime() - (hotbarTime > 0 ?
-                                                hotbar.getFadeInTime() :
+                    hotbar.getFadeInTime() :
-                                                0);
+                    0);
         }
         else if (hotbarTime > 0)
         {
@@ -1137,7 +1161,6 @@ public class TimerUtils
      * needed.
      *
      * @return If true, then cancel drawing the crosshair.
-     *
      * @since 0.1-1.16.4-fabric
      */
     public static void recolorHotbar()

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.
      *
@@ -49,7 +54,18 @@ public class ClientPlayerHook
     @Inject(method = "swingHand", at = @At(value = "TAIL"))
     public void swingHand(Hand hand, CallbackInfo callbackInfo)
     {
-        TimerUtils.onClick(hand, hand == null);
+        try
+        {
+            TimerUtils.onClick(hand, hand == null);
+        }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.network" +
+                            ".ClientPlayerEntity#swingHand " +
+                            "event",
+                    e);
+        }
     }
 
     /**
@@ -63,7 +79,18 @@ public class ClientPlayerHook
     @Inject(method = "setCurrentHand", at = @At(value = "TAIL"))
     public void setCurrentHand(Hand hand, CallbackInfo callbackInfo)
     {
-        TimerUtils.onClick(hand, hand == null);
+        try
+        {
+            TimerUtils.onClick(hand, hand == null);
+        }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.network" +
+                            ".ClientPlayerEntity#setCurrentHand " +
+                            "event",
+                    e);
+        }
     }
 
     /**
@@ -76,10 +103,21 @@ public class ClientPlayerHook
     @Inject(method = "clearActiveItem", at = @At(value = "HEAD"))
     public void clearActiveItem(CallbackInfo callbackInfo)
     {
-        if (MinecraftClient.getInstance().cameraEntity instanceof LivingEntity)
+        try
         {
-            TimerUtils.onClick(((LivingEntity) MinecraftClient.getInstance().cameraEntity)
+            if (MinecraftClient.getInstance().cameraEntity instanceof LivingEntity)
-                    .getActiveHand(), true);
+            {
+                TimerUtils.onClick(((LivingEntity) MinecraftClient.getInstance().cameraEntity)
+                        .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

@@ -23,6 +23,8 @@ import net.minecraft.client.util.math.MatrixStack;
 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;
@@ -40,6 +42,9 @@ import markil3.immersive_hud.TimerUtils;
 @Mixin(HeldItemRenderer.class)
 public class HeldItemHook
 {
+    private static final Logger LOGGER =
+            LogManager.getLogger(HeldItemHook.class);
+
     /**
      * Determines whether or not to render a certain hand.
      *
@@ -72,9 +77,20 @@ public class HeldItemHook
                            int light,
                            CallbackInfo callbackInfo)
     {
-        if (TimerUtils.onRenderHand(hand, matrices, tickDelta))
+        try
         {
-            callbackInfo.cancel();
+            if (TimerUtils.onRenderHand(hand, matrices, tickDelta))
+            {
+                callbackInfo.cancel();
+            }
+        }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.render.item" +
+                            ".HeldItemRenderer#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,11 +60,22 @@ public class HudHook
             cancellable = true)
     public void startCrosshair(CallbackInfo callbackInfo)
     {
-        logger.debug("Starting crosshair");
+        LOGGER.debug("Starting crosshair");
-        if (TimerUtils.drawCrosshair(MinecraftClient.getInstance()
+        try
-                .getTickDelta()))
         {
-            callbackInfo.cancel();
+            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);
         }
     }
 
@@ -79,11 +90,22 @@ 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();
+             * 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);
+        }
     }
 
     /**
@@ -98,10 +120,22 @@ 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
         {
-            callbackInfo.cancel();
+            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);
         }
     }
 
@@ -118,12 +152,23 @@ public class HudHook
             int x,
             CallbackInfo callbackInfo)
     {
-        logger.debug("Finishing jumpbar");
+        LOGGER.debug("Finishing jumpbar");
-        RenderSystem.popMatrix();
+        try
-        /*
+        {
-         * Resets the color so that nothing else is bothered.
+            RenderSystem.popMatrix();
-         */
+            /*
-        TimerUtils.resetAlpha();
+             * 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);
+        }
     }
 
     /**
@@ -138,10 +183,22 @@ 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
         {
-            callbackInfo.cancel();
+            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);
         }
     }
 
@@ -156,27 +213,48 @@ 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");
-        RenderSystem.popMatrix();
+        try
-        /*
+        {
-         * Resets the color so that nothing else is bothered.
+            RenderSystem.popMatrix();
-         */
+            /*
-        TimerUtils.resetAlpha();
+             * 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");
-        RenderSystem.pushMatrix();
+        try
-        RenderSystem.translatef(0F, TimerUtils.getHealthTranslation(), 0F);
+        {
+            RenderSystem.pushMatrix();
+            RenderSystem.translatef(0F, TimerUtils.getHealthTranslation(), 0F);
+        }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.gui.hud" +
+                            ".InGameHud#renderStatusBars " +
+                            "event",
+                    e);
+        }
     }
 
     /**
@@ -190,10 +268,21 @@ public class HudHook
                     "(Ljava/lang/String;)V"))
     public void renderArmor(CallbackInfo callbackInfo)
     {
-        logger.debug("Rendering armor");
+        LOGGER.debug("Rendering armor");
-        if (TimerUtils.drawArmor())
+        try
         {
-            TimerUtils.setAlpha(0F);
+            if (TimerUtils.drawArmor())
+            {
+                TimerUtils.setAlpha(0F);
+            }
+        }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.gui.hud" +
+                            ".InGameHud#renderStatusBars " +
+                            "event",
+                    e);
         }
     }
 
@@ -209,14 +298,26 @@ 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()))
         {
-            TimerUtils.setAlpha(0F);
+            /*
+             * Resets the transparency from the previous call.
+             */
+            TimerUtils.setAlpha(1F);
+            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);
         }
     }
 
@@ -225,19 +326,32 @@ public class HudHook
      *
      * @param callbackInfo
      */
-    @Inject(method = "renderStatusBars()V", at = @At(value = "INVOKE", target = "Lnet" +
+    @Inject(method = "renderStatusBars()V", at = @At(value = "INVOKE",
+            target = "Lnet" +
             "/minecraft/util/profiler/Profiler;swap(Ljava/lang/String;)V",
-            ordinal = 1))
+            ordinal = 1, shift = At.Shift.BY, by = 3))
     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()))
         {
-            TimerUtils.setAlpha(0F);
+            /*
+             * Resets the transparency from the previous call.
+             */
+            TimerUtils.setAlpha(1F);
+            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);
         }
     }
 
@@ -246,23 +360,46 @@ public class HudHook
      *
      * @param callbackInfo
      */
-    @Inject(method = "renderStatusBars()V", at = @At(value = "INVOKE", target = "Lnet" +
+    @Inject(method = "renderStatusBars()V", at = @At(value = "INVOKE",
+            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);
+             * 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");
-        RenderSystem.popMatrix();
+        try
+        {
+            RenderSystem.popMatrix();
+        }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.gui.hud" +
+                            ".InGameHud#renderStatusBars " +
+                            "event",
+                    e);
+        }
     }
 
     /**
@@ -277,13 +414,25 @@ public class HudHook
             cancellable = true)
     public void startMountHealth(CallbackInfo callbackInfo)
     {
-        if (TimerUtils.drawMountHealth(MinecraftClient.getInstance().getTickDelta()))
+        try
         {
-            callbackInfo.cancel();
+            if (TimerUtils.drawMountHealth(MinecraftClient.getInstance()
+                    .getTickDelta()))
+            {
+                callbackInfo.cancel();
+            }
+            else
+            {
+                LOGGER.debug("Starting mount health");
+            }
         }
-        else
+        catch (Exception e)
         {
-            logger.debug("Starting mount health");
+            LOGGER.error(
+                    "Error in running net.minecraft.client.gui.hud" +
+                            ".InGameHud#renderMountHealth " +
+                            "event",
+                    e);
         }
     }
 
@@ -298,12 +447,23 @@ 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.
+        {
-         */
+            /*
-        RenderSystem.popMatrix();
+             * Resets the color so that nothing else is bothered.
-        TimerUtils.resetAlpha();
+             */
+            RenderSystem.popMatrix();
+            TimerUtils.resetAlpha();
+        }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.gui.hud" +
+                            ".InGameHud#renderMountHealth " +
+                            "event",
+                    e);
+        }
     }
 
     /**
@@ -316,10 +476,21 @@ public class HudHook
     @At(value = "HEAD", shift = At.Shift.AFTER))
     public void startPotion(CallbackInfo info)
     {
-        logger.debug("Starting potions");
+        LOGGER.debug("Starting potions");
-        TimerUtils.updatePotions(MinecraftClient.getInstance().cameraEntity instanceof ClientPlayerEntity ?
+        try
-                                 ((ClientPlayerEntity) MinecraftClient.getInstance().cameraEntity) :
+        {
-                                 null);
+            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);
+        }
     }
 
     /**
@@ -335,10 +506,22 @@ public class HudHook
                             "shouldShowIcon()Z"))
     public boolean shouldRenderPotion(StatusEffectInstance effect)
     {
-        logger.debug("Updating potions");
+        LOGGER.debug("Updating potions");
-        currentEffect = effect;
+        try
-        return TimerUtils.updatePotion(effect,
+        {
-                MinecraftClient.getInstance().getTickDelta());
+            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;
     }
 
     /**
@@ -353,8 +536,20 @@ public class HudHook
     @At(value = "STORE"))
     public float updatePotion(float f)
     {
-        logger.debug("Adjusting potions");
+        LOGGER.debug("Adjusting potions");
-        return TimerUtils.getPotionAlpha(currentEffect);
+        try
+        {
+            return TimerUtils.getPotionAlpha(currentEffect);
+        }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.gui.hud" +
+                            ".InGameHud#renderStatusEffectOverlay " +
+                            "event",
+                    e);
+        }
+        return 1F;
     }
 
     /**
@@ -368,11 +563,22 @@ 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();
+             * 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);
+        }
     }
 
     /**
@@ -389,10 +595,21 @@ public class HudHook
     public void startHotbar(float tickDelta,
                             CallbackInfo callbackInfo)
     {
-        logger.debug("Starting hotbar");
+        LOGGER.debug("Starting hotbar");
-        if (TimerUtils.updateHotbar(tickDelta))
+        try
         {
-            callbackInfo.cancel();
+            if (TimerUtils.updateHotbar(tickDelta))
+            {
+                callbackInfo.cancel();
+            }
+        }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.gui.hud" +
+                            ".InGameHud#renderHotbar " +
+                            "event",
+                    e);
         }
     }
 
@@ -411,8 +628,19 @@ public class HudHook
     public void adjustHotbar(float tickDelta,
                              CallbackInfo callbackInfo)
     {
-        logger.debug("Adjusting hotbar");
+        LOGGER.debug("Adjusting hotbar");
-        TimerUtils.recolorHotbar();
+        try
+        {
+            TimerUtils.recolorHotbar();
+        }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.gui.hud" +
+                            ".InGameHud#renderHotbar " +
+                            "event",
+                    e);
+        }
     }
 
     /**
@@ -428,11 +656,21 @@ public class HudHook
     public void finishHotbar(float tickDelta,
                              CallbackInfo callbackInfo)
     {
-        logger.debug("Finishing hotbar");
+        LOGGER.debug("Finishing hotbar");
-        RenderSystem.popMatrix();
+        try
-        /*
+        {
-         * Resets the color so that nothing else is bothered.
+            RenderSystem.popMatrix();
-         */
+            /*
-        TimerUtils.resetAlpha();
+             * 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);
+        }
     }
 }

src/main/resources/assets/immersive_hud/lang/en_us.json

@@ -19,7 +19,9 @@
   "option.immersive_hud.effectFadeIn": "Potion Fade In Time",
   "option.immersive_hud.effectFadeOut": "Potion Fade Out Time",
   "option.immersive_hud.crosshairTime": "Crosshair Display Time",
+  "option.immersive_hud.hideCrosshair": "Hide Crosshair",
   "option.immersive_hud.handTime": "Hand Display Time",
+  "option.immersive_hud.hideHands": "Hide Hands",
   "option.immersive_hud.minHealth": "Minimum Health Fade",
   "option.immersive_hud.minHunger": "Minimum Hunger Fade",
   "option.immersive_hud.showArmor": "Show Armor",
@@ -42,7 +44,9 @@
   "tooltip.immersive_hud.effectFadeIn": "How many seconds it takes for potion icons to fade in",
   "tooltip.immersive_hud.effectFadeOut": "How many seconds it takes for potion icons to fade out",
   "tooltip.immersive_hud.crosshairTime": "How many seconds the crosshairs can be on screen",
+  "tooltip.immersive_hud.hideCrosshair": "Whether or not the crosshairs should be hidden after a period of time",
   "tooltip.immersive_hud.handTime": "How many seconds the hands can be on screen",
+  "tooltip.immersive_hud.hideHands": "Whether or not hands should be hidden after a period of time",
   "tooltip.immersive_hud.minHealth": "When the percentage of health goes below this level, the health bar won't fade away",
   "tooltip.immersive_hud.minHunger": "When the hunger level goes below this level, the hunger bar won't fade away",
   "tooltip.immersive_hud.showArmor": "Whether or not the armor bar should display on the HUD"

src/main/resources/fabric.mod.json

@@ -28,7 +28,7 @@
   },
   "mixins": [
     {
-      "config": "modid.mixins.json",
+      "config": "immersive_hud.mixins.json",
       "environment": "client"
     }
   ],