From 2fd4ca4e9042329a9af4e7cce76c72a3225d656d Mon Sep 17 00:00:00 2001 From: Aaron <51387595+AzureAaron@users.noreply.github.com> Date: Sat, 21 Oct 2023 05:20:11 -0400 Subject: Room Position Command --- 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 4dbe210e..b42ab1e3 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -272,6 +272,8 @@ "skyblocker.dungeons.secrets.markSecretMissing": "§rMarked secret #%d as missing.", "skyblocker.dungeons.secrets.markSecretFoundUnable": "§cUnable to mark secret #%d as found.", "skyblocker.dungeons.secrets.markSecretMissingUnable": "§cUnable to mark secret #%d as missing.", + "skyblocker.dungeons.secrets.posMessage": "§rRoom Pos: X: %d, Y: %d, Z: %d", + "skyblocker.dungeons.secrets.unableToFindPos": "§cUnable to find room position! (Are you in a dungeon room, are you facing a block?)", "skyblocker.fishing.reelNow": "Reel in now!", "skyblocker.rift.healNow": "Heal now!", -- cgit From 9cc09de788ce6f1003a92d1bdedabe8f0fd20c4e Mon Sep 17 00:00:00 2001 From: Aaron <51387595+AzureAaron@users.noreply.github.com> Date: Sun, 22 Oct 2023 04:01:26 -0400 Subject: Add AOTV & Pearl Secret Waypoints --- .../skyblocker/dungeons/secretlocations.json | 65 +++++++++++++++++++++- .../resources/assets/skyblocker/lang/en_us.json | 5 +- 2 files changed, 68 insertions(+), 2 deletions(-) (limited to 'src/main/resources') diff --git a/src/main/resources/assets/skyblocker/dungeons/secretlocations.json b/src/main/resources/assets/skyblocker/dungeons/secretlocations.json index d5e38345..5972659f 100644 --- a/src/main/resources/assets/skyblocker/dungeons/secretlocations.json +++ b/src/main/resources/assets/skyblocker/dungeons/secretlocations.json @@ -834,6 +834,13 @@ "y":75, "z":21 }, + { + "secretName":"2 - AOTV", + "category":"aotv", + "x":25, + "y":76, + "z":22 + }, { "secretName":"2 - Stonk", "category":"stonk", @@ -2947,7 +2954,7 @@ "category":"stonk", "x":17, "y":70, - "z":15 + "z":14 }, { "secretName":"6 - Pressure Plate 2", @@ -3058,6 +3065,13 @@ "y":70, "z":5 }, + { + "secretName":"2 - AOTV", + "category":"aotv", + "x":77, + "y":82, + "z":16 + }, { "secretName":"2 - Wither Essence", "category":"wither", @@ -3109,6 +3123,13 @@ "y":50, "z":9 }, + { + "secretName":"3 - AOTV", + "category":"aotv", + "x":7, + "y":80, + "z":15 + }, { "secretName":"3 - Superboom", "category":"superboom", @@ -3225,6 +3246,13 @@ "y":89, "z":24 }, + { + "secretName":"1/2 - AOTV", + "category":"aotv", + "x":84, + "y":91, + "z":26 + }, { "secretName":"1 - Bat", "category":"bat", @@ -4071,6 +4099,13 @@ "y":109, "z":30 }, + { + "secretName":"5 - AOTV", + "category":"aotv", + "x":52, + "y":78, + "z":9 + }, { "secretName":"5 - Crypt", "category":"superboom", @@ -5080,6 +5115,13 @@ "y":86, "z":61 }, + { + "secretName": "7 - AOTV", + "category":"aotv", + "x":39, + "y":84, + "z":58 + }, { "secretName":"7 - Chest", "category":"chest", @@ -5331,6 +5373,13 @@ "y":85, "z":43 }, + { + "secretName":"3/4 - AOTV", + "category":"aotv", + "x":49, + "y":83, + "z":36 + }, { "secretName":"3 - Chest", "category":"chest", @@ -5552,6 +5601,13 @@ "y":45, "z":15 }, + { + "secretName":"5 - Pearl", + "category":"pearl", + "x":8, + "y":59, + "z":14 + }, { "secretName":"5 - Entrance", "category":"entrance", @@ -5835,6 +5891,13 @@ } ], "Double-Stair-3":[ + { + "secretName":"1 - Pearl", + "category":"pearl", + "x":24, + "y":72, + "z":11 + }, { "secretName":"1 - Wither Essence", "category":"wither", diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index b42ab1e3..a6bf6b49 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -164,6 +164,9 @@ "text.autoconfig.skyblocker.option.locations.dungeons.secretWaypoints.enableLeverWaypoints" : "Enable Lever Waypoints", "text.autoconfig.skyblocker.option.locations.dungeons.secretWaypoints.enableFairySoulWaypoints" : "Enable Fairy Soul Waypoints", "text.autoconfig.skyblocker.option.locations.dungeons.secretWaypoints.enableStonkWaypoints" : "Enable Stonk Waypoints", + "text.autoconfig.skyblocker.option.locations.dungeons.secretWaypoints.enableAotvWaypoints" : "Enable AOTV Waypoints", + "text.autoconfig.skyblocker.option.locations.dungeons.secretWaypoints.enablePearlWaypoints": "Enable Pearl Waypoints", + "text.autoconfig.skyblocker.option.locations.dungeons.secretWaypoints.enablePearlWaypoints.@Tooltip": "With these waypoints, you throw a pearl towards the block and at the same time AOTV up.", "text.autoconfig.skyblocker.option.locations.dungeons.secretWaypoints.enableDefaultWaypoints" : "Enable Default Waypoints", "text.autoconfig.skyblocker.option.locations.dungeons.secretWaypoints.enableDefaultWaypoints.@Tooltip" : "This includes all waypoints that do not belong to a category.", "text.autoconfig.skyblocker.option.locations.dungeons.dungeonChestProfit": "Dungeon Chest Profit Calculator", @@ -272,7 +275,7 @@ "skyblocker.dungeons.secrets.markSecretMissing": "§rMarked secret #%d as missing.", "skyblocker.dungeons.secrets.markSecretFoundUnable": "§cUnable to mark secret #%d as found.", "skyblocker.dungeons.secrets.markSecretMissingUnable": "§cUnable to mark secret #%d as missing.", - "skyblocker.dungeons.secrets.posMessage": "§rRoom Pos: X: %d, Y: %d, Z: %d", + "skyblocker.dungeons.secrets.posMessage": "§rRoom: %s, X: %d, Y: %d, Z: %d", "skyblocker.dungeons.secrets.unableToFindPos": "§cUnable to find room position! (Are you in a dungeon room, are you facing a block?)", "skyblocker.fishing.reelNow": "Reel in now!", -- cgit From 4e3c09b51dff976a7680d887c487830e2445684b Mon Sep 17 00:00:00 2001 From: Aaron <51387595+AzureAaron@users.noreply.github.com> Date: Sun, 22 Oct 2023 22:34:38 -0400 Subject: Change order of redstone skull to be logical This way it doesn't disappear when you pick up an item --- .../skyblocker/dungeons/secretlocations.json | 28 +++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'src/main/resources') diff --git a/src/main/resources/assets/skyblocker/dungeons/secretlocations.json b/src/main/resources/assets/skyblocker/dungeons/secretlocations.json index 5972659f..4c3ca15b 100644 --- a/src/main/resources/assets/skyblocker/dungeons/secretlocations.json +++ b/src/main/resources/assets/skyblocker/dungeons/secretlocations.json @@ -1719,13 +1719,6 @@ } ], "Redstone-Key-3":[ - { - "secretName":"1 - Redstone Skull (right click)", - "category":"lever", - "x":10, - "y":70, - "z":26 - }, { "secretName":"1 - Superboom", "category":"superboom", @@ -1733,13 +1726,6 @@ "y":68, "z":7 }, - { - "secretName":"1 - Redstone Skull (right click)", - "category":"lever", - "x":19, - "y":66, - "z":7 - }, { "secretName":"1 - Lever behind Crypt", "category":"lever", @@ -1754,6 +1740,20 @@ "y":69, "z":6 }, + { + "secretName":"2 - Redstone Skull (right click)", + "category":"lever", + "x":10, + "y":70, + "z":26 + }, + { + "secretName":"2 - Redstone Skull (right click)", + "category":"lever", + "x":19, + "y":66, + "z":7 + }, { "secretName":"2 - Place Skull", "category":"lever", -- cgit From 12d3086e9506e6e120c492ea99dcc6e84738ce3b Mon Sep 17 00:00:00 2001 From: Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com> Date: Sun, 22 Oct 2023 22:02:05 -0400 Subject: Refactor DungeonSecrets --- src/main/resources/assets/skyblocker/lang/en_us.json | 3 ++- 1 file changed, 2 insertions(+), 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 a6bf6b49..b6edb5f8 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -276,7 +276,8 @@ "skyblocker.dungeons.secrets.markSecretFoundUnable": "§cUnable to mark secret #%d as found.", "skyblocker.dungeons.secrets.markSecretMissingUnable": "§cUnable to mark secret #%d as missing.", "skyblocker.dungeons.secrets.posMessage": "§rRoom: %s, X: %d, Y: %d, Z: %d", - "skyblocker.dungeons.secrets.unableToFindPos": "§cUnable to find room position! (Are you in a dungeon room, are you facing a block?)", + "skyblocker.dungeons.secrets.noTarget": "§cNo target block found! (Are you pointing at a block in range?)", + "skyblocker.dungeons.secrets.notMatched": "§cThe current room is not matched! (Are you in a dungeon room?)", "skyblocker.fishing.reelNow": "Reel in now!", "skyblocker.rift.healNow": "Heal now!", -- cgit From 308f27220be48de40c33627d1217698e993a1615 Mon Sep 17 00:00:00 2001 From: Aaron <51387595+AzureAaron@users.noreply.github.com> Date: Sun, 22 Oct 2023 22:48:01 -0400 Subject: Tweak Pressure Plates Stonk 6 Waypoint --- src/main/resources/assets/skyblocker/dungeons/secretlocations.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/resources') diff --git a/src/main/resources/assets/skyblocker/dungeons/secretlocations.json b/src/main/resources/assets/skyblocker/dungeons/secretlocations.json index 4c3ca15b..e31167ae 100644 --- a/src/main/resources/assets/skyblocker/dungeons/secretlocations.json +++ b/src/main/resources/assets/skyblocker/dungeons/secretlocations.json @@ -2952,7 +2952,7 @@ { "secretName":"6 - Stonk", "category":"stonk", - "x":17, + "x":18, "y":70, "z":14 }, -- cgit From d88b9f6e80028eef5b0c7dc5ee0ed2a9df6f3cad Mon Sep 17 00:00:00 2001 From: Aaron <51387595+AzureAaron@users.noreply.github.com> Date: Sun, 22 Oct 2023 22:51:31 -0400 Subject: Add AOTV and Pearl waypoint for Marker --- .../assets/skyblocker/dungeons/secretlocations.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'src/main/resources') diff --git a/src/main/resources/assets/skyblocker/dungeons/secretlocations.json b/src/main/resources/assets/skyblocker/dungeons/secretlocations.json index e31167ae..d8ff69c9 100644 --- a/src/main/resources/assets/skyblocker/dungeons/secretlocations.json +++ b/src/main/resources/assets/skyblocker/dungeons/secretlocations.json @@ -4880,6 +4880,13 @@ "y":81, "z":52 }, + { + "secretName":"2 - AOTV", + "category":"aotv", + "x":45, + "y":78, + "z":47 + }, { "secretName":"2 - Chest", "category":"chest", @@ -4915,6 +4922,13 @@ "y":85, "z":41 }, + { + "secretName":"5 - Pearl", + "category":"pearl", + "x":15, + "y":84, + "z":56 + }, { "secretName":"5 - Stonk", "category":"stonk", -- cgit From fbecc8104bc5f398f5e712cd035c4eb82324fb67 Mon Sep 17 00:00:00 2001 From: Aaron <51387595+AzureAaron@users.noreply.github.com> Date: Sun, 22 Oct 2023 22:53:33 -0400 Subject: Add Blue Skulls Pearl waypoint --- src/main/resources/assets/skyblocker/dungeons/secretlocations.json | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/main/resources') diff --git a/src/main/resources/assets/skyblocker/dungeons/secretlocations.json b/src/main/resources/assets/skyblocker/dungeons/secretlocations.json index d8ff69c9..df939537 100644 --- a/src/main/resources/assets/skyblocker/dungeons/secretlocations.json +++ b/src/main/resources/assets/skyblocker/dungeons/secretlocations.json @@ -262,6 +262,13 @@ "y":77, "z":21 }, + { + "secretName":"1 - Pearl", + "category":"pearl", + "x":25, + "y":75, + "z":27 + }, { "secretName":"1 - Item", "category":"item", -- cgit From aebb4196e7071f6ad6c53f40818e1395b631a654 Mon Sep 17 00:00:00 2001 From: Aaron <51387595+AzureAaron@users.noreply.github.com> Date: Sun, 22 Oct 2023 22:56:21 -0400 Subject: Add Atlas AOTV waypoint --- src/main/resources/assets/skyblocker/dungeons/secretlocations.json | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/main/resources') diff --git a/src/main/resources/assets/skyblocker/dungeons/secretlocations.json b/src/main/resources/assets/skyblocker/dungeons/secretlocations.json index df939537..a0a97c67 100644 --- a/src/main/resources/assets/skyblocker/dungeons/secretlocations.json +++ b/src/main/resources/assets/skyblocker/dungeons/secretlocations.json @@ -3834,6 +3834,13 @@ "y":81, "z":51 }, + { + "secretName":"5 - AOTV", + "category":"aotv", + "x":16, + "y":81, + "z":53 + }, { "secretName":"5 - Chest", "category":"chest", -- cgit