Fully functional mod for 1.16.4 fabric.

.gitattributes

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

.github/workflows/build.yml

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

.gitignore

@@ -1,26 +1,34 @@
+# gradle
+
+.gradle/
+build/
+out/
+classes/
+
 # eclipse
-bin
+
 *.launch
-.settings
-.metadata
+
+# idea
+
+.idea/
+*.iml
+*.ipr
+*.iws
+
+# vscode
+
+.settings/
+.vscode/
+bin/
 .classpath
 .project
 
-# idea
-out
-*.ipr
-*.iws
-*.iml
-.idea
+# macos
 
-# gradle
-build
-.gradle
+*.DS_Store
 
-# other
-eclipse
-run
+# fabric
 
-# Files from Forge MDK
-forge*changelog.txt
-/local.properties
+run/
+/logs/

build.gradle

@@ -1,160 +1,92 @@
-buildscript {
-    repositories {
-        maven { url = 'https://files.minecraftforge.net/maven' }
-        jcenter()
-        mavenCentral()
-    }
-    dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true
-    }
+plugins {
+	id 'fabric-loom' version '0.5-SNAPSHOT'
+	id 'maven-publish'
 }
-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'
+
+sourceCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_1_8
 
 archivesBaseName = project.archives_base_name
-version = project.mod_version + "-" + project.minecraft_version + "-forge"
-group = project.maven_group // http://maven.apache.org/guides/mini/guide-naming-conventions.html
+version = project.mod_version + "-" + project.minecraft_version + "-fabric"
+group = project.maven_group
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
-
-println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
-minecraft {
-    // The mappings can be changed at any time, and must be in the following format.
-    // snapshot_YYYYMMDD   Snapshot are built nightly.
-    // stable_#            Stables are built at the discretion of the MCP team.
-    // Use non-default mappings at your own risk. they may not always work.
-    // Simply re-run your setup task after changing the mappings to update your workspace.
-    mappings channel: 'snapshot', version: project.mappings
-    // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
-    
-    // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
-
-    // Default run configurations.
-    // These can be tweaked, removed, or duplicated as needed.
-    runs {
-        client {
-            workingDirectory project.file('run')
-
-            // Recommended logging data for a userdev environment
-            property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
-
-            // Recommended logging level for the console
-            property 'forge.logging.console.level', 'debug'
-
-            mods {
-                examplemod {
-                    source sourceSets.main
-                }
-            }
-        }
-
-        server {
-            workingDirectory project.file('run')
-
-            // Recommended logging data for a userdev environment
-            property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
-
-            // Recommended logging level for the console
-            property 'forge.logging.console.level', 'debug'
-
-            mods {
-                examplemod {
-                    source sourceSets.main
-                }
-            }
-        }
-
-        data {
-            workingDirectory project.file('run')
-
-            // Recommended logging data for a userdev environment
-            property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
-
-            // Recommended logging level for the console
-            property 'forge.logging.console.level', 'debug'
-
-            // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
-            args '--mod', 'examplemod', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
-
-            mods {
-                examplemod {
-                    source sourceSets.main
-                }
-            }
-        }
-    }
+repositories {
+    // Add repositories to retrieve artifacts from in here.
+    // You should only use this when depending on other mods because
+    // Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
+    // See https://docs.gradle.org/current/userguide/declaring_repositories.html
+    // for more information about repositories.
 }
 
-// Include resources generated by data generators.
-sourceSets.main.resources { srcDir 'src/generated/resources' }
-
 dependencies {
-    // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed
-    // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied.
-    // The userdev artifact is a special name and will get all sorts of transformations applied to it.
-    minecraft "net.minecraftforge:forge:${project.minecraft_version}-${project.forge_version}"
+	// To change the versions see the gradle.properties file
+	minecraft "com.mojang:minecraft:${project.minecraft_version}"
+	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
+	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
-    // You may put jars on which you depend on in ./libs or you may define them like so..
-    // compile "some.group:artifact:version:classifier"
-    // compile "some.group:artifact:version"
-
-    // Real examples
-    // compile 'com.mod-buildcraft:buildcraft:6.0.8:dev'  // adds buildcraft to the dev env
-    // compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env
-
-    // The 'provided' configuration is for optional dependencies that exist at compile-time but might not at runtime.
-    // provided 'com.mod-buildcraft:buildcraft:6.0.8:dev'
-
-    // These dependencies get remapped to your current MCP mappings
-    // deobf 'com.mod-buildcraft:buildcraft:6.0.8:dev'
-
-    // For more info...
-    // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
-    // http://www.gradle.org/docs/current/userguide/dependency_management.html
+	// Fabric API. This is technically optional, but you probably want it anyway.
+	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
+	// PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
+	// You may need to force-disable transitiveness on them.
 }
 
-task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = 'sources'
-    from sourceSets.main.allSource
-}
+processResources {
+	inputs.property "version", project.version
 
-artifacts {
-    archives sourcesJar
-}
-
-// Example for how to get properties into the manifest for reading by the runtime..
-jar {
-    manifest {
-        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")
-        ])
+	filesMatching("fabric.mod.json") {
+		expand "version": project.version
 	}
 }
 
