Upstream/Jobs
1
0
Fork 0
mirror of https://github.com/Zrips/Jobs.git synced 2024-11-25 20:16:13 +01:00
Code Issues Projects Releases Wiki Activity

Fixed issue with colors not work, #267

Browse Source
This commit is contained in:
montlikadani 2018-12-31 13:01:53 +01:00
parent 432cbbbd09
commit 6709abca2f
8 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java
View File

@ -321,12 +321,12 @@ public class ItemManager {
White(0, "White"), White(0, "White"),
Orange(1, "Orange"), Orange(1, "Orange"),
Magenta(2, "Magenta"), Magenta(2, "Magenta"),
LIGHT_BLUE(3, "Light Blue"), // TODO: Not work, github issue: #267 Navy(3, "Navy Blue"),
Yellow(4, "Yellow"), Yellow(4, "Yellow"),
Lime(5, "Lime Green"), Lime(5, "Lime Green"),
Pink(6, "Pink"), Pink(6, "Pink"),
Gray(7, "Gray"), Gray(7, "Gray"),
LIGHT_GRAY(8, "Light Gray"), // TODO: Not work, github issue: #267 Silver(8, "Silver"),
Cyan(9, "Cyan"), Cyan(9, "Cyan"),
Purple(10, "Purple"), Purple(10, "Purple"),
Blue(11, "Blue"), Blue(11, "Blue"),

12
src/main/java/com/gamingmesh/jobs/HookEconomyTask.java
View File

@ -41,12 +41,12 @@ public class HookEconomyTask implements Runnable {
// no Economy found // no Economy found
Jobs.setEconomy(plugin, new BlackholeEconomy()); Jobs.setEconomy(plugin, new BlackholeEconomy());
Bukkit.getServer().getLogger().severe("==================== " + plugin.getDescription().getName() + " ===================="); Jobs.getPluginLogger().severe("==================== " + plugin.getDescription().getName() + " ====================");
Bukkit.getServer().getLogger().severe("Vault is required by this plugin for economy support!"); Jobs.getPluginLogger().severe("Vault is required by this plugin for economy support!");
Bukkit.getServer().getLogger().severe("Please install them first!"); Jobs.getPluginLogger().severe("Please install them first!");
Bukkit.getServer().getLogger().severe("You can find the latest versions here:"); Jobs.getPluginLogger().severe("You can find the latest versions here:");
Bukkit.getServer().getLogger().severe("https://www.spigotmc.org/resources/vault.34315/"); Jobs.getPluginLogger().severe("https://www.spigotmc.org/resources/vault.34315/");
Bukkit.getServer().getLogger().severe("=============================================="); Jobs.getPluginLogger().severe("==============================================");
} }
private boolean setVault() { private boolean setVault() {

2
src/main/java/com/gamingmesh/jobs/Jobs.java
View File

@ -809,13 +809,13 @@ public class Jobs extends JavaPlugin {
restrictedBlocks.saveDefaultConfig(); restrictedBlocks.saveDefaultConfig();
setPermissionHandler(new PermissionHandler(this)); setPermissionHandler(new PermissionHandler(this));
setPluginLogger(getLogger());
setJobsClassloader(); setJobsClassloader();
setPlayerManager(); setPlayerManager();
setLanguage(); setLanguage();
setGUIManager(); setGUIManager();
setExplore(); setExplore();
setBBManager(); setBBManager();
setPluginLogger(getLogger());
setLoging(); setLoging();
setGCManager(); setGCManager();
setConfigManager(); setConfigManager();

8
src/main/java/com/gamingmesh/jobs/PlayerManager.java
View File

@ -543,7 +543,7 @@ public class PlayerManager {
if (player != null && player.getLocation() != null) if (player != null && player.getLocation() != null)
player.getWorld().playSound(player.getLocation(), sound, levelUpEvent.getSoundVolume(), levelUpEvent.getSoundPitch()); player.getWorld().playSound(player.getLocation(), sound, levelUpEvent.getSoundVolume(), levelUpEvent.getSoundPitch());
} else } else
Bukkit.getConsoleSender().sendMessage("[Jobs] Can't find sound by name: " + levelUpEvent.getTitleChangeSound().name() + ". Please update it"); Jobs.consoleMsg("[Jobs] Can't find sound by name: " + levelUpEvent.getTitleChangeSound().name() + ". Please update it");
} }
} catch (Exception e) { } catch (Exception e) {
} }
@ -568,7 +568,7 @@ public class PlayerManager {
for (String line : message.split("\n")) { for (String line : message.split("\n")) {
if (Jobs.getGCManager().isBroadcastingLevelups()) { if (Jobs.getGCManager().isBroadcastingLevelups()) {
if (Jobs.getGCManager().BroadcastingLevelUpLevels.contains(oldLevel + 1) || Jobs.getGCManager().BroadcastingLevelUpLevels.contains(0)) if (Jobs.getGCManager().BroadcastingLevelUpLevels.contains(oldLevel + 1) || Jobs.getGCManager().BroadcastingLevelUpLevels.contains(0))
Bukkit.getServer().broadcastMessage(line); Jobs.consoleMsg(line);
} else if (player != null) { } else if (player != null) {
if (Jobs.getGCManager().LevelChangeActionBar) if (Jobs.getGCManager().LevelChangeActionBar)
Jobs.getActionBar().send(player, line); Jobs.getActionBar().send(player, line);
@ -588,7 +588,7 @@ public class PlayerManager {
player.getWorld().playSound(player.getLocation(), sound, levelUpEvent.getTitleChangeVolume(), player.getWorld().playSound(player.getLocation(), sound, levelUpEvent.getTitleChangeVolume(),
levelUpEvent.getTitleChangePitch()); levelUpEvent.getTitleChangePitch());
} else } else
Bukkit.getConsoleSender().sendMessage("[Jobs] Can't find sound by name: " + levelUpEvent.getTitleChangeSound().name() + ". Please update it"); Jobs.consoleMsg("[Jobs] Can't find sound by name: " + levelUpEvent.getTitleChangeSound().name() + ". Please update it");
} }
} catch (Exception e) { } catch (Exception e) {
} }
@ -607,7 +607,7 @@ public class PlayerManager {
message = message.replace("%jobname%", job.getChatColor() + job.getName()); message = message.replace("%jobname%", job.getChatColor() + job.getName());
for (String line : message.split("\n")) { for (String line : message.split("\n")) {
if (Jobs.getGCManager().isBroadcastingSkillups()) if (Jobs.getGCManager().isBroadcastingSkillups())
Bukkit.getServer().broadcastMessage(line); Jobs.consoleMsg(line);
else if (player != null) { else if (player != null) {
if (Jobs.getGCManager().TitleChangeActionBar) if (Jobs.getGCManager().TitleChangeActionBar)
Jobs.getActionBar().send(player, line); Jobs.getActionBar().send(player, line);

24
src/main/java/com/gamingmesh/jobs/config/ConfigManager.java
View File

@ -101,12 +101,12 @@ public class ConfigManager {
if (s != null) if (s != null)
s.close(); s.close();
} catch (Exception e) { } catch (Exception e) {
Bukkit.getServer().getLogger().severe("==================== Jobs ===================="); Jobs.getPluginLogger().severe("==================== Jobs ====================");
Bukkit.getServer().getLogger().severe("Unable to load jobConfig.yml!"); Jobs.getPluginLogger().severe("Unable to load jobConfig.yml!");
Bukkit.getServer().getLogger().severe("Check your config for formatting issues!"); Jobs.getPluginLogger().severe("Check your config for formatting issues!");
Bukkit.getServer().getLogger().severe("No jobs were loaded!"); Jobs.getPluginLogger().severe("No jobs were loaded!");
Bukkit.getServer().getLogger().severe("Error: " + e.getMessage()); Jobs.getPluginLogger().severe("Error: " + e.getMessage());
Bukkit.getServer().getLogger().severe("=============================================="); Jobs.getPluginLogger().severe("==============================================");
return; return;
} finally { } finally {
if (s != null) if (s != null)
@ -421,12 +421,12 @@ public class ConfigManager {
conf.load(s); conf.load(s);
s.close(); s.close();
} catch (Exception e) { } catch (Exception e) {
Bukkit.getServer().getLogger().severe("==================== Jobs ===================="); Jobs.getPluginLogger().severe("==================== Jobs ====================");
Bukkit.getServer().getLogger().severe("Unable to load jobConfig.yml!"); Jobs.getPluginLogger().severe("Unable to load jobConfig.yml!");
Bukkit.getServer().getLogger().severe("Check your config for formatting issues!"); Jobs.getPluginLogger().severe("Check your config for formatting issues!");
Bukkit.getServer().getLogger().severe("No jobs were loaded!"); Jobs.getPluginLogger().severe("No jobs were loaded!");
Bukkit.getServer().getLogger().severe("Error: " + e.getMessage()); Jobs.getPluginLogger().severe("Error: " + e.getMessage());
Bukkit.getServer().getLogger().severe("=============================================="); Jobs.getPluginLogger().severe("==============================================");
return; return;
} finally { } finally {
s.close(); s.close();

4
src/main/java/com/gamingmesh/jobs/config/NameTranslatorManager.java
View File

@ -431,12 +431,12 @@ public class NameTranslatorManager {
c.get("ColorList.0-white", "&fWhite"); c.get("ColorList.0-white", "&fWhite");
c.get("ColorList.1-orange", "&6Orange"); c.get("ColorList.1-orange", "&6Orange");
c.get("ColorList.2-magenta", "&dMagenta"); c.get("ColorList.2-magenta", "&dMagenta");
c.get("ColorList.3-LIGHT_BLUE", "&9Light blue"); c.get("ColorList.3-navy", "&9Navy");
c.get("ColorList.4-yellow", "&eYellow"); c.get("ColorList.4-yellow", "&eYellow");
c.get("ColorList.5-lime", "&aLime"); c.get("ColorList.5-lime", "&aLime");
c.get("ColorList.6-pink", "&dPink"); c.get("ColorList.6-pink", "&dPink");
c.get("ColorList.7-gray", "&8Gray"); c.get("ColorList.7-gray", "&8Gray");
c.get("ColorList.8-LIGHT_GRAY", "&7Light gray"); c.get("ColorList.8-silver", "&7Silver");
c.get("ColorList.9-cyan", "&3Cyan"); c.get("ColorList.9-cyan", "&3Cyan");
c.get("ColorList.10-purple", "&5Purple"); c.get("ColorList.10-purple", "&5Purple");
c.get("ColorList.11-blue", "&1Blue"); c.get("ColorList.11-blue", "&1Blue");

2
src/main/java/com/gamingmesh/jobs/i18n/Language.java
View File

@ -68,7 +68,7 @@ public class Language {
else else
msg = customlocale.isString(key) ? Colors(customlocale.getString(key)) : missing; msg = customlocale.isString(key) ? Colors(customlocale.getString(key)) : missing;
} catch (Exception e) { } catch (Exception e) {
Bukkit.getServer().getConsoleSender().sendMessage(Colors("&e[Jobs] &2Can't read language file for: " + key)); Jobs.consoleMsg("&e[Jobs] &2Can't read language file for: " + key);
Bukkit.getServer().getPluginManager().disablePlugin(plugin); Bukkit.getServer().getPluginManager().disablePlugin(plugin);
e.printStackTrace(); e.printStackTrace();
throw e; throw e;

10
src/main/resources/jobConfig.yml
View File

@ -345,10 +345,10 @@ Jobs:
Green: Green:
income: 2.0 income: 2.0
experience: 5.0 experience: 5.0
Light_blue: Navy:
income: 2.0 income: 2.0
experience: 5.0 experience: 5.0
'Lime Green': Lime:
income: 2.0 income: 2.0
experience: 5.0 experience: 5.0
Magenta: Magenta:
@ -366,7 +366,7 @@ Jobs:
Red: Red:
income: 2.0 income: 2.0
experience: 5.0 experience: 5.0
'Light Gray': Silver:
income: 2.0 income: 2.0
experience: 5.0 experience: 5.0
White: White:
@ -1749,7 +1749,7 @@ Jobs:
income: 4.0 income: 4.0
points: 4.0 points: 4.0
experience: 5.0 experience: 5.0
'Light Blue': Navy:
income: 4.0 income: 4.0
points: 4.0 points: 4.0
experience: 5.0 experience: 5.0
@ -1765,7 +1765,7 @@ Jobs:
income: 4.0 income: 4.0
points: 4.0 points: 4.0
experience: 5.0 experience: 5.0
'Light Gray': Silver:
income: 4.0 income: 4.0
points: 4.0 points: 4.0
experience: 5.0 experience: 5.0