aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven
diff options
context:
space:
mode:
authorAaron <51387595+AzureAaron@users.noreply.github.com>2023-09-30 23:33:09 -0400
committerGitHub <noreply@github.com>2023-09-30 23:33:09 -0400
commit555161a6568d918f158ceecffe812b45960ec93a (patch)
treecaf0e8dc7e09532697ec82becd10400834593858 /src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven
parentdbdb0598086a4d31018294f87026da517ceb0ce2 (diff)
parentbe8e307391d95e0bdc981411f94626978a88b0a5 (diff)
downloadSkyblocker-555161a6568d918f158ceecffe812b45960ec93a.tar.gz
Skyblocker-555161a6568d918f158ceecffe812b45960ec93a.tar.bz2
Skyblocker-555161a6568d918f158ceecffe812b45960ec93a.zip
Merge pull request #328 from AzureAaron/yacl3
YACL Config
Diffstat (limited to 'src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven')
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHud.java20
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java23
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/Fetchur.java4
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/Puzzler.java4
4 files changed, 28 insertions, 23 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 3563741c..3d8292a5 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHud.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHud.java
@@ -1,7 +1,7 @@
package me.xmrvizzy.skyblocker.skyblock.dwarven;
import it.unimi.dsi.fastutil.ints.IntIntPair;
-import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
+import me.xmrvizzy.skyblocker.config.SkyblockerConfigManager;
import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.hud.HudCommsWidget;
import me.xmrvizzy.skyblocker.utils.scheduler.Scheduler;
import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
@@ -46,19 +46,19 @@ public class DwarvenHud {
.executes(Scheduler.queueOpenScreenCommand(DwarvenHudConfigScreen::new))))));
HudRenderCallback.EVENT.register((context, tickDelta) -> {
- if (!SkyblockerConfig.get().locations.dwarvenMines.dwarvenHud.enabled
+ if (!SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.enabled
|| client.options.playerListKey.isPressed()
|| client.player == null
|| commissionList.isEmpty()) {
return;
}
- render(HudCommsWidget.INSTANCE, context, SkyblockerConfig.get().locations.dwarvenMines.dwarvenHud.x,
- SkyblockerConfig.get().locations.dwarvenMines.dwarvenHud.y, commissionList);
+ render(HudCommsWidget.INSTANCE, context, SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.x,
+ SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.y, commissionList);
});
}
public static IntIntPair getDimForConfig(List<Commission> commissions) {
- return switch (SkyblockerConfig.get().locations.dwarvenMines.dwarvenHud.style) {
+ return switch (SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.style) {
case SIMPLE -> {
HudCommsWidget.INSTANCE_CFG.updateData(commissions, false);
yield IntIntPair.of(
@@ -77,7 +77,7 @@ public class DwarvenHud {
public static void render(HudCommsWidget hcw, DrawContext context, int hudX, int hudY, List<Commission> commissions) {
- switch (SkyblockerConfig.get().locations.dwarvenMines.dwarvenHud.style) {
+ switch (SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.style) {
case SIMPLE -> renderSimple(hcw, context, hudX, hudY, commissions);
case FANCY -> renderFancy(hcw, context, hudX, hudY, commissions);
case CLASSIC -> renderClassic(context, hudX, hudY, commissions);
@@ -85,7 +85,7 @@ public class DwarvenHud {
}
public static void renderClassic(DrawContext context, int hudX, int hudY, List<Commission> commissions) {
- if (SkyblockerConfig.get().locations.dwarvenMines.dwarvenHud.enableBackground) {
+ if (SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.enableBackground) {
context.fill(hudX, hudY, hudX + 200, hudY + (20 * commissions.size()), 0x64000000);
}
@@ -108,7 +108,7 @@ public class DwarvenHud {
hcw.setX(hudX);
hcw.setY(hudY);
hcw.render(context,
- SkyblockerConfig.get().locations.dwarvenMines.dwarvenHud.enableBackground);
+ SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.enableBackground);
}
public static void renderFancy(HudCommsWidget hcw, DrawContext context, int hudX, int hudY, List<Commission> commissions) {
@@ -117,12 +117,12 @@ public class DwarvenHud {
hcw.setX(hudX);
hcw.setY(hudY);
hcw.render(context,
- SkyblockerConfig.get().locations.dwarvenMines.dwarvenHud.enableBackground);
+ SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.enableBackground);
}
public static void update() {
commissionList = new ArrayList<>();
- if (client.player == null || client.getNetworkHandler() == null || !SkyblockerConfig.get().locations.dwarvenMines.dwarvenHud.enabled)
+ if (client.player == null || client.getNetworkHandler() == null || !SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.enabled)
return;
client.getNetworkHandler().getPlayerList().forEach(playerListEntry -> {
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 cde1b236..232817bb 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java
@@ -1,8 +1,7 @@
package me.xmrvizzy.skyblocker.skyblock.dwarven;
import it.unimi.dsi.fastutil.ints.IntIntPair;
-import me.shedaniel.autoconfig.AutoConfig;
-import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
+import me.xmrvizzy.skyblocker.config.SkyblockerConfigManager;
import me.xmrvizzy.skyblocker.skyblock.dwarven.DwarvenHud.Commission;
import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.hud.HudCommsWidget;
import me.xmrvizzy.skyblocker.utils.render.RenderHelper;
@@ -17,11 +16,17 @@ public class DwarvenHudConfigScreen extends Screen {
private static final List<Commission> CFG_COMMS = List.of(new DwarvenHud.Commission("Test Commission 1", "1%"), new DwarvenHud.Commission("Test Commission 2", "2%"));
- private int hudX = SkyblockerConfig.get().locations.dwarvenMines.dwarvenHud.x;
- private int hudY = SkyblockerConfig.get().locations.dwarvenMines.dwarvenHud.y;
+ private int hudX = SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.x;
+ private int hudY = SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.y;
+ private final Screen parent;
protected DwarvenHudConfigScreen() {
- super(Text.of("Dwarven HUD Config"));
+ this(null);
+ }
+
+ public DwarvenHudConfigScreen(Screen parent) {
+ super(Text.of("Dwarven HUD Config"));
+ this.parent = parent;
}
@Override
@@ -54,9 +59,9 @@ public class DwarvenHudConfigScreen extends Screen {
@Override
public void close() {
- SkyblockerConfig.get().locations.dwarvenMines.dwarvenHud.x = hudX;
- SkyblockerConfig.get().locations.dwarvenMines.dwarvenHud.y = hudY;
- AutoConfig.getConfigHolder(SkyblockerConfig.class).save();
- super.close();
+ SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.x = hudX;
+ SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.y = hudY;
+ SkyblockerConfigManager.save();
+ client.setScreen(parent);
}
}
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/Fetchur.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/Fetchur.java
index 5e284452..d5c18545 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/Fetchur.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/Fetchur.java
@@ -1,6 +1,6 @@
package me.xmrvizzy.skyblocker.skyblock.dwarven;
-import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
+import me.xmrvizzy.skyblocker.config.SkyblockerConfigManager;
import me.xmrvizzy.skyblocker.utils.chat.ChatFilterResult;
import me.xmrvizzy.skyblocker.utils.chat.ChatPatternListener;
import net.minecraft.client.MinecraftClient;
@@ -19,7 +19,7 @@ public class Fetchur extends ChatPatternListener {
@Override
public ChatFilterResult state() {
- return SkyblockerConfig.get().locations.dwarvenMines.solveFetchur ? ChatFilterResult.FILTER : ChatFilterResult.PASS;
+ return SkyblockerConfigManager.get().locations.dwarvenMines.solveFetchur ? ChatFilterResult.FILTER : ChatFilterResult.PASS;
}
@Override
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/Puzzler.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/Puzzler.java
index 96ccdaf2..90a0e30f 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/Puzzler.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/Puzzler.java
@@ -1,6 +1,6 @@
package me.xmrvizzy.skyblocker.skyblock.dwarven;
-import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
+import me.xmrvizzy.skyblocker.config.SkyblockerConfigManager;
import me.xmrvizzy.skyblocker.utils.chat.ChatFilterResult;
import me.xmrvizzy.skyblocker.utils.chat.ChatPatternListener;
import net.minecraft.block.Blocks;
@@ -18,7 +18,7 @@ public class Puzzler extends ChatPatternListener {
@Override
public ChatFilterResult state() {
- return SkyblockerConfig.get().locations.dwarvenMines.solvePuzzler ? null : ChatFilterResult.PASS;
+ return SkyblockerConfigManager.get().locations.dwarvenMines.solvePuzzler ? null : ChatFilterResult.PASS;
}
@Override