Adds some versioning information.

.gitattributes

@@ -0,0 +1,5 @@
+# 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

@@ -1,41 +0,0 @@
-# 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.16,  # Minimum supported by Minecraft
-          16,   # Current Java LTS
-          16    # 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,36 +1,26 @@
-# gradle
-
-.gradle/
-build/
-out/
-classes/
-
 # eclipse
-
+bin
 *.launch
-
+.settings
-# idea
+.metadata
-
-.idea/
-*.iml
-*.ipr
-*.iws
-
-# vscode
-
-.settings/
-.vscode/
-bin/
 .classpath
 .project
 
-# macos
+# idea
+out
+*.ipr
+*.iws
+*.iml
+.idea
 
-*.DS_Store
+# gradle
+build
+.gradle
 
-# fabric
+# other
+eclipse
+run
 
-run/
+# Files from Forge MDK
-/logs/
+forge*changelog.txt
-local.properties
+/local.properties
-remappedSrc/

build.gradle

@@ -1,84 +1,160 @@
-plugins {
+buildscript {
-	id 'fabric-loom' version '0.8-SNAPSHOT'
+    repositories {
-	id 'maven-publish'
+        maven { url = 'https://files.minecraftforge.net/maven' }
+        jcenter()
+        mavenCentral()
     }
-
+    dependencies {
-sourceCompatibility = JavaVersion.VERSION_16
+        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true
-targetCompatibility = JavaVersion.VERSION_16
+    }
+}
+apply plugin: 'net.minecraftforge.gradle'
+// Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
+apply plugin: 'eclipse'
+apply plugin: 'maven-publish'
 
 archivesBaseName = project.archives_base_name
-version = project.mod_version + "-" + project.minecraft_version + "-fabric"
+version = project.mod_version + "-" + project.minecraft_version + "-forge"
-group = project.maven_group
+group = project.maven_group // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 
-repositories {
+sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
-	maven { url "https://maven.shedaniel.me/" }
+
-	maven { url "https://maven.terraformersmc.com/" }
+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 {
-	// To change the versions see the gradle.properties file
+    // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed
-	minecraft "com.mojang:minecraft:${project.minecraft_version}"
+    // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied.
-	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
+    // The userdev artifact is a special name and will get all sorts of transformations applied to it.
-	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+    minecraft "net.minecraftforge:forge:${project.minecraft_version}-${project.forge_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
 
-	// PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
-	// You may need to force-disable transitiveness on them.
 }
 
-processResources {
+task sourcesJar(type: Jar, dependsOn: classes) {
-	inputs.property "version", project.version
+    classifier = 'sources'
-
+    from sourceSets.main.allSource
-	filesMatching("fabric.mod.json") {
-		expand "version": project.version
-	}
 }
 
-tasks.withType(JavaCompile).configureEach {
+artifacts {
-	// ensure that the encoding is set to UTF-8, no matter what the system default is
+    archives sourcesJar
-	// 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.17 (21w19a) upwards uses Java 16.
-	it.options.release = 16
-}
-
-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 {
-	from("LICENSE") {
+    manifest {
-		rename { "${it}_${project.archivesBaseName}"}
+        attributes([
+            "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")
+        ])
     }
 }
 
-// configure the maven publication
+// Example configuration to allow publishing using the maven-publish task
+// 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) {
-			// add all the jars that should be included when publishing to maven
+            artifact jar
-			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 {
-        // Add repositories to publish to here.
+        maven {
-        // Notice: This block does NOT have the same function as the block in the top level.
+            url "file:///${project.projectDir}/mcmodsrepo"
-        // The repositories here will be used for publishing your artifact, not for
+        }
-        // retrieving dependencies.
     }
 }

gradle.properties

@@ -1,16 +1,14 @@
-# Done to increase the memory available to gradle.
+# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
-org.gradle.jvmargs=-Xmx1G
+# This is required to provide enough memory for the Minecraft decompilation process.
+org.gradle.jvmargs=-Xmx3G
+org.gradle.daemon=false
 
-# Fabric Properties
+# Forge Properties
-	# check these on https://fabricmc.net/use
+minecraft_version=1.16.4
-	minecraft_version=1.17
+mappings=20201028-1.16.3
-	yarn_mappings=1.17+build.1
+forge_version=35.1.37
-	loader_version=0.11.3
-
-cloth_version=5.0.34
-modmenu_version=2.0.2
 
 # Mod Properties
-	mod_version = 1.2
+mod_version = 0.1
 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.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip

gradlew

@@ -1,21 +1,5 @@
 #!/usr/bin/env sh
 
-#
-# Copyright 2015 the original author or 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
@@ -44,7 +28,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+DEFAULT_JVM_OPTS=""
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -82,7 +66,6 @@ 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
@@ -126,11 +109,10 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin or MSYS, switch paths to Windows format before running java
+# For Cygwin, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+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
@@ -156,19 +138,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=`expr $i + 1`
+        i=$((i+1))
     done
     case $i in
-        0) set -- ;;
+        (0) set -- ;;
-        1) set -- "$args0" ;;
+        (1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
+        (2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -177,9 +159,14 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=`save "$@"`
+APP_ARGS=$(save "$@")
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -1,19 +1,3 @@
-@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
@@ -29,18 +13,15 @@ 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="-Xmx64m" "-Xms64m"
+set DEFAULT_JVM_OPTS=
 
 @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 execute
+if "%ERRORLEVEL%" == "0" goto init
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +35,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto execute
+if exist "%JAVA_EXE%" goto init
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,14 +45,28 @@ 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 %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 
 :end
 @rem End local scope for the variables with windows NT shell

settings.gradle

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

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

@@ -1,377 +0,0 @@
-package markil3.immersive_hud;
-
-import static markil3.immersive_hud.Main.TICKS_PER_SECOND;
-
-import net.minecraft.item.Item;
-import net.minecraft.item.Items;
-import net.minecraft.util.Identifier;
-import net.minecraft.util.math.MathHelper;
-import net.minecraft.util.registry.Registry;
-
-import java.util.Arrays;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import me.shedaniel.autoconfig.AutoConfig;
-
-/**
- * Configuration manager of this mod, which reads from and writes to this mod's
- * configuration file.
- * <p>
- * The methods that change this mod's configuration do not automatically write
- * those changes to the configuration file on disk. Instead, they only update
- * the configuration in memory.
- *
- * @author Markil 3
- */
-public class ConfigManager
-{
-    public static class TimeValues
-    {
-        private static final int SHOW_TIME = 6 * TICKS_PER_SECOND;
-        private static final int FADE_IN = TICKS_PER_SECOND / 2;
-        private static final int FADE_OUT = TICKS_PER_SECOND;
-
-        private int maxTime = SHOW_TIME;
-        private int fadeIn = FADE_IN;
-        private int fadeOut = FADE_OUT;
-
-        /**
-         * Obtains the maximum time that the hotbar can be on the screen,
-         * including fading.
-         *
-         * @return The maximum hotbar display time.
-         */
-        public int getMaxTime()
-        {
-            return this.maxTime;
-        }
-
-        /**
-         * Obtains the time that the hotbar takes to fade in.
-         *
-         * @return The hotbar fade in time.
-         */
-        public int getFadeInTime()
-        {
-            return this.fadeIn;
-        }
-
-        /**
-         * Obtains the time that the hotbar takes to fade out.
-         *
-         * @return The hotbar fade out time.
-         */
-        public int getFadeOutTime()
-        {
-            return this.fadeOut;
-        }
-
-        public void setMaxTime(int time)
-        {
-            this.maxTime = time;
-        }
-
-        public void setFadeInTime(int time)
-        {
-            this.fadeIn = time;
-        }
-
-        public void setFadeOutTime(int time)
-        {
-            this.fadeOut = time;
-        }
-    }
-
-    private TimeValues hotbarTime = new TimeValues();
-    private TimeValues experienceTime = new TimeValues();
-    private TimeValues jumpTime = new TimeValues();
-    private TimeValues healthTime = new TimeValues();
-    private TimeValues hungerTime = new TimeValues();
-    private TimeValues effectTime = new TimeValues();
-    private int crosshairTime = 6 * TICKS_PER_SECOND;
-    private boolean hideCrosshair = true;
-    private int handTime = 30 * TICKS_PER_SECOND;
-    private boolean hideHands = true;
-    private boolean showArmor = true;
-    private double minHealth = 0.5;
-    private int minHunger = 17;
-    private Identifier[] ignoredItems = new Identifier[]{Registry.ITEM.getId(Items.FIREWORK_ROCKET)};
-
-    /**
-     * Returns the instance of this class.
-     *
-     * @return the instance of this class
-     */
-    public static ConfigManager getInstance()
-    {
-        try
-        {
-            if (Class.forName("me.shedaniel.autoconfig.AutoConfig") != null)
-            {
-                return AutoConfig.getConfigHolder(ConfigManagerCloth.class)
-                        .getConfig();
-            }
-            else
-            {
-                throw new ClassNotFoundException();
-            }
-        }
-        catch (ClassNotFoundException e)
-        {
-            return new ConfigManager();
-        }
-    }
-
-    // Validations
-
-    /**
-     * Obtains time values related to the hotbar.
-     *
-     * @return The hotbar display time values.
-     */
-    public TimeValues getHotbarTime()
-    {
-        return this.hotbarTime;
-    }
-
-    /**
-     * Obtains time values related to the experience bar.
-     *
-     * @return The experience bar display time values.
-     */
-    public TimeValues getExperienceTime()
-    {
-        return this.experienceTime;
-    }
-
-    /**
-     * Obtains time values related to the jump bar.
-     *
-     * @return The jump display time values.
-     */
-    public TimeValues getJumpTime()
-    {
-        return this.jumpTime;
-    }
-
-    /**
-     * Obtains time values related to the health bar.
-     *
-     * @return The health display time values.
-     */
-    public TimeValues getHealthTime()
-    {
-        return this.healthTime;
-    }
-
-    /**
-     * Obtains time values related to the hunger bar.
-     *
-     * @return The hunger display time values.
-     */
-    public TimeValues getHungerTime()
-    {
-        return this.hungerTime;
-    }
-
-    /**
-     * Obtains time values related to potion effects.
-     *
-     * @return Potion display time values.
-     */
-    public TimeValues getPotionTime()
-    {
-        return this.effectTime;
-    }
-
-    /**
-     * Obtains the time that the crosshairs are allowed to display.
-     *
-     * @return The crosshair display time values.
-     */
-    public int getCrosshairTime()
-    {
-        return this.crosshairTime;
-    }
-    /**
-     * Checks whether the crosshairs should be hidden after a period of time.
-     *
-     * @return - Whether or not crosshairs will be hidden.
-     */
-    public boolean hideCrosshair()
-    {
-        return this.hideCrosshair;
-    }
-
-    /**
-     * Obtains the time that the hands are allowed to display.
-     *
-     * @return The hand display time values.
-     */
-    public int getHandTime()
-    {
-        return this.handTime;
-    }
-
-    /**
-     * Checks whether hands should be hidden after a period of time.
-     *
-     * @return - Whether or not hands will be hidden.
-     */
-    public boolean hideHands()
-    {
-        return this.hideHands;
-    }
-
-    /**
-     * Checks whether the armor bar should render.
-     *
-     * @return Whether or not armor shows on the HUD.
-     */
-    public boolean shouldShowArmor()
-    {
-        return this.showArmor;
-    }
-
-    /**
-     * Obtains the minimum health for fading. Anything below that and the health
-     * always displays.
-     *
-     * @return The health boundary, from 0 to 1.
-     */
-    public double getMinHealth()
-    {
-        return this.minHealth;
-    }
-
-    /**
-     * Obtains the minimum hunger for fading. Anything below that and the hunger
-     * always displays.
-     *
-     * @return The hunger boundary, from 0 to 20.
-     */
-    public int getMinHunger()
-    {
-        return this.minHunger;
-    }
-
-    /**
-     * Obtains a collection of items that won't cause hands and crosshairs to show when used.
-     *
-     * @return A set of ignored items.
-     */
-    public Set<Item> getIgnoredItems()
-    {
-        return Arrays.stream(ignoredItems).map(Registry.ITEM::get).collect(Collectors.toSet());
-    }
-
-    /**
-     * Obtains a collection of items that won't cause hands and crosshairs to show when used.
-     *
-     * @return An array of identifiers.
-     */
-    public Identifier[] getIgnoredIdentifiers()
-    {
-        return this.ignoredItems;
-    }
-
-    /**
-     * Sets the time that the hands are allowed to display.
-     *
-     * @param time - The hand display time values.
-     */
-    public void setCrosshairTime(int time)
-    {
-        this.crosshairTime = time;
-    }
-
-    /**
-     * Sets whether the crosshairs should be hidden after a period of time.
-     *
-     * @param hide - Whether or not crosshairs will be hidden.
-     */
-    public void hideCrosshair(boolean hide)
-    {
-        this.hideCrosshair = hide;
-    }
-
-    /**
-     * Sets the time that the hands are allowed to display.
-     *
-     * @param time - The hand display time values.
-     */
-    public void setHandTime(int time)
-    {
-        this.handTime = time;
-    }
-
-    /**
-     * Sets whether hands should be hidden after a period of time.
-     *
-     * @param hide - Whether or not hands will be hidden.
-     */
-    public void hideHands(boolean hide)
-    {
-        this.hideHands = hide;
-    }
-
-    /**
-     * Determines whether the armor bar should render.
-     *
-     * @param show - Whether or not armor shows on the HUD.
-     */
-    public void shouldShowArmor(boolean show)
-    {
-        this.showArmor = show;
-    }
-
-    /**
-     * Sets the minimum health for fading. Anything below that and the health
-     * always displays.
-     *
-     * @param boundary - The health boundary, from 0 to 1.
-     */
-    public void setMinHealth(double boundary)
-    {
-        this.minHealth = MathHelper.clamp(boundary, 0, 1);
-    }
-
-    /**
-     * Sets the minimum hunger for fading. Anything below that and the hunger
-     * always displays.
-     *
-     * @param boundary - The hunger boundary, from 0 to 20.
-     */
-    public void setMinHunger(int boundary)
-    {
-        this.minHunger = MathHelper.clamp(boundary, 0, 20);
-    }
-
-    /**
-     * Sets which items won't cause the hands and crosshairs to show when used.
-     *
-     * @param items - A set of ignored items.
-     */
-    public void setIgnoredItems(Item... items)
-    {
-        this.ignoredItems = Arrays.stream(items).map(Registry.ITEM::getId).toArray(Identifier[]::new);
-    }
-
-    /**
-     * Sets which items won't cause the hands and crosshairs to show when used.
-     *
-     * @param items - A set of ignored items.
-     */
-    public void setIgnoredItems(String... items)
-    {
-        this.ignoredItems = Arrays.stream(items).map(Identifier::new).filter(i -> Registry.ITEM.getOrEmpty(i).isPresent()).toArray(Identifier[]::new);
-    }
-/**
-     * Saves changes to this mod's configuration.
-     */
-//    public void save()
-//    {
-//        SPEC.save();
-//    }
-}

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

@@ -1,14 +0,0 @@
-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

@@ -0,0 +1,775 @@
+/**
+ * Copyright (C) 2021 Markil 3
+ * <p>
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.
+ * <p>
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ * <p>
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package markil3.immersive_hud;
+
+import com.mojang.blaze3d.systems.RenderSystem;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.item.BowItem;
+import net.minecraft.item.CrossbowItem;
+import net.minecraft.item.EggItem;
+import net.minecraft.item.EnderPearlItem;
+import net.minecraft.item.FilledMapItem;
+import net.minecraft.item.FishingRodItem;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.ShieldItem;
+import net.minecraft.item.ShootableItem;
+import net.minecraft.item.SnowballItem;
+import net.minecraft.item.ThrowablePotionItem;
+import net.minecraft.item.TridentItem;
+import net.minecraft.potion.Effects;
+import net.minecraft.util.Hand;
+import net.minecraft.util.math.RayTraceResult;
+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;
+
+/**
+ * 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();
+
+    /**
+     * The number of ticks that the hand will be onscreen. Every tick is 1/20th
+     * of a second.
+     */
+    static final int HAND_TIME = 10 * 20;
+    /**
+     * The number of ticks most elements will be onscreen. Every tick is 1/20th
+     * of a second.
+     */
+    static final int VISUAL_TIME = 6 * 20;
+    /**
+     * The number of ticks that the health and hunger bars will be onscreen.
+     * Every tick is 1/20th of a second.
+     */
+    static final int HEALTH_TIME = (int) ((float) VISUAL_TIME * 2.5);
+
+    /**
+     * How many more ticks the hand will be onscreen. Every tick is 1/20th of a
+     * second.
+     */
+    private static int mainHandTime, offHandTime;
+
+    /**
+     * How many more ticks the crosshair will be onscreen. Every tick is 1/20th
+     * of a second.
+     */
+    private static int crosshairTime;
+    /**
+     * If true, then the hand (and crosshairs) will be locked onto the screen
+     * without disappearing until this flag is updated.
+     */
+    private static boolean mainHandLock, offHandLock;
+    /**
+     * A bitmask that will lock the corresponding hand without necessarily
+     * showing the crosshairs. The first bit will be the main hand, and the
+     * second will be the offhand.
+     */
+    private static int mapLock;
+
+    /**
+     * How many more ticks the hotbar will be onscreen. Every tick is 1/20th of
+     * a second.
+     */
+    private static int hotbarTime;
+    /**
+     * The last hotbar slot that was selected. This is used to check for a
+     * change in the hotbar slot.
+     */
+    private static int selectedHotbarSlot = -1;
+    /**
+     * The last item that was in this hand. This is used to check for a change
+     * in what was equipped.
+     */
+    private static Item mainHandItem = null, offHandItem = null;
+
+    /**
+     * How many more ticks the health bar will be onscreen. Every tick is 1/20th
+     * of a second.
+     */
+    private static int healthTime;
+    /**
+     * Records what the health was previously. Used to check for a change in the
+     * health.
+     * <p>
+     * Note that the display of the armor is linked to this.
+     */
+    private static float health = -1;
+    /**
+     * Records what the maximum health was previously. Used to check for a
+     * change in the health.
+     */
+    private static float maxHealth = -1;
+
+    /**
+     * How many more ticks the hunger bar will be onscreen. Every tick is 1/20th
+     * of a second.
+     */
+    private static int hungerTime;
+    /**
+     * Records what the hunger level was previously. Used to check for a change
+     * in hunger.
+     */
+    private static int hunger = -1;
+    /**
+     * Records whether or not there was food poisoning. Used to check for a
+     * change in hunger.
+     */
+    private static boolean isFoodPoisoned = false;
+
+    /**
+     * How many more ticks the mount's health bar will be onscreen. Every tick
+     * is 1/20th of a second.
+     */
+    private static int mountTime;
+    /**
+     * Records what the health of the mount was previously. Used to check for a
+     * change in the health.
+     */
+    private static float mountHealth = -1;
+    /**
+     * Records what the maximum health of the mount was previously. Used to
+     * check for a change in the health.
+     */
+    private static float mountMaxHealth = -1;
+
+    /**
+     * How many more ticks the mount's jump bar will be onscreen. Every tick is
+     * 1/20th of a second.
+     */
+    private static int jumpTime;
+
+    /**
+     * How many more ticks the experience bar will be onscreen. Every tick is
+     * 1/20th of a second.
+     */
+    private static int experienceTime;
+    /**
+     * Records what the experience was previously. Used to check for a change in
+     * the health.
+     */
+    private static float experienceProgress = -1;
+
+    /**
+     * Run whenever the player clicks a mouse button. This brings the hands into
+     * view, and briefly brings the health and hunger into view if the held item
+     * is food.
+     *
+     * @param event - event data
+     */
+    @SubscribeEvent
+    public static void onClick(final PlayerInteractEvent event)
+    {
+        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);
+                        crosshairTime = VISUAL_TIME;
+                        if (event.getHand() == Hand.MAIN_HAND)
+                        {
+                            mainHandTime = HAND_TIME;
+                        }
+                        else
+                        {
+                            offHandTime = HAND_TIME;
+                        }
+                        if (item != null)
+                        {
+                            if (item.isFood())
+                            {
+                                healthTime = HEALTH_TIME;
+                                hungerTime = HEALTH_TIME;
+                            }
+                        }
+                    }
+                });
+    }
+
+    /**
+     * 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)
+    {
+        DistExecutor.safeRunWhenOn(Dist.CLIENT,
+                (DistExecutor.SafeSupplier<DistExecutor.SafeRunnable>) () -> new DistExecutor.SafeRunnable()
+                {
+                    @Override
+                    public void run()
+                    {
+                        mountTime = VISUAL_TIME;
+                    }
+                });
+    }
+
+    /**
+     * 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)
+    {
+        final int HAND_UP_TIME = 20;
+        switch (event.getHand())
+        {
+        case OFF_HAND:
+            if (mainHandTime > 0 && mainHandTime < HAND_UP_TIME)
+            {
+                /*
+                 * Undo the transformation of the previous hand
+                 */
+                event.getMatrixStack()
+                        .translate(0,
+                                1.0F * (HAND_UP_TIME - mainHandTime) / HAND_UP_TIME,
+                                0);
+            }
+            if (offHandTime == 0)
+            {
+                event.setCanceled(true);
+            }
+            else if (!offHandLock && (mapLock & 0b01) == 0)
+            {
+                offHandTime--;
+                if (offHandTime < HAND_UP_TIME)
+                {
+                    event.getMatrixStack()
+                            .translate(0,
+                                    -1.0F * (HAND_UP_TIME - offHandTime) / HAND_UP_TIME,
+                                    0);
+                }
+            }
+            break;
+        case MAIN_HAND:
+            if (mainHandTime == 0)
+            {
+                event.setCanceled(true);
+            }
+            else if (!mainHandLock && (mapLock & 0b10) == 0)
+            {
+                mainHandTime--;
+                if (mainHandTime < HAND_UP_TIME)
+                {
+                    event.getMatrixStack()
+                            .translate(0,
+                                    -1.0F * (HAND_UP_TIME - mainHandTime) / HAND_UP_TIME,
+                                    0);
+                }
+            }
+            break;
+        }
+    }
+
+    /**
+     * 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)
+    {
+        /*
+         * When the health percentage falls to this level or below, the
+         * health bar won't disappear, allowing the player to be constantly
+         * reminded of their low health.
+         */
+        final float CONST_BOUNDARY = 0.5F;
+        /*
+         * When hunger falls to this level or below, the hunger bar won't
+         * disappear, allowing the player to be constantly reminded of their
+         * low hunger.
+         */
+        final int HUNGER_BOUNDARY = 15;
+
+        Minecraft mc = Minecraft.getInstance();
+        boolean changed = false;
+        int hotbarSlot;
+        Item item, handItem = null;
+        switch (event.getType())
+        {
+        case CROSSHAIRS:
+            if (event instanceof RenderGameOverlayEvent.Pre)
+            {
+                if (mc.objectMouseOver != null && mc.objectMouseOver.getType() != RayTraceResult.Type.MISS)
+                {
+                    if (mc.objectMouseOver.getType() == RayTraceResult.Type.ENTITY)
+                    {
+                        if (mc.objectMouseOver.hitInfo == null || mc.objectMouseOver.hitInfo != mc.player
+                                .getRidingEntity())
+                        {
+                            changed = true;
+                        }
+                    }
+                    else
+                    {
+                        changed = true;
+                    }
+                }
+                if (changed || mainHandLock || offHandLock || crosshairTime > 0)
+                {
+                    RenderSystem.color4f(1.0F,
+                            1.0F,
+                            1.0F,
+                            RenderUtils.getAlpha(crosshairTime > 0 ?
+                                                 crosshairTime :
+                                                 VISUAL_TIME));
+                }
+                else
+                {
+                    event.setCanceled(true);
+                }
+                if (crosshairTime > 0)
+                {
+                    crosshairTime--;
+                }
+            }
+            else if (event instanceof RenderGameOverlayEvent.Post)
+            {
+                RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
+            }
+            break;
+        case HOTBAR:
+            if (event instanceof RenderGameOverlayEvent.Pre)
+            {
+                mainHandLock = offHandLock = false;
+                mapLock = 0;
+                event.setCanceled(true);
+                for (int i = 0, l = Hand.values().length; i < l; i++)
+                {
+                    item =
+                            Optional.ofNullable(mc.player.getHeldItem(Hand.values()[i]))
+                                    .map(ItemStack::getItem)
+                                    .orElse(null);
+                    if (item != null)
+                    {
+                        if (item instanceof ShootableItem)
+                        {
+                            /*
+                             * Enables the crosshairs and lock the hand
+                             * whenever the bow is drawn.
+                             */
+                            if (item instanceof BowItem)
+                            {
+                                if (mc.player.isHandActive() && mc.player.getActiveHand()
+                                        .ordinal() == i)
+                                {
+                                    switch (i)
+                                    {
+                                    case 0:
+                                        mainHandLock = true;
+                                        break;
+                                    case 1:
+                                        offHandLock = true;
+                                        break;
+                                    }
+                                }
+                            }
+                            /*
+                             * Enables the crosshairs and lock the hand
+                             * whenever a loaded crossbow is equipped.
+                             */
+                            else if (item instanceof CrossbowItem)
+                            {
+                                if (CrossbowItem.isCharged(mc.player.getHeldItem(
+                                        Hand.values()[i])))
+                                {
+                                    switch (i)
+                                    {
+                                    case 0:
+                                        mainHandLock = true;
+                                        break;
+                                    case 1:
+                                        offHandLock = true;
+                                        break;
+                                    }
+                                }
+                            }
+                            /*
+                             * We don't know how modded items behave
+                             * exactly, so we keep it safe and enable the
+                             * crosshairs at all times for any shootable
+                             * items.
+                             */
+                            else
+                            {
+                                switch (i)
+                                {
+                                case 0:
+                                    mainHandLock = true;
+                                    break;
+                                case 1:
+                                    offHandLock = true;
+                                    break;
+                                }
+                            }
+                        }
+                        /**
+                         * Items that have the crosshairs enabled for as long
+                         * as the item is actively being used.
+                         */
+                        else if (item instanceof TridentItem || item instanceof ShieldItem)
+                        {
+                            if (mc.player.isHandActive() && mc.player.getActiveHand()
+                                    .ordinal() == i)
+                            {
+                                switch (i)
+                                {
+                                case 0:
+                                    mainHandLock = true;
+                                    break;
+                                case 1:
+                                    offHandLock = true;
+                                    break;
+                                }
+                            }
+                        }
+                        /**
+                         * Items that have the crosshairs enabled for as long
+                         * as the item is being held at all.
+                         */
+                        else if (item instanceof ThrowablePotionItem || item instanceof SnowballItem || item instanceof EggItem || item instanceof EnderPearlItem || item instanceof FishingRodItem)
+                        {
+                            switch (i)
+                            {
+                            case 0:
+                                mainHandLock = true;
+                                break;
+                            case 1:
+                                offHandLock = true;
+                                break;
+                            }
+                        }
+                        /**
+                         * Maps get special treatment. The hand is locked,
+                         * but the crosshairs are not enabled.
+                         */
+                        else if (item instanceof FilledMapItem)
+                        {
+                            mapLock = mapLock | (2 - i);
+                        }
+                    }
+
+                    /*
+                     * Checks for a change in the item
+                     */
+                    if (i == 0)
+                    {
+                        handItem = mainHandItem;
+                    }
+                    else if (i == 1)
+                    {
+                        handItem = offHandItem;
+                    }
+                    if (item != handItem)
+                    {
+                        changed = true;
+                        /*
+                         * Briefly shows the health and hunger bar whenever
+                         * food is switched to.
+                         */
+                        if (item.isFood())
+                        {
+                            healthTime = HEALTH_TIME;
+                            hungerTime = HEALTH_TIME;
+                        }
+                        if (i == 0)
+                        {
+                            mainHandItem = item;
+                            mainHandTime = HAND_TIME;
+                        }
+                        else if (i == 1)
+                        {
+                            offHandItem = item;
+                            offHandTime = HAND_TIME;
+                        }
+                    }
+                }
+
+                /*
+                 * Checks for a change in what slot is used.
+                 */
+                hotbarSlot = mc.player.inventory.currentItem;
+                if (selectedHotbarSlot != hotbarSlot)
+                {
+                    selectedHotbarSlot = hotbarSlot;
+                    mainHandTime = HAND_TIME;
+                    changed = true;
+                }
+
+                if (changed)
+                {
+                    hotbarTime = VISUAL_TIME;
+                }
+                else if (hotbarTime > 0)
+                {
+                    hotbarTime--;
+                }
+                RenderUtils.renderHotbar(mc, mc.ingameGUI,
+                        event.getMatrixStack(),
+                        event.getPartialTicks(), hotbarTime);
+            }
+            break;
+        case HEALTH:
+            if (event instanceof RenderGameOverlayEvent.Pre)
+            {
+                /*
+                 * Skip healthy bars that haven't updated in awhile.
+                 */
+                if (healthTime == 0 && health / maxHealth > CONST_BOUNDARY)
+                {
+                    event.setCanceled(true);
+                }
+
+                /**
+                 * Checks for a change in current or max health.
+                 */
+                if (health != mc.player.getHealth())
+                {
+                    health = mc.player.getHealth();
+                    changed = true;
+                }
+                if (maxHealth != mc.player.getMaxHealth())
+                {
+                    maxHealth = mc.player.getMaxHealth();
+                    changed = true;
+                }
+                if (changed)
+                {
+                    healthTime = HEALTH_TIME;
+                }
+                else if (healthTime > 0)
+                {
+                    healthTime--;
+                }
+                /*
+                 * Only makes a change if the player is healthy. Otherwise,
+                 * the bar is shown.
+                 */
+                if (health / maxHealth > CONST_BOUNDARY)
+                {
+                    RenderSystem.color4f(1.0F,
+                            1.0F,
+                            1.0F,
+                            RenderUtils.getAlpha(healthTime));
+                }
+            }
+            /*
+             * Reset the transparency.
+             */
+            else if (event instanceof RenderGameOverlayEvent.Post)
+            {
+                RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
+            }
+            break;
+        case FOOD:
+            if (event instanceof RenderGameOverlayEvent.Pre)
+            {
+                /*
+                 * Skip satisfied bars that haven't updated in awhile.
+                 */
+                if (hungerTime == 0 && hunger > HUNGER_BOUNDARY)
+                {
+                    event.setCanceled(true);
+                }
+
+                if (hunger != mc.player.getFoodStats().getFoodLevel())
+                {
+                    hunger = mc.player.getFoodStats().getFoodLevel();
+                    changed = true;
+                }
+                if (isFoodPoisoned != mc.player.isPotionActive(Effects.HUNGER))
+                {
+                    isFoodPoisoned =
+                            mc.player.isPotionActive(Effects.HUNGER);
+                    changed = true;
+                }
+                if (hunger <= HUNGER_BOUNDARY)
+                {
+                    changed = true;
+                }
+                if (changed)
+                {
+                    hungerTime = HEALTH_TIME;
+                    RenderSystem.color4f(1.0F,
+                            1.0F,
+                            1.0F,
+                            RenderUtils.getAlpha(hungerTime));
+                }
+                else if (hungerTime > 0)
+                {
+                    hungerTime--;
+                }
+                /*
+                 * Only makes a change if the player is satisfied. Otherwise,
+                 * the bar is shown.
+                 */
+            }
+            /*
+             * Reset the transparency.
+             */
+            else if (event instanceof RenderGameOverlayEvent.Post)
+            {
+                RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
+            }
+            break;
+        case ARMOR:
+            if (event instanceof RenderGameOverlayEvent.Pre)
+            {
+                /*
+                 * Renders armor along with health.
+                 */
+                if (healthTime > 0)
+                {
+                    RenderSystem.color4f(1.0F,
+                            1.0F,
+                            1.0F,
+                            RenderUtils.getAlpha(healthTime));
+                }
+                else
+                {
+                    event.setCanceled(true);
+                }
+            }
+            /*
+             * Reset the transparency.
+             */
+            else if (event instanceof RenderGameOverlayEvent.Post)
+            {
+                RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
+            }
+            break;
+        case HEALTHMOUNT:
+            if (event instanceof RenderGameOverlayEvent.Pre)
+            {
+                Entity tmp = mc.player.getRidingEntity();
+                if (tmp == null)
+                {
+                    mountHealth = -1;
+                    mountMaxHealth = -1;
+                }
+                else
+                {
+                    LivingEntity mount = (LivingEntity) tmp;
+                    if (mountHealth != mount.getHealth())
+                    {
+                        mountHealth = mount.getHealth();
+                        changed = true;
+                    }
+                    if (mountMaxHealth != mount.getMaxHealth())
+                    {
+                        mountMaxHealth = mount.getMaxHealth();
+                        changed = true;
+                    }
+                }
+                if (changed)
+                {
+                    mountTime = VISUAL_TIME;
+                }
+                else if (mountTime > 0)
+                {
+                    mountTime--;
+                }
+                /*
+                 * Renders it along with health.
+                 */
+                RenderSystem.color4f(1.0F,
+                        1.0F,
+                        1.0F,
+                        RenderUtils.getAlpha(mountTime));
+            }
+            else if (event instanceof RenderGameOverlayEvent.Post)
+            {
+                RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
+            }
+            break;
+        case JUMPBAR:
+            if (event instanceof RenderGameOverlayEvent.Pre)
+            {
+                event.setCanceled(true);
+                if (mc.player.getHorseJumpPower() > 0)
+                {
+                    jumpTime = VISUAL_TIME;
+                }
+                else if (jumpTime > 0)
+                {
+                    jumpTime--;
+                }
+                RenderUtils.renderHorseJumpBar(mc, mc.ingameGUI,
+                        event.getMatrixStack(), jumpTime);
+            }
+            break;
+        case EXPERIENCE:
+            if (event instanceof RenderGameOverlayEvent.Pre)
+            {
+                event.setCanceled(true);
+                if (experienceProgress != mc.player.experience)
+                {
+                    experienceProgress = mc.player.experience;
+                    changed = true;
+                }
+                if (changed)
+                {
+                    experienceTime = VISUAL_TIME;
+                }
+                else if (experienceTime > 0)
+                {
+                    experienceTime--;
+                }
+                RenderUtils.renderExperience(mc, mc.ingameGUI,
+                        event.getMatrixStack(), experienceTime);
+            }
+            break;
+        }
+    }
+}

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

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

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

