Update gradle.properties

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

.github/workflows/build.yml

@@ -12,9 +12,9 @@ jobs:
       matrix:
         # Use these Java versions
         java: [
-          1.8,  # Minimum supported by Minecraft
+          1.16,  # Minimum supported by Minecraft
-          11,   # Current Java LTS
+          16,   # Current Java LTS
-          15    # Latest version
+          16    # Latest version
         ]
         # and run on both Linux and Windows
         os: [ubuntu-20.04, windows-latest]

.gitignore

@@ -32,3 +32,5 @@ bin/
 
 run/
 /logs/
+local.properties
+remappedSrc/

build.gradle

@@ -1,10 +1,10 @@
 plugins {
-	id 'fabric-loom' version '0.5-SNAPSHOT'
+	id 'fabric-loom' version '0.8-SNAPSHOT'
 	id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_1_8
+sourceCompatibility = JavaVersion.VERSION_16
-targetCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_16
 
 archivesBaseName = project.archives_base_name
 version = project.mod_version + "-" + project.minecraft_version + "-fabric"
@@ -43,13 +43,8 @@ tasks.withType(JavaCompile).configureEach {
 	// If Javadoc is generated, this must be specified in that task too.
 	it.options.encoding = "UTF-8"
 
-	// The Minecraft launcher currently installs Java 8 for users, so your mod probably wants to target Java 8 too
+	// Minecraft 1.17 (21w19a) upwards uses Java 16.
-	// JDK 9 introduced a new way of specifying this that will make sure no newer classes or methods are used.
+	it.options.release = 16
-	// We'll use that if it's available, but otherwise we'll use the older option.
-	def targetVersion = 8
-	if (JavaVersion.current().isJava9Compatible()) {
-		 it.options.release = targetVersion
-	}
 }
 
 java {

gradle.properties

@@ -3,14 +3,14 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version=1.16.4
+	minecraft_version=1.17
-	yarn_mappings=1.16.4+build.9
+	yarn_mappings=1.17+build.1
-	loader_version=0.11.1
+	loader_version=0.11.3
 
-cloth_version=4.11.14
+cloth_version=5.0.34
-modmenu_version=1.16.8
+modmenu_version=2.0.2
 
 # Mod Properties
-	mod_version = 1.0
+	mod_version = 1.2
 	maven_group = markil3
 	archives_base_name = immersive_hud

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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

@@ -1,11 +1,19 @@
 package markil3.immersive_hud;
 
+import static markil3.immersive_hud.Main.TICKS_PER_SECOND;
+
+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 java.util.Arrays;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 import me.shedaniel.autoconfig.AutoConfig;
 
-import static markil3.immersive_hud.Main.TICKS_PER_SECOND;
-
 /**
  * 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.
@@ -183,6 +194,15 @@ 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 +214,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 +256,26 @@ 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());
+    }
+
+    /**
+     * Obtains a collection of items that won't cause hands and crosshairs to show when used.
+     *
+     * @return An array of identifiers.
+     */
+    public Identifier[] getIgnoredIdentifiers()
+    {
+        return this.ignoredItems;
+    }
+
     /**
      * Sets the time that the hands are allowed to display.
      *
@@ -236,6 +286,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 +306,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 +347,26 @@ 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);
+    }
+
+    /**
+     * Sets which items won't cause the hands and crosshairs to show when used.
+     *
+     * @param items - A set of ignored items.
+     */
+    public void setIgnoredItems(String... items)
+    {
+        this.ignoredItems = Arrays.stream(items).map(Identifier::new).filter(i -> Registry.ITEM.getOrEmpty(i).isPresent()).toArray(Identifier[]::new);
+    }
 /**
      * Saves changes to this mod's configuration.
      */

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

@@ -3,7 +3,11 @@ package markil3.immersive_hud;
 import com.terraformersmc.modmenu.api.ConfigScreenFactory;
 import com.terraformersmc.modmenu.api.ModMenuApi;
 
+import net.minecraft.item.Items;
 import net.minecraft.text.TranslatableText;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.InvalidIdentifierException;
+import net.minecraft.util.registry.Registry;
 
 import me.shedaniel.autoconfig.AutoConfig;
 import me.shedaniel.clothconfig2.api.ConfigBuilder;
@@ -13,6 +17,10 @@ import me.shedaniel.clothconfig2.gui.entries.DoubleListEntry;
 
 import static markil3.immersive_hud.Main.TICKS_PER_SECOND;
 
+import java.util.Arrays;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
 public class ModMenu implements ModMenuApi
 {
 
@@ -131,6 +139,15 @@ public class ModMenu implements ModMenuApi
                     .setSaveConsumer(val -> instance.setCrosshairTime((int) (val * TICKS_PER_SECOND)))
                     .build());
 
+            general.addEntry(entryBuilder.startBooleanToggle(new TranslatableText(
+                            "option.immersive_hud.hideCrosshair"),
+                    instance.hideCrosshair())
+                    .setDefaultValue(true)
+                    .setTooltip(new TranslatableText(
+                            "tooltip.immersive_hud.hideCrosshair"))
+                    .setSaveConsumer(val -> instance.hideCrosshair(val))
+                    .build());
+
             general.addEntry(entryBuilder.startDoubleField(new TranslatableText(
                             "option.immersive_hud.handTime"),
                     (float) instance.getHandTime() / TICKS_PER_SECOND)
@@ -140,6 +157,15 @@ public class ModMenu implements ModMenuApi
                     .setSaveConsumer(val -> instance.setHandTime((int) (val * TICKS_PER_SECOND)))
                     .build());
 
+            general.addEntry(entryBuilder.startBooleanToggle(new TranslatableText(
+                            "option.immersive_hud.hideHands"),
+                    instance.hideHands())
+                    .setDefaultValue(true)
+                    .setTooltip(new TranslatableText(
+                            "tooltip.immersive_hud.hideHands"))
+                    .setSaveConsumer(val -> instance.hideHands(val))
+                    .build());
+
             general.addEntry(entryBuilder.startDoubleField(new TranslatableText(
                             "option.immersive_hud.minHealth"),
                     instance.getMinHealth())
@@ -167,6 +193,31 @@ public class ModMenu implements ModMenuApi
                     .setSaveConsumer(val -> instance.shouldShowArmor(val))
                     .build());
 
+            general.addEntry(entryBuilder
+                    .startStrList(new TranslatableText("option.immersive_hud.ignoreList"), Arrays
+                            .asList(instance
+                                    .getIgnoredIdentifiers()).stream().map(Identifier::toString)
+                            .collect(Collectors.toList()))
+                    .setDefaultValue(Arrays
+                            .asList(Registry.ITEM.getId(Items.FIREWORK_ROCKET).toString()))
+                    .setTooltip(new TranslatableText("tooltip.immersive_hud.ignoreList"))
+                    .setSaveConsumer(val -> instance.setIgnoredItems(val.toArray(new String[0]))).setErrorSupplier(val -> {
+                        try
+                        {
+                            Optional<String> item = val.stream().filter(i -> !Registry.ITEM.getOrEmpty(new Identifier(i)).isPresent()).findFirst();
+                            if (item.isPresent())
+                            {
+                                return Optional.of(new TranslatableText("error.immersive_hud.ignoreList.unknownItem"));
+                            }
+                        }
+                        catch (InvalidIdentifierException e)
+                        {
+                            return Optional.of(new TranslatableText("error.immersive_hud.ignoreList.illegalId"));
+                        }
+                        return Optional.empty();
+                    })
+                    .build());
+
             return builder.build();
         };
     }

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

