Skip to content

Commit 7c0eecd

Browse files
NikV2NikV2
committed
Commit
1 parent 2797579 commit 7c0eecd

21 files changed

Lines changed: 253 additions & 320 deletions

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

Lines changed: 37 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import me.nik.combatplus.managers.MsgType;
2323
import me.nik.combatplus.utils.ACManager;
2424
import me.nik.combatplus.utils.CustomRecipes;
25-
import me.nik.combatplus.utils.Messenger;
2625
import me.nik.combatplus.utils.MiscUtils;
2726
import me.nik.combatplus.utils.ResetStats;
2827
import me.nik.combatplus.utils.SetAttackSpeed;
@@ -60,7 +59,7 @@ public void onDisable() {
6059
lang.save();
6160

6261
//Done
63-
consoleMessage(Messenger.message(MsgType.CONSOLE_DISABLED));
62+
consoleMessage(MsgType.CONSOLE_DISABLED.getMessage());
6463
}
6564

6665
@Override
@@ -125,10 +124,6 @@ public void reloadConfig() {
125124
config.reload();
126125
}
127126

128-
public void setupConfig() {
129-
config.setup(this);
130-
}
131-
132127
/**
133128
* Load all the built-in files
134129
*/
@@ -147,7 +142,7 @@ private void checkForUpdates() {
147142
if (isEnabled("settings.check_for_updates")) {
148143
BukkitTask updateChecker = new UpdateChecker(this).runTaskAsynchronously(this);
149144
} else {
150-
consoleMessage(Messenger.message(MsgType.CONSOLE_UPDATE_DISABLED));
145+
consoleMessage(MsgType.CONSOLE_UPDATE_DISABLED.getMessage());
151146
}
152147
}
153148

