aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/de/hysky/skyblocker
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/de/hysky/skyblocker')
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dwarven/CommissionLabels.java18
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dwarven/MiningLocationLabel.java12
2 files changed, 15 insertions, 15 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 d8b40c43..3d7c2c00 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CommissionLabels.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CommissionLabels.java
@@ -13,9 +13,9 @@ import java.util.stream.Collectors;
public class CommissionLabels {
- private static final Map<String, MiningLocationLabel.dwarvenCategory> DWARVEN_LOCATIONS = Arrays.stream(MiningLocationLabel.dwarvenCategory.values()).collect(Collectors.toMap(MiningLocationLabel.dwarvenCategory::toString, Function.identity()));
- private static final List<MiningLocationLabel.dwarvenEmissaries> DWARVEN_EMISSARYS = Arrays.stream(MiningLocationLabel.dwarvenEmissaries.values()).toList();
- private static final Map<String, MiningLocationLabel.glaciteCategory> GLACITE_LOCATIONS = Arrays.stream(MiningLocationLabel.glaciteCategory.values()).collect(Collectors.toMap(MiningLocationLabel.glaciteCategory::toString, Function.identity()));
+ private static final Map<String, MiningLocationLabel.DwarvenCategory> DWARVEN_LOCATIONS = Arrays.stream(MiningLocationLabel.DwarvenCategory.values()).collect(Collectors.toMap(MiningLocationLabel.DwarvenCategory::toString, Function.identity()));
+ private static final List<MiningLocationLabel.DwarvenEmissaries> DWARVEN_EMISSARIES = Arrays.stream(MiningLocationLabel.DwarvenEmissaries.values()).toList();
+ private static final Map<String, MiningLocationLabel.GlaciteCategory> GLACITE_LOCATIONS = Arrays.stream(MiningLocationLabel.GlaciteCategory.values()).collect(Collectors.toMap(MiningLocationLabel.GlaciteCategory::toString, Function.identity()));
protected static List<MiningLocationLabel> activeWaypoints = new ArrayList<>();
@@ -43,9 +43,9 @@ public class CommissionLabels {
}
for (String commission : newCommissions) {
- for (Map.Entry<String, MiningLocationLabel.glaciteCategory> glaciteLocation : GLACITE_LOCATIONS.entrySet()) {
+ for (Map.Entry<String, MiningLocationLabel.GlaciteCategory> glaciteLocation : GLACITE_LOCATIONS.entrySet()) {
if (commission.contains(glaciteLocation.getKey())) {
- MiningLocationLabel.glaciteCategory category = glaciteLocation.getValue();
+ MiningLocationLabel.GlaciteCategory category = glaciteLocation.getValue();
for (BlockPos gemstoneLocation : category.getLocations()) {
activeWaypoints.add(new MiningLocationLabel(category, gemstoneLocation));
}
@@ -54,7 +54,7 @@ public class CommissionLabels {
}
//add base waypoint if enabled
if (SkyblockerConfigManager.get().mining.commissionWaypoints.showBaseCamp) {
- activeWaypoints.add(new MiningLocationLabel(MiningLocationLabel.glaciteCategory.CAMPFIRE, MiningLocationLabel.glaciteCategory.CAMPFIRE.getLocations()[0]));
+ activeWaypoints.add(new MiningLocationLabel(MiningLocationLabel.GlaciteCategory.CAMPFIRE, MiningLocationLabel.GlaciteCategory.CAMPFIRE.getLocations()[0]));
}
return;
}
@@ -64,9 +64,9 @@ public class CommissionLabels {
}
for (String commission : newCommissions) {
- for (Map.Entry<String, MiningLocationLabel.dwarvenCategory> dwarvenLocation : DWARVEN_LOCATIONS.entrySet()) {
+ for (Map.Entry<String, MiningLocationLabel.DwarvenCategory> dwarvenLocation : DWARVEN_LOCATIONS.entrySet()) {
if (commission.contains(dwarvenLocation.getKey())) {
- MiningLocationLabel.dwarvenCategory category = dwarvenLocation.getValue();
+ MiningLocationLabel.DwarvenCategory category = dwarvenLocation.getValue();
category.isTitanium = commission.contains("Titanium");
activeWaypoints.add(new MiningLocationLabel(category, category.getLocation()));
}
@@ -74,7 +74,7 @@ public class CommissionLabels {
}
//if there is a commission completed and enabled show emissary
if (SkyblockerConfigManager.get().mining.commissionWaypoints.showEmissary && completed) {
- for (MiningLocationLabel.dwarvenEmissaries emissaries : DWARVEN_EMISSARYS) {
+ for (MiningLocationLabel.DwarvenEmissaries emissaries : DWARVEN_EMISSARIES) {
activeWaypoints.add(new MiningLocationLabel(emissaries, emissaries.getLocation()));
}
}
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 d41318ad..7d565386 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/MiningLocationLabel.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/MiningLocationLabel.java
@@ -43,7 +43,7 @@ public class MiningLocationLabel {
int getColor(); //all the color codes are the color of the block the waypoint is for
}
- enum dwarvenCategory implements Category {
+ enum DwarvenCategory implements Category {
LAVA_SPRINGS("Lava Springs", new BlockPos(60, 197, -15)),
CLIFFSIDE_VEINS("Cliffside Veins", new BlockPos(40, 128, 40)),
RAMPARTS_QUARRY("Rampart's Quarry", new BlockPos(-100, 150, -20)),
@@ -56,7 +56,7 @@ public class MiningLocationLabel {
private final String name;
private final BlockPos location;
- dwarvenCategory(String name, BlockPos location) {
+ DwarvenCategory(String name, BlockPos location) {
this.name = name;
this.location = location;
}
@@ -84,7 +84,7 @@ public class MiningLocationLabel {
}
}
- enum dwarvenEmissaries implements Category {
+ enum DwarvenEmissaries implements Category {
LAVA_SPRINGS(new BlockPos(58, 198, -8)),
CLIFFSIDE_VEINS(new BlockPos(42, 134, 22)),
RAMPARTS_QUARRY(new BlockPos(-72, 153, -10)),
@@ -95,7 +95,7 @@ public class MiningLocationLabel {
private final BlockPos location;
- dwarvenEmissaries( BlockPos location) {
+ DwarvenEmissaries(BlockPos location) {
this.location = location;
}
@@ -120,7 +120,7 @@ public class MiningLocationLabel {
}
}
- enum glaciteCategory implements Category {
+ enum GlaciteCategory implements Category {
AQUAMARINE("Aquamarine", 0x334cb1, new BlockPos[]{new BlockPos(-1, 139, 437), new BlockPos(90, 151, 229), new BlockPos(56, 151, 400), new BlockPos(51, 117, 303)}),
ONYX("Onyx", 0x191919, new BlockPos[]{new BlockPos(79, 119, 411), new BlockPos(-14, 132, 386), new BlockPos(18, 136, 370), new BlockPos(16, 138, 411), new BlockPos(-68, 130, 408)}),
PERIDOT("Peridot", 0x667f33, new BlockPos[]{new BlockPos(-61, 147, 302), new BlockPos(91, 122, 397), new BlockPos(-73, 122, 458), new BlockPos(-77, 120, 282)}),
@@ -131,7 +131,7 @@ public class MiningLocationLabel {
private final int color;
private final BlockPos[] location;
- glaciteCategory(String name, int color, BlockPos[] location) {
+ GlaciteCategory(String name, int color, BlockPos[] location) {
this.name = name;
this.color = color;
this.location = location;