@@ -49,12 +49,13 @@ 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.
  *
  * @author Markil 3
- * @version 0.1-1.16.4-fabric
+ * @version 1.1.1-1.17-fabric
  */
 public class TimerUtils
 {
@@ -173,7 +174,7 @@ public class TimerUtils
      */
     public static void setAlpha(float alpha)
     {
-        RenderSystem.color4f(1.0F, 1.0F, 1.0F, alpha);
+        RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, alpha);
     }
 
     /**
@@ -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);
     }
 
     /**
@@ -289,6 +305,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 +331,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)
         {
@@ -360,50 +385,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;
     }
@@ -426,37 +455,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;
     }
@@ -488,7 +521,7 @@ public class TimerUtils
         LivingEntity mount;
         boolean changed = false;
 
-        if (tmp == null)
+        if (tmp == null || !(tmp instanceof LivingEntity))
         {
             mountHealth = -1;
             mountMaxHealth = -1;
@@ -839,7 +872,7 @@ public class TimerUtils
             return true;
         }
 
-        if (entity.method_3151() > 0)
+        if (entity.getMountJumpStrength() > 0)
         {
             jumpTime = jump.getMaxTime() - (jumpTime > 0 ?
                                             jump.getFadeInTime() :
@@ -1117,9 +1150,9 @@ public class TimerUtils
         /*
          * Checks for a change in what slot is used.
          */
