diff options
Diffstat (limited to 'src/main/java/de')
3 files changed, 7 insertions, 32 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 116787d0..447453cc 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHud.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHud.java @@ -26,7 +26,7 @@ public class CrystalsHud { private static final MinecraftClient CLIENT = MinecraftClient.getInstance(); protected static final Identifier MAP_TEXTURE = new Identifier(SkyblockerMod.NAMESPACE, "textures/gui/crystals_map.png"); private static final Identifier MAP_ICON = new Identifier("textures/map/map_icons.png"); - private static final String[] SMALL_LOCATIONS = { "Fairy Grotto", "King", "Corleone" }; + private static final String[] SMALL_LOCATIONS = { "Fairy Grotto", "King", "Corleone", "Odawa", "Key Guardian" }; public static boolean visible = false; 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 24b031f8..0a4e4518 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationsManager.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationsManager.java @@ -29,8 +29,10 @@ import java.awt.*; import java.util.Arrays; import java.util.HashMap; import java.util.Map; +import java.util.function.Function; import java.util.regex.Matcher; import java.util.regex.Pattern; +import java.util.stream.Collectors; import org.slf4j.Logger; @@ -45,17 +47,7 @@ public class CrystalsLocationsManager { /** * A look-up table to convert between location names and waypoint in the {@link CrystalsWaypoint.Category} values. */ - protected static final Map<String, CrystalsWaypoint.Category> WAYPOINT_LOCATIONS = Map.of( - "Jungle Temple", CrystalsWaypoint.Category.JUNGLE_TEMPLE, - "Mines of Divan", CrystalsWaypoint.Category.MINES_OF_DIVAN, - "Goblin Queen's Den", CrystalsWaypoint.Category.GOBLIN_QUEENS_DEN, - "Lost Precursor City", CrystalsWaypoint.Category.LOST_PRECURSOR_CITY, - "Khazad-dûm", CrystalsWaypoint.Category.KHAZAD_DUM, - "Fairy Grotto", CrystalsWaypoint.Category.FAIRY_GROTTO, - "Dragon's Lair", CrystalsWaypoint.Category.DRAGONS_LAIR, - "Corleone", CrystalsWaypoint.Category.CORLEONE, - "King", CrystalsWaypoint.Category.KING - ); + protected static final Map<String, CrystalsWaypoint.Category> WAYPOINT_LOCATIONS = Arrays.stream(CrystalsWaypoint.Category.values()).collect(Collectors.toMap(CrystalsWaypoint.Category::toString, Function.identity())); private static final Pattern TEXT_CWORDS_PATTERN = Pattern.compile("([0-9][0-9][0-9]) ([0-9][0-9][0-9]?) ([0-9][0-9][0-9])"); protected static Map<String, CrystalsWaypoint> activeWaypoints = new HashMap<>(); 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 ab971ec4..4c65aefb 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsWaypoint.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsWaypoint.java @@ -1,8 +1,5 @@ package de.hysky.skyblocker.skyblock.dwarven; -import com.google.gson.JsonObject; -import com.mojang.serialization.Codec; -import com.mojang.serialization.JsonOps; import de.hysky.skyblocker.config.SkyblockerConfig; import de.hysky.skyblocker.config.SkyblockerConfigManager; import de.hysky.skyblocker.utils.render.RenderHelper; @@ -13,11 +10,8 @@ import net.minecraft.entity.Entity; import net.minecraft.text.Text; import net.minecraft.util.DyeColor; import net.minecraft.util.Formatting; -import net.minecraft.util.StringIdentifiable; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.awt.*; import java.util.function.Predicate; @@ -25,7 +19,6 @@ import java.util.function.Supplier; import java.util.function.ToDoubleFunction; public class CrystalsWaypoint extends Waypoint { - private static final Logger LOGGER = LoggerFactory.getLogger(CrystalsWaypoint.class); private static final Supplier<SkyblockerConfig.Waypoints> CONFIG = () -> SkyblockerConfigManager.get().general.waypoints; private static final Supplier<Type> TYPE_SUPPLIER = () -> CONFIG.get().waypointType; final Category category; @@ -74,7 +67,7 @@ public class CrystalsWaypoint extends Waypoint { /** * enum for the different waypoints used int the crystals hud each with a {@link Category#name} and associated {@link Category#color} */ - enum Category implements StringIdentifiable { + enum Category { JUNGLE_TEMPLE("Jungle Temple", new Color(DyeColor.PURPLE.getSignColor())), MINES_OF_DIVAN("Mines of Divan", Color.GREEN), GOBLIN_QUEENS_DEN("Goblin Queen's Den", new Color(DyeColor.ORANGE.getSignColor())), @@ -84,10 +77,9 @@ public class CrystalsWaypoint extends Waypoint { DRAGONS_LAIR("Dragon's Lair", Color.BLACK), CORLEONE("Corleone", Color.WHITE), KING("King", Color.RED), - DEFAULT("Default", Color.BLACK); + ODAWA("Odawa", Color.MAGENTA), + KEY_GUARDIAN("Key Guardian", Color.LIGHT_GRAY); - - private static final Codec<Category> CODEC = StringIdentifiable.createCodec(Category::values); public final Color color; private final String name; private final float[] colorComponents; @@ -98,18 +90,9 @@ public class CrystalsWaypoint extends Waypoint { this.colorComponents = color.getColorComponents(null); } - static Category get(JsonObject waypointJson) { - return CODEC.parse(JsonOps.INSTANCE, waypointJson.get("category")).resultOrPartial(LOGGER::error).orElse(Category.DEFAULT); - } - @Override public String toString() { return name; } - - @Override - public String asString() { - return name; - } } } |