aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip
diff options
context:
space:
mode:
authorYasin <a.piri@hotmail.de>2024-06-18 14:32:19 +0200
committerYasin <a.piri@hotmail.de>2024-06-18 22:05:02 +0200
commitddfc98870f671f57c2219417635ca4e25a8c1045 (patch)
tree3733a50b430cc0ecd1be414dd0eda89d1be65a2e /src/main/java/de/hysky/skyblocker/skyblock/item/tooltip
parentca8eaac117d84f42b9aee971d2939e911949dbbf (diff)
downloadSkyblocker-ddfc98870f671f57c2219417635ca4e25a8c1045.tar.gz
Skyblocker-ddfc98870f671f57c2219417635ca4e25a8c1045.tar.bz2
Skyblocker-ddfc98870f671f57c2219417635ca4e25a8c1045.zip
fix and adding stuff
slot text - change most of aggresive text color to more unobtrusive text color - added 4 more slot text (Your essence, essence shop, Stats Tuning, Power Stones Guide) Farming hud: - No Counter doesnt show an counter anymore commision waypoints: - still works if commision hud is turned off
Diffstat (limited to 'src/main/java/de/hysky/skyblocker/skyblock/item/tooltip')
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/TooltipInfoType.java11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/TooltipInfoType.java b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/TooltipInfoType.java
index 88f09496..d82b2682 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/TooltipInfoType.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/TooltipInfoType.java
@@ -1,6 +1,9 @@
package de.hysky.skyblocker.skyblock.item.tooltip;
+import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.stream.JsonReader;
import de.hysky.skyblocker.SkyblockerMod;
import de.hysky.skyblocker.config.SkyblockerConfig;
import de.hysky.skyblocker.config.SkyblockerConfigManager;
@@ -8,6 +11,7 @@ import de.hysky.skyblocker.config.configs.GeneralConfig;
import de.hysky.skyblocker.utils.Http;
import de.hysky.skyblocker.utils.Utils;
+import java.io.StringReader;
import java.net.http.HttpHeaders;
import java.util.List;
import java.util.concurrent.CompletableFuture;
@@ -160,7 +164,12 @@ public enum TooltipInfoType implements Runnable {
if (this.hash == hash) return;
else this.hash = hash;
}
- data = SkyblockerMod.GSON.fromJson(Http.sendGetRequest(address), JsonObject.class);
+ String response = Http.sendGetRequest(address);
+ if (response.trim().startsWith("<!DOCTYPE") || response.trim().startsWith("<html")) {
+ ItemTooltip.LOGGER.warn("[Skyblocker] Received HTML content for " + this.name() + ". Expected JSON.");
+ return;
+ }
+ data = SkyblockerMod.GSON.fromJson(response, JsonObject.class);
if (callback != null) callback.accept(data);
} catch (Exception e) {