From fb583f4d085e4b34609e24399a72701210bb682c Mon Sep 17 00:00:00 2001 From: olim Date: Tue, 30 Jan 2024 12:28:25 +0000 Subject: start of crystal hollows fetures basic implementation of a map and way-points features for the crystal hollows --- src/main/java/de/hysky/skyblocker/utils/Utils.java | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/main/java/de/hysky/skyblocker/utils') diff --git a/src/main/java/de/hysky/skyblocker/utils/Utils.java b/src/main/java/de/hysky/skyblocker/utils/Utils.java index 3f07622c..a8a0d3d6 100644 --- a/src/main/java/de/hysky/skyblocker/utils/Utils.java +++ b/src/main/java/de/hysky/skyblocker/utils/Utils.java @@ -25,6 +25,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.IOException; +import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.concurrent.CompletableFuture; @@ -36,6 +37,8 @@ public class Utils { private static final Logger LOGGER = LoggerFactory.getLogger(Utils.class); private static final String ALTERNATE_HYPIXEL_ADDRESS = System.getProperty("skyblocker.alternateHypixelAddress", ""); private static final String DUNGEONS_LOCATION = "dungeon"; + public static final String CRYSTALS_LOCATION = "crystal_hollows"; + private static final String PROFILE_PREFIX = "Profile: "; private static boolean isOnHypixel = false; private static boolean isOnSkyblock = false; @@ -85,6 +88,9 @@ public class Utils { public static boolean isInDungeons() { return getLocationRaw().equals(DUNGEONS_LOCATION) || FabricLoader.getInstance().isDevelopmentEnvironment(); } + public static boolean isInCrystals(){ + return getLocationRaw().equals(CRYSTALS_LOCATION) || FabricLoader.getInstance().isDevelopmentEnvironment(); + } public static boolean isInTheRift() { return getLocationRaw().equals(TheRift.LOCATION); -- cgit From 1ade575c76517a62f8666a57db7072d7b7b6634b Mon Sep 17 00:00:00 2001 From: Aaron <51387595+AzureAaron@users.noreply.github.com> Date: Thu, 1 Feb 2024 18:38:22 -0500 Subject: Refactor + Other changes - Fix Mines of Divan not showing - Code formatting - Small Optimizations/Changes --- src/main/java/de/hysky/skyblocker/utils/Utils.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/main/java/de/hysky/skyblocker/utils') diff --git a/src/main/java/de/hysky/skyblocker/utils/Utils.java b/src/main/java/de/hysky/skyblocker/utils/Utils.java index a8a0d3d6..066bc19b 100644 --- a/src/main/java/de/hysky/skyblocker/utils/Utils.java +++ b/src/main/java/de/hysky/skyblocker/utils/Utils.java @@ -25,7 +25,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.IOException; -import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.concurrent.CompletableFuture; @@ -37,7 +36,7 @@ public class Utils { private static final Logger LOGGER = LoggerFactory.getLogger(Utils.class); private static final String ALTERNATE_HYPIXEL_ADDRESS = System.getProperty("skyblocker.alternateHypixelAddress", ""); private static final String DUNGEONS_LOCATION = "dungeon"; - public static final String CRYSTALS_LOCATION = "crystal_hollows"; + private static final String CRYSTAL_HOLLOWS_LOCATION = "crystal_hollows"; private static final String PROFILE_PREFIX = "Profile: "; private static boolean isOnHypixel = false; @@ -88,8 +87,9 @@ public class Utils { public static boolean isInDungeons() { return getLocationRaw().equals(DUNGEONS_LOCATION) || FabricLoader.getInstance().isDevelopmentEnvironment(); } - public static boolean isInCrystals(){ - return getLocationRaw().equals(CRYSTALS_LOCATION) || FabricLoader.getInstance().isDevelopmentEnvironment(); + + public static boolean isInCrystalHollows() { + return getLocationRaw().equals(CRYSTAL_HOLLOWS_LOCATION) || FabricLoader.getInstance().isDevelopmentEnvironment(); } public static boolean isInTheRift() { -- cgit From 7b8bb6d5225895925712ebb76130718e7357b055 Mon Sep 17 00:00:00 2001 From: olim Date: Fri, 2 Feb 2024 13:15:16 +0000 Subject: fixed displaying everywere fixed bug introduced by Refactor (setting commission list to a new array only if updating its values in the update function). by adding check for is in Dwarven mines or crystal hollow on the render conditions. instead of if the list is empty or not --- src/main/java/de/hysky/skyblocker/utils/Utils.java | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/main/java/de/hysky/skyblocker/utils') diff --git a/src/main/java/de/hysky/skyblocker/utils/Utils.java b/src/main/java/de/hysky/skyblocker/utils/Utils.java index 066bc19b..b0c5bf45 100644 --- a/src/main/java/de/hysky/skyblocker/utils/Utils.java +++ b/src/main/java/de/hysky/skyblocker/utils/Utils.java @@ -37,6 +37,7 @@ public class Utils { private static final String ALTERNATE_HYPIXEL_ADDRESS = System.getProperty("skyblocker.alternateHypixelAddress", ""); private static final String DUNGEONS_LOCATION = "dungeon"; private static final String CRYSTAL_HOLLOWS_LOCATION = "crystal_hollows"; + private static final String DWARVEN_MINES_LOCATION = "mining_3"; private static final String PROFILE_PREFIX = "Profile: "; private static boolean isOnHypixel = false; @@ -92,6 +93,10 @@ public class Utils { return getLocationRaw().equals(CRYSTAL_HOLLOWS_LOCATION) || FabricLoader.getInstance().isDevelopmentEnvironment(); } + public static boolean isInDwarvenMines() { + return getLocationRaw().equals(DWARVEN_MINES_LOCATION) || FabricLoader.getInstance().isDevelopmentEnvironment(); + } + public static boolean isInTheRift() { return getLocationRaw().equals(TheRift.LOCATION); } -- cgit