From 4d1cf0d9e2e4e62e1dd18290a49081ee1ed82b41 Mon Sep 17 00:00:00 2001
From: Markil3 <75867393+Markil3@users.noreply.github.com>
Date: Fri, 18 Jun 2021 08:46:06 -0600
Subject: [PATCH] Fixes the inventory items not moving properly.

---
 demo.gif                                            | Bin
 screenshot1.png                                     | Bin
 screenshot2.png                                     | Bin
 screenshot3.png                                     | Bin
 screenshot4.png                                     | Bin
 screenshot5.png                                     | Bin
 src/main/java/markil3/immersive_hud/TimerUtils.java |  11 ++++++++---
 .../java/markil3/immersive_hud/mixin/HudHook.java   |   7 +++++--
 src/main/resources/assets/immersive_hud/icon.png    | Bin
 .../resources/assets/immersive_hud/lang/en_us.json  |   0
 10 files changed, 13 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 demo.gif
 mode change 100644 => 100755 screenshot1.png
 mode change 100644 => 100755 screenshot2.png
 mode change 100644 => 100755 screenshot3.png
 mode change 100644 => 100755 screenshot4.png
 mode change 100644 => 100755 screenshot5.png
 mode change 100644 => 100755 src/main/resources/assets/immersive_hud/icon.png
 mode change 100644 => 100755 src/main/resources/assets/immersive_hud/lang/en_us.json

diff --git a/demo.gif b/demo.gif
old mode 100644
new mode 100755
diff --git a/screenshot1.png b/screenshot1.png
old mode 100644
new mode 100755
diff --git a/screenshot2.png b/screenshot2.png
old mode 100644
new mode 100755
diff --git a/screenshot3.png b/screenshot3.png
old mode 100644
new mode 100755
diff --git a/screenshot4.png b/screenshot4.png
old mode 100644
new mode 100755
diff --git a/screenshot5.png b/screenshot5.png
old mode 100644
new mode 100755
diff --git a/src/main/java/markil3/immersive_hud/TimerUtils.java b/src/main/java/markil3/immersive_hud/TimerUtils.java
index 6135f2e..9fefeb1 100755
--- a/src/main/java/markil3/immersive_hud/TimerUtils.java
+++ b/src/main/java/markil3/immersive_hud/TimerUtils.java
@@ -54,7 +54,7 @@ import java.util.Optional;
  * Contains the logic for changing the HUD.
  *
  * @author Markil 3
- * @version 0.1-1.16.4-fabric
+ * @version 1.1.1-1.17-fabric
  */
 public class TimerUtils
 {
@@ -1150,8 +1150,6 @@ public class TimerUtils
      * Determines whether or not to draw the crosshair, adjusting the alpha as
      * needed.
      *
-     * @return If true, then cancel drawing the crosshair.
-     *
      * @since 0.1-1.16.4-fabric
      */
     public static void recolorHotbar(MatrixStack stack)
@@ -1165,5 +1163,12 @@ public class TimerUtils
                 hotbar.getMaxTime(),
                 hotbar.getFadeInTime(),
                 hotbar.getFadeOutTime()));
+        /*
+         * Update the hotbar item matrix
+         */
+        stack = RenderSystem.getModelViewStack();
+        stack.push();
+        stack.translate(0F, TimerUtils.getHotbarTranslation(), 0F);
+        RenderSystem.applyModelViewMatrix();
     }
 }
diff --git a/src/main/java/markil3/immersive_hud/mixin/HudHook.java b/src/main/java/markil3/immersive_hud/mixin/HudHook.java
index 0c73970..7f440cb 100755
--- a/src/main/java/markil3/immersive_hud/mixin/HudHook.java
+++ b/src/main/java/markil3/immersive_hud/mixin/HudHook.java
@@ -40,7 +40,7 @@ import markil3.immersive_hud.TimerUtils;
  * that most of the logic can be found in {@link TimerUtils}.
  *
  * @author Markil 3
- * @version 0.1-1.16.4-fabric
+ * @version 1.1.1-1.17-fabric
  */
 @Mixin(InGameHud.class)
 public class HudHook
@@ -661,7 +661,7 @@ public class HudHook
      * @param stack - The matrix drawing stack.
      * @param callbackInfo
      *
-     * @version 0.2-1.16.4-fabric
+     * @version 1.1.1-1.17-fabric
      * @since 0.1-1.16.4-fabric
      */
     @Inject(method = "renderHotbar", at = @At(value = "TAIL"))
@@ -672,6 +672,9 @@ public class HudHook
         try
         {
             stack.pop();
+            stack = RenderSystem.getModelViewStack();
+            stack.pop();
+            RenderSystem.applyModelViewMatrix();
             /*
              * Resets the color so that nothing else is bothered.
              */
diff --git a/src/main/resources/assets/immersive_hud/icon.png b/src/main/resources/assets/immersive_hud/icon.png
old mode 100644
new mode 100755
diff --git a/src/main/resources/assets/immersive_hud/lang/en_us.json b/src/main/resources/assets/immersive_hud/lang/en_us.json
old mode 100644
new mode 100755