Skip to content

Commit a7b421d

Browse files
NikV2NikV2
committed
Commit
1 parent 166d8db commit a7b421d

20 files changed

Lines changed: 162 additions & 84 deletions

‎src/main/java/me/nik/combatplus/CombatPlus.java‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import me.nik.combatplus.listeners.Offhand;
2020
import me.nik.combatplus.listeners.PlayerRegen;
2121
import me.nik.combatplus.listeners.fixes.Projectiles;
22+
import me.nik.combatplus.managers.MsgType;
2223
import me.nik.combatplus.utils.ACManager;
2324
import me.nik.combatplus.utils.CustomRecipes;
2425
import me.nik.combatplus.utils.Messenger;
@@ -93,7 +94,7 @@ public void onDisable() {
9394
lang.save();
9495

9596
//Done
96-
consoleMessage(Messenger.message("console.disabled"));
97+
consoleMessage(Messenger.message(MsgType.CONSOLE_DISABLED));
9798
}
9899

99100
/**
@@ -114,7 +115,7 @@ private void checkForUpdates() {
114115
if (isEnabled("settings.check_for_updates")) {
115116
BukkitTask updateChecker = new UpdateChecker(this).runTaskAsynchronously(this);
116117
} else {
117-
consoleMessage(Messenger.message("console.update_disabled"));
118+
consoleMessage(Messenger.message(MsgType.CONSOLE_UPDATE_DISABLED));
118119
}
119120
}
120121

@@ -161,7 +162,7 @@ private void loadStats() {
161162
* Initialize enabled Listeners
162163
*/
163164
private void initialize() {
164-
consoleMessage(Messenger.message("console.initialize"));
165+
consoleMessage(Messenger.message(MsgType.CONSOLE_INITIALIZE));
165166

166167
if (isEnabled("combat.settings.old_pvp") || isEnabled("custom.player_health.enabled")) {
167168
registerEvent(new AttributesSet());
@@ -233,35 +234,35 @@ private void checkSupported() {
233234
setBoolean("combat.settings.sword_blocking.enabled", false);
234235
config.save();
235236
config.reload();
236-
consoleMessage(Messenger.message("console.unsupported_version"));
237+
consoleMessage(Messenger.message(MsgType.CONSOLE_UNSUPPORTED_VERSION));
237238
} else if (serverVersion("1.9")) {
238239
setBoolean("combat.settings.disable_sweep_attacks.enabled", false);
239240
setBoolean("recipes.enchanted_golden_apple", false);
240241
setBoolean("knockback.fishing_rod.enabled", false);
241242
config.save();
242243
config.reload();
243-
consoleMessage(Messenger.message("console.unsupported_version"));
244-
consoleMessage(Messenger.message("console.unsupported_sweep_attack"));
244+
consoleMessage(Messenger.message(MsgType.CONSOLE_UNSUPPORTED_VERSION));
245+
consoleMessage(Messenger.message(MsgType.CONSOLE_UNSUPPORTED_SWEEP_ATTACK));
245246
} else if (serverVersion("1.10")) {
246247
setBoolean("combat.settings.disable_sweep_attacks.enabled", false);
247248
setBoolean("recipes.enchanted_golden_apple", false);
248249
setBoolean("knockback.fishing_rod.enabled", false);
249250
config.save();
250251
config.reload();
251-
consoleMessage(Messenger.message("console.unsupported_version"));
252-
consoleMessage(Messenger.message("console.unsupported_sweep_attack"));
252+
consoleMessage(Messenger.message(MsgType.CONSOLE_UNSUPPORTED_VERSION));
253+
consoleMessage(Messenger.message(MsgType.CONSOLE_UNSUPPORTED_SWEEP_ATTACK));
253254
} else if (serverVersion("1.11")) {
254255
setBoolean("recipes.enchanted_golden_apple", false);
255256
setBoolean("knockback.fishing_rod.enabled", false);
256257
config.save();
257258
config.reload();
258-
consoleMessage(Messenger.message("console.unsupported_version"));
259+
consoleMessage(Messenger.message(MsgType.CONSOLE_UNSUPPORTED_VERSION));
259260
} else if (serverVersion("1.12")) {
260261
setBoolean("recipes.enchanted_golden_apple", false);
261262
setBoolean("knockback.fishing_rod.enabled", false);
262263
config.save();
263264
config.reload();
264-
consoleMessage(Messenger.message("console.unsupported_version"));
265+
consoleMessage(Messenger.message(MsgType.CONSOLE_UNSUPPORTED_VERSION));
265266
}
266267
}
267268

‎src/main/java/me/nik/combatplus/commands/CommandManager.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import me.nik.combatplus.CombatPlus;
44
import me.nik.combatplus.commands.subcommands.Menu;
55
import me.nik.combatplus.commands.subcommands.Reload;
6+
import me.nik.combatplus.managers.MsgType;
67
import me.nik.combatplus.utils.Messenger;
78
import org.bukkit.ChatColor;
89
import org.bukkit.command.Command;
@@ -33,11 +34,11 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
3334

3435
if (args[0].equalsIgnoreCase(subCommand.getName())) {
3536
if (!subCommand.canConsoleExecute() && sender instanceof ConsoleCommandSender) {
36-
sender.sendMessage(Messenger.message("console.commands"));
37+
sender.sendMessage(Messenger.message(MsgType.CONSOLE_COMMANDS));
3738
return true;
3839
}
3940
if (!sender.hasPermission(subCommand.getPermission())) {
40-
sender.sendMessage(Messenger.message("no_perm"));
41+
sender.sendMessage(Messenger.message(MsgType.NO_PERMISSION));
4142
return true;
4243
}
4344
subCommand.perform(sender, args);
@@ -74,7 +75,7 @@ public List<String> onTabComplete(CommandSender sender, Command command, String
7475

7576
private void helpMessage(CommandSender sender) {
7677
sender.sendMessage("");
77-
sender.sendMessage(Messenger.prefix(ChatColor.GRAY + "Available Commands"));
78+
sender.sendMessage(Messenger.message(MsgType.PREFIX) + ChatColor.GRAY + "Available Commands");
7879
sender.sendMessage("");
7980
for (int i = 0; i < getSubcommands().size(); i++) {
8081
sender.sendMessage(ChatColor.RED + getSubcommands().get(i).getSyntax() + ChatColor.DARK_GRAY + " - " + ChatColor.GRAY + getSubcommands().get(i).getDescription());
@@ -83,6 +84,6 @@ private void helpMessage(CommandSender sender) {
8384
}
8485

8586
private void pluginInfo(CommandSender sender) {
86-
sender.sendMessage(Messenger.prefix(ChatColor.GRAY + "You're running " + ChatColor.WHITE + plugin.getDescription().getName() + ChatColor.GRAY + " version " + ChatColor.RED + "v" + plugin.getDescription().getVersion() + ChatColor.GRAY + " by" + ChatColor.WHITE + " Nik"));
87+
sender.sendMessage(Messenger.message(MsgType.PREFIX) + ChatColor.GRAY + "You're running " + ChatColor.WHITE + plugin.getDescription().getName() + ChatColor.GRAY + " version " + ChatColor.RED + "v" + plugin.getDescription().getVersion() + ChatColor.GRAY + " by" + ChatColor.WHITE + " Nik");
8788
}
8889
}

‎src/main/java/me/nik/combatplus/commands/subcommands/Reload.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import me.nik.combatplus.CombatPlus;
44
import me.nik.combatplus.commands.SubCommand;
5+
import me.nik.combatplus.managers.MsgType;
56
import me.nik.combatplus.utils.Messenger;
67
import org.bukkit.command.CommandSender;
78

@@ -43,10 +44,10 @@ public boolean canConsoleExecute() {
4344
@Override
4445
public void perform(CommandSender sender, String[] args) {
4546
if (args.length == 1) {
46-
sender.sendMessage(Messenger.message("reloading"));
47+
sender.sendMessage(Messenger.message(MsgType.RELOADING));
4748
plugin.getServer().getPluginManager().disablePlugin(plugin);
4849
plugin.getServer().getPluginManager().enablePlugin(plugin);
49-
sender.sendMessage(Messenger.message("reloaded"));
50+
sender.sendMessage(Messenger.message(MsgType.RELOADED));
5051
}
5152
}
5253

‎src/main/java/me/nik/combatplus/files/Lang.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,16 @@ public void addDefaults() {
5252
Lang.get().addDefault("enderpearl_cooldown", "&fYou cannot use an Ender Pearl yet, You must wait %seconds% seconds.");
5353
Lang.get().addDefault("enderpearl_cooldown_actionbar", "&6You can use an Ender Pearl again in &a%seconds% &6seconds.");
5454
Lang.get().addDefault("cannot_craft_this", "&cYou cannot craft this item!");
55-
Lang.get().addDefault("gui.main", "&c&lCombatPlus Menu");
56-
Lang.get().addDefault("gui.plugin", "&c&lPlugin Settings");
57-
Lang.get().addDefault("gui.combat", "&c&lCombat Settings");
58-
Lang.get().addDefault("gui.general", "&c&lGeneral Settings");
59-
Lang.get().addDefault("console.update_not_found", "&6&lNo updates are found, You're running the Latest Version <3");
60-
Lang.get().addDefault("console.update_disabled", "&f&lUpdate Checker is Disabled, Skipping.");
61-
Lang.get().addDefault("console.commands", "&c&lYou cannot run this command through the console :(");
62-
Lang.get().addDefault("console.initialize", "&f&lInitializing Listeners...");
63-
Lang.get().addDefault("console.unsupported_version", "&c&lWARNING! You Are Using an Unsupported Version, Some Modules Have Been Skipped.");
64-
Lang.get().addDefault("console.unsupported_sweep_attack", "&c&lSweep Attacks Cannot be Disabled on your Minecraft Version, Skipping.");
65-
Lang.get().addDefault("console.disabled", "&f&lAll Player Stats Have Been Set Back To Their Default Values! Goodbye.");
55+
Lang.get().addDefault("gui_main", "&c&lCombatPlus Menu");
56+
Lang.get().addDefault("gui_plugin", "&c&lPlugin Settings");
57+
Lang.get().addDefault("gui_combat", "&c&lCombat Settings");
58+
Lang.get().addDefault("gui_general", "&c&lGeneral Settings");
59+
Lang.get().addDefault("console_update_not_found", "&6&lNo updates are found, You're running the Latest Version <3");
60+
Lang.get().addDefault("console_update_disabled", "&f&lUpdate Checker is Disabled, Skipping.");
61+
Lang.get().addDefault("console_commands", "&c&lYou cannot run this command through the console :(");
62+
Lang.get().addDefault("console_initialize", "&f&lInitializing Listeners...");
63+
Lang.get().addDefault("console_unsupported_version", "&c&lWARNING! You Are Using an Unsupported Version, Some Modules Have Been Skipped.");
64+
Lang.get().addDefault("console_unsupported_sweep_attack", "&c&lSweep Attacks Cannot be Disabled on your Minecraft Version, Skipping.");
65+
Lang.get().addDefault("console_disabled", "&f&lAll Player Stats Have Been Set Back To Their Default Values! Goodbye.");
6666
}
6767
}

‎src/main/java/me/nik/combatplus/gui/menus/CombatGui.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package me.nik.combatplus.gui.menus;
22

33
import me.nik.combatplus.CombatPlus;
4-
import me.nik.combatplus.files.Lang;
54
import me.nik.combatplus.gui.Menu;
65
import me.nik.combatplus.gui.PlayerMenuUtility;
6+
import me.nik.combatplus.managers.MsgType;
77
import me.nik.combatplus.utils.Messenger;
88
import org.bukkit.ChatColor;
99
import org.bukkit.Material;
@@ -21,7 +21,7 @@ public CombatGui(PlayerMenuUtility playerMenuUtility, CombatPlus plugin) {
2121

2222
@Override
2323
protected String getMenuName() {
24-
return Messenger.format(Lang.get().getString("gui.combat"));
24+
return Messenger.message(MsgType.GUI_COMBAT);
2525
}
2626

2727
@Override

‎src/main/java/me/nik/combatplus/gui/menus/GeneralGui.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package me.nik.combatplus.gui.menus;
22

33
import me.nik.combatplus.CombatPlus;
4-
import me.nik.combatplus.files.Lang;
54
import me.nik.combatplus.gui.Menu;
65
import me.nik.combatplus.gui.PlayerMenuUtility;
6+
import me.nik.combatplus.managers.MsgType;
77
import me.nik.combatplus.utils.Messenger;
88
import org.bukkit.ChatColor;
99
import org.bukkit.Material;
@@ -21,7 +21,7 @@ public GeneralGui(PlayerMenuUtility playerMenuUtility, CombatPlus plugin) {
2121

2222
@Override
2323
protected String getMenuName() {
24-
return Messenger.format(Lang.get().getString("gui.general"));
24+
return Messenger.message(MsgType.GUI_GENERAL);
2525
}
2626

2727
@Override

‎src/main/java/me/nik/combatplus/gui/menus/GeneralTwoGui.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package me.nik.combatplus.gui.menus;
22

33
import me.nik.combatplus.CombatPlus;
4-
import me.nik.combatplus.files.Lang;
54
import me.nik.combatplus.gui.Menu;
65
import me.nik.combatplus.gui.PlayerMenuUtility;
6+
import me.nik.combatplus.managers.MsgType;
77
import me.nik.combatplus.utils.Messenger;
88
import org.bukkit.ChatColor;
99
import org.bukkit.Material;
@@ -21,7 +21,7 @@ public GeneralTwoGui(PlayerMenuUtility playerMenuUtility, CombatPlus plugin) {
2121

2222
@Override
2323
protected String getMenuName() {
24-
return Messenger.format(Lang.get().getString("gui.general"));
24+
return Messenger.message(MsgType.GUI_GENERAL);
2525
}
2626

2727
@Override

‎src/main/java/me/nik/combatplus/gui/menus/MainGui.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package me.nik.combatplus.gui.menus;
22

33
import me.nik.combatplus.CombatPlus;
4-
import me.nik.combatplus.files.Lang;
54
import me.nik.combatplus.gui.Menu;
65
import me.nik.combatplus.gui.PlayerMenuUtility;
6+
import me.nik.combatplus.managers.MsgType;
77
import me.nik.combatplus.utils.Messenger;
88
import org.bukkit.ChatColor;
99
import org.bukkit.Material;
@@ -19,7 +19,7 @@ public MainGui(PlayerMenuUtility playerMenuUtility, CombatPlus plugin) {
1919

2020
@Override
2121
public String getMenuName() {
22-
return Messenger.format(Lang.get().getString("gui.main"));
22+
return Messenger.message(MsgType.GUI_MAIN);
2323
}
2424

2525
@Override
@@ -49,10 +49,10 @@ public void handleMenu(InventoryClickEvent e) {
4949
break;
5050
case "§cReload and Exit":
5151
p.closeInventory();
52-
p.sendMessage(Messenger.message("reloading"));
52+
p.sendMessage(Messenger.message(MsgType.RELOADING));
5353
plugin.getServer().getPluginManager().disablePlugin(plugin);
5454
plugin.getServer().getPluginManager().enablePlugin(plugin);
55-
p.sendMessage(Messenger.message("reloaded"));
55+
p.sendMessage(Messenger.message(MsgType.RELOADED));
5656
break;
5757
}
5858
}

‎src/main/java/me/nik/combatplus/gui/menus/PluginGui.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package me.nik.combatplus.gui.menus;
22

33
import me.nik.combatplus.CombatPlus;
4-
import me.nik.combatplus.files.Lang;
54
import me.nik.combatplus.gui.Menu;
65
import me.nik.combatplus.gui.PlayerMenuUtility;
6+
import me.nik.combatplus.managers.MsgType;
77
import me.nik.combatplus.utils.Messenger;
88
import org.bukkit.ChatColor;
99
import org.bukkit.Material;
@@ -22,7 +22,7 @@ public PluginGui(PlayerMenuUtility playerMenuUtility, CombatPlus plugin) {
2222

2323
@Override
2424
public String getMenuName() {
25-
return Messenger.format(Lang.get().getString("gui.plugin"));
25+
return Messenger.message(MsgType.GUI_PLUGIN);
2626
}
2727

2828
@Override

‎src/main/java/me/nik/combatplus/handlers/PapiHook.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,17 +49,17 @@ public String onPlaceholderRequest(Player player, String identifier) {
4949

5050
//Golden Apple Cooldown
5151
if (identifier.equalsIgnoreCase("goldenapple")) {
52-
return GoldenApple.PAPICOOLDOWN;
52+
return GoldenApple.papiCooldown;
5353
}
5454

5555
//Enchanted Golden Apple Cooldown
5656
if (identifier.equalsIgnoreCase("enchantedgoldenapple")) {
57-
return EnchantedGoldenApple.PAPICOOLDOWN;
57+
return EnchantedGoldenApple.papiCooldown;
5858
}
5959

6060
//Enderpearl Cooldown
6161
if (identifier.equalsIgnoreCase("enderpearl")) {
62-
return Enderpearl.PAPICOOLDOWN;
62+
return Enderpearl.papiCooldown;
6363
}
6464
return null;
6565
}

0 commit comments

Comments
 (0)