Redstoner/Modules
Archived
0
Fork 0
Code Activity

Added stripcolor "partial" which will translate colors into &-codes

Browse Source
This commit is contained in:
Pepich
2017-05-13 23:31:40 +02:00
parent 7164a26839
commit 33d1e25632
2 changed files with 43 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/redstoner/modules/socialspy/Socialspy.cmd
View File

@@ -37,6 +37,9 @@ command socialspy {
stripcolor off { stripcolor off {
run stripcolor_off; run stripcolor_off;
} }
stripcolor partial {
run stripcolor_partial;
}
stripcolor { stripcolor {
run stripcolor; run stripcolor;
} }

46
src/com/redstoner/modules/socialspy/Socialspy.java
View File

@@ -21,7 +21,7 @@ import com.redstoner.modules.CoreModule;
import com.redstoner.modules.Module; import com.redstoner.modules.Module;
import com.redstoner.modules.datamanager.DataManager; import com.redstoner.modules.datamanager.DataManager;
@Version(major = 3, minor = 1, revision = 7, compatible = 3) @Version(major = 3, minor = 1, revision = 8, compatible = 3)
public class Socialspy implements CoreModule public class Socialspy implements CoreModule
{ {
@Override @Override
@@ -62,7 +62,7 @@ public class Socialspy implements CoreModule
public boolean stripcolorOn(CommandSender sender) public boolean stripcolorOn(CommandSender sender)
{ {
Utils.sendMessage(sender, null, "Enabled stripping colors!"); Utils.sendMessage(sender, null, "Enabled stripping colors!");
DataManager.setData(sender, "stripcolor", true); DataManager.setData(sender, "stripcolor", "on");
return true; return true;
} }
@@ -70,14 +70,22 @@ public class Socialspy implements CoreModule
public boolean stripcolorOff(CommandSender sender) public boolean stripcolorOff(CommandSender sender)
{ {
Utils.sendMessage(sender, null, "Disabled stripping colors!"); Utils.sendMessage(sender, null, "Disabled stripping colors!");
DataManager.setData(sender, "stripcolor", false); DataManager.setData(sender, "stripcolor", "off");
return true;
}
@Command(hook = "stripcolor_partial")
public boolean stripcolor_partial(CommandSender sender)
{
Utils.sendMessage(sender, null, "Disabled stripping colors!");
DataManager.setData(sender, "stripcolor", "partial");
return true; return true;
} }
@Command(hook = "stripcolor") @Command(hook = "stripcolor")
public boolean stripcolor(CommandSender sender) public boolean stripcolor(CommandSender sender)
{ {
boolean b = (boolean) DataManager.getOrDefault(sender, "stripcolor", true); boolean b = DataManager.getOrDefault(sender, "stripcolor", "on").equals("on");
Utils.sendMessage(sender, null, (b ? "Disabled" : "Enabled") + " stripping colors!"); Utils.sendMessage(sender, null, (b ? "Disabled" : "Enabled") + " stripping colors!");
DataManager.setData(sender, "stripcolor", !b); DataManager.setData(sender, "stripcolor", !b);
return true; return true;
@@ -239,8 +247,21 @@ public class Socialspy implements CoreModule
private String formatMessage(CommandSender formatHolder, CommandSender sender, CommandSender target, String message, private String formatMessage(CommandSender formatHolder, CommandSender sender, CommandSender target, String message,
String command) String command)
{ {
if ((boolean) DataManager.getOrDefault(formatHolder, "stripcolor", false)) Object o = DataManager.getOrDefault(formatHolder, "stripcolor", "off");
if (o instanceof Boolean)
{
boolean b = (boolean) o;
if (b)
o = "on";
else
o = "off";
DataManager.setData(formatHolder, "stripcolor", o);
}
String s = (String) o;
if (s.equals("on"))
message = ChatColor.stripColor(message); message = ChatColor.stripColor(message);
else if (s.equals("partial"))
message = message.replace("§", "&");
String format = (String) DataManager.getOrDefault(formatHolder, "format", getDefaultFormat()); String format = (String) DataManager.getOrDefault(formatHolder, "format", getDefaultFormat());
// Replace escaped % with placeholder // Replace escaped % with placeholder
format = format.replace("%%", "§§"); format = format.replace("%%", "§§");
@@ -266,8 +287,21 @@ public class Socialspy implements CoreModule
private String formatMessage(CommandSender formatHolder, CommandSender sender, String target, String message, private String formatMessage(CommandSender formatHolder, CommandSender sender, String target, String message,
String command) String command)
{ {
if ((boolean) DataManager.getOrDefault(formatHolder, "stripcolor", false)) Object o = DataManager.getOrDefault(formatHolder, "stripcolor", "off");
if (o instanceof Boolean)
{
boolean b = (boolean) o;
if (b)
o = "on";
else
o = "off";
DataManager.setData(formatHolder, "stripcolor", o);
}
String s = (String) o;
if (s.equals("on"))
message = ChatColor.stripColor(message); message = ChatColor.stripColor(message);
else if (s.equals("partial"))
message = message.replace("§", "&");
String format = (String) DataManager.getOrDefault(formatHolder, "format", getDefaultFormat()); String format = (String) DataManager.getOrDefault(formatHolder, "format", getDefaultFormat());
// Replace escaped % with placeholder // Replace escaped % with placeholder
format = format.replace("%%", "§§"); format = format.replace("%%", "§§");