-        if (selectedHotbarSlot != entity.inventory.selectedSlot)
+        if (selectedHotbarSlot != entity.getInventory().selectedSlot)
         {
-            selectedHotbarSlot = entity.inventory.selectedSlot;
+            selectedHotbarSlot = entity.getInventory().selectedSlot;
             mainHandTime = handTime;
             changed = true;
         }
@@ -1142,20 +1175,25 @@ public class TimerUtils
      * Determines whether or not to draw the crosshair, adjusting the alpha as
      * needed.
      *
-     * @return If true, then cancel drawing the crosshair.
-     *
      * @since 0.1-1.16.4-fabric
      */
     public static void recolorHotbar(MatrixStack stack)
     {
         ConfigManager.TimeValues hotbar =
                 ConfigManager.getInstance().getHotbarTime();
-        RenderSystem.pushMatrix();
+//        RenderSystem.pushMatrix();
         stack.push();
-        RenderSystem.translatef(0F, TimerUtils.getHotbarTranslation(), 0F);
+        stack.translate(0F, TimerUtils.getHotbarTranslation(), 0F);
         setAlpha(Main.getAlpha(hotbarTime,
                 hotbar.getMaxTime(),
                 hotbar.getFadeInTime(),
                 hotbar.getFadeOutTime()));
+        /*
+         * Update the hotbar item matrix
+         */
+        stack = RenderSystem.getModelViewStack();
+        stack.push();
+        stack.translate(0F, TimerUtils.getHotbarTranslation(), 0F);
+        RenderSystem.applyModelViewMatrix();
     }
 }

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

@@ -24,6 +24,8 @@ import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.effect.StatusEffectInstance;
 
+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,11 +40,13 @@ import markil3.immersive_hud.TimerUtils;
  * that most of the logic can be found in {@link TimerUtils}.
  *
  * @author Markil 3
