aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/de/hysky/skyblocker/config
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/de/hysky/skyblocker/config')
-rw-r--r--src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java13
-rw-r--r--src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java14
-rw-r--r--src/main/java/de/hysky/skyblocker/config/categories/DwarvenMinesCategory.java15
-rw-r--r--src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java46
4 files changed, 25 insertions, 63 deletions
diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
index 3f39c933..001c7506 100644
--- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
@@ -1,11 +1,11 @@
package de.hysky.skyblocker.config;
+import de.hysky.skyblocker.skyblock.item.CustomArmorTrims;
+import de.hysky.skyblocker.utils.chat.ChatFilterResult;
import dev.isxander.yacl3.config.v2.api.SerialEntry;
import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
-import de.hysky.skyblocker.skyblock.item.CustomArmorTrims;
-import de.hysky.skyblocker.utils.chat.ChatFilterResult;
import net.minecraft.client.resource.language.I18n;
import net.minecraft.text.Text;
import net.minecraft.util.Formatting;
@@ -177,6 +177,9 @@ public class SkyblockerConfig {
public FairySouls fairySouls = new FairySouls();
@SerialEntry
+ public MythologicalRitual mythologicalRitual = new MythologicalRitual();
+
+ @SerialEntry
public ItemCooldown itemCooldown = new ItemCooldown();
@SerialEntry
@@ -322,6 +325,11 @@ public class SkyblockerConfig {
public boolean highlightOnlyNearbySouls = false;
}
+ public static class MythologicalRitual {
+ @SerialEntry
+ public boolean enableMythologicalRitualHelper = true;
+ }
+
public static class ItemCooldown {
@SerialEntry
public boolean enableItemCooldowns = true;
@@ -659,7 +667,6 @@ public class SkyblockerConfig {
@SerialEntry
public Formatting incompleteColor = Formatting.BLUE;
-
}
public static class LividColor {
diff --git a/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java
index 0101eccf..2cdde89d 100644
--- a/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java
+++ b/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java
@@ -241,20 +241,6 @@ public class DungeonsCategory {
newValue -> config.locations.dungeons.mapScaling = newValue)
.controller(FloatFieldControllerBuilder::create)
.build())
- .option(Option.<Integer>createBuilder()
- .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.mapX"))
- .binding(defaults.locations.dungeons.mapX,
- () -> config.locations.dungeons.mapX,
- newValue -> config.locations.dungeons.mapX = newValue)
- .controller(IntegerFieldControllerBuilder::create)
- .build())
- .option(Option.<Integer>createBuilder()
- .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.mapY"))
- .binding(defaults.locations.dungeons.mapY,
- () -> config.locations.dungeons.mapY,
- newValue -> config.locations.dungeons.mapY = newValue)
- .controller(IntegerFieldControllerBuilder::create)
- .build())
.option(Option.<Boolean>createBuilder()
.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.starredMobGlow"))
.description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.starredMobGlow.@Tooltip")))
diff --git a/src/main/java/de/hysky/skyblocker/config/categories/DwarvenMinesCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/DwarvenMinesCategory.java
index 35c91d64..719cbd79 100644
--- a/src/main/java/de/hysky/skyblocker/config/categories/DwarvenMinesCategory.java
+++ b/src/main/java/de/hysky/skyblocker/config/categories/DwarvenMinesCategory.java
@@ -7,7 +7,6 @@ import dev.isxander.yacl3.api.ConfigCategory;
import dev.isxander.yacl3.api.Option;
import dev.isxander.yacl3.api.OptionDescription;
import dev.isxander.yacl3.api.OptionGroup;
-import dev.isxander.yacl3.api.controller.IntegerFieldControllerBuilder;
import de.hysky.skyblocker.skyblock.dwarven.DwarvenHudConfigScreen;
import net.minecraft.client.MinecraftClient;
import net.minecraft.text.Text;
@@ -74,20 +73,6 @@ public class DwarvenMinesCategory {
newValue -> config.locations.dwarvenMines.dwarvenHud.enableBackground = newValue)
.controller(ConfigUtils::createBooleanController)
.build())
- .option(Option.<Integer>createBuilder()
- .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.x"))
- .binding(defaults.locations.dwarvenMines.dwarvenHud.x,
- () -> config.locations.dwarvenMines.dwarvenHud.x,
- newValue -> config.locations.dwarvenMines.dwarvenHud.x = newValue)
- .controller(IntegerFieldControllerBuilder::create)
- .build())
- .option(Option.<Integer>createBuilder()
- .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.y"))
- .binding(defaults.locations.dwarvenMines.dwarvenHud.y,
- () -> config.locations.dwarvenMines.dwarvenHud.y,
- newValue -> config.locations.dwarvenMines.dwarvenHud.y = newValue)
- .controller(IntegerFieldControllerBuilder::create)
- .build())
.build())
.build();
}
diff --git a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java
index 635d192f..10b21891 100644
--- a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java
+++ b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java
@@ -2,13 +2,12 @@ package de.hysky.skyblocker.config.categories;
import de.hysky.skyblocker.config.ConfigUtils;
import de.hysky.skyblocker.config.SkyblockerConfig;
+import de.hysky.skyblocker.skyblock.shortcut.ShortcutsConfigScreen;
+import de.hysky.skyblocker.utils.render.title.TitleContainerConfigScreen;
import dev.isxander.yacl3.api.*;
import dev.isxander.yacl3.api.controller.FloatFieldControllerBuilder;
import dev.isxander.yacl3.api.controller.FloatSliderControllerBuilder;
-import dev.isxander.yacl3.api.controller.IntegerFieldControllerBuilder;
import dev.isxander.yacl3.api.controller.IntegerSliderControllerBuilder;
-import de.hysky.skyblocker.skyblock.shortcut.ShortcutsConfigScreen;
-import de.hysky.skyblocker.utils.render.title.TitleContainerConfigScreen;
import net.minecraft.client.MinecraftClient;
import net.minecraft.text.Text;
@@ -201,6 +200,19 @@ public class GeneralCategory {
.build())
.build())
+ //Mythological Ritual
+ .group(OptionGroup.createBuilder()
+ .name(Text.translatable("text.autoconfig.skyblocker.option.general.mythologicalRitual"))
+ .collapsed(true)
+ .option(Option.<Boolean>createBuilder()
+ .name(Text.translatable("text.autoconfig.skyblocker.option.general.mythologicalRitual.enableMythologicalRitualHelper"))
+ .binding(defaults.general.mythologicalRitual.enableMythologicalRitualHelper,
+ () -> config.general.mythologicalRitual.enableMythologicalRitualHelper,
+ newValue -> config.general.mythologicalRitual.enableMythologicalRitualHelper = newValue)
+ .controller(ConfigUtils::createBooleanController)
+ .build())
+ .build())
+
//Item Cooldown
.group(OptionGroup.createBuilder()
.name(Text.translatable("text.autoconfig.skyblocker.option.general.itemCooldown"))
@@ -443,34 +455,6 @@ public class GeneralCategory {
newValue -> config.general.titleContainer.titleContainerScale = newValue)
.controller(opt -> FloatFieldControllerBuilder.create(opt).range(30f, 140f))
.build())
- .option(Option.<Integer>createBuilder()
- .name(Text.translatable("text.autoconfig.skyblocker.option.general.titleContainer.x"))
- .binding(defaults.general.titleContainer.x,
- () -> config.general.titleContainer.x,
- newValue -> config.general.titleContainer.x = newValue)
- .controller(IntegerFieldControllerBuilder::create)
- .build())
- .option(Option.<Integer>createBuilder()
- .name(Text.translatable("text.autoconfig.skyblocker.option.general.titleContainer.y"))
- .binding(defaults.general.titleContainer.y,
- () -> config.general.titleContainer.y,
- newValue -> config.general.titleContainer.y = newValue)
- .controller(IntegerFieldControllerBuilder::create)
- .build())
- .option(Option.<SkyblockerConfig.Direction>createBuilder()
- .name(Text.translatable("text.autoconfig.skyblocker.option.general.titleContainer.direction"))
- .binding(defaults.general.titleContainer.direction,
- () -> config.general.titleContainer.direction,
- newValue -> config.general.titleContainer.direction = newValue)
- .controller(ConfigUtils::createEnumCyclingListController)
- .build())
- .option(Option.<SkyblockerConfig.Alignment>createBuilder()
- .name(Text.translatable("text.autoconfig.skyblocker.option.general.titleContainer.alignment"))
- .binding(defaults.general.titleContainer.alignment,
- () -> config.general.titleContainer.alignment,
- newValue -> config.general.titleContainer.alignment = newValue)
- .controller(ConfigUtils::createEnumCyclingListController)
- .build())
.option(ButtonOption.createBuilder()
.name(Text.translatable("text.autoconfig.skyblocker.option.general.titleContainer.config"))
.text(Text.translatable("text.skyblocker.open"))