aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav
diff options
context:
space:
mode:
authorGrayray75 <69988482+Grayray75@users.noreply.github.com>2023-10-03 13:56:25 +0200
committerGrayray75 <69988482+Grayray75@users.noreply.github.com>2023-10-03 14:29:39 +0200
commitec2fe2475610e5c1c705d296a697e92803b8db7a (patch)
tree184b07890aeebad87e1d7f241133d79390e414f1 /src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav
parent3cc5f282d65d37c66a8c93035da38210c42fcb1d (diff)
parent88e208843710cb7a46f49c9d404cb10935b66b38 (diff)
downloadSkyblocker-ec2fe2475610e5c1c705d296a697e92803b8db7a.tar.gz
Skyblocker-ec2fe2475610e5c1c705d296a697e92803b8db7a.tar.bz2
Skyblocker-ec2fe2475610e5c1c705d296a697e92803b8db7a.zip
Merge branch 'master' into item-cooldown
Diffstat (limited to 'src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav')
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNav.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNav.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNav.java
index fb8f438b..aa933da4 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNav.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNav.java
@@ -1,7 +1,9 @@
package me.xmrvizzy.skyblocker.skyblock.quicknav;
import com.mojang.brigadier.exceptions.CommandSyntaxException;
+
import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
+import me.xmrvizzy.skyblocker.config.SkyblockerConfigManager;
import me.xmrvizzy.skyblocker.utils.Utils;
import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents;
import net.fabricmc.fabric.api.client.screen.v1.Screens;
@@ -24,7 +26,7 @@ public class QuickNav {
public static void init() {
ScreenEvents.AFTER_INIT.register((client, screen, scaledWidth, scaledHeight) -> {
- if (Utils.isOnSkyblock() && SkyblockerConfig.get().quickNav.enableQuickNav && screen instanceof HandledScreen<?> && client.player != null && !client.player.isCreative()) {
+ if (Utils.isOnSkyblock() && SkyblockerConfigManager.get().quickNav.enableQuickNav && screen instanceof HandledScreen<?> && client.player != null && !client.player.isCreative()) {
String screenTitle = screen.getTitle().getString().trim();
List<QuickNavButton> buttons = QuickNav.init(screenTitle);
for (QuickNavButton button : buttons) Screens.getButtons(screen).add(button);
@@ -34,7 +36,7 @@ public class QuickNav {
public static List<QuickNavButton> init(String screenTitle) {
List<QuickNavButton> buttons = new ArrayList<>();
- SkyblockerConfig.QuickNav data = SkyblockerConfig.get().quickNav;
+ SkyblockerConfig.QuickNav data = SkyblockerConfigManager.get().quickNav;
try {
if (data.button1.render) buttons.add(parseButton(data.button1, screenTitle, 0));
if (data.button2.render) buttons.add(parseButton(data.button2, screenTitle, 1));
@@ -55,7 +57,7 @@ public class QuickNav {
}
private static QuickNavButton parseButton(SkyblockerConfig.QuickNavItem buttonInfo, String screenTitle, int id) throws CommandSyntaxException {
- SkyblockerConfig.ItemData itemData = buttonInfo.item;
+ SkyblockerConfig.ItemData itemData = buttonInfo.item;
String nbtString = "{id:\"minecraft:" + itemData.itemName.toLowerCase(Locale.ROOT) + "\",Count:1";
if (itemData.nbt.length() > 2) nbtString += "," + itemData.nbt;
nbtString += "}";