diff options
Diffstat (limited to 'src/main/java/de/hysky')
4 files changed, 20 insertions, 13 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 b4f9eb22..a14c71f7 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CommissionLabels.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CommissionLabels.java @@ -5,10 +5,12 @@ 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; -import net.minecraft.text.Text; import net.minecraft.util.math.BlockPos; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; import java.util.function.Function; import java.util.stream.Collectors; @@ -48,14 +50,14 @@ public class CommissionLabels { if (commission.contains(glaciteLocation.getKey())) { MiningLocationLabel.GlaciteCategory category = glaciteLocation.getValue(); for (BlockPos gemstoneLocation : category.getLocations()) { - activeWaypoints.add(new MiningLocationLabel(category, gemstoneLocation.toCenterPos())); + activeWaypoints.add(new MiningLocationLabel(category, gemstoneLocation)); } } } } //add base waypoint if enabled if (SkyblockerConfigManager.get().mining.commissionWaypoints.showBaseCamp) { - activeWaypoints.add(new MiningLocationLabel(MiningLocationLabel.GlaciteCategory.CAMPFIRE, MiningLocationLabel.GlaciteCategory.CAMPFIRE.getLocations()[0].toCenterPos())); + activeWaypoints.add(new MiningLocationLabel(MiningLocationLabel.GlaciteCategory.CAMPFIRE, MiningLocationLabel.GlaciteCategory.CAMPFIRE.getLocations()[0])); } return; } @@ -69,14 +71,14 @@ public class CommissionLabels { if (commission.contains(dwarvenLocation.getKey())) { MiningLocationLabel.DwarvenCategory category = dwarvenLocation.getValue(); category.isTitanium = commission.contains("Titanium"); - activeWaypoints.add(new MiningLocationLabel(category, category.getLocation().toCenterPos())); + activeWaypoints.add(new MiningLocationLabel(category, category.getLocation())); } } } //if there is a commission completed and enabled show emissary if (SkyblockerConfigManager.get().mining.commissionWaypoints.showEmissary && completed) { for (MiningLocationLabel.DwarvenEmissaries emissaries : DWARVEN_EMISSARIES) { - activeWaypoints.add(new MiningLocationLabel(emissaries, emissaries.getLocation().toCenterPos())); + activeWaypoints.add(new MiningLocationLabel(emissaries, emissaries.getLocation())); } } } 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 3aa4dc4d..6f4c86a7 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationsManager.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationsManager.java @@ -218,4 +218,4 @@ public class CrystalsLocationsManager { addCustomWaypoint(location, playerLocation); } } -}
\ No newline at end of file +} 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 e77e5463..2cf0ea9d 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/DwarvenHud.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/DwarvenHud.java @@ -168,7 +168,7 @@ public class DwarvenHud { || !Utils.isInCrystalHollows() && !Utils.isInDwarvenMines()) { return; } - List<String> oldCommissionNames = commissionList.stream().map(Commission::commission).toList(); + List<String> oldCommissionNames = commissionList.stream().map(Commission::commission).toList(); boolean oldCompleted = commissionList.stream().anyMatch(commission -> commission.progression.equals("DONE")); commissionList = new ArrayList<>(); for (PlayerListEntry playerListEntry : CLIENT.getNetworkHandler().getPlayerList().stream().sorted(PlayerListHudAccessor.getOrdering()).toList()) { 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 45462400..1f373b55 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/MiningLocationLabel.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/MiningLocationLabel.java @@ -2,6 +2,7 @@ package de.hysky.skyblocker.skyblock.dwarven; import de.hysky.skyblocker.config.SkyblockerConfigManager; import de.hysky.skyblocker.utils.render.RenderHelper; +import de.hysky.skyblocker.utils.render.Renderable; import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext; import net.minecraft.client.MinecraftClient; import net.minecraft.text.Text; @@ -9,7 +10,10 @@ import net.minecraft.util.Formatting; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; -public record MiningLocationLabel (Category category, Vec3d centerPos){ +public record MiningLocationLabel(Category category, Vec3d centerPos) implements Renderable { + public MiningLocationLabel(Category category, BlockPos pos) { + this(category, pos.toCenterPos()); + } private Text getName() { if (SkyblockerConfigManager.get().mining.commissionWaypoints.useColor) { @@ -19,9 +23,10 @@ public record MiningLocationLabel (Category category, Vec3d centerPos){ } /** - * render the name and distance to the label scaled so can be seen at a distance + * Renders the name and distance to the label scaled so can be seen at a distance * @param context render context */ + @Override public void render(WorldRenderContext context) { Vec3d posUp = centerPos.add(0, 1, 0); double distance = context.camera().getPos().distanceTo(centerPos); @@ -30,7 +35,7 @@ public record MiningLocationLabel (Category category, Vec3d centerPos){ RenderHelper.renderText(context, Text.literal(Math.round(distance) + "m").formatted(Formatting.YELLOW), posUp, scale, MinecraftClient.getInstance().textRenderer.fontHeight + 1, true); } - interface Category { + public interface Category { String getName(); int getColor(); //all the color codes are the color of the block the waypoint is for @@ -83,8 +88,8 @@ public record MiningLocationLabel (Category category, Vec3d centerPos){ RAMPARTS_QUARRY(new BlockPos(-72, 153, -10)), UPPER_MINES(new BlockPos(-132, 174, -50)), ROYAL_MINES(new BlockPos(171, 150, 31)), - DWARVEN_VILLAGE( new BlockPos(-37, 200, -92)), - DWARVEN_MINES( new BlockPos(89, 198, -92)); + DWARVEN_VILLAGE(new BlockPos(-37, 200, -92)), + DWARVEN_MINES(new BlockPos(89, 198, -92)); private final BlockPos location; |