Fabric 1.14-1.2 Mod Release

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

.gitignore

@@ -32,3 +32,4 @@ bin/
 
 run/
 /logs/
+/remappedSrc/

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '0.5-SNAPSHOT'
+	id 'fabric-loom' version '0.6-SNAPSHOT'
 	id 'maven-publish'
 }
 
@@ -21,9 +21,9 @@ dependencies {
 	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
 	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
-	modApi "me.shedaniel.cloth:config-2:${project.cloth_version}"
+//	modApi "me.shedaniel.cloth:config-2:${project.cloth_version}"
 	modApi "me.sargunvohra.mcmods:autoconfig1u:${project.autoconfig_version}"
-	modImplementation "io.github.prospector:modmenu:${project.modmenu_version}"
+//	modImplementation "io.github.prospector:modmenu:${project.modmenu_version}"
 
 	// PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
 	// You may need to force-disable transitiveness on them.

gradle.properties

@@ -3,15 +3,15 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version=1.15
-	yarn_mappings=1.15+build.2
+	minecraft_version=1.14.3
+	yarn_mappings=1.14.3+build.13
 	loader_version=0.11.2
 
 cloth_version=2.9.3
-modmenu_version=1.8.4+build.20
+modmenu_version=1.6.3-95
 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,23 @@
 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 me.sargunvohra.mcmods.autoconfig1u.AutoConfig;
 
 import static markil3.immersive_hud.Main.TICKS_PER_SECOND;
 
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+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 +94,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 +199,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 +219,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 +261,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 +281,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 +301,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 +342,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/Main.java

@@ -22,6 +22,9 @@ import net.fabricmc.api.ModInitializer;
 import me.sargunvohra.mcmods.autoconfig1u.AutoConfig;
 import me.sargunvohra.mcmods.autoconfig1u.serializer.Toml4jConfigSerializer;
 
+//import me.sargunvohra.mcmods.autoconfig1u.AutoConfig;
+//import me.sargunvohra.mcmods.autoconfig1u.serializer.Toml4jConfigSerializer;
+
 /**
  * The main entry point for the Immersive HUD mod.
  *

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

@@ -1,168 +0,0 @@
-package markil3.immersive_hud;
-
-import net.minecraft.client.gui.screen.Screen;
-
-import java.util.function.Function;
-
-import io.github.prospector.modmenu.api.ModMenuApi;
-import me.sargunvohra.mcmods.autoconfig1u.AutoConfig;
-import me.shedaniel.clothconfig2.api.ConfigBuilder;
-import me.shedaniel.clothconfig2.api.ConfigCategory;
-import me.shedaniel.clothconfig2.api.ConfigEntryBuilder;
-import me.shedaniel.clothconfig2.gui.entries.DoubleListEntry;
-
-import static markil3.immersive_hud.Main.TICKS_PER_SECOND;
-
-public class ModMenu implements ModMenuApi
-{
-
-    private void startTimeField(String name, ConfigEntryBuilder entryBuilder,
-                                ConfigCategory cat,
-                                ConfigManager.TimeValues value)
-    {
-        final float SHOW_TIME = 6;
-        final float FADE_IN = 0.25F;
-        final float FADE_OUT = 0.5F;
-
-        DoubleListEntry maxTime =
-                entryBuilder.startDoubleField("option.immersive_hud." + name +
-                                "MaxTime",
-                        (float) value.getMaxTime() / TICKS_PER_SECOND)
-                        .setDefaultValue(SHOW_TIME)
-                        .setMin(0)
-                        .setMax(10 * 60 * TICKS_PER_SECOND) // 10 Minutes
-                        .setTooltip("tooltip.immersive_hud." + name +
-                                "MaxTime")
-                        .setSaveConsumer(val -> value.setMaxTime((int) (val * TICKS_PER_SECOND)))
-                        .build();
-
-        DoubleListEntry fadeIn =
-                entryBuilder.startDoubleField("option.immersive_hud." + name +
-                                "FadeIn",
-                        (float) value.getFadeInTime() / TICKS_PER_SECOND)
-                        .setDefaultValue(FADE_IN)
-                        .setMin(0)
-                        .setMax(10 * 60 * TICKS_PER_SECOND)
-                        .setTooltip("tooltip.immersive_hud." + name +
-                                "FadeIn")
-                        .setSaveConsumer(val -> value.setFadeInTime((int) (val * TICKS_PER_SECOND)))
-                        .build();
-
-        DoubleListEntry fadeOut =
-                entryBuilder.startDoubleField("option.immersive_hud." + name +
-                                "FadeOut",
-                        (float) value.getFadeOutTime() / TICKS_PER_SECOND)
-                        .setDefaultValue(FADE_OUT)
-                        .setMin(0)
-                        .setMax(10 * 60 * TICKS_PER_SECOND)
-                        .setTooltip("tooltip.immersive_hud." + name +
-                                "FadeOut")
-                        .setSaveConsumer(val -> value.setFadeOutTime((int) (val * TICKS_PER_SECOND)))
-                        .build();
-
-        cat.addEntry(maxTime);
-        cat.addEntry(fadeIn);
-        cat.addEntry(fadeOut);
-    }
-
-    @Override
-    public String getModId()
-    {
-        return "immersive_hud";
-    }
-
-    @Override
-    public Function<Screen, ? extends Screen> getConfigScreenFactory()
-    {
-        return screen -> {
-            ConfigCategory general;
-            ConfigEntryBuilder entryBuilder;
-            ConfigManager instance = ConfigManager.getInstance();
-            final ConfigBuilder builder = ConfigBuilder.create()
-                    .setParentScreen(screen)
-                    .setTitle("immersive_hud.configGui.title")
-                    .setSavingRunnable(() -> {
-                        try
-                        {
-                            if (Class.forName(
-                                    "me.sargunvohra.mcmods.autoconfig1u" +
-                                            ".AutoConfig") != null)
-                            {
-                                ((me.sargunvohra.mcmods.autoconfig1u.ConfigManager<ConfigManagerCloth>) AutoConfig
-                                        .getConfigHolder(
-                                                ConfigManagerCloth.class)).save();
-                            }
-                        }
-                        catch (ClassNotFoundException e)
-                        {
-                            // Do nothing
-                        }
-                    });
-            general =
-                    builder.getOrCreateCategory("category.immersive_hud" +
-                            ".general");
-            entryBuilder = builder.entryBuilder();
-
-            startTimeField("hotbar", entryBuilder,
-                    general,
-                    instance.getHotbarTime());
-            startTimeField("experience", entryBuilder,
-                    general,
-                    instance.getExperienceTime());
-            startTimeField("jump", entryBuilder,
-                    general,
-                    instance.getJumpTime());
-            startTimeField("jump", entryBuilder,
-                    general,
-                    instance.getHealthTime());
-            startTimeField("hunger", entryBuilder,
-                    general,
-                    instance.getHungerTime());
-            startTimeField("effect", entryBuilder,
-                    general,
-                    instance.getPotionTime());
-
-            general.addEntry(entryBuilder.startDoubleField(
-                    "option.immersive_hud.crosshairTime",
-                    (float) instance.getCrosshairTime() / TICKS_PER_SECOND)
-                    .setDefaultValue(6)
-                    .setTooltip("tooltip.immersive_hud.crosshairTime")
-                    .setSaveConsumer(val -> instance.setCrosshairTime((int) (val * TICKS_PER_SECOND)))
-                    .build());
-
-            general.addEntry(entryBuilder.startDoubleField(
-                    "option.immersive_hud.handTime",
-                    (float) instance.getHandTime() / TICKS_PER_SECOND)
-                    .setDefaultValue(30)
-                    .setTooltip("tooltip.immersive_hud.handTime")
-                    .setSaveConsumer(val -> instance.setHandTime((int) (val * TICKS_PER_SECOND)))
-                    .build());
-
-            general.addEntry(entryBuilder.startDoubleField(
-                    "option.immersive_hud.minHealth",
-                    instance.getMinHealth())
-                    .setDefaultValue(0.5)
-                    .setTooltip("tooltip.immersive_hud.minHealth")
-                    .setSaveConsumer(val -> instance.setMinHealth(val))
-                    .build());
-
-            general.addEntry(entryBuilder.startIntField(
-                    "option.immersive_hud.minHunger",
-                    instance.getMinHunger())
-                    .setDefaultValue(17)
-                    .setTooltip("tooltip.immersive_hud.minHunger")
-                    .setSaveConsumer(val -> instance.setMinHunger(val))
-                    .build());
-
-            general.addEntry(entryBuilder.startBooleanToggle(
-                    "option.immersive_hud.showArmor",
-                    instance.shouldShowArmor())
-                    .setDefaultValue(true)
-                    .setTooltip("tooltip.immersive_hud.showArmor")
-                    .setSaveConsumer(val -> instance.shouldShowArmor(val))
-                    .build());
-
-            return builder.build();
-        };
-    }
-}

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

@@ -16,11 +16,10 @@
  */
 package markil3.immersive_hud;
 
-import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.platform.GlStateManager;
 
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientPlayerEntity;
-import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.effect.StatusEffect;
@@ -35,10 +34,11 @@ import net.minecraft.item.FilledMapItem;
 import net.minecraft.item.FishingRodItem;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.item.LingeringPotionItem;
 import net.minecraft.item.RangedWeaponItem;
 import net.minecraft.item.ShieldItem;
 import net.minecraft.item.SnowballItem;
-import net.minecraft.item.ThrowablePotionItem;
+import net.minecraft.item.SplashPotionItem;
 import net.minecraft.item.TridentItem;
 import net.minecraft.util.Hand;
 import net.minecraft.util.hit.EntityHitResult;
@@ -48,7 +48,9 @@ import net.minecraft.util.math.MathHelper;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 
 /**
  * Contains the logic for changing the HUD.
@@ -173,7 +175,7 @@ public class TimerUtils
      */
     public static void setAlpha(float alpha)
     {
-        RenderSystem.color4f(1.0F, 1.0F, 1.0F, alpha);
+        GlStateManager.color4f(1.0F, 1.0F, 1.0F, alpha);
     }
 
     /**
@@ -250,6 +252,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 +267,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);
     }
 
     /**
@@ -289,6 +306,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 +332,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)
         {
@@ -344,18 +370,19 @@ public class TimerUtils
      * hands into and out of view as needed.
      *
      * @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,
-                                       MatrixStack matrixStack,
                                        float ticks)
     {
         final float HAND_UP_TIME = 20F;
 
+        boolean hideHands = ConfigManager.getInstance().hideHands();
+        if (hideHands)
+        {
             switch (hand)
             {
             case OFF_HAND:
@@ -371,10 +398,9 @@ public class TimerUtils
                     }
                     if (offHandTime < HAND_UP_TIME)
                     {
-                    matrixStack
-                            .translate(0,
-                                    -1.0F * (HAND_UP_TIME - offHandTime) /
-                                            HAND_UP_TIME,
+                        GlStateManager.translatef(0,
+                                (float) (-1.0F * (HAND_UP_TIME - offHandTime) /
+                                        HAND_UP_TIME),
                                 0);
                     }
                 }
@@ -392,15 +418,15 @@ public class TimerUtils
                     }
                     if (mainHandTime < HAND_UP_TIME)
                     {
-                    matrixStack
-                            .translate(0,
-                                    -1.0F * (HAND_UP_TIME - mainHandTime) /
-                                            HAND_UP_TIME,
+                        GlStateManager.translatef(0,
+                                (float) (-1.0F * (HAND_UP_TIME - mainHandTime) /
+                                        HAND_UP_TIME),
                                 0);
                     }
                 }
                 break;
             }
+        }
         return false;
     }
 
@@ -422,13 +448,16 @@ public class TimerUtils
         boolean changed = false;
         boolean canceled = false;
 
-        if (mc.crosshairTarget != null && mc.crosshairTarget
+        boolean hideCrosshair = ConfigManager.getInstance().hideCrosshair();
+        if (hideCrosshair)
+        {
+            if (mc.hitResult != null && mc.hitResult
                     .getType() != HitResult.Type.MISS)
             {
-            if (mc.crosshairTarget.getType() == HitResult.Type
+                if (mc.hitResult.getType() == HitResult.Type
                         .ENTITY)
                 {
-                if (((EntityHitResult) mc.crosshairTarget).getEntity() != entity
+                    if (((EntityHitResult) mc.hitResult).getEntity() != entity
                             .getVehicle())
                     {
                         changed = true;
@@ -454,6 +483,7 @@ public class TimerUtils
             {
                 crosshairTime -= ticks;
             }
+        }
         return canceled;
     }
 
@@ -484,7 +514,7 @@ public class TimerUtils
         LivingEntity mount;
         boolean changed = false;
 
-        if (tmp == null)
+        if (tmp == null || !(tmp instanceof LivingEntity))
         {
             mountHealth = -1;
             mountMaxHealth = -1;
@@ -497,9 +527,9 @@ public class TimerUtils
                 mountHealth = mount.getHealth();
                 changed = true;
             }
-            if (mountMaxHealth != mount.getMaximumHealth())
+            if (mountMaxHealth != mount.getHealthMaximum())
             {
-                mountMaxHealth = mount.getMaximumHealth();
+                mountMaxHealth = mount.getHealthMaximum();
                 changed = true;
             }
         }
@@ -522,8 +552,8 @@ public class TimerUtils
         {
             if (tmp != null && mountTime > 0)
             {
-                RenderSystem.pushMatrix();
-                RenderSystem.translatef(0F,
+                GlStateManager.pushMatrix();
+                GlStateManager.translatef(0F,
                         getHealthTranslation(),
                         0F);
                 setAlpha(Main.getAlpha(mountTime,
@@ -534,8 +564,8 @@ public class TimerUtils
             }
             return true;
         }
-        RenderSystem.pushMatrix();
-        RenderSystem.translatef(0F,
+        GlStateManager.pushMatrix();
+        GlStateManager.translatef(0F,
                 getHealthTranslation(),
                 0F);
         return false;
@@ -695,9 +725,9 @@ public class TimerUtils
             health = entity.getHealth();
             changed = true;
         }
-        if (maxHealth != entity.getMaximumHealth())
+        if (maxHealth != entity.getHealthMaximum())
         {
-            maxHealth = entity.getMaximumHealth();
+            maxHealth = entity.getHealthMaximum();
             changed = true;
         }
         if (changed)
@@ -845,8 +875,8 @@ public class TimerUtils
         }
         if (jumpTime > 0)
         {
-            RenderSystem.pushMatrix();
-            RenderSystem.translatef(0F, TimerUtils.getJumpTranslation(), 0F);
+            GlStateManager.pushMatrix();
+            GlStateManager.translatef(0F, TimerUtils.getJumpTranslation(), 0F);
             setAlpha(Main.getAlpha(jumpTime,
                     jump.getMaxTime(),
                     jump.getFadeInTime(),
@@ -899,8 +929,10 @@ public class TimerUtils
         }
         if (experienceTime > 0)
         {
-            RenderSystem.pushMatrix();
-            RenderSystem.translatef(0F, TimerUtils.getExperienceTranslation(), 0F);
+            GlStateManager.pushMatrix();
+            GlStateManager.translatef(0F,
+                    TimerUtils.getExperienceTranslation(),
+                    0F);
             setAlpha(Main.getAlpha(experienceTime,
                     experience.getMaxTime(),
                     experience.getFadeInTime(),
@@ -1042,7 +1074,7 @@ public class TimerUtils
                  * Items that have the crosshairs enabled for as long
                  * as the item is being held at all.
                  */
-                else if (item instanceof ThrowablePotionItem ||
+                else if (item instanceof SplashPotionItem || item instanceof LingeringPotionItem ||
                         item instanceof SnowballItem || item instanceof
                         EggItem || item instanceof EnderPearlItem || item
                         instanceof FishingRodItem)
@@ -1144,8 +1176,8 @@ public class TimerUtils
     {
         ConfigManager.TimeValues hotbar =
                 ConfigManager.getInstance().getHotbarTime();
-        RenderSystem.pushMatrix();
-        RenderSystem.translatef(0F, TimerUtils.getHotbarTranslation(), 0F);
+        GlStateManager.pushMatrix();
+        GlStateManager.translatef(0F, TimerUtils.getHotbarTranslation(), 0F);
         setAlpha(Main.getAlpha(hotbarTime,
                 hotbar.getMaxTime(),
                 hotbar.getFadeInTime(),

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

@@ -17,12 +17,12 @@
 package markil3.immersive_hud.mixin;
 
 import net.minecraft.client.network.AbstractClientPlayerEntity;
-import net.minecraft.client.render.VertexConsumerProvider;
-import net.minecraft.client.render.item.HeldItemRenderer;
-import net.minecraft.client.util.math.MatrixStack;
+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;
@@ -37,45 +37,49 @@ import markil3.immersive_hud.TimerUtils;
  * @author Markil 3
  * @version 0.1-1.16.4-fabric
  */
-@Mixin(HeldItemRenderer.class)
+@Mixin(FirstPersonRenderer.class)
 public class HeldItemHook
 {
+    private static final Logger LOGGER = LogManager.getLogger(HeldItemHook.class);
+
     /**
      * Determines whether or not to render a certain hand.
      *
-     * @param player
-     * @param tickDelta
-     * @param pitch
      * @param hand
-     * @param swingProgress
-     * @param item
-     * @param equipProgress
-     * @param matrices
-     * @param vertexConsumers
-     * @param light
      * @param callbackInfo
      *
      * @since 0.1-1.16.4-fabric
      */
-    @Inject(method = "renderFirstPersonItem", at = @At(value = "INVOKE",
-            target = "Lnet/minecraft/client/util/math/MatrixStack;push()V",
-            shift = At.Shift.AFTER), cancellable = true)
-    public void renderHand(AbstractClientPlayerEntity player,
-                           float tickDelta,
-                           float pitch,
+    @Inject(method = "renderFirstPersonItem" +
+            "(Lnet/minecraft/client/network/AbstractClientPlayerEntity;" +
+            "FFLnet/minecraft/util/Hand;FLnet/minecraft/item/ItemStack;F)V",
+            at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/platform" +
+                    "/GlStateManager;pushMatrix()V", shift = At.Shift.AFTER),
+            cancellable = true)
+    public void renderHand(AbstractClientPlayerEntity abstractClientPlayerEntity,
+                           float f,
+                           float g,
                            Hand hand,
-                           float swingProgress,
-                           ItemStack item,
-                           float equipProgress,
-                           MatrixStack matrices,
-                           VertexConsumerProvider vertexConsumers,
-                           int light,
+                           float h,
+                           ItemStack itemStack,
+                           float i,
                            CallbackInfo callbackInfo)
     {
-        if (TimerUtils.onRenderHand(hand, matrices, tickDelta))
+        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

@@ -16,7 +16,7 @@
  */
 package markil3.immersive_hud.mixin;
 
-import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.platform.GlStateManager;
 
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.hud.InGameHud;
@@ -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");
-        if (TimerUtils.drawJumpbar(MinecraftClient.getInstance().getTickDelta()))
+        LOGGER.debug("Starting jumpbar");
+        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");
-        RenderSystem.popMatrix();
+        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");
-        if (TimerUtils.drawExperience(MinecraftClient.getInstance().getTickDelta()))
+        LOGGER.debug("Starting experience bar");
+        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");
-        RenderSystem.popMatrix();
+        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");
-        RenderSystem.pushMatrix();
-        RenderSystem.translatef(0F, TimerUtils.getHealthTranslation(), 0F);
+        LOGGER.debug("Starting status bars");
+        try
+        {
+            GlStateManager.pushMatrix();
+            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,60 +300,109 @@ 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",
+            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()))
+            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" +
-            "/minecraft/util/profiler/Profiler;swap(Ljava/lang/String;)V",
+    @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);
         }
+        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");
-        RenderSystem.popMatrix();
+        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);
+        }
     }
 
     /**
@@ -277,13 +417,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 +450,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.
              */
-        RenderSystem.popMatrix();
+            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 +479,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 +509,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 +539,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 +566,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 +598,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.
@@ -406,14 +626,25 @@ public class HudHook
      * @since 0.1-1.16.4-fabric
      */
     @Inject(method = "renderHotbar", at = @At(value = "INVOKE", target =
-            "Lcom/mojang/blaze3d/systems/RenderSystem;color4f(FFFF)V", shift
+            "Lcom/mojang/blaze3d/platform/GlStateManager;color4f(FFFF)V", shift
             = At.Shift.AFTER))
     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 +659,21 @@ public class HudHook
     public void finishHotbar(float tickDelta,
                              CallbackInfo callbackInfo)
     {
-        logger.debug("Finishing hotbar");
-        RenderSystem.popMatrix();
+        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);
+        }
+    }
 }

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,14 +28,14 @@
   },
   "mixins": [
     {
-      "config": "modid.mixins.json",
+      "config": "immersive_hud.mixins.json",
       "environment": "client"
     }
   ],
 
   "depends": {
     "fabricloader": ">=0.7.4",
-    "minecraft": "1.15.x"
+    "minecraft": "1.14.x"
   },
   "suggests": {
     "modmenu": "*",