@@ -1,224 +0,0 @@
-package markil3.immersive_hud;
-
-import com.terraformersmc.modmenu.api.ConfigScreenFactory;
-import com.terraformersmc.modmenu.api.ModMenuApi;
-
-import net.minecraft.item.Items;
-import net.minecraft.text.TranslatableText;
-import net.minecraft.util.Identifier;
-import net.minecraft.util.InvalidIdentifierException;
-import net.minecraft.util.registry.Registry;
-
-import me.shedaniel.autoconfig.AutoConfig;
-import me.shedaniel.clothconfig2.api.ConfigBuilder;
-import me.shedaniel.clothconfig2.api.ConfigCategory;
-import me.shedaniel.clothconfig2.api.ConfigEntryBuilder;
-import me.shedaniel.clothconfig2.gui.entries.DoubleListEntry;
-
-import static markil3.immersive_hud.Main.TICKS_PER_SECOND;
-
-import java.util.Arrays;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-public class ModMenu implements ModMenuApi
-{
-
-    private void startTimeField(String name, ConfigEntryBuilder entryBuilder,
-                                ConfigCategory cat,
-                                ConfigManager.TimeValues value)
-    {
-        final float SHOW_TIME = 6;
-        final float FADE_IN = 0.25F;
-        final float FADE_OUT = 0.5F;
-
-        DoubleListEntry maxTime =
-                entryBuilder.startDoubleField(new TranslatableText(
-                                "option.immersive_hud." + name +
-                                        "MaxTime"),
-                        (float) value.getMaxTime() / TICKS_PER_SECOND)
-                        .setDefaultValue(SHOW_TIME)
-                        .setMin(0)
-                        .setMax(10 * 60 * TICKS_PER_SECOND) // 10 Minutes
-                        .setTooltip(new TranslatableText(
-                                "tooltip.immersive_hud." + name +
-                                        "MaxTime"))
-                        .setSaveConsumer(val -> value.setMaxTime((int) (val * TICKS_PER_SECOND)))
-                        .build();
-
-        DoubleListEntry fadeIn =
-                entryBuilder.startDoubleField(new TranslatableText(
-                                "option.immersive_hud." + name +
-                                        "FadeIn"),
-                        (float) value.getFadeInTime() / TICKS_PER_SECOND)
-                        .setDefaultValue(FADE_IN)
-                        .setMin(0)
-                        .setMax(10 * 60 * TICKS_PER_SECOND)
-                        .setTooltip(new TranslatableText(
-                                "tooltip.immersive_hud." + name +
-                                        "FadeIn"))
-                        .setSaveConsumer(val -> value.setFadeInTime((int) (val * TICKS_PER_SECOND)))
-                        .build();
-
-        DoubleListEntry fadeOut =
-                entryBuilder.startDoubleField(new TranslatableText(
-                                "option.immersive_hud." + name +
-                                        "FadeOut"),
-                        (float) value.getFadeOutTime() / TICKS_PER_SECOND)
-                        .setDefaultValue(FADE_OUT)
-                        .setMin(0)
-                        .setMax(10 * 60 * TICKS_PER_SECOND)
-                        .setTooltip(new TranslatableText(
-                                "tooltip.immersive_hud." + name +
-                                        "FadeOut"))
-                        .setSaveConsumer(val -> value.setFadeOutTime((int) (val * TICKS_PER_SECOND)))
-                        .build();
-
-        cat.addEntry(maxTime);
-        cat.addEntry(fadeIn);
-        cat.addEntry(fadeOut);
-    }
-
-    @Override
-    public ConfigScreenFactory<?> getModConfigScreenFactory()
-    {
-        return screen -> {
-            ConfigCategory general;
-            ConfigEntryBuilder entryBuilder;
-            ConfigManager instance = ConfigManager.getInstance();
-            final ConfigBuilder builder = ConfigBuilder.create()
-                    .setParentScreen(screen)
-                    .setTitle(new TranslatableText(
-                            "immersive_hud.configGui.title"))
-                    .setSavingRunnable(() -> {
-                        try
-                        {
-                            if (Class.forName("me.shedaniel.autoconfig.AutoConfig") != null)
-                            {
-                                AutoConfig.getConfigHolder(ConfigManagerCloth.class)
-                                        .save();
-                            }
-                        }
-                        catch (ClassNotFoundException e)
-                        {
-                            // Do nothing
-                        }
-                    });
-            general =
-                    builder.getOrCreateCategory(new TranslatableText(
-                            "category.immersive_hud.general"));
-            entryBuilder = builder.entryBuilder();
-
-            startTimeField("hotbar", entryBuilder,
-                    general,
-                    instance.getHotbarTime());
-            startTimeField("experience", entryBuilder,
-                    general,
-                    instance.getExperienceTime());
-            startTimeField("jump", entryBuilder,
-                    general,
-                    instance.getJumpTime());
-            startTimeField("jump", entryBuilder,
-                    general,
-                    instance.getHealthTime());
-            startTimeField("hunger", entryBuilder,
-                    general,
-                    instance.getHungerTime());
-            startTimeField("effect", entryBuilder,
-                    general,
-                    instance.getPotionTime());
-
-            general.addEntry(entryBuilder.startDoubleField(new TranslatableText(
-                            "option.immersive_hud" +
-                                    ".crosshairTime"),
-                    (float) instance.getCrosshairTime() / TICKS_PER_SECOND)
-                    .setDefaultValue(6)
-                    .setTooltip(new TranslatableText(
-                            "tooltip.immersive_hud" +
-                                    ".crosshairTime"))
-                    .setSaveConsumer(val -> instance.setCrosshairTime((int) (val * TICKS_PER_SECOND)))
-                    .build());
-
-            general.addEntry(entryBuilder.startBooleanToggle(new TranslatableText(
-                            "option.immersive_hud.hideCrosshair"),
-                    instance.hideCrosshair())
-                    .setDefaultValue(true)
-                    .setTooltip(new TranslatableText(
-                            "tooltip.immersive_hud.hideCrosshair"))
-                    .setSaveConsumer(val -> instance.hideCrosshair(val))
-                    .build());
-
-            general.addEntry(entryBuilder.startDoubleField(new TranslatableText(
-                            "option.immersive_hud.handTime"),
-                    (float) instance.getHandTime() / TICKS_PER_SECOND)
-                    .setDefaultValue(30)
-                    .setTooltip(new TranslatableText(
-                            "tooltip.immersive_hud.handTime"))
-                    .setSaveConsumer(val -> instance.setHandTime((int) (val * TICKS_PER_SECOND)))
-                    .build());
-
-            general.addEntry(entryBuilder.startBooleanToggle(new TranslatableText(
-                            "option.immersive_hud.hideHands"),
-                    instance.hideHands())
-                    .setDefaultValue(true)
-                    .setTooltip(new TranslatableText(
-                            "tooltip.immersive_hud.hideHands"))
-                    .setSaveConsumer(val -> instance.hideHands(val))
-                    .build());
-
-            general.addEntry(entryBuilder.startDoubleField(new TranslatableText(
-                            "option.immersive_hud.minHealth"),
-                    instance.getMinHealth())
-                    .setDefaultValue(0.5)
-                    .setTooltip(new TranslatableText(
-                            "tooltip.immersive_hud.minHealth"))
-                    .setSaveConsumer(val -> instance.setMinHealth(val))
-                    .build());
-
-            general.addEntry(entryBuilder.startIntField(new TranslatableText(
-                            "option.immersive_hud.minHunger"),
-                    instance.getMinHunger())
-                    .setDefaultValue(17)
-                    .setTooltip(new TranslatableText(
-                            "tooltip.immersive_hud.minHunger"))
-                    .setSaveConsumer(val -> instance.setMinHunger(val))
-                    .build());
-
-            general.addEntry(entryBuilder.startBooleanToggle(new TranslatableText(
-                            "option.immersive_hud.showArmor"),
-                    instance.shouldShowArmor())
-                    .setDefaultValue(true)
-                    .setTooltip(new TranslatableText(
-                            "tooltip.immersive_hud.showArmor"))
-                    .setSaveConsumer(val -> instance.shouldShowArmor(val))
-                    .build());
-
-            general.addEntry(entryBuilder
-                    .startStrList(new TranslatableText("option.immersive_hud.ignoreList"), Arrays
-                            .asList(instance
-                                    .getIgnoredIdentifiers()).stream().map(Identifier::toString)
-                            .collect(Collectors.toList()))
-                    .setDefaultValue(Arrays
-                            .asList(Registry.ITEM.getId(Items.FIREWORK_ROCKET).toString()))
-                    .setTooltip(new TranslatableText("tooltip.immersive_hud.ignoreList"))
-                    .setSaveConsumer(val -> instance.setIgnoredItems(val.toArray(new String[0]))).setErrorSupplier(val -> {
-                        try
-                        {
-                            Optional<String> item = val.stream().filter(i -> !Registry.ITEM.getOrEmpty(new Identifier(i)).isPresent()).findFirst();
-                            if (item.isPresent())
-                            {
-                                return Optional.of(new TranslatableText("error.immersive_hud.ignoreList.unknownItem"));
-                            }
-                        }
-                        catch (InvalidIdentifierException e)
-                        {
-                            return Optional.of(new TranslatableText("error.immersive_hud.ignoreList.illegalId"));
-                        }
-                        return Optional.empty();
-                    })
-                    .build());
-
-            return builder.build();
-        };
-    }
-}

