aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorAaron <51387595+AzureAaron@users.noreply.github.com>2025-06-05 01:37:00 -0400
committerAaron <51387595+AzureAaron@users.noreply.github.com>2025-06-05 01:37:00 -0400
commit10349a70e3f579e3b921405364de2bcd365e3acb (patch)
tree413076bff982216ad08c3adbbfabe97ecc50b1d6 /src/main
parent04168807f89be80f8ca212f240047c709886659b (diff)
downloadSkyblocker-10349a70e3f579e3b921405364de2bcd365e3acb.tar.gz
Skyblocker-10349a70e3f579e3b921405364de2bcd365e3acb.tar.bz2
Skyblocker-10349a70e3f579e3b921405364de2bcd365e3acb.zip
Internal Staging Part 2
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/de/hysky/skyblocker/config/SkyblockerConfigManager.java2
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRuleLocationConfigScreen.java2
-rw-r--r--src/main/java/de/hysky/skyblocker/utils/Location.java4
-rw-r--r--src/main/java/de/hysky/skyblocker/utils/Utils.java4
4 files changed, 5 insertions, 7 deletions
diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfigManager.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfigManager.java
index 566a426d..8e9b0c7f 100644
--- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfigManager.java
+++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfigManager.java
@@ -88,7 +88,7 @@ public class SkyblockerConfigManager {
.category(UIAndVisualsCategory.create(defaults, config))
.category(HelperCategory.create(defaults, config))
.category(DungeonsCategory.create(defaults, config))
- //.category(ForagingCategory.create(defaults, config))
+ .category(ForagingCategory.create(defaults, config))
.category(CrimsonIsleCategory.create(defaults, config))
.category(MiningCategory.create(defaults, config))
.category(FarmingCategory.create(defaults, config))
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRuleLocationConfigScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRuleLocationConfigScreen.java
index 399c5d0b..b9908dd3 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRuleLocationConfigScreen.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRuleLocationConfigScreen.java
@@ -34,7 +34,7 @@ public class ChatRuleLocationConfigScreen extends Screen {
context.drawCenteredTextWithShadow(client.textRenderer, Text.translatable("skyblocker.config.chat.chatRules.screen.ruleScreen.locationsConfigScreen.note"), width / 2, (38 - client.textRenderer.fontHeight), 0xFFFFFF);
});
- ItemTickList<Location> itemTickList = addDrawableChild(new ItemTickList<>(client, width, height - 107, 43, 24, enabledLocations, EnumSet.complementOf(EnumSet.of(Location.UNKNOWN, Location.MODERN_FORAGING_ISLAND)), true).init());
+ ItemTickList<Location> itemTickList = addDrawableChild(new ItemTickList<>(client, width, height - 107, 43, 24, enabledLocations, EnumSet.complementOf(EnumSet.of(Location.UNKNOWN)), true).init());
//Grid code gratuitously stolen from WaypointsScreen. Same goes for the y and heights above.
GridWidget gridWidget = new GridWidget();
gridWidget.getMainPositioner().marginX(5).marginY(2);
diff --git a/src/main/java/de/hysky/skyblocker/utils/Location.java b/src/main/java/de/hysky/skyblocker/utils/Location.java
index c3c58c5e..514267c5 100644
--- a/src/main/java/de/hysky/skyblocker/utils/Location.java
+++ b/src/main/java/de/hysky/skyblocker/utils/Location.java
@@ -1,7 +1,6 @@
package de.hysky.skyblocker.utils;
import com.mojang.serialization.Codec;
-import de.hysky.skyblocker.skyblock.chat.ChatRuleLocationConfigScreen;
import net.minecraft.util.StringIdentifiable;
import org.apache.commons.text.WordUtils;
import org.jetbrains.annotations.NotNull;
@@ -39,9 +38,8 @@ public enum Location implements StringIdentifiable {
GLACITE_MINESHAFT("mineshaft"),
/**
* <p>Goodbye 1.8 hello 1.21 (and foraging 50 for all)!</p>
- * <p>If this is ever implemented, please remove it from the list of locations in {@link ChatRuleLocationConfigScreen} along with this line of javadoc.</p>
*/
- MODERN_FORAGING_ISLAND("placeholder"),
+ GALATEA("foraging_2"),
/**
* Unknown Skyblock location
*/
diff --git a/src/main/java/de/hysky/skyblocker/utils/Utils.java b/src/main/java/de/hysky/skyblocker/utils/Utils.java
index 10784db5..5f9d6955 100644
--- a/src/main/java/de/hysky/skyblocker/utils/Utils.java
+++ b/src/main/java/de/hysky/skyblocker/utils/Utils.java
@@ -157,8 +157,8 @@ public class Utils {
return location == Location.CRIMSON_ISLE;
}
- public static boolean isInModernForagingIsland() {
- return location == Location.MODERN_FORAGING_ISLAND;
+ public static boolean isInGalatea() {
+ return location == Location.GALATEA;
}
public static boolean isOnBingo() {