aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorRime <81419447+Emirlol@users.noreply.github.com>2024-01-20 18:31:06 +0300
committerRime <81419447+Emirlol@users.noreply.github.com>2024-01-21 09:37:49 +0300
commitac6ac5096bf60c39ddf52bad41a6123afa51b097 (patch)
treeebb46778a75a8334a30bb1289344121158da6d76 /src/main/java
parentb1bfa5e0009b2a969c913e701a56b812517a0700 (diff)
downloadSkyblocker-ac6ac5096bf60c39ddf52bad41a6123afa51b097.tar.gz
Skyblocker-ac6ac5096bf60c39ddf52bad41a6123afa51b097.tar.bz2
Skyblocker-ac6ac5096bf60c39ddf52bad41a6123afa51b097.zip
Singularize MimicMessages
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java6
-rw-r--r--src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java22
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonScore.java4
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/filters/MimicFilter.java2
4 files changed, 17 insertions, 17 deletions
diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
index 4e7f9802..9477fbed 100644
--- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
@@ -606,7 +606,7 @@ public class SkyblockerConfig {
public DungeonChestProfit dungeonChestProfit = new DungeonChestProfit();
@SerialEntry
- public MimicMessages mimicMessages = new MimicMessages();
+ public MimicMessage mimicMessage = new MimicMessage();
@SerialEntry
public boolean croesusHelper = true;
@@ -800,9 +800,9 @@ public class SkyblockerConfig {
public Formatting incompleteColor = Formatting.BLUE;
}
- public static class MimicMessages {
+ public static class MimicMessage {
@SerialEntry
- public boolean sendMimicMessages = true;
+ public boolean sendMimicMessage = true;
@SerialEntry
public String mimicMessage = "Mimic dead!";
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 1d8a7e8c..c39eb05c 100644
--- a/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java
+++ b/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java
@@ -434,22 +434,22 @@ public class DungeonsCategory {
.build())
//Mimic Messages
.group(OptionGroup.createBuilder()
- .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.mimicMessages"))
+ .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.mimicMessage"))
.collapsed(true)
.option(Option.<Boolean>createBuilder()
- .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.mimicMessages.sendMimicMessages"))
- .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.mimicMessages.sendMimicMessages.@Tooltip")))
- .binding(defaults.locations.dungeons.mimicMessages.sendMimicMessages,
- () -> config.locations.dungeons.mimicMessages.sendMimicMessages,
- newValue -> config.locations.dungeons.mimicMessages.sendMimicMessages = newValue)
+ .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.mimicMessage.sendMimicMessage"))
+ .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.mimicMessage.sendMimicMessage.@Tooltip")))
+ .binding(defaults.locations.dungeons.mimicMessage.sendMimicMessage,
+ () -> config.locations.dungeons.mimicMessage.sendMimicMessage,
+ newValue -> config.locations.dungeons.mimicMessage.sendMimicMessage = newValue)
.controller(ConfigUtils::createBooleanController)
.build())
.option(Option.<String>createBuilder()
- .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.mimicMessages.mimicMessage"))
- .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.mimicMessages.mimicMessage.@Tooltip")))
- .binding(defaults.locations.dungeons.mimicMessages.mimicMessage,
- () -> config.locations.dungeons.mimicMessages.mimicMessage,
- newValue -> config.locations.dungeons.mimicMessages.mimicMessage = newValue)
+ .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.mimicMessage.mimicMessage"))
+ .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.mimicMessage.mimicMessage.@Tooltip")))
+ .binding(defaults.locations.dungeons.mimicMessage.mimicMessage,
+ () -> config.locations.dungeons.mimicMessage.mimicMessage,
+ newValue -> config.locations.dungeons.mimicMessage.mimicMessage = newValue)
.controller(StringControllerBuilder::create)
.build())
.build())
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonScore.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonScore.java
index a59d5615..cb834e7f 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonScore.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonScore.java
@@ -35,7 +35,7 @@ import java.util.stream.StreamSupport;
public class DungeonScore {
private static final SkyblockerConfig.DungeonScore SCORE_CONFIG = SkyblockerConfigManager.get().locations.dungeons.dungeonScore;
- private static final SkyblockerConfig.MimicMessages MIMIC_MESSAGES_CONFIG = SkyblockerConfigManager.get().locations.dungeons.mimicMessages;
+ private static final SkyblockerConfig.MimicMessage MIMIC_MESSAGE_CONFIG = SkyblockerConfigManager.get().locations.dungeons.mimicMessage;
private static final Logger LOGGER = LoggerFactory.getLogger("Skyblocker Dungeon Score");
//Scoreboard patterns
private static final Pattern CLEARED_PATTERN = Pattern.compile("Cleared: (?<cleared>\\d+)%.*");
@@ -206,7 +206,7 @@ public class DungeonScore {
public static void handleEntityDeath(Entity entity) {
if (mimicKilled) return;
if (!isEntityMimic(entity)) return;
- if (MIMIC_MESSAGES_CONFIG.sendMimicMessages) MessageScheduler.INSTANCE.sendMessageAfterCooldown(MIMIC_MESSAGES_CONFIG.mimicMessage);
+ if (MIMIC_MESSAGE_CONFIG.sendMimicMessage) MessageScheduler.INSTANCE.sendMessageAfterCooldown(MIMIC_MESSAGE_CONFIG.mimicMessage);
mimicKilled = true;
}
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/filters/MimicFilter.java b/src/main/java/de/hysky/skyblocker/skyblock/filters/MimicFilter.java
index 31f83187..367e393c 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/filters/MimicFilter.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/filters/MimicFilter.java
@@ -11,7 +11,7 @@ import java.util.regex.Matcher;
public class MimicFilter extends ChatPatternListener {
public MimicFilter() {
- super(".*?(?:Mimic dead!?|Mimic Killed!|\\$SKYTILS-DUNGEON-SCORE-MIMIC\\$|\\Q" + SkyblockerConfigManager.get().locations.dungeons.mimicMessages.mimicMessage + "\\E)$");
+ super(".*?(?:Mimic dead!?|Mimic Killed!|\\$SKYTILS-DUNGEON-SCORE-MIMIC\\$|\\Q" + SkyblockerConfigManager.get().locations.dungeons.mimicMessage.mimicMessage + "\\E)$");
}
@Override