src/main/java/markil3/immersive_hud/RenderUtils.java

@@ -0,0 +1,499 @@
+/**
+ * Copyright (C) 2009-2021 Mojang Studios
+ *
+ * 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.
+ *
+ * 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.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.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.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.util.HandSide;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.world.World;
+
+/**
+ * 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
+ * @author Markil 3
+ * @version 0.1-1.16.4-forge
+ */
+public class RenderUtils
+{
+    /**
+     * A utility method to handle the transparency timing. It will (for the most
+     * part), make
+     *
+     * @param renderTime - How many ticks until the element entirely
+     * disappears.
+     *
+     * @author Markil 3
+     */
+    static float getAlpha(int renderTime)
+    {
+        return Math.min(renderTime / 20.0F,
+                1.0F);
+    }
+
+    /**
+     * Renders the horse jump bar.
+     *
+     * @param mc - A Minecraft instance.
+     * @param gui - The GUI.
+     * @param matrixStack - The rendering transformation matrix stack.
+     * @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,
+                                          int renderTime)
+    {
+        if (renderTime == 0)
+        {
+            return;
+        }
+
+        float alpha = getAlpha(renderTime);
+        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 - 32 + 3;
+        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 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,
+                                        int renderTime)
+    {
+        if (renderTime == 0)
+        {
+            return;
+        }
+
+        float alpha = getAlpha(renderTime);
+        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 - 32 + 3;
+                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 - 31 - 4;
+                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, int renderTime)
+    {
+        final ResourceLocation WIDGETS_TEX_PATH =
+                new ResourceLocation("textures/gui/widgets.png");
+        PlayerEntity playerentity = mc.player;
+
+        if (renderTime == 0)
+        {
+            return;
+        }
+
+        float alpha = getAlpha(renderTime);
+
+        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 - 22, 0, 0, 182, 22);
+            gui.blit(matrixStack,
+                    i - 91 - 1 + playerentity.inventory.currentItem * 20,
+                    scaledHeight - 22 - 1,
+                    0,
+                    22,
+                    24,
+                    22);
+            if (!itemstack.isEmpty())
+            {
+                if (handside == HandSide.LEFT)
+                {
+                    gui.blit(matrixStack,
+                            i - 91 - 29,
+                            scaledHeight - 23,
+                            24,
+                            22,
+                            29,
+                            24);
+                }
+                else
+                {
+                    gui.blit(matrixStack,
+                            i + 91,
+                            scaledHeight - 23,
+                            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 - 16 - 3;
+                renderHotbarItem(mc, alpha, j1,
+                        k1,
+                        partialTicks,
+                        playerentity,
+                        playerentity.inventory.mainInventory.get(i1));
+            }
+
+            if (!itemstack.isEmpty())
+            {
+                int i2 = scaledHeight - 16 - 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

@@ -1,123 +0,0 @@
-/**
- * Copyright (C) 2021 Markil 3
- * <p>
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation, either version 3 of the License, or (at your option) any later
- * version.
- * <p>
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- * <p>
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package markil3.immersive_hud.mixin;
-
-import 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

@@ -1,97 +0,0 @@
-/**
- * Copyright (C) 2021 Markil 3
- * <p>
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation, either version 3 of the License, or (at your option) any later
- * version.
- * <p>
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- * <p>
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package markil3.immersive_hud.mixin;
-
-import 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

@@ -1,692 +0,0 @@
-/**
- * Copyright (C) 2021 Markil 3
- * <p>
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation, either version 3 of the License, or (at your option) any later
- * version.
- * <p>
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- * <p>
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package markil3.immersive_hud.mixin;
-
-import com.mojang.blaze3d.systems.RenderSystem;
-
-import net.minecraft.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
-        {
-            stack.push();
-            stack.translate(0F, TimerUtils.getHealthTranslation(), 0F);
-        }
-        catch (Exception e)
-        {
-            LOGGER.error(
-                    "Error in running net.minecraft.client.gui.hud" +
-                            ".InGameHud#renderStatusBars " +
-                            "event",
-                    e);
-        }
-        return stack;
-    }
-
-    /**
-     * 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);
-        }
-        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
-        {
-            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

@@ -0,0 +1,65 @@
+# 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="All rights reserved"
+# A URL to refer people to when problems occur with this mod
+#issueTrackerURL="https://change.me.to.your.issue.tracker.example.invalid/" #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://change.me.example.invalid/updates.json" #optional
+# A URL for the "homepage" for this mod, displayed in the mod UI
+#displayURL="https://change.me.to.your.mods.homepage.example.invalid/" #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" #optional
+# The description text for the mod (multi line!) (#mandatory)
+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.
+
+Note that the following elements are unaffected:
+* The F3 Menu. Honestly, anyone who uses this isn't in the need for immersion at the moment.
+* The chat. This will automatically fade away by itself.
+* The oxygen bar. This will disappear as soon as it is filled, anyway.
+* Boss health. It is helpful to have this available in a hectic situation.
+* Sub-maximum health or hunger. In hectic battles, it can be convenient to see health at a glance.
+'''
+# A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional.
+[[dependencies.immersive_hud]] #optional
+    # 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"
+# 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

@@ -1,57 +0,0 @@
-{
-  "immersive_hud.configGui.title": "Immersive HUD Configuration",
-  "option.immersive_hud.hotbarMaxTime": "Hotbar Display Time",
-  "option.immersive_hud.hotbarFadeIn": "Hotbar Fade In Time",
-  "option.immersive_hud.hotbarFadeOut": "Hotbar Fade Out Time",
-  "option.immersive_hud.experienceMaxTime": "Experience Display Time",
-  "option.immersive_hud.experienceFadeIn": "Experience Fade In Time",
-  "option.immersive_hud.experienceFadeOut": "Experience Fade Out Time",
-  "option.immersive_hud.jumpMaxTime": "Jump Bar Display Time",
-  "option.immersive_hud.jumpFadeIn": "Jump Bar Fade In Time",
-  "option.immersive_hud.jumpFadeOut": "Jump Bar Fade Out Time",
-  "option.immersive_hud.healthMaxTime": "Health Bar Display Time",
-  "option.immersive_hud.healthFadeIn": "Health Bar Fade In Time",
-  "option.immersive_hud.healthFadeOut": "Health Bar Fade Out Time",
-  "option.immersive_hud.hungerMaxTime": "Hunger Bar Display Time",
-  "option.immersive_hud.hungerFadeIn": "Hunger Bar Fade In Time",
-  "option.immersive_hud.hungerFadeOut": "Hunger Bar Fade Out Time",
-  "option.immersive_hud.effectMaxTime": "Potion Display Time",
-  "option.immersive_hud.effectFadeIn": "Potion Fade In Time",
-  "option.immersive_hud.effectFadeOut": "Potion Fade Out Time",
-  "option.immersive_hud.crosshairTime": "Crosshair Display Time",
-  "option.immersive_hud.hideCrosshair": "Hide Crosshair",
-  "option.immersive_hud.handTime": "Hand Display Time",
-  "option.immersive_hud.hideHands": "Hide Hands",
-  "option.immersive_hud.minHealth": "Minimum Health Fade",
-  "option.immersive_hud.minHunger": "Minimum Hunger Fade",
-  "option.immersive_hud.showArmor": "Show Armor",
-  "option.immersive_hud.ignoreList": "Ignored Items",
-  "tooltip.immersive_hud.hotbarMaxTime": "How long the hotbar can be displayed on screen in seconds",
-  "tooltip.immersive_hud.hotbarFadeIn": "How many seconds it takes for the hotbar to fade in",
-  "tooltip.immersive_hud.hotbarFadeOut": "How many seconds it takes for the hotbar to move out",
-  "tooltip.immersive_hud.experienceMaxTime": "How long the experience bar can be displayed on screen in seconds",
-  "tooltip.immersive_hud.experienceFadeIn": "How many seconds it takes for the experience bar to fade in",
-  "tooltip.immersive_hud.experienceFadeOut": "How many seconds it takes for the experience bar to move out",
-  "tooltip.immersive_hud.jumpMaxTime": "How long the horse jump bar can be displayed on screen in seconds",
-  "tooltip.immersive_hud.jumpFadeIn": "How many seconds it takes for the horse jump bar to fade in",
-  "tooltip.immersive_hud.jumpFadeOut": "How many seconds it takes for the horse jump bar to fade out",
-  "tooltip.immersive_hud.healthMaxTime": "How long the health bar can be displayed on screen in seconds",
-  "tooltip.immersive_hud.healthFadeIn": "How many seconds it takes for the health bar to fade in",
-  "tooltip.immersive_hud.healthFadeOut": "How many seconds it takes for the health bar to fade out",
-  "tooltip.immersive_hud.hungerMaxTime": "How long the hunger bar can be displayed on screen in seconds",
-  "tooltip.immersive_hud.hungerFadeIn": "How many seconds it takes for the hunger bar to fade in",
-  "tooltip.immersive_hud.hungerFadeOut": "How many seconds it takes for the hunger bar to fade out",
-  "tooltip.immersive_hud.effectMaxTime": "How long potion icons can be displayed on screen in seconds",
-  "tooltip.immersive_hud.effectFadeIn": "How many seconds it takes for potion icons to fade in",
-  "tooltip.immersive_hud.effectFadeOut": "How many seconds it takes for potion icons to fade out",
-  "tooltip.immersive_hud.crosshairTime": "How many seconds the crosshairs can be on screen",
-  "tooltip.immersive_hud.hideCrosshair": "Whether or not the crosshairs should be hidden after a period of time",
-  "tooltip.immersive_hud.handTime": "How many seconds the hands can be on screen",
-  "tooltip.immersive_hud.hideHands": "Whether or not hands should be hidden after a period of time",
-  "tooltip.immersive_hud.minHealth": "When the percentage of health goes below this level, the health bar won't fade away",
-  "tooltip.immersive_hud.minHunger": "When the hunger level goes below this level, the hunger bar won't fade away",
-  "tooltip.immersive_hud.showArmor": "Whether or not the armor bar should display on the HUD",
-  "tooltip.immersive_hud.ignoreList": "Which items will not trigger the arm and crosshairs when used",
-  "error.immersive_hud.ignoreList.unknownItem": "Unknown item %s",
-  "error.immersive_hud.ignoreList.illegalId": "%s is not a legal item identifier"
-}

src/main/resources/fabric.mod.json

@@ -1,45 +0,0 @@
-{
-  "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.11.3",
-    "minecraft": "1.17.x",
-    "java": ">=16"
-  },
-  "suggests": {
-    "modmenu": "*",
-    "cloth-config2": "*"
-  }
-}

src/main/resources/immersive_hud.mixins.json

@@ -1,16 +0,0 @@
-{
-  "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

@@ -0,0 +1,7 @@
+{
+    "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."
+    }
+}