From e30367c9b7b2370850e839e994d3c0bf95b3b9ad Mon Sep 17 00:00:00 2001 From: olim Date: Wed, 19 Jun 2024 20:47:38 +0100 Subject: add remove command and consistence add command to remove way-point and consistence for the add and share --- src/main/resources/assets/skyblocker/lang/en_us.json | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/main/resources') diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index b7096424..8bdc5965 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -473,7 +473,11 @@ "skyblocker.config.mining.crystalsWaypoints.enabled.@Tooltip": "Show a waypoint (waypoint selected in general/waypoints) at important areas in the crystal hollows, e.g., Jungle Temple and Fairy Grotto. ", "skyblocker.config.mining.crystalsWaypoints.findInChat": "Find Waypoints In Chat", "skyblocker.config.mining.crystalsWaypoints.findInChat.@Tooltip": "When in crystal hollows read the chat to see if coordinates are sent and extract these to show as waypoint or on the map", + "skyblocker.config.mining.crystalsWaypoints.addedWaypoint": "Added waypoint for ", + "skyblocker.config.mining.crystalsWaypoints.addedWaypoint.at": "at", "skyblocker.config.mining.crystalsWaypoints.shareFail": "Can only share waypoints you have found.", + "skyblocker.config.mining.crystalsWaypoints.removeSuccess": "Removed waypoint for ", + "skyblocker.config.mining.crystalsWaypoints.removeFail": "Can only remove waypoints you have found.", "skyblocker.config.mining.dwarvenHud": "Dwarven HUD", "skyblocker.config.mining.dwarvenHud.enabledCommissions": "Enable Commissions", -- cgit From c22843b1d2b34afe240df12d6129c980a0f6680c Mon Sep 17 00:00:00 2001 From: olim Date: Thu, 20 Jun 2024 00:42:52 +0100 Subject: add options to config and translations add option for wishing compass to config and translations for text in it. add separate scale for crystal waypoints and commissions --- src/main/resources/assets/skyblocker/lang/en_us.json | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'src/main/resources') diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index 8bdc5965..964e0a44 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -471,6 +471,8 @@ "skyblocker.config.mining.crystalsWaypoints": "Crystal Hollows Waypoints", "skyblocker.config.mining.crystalsWaypoints.enabled": "Enabled Waypoints", "skyblocker.config.mining.crystalsWaypoints.enabled.@Tooltip": "Show a waypoint (waypoint selected in general/waypoints) at important areas in the crystal hollows, e.g., Jungle Temple and Fairy Grotto. ", + "skyblocker.config.mining.crystalsWaypoints.textScale": "Text Scale", + "skyblocker.config.mining.crystalsWaypoints.textScale.@Tooltip": "Scale the size of the commission labels.", "skyblocker.config.mining.crystalsWaypoints.findInChat": "Find Waypoints In Chat", "skyblocker.config.mining.crystalsWaypoints.findInChat.@Tooltip": "When in crystal hollows read the chat to see if coordinates are sent and extract these to show as waypoint or on the map", "skyblocker.config.mining.crystalsWaypoints.addedWaypoint": "Added waypoint for ", @@ -478,6 +480,17 @@ "skyblocker.config.mining.crystalsWaypoints.shareFail": "Can only share waypoints you have found.", "skyblocker.config.mining.crystalsWaypoints.removeSuccess": "Removed waypoint for ", "skyblocker.config.mining.crystalsWaypoints.removeFail": "Can only remove waypoints you have found.", + "skyblocker.config.mining.crystalsWaypoints.wishingCompassSolver": "Wishing Compass Solver", + "skyblocker.config.mining.crystalsWaypoints.wishingCompassSolver.@Tooltip": "Works out and adds a waypoint to where a wishing compass points to", + "skyblocker.config.mining.crystalsWaypoints.wishingCompassSolver.enableTabMessage": "Enable crystals in /tab so the compass can know what has been found", + "skyblocker.config.mining.crystalsWaypoints.wishingCompassSolver.wishingCompassUsedMessage": "Wishing compass used. Move to another location and use another compass to triangulate target", + "skyblocker.config.mining.crystalsWaypoints.wishingCompassSolver.somethingWentWrongMessage": "Something went wrong. lines do not cross. please try again", + "skyblocker.config.mining.crystalsWaypoints.wishingCompassSolver.foundMessage": "Wishing compass solver found ", + "skyblocker.config.mining.crystalsWaypoints.wishingCompassSolver.useOutsideNucleusMessage": "Use compass outside of nucleus for better results", + "skyblocker.config.mining.crystalsWaypoints.wishingCompassSolver.moveFurtherMessage": "Move further away from the first use before using again", + "skyblocker.config.mining.crystalsWaypoints.wishingCompassSolver.changingZoneMessage": "Changed zone. Restarting...", + "skyblocker.config.mining.crystalsWaypoints.wishingCompassSolver.waitLongerMessage": "Wait a little before using another wishing compass", + "": "Could not detect last use. Restarting...", "skyblocker.config.mining.dwarvenHud": "Dwarven HUD", "skyblocker.config.mining.dwarvenHud.enabledCommissions": "Enable Commissions", -- cgit From d03d158f8ca40572560f78285e646d4bb3b28d8e Mon Sep 17 00:00:00 2001 From: olim Date: Thu, 20 Jun 2024 15:18:55 +0100 Subject: make sure the location guess is sensible make sure its within 100 blocks of the players zone --- src/main/resources/assets/skyblocker/lang/en_us.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/resources') diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index 964e0a44..ce799fce 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -490,7 +490,7 @@ "skyblocker.config.mining.crystalsWaypoints.wishingCompassSolver.moveFurtherMessage": "Move further away from the first use before using again", "skyblocker.config.mining.crystalsWaypoints.wishingCompassSolver.changingZoneMessage": "Changed zone. Restarting...", "skyblocker.config.mining.crystalsWaypoints.wishingCompassSolver.waitLongerMessage": "Wait a little before using another wishing compass", - "": "Could not detect last use. Restarting...", + "skyblocker.config.mining.crystalsWaypoints.wishingCompassSolver.couldNotDetectLastUseMessage": "Could not detect last use. Restarting...", "skyblocker.config.mining.dwarvenHud": "Dwarven HUD", "skyblocker.config.mining.dwarvenHud.enabledCommissions": "Enable Commissions", -- cgit From 1bf1e29ff8d65c2930997fe9a7b81be611ddbf7f Mon Sep 17 00:00:00 2001 From: olim Date: Tue, 9 Jul 2024 15:44:37 +0100 Subject: adds location selection menu for share add and remove when the player just types add share and remove to commands without arguments bring up a menu in chat to select the location to use for that action --- src/main/resources/assets/skyblocker/lang/en_us.json | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/main/resources') diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index ce799fce..f323641a 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -477,6 +477,8 @@ "skyblocker.config.mining.crystalsWaypoints.findInChat.@Tooltip": "When in crystal hollows read the chat to see if coordinates are sent and extract these to show as waypoint or on the map", "skyblocker.config.mining.crystalsWaypoints.addedWaypoint": "Added waypoint for ", "skyblocker.config.mining.crystalsWaypoints.addedWaypoint.at": "at", + "skyblocker.config.mining.crystalsWaypoints.noActive": "You have no active waypoints to share or remove.", + "skyblocker.config.mining.crystalsWaypoints.allActive": "You have no more waypoints left to create.", "skyblocker.config.mining.crystalsWaypoints.shareFail": "Can only share waypoints you have found.", "skyblocker.config.mining.crystalsWaypoints.removeSuccess": "Removed waypoint for ", "skyblocker.config.mining.crystalsWaypoints.removeFail": "Can only remove waypoints you have found.", -- cgit From 4563b3e5f188a3b49db2e9219bee1474856cde98 Mon Sep 17 00:00:00 2001 From: olim Date: Mon, 15 Jul 2024 12:35:49 +0100 Subject: implement requested changes --- src/main/resources/assets/skyblocker/lang/en_us.json | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'src/main/resources') diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index f323641a..97add21b 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -479,20 +479,25 @@ "skyblocker.config.mining.crystalsWaypoints.addedWaypoint.at": "at", "skyblocker.config.mining.crystalsWaypoints.noActive": "You have no active waypoints to share or remove.", "skyblocker.config.mining.crystalsWaypoints.allActive": "You have no more waypoints left to create.", + "skyblocker.config.mining.crystalsWaypoints.MarkLocation.start": "Mark", + "skyblocker.config.mining.crystalsWaypoints.MarkLocation.end": "as: ", + "skyblocker.config.mining.crystalsWaypoints.getLocationHover.add": "Add Location", + "skyblocker.config.mining.crystalsWaypoints.getLocationHover.remove": "Remove Location", + "skyblocker.config.mining.crystalsWaypoints.getLocationHover.share": "Share Location", "skyblocker.config.mining.crystalsWaypoints.shareFail": "Can only share waypoints you have found.", "skyblocker.config.mining.crystalsWaypoints.removeSuccess": "Removed waypoint for ", "skyblocker.config.mining.crystalsWaypoints.removeFail": "Can only remove waypoints you have found.", "skyblocker.config.mining.crystalsWaypoints.wishingCompassSolver": "Wishing Compass Solver", - "skyblocker.config.mining.crystalsWaypoints.wishingCompassSolver.@Tooltip": "Works out and adds a waypoint to where a wishing compass points to", - "skyblocker.config.mining.crystalsWaypoints.wishingCompassSolver.enableTabMessage": "Enable crystals in /tab so the compass can know what has been found", - "skyblocker.config.mining.crystalsWaypoints.wishingCompassSolver.wishingCompassUsedMessage": "Wishing compass used. Move to another location and use another compass to triangulate target", - "skyblocker.config.mining.crystalsWaypoints.wishingCompassSolver.somethingWentWrongMessage": "Something went wrong. lines do not cross. please try again", + "skyblocker.config.mining.crystalsWaypoints.wishingCompassSolver.@Tooltip": "Calculates and adds a waypoint at the location indicated by wishing compasses.", + "skyblocker.config.mining.crystalsWaypoints.wishingCompassSolver.enableTabMessage": "Enable crystals in the /tab to allow the compass to identify discovered items", + "skyblocker.config.mining.crystalsWaypoints.wishingCompassSolver.wishingCompassUsedMessage": "Wishing compass used. Move to another location and use a second compass to triangulate the target", + "skyblocker.config.mining.crystalsWaypoints.wishingCompassSolver.somethingWentWrongMessage": "The lines did not intersect (Something went wrong) please try again.", "skyblocker.config.mining.crystalsWaypoints.wishingCompassSolver.foundMessage": "Wishing compass solver found ", "skyblocker.config.mining.crystalsWaypoints.wishingCompassSolver.useOutsideNucleusMessage": "Use compass outside of nucleus for better results", "skyblocker.config.mining.crystalsWaypoints.wishingCompassSolver.moveFurtherMessage": "Move further away from the first use before using again", "skyblocker.config.mining.crystalsWaypoints.wishingCompassSolver.changingZoneMessage": "Changed zone. Restarting...", - "skyblocker.config.mining.crystalsWaypoints.wishingCompassSolver.waitLongerMessage": "Wait a little before using another wishing compass", - "skyblocker.config.mining.crystalsWaypoints.wishingCompassSolver.couldNotDetectLastUseMessage": "Could not detect last use. Restarting...", + "skyblocker.config.mining.crystalsWaypoints.wishingCompassSolver.waitLongerMessage": "Wait a moment before using another wishing compass", + "skyblocker.config.mining.crystalsWaypoints.wishingCompassSolver.couldNotDetectLastUseMessage": "Unable to detect the last use. Restarting...", "skyblocker.config.mining.dwarvenHud": "Dwarven HUD", "skyblocker.config.mining.dwarvenHud.enabledCommissions": "Enable Commissions", -- cgit From d19a509eedcc87b249288cbc196f6d6422200fff Mon Sep 17 00:00:00 2001 From: Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com> Date: Mon, 22 Jul 2024 23:27:03 +0800 Subject: Apply code review --- src/main/resources/assets/skyblocker/lang/en_us.json | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/main/resources') diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index 97add21b..b7866dc2 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -475,12 +475,10 @@ "skyblocker.config.mining.crystalsWaypoints.textScale.@Tooltip": "Scale the size of the commission labels.", "skyblocker.config.mining.crystalsWaypoints.findInChat": "Find Waypoints In Chat", "skyblocker.config.mining.crystalsWaypoints.findInChat.@Tooltip": "When in crystal hollows read the chat to see if coordinates are sent and extract these to show as waypoint or on the map", - "skyblocker.config.mining.crystalsWaypoints.addedWaypoint": "Added waypoint for ", - "skyblocker.config.mining.crystalsWaypoints.addedWaypoint.at": "at", + "skyblocker.config.mining.crystalsWaypoints.addedWaypoint": "Added waypoint for '%s' at %d %d %d.", "skyblocker.config.mining.crystalsWaypoints.noActive": "You have no active waypoints to share or remove.", "skyblocker.config.mining.crystalsWaypoints.allActive": "You have no more waypoints left to create.", - "skyblocker.config.mining.crystalsWaypoints.MarkLocation.start": "Mark", - "skyblocker.config.mining.crystalsWaypoints.MarkLocation.end": "as: ", + "skyblocker.config.mining.crystalsWaypoints.markLocation": "Mark (%s) as: %s", "skyblocker.config.mining.crystalsWaypoints.getLocationHover.add": "Add Location", "skyblocker.config.mining.crystalsWaypoints.getLocationHover.remove": "Remove Location", "skyblocker.config.mining.crystalsWaypoints.getLocationHover.share": "Share Location", -- cgit From cd9f7062e7b66f6f8fee078cbef32aee8d07df94 Mon Sep 17 00:00:00 2001 From: olim Date: Wed, 24 Jul 2024 12:20:20 +0100 Subject: add error message when target location is to far away --- src/main/resources/assets/skyblocker/lang/en_us.json | 1 + 1 file changed, 1 insertion(+) (limited to 'src/main/resources') diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index b7866dc2..760a7221 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -490,6 +490,7 @@ "skyblocker.config.mining.crystalsWaypoints.wishingCompassSolver.enableTabMessage": "Enable crystals in the /tab to allow the compass to identify discovered items", "skyblocker.config.mining.crystalsWaypoints.wishingCompassSolver.wishingCompassUsedMessage": "Wishing compass used. Move to another location and use a second compass to triangulate the target", "skyblocker.config.mining.crystalsWaypoints.wishingCompassSolver.somethingWentWrongMessage": "The lines did not intersect (Something went wrong) please try again.", + "skyblocker.config.mining.crystalsWaypoints.wishingCompassSolver.targetLocationToFar": "The target location is too far away to identify the structure, possibly due to a missing structure in the lobby.", "skyblocker.config.mining.crystalsWaypoints.wishingCompassSolver.foundMessage": "Wishing compass solver found ", "skyblocker.config.mining.crystalsWaypoints.wishingCompassSolver.useOutsideNucleusMessage": "Use compass outside of nucleus for better results", "skyblocker.config.mining.crystalsWaypoints.wishingCompassSolver.moveFurtherMessage": "Move further away from the first use before using again", -- cgit