- * @version 0.1-1.16.4-fabric
+ * @version 1.1.1-1.17-fabric
  */
 @Mixin(InGameHud.class)
 public class HudHook
 {
+    private static final Logger LOGGER = LogManager.getLogger(HudHook.class);
+
     private StatusEffectInstance currentEffect;
 
     /**
@@ -58,10 +62,21 @@ public class HudHook
             cancellable = true)
     public void startCrosshair(MatrixStack stack, CallbackInfo callbackInfo)
     {
-        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#startCrosshair " +
+                            "event",
+                    e);
         }
     }
 
@@ -77,10 +92,21 @@ public class HudHook
     @Inject(method = "renderCrosshair", at = @At(value = "TAIL"))
     public void finishCrosshair(MatrixStack stack, CallbackInfo callbackInfo)
     {
-        /*
+        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 +124,21 @@ public class HudHook
                              int x,
                              CallbackInfo callbackInfo)
     {
-        if (TimerUtils.drawJumpbar(stack,
+        try
-                MinecraftClient.getInstance().getTickDelta()))
         {
-            callbackInfo.cancel();
+            if (TimerUtils.drawJumpbar(stack,
+                    MinecraftClient.getInstance().getTickDelta()))
+            {
+                callbackInfo.cancel();
+            }
+        }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.gui.hud" +
+                            ".InGameHud#renderMountJumpBar " +
+                            "event",
+                    e);
         }
     }
 
@@ -119,11 +156,22 @@ public class HudHook
                               int x,
                               CallbackInfo callbackInfo)
     {
-        stack.pop();
+        try
-        /*
+        {
-         * Resets the color so that nothing else is bothered.
+            stack.pop();
-         */
+            /*
-        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);
+        }
     }
 
     /**
@@ -141,10 +189,21 @@ public class HudHook
                                 int x,
                                 CallbackInfo callbackInfo)
     {
-        if (TimerUtils.drawExperience(stack,
+        try
-                MinecraftClient.getInstance().getTickDelta()))
         {
-            callbackInfo.cancel();
+            if (TimerUtils.drawExperience(stack,
+                    MinecraftClient.getInstance().getTickDelta()))
+            {
+                callbackInfo.cancel();
+            }
+        }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.gui.hud" +
+                            ".InGameHud#renderExperienceBar " +
+                            "event",
+                    e);
         }
     }
 
@@ -162,11 +221,22 @@ public class HudHook
                                  int x,
                                  CallbackInfo callbackInfo)
     {
-        stack.pop();
+        try
-        /*
+        {
-         * Resets the color so that nothing else is bothered.
+            stack.pop();
-         */
+            /*
-        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);
+        }
     }
 
     /**
@@ -181,8 +251,19 @@ public class HudHook
             "/math/MatrixStack;)V", at = @At("HEAD"))
     public MatrixStack startStatus(MatrixStack stack)
     {
-        stack.push();
+        try
-        stack.translate(0F, TimerUtils.getHealthTranslation(), 0F);
+        {
+            stack.push();
+            stack.translate(0F, TimerUtils.getHealthTranslation(), 0F);
+        }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.gui.hud" +
+                            ".InGameHud#renderStatusBars " +
+                            "event",
+                    e);
+        }
         return stack;
     }
 
@@ -197,9 +278,20 @@ public class HudHook
             "/minecraft/util/profiler/Profiler;push(Ljava/lang/String;)V"))
     public void renderArmor(MatrixStack matrices, CallbackInfo callbackInfo)
     {
-        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);
         }
     }
 
@@ -215,13 +307,25 @@ public class HudHook
             ordinal = 0))
     public void renderHealth(MatrixStack matrices, CallbackInfo callbackInfo)
     {
-        /*
+        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);
         }
     }
 
@@ -234,16 +338,28 @@ public class HudHook
     @Inject(method = "renderStatusBars(Lnet/minecraft/client/util" +
             "/math/MatrixStack;)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(MatrixStack matrices, CallbackInfo callbackInfo)
     {
-        /*
+        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);
         }
     }
 
@@ -259,17 +375,39 @@ public class HudHook
             ordinal = 2))
     public void renderAir(MatrixStack matrices, CallbackInfo callbackInfo)
     {
-        /*
+        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);
+        }
     }
 
     @ModifyVariable(method = "renderStatusBars(Lnet/minecraft/client/util" +
             "/math/MatrixStack;)V", at = @At("TAIL"))
     public MatrixStack finishStatus(MatrixStack stack)
     {
-        stack.pop();
+        try
+        {
+            stack.pop();
+        }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.gui.hud" +
+                            ".InGameHud#renderStatusBars " +
+                            "event",
+                    e);
+        }
         return stack;
     }
 
@@ -286,10 +424,21 @@ public class HudHook
             cancellable = true)
     public void startMountHealth(MatrixStack stack, CallbackInfo callbackInfo)
     {
-        if (TimerUtils.drawMountHealth(stack,
+        try
-                MinecraftClient.getInstance().getTickDelta()))
         {
-            callbackInfo.cancel();
+            if (TimerUtils.drawMountHealth(stack,
+                    MinecraftClient.getInstance().getTickDelta()))
+            {
+                callbackInfo.cancel();
+            }
+        }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.gui.hud" +
+                            ".InGameHud#renderMountHealth " +
+                            "event",
+                    e);
         }
     }
 
@@ -305,11 +454,22 @@ public class HudHook
     @Inject(method = "renderMountHealth", at = @At(value = "TAIL"))
     public void finishMountHealth(MatrixStack stack, CallbackInfo callbackInfo)
     {
-        /*
+        try
-         * Resets the color so that nothing else is bothered.
+        {
-         */
+            /*
-        stack.pop();
+             * Resets the color so that nothing else is bothered.
-        TimerUtils.resetAlpha();
+             */
+            stack.pop();
+            TimerUtils.resetAlpha();
+        }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.gui.hud" +
+                            ".InGameHud#renderMountHealth " +
+                            "event",
+                    e);
+        }
     }
 
     /**
@@ -323,9 +483,20 @@ public class HudHook
     @At(value = "HEAD", shift = At.Shift.AFTER))
     public void startPotion(MatrixStack effect, CallbackInfo info)
     {
-        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);
+        }
     }
 
     /**
@@ -342,9 +513,21 @@ public class HudHook
                             "shouldShowIcon()Z"))
     public boolean shouldRenderPotion(StatusEffectInstance effect)
     {
-        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;
     }
 
     /**
@@ -362,7 +545,19 @@ public class HudHook
     public float updatePotion(float f,
                               MatrixStack stack)
     {
-        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;
     }
 
     /**
@@ -378,10 +573,21 @@ public class HudHook
     public void finishPotion(MatrixStack matrices,
                              CallbackInfo callbackInfo)
     {
-        /*
+        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);
+        }
     }
 
     /**
@@ -400,9 +606,20 @@ public class HudHook
                             MatrixStack matrices,
                             CallbackInfo callbackInfo)
     {
-        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);
         }
     }
 
@@ -417,13 +634,24 @@ 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/systems/RenderSystem;setShaderColor(FFFF)V", shift
             = At.Shift.AFTER))
     public void adjustHotbar(float tickDelta,
                              MatrixStack matrices,
                              CallbackInfo callbackInfo)
     {
-        TimerUtils.recolorHotbar(matrices);
+        try
+        {
+            TimerUtils.recolorHotbar(matrices);
+        }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.gui.hud" +
+                            ".InGameHud#renderHotbar " +
+                            "event",
+                    e);
+        }
     }
 
     /**
@@ -433,7 +661,7 @@ public class HudHook
      * @param stack - The matrix drawing stack.
      * @param callbackInfo
      *
-     * @version 0.2-1.16.4-fabric
+     * @version 1.1.1-1.17-fabric
      * @since 0.1-1.16.4-fabric
      */
     @Inject(method = "renderHotbar", at = @At(value = "TAIL"))
