Update gradle.properties

This is helpful if one is using Firework rockets to fly around the landscape.

.github/workflows/build.yml

@@ -12,9 +12,9 @@ jobs:
       matrix:
         # Use these Java versions
         java: [
-          1.8,  # Minimum supported by Minecraft
+          1.16,  # Minimum supported by Minecraft
-          11,   # Current Java LTS
+          16,   # Current Java LTS
-          15    # Latest version
+          16    # Latest version
         ]
         # and run on both Linux and Windows
         os: [ubuntu-20.04, windows-latest]

.gitignore

@@ -32,3 +32,5 @@ bin/
 
 run/
 /logs/
+local.properties
+remappedSrc/

build.gradle

@@ -1,10 +1,10 @@
 plugins {
-	id 'fabric-loom' version '0.5-SNAPSHOT'
+	id 'fabric-loom' version '0.8-SNAPSHOT'
 	id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_1_8
+sourceCompatibility = JavaVersion.VERSION_16
-targetCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_16
 
 archivesBaseName = project.archives_base_name
 version = project.mod_version + "-" + project.minecraft_version + "-fabric"
@@ -21,9 +21,8 @@ dependencies {
 	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
 	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
-	modApi "me.shedaniel.cloth:config-2:${project.cloth_version}"
+	modApi "me.shedaniel.cloth:cloth-config-fabric:${project.cloth_version}"
-	modApi "me.sargunvohra.mcmods:autoconfig1u:${project.autoconfig_version}"
+	modImplementation "com.terraformersmc:modmenu:${project.modmenu_version}"
-	modImplementation "io.github.prospector:modmenu:${project.modmenu_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.
@@ -44,13 +43,8 @@ tasks.withType(JavaCompile).configureEach {
 	// If Javadoc is generated, this must be specified in that task too.
 	it.options.encoding = "UTF-8"
 
-	// The Minecraft launcher currently installs Java 8 for users, so your mod probably wants to target Java 8 too
+	// Minecraft 1.17 (21w19a) upwards uses Java 16.
-	// JDK 9 introduced a new way of specifying this that will make sure no newer classes or methods are used.
+	it.options.release = 16
-	// We'll use that if it's available, but otherwise we'll use the older option.
-	def targetVersion = 8
-	if (JavaVersion.current().isJava9Compatible()) {
-		 it.options.release = targetVersion
-	}
 }
 
 java {

gradle.properties

@@ -3,13 +3,12 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version=1.15
+	minecraft_version=1.17
-	yarn_mappings=1.15+build.2
+	yarn_mappings=1.17+build.1
-	loader_version=0.11.2
+	loader_version=0.11.3
 
-cloth_version=2.9.3
+cloth_version=5.0.34
-modmenu_version=1.8.4+build.20
+modmenu_version=2.0.2
-autoconfig_version=2.2.0
 
 # Mod Properties
 	mod_version = 1.2

gradle/wrapper/gradle-wrapper.properties

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

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

@@ -1,19 +1,19 @@
 package markil3.immersive_hud;
 
+import static markil3.immersive_hud.Main.TICKS_PER_SECOND;
+
 import net.minecraft.item.Item;
 import net.minecraft.item.Items;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.registry.Registry;
 
-import me.sargunvohra.mcmods.autoconfig1u.AutoConfig;
-
-import static markil3.immersive_hud.Main.TICKS_PER_SECOND;
-
 import java.util.Arrays;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import me.shedaniel.autoconfig.AutoConfig;
+
 /**
  * Configuration manager of this mod, which reads from and writes to this mod's
  * configuration file.
@@ -107,7 +107,7 @@ public class ConfigManager
     {
         try
         {
-            if (Class.forName("me.sargunvohra.mcmods.autoconfig1u.AutoConfig") != null)
+            if (Class.forName("me.shedaniel.autoconfig.AutoConfig") != null)
             {
                 return AutoConfig.getConfigHolder(ConfigManagerCloth.class)
                         .getConfig();
@@ -194,7 +194,6 @@ public class ConfigManager
     {
         return this.crosshairTime;
     }
-
     /**
      * Checks whether the crosshairs should be hidden after a period of time.
      *
@@ -267,6 +266,16 @@ public class ConfigManager
         return Arrays.stream(ignoredItems).map(Registry.ITEM::get).collect(Collectors.toSet());
     }
 
+    /**
+     * Obtains a collection of items that won't cause hands and crosshairs to show when used.
+     *
+     * @return An array of identifiers.
+     */
+    public Identifier[] getIgnoredIdentifiers()
+    {
+        return this.ignoredItems;
+    }
+
     /**
      * Sets the time that the hands are allowed to display.
      *
@@ -348,6 +357,16 @@ public class ConfigManager
     {
         this.ignoredItems = Arrays.stream(items).map(Registry.ITEM::getId).toArray(Identifier[]::new);
     }
+
+    /**
+     * Sets which items won't cause the hands and crosshairs to show when used.
+     *
+     * @param items - A set of ignored items.
+     */
+    public void setIgnoredItems(String... items)
+    {
+        this.ignoredItems = Arrays.stream(items).map(Identifier::new).filter(i -> Registry.ITEM.getOrEmpty(i).isPresent()).toArray(Identifier[]::new);
+    }
 /**
      * Saves changes to this mod's configuration.
      */

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

@@ -1,13 +1,13 @@
 package markil3.immersive_hud;
 
-import me.sargunvohra.mcmods.autoconfig1u.ConfigData;
+import me.shedaniel.autoconfig.ConfigData;
-import me.sargunvohra.mcmods.autoconfig1u.annotation.Config;
+import me.shedaniel.autoconfig.annotation.Config;
 
 @Config(name = "immersive_hud")
 public class ConfigManagerCloth extends ConfigManager implements ConfigData
 {
     @Override
-    public void validatePostLoad() throws ConfigData.ValidationException
+    public void validatePostLoad() throws ValidationException
     {
         this.setMinHealth(this.getMinHealth());
     }

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

@@ -19,8 +19,8 @@ package markil3.immersive_hud;
 
 import net.fabricmc.api.ModInitializer;
 
-import me.sargunvohra.mcmods.autoconfig1u.AutoConfig;
+import me.shedaniel.autoconfig.AutoConfig;
-import me.sargunvohra.mcmods.autoconfig1u.serializer.Toml4jConfigSerializer;
+import me.shedaniel.autoconfig.serializer.Toml4jConfigSerializer;
 
 /**
  * The main entry point for the Immersive HUD mod.
@@ -37,7 +37,7 @@ public class Main implements ModInitializer
     {
         try
         {
-            if (Class.forName("me.sargunvohra.mcmods.autoconfig1u.AutoConfig") != null)
+            if (Class.forName("me.shedaniel.autoconfig.AutoConfig") != null)
             {
                 AutoConfig.register(ConfigManagerCloth.class,
                         Toml4jConfigSerializer::new);

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

@@ -1,11 +1,15 @@
 package markil3.immersive_hud;
 
-import net.minecraft.client.gui.screen.Screen;
+import com.terraformersmc.modmenu.api.ConfigScreenFactory;
+import com.terraformersmc.modmenu.api.ModMenuApi;
 
-import java.util.function.Function;
+import net.minecraft.item.Items;
+import net.minecraft.text.TranslatableText;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.InvalidIdentifierException;
+import net.minecraft.util.registry.Registry;
 
-import io.github.prospector.modmenu.api.ModMenuApi;
+import me.shedaniel.autoconfig.AutoConfig;
-import me.sargunvohra.mcmods.autoconfig1u.AutoConfig;
 import me.shedaniel.clothconfig2.api.ConfigBuilder;
 import me.shedaniel.clothconfig2.api.ConfigCategory;
 import me.shedaniel.clothconfig2.api.ConfigEntryBuilder;
@@ -13,6 +17,10 @@ import me.shedaniel.clothconfig2.gui.entries.DoubleListEntry;
 
 import static markil3.immersive_hud.Main.TICKS_PER_SECOND;
 
+import java.util.Arrays;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
 public class ModMenu implements ModMenuApi
 {
 
@@ -25,38 +33,44 @@ public class ModMenu implements ModMenuApi
         final float FADE_OUT = 0.5F;
 
         DoubleListEntry maxTime =
-                entryBuilder.startDoubleField("option.immersive_hud." + name +
+                entryBuilder.startDoubleField(new TranslatableText(
-                                "MaxTime",
+                                "option.immersive_hud." + name +
+                                        "MaxTime"),
                         (float) value.getMaxTime() / TICKS_PER_SECOND)
                         .setDefaultValue(SHOW_TIME)
                         .setMin(0)
                         .setMax(10 * 60 * TICKS_PER_SECOND) // 10 Minutes
-                        .setTooltip("tooltip.immersive_hud." + name +
+                        .setTooltip(new TranslatableText(
-                                "MaxTime")
+                                "tooltip.immersive_hud." + name +
+                                        "MaxTime"))
                         .setSaveConsumer(val -> value.setMaxTime((int) (val * TICKS_PER_SECOND)))
                         .build();
 
         DoubleListEntry fadeIn =
-                entryBuilder.startDoubleField("option.immersive_hud." + name +
+                entryBuilder.startDoubleField(new TranslatableText(
-                                "FadeIn",
+                                "option.immersive_hud." + name +
+                                        "FadeIn"),
                         (float) value.getFadeInTime() / TICKS_PER_SECOND)
                         .setDefaultValue(FADE_IN)
                         .setMin(0)
                         .setMax(10 * 60 * TICKS_PER_SECOND)
-                        .setTooltip("tooltip.immersive_hud." + name +
+                        .setTooltip(new TranslatableText(
-                                "FadeIn")
+                                "tooltip.immersive_hud." + name +
+                                        "FadeIn"))
                         .setSaveConsumer(val -> value.setFadeInTime((int) (val * TICKS_PER_SECOND)))
                         .build();
 
         DoubleListEntry fadeOut =
-                entryBuilder.startDoubleField("option.immersive_hud." + name +
+                entryBuilder.startDoubleField(new TranslatableText(
-                                "FadeOut",
+                                "option.immersive_hud." + name +
+                                        "FadeOut"),
                         (float) value.getFadeOutTime() / TICKS_PER_SECOND)
                         .setDefaultValue(FADE_OUT)
                         .setMin(0)
                         .setMax(10 * 60 * TICKS_PER_SECOND)
-                        .setTooltip("tooltip.immersive_hud." + name +
+                        .setTooltip(new TranslatableText(
-                                "FadeOut")
+                                "tooltip.immersive_hud." + name +
+                                        "FadeOut"))
                         .setSaveConsumer(val -> value.setFadeOutTime((int) (val * TICKS_PER_SECOND)))
                         .build();
 
@@ -66,13 +80,7 @@ public class ModMenu implements ModMenuApi
     }
 
     @Override
-    public String getModId()
+    public ConfigScreenFactory<?> getModConfigScreenFactory()
-    {
-        return "immersive_hud";
-    }
-
-    @Override
-    public Function<Screen, ? extends Screen> getConfigScreenFactory()
     {
         return screen -> {
             ConfigCategory general;
@@ -80,17 +88,15 @@ public class ModMenu implements ModMenuApi
             ConfigManager instance = ConfigManager.getInstance();
             final ConfigBuilder builder = ConfigBuilder.create()
                     .setParentScreen(screen)
-                    .setTitle("immersive_hud.configGui.title")
+                    .setTitle(new TranslatableText(
+                            "immersive_hud.configGui.title"))
                     .setSavingRunnable(() -> {
                         try
                         {
-                            if (Class.forName(
+                            if (Class.forName("me.shedaniel.autoconfig.AutoConfig") != null)
-                                    "me.sargunvohra.mcmods.autoconfig1u" +
-                                            ".AutoConfig") != null)
                             {
-                                ((me.sargunvohra.mcmods.autoconfig1u.ConfigManager<ConfigManagerCloth>) AutoConfig
+                                AutoConfig.getConfigHolder(ConfigManagerCloth.class)
-                                        .getConfigHolder(
+                                        .save();
-                                                ConfigManagerCloth.class)).save();
                             }
                         }
                         catch (ClassNotFoundException e)
@@ -99,8 +105,8 @@ public class ModMenu implements ModMenuApi
                         }
                     });
             general =
-                    builder.getOrCreateCategory("category.immersive_hud" +
+                    builder.getOrCreateCategory(new TranslatableText(
-                            ".general");
+                            "category.immersive_hud.general"));
             entryBuilder = builder.entryBuilder();
 
             startTimeField("hotbar", entryBuilder,
@@ -122,62 +128,96 @@ public class ModMenu implements ModMenuApi
                     general,
                     instance.getPotionTime());
 
-            general.addEntry(entryBuilder.startDoubleField(
+            general.addEntry(entryBuilder.startDoubleField(new TranslatableText(
-                    "option.immersive_hud.crosshairTime",
+                            "option.immersive_hud" +
+                                    ".crosshairTime"),
                     (float) instance.getCrosshairTime() / TICKS_PER_SECOND)
                     .setDefaultValue(6)
-                    .setTooltip("tooltip.immersive_hud.crosshairTime")
+                    .setTooltip(new TranslatableText(
+                            "tooltip.immersive_hud" +
+                                    ".crosshairTime"))
                     .setSaveConsumer(val -> instance.setCrosshairTime((int) (val * TICKS_PER_SECOND)))
                     .build());
 
-            general.addEntry(entryBuilder.startBooleanToggle(
+            general.addEntry(entryBuilder.startBooleanToggle(new TranslatableText(
-                            "option.immersive_hud.hideCrosshair",
+                            "option.immersive_hud.hideCrosshair"),
                     instance.hideCrosshair())
                     .setDefaultValue(true)
-                    .setTooltip("tooltip.immersive_hud.hideCrosshair")
+                    .setTooltip(new TranslatableText(
+                            "tooltip.immersive_hud.hideCrosshair"))
                     .setSaveConsumer(val -> instance.hideCrosshair(val))
                     .build());
 
-            general.addEntry(entryBuilder.startDoubleField(
+            general.addEntry(entryBuilder.startDoubleField(new TranslatableText(
-                    "option.immersive_hud.handTime",
+                            "option.immersive_hud.handTime"),
                     (float) instance.getHandTime() / TICKS_PER_SECOND)
                     .setDefaultValue(30)
-                    .setTooltip("tooltip.immersive_hud.handTime")
+                    .setTooltip(new TranslatableText(
+                            "tooltip.immersive_hud.handTime"))
                     .setSaveConsumer(val -> instance.setHandTime((int) (val * TICKS_PER_SECOND)))
                     .build());
 
-            general.addEntry(entryBuilder.startBooleanToggle(
+            general.addEntry(entryBuilder.startBooleanToggle(new TranslatableText(
-                    "option.immersive_hud.hideHands",
+                            "option.immersive_hud.hideHands"),
                     instance.hideHands())
                     .setDefaultValue(true)
-                    .setTooltip("tooltip.immersive_hud.hideHands")
+                    .setTooltip(new TranslatableText(
+                            "tooltip.immersive_hud.hideHands"))
                     .setSaveConsumer(val -> instance.hideHands(val))
                     .build());
 
-            general.addEntry(entryBuilder.startDoubleField(
+            general.addEntry(entryBuilder.startDoubleField(new TranslatableText(
-                    "option.immersive_hud.minHealth",
+                            "option.immersive_hud.minHealth"),
                     instance.getMinHealth())
                     .setDefaultValue(0.5)
-                    .setTooltip("tooltip.immersive_hud.minHealth")
+                    .setTooltip(new TranslatableText(
+                            "tooltip.immersive_hud.minHealth"))
                     .setSaveConsumer(val -> instance.setMinHealth(val))
                     .build());
 
-            general.addEntry(entryBuilder.startIntField(
+            general.addEntry(entryBuilder.startIntField(new TranslatableText(
-                    "option.immersive_hud.minHunger",
+                            "option.immersive_hud.minHunger"),
                     instance.getMinHunger())
                     .setDefaultValue(17)
-                    .setTooltip("tooltip.immersive_hud.minHunger")
+                    .setTooltip(new TranslatableText(
+                            "tooltip.immersive_hud.minHunger"))
                     .setSaveConsumer(val -> instance.setMinHunger(val))
                     .build());
 
-            general.addEntry(entryBuilder.startBooleanToggle(
+            general.addEntry(entryBuilder.startBooleanToggle(new TranslatableText(
-                    "option.immersive_hud.showArmor",
+                            "option.immersive_hud.showArmor"),
                     instance.shouldShowArmor())
                     .setDefaultValue(true)
-                    .setTooltip("tooltip.immersive_hud.showArmor")
+                    .setTooltip(new TranslatableText(
+                            "tooltip.immersive_hud.showArmor"))
                     .setSaveConsumer(val -> instance.shouldShowArmor(val))
                     .build());
 
+            general.addEntry(entryBuilder
+                    .startStrList(new TranslatableText("option.immersive_hud.ignoreList"), Arrays
+                            .asList(instance
+                                    .getIgnoredIdentifiers()).stream().map(Identifier::toString)
+                            .collect(Collectors.toList()))
+                    .setDefaultValue(Arrays
+                            .asList(Registry.ITEM.getId(Items.FIREWORK_ROCKET).toString()))
+                    .setTooltip(new TranslatableText("tooltip.immersive_hud.ignoreList"))
+                    .setSaveConsumer(val -> instance.setIgnoredItems(val.toArray(new String[0]))).setErrorSupplier(val -> {
+                        try
+                        {
+                            Optional<String> item = val.stream().filter(i -> !Registry.ITEM.getOrEmpty(new Identifier(i)).isPresent()).findFirst();
+                            if (item.isPresent())
+                            {
+                                return Optional.of(new TranslatableText("error.immersive_hud.ignoreList.unknownItem"));
+                            }
+                        }
+                        catch (InvalidIdentifierException e)
+                        {
+                            return Optional.of(new TranslatableText("error.immersive_hud.ignoreList.illegalId"));
+                        }
+                        return Optional.empty();
+                    })
+                    .build());
+
             return builder.build();
         };
     }

src/main/java/markil3/immersive_hud/TimerUtils.java

@@ -55,7 +55,7 @@ import java.util.Set;
  * 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
 {
@@ -174,7 +174,7 @@ public class TimerUtils
      */
     public static void setAlpha(float alpha)
     {
-        RenderSystem.color4f(1.0F, 1.0F, 1.0F, alpha);
+        RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, alpha);
     }
 
     /**
@@ -290,6 +290,7 @@ public class TimerUtils
      *
      * @param hand - The hand being triggered
      * @param clear - Whether the hand it being enabled or disabled.
+     *
      * @since 0.1-1.16.4-fabric
      */
     public static void onClick(Hand hand, boolean clear)
@@ -361,6 +362,10 @@ public class TimerUtils
                                                     0);
             }
         }
