Famous_Longwing/RealEstate
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove redundant coloring from messages

Browse Source
This commit is contained in:
Dmitry Rendov 2020-05-14 10:47:22 +03:00 committed by Dmitry Rendov
parent e240af74f0
commit ca0243e831
3 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/me/EtienneDx/RealEstate/Config.java
View File

@ -197,29 +197,29 @@ public class Config extends AnnotationConfig
return message; return message;
} }
//sends a color-coded message to a player //sends a color-coded message to a player
public static void sendMessage(Player player, ChatColor color, Messages messageID, String... args) { public static void sendMessage(Player player, Messages messageID, String... args) {
sendMessage(player, color, messageID, 0, args); sendMessage(player, messageID, 0, args);
} }
//sends a color-coded message to a player //sends a color-coded message to a player
public static void sendMessage(Player player, ChatColor color, Messages messageID, long delayInTicks, String... args) { public static void sendMessage(Player player, Messages messageID, long delayInTicks, String... args) {
String message = RealEstate.instance.config.getMessage(messageID, args); String message = RealEstate.instance.config.getMessage(messageID, args);
sendMessage(player, color, message, delayInTicks); sendMessage(player, message, delayInTicks);
} }
//sends a color-coded message to a player //sends a color-coded message to a player
public static void sendMessage(Player player, ChatColor color, String message) { public static void sendMessage(Player player, String message) {
if (message == null || message.length() == 0) return; if (message == null || message.length() == 0) return;
if (player == null) { if (player == null) {
RealEstate.instance.log.info(color + message); RealEstate.instance.log.info(message);
} else { } else {
player.sendMessage(RealEstate.instance.config.chatPrefix + color + message); player.sendMessage(RealEstate.instance.config.chatPrefix + message);
} }
} }
public static void sendMessage(Player player, ChatColor color, String message, long delayInTicks) { public static void sendMessage(Player player, String message, long delayInTicks) {
SendPlayerMessageTask task = new SendPlayerMessageTask(player, color, message); SendPlayerMessageTask task = new SendPlayerMessageTask(player, message);
if (delayInTicks > 0) { if (delayInTicks > 0) {
RealEstate.instance.getServer().getScheduler().runTaskLater(RealEstate.instance, task, delayInTicks); RealEstate.instance.getServer().getScheduler().runTaskLater(RealEstate.instance, task, delayInTicks);

13
src/me/EtienneDx/RealEstate/RECommand.java
View File

@ -1,9 +1,6 @@
package me.EtienneDx.RealEstate; package me.EtienneDx.RealEstate;
import java.awt.*;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.UUID; import java.util.UUID;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
@ -51,7 +48,7 @@ public class RECommand extends BaseCommand
} }
else else
{ {
Config.sendMessage(player, ChatColor.RED, Messages.NoTransactionFound); Config.sendMessage(player, Messages.NoTransactionFound);
} }
} }
@ -68,7 +65,7 @@ public class RECommand extends BaseCommand
} }
if(page <= 0) if(page <= 0)
{ {
Config.sendMessage(player, ChatColor.RED, Messages.PageMustBePositive); Config.sendMessage(player, Messages.PageMustBePositive);
return; return;
} }
int count = 0; int count = 0;
@ -144,7 +141,7 @@ public class RECommand extends BaseCommand
} }
else else
{ {
Config.sendMessage(player, ChatColor.RED, Messages.PageNotExists); Config.sendMessage(player, Messages.PageNotExists);
} }
} }
} }
@ -167,7 +164,7 @@ public class RECommand extends BaseCommand
} }
if(newStatus == null) if(newStatus == null)
{ {
Config.sendMessage(player, ChatColor.AQUA, Messages.RenewRentCurrently, cr.autoRenew ? "enabled" : "disabled", claimType); Config.sendMessage(player, Messages.RenewRentCurrently, cr.autoRenew ? "enabled" : "disabled", claimType);
} }
else if(!newStatus.equalsIgnoreCase("enable") && !newStatus.equalsIgnoreCase("disable")) else if(!newStatus.equalsIgnoreCase("enable") && !newStatus.equalsIgnoreCase("disable"))
{ {
@ -177,7 +174,7 @@ public class RECommand extends BaseCommand
{ {
cr.autoRenew = newStatus.equalsIgnoreCase("enable"); cr.autoRenew = newStatus.equalsIgnoreCase("enable");
RealEstate.transactionsStore.saveData(); RealEstate.transactionsStore.saveData();
Config.sendMessage(player, ChatColor.AQUA, Messages.RenewRentNow, cr.autoRenew ? "enabled" : "disabled", claimType); Config.sendMessage(player, Messages.RenewRentNow, cr.autoRenew ? "enabled" : "disabled", claimType);
} }
else else
{ {

11
src/me/EtienneDx/RealEstate/SendPlayerMessageTask.java
View File

@ -1,21 +1,16 @@
package me.EtienneDx.RealEstate; package me.EtienneDx.RealEstate;
import org.bukkit.ChatColor;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import java.util.logging.Logger;
class SendPlayerMessageTask implements Runnable class SendPlayerMessageTask implements Runnable
{ {
private Player player; private Player player;
private ChatColor color;
private String message; private String message;
public SendPlayerMessageTask(Player player, ChatColor color, String message) public SendPlayerMessageTask(Player player, String message)
{ {
this.player = player; this.player = player;
this.color = color;
this.message = message; this.message = message;
} }
@ -24,9 +19,9 @@ class SendPlayerMessageTask implements Runnable
{ {
if(player == null) if(player == null)
{ {
RealEstate.instance.log.info(color + message); RealEstate.instance.log.info(message);
return; return;
} }
Config.sendMessage(this.player, this.color, this.message); Config.sendMessage(this.player, this.message);
} }
} }