@@ -441,11 +669,24 @@ public class HudHook
                              MatrixStack stack,
                              CallbackInfo callbackInfo)
     {
-        RenderSystem.popMatrix();
+        try
-        stack.pop();
+        {
-        /*
+            stack.pop();
-         * Resets the color so that nothing else is bothered.
+            stack = RenderSystem.getModelViewStack();
-         */
+            stack.pop();
-        TimerUtils.resetAlpha();
+            RenderSystem.applyModelViewMatrix();
+            /*
+             * 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,10 +19,13 @@
   "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",
+  "option.immersive_hud.ignoreList": "Ignored Items",
   "tooltip.immersive_hud.hotbarMaxTime": "How long the hotbar can be displayed on screen in seconds",
   "tooltip.immersive_hud.hotbarFadeIn": "How many seconds it takes for the hotbar to fade in",
   "tooltip.immersive_hud.hotbarFadeOut": "How many seconds it takes for the hotbar to move out",
@@ -42,8 +45,13 @@
   "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"
+  "tooltip.immersive_hud.showArmor": "Whether or not the armor bar should display on the HUD",
+  "tooltip.immersive_hud.ignoreList": "Which items will not trigger the arm and crosshairs when used",
+  "error.immersive_hud.ignoreList.unknownItem": "Unknown item %s",
+  "error.immersive_hud.ignoreList.illegalId": "%s is not a legal item identifier"
 }

src/main/resources/fabric.mod.json

@@ -28,14 +28,15 @@
   },
   "mixins": [
     {
-      "config": "modid.mixins.json",
+      "config": "immersive_hud.mixins.json",
       "environment": "client"
     }
   ],
 
   "depends": {
-    "fabricloader": ">=0.7.4",
+    "fabricloader": ">=0.11.3",
-    "minecraft": "1.16.x"
+    "minecraft": "1.17.x",
+    "java": ">=16"
   },
   "suggests": {
     "modmenu": "*",

src/main/resources/immersive_hud.mixins.json

@@ -2,7 +2,7 @@
   "required": true,
   "minVersion": "0.8",
   "package": "markil3.immersive_hud.mixin",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_16",
   "mixins": [
   ],
   "client": [