diff options
| author | msg-programs <msgdoesstuff@gmail.com> | 2023-08-14 18:18:00 +0200 |
|---|---|---|
| committer | msg-programs <msgdoesstuff@gmail.com> | 2023-08-14 18:18:00 +0200 |
| commit | cfef2d401c80d58871c7d5c236946777d1915d00 (patch) | |
| tree | 52f7eea8f0fb18bcc3327e098838fff07f61b8a1 /src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven | |
| parent | 54133f9aa5d4b5134943d3e8d2916100ae7e1f3a (diff) | |
| parent | ada74ef6b54168a1793c76bf3dd1c2c9d379c604 (diff) | |
| download | Skyblocker-cfef2d401c80d58871c7d5c236946777d1915d00.tar.gz Skyblocker-cfef2d401c80d58871c7d5c236946777d1915d00.tar.bz2 Skyblocker-cfef2d401c80d58871c7d5c236946777d1915d00.zip | |
Merge branch 'master' of https://github.com/SkyblockerMod/Skyblocker into json-tabhud
# Conflicts:
# src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHud.java
Pull new upstream things into branch
Diffstat (limited to 'src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven')
| -rw-r--r-- | src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHud.java | 12 |
1 files changed, 5 insertions, 7 deletions
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 999a3163..083cdcdf 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHud.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHud.java @@ -1,8 +1,8 @@ package me.xmrvizzy.skyblocker.skyblock.dwarven; -import me.xmrvizzy.skyblocker.SkyblockerMod; import me.xmrvizzy.skyblocker.config.SkyblockerConfig; import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.hud.HudCommsWidget; +import me.xmrvizzy.skyblocker.utils.Scheduler; import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager; import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback; import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback; @@ -39,12 +39,10 @@ public class DwarvenHud { .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 -> SkyblockerMod.getInstance().scheduler - .queueOpenScreen(DwarvenHudConfigScreen::new)))))); + ClientCommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> dispatcher.register(ClientCommandManager.literal("skyblocker") + .then(ClientCommandManager.literal("hud") + .then(ClientCommandManager.literal("dwarven") + .executes(Scheduler.queueOpenScreenCommand(DwarvenHudConfigScreen::new)))))); HudRenderCallback.EVENT.register((context, tickDelta) -> { if (!SkyblockerConfig.get().locations.dwarvenMines.dwarvenHud.enabled |