From d002986525f24275c192df1f6bc5136a787fbd98 Mon Sep 17 00:00:00 2001
From: zontreck <tarapiccari@gmail.com>
Date: Sun, 19 Nov 2023 08:19:21 -0700
Subject: [PATCH] Finish updating to 1.20

---
 gradle.properties                                        | 2 +-
 src/main/java/dev/zontreck/mcmods/CheckHealth.java       | 1 +
 src/main/java/dev/zontreck/mcmods/CheckHunger.java       | 8 ++++++++
 src/main/java/dev/zontreck/mcmods/CheckInventory.java    | 3 +--
 src/main/java/dev/zontreck/mcmods/WatchMyDurability.java | 5 +++--
 5 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index c44fcec..1a963b2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -49,7 +49,7 @@ mod_name=WatchMyDurability
 # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
 mod_license=GPLv3
 # The mod version. See https://semver.org/
-mod_version=1.1.5.1119230555
+mod_version=1.1.5.1119230818
 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
 # This should match the base package used for the mod sources.
 # See https://maven.apache.org/guides/mini/guide-naming-conventions.html
diff --git a/src/main/java/dev/zontreck/mcmods/CheckHealth.java b/src/main/java/dev/zontreck/mcmods/CheckHealth.java
index b8a8156..8f94592 100644
--- a/src/main/java/dev/zontreck/mcmods/CheckHealth.java
+++ b/src/main/java/dev/zontreck/mcmods/CheckHealth.java
@@ -1,6 +1,7 @@
 package dev.zontreck.mcmods;
 
 import dev.zontreck.ariaslib.terminal.Task;
+import dev.zontreck.ariaslib.util.DelayedExecutorService;
 import dev.zontreck.libzontreck.chat.ChatColor;
 import dev.zontreck.mcmods.configs.WMDClientConfig;
 import net.minecraft.client.Minecraft;
diff --git a/src/main/java/dev/zontreck/mcmods/CheckHunger.java b/src/main/java/dev/zontreck/mcmods/CheckHunger.java
index bb072ed..02cd33f 100644
--- a/src/main/java/dev/zontreck/mcmods/CheckHunger.java
+++ b/src/main/java/dev/zontreck/mcmods/CheckHunger.java
@@ -1,6 +1,7 @@
 package dev.zontreck.mcmods;
 
 import dev.zontreck.ariaslib.terminal.Task;
+import dev.zontreck.ariaslib.util.DelayedExecutorService;
 import dev.zontreck.libzontreck.chat.ChatColor;
 import dev.zontreck.mcmods.configs.WMDClientConfig;
 import net.minecraft.client.Minecraft;
@@ -10,6 +11,11 @@ import net.minecraft.sounds.SoundEvents;
 
 public class CheckHunger extends Task
 {
+    private static CheckHunger inst = new CheckHunger();
+    public static CheckHunger getInstance()
+    {
+        return inst;
+    }
     public CheckHunger()
     {
         super("CheckHunger", true);
@@ -19,7 +25,9 @@ public class CheckHunger extends Task
     public void run() {
         if(!WMDClientConfig.EnableHungerAlert.get()) return;
 
+
         Hunger current = Hunger.of(Minecraft.getInstance().player);
+        if(WatchMyDurability.LastHunger == null)WatchMyDurability.LastHunger = new Hunger();
 
         if(current.identical()) return;
         if(current.shouldGiveAlert())
diff --git a/src/main/java/dev/zontreck/mcmods/CheckInventory.java b/src/main/java/dev/zontreck/mcmods/CheckInventory.java
index 2974f57..330e89e 100644
--- a/src/main/java/dev/zontreck/mcmods/CheckInventory.java
+++ b/src/main/java/dev/zontreck/mcmods/CheckInventory.java
@@ -38,8 +38,7 @@ public class CheckInventory extends Task {
                 
             if(!WatchMyDurability.isInGame)return;
 
-            DelayedExecutorService.getInstance().schedule(this,
-                    WMDClientConfig.TimerVal.get());
+
             //WatchMyDurability.LOGGER.info("TICKING CHECK INVENTORY EVENT");
             // Get the player inventory
             Inventory inv = Minecraft.getInstance().player.getInventory();
diff --git a/src/main/java/dev/zontreck/mcmods/WatchMyDurability.java b/src/main/java/dev/zontreck/mcmods/WatchMyDurability.java
index 94108d3..3fdfef6 100644
--- a/src/main/java/dev/zontreck/mcmods/WatchMyDurability.java
+++ b/src/main/java/dev/zontreck/mcmods/WatchMyDurability.java
@@ -119,8 +119,9 @@ public class WatchMyDurability
             WatchMyDurability.isInGame=true;
             DelayedExecutorService.start();
 
-            DelayedExecutorService.getInstance().schedule(CheckInventory.getInstance(), WMDClientConfig.TimerVal.get());
-            DelayedExecutorService.getInstance().schedule(CheckHealth.getInstance(), WMDClientConfig.TimerVal.get());
+            DelayedExecutorService.getInstance().scheduleRepeating(CheckInventory.getInstance(), WMDClientConfig.TimerVal.get());
+            DelayedExecutorService.getInstance().scheduleRepeating(CheckHealth.getInstance(), WMDClientConfig.TimerVal.get());
+            DelayedExecutorService.getInstance().scheduleRepeating(CheckHunger.getInstance(), WMDClientConfig.TimerVal.get());
         }
     
         @SubscribeEvent