Merge pull request #616 from AzureAaron/comm-hud-wiki-lookup-fixes

Fix Commissions Hud & Wiki Lookup

4 files changed, 8 insertions, 8 deletions

diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
index cf7256dc..29678683 100644
--- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
@@ -622,7 +622,7 @@ public class SkyblockerConfig {
 		public boolean enableWikiLookup = true;
 
 		@SerialEntry
-		public boolean officialWiki = false;
+		public boolean officialWiki = true;
 	}
 
 	public static class ChestValue {
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/DwarvenHud.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/DwarvenHud.java
index 58abd980..b4ffd409 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/DwarvenHud.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/DwarvenHud.java
@@ -55,7 +55,7 @@ public class DwarvenHud {
                                 .executes(Scheduler.queueOpenScreenCommand(DwarvenHudConfigScreen::new))))));
 
         HudRenderCallback.EVENT.register((context, tickDelta) -> {
-            if ((!SkyblockerConfigManager.get().general.tabHud.enableHudBackground && !SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.enabledPowder)
+            if ((!SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.enabledCommissions && !SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.enabledPowder)
                     || client.options.playerListKey.isPressed()
                     || client.player == null
                     || (!Utils.isInDwarvenMines() && !Utils.isInCrystalHollows())) {
@@ -93,7 +93,7 @@ public class DwarvenHud {
             context.fill(comHudX, comHudY, comHudX + 200, comHudY + (20 * commissions.size()), 0x64000000);
             context.fill(powderHudX, powderHudY, powderHudX + 200, powderHudY + 40, 0x64000000);
         }
-        if (SkyblockerConfigManager.get().general.tabHud.enableHudBackground) {
+        if (SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.enabledCommissions) {
             int y = 0;
             for (Commission commission : commissions) {
                 float percentage;
@@ -125,7 +125,7 @@ public class DwarvenHud {
     }
 
     public static void renderSimple(HudCommsWidget hcw, HudPowderWidget hpw, DrawContext context, int comHudX, int comHudY, int powderHudX, int powderHudY, List<Commission> commissions) {
-        if (SkyblockerConfigManager.get().general.tabHud.enableHudBackground) {
+        if (SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.enabledCommissions) {
             hcw.updateData(commissions, false);
             hcw.update();
             hcw.setX(comHudX);
@@ -141,7 +141,7 @@ public class DwarvenHud {
     }
 
     public static void renderFancy(HudCommsWidget hcw, HudPowderWidget hpw, DrawContext context, int comHudX, int comHudY, int powderHudX, int powderHudY, List<Commission> commissions) {
-        if (SkyblockerConfigManager.get().general.tabHud.enableHudBackground) {
+        if (SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.enabledCommissions) {
             hcw.updateData(commissions, true);
             hcw.update();
             hcw.setX(comHudX);
@@ -159,7 +159,7 @@ public class DwarvenHud {
     }
 
     public static void update() {
-        if (client.player == null || client.getNetworkHandler() == null || (!SkyblockerConfigManager.get().general.tabHud.enableHudBackground && !SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.enabledPowder) 
+        if (client.player == null || client.getNetworkHandler() == null || (!SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.enabledCommissions && !SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.enabledPowder) 
                 || (!Utils.isInCrystalHollows() && !Utils.isInDwarvenMines()))
             return;
 
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/WikiLookup.java b/src/main/java/de/hysky/skyblocker/skyblock/item/WikiLookup.java
index 38121ea3..5815c11f 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/WikiLookup.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/WikiLookup.java
@@ -40,7 +40,7 @@ public class WikiLookup {
             getSkyblockId(slot);
             try {
                 String wikiLink = ItemRepository.getWikiLink(id, player);
-                CompletableFuture.runAsync(() -> Util.getOperatingSystem().open(wikiLink));
+                if (wikiLink != null) CompletableFuture.runAsync(() -> Util.getOperatingSystem().open(wikiLink));
             } catch (IndexOutOfBoundsException | IllegalStateException e) {
                 LOGGER.error("[Skyblocker] Error while retrieving wiki article...", e);
                 if (player != null) {
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/itemlist/ItemRepository.java b/src/main/java/de/hysky/skyblocker/skyblock/itemlist/ItemRepository.java
index bd2ac27a..3379b693 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/itemlist/ItemRepository.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/itemlist/ItemRepository.java
@@ -69,7 +69,7 @@ public class ItemRepository {
 
     public static String getWikiLink(String internalName, PlayerEntity player) {
         NEUItem item = NEURepoManager.NEU_REPO.getItems().getItemBySkyblockId(internalName);
-        if (item == null || item.getInfo().isEmpty()) {
+        if (item == null || item.getInfo() == null || item.getInfo().isEmpty()) {
             warnNoWikiLink(player);
             return null;
         }