Adds fading for the oxygen bar.

This should fix #2. Thanks, @Reddy64!

.gitattributes

@@ -1,5 +0,0 @@
-# Disable autocrlf on generated files, they always generate with LF
-# Add any extra files or paths here to make git stop saying they
-# are changed when only line endings change.
-src/generated/**/.cache/cache text eol=lf
-src/generated/**/*.json text eol=lf

.github/workflows/build.yml

@@ -0,0 +1,41 @@
+# Automatically build the project and run any configured tests for every push
+# and submitted pull request. This can help catch issues that only occur on
+# certain platforms or Java versions, and provides a first line of defence
+# against bad commits.
+
+name: build
+on: [pull_request, push]
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        # Use these Java versions
+        java: [
+          1.17,  # Minimum supported by Minecraft
+          17,   # Current Java LTS
+          17    # Latest version
+        ]
+        # and run on both Linux and Windows
+        os: [ubuntu-20.04, windows-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: checkout repository
+        uses: actions/checkout@v2
+      - name: validate gradle wrapper
+        uses: gradle/wrapper-validation-action@v1
+      - name: setup jdk ${{ matrix.java }}
+        uses: actions/setup-java@v1
+        with:
+          java-version: ${{ matrix.java }}
+      - name: make gradle wrapper executable
+        if: ${{ runner.os != 'Windows' }}
+        run: chmod +x ./gradlew
+      - name: build
+        run: ./gradlew build
+      - name: capture build artifacts
+        if: ${{ runner.os == 'Linux' && matrix.java == '11' }} # Only upload artifacts built from LTS java on one OS
+        uses: actions/upload-artifact@v2
+        with:
+          name: Artifacts
+          path: build/libs/

.gitignore

@@ -1,26 +1,41 @@
+# gradle
+
+.gradle/
+build/
+out/
+classes/
+
 # eclipse
-bin
+
 *.launch
-.settings
+
-.metadata
+# idea
+
+.idea/
+*.iml
+*.ipr
+*.iws
+
+# vscode
+
+.settings/
+.vscode/
+bin/
 .classpath
 .project
 
-# idea
+# macos
-out
-*.ipr
-*.iws
-*.iml
-.idea
 
-# gradle
+*.DS_Store
-build
-.gradle
 
-# other
+# fabric
-eclipse
-run
 
-# Files from Forge MDK
+run/
-forge*changelog.txt
+/logs/
-/local.properties
+local.properties
+remappedSrc/
+MinecraftImmersiveHUD.mcpack
+manifest.json
+pack_icon.png
+scripts/
+subpacks/

build.gradle

@@ -1,165 +1,86 @@
-buildscript {
+plugins {
-    repositories {
+	id 'fabric-loom' version '0.11-SNAPSHOT'
-        maven { url = 'https://files.minecraftforge.net/maven' }
+	id 'maven-publish'
-        jcenter()
-        mavenCentral()
 }
-    dependencies {
+
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true
+sourceCompatibility = JavaVersion.VERSION_17
-    }
+targetCompatibility = JavaVersion.VERSION_17
-}
+
-apply plugin: 'net.minecraftforge.gradle'
+archivesBaseName = project.archives_base_name
-// Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
+version = project.mod_version + "-" + project.minecraft_version + "-fabric"
-apply plugin: 'eclipse'
+group = project.maven_group
-apply plugin: 'maven-publish'
 
 repositories {
 	maven { url "https://maven.shedaniel.me/" }
+	maven { url "https://maven.terraformersmc.com/" }
 }
 
-archivesBaseName = project.archives_base_name
-version = project.mod_version + "-" + project.minecraft_version + "-forge"
-group = project.maven_group // http://maven.apache.org/guides/mini/guide-naming-conventions.html
-
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
-
-println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
-minecraft {
-    // The mappings can be changed at any time, and must be in the following format.
-    // snapshot_YYYYMMDD   Snapshot are built nightly.
-    // stable_#            Stables are built at the discretion of the MCP team.
-    // Use non-default mappings at your own risk. they may not always work.
-    // Simply re-run your setup task after changing the mappings to update your workspace.
-    mappings channel: 'snapshot', version: project.mappings
-    // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
-    
-    // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
-
-    // Default run configurations.
-    // These can be tweaked, removed, or duplicated as needed.
-    runs {
-        client {
-            workingDirectory project.file('run')
-
-            // Recommended logging data for a userdev environment
-            property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
-
-            // Recommended logging level for the console
-            property 'forge.logging.console.level', 'debug'
-
-            mods {
-                examplemod {
-                    source sourceSets.main
-                }
-            }
-        }
-
-        server {
-            workingDirectory project.file('run')
-
-            // Recommended logging data for a userdev environment
-            property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
-
-            // Recommended logging level for the console
-            property 'forge.logging.console.level', 'debug'
-
-            mods {
-                examplemod {
-                    source sourceSets.main
-                }
-            }
-        }
-
-        data {
-            workingDirectory project.file('run')
-
-            // Recommended logging data for a userdev environment
-            property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
-
-            // Recommended logging level for the console
-            property 'forge.logging.console.level', 'debug'
-
-            // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
-            args '--mod', 'examplemod', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
-
-            mods {
-                examplemod {
-                    source sourceSets.main
-                }
-            }
-        }
-    }
-}
-
-// Include resources generated by data generators.
-sourceSets.main.resources { srcDir 'src/generated/resources' }
-
 dependencies {
-    // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed
+	// To change the versions see the gradle.properties file
-    // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied.
+	minecraft "com.mojang:minecraft:${project.minecraft_version}"
-    // The userdev artifact is a special name and will get all sorts of transformations applied to it.
+	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
-    minecraft "net.minecraftforge:forge:${project.minecraft_version}-${project.forge_version}"
+	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
-    compile(fg.deobf("me.shedaniel.cloth:cloth-config-forge:${project.cloth_version}"))
+	modApi "me.shedaniel.cloth:cloth-config-fabric:${project.cloth_version}"
-    // You may put jars on which you depend on in ./libs or you may define them like so..
+	modImplementation "com.terraformersmc:modmenu:${project.modmenu_version}"
-    // compile "some.group:artifact:version:classifier"
-    // compile "some.group:artifact:version"
-
-    // Real examples
-    // compile 'com.mod-buildcraft:buildcraft:6.0.8:dev'  // adds buildcraft to the dev env
-    // compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env
-
-    // The 'provided' configuration is for optional dependencies that exist at compile-time but might not at runtime.
-    // provided 'com.mod-buildcraft:buildcraft:6.0.8:dev'
-
-    // These dependencies get remapped to your current MCP mappings
-    // deobf 'com.mod-buildcraft:buildcraft:6.0.8:dev'
-
-    // For more info...
-    // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
-    // http://www.gradle.org/docs/current/userguide/dependency_management.html
 
+	// 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.
 }
 
-task sourcesJar(type: Jar, dependsOn: classes) {
+processResources {
-    classifier = 'sources'
+	inputs.property "version", project.version
-    from sourceSets.main.allSource
+
+	filesMatching("fabric.mod.json") {
+		expand "version": project.version
+	}
 }
 
-artifacts {
+tasks.withType(JavaCompile).configureEach {
-    archives sourcesJar
+	// ensure that the encoding is set to UTF-8, no matter what the system default is
+	// this fixes some edge cases with special characters not displaying correctly
+	// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
+	// If Javadoc is generated, this must be specified in that task too.
+	it.options.encoding = "UTF-8"
+
+	// Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
+	it.options.release = 17
+}
+
+java {
+	// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
+	// if it is present.
+	// If you remove this line, sources will not be generated.
+	withSourcesJar()
 }
 
-// Example for how to get properties into the manifest for reading by the runtime..
 jar {
-    manifest {
+	from("LICENSE") {
-        attributes([
+		rename { "${it}_${project.archivesBaseName}"}
-            "Specification-Title": project.archivesBaseName,
-            "Specification-Vendor": "Markil 3",
-            "Specification-Version": project.version,
-            "Implementation-Title": project.name,
-            "Implementation-Version": "${version}",
-            "Implementation-Vendor" :"Markil 3",
-            "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
-        ])
 	}
 }
 
-// Example configuration to allow publishing using the maven-publish task
+// configure the maven publication
-// This is the preferred method to reobfuscate your jar file
-jar.finalizedBy('reobfJar') 
-// However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing
-//publish.dependsOn('reobfJar')
-
 publishing {
 	publications {
 		mavenJava(MavenPublication) {
-            artifact jar
+			// add all the jars that should be included when publishing to maven
+			artifact(remapJar) {
+				builtBy remapJar
+			}
+			artifact(sourcesJar) {
+				builtBy remapSourcesJar
 			}
 		}
+	}
+    
+    // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
     repositories {
-        maven {
+        // Add repositories to publish to here.
-            url "file:///${project.projectDir}/mcmodsrepo"
+        // Notice: This block does NOT have the same function as the block in the top level.
-        }
+        // The repositories here will be used for publishing your artifact, not for
+        // retrieving dependencies.
     }
 }

gradle.properties

@@ -1,16 +1,17 @@
-# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
+# Done to increase the memory available to gradle.
-# This is required to provide enough memory for the Minecraft decompilation process.
+org.gradle.jvmargs=-Xmx4G
-org.gradle.jvmargs=-Xmx3G
-org.gradle.daemon=false
 
-# Forge Properties
+# Fabric Properties
-minecraft_version=1.16.4
+	# check these on https://fabricmc.net/use
-mappings=20201028-1.16.3
+	minecraft_version=1.18.1
-forge_version=35.1.37
+	yarn_mappings=1.18.1+build.22
+	loader_version=0.12.12
 
-cloth_version=4.11.14
+cloth_version=6.1.48
+modmenu_version=3.0.1
+fabric_version=0.46.2+1.18
 
 # Mod Properties
-mod_version = 1.1.1
+	mod_version = 1.3
 	maven_group = markil3
 	archives_base_name = immersive_hud

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -1,78 +1,129 @@
-#!/usr/bin/env sh
+#!/bin/sh
+
+#
+# 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.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 ##############################################################################
-##
+#
-##  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=""
+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
 
+
 # Determine the Java command to use to start the JVM.
 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
@@ -81,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
@@ -89,84 +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, switch paths to Windows format before running java
-if $cygwin ; 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=$((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" )
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+
-  cd "$(dirname "$0")"
+    # 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,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@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 obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@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 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -13,15 +29,18 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+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.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -35,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -45,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

settings.gradle

@@ -0,0 +1,9 @@
+pluginManagement {
+    repositories {
+        maven {
+            name = 'Fabric'
+            url = 'https://maven.fabricmc.net/'
+        }
+        gradlePluginPortal()
+    }
+}

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

@@ -1,106 +1,42 @@
 package markil3.immersive_hud;
 
-import com.electronwill.nightconfig.core.file.CommentedFileConfig;
-import com.electronwill.nightconfig.core.io.WritingMode;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.util.math.MathHelper;
-import net.minecraftforge.common.ForgeConfigSpec;
-import net.minecraftforge.fml.common.Mod;
-
-import org.apache.commons.lang3.tuple.Pair;
-
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
 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. To write any changes, use the {@link #save()}
+ * the configuration in memory.
- * method.
  *
  * @author Markil 3
  */
 public class ConfigManager
 {
-    /**
-     * The only instance of this class
-     */
-    private static final ConfigManager INSTANCE;
-
-    /**
-     * The {@link ForgeConfigSpec} instance for this mod's configuration
-     */
-    private static final ForgeConfigSpec SPEC;
-
-    /**
-     * {@link Path} to the configuration file of this mod
-     */
-    private static final Path CONFIG_PATH =
-            Paths.get("config",
-                    Main.class.getAnnotation(Mod.class).value() + ".toml");
-
-    static
-    {
-        Pair<ConfigManager, ForgeConfigSpec> specPair =
-                new ForgeConfigSpec.Builder().configure(ConfigManager::new);
-        INSTANCE = specPair.getLeft();
-        SPEC = specPair.getRight();
-        CommentedFileConfig config = CommentedFileConfig.builder(Minecraft.getInstance().gameDir.toPath().toAbsolutePath().resolve(CONFIG_PATH))
-                .sync()
-                .autoreload()
-                .writingMode(WritingMode.REPLACE)
-                .build();
-        config.load();
-        config.save();
-        SPEC.setConfig(config);
-    }
-
     public static class TimeValues
     {
         private static final int SHOW_TIME = 6 * TICKS_PER_SECOND;
-        private static final int FADE_IN = TICKS_PER_SECOND / 4;
+        private static final int FADE_IN = TICKS_PER_SECOND / 2;
-        private static final int FADE_OUT = TICKS_PER_SECOND / 2;
+        private static final int FADE_OUT = TICKS_PER_SECOND;
 
-        private final String name;
+        private int maxTime = SHOW_TIME;
-        private final ForgeConfigSpec.IntValue maxTime;
+        private int fadeIn = FADE_IN;
-        private final ForgeConfigSpec.IntValue fadeIn;
+        private int fadeOut = FADE_OUT;
-        private final ForgeConfigSpec.IntValue fadeOut;
-
-        TimeValues(String name, ForgeConfigSpec.Builder configSpecBuilder)
-        {
-            final int MAX_TIME = 10 * 60 * TICKS_PER_SECOND;
-
-            this.name = name;
-            this.maxTime =
-                    configSpecBuilder.translation("immersive_hud.configGui." + name + "Time.title")
-                            .defineInRange(name + "Time.maxTime",
-                                    SHOW_TIME,
-                                    0,
-                                    MAX_TIME);
-            this.fadeIn =
-                    configSpecBuilder.translation("immersive_hud.configGui." + name + "FadeIn.title")
-                            .defineInRange(name + "Time.fadeIn",
-                                    FADE_IN,
-                                    0,
-                                    MAX_TIME);
-            this.fadeOut =
-                    configSpecBuilder.translation("immersive_hud.configGui." + name + "FadeOut.title")
-                            .defineInRange(name + "Time.fadeOut",
-                                    FADE_OUT,
-                                    0,
-                                    MAX_TIME);
-        }
-
-        public String getName()
-        {
-            return this.name;
-        }
 
         /**
          * Obtains the maximum time that the hotbar can be on the screen,
@@ -110,7 +46,7 @@ public class ConfigManager
          */
         public int getMaxTime()
         {
-            return this.maxTime.get();
+            return this.maxTime;
         }
 
         /**
@@ -120,7 +56,7 @@ public class ConfigManager
          */
         public int getFadeInTime()
         {
-            return this.fadeIn.get();
+            return this.fadeIn;
         }
 
         /**
@@ -130,86 +66,42 @@ public class ConfigManager
          */
         public int getFadeOutTime()
         {
-            return this.fadeOut.get();
+            return this.fadeOut;
         }
 
         public void setMaxTime(int time)
         {
-            this.maxTime.set(time);
+            this.maxTime = time;
         }
 
         public void setFadeInTime(int time)
         {
-            this.fadeIn.set(time);
+            this.fadeIn = time;
         }
 
         public void setFadeOutTime(int time)
         {
-            this.fadeOut.set(time);
+            this.fadeOut = time;
         }
     }
 
-    private final TimeValues hotbarTime;
+    private TimeValues hotbarTime = new TimeValues();
-    private final TimeValues experienceTime;
+    private TimeValues experienceTime = new TimeValues();
-    private final TimeValues jumpTime;
+    private TimeValues jumpTime = new TimeValues();
-    private final TimeValues healthTime;
+    private TimeValues healthTime = new TimeValues();
-    private final TimeValues hungerTime;
+    private TimeValues hungerTime = new TimeValues();
-    private final TimeValues effectTime;
+    private TimeValues airTime = new TimeValues();
-    private final ForgeConfigSpec.IntValue crosshairTime;
+    private TimeValues effectTime = new TimeValues();
-    private final ForgeConfigSpec.BooleanValue hideCrosshair;
+    private int crosshairTime = 6 * TICKS_PER_SECOND;
-    private final ForgeConfigSpec.IntValue handTime;
+    private boolean hideCrosshair = true;
-    private final ForgeConfigSpec.BooleanValue hideHands;
+    private int handTime = 30 * TICKS_PER_SECOND;
-    private final ForgeConfigSpec.BooleanValue showArmor;
+    private boolean hideHands = true;
-    private final ForgeConfigSpec.DoubleValue minHealth;
+    private boolean showArmor = true;
-    private final ForgeConfigSpec.IntValue minHunger;
+    private double minHealth = 0.5;
-
+    private int minHunger = 17;
-    /**
+    private int minAir = 300;
-     * Implementation of Singleton design pattern, which allows only one
+    private Identifier[] ignoredItems = new Identifier[]{Registry.ITEM.getId(Items.FIREWORK_ROCKET)};
-     * instance of this class to be created.
+    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)};
-     */
-    private ConfigManager(ForgeConfigSpec.Builder configSpecBuilder)
-    {
-        // Comments are not added because there was no way to translate
-        // descriptions from translate keys here
-
-        this.hotbarTime = new TimeValues("hotbar", configSpecBuilder);
-        this.experienceTime = new TimeValues("experience", configSpecBuilder);
-        this.jumpTime = new TimeValues("jump", configSpecBuilder);
-        this.healthTime = new TimeValues("health", configSpecBuilder);
-        this.hungerTime = new TimeValues("hunger", configSpecBuilder);
-        this.effectTime = new TimeValues("effect", configSpecBuilder);
-        this.crosshairTime =
-                configSpecBuilder.translation(
-                        "immersive_hud.configGui.crosshairTime.title")
-                        .defineInRange("crosshairTime",
-                                6 * TICKS_PER_SECOND,
-                                0,
-                                10 * 60 * TICKS_PER_SECOND);
-        this.hideCrosshair =
-                configSpecBuilder.translation(
-                        "immersive_hud.configGui.hideCrosshair.title")
-                        .define("hideCrosshair", true);
-        this.handTime =
-                configSpecBuilder.translation(
-                        "immersive_hud.configGui.handTime.title")
-                        .defineInRange("handTime",
-                                30 * TICKS_PER_SECOND,
-                                0,
-                                10 * 60 * TICKS_PER_SECOND);
-        this.hideHands =
-                configSpecBuilder.translation(
-                        "immersive_hud.configGui.hideHands.title")
-                        .define("hideHands", true);
-        this.showArmor = configSpecBuilder.translation(
-                "immersive_hud.configGui.showArmor.title")
-                .define("showArmor", true);
-        this.minHealth = configSpecBuilder.translation(
-                "immersive_hud.configGui.minHealth.title")
-                .defineInRange("minHealth", 0.5, 0.0, 1.0);
-        this.minHunger = configSpecBuilder.translation(
-                "immersive_hud.configGui.minHunger.title")
-                .defineInRange("minHunger", 17, 0, 20);
-    }
 
     /**
      * Returns the instance of this class.
@@ -218,7 +110,22 @@ public class ConfigManager
      */
     public static ConfigManager getInstance()
     {
-        return INSTANCE;
+        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
@@ -238,7 +145,7 @@ public class ConfigManager
      *
      * @return The experience bar display time values.
      */
-    public TimeValues getExperenceTime()
+    public TimeValues getExperienceTime()
     {
         return this.experienceTime;
     }
@@ -273,6 +180,11 @@ public class ConfigManager
         return this.hungerTime;
     }
     
+    public TimeValues getAirTime()
+    {
+        return this.airTime;
+    }
+
     /**
      * Obtains time values related to potion effects.
      *
@@ -290,9 +202,8 @@ public class ConfigManager
      */
     public int getCrosshairTime()
     {
-        return this.crosshairTime.get();
+        return this.crosshairTime;
     }
-
     /**
      * Checks whether the crosshairs should be hidden after a period of time.
      *
@@ -300,7 +211,7 @@ public class ConfigManager
      */
     public boolean hideCrosshair()
     {
-        return this.hideCrosshair.get();
+        return this.hideCrosshair;
     }
 
     /**
@@ -310,7 +221,7 @@ public class ConfigManager
      */
     public int getHandTime()
     {
-        return this.handTime.get();
+        return this.handTime;
     }
 
     /**
@@ -320,7 +231,7 @@ public class ConfigManager
      */
     public boolean hideHands()
     {
-        return this.hideHands.get();
+        return this.hideHands;
     }
 
     /**
@@ -330,7 +241,7 @@ public class ConfigManager
      */
     public boolean shouldShowArmor()
     {
-        return this.showArmor.get();
+        return this.showArmor;
     }
 
     /**
@@ -341,7 +252,7 @@ public class ConfigManager
      */
     public double getMinHealth()
     {
-        return this.minHealth.get();
+        return this.minHealth;
     }
 
     /**
@@ -352,7 +263,58 @@ public class ConfigManager
      */
     public int getMinHunger()
     {
-        return this.minHunger.get();
+        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;
     }
 
     /**
@@ -362,7 +324,7 @@ public class ConfigManager
      */
     public void setCrosshairTime(int time)
     {
-        this.crosshairTime.set(time);
+        this.crosshairTime = time;
     }
 
     /**
@@ -372,7 +334,7 @@ public class ConfigManager
      */
     public void hideCrosshair(boolean hide)
     {
-        this.hideCrosshair.set(hide);
+        this.hideCrosshair = hide;
     }
 
     /**
@@ -382,7 +344,7 @@ public class ConfigManager
      */
     public void setHandTime(int time)
     {
-        this.handTime.set(time);
+        this.handTime = time;
     }
 
     /**
@@ -392,7 +354,7 @@ public class ConfigManager
      */
     public void hideHands(boolean hide)
     {
-        this.hideHands.set(hide);
+        this.hideHands = hide;
     }
 
     /**
@@ -402,7 +364,7 @@ public class ConfigManager
      */
     public void shouldShowArmor(boolean show)
     {
-        this.showArmor.set(show);
+        this.showArmor = show;
     }
 
     /**
@@ -413,7 +375,7 @@ public class ConfigManager
      */
     public void setMinHealth(double boundary)
     {
-        this.minHealth.set(MathHelper.clamp(boundary, 0, 1));
+        this.minHealth = MathHelper.clamp(boundary, 0, 1);
     }
 
     /**
@@ -424,14 +386,65 @@ public class ConfigManager
      */
     public void setMinHunger(int boundary)
     {
-        this.minHunger.set(MathHelper.clamp(boundary, 0, 20));
+        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()
+//    public void save()
-    {
+//    {
-        SPEC.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,323 +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 net.minecraft.client.Minecraft;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.client.event.RenderGameOverlayEvent;
-import net.minecraftforge.client.event.RenderHandEvent;
-import net.minecraftforge.event.entity.EntityMountEvent;
-import net.minecraftforge.event.entity.player.PlayerInteractEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.DistExecutor;
-import net.minecraftforge.fml.common.Mod;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-import java.util.Optional;
-
-import static markil3.immersive_hud.TimerUtils.resetAlpha;
-
-/**
- * Contains the logic for changing the HUD.
- *
- * @author Markil 3
- * @version 0.1-1.16.4-forge
- */
-@Mod.EventBusSubscriber(Dist.CLIENT)
-public class EventBus
-{
-    /**
-     * Class logger
-     */
-    private static final Logger LOGGER = LogManager.getLogger();
-
-    /**
-     * 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 event - event data
-     */
-    @SubscribeEvent
-    public static void onClick(final PlayerInteractEvent event)
-    {
-        try
-        {
-            DistExecutor.safeRunWhenOn(Dist.CLIENT,
-                    (DistExecutor.SafeSupplier<DistExecutor.SafeRunnable>) () -> new DistExecutor.SafeRunnable()
-                    {
-                        @Override
-                        public void run()
-                        {
-                            Item item =
-                                    Optional.ofNullable(event.getItemStack())
-                                            .map(ItemStack::getItem)
-                                            .orElse(null);
-                            TimerUtils.onClick(event.getHand(), item);
-                        }
-                    });
-        }
-        catch (Exception e)
-        {
-            LOGGER.error(
-                    "Error in running markil3.immersive_hud.EventBus#onClick " +
-                            "event",
-                    e);
-        }
-    }
-
-    /**
-     * Run whenever the player mounts something. This brings the mount's health
-     * bar into view.
-     * <p>
-     * While this event is called on both client and server, only on the client
-     * will anything happen.
-     *
-     * @param event - event data
-     */
-    @SubscribeEvent
-    public static void onMount(final EntityMountEvent event)
-    {
-        try
-        {
-            DistExecutor.safeRunWhenOn(Dist.CLIENT,
-                    (DistExecutor.SafeSupplier<DistExecutor.SafeRunnable>) () -> new DistExecutor.SafeRunnable()
-                    {
-                        @Override
-                        public void run()
-                        {
-                            TimerUtils.resetMountHealth();
-                        }
-                    });
-        }
-        catch (Exception e)
-        {
-            LOGGER.error(
-                    "Error in running markil3.immersive_hud.EventBus#onMount " +
-                            "event",
-                    e);
-        }
-    }
-
-    /**
-     * Run whenever a hand is rendered in 1st person. This brings the player
-     * hands into and out of view as needed.
-     *
-     * @param event - event data
-     */
-    @SubscribeEvent
-    public static void onRenderHand(final RenderHandEvent event)
-    {
-        try
-        {
-            if (TimerUtils.onRenderHand(event.getHand(),
-                    event.getMatrixStack(),
-                    event.getPartialTicks()))
-            {
-                event.setCanceled(true);
-            }
-        }
-        catch (Exception e)
-        {
-            LOGGER.error(
-                    "Error in running markil3.immersive_hud" +
-                            ".EventBus#onRenderHand event",
-                    e);
-        }
-    }
-
-    /**
-     * Called whenever we are drawing a part of the GUI. This is where most of
-     * the change checks are made and adjustments or overrides are done.
-     *
-     * @param event - event data
-     */
-    @SubscribeEvent
-    public static void onGUIDraw(final RenderGameOverlayEvent event)
-    {
-        try
-        {
-            Minecraft mc = Minecraft.getInstance();
-            boolean fadeIn = false;
-
-            switch (event.getType())
-            {
-            case CROSSHAIRS:
-                if (event instanceof RenderGameOverlayEvent.Pre)
-                {
-                    if (TimerUtils.drawCrosshair(event.getPartialTicks()))
-                    {
-                        event.setCanceled(true);
-                    }
-                }
-                /*
-                 * Reset the transparency.
-                 */
-                else if (event instanceof RenderGameOverlayEvent.Post)
-                {
-                    resetAlpha();
-                }
-                break;
-            case POTION_ICONS:
-                if (event instanceof RenderGameOverlayEvent.Pre)
-                {
-                    TimerUtils.updatePotions(mc.player);
-                    event.setCanceled(true);
-                    RenderUtils.renderPotionIcons(mc,
-                            mc.ingameGUI,
-                            event.getMatrixStack(), event.getPartialTicks());
-                    resetAlpha();
-                }
-                break;
-            case HOTBAR:
-                if (event instanceof RenderGameOverlayEvent.Pre)
-                {
-                    event.setCanceled(true);
-                    if (!TimerUtils.drawHotbar(event.getPartialTicks()))
-                    {
-                        RenderUtils.renderHotbar(mc, mc.ingameGUI,
-                                event.getMatrixStack(),
-                                event.getPartialTicks(), TimerUtils.hotbarTime);
-                    }
-                }
-                break;
-            case HEALTH:
-                if (event instanceof RenderGameOverlayEvent.Pre)
-                {
-                    if (TimerUtils.drawHealth(event.getMatrixStack(),
-                            event.getPartialTicks()))
-                    {
-                        event.setCanceled(true);
-                    }
-                }
-                else if (event instanceof RenderGameOverlayEvent.Post)
-                {
-                    event.getMatrixStack().pop();
-                    resetAlpha();
-                }
-                break;
-            case FOOD:
-                if (event instanceof RenderGameOverlayEvent.Pre)
-                {
-                    if (TimerUtils.drawHunger(event.getMatrixStack(),
-                            event.getPartialTicks()))
-                    {
-                        event.setCanceled(true);
-                    }
-                }
-                /*
-                 * Reset the transparency.
-                 */
-                else if (event instanceof RenderGameOverlayEvent.Post)
-                {
-                    event.getMatrixStack().pop();
-                    resetAlpha();
-                }
-                break;
-            case ARMOR:
-                if (event instanceof RenderGameOverlayEvent.Pre)
-                {
-                    if (TimerUtils.drawArmor(event.getMatrixStack(),
-                            event.getPartialTicks()))
-                    {
-                        event.setCanceled(true);
-                    }
-                }
-                /*
-                 * Reset the transparency.
-                 */
-                else if (event instanceof RenderGameOverlayEvent.Post)
-                {
-                    event.getMatrixStack().pop();
-                    resetAlpha();
-                }
-                break;
-            case AIR:
-                if (event instanceof RenderGameOverlayEvent.Pre)
-                {
-                    if (TimerUtils.drawAir(event.getMatrixStack(),
-                            event.getPartialTicks()))
-                    {
-                        event.setCanceled(true);
-                    }
-                }
-                /*
-                 * Reset the transparency.
-                 */
-                else if (event instanceof RenderGameOverlayEvent.Post)
-                {
-                    event.getMatrixStack().pop();
-                    resetAlpha();
-                }
-                break;
-            case HEALTHMOUNT:
-                if (event instanceof RenderGameOverlayEvent.Pre)
-                {
-                    if (TimerUtils.drawMountHealth(event.getMatrixStack(),
-                            event.getPartialTicks()))
-                    {
-                        event.setCanceled(true);
-                    }
-                }
-                else if (event instanceof RenderGameOverlayEvent.Post)
-                {
-                    event.getMatrixStack().pop();
-                    resetAlpha();
-                }
-                break;
-            case JUMPBAR:
-                if (event instanceof RenderGameOverlayEvent.Pre)
-                {
-                    event.setCanceled(true);
-                    if (!TimerUtils.drawJumpbar(event.getPartialTicks()))
-                    {
-                        RenderUtils.renderHorseJumpBar(mc,
-                                mc.ingameGUI,
-                                event.getMatrixStack(),
-                                event.getPartialTicks(),
-                                TimerUtils.jumpTime);
-                    }
-                }
-                break;
-            case EXPERIENCE:
-                if (event instanceof RenderGameOverlayEvent.Pre)
-                {
-                    event.setCanceled(true);
-                    if (!TimerUtils.drawExperience(event.getPartialTicks()))
-                    {
-                        RenderUtils.renderExperience(mc,
-                                mc.ingameGUI,
-                                event.getMatrixStack(),
-                                event.getPartialTicks(),
-                                TimerUtils.experienceTime);
-                    }
-                }
-                break;
-            }
-        }
-        catch (Exception e)
-        {
-            LOGGER.error(
-                    "Error in running markil3.immersive_hud.EventBus#onGUIDraw event",
-                    e);
-        }
-    }
-}

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

@@ -17,73 +17,48 @@
  */
 package markil3.immersive_hud;
 
-import net.minecraft.util.text.TranslationTextComponent;
+import net.fabricmc.api.ModInitializer;
-import net.minecraftforge.fml.ExtensionPoint;
-import net.minecraftforge.fml.ModList;
-import net.minecraftforge.fml.ModLoadingContext;
-import net.minecraftforge.fml.VersionChecker;
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
-import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
-import net.minecraftforge.fml.network.FMLNetworkConstants;
 
-import org.apache.commons.lang3.tuple.Pair;
+import me.shedaniel.autoconfig.AutoConfig;
-import org.apache.logging.log4j.LogManager;
+import me.shedaniel.autoconfig.serializer.Toml4jConfigSerializer;
-import org.apache.logging.log4j.Logger;
 
 /**
  * The main entry point for the Immersive HUD mod.
  *
  * @author Markil 3
- * @version 0.1-1.16.4-forge
+ * @version 0.1-1.16.4-fabric
  */
-@Mod("immersive_hud")
+public class Main implements ModInitializer
-public class Main
 {
-    /**
-     * Class logger.
-     */
-    private static final Logger LOGGER = LogManager.getLogger();
     public static final int TICKS_PER_SECOND = 20;
 
-    public Main()
+    @Override
+    public void onInitialize()
     {
-        FMLJavaModLoadingContext.get()
-                .getModEventBus()
-                .addListener(this::setup);
-
         try
         {
-            if (Class.forName("me.shedaniel.clothconfig2.api.ConfigBuilder") != null)
+            if (Class.forName("me.shedaniel.autoconfig.AutoConfig") != null)
             {
-                ModMenu.setupScreen();
+                AutoConfig.register(ConfigManagerCloth.class,
+                        Toml4jConfigSerializer::new);
             }
         }
         catch (ClassNotFoundException e)
         {
             // Do nothing
         }
-        //Make sure the mod being absent on the other network side does not
-        // cause the client to display the server as incompatible
-        ModLoadingContext.get()
-                .registerExtensionPoint(ExtensionPoint.DISPLAYTEST, () -> Pair
-                        .of(() -> FMLNetworkConstants.IGNORESERVERONLY,
-                                (a, b) -> true));
-    }
-
-    private void setup(final FMLClientSetupEvent event)
-    {
     }
 
     /**
      * A utility method to handle the transparency timing. It will (for the most
      * part), make
      *
-     * @param renderTime - How many seconds until the element entirely
+     * @param renderTime - How many ticks until the element entirely
      * disappears.
-     * @param maxTime - How many seconds the element can appear.
      *
-     * @return The proper transparency to render something.
+     * @return The new alpha value.
+     *
+     * @since 0.1-1.16.4-fabric
      */
     static float getAlpha(double renderTime,
                           double maxTime,

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

@@ -1,9 +1,16 @@
 package markil3.immersive_hud;
 
-import net.minecraft.util.text.TranslationTextComponent;
+import com.terraformersmc.modmenu.api.ConfigScreenFactory;
-import net.minecraftforge.fml.ExtensionPoint;
+import com.terraformersmc.modmenu.api.ModMenuApi;
-import net.minecraftforge.fml.ModLoadingContext;
 
+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;
@@ -11,10 +18,14 @@ import me.shedaniel.clothconfig2.gui.entries.DoubleListEntry;
 
 import static markil3.immersive_hud.Main.TICKS_PER_SECOND;
 
-public class ModMenu
+import java.util.Arrays;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+public class ModMenu implements ModMenuApi
 {
 
-    static void startTimeField(ConfigEntryBuilder entryBuilder,
+    private void startTimeField(String name, ConfigEntryBuilder entryBuilder,
                                 ConfigCategory cat,
                                 ConfigManager.TimeValues value)
     {
@@ -23,41 +34,43 @@ public class ModMenu
         final float FADE_OUT = 0.5F;
 
         DoubleListEntry maxTime =
-                entryBuilder.startDoubleField(new TranslationTextComponent(
+                entryBuilder.startDoubleField(new TranslatableText(
-                                "option.immersive_hud." + value.getName() +
+                                "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 TranslationTextComponent(
+                        .setTooltip(new TranslatableText(
-                                "tooltip.immersive_hud." + value.getName() +
+                                "tooltip.immersive_hud." + name +
                                         "MaxTime"))
                         .setSaveConsumer(val -> value.setMaxTime((int) (val * TICKS_PER_SECOND)))
                         .build();
 
         DoubleListEntry fadeIn =
-                entryBuilder.startDoubleField(new TranslationTextComponent(
+                entryBuilder.startDoubleField(new TranslatableText(
-                                "option.immersive_hud." + value.getName() +
+                                "option.immersive_hud." + name +
                                         "FadeIn"),
                         (float) value.getFadeInTime() / TICKS_PER_SECOND)
-                        .setDefaultValue(FADE_IN).setMin(0).setMax(10 * 60 * TICKS_PER_SECOND)
+                        .setDefaultValue(FADE_IN)
-                        .setTooltip(new TranslationTextComponent(
+                        .setMin(0)
-                                "tooltip.immersive_hud." + value.getName() +
+                        .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 TranslationTextComponent(
+                entryBuilder.startDoubleField(new TranslatableText(
-                                "option.immersive_hud." + value.getName() +
+                                "option.immersive_hud." + name +
                                         "FadeOut"),
                         (float) value.getFadeOutTime() / TICKS_PER_SECOND)
                         .setDefaultValue(FADE_OUT)
                         .setMin(0)
                         .setMax(10 * 60 * TICKS_PER_SECOND)
-                        .setTooltip(new TranslationTextComponent(
+                        .setTooltip(new TranslatableText(
-                                "tooltip.immersive_hud." + value.getName() +
+                                "tooltip.immersive_hud." + name +
                                         "FadeOut"))
                         .setSaveConsumer(val -> value.setFadeOutTime((int) (val * TICKS_PER_SECOND)))
                         .build();
@@ -67,128 +80,183 @@ public class ModMenu
         cat.addEntry(fadeOut);
     }
 
-    static void setupScreen()
+    @Override
+    public ConfigScreenFactory<?> getModConfigScreenFactory()
     {
-        ModLoadingContext.get()
+        return screen -> {
-                .registerExtensionPoint(ExtensionPoint.CONFIGGUIFACTORY,
-                        () -> (mc, screen) -> {
             ConfigCategory general;
             ConfigEntryBuilder entryBuilder;
+            ConfigManager instance = ConfigManager.getInstance();
             final ConfigBuilder builder = ConfigBuilder.create()
                     .setParentScreen(screen)
-                                    .setTitle(new TranslationTextComponent(
+                    .setTitle(new TranslatableText(
                             "immersive_hud.configGui.title"))
                     .setSavingRunnable(() -> {
-                                        ConfigManager.getInstance().save();
+                        try
+                        {
+                            if (Class.forName("me.shedaniel.autoconfig.AutoConfig") != null)
+                            {
+                                AutoConfig.getConfigHolder(ConfigManagerCloth.class)
+                                        .save();
+                            }
+                        }
+                        catch (ClassNotFoundException e)
+                        {
+                            // Do nothing
+                        }
                     });
             general =
-                                    builder.getOrCreateCategory(new TranslationTextComponent(
+                    builder.getOrCreateCategory(new TranslatableText(
                             "category.immersive_hud.general"));
             entryBuilder = builder.entryBuilder();
 
-                            startTimeField(entryBuilder,
+            startTimeField("hotbar", entryBuilder,
                     general,
-                                    ConfigManager.getInstance()
+                    instance.getHotbarTime());
-                                            .getHotbarTime());
+            startTimeField("experience", entryBuilder,
-                            startTimeField(entryBuilder,
                     general,
-                                    ConfigManager.getInstance()
+                    instance.getExperienceTime());
-                                            .getExperenceTime());
+            startTimeField("jump", entryBuilder,
-                            startTimeField(entryBuilder,
                     general,
-                                    ConfigManager.getInstance().getJumpTime());
+                    instance.getJumpTime());
-                            startTimeField(entryBuilder,
+            startTimeField("jump", entryBuilder,
                     general,
-                                    ConfigManager.getInstance()
+                    instance.getHealthTime());
-                                            .getHealthTime());
+            startTimeField("hunger", entryBuilder,
-                            startTimeField(entryBuilder,
                     general,
-                                    ConfigManager.getInstance()
+                    instance.getHungerTime());
-                                            .getHungerTime());
+            startTimeField("air", entryBuilder,
-                            startTimeField(entryBuilder,
                     general,
-                                    ConfigManager.getInstance()
+                    instance.getAirTime());
-                                            .getPotionTime());
+            startTimeField("effect", entryBuilder,
+                    general,
+                    instance.getPotionTime());
 
-                            general.addEntry(entryBuilder.startDoubleField(new TranslationTextComponent(
+            general.addEntry(entryBuilder.startDoubleField(new TranslatableText(
                             "option.immersive_hud" +
                                     ".crosshairTime"),
-                                    (float) ConfigManager.getInstance()
+                    (float) instance.getCrosshairTime() / TICKS_PER_SECOND)
-                                            .getCrosshairTime() / TICKS_PER_SECOND)
                     .setDefaultValue(6)
-                                    .setTooltip(new TranslationTextComponent(
+                    .setTooltip(new TranslatableText(
                             "tooltip.immersive_hud" +
                                     ".crosshairTime"))
-                                    .setSaveConsumer(val -> ConfigManager.getInstance()
+                    .setSaveConsumer(val -> instance.setCrosshairTime((int) (val * TICKS_PER_SECOND)))
-                                            .setCrosshairTime((int) (val * TICKS_PER_SECOND)))
                     .build());
 
-                            general.addEntry(entryBuilder.startBooleanToggle(new TranslationTextComponent(
+            general.addEntry(entryBuilder.startBooleanToggle(new TranslatableText(
-                                    "option.immersive_hud.hideCrosshair"), ConfigManager.getInstance().hideCrosshair())
+                            "option.immersive_hud.hideCrosshair"),
+                    instance.hideCrosshair())
                     .setDefaultValue(true)
-                                    .setTooltip(new TranslationTextComponent(
+                    .setTooltip(new TranslatableText(
                             "tooltip.immersive_hud.hideCrosshair"))
-                                    .setSaveConsumer(val -> ConfigManager.getInstance()
+                    .setSaveConsumer(val -> instance.hideCrosshair(val))
-                                            .hideCrosshair(val))
                     .build());
 
-                            general.addEntry(entryBuilder.startDoubleField(new TranslationTextComponent(
+            general.addEntry(entryBuilder.startDoubleField(new TranslatableText(
                             "option.immersive_hud.handTime"),
-                                    (float) ConfigManager.getInstance()
+                    (float) instance.getHandTime() / TICKS_PER_SECOND)
-                                            .getHandTime() / TICKS_PER_SECOND)
                     .setDefaultValue(30)
-                                    .setTooltip(new TranslationTextComponent(
+                    .setTooltip(new TranslatableText(
                             "tooltip.immersive_hud.handTime"))
-                                    .setSaveConsumer(val -> ConfigManager.getInstance()
+                    .setSaveConsumer(val -> instance.setHandTime((int) (val * TICKS_PER_SECOND)))
-                                            .setHandTime((int) (val * TICKS_PER_SECOND)))
                     .build());
 
-                            general.addEntry(entryBuilder.startBooleanToggle(new TranslationTextComponent(
+            general.addEntry(entryBuilder.startBooleanToggle(new TranslatableText(
-                                            "option.immersive_hud.hideHands"), ConfigManager.getInstance().hideHands())
+                            "option.immersive_hud.hideHands"),
+                    instance.hideHands())
                     .setDefaultValue(true)
-                                    .setTooltip(new TranslationTextComponent(
+                    .setTooltip(new TranslatableText(
                             "tooltip.immersive_hud.hideHands"))
-                                    .setSaveConsumer(val -> ConfigManager.getInstance()
+                    .setSaveConsumer(val -> instance.hideHands(val))
-                                            .hideHands(val))
                     .build());
 
-                            general.addEntry(entryBuilder.startDoubleField(new TranslationTextComponent(
+            general.addEntry(entryBuilder.startDoubleField(new TranslatableText(
                             "option.immersive_hud.minHealth"),
-                                    ConfigManager.getInstance()
+                    instance.getMinHealth())
-                                            .getMinHealth())
                     .setDefaultValue(0.5)
-                                    .setTooltip(new TranslationTextComponent(
+                    .setTooltip(new TranslatableText(
                             "tooltip.immersive_hud.minHealth"))
-                                    .setSaveConsumer(val -> ConfigManager.getInstance()
+                    .setSaveConsumer(val -> instance.setMinHealth(val))
-                                            .setMinHealth(
-                                                    val))
                     .build());
 
-                            general.addEntry(entryBuilder.startIntField(new TranslationTextComponent(
+            general.addEntry(entryBuilder.startIntField(new TranslatableText(
                             "option.immersive_hud.minHunger"),
-                                    ConfigManager.getInstance()
+                    instance.getMinHunger())
-                                            .getMinHunger())
                     .setDefaultValue(17)
-                                    .setTooltip(new TranslationTextComponent(
+                    .setTooltip(new TranslatableText(
                             "tooltip.immersive_hud.minHunger"))
-                                    .setSaveConsumer(val -> ConfigManager.getInstance()
+                    .setSaveConsumer(val -> instance.setMinHunger(val))
-                                            .setMinHunger(
-                                                    val))
                     .build());
     
-                            general.addEntry(entryBuilder.startBooleanToggle(new TranslationTextComponent(
+            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"),
-                                    ConfigManager.getInstance()
+                    instance.shouldShowArmor())
-                                            .shouldShowArmor())
                     .setDefaultValue(true)
-                                    .setTooltip(new TranslationTextComponent(
+                    .setTooltip(new TranslatableText(
                             "tooltip.immersive_hud.showArmor"))
-                                    .setSaveConsumer(val -> ConfigManager.getInstance()
+                    .setSaveConsumer(val -> instance.shouldShowArmor(val))
-                                            .shouldShowArmor(
+                    .build());
-                                                    val))
+
+            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/RenderUtils.java

@@ -1,597 +0,0 @@
-/**
- * Copyright (C) 2009-2021 Mojang Studios
- * <p>
- * Players are free to create, build, and mod within Minecraft if the branding
- * usage guidelines are followed. Fan art, logos, videos, and screen shots are
- * acceptable as long as they are not used to falsely represent Mojang Minecraft
- * assets.  If you intend to use any portion of the name in relation to
- * services, products, or distribution, you must adhere to the following
- * requirements.
- * <p>
- * Mojang's terms of service and brand guidelines are designed to let you know
- * in plain terms what you can and cannot do with your game, the Mojang brand or
- * Mojang assets. https://account.mojang.com/documents/minecraft_eula
- */
-package markil3.immersive_hud;
-
-import com.google.common.collect.Lists;
-import com.google.common.collect.Ordering;
-import com.mojang.blaze3d.matrix.MatrixStack;
-import com.mojang.blaze3d.systems.RenderSystem;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.AbstractGui;
-import net.minecraft.client.gui.IngameGui;
-import net.minecraft.client.gui.screen.inventory.ContainerScreen;
-import net.minecraft.client.renderer.IRenderTypeBuffer;
-import net.minecraft.client.renderer.RenderHelper;
-import net.minecraft.client.renderer.model.IBakedModel;
-import net.minecraft.client.renderer.model.ItemCameraTransforms;
-import net.minecraft.client.renderer.texture.AtlasTexture;
-import net.minecraft.client.renderer.texture.OverlayTexture;
-import net.minecraft.client.renderer.texture.PotionSpriteUploader;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.client.renderer.texture.TextureManager;
-import net.minecraft.client.settings.AttackIndicatorStatus;
-import net.minecraft.crash.CrashReport;
-import net.minecraft.crash.CrashReportCategory;
-import net.minecraft.crash.ReportedException;
-import net.minecraft.entity.LivingEntity;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.item.ItemStack;
-import net.minecraft.potion.Effect;
-import net.minecraft.potion.EffectInstance;
-import net.minecraft.util.HandSide;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.math.MathHelper;
-import net.minecraft.world.World;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * Contains methods for rendering various HUD elements. Most of these methods
- * come from {@link IngameGui} and
- * {@link net.minecraft.client.renderer.ItemRenderer},
- * with some tweaks to make the mod work.
- *
- * @author Mojang Studios
- * @version 0.1-1.16.4-forge
- */
-public class RenderUtils
-{
-    public static void renderPotionIcons(Minecraft mc,
-                                         IngameGui gui,
-                                         MatrixStack matrixStack, float ticks)
-    {
-        int scaledWidth = mc.getMainWindow().getScaledWidth();
-        int scaledHeight = mc.getMainWindow().getScaledHeight();
-
-        Collection<EffectInstance> collection =
-                mc.player.getActivePotionEffects();
-        if (!collection.isEmpty())
-        {
-            RenderSystem.enableBlend();
-            int i = 0;
-            int j = 0;
-            PotionSpriteUploader potionspriteuploader =
-                    mc.getPotionSpriteUploader();
-            List<Runnable> list =
-                    Lists.newArrayListWithExpectedSize(collection.size());
-            mc.getTextureManager()
-                    .bindTexture(ContainerScreen.INVENTORY_BACKGROUND);
-
-            for (EffectInstance effectinstance : Ordering.natural()
-                    .reverse()
-                    .sortedCopy(collection))
-            {
-                Effect effect = effectinstance.getPotion();
-                float effectAlpha = TimerUtils.getPotionAlpha(mc.player, effectinstance, ticks);
-                if (!effectinstance.shouldRenderHUD() || effectAlpha < 0.01F)
-                {
-                    continue;
-                }
-                // Rebind in case previous renderHUDEffect changed texture
-                mc.getTextureManager()
-                        .bindTexture(ContainerScreen.INVENTORY_BACKGROUND);
-                if (effectinstance.isShowIcon())
-                {
-                    int k = scaledWidth;
-                    int l = 1;
-                    if (mc.isDemo())
-                    {
-                        l += 15;
-                    }
-
-                    if (effect.isBeneficial())
-                    {
-                        ++i;
-                        k = k - 25 * i;
-                    }
-                    else
-                    {
-                        ++j;
-                        k = k - 25 * j;
-                        l += 26;
-                    }
-
-                    RenderSystem.color4f(1.0F, 1.0F, 1.0F, effectAlpha);
-                    if (effectinstance.isAmbient())
-                    {
-                        gui.blit(matrixStack, k, l, 165, 166, 24, 24);
-                    }
-                    else
-                    {
-                        gui.blit(matrixStack, k, l, 141, 166, 24, 24);
-                    }
-
-                    TextureAtlasSprite textureatlassprite =
-                            potionspriteuploader.getSprite(effect);
-                    int j1 = k;
-                    int k1 = l;
-                    float f1 = effectAlpha;
-                    list.add(() -> {
-                        mc.getTextureManager()
-                                .bindTexture(textureatlassprite.getAtlasTexture()
-                                        .getTextureLocation());
-                        RenderSystem.color4f(1.0F, 1.0F, 1.0F, f1);
-                        gui.blit(matrixStack,
-                                j1 + 3,
-                                k1 + 3,
-                                gui.getBlitOffset(),
-                                18,
-                                18,
-                                textureatlassprite);
-                    });
-                    effectinstance.renderHUDEffect(gui,
-                            matrixStack,
-                            k,
-                            l,
-                            gui.getBlitOffset(),
-                            effectAlpha);
-                }
-            }
-
-            list.forEach(Runnable::run);
-        }
-    }
-
-    /**
-     * Renders the horse jump bar.
-     *
-     * @param mc - A Minecraft instance.
-     * @param gui - The GUI.
-     * @param matrixStack - The rendering transformation matrix stack.
-     * @param ticks
-     * @param renderTime - How much time before this element becomes fully
-     * transparent.
-     *
-     * @see IngameGui#renderHorseJumpBar(MatrixStack, int)
-     */
-    public static void renderHorseJumpBar(Minecraft mc,
-                                          IngameGui gui,
-                                          MatrixStack matrixStack,
-                                          float ticks, double renderTime)
-    {
-        ConfigManager.TimeValues jump = ConfigManager.getInstance().getJumpTime();
-        if (renderTime <= 0)
-        {
-            return;
-        }
-
-        float alpha = Main.getAlpha(renderTime, jump.getMaxTime(), jump.getFadeInTime(), jump.getFadeOutTime());
-        int scaledWidth = mc.getMainWindow().getScaledWidth();
-        int scaledHeight = mc.getMainWindow().getScaledHeight();
-        int xPosition = scaledWidth / 2 - 91;
-
-        mc.getProfiler().startSection("jumpBar");
-        RenderSystem.enableBlend();
-        RenderSystem.color4f(1.0F, 1.0F, 1.0F, alpha);
-        mc.getTextureManager().bindTexture(AbstractGui.GUI_ICONS_LOCATION);
-        float f = mc.player.getHorseJumpPower();
-        int i = 182;
-        int j = (int) (f * 183.0F);
-        int k = scaledHeight - TimerUtils.getJumpTranslation();
-        gui.blit(matrixStack, xPosition, k, 0, 84, 182, 5);
-        if (j > 0)
-        {
-            gui.blit(matrixStack, xPosition, k, 0, 89, j, 5);
-        }
-        RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
-
-        RenderSystem.disableBlend();
-        mc.getProfiler().endSection();
-    }
-
-    /**
-     * Renders the experience bar.
-     *
-     * @param mc - A Minecraft instance.
-     * @param gui - The GUI.
-     * @param matrixStack - The rendering transformation matrix stack.
-     * @param ticks
-     * @param renderTime - How much time before this element becomes fully
-     * transparent.
-     *
-     * @see IngameGui#func_238454_b_(MatrixStack, int)
-     */
-    public static void renderExperience(Minecraft mc,
-                                        IngameGui gui,
-                                        MatrixStack matrixStack,
-                                        float ticks, double renderTime)
-    {
-        ConfigManager.TimeValues experience = ConfigManager.getInstance().getHealthTime();
-        ConfigManager.TimeValues hotbar = ConfigManager.getInstance().getHotbarTime();
-        if (renderTime <= 0)
-        {
-            return;
-        }
-
-        float alpha = Main.getAlpha(renderTime, experience.getMaxTime(), experience.getFadeInTime(), experience.getFadeOutTime());
-        RenderSystem.color4f(1.0F, 1.0F, 1.0F, alpha);
-
-        if (mc.playerController.gameIsSurvivalOrAdventure())
-        {
-            int scaledWidth = mc.getMainWindow().getScaledWidth();
-            int scaledHeight = mc.getMainWindow().getScaledHeight();
-            int x = scaledWidth / 2 - 91;
-
-            mc.getProfiler().startSection("expBar");
-            RenderSystem.enableBlend();
-            mc.getTextureManager().bindTexture(AbstractGui.GUI_ICONS_LOCATION);
-            int i = mc.player.xpBarCap();
-            if (i > 0)
-            {
-                int j = 182;
-                int k = (int) (mc.player.experience * 183.0F);
-                int l = scaledHeight - TimerUtils.getExperienceTranslation();
-                gui.blit(matrixStack, x, l, 0, 64, 182, 5);
-                if (k > 0)
-                {
-                    gui.blit(matrixStack, x, l, 0, 69, k, 5);
-                }
-            }
-
-            RenderSystem.disableBlend();
-            mc.getProfiler().endSection();
-            if (mc.player.experienceLevel > 0)
-            {
-                mc.getProfiler().startSection("expLevel");
-                RenderSystem.enableBlend();
-                String s = "" + mc.player.experienceLevel;
-                int i1 = (scaledWidth - gui.getFontRenderer()
-                        .getStringWidth(s)) / 2;
-                int j1 = scaledHeight - (int) ((22F * Main.getAlpha(TimerUtils.hotbarTime, hotbar.getMaxTime(), hotbar.getFadeInTime(), hotbar.getFadeOutTime()) + 9F) * alpha) - (int) (4F * alpha);
-                gui.getFontRenderer()
-                        .drawString(matrixStack,
-                                s,
-                                (float) (i1 + 1),
-                                (float) j1,
-                                0);
-                gui.getFontRenderer()
-                        .drawString(matrixStack,
-                                s,
-                                (float) (i1 - 1),
-                                (float) j1,
-                                0);
-                gui.getFontRenderer()
-                        .drawString(matrixStack,
-                                s,
-                                (float) i1,
-                                (float) (j1 + 1),
-                                0);
-                gui.getFontRenderer()
-                        .drawString(matrixStack,
-                                s,
-                                (float) i1,
-                                (float) (j1 - 1),
-                                0);
-                gui.getFontRenderer()
-                        .drawString(matrixStack,
-                                s,
-                                (float) i1,
-                                (float) j1,
-                                8453920);
-                RenderSystem.disableBlend();
-                mc.getProfiler().endSection();
-            }
-        }
-        RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
-    }
-
-
-    /**
-     * Renders the hotbar and all the items in it.
-     *
-     * @param mc - A Minecraft instance.
-     * @param gui - The GUI.
-     * @param matrixStack - The rendering transformation matrix stack.
-     * @param partialTicks
-     * @param renderTime - How much time before this element becomes fully
-     * transparent.
-     *
-     * @see IngameGui#renderHotbar(float, MatrixStack)
-     */
-    public static void renderHotbar(Minecraft mc,
-                                    IngameGui gui,
-                                    MatrixStack matrixStack,
-                                    float partialTicks,
-                                    double renderTime)
-    {
-        ConfigManager.TimeValues hotbar = ConfigManager.getInstance().getHotbarTime();
-        final ResourceLocation WIDGETS_TEX_PATH =
-                new ResourceLocation("textures/gui/widgets.png");
-        PlayerEntity playerentity = mc.player;
-
-        if (renderTime <= 0)
-        {
-            return;
-        }
-
-        float alpha = Main.getAlpha(renderTime, hotbar.getMaxTime(), hotbar.getFadeInTime(), hotbar.getFadeOutTime());
-
-        int scaledWidth = mc.getMainWindow().getScaledWidth();
-        int scaledHeight = mc.getMainWindow().getScaledHeight();
-        if (playerentity != null)
-        {
-            RenderSystem.color4f(1.0F, 1.0F, 1.0F, alpha);
-            mc.getTextureManager().bindTexture(WIDGETS_TEX_PATH);
-            ItemStack itemstack = playerentity.getHeldItemOffhand();
-            HandSide handside = playerentity.getPrimaryHand().opposite();
-            int i = scaledWidth / 2;
-            int j = gui.getBlitOffset();
-            int k = 182;
-            int l = 91;
-            gui.setBlitOffset(-90);
-            gui.blit(matrixStack, i - 91, scaledHeight - TimerUtils.getHotbarTranslation(), 0, 0, 182, 22);
-            gui.blit(matrixStack,
-                    i - 91 - 1 + playerentity.inventory.currentItem * 20,
-                    scaledHeight - (int) (22F * alpha) - 1,
-                    0,
-                    22,
-                    24,
-                    22);
-            if (!itemstack.isEmpty())
-            {
-                if (handside == HandSide.LEFT)
-                {
-                    gui.blit(matrixStack,
-                            i - 91 - 29,
-                            scaledHeight - (int) (23F * alpha),
-                            24,
-                            22,
-                            29,
-                            24);
-                }
-                else
-                {
-                    gui.blit(matrixStack,
-                            i + 91,
-                            scaledHeight - (int) (23F * alpha),
-                            53,
-                            22,
-                            29,
-                            24);
-                }
-            }
-
-            gui.setBlitOffset(j);
-            RenderSystem.enableRescaleNormal();
-            RenderSystem.enableBlend();
-            RenderSystem.defaultBlendFunc();
-
-            for (int i1 = 0; i1 < 9; ++i1)
-            {
-                int j1 = i - 90 + i1 * 20 + 2;
-                int k1 = scaledHeight - (int) (16F * alpha) - 3;
-                renderHotbarItem(mc, alpha, j1,
-                        k1,
-                        partialTicks,
-                        playerentity,
-                        playerentity.inventory.mainInventory.get(i1));
-            }
-
-            if (!itemstack.isEmpty())
-            {
-                int i2 = scaledHeight - (int) (16F * alpha) - 3;
-                if (handside == HandSide.LEFT)
-                {
-                    renderHotbarItem(mc, alpha, i - 91 - 26,
-                            i2,
-                            partialTicks,
-                            playerentity,
-                            itemstack);
-                }
-                else
-                {
-                    renderHotbarItem(mc, alpha, i + 91 + 10,
-                            i2,
-                            partialTicks,
-                            playerentity,
-                            itemstack);
-                }
-            }
-
-            if (mc.gameSettings.attackIndicator == AttackIndicatorStatus.HOTBAR)
-            {
-                float f = mc.player.getCooledAttackStrength(0.0F);
-                if (f < 1.0F)
-                {
-                    int j2 = scaledHeight - 20;
-                    int k2 = i + 91 + 6;
-                    if (handside == HandSide.RIGHT)
-                    {
-                        k2 = i - 91 - 22;
-                    }
-
-                    mc.getTextureManager()
-                            .bindTexture(AbstractGui.GUI_ICONS_LOCATION);
-                    int l1 = (int) (f * 19.0F);
-                    RenderSystem.color4f(1.0F, 1.0F, 1.0F, alpha);
-                    gui.blit(matrixStack, k2, j2, 0, 94, 18, 18);
-                    gui.blit(matrixStack,
-                            k2,
-                            j2 + 18 - l1,
-                            18,
-                            112 - l1,
-                            18,
-                            l1);
-                }
-            }
-
-            RenderSystem.disableRescaleNormal();
-            RenderSystem.disableBlend();
-        }
-    }
-
-    /**
-     * Renders a single item on the HUD.
-     *
-     * @param mc - A Minecraft instance.
-     * @param x - The x position of the item on the screen.
-     * @param y - The y position of the item on the screen
-     * @param partialTicks
-     * @param player - The player that the item is from.
-     * @param stack - The item to render.
-     *
-     * @see IngameGui#renderHotbarItem(int, int, float, PlayerEntity, ItemStack)
-     */
-    static void renderHotbarItem(Minecraft mc, float alpha,
-                                 int x,
-                                 int y,
-                                 float partialTicks,
-                                 PlayerEntity player,
-                                 ItemStack stack)
-    {
-        if (!stack.isEmpty())
-        {
-            float f = (float) stack.getAnimationsToGo() - partialTicks;
-            RenderSystem.pushMatrix();
-            RenderSystem.color4f(1.0F, 1.0F, 1.0F, alpha);
-            if (f > 0.0F)
-            {
-                RenderSystem.pushMatrix();
-                float f1 = 1.0F + f / 5.0F;
-                RenderSystem.translatef((float) (x + 8),
-                        (float) (y + 12),
-                        0.0F);
-                RenderSystem.scalef(1.0F / f1, (f1 + 1.0F) / 2.0F, 1.0F);
-                RenderSystem.translatef((float) (-(x + 8)),
-                        (float) (-(y + 12)),
-                        0.0F);
-            }
-
-            renderItemAndEffectIntoGUI(mc, alpha, player, stack, x, y);
-            if (f > 0.0F)
-            {
-                RenderSystem.popMatrix();
-            }
-            RenderSystem.popMatrix();
-
-            mc.getItemRenderer()
-                    .renderItemOverlays(mc.fontRenderer, stack, x, y);
-        }
-    }
-
-    /**
-     * Renders a single item on the HUD.
-     *
-     * @param mc - A Minecraft instance.
-     * @param alpha - How transparent the item should be, on a scale from 0 to
-     * 1.
-     * @param ent - The player that the item is from.
-     * @param stack - The item to render.
-     * @param x - The x position of the item on the screen.
-     * @param y - The y position of the item on the screen
-     *
-     * @see net.minecraft.client.renderer.ItemRenderer#renderItemIntoGUI(LivingEntity,
-     * ItemStack, int, int)
-     */
-    static void renderItemAndEffectIntoGUI(Minecraft mc,
-                                           float alpha,
-                                           PlayerEntity ent,
-                                           ItemStack stack,
-                                           int x,
-                                           int y)
-    {
-        TextureManager textureManager = mc.textureManager;
-        IBakedModel bakedmodel = mc.getItemRenderer()
-                .getItemModelWithOverrides(stack,
-                        (World) null,
-                        (LivingEntity) null);
-        if (!stack.isEmpty())
-        {
-            try
-            {
-                RenderSystem.pushMatrix();
-                textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE);
-                textureManager.getTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE)
-                        .setBlurMipmapDirect(false, false);
-                RenderSystem.enableRescaleNormal();
-//                RenderSystem.enableAlphaTest();
-//                RenderSystem.defaultAlphaFunc();
-//                RenderSystem.enableBlend();
-//                RenderSystem.blendFunc(GlStateManager.SourceFactor
-//                .SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA);
-                RenderSystem.color4f(1.0F, 1.0F, 1.0F, alpha);
-                RenderSystem.translatef((float) x, (float) y, 100.0F + 50F);
-                RenderSystem.translatef(8.0F, 8.0F, 0.0F);
-                RenderSystem.scalef(1.0F, -1.0F, 1.0F);
-                RenderSystem.scalef(16.0F, 16.0F, 16.0F);
-                MatrixStack matrixstack = new MatrixStack();
-                IRenderTypeBuffer.Impl irendertypebuffer$impl =
-                        Minecraft.getInstance()
-                                .getRenderTypeBuffers()
-                                .getBufferSource();
-                boolean flag = !bakedmodel.isSideLit();
-                if (flag)
-                {
-                    RenderHelper.setupGuiFlatDiffuseLighting();
-                }
-
-                mc.getItemRenderer()
-                        .renderItem(stack,
-                                ItemCameraTransforms.TransformType.GUI,
-                                false,
-                                matrixstack,
-                                irendertypebuffer$impl,
-                                15728880,
-                                OverlayTexture.NO_OVERLAY,
-                                bakedmodel);
-                irendertypebuffer$impl.finish();
-                RenderSystem.enableDepthTest();
-                if (flag)
-                {
-                    RenderHelper.setupGui3DDiffuseLighting();
-                }
-
-//                RenderSystem.disableAlphaTest();
-                RenderSystem.disableRescaleNormal();
-                RenderSystem.popMatrix();
-            }
-            catch (Throwable throwable)
-            {
-                CrashReport crashreport = CrashReport.makeCrashReport(throwable,
-                        "Rendering item");
-                CrashReportCategory crashreportcategory =
-                        crashreport.makeCategory("Item being rendered");
-                crashreportcategory.addDetail("Item Type", () -> {
-                    return String.valueOf((Object) stack.getItem());
-                });
-                crashreportcategory.addDetail("Registry Name",
-                        () -> String.valueOf(stack.getItem()
-                                .getRegistryName()));
-                crashreportcategory.addDetail("Item Damage", () -> {
-                    return String.valueOf(stack.getDamage());
-                });
-                crashreportcategory.addDetail("Item NBT", () -> {
-                    return String.valueOf((Object) stack.getTag());
-                });
-                crashreportcategory.addDetail("Item Foil", () -> {
-                    return String.valueOf(stack.hasEffect());
-                });
-                throw new ReportedException(crashreport);
-            }
-        }
-    }
-}

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

@@ -0,0 +1,123 @@
+/**
+ * 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 net.minecraft.client.MinecraftClient;
+import net.minecraft.client.network.ClientPlayerEntity;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.util.Hand;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+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 TimerUtils}.
+ *
+ * @author Markil 3
+ * @version 0.1-1.16.4-fabric
+ */
+@Mixin(ClientPlayerEntity.class)
+public class ClientPlayerHook
+{
+    private static final Logger LOGGER =
+            LogManager.getLogger(ClientPlayerHook.class);
+
+    /**
+     * Updates hand timing every time an attack is initiated.
+     *
+     * @param hand - The attacking hand.
+     * @param callbackInfo
+     *
+     * @since 0.1-1.16.4-fabric
+     */
+    @Inject(method = "swingHand", at = @At(value = "TAIL"))
+    public void swingHand(Hand hand, CallbackInfo callbackInfo)
+    {
+        try
+        {
+            TimerUtils.onClick(hand, hand == null);
+        }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.network" +
+                            ".ClientPlayerEntity#swingHand " +
+                            "event",
+                    e);
+        }
+    }
+
+    /**
+     * Updates hand timing every time an item is used.
+     *
+     * @param hand - The using hand.
+     * @param callbackInfo
+     *
+     * @since 0.1-1.16.4-fabric
+     */
+    @Inject(method = "setCurrentHand", at = @At(value = "TAIL"))
+    public void setCurrentHand(Hand hand, CallbackInfo callbackInfo)
+    {
+        try
+        {
+            TimerUtils.onClick(hand, hand == null);
+        }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.network" +
+                            ".ClientPlayerEntity#setCurrentHand " +
+                            "event",
+                    e);
+        }
+    }
+
+    /**
+     * Updates hand timing every the hand is no longer being used.
+     *
+     * @param callbackInfo
+     *
+     * @since 0.1-1.16.4-fabric
+     */
+    @Inject(method = "clearActiveItem", at = @At(value = "HEAD"))
+    public void clearActiveItem(CallbackInfo callbackInfo)
+    {
+        try
+        {
+            if (MinecraftClient.getInstance().cameraEntity instanceof LivingEntity)
+            {
+                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

@@ -0,0 +1,97 @@
+/**
+ * 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 net.minecraft.client.network.AbstractClientPlayerEntity;
+import net.minecraft.client.render.VertexConsumerProvider;
+import net.minecraft.client.render.item.HeldItemRenderer;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.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.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 TimerUtils}.
+ *
+ * @author Markil 3
+ * @version 0.1-1.16.4-fabric
+ */
+@Mixin(HeldItemRenderer.class)
+public class HeldItemHook
+{
+    private static final Logger LOGGER =
+            LogManager.getLogger(HeldItemHook.class);
+
+    /**
+     * Determines whether or not to render a certain hand.
+     *
+     * @param player
+     * @param tickDelta
+     * @param pitch
+     * @param hand
+     * @param swingProgress
+     * @param item
+     * @param equipProgress
+     * @param matrices
+     * @param vertexConsumers
+     * @param light
+     * @param callbackInfo
+     *
+     * @since 0.1-1.16.4-fabric
+     */
+    @Inject(method = "renderFirstPersonItem", at = @At(value = "INVOKE",
+            target = "Lnet/minecraft/client/util/math/MatrixStack;push()V",
+            shift = At.Shift.AFTER), cancellable = true)
+    public void renderHand(AbstractClientPlayerEntity player,
+                           float tickDelta,
+                           float pitch,
+                           Hand hand,
+                           float swingProgress,
+                           ItemStack item,
+                           float equipProgress,
+                           MatrixStack matrices,
+                           VertexConsumerProvider vertexConsumers,
+                           int light,
+                           CallbackInfo callbackInfo)
+    {
+        try
+        {
+            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

@@ -0,0 +1,698 @@
+/**
+ * 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.client.MinecraftClient;
+import net.minecraft.client.gui.hud.InGameHud;
+import net.minecraft.client.network.ClientPlayerEntity;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.entity.effect.StatusEffectInstance;
+
+import org.apache.logging.log4j.LogManager;
+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.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 TimerUtils}.
+ *
+ * @author Markil 3
+ * @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"),
+            cancellable = true)
+    public void startCrosshair(MatrixStack stack, CallbackInfo callbackInfo)
+    {
+        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);
+        }
+    }
+
+    /**
+     * Resets any changes from drawing the crosshair.
+     *
+     * @param stack - The matrix drawing stack.
+     * @param callbackInfo
+     *
+     * @version 0.2-1.16.4-fabric
+     * @since 0.1-1.16.4-fabric
+     */
+    @Inject(method = "renderCrosshair", at = @At(value = "TAIL"))
+    public void finishCrosshair(MatrixStack stack, 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#renderCrosshair " +
+                            "event",
+                    e);
+        }
+    }
+
+    /**
+     * Determines whether or not to draw the horse jump bar.
+     *
+     * @param stack - The matrix drawing stack.
+     * @param callbackInfo
+     *
+     * @version 0.2-1.16.4-fabric
+     * @since 0.1-1.16.4-fabric
+     */
+    @Inject(method = "renderMountJumpBar", at = @At(value = "HEAD"),
+            cancellable = true)
+    public void startJumpbar(MatrixStack stack,
+                             int x,
+                             CallbackInfo callbackInfo)
+    {
+        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);
+        }
+    }
+
+    /**
+     * Resets any changes from drawing the horse jump bar.
+     *
+     * @param stack - The matrix drawing stack.
+     * @param callbackInfo
+     *
+     * @version 0.2-1.16.4-fabric
+     * @since 0.1-1.16.4-fabric
+     */
+    @Inject(method = "renderMountJumpBar", at = @At(value = "TAIL"))
+    public void finishJumpbar(MatrixStack stack,
+                              int x,
+                              CallbackInfo callbackInfo)
+    {
+        try
+        {
+            stack.pop();
+            /*
+             * Resets the color so that nothing else is bothered.
+             */
+            TimerUtils.resetAlpha();
+        }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.gui.hud" +
+                            ".InGameHud#renderMountJumpBar " +
+                            "event",
+                    e);
+        }
+    }
+
+    /**
+     * Determines whether or not to draw the experience bar.
+     *
+     * @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"),
+            cancellable = true)
+    public void startExperience(MatrixStack stack,
+                                int x,
+                                CallbackInfo callbackInfo)
+    {
+        try
+        {
+            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);
+        }
+    }
+
+    /**
+     * Resets any changes from drawing the experience bar.
+     *
+     * @param stack - The matrix drawing stack.
+     * @param callbackInfo
+     *
+     * @version 0.2-1.16.4-fabric
+     * @since 0.1-1.16.4-fabric
+     */
+    @Inject(method = "renderExperienceBar", at = @At(value = "TAIL"))
+    public void finishExperience(MatrixStack stack,
+                                 int x,
+                                 CallbackInfo callbackInfo)
+    {
+        try
+        {
+            stack.pop();
+            /*
+             * 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;
+    }
+
+    /**
+     * Determines whether or not to draw the mount's health.
+     *
+     * @param stack - The matrix drawing stack.
+     * @param callbackInfo
+     *
+     * @version 0.2-1.16.4-fabric
+     * @since 0.1-1.16.4-fabric
+     */
+    @Inject(method = "renderMountHealth", at = @At(value = "HEAD"),
+            cancellable = true)
+    public void startMountHealth(MatrixStack stack, CallbackInfo callbackInfo)
+    {
+        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);
+        }
+    }
+
+    /**
+     * Resets any changes from drawing the mount's health.
+     *
+     * @param stack - The matrix drawing stack.
+     * @param callbackInfo
+     *
+     * @version 0.2-1.16.4-fabric
+     * @since 0.1-1.16.4-fabric
+     */
+    @Inject(method = "renderMountHealth", at = @At(value = "TAIL"))
+    public void finishMountHealth(MatrixStack stack, CallbackInfo callbackInfo)
+    {
+        try
+        {
+            /*
+             * 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);
+        }
+    }
+
+    /**
+     * Determines whether or not to draw the hotbar.
+     *
+     * @param tickDelta
+     * @param matrices - The matrix drawing stack.
+     * @param callbackInfo
+     *
+     * @version 0.2-1.16.4-fabric
+     * @since 0.1-1.16.4-fabric
+     */
+    @Inject(method = "renderHotbar", at = @At(value = "HEAD"), cancellable =
+            true)
+    public void startHotbar(float tickDelta,
+                            MatrixStack matrices,
+                            CallbackInfo callbackInfo)
+    {
+        try
+        {
+            if (TimerUtils.updateHotbar(tickDelta))
+            {
+                callbackInfo.cancel();
+            }
+        }
+        catch (Exception e)
+        {
+            LOGGER.error(
+                    "Error in running net.minecraft.client.gui.hud" +
+                            ".InGameHud#renderHotbar " +
+                            "event",
+                    e);
+        }
+    }
+
+    /**
+     * Makes the actual adjustment to the hotbar as needed.
+     *
+     * @param tickDelta
+     * @param matrices - The matrix drawing stack.
+     * @param callbackInfo
+     *
+     * @version 0.2-1.16.4-fabric
+     * @since 0.1-1.16.4-fabric
+     */
+    @Inject(method = "renderHotbar", at = @At(value = "INVOKE", target =
+            "Lcom/mojang/blaze3d/systems/RenderSystem;setShaderColor(FFFF)V", shift
+            = At.Shift.AFTER))
+    public void adjustHotbar(float tickDelta,
+                             MatrixStack matrices,
+                             CallbackInfo callbackInfo)
+    {
+        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 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 stack,
+                             CallbackInfo callbackInfo)
+    {
+        try
+        {
+            stack.pop();
+            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/resources/META-INF/mods.toml

@@ -1,84 +0,0 @@
-# This is an example mods.toml file. It contains the data relating to the loading mods.
-# There are several mandatory fields (#mandatory), and many more that are optional (#optional).
-# The overall format is standard TOML format, v0.5.0.
-# Note that there are a couple of TOML lists in this file.
-# Find more information on toml format here:  https://github.com/toml-lang/toml
-# The name of the mod loader type to load - for regular FML @Mod mods it should be javafml
-modLoader="javafml" #mandatory
-# A version range to match for said mod loader - for regular FML @Mod it will be the forge version
-loaderVersion="[35,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
-# The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties.
-# Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here.
-license="GPL-3.0-only"
-# A URL to refer people to when problems occur with this mod
-issueTrackerURL="https://github.com/Markil3/MinecraftImmersiveHUD/issues" #optional
-# A list of mods - how many allowed here is determined by the individual mod loader
-[[mods]] #mandatory
-# The modid of the mod
-modId="immersive_hud" #mandatory
-# The version number of the mod - there's a few well known ${} variables useable here or just hardcode it
-# ${file.jarVersion} will substitute the value of the Implementation-Version as read from the mod's JAR file metadata
-# see the associated build.gradle script for how to populate this completely automatically during a build
-version="${file.jarVersion}" #mandatory
- # A display name for the mod
-displayName="Immersive HUD" #mandatory
-# A URL to query for updates for this mod. See the JSON update specification https://mcforge.readthedocs.io/en/latest/gettingstarted/autoupdate/
-updateJSONURL="https://raw.githubusercontent.com/Markil3/MinecraftImmersiveHUD/master/update-forge.json" #optional
-# A URL for the "homepage" for this mod, displayed in the mod UI
-displayURL="https://www.planetminecraft.com/mod/immersive-hud/" #optional
-# A file name (in the root of the mod JAR) containing a logo for display
-logoFile="immersive_hud_logo.png" #optional
-# A text field displayed in the mod UI
-credits="Minecraft Rendering Code (c) 2009-2021 Mojang Studios" #optional
-# A text field displayed in the mod UI
-authors="Markil 3"
-# The description text for the mod (multi line!) (#mandatory)
-description='''
-This Minecraft mod aims to move the ingame HUD out of the way whenever possible. Whenever an element updates
-(i.e., health changes, you swap items, you look at something, etc.), the respective item will show
-up. However, once you've been able to see the information, it will fade away and allow you to enjoy
-your game without the clutter of unneeded HUD elements.
-The following elements will only show up under certain conditions:
-
- * The health and armor bars will only show up when your health changes (i.e. after taking damage), when your health is low or when holding food.
- * The hunger bar will only show up when your hunger level (not your saturation) changes, you are hungry, or when holding food.
- * The experience bar and level will only show upon gaining experience.
- * The health of your mount (i.e. your horse) will only show when its health changes.
- * The horse jump bar will only show when you are getting ready to jump.
- * The hotbar will only show when an item you are holding changes or you change which slot is selected.
- * The crosshair will only show when you are looking at something or you are using a bow, crossbow, shield, or trident or holding a throwable item.
- * The hands will show only when you use an item or are holding/using one of the above specified items, or a map.
- * Potion icons will only show up when first applied or about to run out.
-'''
-# A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional.
-[[dependencies.immersive_hud]]
-    # the modid of the dependency
-    modId="forge" #mandatory
-    # Does this dependency have to exist - if not, ordering below must be specified
-    mandatory=true #mandatory
-    # The version range of the dependency
-    versionRange="[35,)" #mandatory
-    # An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory
-    ordering="NONE"
-    # Side this dependency is applied on - BOTH, CLIENT or SERVER
-    side="CLIENT"
-
-[[dependencies.immersive_hud]]
-    # the modid of the dependency
-    modId="cloth-config" #mandatory
-    # Does this dependency have to exist - if not, ordering below must be specified
-    mandatory=false #mandatory
-    # The version range of the dependency
-    versionRange="[4.11,)" #mandatory
-    # An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory
-    ordering="BEFORE"
-    # Side this dependency is applied on - BOTH, CLIENT or SERVER
-    side="CLIENT"
-# Here's another dependency
-[[dependencies.immersive_hud]]
-    modId="minecraft"
-    mandatory=true
-# This version range declares a minimum of the current minecraft version up to but not including the next major version
-    versionRange="[1.16.4,1.17)"
-    ordering="NONE"
-    side="CLIENT"

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

@@ -15,6 +15,9 @@
   "option.immersive_hud.hungerMaxTime": "Hunger Bar Display Time",
   "option.immersive_hud.hungerFadeIn": "Hunger Bar Fade In Time",
   "option.immersive_hud.hungerFadeOut": "Hunger Bar Fade Out Time",
+  "option.immersive_hud.airMaxTime": "Oxygen Bar Display Time",
+  "option.immersive_hud.airFadeIn": "Oxygen Bar Fade In Time",
+  "option.immersive_hud.airFadeOut": "Oxygen Bar Fade Out Time",
   "option.immersive_hud.effectMaxTime": "Potion Display Time",
   "option.immersive_hud.effectFadeIn": "Potion Fade In Time",
   "option.immersive_hud.effectFadeOut": "Potion Fade Out Time",
@@ -24,7 +27,10 @@
   "option.immersive_hud.hideHands": "Hide Hands",
   "option.immersive_hud.minHealth": "Minimum Health Fade",
   "option.immersive_hud.minHunger": "Minimum Hunger Fade",
+  "option.immersive_hud.minAir": "Minimum Oxygen Fade",
   "option.immersive_hud.showArmor": "Show Armor",
+  "option.immersive_hud.ignoreList": "Ignored Items",
+  "option.immersive_hud.enchantingList": "Experience Blocks",
   "tooltip.immersive_hud.hotbarMaxTime": "How long the hotbar can be displayed on screen in seconds",
   "tooltip.immersive_hud.hotbarFadeIn": "How many seconds it takes for the hotbar to fade in",
   "tooltip.immersive_hud.hotbarFadeOut": "How many seconds it takes for the hotbar to move out",
@@ -40,6 +46,9 @@
   "tooltip.immersive_hud.hungerMaxTime": "How long the hunger bar can be displayed on screen in seconds",
   "tooltip.immersive_hud.hungerFadeIn": "How many seconds it takes for the hunger bar to fade in",
   "tooltip.immersive_hud.hungerFadeOut": "How many seconds it takes for the hunger bar to fade out",
+  "tooltip.immersive_hud.airMaxTime": "How long the hunger bar can be oxygen on screen in seconds",
+  "tooltip.immersive_hud.airFadeIn": "How many seconds it takes for the oxygen bar to fade in",
+  "tooltip.immersive_hud.airFadeOut": "How many seconds it takes for the oxygen bar to fade out",
   "tooltip.immersive_hud.effectMaxTime": "How long potion icons can be displayed on screen in seconds",
   "tooltip.immersive_hud.effectFadeIn": "How many seconds it takes for potion icons to fade in",
   "tooltip.immersive_hud.effectFadeOut": "How many seconds it takes for potion icons to fade out",
@@ -49,5 +58,10 @@
   "tooltip.immersive_hud.hideHands": "Whether or not hands should be hidden after a period of time",
   "tooltip.immersive_hud.minHealth": "When the percentage of health goes below this level, the health bar won't fade away",
   "tooltip.immersive_hud.minHunger": "When the hunger level goes below this level, the hunger bar won't fade away",
-  "tooltip.immersive_hud.showArmor": "Whether or not the armor bar should display on the HUD"
+  "tooltip.immersive_hud.minAir": "When the oxygen level goes below this level, the oxygen bar won't fade away",
+  "tooltip.immersive_hud.showArmor": "Whether or not the armor bar should display on the HUD",
+  "tooltip.immersive_hud.ignoreList": "Which items will not trigger the arm and crosshairs when used",
+  "tooltip.immersive_hud.enchantingList": "Which blocks will show the experience bar when looked at.",
+  "error.immersive_hud.ignoreList.unknownItem": "Unknown item %s",
+  "error.immersive_hud.ignoreList.illegalId": "%s is not a legal item identifier"
 }

src/main/resources/fabric.mod.json

@@ -0,0 +1,45 @@
+{
+  "schemaVersion": 1,
+  "id": "immersive_hud",
+  "version": "${version}",
+
+  "name": "Immersive HUD",
+  "description": "This mod aims to move the ingame HUD out of the way whenever possible. Whenever an element updates (i.e., health changes, you swap items, you look at something, etc.), the respective item will show up. However, once you've been able to see the information, it will fade away and allow you to enjoy your game without the clutter of unneeded HUD elements.\n\nNote that the following elements are unaffected:\n* The F3 Menu. Honestly, anyone who uses this isn't in the need for immersion at the moment.\n* The chat. This will automatically fade away by itself.\n* The oxygen bar. This will disappear as soon as it is filled, anyway.\n* Boss health. It is helpful to have this available in a hectic situation.\n* Sub-maximum health or hunger. In hectic battles, it can be convenient to see health at a glance.",
+  "authors": [
+    "Markil 3"
+  ],
+  "contact": {
+    "homepage": "https://www.planetminecraft.com/mod/immersive-hud/",
+    "sources": "https://github.com/Markil3/MinecraftImmersiveHUD",
+    "issues": "https://github.com/Markil3/MinecraftImmersiveHUD/issues"
+  },
+
+  "license": "GPL-3.0-only",
+  "icon": "assets/immersive_hud/icon.png",
+
+  "environment": "client",
+  "entrypoints": {
+    "main": [
+      "markil3.immersive_hud.Main"
+    ],
+    "modmenu": [
+      "markil3.immersive_hud.ModMenu"
+    ]
+  },
+  "mixins": [
+    {
+      "config": "immersive_hud.mixins.json",
+      "environment": "client"
+    }
+  ],
+
+  "depends": {
+    "fabricloader": ">=0.12.12",
+    "minecraft": "1.18.x",
+    "java": ">=17"
+  },
+  "suggests": {
+    "modmenu": "*",
+    "cloth-config2": "*"
+  }
+}

src/main/resources/immersive_hud.mixins.json

@@ -0,0 +1,16 @@
+{
+  "required": true,
+  "minVersion": "0.8",
+  "package": "markil3.immersive_hud.mixin",
+  "compatibilityLevel": "JAVA_16",
+  "mixins": [
+  ],
+  "client": [
+    "ClientPlayerHook",
+    "HeldItemHook",
+    "HudHook"
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  }
+}

src/main/resources/pack.mcmeta

@@ -1,7 +0,0 @@
-{
-    "pack": {
-        "description": "immersive_hud resources",
-        "pack_format": 6,
-        "_comment": "A pack_format of 6 requires json lang files and some texture changes from 1.16.2. Note: we require v6 pack meta for all mods."
-    }
-}