Adds fading for the oxygen bar.

This should fix #2. Thanks, @Reddy64!

.github/workflows/build.yml

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

.gitignore

@@ -32,3 +32,10 @@ bin/
 
 run/
 /logs/
+local.properties
+remappedSrc/
+MinecraftImmersiveHUD.mcpack
+manifest.json
+pack_icon.png
+scripts/
+subpacks/

build.gradle

@@ -1,10 +1,10 @@
 plugins {
-	id 'fabric-loom' version '0.6-SNAPSHOT'
+	id 'fabric-loom' version '0.11-SNAPSHOT'
 	id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
+sourceCompatibility = JavaVersion.VERSION_17
+targetCompatibility = JavaVersion.VERSION_17
 
 archivesBaseName = project.archives_base_name
 version = project.mod_version + "-" + project.minecraft_version + "-fabric"
@@ -21,10 +21,11 @@ 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.sargunvohra.mcmods:autoconfig1u:${project.autoconfig_version}"
-//	modImplementation "io.github.prospector:modmenu:${project.modmenu_version}"
+	modApi "me.shedaniel.cloth:cloth-config-fabric:${project.cloth_version}"
+	modImplementation "com.terraformersmc:modmenu:${project.modmenu_version}"
 
+	// Fabric API. This is technically optional, but you probably want it anyway.
+	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_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.
 }