@@ -194,7 +189,7 @@ private void loadStats() {
194189
* Initialize enabled Listeners
195190
*/
196191
private void initialize() {
197-
consoleMessage(Messenger.message(MsgType.CONSOLE_INITIALIZE));
192+
consoleMessage(MsgType.CONSOLE_INITIALIZE.getMessage());
198193

199194
if (isEnabled("combat.settings.old_pvp") || isEnabled("custom.player_health.enabled")) {
200195
registerEvent(new AttributesSet(this));
@@ -250,51 +245,51 @@ private void initialize() {
250245
*/
251246
private void checkSupported() {
252247
if (serverVersion("1.8")) {
253-
setBoolean("combat.settings.old_pvp", false);
254-
setBoolean("combat.settings.old_weapon_damage", false);
255-
setBoolean("combat.settings.old_tool_damage", false);
256-
setBoolean("combat.settings.old_sharpness", false);
257-
setBoolean("combat.settings.disable_sweep_attacks.enabled", false);
258-
setBoolean("combat.settings.old_player_regen", false);
259-
setBoolean("custom.player_health.enabled", false);
260-
setBoolean("disable_offhand.enabled", false);
261-
setBoolean("recipes.enchanted_golden_apple", false);
262-
setBoolean("knockback.fishing_rod.enabled", false);
263-
setBoolean("golden_apple_cooldown.golden_apple.actionbar", false);
264-
setBoolean("golden_apple_cooldown.enchanted_golden_apple.actionbar", false);
265-
setBoolean("enderpearl_cooldown.actionbar", false);
266-
setBoolean("combat.settings.sword_blocking.enabled", false);
248+
setFalse("combat.settings.old_pvp");
249+
setFalse("combat.settings.old_weapon_damage");
250+
setFalse("combat.settings.old_tool_damage");
251+
setFalse("combat.settings.old_sharpness");
252+
setFalse("combat.settings.disable_sweep_attacks.enabled");
253+
setFalse("combat.settings.old_player_regen");
254+
setFalse("custom.player_health.enabled");
255+
setFalse("disable_offhand.enabled");
256+
setFalse("recipes.enchanted_golden_apple");
257+
setFalse("knockback.fishing_rod.enabled");
258+
setFalse("golden_apple_cooldown.golden_apple.actionbar");
259+
setFalse("golden_apple_cooldown.enchanted_golden_apple.actionbar");
260+
setFalse("enderpearl_cooldown.actionbar");
261+
setFalse("combat.settings.sword_blocking.enabled");
267262
config.save();
268263
config.reload();
269-
consoleMessage(Messenger.message(MsgType.CONSOLE_UNSUPPORTED_VERSION));
264+
consoleMessage(MsgType.CONSOLE_UNSUPPORTED_VERSION.getMessage());
270265
} else if (serverVersion("1.9")) {
271-
setBoolean("combat.settings.disable_sweep_attacks.enabled", false);
272-
setBoolean("recipes.enchanted_golden_apple", false);
273-
setBoolean("knockback.fishing_rod.enabled", false);
266+
setFalse("combat.settings.disable_sweep_attacks.enabled");
267+
setFalse("recipes.enchanted_golden_apple");
268+
setFalse("knockback.fishing_rod.enabled");
274269
config.save();
275270
config.reload();
276-
consoleMessage(Messenger.message(MsgType.CONSOLE_UNSUPPORTED_VERSION));
277-
consoleMessage(Messenger.message(MsgType.CONSOLE_UNSUPPORTED_SWEEP_ATTACK));
271+
consoleMessage(MsgType.CONSOLE_UNSUPPORTED_VERSION.getMessage());
272+
consoleMessage(MsgType.CONSOLE_UNSUPPORTED_SWEEP_ATTACK.getMessage());
278273
} else if (serverVersion("1.10")) {
279-
setBoolean("combat.settings.disable_sweep_attacks.enabled", false);
280-
setBoolean("recipes.enchanted_golden_apple", false);
281-
setBoolean("knockback.fishing_rod.enabled", false);
274+
setFalse("combat.settings.disable_sweep_attacks.enabled");
275+
setFalse("recipes.enchanted_golden_apple");
276+
setFalse("knockback.fishing_rod.enabled");
282277
config.save();
283278
config.reload();
284-
consoleMessage(Messenger.message(MsgType.CONSOLE_UNSUPPORTED_VERSION));
285-
consoleMessage(Messenger.message(MsgType.CONSOLE_UNSUPPORTED_SWEEP_ATTACK));
279+
consoleMessage(MsgType.CONSOLE_UNSUPPORTED_VERSION.getMessage());
280+
consoleMessage(MsgType.CONSOLE_UNSUPPORTED_SWEEP_ATTACK.getMessage());
286281
} else if (serverVersion("1.11")) {
287-
setBoolean("recipes.enchanted_golden_apple", false);
288-
setBoolean("knockback.fishing_rod.enabled", false);
282+
setFalse("recipes.enchanted_golden_apple");
283+
setFalse("knockback.fishing_rod.enabled");
289284
config.save();
290285
config.reload();
291-
consoleMessage(Messenger.message(MsgType.CONSOLE_UNSUPPORTED_VERSION));
286+
consoleMessage(MsgType.CONSOLE_UNSUPPORTED_VERSION.getMessage());
292287
} else if (serverVersion("1.12")) {
293-
setBoolean("recipes.enchanted_golden_apple", false);
294-
setBoolean("knockback.fishing_rod.enabled", false);
288+
setFalse("recipes.enchanted_golden_apple");
289+
setFalse("knockback.fishing_rod.enabled");
295290
config.save();
296291
config.reload();
297-
consoleMessage(Messenger.message(MsgType.CONSOLE_UNSUPPORTED_VERSION));
292+
consoleMessage(MsgType.CONSOLE_UNSUPPORTED_VERSION.getMessage());
298293
}
299294
}
300295

@@ -324,11 +319,10 @@ private boolean isEnabled(String path) {
324319
}
325320

326321
/**
327-
* @param path Path to the boolean
328-
* @param value true/false
322+
* @param path Path to the boolean
329323
*/
330-
private void setBoolean(String path, boolean value) {
331-
config.get().set(path, value);
324+
private void setFalse(String path) {
325+
config.get().set(path, false);
332326
}
333327

334328
/**

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

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

3534
if (args[0].equalsIgnoreCase(subCommand.getName())) {
3635
if (!subCommand.canConsoleExecute() && sender instanceof ConsoleCommandSender) {
37-
sender.sendMessage(Messenger.message(MsgType.CONSOLE_COMMANDS));
36+
sender.sendMessage(MsgType.CONSOLE_COMMANDS.getMessage());
3837
return true;
3938
}
4039
if (!sender.hasPermission(subCommand.getPermission())) {
41-
sender.sendMessage(Messenger.message(MsgType.NO_PERMISSION));
40+
sender.sendMessage(MsgType.NO_PERMISSION.getMessage());
4241
return true;
4342
}
4443
subCommand.perform(sender, args);
@@ -75,7 +74,7 @@ public List<String> onTabComplete(CommandSender sender, Command command, String
7574

7675
private void helpMessage(CommandSender sender) {
7776
sender.sendMessage("");
78-
sender.sendMessage(Messenger.message(MsgType.PREFIX) + ChatColor.GRAY + "Available Commands");
77+
sender.sendMessage(MsgType.PREFIX.getMessage() + ChatColor.GRAY + "Available Commands");
7978
sender.sendMessage("");
8079
for (int i = 0; i < getSubcommands().size(); i++) {
8180
sender.sendMessage(ChatColor.RED + getSubcommands().get(i).getSyntax() + ChatColor.DARK_GRAY + " - " + ChatColor.GRAY + getSubcommands().get(i).getDescription());
@@ -84,6 +83,6 @@ private void helpMessage(CommandSender sender) {
8483
}
8584

8685
private void pluginInfo(CommandSender sender) {
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");
86+
sender.sendMessage(MsgType.PREFIX.getMessage() + 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");
8887
}
89-
}
88+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,4 @@ public void perform(CommandSender sender, String[] args) {
5454
public List<String> getSubcommandArguments(CommandSender sender, String[] args) {
5555
return null;
5656
}
57-
}
57+
}

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import me.nik.combatplus.CombatPlus;
44
import me.nik.combatplus.commands.SubCommand;
55
import me.nik.combatplus.managers.MsgType;
6-
import me.nik.combatplus.utils.Messenger;
76
import org.bukkit.command.CommandSender;
87

98
import java.util.List;
@@ -44,15 +43,15 @@ public boolean canConsoleExecute() {
4443
@Override
4544
public void perform(CommandSender sender, String[] args) {
4645
if (args.length == 1) {
47-
sender.sendMessage(Messenger.message(MsgType.RELOADING));
46+
sender.sendMessage(MsgType.RELOADING.getMessage());
4847
plugin.getServer().getPluginManager().disablePlugin(plugin);
4948
plugin.getServer().getPluginManager().enablePlugin(plugin);
50-
sender.sendMessage(Messenger.message(MsgType.RELOADED));
49+
sender.sendMessage(MsgType.RELOADED.getMessage());
5150
}
5251
}
5352

5453
@Override
5554
public List<String> getSubcommandArguments(CommandSender sender, String[] args) {
5655
return null;
5756
}
58-
}
57+
}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ public void reload() {
3939
}
4040

4141
public void addDefaults() {
42-
//config.yml
43-
//string lists
4442
List<String> combatList = get().getStringList("combat.settings.disabled_worlds");
4543
combatList.add("example_world");
4644
List<String> gappleList = get().getStringList("general.settings.golden_apple_cooldown.disabled_worlds");

‎src/main/java/me/nik/combatplus/gui/Menu.java‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package me.nik.combatplus.gui;
22

33
import me.nik.combatplus.CombatPlus;
4+
import me.nik.combatplus.utils.Messenger;
45
import org.bukkit.Bukkit;
56
import org.bukkit.Material;
67
import org.bukkit.event.inventory.InventoryClickEvent;
@@ -10,6 +11,7 @@
1011
import org.bukkit.inventory.meta.ItemMeta;
1112

1213
import java.util.ArrayList;
14+
import java.util.List;
1315

1416
public abstract class Menu implements InventoryHolder {
1517

@@ -40,12 +42,18 @@ public void open() {
4042
playerMenuUtility.getOwner().openInventory(inventory);
4143
}
4244

43-
protected ItemStack makeItem(Material material, int amount, String displayName, ArrayList<String> lore) {
45+
protected ItemStack makeItem(Material material, int amount, String displayName, List<String> lore) {
4446

4547
ItemStack item = new ItemStack(material, amount);
4648
ItemMeta itemMeta = item.getItemMeta();
47-
itemMeta.setDisplayName(displayName);
48-
itemMeta.setLore(lore);
49+
itemMeta.setDisplayName(Messenger.format(displayName));
50+
if (lore != null) {
51+
List<String> loreList = new ArrayList<>();
52+
for (String l : lore) {
53+
loreList.add(Messenger.format(l));
54+
}
55+
itemMeta.setLore(loreList);
56+
}
4957
item.setItemMeta(itemMeta);
5058

5159
return item;
@@ -66,7 +74,6 @@ protected void booleanSet(String path, boolean value) {
6674
protected void saveAndReload() {
6775
plugin.saveConfig();
6876
plugin.reloadConfig();
69-
plugin.setupConfig();
7077
}
7178

7279
/**
@@ -78,4 +85,4 @@ protected void saveAndReload() {
7885
public Inventory getInventory() {
7986
return inventory;
8087
}
81-
}
88+
}

0 commit comments

Comments
 (0)