aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-10-16 11:13:44 +0200
committerhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-10-16 11:13:44 +0200
commit0b6d2a73b81c1f43ca03f6527d8ccc95fff50599 (patch)
tree0416f176c9135e56891454797ec281914700c146 /src/main/java
parentf36ef92c5df4a8257b17758a6170bfd6b2b6ffab (diff)
downloadskyhanni-0b6d2a73b81c1f43ca03f6527d8ccc95fff50599.tar.gz
skyhanni-0b6d2a73b81c1f43ca03f6527d8ccc95fff50599.tar.bz2
skyhanni-0b6d2a73b81c1f43ca03f6527d8ccc95fff50599.zip
moved chat config into chat category and changed to red color for incompatibility message in config description.
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/ChatConfig.java23
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/MiscConfig.java22
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/PlayerChatSymbols.kt2
3 files changed, 24 insertions, 23 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/ChatConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/ChatConfig.java
index a2f8f78ad..8168f98d0 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/ChatConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/ChatConfig.java
@@ -4,6 +4,7 @@ import at.hannibal2.skyhanni.config.FeatureToggle;
import com.google.gson.annotations.Expose;
import io.github.moulberry.moulconfig.annotations.Accordion;
import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.moulberry.moulconfig.annotations.ConfigEditorDropdown;
import io.github.moulberry.moulconfig.annotations.ConfigEditorKeybind;
import io.github.moulberry.moulconfig.annotations.ConfigOption;
import org.lwjgl.input.Keyboard;
@@ -116,6 +117,28 @@ public class ChatConfig {
}
@Expose
+ @ConfigOption(name = "Player Chat Symbols", desc = "")
+ @Accordion
+ public ChatSymbols chatSymbols = new ChatSymbols();
+
+ public static class ChatSymbols {
+
+ @Expose
+ @ConfigOption(name = "Enabled", desc = "Adds extra symbols to the chat such as those from ironman, " +
+ "stranded, bingo or nether factions and places them next to your regular player emblems. " +
+ "§cDoes not work with hide rank hider!")
+ @ConfigEditorBoolean
+ @FeatureToggle
+ public boolean enabled = true;
+
+ @Expose
+ @ConfigOption(name = "Chat Symbol Location", desc = "Determines where the symbols should go in chat in relation to the " +
+ "player's name. Hidden will hide all emblems from the chat. §eRequires above setting to be on to hide the symbols.")
+ @ConfigEditorDropdown(values = {"Left", "Right", "Hidden"})
+ public int symbolLocation = 0;
+ }
+
+ @Expose
@ConfigOption(name = "Dungeon Filter", desc = "Hide annoying messages in Dungeons.")
@ConfigEditorBoolean
@FeatureToggle
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/MiscConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/MiscConfig.java
index 9b515dbd9..ea9abf625 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/MiscConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/MiscConfig.java
@@ -661,28 +661,6 @@ public class MiscConfig {
}
@Expose
- @ConfigOption(name = "Player Chat Symbols", desc = "")
- @Accordion
- public ChatSymbols chatSymbols = new ChatSymbols();
-
- public static class ChatSymbols {
-
- @Expose
- @ConfigOption(name = "Enabled", desc = "Adds extra symbols to the chat such as those from ironman, " +
- "stranded, bingo or nether factions and places them next to your regular player emblems. §eDoes" +
- " not work with hide rank hider!")
- @ConfigEditorBoolean
- @FeatureToggle
- public boolean enabled = true;
-
- @Expose
- @ConfigOption(name = "Chat Symbol Location", desc = "Determines where the symbols should go in chat in relation to the " +
- "player's name. Hidden will hide all emblems from the chat. §eRequires above setting to be on to hide the symbols.")
- @ConfigEditorDropdown(values = {"Left", "Right", "Hidden"})
- public int symbolLocation = 0;
- }
-
- @Expose
@ConfigOption(name = "Exp Bottles", desc = "Hides all the experience orbs lying on the ground.")
@ConfigEditorBoolean
@FeatureToggle
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/PlayerChatSymbols.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/PlayerChatSymbols.kt
index 80ec276db..c3d45ccee 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/PlayerChatSymbols.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/PlayerChatSymbols.kt
@@ -16,7 +16,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
// code inspired by SBA but heavily modified to be more functional and actually work
class PlayerChatSymbols {
- private val config get() = SkyHanniMod.feature.misc.chatSymbols
+ private val config get() = SkyHanniMod.feature.chat.chatSymbols
private val nameSymbols = mutableMapOf<String, String>()
private val symbolsPattern = "^(?<symbols>(?:(?:§\\w)+\\S)+) ".toPattern()
private val symbolPattern = "((?:§\\w)+\\S)".toPattern()