Merge branch 'SkyblockerMod:master' into dark-auction-tabhud

18 files changed, 685 insertions, 115 deletions

diff --git a/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java b/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
index 3692db1b..0263f20c 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
@@ -16,6 +16,7 @@ import me.xmrvizzy.skyblocker.skyblock.item.WikiLookup;
 import me.xmrvizzy.skyblocker.skyblock.itemlist.ItemRegistry;
 import me.xmrvizzy.skyblocker.skyblock.quicknav.QuickNav;
 import me.xmrvizzy.skyblocker.skyblock.rift.TheRift;
+import me.xmrvizzy.skyblocker.skyblock.shortcut.Shortcuts;
 import me.xmrvizzy.skyblocker.skyblock.tabhud.TabHud;
 import me.xmrvizzy.skyblocker.skyblock.tabhud.util.PlayerListMgr;
 import me.xmrvizzy.skyblocker.utils.*;
@@ -76,6 +77,7 @@ public class SkyblockerMod implements ClientModInitializer {
         QuickNav.init();
         DwarvenHud.init();
         ChatMessageListener.init();
+        Shortcuts.init();
         DiscordRPCManager.init();
         LividColor.init();
         FishingHelper.init();
diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
index 04cfaea3..c4eeb090 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
@@ -1,6 +1,5 @@
 package me.xmrvizzy.skyblocker.config;
 
-import com.mojang.brigadier.Command;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import me.shedaniel.autoconfig.AutoConfig;
 import me.shedaniel.autoconfig.ConfigData;
@@ -161,6 +160,10 @@ public class SkyblockerConfig implements ConfigData {
         @ConfigEntry.Gui.CollapsibleObject()
         public FairySouls fairySouls = new FairySouls();
 
+        @ConfigEntry.Category("shortcuts")
+        @ConfigEntry.Gui.CollapsibleObject()
+        public Shortcuts shortcuts = new Shortcuts();
+
         @ConfigEntry.Category("itemList")
         @ConfigEntry.Gui.CollapsibleObject()
         public ItemList itemList = new ItemList();
@@ -264,6 +267,15 @@ public class SkyblockerConfig implements ConfigData {
         public boolean enableFairySoulsHelper = false;
     }
 
+    public static class Shortcuts {
+        @ConfigEntry.Gui.Tooltip()
+        public boolean enableShortcuts = true;
+        @ConfigEntry.Gui.Tooltip()
+        public boolean enableCommandShortcuts = true;
+        @ConfigEntry.Gui.Tooltip()
+        public boolean enableCommandArgShortcuts = true;
+    }
+
     public static class Hitbox {
         public boolean oldFarmlandHitbox = true;
         public boolean oldLeverHitbox = false;
@@ -505,7 +517,7 @@ public class SkyblockerConfig implements ConfigData {
      */
     public static void init() {
         AutoConfig.register(SkyblockerConfig.class, GsonConfigSerializer::new);
-        ClientCommandRegistrationCallback.EVENT.register(((dispatcher, registryAccess) -> dispatcher.register(literal("skyblocker").then(optionsLiteral("config")).then(optionsLiteral("options")))));
+        ClientCommandRegistrationCallback.EVENT.register(((dispatcher, registryAccess) -> dispatcher.register(literal(SkyblockerMod.NAMESPACE).then(optionsLiteral("config")).then(optionsLiteral("options")))));
     }
 
     /**
@@ -515,11 +527,8 @@ public class SkyblockerConfig implements ConfigData {
      * @return the command builder
      */
     private static LiteralArgumentBuilder<FabricClientCommandSource> optionsLiteral(String name) {
-        return literal(name).executes(context -> {
-            // Don't immediately open the next screen as it will be closed by ChatScreen right after this command is executed
-            SkyblockerMod.getInstance().scheduler.queueOpenScreen(AutoConfig.getConfigScreen(SkyblockerConfig.class, null));
-            return Command.SINGLE_SUCCESS;
-        });
+        // Don't immediately open the next screen as it will be closed by ChatScreen right after this command is executed
+        return literal(name).executes(context -> SkyblockerMod.getInstance().scheduler.queueOpenScreen(AutoConfig.getConfigScreen(SkyblockerConfig.class, null)));
     }
 
     public static SkyblockerConfig get() {
diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java
index 903d3992..13272323 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java
@@ -30,6 +30,8 @@ import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
+import java.util.Map;
+
 @Mixin(HandledScreen.class)
 public abstract class HandledScreenMixin extends Screen {
     protected HandledScreenMixin(Text title) {
@@ -96,7 +98,7 @@ public abstract class HandledScreenMixin extends Screen {
                     superpairsSolver.setSuperpairsCurrentSlot(ItemStack.EMPTY);
                 } else if (experimentSolver instanceof UltrasequencerSolver ultrasequencerSolver && slot.getIndex() == ultrasequencerSolver.getUltrasequencerNextSlot()) {
                     int count = ultrasequencerSolver.getSlots().get(ultrasequencerSolver.getUltrasequencerNextSlot()).getCount() + 1;
-                    ultrasequencerSolver.getSlots().entrySet().stream().filter(entry -> entry.getValue().getCount() == count).findAny().ifPresentOrElse((entry) -> ultrasequencerSolver.setUltrasequencerNextSlot(entry.getKey()), () -> ultrasequencerSolver.setState(ExperimentSolver.State.END));
+                    ultrasequencerSolver.getSlots().entrySet().stream().filter(entry -> entry.getValue().getCount() == count).findAny().map(Map.Entry::getKey).ifPresentOrElse(ultrasequencerSolver::setUltrasequencerNextSlot, () -> ultrasequencerSolver.setState(ExperimentSolver.State.END));
                 }
             }
         }
diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/accessor/FrustumInvoker.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/accessor/FrustumInvoker.java
index 108a7344..3cde115e 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/mixin/accessor/FrustumInvoker.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/accessor/FrustumInvoker.java
@@ -1,15 +1,14 @@
 package me.xmrvizzy.skyblocker.mixin.accessor;
 
-import me.xmrvizzy.skyblocker.utils.FrustumUtils;
 import net.minecraft.client.render.Frustum;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Invoker;
 
 /**
- * Use {@link FrustumUtils#isVisible(double, double, double, double, double, double) FrustumUtils#isVisible} which is shorter. For the purpose of avoiding object allocations!
+ * Use {@link me.xmrvizzy.skyblocker.utils.FrustumUtils#isVisible(double, double, double, double, double, double) FrustumUtils#isVisible} which is shorter. For the purpose of avoiding object allocations!
  */
 @Mixin(Frustum.class)
 public interface FrustumInvoker {
-    @Invoker("isVisible")
-    boolean isVisible(double minX, double minY, double minZ, double maxX, double maxY, double maxZ);
+    @Invoker
+    boolean invokeIsVisible(double minX, double minY, double minZ, double maxX, double maxY, double maxZ);
 }
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMap.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMap.java
index 2a97d0ee..29a6e687 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMap.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMap.java
@@ -1,9 +1,6 @@
 package me.xmrvizzy.skyblocker.skyblock.dungeon;
 
-import org.apache.commons.lang3.StringUtils;
-
-import com.mojang.brigadier.Command;
-
+import me.xmrvizzy.skyblocker.SkyblockerMod;
 import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
@@ -16,11 +13,11 @@ import net.minecraft.item.FilledMapItem;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.map.MapState;
 import net.minecraft.nbt.NbtCompound;
-import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
+import org.apache.commons.lang3.StringUtils;
 
 public class DungeonMap {
-	private static final Identifier MAP_BACKGROUND = new Identifier("textures/map/map_background.png");
+    private static final Identifier MAP_BACKGROUND = new Identifier("textures/map/map_background.png");
 
     public static void render(MatrixStack matrices) {
         MinecraftClient client = MinecraftClient.getInstance();
@@ -36,36 +33,29 @@ public class DungeonMap {
             MapRenderer map = client.gameRenderer.getMapRenderer();
             MapState state = FilledMapItem.getMapState(mapid, client.world);
             float scaling = SkyblockerConfig.get().locations.dungeons.mapScaling;
-        	int x = SkyblockerConfig.get().locations.dungeons.mapX;
-        	int y = SkyblockerConfig.get().locations.dungeons.mapY;
+            int x = SkyblockerConfig.get().locations.dungeons.mapX;
+            int y = SkyblockerConfig.get().locations.dungeons.mapY;
 
             if (state == null) return;
             matrices.push();
             matrices.translate(x, y, 0);
             matrices.scale(scaling, scaling, 0f);
-            map.draw( matrices, vertices, mapid, state, false, 15728880);
+            map.draw(matrices, vertices, mapid, state, false, 15728880);
             vertices.draw();
             matrices.pop();
         }
     }
-    
+
     public static void renderHUDMap(DrawContext context, int x, int y) {
-    	float scaling = SkyblockerConfig.get().locations.dungeons.mapScaling;
-    	int size = (int) (128 * scaling);
-    	context.drawTexture(MAP_BACKGROUND, x, y, 0, 0, size, size, size, size);
+        float scaling = SkyblockerConfig.get().locations.dungeons.mapScaling;
+        int size = (int) (128 * scaling);
+        context.drawTexture(MAP_BACKGROUND, x, y, 0, 0, size, size, size, size);
     }
-    
+
     public static void init() {
-    	ClientCommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> {
-    		dispatcher.register(ClientCommandManager.literal("skyblocker")
-    				.then(ClientCommandManager.literal("hud")
-    						.then(ClientCommandManager.literal("dungeonmap")
-    								.executes(context -> {
-    									MinecraftClient client = context.getSource().getClient();
-    									client.send(() -> client.setScreen(new DungeonMapConfigScreen(Text.literal("Dungeon Map Config"))));
-    									
-    									return Command.SINGLE_SUCCESS;
-    								}))));
-    	});
+        ClientCommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> dispatcher.register(ClientCommandManager.literal("skyblocker")
+                .then(ClientCommandManager.literal("hud")
+                        .then(ClientCommandManager.literal("dungeonmap")
+                                .executes(context -> SkyblockerMod.getInstance().scheduler.queueOpenScreen(DungeonMapConfigScreen::new))))));
     }
 }
\ No newline at end of file
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java
index ffd7a8b6..ef782c3b 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java
@@ -10,43 +10,43 @@ import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.text.Text;
 
 public class DungeonMapConfigScreen extends Screen {
-	
+
 	private int hudX = SkyblockerConfig.get().locations.dungeons.mapX;
 	private int hudY = SkyblockerConfig.get().locations.dungeons.mapY;
-	
-	protected DungeonMapConfigScreen(Text title) {
-		super(title);
+
+	protected DungeonMapConfigScreen() {
+		super(Text.literal("Dungeon Map Config"));
 	}
-	
+
 	@Override
 	public void render(DrawContext context, int mouseX, int mouseY, float delta) {
 		super.render(context, mouseX, mouseY, delta);
 		renderBackground(context);
 		DungeonMap.renderHUDMap(context, hudX, hudY);
-		context.drawCenteredTextWithShadow(textRenderer, "Right Click To Reset Position", width / 2, height / 2, Color.GRAY.getRGB());
+		context.drawCenteredTextWithShadow(textRenderer, "Right Click To Reset Position", width >> 1, height >> 1, Color.GRAY.getRGB());
 	}
-	
+
 	@Override
 	public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) {
 		float scaling = SkyblockerConfig.get().locations.dungeons.mapScaling;
 		int size = (int) (128 * scaling);
-		if(RenderUtils.pointExistsInArea((int) mouseX, (int) mouseY, hudX, hudY, hudX + size, hudY + size) && button == 0) {
-			hudX = (int) Math.max(Math.min(mouseX - (size / 2), this.width - size), 0);
-			hudY = (int) Math.max(Math.min(mouseY - (size / 2), this.height - size), 0);
+		if (RenderUtils.pointExistsInArea((int) mouseX, (int) mouseY, hudX, hudY, hudX + size, hudY + size) && button == 0) {
+			hudX = (int) Math.max(Math.min(mouseX - (size >> 1), this.width - size), 0);
+			hudY = (int) Math.max(Math.min(mouseY - (size >> 1), this.height - size), 0);
 		}
 		return super.mouseDragged(mouseX, mouseY, button, deltaX, deltaY);
 	}
-	
+
 	@Override
 	public boolean mouseClicked(double mouseX, double mouseY, int button) {
-		if(button == 1) {
+		if (button == 1) {
 			hudX = 2;
 			hudY = 2;
 		}
-		
+
 		return super.mouseClicked(mouseX, mouseY, button);
 	}
-	
+
 	@Override
 	public void close() {
 		SkyblockerConfig.get().locations.dungeons.mapX = hudX;
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHud.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHud.java
index 122f6c6c..7316577e 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHud.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHud.java
@@ -1,5 +1,6 @@
 package me.xmrvizzy.skyblocker.skyblock.dwarven;
 
+import me.xmrvizzy.skyblocker.SkyblockerMod;
 import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
 import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.CommsWidget;
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
@@ -7,7 +8,6 @@ import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallba
 import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
 
@@ -26,34 +26,32 @@ public class DwarvenHud {
 
 
     public static final List<Pattern> COMMISSIONS = Stream.of(
-            "(?:Titanium|Mithril|Hard Stone) Miner",
-            "(?:Ice Walker|Goblin|Goblin Raid|Automaton|Sludge|Team Treasurite Member|Yog|Boss Corleone|Thyst) Slayer",
-            "(?:Lava Springs|Cliffside Veins|Rampart's Quarry|Upper Mines|Royal Mines) Mithril",
-            "(?:Lava Springs|Cliffside Veins|Rampart's Quarry|Upper Mines|Royal Mines) Titanium",
-            "Goblin Raid",
-            "(?:Powder Ghast|Star Sentry) Puncher",
-            "(?<!Lucky )Raffle",
-            "Lucky Raffle",
-            "2x Mithril Powder Collector",
-            "(?:Ruby|Amber|Sapphire|Jade|Amethyst|Topaz) Gemstone Collector",
-            "(?:Amber|Sapphire|Jade|Amethyst|Topaz) Crystal Hunter",
-            "Chest Looter"
+                    "(?:Titanium|Mithril|Hard Stone) Miner",
+                    "(?:Ice Walker|Goblin|Goblin Raid|Automaton|Sludge|Team Treasurite Member|Yog|Boss Corleone|Thyst) Slayer",
+                    "(?:Lava Springs|Cliffside Veins|Rampart's Quarry|Upper Mines|Royal Mines) Mithril",
+                    "(?:Lava Springs|Cliffside Veins|Rampart's Quarry|Upper Mines|Royal Mines) Titanium",
+                    "Goblin Raid",
+                    "(?:Powder Ghast|Star Sentry) Puncher",
+                    "(?<!Lucky )Raffle",
+                    "Lucky Raffle",
+                    "2x Mithril Powder Collector",
+                    "(?:Ruby|Amber|Sapphire|Jade|Amethyst|Topaz) Gemstone Collector",
+                    "(?:Amber|Sapphire|Jade|Amethyst|Topaz) Crystal Hunter",
+                    "Chest Looter"
             ).map(s -> Pattern.compile("^.*(" + s + "): (\\d+\\.?\\d*%|DONE)"))
             .collect(Collectors.toList());
+
     public static void init() {
         ClientCommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> dispatcher.register(ClientCommandManager.literal("skyblocker")
                 .then(ClientCommandManager.literal("hud")
                         .then(ClientCommandManager.literal("dwarven")
-                                .executes(context -> {
-                                    client.send(() -> client.setScreen(new DwarvenHudConfigScreen(Text.of("Dwarven HUD Config"))));
-                                    return 1;
-                                })))));
+                                .executes(context -> SkyblockerMod.getInstance().scheduler.queueOpenScreen(DwarvenHudConfigScreen::new))))));
 
         HudRenderCallback.EVENT.register((context, tickDelta) -> {
             if (!SkyblockerConfig.get().locations.dwarvenMines.dwarvenHud.enabled
-                || client.options.playerListKey.isPressed()
-                || client.player == null
-                || commissionList.isEmpty()) {
+                    || client.options.playerListKey.isPressed()
+                    || client.player == null
+                    || commissionList.isEmpty()) {
                 return;
             }
             render(context, SkyblockerConfig.get().locations.dwarvenMines.dwarvenHud.x, SkyblockerConfig.get().locations.dwarvenMines.dwarvenHud.y, commissionList);
@@ -62,7 +60,7 @@ public class DwarvenHud {
 
     public static void render(DrawContext context, int hudX, int hudY, List<Commission> commissions) {
 
-        switch(SkyblockerConfig.get().locations.dwarvenMines.dwarvenHud.style) {
+        switch (SkyblockerConfig.get().locations.dwarvenMines.dwarvenHud.style) {
             case SIMPLE -> renderSimple(context, hudX, hudY, commissions);
             case FANCY -> renderFancy(context, hudX, hudY, commissions);
             case CLASSIC -> renderClassic(context, hudX, hudY, commissions);
@@ -77,12 +75,12 @@ public class DwarvenHud {
         int y = 0;
         for (Commission commission : commissions) {
             context
-                .drawTextWithShadow(client.textRenderer,
-                    Text.literal(commission.commission + ": ")
-                        .styled(style -> style.withColor(Formatting.AQUA))
-                        .append(Text.literal(commission.progression)
-                        .styled(style -> style.withColor(Formatting.GREEN))),
-                    hudX + 5, hudY + y + 5, 0xFFFFFFFF);
+                    .drawTextWithShadow(client.textRenderer,
+                            Text.literal(commission.commission + ": ")
+                                    .styled(style -> style.withColor(Formatting.AQUA))
+                                    .append(Text.literal(commission.progression)
+                                            .styled(style -> style.withColor(Formatting.GREEN))),
+                            hudX + 5, hudY + y + 5, 0xFFFFFFFF);
             y += 20;
         }
     }
@@ -119,6 +117,6 @@ public class DwarvenHud {
     }
 
     // steamroller tactics to get visibility from outside classes (CommsWidget)
-    public static record Commission(String commission, String progression){}
-
+    public record Commission(String commission, String progression) {
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java
index f91ed921..10e62d88 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java
@@ -5,7 +5,6 @@ import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
 import me.xmrvizzy.skyblocker.utils.RenderUtils;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.text.Text;
 
 import java.awt.*;
@@ -15,8 +14,9 @@ public class DwarvenHudConfigScreen extends Screen {
 
     private int hudX = SkyblockerConfig.get().locations.dwarvenMines.dwarvenHud.x;
     private int hudY = SkyblockerConfig.get().locations.dwarvenMines.dwarvenHud.y;
-    protected DwarvenHudConfigScreen(Text title) {
-        super(title);
+
+    protected DwarvenHudConfigScreen() {
+        super(Text.of("Dwarven HUD Config"));
     }
 
     @Override
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/shortcut/Shortcuts.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/shortcut/Shortcuts.java
new file mode 100644
index 00000000..44077b3e
--- /dev/null
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/shortcut/Shortcuts.java
@@ -0,0 +1,206 @@
+package me.xmrvizzy.skyblocker.skyblock.shortcut;
+
+import com.google.gson.JsonObject;
+import com.google.gson.reflect.TypeToken;
+import com.mojang.brigadier.Command;
+import com.mojang.brigadier.CommandDispatcher;
+import com.mojang.brigadier.arguments.StringArgumentType;
+import me.xmrvizzy.skyblocker.SkyblockerMod;
+import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
+import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
+import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
+import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
+import net.fabricmc.fabric.api.client.message.v1.ClientSendMessageEvents;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.command.CommandRegistryAccess;
+import net.minecraft.text.Text;
+import org.jetbrains.annotations.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.*;
+import java.lang.reflect.Type;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+
+import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.argument;
+import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.literal;
+
+public class Shortcuts {
+    private static final Logger LOGGER = LoggerFactory.getLogger(Shortcuts.class);
+    private static final File SHORTCUTS_FILE = SkyblockerMod.CONFIG_DIR.resolve("shortcuts.json").toFile();
+    @Nullable
+    private static CompletableFuture<Void> shortcutsLoaded;
+    public static final Map<String, String> commands = new HashMap<>();
+    public static final Map<String, String> commandArgs = new HashMap<>();
+
+    public static boolean isShortcutsLoaded() {
+        return shortcutsLoaded != null && shortcutsLoaded.isDone();
+    }
+
+    public static void init() {
+        loadShortcuts();
+        ClientLifecycleEvents.CLIENT_STOPPING.register(Shortcuts::saveShortcuts);
+        ClientCommandRegistrationCallback.EVENT.register(Shortcuts::registerCommands);
+        ClientSendMessageEvents.MODIFY_COMMAND.register(Shortcuts::modifyCommand);
+    }
+
+    protected static void loadShortcuts() {
+        if (shortcutsLoaded != null && !isShortcutsLoaded()) {
+            return;
+        }
+        shortcutsLoaded = CompletableFuture.runAsync(() -> {
+            try (BufferedReader reader = new BufferedReader(new FileReader(SHORTCUTS_FILE))) {
+                Type shortcutsType = new TypeToken<Map<String, Map<String, String>>>() {
+                }.getType();
+                Map<String, Map<String, String>> shortcuts = SkyblockerMod.GSON.fromJson(reader, shortcutsType);
+                commands.clear();
+                commandArgs.clear();
+                commands.putAll(shortcuts.get("commands"));
+                commandArgs.putAll(shortcuts.get("commandArgs"));
+                LOGGER.info("[Skyblocker] Loaded {} command shortcuts and {} command argument shortcuts", commands.size(), commandArgs.size());
+            } catch (FileNotFoundException e) {
+                registerDefaultShortcuts();
+                LOGGER.warn("[Skyblocker] Shortcuts file not found, using default shortcuts. This is normal when using for the first time.", e);
+            } catch (IOException e) {
+                LOGGER.error("[Skyblocker] Failed to load shortcuts file", e);
+            }
+        });
+    }
+
+    private static void registerDefaultShortcuts() {
+        commands.clear();
+        commandArgs.clear();
+
+        // Skyblock
+        commands.put("/s", "/skyblock");
+        commands.put("/i", "/is");
+        commands.put("/h", "/hub");
+
+        // Dungeon
+        commands.put("/d", "/warp dungeon_hub");
+
+        // Chat channels
+        commands.put("/ca", "/chat all");
+        commands.put("/cp", "/chat party");
+        commands.put("/cg", "/chat guild");
+        commands.put("/co", "/chat officer");
+        commands.put("/cc", "/chat coop");
+
+        // Message
+        commandArgs.put("/m", "/msg");
+
+        // Party
+        commandArgs.put("/pa", "/p accept");
+        commands.put("/pv", "/p leave");
+        commands.put("/pd", "/p disband");
+        commands.put("/rp", "/reparty");
+
+        // Visit
+        commandArgs.put("/v", "/visit");
+        commands.put("/vp", "/visit portalhub");
+    }
+
+    private static void registerMoreDefaultShortcuts() {
+        // Combat
+        commands.put("/spider", "/warp spider");
+        commands.put("/crimson", "/warp nether");
+        commands.put("/end", "/warp end");
+
+        // Mining
+        commands.put("/gold", "/warp gold");
+        commands.put("/cavern", "/warp deep");
+        commands.put("/dwarven", "/warp mines");
+        commands.put("/fo", "/warp forge");
+        commands.put("/ch", "/warp crystals");
+
+        // Foraging & Farming
+        commands.put("/park", "/warp park");
+        commands.put("/barn", "/warp barn");
+        commands.put("/desert", "/warp desert");
+        commands.put("/ga", "/warp garden");
+
+        // Other warps
+        commands.put("/castle", "/warp castle");
+        commands.put("/museum", "/warp museum");
+        commands.put("/da", "/warp da");
+        commands.put("/crypt", "/warp crypt");
+        commands.put("/nest", "/warp nest");
+        commands.put("/magma", "/warp magma");
+        commands.put("/void", "/warp void");
+        commands.put("/drag", "/warp drag");
+        commands.put("/jungle", "/warp jungle");
+        commands.put("/howl", "/warp howl");
+    }
+
+    protected static void saveShortcuts(MinecraftClient client) {
+        JsonObject shortcutsJson = new JsonObject();
+        shortcutsJson.add("commands", SkyblockerMod.GSON.toJsonTree(commands));
+        shortcutsJson.add("commandArgs", SkyblockerMod.GSON.toJsonTree(commandArgs));
+        try (BufferedWriter writer = new BufferedWriter(new FileWriter(SHORTCUTS_FILE))) {
+            SkyblockerMod.GSON.toJson(shortcutsJson, writer);
+            LOGGER.info("[Skyblocker] Saved {} command shortcuts and {} command argument shortcuts", commands.size(), commandArgs.size());
+        } catch (IOException e) {
+            LOGGER.error("[Skyblocker] Failed to save shortcuts file", e);
+        }
+    }
+
+    private static void registerCommands(CommandDispatcher<FabricClientCommandSource> dispatcher, CommandRegistryAccess registryAccess) {
+        for (String key : commands.keySet()) {
+            if (key.startsWith("/")) {
+                dispatcher.register(literal(key.substring(1)));
+            }
+        }
+        for (String key : commandArgs.keySet()) {
+            if (key.startsWith("/")) {
+                dispatcher.register(literal(key.substring(1)).then(argument("args", StringArgumentType.greedyString())));
+            }
+        }
+        dispatcher.register(literal(SkyblockerMod.NAMESPACE).then(literal("help").executes(context -> {
+            FabricClientCommandSource source = context.getSource();
+            String status = SkyblockerConfig.get().general.shortcuts.enableShortcuts && SkyblockerConfig.get().general.shortcuts.enableCommandShortcuts ? "§a§l (Enabled)" : "§c§l (Disabled)";
+            source.sendFeedback(Text.of("§e§lSkyblocker §fCommand Shortcuts" + status));
+            if (!isShortcutsLoaded()) {
+                source.sendFeedback(Text.translatable("skyblocker.shortcuts.notLoaded"));
+            } else for (Map.Entry<String, String> command : commands.entrySet()) {
+                source.sendFeedback(Text.of("§7" + command.getKey() + " §f→ §7" + command.getValue()));
+            }
+            status = SkyblockerConfig.get().general.shortcuts.enableShortcuts && SkyblockerConfig.get().general.shortcuts.enableCommandArgShortcuts ? "§a§l (Enabled)" : "§c§l (Disabled)";
+            source.sendFeedback(Text.of("§e§lSkyblocker §fCommand Argument Shortcuts" + status));
+            if (!isShortcutsLoaded()) {
+                source.sendFeedback(Text.translatable("skyblocker.shortcuts.notLoaded"));
+            } else for (Map.Entry<String, String> commandArg : commandArgs.entrySet()) {
+                source.sendFeedback(Text.of("§7" + commandArg.getKey() + " §f→ §7" + commandArg.getValue()));
+            }
+            source.sendFeedback(Text.of("§e§lSkyblocker §fCommands"));
+            for (String command : dispatcher.getSmartUsage(dispatcher.getRoot().getChild(SkyblockerMod.NAMESPACE), source).values()) {
+                source.sendFeedback(Text.of("§7/" + SkyblockerMod.NAMESPACE + " " + command));
+            }
+            return Command.SINGLE_SUCCESS;
+            // Queue the screen or else the screen will be immediately closed after executing this command
+        })).then(literal("shortcuts").executes(context -> SkyblockerMod.getInstance().scheduler.queueOpenScreen(ShortcutsConfigScreen::new))));
+    }
+
+    private static String modifyCommand(String command) {
+        if (SkyblockerConfig.get().general.shortcuts.enableShortcuts) {
+            if (!isShortcutsLoaded()) {
+                LOGGER.warn("[Skyblocker] Shortcuts not loaded yet, skipping shortcut for command: {}", command);
+                return command;
+            }
+            command = '/' + command;
+            if (SkyblockerConfig.get().general.shortcuts.enableCommandShortcuts) {
+                command = commands.getOrDefault(command, command);
+            }
+            if (SkyblockerConfig.get().general.shortcuts.enableCommandArgShortcuts) {
+                String[] messageArgs = command.split(" ");
+                for (int i = 0; i < messageArgs.length; i++) {
+                    messageArgs[i] = commandArgs.getOrDefault(messageArgs[i], messageArgs[i]);
+                }
+                command = String.join(" ", messageArgs);
+            }
+            return command.substring(1);
+        }
+        return command;
+    }
+}
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/shortcut/ShortcutsConfigListWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/shortcut/ShortcutsConfigListWidget.java
new file mode 100644
index 00000000..f29470bf
--- /dev/null
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/shortcut/ShortcutsConfigListWidget.java
@@ -0,0 +1,232 @@
+package me.xmrvizzy.skyblocker.skyblock.shortcut;
+
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.gui.Element;
+import net.minecraft.client.gui.Selectable;
+import net.minecraft.client.gui.screen.narration.NarrationMessageBuilder;
+import net.minecraft.client.gui.screen.narration.NarrationPart;
+import net.minecraft.client.gui.widget.ElementListWidget;
+import net.minecraft.client.gui.widget.TextFieldWidget;
+import net.minecraft.text.Text;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.*;
+import java.util.stream.Stream;
+
+public class ShortcutsConfigListWidget extends ElementListWidget<ShortcutsConfigListWidget.AbstractShortcutEntry> {
+    private final ShortcutsConfigScreen screen;
+    private final List<Map<String, String>> shortcutMaps = new ArrayList<>();
+
+    public ShortcutsConfigListWidget(MinecraftClient minecraftClient, ShortcutsConfigScreen screen, int width, int height, int top, int bottom, int itemHeight) {
+        super(minecraftClient, width, height, top, bottom, itemHeight);
+        this.screen = screen;
+        ShortcutCategoryEntry commandCategory = new ShortcutCategoryEntr