Skip to content

Commit 9abcf32

Browse files
NikV2NikV2
committed
Commit
1 parent 8244f34 commit 9abcf32

4 files changed

Lines changed: 44 additions & 18 deletions

File tree

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

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ public void onEnable() {
4545
loadFiles();
4646

4747
//Startup Message
48-
System.out.println();
49-
System.out.println(" " + ChatColor.RED + "CombatPlus " + ChatColor.UNDERLINE + "v" + this.getDescription().getVersion());
50-
System.out.println();
51-
System.out.println(" " + ChatColor.BOLD + "Author: " + ChatColor.UNDERLINE + "Nik");
52-
System.out.println();
48+
consoleMessage("");
49+
consoleMessage(" " + ChatColor.RED + "CombatPlus " + ChatColor.UNDERLINE + "v" + this.getDescription().getVersion());
50+
consoleMessage("");
51+
consoleMessage(" " + ChatColor.BOLD + "Author: " + ChatColor.UNDERLINE + "Nik");
52+
consoleMessage("");
5353

5454
//Unsupported Version Checker
5555
checkSupported();
@@ -83,10 +83,10 @@ public void onDisable() {
8383

8484
//Unload Instances
8585
instance = null;
86-
this.getCommand("combatplus").setExecutor(null);
86+
getCommand("combatplus").setExecutor(null);
8787

8888
//Done
89-
System.out.println(Messenger.message("console.disabled"));
89+
consoleMessage(Messenger.message("console.disabled"));
9090
}
9191

9292
public static CombatPlus getInstance() {
@@ -109,7 +109,7 @@ private void checkForUpdates() {
109109
BukkitTask updateChecker = new UpdateChecker(this).runTaskAsynchronously(this);
110110
registerEvent(new UpdateReminder());
111111
} else {
112-
System.out.println(Messenger.message("console.update_disabled"));
112+
consoleMessage(Messenger.message("console.update_disabled"));
113113
}
114114
}
115115

@@ -150,7 +150,8 @@ private void loadStats() {
150150
}
151151

152152
private void initialize() {
153-
System.out.println(Messenger.message("console.initialize"));
153+
consoleMessage(Messenger.message("console.initialize"));
154+
154155
if (isEnabled("combat.settings.old_pvp") || isEnabled("custom.player_health.enabled")) {
155156
registerEvent(new AttributesSet(this));
156157
}
@@ -194,7 +195,10 @@ private void initialize() {
194195
registerEvent(new Enderpearl(this));
195196
}
196197
if (isEnabled("recipes.enchanted_golden_apple")) {
197-
Bukkit.addRecipe(new CustomRecipes(this).enchantedGoldenAppleRecipe());
198+
try {
199+
this.getServer().addRecipe(new CustomRecipes(this).enchantedGoldenAppleRecipe());
200+
} catch (Exception ignored) {
201+
}
198202
}
199203
//GUI Listener (Do not remove this, idiot nik)
200204
registerEvent(new GUIListener(this));
@@ -216,7 +220,7 @@ private void checkSupported() {
216220
Config.get().set("recipes.enchanted_golden_apple", false);
217221
Config.save();
218222
Config.reload();
219-
System.out.println(Messenger.message("console.unsupported_version"));
223+
consoleMessage(Messenger.message("console.unsupported_version"));
220224
} else if (serverVersion("1.9")) {
221225
Config.get().set("combat.settings.disable_sweep_attacks.enabled", false);
222226
Config.get().set("golden_apple_cooldown.enchanted_golden_apple.enabled", false);
@@ -225,31 +229,31 @@ private void checkSupported() {
225229
Config.get().set("recipes.enchanted_golden_apple", false);
226230
Config.save();
227231
Config.reload();
228-
System.out.println(Messenger.message("console.unsupported_version"));
229-
System.out.println(Messenger.message("console.unsupported_sweep_attack"));
232+
consoleMessage(Messenger.message("console.unsupported_version"));
233+
consoleMessage(Messenger.message("console.unsupported_sweep_attack"));
230234
} else if (serverVersion("1.10")) {
231235
Config.get().set("combat.settings.disable_sweep_attacks.enabled", false);
232236
Config.get().set("golden_apple_cooldown.enchanted_golden_apple.enabled", false);
233237
Config.get().set("golden_apple_cooldown.golden_apple.enabled", false);
234238
Config.get().set("recipes.enchanted_golden_apple", false);
235239
Config.save();
236240
Config.reload();
237-
System.out.println(Messenger.message("console.unsupported_version"));
238-
System.out.println(Messenger.message("console.unsupported_sweep_attack"));
241+
consoleMessage(Messenger.message("console.unsupported_version"));
242+
consoleMessage(Messenger.message("console.unsupported_sweep_attack"));
239243
} else if (serverVersion("1.11")) {
240244
Config.get().set("golden_apple_cooldown.enchanted_golden_apple.enabled", false);
241245
Config.get().set("golden_apple_cooldown.golden_apple.enabled", false);
242246
Config.get().set("recipes.enchanted_golden_apple", false);
243247
Config.save();
244248
Config.reload();
245-
System.out.println(Messenger.message("console.unsupported_version"));
249+
consoleMessage(Messenger.message("console.unsupported_version"));
246250
} else if (serverVersion("1.12")) {
247251
Config.get().set("golden_apple_cooldown.enchanted_golden_apple.enabled", false);
248252
Config.get().set("golden_apple_cooldown.golden_apple.enabled", false);
249253
Config.get().set("recipes.enchanted_golden_apple", false);
250254
Config.save();
251255
Config.reload();
252-
System.out.println(Messenger.message("console.unsupported_version"));
256+
consoleMessage(Messenger.message("console.unsupported_version"));
253257
}
254258
}
255259

@@ -264,4 +268,8 @@ private void registerEvent(Listener listener) {
264268
private boolean isEnabled(String path) {
265269
return Config.get().getBoolean(path);
266270
}
271+
272+
private void consoleMessage(String message) {
273+
this.getServer().getConsoleSender().sendMessage(message);
274+
}
267275
}

‎src/main/java/me/nik/combatplus/api/GUIManager.java‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -440,6 +440,20 @@ public void run() {
440440
auraMeta.setLore(auraLore);
441441
aura.setItemMeta(auraMeta);
442442

443+
//enchanted golden apple crafting
444+
ItemStack ega = new ItemStack(Material.PAPER, 1);
445+
ItemMeta egaMeta = ega.getItemMeta();
446+
egaMeta.setDisplayName("§6Enchanted Golden Apple Crafting");
447+
ArrayList<String> egaLore = new ArrayList<>();
448+
egaLore.add("");
449+
egaLore.add(ChatColor.GRAY + "Currently set to: " + ChatColor.GREEN + isEnabled("recipes.enchanted_golden_apple"));
450+
egaLore.add("");
451+
egaLore.add(ChatColor.WHITE + "Makes Enchanted Golden Apples");
452+
egaLore.add(ChatColor.WHITE + "Able to be Crafted");
453+
egaMeta.setLore(egaLore);
454+
ega.setItemMeta(egaMeta);
455+
456+
generalTwoGUI.setItem(16, ega);
443457
generalTwoGUI.setItem(14, aura);
444458
generalTwoGUI.setItem(12, hs);
445459
generalTwoGUI.setItem(10, crit);

‎src/main/java/me/nik/combatplus/listeners/GUIListener.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,10 @@ public void onClick(InventoryClickEvent e) {
152152
booleanSet("fixes.kill_aura", !configBoolean("fixes.kill_aura"));
153153
saveAndReload();
154154
break;
155+
case "§6Enchanted Golden Apple Crafting":
156+
booleanSet("recipes.enchanted_golden_apple", !configBoolean("recipes.enchanted_golden_apple"));
157+
saveAndReload();
158+
break;
155159
}
156160
e.setCancelled(true);
157161
if (e.getClick() == ClickType.SHIFT_RIGHT) {

‎src/main/resources/plugin.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ main: me.nik.combatplus.CombatPlus
44
api-version: 1.13
55
authors: [Nik]
66
prefix: CombatPlus
7-
load: STARTUP
7+
load: POSTWORLD
88
description: The all in one Combat System!
99
website: https://discord.gg/m7j2Y9H
1010
commands:

0 commit comments

Comments
 (0)