aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/de/hysky/skyblocker/skyblock/dwarven
diff options
context:
space:
mode:
authorolim <bobq4582@gmail.com>2024-05-09 23:10:38 +0100
committerolim <bobq4582@gmail.com>2024-05-09 23:10:38 +0100
commite81be5283360c6cf118c3b663b3d58df4dba10fd (patch)
tree7c9e643732f83672cdd38a8fbff392e38834a46a /src/main/java/de/hysky/skyblocker/skyblock/dwarven
parentf34fdf9bc3fd00ab9878682a1e331fb9b4d60397 (diff)
downloadSkyblocker-e81be5283360c6cf118c3b663b3d58df4dba10fd.tar.gz
Skyblocker-e81be5283360c6cf118c3b663b3d58df4dba10fd.tar.bz2
Skyblocker-e81be5283360c6cf118c3b663b3d58df4dba10fd.zip
fix to work with new config
Diffstat (limited to 'src/main/java/de/hysky/skyblocker/skyblock/dwarven')
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dwarven/CommissionLabels.java16
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dwarven/MiningLocationLabel.java4
2 files changed, 10 insertions, 10 deletions
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CommissionLabels.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CommissionLabels.java
index 57361ae5..d8b40c43 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CommissionLabels.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CommissionLabels.java
@@ -1,7 +1,7 @@
package de.hysky.skyblocker.skyblock.dwarven;
-import de.hysky.skyblocker.config.SkyblockerConfig;
import de.hysky.skyblocker.config.SkyblockerConfigManager;
+import de.hysky.skyblocker.config.configs.MiningConfig;
import de.hysky.skyblocker.utils.Utils;
import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext;
import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents;
@@ -30,15 +30,15 @@ public class CommissionLabels {
* @param completed if there is a commission completed
*/
protected static void update(List<String> newCommissions, boolean completed) {
- SkyblockerConfig.CommissionWaypointMode currentMode = SkyblockerConfigManager.get().locations.dwarvenMines.commissionWaypoints.mode;
- if (currentMode == SkyblockerConfig.CommissionWaypointMode.OFF) {
+ MiningConfig.CommissionWaypointMode currentMode = SkyblockerConfigManager.get().mining.commissionWaypoints.mode;
+ if (currentMode == MiningConfig.CommissionWaypointMode.OFF) {
return;
}
activeWaypoints.clear();
String location = Utils.getIslandArea().substring(2);
//find commission locations in glacite
if (location.equals("Dwarven Base Camp") || location.equals("Glacite Tunnels") || location.equals("Glacite Mineshafts") || location.equals("Glacite Lake")) {
- if (currentMode != SkyblockerConfig.CommissionWaypointMode.BOTH && currentMode != SkyblockerConfig.CommissionWaypointMode.GLACITE) {
+ if (currentMode != MiningConfig.CommissionWaypointMode.BOTH && currentMode != MiningConfig.CommissionWaypointMode.GLACITE) {
return;
}
@@ -53,13 +53,13 @@ public class CommissionLabels {
}
}
//add base waypoint if enabled
- if (SkyblockerConfigManager.get().locations.dwarvenMines.commissionWaypoints.showBaseCamp) {
+ if (SkyblockerConfigManager.get().mining.commissionWaypoints.showBaseCamp) {
activeWaypoints.add(new MiningLocationLabel(MiningLocationLabel.glaciteCategory.CAMPFIRE, MiningLocationLabel.glaciteCategory.CAMPFIRE.getLocations()[0]));
}
return;
}
//find commission locations in dwarven mines
- if (currentMode != SkyblockerConfig.CommissionWaypointMode.BOTH && currentMode != SkyblockerConfig.CommissionWaypointMode.DWARVEN) {
+ if (currentMode != MiningConfig.CommissionWaypointMode.BOTH && currentMode != MiningConfig.CommissionWaypointMode.DWARVEN) {
return;
}
@@ -73,7 +73,7 @@ public class CommissionLabels {
}
}
//if there is a commission completed and enabled show emissary
- if (SkyblockerConfigManager.get().locations.dwarvenMines.commissionWaypoints.showEmissary && completed) {
+ if (SkyblockerConfigManager.get().mining.commissionWaypoints.showEmissary && completed) {
for (MiningLocationLabel.dwarvenEmissaries emissaries : DWARVEN_EMISSARYS) {
activeWaypoints.add(new MiningLocationLabel(emissaries, emissaries.getLocation()));
}
@@ -86,7 +86,7 @@ public class CommissionLabels {
* @param context render context
*/
private static void render(WorldRenderContext context) {
- if (!Utils.isInDwarvenMines() || SkyblockerConfigManager.get().locations.dwarvenMines.commissionWaypoints.mode == SkyblockerConfig.CommissionWaypointMode.OFF) {
+ if (!Utils.isInDwarvenMines() || SkyblockerConfigManager.get().mining.commissionWaypoints.mode == MiningConfig.CommissionWaypointMode.OFF) {
return;
}
for (MiningLocationLabel MiningLocationLabel : activeWaypoints) {
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/MiningLocationLabel.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/MiningLocationLabel.java
index 356e2214..d41318ad 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/MiningLocationLabel.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/MiningLocationLabel.java
@@ -15,7 +15,7 @@ public class MiningLocationLabel {
private final Vec3d centerPos;
MiningLocationLabel(Category category, BlockPos pos) {
- if (SkyblockerConfigManager.get().locations.dwarvenMines.commissionWaypoints.useColor) {
+ if (SkyblockerConfigManager.get().mining.commissionWaypoints.useColor) {
this.name = Text.literal(category.getName()).withColor(category.getColor());
} else {
this.name = Text.literal(category.getName());
@@ -32,7 +32,7 @@ public class MiningLocationLabel {
public void render(WorldRenderContext context) {
Vec3d posUp = centerPos.add(0, 1, 0);
double distance = context.camera().getPos().distanceTo(centerPos);
- float scale = (float) (SkyblockerConfigManager.get().locations.dwarvenMines.commissionWaypoints.textScale * (distance / 10));
+ float scale = (float) (SkyblockerConfigManager.get().mining.commissionWaypoints.textScale * (distance / 10));
RenderHelper.renderText(context, name, posUp, scale, true);
RenderHelper.renderText(context, Text.literal(Math.round(distance) + "m").formatted(Formatting.YELLOW), posUp, scale, MinecraftClient.getInstance().textRenderer.fontHeight + 1, true);
}