diff --git a/java/coreplugin/coreplugin/commands/discord.java b/java/coreplugin/coreplugin/commands/discord.java index 7d7ec2a..f834136 100644 --- a/java/coreplugin/coreplugin/commands/discord.java +++ b/java/coreplugin/coreplugin/commands/discord.java @@ -1,16 +1,13 @@ package coreplugin.coreplugin.commands; import coreplugin.coreplugin.Core; -import org.bukkit.ChatColor; +import coreplugin.coreplugin.utils.chatcolors; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -public class discord implements CommandExecutor { - private String color(String string) { - return ChatColor.translateAlternateColorCodes('&', string); - } +public class discord extends chatcolors implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { boolean t; diff --git a/java/coreplugin/coreplugin/commands/fly.java b/java/coreplugin/coreplugin/commands/fly.java index 2943704..5d501d0 100644 --- a/java/coreplugin/coreplugin/commands/fly.java +++ b/java/coreplugin/coreplugin/commands/fly.java @@ -1,17 +1,14 @@ package coreplugin.coreplugin.commands; import coreplugin.coreplugin.Core; +import coreplugin.coreplugin.utils.chatcolors; import org.bukkit.Bukkit; -import org.bukkit.ChatColor; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -public class fly implements CommandExecutor { - private String color(String string) { - return ChatColor.translateAlternateColorCodes('&', string); - } +public class fly extends chatcolors implements CommandExecutor { public boolean onCommand(CommandSender sender, Command command, String s, String[] strings) { if (sender.hasPermission("core.fly")) { Player p = (Player) sender; diff --git a/java/coreplugin/coreplugin/commands/gamemodes/GMA.java b/java/coreplugin/coreplugin/commands/gamemodes/GMA.java index 918f3ff..dcbf886 100644 --- a/java/coreplugin/coreplugin/commands/gamemodes/GMA.java +++ b/java/coreplugin/coreplugin/commands/gamemodes/GMA.java @@ -1,20 +1,15 @@ package coreplugin.coreplugin.commands.gamemodes; import coreplugin.coreplugin.Core; +import coreplugin.coreplugin.utils.chatcolors; import org.bukkit.Bukkit; -import org.bukkit.ChatColor; import org.bukkit.GameMode; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -public class GMA implements CommandExecutor { - - private String color(String string) { - return ChatColor.translateAlternateColorCodes('&', string); - } - +public class GMA extends chatcolors implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command command, String s, String[] strings) { if (sender.hasPermission("core.gma")) { diff --git a/java/coreplugin/coreplugin/commands/gamemodes/GMC.java b/java/coreplugin/coreplugin/commands/gamemodes/GMC.java index c886953..e512599 100644 --- a/java/coreplugin/coreplugin/commands/gamemodes/GMC.java +++ b/java/coreplugin/coreplugin/commands/gamemodes/GMC.java @@ -1,20 +1,15 @@ package coreplugin.coreplugin.commands.gamemodes; import coreplugin.coreplugin.Core; +import coreplugin.coreplugin.utils.chatcolors; import org.bukkit.Bukkit; -import org.bukkit.ChatColor; import org.bukkit.GameMode; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -public class GMC implements CommandExecutor { - - private String color(String string) { - return ChatColor.translateAlternateColorCodes('&', string); - } - +public class GMC extends chatcolors implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command command, String s, String[] strings) { if (sender.hasPermission("core.gmc")) { diff --git a/java/coreplugin/coreplugin/commands/gamemodes/GMS.java b/java/coreplugin/coreplugin/commands/gamemodes/GMS.java index 974e525..bda0ccf 100644 --- a/java/coreplugin/coreplugin/commands/gamemodes/GMS.java +++ b/java/coreplugin/coreplugin/commands/gamemodes/GMS.java @@ -1,20 +1,15 @@ package coreplugin.coreplugin.commands.gamemodes; import coreplugin.coreplugin.Core; +import coreplugin.coreplugin.utils.chatcolors; import org.bukkit.Bukkit; -import org.bukkit.ChatColor; import org.bukkit.GameMode; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -public class GMS implements CommandExecutor { - - private String color(String string) { - return ChatColor.translateAlternateColorCodes('&', string); - } - +public class GMS extends chatcolors implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command command, String s, String[] strings) { if (sender.hasPermission("core.gms")) { diff --git a/java/coreplugin/coreplugin/commands/gamemodes/GMSP.java b/java/coreplugin/coreplugin/commands/gamemodes/GMSP.java index 18b30ad..b76bf0e 100644 --- a/java/coreplugin/coreplugin/commands/gamemodes/GMSP.java +++ b/java/coreplugin/coreplugin/commands/gamemodes/GMSP.java @@ -1,20 +1,15 @@ package coreplugin.coreplugin.commands.gamemodes; import coreplugin.coreplugin.Core; +import coreplugin.coreplugin.utils.chatcolors; import org.bukkit.Bukkit; -import org.bukkit.ChatColor; import org.bukkit.GameMode; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -public class GMSP implements CommandExecutor { - - private String color(String string) { - return ChatColor.translateAlternateColorCodes('&', string); - } - +public class GMSP extends chatcolors implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command command, String s, String[] strings) { if (sender.hasPermission("core.gmsp")) { diff --git a/java/coreplugin/coreplugin/commands/heal.java b/java/coreplugin/coreplugin/commands/heal.java index 11c0b75..fa2b845 100644 --- a/java/coreplugin/coreplugin/commands/heal.java +++ b/java/coreplugin/coreplugin/commands/heal.java @@ -1,17 +1,14 @@ package coreplugin.coreplugin.commands; import coreplugin.coreplugin.Core; +import coreplugin.coreplugin.utils.chatcolors; import org.bukkit.Bukkit; -import org.bukkit.ChatColor; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -public class heal implements CommandExecutor { - private String color(String string) { - return ChatColor.translateAlternateColorCodes('&', string); - } +public class heal extends chatcolors implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { if (sender.hasPermission("core.heal")) { diff --git a/java/coreplugin/coreplugin/commands/punish/ban.java b/java/coreplugin/coreplugin/commands/punish/ban.java index e97957e..6c9a35f 100644 --- a/java/coreplugin/coreplugin/commands/punish/ban.java +++ b/java/coreplugin/coreplugin/commands/punish/ban.java @@ -1,6 +1,7 @@ package coreplugin.coreplugin.commands.punish; import coreplugin.coreplugin.Core; +import coreplugin.coreplugin.utils.chatcolors; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.OfflinePlayer; @@ -11,11 +12,7 @@ import org.bukkit.entity.Player; import java.util.Arrays; -public class ban implements CommandExecutor { - private String color(String string) { - return ChatColor.translateAlternateColorCodes('&', string); - } - +public class ban extends chatcolors implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { if (sender.hasPermission("core.ban")) { diff --git a/java/coreplugin/coreplugin/commands/punish/kick.java b/java/coreplugin/coreplugin/commands/punish/kick.java index 301de40..94eec0a 100644 --- a/java/coreplugin/coreplugin/commands/punish/kick.java +++ b/java/coreplugin/coreplugin/commands/punish/kick.java @@ -1,8 +1,8 @@ package coreplugin.coreplugin.commands.punish; import coreplugin.coreplugin.Core; +import coreplugin.coreplugin.utils.chatcolors; import org.bukkit.Bukkit; -import org.bukkit.ChatColor; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; @@ -10,11 +10,7 @@ import org.bukkit.entity.Player; import java.util.Arrays; -public class kick implements CommandExecutor { - private String color(String string) { - return ChatColor.translateAlternateColorCodes('&', string); - } - +public class kick extends chatcolors implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { if (sender.hasPermission("core.kick")) { diff --git a/java/coreplugin/coreplugin/commands/punish/unban.java b/java/coreplugin/coreplugin/commands/punish/unban.java index c9aa567..183b9fb 100644 --- a/java/coreplugin/coreplugin/commands/punish/unban.java +++ b/java/coreplugin/coreplugin/commands/punish/unban.java @@ -1,19 +1,16 @@ package coreplugin.coreplugin.commands.punish; import coreplugin.coreplugin.Core; +import coreplugin.coreplugin.utils.chatcolors; import org.bukkit.BanList; import org.bukkit.Bukkit; -import org.bukkit.ChatColor; import org.bukkit.OfflinePlayer; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -public class unban implements CommandExecutor { - private String color(String string) { - return ChatColor.translateAlternateColorCodes('&', string); - } +public class unban extends chatcolors implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { Player p = (Player) sender; diff --git a/java/coreplugin/coreplugin/commands/toggle.java b/java/coreplugin/coreplugin/commands/toggle.java index 72e98b9..d6fc8fb 100644 --- a/java/coreplugin/coreplugin/commands/toggle.java +++ b/java/coreplugin/coreplugin/commands/toggle.java @@ -1,17 +1,13 @@ package coreplugin.coreplugin.commands; import coreplugin.coreplugin.Core; -import org.bukkit.ChatColor; +import coreplugin.coreplugin.utils.chatcolors; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -public class toggle implements CommandExecutor { - - private String color(String string) { - return ChatColor.translateAlternateColorCodes('&', string); - } +public class toggle extends chatcolors implements CommandExecutor { public static boolean DiscordToggle; public static boolean JoinToggle; public static boolean LeaveToggle; diff --git a/java/coreplugin/coreplugin/events/OnPlayerJoin.java b/java/coreplugin/coreplugin/events/OnPlayerJoin.java index 65a9b95..885b438 100644 --- a/java/coreplugin/coreplugin/events/OnPlayerJoin.java +++ b/java/coreplugin/coreplugin/events/OnPlayerJoin.java @@ -2,17 +2,13 @@ package coreplugin.coreplugin.events; import coreplugin.coreplugin.Core; import coreplugin.coreplugin.commands.toggle; -import org.bukkit.ChatColor; +import coreplugin.coreplugin.utils.chatcolors; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerJoinEvent; -public class OnPlayerJoin implements Listener { - private String color(String string) { - return ChatColor.translateAlternateColorCodes('&', string); - } - +public class OnPlayerJoin extends chatcolors implements Listener { @EventHandler public void OnPlayerJoin(PlayerJoinEvent event) { boolean t; diff --git a/java/coreplugin/coreplugin/events/OnPlayerLeave.java b/java/coreplugin/coreplugin/events/OnPlayerLeave.java index cf27f7f..5cbca3c 100644 --- a/java/coreplugin/coreplugin/events/OnPlayerLeave.java +++ b/java/coreplugin/coreplugin/events/OnPlayerLeave.java @@ -2,17 +2,13 @@ package coreplugin.coreplugin.events; import coreplugin.coreplugin.Core; import coreplugin.coreplugin.commands.toggle; -import org.bukkit.ChatColor; +import coreplugin.coreplugin.utils.chatcolors; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerQuitEvent; -public class OnPlayerLeave implements Listener { - private String color(String string) { - return ChatColor.translateAlternateColorCodes('&', string); - } - +public class OnPlayerLeave extends chatcolors implements Listener { @EventHandler public void OnPlayerLeave(PlayerQuitEvent event){ boolean t; diff --git a/java/coreplugin/coreplugin/utils/chatcolors.java b/java/coreplugin/coreplugin/utils/chatcolors.java new file mode 100644 index 0000000..f27e243 --- /dev/null +++ b/java/coreplugin/coreplugin/utils/chatcolors.java @@ -0,0 +1,5 @@ +package coreplugin.coreplugin.utils; +import org.bukkit.ChatColor; +public class chatcolors { + public String color(String string){return ChatColor.translateAlternateColorCodes('&', string);} +} \ No newline at end of file