@@ -44,13 +45,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
-	// JDK 9 introduced a new way of specifying this that will make sure no newer classes or methods are used.
-	// 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
-	}
+	// Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
+	it.options.release = 17
 }
 
 java {

gradle.properties

@@ -1,17 +1,17 @@
 # Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx1G
+org.gradle.jvmargs=-Xmx4G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version=1.14.3
-	yarn_mappings=1.14.3+build.13
-	loader_version=0.11.2
+	minecraft_version=1.18.1
+	yarn_mappings=1.18.1+build.22
+	loader_version=0.12.12
 
-cloth_version=2.9.3
-modmenu_version=1.6.3-95
-autoconfig_version=2.2.0
+cloth_version=6.1.48
+modmenu_version=3.0.1
+fabric_version=0.46.2+1.18
 
 # Mod Properties
-	mod_version = 1.1
+	mod_version = 1.3
 	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.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,101 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,95 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"

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

@@ -1,13 +1,21 @@
 package markil3.immersive_hud;
 
-import net.minecraft.util.math.MathHelper;
-
-//import me.sargunvohra.mcmods.autoconfig1u.AutoConfig;
-
-import me.sargunvohra.mcmods.autoconfig1u.AutoConfig;
-
 import static markil3.immersive_hud.Main.TICKS_PER_SECOND;
 
+import net.minecraft.block.Block;
+import net.minecraft.block.Blocks;
+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;
+
 /**
  * Configuration manager of this mod, which reads from and writes to this mod's
  * configuration file.
@@ -82,6 +90,7 @@ public class ConfigManager
     private TimeValues jumpTime = new TimeValues();
     private TimeValues healthTime = new TimeValues();
     private TimeValues hungerTime = new TimeValues();
+    private TimeValues airTime = new TimeValues();
     private TimeValues effectTime = new TimeValues();
     private int crosshairTime = 6 * TICKS_PER_SECOND;
     private boolean hideCrosshair = true;
@@ -90,6 +99,9 @@ public class ConfigManager
     private boolean showArmor = true;
     private double minHealth = 0.5;
     private int minHunger = 17;
+    private int minAir = 300;
+    private Identifier[] ignoredItems = new Identifier[]{Registry.ITEM.getId(Items.FIREWORK_ROCKET)};
+    private Identifier[] enchantingBlocks = new Identifier[]{Registry.BLOCK.getId(Blocks.ENCHANTING_TABLE), Registry.BLOCK.getId(Blocks.ANVIL), Registry.BLOCK.getId(Blocks.BOOKSHELF), Registry.BLOCK.getId(Blocks.FURNACE), Registry.BLOCK.getId(Blocks.BLAST_FURNACE), Registry.BLOCK.getId(Blocks.SMOKER), Registry.BLOCK.getId(Blocks.GRINDSTONE)};
 
     /**
      * Returns the instance of this class.
@@ -100,7 +112,7 @@ public class ConfigManager
     {
         try
         {
-            if (Class.forName("me.sargunvohra.mcmods.autoconfig1u.AutoConfig") != null)
+            if (Class.forName("me.shedaniel.autoconfig.AutoConfig") != null)
             {
                 return AutoConfig.getConfigHolder(ConfigManagerCloth.class)
                         .getConfig();
@@ -168,6 +180,11 @@ public class ConfigManager
         return this.hungerTime;
     }
     
+    public TimeValues getAirTime()
+    {
+        return this.airTime;
+    }
+
     /**
      * Obtains time values related to potion effects.
      *
@@ -187,7 +204,6 @@ public class ConfigManager
     {
         return this.crosshairTime;
     }
-
     /**
      * Checks whether the crosshairs should be hidden after a period of time.
      *
@@ -250,6 +266,57 @@ public class ConfigManager
         return this.minHunger;
     }
     
+    /**
+     * Obtains the minimum oxygen for fading. Anything below that and the oxygen
+     * always displays.
+     *
+     * @return The oxygen boundary, from 0 to 20.
+     */
+    public int getMinAir()
+    {
+        return this.minAir;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * Obtains a collection of items that will display the enchantment bar when hovered over.
+     *
+     * @return A set of blocks.
+     */
+    public Set<Block> getEnchantingItems()
+    {
+        return Arrays.stream(enchantingBlocks).map(Registry.BLOCK::get).collect(Collectors.toSet());
+    }
+
+    /**
+     * Obtains a collection of items that will display the enchantment bar when hovered over.
+     *
+     * @return An array blocks.
+     */
+    public Identifier[] getEnchantingdentifiers()
+    {
+        return this.enchantingBlocks;
+    }
+
     /**
      * Sets the time that the hands are allowed to display.
      *
@@ -321,9 +388,61 @@ public class ConfigManager
     {
         this.minHunger = MathHelper.clamp(boundary, 0, 20);
     }
+    
+    /**
+     * Sets the minimum oxygen value for fading. Anything below that and the
+     * air bar always displays.
+     *
+     * @param boundary - The air boundary, from 0 to 20.
+     */
+    public void setMinAir(int boundary)
+    {
+        this.minAir = 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);
+    }
+
+    /**
+     * Sets which items will display the experience bar when hovered over.
+     *
+     * @param items - A set of ignored items.
+     */
+    public void setEnchantingItems(Block... items)
+    {
+        this.enchantingBlocks = Arrays.stream(items).map(Registry.BLOCK::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 setEnchantingItems(String... items)
+    {
+        this.enchantingBlocks = Arrays.stream(items).map(Identifier::new).filter(i -> Registry.BLOCK.getOrEmpty(i).isPresent()).toArray(Identifier[]::new);
+    }
+
 /**
- * Saves changes to this mod's configuration.
- */
+     * Saves changes to this mod's configuration.
+     */
 //    public void save()
 //    {
 //        SPEC.save();

src/main/java/markil3/immersive_hud/ConfigManagerCloth.java

@@ -1,13 +1,13 @@
 package markil3.immersive_hud;
 
-import me.sargunvohra.mcmods.autoconfig1u.ConfigData;
-import me.sargunvohra.mcmods.autoconfig1u.annotation.Config;
+import me.shedaniel.autoconfig.ConfigData;
+import me.shedaniel.autoconfig.annotation.Config;
 
 @Config(name = "immersive_hud")
 public class ConfigManagerCloth extends ConfigManager implements ConfigData
 {
     @Override
-    public void validatePostLoad() throws ConfigData.ValidationException
+    public void validatePostLoad() throws ValidationException
     {
         this.setMinHealth(this.getMinHealth());
     }

src/main/java/markil3/immersive_hud/Main.java

@@ -19,11 +19,8 @@ package markil3.immersive_hud;
 
 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;
+import me.shedaniel.autoconfig.AutoConfig;
+import me.shedaniel.autoconfig.serializer.Toml4jConfigSerializer;
 
 /**
  * The main entry point for the Immersive HUD mod.
@@ -40,7 +37,7 @@ public class Main implements ModInitializer
     {
         try
         {
-            if (Class.forName("me.sargunvohra.mcmods.autoconfig1u.AutoConfig") != null)
+            if (Class.forName("me.shedaniel.autoconfig.AutoConfig") != null)
             {
                 AutoConfig.register(ConfigManagerCloth.class,
                         Toml4jConfigSerializer::new);

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

@@ -0,0 +1,262 @@
+package markil3.immersive_hud;
+
+import com.terraformersmc.modmenu.api.ConfigScreenFactory;
+import com.terraformersmc.modmenu.api.ModMenuApi;
+
+import net.minecraft.block.Blocks;
+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;
+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;
+
+import java.util.Arrays;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+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(new TranslatableText(
+                                "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(new TranslatableText(
+                                "tooltip.immersive_hud." + name +
+                                        "MaxTime"))
+                        .setSaveConsumer(val -> value.setMaxTime((int) (val * TICKS_PER_SECOND)))
+                        .build();
+
+        DoubleListEntry fadeIn =
+                entryBuilder.startDoubleField(new TranslatableText(
+                                "option.immersive_hud." + name +
+                                        "FadeIn"),
+                        (float) value.getFadeInTime() / TICKS_PER_SECOND)
+                        .setDefaultValue(FADE_IN)
+                        .setMin(0)
+                        .setMax(10 * 60 * TICKS_PER_SECOND)
+                        .setTooltip(new TranslatableText(
+                                "tooltip.immersive_hud." + name +
+                                        "FadeIn"))
+                        .setSaveConsumer(val -> value.setFadeInTime((int) (val * TICKS_PER_SECOND)))
+                        .build();
+
+        DoubleListEntry fadeOut =
+                entryBuilder.startDoubleField(new TranslatableText(
+                                "option.immersive_hud." + name +
+                                        "FadeOut"),
+                        (float) value.getFadeOutTime() / TICKS_PER_SECOND)
+                        .setDefaultValue(FADE_OUT)
+                        .setMin(0)
+                        .setMax(10 * 60 * TICKS_PER_SECOND)
+                        .setTooltip(new TranslatableText(
+                                "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 ConfigScreenFactory<?> getModConfigScreenFactory()
+    {
+        return screen -> {
+            ConfigCategory general;
+            ConfigEntryBuilder entryBuilder;
+            ConfigManager instance = ConfigManager.getInstance();
+            final ConfigBuilder builder = ConfigBuilder.create()
+                    .setParentScreen(screen)
+                    .setTitle(new TranslatableText(
+                            "immersive_hud.configGui.title"))
+                    .setSavingRunnable(() -> {
+                        try
+                        {
+                            if (Class.forName("me.shedaniel.autoconfig.AutoConfig") != null)
+                            {
+                                AutoConfig.getConfigHolder(ConfigManagerCloth.class)
+                                        .save();
+                            }
+                        }
+                        catch (ClassNotFoundException e)
+                        {
+                            // Do nothing
+                        }
+                    });
+            general =
+                    builder.getOrCreateCategory(new TranslatableText(
+                            "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("air", entryBuilder,
+                    general,
+                    instance.getAirTime());
+            startTimeField("effect", entryBuilder,
+                    general,
+                    instance.getPotionTime());
+
+            general.addEntry(entryBuilder.startDoubleField(new TranslatableText(
+                            "option.immersive_hud" +
+                                    ".crosshairTime"),
+                    (float) instance.getCrosshairTime() / TICKS_PER_SECOND)
+                    .setDefaultValue(6)
+                    .setTooltip(new TranslatableText(
+                            "tooltip.immersive_hud" +
+                                    ".crosshairTime"))
+                    .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)
+                    .setDefaultValue(30)
+                    .setTooltip(new TranslatableText(
+                            "tooltip.immersive_hud.handTime"))
+                    .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())
+                    .setDefaultValue(0.5)
+                    .setTooltip(new TranslatableText(
+                            "tooltip.immersive_hud.minHealth"))
+                    .setSaveConsumer(val -> instance.setMinHealth(val))
+                    .build());
+
+            general.addEntry(entryBuilder.startIntField(new TranslatableText(
+                            "option.immersive_hud.minHunger"),
+                    instance.getMinHunger())
+                    .setDefaultValue(17)
+                    .setTooltip(new TranslatableText(
+                            "tooltip.immersive_hud.minHunger"))
+                    .setSaveConsumer(val -> instance.setMinHunger(val))
+                    .build());
+    
+            general.addEntry(entryBuilder.startIntField(new TranslatableText(
+                                    "option.immersive_hud.minAir"),
+                            instance.getMinAir())
+                    .setDefaultValue(300)
+                    .setTooltip(new TranslatableText(
+                            "tooltip.immersive_hud.minAir"))
+                    .setSaveConsumer(val -> instance.setMinAir(val))
+                    .build());
+
+            general.addEntry(entryBuilder.startBooleanToggle(new TranslatableText(
+                            "option.immersive_hud.showArmor"),
+                    instance.shouldShowArmor())
+                    .setDefaultValue(true)
+                    .setTooltip(new TranslatableText(
+                            "tooltip.immersive_hud.showArmor"))
+                    .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());
+
+            general.addEntry(entryBuilder
+                    .startStrList(new TranslatableText("option.immersive_hud.enchantingList"), Arrays
+                            .asList(instance
+                                    .getEnchantingdentifiers()).stream().map(Identifier::toString)
+                            .collect(Collectors.toList()))
+                    .setDefaultValue(Arrays
+                            .asList(Blocks.ENCHANTING_TABLE, Blocks.ANVIL, Blocks.BOOKSHELF, Blocks.FURNACE, Blocks.BLAST_FURNACE, Blocks.SMOKER, Blocks.GRINDSTONE).stream().map(b -> Registry.BLOCK.getId(b).toString()).toList())
+                    .setTooltip(new TranslatableText("tooltip.immersive_hud.enchantingList"))
+                    .setSaveConsumer(val -> instance.setIgnoredItems(val.toArray(new String[0]))).setErrorSupplier(val -> {
+                        try
+                        {
+                            Optional<String> item = val.stream().filter(i -> !Registry.BLOCK.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

@@ -16,10 +16,13 @@
  */
 package markil3.immersive_hud;
 
-import com.mojang.blaze3d.platform.GlStateManager;
+import com.mojang.blaze3d.systems.RenderSystem;
 
+import net.minecraft.block.Block;
+import net.minecraft.block.Blocks;
 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;
@@ -34,13 +37,13 @@ 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.SplashPotionItem;
+import net.minecraft.item.ThrowablePotionItem;
 import net.minecraft.item.TridentItem;
 import net.minecraft.util.Hand;
+import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.hit.EntityHitResult;
 import net.minecraft.util.hit.HitResult;
 import net.minecraft.util.math.MathHelper;
@@ -49,12 +52,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
 {
@@ -127,11 +131,21 @@ public class TimerUtils
      * in hunger.
      */
     private static int hunger = -1;
+    /**
+     * Records what the oxygen level was previously. Used to check for a change
+     * in oxygen.
+     */
+    private static int air = -1;
     /**
      * Records whether or not there was food poisoning. Used to check for a
      * change in hunger.
      */
     private static boolean isFoodPoisoned = false;
+    /**
+     * How many more ticks the oxygen bar will be onscreen. Every tick is 1/20th
+     * of a second.
+     */
+    private static double airTime;
 
     /**
      * How many more ticks the mount's health bar will be onscreen. Every tick
@@ -173,7 +187,7 @@ public class TimerUtils
      */
     public static void setAlpha(float alpha)
     {
-        GlStateManager.color4f(1.0F, 1.0F, 1.0F, alpha);
+        RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, alpha);
     }
 
     /**
@@ -250,6 +264,10 @@ public class TimerUtils
                 ConfigManager.getInstance().getExperienceTime();
         ConfigManager.TimeValues jump =
                 ConfigManager.getInstance().getJumpTime();
+        ConfigManager.TimeValues healthTimes = ConfigManager.getInstance().getHealthTime();
+        ConfigManager.TimeValues hungerTimes = ConfigManager.getInstance().getHungerTime();
+        ConfigManager.TimeValues airTimes =
+                ConfigManager.getInstance().getAirTime();
 
         float hotbarAlpha = Main.getAlpha(hotbarTime,
                 hotbar.getMaxTime(),
@@ -263,8 +281,32 @@ public class TimerUtils
                 jump.getMaxTime(),
                 jump.getFadeInTime(),
                 jump.getFadeOutTime());
-        return 7 * (1 - Math.max(experienceAlpha,
-                jumpAlpha)) + 22 * (1 - hotbarAlpha);
+        float statusAlpha = Main.getAlpha(healthTime,
+                healthTimes.getMaxTime(),
+                healthTimes.getFadeInTime(),
+                healthTimes.getFadeOutTime());
+        statusAlpha = Math.max(statusAlpha, Main.getAlpha(hungerTime,
+                hungerTimes.getMaxTime(),
+                hungerTimes.getFadeInTime(),
+                hungerTimes.getFadeOutTime()));
+        statusAlpha = Math.max(statusAlpha, Main.getAlpha(airTime,
+                airTimes.getMaxTime(),
+                airTimes.getFadeInTime(),
+                airTimes.getFadeOutTime()));
+        /*
+         * Draw it in its standard location until it is completely transparent, then move it
+         * instantly.
+         */
+        statusAlpha = (float) Math.ceil(statusAlpha);
+        float trans = 7 * (1 - Math.max(experienceAlpha,
+                jumpAlpha)) + 22 * (1 - hotbarAlpha) + 42 * (1 - statusAlpha) +  9 * (1 - Math.max(Main.getAlpha(hungerTime,
+                hungerTimes.getMaxTime(),
+                hungerTimes.getFadeInTime(),
+                hungerTimes.getFadeOutTime()), Main.getAlpha(healthTime,
+                healthTimes.getMaxTime(),
+                healthTimes.getFadeInTime(),
+                healthTimes.getFadeOutTime())));
+        return trans;
     }
 
     /**
@@ -289,6 +331,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 +357,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)
         {
@@ -337,6 +388,10 @@ public class TimerUtils
                                                     0);
             }
         }
+        else
+        {
+            System.out.println("Unusing hand " + hand);
+        }
     }
 
     /**
@@ -344,12 +399,14 @@ 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;
@@ -372,10 +429,11 @@ public class TimerUtils
                     }
                     if (offHandTime < HAND_UP_TIME)
                     {
-                        GlStateManager.translatef(0,
-                                (float) (-1.0F * (HAND_UP_TIME - offHandTime) /
-                                        HAND_UP_TIME),
-                                0);
+                        matrixStack
+                                .translate(0,
+                                        -1.0F * (HAND_UP_TIME - offHandTime) /
+                                                HAND_UP_TIME,
+                                        0);
                     }
                 }
                 break;
@@ -392,10 +450,11 @@ public class TimerUtils
                     }
                     if (mainHandTime < HAND_UP_TIME)
                     {
-                        GlStateManager.translatef(0,
-                                (float) (-1.0F * (HAND_UP_TIME - mainHandTime) /
-                                        HAND_UP_TIME),
-                                0);
+                        matrixStack
+                                .translate(0,
+                                        -1.0F * (HAND_UP_TIME - mainHandTime) /
+                                                HAND_UP_TIME,
+                                        0);
                     }
                 }
                 break;
@@ -425,13 +484,13 @@ public class TimerUtils
         boolean hideCrosshair = ConfigManager.getInstance().hideCrosshair();
         if (hideCrosshair)
         {
-            if (mc.hitResult != null && mc.hitResult
+            if (mc.crosshairTarget != null && mc.crosshairTarget
                     .getType() != HitResult.Type.MISS)
             {
-                if (mc.hitResult.getType() == HitResult.Type
+                if (mc.crosshairTarget.getType() == HitResult.Type
                         .ENTITY)
                 {
-                    if (((EntityHitResult) mc.hitResult).getEntity() != entity
+                    if (((EntityHitResult) mc.crosshairTarget).getEntity() != entity
                             .getVehicle())
                     {
                         changed = true;
@@ -469,7 +528,7 @@ public class TimerUtils
      *
      * @since 0.1-1.16.4-fabric
      */
-    public static boolean drawMountHealth(float ticks)
+    public static boolean drawMountHealth(MatrixStack stack, float ticks)
     {
         /*
          * When the health percentage falls to this level or below, the
@@ -501,9 +560,9 @@ public class TimerUtils
                 mountHealth = mount.getHealth();
                 changed = true;
             }
-            if (mountMaxHealth != mount.getHealthMaximum())
+            if (mountMaxHealth != mount.getMaxHealth())
             {
-                mountMaxHealth = mount.getHealthMaximum();
+                mountMaxHealth = mount.getMaxHealth();
                 changed = true;
             }
         }
@@ -524,10 +583,10 @@ public class TimerUtils
          */
         if (mountHealth / mountMaxHealth > HEALTH_BOUNDARY)
         {
-            if (tmp != null && mountTime > 0)
+            if (mountTime > 0)
             {
-                GlStateManager.pushMatrix();
-                GlStateManager.translatef(0F,
+                stack.push();
+                stack.translate(0F,
                         getHealthTranslation(),
                         0F);
                 setAlpha(Main.getAlpha(mountTime,
@@ -538,8 +597,8 @@ public class TimerUtils
             }
             return true;
         }
-        GlStateManager.pushMatrix();
-        GlStateManager.translatef(0F,
+        stack.push();
+        stack.translate(0F,
                 getHealthTranslation(),
                 0F);
         return false;
@@ -699,9 +758,9 @@ public class TimerUtils
             health = entity.getHealth();
             changed = true;
         }
-        if (maxHealth != entity.getHealthMaximum())
+        if (maxHealth != entity.getMaxHealth())
         {
-            maxHealth = entity.getHealthMaximum();
+            maxHealth = entity.getMaxHealth();
             changed = true;
         }
         if (changed)
@@ -813,15 +872,104 @@ public class TimerUtils
                 .hasStatusEffect(StatusEffects.HUNGER);
     }
     
+    /**
+     * Determines whether or not to draw the oxygen bar, adjusting the alpha as
+     * needed.
+     *
+     * @return If true, then cancel drawing the oxygen bar.
+     *
+     * @since 1.3.1-1.18-fabric
+     */
+    public static boolean drawAir(float ticks)
+    {
+        /*
+         * When air falls to this level or below, the oxygen bar won't
+         * disappear, allowing the player to be constantly reminded of their
+         * low oxygen.
+         */
+        final int AIR_BOUNDARY = ConfigManager.getInstance().getMinAir();
+        ConfigManager.TimeValues airTimes =
+                ConfigManager.getInstance().getAirTime();
+    
+        MinecraftClient mc = MinecraftClient.getInstance();
+        PlayerEntity entity;
+        boolean canceled;
+        boolean changed = false;
+    
+        if (mc.getCameraEntity() instanceof PlayerEntity)
+        {
+            entity = (PlayerEntity) mc.getCameraEntity();
+        }
+        else
+        {
+            return true;
+        }
+    
+        if (air != entity.getAir())
+        {
+            float dividor = entity.getMaxAir() / 10;
+            if (air / dividor != entity.getAir() / dividor)
+            {
+                changed = true;
+            }
+            air = entity.getAir();
+        }
+        if (air <= AIR_BOUNDARY)
+        {
+            changed = true;
+        }
+        if (entity.hasStatusEffect(StatusEffects
+                .CONDUIT_POWER) || entity.hasStatusEffect(StatusEffects
+                .WATER_BREATHING))
+        {
+            changed = false;
+        }
+        if (changed)
+        {
+            airTime = airTimes.getMaxTime() - (airTime > 0 ?
+                    airTimes.getFadeInTime() :
+                    0);
+        }
+        else if (airTime > 0)
+        {
+            airTime -= ticks;
+        }
+    
+        if (airTime <= 0 && (air >= AIR_BOUNDARY || entity.hasStatusEffect(StatusEffects
+                .CONDUIT_POWER) || entity.hasStatusEffect(StatusEffects
+                .WATER_BREATHING)))
+        {
+            return true;
+        }
+        /*
+         * Only makes a change if the player is healthy. Otherwise,
+         * the bar is shown.
+         */
+        if (entity.getAir() >= entity.getMaxAir() || entity.hasStatusEffect(StatusEffects
+                .CONDUIT_POWER) || entity.hasStatusEffect(StatusEffects
+                .WATER_BREATHING))
+        {
+            setAlpha(Main.getAlpha(airTime,
+                    airTimes.getMaxTime(),
+                    airTimes.getFadeInTime(),
+                    airTimes.getFadeOutTime()));
+        }
+        return airTime == 0 && entity.getAir() >= entity.getMaxAir() && !entity.hasStatusEffect(StatusEffects
+                .CONDUIT_POWER) && !entity.hasStatusEffect(StatusEffects
+                .WATER_BREATHING);
+    }
+
     /**
      * Determines whether or not to draw the horse jump bar, adjusting the alpha
      * as needed.
      *
+     * @param stack
+     *
      * @return If true, then cancel drawing the jump bar.
      *
      * @since 0.1-1.16.4-fabric
      */
-    public static boolean drawJumpbar(float ticks)
+    public static boolean drawJumpbar(MatrixStack stack, float ticks)
     {
         ConfigManager.TimeValues jump =
                 ConfigManager.getInstance().getJumpTime();
@@ -837,7 +985,7 @@ public class TimerUtils
             return true;
         }
 
-        if (entity.method_3151() > 0)
+        if (entity.getMountJumpStrength() > 0)
         {
             jumpTime = jump.getMaxTime() - (jumpTime > 0 ?
                                             jump.getFadeInTime() :
@@ -849,8 +997,8 @@ public class TimerUtils
         }
         if (jumpTime > 0)
         {
-            GlStateManager.pushMatrix();
-            GlStateManager.translatef(0F, TimerUtils.getJumpTranslation(), 0F);
+            stack.push();
+            stack.translate(0F, TimerUtils.getJumpTranslation(), 0F);
             setAlpha(Main.getAlpha(jumpTime,
                     jump.getMaxTime(),
                     jump.getFadeInTime(),
@@ -868,7 +1016,7 @@ public class TimerUtils
      *
      * @since 0.1-1.16.4-fabric
      */
-    public static boolean drawExperience(float ticks)
+    public static boolean drawExperience(MatrixStack stack, float ticks)
     {
         ConfigManager.TimeValues experience =
                 ConfigManager.getInstance().getExperienceTime();
@@ -891,22 +1039,32 @@ public class TimerUtils
             experienceProgress = entity.totalExperience;
             changed = true;
         }
+
+        if (experienceTime <= 0 && mc.crosshairTarget != null && mc.crosshairTarget.getType() == HitResult.Type.BLOCK)
+        {
+            Block block = mc.world.getBlockState(((BlockHitResult) mc.crosshairTarget).getBlockPos()).getBlock();
+            Set<Block> ignored = ConfigManager.getInstance().getEnchantingItems();
+            if (ignored.contains(block))
+            {
+                changed = true;
+            }
+        }
+
         if (changed)
         {
             experienceTime = experience.getMaxTime() - (experienceTime > 0 ?
-                                                        experience.getFadeInTime() :
-                                                        0);
+                    experience.getFadeInTime() :
+                    0);
         }
         else if (experienceTime > 0)
         {
             experienceTime -= ticks;
         }
+
         if (experienceTime > 0)
         {
-            GlStateManager.pushMatrix();
-            GlStateManager.translatef(0F,
-                    TimerUtils.getExperienceTranslation(),
-                    0F);
+            stack.push();
+            stack.translate(0F, TimerUtils.getExperienceTranslation(), 0F);
             setAlpha(Main.getAlpha(experienceTime,
                     experience.getMaxTime(),
                     experience.getFadeInTime(),
@@ -923,7 +1081,7 @@ public class TimerUtils
      *
      * @return If true, then cancel drawing the hotbar.
      *
-     * @see #recolorHotbar()
+     * @see #recolorHotbar(MatrixStack)
      * @since 0.1-1.16.4-fabric
      */
     public static boolean updateHotbar(float ticks)
@@ -1048,7 +1206,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 SplashPotionItem || item instanceof LingeringPotionItem ||
+                else if (item instanceof ThrowablePotionItem ||
                         item instanceof SnowballItem || item instanceof
                         EggItem || item instanceof EnderPearlItem || item
                         instanceof FishingRodItem)
@@ -1117,9 +1275,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,19 +1300,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()
+    public static void recolorHotbar(MatrixStack stack)
     {
         ConfigManager.TimeValues hotbar =
                 ConfigManager.getInstance().getHotbarTime();
-        GlStateManager.pushMatrix();
-        GlStateManager.translatef(0F, TimerUtils.getHotbarTranslation(), 0F);
+//        RenderSystem.pushMatrix();
+        stack.push();
+        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/HeldItemHook.java

@@ -17,7 +17,9 @@
 package markil3.immersive_hud.mixin;
 
 import net.minecraft.client.network.AbstractClientPlayerEntity;
-import net.minecraft.client.render.FirstPersonRenderer;
+import net.minecraft.client.render.VertexConsumerProvider;
+import net.minecraft.client.render.item.HeldItemRenderer;
+import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.Hand;
 
@@ -37,46 +39,56 @@ import markil3.immersive_hud.TimerUtils;
  * @author Markil 3
  * @version 0.1-1.16.4-fabric
  */
-@Mixin(FirstPersonRenderer.class)
+@Mixin(HeldItemRenderer.class)
 public class HeldItemHook
 {
-    private static final Logger LOGGER = LogManager.getLogger(HeldItemHook.class);
+    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" +
-            "(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,
+    @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,
                            Hand hand,
-                           float h,
-                           ItemStack itemStack,
-                           float i,
+                           float swingProgress,
+                           ItemStack item,
+                           float equipProgress,
+                           MatrixStack matrices,
+                           VertexConsumerProvider vertexConsumers,
+                           int light,
                            CallbackInfo callbackInfo)
     {
         try
         {
-        if (TimerUtils.onRenderHand(hand, f))
-        {
-            callbackInfo.cancel();
-        }
+            if (TimerUtils.onRenderHand(hand, matrices, tickDelta))
+            {
+                callbackInfo.cancel();
+            }
         }
         catch (Exception e)
         {
             LOGGER.error(
-                    "Error in running net.minecraft.client.render" +
-                            ".FirstPersonRenderer#renderFirstPersonItem " +
+                    "Error in running net.minecraft.client.render.item" +
+                            ".HeldItemRenderer#renderFirstPersonItem " +
                             "event",
                     e);
         }

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

@@ -16,11 +16,12 @@
  */
 package markil3.immersive_hud.mixin;
 
-import com.mojang.blaze3d.platform.GlStateManager;
+import com.mojang.blaze3d.systems.RenderSystem;
 
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.hud.InGameHud;
 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;
@@ -39,7 +40,7 @@ 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
@@ -51,6 +52,7 @@ public class HudHook
     /**
      * Determines whether or not to draw the crosshair.
      *
+     * @param stack - The matrix drawing stack.
      * @param callbackInfo
      *
      * @version 0.2-1.16.4-fabric
@@ -58,9 +60,8 @@ public class HudHook
      */
     @Inject(method = "renderCrosshair", at = @At(value = "HEAD"),
             cancellable = true)
-    public void startCrosshair(CallbackInfo callbackInfo)
+    public void startCrosshair(MatrixStack stack, CallbackInfo callbackInfo)
     {
-        LOGGER.debug("Starting crosshair");
         try
         {
             if (TimerUtils.drawCrosshair(MinecraftClient.getInstance()
@@ -73,7 +74,7 @@ public class HudHook
         {
             LOGGER.error(
                     "Error in running net.minecraft.client.gui.hud" +
-                            ".InGameHud#renderCrosshair " +
+                            ".InGameHud#startCrosshair " +
                             "event",
                     e);
         }
@@ -82,15 +83,15 @@ public class HudHook
     /**
      * Resets any changes from drawing the crosshair.
      *
+     * @param stack - The matrix drawing stack.
      * @param callbackInfo
      *
      * @version 0.2-1.16.4-fabric
      * @since 0.1-1.16.4-fabric
      */
     @Inject(method = "renderCrosshair", at = @At(value = "TAIL"))
-    public void finishCrosshair(CallbackInfo callbackInfo)
+    public void finishCrosshair(MatrixStack stack, CallbackInfo callbackInfo)
     {
-        LOGGER.debug("Finishing crosshair");
         try
         {
             /*
@@ -111,6 +112,7 @@ public class HudHook
     /**
      * Determines whether or not to draw the horse jump bar.
      *
+     * @param stack - The matrix drawing stack.
      * @param callbackInfo
      *
      * @version 0.2-1.16.4-fabric
@@ -118,13 +120,14 @@ public class HudHook
      */
     @Inject(method = "renderMountJumpBar", at = @At(value = "HEAD"),
             cancellable = true)
-    public void startJumpbar(int x, CallbackInfo callbackInfo)
+    public void startJumpbar(MatrixStack stack,
+                             int x,
+                             CallbackInfo callbackInfo)
     {
-        LOGGER.debug("Starting jumpbar");
         try
         {
-            if (TimerUtils.drawJumpbar(MinecraftClient.getInstance()
-                    .getTickDelta()))
+            if (TimerUtils.drawJumpbar(stack,
+                    MinecraftClient.getInstance().getTickDelta()))
             {
                 callbackInfo.cancel();
             }
@@ -142,20 +145,20 @@ public class HudHook
     /**
      * Resets any changes from drawing the horse jump bar.
      *
+     * @param stack - The matrix drawing stack.
      * @param callbackInfo
      *
      * @version 0.2-1.16.4-fabric
      * @since 0.1-1.16.4-fabric
      */
     @Inject(method = "renderMountJumpBar", at = @At(value = "TAIL"))
-    public void finishJumpbar(
-            int x,
-            CallbackInfo callbackInfo)
+    public void finishJumpbar(MatrixStack stack,
+                              int x,
+                              CallbackInfo callbackInfo)
     {
-        LOGGER.debug("Finishing jumpbar");
         try
         {
-            GlStateManager.popMatrix();
+            stack.pop();
             /*
              * Resets the color so that nothing else is bothered.
              */
@@ -174,6 +177,7 @@ public class HudHook
     /**
      * Determines whether or not to draw the experience bar.
      *
+     * @param stack - The matrix drawing stack.
      * @param callbackInfo
      *
      * @version 0.2-1.16.4-fabric
@@ -181,13 +185,14 @@ public class HudHook
      */
     @Inject(method = "renderExperienceBar", at = @At(value = "HEAD"),
             cancellable = true)
-    public void startExperience(int x, CallbackInfo callbackInfo)
+    public void startExperience(MatrixStack stack,
+                                int x,
+                                CallbackInfo callbackInfo)
     {
-        LOGGER.debug("Starting experience bar");
         try
         {
-            if (TimerUtils.drawExperience(MinecraftClient.getInstance()
-                    .getTickDelta()))
+            if (TimerUtils.drawExperience(stack,
+                    MinecraftClient.getInstance().getTickDelta()))
             {
                 callbackInfo.cancel();
             }
@@ -205,18 +210,20 @@ public class HudHook
     /**
      * Resets any changes from drawing the experience bar.
      *
+     * @param stack - The matrix drawing stack.
      * @param callbackInfo
      *
      * @version 0.2-1.16.4-fabric
      * @since 0.1-1.16.4-fabric
      */
     @Inject(method = "renderExperienceBar", at = @At(value = "TAIL"))
-    public void finishExperience(int x, CallbackInfo callbackInfo)
+    public void finishExperience(MatrixStack stack,
+                                 int x,
+                                 CallbackInfo callbackInfo)
     {
-        LOGGER.debug("Finishing experience bar");
         try
         {
-            GlStateManager.popMatrix();
+            stack.pop();
             /*
              * Resets the color so that nothing else is bothered.
              */
@@ -236,18 +243,19 @@ public class HudHook
      * Changes the position of the status bars as the ones below them move up
      * and down.
      *
+     * @param stack - The matrix stack used.
+     *
      * @return The same matrix stack, with a new matrix pushed onto it.
      */
-    @Inject(method = "renderStatusBars", at = @At("HEAD"))
-    public void startStatus(CallbackInfo info)
+    @ModifyVariable(method = "renderStatusBars(Lnet/minecraft/client/util" +
+            "/math/MatrixStack;)V", at = @At("HEAD"))
+    public MatrixStack startStatus(MatrixStack stack)
     {
-        LOGGER.debug("Starting status bars");
         try
         {
-            GlStateManager.pushMatrix();
-            GlStateManager.translatef(0F,
-                    TimerUtils.getHealthTranslation(),
-                    0F);
+            float trans = TimerUtils.getHealthTranslation();
+            stack.push();
+            stack.translate(0F, trans, 0F);
         }
         catch (Exception e)
         {
@@ -257,20 +265,20 @@ public class HudHook
                             "event",
                     e);
         }
+        return stack;
     }
 
     /**
      * Adjusts the armor GUI.
      *
+     * @param matrices
      * @param callbackInfo
      */
-    @Inject(method = "renderStatusBars()V", at = @At(value = "INVOKE",
-            target = "Lnet" +
-                    "/minecraft/util/profiler/Profiler;push" +
-                    "(Ljava/lang/String;)V"))
-    public void renderArmor(CallbackInfo callbackInfo)
+    @Inject(method = "renderStatusBars(Lnet/minecraft/client/util" +
+            "/math/MatrixStack;)V", at = @At(value = "INVOKE", target = "Lnet" +
+            "/minecraft/util/profiler/Profiler;push(Ljava/lang/String;)V"))
+    public void renderArmor(MatrixStack matrices, CallbackInfo callbackInfo)
     {
-        LOGGER.debug("Rendering armor");
         try
         {
             if (TimerUtils.drawArmor())
@@ -291,16 +299,15 @@ public class HudHook
     /**
      * Adjusts the health GUI.
      *
+     * @param matrices
      * @param callbackInfo
      */
-    @Inject(method = "renderStatusBars()V", at = @At(value = "INVOKE",
-            target = "Lnet" +
-                    "/minecraft/util/profiler/Profiler;swap" +
-                    "(Ljava/lang/String;)V",
+    @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 = 0))
-    public void renderHealth(CallbackInfo callbackInfo)
+    public void renderHealth(MatrixStack matrices, CallbackInfo callbackInfo)
     {
-        LOGGER.debug("Rendering health");
         try
         {
             /*
@@ -326,16 +333,15 @@ public class HudHook
     /**
      * Adjusts the food GUI.
      *
+     * @param matrices
      * @param callbackInfo
      */
-    @Inject(method = "renderStatusBars()V", at = @At(value = "INVOKE",
-            target = "Lnet" +
-                    "/minecraft/util/profiler/Profiler;swap" +
-                    "(Ljava/lang/String;)V",
-            ordinal = 1))
-    public void renderFood(CallbackInfo callbackInfo)
+    @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, shift = At.Shift.BY, by = 3))
+    public void renderFood(MatrixStack matrices, CallbackInfo callbackInfo)
     {
-        LOGGER.debug("Rendering food");
         try
         {
             /*
@@ -361,22 +367,25 @@ public class HudHook
     /**
      * Resets the air GUI.
      *
+     * @param matrices
      * @param callbackInfo
      */
-    @Inject(method = "renderStatusBars()V", at = @At(value = "INVOKE",
-            target = "Lnet" +
-                    "/minecraft/util/profiler/Profiler;swap" +
-                    "(Ljava/lang/String;)V",
+    @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 = 2))
-    public void renderAir(CallbackInfo callbackInfo)
+    public void renderAir(MatrixStack matrices, CallbackInfo callbackInfo)
     {
-        LOGGER.debug("Rendering air");
         try
         {
             /*
              * Resets the color so that nothing else is bothered.
              */
             TimerUtils.setAlpha(1F);
+            if (TimerUtils.drawAir(MinecraftClient.getInstance().getTickDelta()))
+            {
+                TimerUtils.setAlpha(0F);
+            }
         }
         catch (Exception e)
         {
@@ -388,13 +397,14 @@ public class HudHook
         }
     }
 
-    @Inject(method = "renderStatusBars", at = @At("TAIL"))
-    public void finishStatus(CallbackInfo info)
+    @ModifyVariable(method = "renderStatusBars(Lnet/minecraft/client/util" +
+            "/math/MatrixStack;)V", at = @At("TAIL"))
+    public MatrixStack finishStatus(MatrixStack stack)
     {
-        LOGGER.debug("Finishing status bars");
         try
         {
-            GlStateManager.popMatrix();
+            TimerUtils.setAlpha(1F);
+            stack.pop();
         }
         catch (Exception e)
         {
@@ -404,11 +414,13 @@ public class HudHook
                             "event",
                     e);
         }
+        return stack;
     }
 
     /**
      * Determines whether or not to draw the mount's health.
      *
+     * @param stack - The matrix drawing stack.
      * @param callbackInfo
      *
      * @version 0.2-1.16.4-fabric
@@ -416,19 +428,15 @@ public class HudHook
      */
     @Inject(method = "renderMountHealth", at = @At(value = "HEAD"),
             cancellable = true)
-    public void startMountHealth(CallbackInfo callbackInfo)
+    public void startMountHealth(MatrixStack stack, CallbackInfo callbackInfo)
     {
         try
         {
-            if (TimerUtils.drawMountHealth(MinecraftClient.getInstance()
-                    .getTickDelta()))
+            if (TimerUtils.drawMountHealth(stack,
+                    MinecraftClient.getInstance().getTickDelta()))
             {
                 callbackInfo.cancel();
             }
-            else
-            {
-                LOGGER.debug("Starting mount health");
-            }
         }
         catch (Exception e)
         {
@@ -443,21 +451,21 @@ public class HudHook
     /**
      * Resets any changes from drawing the mount's health.
      *
+     * @param stack - The matrix drawing stack.
      * @param callbackInfo
      *
      * @version 0.2-1.16.4-fabric
      * @since 0.1-1.16.4-fabric
      */
     @Inject(method = "renderMountHealth", at = @At(value = "TAIL"))
-    public void finishMountHealth(CallbackInfo callbackInfo)
+    public void finishMountHealth(MatrixStack stack, CallbackInfo callbackInfo)
     {
-        LOGGER.debug("Finishing mount health");
         try
         {
             /*
              * Resets the color so that nothing else is bothered.
              */
-            GlStateManager.popMatrix();
+            stack.pop();
             TimerUtils.resetAlpha();
         }
         catch (Exception e)
@@ -476,11 +484,11 @@ public class HudHook
      * @version 0.2-1.16.4-fabric
      * @since 0.1-1.16.4-fabric
      */
-    @Inject(method = "renderStatusEffectOverlay()V", at =
+    @Inject(method = "renderStatusEffectOverlay" +
+            "(Lnet/minecraft/client/util/math/MatrixStack;)V", at =
     @At(value = "HEAD", shift = At.Shift.AFTER))
-    public void startPotion(CallbackInfo info)
+    public void startPotion(MatrixStack effect, CallbackInfo info)
     {
-        LOGGER.debug("Starting potions");
         try
         {
             TimerUtils.updatePotions(MinecraftClient.getInstance().cameraEntity instanceof ClientPlayerEntity ?
@@ -503,14 +511,14 @@ public class HudHook
      * @version 0.2-1.16.4-fabric
      * @since 0.1-1.16.4-fabric
      */
-    @Redirect(method = "renderStatusEffectOverlay()V", at =
+    @Redirect(method = "renderStatusEffectOverlay" +
+            "(Lnet/minecraft/client/util/math/MatrixStack;)V", at =
     @At(value = "INVOKE",
             target =
                     "Lnet/minecraft/entity/effect/StatusEffectInstance;" +
                             "shouldShowIcon()Z"))
     public boolean shouldRenderPotion(StatusEffectInstance effect)
     {
-        LOGGER.debug("Updating potions");
         try
         {
             currentEffect = effect;
@@ -532,15 +540,17 @@ public class HudHook
      * Makes the actual adjustment to the hotbar as needed.
      *
      * @param f - The original transparency
+     * @param stack - The matrix stack
      *
      * @version 0.2-1.16.4-fabric
      * @since 0.1-1.16.4-fabric
      */
-    @ModifyVariable(method = "renderStatusEffectOverlay()V", at =
+    @ModifyVariable(method = "renderStatusEffectOverlay" +
+            "(Lnet/minecraft/client/util/math/MatrixStack;)V", at =
     @At(value = "STORE"))
-    public float updatePotion(float f)
+    public float updatePotion(float f,
+                              MatrixStack stack)
     {
-        LOGGER.debug("Adjusting potions");
         try
         {
             return TimerUtils.getPotionAlpha(currentEffect);
@@ -559,15 +569,16 @@ public class HudHook
     /**
      * Resets any changes from drawing the potion effects.
      *
+     * @param matrices - The matrix drawing stack.
      * @param callbackInfo
      *
      * @version 0.2-1.16.4-fabric
      * @since 0.2-1.16.4-fabric
      */
     @Inject(method = "renderStatusEffectOverlay", at = @At(value = "TAIL"))
-    public void finishPotion(CallbackInfo callbackInfo)
+    public void finishPotion(MatrixStack matrices,
+                             CallbackInfo callbackInfo)
     {
-        LOGGER.debug("Finishing potions");
         try
         {
             /*
@@ -589,6 +600,7 @@ public class HudHook
      * Determines whether or not to draw the hotbar.
      *
      * @param tickDelta
+     * @param matrices - The matrix drawing stack.
      * @param callbackInfo
      *
      * @version 0.2-1.16.4-fabric
@@ -597,9 +609,9 @@ public class HudHook
     @Inject(method = "renderHotbar", at = @At(value = "HEAD"), cancellable =
             true)
     public void startHotbar(float tickDelta,
+                            MatrixStack matrices,
                             CallbackInfo callbackInfo)
     {
-        LOGGER.debug("Starting hotbar");
         try
         {
             if (TimerUtils.updateHotbar(tickDelta))
@@ -621,21 +633,22 @@ public class HudHook
      * Makes the actual adjustment to the hotbar as needed.
      *
      * @param tickDelta
+     * @param matrices - The matrix drawing stack.
      * @param callbackInfo
      *
      * @version 0.2-1.16.4-fabric
      * @since 0.1-1.16.4-fabric
      */
     @Inject(method = "renderHotbar", at = @At(value = "INVOKE", target =
-            "Lcom/mojang/blaze3d/platform/GlStateManager;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)
     {
-        LOGGER.debug("Adjusting hotbar");
         try
         {
-            TimerUtils.recolorHotbar();
+            TimerUtils.recolorHotbar(matrices);
         }
         catch (Exception e)
         {
@@ -651,19 +664,23 @@ public class HudHook
      * Resets any changes from drawing the hotbar.
      *
      * @param tickDelta
+     * @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"))
     public void finishHotbar(float tickDelta,
+                             MatrixStack stack,
                              CallbackInfo callbackInfo)
     {
-        LOGGER.debug("Finishing hotbar");
         try
         {
-            GlStateManager.popMatrix();
+            stack.pop();
+            stack = RenderSystem.getModelViewStack();
+            stack.pop();
+            RenderSystem.applyModelViewMatrix();
             /*
              * Resets the color so that nothing else is bothered.
              */
@@ -672,7 +689,8 @@ public class HudHook
         catch (Exception e)
         {
             LOGGER.error(
-                    "Error in running net.minecraft.client.gui.hud.InGameHud#renderHotbar " +
+                    "Error in running net.minecraft.client.gui.hud" +
+                            ".InGameHud#renderHotbar " +
                             "event",
                     e);
         }

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

@@ -15,6 +15,9 @@
   "option.immersive_hud.hungerMaxTime": "Hunger Bar Display Time",
   "option.immersive_hud.hungerFadeIn": "Hunger Bar Fade In Time",
   "option.immersive_hud.hungerFadeOut": "Hunger Bar Fade Out Time",
+  "option.immersive_hud.airMaxTime": "Oxygen Bar Display Time",
+  "option.immersive_hud.airFadeIn": "Oxygen Bar Fade In Time",
+  "option.immersive_hud.airFadeOut": "Oxygen Bar Fade Out Time",
   "option.immersive_hud.effectMaxTime": "Potion Display Time",
   "option.immersive_hud.effectFadeIn": "Potion Fade In Time",
   "option.immersive_hud.effectFadeOut": "Potion Fade Out Time",
@@ -24,7 +27,10 @@
   "option.immersive_hud.hideHands": "Hide Hands",
   "option.immersive_hud.minHealth": "Minimum Health Fade",
   "option.immersive_hud.minHunger": "Minimum Hunger Fade",
+  "option.immersive_hud.minAir": "Minimum Oxygen Fade",
   "option.immersive_hud.showArmor": "Show Armor",
+  "option.immersive_hud.ignoreList": "Ignored Items",
+  "option.immersive_hud.enchantingList": "Experience Blocks",
   "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",
@@ -40,6 +46,9 @@
   "tooltip.immersive_hud.hungerMaxTime": "How long the hunger bar can be displayed on screen in seconds",
   "tooltip.immersive_hud.hungerFadeIn": "How many seconds it takes for the hunger bar to fade in",
   "tooltip.immersive_hud.hungerFadeOut": "How many seconds it takes for the hunger bar to fade out",
+  "tooltip.immersive_hud.airMaxTime": "How long the hunger bar can be oxygen on screen in seconds",
+  "tooltip.immersive_hud.airFadeIn": "How many seconds it takes for the oxygen bar to fade in",
+  "tooltip.immersive_hud.airFadeOut": "How many seconds it takes for the oxygen bar to fade out",
   "tooltip.immersive_hud.effectMaxTime": "How long potion icons can be displayed on screen in seconds",
   "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",
@@ -49,5 +58,10 @@
   "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.minAir": "When the oxygen level goes below this level, the oxygen bar won't fade away",
+  "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",
+  "tooltip.immersive_hud.enchantingList": "Which blocks will show the experience bar when looked at.",
+  "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",
-    "minecraft": "1.14.x"
+    "fabricloader": ">=0.12.12",
+    "minecraft": "1.18.x",
+    "java": ">=17"
   },
   "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": [