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
+          1.17,  # Minimum supported by Minecraft
-          11,   # Current Java LTS
+          17,   # Current Java LTS
-          15    # Latest version
+          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,21 +1,18 @@
 plugins {
-	id 'fabric-loom' version '0.5-SNAPSHOT'
+	id 'fabric-loom' version '0.11-SNAPSHOT'
 	id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_1_8
+sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_17
 
 archivesBaseName = project.archives_base_name
 version = project.mod_version + "-" + project.minecraft_version + "-fabric"
 group = project.maven_group
 
 repositories {
-    // Add repositories to retrieve artifacts from in here.
+	maven { url "https://maven.shedaniel.me/" }
-    // You should only use this when depending on other mods because
+	maven { url "https://maven.terraformersmc.com/" }
-    // Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
-    // See https://docs.gradle.org/current/userguide/declaring_repositories.html
-    // for more information about repositories.
 }
 
 dependencies {
@@ -24,9 +21,11 @@ dependencies {
 	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
 	modImplementation "net.fabricmc:fabric-loader:${project.loader_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.
 }
@@ -46,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
+	// Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
-	// JDK 9 introduced a new way of specifying this that will make sure no newer classes or methods are used.
+	it.options.release = 17
-	// 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

@@ -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.16.4
+	minecraft_version=1.18.1
-	yarn_mappings=1.16.4+build.9
+	yarn_mappings=1.18.1+build.22
-	loader_version=0.11.1
+	loader_version=0.12.12
+
+cloth_version=6.1.48
+modmenu_version=3.0.1
+fabric_version=0.46.2+1.18
 
 # Mod Properties
-	mod_version = 0.1
+	mod_version = 1.3
 	maven_group = markil3
 	archives_base_name = immersive_hud
-
-# Dependencies
-	# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-	fabric_version=0.30.3+1.16

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"
+app_path=$0
-# Need this for relative symlinks.
+
-while [ -h "$PRG" ] ; do
+# Need this for daisy-chained symlinks.
-    ls=`ls -ld "$PRG"`
+while
-    link=`expr "$ls" : '.*-> \(.*\)$'`
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    if expr "$link" : '/.*' > /dev/null; then
+    [ -h "$app_path" ]
-        PRG="$link"
+do
-    else
+    ls=$( ls -ld "$app_path" )
-        PRG=`dirname "$PRG"`"/$link"
+    link=${ls#*' -> '}
-    fi
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
+
-cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
 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
+case "$( uname )" in                #(
-  CYGWIN* )
+  CYGWIN* )         cygwin=true  ;; #(
-    cygwin=true
+  Darwin* )         darwin=true  ;; #(
-    ;;
+  MSYS* | MINGW* )  msys=true    ;; #(
-  Darwin* )
+  NONSTOP* )        nonstop=true ;;
-    darwin=true
-    ;;
-  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
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
+    case $MAX_FD in #(
-    if [ $? -eq 0 ] ; then
+      max*)
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+        MAX_FD=$( ulimit -H -n ) ||
-            MAX_FD="$MAX_FD_LIMIT"
+            warn "Could not query maximum file descriptor limit"
-        fi
+    esac
-        ulimit -n $MAX_FD
+    case $MAX_FD in  #(
-        if [ $? -ne 0 ] ; then
+      '' | soft) :;; #(
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
+      *)
-        fi
+        ulimit -n "$MAX_FD" ||
-    else
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
-        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" ;;
     esac
 fi
 
-# Escape application args
+# Collect all arguments for the java command, stacking in reverse order:
-save () {
+#   * args from the command line
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+#   * the main class name
-    echo " "
+#   * -classpath
-}
+#   * -D...appname settings
-APP_ARGS=`save "$@"`
+#   * --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
+# For Cygwin or MSYS, switch paths to Windows format before running java
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+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" "$@"

gradlew.bat

@@ -1,89 +1,89 @@
-@rem
+@rem
-@rem Copyright 2015 the original author or authors.
+@rem Copyright 2015 the original author or authors.
-@rem
+@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
+@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
+@rem You may obtain a copy of the License at
-@rem
+@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
+@rem
-@rem Unless required by applicable law or agreed to in writing, software
+@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
+@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
+@rem limitations under the License.
-@rem
+@rem
-
+
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
+@rem ##########################################################################
-@rem
+@rem
-@rem  Gradle startup script for Windows
+@rem  Gradle startup script for Windows
-@rem
+@rem
-@rem ##########################################################################
+@rem ##########################################################################
-
+
-@rem Set local scope for the variables with windows NT shell
+@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
+if "%OS%"=="Windows_NT" setlocal
-
+
-set DIRNAME=%~dp0
+set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
+set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
+set APP_HOME=%DIRNAME%
-
+
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
+
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
+
-@rem Find java.exe
+@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
+if defined JAVA_HOME goto findJavaFromJavaHome
-
+
-set JAVA_EXE=java.exe
+set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
+%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if "%ERRORLEVEL%" == "0" goto execute
-
+
-echo.
+echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
+echo.
-echo Please set the JAVA_HOME variable in your environment to match the
+echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo location of your Java installation.
-
+
-goto fail
+goto fail
-
+
-:findJavaFromJavaHome
+:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
+
-if exist "%JAVA_EXE%" goto execute
+if exist "%JAVA_EXE%" goto execute
-
+
-echo.
+echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
+echo.
-echo Please set the JAVA_HOME variable in your environment to match the
+echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo location of your Java installation.
-
+
-goto fail
+goto fail
-
+
-:execute
+:execute
-@rem Setup the command line
+@rem Setup the command line
-
+
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
+
-
+
-@rem Execute Gradle
+@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
+
-:end
+:end
-@rem End local scope for the variables with windows NT shell
+@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if "%ERRORLEVEL%"=="0" goto mainEnd
-
+
-:fail
+:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
+rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+exit /b 1
-
+
-:mainEnd
+:mainEnd
-if "%OS%"=="Windows_NT" endlocal
+if "%OS%"=="Windows_NT" endlocal
-
+
-:omega
+:omega

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