+        else
+        {
+            System.out.println("Unusing hand " + hand);
+        }
     }
 
     /**
@@ -369,7 +374,9 @@ public class TimerUtils
      *
      * @param hand - The hand being rendered.
      * @param matrixStack - The rendering stack.
+     *
      * @return If true, then don't render this hand at all.
+     *
      * @since 0.1-1.16.4-fabric
      */
     public static boolean onRenderHand(Hand hand,
@@ -435,6 +442,7 @@ public class TimerUtils
      * needed.
      *
      * @return If true, then cancel drawing the crosshair.
+     *
      * @since 0.1-1.16.4-fabric
      */
     public static boolean drawCrosshair(float ticks)
@@ -491,9 +499,10 @@ public class TimerUtils
      * as needed.
      *
      * @return If true, then cancel drawing the mount health bar.
+     *
      * @since 0.1-1.16.4-fabric
      */
-    public static boolean drawMountHealth(float ticks)
+    public static boolean drawMountHealth(MatrixStack stack, float ticks)
     {
         /*
          * When the health percentage falls to this level or below, the
@@ -525,9 +534,9 @@ public class TimerUtils
                 mountHealth = mount.getHealth();
                 changed = true;
             }
-            if (mountMaxHealth != mount.getMaximumHealth())
+            if (mountMaxHealth != mount.getMaxHealth())
             {
-                mountMaxHealth = mount.getMaximumHealth();
+                mountMaxHealth = mount.getMaxHealth();
                 changed = true;
             }
         }
@@ -548,10 +557,10 @@ public class TimerUtils
          */
         if (mountHealth / mountMaxHealth > HEALTH_BOUNDARY)
         {
-            if (tmp != null && mountTime > 0)
+            if (mountTime > 0)
             {
-                RenderSystem.pushMatrix();
+                stack.push();
-                RenderSystem.translatef(0F,
+                stack.translate(0F,
                         getHealthTranslation(),
                         0F);
                 setAlpha(Main.getAlpha(mountTime,
@@ -562,8 +571,8 @@ public class TimerUtils
             }
             return true;
         }
-        RenderSystem.pushMatrix();
+        stack.push();
-        RenderSystem.translatef(0F,
+        stack.translate(0F,
                 getHealthTranslation(),
                 0F);
         return false;
@@ -622,6 +631,7 @@ public class TimerUtils
      * Obtains how transparent
      *
      * @param effectinstance
+     *
      * @return
      */
     public static float getPotionAlpha(StatusEffectInstance effectinstance)
@@ -633,8 +643,7 @@ public class TimerUtils
         if (effectinstance.getDuration() <= BLINK_TIME)
         {
             effectAlpha =
-                    MathHelper.sin(7000F / (effectinstance
+                    MathHelper.sin(7000F / (effectinstance.getDuration() + 16F * (float) Math.PI)) * 50F / (effectinstance
-                            .getDuration() + 16F * (float) Math.PI)) * 50F / (effectinstance
                             .getDuration() + 100F) + 0.5F;
         }
         else if (effectinstance.getDuration() <= BLINK_TIME + potion.getFadeInTime())
@@ -659,6 +668,7 @@ public class TimerUtils
      * needed.
      *
      * @return If true, then cancel drawing the armor bar.
+     *
      * @since 0.1-1.16.4-fabric
      */
     public static boolean drawArmor()
@@ -686,6 +696,7 @@ public class TimerUtils
      * needed.
      *
      * @return If true, then cancel drawing the health.
+     *
      * @since 0.1-1.16.4-fabric
      */
     public static boolean drawHealth(float ticks)
@@ -721,9 +732,9 @@ public class TimerUtils
             health = entity.getHealth();
             changed = true;
         }
-        if (maxHealth != entity.getMaximumHealth())
+        if (maxHealth != entity.getMaxHealth())
         {
-            maxHealth = entity.getMaximumHealth();
+            maxHealth = entity.getMaxHealth();
             changed = true;
         }
         if (changed)
@@ -761,6 +772,7 @@ public class TimerUtils
      * needed.
      *
      * @return If true, then cancel drawing the hunger bar.
+     *
      * @since 0.1-1.16.4-fabric
      */
     public static boolean drawHunger(float ticks)
@@ -838,10 +850,13 @@ public class TimerUtils
      * Determines whether or not to draw the horse jump bar, adjusting the alpha
      * as needed.
      *
+     * @param stack
+     *
      * @return If true, then cancel drawing the jump bar.
+     *
      * @since 0.1-1.16.4-fabric
      */
-    public static boolean drawJumpbar(float ticks)
+    public static boolean drawJumpbar(MatrixStack stack, float ticks)
     {
         ConfigManager.TimeValues jump =
                 ConfigManager.getInstance().getJumpTime();
@@ -857,7 +872,7 @@ public class TimerUtils
             return true;
         }
 
-        if (entity.method_3151() > 0)
+        if (entity.getMountJumpStrength() > 0)
         {
             jumpTime = jump.getMaxTime() - (jumpTime > 0 ?
                                             jump.getFadeInTime() :
@@ -869,8 +884,8 @@ public class TimerUtils
         }
         if (jumpTime > 0)
         {
-            RenderSystem.pushMatrix();
+            stack.push();
-            RenderSystem.translatef(0F, TimerUtils.getJumpTranslation(), 0F);
+            stack.translate(0F, TimerUtils.getJumpTranslation(), 0F);
             setAlpha(Main.getAlpha(jumpTime,
                     jump.getMaxTime(),
                     jump.getFadeInTime(),
@@ -885,9 +900,10 @@ public class TimerUtils
      * as needed.
      *
      * @return If true, then cancel drawing the experience bar.
+     *
      * @since 0.1-1.16.4-fabric
      */
-    public static boolean drawExperience(float ticks)
+    public static boolean drawExperience(MatrixStack stack, float ticks)
     {
         ConfigManager.TimeValues experience =
                 ConfigManager.getInstance().getExperienceTime();
@@ -922,10 +938,8 @@ public class TimerUtils
         }
         if (experienceTime > 0)
         {
-            RenderSystem.pushMatrix();
+            stack.push();
-            RenderSystem.translatef(0F,
+            stack.translate(0F, TimerUtils.getExperienceTranslation(), 0F);
-                    TimerUtils.getExperienceTranslation(),
-                    0F);
             setAlpha(Main.getAlpha(experienceTime,
                     experience.getMaxTime(),
                     experience.getFadeInTime(),
@@ -941,7 +955,8 @@ public class TimerUtils
      * or not to draw it.
      *
      * @return If true, then cancel drawing the hotbar.
-     * @see #recolorHotbar()
+     *
+     * @see #recolorHotbar(MatrixStack)
      * @since 0.1-1.16.4-fabric
      */
     public static boolean updateHotbar(float ticks)
@@ -1135,9 +1150,9 @@ public class TimerUtils
         /*
          * Checks for a change in what slot is used.
          */
-        if (selectedHotbarSlot != entity.inventory.selectedSlot)
+        if (selectedHotbarSlot != entity.getInventory().selectedSlot)
         {
-            selectedHotbarSlot = entity.inventory.selectedSlot;
+            selectedHotbarSlot = entity.getInventory().selectedSlot;
             mainHandTime = handTime;
             changed = true;
         }
@@ -1160,18 +1175,25 @@ 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()
+    public static void recolorHotbar(MatrixStack stack)
     {
         ConfigManager.TimeValues hotbar =
                 ConfigManager.getInstance().getHotbarTime();
-        RenderSystem.pushMatrix();
+//        RenderSystem.pushMatrix();
-        RenderSystem.translatef(0F, TimerUtils.getHotbarTranslation(), 0F);
+        stack.push();
+        stack.translate(0F, TimerUtils.getHotbarTranslation(), 0F);
         setAlpha(Main.getAlpha(hotbarTime,
                 hotbar.getMaxTime(),
                 hotbar.getFadeInTime(),
                 hotbar.getFadeOutTime()));
+        /*
+         * Update the hotbar item matrix
+         */
+        stack = RenderSystem.getModelViewStack();
+        stack.push();
+        stack.translate(0F, TimerUtils.getHotbarTranslation(), 0F);
+        RenderSystem.applyModelViewMatrix();
     }
 }

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

@@ -21,6 +21,7 @@ import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.hud.InGameHud;
 import net.minecraft.client.network.ClientPlayerEntity;
+import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.effect.StatusEffectInstance;
 
 import org.apache.logging.log4j.LogManager;
@@ -39,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
@@ -51,6 +52,7 @@ public class HudHook
     /**
      * Determines whether or not to draw the crosshair.
      *
+     * @param stack - The matrix drawing stack.
      * @param callbackInfo
      *
      * @version 0.2-1.16.4-fabric
@@ -58,9 +60,8 @@ public class HudHook
      */
     @Inject(method = "renderCrosshair", at = @At(value = "HEAD"),
             cancellable = true)
-    public void startCrosshair(CallbackInfo callbackInfo)
+    public void startCrosshair(MatrixStack stack, CallbackInfo callbackInfo)
     {
-        LOGGER.debug("Starting crosshair");
         try
         {
             if (TimerUtils.drawCrosshair(MinecraftClient.getInstance()
@@ -73,7 +74,7 @@ public class HudHook
         {
             LOGGER.error(
                     "Error in running net.minecraft.client.gui.hud" +
-                            ".InGameHud#renderCrosshair " +
+                            ".InGameHud#startCrosshair " +
                             "event",
                     e);
         }
@@ -82,15 +83,15 @@ public class HudHook
     /**
      * Resets any changes from drawing the crosshair.
      *
+     * @param stack - The matrix drawing stack.
      * @param callbackInfo
      *
      * @version 0.2-1.16.4-fabric
      * @since 0.1-1.16.4-fabric
      */
     @Inject(method = "renderCrosshair", at = @At(value = "TAIL"))
-    public void finishCrosshair(CallbackInfo callbackInfo)
+    public void finishCrosshair(MatrixStack stack, CallbackInfo callbackInfo)
     {
-        LOGGER.debug("Finishing crosshair");
         try
         {
             /*
@@ -111,6 +112,7 @@ public class HudHook
     /**
      * Determines whether or not to draw the horse jump bar.
      *
+     * @param stack - The matrix drawing stack.
      * @param callbackInfo
      *
      * @version 0.2-1.16.4-fabric
@@ -118,13 +120,14 @@ public class HudHook
      */
     @Inject(method = "renderMountJumpBar", at = @At(value = "HEAD"),
             cancellable = true)
-    public void startJumpbar(int x, CallbackInfo callbackInfo)
+    public void startJumpbar(MatrixStack stack,
+                             int x,
+                             CallbackInfo callbackInfo)
     {
-        LOGGER.debug("Starting jumpbar");
         try
         {
-            if (TimerUtils.drawJumpbar(MinecraftClient.getInstance()
+            if (TimerUtils.drawJumpbar(stack,
-                    .getTickDelta()))
+                    MinecraftClient.getInstance().getTickDelta()))
             {
                 callbackInfo.cancel();
             }
@@ -142,20 +145,20 @@ public class HudHook
     /**
      * Resets any changes from drawing the horse jump bar.
      *
+     * @param stack - The matrix drawing stack.
      * @param callbackInfo
      *
      * @version 0.2-1.16.4-fabric
      * @since 0.1-1.16.4-fabric
      */
     @Inject(method = "renderMountJumpBar", at = @At(value = "TAIL"))
-    public void finishJumpbar(
+    public void finishJumpbar(MatrixStack stack,
                               int x,
                               CallbackInfo callbackInfo)
     {
-        LOGGER.debug("Finishing jumpbar");
         try
         {
-            RenderSystem.popMatrix();
+            stack.pop();
             /*
              * Resets the color so that nothing else is bothered.
              */
@@ -174,6 +177,7 @@ public class HudHook
     /**
      * Determines whether or not to draw the experience bar.
      *
+     * @param stack - The matrix drawing stack.
      * @param callbackInfo
      *
      * @version 0.2-1.16.4-fabric
@@ -181,13 +185,14 @@ public class HudHook
      */
     @Inject(method = "renderExperienceBar", at = @At(value = "HEAD"),
             cancellable = true)
-    public void startExperience(int x, CallbackInfo callbackInfo)
+    public void startExperience(MatrixStack stack,
+                                int x,
+                                CallbackInfo callbackInfo)
     {
-        LOGGER.debug("Starting experience bar");
         try
         {
-            if (TimerUtils.drawExperience(MinecraftClient.getInstance()
+            if (TimerUtils.drawExperience(stack,
-                    .getTickDelta()))
+                    MinecraftClient.getInstance().getTickDelta()))
             {
                 callbackInfo.cancel();
             }
@@ -205,18 +210,20 @@ public class HudHook
     /**
      * Resets any changes from drawing the experience bar.
      *
+     * @param stack - The matrix drawing stack.
      * @param callbackInfo
      *
      * @version 0.2-1.16.4-fabric
      * @since 0.1-1.16.4-fabric
      */
     @Inject(method = "renderExperienceBar", at = @At(value = "TAIL"))
-    public void finishExperience(int x, CallbackInfo callbackInfo)
+    public void finishExperience(MatrixStack stack,
+                                 int x,
+                                 CallbackInfo callbackInfo)
     {
-        LOGGER.debug("Finishing experience bar");
         try
         {
-            RenderSystem.popMatrix();
+            stack.pop();
             /*
              * Resets the color so that nothing else is bothered.
              */
@@ -236,16 +243,18 @@ public class HudHook
      * Changes the position of the status bars as the ones below them move up
      * and down.
      *
+     * @param stack - The matrix stack used.
+     *
      * @return The same matrix stack, with a new matrix pushed onto it.
      */
-    @Inject(method = "renderStatusBars", at = @At("HEAD"))
+    @ModifyVariable(method = "renderStatusBars(Lnet/minecraft/client/util" +
-    public void startStatus(CallbackInfo info)
+            "/math/MatrixStack;)V", at = @At("HEAD"))
+    public MatrixStack startStatus(MatrixStack stack)
     {
-        LOGGER.debug("Starting status bars");
         try
         {
-            RenderSystem.pushMatrix();
+            stack.push();
-            RenderSystem.translatef(0F, TimerUtils.getHealthTranslation(), 0F);
+            stack.translate(0F, TimerUtils.getHealthTranslation(), 0F);
         }
         catch (Exception e)
         {
@@ -255,20 +264,20 @@ public class HudHook
                             "event",
                     e);
         }
+        return stack;
     }
 
     /**
      * Adjusts the armor GUI.
      *
+     * @param matrices
      * @param callbackInfo
      */
-    @Inject(method = "renderStatusBars()V", at = @At(value = "INVOKE",
+    @Inject(method = "renderStatusBars(Lnet/minecraft/client/util" +
-            target = "Lnet" +
+            "/math/MatrixStack;)V", at = @At(value = "INVOKE", target = "Lnet" +
-                    "/minecraft/util/profiler/Profiler;push" +
+            "/minecraft/util/profiler/Profiler;push(Ljava/lang/String;)V"))
-                    "(Ljava/lang/String;)V"))
+    public void renderArmor(MatrixStack matrices, CallbackInfo callbackInfo)
-    public void renderArmor(CallbackInfo callbackInfo)
     {
-        LOGGER.debug("Rendering armor");
         try
         {
             if (TimerUtils.drawArmor())
@@ -289,16 +298,15 @@ public class HudHook
     /**
      * Adjusts the health GUI.
      *
+     * @param matrices
      * @param callbackInfo
      */
-    @Inject(method = "renderStatusBars()V", at = @At(value = "INVOKE",
+    @Inject(method = "renderStatusBars(Lnet/minecraft/client/util" +
-            target = "Lnet" +
+            "/math/MatrixStack;)V", at = @At(value = "INVOKE", target = "Lnet" +
-                    "/minecraft/util/profiler/Profiler;swap" +
+            "/minecraft/util/profiler/Profiler;swap(Ljava/lang/String;)V",
-                    "(Ljava/lang/String;)V",
             ordinal = 0))
-    public void renderHealth(CallbackInfo callbackInfo)
+    public void renderHealth(MatrixStack matrices, CallbackInfo callbackInfo)
     {
-        LOGGER.debug("Rendering health");
         try
         {
             /*
@@ -324,15 +332,15 @@ public class HudHook
     /**
      * Adjusts the food GUI.
      *
+     * @param matrices
      * @param callbackInfo
      */
-    @Inject(method = "renderStatusBars()V", at = @At(value = "INVOKE",
+    @Inject(method = "renderStatusBars(Lnet/minecraft/client/util" +
-            target = "Lnet" +
+            "/math/MatrixStack;)V", at = @At(value = "INVOKE", target = "Lnet" +
             "/minecraft/util/profiler/Profiler;swap(Ljava/lang/String;)V",
             ordinal = 1, shift = At.Shift.BY, by = 3))
-    public void renderFood(CallbackInfo callbackInfo)
+    public void renderFood(MatrixStack matrices, CallbackInfo callbackInfo)
     {
-        LOGGER.debug("Rendering food");
         try
         {
             /*
@@ -358,15 +366,15 @@ public class HudHook
     /**
      * Resets the air GUI.
      *
+     * @param matrices
      * @param callbackInfo
      */
-    @Inject(method = "renderStatusBars()V", at = @At(value = "INVOKE",
+    @Inject(method = "renderStatusBars(Lnet/minecraft/client/util" +
-            target = "Lnet" +
+            "/math/MatrixStack;)V", at = @At(value = "INVOKE", target = "Lnet" +
             "/minecraft/util/profiler/Profiler;swap(Ljava/lang/String;)V",
             ordinal = 2))
-    public void renderAir(CallbackInfo callbackInfo)
+    public void renderAir(MatrixStack matrices, CallbackInfo callbackInfo)
     {
-        LOGGER.debug("Rendering air");
         try
         {
             /*
@@ -384,13 +392,13 @@ public class HudHook
         }
     }
 
-    @Inject(method = "renderStatusBars", at = @At("TAIL"))
+    @ModifyVariable(method = "renderStatusBars(Lnet/minecraft/client/util" +
-    public void finishStatus(CallbackInfo info)
+            "/math/MatrixStack;)V", at = @At("TAIL"))
+    public MatrixStack finishStatus(MatrixStack stack)
     {
-        LOGGER.debug("Finishing status bars");
         try
         {
-            RenderSystem.popMatrix();
+            stack.pop();
         }
         catch (Exception e)
         {
@@ -400,11 +408,13 @@ public class HudHook
                             "event",
                     e);
         }
+        return stack;
     }
 
     /**
      * Determines whether or not to draw the mount's health.
      *
+     * @param stack - The matrix drawing stack.
      * @param callbackInfo
      *
      * @version 0.2-1.16.4-fabric
@@ -412,19 +422,15 @@ public class HudHook
      */
     @Inject(method = "renderMountHealth", at = @At(value = "HEAD"),
             cancellable = true)
-    public void startMountHealth(CallbackInfo callbackInfo)
+    public void startMountHealth(MatrixStack stack, CallbackInfo callbackInfo)
     {
         try
         {
-            if (TimerUtils.drawMountHealth(MinecraftClient.getInstance()
+            if (TimerUtils.drawMountHealth(stack,
-                    .getTickDelta()))
+                    MinecraftClient.getInstance().getTickDelta()))
             {
                 callbackInfo.cancel();
             }
-            else
-            {
-                LOGGER.debug("Starting mount health");
-            }
         }
         catch (Exception e)
         {
@@ -439,21 +445,21 @@ public class HudHook
     /**
      * Resets any changes from drawing the mount's health.
      *
+     * @param stack - The matrix drawing stack.
      * @param callbackInfo
      *
      * @version 0.2-1.16.4-fabric
      * @since 0.1-1.16.4-fabric
      */
     @Inject(method = "renderMountHealth", at = @At(value = "TAIL"))
-    public void finishMountHealth(CallbackInfo callbackInfo)
+    public void finishMountHealth(MatrixStack stack, CallbackInfo callbackInfo)
     {
-        LOGGER.debug("Finishing mount health");
         try
         {
             /*
              * Resets the color so that nothing else is bothered.
              */
-            RenderSystem.popMatrix();
+            stack.pop();
             TimerUtils.resetAlpha();
         }
         catch (Exception e)
@@ -472,11 +478,11 @@ public class HudHook
      * @version 0.2-1.16.4-fabric
      * @since 0.1-1.16.4-fabric
      */
-    @Inject(method = "renderStatusEffectOverlay()V", at =
+    @Inject(method = "renderStatusEffectOverlay" +
+            "(Lnet/minecraft/client/util/math/MatrixStack;)V", at =
     @At(value = "HEAD", shift = At.Shift.AFTER))
-    public void startPotion(CallbackInfo info)
+    public void startPotion(MatrixStack effect, CallbackInfo info)
     {
-        LOGGER.debug("Starting potions");
         try
         {
             TimerUtils.updatePotions(MinecraftClient.getInstance().cameraEntity instanceof ClientPlayerEntity ?
@@ -499,14 +505,14 @@ public class HudHook
      * @version 0.2-1.16.4-fabric
      * @since 0.1-1.16.4-fabric
      */
-    @Redirect(method = "renderStatusEffectOverlay()V", at =
+    @Redirect(method = "renderStatusEffectOverlay" +
+            "(Lnet/minecraft/client/util/math/MatrixStack;)V", at =
     @At(value = "INVOKE",
             target =
                     "Lnet/minecraft/entity/effect/StatusEffectInstance;" +
                             "shouldShowIcon()Z"))
     public boolean shouldRenderPotion(StatusEffectInstance effect)
     {
-        LOGGER.debug("Updating potions");
         try
         {
             currentEffect = effect;
@@ -528,15 +534,17 @@ public class HudHook
      * Makes the actual adjustment to the hotbar as needed.
      *
      * @param f - The original transparency
+     * @param stack - The matrix stack
      *
      * @version 0.2-1.16.4-fabric
      * @since 0.1-1.16.4-fabric
      */
-    @ModifyVariable(method = "renderStatusEffectOverlay()V", at =
+    @ModifyVariable(method = "renderStatusEffectOverlay" +
+            "(Lnet/minecraft/client/util/math/MatrixStack;)V", at =
     @At(value = "STORE"))
-    public float updatePotion(float f)
+    public float updatePotion(float f,
+                              MatrixStack stack)
     {
-        LOGGER.debug("Adjusting potions");
         try
         {
             return TimerUtils.getPotionAlpha(currentEffect);
@@ -555,15 +563,16 @@ public class HudHook
     /**
      * Resets any changes from drawing the potion effects.
      *
+     * @param matrices - The matrix drawing stack.
      * @param callbackInfo
      *
      * @version 0.2-1.16.4-fabric
      * @since 0.2-1.16.4-fabric
      */
     @Inject(method = "renderStatusEffectOverlay", at = @At(value = "TAIL"))
-    public void finishPotion(CallbackInfo callbackInfo)
+    public void finishPotion(MatrixStack matrices,
+                             CallbackInfo callbackInfo)
     {
-        LOGGER.debug("Finishing potions");
         try
         {
             /*
@@ -585,6 +594,7 @@ public class HudHook
      * Determines whether or not to draw the hotbar.
      *
      * @param tickDelta
+     * @param matrices - The matrix drawing stack.
      * @param callbackInfo
      *
      * @version 0.2-1.16.4-fabric
@@ -593,9 +603,9 @@ public class HudHook
     @Inject(method = "renderHotbar", at = @At(value = "HEAD"), cancellable =
             true)
     public void startHotbar(float tickDelta,
+                            MatrixStack matrices,
                             CallbackInfo callbackInfo)
     {
-        LOGGER.debug("Starting hotbar");
         try
         {
             if (TimerUtils.updateHotbar(tickDelta))
@@ -617,21 +627,22 @@ public class HudHook
      * Makes the actual adjustment to the hotbar as needed.
      *
      * @param tickDelta
+     * @param matrices - The matrix drawing stack.
      * @param callbackInfo
      *
      * @version 0.2-1.16.4-fabric
      * @since 0.1-1.16.4-fabric
      */
     @Inject(method = "renderHotbar", at = @At(value = "INVOKE", target =
-            "Lcom/mojang/blaze3d/systems/RenderSystem;color4f(FFFF)V", shift
+            "Lcom/mojang/blaze3d/systems/RenderSystem;setShaderColor(FFFF)V", shift
             = At.Shift.AFTER))
     public void adjustHotbar(float tickDelta,
+                             MatrixStack matrices,
                              CallbackInfo callbackInfo)
     {
-        LOGGER.debug("Adjusting hotbar");
         try
         {
-            TimerUtils.recolorHotbar();
+            TimerUtils.recolorHotbar(matrices);
         }
         catch (Exception e)
         {
@@ -647,19 +658,23 @@ public class HudHook
      * Resets any changes from drawing the hotbar.
      *
      * @param tickDelta
+     * @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"))
     public void finishHotbar(float tickDelta,
+                             MatrixStack stack,
                              CallbackInfo callbackInfo)
     {
-        LOGGER.debug("Finishing hotbar");
         try
         {
-            RenderSystem.popMatrix();
+            stack.pop();
+            stack = RenderSystem.getModelViewStack();
+            stack.pop();
+            RenderSystem.applyModelViewMatrix();
             /*
              * Resets the color so that nothing else is bothered.
              */
@@ -668,7 +683,8 @@ public class HudHook
         catch (Exception e)
         {
             LOGGER.error(
-                    "Error in running net.minecraft.client.gui.hud.InGameHud#renderHotbar " +
+                    "Error in running net.minecraft.client.gui.hud" +
+                            ".InGameHud#renderHotbar " +
                             "event",
                     e);
         }

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

@@ -25,6 +25,7 @@
   "option.immersive_hud.minHealth": "Minimum Health Fade",
   "option.immersive_hud.minHunger": "Minimum Hunger Fade",
   "option.immersive_hud.showArmor": "Show Armor",
+  "option.immersive_hud.ignoreList": "Ignored Items",
   "tooltip.immersive_hud.hotbarMaxTime": "How long the hotbar can be displayed on screen in seconds",
   "tooltip.immersive_hud.hotbarFadeIn": "How many seconds it takes for the hotbar to fade in",
   "tooltip.immersive_hud.hotbarFadeOut": "How many seconds it takes for the hotbar to move out",
@@ -49,5 +50,8 @@
   "tooltip.immersive_hud.hideHands": "Whether or not hands should be hidden after a period of time",
   "tooltip.immersive_hud.minHealth": "When the percentage of health goes below this level, the health bar won't fade away",
   "tooltip.immersive_hud.minHunger": "When the hunger level goes below this level, the hunger bar won't fade away",
-  "tooltip.immersive_hud.showArmor": "Whether or not the armor bar should display on the HUD"
+  "tooltip.immersive_hud.showArmor": "Whether or not the armor bar should display on the HUD",
+  "tooltip.immersive_hud.ignoreList": "Which items will not trigger the arm and crosshairs when used",
+  "error.immersive_hud.ignoreList.unknownItem": "Unknown item %s",
+  "error.immersive_hud.ignoreList.illegalId": "%s is not a legal item identifier"
 }

src/main/resources/fabric.mod.json

@@ -34,8 +34,9 @@
   ],
 
   "depends": {
-    "fabricloader": ">=0.7.4",
+    "fabricloader": ">=0.11.3",
-    "minecraft": "1.15.x"
+    "minecraft": "1.17.x",
+    "java": ">=16"
   },
   "suggests": {
     "modmenu": "*",

src/main/resources/immersive_hud.mixins.json

@@ -2,7 +2,7 @@
   "required": true,
   "minVersion": "0.8",
   "package": "markil3.immersive_hud.mixin",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_16",
   "mixins": [
   ],
   "client": [