diff options
Diffstat (limited to 'src/main/java/de/hysky/skyblocker/skyblock/dwarven')
9 files changed, 48 insertions, 46 deletions
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHud.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHud.java index a4af804c..a74dbc5e 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHud.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHud.java @@ -35,18 +35,18 @@ public class CrystalsHud { .executes(Scheduler.queueOpenScreenCommand(CrystalsHudConfigScreen::new)))))); HudRenderEvents.AFTER_MAIN_HUD.register((context, tickDelta) -> { - if (!SkyblockerConfigManager.get().locations.dwarvenMines.crystalsHud.enabled + if (!SkyblockerConfigManager.get().mining.crystalsHud.enabled || CLIENT.player == null || !visible) { return; } - render(context, tickDelta, SkyblockerConfigManager.get().locations.dwarvenMines.crystalsHud.x, - SkyblockerConfigManager.get().locations.dwarvenMines.crystalsHud.y); + render(context, tickDelta, SkyblockerConfigManager.get().mining.crystalsHud.x, + SkyblockerConfigManager.get().mining.crystalsHud.y); }); } protected static int getDimensionsForConfig() { - return (int) (62 * SkyblockerConfigManager.get().locations.dwarvenMines.crystalsHud.mapScaling); + return (int) (62 * SkyblockerConfigManager.get().mining.crystalsHud.mapScaling); } @@ -59,7 +59,7 @@ public class CrystalsHud { * @param hudY Top left Y coordinate of the map */ private static void render(DrawContext context, float tickDelta, int hudX, int hudY) { - float scale = SkyblockerConfigManager.get().locations.dwarvenMines.crystalsHud.mapScaling; + float scale = SkyblockerConfigManager.get().mining.crystalsHud.mapScaling; //make sure the map renders infront of some stuff - improve this in the future with better layering (1.20.5?) //and set position and scale @@ -72,13 +72,13 @@ public class CrystalsHud { context.drawTexture(MAP_TEXTURE, 0, 0, 0, 0, 62, 62, 62, 62); //if enabled add waypoint locations to map - if (SkyblockerConfigManager.get().locations.dwarvenMines.crystalsHud.showLocations) { + if (SkyblockerConfigManager.get().mining.crystalsHud.showLocations) { Map<String,CrystalsWaypoint> ActiveWaypoints = CrystalsLocationsManager.activeWaypoints; for (CrystalsWaypoint waypoint : ActiveWaypoints.values()) { Color waypointColor = waypoint.category.color; Vector2ic renderPos = transformLocation(waypoint.pos.getX(), waypoint.pos.getZ()); - int locationSize = SkyblockerConfigManager.get().locations.dwarvenMines.crystalsHud.locationSize; + int locationSize = SkyblockerConfigManager.get().mining.crystalsHud.locationSize; if (SMALL_LOCATIONS.contains(waypoint.name.getString())) {//if small location half the location size locationSize /= 2; @@ -150,7 +150,7 @@ public class CrystalsHud { * */ public static void update() { - if (CLIENT.player == null || CLIENT.getNetworkHandler() == null || !SkyblockerConfigManager.get().locations.dwarvenMines.crystalsHud.enabled) { + if (CLIENT.player == null || CLIENT.getNetworkHandler() == null || !SkyblockerConfigManager.get().mining.crystalsHud.enabled) { visible = false; return; } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHudConfigScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHudConfigScreen.java index 15e605b9..823a8bcd 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHudConfigScreen.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHudConfigScreen.java @@ -26,7 +26,7 @@ public class CrystalsHudConfigScreen extends HudConfigScreen { @SuppressWarnings("SuspiciousNameCombination") @Override protected List<IntIntMutablePair> getConfigPos(SkyblockerConfig config) { - return List.of(IntIntMutablePair.of(config.locations.dwarvenMines.crystalsHud.x, config.locations.dwarvenMines.crystalsHud.y)); + return List.of(IntIntMutablePair.of(config.mining.crystalsHud.x, config.mining.crystalsHud.y)); } @Override @@ -38,7 +38,7 @@ public class CrystalsHudConfigScreen extends HudConfigScreen { @Override protected void savePos(SkyblockerConfig configManager, List<Widget> widgets) { - configManager.locations.dwarvenMines.crystalsHud.x = widgets.get(0).getX(); - configManager.locations.dwarvenMines.crystalsHud.y = widgets.get(0).getY(); + configManager.mining.crystalsHud.x = widgets.getFirst().getX(); + configManager.mining.crystalsHud.y = widgets.getFirst().getY(); } } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationsManager.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationsManager.java index 9c37de51..dd13af42 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationsManager.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationsManager.java @@ -63,7 +63,7 @@ public class CrystalsLocationsManager { } private static void extractLocationFromMessage(Text message, Boolean overlay) { - if (!SkyblockerConfigManager.get().locations.dwarvenMines.crystalsWaypoints.findInChat || !Utils.isInCrystalHollows()) { + if (!SkyblockerConfigManager.get().mining.crystalsWaypoints.findInChat || !Utils.isInCrystalHollows()) { return; } @@ -177,7 +177,7 @@ public class CrystalsLocationsManager { if (CLIENT.player == null || CLIENT.getNetworkHandler() == null) { return 0; } - CLIENT.player.sendMessage(Constants.PREFIX.get().append(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.crystalsWaypoints.shareFail").formatted(Formatting.RED)), false); + CLIENT.player.sendMessage(Constants.PREFIX.get().append(Text.translatable("skyblocker.option.locations.dwarvenMines.crystalsWaypoints.shareFail").formatted(Formatting.RED)), false); } return Command.SINGLE_SUCCESS; @@ -191,7 +191,7 @@ public class CrystalsLocationsManager { } public static void render(WorldRenderContext context) { - if (SkyblockerConfigManager.get().locations.dwarvenMines.crystalsWaypoints.enabled) { + if (SkyblockerConfigManager.get().mining.crystalsWaypoints.enabled) { for (CrystalsWaypoint crystalsWaypoint : activeWaypoints.values()) { if (crystalsWaypoint.shouldRender()) { crystalsWaypoint.render(context); @@ -205,7 +205,7 @@ public class CrystalsLocationsManager { } public static void update() { - if (CLIENT.player == null || CLIENT.getNetworkHandler() == null || !SkyblockerConfigManager.get().locations.dwarvenMines.crystalsWaypoints.enabled || !Utils.isInCrystalHollows()) { + if (CLIENT.player == null || CLIENT.getNetworkHandler() == null || !SkyblockerConfigManager.get().mining.crystalsWaypoints.enabled || !Utils.isInCrystalHollows()) { return; } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsWaypoint.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsWaypoint.java index fbb43083..0a03e60c 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsWaypoint.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsWaypoint.java @@ -2,6 +2,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.UiAndVisualsConfig; import de.hysky.skyblocker.utils.render.RenderHelper; import de.hysky.skyblocker.utils.waypoint.Waypoint; import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext; @@ -19,7 +20,7 @@ import java.util.function.Supplier; import java.util.function.ToDoubleFunction; public class CrystalsWaypoint extends Waypoint { - private static final Supplier<SkyblockerConfig.Waypoints> CONFIG = () -> SkyblockerConfigManager.get().general.waypoints; + private static final Supplier<UiAndVisualsConfig.Waypoints> CONFIG = () -> SkyblockerConfigManager.get().uiAndVisuals.waypoints; private static final Supplier<Type> TYPE_SUPPLIER = () -> CONFIG.get().waypointType; final Category category; final Text name; diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/DwarvenHud.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/DwarvenHud.java index a5b9fa24..936077f1 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/DwarvenHud.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/DwarvenHud.java @@ -62,7 +62,7 @@ public class DwarvenHud { )); HudRenderEvents.AFTER_MAIN_HUD.register((context, tickDelta) -> { - if (!SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.enabledCommissions && !SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.enabledPowder + if (!SkyblockerConfigManager.get().mining.dwarvenHud.enabledCommissions && !SkyblockerConfigManager.get().mining.dwarvenHud.enabledPowder || CLIENT.options.playerListKey.isPressed() || CLIENT.player == null || (!Utils.isInDwarvenMines() && !Utils.isInCrystalHollows())) { @@ -70,16 +70,16 @@ public class DwarvenHud { } render(HudCommsWidget.INSTANCE, HudPowderWidget.INSTANCE, context, - SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.x, - SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.y, - SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.powderX, - SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.powderY, + SkyblockerConfigManager.get().mining.dwarvenHud.x, + SkyblockerConfigManager.get().mining.dwarvenHud.y, + SkyblockerConfigManager.get().mining.dwarvenHud.powderX, + SkyblockerConfigManager.get().mining.dwarvenHud.powderY, commissionList); }); } protected static void render(HudCommsWidget hcw, HudPowderWidget hpw, DrawContext context, int comHudX, int comHudY, int powderHudX, int powderHudY, List<Commission> commissions) { - switch (SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.style) { + switch (SkyblockerConfigManager.get().mining.dwarvenHud.style) { case SIMPLE -> renderSimple(hcw, hpw, context, comHudX, comHudY, powderHudX, powderHudY, commissions); case FANCY -> renderFancy(hcw, hpw, context, comHudX, comHudY, powderHudX, powderHudY, commissions); case CLASSIC -> renderClassic(context, comHudX, comHudY, powderHudX, powderHudY, commissions); @@ -96,11 +96,11 @@ public class DwarvenHud { * @param commissions the commissions to render to the commissions hud */ private static void renderClassic(DrawContext context, int comHudX, int comHudY, int powderHudX, int powderHudY, List<Commission> commissions) { - if (SkyblockerConfigManager.get().general.tabHud.enableHudBackground) { + if (SkyblockerConfigManager.get().uiAndVisuals.tabHud.enableHudBackground) { context.fill(comHudX, comHudY, comHudX + 200, comHudY + (20 * commissions.size()), 0x64000000); context.fill(powderHudX, powderHudY, powderHudX + 200, powderHudY + 40, 0x64000000); } - if (SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.enabledCommissions) { + if (SkyblockerConfigManager.get().mining.dwarvenHud.enabledCommissions) { int y = 0; for (Commission commission : commissions) { float percentage; @@ -118,7 +118,7 @@ public class DwarvenHud { y += 20; } } - if (SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.enabledPowder) { + if (SkyblockerConfigManager.get().mining.dwarvenHud.enabledPowder) { //render mithril powder then gemstone context.drawTextWithShadow(CLIENT.textRenderer, Text.literal("Mithril: " + mithrilPowder).formatted(Formatting.AQUA), @@ -130,40 +130,40 @@ public class DwarvenHud { } private static void renderSimple(HudCommsWidget hcw, HudPowderWidget hpw, DrawContext context, int comHudX, int comHudY, int powderHudX, int powderHudY, List<Commission> commissions) { - if (SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.enabledCommissions) { + if (SkyblockerConfigManager.get().mining.dwarvenHud.enabledCommissions) { hcw.updateData(commissions, false); hcw.update(); hcw.setX(comHudX); hcw.setY(comHudY); - hcw.render(context, SkyblockerConfigManager.get().general.tabHud.enableHudBackground); + hcw.render(context, SkyblockerConfigManager.get().uiAndVisuals.tabHud.enableHudBackground); } - if (SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.enabledPowder) { + if (SkyblockerConfigManager.get().mining.dwarvenHud.enabledPowder) { hpw.update(); hpw.setX(powderHudX); hpw.setY(powderHudY); - hpw.render(context, SkyblockerConfigManager.get().general.tabHud.enableHudBackground); + hpw.render(context, SkyblockerConfigManager.get().uiAndVisuals.tabHud.enableHudBackground); } } private static void renderFancy(HudCommsWidget hcw, HudPowderWidget hpw, DrawContext context, int comHudX, int comHudY, int powderHudX, int powderHudY, List<Commission> commissions) { - if (SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.enabledCommissions) { + if (SkyblockerConfigManager.get().mining.dwarvenHud.enabledCommissions) { hcw.updateData(commissions, true); hcw.update(); hcw.setX(comHudX); hcw.setY(comHudY); - hcw.render(context, SkyblockerConfigManager.get().general.tabHud.enableHudBackground); + hcw.render(context, SkyblockerConfigManager.get().uiAndVisuals.tabHud.enableHudBackground); } - if (SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.enabledPowder) { + if (SkyblockerConfigManager.get().mining.dwarvenHud.enabledPowder) { hpw.update(); hpw.setX(powderHudX); hpw.setY(powderHudY); - hpw.render(context, SkyblockerConfigManager.get().general.tabHud.enableHudBackground); + hpw.render(context, SkyblockerConfigManager.get().uiAndVisuals.tabHud.enableHudBackground); } } public static void update() { if (CLIENT.player == null || CLIENT.getNetworkHandler() == null - || !SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.enabledCommissions && !SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.enabledPowder + || !SkyblockerConfigManager.get().mining.dwarvenHud.enabledCommissions && !SkyblockerConfigManager.get().mining.dwarvenHud.enabledPowder || !Utils.isInCrystalHollows() && !Utils.isInDwarvenMines()) { return; } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java index 79a139f9..3e9c1861 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java @@ -3,6 +3,7 @@ package de.hysky.skyblocker.skyblock.dwarven; import de.hysky.skyblocker.config.HudConfigScreen; import de.hysky.skyblocker.config.SkyblockerConfig; import de.hysky.skyblocker.config.SkyblockerConfigManager; +import de.hysky.skyblocker.config.configs.MiningConfig; import de.hysky.skyblocker.skyblock.dwarven.DwarvenHud.Commission; import de.hysky.skyblocker.skyblock.tabhud.widget.Widget; import de.hysky.skyblocker.skyblock.tabhud.widget.hud.HudCommsWidget; @@ -23,7 +24,7 @@ public class DwarvenHudConfigScreen extends HudConfigScreen { public DwarvenHudConfigScreen(Screen parent) { super(Text.literal("Dwarven HUD Config"), parent, List.of(HudCommsWidget.INSTANCE_CFG, HudPowderWidget.INSTANCE_CFG)); - if (SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.style == SkyblockerConfig.DwarvenHudStyle.CLASSIC) { + if (SkyblockerConfigManager.get().mining.dwarvenHud.style == MiningConfig.DwarvenHudStyle.CLASSIC) { HudCommsWidget.INSTANCE_CFG.setWidth(200); HudCommsWidget.INSTANCE_CFG.setHeight(20 * CFG_COMMS.size()); HudPowderWidget.INSTANCE_CFG.setWidth(200); @@ -35,8 +36,8 @@ public class DwarvenHudConfigScreen extends HudConfigScreen { @Override protected List<IntIntMutablePair> getConfigPos(SkyblockerConfig config) { return List.of( - IntIntMutablePair.of(config.locations.dwarvenMines.dwarvenHud.x, config.locations.dwarvenMines.dwarvenHud.y), - IntIntMutablePair.of(config.locations.dwarvenMines.dwarvenHud.powderX, config.locations.dwarvenMines.dwarvenHud.powderY) + IntIntMutablePair.of(config.mining.dwarvenHud.x, config.mining.dwarvenHud.y), + IntIntMutablePair.of(config.mining.dwarvenHud.powderX, config.mining.dwarvenHud.powderY) ); } @@ -47,9 +48,9 @@ public class DwarvenHudConfigScreen extends HudConfigScreen { @Override protected void savePos(SkyblockerConfig configManager, List<Widget> widgets) { - configManager.locations.dwarvenMines.dwarvenHud.x = widgets.get(0).getX(); - configManager.locations.dwarvenMines.dwarvenHud.y = widgets.get(0).getY(); - configManager.locations.dwarvenMines.dwarvenHud.powderX = widgets.get(1).getX(); - configManager.locations.dwarvenMines.dwarvenHud.powderY = widgets.get(1).getY(); + configManager.mining.dwarvenHud.x = widgets.get(0).getX(); + configManager.mining.dwarvenHud.y = widgets.get(0).getY(); + configManager.mining.dwarvenHud.powderX = widgets.get(1).getX(); + configManager.mining.dwarvenHud.powderY = widgets.get(1).getY(); } } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/Fetchur.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/Fetchur.java index 2ddaf6b5..08cb381d 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/Fetchur.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/Fetchur.java @@ -23,7 +23,7 @@ public class Fetchur extends ChatPatternListener { @Override public ChatFilterResult state() { - return SkyblockerConfigManager.get().locations.dwarvenMines.solveFetchur ? ChatFilterResult.FILTER : ChatFilterResult.PASS; + return SkyblockerConfigManager.get().mining.dwarvenMines.solveFetchur ? ChatFilterResult.FILTER : ChatFilterResult.PASS; } @Override diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/MetalDetector.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/MetalDetector.java index 4d126b7c..dd97e5d1 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/MetalDetector.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/MetalDetector.java @@ -101,7 +101,7 @@ public class MetalDetector { * @param overlay if the message is an overlay message */ private static void getDistanceMessage(Text text, boolean overlay) { - if (!overlay || !SkyblockerConfigManager.get().locations.dwarvenMines.metalDetectorHelper || !Utils.isInCrystalHollows() || !(Utils.getIslandArea().substring(2).equals("Mines of Divan")) || CLIENT.player == null) { + if (!overlay || !SkyblockerConfigManager.get().mining.crystalHollows.metalDetectorHelper || !Utils.isInCrystalHollows() || !(Utils.getIslandArea().substring(2).equals("Mines of Divan")) || CLIENT.player == null) { checkChestFound(text); return; } @@ -236,12 +236,12 @@ public class MetalDetector { */ private static void render(WorldRenderContext context) { //only render enabled and if there is a few location options and in the mines of divan - if (!SkyblockerConfigManager.get().locations.dwarvenMines.metalDetectorHelper || !Utils.isInCrystalHollows() || possibleBlocks.isEmpty() || possibleBlocks.size() > 8 || !(Utils.getIslandArea().substring(2).equals("Mines of Divan"))) { + if (!SkyblockerConfigManager.get().mining.crystalHollows.metalDetectorHelper || !Utils.isInCrystalHollows() || possibleBlocks.isEmpty() || possibleBlocks.size() > 8 || !(Utils.getIslandArea().substring(2).equals("Mines of Divan"))) { return; } //only one location render just that and guiding line to it if (possibleBlocks.size() == 1) { - Vec3i block = possibleBlocks.get(0).add(0, -1, 0); //the block you are taken to is one block above the chest + Vec3i block = possibleBlocks.getFirst().add(0, -1, 0); //the block you are taken to is one block above the chest CrystalsWaypoint waypoint = new CrystalsWaypoint(CrystalsWaypoint.Category.CORLEONE, Text.translatable("skyblocker.dwarvenMines.metalDetectorHelper.treasure"), new BlockPos(block.getX(), block.getY(), block.getZ())); waypoint.render(context); RenderHelper.renderLineFromCursor(context, Vec3d.ofCenter(block), LIGHT_GRAY, 1f, 5f); diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/Puzzler.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/Puzzler.java index 1f5c0c90..400f40ff 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/Puzzler.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/Puzzler.java @@ -18,7 +18,7 @@ public class Puzzler extends ChatPatternListener { @Override public ChatFilterResult state() { - return SkyblockerConfigManager.get().locations.dwarvenMines.solvePuzzler ? null : ChatFilterResult.PASS; + return SkyblockerConfigManager.get().mining.dwarvenMines.solvePuzzler ? null : ChatFilterResult.PASS; } @Override |