@@ -0,0 +1,450 @@
+package markil3.immersive_hud;
+
+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.
+ * <p>
+ * The methods that change this mod's configuration do not automatically write
+ * those changes to the configuration file on disk. Instead, they only update
+ * the configuration in memory.
+ *
+ * @author Markil 3
+ */
+public class ConfigManager
+{
+    public static class TimeValues
+    {
+        private static final int SHOW_TIME = 6 * TICKS_PER_SECOND;
+        private static final int FADE_IN = TICKS_PER_SECOND / 2;
+        private static final int FADE_OUT = TICKS_PER_SECOND;
+
+        private int maxTime = SHOW_TIME;
+        private int fadeIn = FADE_IN;
+        private int fadeOut = FADE_OUT;
+
+        /**
+         * Obtains the maximum time that the hotbar can be on the screen,
+         * including fading.
+         *
+         * @return The maximum hotbar display time.
+         */
+        public int getMaxTime()
+        {
+            return this.maxTime;
+        }
+
+        /**
+         * Obtains the time that the hotbar takes to fade in.
+         *
+         * @return The hotbar fade in time.
+         */
+        public int getFadeInTime()
+        {
+            return this.fadeIn;
+        }
+
+        /**
+         * Obtains the time that the hotbar takes to fade out.
+         *
+         * @return The hotbar fade out time.
+         */
+        public int getFadeOutTime()
+        {
+            return this.fadeOut;
+        }
+
+        public void setMaxTime(int time)
+        {
+            this.maxTime = time;
+        }
+
+        public void setFadeInTime(int time)
+        {
+            this.fadeIn = time;
+        }
+
+        public void setFadeOutTime(int time)
+        {
+            this.fadeOut = time;
+        }
+    }
+
+    private TimeValues hotbarTime = new TimeValues();
+    private TimeValues experienceTime = new TimeValues();
+    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;
+    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 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.
+     *
+     * @return the instance of this class
+     */
+    public static ConfigManager getInstance()
+    {
+        try
+        {
+            if (Class.forName("me.shedaniel.autoconfig.AutoConfig") != null)
+            {
+                return AutoConfig.getConfigHolder(ConfigManagerCloth.class)
+                        .getConfig();
+            }
+            else
+            {
+                throw new ClassNotFoundException();
+            }
+        }
+        catch (ClassNotFoundException e)
+        {
+            return new ConfigManager();
+        }
+    }
+
+    // Validations
+
+    /**
+     * Obtains time values related to the hotbar.
+     *
+     * @return The hotbar display time values.
+     */
+    public TimeValues getHotbarTime()
+    {
+        return this.hotbarTime;
+    }
+
+    /**
+     * Obtains time values related to the experience bar.
+     *
+     * @return The experience bar display time values.
+     */
+    public TimeValues getExperienceTime()
+    {
+        return this.experienceTime;
+    }
+
+    /**
+     * Obtains time values related to the jump bar.
+     *
+     * @return The jump display time values.
+     */
+    public TimeValues getJumpTime()
+    {
+        return this.jumpTime;
+    }
+
+    /**
+     * Obtains time values related to the health bar.
+     *
+     * @return The health display time values.
+     */
+    public TimeValues getHealthTime()
+    {
+        return this.healthTime;
+    }
+
+    /**
+     * Obtains time values related to the hunger bar.
+     *
+     * @return The hunger display time values.
+     */
+    public TimeValues getHungerTime()
+    {
+        return this.hungerTime;
+    }
+    
+    public TimeValues getAirTime()
+    {
+        return this.airTime;
+    }
+
+    /**
+     * Obtains time values related to potion effects.
+     *
+     * @return Potion display time values.
+     */
+    public TimeValues getPotionTime()
+    {
+        return this.effectTime;
+    }
+
+    /**
+     * Obtains the time that the crosshairs are allowed to display.
+     *
+     * @return The crosshair display time values.
+     */
+    public int getCrosshairTime()
+    {
+        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.
+     *
+     * @return The hand display time values.
+     */
+    public int getHandTime()
+    {
+        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.
+     *
+     * @return Whether or not armor shows on the HUD.
+     */
+    public boolean shouldShowArmor()
+    {
+        return this.showArmor;
+    }
+
+    /**
+     * Obtains the minimum health for fading. Anything below that and the health
+     * always displays.
+     *
+     * @return The health boundary, from 0 to 1.
+     */
+    public double getMinHealth()
+    {
+        return this.minHealth;
+    }
+
+    /**
+     * Obtains the minimum hunger for fading. Anything below that and the hunger
+     * always displays.
+     *
+     * @return The hunger boundary, from 0 to 20.
+     */
+    public int getMinHunger()
+    {
+        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.
+     *
+     * @param time - The hand display time values.
+     */
+    public void setCrosshairTime(int time)
+    {
+        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.
+     *
+     * @param time - The hand display time values.
+     */
+    public void setHandTime(int time)
+    {
+        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.
+     *
+     * @param show - Whether or not armor shows on the HUD.
+     */
+    public void shouldShowArmor(boolean show)
+    {
+        this.showArmor = show;
+    }
+
+    /**
+     * Sets the minimum health for fading. Anything below that and the health
+     * always displays.
+     *
+     * @param boundary - The health boundary, from 0 to 1.
+     */
+    public void setMinHealth(double boundary)
+    {
+        this.minHealth = MathHelper.clamp(boundary, 0, 1);
+    }
+
+    /**
+     * Sets the minimum hunger for fading. Anything below that and the hunger
+     * always displays.
+     *
+     * @param boundary - The hunger boundary, from 0 to 20.
+     */
+    public void setMinHunger(int boundary)
+    {
+        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.
+     */
+//    public void save()
+//    {
+//        SPEC.save();
+//    }
+}

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

@@ -0,0 +1,14 @@
+package markil3.immersive_hud;
+
+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 ValidationException
+    {
+        this.setMinHealth(this.getMinHealth());
+    }
+}

src/main/java/markil3/immersive_hud/EventBus.java

@@ -1,910 +0,0 @@
-/**
- * Copyright (C) 2021 Markil 3
- * <p>
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation, either version 3 of the License, or (at your option) any later
- * version.
- * <p>
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- * <p>
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package markil3.immersive_hud;
-
-import com.mojang.blaze3d.systems.RenderSystem;
-
-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.StatusEffects;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.item.BowItem;
-import net.minecraft.item.CrossbowItem;
-import net.minecraft.item.EggItem;
-import net.minecraft.item.EnderPearlItem;
-import net.minecraft.item.FilledMapItem;
-import net.minecraft.item.FishingRodItem;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.RangedWeaponItem;
-import net.minecraft.item.ShieldItem;
-import net.minecraft.item.SnowballItem;
-import net.minecraft.item.ThrowablePotionItem;
-import net.minecraft.item.TridentItem;
-import net.minecraft.util.Hand;
-import net.minecraft.util.hit.EntityHitResult;
-import net.minecraft.util.hit.HitResult;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-import java.util.Iterator;
-import java.util.Optional;
-
-/**
- * Contains the logic for changing the HUD.
- *
- * @author Markil 3
- * @version 0.1-1.16.4-fabric
- */
-public class EventBus
-{
-    /**
-     * The number of ticks that the hand will be onscreen. Every tick is 1/20th
-     * of a second.
-     */
-    static final int HAND_TIME = 10 * 20;
-    /**
-     * The number of ticks most elements will be onscreen. Every tick is 1/20th
-     * of a second.
-     */
-    static final int VISUAL_TIME = 6 * 20;
-    /**
-     * The number of ticks that the health and hunger bars will be onscreen.
-     * Every tick is 1/20th of a second.
-     */
-    static final int HEALTH_TIME = (int) ((float) VISUAL_TIME * 2.5);
-
-    /**
-     * How many more ticks the hand will be onscreen. Every tick is 1/20th of a
-     * second.
-     */
-    private static int mainHandTime, offHandTime;
-
-    /**
-     * How many more ticks the crosshair will be onscreen. Every tick is 1/20th
-     * of a second.
-     */
-    private static int crosshairTime;
-    /**
-     * If true, then the hand (and crosshairs) will be locked onto the screen
-     * without disappearing until this flag is updated.
-     */
-    private static boolean mainHandLock, offHandLock;
-    /**
-     * A bitmask that will lock the corresponding hand without necessarily
-     * showing the crosshairs. The first bit will be the main hand, and the
-     * second will be the offhand.
-     */
-    private static int mapLock;
-
-    /**
-     * How many more ticks the hotbar will be onscreen. Every tick is 1/20th of
-     * a second.
-     */
-    private static int hotbarTime;
-    /**
-     * The last hotbar slot that was selected. This is used to check for a
-     * change in the hotbar slot.
-     */
-    private static int selectedHotbarSlot = -1;
-    /**
-     * The last item that was in this hand. This is used to check for a change
-     * in what was equipped.
-     */
-    private static Item mainHandItem = null, offHandItem = null;
-
-    /**
-     * How many more ticks the health bar will be onscreen. Every tick is 1/20th
-     * of a second.
-     */
-    private static int healthTime;
-    /**
-     * Records what the health was previously. Used to check for a change in the
-     * health.
-     * <p>
-     * Note that the display of the armor is linked to this.
-     */
-    private static float health = -1;
-    /**
-     * Records what the maximum health was previously. Used to check for a
-     * change in the health.
-     */
-    private static float maxHealth = -1;
-
-    /**
-     * How many more ticks the hunger bar will be onscreen. Every tick is 1/20th
-     * of a second.
-     */
-    private static int hungerTime;
-    /**
-     * Records what the hunger level was previously. Used to check for a change
-     * in hunger.
-     */
-    private static int hunger = -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 mount's health bar will be onscreen. Every tick
-     * is 1/20th of a second.
-     */
-    private static int mountTime;
-    /**
-     * Records what the health of the mount was previously. Used to check for a
-     * change in the health.
-     */
-    private static float mountHealth = -1;
-    /**
-     * Records what the maximum health of the mount was previously. Used to
-     * check for a change in the health.
-     */
-    private static float mountMaxHealth = -1;
-
-    /**
-     * How many more ticks the mount's jump bar will be onscreen. Every tick is
-     * 1/20th of a second.
-     */
-    private static int jumpTime;
-
-    /**
-     * How many more ticks the experience bar will be onscreen. Every tick is
-     * 1/20th of a second.
-     */
-    private static int experienceTime;
-    /**
-     * Records what the experience was previously. Used to check for a change in
-     * the health.
-     */
-    private static float experienceProgress = -1;
-
-    /**
-     * Run whenever the player clicks a mouse button. This brings the hands into
-     * view, and briefly brings the health and hunger into view if the held item
-     * is food.
-     *
-     * @param hand - The hand being triggered
-     * @param clear - Whether the hand it being enabled or disabled.
-     *
-     * @since 0.1-1.16.4-fabric
-     */
-    public static void onClick(Hand hand, boolean clear)
-    {
-        MinecraftClient mc = MinecraftClient.getInstance();
-        LivingEntity entity;
-        Item item;
-        Iterator<ItemStack> hands;
-        if (mc.getCameraEntity() instanceof LivingEntity)
-        {
-            entity = (LivingEntity) mc.getCameraEntity();
-        }
-        else
-        {
-            return;
-        }
-        if (clear)
-        {
-            item = null;
-        }
-        else
-        {
-            hands = entity.getItemsHand().iterator();
-            if (hand == Hand.OFF_HAND)
-            {
-                hands.next();
-            }
-            item =
-                    Optional.ofNullable(hands.next())
-                            .filter(stack -> !stack.isEmpty())
-                            .map(ItemStack::getItem)
-                            .orElse(null);
-        }
-        crosshairTime = VISUAL_TIME;
-        if (hand == Hand.MAIN_HAND)
-        {
-            mainHandTime = HAND_TIME;
-            mainHandLock = item != null;
-        }
-        else
-        {
-            offHandTime = HAND_TIME;
-            offHandLock = item != null;
-        }
-        if (item != null)
-        {
-            if (item.isFood())
-            {
-                healthTime = HEALTH_TIME;
-                hungerTime = HEALTH_TIME;
-            }
-        }
-        else
-        {
-            System.out.println("Unusing hand " + hand);
-        }
-    }
-
-    /**
-     * Run whenever a hand is rendered in 1st person. This brings the player
-     * hands into and out of view as needed.
-     *
-     * @param hand - The hand being rendered.
-     * @param 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)
-    {
-        final int HAND_UP_TIME = 20;
-        switch (hand)
-        {
-        case OFF_HAND:
-            if (offHandTime == 0 && !offHandLock)
-            {
-                return true;
-            }
-            else if (!offHandLock && (mapLock & 0b01) == 0)
-            {
-                offHandTime--;
-                if (offHandTime < HAND_UP_TIME)
-                {
-                    matrixStack
-                            .translate(0,
-                                    -1.0F * (HAND_UP_TIME - offHandTime) /
-                                            HAND_UP_TIME,
-                                    0);
-                }
-            }
-            break;
-        case MAIN_HAND:
-            if (mainHandTime == 0 && !mainHandLock)
-            {
-                return true;
-            }
-            else if (!mainHandLock && (mapLock & 0b10) == 0)
-            {
-                System.out.println("Decreasing main hand time");
-                mainHandTime--;
-                if (mainHandTime < HAND_UP_TIME)
-                {
-                    matrixStack
-                            .translate(0,
-                                    -1.0F * (HAND_UP_TIME - mainHandTime) /
-                                            HAND_UP_TIME,
-                                    0);
-                }
-            }
-            break;
-        }
-        return false;
-    }
-
-    /**
-     * 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 boolean drawCrosshair()
-    {
-        MinecraftClient mc = MinecraftClient.getInstance();
-        Entity entity = mc.getCameraEntity();
-        boolean changed = false;
-        if (mc.crosshairTarget != null && mc.crosshairTarget
-                .getType() != HitResult.Type.MISS)
-        {
-            if (mc.crosshairTarget.getType() == HitResult.Type
-                    .ENTITY)
-            {
-                if (((EntityHitResult) mc.crosshairTarget).getEntity() != entity
-                        .getVehicle())
-                {
-                    changed = true;
-                }
-            }
-            else
-            {
-                changed = true;
-            }
-        }
-        if (changed || mainHandLock || offHandLock || crosshairTime
-                > 0)
-        {
-            RenderSystem.color4f(1.0F,
-                    1.0F,
-                    1.0F,
-                    Main.getAlpha(crosshairTime > 0 ?
-                                  crosshairTime :
-                                  VISUAL_TIME));
-        }
-        else
-        {
-            RenderSystem.color4f(1.0F,
-                    1.0F,
-                    1.0F,
-                    0F);
-        }
-        if (crosshairTime > 0)
-        {
-            crosshairTime--;
-        }
-        return false;
-    }
-
-    /**
-     * Determines whether or not to draw the mount's health, adjusting the alpha
-     * as needed.
-     *
-     * @return If true, then cancel drawing the mount health bar.
-     *
-     * @since 0.1-1.16.4-fabric
-     */
-    public static boolean drawMountHealth()
-    {
-        /*
-         * When the health percentage falls to this level or below, the
-         * health bar won't disappear, allowing the player to be constantly
-         * reminded of their low health.
-         */
-        final float CONST_BOUNDARY = 0.5F;
-
-        MinecraftClient mc = MinecraftClient.getInstance();
-        Entity entity = mc.getCameraEntity();
-        Entity tmp = entity.getVehicle();
-        LivingEntity mount;
-        boolean changed = false;
-
-        if (tmp == null)
-        {
-            mountHealth = -1;
-            mountMaxHealth = -1;
-        }
-        else
-        {
-            mount = (LivingEntity) tmp;
-            if (mountHealth != mount.getHealth())
-            {
-                mountHealth = mount.getHealth();
-                changed = true;
-            }
-            if (mountMaxHealth != mount.getMaxHealth())
-            {
-                mountMaxHealth = mount.getMaxHealth();
-                changed = true;
-            }
-        }
-        if (changed)
-        {
-            mountTime = VISUAL_TIME;
-        }
-        else if (mountTime > 0)
-        {
-            mountTime--;
-        }
-        if (mountTime > 0)
-        {
-            /*
-             * Renders it along with health.
-             */
-            RenderSystem.color4f(1.0F,
-                    1.0F,
-                    1.0F,
-                    Main.getAlpha(mountTime));
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Determines whether or not to draw the armor bar, adjusting the alpha as
-     * needed.
-     *
-     * @return If true, then cancel drawing the armor bar.
-     *
-     * @since 0.1-1.16.4-fabric
-     */
-    public static boolean drawArmor()
-    {
-        /*
-         * Sets the armor to fade in and out in sync with the health.
-         * Technically, since this method gets called before health, it will
-         * be 1 tick behind, but I'm not too concerned about it.
-         */
-        if (healthTime > 0)
-        {
-            RenderSystem.color4f(1.0F,
-                    1.0F,
-                    1.0F,
-                    Main.getAlpha(healthTime));
-        }
-        else
-        {
-            RenderSystem.color4f(1.0F,
-                    1.0F,
-                    1.0F,
-                    0.0F);
-        }
-        return false;
-    }
-
-    /**
-     * Determines whether or not to draw the health bar, adjusting the alpha as
-     * needed.
-     *
-     * @return If true, then cancel drawing the health.
-     *
-     * @since 0.1-1.16.4-fabric
-     */
-    public static boolean drawHealth()
-    {
-        /*
-         * When the health percentage falls to this level or below, the
-         * health bar won't disappear, allowing the player to be constantly
-         * reminded of their low health.
-         */
-        final float CONST_BOUNDARY = 0.5F;
-
-        MinecraftClient mc = MinecraftClient.getInstance();
-        LivingEntity entity;
-        if (mc.getCameraEntity() instanceof LivingEntity)
-        {
-            entity = (LivingEntity) mc.getCameraEntity();
-        }
-        else
-        {
-            return true;
-        }
-        boolean changed = false;
-
-        /*
-         * Resets the transparency from the armor call.
-         */
-        RenderSystem.color4f(1.0F,
-                1.0F,
-                1.0F,
-                1F);
-
-        /**
-         * Checks for a change in current or max health.
-         */
-        if (health != entity.getHealth())
-        {
-            health = entity.getHealth();
-            changed = true;
-        }
-        if (maxHealth != entity.getMaxHealth())
-        {
-            maxHealth = entity.getMaxHealth();
-            changed = true;
-        }
-        if (changed)
-        {
-            healthTime = HEALTH_TIME;
-        }
-        else if (healthTime > 0)
-        {
-            healthTime--;
-        }
-        /*
-         * Only makes a change if the player is healthy. Otherwise,
-         * the bar is shown.
-         */
-        if (health / maxHealth > CONST_BOUNDARY)
-        {
-            RenderSystem.color4f(1.0F,
-                    1.0F,
-                    1.0F,
-                    Main.getAlpha(healthTime));
-        }
-        return false;
-    }
-
-    /**
-     * Determines whether or not to draw the hunger bar, adjusting the alpha as
-     * needed.
-     *
-     * @return If true, then cancel drawing the hunger bar.
-     *
-     * @since 0.1-1.16.4-fabric
-     */
-    public static boolean drawHunger()
-    {
-        /*
-         * When hunger falls to this level or below, the hunger bar won't
-         * disappear, allowing the player to be constantly reminded of their
-         * low hunger.
-         */
-        final int HUNGER_BOUNDARY = 15;
-
-        MinecraftClient mc = MinecraftClient.getInstance();
-        PlayerEntity entity;
-        boolean changed = false;
-
-        /*
-         * Resets the transparency from last time.
-         */
-        RenderSystem.color4f(1.0F,
-                1.0F,
-                1.0F,
-                1F);
-        if (mc.getCameraEntity() instanceof PlayerEntity)
-        {
-            entity = (PlayerEntity) mc.getCameraEntity();
-        }
-        else
-        {
-            return true;
-        }
-
-        if (hunger != entity.getHungerManager().getFoodLevel())
-        {
-            hunger = entity.getHungerManager().getFoodLevel();
-            changed = true;
-        }
-        if (isFoodPoisoned != entity.hasStatusEffect(StatusEffects
-                .HUNGER))
-        {
-            isFoodPoisoned =
-                    entity.hasStatusEffect(StatusEffects.HUNGER);
-            changed = true;
-        }
-        if (hunger <= HUNGER_BOUNDARY)
-        {
-            changed = true;
-        }
-        if (changed)
-        {
-            hungerTime = HEALTH_TIME;
-        }
-        else if (hungerTime > 0)
-        {
-            hungerTime--;
-        }
-        RenderSystem.color4f(1.0F,
-                1.0F,
-                1.0F,
-                Main.getAlpha(hungerTime));
-        /*
-         * Only makes a change if the player is satisfied. Otherwise,
-         * the bar is shown.
-         */
-        return false;
-    }
-
-    /**
-     * Determines whether or not to draw the horse jump bar, adjusting the alpha
-     * as needed.
-     *
-     * @return If true, then cancel drawing the jump bar.
-     *
-     * @since 0.1-1.16.4-fabric
-     */
-    public static boolean drawJumpbar()
-    {
-        MinecraftClient mc = MinecraftClient.getInstance();
-        ClientPlayerEntity entity;
-        boolean changed = false;
-
-        if (mc.getCameraEntity() instanceof ClientPlayerEntity)
-        {
-            entity = (ClientPlayerEntity) mc.getCameraEntity();
-        }
-        else
-        {
-            return true;
-        }
-
-        if (entity.method_3151() > 0)
-        {
-            jumpTime = VISUAL_TIME;
-        }
-        else if (jumpTime > 0)
-        {
-            jumpTime--;
-        }
-        if (experienceTime > 0)
-        {
-            RenderSystem.color4f(1.0F,
-                    1.0F,
-                    1.0F,
-                    Main.getAlpha(jumpTime));
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Determines whether or not to draw the experience bar, adjusting the alpha
-     * as needed.
-     *
-     * @return If true, then cancel drawing the experience bar.
-     *
-     * @since 0.1-1.16.4-fabric
-     */
-    public static boolean drawExperience()
-    {
-        MinecraftClient mc = MinecraftClient.getInstance();
-        ClientPlayerEntity entity;
-        boolean changed = false;
-
-        if (mc.getCameraEntity() instanceof ClientPlayerEntity)
-        {
-            entity = (ClientPlayerEntity) mc.getCameraEntity();
-        }
-        else
-        {
-            return true;
-        }
-
-        if (experienceProgress != entity.totalExperience)
-        {
-            experienceProgress = entity.totalExperience;
-            changed = true;
-        }
-        if (changed)
-        {
-            experienceTime = VISUAL_TIME;
-        }
-        else if (experienceTime > 0)
-        {
-            experienceTime--;
-        }
-        if (experienceTime > 0)
-        {
-            RenderSystem.color4f(1.0F,
-                    1.0F,
-                    1.0F,
-                    Main.getAlpha(experienceTime));
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Determines whether or not to draw the hotbar. Note that this method does
-     * not directly change the transparency of the hotbar, only checking whether
-     * or not to draw it.
-     *
-     * @return If true, then cancel drawing the hotbar.
-     *
-     * @see #recolorHotbar()
-     * @since 0.1-1.16.4-fabric
-     */
-    public static boolean updateHotbar()
-    {
-        MinecraftClient mc = MinecraftClient.getInstance();
-        ClientPlayerEntity entity;
-        Item item, handItem = null;
-        boolean changed = false;
-
-        if (mc.getCameraEntity() instanceof ClientPlayerEntity)
-        {
-            entity = (ClientPlayerEntity) mc.getCameraEntity();
-        }
-        else
-        {
-            return true;
-        }
-
-        mainHandLock = offHandLock = false;
-        mapLock = 0;
-        int i = 0;
-        for (ItemStack stack : entity.getItemsHand())
-        {
-            item =
-                    Optional.ofNullable(stack)
-                            .map(ItemStack::getItem)
-                            .orElse(null);
-            if (item != null)
-            {
-                if (item instanceof RangedWeaponItem)
-                {
-                    /*
-                     * Enables the crosshairs and lock the hand
-                     * whenever the bow is drawn.
-                     */
-                    if (item instanceof BowItem)
-                    {
-                        if (entity.isUsingItem() && entity
-                                .getActiveHand()
-                                .ordinal() == i)
-                        {
-                            switch (i)
-                            {
-                            case 0:
-                                mainHandLock = true;
-                                break;
-                            case 1:
-                                offHandLock = true;
-                                break;
-                            }
-                        }
-                    }
-                    /*
-                     * Enables the crosshairs and lock the hand
-                     * whenever a loaded crossbow is equipped.
-                     */
-                    else if (item instanceof CrossbowItem)
-                    {
-                        if (CrossbowItem.isCharged(stack))
-                        {
-                            switch (i)
-                            {
-                            case 0:
-                                mainHandLock = true;
-                                break;
-                            case 1:
-                                offHandLock = true;
-                                break;
-                            }
-                        }
-                    }
-                    /*
-                     * We don't know how modded items behave
-                     * exactly, so we keep it safe and enable the
-                     * crosshairs at all times for any shootable
-                     * items.
-                     */
-                    else
-                    {
-                        switch (i)
-                        {
-                        case 0:
-                            mainHandLock = true;
-                            break;
-                        case 1:
-                            offHandLock = true;
-                            break;
-                        }
-                    }
-                }
-                /**
-                 * Items that have the crosshairs enabled for as long
-                 * as the item is actively being used.
-                 */
-                else if (item instanceof TridentItem || item
-                        instanceof ShieldItem)
-                {
-                    if (entity.isUsingItem() && entity
-                            .getActiveHand() != null && entity.getActiveHand()
-                            .ordinal() == i)
-                    {
-                        switch (i)
-                        {
-                        case 0:
-                            mainHandLock = true;
-                            break;
-                        case 1:
-                            offHandLock = true;
-                            break;
-                        }
-                    }
-                }
-                /**
-                 * Items that have the crosshairs enabled for as long
-                 * as the item is being held at all.
-                 */
-                else if (item instanceof ThrowablePotionItem ||
-                        item instanceof SnowballItem || item instanceof
-                        EggItem || item instanceof EnderPearlItem || item
-                        instanceof FishingRodItem)
-                {
-                    switch (i)
-                    {
-                    case 0:
-                        mainHandLock = true;
-                        break;
-                    case 1:
-                        offHandLock = true;
-                        break;
-                    }
-                }
-                /**
-                 * Maps get special treatment. The hand is locked,
-                 * but the crosshairs are not enabled.
-                 */
-                else if (item instanceof FilledMapItem)
-                {
-                    mapLock = mapLock | (2 - i);
-                }
-            }
-
-            /*
-             * Checks for a change in the item
-             */
-            if (i == 0)
-            {
-                handItem = mainHandItem;
-            }
-            else
-            {
-                handItem = offHandItem;
-            }
-            if (item != handItem)
-            {
-                changed = true;
-                /*
-                 * Briefly shows the health and hunger bar whenever
-                 * food is switched to.
-                 */
-                if (item.isFood())
-                {
-                    healthTime = HEALTH_TIME;
-                    hungerTime = HEALTH_TIME;
-                }
-                if (i == 0)
-                {
-                    mainHandItem = item;
-                    mainHandTime = HAND_TIME;
-                }
-                else if (i == 1)
-                {
-                    offHandItem = item;
-                    offHandTime = HAND_TIME;
-                }
-            }
-            i++;
-        }
-
-        /*
-         * Checks for a change in what slot is used.
-         */
-        if (selectedHotbarSlot != entity.inventory.selectedSlot)
-        {
-            selectedHotbarSlot = entity.inventory.selectedSlot;
-            mainHandTime = HAND_TIME;
-            changed = true;
-        }
-
-        if (changed)
-        {
-            hotbarTime = VISUAL_TIME;
-        }
-        else if (hotbarTime > 0)
-        {
-            hotbarTime--;
-        }
-
-        return hotbarTime == 0;
-    }
-
-    /**
-     * 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()
-    {
-        RenderSystem.color4f(1.0F,
-                1.0F,
-                1.0F,
-                Main.getAlpha(hotbarTime));
-    }
-}

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

@@ -18,8 +18,9 @@
 package markil3.immersive_hud;
 
 import net.fabricmc.api.ModInitializer;
-import net.minecraft.client.gui.DrawableHelper;
+
-import net.minecraft.client.util.math.MatrixStack;
+import me.shedaniel.autoconfig.AutoConfig;
+import me.shedaniel.autoconfig.serializer.Toml4jConfigSerializer;
 
 /**
  * The main entry point for the Immersive HUD mod.
@@ -29,9 +30,23 @@ import net.minecraft.client.util.math.MatrixStack;
  */
 public class Main implements ModInitializer
 {
+    public static final int TICKS_PER_SECOND = 20;
+
     @Override
     public void onInitialize()
     {
+        try
+        {
+            if (Class.forName("me.shedaniel.autoconfig.AutoConfig") != null)
+            {
+                AutoConfig.register(ConfigManagerCloth.class,
+                        Toml4jConfigSerializer::new);
+            }
+        }
+        catch (ClassNotFoundException e)
+        {
+            // Do nothing
+        }
     }
 
     /**
@@ -45,9 +60,19 @@ public class Main implements ModInitializer
      *
      * @since 0.1-1.16.4-fabric
      */
-    static float getAlpha(int renderTime)
+    static float getAlpha(double renderTime,
+                          double maxTime,
+                          double fadeInTime,
+                          double fadeOutTime)
     {
-        return Math.min(renderTime / 20.0F,
+        if (renderTime <= fadeOutTime)
-                1.0F);
+        {
+            return (float) (renderTime / fadeOutTime);
+        }
+        else if (renderTime > maxTime - fadeInTime)
+        {
+            return (float) ((maxTime - renderTime) / fadeInTime);
+        }
+        return 1F;
     }
 }

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/mixin/ClientPlayerHook.java

@@ -17,25 +17,22 @@
 package markil3.immersive_hud.mixin;
 
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.network.AbstractClientPlayerEntity;
 import net.minecraft.client.network.ClientPlayerEntity;
-import net.minecraft.client.render.VertexConsumerProvider;
-import net.minecraft.client.render.item.HeldItemRenderer;
-import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.LivingEntity;
-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;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import markil3.immersive_hud.EventBus;
+import markil3.immersive_hud.TimerUtils;
 
 /**
  * This mixin hooks into the client player class to check for when the hands
- * move. Note that most of the logic can be found in {@link EventBus}.
+ * move. Note that most of the logic can be found in {@link TimerUtils}.
  *
  * @author Markil 3
  * @version 0.1-1.16.4-fabric
@@ -43,6 +40,9 @@ import markil3.immersive_hud.EventBus;
 @Mixin(ClientPlayerEntity.class)
 public class ClientPlayerHook
 {
+    private static final Logger LOGGER =
+            LogManager.getLogger(ClientPlayerHook.class);
+
     /**
      * Updates hand timing every time an attack is initiated.
      *
@@ -54,7 +54,18 @@ public class ClientPlayerHook
     @Inject(method = "swingHand", at = @At(value = "TAIL"))
     public void swingHand(Hand hand, CallbackInfo callbackInfo)
     {
-        EventBus.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);
+        }
     }
 
     /**
@@ -68,7 +79,18 @@ public class ClientPlayerHook
     @Inject(method = "setCurrentHand", at = @At(value = "TAIL"))
     public void setCurrentHand(Hand hand, CallbackInfo callbackInfo)
     {
-        EventBus.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);
+        }
     }
 
     /**
@@ -81,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
         {
-            EventBus.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

@@ -16,9 +16,6 @@
  */
 package markil3.immersive_hud.mixin;
 
-import com.mojang.blaze3d.systems.RenderSystem;
-
-import net.minecraft.client.gui.hud.InGameHud;
 import net.minecraft.client.network.AbstractClientPlayerEntity;
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.item.HeldItemRenderer;
@@ -26,16 +23,18 @@ 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;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import markil3.immersive_hud.EventBus;
+import markil3.immersive_hud.TimerUtils;
 
 /**
  * This mixin hooks into the hand renderer to make the hands move in and out of
- * view. Note that most of the logic can be found in {@link EventBus}.
+ * view. Note that most of the logic can be found in {@link TimerUtils}.
  *
  * @author Markil 3
  * @version 0.1-1.16.4-fabric
@@ -43,6 +42,9 @@ import markil3.immersive_hud.EventBus;
 @Mixin(HeldItemRenderer.class)
 public class HeldItemHook
 {
+    private static final Logger LOGGER =
+            LogManager.getLogger(HeldItemHook.class);
+
     /**
      * Determines whether or not to render a certain hand.
      *
@@ -75,9 +77,20 @@ public class HeldItemHook
                            int light,
                            CallbackInfo callbackInfo)
     {
-        if (EventBus.onRenderHand(hand, matrices))
+        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

@@ -18,39 +18,66 @@ package markil3.immersive_hud.mixin;
 
 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.util.profiler.DummyProfiler;
+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;
+import org.spongepowered.asm.mixin.injection.ModifyVariable;
+import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import markil3.immersive_hud.EventBus;
+import markil3.immersive_hud.TimerUtils;
 
 /**
  * This mixin hooks into the HUD class to modify most of the HUD elements. Note
- * that most of the logic can be found in {@link EventBus}.
+ * 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;
+
     /**
      * Determines whether or not to draw 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 = "HEAD"))
+    @Inject(method = "renderCrosshair", at = @At(value = "HEAD"),
+            cancellable = true)
     public void startCrosshair(MatrixStack stack, CallbackInfo callbackInfo)
     {
-        EventBus.drawCrosshair();
+        try
+        {
+            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);
+        }
     }
 
     /**
@@ -59,15 +86,27 @@ public class HudHook
      * @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(MatrixStack stack, CallbackInfo callbackInfo)
     {
-        /*
+        try
-         * Resets the color so that nothing else is bothered.
+        {
-         */
+            /*
-        RenderSystem.color4f(1, 1, 1, 1F);
+             * 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);
+        }
     }
 
     /**
@@ -76,14 +115,31 @@ public class HudHook
      * @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 = "HEAD"))
+    @Inject(method = "renderMountJumpBar", at = @At(value = "HEAD"),
+            cancellable = true)
     public void startJumpbar(MatrixStack stack,
                              int x,
                              CallbackInfo callbackInfo)
     {
-        EventBus.drawJumpbar();
+        try
+        {
+            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);
+        }
     }
 
     /**
@@ -92,6 +148,7 @@ public class HudHook
      * @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"))
@@ -99,10 +156,22 @@ public class HudHook
                               int x,
                               CallbackInfo callbackInfo)
     {
-        /*
+        try
-         * Resets the color so that nothing else is bothered.
+        {
-         */
+            stack.pop();
-        RenderSystem.color4f(1, 1, 1, 1F);
+            /*
+             * 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);
+        }
     }
 
     /**
@@ -111,6 +180,7 @@ public class HudHook
      * @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 = "HEAD"),
@@ -119,9 +189,21 @@ public class HudHook
                                 int x,
                                 CallbackInfo callbackInfo)
     {
-        if (EventBus.drawExperience())
+        try
         {
-            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);
         }
     }
 
@@ -131,6 +213,7 @@ public class HudHook
      * @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"))
@@ -138,10 +221,200 @@ public class HudHook
                                  int x,
                                  CallbackInfo callbackInfo)
     {
-        /*
+        try
-         * Resets the color so that nothing else is bothered.
+        {
-         */
+            stack.pop();
-        RenderSystem.color4f(1, 1, 1, 1F);
+            /*
+             * Resets the color so that nothing else is bothered.
+             */
+            TimerUtils.resetAlpha();
+        }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.gui.hud" +
+                            ".InGameHud#renderExperienceBar " +
+                            "event",
+                    e);
+        }
+    }
+
+    /**
+     * Changes the position of the status bars as the ones below them move up
+     * and down.
+     *
+     * @param stack - The matrix stack used.
+     *
+     * @return The same matrix stack, with a new matrix pushed onto it.
+     */
+    @ModifyVariable(method = "renderStatusBars(Lnet/minecraft/client/util" +
+            "/math/MatrixStack;)V", at = @At("HEAD"))
+    public MatrixStack startStatus(MatrixStack stack)
+    {
+        try
+        {
+            float trans = TimerUtils.getHealthTranslation();
+            stack.push();
+            stack.translate(0F, trans, 0F);
+        }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.gui.hud" +
+                            ".InGameHud#renderStatusBars " +
+                            "event",
+                    e);
+        }
+        return stack;
+    }
+
+    /**
+     * Adjusts the armor GUI.
+     *
+     * @param matrices
+     * @param 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)
+    {
+        try
+        {
+            if (TimerUtils.drawArmor())
+            {
+                TimerUtils.setAlpha(0F);
+            }
+        }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.gui.hud" +
+                            ".InGameHud#renderStatusBars " +
+                            "event",
+                    e);
+        }
+    }
+
+    /**
+     * Adjusts the health GUI.
+     *
+     * @param matrices
+     * @param 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 = 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);
+            }
+        }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.gui.hud" +
+                            ".InGameHud#renderStatusBars " +
+                            "event",
+                    e);
+        }
+    }
+
+    /**
+     * Adjusts the food GUI.
+     *
+     * @param matrices
+     * @param 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)
+    {
+        try
+        {
+            /*
+             * 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);
+        }
+    }
+
+    /**
+     * Resets the air GUI.
+     *
+     * @param matrices
+     * @param 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 = 2))
+    public void renderAir(MatrixStack matrices, CallbackInfo callbackInfo)
+    {
+        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)
+        {
+            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)
+    {
+        try
+        {
+            TimerUtils.setAlpha(1F);
+            stack.pop();
+        }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.gui.hud" +
+                            ".InGameHud#renderStatusBars " +
+                            "event",
+                    e);
+        }
+        return stack;
     }
 
     /**
@@ -150,12 +423,29 @@ public class HudHook
      * @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 = "HEAD"))
+    @Inject(method = "renderMountHealth", at = @At(value = "HEAD"),
+            cancellable = true)
     public void startMountHealth(MatrixStack stack, CallbackInfo callbackInfo)
     {
-        EventBus.drawMountHealth();
+        try
+        {
+            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);
+        }
     }
 
     /**
@@ -164,15 +454,146 @@ public class HudHook
      * @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(MatrixStack stack, CallbackInfo callbackInfo)
     {
-        /*
+        try
-         * Resets the color so that nothing else is bothered.
+        {
-         */
+            /*
-        RenderSystem.color4f(1, 1, 1, 1F);
+             * Resets the color so that nothing else is bothered.
+             */
+            stack.pop();
+            TimerUtils.resetAlpha();
+        }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.gui.hud" +
+                            ".InGameHud#renderMountHealth " +
+                            "event",
+                    e);
+        }
+    }
+
+    /**
+     * Makes the actual adjustment to the hotbar as needed.
+     *
+     * @version 0.2-1.16.4-fabric
+     * @since 0.1-1.16.4-fabric
+     */
+    @Inject(method = "renderStatusEffectOverlay" +
+            "(Lnet/minecraft/client/util/math/MatrixStack;)V", at =
+    @At(value = "HEAD", shift = At.Shift.AFTER))
+    public void startPotion(MatrixStack effect, CallbackInfo info)
+    {
+        try
+        {
+            TimerUtils.updatePotions(MinecraftClient.getInstance().cameraEntity instanceof ClientPlayerEntity ?
+                                     ((ClientPlayerEntity) MinecraftClient.getInstance().cameraEntity) :
+                                     null);
+        }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.gui.hud" +
+                            ".InGameHud#renderStatusEffectOverlay " +
+                            "event",
+                    e);
+        }
+    }
+
+    /**
+     * Makes the actual adjustment to the hotbar as needed.
+     *
+     * @version 0.2-1.16.4-fabric
+     * @since 0.1-1.16.4-fabric
+     */
+    @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)
+    {
+        try
+        {
+            currentEffect = effect;
+            return TimerUtils.updatePotion(effect,
+                    MinecraftClient.getInstance().getTickDelta());
+        }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.gui.hud" +
+                            ".InGameHud#renderStatusEffectOverlay " +
+                            "event",
+                    e);
+        }
+        return true;
+    }
+
+    /**
+     * Makes the actual adjustment to the hotbar as needed.
+     *
+     * @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" +
+            "(Lnet/minecraft/client/util/math/MatrixStack;)V", at =
+    @At(value = "STORE"))
+    public float updatePotion(float f,
+                              MatrixStack stack)
+    {
+        try
+        {
+            return TimerUtils.getPotionAlpha(currentEffect);
+        }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.gui.hud" +
+                            ".InGameHud#renderStatusEffectOverlay " +
+                            "event",
+                    e);
+        }
+        return 1F;
+    }
+
+    /**
+     * Resets any changes from drawing the potion effects.
+     *
+     * @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(MatrixStack matrices,
+                             CallbackInfo callbackInfo)
+    {
+        try
+        {
+            /*
+             * Resets the color so that nothing else is bothered.
+             */
+            TimerUtils.resetAlpha();
+        }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.gui.hud" +
+                            ".InGameHud#renderStatusEffectOverlay " +
+                            "event",
+                    e);
+        }
     }
 
     /**
@@ -182,6 +603,7 @@ public class HudHook
      * @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 = "HEAD"), cancellable =
@@ -190,9 +612,20 @@ public class HudHook
                             MatrixStack matrices,
                             CallbackInfo callbackInfo)
     {
-        if (EventBus.updateHotbar())
+        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);
         }
     }
 
@@ -203,35 +636,63 @@ public class HudHook
      * @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/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)
     {
-        EventBus.recolorHotbar();
+        try
+        {
+            TimerUtils.recolorHotbar(matrices);
+        }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.gui.hud" +
+                            ".InGameHud#renderHotbar " +
+                            "event",
+                    e);
+        }
     }
 
     /**
      * Resets any changes from drawing the hotbar.
      *
      * @param tickDelta
-     * @param matrices - The matrix drawing stack.
+     * @param stack - The matrix drawing stack.
      * @param callbackInfo
      *
+     * @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 matrices,
+                             MatrixStack stack,
                              CallbackInfo callbackInfo)
     {
-        /*
+        try
-         * Resets the color so that nothing else is bothered.
+        {
-         */
+            stack.pop();
-        RenderSystem.color4f(1, 1, 1, 1F);
+            stack = RenderSystem.getModelViewStack();
+            stack.pop();
+            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/java/markil3/immersive_hud/mixin/ProfilerHook.java