-// 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')
+tasks.withType(JavaCompile).configureEach {
+	// ensure that the encoding is set to UTF-8, no matter what the system default is
+	// this fixes some edge cases with special characters not displaying correctly
+	// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
+	// If Javadoc is generated, this must be specified in that task too.
+	it.options.encoding = "UTF-8"
 
+	// The Minecraft launcher currently installs Java 8 for users, so your mod probably wants to target Java 8 too
+	// JDK 9 introduced a new way of specifying this that will make sure no newer classes or methods are used.
+	// We'll use that if it's available, but otherwise we'll use the older option.
+	def targetVersion = 8
+	if (JavaVersion.current().isJava9Compatible()) {
+		 it.options.release = targetVersion
+	}
+}
+
+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()
+}
+
+jar {
+	from("LICENSE") {
+		rename { "${it}_${project.archivesBaseName}"}
+	}
+}
+
+// configure the maven publication
 publishing {
 	publications {
 		mavenJava(MavenPublication) {
-            artifact jar
+			// add all the jars that should be included when publishing to maven
+			artifact(remapJar) {
+				builtBy remapJar
+			}
+			artifact(sourcesJar) {
+				builtBy remapSourcesJar
 			}
 		}
+	}
+    
+    // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
     repositories {
-        maven {
-            url "file:///${project.projectDir}/mcmodsrepo"
-        }
+        // Add repositories to publish to here.
+        // Notice: This block does NOT have the same function as the block in the top level.
+        // The repositories here will be used for publishing your artifact, not for
+        // retrieving dependencies.
     }
 }

gradle.properties

@@ -1,14 +1,17 @@
-# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
-# This is required to provide enough memory for the Minecraft decompilation process.
-org.gradle.jvmargs=-Xmx3G
-org.gradle.daemon=false
+# Done to increase the memory available to gradle.
+org.gradle.jvmargs=-Xmx1G
 
-# Forge Properties
-minecraft_version=1.16.4
-mappings=20201028-1.16.3
-forge_version=35.1.37
+# Fabric Properties
+	# check these on https://fabricmc.net/use
+	minecraft_version=1.16.4
+	yarn_mappings=1.16.4+build.9
+	loader_version=0.11.1
 
 # Mod Properties
-mod_version = 0.1
-maven_group = markil3
-archives_base_name = immersive_hud
+	mod_version = 0.1
+	maven_group = markil3
+	archives_base_name = immersive_hud
+
+# Dependencies
+	# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
+	fabric_version=0.30.3+1.16

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -1,5 +1,21 @@
 #!/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
@@ -28,7 +44,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=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -66,6 +82,7 @@ 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
@@ -109,10 +126,11 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
@@ -138,19 +156,19 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -159,14 +177,9 @@ 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,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -13,15 +29,18 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -35,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -45,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

settings.gradle

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

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

@@ -18,9 +18,13 @@ package markil3.immersive_hud;
 
 import com.mojang.blaze3d.systems.RenderSystem;
 
-import net.minecraft.client.Minecraft;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.network.ClientPlayerEntity;
+import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.effect.StatusEffects;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.BowItem;
 import net.minecraft.item.CrossbowItem;
 import net.minecraft.item.EggItem;
@@ -29,42 +33,29 @@ import net.minecraft.item.FilledMapItem;
 import net.minecraft.item.FishingRodItem;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.item.RangedWeaponItem;
 import net.minecraft.item.ShieldItem;
-import net.minecraft.item.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 net.minecraft.util.hit.EntityHitResult;
+import net.minecraft.util.hit.HitResult;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
+import java.util.Iterator;
 import java.util.Optional;
 
 /**
  * Contains the logic for changing the HUD.
  *
  * @author Markil 3
- * @version 0.1-1.16.4-forge
+ * @version 0.1-1.16.4-fabric
  */
-@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.
@@ -192,29 +183,52 @@ public class EventBus
      * view, and briefly brings the health and hunger into view if the held item
      * is food.
      *
-     * @param event - event data
+     * @param hand - The hand being triggered
+     * @param clear - Whether the hand it being enabled or disabled.
+     *
+     * @since 0.1-1.16.4-fabric
      */
