From 51b7043abab1d91beb4f0dabec6b9ffe8ca7b1bf Mon Sep 17 00:00:00 2001 From: olim Date: Tue, 30 Jan 2024 16:11:11 +0000 Subject: add Corleone and map icon changes changed map icon so it smaller centred on player and dose not look like it can rotate as that is non functional. and added Corleone to locations --- src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHud.java | 4 ++-- .../hysky/skyblocker/skyblock/dwarven/CrystalsLocationsManager.java | 5 +++-- .../java/de/hysky/skyblocker/skyblock/dwarven/CrystalsWaypoint.java | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'src/main/java/de/hysky/skyblocker') 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 f9eaa65f..6a9ac743 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHud.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHud.java @@ -85,9 +85,9 @@ public class CrystalsHud { Pair renderPos = transformLocation(playerX,playerZ); //draw marker on map context. - drawTexture(MAP_ICON,hudX+renderPos.first(),hudY+renderPos.second(),2,0,5,7,128,128); + drawTexture(MAP_ICON,hudX+renderPos.first()-2,hudY+renderPos.second()-2,58,2,4,4,128,128); - //todo add direction and scale (could be wrong drawing methods) and offset to center on player + //todo add direction and scale (can not work out how to rotate) } private static Pair transformLocation(double x, double z){ 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 3484bafd..743d4ef5 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationsManager.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationsManager.java @@ -50,7 +50,8 @@ public class CrystalsLocationsManager { "Lost Precursor City", CrystalsWaypoint.Category.LOSTPRECURSORCITY, "Khazad-dûm", CrystalsWaypoint.Category.KHAZADUM, "Fairy Grotto", CrystalsWaypoint.Category.FAIRYGROTTO, - "Dragon's Lair", CrystalsWaypoint.Category.DRAGONSLAIR + "Dragon's Lair", CrystalsWaypoint.Category.DRAGONSLAIR, + "Corleone", CrystalsWaypoint.Category.DRAGONSLAIR ); 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])"); @@ -62,7 +63,7 @@ public class CrystalsLocationsManager { ClientCommandRegistrationCallback.EVENT.register(CrystalsLocationsManager::registerWaypointLocationCommands); } private static void extractLocationFromMessage(Text message, SignedMessage signedMessage, GameProfile sender, MessageType.Parameters params, Instant receptionTimestamp){ - if (!SkyblockerConfigManager.get().locations.dwarvenMines.crystalsWaypoints.findInChat || !Utils.isInCrystals()) { + if (!SkyblockerConfigManager.get().locations.dwarvenMines.crystalsWaypoints.findInChat || !Utils.isInCrystals()) { return; } //get the message text 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 551821ca..c33251d7 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsWaypoint.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsWaypoint.java @@ -104,6 +104,7 @@ public class CrystalsWaypoint extends Waypoint { KHAZADUM("Khazad-dûm",Color.RED), FAIRYGROTTO("Fairy Grotto",Color.PINK), DRAGONSLAIR("Dragon's Lair",Color.BLACK), + CORLEONE("Corleone",Color.ORANGE), DEFAULT("Default",Color.BLACK); -- cgit