aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorolim <bobq4582@gmail.com>2024-02-08 17:42:28 +0000
committerolim <bobq4582@gmail.com>2024-02-08 17:42:28 +0000
commit65f0b628a6db1c5c6f15622b6a7948c6e19b540f (patch)
treea651a2bdb740013e559ccf4f147ed302ca56e6a4
parent7dd0678eab47ba81420b2110b03821fe5d37d3f8 (diff)
downloadSkyblocker-65f0b628a6db1c5c6f15622b6a7948c6e19b540f.tar.gz
Skyblocker-65f0b628a6db1c5c6f15622b6a7948c6e19b540f.tar.bz2
Skyblocker-65f0b628a6db1c5c6f15622b6a7948c6e19b540f.zip
small fixes and comments
fix small bugs and add more comments
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/searchOverlay/OverlayScreen.java10
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/searchOverlay/SearchOverManager.java11
2 files changed, 18 insertions, 3 deletions
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/searchOverlay/OverlayScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/searchOverlay/OverlayScreen.java
index b626ed7a..9155a894 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/searchOverlay/OverlayScreen.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/searchOverlay/OverlayScreen.java
@@ -178,9 +178,15 @@ public class OverlayScreen extends Screen {
//update the tool tip
String id = SearchOverManager.getSuggestionId(i);
- if (id.isEmpty() || client == null) continue;
+ if (id.isEmpty() || client == null) {
+ suggestionButtons[i].setTooltip(null);
+ continue;
+ }
ItemStack item = getItemStack(id);
- if (item == null) continue;
+ if (item == null) {
+ suggestionButtons[i].setTooltip(null);
+ continue;
+ }
MutableText tooltip = Text.literal("");
item.getTooltip(client.player, TooltipContext.BASIC).forEach(line -> {
tooltip.append(line);
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/searchOverlay/SearchOverManager.java b/src/main/java/de/hysky/skyblocker/skyblock/searchOverlay/SearchOverManager.java
index d57e3174..3b48afa0 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/searchOverlay/SearchOverManager.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/searchOverlay/SearchOverManager.java
@@ -9,6 +9,7 @@ import com.mojang.brigadier.CommandDispatcher;
import com.mojang.brigadier.context.CommandContext;
import de.hysky.skyblocker.SkyblockerMod;
import de.hysky.skyblocker.config.SkyblockerConfigManager;
+import de.hysky.skyblocker.skyblock.dwarven.CrystalsHud;
import de.hysky.skyblocker.utils.Http;
import de.hysky.skyblocker.utils.NEURepoManager;
import de.hysky.skyblocker.utils.scheduler.MessageScheduler;
@@ -309,7 +310,7 @@ public class SearchOverManager {
}
/**
- *Saves the current search value and then splits it onto the first to lines of the sign making sure not to split a word in 2
+ *Saves the current value of ({@link SearchOverManager#search}) then pushes it to a command or sign depending on how the gui was opened
*/
protected static void pushSearch() {
//save to history
@@ -325,7 +326,12 @@ public class SearchOverManager {
}
+ /**
+ * runs the command to search for the value in ({@link SearchOverManager#search})
+ */
private static void pushCommand() {
+ if (search.isEmpty()) return;
+
String command;
if (IsAuction){
command = "/ahSearch " + search;
@@ -335,6 +341,9 @@ public class SearchOverManager {
MessageScheduler.INSTANCE.queueMessage(command, 0);
}
+ /**
+ * pushes the ({@link SearchOverManager#search}) to the sign. It needs to split it over two lines without splitting a word
+ */
private static void pushSign() {
//splits text into 2 lines max = 30 chars
StringBuilder line0 = new StringBuilder();