-    @SubscribeEvent
-    public static void onClick(final PlayerInteractEvent event)
+    public static void onClick(Hand hand, boolean clear)
     {
-        DistExecutor.safeRunWhenOn(Dist.CLIENT,
-                (DistExecutor.SafeSupplier<DistExecutor.SafeRunnable>) () -> new DistExecutor.SafeRunnable()
+        MinecraftClient mc = MinecraftClient.getInstance();
+        LivingEntity entity;
+        Item item;
+        Iterator<ItemStack> hands;
+        if (mc.getCameraEntity() instanceof LivingEntity)
         {
-                    @Override
-                    public void run()
+            entity = (LivingEntity) mc.getCameraEntity();
+        }
+        else
         {
-                        Item item =
-                                Optional.ofNullable(event.getItemStack())
+            return;
+        }
+        if (clear)
+        {
+            item = null;
+        }
+        else
+        {
+            hands = entity.getItemsHand().iterator();
+            if (hand == Hand.OFF_HAND)
+            {
+                hands.next();
+            }
+            item =
+                    Optional.ofNullable(hands.next())
+                            .filter(stack -> !stack.isEmpty())
                             .map(ItemStack::getItem)
                             .orElse(null);
+        }
         crosshairTime = VISUAL_TIME;
-                        if (event.getHand() == Hand.MAIN_HAND)
+        if (hand == Hand.MAIN_HAND)
         {
             mainHandTime = HAND_TIME;
+            mainHandLock = item != null;
         }
         else
         {
             offHandTime = HAND_TIME;
+            offHandLock = item != null;
         }
         if (item != null)
         {
@@ -224,100 +238,132 @@ public class EventBus
                 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)
+        else
         {
-        DistExecutor.safeRunWhenOn(Dist.CLIENT,
-                (DistExecutor.SafeSupplier<DistExecutor.SafeRunnable>) () -> new DistExecutor.SafeRunnable()
-                {
-                    @Override
-                    public void run()
-                    {
-                        mountTime = VISUAL_TIME;
+            System.out.println("Unusing hand " + hand);
         }
-                });
     }
 
     /**
      * Run whenever a hand is rendered in 1st person. This brings the player
      * hands into and out of view as needed.
      *
-     * @param event - event data
+     * @param hand - The hand being rendered.
+     * @param matrixStack - The rendering stack.
+     *
+     * @return If true, then don't render this hand at all.
+     *
+     * @since 0.1-1.16.4-fabric
      */
-    @SubscribeEvent
-    public static void onRenderHand(final RenderHandEvent event)
+    public static boolean onRenderHand(Hand hand, MatrixStack matrixStack)
     {
         final int HAND_UP_TIME = 20;
-        switch (event.getHand())
+        switch (hand)
         {
         case OFF_HAND:
-            if (mainHandTime > 0 && mainHandTime < HAND_UP_TIME)
+            if (offHandTime == 0 && !offHandLock)
             {
-                /*
-                 * 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);
+                return true;
             }
             else if (!offHandLock && (mapLock & 0b01) == 0)
             {
                 offHandTime--;
                 if (offHandTime < HAND_UP_TIME)
                 {
-                    event.getMatrixStack()
+                    matrixStack
                             .translate(0,
-                                    -1.0F * (HAND_UP_TIME - offHandTime) / HAND_UP_TIME,
+                                    -1.0F * (HAND_UP_TIME - offHandTime) /
+                                            HAND_UP_TIME,
                                     0);
                 }
             }
             break;
         case MAIN_HAND:
-            if (mainHandTime == 0)
+            if (mainHandTime == 0 && !mainHandLock)
             {
-                event.setCanceled(true);
+                return true;
             }
             else if (!mainHandLock && (mapLock & 0b10) == 0)
             {
+                System.out.println("Decreasing main hand time");
                 mainHandTime--;
                 if (mainHandTime < HAND_UP_TIME)
                 {
-                    event.getMatrixStack()
+                    matrixStack
                             .translate(0,
-                                    -1.0F * (HAND_UP_TIME - mainHandTime) / HAND_UP_TIME,
+                                    -1.0F * (HAND_UP_TIME - mainHandTime) /
+                                            HAND_UP_TIME,
                                     0);
                 }
             }
             break;
         }
+        return false;
     }
 
     /**
-     * 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.
+     * Determines whether or not to draw the crosshair, adjusting the alpha as
+     * needed.
      *
-     * @param event - event data
+     * @return If true, then cancel drawing the crosshair.
+     *
+     * @since 0.1-1.16.4-fabric
      */
-    @SubscribeEvent
-    public static void onGUIDraw(final RenderGameOverlayEvent event)
+    public static boolean drawCrosshair()
+    {
+        MinecraftClient mc = MinecraftClient.getInstance();
+        Entity entity = mc.getCameraEntity();
+        boolean changed = false;
+        if (mc.crosshairTarget != null && mc.crosshairTarget
+                .getType() != HitResult.Type.MISS)
+        {
+            if (mc.crosshairTarget.getType() == HitResult.Type
+                    .ENTITY)
+            {
+                if (((EntityHitResult) mc.crosshairTarget).getEntity() != entity
+                        .getVehicle())
+                {
+                    changed = true;
+                }
+            }
+            else
+            {
+                changed = true;
+            }
+        }
+        if (changed || mainHandLock || offHandLock || crosshairTime
+                > 0)
+        {
+            RenderSystem.color4f(1.0F,
+                    1.0F,
+                    1.0F,
+                    Main.getAlpha(crosshairTime > 0 ?
+                                  crosshairTime :
+                                  VISUAL_TIME));
+        }
+        else
+        {
+            RenderSystem.color4f(1.0F,
+                    1.0F,
+                    1.0F,
+                    0F);
+        }
+        if (crosshairTime > 0)
+        {
+            crosshairTime--;
+        }
+        return false;
+    }
+
+    /**
+     * Determines whether or not to draw the mount's health, adjusting the alpha
+     * as needed.
+     *
+     * @return If true, then cancel drawing the mount health bar.
+     *
+     * @since 0.1-1.16.4-fabric
+     */
+    public static boolean drawMountHealth()
     {
         /*
          * When the health percentage falls to this level or below, the
@@ -325,6 +371,168 @@ public class EventBus
          * reminded of their low health.
          */
         final float CONST_BOUNDARY = 0.5F;
+
+        MinecraftClient mc = MinecraftClient.getInstance();
+        Entity entity = mc.getCameraEntity();
+        Entity tmp = entity.getVehicle();
+        LivingEntity mount;
+        boolean changed = false;
+
+        if (tmp == null)
+        {
+            mountHealth = -1;
+            mountMaxHealth = -1;
+        }
+        else
+        {
+            mount = (LivingEntity) tmp;
+            if (mountHealth != mount.getHealth())
+            {
+                mountHealth = mount.getHealth();
+                changed = true;
+            }
+            if (mountMaxHealth != mount.getMaxHealth())
+            {
+                mountMaxHealth = mount.getMaxHealth();
+                changed = true;
+            }
+        }
+        if (changed)
+        {
+            mountTime = VISUAL_TIME;
+        }
+        else if (mountTime > 0)
+        {
+            mountTime--;
+        }
+        if (mountTime > 0)
+        {
+            /*
+             * Renders it along with health.
+             */
+            RenderSystem.color4f(1.0F,
+                    1.0F,
+                    1.0F,
+                    Main.getAlpha(mountTime));
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Determines whether or not to draw the armor bar, adjusting the alpha as
+     * needed.
+     *
+     * @return If true, then cancel drawing the armor bar.
+     *
+     * @since 0.1-1.16.4-fabric
+     */
+    public static boolean drawArmor()
+    {
+        /*
+         * Sets the armor to fade in and out in sync with the health.
+         * Technically, since this method gets called before health, it will
+         * be 1 tick behind, but I'm not too concerned about it.
+         */
+        if (healthTime > 0)
+        {
+            RenderSystem.color4f(1.0F,
+                    1.0F,
+                    1.0F,
+                    Main.getAlpha(healthTime));
+        }
+        else
+        {
+            RenderSystem.color4f(1.0F,
+                    1.0F,
+                    1.0F,
+                    0.0F);
+        }
+        return false;
+    }
+
+    /**
+     * Determines whether or not to draw the health bar, adjusting the alpha as
+     * needed.
+     *
+     * @return If true, then cancel drawing the health.
+     *
+     * @since 0.1-1.16.4-fabric
+     */
+    public static boolean drawHealth()
+    {
+        /*
+         * When the health percentage falls to this level or below, the
+         * health bar won't disappear, allowing the player to be constantly
+         * reminded of their low health.
+         */
+        final float CONST_BOUNDARY = 0.5F;
+
+        MinecraftClient mc = MinecraftClient.getInstance();
+        LivingEntity entity;
+        if (mc.getCameraEntity() instanceof LivingEntity)
+        {
+            entity = (LivingEntity) mc.getCameraEntity();
+        }
+        else
+        {
+            return true;
+        }
+        boolean changed = false;
+
+        /*
+         * Resets the transparency from the armor call.
+         */
+        RenderSystem.color4f(1.0F,
+                1.0F,
+                1.0F,
+                1F);
+
+        /**
+         * Checks for a change in current or max health.
+         */
+        if (health != entity.getHealth())
+        {
+            health = entity.getHealth();
+            changed = true;
+        }
+        if (maxHealth != entity.getMaxHealth())
+        {
+            maxHealth = entity.getMaxHealth();
+            changed = true;
+        }
+        if (changed)
+        {
+            healthTime = HEALTH_TIME;
+        }
+        else if (healthTime > 0)
+        {
+            healthTime--;
+        }
+        /*
+         * Only makes a change if the player is healthy. Otherwise,
+         * the bar is shown.
+         */
+        if (health / maxHealth > CONST_BOUNDARY)
+        {
+            RenderSystem.color4f(1.0F,
+                    1.0F,
+                    1.0F,
+                    Main.getAlpha(healthTime));
+        }
+        return false;
+    }
+
+    /**
+     * Determines whether or not to draw the hunger bar, adjusting the alpha as
+     * needed.
+     *
+     * @return If true, then cancel drawing the hunger bar.
+     *
+     * @since 0.1-1.16.4-fabric
+     */
+    public static boolean drawHunger()
+    {
         /*
          * When hunger falls to this level or below, the hunger bar won't
          * disappear, allowing the player to be constantly reminded of their
@@ -332,68 +540,188 @@ public class EventBus
          */
         final int HUNGER_BOUNDARY = 15;
 
-        Minecraft mc = Minecraft.getInstance();
+        MinecraftClient mc = MinecraftClient.getInstance();
+        PlayerEntity entity;
         boolean changed = false;
-        int hotbarSlot;
-        Item item, handItem = null;
-        switch (event.getType())
+
+        /*
+         * Resets the transparency from last time.
+         */
+        RenderSystem.color4f(1.0F,
+                1.0F,
+                1.0F,
+                1F);
+        if (mc.getCameraEntity() instanceof PlayerEntity)
         {
-        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;
-                        }
+            entity = (PlayerEntity) mc.getCameraEntity();
         }
         else
         {
+            return true;
+        }
+
+        if (hunger != entity.getHungerManager().getFoodLevel())
+        {
+            hunger = entity.getHungerManager().getFoodLevel();
             changed = true;
         }
+        if (isFoodPoisoned != entity.hasStatusEffect(StatusEffects
+                .HUNGER))
+        {
+            isFoodPoisoned =
+                    entity.hasStatusEffect(StatusEffects.HUNGER);
+            changed = true;
         }
-                if (changed || mainHandLock || offHandLock || crosshairTime > 0)
+        if (hunger <= HUNGER_BOUNDARY)
+        {
+            changed = true;
+        }
+        if (changed)
+        {
+            hungerTime = HEALTH_TIME;
+        }
+        else if (hungerTime > 0)
+        {
+            hungerTime--;
+        }
+        RenderSystem.color4f(1.0F,
+                1.0F,
+                1.0F,
+                Main.getAlpha(hungerTime));
+        /*
+         * Only makes a change if the player is satisfied. Otherwise,
+         * the bar is shown.
+         */
+        return false;
+    }
+
+    /**
+     * Determines whether or not to draw the horse jump bar, adjusting the alpha
+     * as needed.
+     *
+     * @return If true, then cancel drawing the jump bar.
+     *
+     * @since 0.1-1.16.4-fabric
+     */
+    public static boolean drawJumpbar()
+    {
+        MinecraftClient mc = MinecraftClient.getInstance();
+        ClientPlayerEntity entity;
+        boolean changed = false;
+
+        if (mc.getCameraEntity() instanceof ClientPlayerEntity)
+        {
+            entity = (ClientPlayerEntity) mc.getCameraEntity();
+        }
+        else
+        {
+            return true;
+        }
+
+        if (entity.method_3151() > 0)
+        {
+            jumpTime = VISUAL_TIME;
+        }
+        else if (jumpTime > 0)
+        {
+            jumpTime--;
+        }
+        if (experienceTime > 0)
         {
             RenderSystem.color4f(1.0F,
                     1.0F,
                     1.0F,
-                            RenderUtils.getAlpha(crosshairTime > 0 ?
-                                                 crosshairTime :
-                                                 VISUAL_TIME));
+                    Main.getAlpha(jumpTime));
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Determines whether or not to draw the experience bar, adjusting the alpha
+     * as needed.
+     *
+     * @return If true, then cancel drawing the experience bar.
+     *
+     * @since 0.1-1.16.4-fabric
+     */
+    public static boolean drawExperience()
+    {
+        MinecraftClient mc = MinecraftClient.getInstance();
+        ClientPlayerEntity entity;
+        boolean changed = false;
+
+        if (mc.getCameraEntity() instanceof ClientPlayerEntity)
+        {
+            entity = (ClientPlayerEntity) mc.getCameraEntity();
         }
         else
         {
-                    event.setCanceled(true);
+            return true;
         }
-                if (crosshairTime > 0)
+
+        if (experienceProgress != entity.totalExperience)
         {
-                    crosshairTime--;
+            experienceProgress = entity.totalExperience;
+            changed = true;
         }
-            }
-            else if (event instanceof RenderGameOverlayEvent.Post)
+        if (changed)
         {
-                RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
+            experienceTime = VISUAL_TIME;
         }
-            break;
-        case HOTBAR:
-            if (event instanceof RenderGameOverlayEvent.Pre)
+        else if (experienceTime > 0)
         {
+            experienceTime--;
+        }
+        if (experienceTime > 0)
+        {
+            RenderSystem.color4f(1.0F,
+                    1.0F,
+                    1.0F,
+                    Main.getAlpha(experienceTime));
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Determines whether or not to draw the hotbar. Note that this method does
+     * not directly change the transparency of the hotbar, only checking whether
+     * or not to draw it.
+     *
+     * @return If true, then cancel drawing the hotbar.
+     *
+     * @see #recolorHotbar()
+     * @since 0.1-1.16.4-fabric
+     */
+    public static boolean updateHotbar()
+    {
+        MinecraftClient mc = MinecraftClient.getInstance();
+        ClientPlayerEntity entity;
+        Item item, handItem = null;
+        boolean changed = false;
+
+        if (mc.getCameraEntity() instanceof ClientPlayerEntity)
+        {
+            entity = (ClientPlayerEntity) mc.getCameraEntity();
+        }
+        else
+        {
+            return true;
+        }
+
         mainHandLock = offHandLock = false;
         mapLock = 0;
-                event.setCanceled(true);
-                for (int i = 0, l = Hand.values().length; i < l; i++)
+        int i = 0;
+        for (ItemStack stack : entity.getItemsHand())
         {
             item =
-                            Optional.ofNullable(mc.player.getHeldItem(Hand.values()[i]))
+                    Optional.ofNullable(stack)
                             .map(ItemStack::getItem)
                             .orElse(null);
             if (item != null)
             {
-                        if (item instanceof ShootableItem)
+                if (item instanceof RangedWeaponItem)
                 {
                     /*
                      * Enables the crosshairs and lock the hand
@@ -401,7 +729,8 @@ public class EventBus
                      */
                     if (item instanceof BowItem)
                     {
-                                if (mc.player.isHandActive() && mc.player.getActiveHand()
+                        if (entity.isUsingItem() && entity
+                                .getActiveHand()
                                 .ordinal() == i)
                         {
                             switch (i)
@@ -421,8 +750,7 @@ public class EventBus
                      */
                     else if (item instanceof CrossbowItem)
                     {
-                                if (CrossbowItem.isCharged(mc.player.getHeldItem(
-                                        Hand.values()[i])))
+                        if (CrossbowItem.isCharged(stack))
                         {
                             switch (i)
                             {
@@ -458,9 +786,11 @@ public class EventBus
                  * Items that have the crosshairs enabled for as long
                  * as the item is actively being used.
                  */
-                        else if (item instanceof TridentItem || item instanceof ShieldItem)
+                else if (item instanceof TridentItem || item
+                        instanceof ShieldItem)
                 {
-                            if (mc.player.isHandActive() && mc.player.getActiveHand()
+                    if (entity.isUsingItem() && entity
+                            .getActiveHand() != null && entity.getActiveHand()
                             .ordinal() == i)
                     {
                         switch (i)
@@ -478,7 +808,10 @@ public class EventBus
                  * 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)
+                else if (item instanceof ThrowablePotionItem ||
+                        item instanceof SnowballItem || item instanceof
+                        EggItem || item instanceof EnderPearlItem || item
+                        instanceof FishingRodItem)
                 {
                     switch (i)
                     {
@@ -507,7 +840,7 @@ public class EventBus
             {
                 handItem = mainHandItem;
             }
-                    else if (i == 1)
+            else
             {
                 handItem = offHandItem;
             }
@@ -534,15 +867,15 @@ public class EventBus
                     offHandTime = HAND_TIME;
                 }
             }
+            i++;
         }
 
         /*
          * Checks for a change in what slot is used.
          */
-                hotbarSlot = mc.player.inventory.currentItem;
-                if (selectedHotbarSlot != hotbarSlot)
+        if (selectedHotbarSlot != entity.inventory.selectedSlot)
         {
-                    selectedHotbarSlot = hotbarSlot;
+            selectedHotbarSlot = entity.inventory.selectedSlot;
             mainHandTime = HAND_TIME;
             changed = true;
         }
@@ -555,221 +888,23 @@ public class EventBus
         {
             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);
+
+        return hotbarTime == 0;
     }
 
     /**
-                 * Checks for a change in current or max health.
+     * Determines whether or not to draw the crosshair, adjusting the alpha as
+     * needed.
+     *
+     * @return If true, then cancel drawing the crosshair.
+     *
+     * @since 0.1-1.16.4-fabric
      */
-                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)
+    public static void recolorHotbar()
     {
         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;
-        }
+                Main.getAlpha(hotbarTime));
     }
 }

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

@@ -17,36 +17,37 @@
  */
 package markil3.immersive_hud;
 
-import net.minecraftforge.fml.ExtensionPoint;
-import net.minecraftforge.fml.ModLoadingContext;
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.network.FMLNetworkConstants;
-
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import net.fabricmc.api.ModInitializer;
+import net.minecraft.client.gui.DrawableHelper;
+import net.minecraft.client.util.math.MatrixStack;
 
 /**
  * The main entry point for the Immersive HUD mod.
  *
  * @author Markil 3
- * @version 0.1-1.16.4-forge
+ * @version 0.1-1.16.4-fabric
  */
-@Mod("immersive_hud")
-public class Main
+public class Main implements ModInitializer
 {
-    /**
-     * Class logger.
-     */
-    private static final Logger LOGGER = LogManager.getLogger();
-
-    public Main()
+    @Override
+    public void onInitialize()
     {
-        //Make sure the mod being absent on the other network side does not
-        // cause the client to display the server as incompatible
-        ModLoadingContext.get()
-                .registerExtensionPoint(ExtensionPoint.DISPLAYTEST, () -> Pair
-                        .of(() -> FMLNetworkConstants.IGNORESERVERONLY,
-                                (a, b) -> true));
+    }
+
+    /**
+     * 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.
+     *
+     * @return The new alpha value.
+     *
+     * @since 0.1-1.16.4-fabric
+     */
+    static float getAlpha(int renderTime)
+    {
+        return Math.min(renderTime / 20.0F,
+                1.0F);
     }
 }

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

@@ -1,499 +0,0 @@
-/**
- * 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

@@ -0,0 +1,90 @@
+/**
+ * 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.AbstractClientPlayerEntity;
+import net.minecraft.client.network.ClientPlayerEntity;
+import net.minecraft.client.render.VertexConsumerProvider;
+import net.minecraft.client.render.item.HeldItemRenderer;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.Hand;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import markil3.immersive_hud.EventBus;
+
+/**
+ * This mixin hooks into the client player class to check for when the hands
+ * move. Note that most of the logic can be found in {@link EventBus}.
+ *
+ * @author Markil 3
+ * @version 0.1-1.16.4-fabric
+ */
+@Mixin(ClientPlayerEntity.class)
+public class ClientPlayerHook
+{
+    /**
+     * 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)
+    {
+        EventBus.onClick(hand, hand == null);
+    }
+
+    /**
+     * 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)
+    {
+        EventBus.onClick(hand, hand == null);
+    }
+
+    /**
+     * 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)
+    {
+        if (MinecraftClient.getInstance().cameraEntity instanceof LivingEntity)
+        {
+            EventBus.onClick(((LivingEntity) MinecraftClient.getInstance().cameraEntity)
+                    .getActiveHand(), true);
+        }
+    }
+}

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

@@ -0,0 +1,84 @@
+/**
+ * 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.gui.hud.InGameHud;
+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.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import markil3.immersive_hud.EventBus;
+
+/**
+ * This mixin hooks into the hand renderer to make the hands move in and out of
+ * view. Note that most of the logic can be found in {@link EventBus}.
+ *
+ * @author Markil 3
+ * @version 0.1-1.16.4-fabric
+ */
+@Mixin(HeldItemRenderer.class)
+public class HeldItemHook
+{
+    /**
+     * 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)
+    {
+        if (EventBus.onRenderHand(hand, matrices))
+        {
+            callbackInfo.cancel();
+        }
+    }
+
+}

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

@@ -0,0 +1,237 @@
+/**
+ * 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.gui.hud.InGameHud;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.util.profiler.DummyProfiler;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import markil3.immersive_hud.EventBus;
+
+/**
+ * This mixin hooks into the HUD class to modify most of the HUD elements. Note
+ * that most of the logic can be found in {@link EventBus}.
+ *
+ * @author Markil 3
+ * @version 0.1-1.16.4-fabric
+ */
+@Mixin(InGameHud.class)
+public class HudHook
+{
+    /**
+     * Determines whether or not to draw the crosshair.
+     *
+     * @param stack - The matrix drawing stack.
+     * @param callbackInfo
+     *
+     * @since 0.1-1.16.4-fabric
+     */
+    @Inject(method = "renderCrosshair", at = @At(value = "HEAD"))
+    public void startCrosshair(MatrixStack stack, CallbackInfo callbackInfo)
+    {
+        EventBus.drawCrosshair();
+    }
+
+    /**
+     * Resets any changes from drawing the crosshair.
+     *
+     * @param stack - The matrix drawing stack.
+     * @param callbackInfo
+     *
+     * @since 0.1-1.16.4-fabric
+     */
+    @Inject(method = "renderCrosshair", at = @At(value = "TAIL"))
+    public void finishCrosshair(MatrixStack stack, CallbackInfo callbackInfo)
+    {
+        /*
+         * Resets the color so that nothing else is bothered.
+         */
+        RenderSystem.color4f(1, 1, 1, 1F);
+    }
+
+    /**
+     * Determines whether or not to draw the horse jump bar.
+     *
+     * @param stack - The matrix drawing stack.
+     * @param callbackInfo
+     *
+     * @since 0.1-1.16.4-fabric
+     */
+    @Inject(method = "renderMountJumpBar", at = @At(value = "HEAD"))
+    public void startJumpbar(MatrixStack stack,
+                             int x,
+                             CallbackInfo callbackInfo)
+    {
+        EventBus.drawJumpbar();
+    }
+
+    /**
+     * Resets any changes from drawing the horse jump bar.
+     *
+     * @param stack - The matrix drawing stack.
+     * @param callbackInfo
+     *
+     * @since 0.1-1.16.4-fabric
+     */
+    @Inject(method = "renderMountJumpBar", at = @At(value = "TAIL"))
+    public void finishJumpbar(MatrixStack stack,
+                              int x,
+                              CallbackInfo callbackInfo)
+    {
+        /*
+         * Resets the color so that nothing else is bothered.
+         */
+        RenderSystem.color4f(1, 1, 1, 1F);
+    }
+
+    /**
+     * Determines whether or not to draw the experience bar.
+     *
+     * @param stack - The matrix drawing stack.
+     * @param callbackInfo
+     *
+     * @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)
+    {
+        if (EventBus.drawExperience())
+        {
+            callbackInfo.cancel();
+        }
+    }
+
+    /**
+     * Resets any changes from drawing the experience bar.
+     *
+     * @param stack - The matrix drawing stack.
+     * @param callbackInfo
+     *
+     * @since 0.1-1.16.4-fabric
+     */
+    @Inject(method = "renderExperienceBar", at = @At(value = "TAIL"))
+    public void finishExperience(MatrixStack stack,
+                                 int x,
+                                 CallbackInfo callbackInfo)
+    {
+        /*
+         * Resets the color so that nothing else is bothered.
+         */
+        RenderSystem.color4f(1, 1, 1, 1F);
+    }
+
+    /**
+     * Determines whether or not to draw the mount's health.
+     *
+     * @param stack - The matrix drawing stack.
+     * @param callbackInfo
+     *
+     * @since 0.1-1.16.4-fabric
+     */
+    @Inject(method = "renderMountHealth", at = @At(value = "HEAD"))
+    public void startMountHealth(MatrixStack stack, CallbackInfo callbackInfo)
+    {
+        EventBus.drawMountHealth();
+    }
+
+    /**
+     * Resets any changes from drawing the mount's health.
+     *
+     * @param stack - The matrix drawing stack.
+     * @param callbackInfo
+     *
+     * @since 0.1-1.16.4-fabric
+     */
+    @Inject(method = "renderMountHealth", at = @At(value = "TAIL"))
+    public void finishMountHealth(MatrixStack stack, CallbackInfo callbackInfo)
+    {
+        /*
+         * Resets the color so that nothing else is bothered.
+         */
+        RenderSystem.color4f(1, 1, 1, 1F);
+    }
+
+    /**
+     * Determines whether or not to draw the hotbar.
+     *
+     * @param tickDelta
+     * @param matrices - The matrix drawing stack.
+     * @param callbackInfo
+     *
+     * @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)
+    {
+        if (EventBus.updateHotbar())
+        {
+            callbackInfo.cancel();
+        }
+    }
+
+    /**
+     * Makes the actual adjustment to the hotbar as needed.
+     *
+     * @param tickDelta
+     * @param matrices - The matrix drawing stack.
+     * @param callbackInfo
+     *
+     * @since 0.1-1.16.4-fabric
+     */
+    @Inject(method = "renderHotbar", at = @At(value = "INVOKE", target =
+            "Lcom/mojang/blaze3d/systems/RenderSystem;color4f(FFFF)V", shift
+            = At.Shift.AFTER))
+    public void adjustHotbar(float tickDelta,
+                             MatrixStack matrices,
+                             CallbackInfo callbackInfo)
+    {
+        EventBus.recolorHotbar();
+    }
+
+    /**
+     * Resets any changes from drawing the hotbar.
+     *
+     * @param tickDelta
+     * @param matrices - The matrix drawing stack.
+     * @param callbackInfo
+     *
+     * @since 0.1-1.16.4-fabric
+     */
+    @Inject(method = "renderHotbar", at = @At(value = "TAIL"))
+    public void finishHotbar(float tickDelta,
+                             MatrixStack matrices,
+                             CallbackInfo callbackInfo)
+    {
+        /*
+         * Resets the color so that nothing else is bothered.
+         */
+        RenderSystem.color4f(1, 1, 1, 1F);
+    }
+}

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

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

src/main/resources/META-INF/mods.toml

@@ -1,65 +0,0 @@
-# This is an example mods.toml file. It contains the data relating to the loading mods.
-# There are several mandatory fields (#mandatory), and many more that are optional (#optional).
-# The overall format is standard TOML format, v0.5.0.
-# Note that there are a couple of TOML lists in this file.
-# Find more information on toml format here:  https://github.com/toml-lang/toml
-# The name of the mod loader type to load - for regular FML @Mod mods it should be javafml
-modLoader="javafml" #mandatory
-# A version range to match for said mod loader - for regular FML @Mod it will be the forge version
-loaderVersion="[35,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
-# The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties.
-# Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here.
-license="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/fabric.mod.json

@@ -0,0 +1,37 @@
+{
+  "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://fabricmc.net/",
+    "sources": "https://github.com/FabricMC/fabric-example-mod"
+  },
+
+  "license": "GPL-3.0-only",
+  "icon": "assets/immersive_hud/icon.png",
+
+  "environment": "client",
+  "entrypoints": {
+    "main": [
+      "markil3.immersive_hud.Main"
+    ]
+  },
+  "mixins": [
+    {
+      "config": "modid.mixins.json",
+      "environment": "client"
+    }
+  ],
+
+  "depends": {
+    "fabricloader": ">=0.7.4",
+    "fabric": "*",
+    "minecraft": "1.16.x"
+  }
+}

src/main/resources/modid.mixins.json

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

src/main/resources/pack.mcmeta

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