From 94eb9fd516ba4eef2326ce60d83e834c674b56c6 Mon Sep 17 00:00:00 2001
From: CabbageGod <cabbagegod.dev@gmail.com>
Date: Fri, 2 Sep 2022 10:33:40 -0400
Subject: [PATCH 01/15] Added reload command

---
 .../com/cabbagegod/cabbagescape/commands/Commands.java    | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/main/java/com/cabbagegod/cabbagescape/commands/Commands.java b/src/main/java/com/cabbagegod/cabbagescape/commands/Commands.java
index fb58f97..39bead8 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/commands/Commands.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/commands/Commands.java
@@ -1,6 +1,8 @@
 package com.cabbagegod.cabbagescape.commands;
 
 import com.cabbagegod.cabbagescape.client.CabbageScapeClient;
+import com.cabbagegod.cabbagescape.client.blockoutline.PersistentOutlineRenderer;
+import com.cabbagegod.cabbagescape.client.grounditems.GroundItemsManager;
 import com.mojang.brigadier.arguments.FloatArgumentType;
 import net.fabricmc.fabric.api.client.command.v1.ClientCommandManager;
 import net.minecraft.client.MinecraftClient;
@@ -49,6 +51,12 @@ public static void register(){
 
                                     return 1;
                                 })))
