From 4598f8d038c091e4158dc7b1dbbcb7cdd5f0d5a7 Mon Sep 17 00:00:00 2001 From: olim Date: Tue, 16 Apr 2024 21:32:01 +0100 Subject: main commit most of the feature is implemented with some optimisations and fixes for y offsets still needed --- src/main/resources/assets/skyblocker/lang/en_us.json | 9 +++++++++ 1 file changed, 9 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 bda6a909..e859db04 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -333,6 +333,15 @@ "text.autoconfig.skyblocker.option.locations.dwarvenMines.enableDrillFuel": "Enable Drill Fuel", "text.autoconfig.skyblocker.option.locations.dwarvenMines.solveFetchur": "Solve Fetchur", "text.autoconfig.skyblocker.option.locations.dwarvenMines.solvePuzzler": "Solve Puzzler Puzzle", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.solveMetalDetector": "Metal Detector Helper", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.solveMetalDetector.@Tooltip": "Helper for the metal detector puzzle in the Mines of Divan in the Crystal Hollows.", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.solveMetalDetector.startTip": "Stand still in multiple places unit solver has narrowed down locations to one", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.solveMetalDetector.foundCenter": "Found center of mines now working faster", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.solveMetalDetector.foundTreasureMessage": "Found treasure", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.solveMetalDetector.possibleTreasureLocationsMessage": "Possible treasure locations: ", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.solveMetalDetector.somethingWentWrongMessage": "Something went wrong with the metal detector. Trying again", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.solveMetalDetector.treasure": "Treasure", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.solveMetalDetector.possible": "Possible", "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud": "Dwarven HUD", "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enabledCommissions": "Enable Commissions", "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enabledPowder": "Enable Powder", -- cgit From 3e28335ed2909cdb1a0a5952b170a3dd25f160d2 Mon Sep 17 00:00:00 2001 From: olim Date: Wed, 17 Apr 2024 12:27:53 +0100 Subject: optimise and clean up code --- src/main/resources/assets/skyblocker/lang/en_us.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 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 e859db04..4300432d 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -333,15 +333,15 @@ "text.autoconfig.skyblocker.option.locations.dwarvenMines.enableDrillFuel": "Enable Drill Fuel", "text.autoconfig.skyblocker.option.locations.dwarvenMines.solveFetchur": "Solve Fetchur", "text.autoconfig.skyblocker.option.locations.dwarvenMines.solvePuzzler": "Solve Puzzler Puzzle", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.solveMetalDetector": "Metal Detector Helper", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.solveMetalDetector.@Tooltip": "Helper for the metal detector puzzle in the Mines of Divan in the Crystal Hollows.", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.solveMetalDetector.startTip": "Stand still in multiple places unit solver has narrowed down locations to one", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.solveMetalDetector.foundCenter": "Found center of mines now working faster", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.solveMetalDetector.foundTreasureMessage": "Found treasure", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.solveMetalDetector.possibleTreasureLocationsMessage": "Possible treasure locations: ", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.solveMetalDetector.somethingWentWrongMessage": "Something went wrong with the metal detector. Trying again", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.solveMetalDetector.treasure": "Treasure", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.solveMetalDetector.possible": "Possible", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.MetalDetectorHelper": "Metal Detector Helper", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.MetalDetectorHelper.@Tooltip": "Helper for the metal detector puzzle in the Mines of Divan in the Crystal Hollows.", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.MetalDetectorHelper.startTip": "Stand still in multiple places unit solver has narrowed down locations to one", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.MetalDetectorHelper.foundCenter": "Found center of mines now working faster", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.MetalDetectorHelper.foundTreasureMessage": "Found treasure", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.MetalDetectorHelper.possibleTreasureLocationsMessage": "Possible treasure locations: ", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.MetalDetectorHelper.somethingWentWrongMessage": "Something went wrong with the metal detector. Trying again", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.MetalDetectorHelper.treasure": "Treasure", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.MetalDetectorHelper.possible": "Possible", "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud": "Dwarven HUD", "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enabledCommissions": "Enable Commissions", "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enabledPowder": "Enable Powder", -- cgit From 31744be3393f3fcec57dccfbc4aa8a1942c08f15 Mon Sep 17 00:00:00 2001 From: olim Date: Wed, 17 Apr 2024 12:32:12 +0100 Subject: fix option description --- 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 4300432d..ee4a77b1 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -334,7 +334,7 @@ "text.autoconfig.skyblocker.option.locations.dwarvenMines.solveFetchur": "Solve Fetchur", "text.autoconfig.skyblocker.option.locations.dwarvenMines.solvePuzzler": "Solve Puzzler Puzzle", "text.autoconfig.skyblocker.option.locations.dwarvenMines.MetalDetectorHelper": "Metal Detector Helper", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.MetalDetectorHelper.@Tooltip": "Helper for the metal detector puzzle in the Mines of Divan in the Crystal Hollows.", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.MetalDetectorHelper.@Tooltip": "Helper for the metal detector puzzle in the Mines of Divan.", "text.autoconfig.skyblocker.option.locations.dwarvenMines.MetalDetectorHelper.startTip": "Stand still in multiple places unit solver has narrowed down locations to one", "text.autoconfig.skyblocker.option.locations.dwarvenMines.MetalDetectorHelper.foundCenter": "Found center of mines now working faster", "text.autoconfig.skyblocker.option.locations.dwarvenMines.MetalDetectorHelper.foundTreasureMessage": "Found treasure", -- cgit From a7103075422e9989ac204fa84bd1f92486b72077 Mon Sep 17 00:00:00 2001 From: Aaron <51387595+AzureAaron@users.noreply.github.com> Date: Thu, 18 Apr 2024 02:12:29 -0400 Subject: Refactor Metal Detector --- src/main/resources/assets/skyblocker/lang/en_us.json | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 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 5fa39b63..7b42ee39 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -341,15 +341,8 @@ "text.autoconfig.skyblocker.option.locations.dwarvenMines.enableDrillFuel": "Enable Drill Fuel", "text.autoconfig.skyblocker.option.locations.dwarvenMines.solveFetchur": "Solve Fetchur", "text.autoconfig.skyblocker.option.locations.dwarvenMines.solvePuzzler": "Solve Puzzler Puzzle", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.MetalDetectorHelper": "Metal Detector Helper", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.MetalDetectorHelper.@Tooltip": "Helper for the metal detector puzzle in the Mines of Divan.", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.MetalDetectorHelper.startTip": "Stand still in multiple places unit solver has narrowed down locations to one", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.MetalDetectorHelper.foundCenter": "Found center of mines now working faster", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.MetalDetectorHelper.foundTreasureMessage": "Found treasure", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.MetalDetectorHelper.possibleTreasureLocationsMessage": "Possible treasure locations: ", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.MetalDetectorHelper.somethingWentWrongMessage": "Something went wrong with the metal detector. Trying again", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.MetalDetectorHelper.treasure": "Treasure", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.MetalDetectorHelper.possible": "Possible", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.metalDetectorHelper": "Metal Detector Helper", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.metalDetectorHelper.@Tooltip": "Helper for the metal detector puzzle in the Mines of Divan.", "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud": "Dwarven HUD", "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enabledCommissions": "Enable Commissions", "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enabledPowder": "Enable Powder", @@ -524,6 +517,14 @@ "skyblocker.exotic.glitched": "GLITCHED", "skyblocker.exotic.exotic": "EXOTIC", + "skyblocker.dwarvenMines.metalDetectorHelper.startTip": "Stand still in multiple places unit solver has narrowed down locations to one", + "skyblocker.dwarvenMines.metalDetectorHelper.foundCenter": "Found center of mines now working faster", + "skyblocker.dwarvenMines.metalDetectorHelper.foundTreasureMessage": "Found treasure", + "skyblocker.dwarvenMines.metalDetectorHelper.possibleTreasureLocationsMessage": "Possible treasure locations: ", + "skyblocker.dwarvenMines.metalDetectorHelper.somethingWentWrongMessage": "Something went wrong with the metal detector. Trying again", + "skyblocker.dwarvenMines.metalDetectorHelper.treasure": "Treasure", + "skyblocker.dwarvenMines.metalDetectorHelper.possible": "Possible", + "skyblocker.end.hud.zealotsSinceLastEye": "Since last eye: %d", "skyblocker.end.hud.zealotsTotalKills": "Total kills: %d", "skyblocker.end.hud.avgKillsPerEye": "Avg kills per eye: %d", -- cgit From 8178c283fd884515afdab10e42eafc46f819dcd4 Mon Sep 17 00:00:00 2001 From: Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com> Date: Thu, 18 Apr 2024 19:21:23 -0400 Subject: Refactor MetalDetector --- src/main/resources/assets/skyblocker/lang/en_us.json | 4 ++-- 1 file changed, 2 insertions(+), 2 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 7b42ee39..42f0f505 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -517,8 +517,8 @@ "skyblocker.exotic.glitched": "GLITCHED", "skyblocker.exotic.exotic": "EXOTIC", - "skyblocker.dwarvenMines.metalDetectorHelper.startTip": "Stand still in multiple places unit solver has narrowed down locations to one", - "skyblocker.dwarvenMines.metalDetectorHelper.foundCenter": "Found center of mines now working faster", + "skyblocker.dwarvenMines.metalDetectorHelper.startTip": "Stand still in multiple places until the solver has narrowed down possible locations to one", + "skyblocker.dwarvenMines.metalDetectorHelper.foundCenter": "Found the center of mines, now working faster", "skyblocker.dwarvenMines.metalDetectorHelper.foundTreasureMessage": "Found treasure", "skyblocker.dwarvenMines.metalDetectorHelper.possibleTreasureLocationsMessage": "Possible treasure locations: ", "skyblocker.dwarvenMines.metalDetectorHelper.somethingWentWrongMessage": "Something went wrong with the metal detector. Trying again", -- cgit