Sets up for Fabric 1.14

Note that we had to remove the modmenu and cloth APIs, since we couldn't figure out how to get the dependency mess to work. Maybe we will fix it later, but at least the .toml config file still works.

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '0.5-SNAPSHOT'
+	id 'fabric-loom' version '0.6-SNAPSHOT'
 	id 'maven-publish'
 }
 
@@ -21,8 +21,9 @@ dependencies {
 	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
 	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
-	modApi "me.shedaniel.cloth:cloth-config-fabric:${project.cloth_version}"
-	modImplementation "com.terraformersmc:modmenu:${project.modmenu_version}"
+//	modApi "me.shedaniel.cloth:config-2:${project.cloth_version}"
+	modApi "me.sargunvohra.mcmods:autoconfig1u:${project.autoconfig_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.

gradle.properties

@@ -3,12 +3,13 @@ org.gradle.jvmargs=-Xmx1G
 
 # 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
+	minecraft_version=1.14.3
+	yarn_mappings=1.14.3+build.13
+	loader_version=0.11.2
 
-cloth_version=4.11.14
-modmenu_version=1.16.8
+cloth_version=2.9.3
+modmenu_version=1.6.3-95
+autoconfig_version=2.2.0
 
 # Mod Properties
 	mod_version = 1.0

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

@@ -2,7 +2,9 @@ package markil3.immersive_hud;
 
 import net.minecraft.util.math.MathHelper;
 
-import me.shedaniel.autoconfig.AutoConfig;
+//import me.sargunvohra.mcmods.autoconfig1u.AutoConfig;
+
+import me.sargunvohra.mcmods.autoconfig1u.AutoConfig;
 
 import static markil3.immersive_hud.Main.TICKS_PER_SECOND;
 
@@ -96,7 +98,7 @@ public class ConfigManager
     {
         try
         {
-            if (Class.forName("me.shedaniel.autoconfig.AutoConfig") != null)
+            if (Class.forName("me.sargunvohra.mcmods.autoconfig1u.AutoConfig") != null)
             {
                 return AutoConfig.getConfigHolder(ConfigManagerCloth.class)
                         .getConfig();

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

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

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

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

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

@@ -1,173 +0,0 @@
-package markil3.immersive_hud;
-
-import com.terraformersmc.modmenu.api.ConfigScreenFactory;
-import com.terraformersmc.modmenu.api.ModMenuApi;
-
-import net.minecraft.text.TranslatableText;
-
-import me.shedaniel.autoconfig.AutoConfig;
-import me.shedaniel.clothconfig2.api.ConfigBuilder;
-import me.shedaniel.clothconfig2.api.ConfigCategory;
-import me.shedaniel.clothconfig2.api.ConfigEntryBuilder;
-import me.shedaniel.clothconfig2.gui.entries.DoubleListEntry;
-
-import static markil3.immersive_hud.Main.TICKS_PER_SECOND;
-
-public class ModMenu implements ModMenuApi
-{
-
-    private void startTimeField(String name, ConfigEntryBuilder entryBuilder,
-                                ConfigCategory cat,
-                                ConfigManager.TimeValues value)
-    {
-        final float SHOW_TIME = 6;
-        final float FADE_IN = 0.25F;
-        final float FADE_OUT = 0.5F;
-
-        DoubleListEntry maxTime =
-                entryBuilder.startDoubleField(new TranslatableText(
-                                "option.immersive_hud." + name +
-                                        "MaxTime"),
-                        (float) value.getMaxTime() / TICKS_PER_SECOND)
-                        .setDefaultValue(SHOW_TIME)
-                        .setMin(0)
-                        .setMax(10 * 60 * TICKS_PER_SECOND) // 10 Minutes
-                        .setTooltip(new TranslatableText(
-                                "tooltip.immersive_hud." + name +
-                                        "MaxTime"))
-                        .setSaveConsumer(val -> value.setMaxTime((int) (val * TICKS_PER_SECOND)))
-                        .build();
-
-        DoubleListEntry fadeIn =
-                entryBuilder.startDoubleField(new TranslatableText(
-                                "option.immersive_hud." + name +
-                                        "FadeIn"),
-                        (float) value.getFadeInTime() / TICKS_PER_SECOND)
-                        .setDefaultValue(FADE_IN)
-                        .setMin(0)
-                        .setMax(10 * 60 * TICKS_PER_SECOND)
-                        .setTooltip(new TranslatableText(
-                                "tooltip.immersive_hud." + name +
-                                        "FadeIn"))
-                        .setSaveConsumer(val -> value.setFadeInTime((int) (val * TICKS_PER_SECOND)))
-                        .build();
-
-        DoubleListEntry fadeOut =
-                entryBuilder.startDoubleField(new TranslatableText(
-                                "option.immersive_hud." + name +
-                                        "FadeOut"),
-                        (float) value.getFadeOutTime() / TICKS_PER_SECOND)
-                        .setDefaultValue(FADE_OUT)
-                        .setMin(0)
-                        .setMax(10 * 60 * TICKS_PER_SECOND)
-                        .setTooltip(new TranslatableText(
-                                "tooltip.immersive_hud." + name +
-                                        "FadeOut"))
-                        .setSaveConsumer(val -> value.setFadeOutTime((int) (val * TICKS_PER_SECOND)))
-                        .build();
-
-        cat.addEntry(maxTime);
-        cat.addEntry(fadeIn);
-        cat.addEntry(fadeOut);
-    }
-
-    @Override
-    public ConfigScreenFactory<?> getModConfigScreenFactory()
-    {
-        return screen -> {
-            ConfigCategory general;
-            ConfigEntryBuilder entryBuilder;
-            ConfigManager instance = ConfigManager.getInstance();
-            final ConfigBuilder builder = ConfigBuilder.create()
-                    .setParentScreen(screen)
-                    .setTitle(new TranslatableText(
-                            "immersive_hud.configGui.title"))
-                    .setSavingRunnable(() -> {
-                        try
-                        {
-                            if (Class.forName("me.shedaniel.autoconfig.AutoConfig") != null)
-                            {
-                                AutoConfig.getConfigHolder(ConfigManagerCloth.class)
-                                        .save();
-                            }
-                        }
-                        catch (ClassNotFoundException e)
-                        {
-                            // Do nothing
-                        }
-                    });
-            general =
-                    builder.getOrCreateCategory(new TranslatableText(
-                            "category.immersive_hud.general"));
-            entryBuilder = builder.entryBuilder();
-
-            startTimeField("hotbar", entryBuilder,
-                    general,
-                    instance.getHotbarTime());
-            startTimeField("experience", entryBuilder,
-                    general,
-                    instance.getExperienceTime());
-            startTimeField("jump", entryBuilder,
-                    general,
-                    instance.getJumpTime());
-            startTimeField("jump", entryBuilder,
-                    general,
-                    instance.getHealthTime());
-            startTimeField("hunger", entryBuilder,
-                    general,
-                    instance.getHungerTime());
-            startTimeField("effect", entryBuilder,
-                    general,
-                    instance.getPotionTime());
-
-            general.addEntry(entryBuilder.startDoubleField(new TranslatableText(
-                            "option.immersive_hud" +
-                                    ".crosshairTime"),
-                    (float) instance.getCrosshairTime() / TICKS_PER_SECOND)
-                    .setDefaultValue(6)
-                    .setTooltip(new TranslatableText(
-                            "tooltip.immersive_hud" +
-                                    ".crosshairTime"))
-                    .setSaveConsumer(val -> instance.setCrosshairTime((int) (val * TICKS_PER_SECOND)))
-                    .build());
-
-            general.addEntry(entryBuilder.startDoubleField(new TranslatableText(
-                            "option.immersive_hud.handTime"),
-                    (float) instance.getHandTime() / TICKS_PER_SECOND)
-                    .setDefaultValue(30)
-                    .setTooltip(new TranslatableText(
-                            "tooltip.immersive_hud.handTime"))
-                    .setSaveConsumer(val -> instance.setHandTime((int) (val * TICKS_PER_SECOND)))
-                    .build());
-
-            general.addEntry(entryBuilder.startDoubleField(new TranslatableText(
-                            "option.immersive_hud.minHealth"),
-                    instance.getMinHealth())
-                    .setDefaultValue(0.5)
-                    .setTooltip(new TranslatableText(
-                            "tooltip.immersive_hud.minHealth"))
-                    .setSaveConsumer(val -> instance.setMinHealth(val))
-                    .build());
-
-            general.addEntry(entryBuilder.startIntField(new TranslatableText(
-                            "option.immersive_hud.minHunger"),
-                    instance.getMinHunger())
-                    .setDefaultValue(17)
-                    .setTooltip(new TranslatableText(
-                            "tooltip.immersive_hud.minHunger"))
-                    .setSaveConsumer(val -> instance.setMinHunger(val))
-                    .build());
-
-            general.addEntry(entryBuilder.startBooleanToggle(new TranslatableText(
-                            "option.immersive_hud.showArmor"),
-                    instance.shouldShowArmor())
-                    .setDefaultValue(true)
-                    .setTooltip(new TranslatableText(
-                            "tooltip.immersive_hud.showArmor"))
-                    .setSaveConsumer(val -> instance.shouldShowArmor(val))
-                    .build());
-
-            return builder.build();
-        };
-    }
-}

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

@@ -16,11 +16,10 @@
  */
 package markil3.immersive_hud;
 
-import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.platform.GlStateManager;
 
 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.StatusEffect;
@@ -35,10 +34,11 @@ import net.minecraft.item.FilledMapItem;
 import net.minecraft.item.FishingRodItem;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.item.LingeringPotionItem;
 import net.minecraft.item.RangedWeaponItem;
 import net.minecraft.item.ShieldItem;
 import net.minecraft.item.SnowballItem;
-import net.minecraft.item.ThrowablePotionItem;
+import net.minecraft.item.SplashPotionItem;
 import net.minecraft.item.TridentItem;
 import net.minecraft.util.Hand;
 import net.minecraft.util.hit.EntityHitResult;
@@ -173,7 +173,7 @@ public class TimerUtils
      */
     public static void setAlpha(float alpha)
     {
-        RenderSystem.color4f(1.0F, 1.0F, 1.0F, alpha);
+        GlStateManager.color4f(1.0F, 1.0F, 1.0F, alpha);
     }
 
     /**
@@ -337,10 +337,6 @@ public class TimerUtils
                                                     0);
             }
         }
-        else
-        {
-            System.out.println("Unusing hand " + hand);
-        }
     }
 
     /**
@@ -348,14 +344,12 @@ public class TimerUtils
      * hands into and out of view as needed.
      *
      * @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,
-                                       MatrixStack matrixStack,
                                        float ticks)
     {
         final float HAND_UP_TIME = 20F;
@@ -375,10 +369,9 @@ public class TimerUtils
                 }
                 if (offHandTime < HAND_UP_TIME)
                 {
-                    matrixStack
-                            .translate(0,
-                                    -1.0F * (HAND_UP_TIME - offHandTime) /
-                                            HAND_UP_TIME,
+                    GlStateManager.translatef(0,
+                            (float) (-1.0F * (HAND_UP_TIME - offHandTime) /
+                                                                        HAND_UP_TIME),
                                     0);
                 }
             }
@@ -396,10 +389,9 @@ public class TimerUtils
                 }
                 if (mainHandTime < HAND_UP_TIME)
                 {
-                    matrixStack
-                            .translate(0,
-                                    -1.0F * (HAND_UP_TIME - mainHandTime) /
-                                            HAND_UP_TIME,
+                    GlStateManager.translatef(0,
+                            (float) (-1.0F * (HAND_UP_TIME - mainHandTime) /
+                                                                        HAND_UP_TIME),
                                     0);
                 }
             }
@@ -426,13 +418,13 @@ public class TimerUtils
         boolean changed = false;
         boolean canceled = false;
 
-        if (mc.crosshairTarget != null && mc.crosshairTarget
+        if (mc.hitResult != null && mc.hitResult
                 .getType() != HitResult.Type.MISS)
         {
-            if (mc.crosshairTarget.getType() == HitResult.Type
+            if (mc.hitResult.getType() == HitResult.Type
                     .ENTITY)
             {
-                if (((EntityHitResult) mc.crosshairTarget).getEntity() != entity
+                if (((EntityHitResult) mc.hitResult).getEntity() != entity
                         .getVehicle())
                 {
                     changed = true;
@@ -469,7 +461,7 @@ public class TimerUtils
      *
      * @since 0.1-1.16.4-fabric
      */
-    public static boolean drawMountHealth(MatrixStack stack, float ticks)
+    public static boolean drawMountHealth(float ticks)
     {
         /*
          * When the health percentage falls to this level or below, the
@@ -501,9 +493,9 @@ public class TimerUtils
                 mountHealth = mount.getHealth();
                 changed = true;
             }
-            if (mountMaxHealth != mount.getMaxHealth())
+            if (mountMaxHealth != mount.getHealthMaximum())
             {
-                mountMaxHealth = mount.getMaxHealth();
+                mountMaxHealth = mount.getHealthMaximum();
                 changed = true;
             }
         }
@@ -524,10 +516,10 @@ public class TimerUtils
          */
         if (mountHealth / mountMaxHealth > HEALTH_BOUNDARY)
         {
-            if (mountTime > 0)
+            if (tmp != null && mountTime > 0)
             {
-                stack.push();
-                stack.translate(0F,
+                GlStateManager.pushMatrix();
+                GlStateManager.translatef(0F,
                         getHealthTranslation(),
                         0F);
                 setAlpha(Main.getAlpha(mountTime,
@@ -538,8 +530,8 @@ public class TimerUtils
             }
             return true;
         }
-        stack.push();
-        stack.translate(0F,
+        GlStateManager.pushMatrix();
+        GlStateManager.translatef(0F,
                 getHealthTranslation(),
                 0F);
         return false;
@@ -699,9 +691,9 @@ public class TimerUtils
             health = entity.getHealth();
             changed = true;
         }
-        if (maxHealth != entity.getMaxHealth())
+        if (maxHealth != entity.getHealthMaximum())
         {
-            maxHealth = entity.getMaxHealth();
+            maxHealth = entity.getHealthMaximum();
             changed = true;
         }
         if (changed)
@@ -817,13 +809,11 @@ 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(MatrixStack stack, float ticks)
+    public static boolean drawJumpbar(float ticks)
     {
         ConfigManager.TimeValues jump =
                 ConfigManager.getInstance().getJumpTime();
@@ -851,8 +841,8 @@ public class TimerUtils
         }
         if (jumpTime > 0)
         {
-            stack.push();
-            stack.translate(0F, TimerUtils.getJumpTranslation(), 0F);
+            GlStateManager.pushMatrix();
+            GlStateManager.translatef(0F, TimerUtils.getJumpTranslation(), 0F);
             setAlpha(Main.getAlpha(jumpTime,
                     jump.getMaxTime(),
                     jump.getFadeInTime(),
@@ -870,7 +860,7 @@ public class TimerUtils
      *
      * @since 0.1-1.16.4-fabric
      */
-    public static boolean drawExperience(MatrixStack stack, float ticks)
+    public static boolean drawExperience(float ticks)
     {
         ConfigManager.TimeValues experience =
                 ConfigManager.getInstance().getExperienceTime();
@@ -905,8 +895,10 @@ public class TimerUtils
         }
         if (experienceTime > 0)
         {
-            stack.push();
-            stack.translate(0F, TimerUtils.getExperienceTranslation(), 0F);
+            GlStateManager.pushMatrix();
+            GlStateManager.translatef(0F,
+                    TimerUtils.getExperienceTranslation(),
+                    0F);
             setAlpha(Main.getAlpha(experienceTime,
                     experience.getMaxTime(),
                     experience.getFadeInTime(),
@@ -923,7 +915,7 @@ public class TimerUtils
      *
      * @return If true, then cancel drawing the hotbar.
      *
-     * @see #recolorHotbar(MatrixStack)
+     * @see #recolorHotbar()
      * @since 0.1-1.16.4-fabric
      */
     public static boolean updateHotbar(float ticks)
@@ -1048,7 +1040,7 @@ public class TimerUtils
                  * Items that have the crosshairs enabled for as long
                  * as the item is being held at all.
                  */
-                else if (item instanceof ThrowablePotionItem ||
+                else if (item instanceof SplashPotionItem || item instanceof LingeringPotionItem ||
                         item instanceof SnowballItem || item instanceof
                         EggItem || item instanceof EnderPearlItem || item
                         instanceof FishingRodItem)
@@ -1146,13 +1138,12 @@ public class TimerUtils
      *
      * @since 0.1-1.16.4-fabric
      */
-    public static void recolorHotbar(MatrixStack stack)
+    public static void recolorHotbar()
     {
         ConfigManager.TimeValues hotbar =
                 ConfigManager.getInstance().getHotbarTime();
-        RenderSystem.pushMatrix();
-        stack.push();
-        RenderSystem.translatef(0F, TimerUtils.getHotbarTranslation(), 0F);
+        GlStateManager.pushMatrix();
+        GlStateManager.translatef(0F, TimerUtils.getHotbarTranslation(), 0F);
         setAlpha(Main.getAlpha(hotbarTime,
                 hotbar.getMaxTime(),
                 hotbar.getFadeInTime(),

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

@@ -17,9 +17,7 @@
 package markil3.immersive_hud.mixin;
 
 import net.minecraft.client.network.AbstractClientPlayerEntity;
-import net.minecraft.client.render.VertexConsumerProvider;
-import net.minecraft.client.render.item.HeldItemRenderer;
-import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.client.render.FirstPersonRenderer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.Hand;
 
@@ -37,42 +35,33 @@ import markil3.immersive_hud.TimerUtils;
  * @author Markil 3
  * @version 0.1-1.16.4-fabric
  */
-@Mixin(HeldItemRenderer.class)
+@Mixin(FirstPersonRenderer.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,
+    @Inject(method = "renderFirstPersonItem" +
+            "(Lnet/minecraft/client/network/AbstractClientPlayerEntity;" +
+            "FFLnet/minecraft/util/Hand;FLnet/minecraft/item/ItemStack;F)V",
+            at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/platform" +
+                    "/GlStateManager;pushMatrix()V", shift = At.Shift.AFTER),
+            cancellable = true)
+    public void renderHand(AbstractClientPlayerEntity abstractClientPlayerEntity,
+                           float f,
+                           float g,
                            Hand hand,
-                           float swingProgress,
-                           ItemStack item,
-                           float equipProgress,
-                           MatrixStack matrices,
-                           VertexConsumerProvider vertexConsumers,
-                           int light,
+                           float h,
+                           ItemStack itemStack,
+                           float i,
                            CallbackInfo callbackInfo)
     {
-        if (TimerUtils.onRenderHand(hand, matrices, tickDelta))
+        if (TimerUtils.onRenderHand(hand, f))
         {
             callbackInfo.cancel();
         }

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

@@ -16,14 +16,15 @@
  */
 package markil3.immersive_hud.mixin;
 
-import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.platform.GlStateManager;
 
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.hud.InGameHud;
 import net.minecraft.client.network.ClientPlayerEntity;
-import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.effect.StatusEffectInstance;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -43,12 +44,13 @@ import markil3.immersive_hud.TimerUtils;
 @Mixin(InGameHud.class)
 public class HudHook
 {
+    private static final Logger logger = LogManager.getLogger(HudHook.class);
+
     private StatusEffectInstance currentEffect;
 
     /**
      * Determines whether or not to draw the crosshair.
      *
-     * @param stack - The matrix drawing stack.
      * @param callbackInfo
      *
      * @version 0.2-1.16.4-fabric
@@ -56,8 +58,9 @@ public class HudHook
      */
     @Inject(method = "renderCrosshair", at = @At(value = "HEAD"),
             cancellable = true)
-    public void startCrosshair(MatrixStack stack, CallbackInfo callbackInfo)
+    public void startCrosshair(CallbackInfo callbackInfo)
     {
+        logger.debug("Starting crosshair");
         if (TimerUtils.drawCrosshair(MinecraftClient.getInstance()
                 .getTickDelta()))
         {
@@ -68,15 +71,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(MatrixStack stack, CallbackInfo callbackInfo)
+    public void finishCrosshair(CallbackInfo callbackInfo)
     {
+        logger.debug("Finishing crosshair");
         /*
          * Resets the color so that nothing else is bothered.
          */
@@ -86,7 +89,6 @@ 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
@@ -94,12 +96,10 @@ public class HudHook
      */
     @Inject(method = "renderMountJumpBar", at = @At(value = "HEAD"),
             cancellable = true)
-    public void startJumpbar(MatrixStack stack,
-                             int x,
-                             CallbackInfo callbackInfo)
+    public void startJumpbar(int x, CallbackInfo callbackInfo)
     {
-        if (TimerUtils.drawJumpbar(stack,
-                MinecraftClient.getInstance().getTickDelta()))
+        logger.debug("Starting jumpbar");
+        if (TimerUtils.drawJumpbar(MinecraftClient.getInstance().getTickDelta()))
         {
             callbackInfo.cancel();
         }
@@ -108,18 +108,18 @@ 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(MatrixStack stack,
+    public void finishJumpbar(
             int x,
             CallbackInfo callbackInfo)
     {
-        stack.pop();
+        logger.debug("Finishing jumpbar");
+        GlStateManager.popMatrix();
         /*
          * Resets the color so that nothing else is bothered.
          */
@@ -129,7 +129,6 @@ 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
@@ -137,12 +136,10 @@ public class HudHook
      */
     @Inject(method = "renderExperienceBar", at = @At(value = "HEAD"),
             cancellable = true)
-    public void startExperience(MatrixStack stack,
-                                int x,
-                                CallbackInfo callbackInfo)
+    public void startExperience(int x, CallbackInfo callbackInfo)
     {
-        if (TimerUtils.drawExperience(stack,
-                MinecraftClient.getInstance().getTickDelta()))
+        logger.debug("Starting experience bar");
+        if (TimerUtils.drawExperience(MinecraftClient.getInstance().getTickDelta()))
         {
             callbackInfo.cancel();
         }
@@ -151,18 +148,16 @@ 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(MatrixStack stack,
-                                 int x,
-                                 CallbackInfo callbackInfo)
+    public void finishExperience(int x, CallbackInfo callbackInfo)
     {
-        stack.pop();
+        logger.debug("Finishing experience bar");
+        GlStateManager.popMatrix();
         /*
          * Resets the color so that nothing else is bothered.
          */
@@ -173,30 +168,29 @@ 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.
      */
-    @ModifyVariable(method = "renderStatusBars(Lnet/minecraft/client/util" +
-            "/math/MatrixStack;)V", at = @At("HEAD"))
-    public MatrixStack startStatus(MatrixStack stack)
+    @Inject(method = "renderStatusBars", at = @At("HEAD"))
+    public void startStatus(CallbackInfo info)
     {
-        stack.push();
-        stack.translate(0F, TimerUtils.getHealthTranslation(), 0F);
-        return stack;
+        logger.debug("Starting status bars");
+        GlStateManager.pushMatrix();
+        GlStateManager.translatef(0F, TimerUtils.getHealthTranslation(), 0F);
     }
 
     /**
      * Adjusts the armor GUI.
      *
-     * @param matrices
      * @param callbackInfo
      */
-    @Inject(method = "renderStatusBars(Lnet/minecraft/client/util" +
-            "/math/MatrixStack;)V", at = @At(value = "INVOKE", target = "Lnet" +
-            "/minecraft/util/profiler/Profiler;push(Ljava/lang/String;)V"))
-    public void renderArmor(MatrixStack matrices, CallbackInfo callbackInfo)
+    @Inject(method = "renderStatusBars()V", at = @At(value = "INVOKE",
+            target = "Lnet" +
+                    "/minecraft/util/profiler/Profiler;push" +
+                    "(Ljava/lang/String;)V"))
+    public void renderArmor(CallbackInfo callbackInfo)
     {
+        logger.debug("Rendering armor");
         if (TimerUtils.drawArmor())
         {
             TimerUtils.setAlpha(0F);
@@ -206,15 +200,16 @@ public class HudHook
     /**
      * Adjusts the health GUI.
      *
-     * @param matrices
      * @param callbackInfo
      */
-    @Inject(method = "renderStatusBars(Lnet/minecraft/client/util" +
-            "/math/MatrixStack;)V", at = @At(value = "INVOKE", target = "Lnet" +
-            "/minecraft/util/profiler/Profiler;swap(Ljava/lang/String;)V",
+    @Inject(method = "renderStatusBars()V", at = @At(value = "INVOKE",
+            target = "Lnet" +
+                    "/minecraft/util/profiler/Profiler;swap" +
+                    "(Ljava/lang/String;)V",
             ordinal = 0))
-    public void renderHealth(MatrixStack matrices, CallbackInfo callbackInfo)
+    public void renderHealth(CallbackInfo callbackInfo)
     {
+        logger.debug("Rendering health");
         /*
          * Resets the transparency from the previous call.
          */
@@ -228,15 +223,14 @@ public class HudHook
     /**
      * Adjusts the food GUI.
      *
-     * @param matrices
      * @param callbackInfo
      */
-    @Inject(method = "renderStatusBars(Lnet/minecraft/client/util" +
-            "/math/MatrixStack;)V", at = @At(value = "INVOKE", target = "Lnet" +
+    @Inject(method = "renderStatusBars()V", at = @At(value = "INVOKE", target = "Lnet" +
             "/minecraft/util/profiler/Profiler;swap(Ljava/lang/String;)V",
             ordinal = 1))
-    public void renderFood(MatrixStack matrices, CallbackInfo callbackInfo)
+    public void renderFood(CallbackInfo callbackInfo)
     {
+        logger.debug("Rendering food");
         /*
          * Resets the transparency from the previous call.
          */
@@ -250,33 +244,30 @@ public class HudHook
     /**
      * Resets the air GUI.
      *
-     * @param matrices
      * @param callbackInfo
      */
-    @Inject(method = "renderStatusBars(Lnet/minecraft/client/util" +
-            "/math/MatrixStack;)V", at = @At(value = "INVOKE", target = "Lnet" +
+    @Inject(method = "renderStatusBars()V", at = @At(value = "INVOKE", target = "Lnet" +
             "/minecraft/util/profiler/Profiler;swap(Ljava/lang/String;)V",
             ordinal = 2))
-    public void renderAir(MatrixStack matrices, CallbackInfo callbackInfo)
+    public void renderAir(CallbackInfo callbackInfo)
     {
+        logger.debug("Rendering air");
         /*
          * Resets the color so that nothing else is bothered.
          */
         TimerUtils.setAlpha(1F);
     }
 
-    @ModifyVariable(method = "renderStatusBars(Lnet/minecraft/client/util" +
-            "/math/MatrixStack;)V", at = @At("TAIL"))
-    public MatrixStack finishStatus(MatrixStack stack)
+    @Inject(method = "renderStatusBars", at = @At("TAIL"))
+    public void finishStatus(CallbackInfo info)
     {
-        stack.pop();
-        return stack;
+        logger.debug("Finishing status bars");
+        GlStateManager.popMatrix();
     }
 
     /**
      * 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
@@ -284,31 +275,34 @@ public class HudHook
      */
     @Inject(method = "renderMountHealth", at = @At(value = "HEAD"),
             cancellable = true)
-    public void startMountHealth(MatrixStack stack, CallbackInfo callbackInfo)
+    public void startMountHealth(CallbackInfo callbackInfo)
     {
-        if (TimerUtils.drawMountHealth(stack,
-                MinecraftClient.getInstance().getTickDelta()))
+        if (TimerUtils.drawMountHealth(MinecraftClient.getInstance().getTickDelta()))
         {
             callbackInfo.cancel();
         }
+        else
+        {
+            logger.debug("Starting mount health");
+        }
     }
 
     /**
      * Resets any changes from drawing the mount's health.
      *
-     * @param stack - The matrix drawing stack.
      * @param callbackInfo
      *
      * @version 0.2-1.16.4-fabric
      * @since 0.1-1.16.4-fabric
      */
     @Inject(method = "renderMountHealth", at = @At(value = "TAIL"))
-    public void finishMountHealth(MatrixStack stack, CallbackInfo callbackInfo)
+    public void finishMountHealth(CallbackInfo callbackInfo)
     {
+        logger.debug("Finishing mount health");
         /*
          * Resets the color so that nothing else is bothered.
          */
-        stack.pop();
+        GlStateManager.popMatrix();
         TimerUtils.resetAlpha();
     }
 
@@ -318,11 +312,11 @@ public class HudHook
      * @version 0.2-1.16.4-fabric
      * @since 0.1-1.16.4-fabric
      */
-    @Inject(method = "renderStatusEffectOverlay" +
-            "(Lnet/minecraft/client/util/math/MatrixStack;)V", at =
+    @Inject(method = "renderStatusEffectOverlay()V", at =
     @At(value = "HEAD", shift = At.Shift.AFTER))
-    public void startPotion(MatrixStack effect, CallbackInfo info)
+    public void startPotion(CallbackInfo info)
     {
+        logger.debug("Starting potions");
         TimerUtils.updatePotions(MinecraftClient.getInstance().cameraEntity instanceof ClientPlayerEntity ?
                                  ((ClientPlayerEntity) MinecraftClient.getInstance().cameraEntity) :
                                  null);
@@ -334,14 +328,14 @@ public class HudHook
      * @version 0.2-1.16.4-fabric
      * @since 0.1-1.16.4-fabric
      */
-    @Redirect(method = "renderStatusEffectOverlay" +
-            "(Lnet/minecraft/client/util/math/MatrixStack;)V", at =
+    @Redirect(method = "renderStatusEffectOverlay()V", at =
     @At(value = "INVOKE",
             target =
                     "Lnet/minecraft/entity/effect/StatusEffectInstance;" +
                             "shouldShowIcon()Z"))
     public boolean shouldRenderPotion(StatusEffectInstance effect)
     {
+        logger.debug("Updating potions");
         currentEffect = effect;
         return TimerUtils.updatePotion(effect,
                 MinecraftClient.getInstance().getTickDelta());
@@ -351,33 +345,30 @@ 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" +
-            "(Lnet/minecraft/client/util/math/MatrixStack;)V", at =
+    @ModifyVariable(method = "renderStatusEffectOverlay()V", at =
     @At(value = "STORE"))
-    public float updatePotion(float f,
-                              MatrixStack stack)
+    public float updatePotion(float f)
     {
+        logger.debug("Adjusting potions");
         return TimerUtils.getPotionAlpha(currentEffect);
     }
 
     /**
      * Resets any changes from drawing the potion effects.
      *
-     * @param matrices - The matrix drawing stack.
      * @param callbackInfo
      *
      * @version 0.2-1.16.4-fabric
      * @since 0.2-1.16.4-fabric
      */
     @Inject(method = "renderStatusEffectOverlay", at = @At(value = "TAIL"))
-    public void finishPotion(MatrixStack matrices,
-                             CallbackInfo callbackInfo)
+    public void finishPotion(CallbackInfo callbackInfo)
     {
+        logger.debug("Finishing potions");
         /*
          * Resets the color so that nothing else is bothered.
          */
@@ -388,7 +379,6 @@ 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
@@ -397,9 +387,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");
         if (TimerUtils.updateHotbar(tickDelta))
         {
             callbackInfo.cancel();
@@ -410,27 +400,25 @@ 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/platform/GlStateManager;color4f(FFFF)V", shift
             = At.Shift.AFTER))
     public void adjustHotbar(float tickDelta,
-                             MatrixStack matrices,
                              CallbackInfo callbackInfo)
     {
-        TimerUtils.recolorHotbar(matrices);
+        logger.debug("Adjusting hotbar");
+        TimerUtils.recolorHotbar();
     }
 
     /**
      * Resets any changes from drawing the hotbar.
      *
      * @param tickDelta
-     * @param stack - The matrix drawing stack.
      * @param callbackInfo
      *
      * @version 0.2-1.16.4-fabric
@@ -438,11 +426,10 @@ public class HudHook
      */
     @Inject(method = "renderHotbar", at = @At(value = "TAIL"))
     public void finishHotbar(float tickDelta,
-                             MatrixStack stack,
                              CallbackInfo callbackInfo)
     {
-        RenderSystem.popMatrix();
-        stack.pop();
+        logger.debug("Finishing hotbar");
+        GlStateManager.popMatrix();
         /*
          * Resets the color so that nothing else is bothered.
          */

src/main/resources/fabric.mod.json

@@ -35,7 +35,7 @@
 
   "depends": {
     "fabricloader": ">=0.7.4",
-    "minecraft": "1.16.x"
+    "minecraft": "1.14.x"
   },
   "suggests": {
     "modmenu": "*",