Skip to content

Commit 2797579

Browse files
NikV2NikV2
committed
Commit
1 parent 7106526 commit 2797579

5 files changed

Lines changed: 250 additions & 125 deletions

File tree

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

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,39 @@
3939

4040
public final class CombatPlus extends JavaPlugin {
4141

42+
private static CombatPlus instance;
43+
4244
private Config config;
4345
private Lang lang;
4446

47+
public static CombatPlus getInstance() {
48+
return instance;
49+
}
50+
51+
@Override
52+
public void onDisable() {
53+
//Load Default Stats to avoid server damage
54+
setDefaultStats();
55+
56+
//Reload Files
57+
config.reload();
58+
config.save();
59+
lang.reload();
60+
lang.save();
61+
62+
//Done
63+
consoleMessage(Messenger.message(MsgType.CONSOLE_DISABLED));
64+
}
65+
4566
@Override
4667
public void onEnable() {
68+
instance = this;
4769
this.lang = new Lang();
4870
this.config = new Config();
4971

5072
//Load Files
5173
loadFiles();
5274

53-
Messenger.initialize(lang, config);
54-
5575
//Startup Message
5676
consoleMessage("");
5777
consoleMessage(" " + ChatColor.RED + "Combat Plus v" + this.getDescription().getVersion());
@@ -85,26 +105,16 @@ public void onEnable() {
85105
//Hook AntiCheats
86106
new ACManager().hookMatrixAC();
87107
}
88-
@Override
89-
public void onDisable() {
90-
//Load Default Stats to avoid server damage
91-
setDefaultStats();
92-
93-
//Reload Files
94-
config.reload();
95-
config.save();
96-
lang.reload();
97-
lang.save();
98-
99-
//Done
100-
consoleMessage(Messenger.message(MsgType.CONSOLE_DISABLED));
101-
}
102108

103109
@Override
104110
public FileConfiguration getConfig() {
105111
return config.get();
106112
}
107113

114+
public Lang getLang() {
115+
return lang;
116+
}
117+
108118
@Override
109119
public void saveConfig() {
110120
config.save();

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

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,36 @@ public void addDefaults() {
9999
get().addDefault("custom.player_health.max_health", 20);
100100
get().addDefault("advanced.settings.old_pvp.attack_speed", 24);
101101
get().addDefault("advanced.settings.new_pvp.attack_speed", 4);
102-
get().addDefault("advanced.settings.modifiers.old_swords_damage", 1);
103-
get().addDefault("advanced.settings.modifiers.old_shovels_damage", -0.5);
104-
get().addDefault("advanced.settings.modifiers.old_axes_damage", -2);
105-
get().addDefault("advanced.settings.modifiers.old_pickaxes_damage", 1);
102+
get().addDefault("advanced.settings.modifiers.netherite_sword", 1);
103+
get().addDefault("advanced.settings.modifiers.diamond_sword", 1);
104+
get().addDefault("advanced.settings.modifiers.golden_sword", 1);
105+
get().addDefault("advanced.settings.modifiers.iron_sword", 1);
106+
get().addDefault("advanced.settings.modifiers.stone_sword", 1);
107+
get().addDefault("advanced.settings.modifiers.wooden_sword", 1);
108+
get().addDefault("advanced.settings.modifiers.netherite_shovel", 0.5);
109+
get().addDefault("advanced.settings.modifiers.diamond_shovel", 0.5);
110+
get().addDefault("advanced.settings.modifiers.golden_shovel", 0.5);
111+
get().addDefault("advanced.settings.modifiers.iron_shovel", 0.5);
112+
get().addDefault("advanced.settings.modifiers.stone_shovel", 0.5);
113+
get().addDefault("advanced.settings.modifiers.wooden_shovel", 0.5);
114+
get().addDefault("advanced.settings.modifiers.netherite_axe", -2);
115+
get().addDefault("advanced.settings.modifiers.diamond_axe", -2);
116+
get().addDefault("advanced.settings.modifiers.golden_axe", -2);
117+
get().addDefault("advanced.settings.modifiers.iron_axe", -2);
118+
get().addDefault("advanced.settings.modifiers.stone_axe", -2);
119+
get().addDefault("advanced.settings.modifiers.wooden_axe", -2);
120+
get().addDefault("advanced.settings.modifiers.netherite_pickaxe", 1);
121+
get().addDefault("advanced.settings.modifiers.diamond_pickaxe", 1);
122+
get().addDefault("advanced.settings.modifiers.golden_pickaxe", 1);
123+
get().addDefault("advanced.settings.modifiers.iron_pickaxe", 1);
124+
get().addDefault("advanced.settings.modifiers.stone_pickaxe", 1);
125+
get().addDefault("advanced.settings.modifiers.wooden_pickaxe", 1);
126+
get().addDefault("advanced.settings.modifiers.netherite_hoe", 0);
127+
get().addDefault("advanced.settings.modifiers.diamond_hoe", 0);
128+
get().addDefault("advanced.settings.modifiers.golden_hoe", 0);
129+
get().addDefault("advanced.settings.modifiers.iron_hoe", 0);
130+
get().addDefault("advanced.settings.modifiers.stone_hoe", 0);
131+
get().addDefault("advanced.settings.modifiers.wooden_hoe", 0);
106132
get().addDefault("advanced.settings.old_regen.frequency", 3);
107133
get().addDefault("advanced.settings.old_regen.amount", 1);
108134
get().addDefault("advanced.settings.old_regen.exhaustion", 3);

0 commit comments

Comments
 (0)