aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAaron <51387595+AzureAaron@users.noreply.github.com>2025-06-10 23:42:21 -0400
committerAaron <51387595+AzureAaron@users.noreply.github.com>2025-06-10 23:42:21 -0400
commitc6d6f09f1f072070956ad00f1c828fe8e2450199 (patch)
tree80cf5617ac7b75f16dbb81eb482e1fc130cbcb78 /src
parent2684925f290ec3742764b3953cfcbc24cbdb90d4 (diff)
downloadSkyblocker-c6d6f09f1f072070956ad00f1c828fe8e2450199.tar.gz
Skyblocker-c6d6f09f1f072070956ad00f1c828fe8e2450199.tar.bz2
Skyblocker-c6d6f09f1f072070956ad00f1c828fe8e2450199.zip
Add dedicated Hunting config
Also cleanup foraging category
Diffstat (limited to 'src')
-rw-r--r--src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java3
-rw-r--r--src/main/java/de/hysky/skyblocker/config/SkyblockerConfigManager.java1
-rw-r--r--src/main/java/de/hysky/skyblocker/config/categories/ForagingCategory.java8
-rw-r--r--src/main/java/de/hysky/skyblocker/config/categories/HuntingCategory.java14
-rw-r--r--src/main/java/de/hysky/skyblocker/config/configs/ForagingConfig.java7
-rw-r--r--src/main/java/de/hysky/skyblocker/config/configs/HuntingConfig.java5
-rw-r--r--src/main/resources/assets/skyblocker/lang/en_us.json2
7 files changed, 25 insertions, 15 deletions
diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
index eed0eba9..342eea53 100644
--- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
@@ -32,6 +32,9 @@ public class SkyblockerConfig {
public FarmingConfig farming = new FarmingConfig();
@SerialEntry
+ public HuntingConfig hunting = new HuntingConfig();
+
+ @SerialEntry
public OtherLocationsConfig otherLocations = new OtherLocationsConfig();
@SerialEntry
diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfigManager.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfigManager.java
index 8e9b0c7f..33c92959 100644
--- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfigManager.java
+++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfigManager.java
@@ -92,6 +92,7 @@ public class SkyblockerConfigManager {
.category(CrimsonIsleCategory.create(defaults, config))
.category(MiningCategory.create(defaults, config))
.category(FarmingCategory.create(defaults, config))
+ .category(HuntingCategory.create(defaults, config))
.category(OtherLocationsCategory.create(defaults, config))
.category(SlayersCategory.create(defaults, config))
.category(ChatCategory.create(defaults, config))
diff --git a/src/main/java/de/hysky/skyblocker/config/categories/ForagingCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/ForagingCategory.java
index 1441256e..bd7b03f5 100644
--- a/src/main/java/de/hysky/skyblocker/config/categories/ForagingCategory.java
+++ b/src/main/java/de/hysky/skyblocker/config/categories/ForagingCategory.java
@@ -13,7 +13,6 @@ public class ForagingCategory {
public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig config) {
return ConfigCategory.createBuilder()
.name(Text.translatable("skyblocker.config.foraging"))
- //Modern Foraging island
//Galatea
.group(OptionGroup.createBuilder()
@@ -35,13 +34,6 @@ public class ForagingCategory {
.controller(ConfigUtils::createBooleanController)
.build())
.build())
-
- //Hunting - YACL doesn't like empty option groups
- /*.group(OptionGroup.createBuilder()
- .name(Text.translatable("skyblocker.config.foraging.hunting"))
-
- .build())*/
-
.build();
}
}
diff --git a/src/main/java/de/hysky/skyblocker/config/categories/HuntingCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/HuntingCategory.java
new file mode 100644
index 00000000..c62c9230
--- /dev/null
+++ b/src/main/java/de/hysky/skyblocker/config/categories/HuntingCategory.java
@@ -0,0 +1,14 @@
+package de.hysky.skyblocker.config.categories;
+
+import de.hysky.skyblocker.config.SkyblockerConfig;
+import dev.isxander.yacl3.api.ConfigCategory;
+import net.minecraft.text.Text;
+
+public class HuntingCategory {
+
+ public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig config) {
+ return ConfigCategory.createBuilder()
+ .name(Text.translatable("skyblocker.config.hunting"))
+ .build();
+ }
+}
diff --git a/src/main/java/de/hysky/skyblocker/config/configs/ForagingConfig.java b/src/main/java/de/hysky/skyblocker/config/configs/ForagingConfig.java
index 1f81b795..64cb62c8 100644
--- a/src/main/java/de/hysky/skyblocker/config/configs/ForagingConfig.java
+++ b/src/main/java/de/hysky/skyblocker/config/configs/ForagingConfig.java
@@ -7,9 +7,6 @@ public class ForagingConfig {
@SerialEntry
public Galatea galatea = new Galatea();
- @SerialEntry
- public Hunting hunting = new Hunting();
-
public static class Galatea {
@SerialEntry
public boolean enableForestNodeHelper = true;
@@ -17,8 +14,4 @@ public class ForagingConfig {
@SerialEntry
public boolean solveForestTemplePuzzle = true;
}
-
- public static class Hunting {
-
- }
}
diff --git a/src/main/java/de/hysky/skyblocker/config/configs/HuntingConfig.java b/src/main/java/de/hysky/skyblocker/config/configs/HuntingConfig.java
new file mode 100644
index 00000000..e0540677
--- /dev/null
+++ b/src/main/java/de/hysky/skyblocker/config/configs/HuntingConfig.java
@@ -0,0 +1,5 @@
+package de.hysky.skyblocker.config.configs;
+
+public class HuntingConfig {
+
+}
diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json
index ab1156ce..8a067076 100644
--- a/src/main/resources/assets/skyblocker/lang/en_us.json
+++ b/src/main/resources/assets/skyblocker/lang/en_us.json
@@ -480,6 +480,8 @@
"skyblocker.config.helpers.mythologicalRitual": "Mythological Ritual Helper",
"skyblocker.config.helpers.mythologicalRitual.enableMythologicalRitualHelper": "Enable Mythological Ritual Helper",
+ "skyblocker.config.hunting": "Hunting",
+
"skyblocker.config.chat": "Chat",
"skyblocker.config.chat.chatRules": "Custom Chat Rules",