diff options
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java | 3 | ||||
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsWaypoint.java | 10 |
2 files changed, 2 insertions, 11 deletions
diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java index ecf66407..a07b0084 100644 --- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java @@ -934,8 +934,7 @@ public class SkyblockerConfig { @SerialEntry public Map<String, CrystalsWaypoint> ActiveWaypoints = new HashMap<>() {}; - @SerialEntry - public Waypoint.Type waypointType = Waypoint.Type.WAYPOINT; //todo see if best option / give player a choice + } public enum DwarvenHudStyle { 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 09eeb419..39509c41 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsWaypoint.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsWaypoint.java @@ -32,20 +32,12 @@ import java.util.function.ToDoubleFunction; public class CrystalsWaypoint extends Waypoint { private static final Logger LOGGER = LoggerFactory.getLogger(CrystalsWaypoint.class); - private static final Supplier<SkyblockerConfig.CrystalsWaypoints> CONFIG = () -> SkyblockerConfigManager.get().locations.dwarvenMines.crystalsWaypoints; + private static final Supplier<SkyblockerConfig.Waypoints> CONFIG = () -> SkyblockerConfigManager.get().general.waypoints; static final Supplier<Type> TYPE_SUPPLIER = () -> CONFIG.get().waypointType; final Category category; final Text name; private final Vec3d centerPos; - CrystalsWaypoint( JsonObject waypoint, String name, BlockPos pos) { - this(Category.get(waypoint), name, pos); - } - - CrystalsWaypoint(Category category, String name, BlockPos pos) { - this( category, Text.of(name), pos); - } - CrystalsWaypoint( Category category, Text name, BlockPos pos) { super(pos, TYPE_SUPPLIER, category.colorComponents); this.category = category; |