mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-18 18:23:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow disabling console / ingame formatting

Browse Source
This commit is contained in:
cyberpwn 2021-08-30 11:55:22 -04:00
parent c8c4a0f61b
commit 9cf13e320a
3 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/volmit/iris/core/IrisSettings.java
View File

@ -23,6 +23,7 @@ import com.volmit.iris.Iris;
import com.volmit.iris.util.io.IO; import com.volmit.iris.util.io.IO;
import com.volmit.iris.util.json.JSONException; import com.volmit.iris.util.json.JSONException;
import com.volmit.iris.util.json.JSONObject; import com.volmit.iris.util.json.JSONObject;
import com.volmit.iris.util.plugin.VolmitSender;
import lombok.Data; import lombok.Data;
import java.io.File; import java.io.File;
@ -103,12 +104,16 @@ public class IrisSettings {
public boolean pluginMetrics = true; public boolean pluginMetrics = true;
public boolean splashLogoStartup = true; public boolean splashLogoStartup = true;
public boolean autoStartDefaultStudio = false; public boolean autoStartDefaultStudio = false;
public boolean useConsoleCustomColors = false; public boolean useConsoleCustomColors = true;
public boolean useCustomColorsIngame = true; public boolean useCustomColorsIngame = true;
public String forceMainWorld = ""; public String forceMainWorld = "";
public int spinh = -20; public int spinh = -20;
public int spins = 7; public int spins = 7;
public int spinb = 8; public int spinb = 8;
public boolean canUseCustomColors(VolmitSender volmitSender) {
return (volmitSender.isPlayer() && useCustomColorsIngame) || (!volmitSender.isPlayer() && useConsoleCustomColors);
}
} }
@Data @Data

1
src/main/java/com/volmit/iris/util/io/ReactiveFolder.java
View File

@ -20,6 +20,7 @@ package com.volmit.iris.util.io;
import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KList;
import com.volmit.iris.util.function.Consumer3; import com.volmit.iris.util.function.Consumer3;
import com.volmit.iris.util.plugin.VolmitSender;
import java.io.File; import java.io.File;

18
src/main/java/com/volmit/iris/util/plugin/VolmitSender.java
View File

@ -251,6 +251,12 @@ public class VolmitSender implements CommandSender {
} }
private Component createNoPrefixComponent(String message) { 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 t = C.translateAlternateColorCodes('&', message);
String a = C.aura(t, IrisSettings.get().getGeneral().getSpinh(), IrisSettings.get().getGeneral().getSpins(), IrisSettings.get().getGeneral().getSpinb(), 0.36); String a = C.aura(t, IrisSettings.get().getGeneral().getSpinh(), IrisSettings.get().getGeneral().getSpins(), IrisSettings.get().getGeneral().getSpinb(), 0.36);
return MiniMessage.get().parse(a); return MiniMessage.get().parse(a);
@ -261,12 +267,24 @@ public class VolmitSender implements CommandSender {
} }
private Component createComponent(String message) { 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 t = C.translateAlternateColorCodes('&', getTag() + message);
String a = C.aura(t, IrisSettings.get().getGeneral().getSpinh(), IrisSettings.get().getGeneral().getSpins(), IrisSettings.get().getGeneral().getSpinb()); String a = C.aura(t, IrisSettings.get().getGeneral().getSpinh(), IrisSettings.get().getGeneral().getSpins(), IrisSettings.get().getGeneral().getSpinb());
return MiniMessage.get().parse(a); return MiniMessage.get().parse(a);
} }
private Component createComponentRaw(String message) { 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); String t = C.translateAlternateColorCodes('&', getTag() + message);
return MiniMessage.get().parse(t); return MiniMessage.get().parse(t);
} }