mirror of
https://github.com/TotalFreedomMC/TF-ProjectKorra.git
synced 2024-08-16 08:26:29 +00:00
Merge remote-tracking branch 'refs/remotes/ProjectKorra/master'
This commit is contained in:
commit
6f58fe5c4b
|
@ -102,8 +102,7 @@ public class Element {
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getPrefix() {
|
public String getPrefix() {
|
||||||
String prefix = this.plugin.getName().equalsIgnoreCase("ProjectKorra") ? this.getColor() + ConfigManager.languageConfig.get().getString("Chat.Prefixes." + name) + " " : ChatColor.WHITE + "[Nonbender] ";
|
return getColor() + "[" + getName() + (getType() != null ? getType().getBender() : "") + "] ";
|
||||||
return prefix;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public ChatColor getColor() {
|
public ChatColor getColor() {
|
||||||
|
|
|
@ -548,6 +548,13 @@ public abstract class CoreAbility implements Ability {
|
||||||
return ConfigManager.getConfig();
|
return ConfigManager.getConfig();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return the language.yml for the plugin
|
||||||
|
*/
|
||||||
|
public static FileConfiguration getLanguageConfig() {
|
||||||
|
return ConfigManager.languageConfig.get();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns a String used to debug potential CoreAbility memory that can be caused
|
* Returns a String used to debug potential CoreAbility memory that can be caused
|
||||||
* by a developer forgetting to call {@link #remove()}
|
* by a developer forgetting to call {@link #remove()}
|
||||||
|
|
|
@ -105,7 +105,7 @@ public class RemoveCommand extends PKCommand {
|
||||||
}
|
}
|
||||||
|
|
||||||
GeneralMethods.removeUnusableAbilities(player.getName());
|
GeneralMethods.removeUnusableAbilities(player.getName());
|
||||||
sender.sendMessage(e.getColor() + this.succesfullyRemovedElementTargetConfirm.replace("{element}", e.getName() + e.getType().getBending()).replace("{sender}", ChatColor.DARK_AQUA + player.getName() + e.getColor()));
|
player.sendMessage(e.getColor() + this.succesfullyRemovedElementTargetConfirm.replace("{element}", e.getName() + e.getType().getBending()).replace("{sender}", ChatColor.DARK_AQUA + player.getName() + e.getColor()));
|
||||||
sender.sendMessage(e.getColor() + this.succesfullyRemovedElementTarget.replace("{element}" , e.getName() + e.getType().getBending()).replace("{sender}", ChatColor.DARK_AQUA + sender.getName() + e.getColor()));
|
sender.sendMessage(e.getColor() + this.succesfullyRemovedElementTarget.replace("{element}" , e.getName() + e.getType().getBending()).replace("{sender}", ChatColor.DARK_AQUA + sender.getName() + e.getColor()));
|
||||||
Bukkit.getServer().getPluginManager().callEvent(new PlayerChangeElementEvent(sender, player, e, Result.REMOVE));
|
Bukkit.getServer().getPluginManager().callEvent(new PlayerChangeElementEvent(sender, player, e, Result.REMOVE));
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -44,12 +44,6 @@ public class ConfigManager {
|
||||||
|
|
||||||
config.addDefault("Chat.Enable", true);
|
config.addDefault("Chat.Enable", true);
|
||||||
config.addDefault("Chat.Format", "<name>: <message>");
|
config.addDefault("Chat.Format", "<name>: <message>");
|
||||||
config.addDefault("Chat.Prefixes.Air", "[Airbender]");
|
|
||||||
config.addDefault("Chat.Prefixes.Water", "[Waterbender]");
|
|
||||||
config.addDefault("Chat.Prefixes.Earth", "[Earthbender]");
|
|
||||||
config.addDefault("Chat.Prefixes.Fire", "[Firebender]");
|
|
||||||
config.addDefault("Chat.Prefixes.Chi", "[Chiblocker]");
|
|
||||||
config.addDefault("Chat.Prefixes.Avatar", "[Avatar]");
|
|
||||||
config.addDefault("Chat.Colors.Avatar", "DARK_PURPLE");
|
config.addDefault("Chat.Colors.Avatar", "DARK_PURPLE");
|
||||||
config.addDefault("Chat.Colors.Air", "GRAY");
|
config.addDefault("Chat.Colors.Air", "GRAY");
|
||||||
config.addDefault("Chat.Colors.AirSub", "DARK_GRAY");
|
config.addDefault("Chat.Colors.AirSub", "DARK_GRAY");
|
||||||
|
|
Loading…
Reference in a new issue