@@ -1,85 +0,0 @@
-/**
- * Copyright (C) 2021 Markil 3
- * <p>
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation, either version 3 of the License, or (at your option) any later
- * version.
- * <p>
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- * <p>
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package markil3.immersive_hud.mixin;
-
-import com.mojang.blaze3d.systems.RenderSystem;
-
-import net.minecraft.util.profiler.DummyProfiler;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import markil3.immersive_hud.EventBus;
-
-/**
- * This class hooks into the profiler to trigger color changes for the status
- * indicators.
- *
- * @author Markil 3
- * @version 0.1-1.16.4-fabric
- */
-@Mixin(DummyProfiler.class)
-public class ProfilerHook
-{
-    /**
-     * Hooks into the profiler to add logic to drawing armor.
-     *
-     * @param section - The profiler section
-     * @param callbackInfo
-     *
-     * @since 0.1-1.16.4-fabric
-     */
-    @Inject(method = "push", at = @At(value = "TAIL"))
-    public void renderArmor(String section, CallbackInfo callbackInfo)
-    {
-        if (section.equals("armor"))
-        {
-            EventBus.drawArmor();
-        }
-    }
-
-    /**
-     * Hooks into the profiler to add logic to drawing status bars besides
-     * armor.
-     *
-     * @param section - The profiler section
-     * @param callbackInfo
-     *
-     * @since 0.1-1.16.4-fabric
-     */
-    @Inject(method = "swap", at = @At(value = "TAIL"))
-    public void renderStatus(String section, CallbackInfo callbackInfo)
-    {
-        switch (section)
-        {
-        case "health":
-            EventBus.drawHealth();
-            break;
-        case "food":
-            EventBus.drawHunger();
-            break;
-        case "air":
-            /*
-             * Resets the color so that nothing else is bothered.
-             */
-            RenderSystem.color4f(1, 1, 1, 1F);
-            break;
-        }
-    }
-}

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

