Refactor TooltipInfoType#run

SkyblockerMod · Oct 29, 2023 · 83a5c0f · 83a5c0f
1 parent 13e7b46
commit 83a5c0f
Showing 1 changed file with 5 additions and 14 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
@@ -82,10 +82,6 @@ public JsonObject getData() {
         return data;
     }
 
-    public void setData(JsonObject data) {
-        this.data = data;
-    }
-
     /**
      * Checks if the data has the given member name and sends a warning message if data is null.
      *
@@ -135,18 +131,13 @@ public void download(List<CompletableFuture<Void>> futureList) {
     @Override
     public void run() {
         try {
-            if (this.cacheable) {
+            if (cacheable) {
                 HttpHeaders headers = Http.sendHeadRequest(address);
-                long combinedHash = Http.getEtag(headers).hashCode() + Http.getLastModified(headers).hashCode();
-
-                switch (this) {
-                    case NPC, MOTES, MUSEUM, COLOR:
-                        if (this.hash == combinedHash) return;
-                        else this.hash = combinedHash;
-                }
+                long hash = Http.getEtag(headers).hashCode() + Http.getLastModified(headers).hashCode();
+                if (this.hash == hash) return;
+                else this.hash = hash;
             }
-
-            setData(SkyblockerMod.GSON.fromJson(Http.sendGetRequest(address), JsonObject.class));
+            data = SkyblockerMod.GSON.fromJson(Http.sendGetRequest(address), JsonObject.class);
         } catch (Exception e) {
             ItemTooltip.LOGGER.warn("[Skyblocker] Failed to download " + this + " prices!", e);
         }