+                .then(ClientCommandManager.literal("reload")
+                                .executes(context -> {
+                                    PersistentOutlineRenderer.getInstance().clear();
+
+                                    return 1;
+                                }))
                 .then(ClientCommandManager.literal("contains")
                     .then(ClientCommandManager.literal("add")
                         .then(ClientCommandManager.argument("item", ClientMessageArgumentType.message())

From 16e3cc1a68ec8b0e1d0cbe3f4fa4e6d8e7e24ce8 Mon Sep 17 00:00:00 2001
From: CabbageGod <cabbagegod.dev@gmail.com>
Date: Fri, 2 Sep 2022 11:03:35 -0400
Subject: [PATCH 02/15] Fixed a bug that caused empty contains list to trigger
 all armor stands

---
 .../com/cabbagegod/cabbagescape/ui/GroundItemsScreen.java    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/com/cabbagegod/cabbagescape/ui/GroundItemsScreen.java b/src/main/java/com/cabbagegod/cabbagescape/ui/GroundItemsScreen.java
index 35f9fd0..d5cfa9b 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/ui/GroundItemsScreen.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/ui/GroundItemsScreen.java
@@ -139,6 +139,11 @@ void setupOptions(){
         this.containsKeysTextField.setMaxLength(Integer.MAX_VALUE);
         this.containsKeysTextField.setText(parsedTags.toString());
         this.containsKeysTextField.setChangedListener(parsedKeys -> {
+            if(parsedKeys.isEmpty()){
+                settings.containsTags = new ArrayList<String>();
+                return;
+            }
+
             String[] keys = parsedKeys.split(",");
             settings.containsTags = new ArrayList<String>(Arrays.asList(keys));
         });

From 95e48dd137b3351d6f0f56fb464f521b6ee70aa9 Mon Sep 17 00:00:00 2001
From: CabbageGod <cabbagegod.dev@gmail.com>
Date: Mon, 19 Dec 2022 15:17:25 -0500
Subject: [PATCH 03/15] Removed unnecessary import

---
 .../cabbagegod/cabbagescape/mixin/PlayerEntityRendererMixin.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/com/cabbagegod/cabbagescape/mixin/PlayerEntityRendererMixin.java b/src/main/java/com/cabbagegod/cabbagescape/mixin/PlayerEntityRendererMixin.java
index f193754..11bd65d 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/mixin/PlayerEntityRendererMixin.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/mixin/PlayerEntityRendererMixin.java
@@ -1,6 +1,5 @@
 package com.cabbagegod.cabbagescape.mixin;
 
-import net.minecraft.block.DoorBlock;
 import net.minecraft.client.render.entity.PlayerEntityRenderer;
 import net.minecraft.text.LiteralText;
 import net.minecraft.text.Text;

From 7a9ca4298f347d3c7de2e1159ac31cad6267f20a Mon Sep 17 00:00:00 2001
From: CabbageGod <cabbagegod.dev@gmail.com>
Date: Thu, 12 Jan 2023 17:23:34 -0500
Subject: [PATCH 04/15] Removed unneeded imports

---
 .../client/CabbageScapeClient.java             | 18 +-----------------
 .../cabbagescape/client/LevelUpManager.java    |  5 -----
 .../cabbagescape/client/VersionChecker.java    |  5 -----
 .../client/barrows/BarrowsHelper.java          |  3 ---
 .../blockoutline/BlockOutlineManager.java      |  1 -
 .../client/cluetracker/ClueStep.java           |  1 -
 .../client/cluetracker/ClueTracker.java        |  3 ---
 .../potiontimers/PotionTimerManager.java       |  4 ----
 .../commands/ClientMessageArgumentType.java    |  2 --
 .../cabbagescape/commands/Commands.java        |  1 -
 .../cabbagescape/data/DataHandler.java         |  3 ---
 .../cabbagescape/data/GroundItemSettings.java  |  3 ---
 .../cabbagegod/cabbagescape/data/Settings.java |  3 ---
 .../cabbagescape/data/itemdata/ItemName.java   |  2 --
 .../cabbagescape/events/DoorUseCallback.java   |  1 -
 .../cabbagescape/mixin/GameMenuMixin.java      |  2 --
 .../cabbagescape/mixin/InGameHudMixin.java     |  4 ----
 .../notifications/NotificationManager.java     |  2 --
 .../cabbagescape/ui/ClueHintScreen.java        |  1 -
 .../cabbagescape/ui/GroundItemsScreen.java     |  9 ---------
 .../cabbagescape/ui/SettingsScreen.java        | 13 -------------
 .../cabbagescape/ui/UpdateScreen.java          |  2 --
 22 files changed, 1 insertion(+), 87 deletions(-)

diff --git a/src/main/java/com/cabbagegod/cabbagescape/client/CabbageScapeClient.java b/src/main/java/com/cabbagegod/cabbagescape/client/CabbageScapeClient.java
index 93ececd..b5b078d 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/client/CabbageScapeClient.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/client/CabbageScapeClient.java
@@ -4,7 +4,6 @@
 import com.cabbagegod.cabbagescape.client.blockoutline.BlockOutlineManager;
 import com.cabbagegod.cabbagescape.client.blockoutline.PersistentOutlineRenderer;
 import com.cabbagegod.cabbagescape.client.grounditems.GroundItemsManager;
-import com.cabbagegod.cabbagescape.client.potiontimers.PotionTimerManager;
 import com.cabbagegod.cabbagescape.commands.Commands;
 import com.cabbagegod.cabbagescape.data.DataHandler;
 import com.cabbagegod.cabbagescape.data.DelayedScreenshot;
@@ -13,32 +12,17 @@
 import com.cabbagegod.cabbagescape.ui.UpdateScreen;
 import com.cabbagegod.cabbagescape.util.FileUtil;
 import com.cabbagegod.cabbagescape.util.ScreenshotUtil;
-import com.cabbagegod.cabbagescape.util.ThreadingUtil;
 import com.google.gson.Gson;
-import jdk.jshell.spi.ExecutionControl;
 import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientEntityEvents;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gl.Framebuffer;
-import net.minecraft.client.gl.SimpleFramebuffer;
 import net.minecraft.client.option.KeyBinding;
 import net.minecraft.client.texture.NativeImage;
 import net.minecraft.client.util.ScreenshotRecorder;
-import net.minecraft.client.world.ClientWorld;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityType;
-import net.minecraft.sound.SoundEvents;
-import net.minecraft.text.LiteralText;
-import org.lwjgl.glfw.GLFW;
-
-import java.io.DataOutputStream;
+
 import java.io.File;
 import java.io.IOException;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
diff --git a/src/main/java/com/cabbagegod/cabbagescape/client/LevelUpManager.java b/src/main/java/com/cabbagegod/cabbagescape/client/LevelUpManager.java
index 2481f70..07b2bf6 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/client/LevelUpManager.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/client/LevelUpManager.java
@@ -1,11 +1,6 @@
 package com.cabbagegod.cabbagescape.client;
 
-import com.cabbagegod.cabbagescape.data.DataHandler;
 import com.cabbagegod.cabbagescape.data.Skill;
-import com.cabbagegod.cabbagescape.util.ScreenshotUtil;
-import com.cabbagegod.cabbagescape.util.ThreadingUtil;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.text.LiteralText;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/com/cabbagegod/cabbagescape/client/VersionChecker.java b/src/main/java/com/cabbagegod/cabbagescape/client/VersionChecker.java
index 21a0dc9..41d57be 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/client/VersionChecker.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/client/VersionChecker.java
@@ -1,19 +1,14 @@
 package com.cabbagegod.cabbagescape.client;
 
-import com.cabbagegod.cabbagescape.data.Settings;
 import com.cabbagegod.cabbagescape.github.Release;
-import com.google.common.reflect.TypeToken;
 import com.google.gson.Gson;
 
 import java.io.IOException;
-import java.lang.reflect.Type;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
-import java.util.ArrayList;
-import java.util.List;
 
 public class VersionChecker {
     private static boolean showUpdate = false;
diff --git a/src/main/java/com/cabbagegod/cabbagescape/client/barrows/BarrowsHelper.java b/src/main/java/com/cabbagegod/cabbagescape/client/barrows/BarrowsHelper.java
index 6a72c71..1aeaf0b 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/client/barrows/BarrowsHelper.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/client/barrows/BarrowsHelper.java
@@ -3,9 +3,7 @@
 import com.cabbagegod.cabbagescape.client.blockoutline.PersistentOutlineRenderer;
 import com.cabbagegod.cabbagescape.events.DoorUseCallback;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
-import net.minecraft.block.Material;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.enchantment.Enchantment;
 import net.minecraft.enchantment.Enchantments;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EquipmentSlot;
@@ -13,7 +11,6 @@
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.*;
 import net.minecraft.screen.ScreenHandler;
-import net.minecraft.text.LiteralText;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
 
diff --git a/src/main/java/com/cabbagegod/cabbagescape/client/blockoutline/BlockOutlineManager.java b/src/main/java/com/cabbagegod/cabbagescape/client/blockoutline/BlockOutlineManager.java
index 4a794d0..9fe32f9 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/client/blockoutline/BlockOutlineManager.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/client/blockoutline/BlockOutlineManager.java
@@ -1,6 +1,5 @@
 package com.cabbagegod.cabbagescape.client.blockoutline;
 
-import com.cabbagegod.cabbagescape.client.CabbageScapeClient;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.render.Camera;
 import net.minecraft.client.util.math.MatrixStack;
diff --git a/src/main/java/com/cabbagegod/cabbagescape/client/cluetracker/ClueStep.java b/src/main/java/com/cabbagegod/cabbagescape/client/cluetracker/ClueStep.java
index fe341f4..3211c9e 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/client/cluetracker/ClueStep.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/client/cluetracker/ClueStep.java
@@ -1,6 +1,5 @@
 package com.cabbagegod.cabbagescape.client.cluetracker;
 
-import net.fabricmc.loader.impl.lib.sat4j.core.Vec;
 import net.minecraft.client.util.math.Vector3d;
 
 public class ClueStep {
diff --git a/src/main/java/com/cabbagegod/cabbagescape/client/cluetracker/ClueTracker.java b/src/main/java/com/cabbagegod/cabbagescape/client/cluetracker/ClueTracker.java
index a2ffa9a..ed989f4 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/client/cluetracker/ClueTracker.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/client/cluetracker/ClueTracker.java
@@ -3,19 +3,16 @@
 import java.util.ArrayList;
 import java.util.List;
 import com.cabbagegod.cabbagescape.client.cluetracker.ClueStep.Difficulty;
-import com.cabbagegod.cabbagescape.data.DataHandler;
 import com.cabbagegod.cabbagescape.data.itemdata.ItemDisplay;
 import com.cabbagegod.cabbagescape.data.itemdata.ItemExtra;
 import com.cabbagegod.cabbagescape.data.itemdata.ItemExtra__1;
 import com.cabbagegod.cabbagescape.data.itemdata.ItemLore;
 import com.cabbagegod.cabbagescape.ui.ClueHintScreen;
-import com.cabbagegod.cabbagescape.ui.UpdateScreen;
 import com.google.gson.Gson;
 import net.fabricmc.fabric.api.event.player.UseItemCallback;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NbtElement;
-import net.minecraft.text.LiteralText;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Hand;
 import net.minecraft.util.TypedActionResult;
diff --git a/src/main/java/com/cabbagegod/cabbagescape/client/potiontimers/PotionTimerManager.java b/src/main/java/com/cabbagegod/cabbagescape/client/potiontimers/PotionTimerManager.java
index 3d17771..5ed1ae0 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/client/potiontimers/PotionTimerManager.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/client/potiontimers/PotionTimerManager.java
@@ -1,20 +1,16 @@
 package com.cabbagegod.cabbagescape.client.potiontimers;
 
 import com.cabbagegod.cabbagescape.client.CabbageScapeClient;
-import com.cabbagegod.cabbagescape.notifications.NotificationManager;
-import com.cabbagegod.cabbagescape.notifications.TrayNotification;
 import com.cabbagegod.cabbagescape.util.ThreadingUtil;
 import net.fabricmc.fabric.api.client.item.v1.ItemTooltipCallback;
 import net.fabricmc.fabric.api.event.player.UseItemCallback;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.item.ItemStack;
-import net.minecraft.text.LiteralText;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Hand;
 import net.minecraft.util.TypedActionResult;
 
-import java.awt.*;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
diff --git a/src/main/java/com/cabbagegod/cabbagescape/commands/ClientMessageArgumentType.java b/src/main/java/com/cabbagegod/cabbagescape/commands/ClientMessageArgumentType.java
index 141a5ab..bb22e9a 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/commands/ClientMessageArgumentType.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/commands/ClientMessageArgumentType.java
@@ -18,11 +18,9 @@
 import net.fabricmc.fabric.api.client.command.v1.FabricClientCommandSource;
 import net.minecraft.command.EntitySelector;
 import net.minecraft.command.EntitySelectorReader;
-import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.text.LiteralText;
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
-import org.jetbrains.annotations.Nullable;
 
 public class ClientMessageArgumentType
         implements ArgumentType<ClientMessageArgumentType.MessageFormat>
diff --git a/src/main/java/com/cabbagegod/cabbagescape/commands/Commands.java b/src/main/java/com/cabbagegod/cabbagescape/commands/Commands.java
index 39bead8..2d3f3a3 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/commands/Commands.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/commands/Commands.java
@@ -2,7 +2,6 @@
 
 import com.cabbagegod.cabbagescape.client.CabbageScapeClient;
 import com.cabbagegod.cabbagescape.client.blockoutline.PersistentOutlineRenderer;
-import com.cabbagegod.cabbagescape.client.grounditems.GroundItemsManager;
 import com.mojang.brigadier.arguments.FloatArgumentType;
 import net.fabricmc.fabric.api.client.command.v1.ClientCommandManager;
 import net.minecraft.client.MinecraftClient;
diff --git a/src/main/java/com/cabbagegod/cabbagescape/data/DataHandler.java b/src/main/java/com/cabbagegod/cabbagescape/data/DataHandler.java
index f5f64ab..10ed2bf 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/data/DataHandler.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/data/DataHandler.java
@@ -4,11 +4,8 @@
 
 import java.io.FileWriter;
 import java.io.IOException;
-import java.io.File;
-import java.io.FileNotFoundException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import java.util.Scanner;
 
 public class DataHandler {
     public static void WriteStringToFile(String data, String fileName){
diff --git a/src/main/java/com/cabbagegod/cabbagescape/data/GroundItemSettings.java b/src/main/java/com/cabbagegod/cabbagescape/data/GroundItemSettings.java
index aaa6c6e..dc53cca 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/data/GroundItemSettings.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/data/GroundItemSettings.java
@@ -1,8 +1,5 @@
 package com.cabbagegod.cabbagescape.data;
 
-import org.checkerframework.checker.units.qual.C;
-
-import java.awt.*;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/src/main/java/com/cabbagegod/cabbagescape/data/Settings.java b/src/main/java/com/cabbagegod/cabbagescape/data/Settings.java
index 2c8ef29..3380904 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/data/Settings.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/data/Settings.java
@@ -2,9 +2,6 @@
 
 import com.cabbagegod.cabbagescape.client.CabbageScapeClient;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class Settings {
     public String lastVersion = CabbageScapeClient.version;
     public GroundItemSettings groundItemSettings = new GroundItemSettings();
diff --git a/src/main/java/com/cabbagegod/cabbagescape/data/itemdata/ItemName.java b/src/main/java/com/cabbagegod/cabbagescape/data/itemdata/ItemName.java
index 52f65d1..b298aa7 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/data/itemdata/ItemName.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/data/itemdata/ItemName.java
@@ -1,7 +1,5 @@
 package com.cabbagegod.cabbagescape.data.itemdata;
 
-import java.util.List;
-
 //Class used to read raw JSON from NBT data
 public class ItemName {
     public String text;
diff --git a/src/main/java/com/cabbagegod/cabbagescape/events/DoorUseCallback.java b/src/main/java/com/cabbagegod/cabbagescape/events/DoorUseCallback.java
index 7b5f35f..5180ff0 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/events/DoorUseCallback.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/events/DoorUseCallback.java
@@ -3,7 +3,6 @@
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;
 import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.util.ActionResult;
 import net.minecraft.util.math.BlockPos;
 
 public interface DoorUseCallback {
diff --git a/src/main/java/com/cabbagegod/cabbagescape/mixin/GameMenuMixin.java b/src/main/java/com/cabbagegod/cabbagescape/mixin/GameMenuMixin.java
index f42e6dc..73dcfc2 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/mixin/GameMenuMixin.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/mixin/GameMenuMixin.java
@@ -7,8 +7,6 @@
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.text.LiteralText;
 import net.minecraft.text.Text;
-import net.minecraft.text.TextColor;
-import net.minecraft.text.TranslatableText;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
diff --git a/src/main/java/com/cabbagegod/cabbagescape/mixin/InGameHudMixin.java b/src/main/java/com/cabbagegod/cabbagescape/mixin/InGameHudMixin.java
index 6e2a9e4..98730da 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/mixin/InGameHudMixin.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/mixin/InGameHudMixin.java
@@ -1,18 +1,14 @@
 package com.cabbagegod.cabbagescape.mixin;
 
-import com.cabbagegod.cabbagescape.client.CabbageScapeClient;
 import com.cabbagegod.cabbagescape.client.potiontimers.PotionInstance;
 import com.cabbagegod.cabbagescape.client.potiontimers.PotionTimerManager;
-import com.cabbagegod.cabbagescape.data.NotificationSettings;
 import com.cabbagegod.cabbagescape.notifications.NotificationManager;
 import com.mojang.blaze3d.systems.RenderSystem;
-import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawableHelper;
 import net.minecraft.client.gui.hud.InGameHud;
 import net.minecraft.client.render.GameRenderer;
 import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.datafixer.fix.OminousBannerBlockEntityRenameFix;
 import net.minecraft.text.LiteralText;
 import net.minecraft.util.Identifier;
 import org.spongepowered.asm.mixin.Mixin;
diff --git a/src/main/java/com/cabbagegod/cabbagescape/notifications/NotificationManager.java b/src/main/java/com/cabbagegod/cabbagescape/notifications/NotificationManager.java
index 56ecede..09be0b8 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/notifications/NotificationManager.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/notifications/NotificationManager.java
@@ -1,12 +1,10 @@
 package com.cabbagegod.cabbagescape.notifications;
 
 import com.cabbagegod.cabbagescape.data.NotificationSettings;
-import com.cabbagegod.cabbagescape.mixin.InGameHudMixin;
 import com.cabbagegod.cabbagescape.util.ThreadingUtil;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.text.LiteralText;
 
 public class NotificationManager {
     public static boolean showFlash = false;
diff --git a/src/main/java/com/cabbagegod/cabbagescape/ui/ClueHintScreen.java b/src/main/java/com/cabbagegod/cabbagescape/ui/ClueHintScreen.java
index e2bb6bc..8329e7f 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/ui/ClueHintScreen.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/ui/ClueHintScreen.java
@@ -1,6 +1,5 @@
 package com.cabbagegod.cabbagescape.ui;
 
-import com.cabbagegod.cabbagescape.client.VersionChecker;
 import com.cabbagegod.cabbagescape.client.cluetracker.ClueStep;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
diff --git a/src/main/java/com/cabbagegod/cabbagescape/ui/GroundItemsScreen.java b/src/main/java/com/cabbagegod/cabbagescape/ui/GroundItemsScreen.java
index d5cfa9b..32ff733 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/ui/GroundItemsScreen.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/ui/GroundItemsScreen.java
@@ -1,12 +1,9 @@
 package com.cabbagegod.cabbagescape.ui;
 
 import com.cabbagegod.cabbagescape.client.CabbageScapeClient;
-import com.cabbagegod.cabbagescape.client.VersionChecker;
 import com.cabbagegod.cabbagescape.data.GroundItemSettings;
 import com.cabbagegod.cabbagescape.data.Settings;
-import com.mojang.blaze3d.platform.GlStateManager;
 import com.mojang.blaze3d.systems.RenderSystem;
-import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.option.GameOptionsScreen;
 import net.minecraft.client.gui.widget.ButtonListWidget;
@@ -17,19 +14,13 @@
 import net.minecraft.client.option.GameOptions;
 import net.minecraft.client.option.Option;
 import net.minecraft.client.render.GameRenderer;
-import net.minecraft.client.texture.Sprite;
-import net.minecraft.client.util.InputUtil;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.text.LiteralText;
-import net.minecraft.text.Text;
-import net.minecraft.text.TranslatableText;
 import net.minecraft.util.Identifier;
 import org.apache.commons.lang3.StringUtils;
 
-import java.awt.*;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.stream.Stream;
 
 public class GroundItemsScreen extends GameOptionsScreen {
     private static Option[] OPTIONS;
diff --git a/src/main/java/com/cabbagegod/cabbagescape/ui/SettingsScreen.java b/src/main/java/com/cabbagegod/cabbagescape/ui/SettingsScreen.java
index 57f7782..1e5e319 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/ui/SettingsScreen.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/ui/SettingsScreen.java
@@ -1,29 +1,16 @@
 package com.cabbagegod.cabbagescape.ui;
 
 import com.cabbagegod.cabbagescape.client.CabbageScapeClient;
-import com.cabbagegod.cabbagescape.client.VersionChecker;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.fabricmc.loader.language.LanguageAdapter;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.Element;
 import net.minecraft.client.gui.screen.GameMenuScreen;
 import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.screen.option.OptionsScreen;
-import net.minecraft.client.gui.widget.ButtonListWidget;
 import net.minecraft.client.gui.widget.ButtonWidget;
-import net.minecraft.client.option.DoubleOption;
-import net.minecraft.client.option.Option;
-import net.minecraft.client.util.InputUtil;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.text.LiteralText;
-import net.minecraft.text.Text;
 import net.minecraft.text.TranslatableText;
 
-import java.util.Arrays;
-import java.util.Optional;
-import java.util.stream.Stream;
-
 @Environment(EnvType.CLIENT)
 public class SettingsScreen extends Screen {
 
diff --git a/src/main/java/com/cabbagegod/cabbagescape/ui/UpdateScreen.java b/src/main/java/com/cabbagegod/cabbagescape/ui/UpdateScreen.java
index e97aca9..af1faee 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/ui/UpdateScreen.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/ui/UpdateScreen.java
@@ -4,11 +4,9 @@
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.screen.option.SkinOptionsScreen;
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.text.LiteralText;
-import net.minecraft.text.Text;
 import net.minecraft.text.TranslatableText;
 
 @Environment(EnvType.CLIENT)

From 8108b4f4782053c6244093bdd590419733cade29 Mon Sep 17 00:00:00 2001
From: CabbageGod <cabbagegod.dev@gmail.com>
Date: Fri, 13 Jan 2023 11:52:27 -0500
Subject: [PATCH 05/15] Removed debug button function

---
 .../cabbagescape/client/CabbageScapeClient.java      | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/main/java/com/cabbagegod/cabbagescape/client/CabbageScapeClient.java b/src/main/java/com/cabbagegod/cabbagescape/client/CabbageScapeClient.java
index b5b078d..0c21ee7 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/client/CabbageScapeClient.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/client/CabbageScapeClient.java
@@ -100,17 +100,7 @@ private void checkKeyPress(MinecraftClient client){
         assert client.player != null;
 
         if(debugKey.wasPressed()){
-            NativeImage image = ScreenshotRecorder.takeScreenshot(client.getFramebuffer());
-            try {
-                DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd_HH.mm.ss");;
-                String currentDate = dateFormat.format(LocalDateTime.now());
-
-                String screenshotDir = FileUtil.directoryPath + "screenshots/";
-                FileUtil.CreateNewDirecotryIfNotExists(screenshotDir);
-                image.writeTo(new File(screenshotDir + currentDate + ".png"));
-            } catch (IOException exception) {
-                exception.printStackTrace();
-            }
+            //test something
         }
     }
 

From 7a388f74e7672f83e76f7f332d0a7e4b76a4b623 Mon Sep 17 00:00:00 2001
From: CabbageGod <cabbagegod.dev@gmail.com>
Date: Fri, 13 Jan 2023 11:52:48 -0500
Subject: [PATCH 06/15] Added a new option for a basic button

---
 .../cabbagescape/ui/ButtonOption.java         | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 src/main/java/com/cabbagegod/cabbagescape/ui/ButtonOption.java

diff --git a/src/main/java/com/cabbagegod/cabbagescape/ui/ButtonOption.java b/src/main/java/com/cabbagegod/cabbagescape/ui/ButtonOption.java
new file mode 100644
index 0000000..6fc4637
--- /dev/null
+++ b/src/main/java/com/cabbagegod/cabbagescape/ui/ButtonOption.java
@@ -0,0 +1,29 @@
+package com.cabbagegod.cabbagescape.ui;
+
+import com.cabbagegod.cabbagescape.client.CabbageScapeClient;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.widget.ButtonWidget;
+import net.minecraft.client.gui.widget.ClickableWidget;
+import net.minecraft.client.option.GameOptions;
+import net.minecraft.client.option.Option;
+import net.minecraft.text.LiteralText;
+
+import java.util.function.Function;
+
+public class ButtonOption extends Option {
+    private ButtonWidget.PressAction action;
+
+    public ButtonOption(String key, ButtonWidget.PressAction action) {
+        super(key);
+
+        this.key = key;
+        this.action = action;
+    }
+
+    String key;
+
+    @Override
+    public ClickableWidget createButton(GameOptions options, int x, int y, int width) {
+        return new ButtonWidget(x,y,width,20,new LiteralText(key), action);
+    }
+}

From c070918a3824f4ff4521793ab64467b2ed12ae3a Mon Sep 17 00:00:00 2001
From: CabbageGod <cabbagegod.dev@gmail.com>
Date: Fri, 13 Jan 2023 11:53:11 -0500
Subject: [PATCH 07/15] Refactored + added new dynamic plugins menu

---
 .../cabbagescape/data/MinescapePlugins.java   | 14 ++++
 .../cabbagescape/mixin/GameMenuMixin.java     |  2 +-
 .../ui/{ => settings}/GroundItemsScreen.java  |  8 +--
 .../ui/settings/PluginsScreen.java            | 64 +++++++++++++++++++
 .../ui/{ => settings}/SettingsScreen.java     |  8 +--
 5 files changed, 86 insertions(+), 10 deletions(-)
 create mode 100644 src/main/java/com/cabbagegod/cabbagescape/data/MinescapePlugins.java
 rename src/main/java/com/cabbagegod/cabbagescape/ui/{ => settings}/GroundItemsScreen.java (96%)
 create mode 100644 src/main/java/com/cabbagegod/cabbagescape/ui/settings/PluginsScreen.java
 rename src/main/java/com/cabbagegod/cabbagescape/ui/{ => settings}/SettingsScreen.java (77%)

diff --git a/src/main/java/com/cabbagegod/cabbagescape/data/MinescapePlugins.java b/src/main/java/com/cabbagegod/cabbagescape/data/MinescapePlugins.java
new file mode 100644
index 0000000..3033ef4
--- /dev/null
+++ b/src/main/java/com/cabbagegod/cabbagescape/data/MinescapePlugins.java
@@ -0,0 +1,14 @@
+package com.cabbagegod.cabbagescape.data;
+
+import com.cabbagegod.cabbagescape.ui.settings.GroundItemsScreen;
+
+public enum MinescapePlugins {
+    GROUNDITEMS("Ground Items", GroundItemsScreen.class);
+
+    public String name;
+    public Class screen;
+    MinescapePlugins(String name, Class settingsScreen){
+        this.name = name;
+        screen = settingsScreen;
+    }
+}
diff --git a/src/main/java/com/cabbagegod/cabbagescape/mixin/GameMenuMixin.java b/src/main/java/com/cabbagegod/cabbagescape/mixin/GameMenuMixin.java
index 73dcfc2..8b02d80 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/mixin/GameMenuMixin.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/mixin/GameMenuMixin.java
@@ -1,6 +1,6 @@
 package com.cabbagegod.cabbagescape.mixin;
 
-import com.cabbagegod.cabbagescape.ui.SettingsScreen;
+import com.cabbagegod.cabbagescape.ui.settings.SettingsScreen;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.GameMenuScreen;
 import net.minecraft.client.gui.screen.Screen;
diff --git a/src/main/java/com/cabbagegod/cabbagescape/ui/GroundItemsScreen.java b/src/main/java/com/cabbagegod/cabbagescape/ui/settings/GroundItemsScreen.java
similarity index 96%
rename from src/main/java/com/cabbagegod/cabbagescape/ui/GroundItemsScreen.java
rename to src/main/java/com/cabbagegod/cabbagescape/ui/settings/GroundItemsScreen.java
index 32ff733..136c9db 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/ui/GroundItemsScreen.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/ui/settings/GroundItemsScreen.java
@@ -1,4 +1,4 @@
-package com.cabbagegod.cabbagescape.ui;
+package com.cabbagegod.cabbagescape.ui.settings;
 
 import com.cabbagegod.cabbagescape.client.CabbageScapeClient;
 import com.cabbagegod.cabbagescape.data.GroundItemSettings;
@@ -29,10 +29,10 @@ public class GroundItemsScreen extends GameOptionsScreen {
     private TextFieldWidget groundItemsListTextField;
     private TextFieldWidget containsKeysTextField;
 
-    public GroundItemsScreen(Screen parent, GameOptions gameOptions, Settings settings) {
-        super(parent, gameOptions, new LiteralText("Ground Items Options"));
+    public GroundItemsScreen() {
+        super(null, null, new LiteralText("Ground Items Options"));
 
-        this.settings = settings;
+        this.settings = CabbageScapeClient.settings;
     }
 
     protected void init(){
diff --git a/src/main/java/com/cabbagegod/cabbagescape/ui/settings/PluginsScreen.java b/src/main/java/com/cabbagegod/cabbagescape/ui/settings/PluginsScreen.java
new file mode 100644
index 0000000..933894b
--- /dev/null
+++ b/src/main/java/com/cabbagegod/cabbagescape/ui/settings/PluginsScreen.java
@@ -0,0 +1,64 @@
+package com.cabbagegod.cabbagescape.ui.settings;
+
+import com.cabbagegod.cabbagescape.data.Settings;
+import com.cabbagegod.cabbagescape.ui.ButtonOption;
+import com.cabbagegod.cabbagescape.data.MinescapePlugins;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.gui.screen.option.GameOptionsScreen;
+import net.minecraft.client.gui.widget.ButtonListWidget;
+import net.minecraft.client.option.GameOptions;
+import net.minecraft.client.option.Option;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.text.LiteralText;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class PluginsScreen extends GameOptionsScreen {
+    private static Option[] OPTIONS;
+    private ButtonListWidget buttonList;
+    private final Settings settings;
+
+    public PluginsScreen(Screen parent, GameOptions gameOptions, Settings settings) {
+        super(parent, gameOptions, new LiteralText("Plugins Settings"));
+
+        this.settings = settings;
+    }
+
+    protected void init(){
+        try {
+            setup();
+        } catch (NoSuchMethodException | InvocationTargetException | InstantiationException | IllegalAccessException e) {
+            e.printStackTrace();
+        }
+
+        this.buttonList = new ButtonListWidget(this.client, this.width, this.height, 32, this.height - 32, 25);
+        this.buttonList.addAll(OPTIONS);
+
+        addSelectableChild(this.buttonList);
+    }
+
+    public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
+        renderBackground(matrices);
+        buttonList.render(matrices, mouseX, mouseY, delta);
+
+        super.render(matrices, mouseX, mouseY, delta);
+    }
+
+    private void setup() throws NoSuchMethodException, InvocationTargetException, InstantiationException, IllegalAccessException {
+        List<Option> options = new ArrayList<>();
+
+        for (MinescapePlugins plugin: MinescapePlugins.values()) {
+            Object screen = plugin.screen.getDeclaredConstructor().newInstance();
+
+            Option newOption = new ButtonOption(plugin.toString(), (widget) -> {
+                MinecraftClient.getInstance().setScreen((Screen) screen);
+            });
+            options.add(newOption);
+        }
+
+        OPTIONS = options.toArray(new Option[0]);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/cabbagegod/cabbagescape/ui/SettingsScreen.java b/src/main/java/com/cabbagegod/cabbagescape/ui/settings/SettingsScreen.java
similarity index 77%
rename from src/main/java/com/cabbagegod/cabbagescape/ui/SettingsScreen.java
rename to src/main/java/com/cabbagegod/cabbagescape/ui/settings/SettingsScreen.java
index 1e5e319..0468ed7 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/ui/SettingsScreen.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/ui/settings/SettingsScreen.java
@@ -1,4 +1,4 @@
-package com.cabbagegod.cabbagescape.ui;
+package com.cabbagegod.cabbagescape.ui.settings;
 
 import com.cabbagegod.cabbagescape.client.CabbageScapeClient;
 import net.fabricmc.api.EnvType;
@@ -21,15 +21,13 @@ public SettingsScreen() {
     public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
         renderBackground(matrices);
 
-        addDrawableChild(new ButtonWidget(this.width / 2 - 102, this.height / 4 + 96 + -16, 204, 20, new LiteralText("Ground Items"), button -> {
-            //this.client.setScreen(new OptionsScreen(this, this.client.options));
-            MinecraftClient.getInstance().setScreen(new GroundItemsScreen(this, this.client.options, CabbageScapeClient.settings));
+        addDrawableChild(new ButtonWidget(this.width / 2 - 102, this.height / 4 + 96 + -16, 204, 20, new LiteralText("Plugin Settings"), button -> {
+            MinecraftClient.getInstance().setScreen(new PluginsScreen(this, this.client.options, CabbageScapeClient.settings));
         }));
         addDrawableChild(new ButtonWidget(this.width / 2 - 102, this.height / 4 + 96 + 16, 204, 20, new LiteralText("Done"), button -> {
             MinecraftClient.getInstance().setScreen(new GameMenuScreen(true));
         }));
 
-
         super.render(matrices, mouseX, mouseY, delta);
     }
 }

From 8da18d2e3bf134aeccc56cac53fe595f2a419ba4 Mon Sep 17 00:00:00 2001
From: CabbageGod <cabbagegod.dev@gmail.com>
Date: Sat, 4 Feb 2023 19:05:22 -0500
Subject: [PATCH 08/15] Events refactor

---
 build.gradle                                  |  5 ++
 .../com/cabbagegod/cabbagescape/Main.java     | 10 +++-
 .../DoorUseCallback.java                      |  3 +-
 .../callbacks/ReceiveChatMessageCallback.java | 22 +++++++
 .../client/CabbageScapeClient.java            | 55 +++++++++---------
 .../cabbagescape/client/EventRegisterer.java  | 12 ----
 .../cabbagescape/client/LevelUpManager.java   |  1 -
 .../client/barrows/BarrowsHelper.java         | 11 ++--
 .../client/cluetracker/ClueTracker.java       |  9 +--
 .../grounditems/GroundItemsManager.java       | 12 ++--
 .../potiontimers/PotionTimerManager.java      | 16 ++---
 .../cabbagescape/commands/Commands.java       | 25 +++++++-
 .../events/ChatMessageHandler.java            | 17 ++++++
 .../events/ClueTrackerHandler.java            | 12 ++++
 .../cabbagescape/events/EventHandler.java     |  5 ++
 .../events/PotionTimerHandler.java            | 43 ++++++++++++++
 .../events/ServerConnectionHandler.java       | 17 ++++++
 .../cabbagescape/mixin/ChatHudMixin.java      |  3 +-
 .../cabbagescape/mixin/DoorBlockMixin.java    |  2 +-
 .../cabbagescape/mixin/InGameHudMixin.java    | 58 -------------------
 .../notifications/NotificationManager.java    | 15 +++++
 src/main/resources/cabbagescape.mixins.json   |  1 -
 22 files changed, 227 insertions(+), 127 deletions(-)
 rename src/main/java/com/cabbagegod/cabbagescape/{events => callbacks}/DoorUseCallback.java (92%)
 create mode 100644 src/main/java/com/cabbagegod/cabbagescape/callbacks/ReceiveChatMessageCallback.java
 delete mode 100644 src/main/java/com/cabbagegod/cabbagescape/client/EventRegisterer.java
 create mode 100644 src/main/java/com/cabbagegod/cabbagescape/events/ChatMessageHandler.java
 create mode 100644 src/main/java/com/cabbagegod/cabbagescape/events/ClueTrackerHandler.java
 create mode 100644 src/main/java/com/cabbagegod/cabbagescape/events/EventHandler.java
 create mode 100644 src/main/java/com/cabbagegod/cabbagescape/events/PotionTimerHandler.java
 create mode 100644 src/main/java/com/cabbagegod/cabbagescape/events/ServerConnectionHandler.java
 delete mode 100644 src/main/java/com/cabbagegod/cabbagescape/mixin/InGameHudMixin.java

diff --git a/build.gradle b/build.gradle
index 27ac707..7fd50b0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -26,6 +26,11 @@ dependencies {
 
 	// Fabric API. This is technically optional, but you probably want it anyway.
 	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+
+	//Reflection API for EventHandler
+	implementation 'org.reflections:reflections:0.10.2'
+	include 'org.reflections:reflections:0.10.2'
+	include 'org.javassist:javassist:3.29.2-GA'
 }
 
 processResources {
diff --git a/src/main/java/com/cabbagegod/cabbagescape/Main.java b/src/main/java/com/cabbagegod/cabbagescape/Main.java
index 3bde2d2..ad92f6f 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/Main.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/Main.java
@@ -1,9 +1,17 @@
 package com.cabbagegod.cabbagescape;
 
+import com.cabbagegod.cabbagescape.client.cluetracker.ClueTracker;
+import com.cabbagegod.cabbagescape.events.EventHandler;
+import jdk.jfr.Event;
 import net.fabricmc.api.ModInitializer;
+import org.reflections.Reflections;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Set;
+
 public class Main implements ModInitializer {
 	// This logger is used to write text to the console and the log file.
 	// It is considered best practice to use your mod id as the logger's name.
@@ -15,6 +23,6 @@ public void onInitialize() {
 		// This code runs as soon as Minecraft is in a mod-load-ready state.
 		// However, some things (like resources) may still be uninitialized.
 		// Proceed with mild caution.
-		LOGGER.info("Hello Fabric world!");
+		LOGGER.info("Loaded CabbageScape");
 	}
 }
diff --git a/src/main/java/com/cabbagegod/cabbagescape/events/DoorUseCallback.java b/src/main/java/com/cabbagegod/cabbagescape/callbacks/DoorUseCallback.java
similarity index 92%
rename from src/main/java/com/cabbagegod/cabbagescape/events/DoorUseCallback.java
rename to src/main/java/com/cabbagegod/cabbagescape/callbacks/DoorUseCallback.java
index 5180ff0..5004575 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/events/DoorUseCallback.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/callbacks/DoorUseCallback.java
@@ -1,4 +1,4 @@
-package com.cabbagegod.cabbagescape.events;
+package com.cabbagegod.cabbagescape.callbacks;
 
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;
@@ -6,7 +6,6 @@
 import net.minecraft.util.math.BlockPos;
 
 public interface DoorUseCallback {
-
     Event<DoorUseCallback> EVENT = EventFactory.createArrayBacked(DoorUseCallback.class,
             (listeners) -> (player, pos) -> {
                 for(DoorUseCallback listener : listeners){
diff --git a/src/main/java/com/cabbagegod/cabbagescape/callbacks/ReceiveChatMessageCallback.java b/src/main/java/com/cabbagegod/cabbagescape/callbacks/ReceiveChatMessageCallback.java
new file mode 100644
index 0000000..c8c91e5
--- /dev/null
+++ b/src/main/java/com/cabbagegod/cabbagescape/callbacks/ReceiveChatMessageCallback.java
@@ -0,0 +1,22 @@
+package com.cabbagegod.cabbagescape.callbacks;
+
+import net.fabricmc.fabric.api.event.Event;
+import net.fabricmc.fabric.api.event.EventFactory;
+import net.minecraft.util.ActionResult;
+
+public interface ReceiveChatMessageCallback {
+
+    Event<ReceiveChatMessageCallback> EVENT = EventFactory.createArrayBacked(ReceiveChatMessageCallback.class, (listeners) -> (message) -> {
+        for (ReceiveChatMessageCallback listener : listeners) {
+            ActionResult result = listener.interact(message);
+
+            if(result != ActionResult.PASS) {
+                return result;
+            }
+        }
+
+        return ActionResult.PASS;
+    });
+
+    ActionResult interact(String message);
+}
diff --git a/src/main/java/com/cabbagegod/cabbagescape/client/CabbageScapeClient.java b/src/main/java/com/cabbagegod/cabbagescape/client/CabbageScapeClient.java
index 0c21ee7..d9ca31d 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/client/CabbageScapeClient.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/client/CabbageScapeClient.java
@@ -1,5 +1,6 @@
 package com.cabbagegod.cabbagescape.client;
 
+import com.cabbagegod.cabbagescape.Main;
 import com.cabbagegod.cabbagescape.client.barrows.BarrowsHelper;
 import com.cabbagegod.cabbagescape.client.blockoutline.BlockOutlineManager;
 import com.cabbagegod.cabbagescape.client.blockoutline.PersistentOutlineRenderer;
@@ -8,21 +9,28 @@
 import com.cabbagegod.cabbagescape.data.DataHandler;
 import com.cabbagegod.cabbagescape.data.DelayedScreenshot;
 import com.cabbagegod.cabbagescape.data.Settings;
+import com.cabbagegod.cabbagescape.events.EventHandler;
 import com.cabbagegod.cabbagescape.notifications.NotificationManager;
 import com.cabbagegod.cabbagescape.ui.UpdateScreen;
 import com.cabbagegod.cabbagescape.util.FileUtil;
 import com.cabbagegod.cabbagescape.util.ScreenshotUtil;
 import com.google.gson.Gson;
 import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientEntityEvents;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
+import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.client.option.KeyBinding;
 import net.minecraft.client.texture.NativeImage;
 import net.minecraft.client.util.ScreenshotRecorder;
+import org.reflections.Reflections;
 
 import java.io.File;
 import java.io.IOException;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
@@ -35,26 +43,39 @@ public class CabbageScapeClient implements ClientModInitializer {
     public static NotificationManager notificationManager;
 
     //Keybinds - F to pay respects
-    private static KeyBinding debugKey;
+    public static KeyBinding debugKey;
 
     @Override
     public void onInitializeClient() {
         debugKey = KeybindHandler.createKeybind("debug_key", "category.cabbagescape", 0);
 
         loadSettings();
-        VersionChecker.Verify();
 
         notificationManager = new NotificationManager(settings.notificationSettings);
 
-        Commands.register();
         setupEvents();
-        EventRegisterer.register();
-        GroundItemsManager.register();
-        BarrowsHelper.register();
-
-        //PotionTimerManager potionTimerManager = PotionTimerManager.getInstance();
 
         BlockOutlineManager.getInstance().add(PersistentOutlineRenderer.getInstance());
+
+        loadEventHandlers();
+    }
+
+    private void loadEventHandlers(){
+        //Load all event handlers
+        Reflections reflections = new Reflections("com.cabbagegod.cabbagescape");
+        Set<Class<? extends EventHandler>> classes = reflections.getSubTypesOf(EventHandler.class);
+        for (Class handler: classes) {
+            try {
+                Constructor<?> hConst = handler.getConstructor();
+
+                EventHandler eventHandler = (EventHandler) hConst.newInstance();
+
+                eventHandler.start();
+
+                Main.LOGGER.info("Started Event: " + eventHandler.getClass().getTypeName());
+            } catch (NoSuchMethodException | InvocationTargetException | InstantiationException | IllegalAccessException ignored) {
+            }
+        }
     }
 
     //Loads json file as settings
@@ -83,25 +104,7 @@ public static void saveSettings(){
     private void setupEvents(){
         ClientTickEvents.END_CLIENT_TICK.register(client -> {
             delayedScreenshotQueue();
-
-            if(client.world != null) {
-                checkKeyPress(client);
-            }
         });
-
-        ClientPlayConnectionEvents.JOIN.register(((handler, sender, client) -> {
-            if(VersionChecker.shouldShowUpdate())
-                client.setScreen(new UpdateScreen());
-        }));
-    }
-
-    //Is called every client tick to see if a hotkey was pressed
-    private void checkKeyPress(MinecraftClient client){
-        assert client.player != null;
-
-        if(debugKey.wasPressed()){
-            //test something
-        }
     }
 
     //Allows you to take a screenshot from another thread and or with a delay
diff --git a/src/main/java/com/cabbagegod/cabbagescape/client/EventRegisterer.java b/src/main/java/com/cabbagegod/cabbagescape/client/EventRegisterer.java
deleted file mode 100644
index ce756b8..0000000
--- a/src/main/java/com/cabbagegod/cabbagescape/client/EventRegisterer.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.cabbagegod.cabbagescape.client;
-
-import com.cabbagegod.cabbagescape.client.cluetracker.ClueTracker;
-
-//Used to register all events to remove clutter from CabbageScapeClient
-public class EventRegisterer {
-    public static ClueTracker clueTracker = new ClueTracker();
-
-    public static void register(){
-        clueTracker.register();
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/cabbagegod/cabbagescape/client/LevelUpManager.java b/src/main/java/com/cabbagegod/cabbagescape/client/LevelUpManager.java
index 07b2bf6..116ed0b 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/client/LevelUpManager.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/client/LevelUpManager.java
@@ -6,7 +6,6 @@
 import java.util.List;
 
 public class LevelUpManager {
-    private static String lastLevelUpMessage = "";
     private static List<Skill> skills;
 
     //These are used for checking if the player has received a level up
diff --git a/src/main/java/com/cabbagegod/cabbagescape/client/barrows/BarrowsHelper.java b/src/main/java/com/cabbagegod/cabbagescape/client/barrows/BarrowsHelper.java
index 1aeaf0b..fd92200 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/client/barrows/BarrowsHelper.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/client/barrows/BarrowsHelper.java
@@ -1,7 +1,8 @@
 package com.cabbagegod.cabbagescape.client.barrows;
 
 import com.cabbagegod.cabbagescape.client.blockoutline.PersistentOutlineRenderer;
-import com.cabbagegod.cabbagescape.events.DoorUseCallback;
+import com.cabbagegod.cabbagescape.callbacks.DoorUseCallback;
+import com.cabbagegod.cabbagescape.events.EventHandler;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.enchantment.Enchantments;
@@ -17,11 +18,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class BarrowsHelper {
+public class BarrowsHelper implements EventHandler {
     private static final Bounds BarrowsBounds = new Bounds(new Vec3d(1583,17,-78), new Vec3d(1708,100,48));
     private static final Bounds BarrowsUndergroundBounds = new Bounds(new Vec3d(1583,17,-78), new Vec3d(1708,32,48));
 
-    private static boolean isInBarrows = false;
     private static boolean isInBarrowsUnderground = false;
 
     public static List<BlockPos> trackedDoors = new ArrayList<>();
@@ -34,7 +34,8 @@ public class BarrowsHelper {
     static ArmorStandEntity toragIndicator;
     static ArmorStandEntity veracIndicator;
 
-    public static void register(){
+    @Override
+    public void start() {
         ClientTickEvents.END_CLIENT_TICK.register(BarrowsHelper::tickEvent);
         DoorUseCallback.EVENT.register(BarrowsHelper::onUseDoor);
     }
@@ -44,7 +45,7 @@ private static void tickEvent(MinecraftClient client) {
             assert client.player != null;
 
             //Check if player is in barrows
-            isInBarrows = BarrowsBounds.isWithinBounds(client.player.getPos());
+            boolean isInBarrows = BarrowsBounds.isWithinBounds(client.player.getPos());
             isInBarrowsUnderground = BarrowsUndergroundBounds.isWithinBounds(client.player.getPos());
 
             if(isInBarrows) {
diff --git a/src/main/java/com/cabbagegod/cabbagescape/client/cluetracker/ClueTracker.java b/src/main/java/com/cabbagegod/cabbagescape/client/cluetracker/ClueTracker.java
index ed989f4..efb2efb 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/client/cluetracker/ClueTracker.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/client/cluetracker/ClueTracker.java
@@ -2,11 +2,14 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
+import com.cabbagegod.cabbagescape.Main;
 import com.cabbagegod.cabbagescape.client.cluetracker.ClueStep.Difficulty;
 import com.cabbagegod.cabbagescape.data.itemdata.ItemDisplay;
 import com.cabbagegod.cabbagescape.data.itemdata.ItemExtra;
 import com.cabbagegod.cabbagescape.data.itemdata.ItemExtra__1;
 import com.cabbagegod.cabbagescape.data.itemdata.ItemLore;
+import com.cabbagegod.cabbagescape.events.EventHandler;
 import com.cabbagegod.cabbagescape.ui.ClueHintScreen;
 import com.google.gson.Gson;
 import net.fabricmc.fabric.api.event.player.UseItemCallback;
@@ -20,7 +23,7 @@
 public class ClueTracker {
     static List<ClueStep> clueSteps = new ArrayList<ClueStep>();
 
-    public ClueTracker(){
+    public static void Setup(){
         if(clueSteps.size() != 0)
             return;
 
@@ -89,9 +92,7 @@ public void register(){
                                 for(ItemExtra__1 extra2 : extra.getExtra()) {
                                     try {
                                         clueId = Integer.parseInt(extra2.getText().replaceAll("[\\D]", ""));
-                                    } catch (NumberFormatException e){
-                                        //This one wasn't the clue id
-                                    }
+                                    } catch (NumberFormatException ignored){ }
                                 }
                             }
                         }
diff --git a/src/main/java/com/cabbagegod/cabbagescape/client/grounditems/GroundItemsManager.java b/src/main/java/com/cabbagegod/cabbagescape/client/grounditems/GroundItemsManager.java
index 0f08acf..8a977e7 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/client/grounditems/GroundItemsManager.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/client/grounditems/GroundItemsManager.java
@@ -5,6 +5,7 @@
 import com.cabbagegod.cabbagescape.client.blockoutline.Vector3f;
 import com.cabbagegod.cabbagescape.data.GroundItemSettings;
 import com.cabbagegod.cabbagescape.data.Settings;
+import com.cabbagegod.cabbagescape.events.EventHandler;
 import com.cabbagegod.cabbagescape.util.ParticleUtil;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientEntityEvents;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
@@ -23,16 +24,17 @@
 import java.util.List;
 import java.util.Objects;
 
-public class GroundItemsManager {
-    //Ground items
-    private static List<Entity> armorStands = new ArrayList<Entity>();
-
-    public static void register(){
+public class GroundItemsManager implements EventHandler {
+    @Override
+    public void start() {
         ClientEntityEvents.ENTITY_LOAD.register(GroundItemsManager::OnArmorStandLoad);
         ClientEntityEvents.ENTITY_UNLOAD.register(GroundItemsManager::OnArmorStandUnload);
         ClientTickEvents.END_CLIENT_TICK.register(GroundItemsManager::OnEndTick);
     }
 
+    //Ground items
+    private static List<Entity> armorStands = new ArrayList<Entity>();
+
     public static void RemoveArmorStand(Entity e){
         armorStands.remove(e);
     }
diff --git a/src/main/java/com/cabbagegod/cabbagescape/client/potiontimers/PotionTimerManager.java b/src/main/java/com/cabbagegod/cabbagescape/client/potiontimers/PotionTimerManager.java
index 5ed1ae0..068ff08 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/client/potiontimers/PotionTimerManager.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/client/potiontimers/PotionTimerManager.java
@@ -133,14 +133,14 @@ Potion parsePotionName(String name){
 
     List<Potion> getPotions(){
         List<Potion> potions = new ArrayList<Potion>();
-        potions.add(new Potion(3 * 60, "super antifire potion", "textures/custom/diamond_shovel/herblore_or_potion/super_antifire_potion/super_antifire_potion_4.png"));
-        potions.add(new Potion(6 * 60, "antifire potion", "textures/custom/diamond_shovel/herblore_or_potion/antifire_potion/antifire_potion_4.png"));
-        potions.add(new Potion(12 * 60, "extended antifire", "textures/custom/diamond_shovel/herblore_or_potion/extended_antifire/extended_antifire_4.png"));
-        potions.add(new Potion(6 * 60, "extended super antifire", "textures/custom/diamond_shovel/herblore_or_potion/extended_super_antifire/extended_super_antifire_4.png"));
-        potions.add(new Potion(3 * 60, "agility potion", "textures/custom/diamond_shovel/herblore_or_potion/agility_potion/agility_potion_4.png"));
-        potions.add(new Potion(4 * 60, "magic potion", "textures/custom/diamond_shovel/herblore_or_potion/magic_potion/magic_potion_4.png"));
-        potions.add(new Potion(3 * 60, "hunter potion", "textures/custom/diamond_shovel/herblore_or_potion/hunter_potion/hunter_potion_4.png"));
-        potions.add(new Potion(3 * 60, "fishing potion", "textures/custom/diamond_shovel/herblore_or_potion/fishing_potion/fishing_potion_4.png"));
+        potions.add(new Potion(3 * 60, "super antifire potion", "textures/item/custom/diamond_shovel/herblore_or_potion/super_antifire_potion/super_antifire_potion_4.png"));
+        potions.add(new Potion(6 * 60, "antifire potion", "textures/item/custom/diamond_shovel/herblore_or_potion/antifire_potion/antifire_potion_4.png"));
+        potions.add(new Potion(12 * 60, "extended antifire", "textures/item/custom/diamond_shovel/herblore_or_potion/extended_antifire/extended_antifire_4.png"));
+        potions.add(new Potion(6 * 60, "extended super antifire", "textures/item/custom/diamond_shovel/herblore_or_potion/extended_super_antifire/extended_super_antifire_4.png"));
+        potions.add(new Potion(3 * 60, "agility potion", "textures/item/custom/diamond_shovel/herblore_or_potion/agility_potion/agility_potion_4.png"));
+        potions.add(new Potion(4 * 60, "magic potion", "textures/item/custom/diamond_shovel/herblore_or_potion/magic_potion/magic_potion_4.png"));
+        potions.add(new Potion(3 * 60, "hunter potion", "textures/item/custom/diamond_shovel/herblore_or_potion/hunter_potion/hunter_potion_4.png"));
+        potions.add(new Potion(3 * 60, "fishing potion", "textures/item/custom/diamond_shovel/herblore_or_potion/fishing_potion/fishing_potion_4.png"));
 
         return potions;
     }
diff --git a/src/main/java/com/cabbagegod/cabbagescape/commands/Commands.java b/src/main/java/com/cabbagegod/cabbagescape/commands/Commands.java
index 2d3f3a3..a96f171 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/commands/Commands.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/commands/Commands.java
@@ -2,15 +2,36 @@
 
 import com.cabbagegod.cabbagescape.client.CabbageScapeClient;
 import com.cabbagegod.cabbagescape.client.blockoutline.PersistentOutlineRenderer;
+import com.cabbagegod.cabbagescape.events.EventHandler;
 import com.mojang.brigadier.arguments.FloatArgumentType;
 import net.fabricmc.fabric.api.client.command.v1.ClientCommandManager;
+import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.text.LiteralText;
 import net.minecraft.text.Text;
 import org.apache.commons.lang3.StringUtils;
 
-public class Commands {
-    public static void register(){
+public class Commands implements EventHandler {
+    @Override
+    public void start() {
+        register();
+        ClientTickEvents.END_CLIENT_TICK.register(client -> {
+            if(client.world != null) {
+                checkKeyPress(client);
+            }
+        });
+    }
+
+    //Is called every client tick to see if a hotkey was pressed
+    private void checkKeyPress(MinecraftClient client){
+        assert client.player != null;
+
+        if(CabbageScapeClient.debugKey.wasPressed()){
+            //test something
+        }
+    }
+
+    private void register(){
         ClientCommandManager.DISPATCHER.register(ClientCommandManager.literal("grounditems")
                 .then(ClientCommandManager.literal("add")
                         .then(ClientCommandManager.argument("item", ClientMessageArgumentType.message())
diff --git a/src/main/java/com/cabbagegod/cabbagescape/events/ChatMessageHandler.java b/src/main/java/com/cabbagegod/cabbagescape/events/ChatMessageHandler.java
new file mode 100644
index 0000000..04357ef
--- /dev/null
+++ b/src/main/java/com/cabbagegod/cabbagescape/events/ChatMessageHandler.java
@@ -0,0 +1,17 @@
+package com.cabbagegod.cabbagescape.events;
+
+import com.cabbagegod.cabbagescape.callbacks.ReceiveChatMessageCallback;
+import com.cabbagegod.cabbagescape.client.LevelUpManager;
+
+public class ChatMessageHandler implements EventHandler {
+
+
+    @Override
+    public void start() {
+        ReceiveChatMessageCallback.EVENT.register((String message) -> {
+            LevelUpManager.receiveMessage(message);
+
+            return null;
+        });
+    }
+}
diff --git a/src/main/java/com/cabbagegod/cabbagescape/events/ClueTrackerHandler.java b/src/main/java/com/cabbagegod/cabbagescape/events/ClueTrackerHandler.java
new file mode 100644
index 0000000..395347e
--- /dev/null
+++ b/src/main/java/com/cabbagegod/cabbagescape/events/ClueTrackerHandler.java
@@ -0,0 +1,12 @@
+package com.cabbagegod.cabbagescape.events;
+
+import com.cabbagegod.cabbagescape.client.cluetracker.ClueTracker;
+
+public class ClueTrackerHandler implements EventHandler {
+
+    @Override
+    public void start() {
+        new ClueTracker().register();
+    }
+
+}
diff --git a/src/main/java/com/cabbagegod/cabbagescape/events/EventHandler.java b/src/main/java/com/cabbagegod/cabbagescape/events/EventHandler.java
new file mode 100644
index 0000000..e907c8c
--- /dev/null
+++ b/src/main/java/com/cabbagegod/cabbagescape/events/EventHandler.java
@@ -0,0 +1,5 @@
+package com.cabbagegod.cabbagescape.events;
+
+public interface EventHandler {
+    void start();
+}
diff --git a/src/main/java/com/cabbagegod/cabbagescape/events/PotionTimerHandler.java b/src/main/java/com/cabbagegod/cabbagescape/events/PotionTimerHandler.java
new file mode 100644
index 0000000..bd8b12a
--- /dev/null
+++ b/src/main/java/com/cabbagegod/cabbagescape/events/PotionTimerHandler.java
@@ -0,0 +1,43 @@
+package com.cabbagegod.cabbagescape.events;
+
+import com.cabbagegod.cabbagescape.client.potiontimers.PotionInstance;
+import com.cabbagegod.cabbagescape.client.potiontimers.PotionTimerManager;
+import com.mojang.blaze3d.systems.RenderSystem;
+import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.font.TextRenderer;
+import net.minecraft.client.gui.DrawableHelper;
+import net.minecraft.client.render.GameRenderer;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.text.LiteralText;
+import net.minecraft.util.Identifier;
+
+public class PotionTimerHandler implements EventHandler {
+    @Override
+    public void start(){
+        HudRenderCallback.EVENT.register(PotionTimerHandler::onHudRender);
+    }
+
+
+    public static void onHudRender(MatrixStack matrices, float tickDelta){
+        TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer;
+
+        //Display any potion timers
+        int x = 11;
+        for(PotionInstance potion : PotionTimerManager.getInstance().potionThreads.keySet()) {
+            String resourceLocation = potion.resourceLocation.isEmpty() || potion.resourceLocation.isBlank() ? "textures/custom/colors/white.png" : potion.resourceLocation;
+
+            RenderSystem.setShader(GameRenderer::getPositionTexShader);
+            RenderSystem.setShaderColor(1, 1, 1, 1.0F);
+            Identifier potionIcon = new Identifier("minecraft", resourceLocation);
+            RenderSystem.setShaderTexture(0, potionIcon);
+
+            DrawableHelper.drawTexture(matrices, x, 5, 0, 0, 22, 22, 22, 22);
+            long currentTime = (potion.startTime / 1000) + potion.length - (System.currentTimeMillis() / 1000);
+
+            DrawableHelper.drawCenteredText(matrices, textRenderer, new LiteralText("" + Math.round(currentTime)), x + 11, 20, -1);
+
+            x += 30;
+        }
+    }
+}
diff --git a/src/main/java/com/cabbagegod/cabbagescape/events/ServerConnectionHandler.java b/src/main/java/com/cabbagegod/cabbagescape/events/ServerConnectionHandler.java
new file mode 100644
index 0000000..cc30d70
--- /dev/null
+++ b/src/main/java/com/cabbagegod/cabbagescape/events/ServerConnectionHandler.java
@@ -0,0 +1,17 @@
+package com.cabbagegod.cabbagescape.events;
+
+import com.cabbagegod.cabbagescape.client.VersionChecker;
+import com.cabbagegod.cabbagescape.ui.UpdateScreen;
+import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
+
+public class ServerConnectionHandler implements EventHandler{
+    @Override
+    public void start() {
+        VersionChecker.Verify();
+
+        ClientPlayConnectionEvents.JOIN.register(((handler, sender, client) -> {
+            if(VersionChecker.shouldShowUpdate())
+                client.setScreen(new UpdateScreen());
+        }));
+    }
+}
diff --git a/src/main/java/com/cabbagegod/cabbagescape/mixin/ChatHudMixin.java b/src/main/java/com/cabbagegod/cabbagescape/mixin/ChatHudMixin.java
index ff97311..41d42aa 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/mixin/ChatHudMixin.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/mixin/ChatHudMixin.java
@@ -1,5 +1,6 @@
 package com.cabbagegod.cabbagescape.mixin;
 
+import com.cabbagegod.cabbagescape.callbacks.ReceiveChatMessageCallback;
 import com.cabbagegod.cabbagescape.client.LevelUpManager;
 import net.minecraft.client.gui.hud.ChatHud;
 import net.minecraft.text.Text;
@@ -16,6 +17,6 @@
 public class ChatHudMixin {
     @Inject(at = @At("RETURN"), method = "addMessage(Lnet/minecraft/text/Text;)V")
     public void addMessage(Text message, CallbackInfo ci){
-        LevelUpManager.receiveMessage(message.getString());
+        ReceiveChatMessageCallback.EVENT.invoker().interact(message.getString());
     }
 }
diff --git a/src/main/java/com/cabbagegod/cabbagescape/mixin/DoorBlockMixin.java b/src/main/java/com/cabbagegod/cabbagescape/mixin/DoorBlockMixin.java
index ffa74cc..c2cf60b 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/mixin/DoorBlockMixin.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/mixin/DoorBlockMixin.java
@@ -1,6 +1,6 @@
 package com.cabbagegod.cabbagescape.mixin;
 
-import com.cabbagegod.cabbagescape.events.DoorUseCallback;
+import com.cabbagegod.cabbagescape.callbacks.DoorUseCallback;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.DoorBlock;
 import net.minecraft.entity.player.PlayerEntity;
diff --git a/src/main/java/com/cabbagegod/cabbagescape/mixin/InGameHudMixin.java b/src/main/java/com/cabbagegod/cabbagescape/mixin/InGameHudMixin.java
deleted file mode 100644
index 98730da..0000000
--- a/src/main/java/com/cabbagegod/cabbagescape/mixin/InGameHudMixin.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.cabbagegod.cabbagescape.mixin;
-
-import com.cabbagegod.cabbagescape.client.potiontimers.PotionInstance;
-import com.cabbagegod.cabbagescape.client.potiontimers.PotionTimerManager;
-import com.cabbagegod.cabbagescape.notifications.NotificationManager;
-import com.mojang.blaze3d.systems.RenderSystem;
-import net.minecraft.client.font.TextRenderer;
-import net.minecraft.client.gui.DrawableHelper;
-import net.minecraft.client.gui.hud.InGameHud;
-import net.minecraft.client.render.GameRenderer;
-import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.text.LiteralText;
-import net.minecraft.util.Identifier;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(InGameHud.class)
-public abstract class InGameHudMixin extends DrawableHelper {
-    @Shadow private int scaledWidth;
-
-    @Shadow private int scaledHeight;
-
-    @Shadow public abstract TextRenderer getTextRenderer();
-
-    @Inject(method = "render", at = @At("RETURN"))
-    public void render(MatrixStack matrices, float tickDelta, CallbackInfo info){
-        //Display any potion timers
-        int x = 11;
-        for(PotionInstance potion : PotionTimerManager.getInstance().potionThreads.keySet()) {
-            String resourceLocation = potion.resourceLocation.isEmpty() || potion.resourceLocation.isBlank() ? "textures/custom/colors/white.png" : potion.resourceLocation;
-
-            RenderSystem.setShader(GameRenderer::getPositionTexShader);
-            RenderSystem.setShaderColor(1, 1, 1, 1.0F);
-            Identifier potionIcon = new Identifier("minecraft", resourceLocation);
-            RenderSystem.setShaderTexture(0, potionIcon);
-
-            drawTexture(matrices, x, 5, 0, 0, 22, 22, 22, 22);
-            long currentTime = (potion.startTime / 1000) + potion.length - (System.currentTimeMillis() / 1000);
-
-            drawCenteredText(matrices, this.getTextRenderer(), new LiteralText("" + Math.round(currentTime)), x + 11, 20, -1);
-
-            x += 30;
-        }
-
-        //Display flash notification
-        if(NotificationManager.showFlash) {
-
-
-            //The color picker texture
-            //Texture transparency for some reason is acting all funny :(
-            //drawTexture(matrices, 0, 0, 0, 0, this.scaledWidth - 150, this.scaledHeight - 150);
-            drawCenteredText(matrices, this.getTextRenderer(), new LiteralText(NotificationManager.currentNotif), scaledWidth / 2, scaledHeight / 2, -1);
-        }
-    }
-}
diff --git a/src/main/java/com/cabbagegod/cabbagescape/notifications/NotificationManager.java b/src/main/java/com/cabbagegod/cabbagescape/notifications/NotificationManager.java
index 09be0b8..929d599 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/notifications/NotificationManager.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/notifications/NotificationManager.java
@@ -2,9 +2,13 @@
 
 import com.cabbagegod.cabbagescape.data.NotificationSettings;
 import com.cabbagegod.cabbagescape.util.ThreadingUtil;
+import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.DrawableHelper;
 import net.minecraft.client.network.ClientPlayerEntity;
+import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.sound.SoundEvents;
+import net.minecraft.text.LiteralText;
 
 public class NotificationManager {
     public static boolean showFlash = false;
@@ -14,6 +18,7 @@ public class NotificationManager {
 
     public NotificationManager(NotificationSettings settings){
         this.settings = settings;
+        HudRenderCallback.EVENT.register(NotificationManager::onHudRender);
     }
 
     public void sendNotification(String text){
@@ -34,4 +39,14 @@ public void sendNotification(String text){
             }).start();
         }
     }
+
+    public static void onHudRender(MatrixStack matrices, float t){
+        int width = MinecraftClient.getInstance().getWindow().getWidth();
+        int height = MinecraftClient.getInstance().getWindow().getHeight();
+
+        //The color picker texture
+        //Texture transparency for some reason is acting all funny :(
+        //drawTexture(matrices, 0, 0, 0, 0, this.scaledWidth - 150, this.scaledHeight - 150);
+        DrawableHelper.drawCenteredText(matrices, MinecraftClient.getInstance().textRenderer, new LiteralText(NotificationManager.currentNotif), width / 2, height / 2, -1);
+    }
 }
diff --git a/src/main/resources/cabbagescape.mixins.json b/src/main/resources/cabbagescape.mixins.json
index 98a3076..2c33752 100644
--- a/src/main/resources/cabbagescape.mixins.json
+++ b/src/main/resources/cabbagescape.mixins.json
@@ -7,7 +7,6 @@
     "ChatHudMixin",
     "DoorBlockMixin",
     "GameMenuMixin",
-    "InGameHudMixin",
     "PlayerEntityRendererMixin",
     "WorldRendererMixin"
   ],

From 21b20c9ad126a64bd377abb64e3e334adccf92e1 Mon Sep 17 00:00:00 2001
From: CabbageGod <cabbagegod.dev@gmail.com>
Date: Mon, 13 Feb 2023 05:27:54 -0500
Subject: [PATCH 09/15] Updated Settings

---
 .../cabbagescape/data/MinescapePlugins.java   |  6 +-
 .../cabbagescape/data/Settings.java           |  2 +
 .../data/itemdata/BarrowsHelperSettings.java  |  6 ++
 ...andler.java => VersionCheckerHandler.java} |  2 +-
 .../mixin/PlayerEntityRendererMixin.java      |  4 +-
 .../notifications/NotificationManager.java    | 37 +++++++++----
 .../ui/settings/BarrowsHelperScreen.java      | 45 +++++++++++++++
 .../ui/settings/GroundItemsScreen.java        |  2 +-
 .../settings/NotificationSettingsScreen.java  | 55 +++++++++++++++++++
 .../ui/settings/PluginsScreen.java            |  6 +-
 .../ui/settings/SettingsScreen.java           |  2 +-
 .../assets/cabbagescape/lang/en_us.json       |  7 +--
 12 files changed, 151 insertions(+), 23 deletions(-)
 create mode 100644 src/main/java/com/cabbagegod/cabbagescape/data/itemdata/BarrowsHelperSettings.java
 rename src/main/java/com/cabbagegod/cabbagescape/events/{ServerConnectionHandler.java => VersionCheckerHandler.java} (89%)
 create mode 100644 src/main/java/com/cabbagegod/cabbagescape/ui/settings/BarrowsHelperScreen.java
 create mode 100644 src/main/java/com/cabbagegod/cabbagescape/ui/settings/NotificationSettingsScreen.java

diff --git a/src/main/java/com/cabbagegod/cabbagescape/data/MinescapePlugins.java b/src/main/java/com/cabbagegod/cabbagescape/data/MinescapePlugins.java
index 3033ef4..9449b14 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/data/MinescapePlugins.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/data/MinescapePlugins.java
@@ -1,9 +1,13 @@
 package com.cabbagegod.cabbagescape.data;
 
+import com.cabbagegod.cabbagescape.ui.settings.BarrowsHelperScreen;
 import com.cabbagegod.cabbagescape.ui.settings.GroundItemsScreen;
+import com.cabbagegod.cabbagescape.ui.settings.NotificationSettingsScreen;
 
 public enum MinescapePlugins {
-    GROUNDITEMS("Ground Items", GroundItemsScreen.class);
+    GROUNDITEMS("Ground Items", GroundItemsScreen.class),
+    NOTIFICATIONS("Notifications", NotificationSettingsScreen.class),
+    BARROWS_HELPER("Barrows Helper", BarrowsHelperScreen.class);
 
     public String name;
     public Class screen;
diff --git a/src/main/java/com/cabbagegod/cabbagescape/data/Settings.java b/src/main/java/com/cabbagegod/cabbagescape/data/Settings.java
index 3380904..d4e9879 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/data/Settings.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/data/Settings.java
@@ -1,11 +1,13 @@
 package com.cabbagegod.cabbagescape.data;
 
 import com.cabbagegod.cabbagescape.client.CabbageScapeClient;
+import com.cabbagegod.cabbagescape.data.itemdata.BarrowsHelperSettings;
 
 public class Settings {
     public String lastVersion = CabbageScapeClient.version;
     public GroundItemSettings groundItemSettings = new GroundItemSettings();
     public NotificationSettings notificationSettings = new NotificationSettings();
+    public BarrowsHelperSettings barrowsHelperSettings = new BarrowsHelperSettings();
 
     public Settings(){
 
diff --git a/src/main/java/com/cabbagegod/cabbagescape/data/itemdata/BarrowsHelperSettings.java b/src/main/java/com/cabbagegod/cabbagescape/data/itemdata/BarrowsHelperSettings.java
new file mode 100644
index 0000000..75270e5
--- /dev/null
+++ b/src/main/java/com/cabbagegod/cabbagescape/data/itemdata/BarrowsHelperSettings.java
@@ -0,0 +1,6 @@
+package com.cabbagegod.cabbagescape.data.itemdata;
+
+public class BarrowsHelperSettings {
+    public boolean doorMarkers = false;
+
+}
diff --git a/src/main/java/com/cabbagegod/cabbagescape/events/ServerConnectionHandler.java b/src/main/java/com/cabbagegod/cabbagescape/events/VersionCheckerHandler.java
similarity index 89%
rename from src/main/java/com/cabbagegod/cabbagescape/events/ServerConnectionHandler.java
rename to src/main/java/com/cabbagegod/cabbagescape/events/VersionCheckerHandler.java
index cc30d70..1590a2f 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/events/ServerConnectionHandler.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/events/VersionCheckerHandler.java
@@ -4,7 +4,7 @@
 import com.cabbagegod.cabbagescape.ui.UpdateScreen;
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
 
-public class ServerConnectionHandler implements EventHandler{
+public class VersionCheckerHandler implements EventHandler{
     @Override
     public void start() {
         VersionChecker.Verify();
diff --git a/src/main/java/com/cabbagegod/cabbagescape/mixin/PlayerEntityRendererMixin.java b/src/main/java/com/cabbagegod/cabbagescape/mixin/PlayerEntityRendererMixin.java
index 11bd65d..5742402 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/mixin/PlayerEntityRendererMixin.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/mixin/PlayerEntityRendererMixin.java
@@ -17,9 +17,9 @@ public Text renderLabelIfPresent(Text par2){
             StringBuilder sb = new StringBuilder(nameStr);
             sb.insert(0, "\2477");
             int index = sb.toString().indexOf("CabbageGod");
-            sb.insert(index, "逬\2472");
+            sb.insert(index, "邘\2472");
             index = sb.toString().indexOf("CabbageGod");
-            sb.insert(index + 10, "\247r\2477");
+            sb.insert(index + 10, "\247r邘\2477");
 
             par2 = new LiteralText(sb.toString());
         }
diff --git a/src/main/java/com/cabbagegod/cabbagescape/notifications/NotificationManager.java b/src/main/java/com/cabbagegod/cabbagescape/notifications/NotificationManager.java
index 929d599..5fe70e1 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/notifications/NotificationManager.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/notifications/NotificationManager.java
@@ -13,6 +13,8 @@
 public class NotificationManager {
     public static boolean showFlash = false;
     public static String currentNotif = "";
+    private Thread currentThread = null;
+
 
     NotificationSettings settings;
 
@@ -33,20 +35,35 @@ public void sendNotification(String text){
         if(settings.flashEnabled){
             showFlash = true;
             currentNotif = text;
-            new Thread(() -> {
-                ThreadingUtil.wait(2000);
-                showFlash = false;
-            }).start();
+
+            if(currentThread != null)
+                currentThread.interrupt();
+
+            currentThread = new Thread() {
+                public void run() {
+                    for (int i = 0; i < 20; i++) {
+                        ThreadingUtil.wait(100);
+
+                        if (this.isInterrupted())
+                            return;
+                    }
+                    showFlash = false;
+                }
+            };
+
+            currentThread.start();
         }
     }
 
     public static void onHudRender(MatrixStack matrices, float t){
-        int width = MinecraftClient.getInstance().getWindow().getWidth();
-        int height = MinecraftClient.getInstance().getWindow().getHeight();
+        if(showFlash) {
+            int width = MinecraftClient.getInstance().getWindow().getWidth();
+            int height = MinecraftClient.getInstance().getWindow().getHeight();
 
-        //The color picker texture
-        //Texture transparency for some reason is acting all funny :(
-        //drawTexture(matrices, 0, 0, 0, 0, this.scaledWidth - 150, this.scaledHeight - 150);
-        DrawableHelper.drawCenteredText(matrices, MinecraftClient.getInstance().textRenderer, new LiteralText(NotificationManager.currentNotif), width / 2, height / 2, -1);
+            //The color picker texture
+            //Texture transparency for some reason is acting all funny :(
+            //drawTexture(matrices, 0, 0, 0, 0, this.scaledWidth - 150, this.scaledHeight - 150);
+            DrawableHelper.drawCenteredText(matrices, MinecraftClient.getInstance().textRenderer, new LiteralText(NotificationManager.currentNotif), width / 2, height / 2, -1);
+        }
     }
 }
diff --git a/src/main/java/com/cabbagegod/cabbagescape/ui/settings/BarrowsHelperScreen.java b/src/main/java/com/cabbagegod/cabbagescape/ui/settings/BarrowsHelperScreen.java
new file mode 100644
index 0000000..168b293
--- /dev/null
+++ b/src/main/java/com/cabbagegod/cabbagescape/ui/settings/BarrowsHelperScreen.java
@@ -0,0 +1,45 @@
+package com.cabbagegod.cabbagescape.ui.settings;
+
+import com.cabbagegod.cabbagescape.client.CabbageScapeClient;
+import com.cabbagegod.cabbagescape.data.GroundItemSettings;
+import com.cabbagegod.cabbagescape.data.Settings;
+import net.minecraft.client.gui.screen.option.GameOptionsScreen;
+import net.minecraft.client.gui.widget.ButtonListWidget;
+import net.minecraft.client.option.CyclingOption;
+import net.minecraft.client.option.Option;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.text.LiteralText;
+
+public class BarrowsHelperScreen extends GameOptionsScreen {
+    private static Option[] OPTIONS;
+    private ButtonListWidget buttonList;
+    private final Settings settings;
+
+    public BarrowsHelperScreen() {
+        super(new PluginsScreen(null, CabbageScapeClient.settings), null, new LiteralText("Barrows Helper Options"));
+
+        this.settings = CabbageScapeClient.settings;
+    }
+
+    protected void init(){
+        setupOptions();
+
+        this.buttonList = new ButtonListWidget(this.client, this.width, this.height, 32, this.height - 32, 25);
+        this.buttonList.addAll(OPTIONS);
+
+        addSelectableChild(this.buttonList);
+    }
+
+    public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
+        renderBackground(matrices);
+        buttonList.render(matrices, mouseX, mouseY, delta);
+
+        super.render(matrices, mouseX, mouseY, delta);
+    }
+
+    void setupOptions(){
+        Option doorMarkersEnabled = CyclingOption.create("options.doormarkers", gameOptions -> settings.barrowsHelperSettings.doorMarkers, (gameOptions, option, toggle) -> settings.barrowsHelperSettings.doorMarkers = toggle);
+
+        OPTIONS = new Option[]{doorMarkersEnabled};
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/cabbagegod/cabbagescape/ui/settings/GroundItemsScreen.java b/src/main/java/com/cabbagegod/cabbagescape/ui/settings/GroundItemsScreen.java
index 136c9db..3827993 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/ui/settings/GroundItemsScreen.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/ui/settings/GroundItemsScreen.java
@@ -30,7 +30,7 @@ public class GroundItemsScreen extends GameOptionsScreen {
     private TextFieldWidget containsKeysTextField;
 
     public GroundItemsScreen() {
-        super(null, null, new LiteralText("Ground Items Options"));
+        super(new PluginsScreen(null, CabbageScapeClient.settings), null, new LiteralText("Ground Items Options"));
 
         this.settings = CabbageScapeClient.settings;
     }
diff --git a/src/main/java/com/cabbagegod/cabbagescape/ui/settings/NotificationSettingsScreen.java b/src/main/java/com/cabbagegod/cabbagescape/ui/settings/NotificationSettingsScreen.java
new file mode 100644
index 0000000..0b7ae6f
--- /dev/null
+++ b/src/main/java/com/cabbagegod/cabbagescape/ui/settings/NotificationSettingsScreen.java
@@ -0,0 +1,55 @@
+package com.cabbagegod.cabbagescape.ui.settings;
+
+import com.cabbagegod.cabbagescape.client.CabbageScapeClient;
+import com.cabbagegod.cabbagescape.data.GroundItemSettings;
+import com.cabbagegod.cabbagescape.data.Settings;
+import com.mojang.blaze3d.systems.RenderSystem;
+import net.minecraft.client.gui.screen.option.GameOptionsScreen;
+import net.minecraft.client.gui.widget.ButtonListWidget;
+import net.minecraft.client.gui.widget.ButtonWidget;
+import net.minecraft.client.gui.widget.TextFieldWidget;
+import net.minecraft.client.option.CyclingOption;
+import net.minecraft.client.option.DoubleOption;
+import net.minecraft.client.option.Option;
+import net.minecraft.client.render.GameRenderer;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.text.LiteralText;
+import net.minecraft.util.Identifier;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+public class NotificationSettingsScreen extends GameOptionsScreen {
+    private static Option[] OPTIONS;
+    private ButtonListWidget buttonList;
+    private final Settings settings;
+
+    public NotificationSettingsScreen() {
+        super(new PluginsScreen(null, CabbageScapeClient.settings), null, new LiteralText("Notification Settings"));
+
+        this.settings = CabbageScapeClient.settings;
+    }
+
+    protected void init(){
+        setupOptions();
+
+        this.buttonList = new ButtonListWidget(this.client, this.width, this.height, 32, this.height - 32, 25);
+        this.buttonList.addAll(OPTIONS);
+
+        addSelectableChild(this.buttonList);
+    }
+
+    public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
+        renderBackground(matrices);
+        buttonList.render(matrices, mouseX, mouseY, delta);
+
+        super.render(matrices, mouseX, mouseY, delta);
+    }
+
+    void setupOptions(){
+        GroundItemSettings settings = this.settings.groundItemSettings;
+
+        OPTIONS = new Option[]{};
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/cabbagegod/cabbagescape/ui/settings/PluginsScreen.java b/src/main/java/com/cabbagegod/cabbagescape/ui/settings/PluginsScreen.java
index 933894b..8628b48 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/ui/settings/PluginsScreen.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/ui/settings/PluginsScreen.java
@@ -21,8 +21,8 @@ public class PluginsScreen extends GameOptionsScreen {
     private ButtonListWidget buttonList;
     private final Settings settings;
 
-    public PluginsScreen(Screen parent, GameOptions gameOptions, Settings settings) {
-        super(parent, gameOptions, new LiteralText("Plugins Settings"));
+    public PluginsScreen(Screen parent, Settings settings) {
+        super(parent, null, new LiteralText("Plugins Settings"));
 
         this.settings = settings;
     }
@@ -53,7 +53,7 @@ private void setup() throws NoSuchMethodException, InvocationTargetException, In
         for (MinescapePlugins plugin: MinescapePlugins.values()) {
             Object screen = plugin.screen.getDeclaredConstructor().newInstance();
 
-            Option newOption = new ButtonOption(plugin.toString(), (widget) -> {
+            Option newOption = new ButtonOption(plugin.name, (widget) -> {
                 MinecraftClient.getInstance().setScreen((Screen) screen);
             });
             options.add(newOption);
diff --git a/src/main/java/com/cabbagegod/cabbagescape/ui/settings/SettingsScreen.java b/src/main/java/com/cabbagegod/cabbagescape/ui/settings/SettingsScreen.java
index 0468ed7..853703f 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/ui/settings/SettingsScreen.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/ui/settings/SettingsScreen.java
@@ -22,7 +22,7 @@ public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
         renderBackground(matrices);
 
         addDrawableChild(new ButtonWidget(this.width / 2 - 102, this.height / 4 + 96 + -16, 204, 20, new LiteralText("Plugin Settings"), button -> {
-            MinecraftClient.getInstance().setScreen(new PluginsScreen(this, this.client.options, CabbageScapeClient.settings));
+            MinecraftClient.getInstance().setScreen(new PluginsScreen(this, CabbageScapeClient.settings));
         }));
         addDrawableChild(new ButtonWidget(this.width / 2 - 102, this.height / 4 + 96 + 16, 204, 20, new LiteralText("Done"), button -> {
             MinecraftClient.getInstance().setScreen(new GameMenuScreen(true));
diff --git a/src/main/resources/assets/cabbagescape/lang/en_us.json b/src/main/resources/assets/cabbagescape/lang/en_us.json
index b782720..ba11cbe 100644
--- a/src/main/resources/assets/cabbagescape/lang/en_us.json
+++ b/src/main/resources/assets/cabbagescape/lang/en_us.json
@@ -1,10 +1,9 @@
 {
   "cabbagescape.newUpdate" : "New Update Available!",
   "category.cabbagescape" : "CabbageScape",
-  "key.cabbagescape.buildmode_key" : "Buildmode Toggle",
-  "key.cabbagescape.home_key" : "Home TP",
   "key.cabbagescape.debug_key" : "Debug",
   "cabbagescape.clueHint": "Clue Step",
-  "options.spiralenabled" : "Spiral:",
-  "options.highlightenabled" : "Block Highlight:"
+  "options.spiralenabled" : "Spiral",
+  "options.highlightenabled" : "Block Highlight",
+  "options.doormarkers" : "Door Markers"
 }
\ No newline at end of file

From 8b077da368b5127dc82cb9e6dd4e2aa80eea97a6 Mon Sep 17 00:00:00 2001
From: CabbageGod <cabbagegod.dev@gmail.com>
Date: Fri, 17 Feb 2023 13:26:09 -0500
Subject: [PATCH 10/15] Fixed clue helper

---
 .../client/cluetracker/ClueTracker.java       | 28 +++++++++---------
 .../cabbagescape/data/itemdata/ItemExtra.java | 11 -------
 .../data/itemdata/ItemExtra__1.java           | 29 -------------------
 3 files changed, 15 insertions(+), 53 deletions(-)
 delete mode 100644 src/main/java/com/cabbagegod/cabbagescape/data/itemdata/ItemExtra__1.java

diff --git a/src/main/java/com/cabbagegod/cabbagescape/client/cluetracker/ClueTracker.java b/src/main/java/com/cabbagegod/cabbagescape/client/cluetracker/ClueTracker.java
index efb2efb..ee2a011 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/client/cluetracker/ClueTracker.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/client/cluetracker/ClueTracker.java
@@ -2,12 +2,11 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
-import com.cabbagegod.cabbagescape.Main;
 import com.cabbagegod.cabbagescape.client.cluetracker.ClueStep.Difficulty;
 import com.cabbagegod.cabbagescape.data.itemdata.ItemDisplay;
 import com.cabbagegod.cabbagescape.data.itemdata.ItemExtra;
-import com.cabbagegod.cabbagescape.data.itemdata.ItemExtra__1;
 import com.cabbagegod.cabbagescape.data.itemdata.ItemLore;
 import com.cabbagegod.cabbagescape.events.EventHandler;
 import com.cabbagegod.cabbagescape.ui.ClueHintScreen;
@@ -16,13 +15,19 @@
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NbtElement;
+import net.minecraft.text.LiteralText;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Hand;
 import net.minecraft.util.TypedActionResult;
 
-public class ClueTracker {
+public class ClueTracker implements EventHandler {
     static List<ClueStep> clueSteps = new ArrayList<ClueStep>();
 
+    @Override
+    public void start() {
+        Setup();
+    }
+
     public static void Setup(){
         if(clueSteps.size() != 0)
             return;
@@ -69,7 +74,6 @@ public static void Setup(){
     public void register(){
         UseItemCallback.EVENT.register(((player, world, hand) -> {
             ItemStack handItem = player.getStackInHand(Hand.MAIN_HAND);
-
             if(Formatting.strip(handItem.getName().getString().toLowerCase()).equals("clue scroll easy")){
                 if(handItem.hasNbt() && MinecraftClient.getInstance().currentScreen == null) {
                     NbtElement element = handItem.getNbt().get("display");
@@ -81,19 +85,17 @@ public void register(){
 
                     if(!itemLores.isEmpty()){
                         int clueId = -100;
-
                         //Blame bandit for this
                         for(ItemLore lore : itemLores){
                             for(ItemExtra extra : lore.getExtra()){
-                                //Checks if there is no clue id, like in the test server (thanks zombie :P)
-                                if(extra.getExtra() == null)
-                                    break;
+                                if(extra.getText() == null)
+                                    continue;
+                                if(extra.getText().equals(""))
+                                    continue;
 
-                                for(ItemExtra__1 extra2 : extra.getExtra()) {
-                                    try {
-                                        clueId = Integer.parseInt(extra2.getText().replaceAll("[\\D]", ""));
-                                    } catch (NumberFormatException ignored){ }
-                                }
+                                try {
+                                    clueId = Integer.parseInt(extra.getText());
+                                } catch (NumberFormatException ignored){ }
                             }
                         }
 
diff --git a/src/main/java/com/cabbagegod/cabbagescape/data/itemdata/ItemExtra.java b/src/main/java/com/cabbagegod/cabbagescape/data/itemdata/ItemExtra.java
index a4b8705..7c0b63f 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/data/itemdata/ItemExtra.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/data/itemdata/ItemExtra.java
@@ -6,21 +6,10 @@
 import java.util.List;
 
 public class ItemExtra {
-    @SerializedName("extra")
-    @Expose
-    private List<ItemExtra__1> extra = null;
     @SerializedName("text")
     @Expose
     private String text;
 
-    public List<ItemExtra__1> getExtra() {
-        return extra;
-    }
-
-    public void setExtra(List<ItemExtra__1> extra) {
-        this.extra = extra;
-    }
-
     public String getText() {
         return text;
     }
diff --git a/src/main/java/com/cabbagegod/cabbagescape/data/itemdata/ItemExtra__1.java b/src/main/java/com/cabbagegod/cabbagescape/data/itemdata/ItemExtra__1.java
deleted file mode 100644
index 262eb7d..0000000
--- a/src/main/java/com/cabbagegod/cabbagescape/data/itemdata/ItemExtra__1.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.cabbagegod.cabbagescape.data.itemdata;
-
-import com.google.gson.annotations.Expose;
-import com.google.gson.annotations.SerializedName;
-
-public class ItemExtra__1 {
-    @SerializedName("color")
-    @Expose
-    private String color;
-    @SerializedName("text")
-    @Expose
-    private String text;
-
-    public String getColor() {
-        return color;
-    }
-
-    public void setColor(String color) {
-        this.color = color;
-    }
-
-    public String getText() {
-        return text;
-    }
-
-    public void setText(String text) {
-        this.text = text;
-    }
-}

From 526c0b7c7790b84e61e8b70919d09463ee28c089 Mon Sep 17 00:00:00 2001
From: CabbageGod <cabbagegod.dev@gmail.com>
Date: Fri, 17 Feb 2023 13:26:21 -0500
Subject: [PATCH 11/15] Added barrows helper door marker toggle

---
 .../cabbagegod/cabbagescape/client/barrows/BarrowsHelper.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/com/cabbagegod/cabbagescape/client/barrows/BarrowsHelper.java b/src/main/java/com/cabbagegod/cabbagescape/client/barrows/BarrowsHelper.java
index fd92200..222afe8 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/client/barrows/BarrowsHelper.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/client/barrows/BarrowsHelper.java
@@ -1,5 +1,6 @@
 package com.cabbagegod.cabbagescape.client.barrows;
 
+import com.cabbagegod.cabbagescape.client.CabbageScapeClient;
 import com.cabbagegod.cabbagescape.client.blockoutline.PersistentOutlineRenderer;
 import com.cabbagegod.cabbagescape.callbacks.DoorUseCallback;
 import com.cabbagegod.cabbagescape.events.EventHandler;
@@ -118,6 +119,9 @@ private static void onUseDoor(PlayerEntity player, BlockPos pos){
         assert MinecraftClient.getInstance().player != null;
 
         if(isInBarrowsUnderground){
+            if(!CabbageScapeClient.settings.barrowsHelperSettings.doorMarkers)
+                return;
+
             if(!trackedDoors.contains(pos)) {
                 trackedDoors.add(pos);
                 PersistentOutlineRenderer.getInstance().addPos(pos);

From 7453b8108978f1bfcacb2934f511b21a540bf5a3 Mon Sep 17 00:00:00 2001
From: CabbageGod <cabbagegod.dev@gmail.com>
Date: Fri, 17 Feb 2023 13:42:03 -0500
Subject: [PATCH 12/15] Added save button to barrows helper

---
 .../cabbagescape/ui/settings/BarrowsHelperScreen.java     | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/main/java/com/cabbagegod/cabbagescape/ui/settings/BarrowsHelperScreen.java b/src/main/java/com/cabbagegod/cabbagescape/ui/settings/BarrowsHelperScreen.java
index 168b293..e3a8f04 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/ui/settings/BarrowsHelperScreen.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/ui/settings/BarrowsHelperScreen.java
@@ -5,6 +5,7 @@
 import com.cabbagegod.cabbagescape.data.Settings;
 import net.minecraft.client.gui.screen.option.GameOptionsScreen;
 import net.minecraft.client.gui.widget.ButtonListWidget;
+import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.option.CyclingOption;
 import net.minecraft.client.option.Option;
 import net.minecraft.client.util.math.MatrixStack;
@@ -40,6 +41,13 @@ public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
     void setupOptions(){
         Option doorMarkersEnabled = CyclingOption.create("options.doormarkers", gameOptions -> settings.barrowsHelperSettings.doorMarkers, (gameOptions, option, toggle) -> settings.barrowsHelperSettings.doorMarkers = toggle);
 
+        addDrawableChild(new ButtonWidget(this.width / 2 - (150/2), 185, 150, 20, new LiteralText("Save"), button -> {
+            CabbageScapeClient.saveSettings();
+
+            assert this.client != null;
+            this.client.setScreen(this.parent);
+        }));
+
         OPTIONS = new Option[]{doorMarkersEnabled};
     }
 }
\ No newline at end of file

From b688ecf19e48eb11bc80a590dc642ccaaf0a0646 Mon Sep 17 00:00:00 2001
From: CabbageGod <cabbagegod.dev@gmail.com>
Date: Fri, 17 Feb 2023 14:31:11 -0500
Subject: [PATCH 13/15] Fixed color picker texture

---
 .../cabbagegod/cabbagescape/ui/settings/GroundItemsScreen.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/com/cabbagegod/cabbagescape/ui/settings/GroundItemsScreen.java b/src/main/java/com/cabbagegod/cabbagescape/ui/settings/GroundItemsScreen.java
index 3827993..4f6dca6 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/ui/settings/GroundItemsScreen.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/ui/settings/GroundItemsScreen.java
@@ -55,8 +55,7 @@ public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
         float blue = (float) settings.groundItemSettings.itemBlue;
 
         RenderSystem.setShaderColor(red / 255, green / 255, blue / 255, 1.0F);
-        Identifier colorPickerIcon = new Identifier("minecraft", "textures/custom/colors/white.png");
-        //Identifier colorPickerIcon = new Identifier("minecraft", "textures/gui/book.png");
+        Identifier colorPickerIcon = new Identifier("minecraft", "textures/block/white_wool.png");
         RenderSystem.setShaderTexture(0, colorPickerIcon);
 
         //The color picker texture

From 4be4407c321b69ac87b55d74715fbecb4b5fd599 Mon Sep 17 00:00:00 2001
From: CabbageGod <cabbagegod.dev@gmail.com>
Date: Fri, 17 Feb 2023 14:31:19 -0500
Subject: [PATCH 14/15] Added notification settings

---
 .../notifications/NotificationManager.java    |  1 -
 .../settings/NotificationSettingsScreen.java  | 19 +++++++++++++++++--
 .../assets/cabbagescape/lang/en_us.json       |  4 +++-
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/cabbagegod/cabbagescape/notifications/NotificationManager.java b/src/main/java/com/cabbagegod/cabbagescape/notifications/NotificationManager.java
index 5fe70e1..46c2198 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/notifications/NotificationManager.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/notifications/NotificationManager.java
@@ -15,7 +15,6 @@ public class NotificationManager {
     public static String currentNotif = "";
     private Thread currentThread = null;
 
-
     NotificationSettings settings;
 
     public NotificationManager(NotificationSettings settings){
diff --git a/src/main/java/com/cabbagegod/cabbagescape/ui/settings/NotificationSettingsScreen.java b/src/main/java/com/cabbagegod/cabbagescape/ui/settings/NotificationSettingsScreen.java
index 0b7ae6f..39a8e2f 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/ui/settings/NotificationSettingsScreen.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/ui/settings/NotificationSettingsScreen.java
@@ -48,8 +48,23 @@ public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
     }
 
     void setupOptions(){
-        GroundItemSettings settings = this.settings.groundItemSettings;
+        Option flashEnabled = CyclingOption.create("options.notifications.flashenabled", gameOptions -> settings.notificationSettings.flashEnabled, (gameOptions, option, toggle) -> settings.notificationSettings.flashEnabled = toggle);
+        Option soundEnabled = CyclingOption.create("options.notifications.soundenabled", gameOptions -> settings.notificationSettings.soundEnabled, (gameOptions, option, toggle) -> settings.notificationSettings.soundEnabled = toggle);
 
-        OPTIONS = new Option[]{};
+        Option volumeOption = new DoubleOption("volume", 0D, 100.0D, 1.0F, gameOptions -> (double) (settings.notificationSettings.volume * 100), (gameOptions, volume) -> {
+            settings.notificationSettings.volume = (float) (volume / 100);
+        },(gameOptions, option) -> {
+            double d = option.get(gameOptions);
+            return new LiteralText("Volume: " + Math.round(d) + "%");
+        });
+
+        addDrawableChild(new ButtonWidget(this.width / 2 - (150/2), 185, 150, 20, new LiteralText("Save"), button -> {
+            CabbageScapeClient.saveSettings();
+
+            assert this.client != null;
+            this.client.setScreen(this.parent);
+        }));
+
+        OPTIONS = new Option[]{flashEnabled, soundEnabled, volumeOption};
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/cabbagescape/lang/en_us.json b/src/main/resources/assets/cabbagescape/lang/en_us.json
index ba11cbe..7a7dc91 100644
--- a/src/main/resources/assets/cabbagescape/lang/en_us.json
+++ b/src/main/resources/assets/cabbagescape/lang/en_us.json
@@ -5,5 +5,7 @@
   "cabbagescape.clueHint": "Clue Step",
   "options.spiralenabled" : "Spiral",
   "options.highlightenabled" : "Block Highlight",
-  "options.doormarkers" : "Door Markers"
+  "options.doormarkers" : "Door Markers",
+  "options.notifications.flashenabled" : "Flash Enabled",
+  "options.notifications.soundenabled" : "Sound Enabled"
 }
\ No newline at end of file

From 39d1703a9ac0ae07359de9cf8f39eb44801631c8 Mon Sep 17 00:00:00 2001
From: CabbageGod <cabbagegod.dev@gmail.com>
Date: Fri, 17 Feb 2023 14:36:23 -0500
Subject: [PATCH 15/15] Increment version

---
 gradle.properties                                               | 2 +-
 .../com/cabbagegod/cabbagescape/client/CabbageScapeClient.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 834da00..1864d07 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G
 	loader_version=0.13.3
 
 # Mod Properties
-	mod_version = a1.4+1.18.2
+	mod_version = a1.4.1+1.18.2
 	maven_group = com.cabbagegod
 	archives_base_name = cabbagescape
 
diff --git a/src/main/java/com/cabbagegod/cabbagescape/client/CabbageScapeClient.java b/src/main/java/com/cabbagegod/cabbagescape/client/CabbageScapeClient.java
index d9ca31d..448d22f 100644
--- a/src/main/java/com/cabbagegod/cabbagescape/client/CabbageScapeClient.java
+++ b/src/main/java/com/cabbagegod/cabbagescape/client/CabbageScapeClient.java
@@ -37,7 +37,7 @@
 
 public class CabbageScapeClient implements ClientModInitializer {
     public static String settingsDir = "settings";
-    public static String version = "a1.4+1.18.2";
+    public static String version = "a1.4.1+1.18.2";
     public static Settings settings;
 
     public static NotificationManager notificationManager;