@@ -0,0 +1,67 @@
+{
+  "immersive_hud.configGui.title": "Immersive HUD Configuration",
+  "option.immersive_hud.hotbarMaxTime": "Hotbar Display Time",
+  "option.immersive_hud.hotbarFadeIn": "Hotbar Fade In Time",
+  "option.immersive_hud.hotbarFadeOut": "Hotbar Fade Out Time",
+  "option.immersive_hud.experienceMaxTime": "Experience Display Time",
+  "option.immersive_hud.experienceFadeIn": "Experience Fade In Time",
+  "option.immersive_hud.experienceFadeOut": "Experience Fade Out Time",
+  "option.immersive_hud.jumpMaxTime": "Jump Bar Display Time",
+  "option.immersive_hud.jumpFadeIn": "Jump Bar Fade In Time",
+  "option.immersive_hud.jumpFadeOut": "Jump Bar Fade Out Time",
+  "option.immersive_hud.healthMaxTime": "Health Bar Display Time",
+  "option.immersive_hud.healthFadeIn": "Health Bar Fade In Time",
+  "option.immersive_hud.healthFadeOut": "Health Bar Fade Out Time",
+  "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",
+  "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.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",
+  "tooltip.immersive_hud.experienceMaxTime": "How long the experience bar can be displayed on screen in seconds",
+  "tooltip.immersive_hud.experienceFadeIn": "How many seconds it takes for the experience bar to fade in",
+  "tooltip.immersive_hud.experienceFadeOut": "How many seconds it takes for the experience bar to move out",
+  "tooltip.immersive_hud.jumpMaxTime": "How long the horse jump bar can be displayed on screen in seconds",
+  "tooltip.immersive_hud.jumpFadeIn": "How many seconds it takes for the horse jump bar to fade in",
+  "tooltip.immersive_hud.jumpFadeOut": "How many seconds it takes for the horse jump bar to fade out",
+  "tooltip.immersive_hud.healthMaxTime": "How long the health bar can be displayed on screen in seconds",
+  "tooltip.immersive_hud.healthFadeIn": "How many seconds it takes for the health bar to fade in",
+  "tooltip.immersive_hud.healthFadeOut": "How many seconds it takes for the health bar to fade out",
+  "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",
+  "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.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

@@ -9,8 +9,9 @@
     "Markil 3"
   ],
   "contact": {
-    "homepage": "https://fabricmc.net/",
+    "homepage": "https://www.planetminecraft.com/mod/immersive-hud/",
-    "sources": "https://github.com/FabricMC/fabric-example-mod"
+    "sources": "https://github.com/Markil3/MinecraftImmersiveHUD",
+    "issues": "https://github.com/Markil3/MinecraftImmersiveHUD/issues"
   },
 
   "license": "GPL-3.0-only",
@@ -20,18 +21,25 @@
   "entrypoints": {
     "main": [
       "markil3.immersive_hud.Main"
+    ],
+    "modmenu": [
+      "markil3.immersive_hud.ModMenu"
     ]
   },
   "mixins": [
     {
-      "config": "modid.mixins.json",
+      "config": "immersive_hud.mixins.json",
       "environment": "client"
     }
   ],
 
   "depends": {
-    "fabricloader": ">=0.7.4",
+    "fabricloader": ">=0.12.12",
-    "fabric": "*",
+    "minecraft": "1.18.x",
-    "minecraft": "1.16.x"
+    "java": ">=17"
+  },
+  "suggests": {
+    "modmenu": "*",
+    "cloth-config2": "*"
   }
 }

src/main/resources/immersive_hud.mixins.json

@@ -2,14 +2,13 @@
   "required": true,
   "minVersion": "0.8",
   "package": "markil3.immersive_hud.mixin",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_16",
   "mixins": [
   ],
   "client": [
     "ClientPlayerHook",
     "HeldItemHook",
-    "HudHook",
+    "HudHook"
-    "ProfilerHook"
   ],
   "injectors": {
     "defaultRequire": 1