diff --git a/src/main/java/com/volmit/iris/core/IrisSettings.java b/src/main/java/com/volmit/iris/core/IrisSettings.java index b76c8d995..b885450a3 100644 --- a/src/main/java/com/volmit/iris/core/IrisSettings.java +++ b/src/main/java/com/volmit/iris/core/IrisSettings.java @@ -23,6 +23,7 @@ import com.volmit.iris.Iris; import com.volmit.iris.util.io.IO; import com.volmit.iris.util.json.JSONException; import com.volmit.iris.util.json.JSONObject; +import com.volmit.iris.util.plugin.VolmitSender; import lombok.Data; import java.io.File; @@ -103,12 +104,16 @@ public class IrisSettings { public boolean pluginMetrics = true; public boolean splashLogoStartup = true; public boolean autoStartDefaultStudio = false; - public boolean useConsoleCustomColors = false; + public boolean useConsoleCustomColors = true; public boolean useCustomColorsIngame = true; public String forceMainWorld = ""; public int spinh = -20; public int spins = 7; public int spinb = 8; + + public boolean canUseCustomColors(VolmitSender volmitSender) { + return (volmitSender.isPlayer() && useCustomColorsIngame) || (!volmitSender.isPlayer() && useConsoleCustomColors); + } } @Data diff --git a/src/main/java/com/volmit/iris/util/io/ReactiveFolder.java b/src/main/java/com/volmit/iris/util/io/ReactiveFolder.java index 6c3e14f1e..c26d5ab67 100644 --- a/src/main/java/com/volmit/iris/util/io/ReactiveFolder.java +++ b/src/main/java/com/volmit/iris/util/io/ReactiveFolder.java @@ -20,6 +20,7 @@ package com.volmit.iris.util.io; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.function.Consumer3; +import com.volmit.iris.util.plugin.VolmitSender; import java.io.File; diff --git a/src/main/java/com/volmit/iris/util/plugin/VolmitSender.java b/src/main/java/com/volmit/iris/util/plugin/VolmitSender.java index 121a47bd3..39ad7cd4b 100644 --- a/src/main/java/com/volmit/iris/util/plugin/VolmitSender.java +++ b/src/main/java/com/volmit/iris/util/plugin/VolmitSender.java @@ -251,6 +251,12 @@ public class VolmitSender implements CommandSender { } private Component createNoPrefixComponent(String message) { + if(!IrisSettings.get().getGeneral().canUseCustomColors(this)) + { + String t = C.translateAlternateColorCodes('&', MiniMessage.get().stripTokens(message)); + return MiniMessage.get().parse(t); + } + String t = C.translateAlternateColorCodes('&', message); String a = C.aura(t, IrisSettings.get().getGeneral().getSpinh(), IrisSettings.get().getGeneral().getSpins(), IrisSettings.get().getGeneral().getSpinb(), 0.36); return MiniMessage.get().parse(a); @@ -261,12 +267,24 @@ public class VolmitSender implements CommandSender { } private Component createComponent(String message) { + if(!IrisSettings.get().getGeneral().canUseCustomColors(this)) + { + String t = C.translateAlternateColorCodes('&', MiniMessage.get().stripTokens(getTag() + message)); + return MiniMessage.get().parse(t); + } + String t = C.translateAlternateColorCodes('&', getTag() + message); String a = C.aura(t, IrisSettings.get().getGeneral().getSpinh(), IrisSettings.get().getGeneral().getSpins(), IrisSettings.get().getGeneral().getSpinb()); return MiniMessage.get().parse(a); } private Component createComponentRaw(String message) { + if(!IrisSettings.get().getGeneral().canUseCustomColors(this)) + { + String t = C.translateAlternateColorCodes('&', MiniMessage.get().stripTokens(getTag() + message)); + return MiniMessage.get().parse(t); + } + String t = C.translateAlternateColorCodes('&', getTag() + message); return MiniMessage.get().parse(t); }