Skip to content

Commit 1e587f5

Browse files
NikV2NikV2
committed
Commit
1 parent 9a2827d commit 1e587f5

5 files changed

Lines changed: 39 additions & 34 deletions

File tree

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

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,13 @@
4242

4343
public final class CombatPlus extends JavaPlugin {
4444

45+
public Config config;
46+
public Lang lang;
47+
4548
@Override
4649
public void onEnable() {
50+
this.lang = new Lang();
51+
this.config = new Config();
4752

4853
//Load Files
4954
loadFiles();
@@ -87,24 +92,24 @@ public void onDisable() {
8792
setDefaultStats();
8893

8994
//Reload Files
90-
Config.reload();
91-
Config.save();
92-
Lang.reload();
93-
Lang.save();
95+
config.reload();
96+
config.save();
97+
lang.reload();
98+
lang.save();
9499

95100
//Done
96101
consoleMessage(Messenger.message("console.disabled"));
97102
}
98103

99104
private void loadFiles() {
100-
Config.setup();
101-
Config.addDefaults();
105+
config.setup();
106+
config.addDefaults();
102107
Config.get().options().copyDefaults(true);
103-
Config.save();
104-
Lang.setup();
105-
Lang.addDefaults();
108+
config.save();
109+
lang.setup();
110+
lang.addDefaults();
106111
Lang.get().options().copyDefaults(true);
107-
Lang.save();
112+
lang.save();
108113
}
109114

110115
private void checkForUpdates() {
@@ -230,36 +235,36 @@ private void checkSupported() {
230235
Config.get().set("golden_apple_cooldown.golden_apple.actionbar", false);
231236
Config.get().set("golden_apple_cooldown.enchanted_golden_apple.actionbar", false);
232237
Config.get().set("enderpearl_cooldown.actionbar", false);
233-
Config.save();
234-
Config.reload();
238+
config.save();
239+
config.reload();
235240
consoleMessage(Messenger.message("console.unsupported_version"));
236241
} else if (serverVersion("1.9")) {
237242
Config.get().set("combat.settings.disable_sweep_attacks.enabled", false);
238243
Config.get().set("recipes.enchanted_golden_apple", false);
239244
Config.get().set("knockback.fishing_rod.enabled", false);
240-
Config.save();
241-
Config.reload();
245+
config.save();
246+
config.reload();
242247
consoleMessage(Messenger.message("console.unsupported_version"));
243248
consoleMessage(Messenger.message("console.unsupported_sweep_attack"));
244249
} else if (serverVersion("1.10")) {
245250
Config.get().set("combat.settings.disable_sweep_attacks.enabled", false);
246251
Config.get().set("recipes.enchanted_golden_apple", false);
247252
Config.get().set("knockback.fishing_rod.enabled", false);
248-
Config.save();
249-
Config.reload();
253+
config.save();
254+
config.reload();
250255
consoleMessage(Messenger.message("console.unsupported_version"));
251256
consoleMessage(Messenger.message("console.unsupported_sweep_attack"));
252257
} else if (serverVersion("1.11")) {
253258
Config.get().set("recipes.enchanted_golden_apple", false);
254259
Config.get().set("knockback.fishing_rod.enabled", false);
255-
Config.save();
256-
Config.reload();
260+
config.save();
261+
config.reload();
257262
consoleMessage(Messenger.message("console.unsupported_version"));
258263
} else if (serverVersion("1.12")) {
259264
Config.get().set("recipes.enchanted_golden_apple", false);
260265
Config.get().set("knockback.fishing_rod.enabled", false);
261-
Config.save();
262-
Config.reload();
266+
config.save();
267+
config.reload();
263268
consoleMessage(Messenger.message("console.unsupported_version"));
264269
}
265270
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
import java.util.List;
1010

1111
public class Config {
12-
private static File file;
12+
private File file;
1313
private static FileConfiguration config;
1414

15-
public static void setup() {
15+
public void setup() {
1616
file = new File(Bukkit.getServer().getPluginManager().getPlugin("CombatPlus").getDataFolder(), "config.yml");
1717
if (!file.exists()) {
1818
try {
@@ -27,18 +27,18 @@ public static FileConfiguration get() {
2727
return config;
2828
}
2929

30-
public static void save() {
30+
public void save() {
3131
try {
3232
config.save(file);
3333
} catch (IOException ignored) {
3434
}
3535
}
3636

37-
public static void reload() {
37+
public void reload() {
3838
config = YamlConfiguration.loadConfiguration(file);
3939
}
4040

41-
public static void addDefaults() {
41+
public void addDefaults() {
4242
//config.yml
4343
//string lists
4444
List<String> combatList = Config.get().getStringList("combat.settings.disabled_worlds");

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
import java.io.IOException;
99

1010
public class Lang {
11-
private static File file;
11+
private File file;
1212
private static FileConfiguration lang;
1313

14-
public static void setup() {
14+
public void setup() {
1515
file = new File(Bukkit.getServer().getPluginManager().getPlugin("CombatPlus").getDataFolder(), "lang.yml");
1616
if (!file.exists()) {
1717
try {
@@ -26,18 +26,18 @@ public static FileConfiguration get() {
2626
return lang;
2727
}
2828

29-
public static void save() {
29+
public void save() {
3030
try {
3131
lang.save(file);
3232
} catch (IOException ignored) {
3333
}
3434
}
3535

36-
public static void reload() {
36+
public void reload() {
3737
lang = YamlConfiguration.loadConfiguration(file);
3838
}
3939

40-
public static void addDefaults() {
40+
public void addDefaults() {
4141
//lang.yml
4242
Lang.get().options().header("+----------------------------------------------------------------------------------------------+" + "\n" + "| |" + "\n" + "| Combat Plus |" + "\n" + "| |" + "\n" + "| Discord: https://discord.gg/m7j2Y9H |" + "\n" + "| |" + "\n" + "| Author: Nik |" + "\n" + "| |" + "\n" + "+----------------------------------------------------------------------------------------------+" + "\n");
4343
Lang.get().addDefault("prefix", "&f&l[&cCombat+&f&l]&f: ");

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,8 @@ private void booleanSet(String path, boolean value) {
186186
}
187187

188188
private void saveAndReload() {
189-
Config.save();
190-
Config.reload();
191-
Config.save();
189+
plugin.config.save();
190+
plugin.config.reload();
191+
plugin.config.save();
192192
}
193193
}

‎src/main/resources/plugin.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: CombatPlus
2-
version: 1.3.5
2+
version: 1.3.6
33
main: me.nik.combatplus.CombatPlus
44
api-version: 1.13
55
authors: [Nik]

0 commit comments

Comments
 (0)