Skip to content

Commit 737cd9d

Browse files
NikV2NikV2
committed
Commit
1 parent a7b421d commit 737cd9d

21 files changed

Lines changed: 364 additions & 273 deletions

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

Lines changed: 44 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,15 @@
3232
import org.bukkit.ChatColor;
3333
import org.bukkit.attribute.Attribute;
3434
import org.bukkit.attribute.AttributeInstance;
35+
import org.bukkit.configuration.file.FileConfiguration;
3536
import org.bukkit.event.Listener;
3637
import org.bukkit.plugin.java.JavaPlugin;
3738
import org.bukkit.scheduler.BukkitTask;
3839

3940
public final class CombatPlus extends JavaPlugin {
4041

41-
public Config config;
42-
public Lang lang;
42+
private Config config;
43+
private Lang lang;
4344

4445
@Override
4546
public void onEnable() {
@@ -62,6 +63,8 @@ public void onEnable() {
6263
//Load Commands
6364
getCommand("combatplus").setExecutor(new CommandManager(this));
6465

66+
Messenger.initialize(lang, config);
67+
6568
//Load Listeners
6669
initialize();
6770

@@ -97,17 +100,36 @@ public void onDisable() {
97100
consoleMessage(Messenger.message(MsgType.CONSOLE_DISABLED));
98101
}
99102

103+
@Override
104+
public FileConfiguration getConfig() {
105+
return config.get();
106+
}
107+
108+
@Override
109+
public void saveConfig() {
110+
config.save();
111+
}
112+
113+
@Override
114+
public void reloadConfig() {
115+
config.reload();
116+
}
117+
118+
public void setupConfig() {
119+
config.setup(this);
120+
}
121+
100122
/**
101123
* Load all the built-in files
102124
*/
103125
private void loadFiles() {
104126
config.setup(this);
105127
config.addDefaults();
106-
Config.get().options().copyDefaults(true);
128+
config.get().options().copyDefaults(true);
107129
config.save();
108130
lang.setup(this);
109131
lang.addDefaults();
110-
Lang.get().options().copyDefaults(true);
132+
lang.get().options().copyDefaults(true);
111133
lang.save();
112134
}
113135

@@ -125,10 +147,10 @@ private void checkForUpdates() {
125147
private void setDefaultStats() {
126148
if (serverVersion("1.8")) return;
127149
Bukkit.getOnlinePlayers().forEach(player -> {
128-
final double defaultHealth = Config.get().getDouble("advanced.settings.base_player_health");
150+
final double defaultHealth = config.get().getDouble("advanced.settings.base_player_health");
129151
final AttributeInstance playerMaxHealth = player.getAttribute(Attribute.GENERIC_MAX_HEALTH);
130152
playerMaxHealth.setBaseValue(defaultHealth);
131-
final double defaultAttSpd = Config.get().getDouble("advanced.settings.new_pvp.attack_speed");
153+
final double defaultAttSpd = config.get().getDouble("advanced.settings.new_pvp.attack_speed");
132154
final AttributeInstance playerAttSpeed = player.getAttribute(Attribute.GENERIC_ATTACK_SPEED);
133155
playerAttSpeed.setBaseValue(defaultAttSpd);
134156
player.saveData();
@@ -141,20 +163,20 @@ private void setDefaultStats() {
141163
*/
142164
private void loadStats() {
143165
if (serverVersion("1.8")) return;
144-
SetAttackSpeed setAttackSpeed = new SetAttackSpeed();
145-
ResetStats resetStats = new ResetStats();
146-
SetCustomHealth setCustomHealth = new SetCustomHealth();
166+
SetAttackSpeed setAttackSpeed = new SetAttackSpeed(this);
167+
ResetStats resetStats = new ResetStats(this);
168+
SetCustomHealth setCustomHealth = new SetCustomHealth(this);
147169

148170
if (isEnabled("combat.settings.old_pvp")) {
149-
Bukkit.getOnlinePlayers().forEach(setAttackSpeed::setAttackSpd);
171+
this.getServer().getOnlinePlayers().forEach(setAttackSpeed::setAttackSpd);
150172
} else {
151-
Bukkit.getOnlinePlayers().forEach(resetStats::resetAttackSpeed);
173+
this.getServer().getOnlinePlayers().forEach(resetStats::resetAttackSpeed);
152174
}
153175

154176
if (isEnabled("custom.player_health.enabled")) {
155-
Bukkit.getOnlinePlayers().forEach(setCustomHealth::setHealth);
177+
this.getServer().getOnlinePlayers().forEach(setCustomHealth::setHealth);
156178
} else {
157-
Bukkit.getOnlinePlayers().forEach(resetStats::resetMaxHealth);
179+
this.getServer().getOnlinePlayers().forEach(resetStats::resetMaxHealth);
158180
}
159181
}
160182

@@ -165,25 +187,25 @@ private void initialize() {
165187
consoleMessage(Messenger.message(MsgType.CONSOLE_INITIALIZE));
166188

167189
if (isEnabled("combat.settings.old_pvp") || isEnabled("custom.player_health.enabled")) {
168-
registerEvent(new AttributesSet());
190+
registerEvent(new AttributesSet(this));
169191
}
170192
if (isEnabled("combat.settings.old_weapon_damage") || isEnabled("combat.settings.old_tool_damage") || isEnabled("combat.settings.disable_sweep_attacks.enabled")) {
171-
registerEvent(new DamageModifiers());
193+
registerEvent(new DamageModifiers(this));
172194
}
173195
if (isEnabled("combat.settings.disable_arrow_boost")) {
174-
registerEvent(new BowBoost());
196+
registerEvent(new BowBoost(this));
175197
}
176198
if (isEnabled("combat.settings.old_player_regen")) {
177199
registerEvent(new PlayerRegen(this));
178200
}
179201
if (isEnabled("disabled_items.enabled")) {
180-
registerEvent(new DisabledItems());
202+
registerEvent(new DisabledItems(this));
181203
}
182204
if (isEnabled("disable_item_frame_rotation.enabled")) {
183-
registerEvent(new ItemFrameRotate());
205+
registerEvent(new ItemFrameRotate(this));
184206
}
185207
if (isEnabled("disable_offhand.enabled")) {
186-
registerEvent(new Offhand());
208+
registerEvent(new Offhand(this));
187209
}
188210
if (isEnabled("fixes.projectile_fixer")) {
189211
registerEvent(new Projectiles());
@@ -204,7 +226,7 @@ private void initialize() {
204226
}
205227
}
206228
if (isEnabled("knockback.fishing_rod.enabled")) {
207-
registerEvent(new FishingRodKnockback());
229+
registerEvent(new FishingRodKnockback(this));
208230
}
209231
if (isEnabled("combat.settings.sword_blocking.enabled")) {
210232
registerEvent(new Blocking(this));
@@ -288,15 +310,15 @@ public void registerEvent(Listener listener) {
288310
* @return Whether or not the config boolean is true
289311
*/
290312
private boolean isEnabled(String path) {
291-
return Config.get().getBoolean(path);
313+
return config.get().getBoolean(path);
292314
}
293315

294316
/**
295317
* @param path Path to the boolean
296318
* @param value true/false
297319
*/
298320
private void setBoolean(String path, boolean value) {
299-
Config.get().set(path, value);
321+
config.get().set(path, value);
300322
}
301323

302324
/**

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

Lines changed: 62 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
public class Config {
1212
private File file;
13-
private static FileConfiguration config;
13+
private FileConfiguration config;
1414

1515
public void setup(JavaPlugin plugin) {
1616
file = new File(plugin.getDataFolder(), "config.yml");
@@ -23,7 +23,7 @@ public void setup(JavaPlugin plugin) {
2323
config = YamlConfiguration.loadConfiguration(file);
2424
}
2525

26-
public static FileConfiguration get() {
26+
public FileConfiguration get() {
2727
return config;
2828
}
2929

@@ -41,72 +41,72 @@ public void reload() {
4141
public void addDefaults() {
4242
//config.yml
4343
//string lists
44-
List<String> combatList = Config.get().getStringList("combat.settings.disabled_worlds");
44+
List<String> combatList = get().getStringList("combat.settings.disabled_worlds");
4545
combatList.add("example_world");
46-
List<String> gappleList = Config.get().getStringList("general.settings.golden_apple_cooldown.disabled_worlds");
46+
List<String> gappleList = get().getStringList("general.settings.golden_apple_cooldown.disabled_worlds");
4747
gappleList.add("example_world");
48-
List<String> itemsList = Config.get().getStringList("general.settings.disabled_items.items");
48+
List<String> itemsList = get().getStringList("general.settings.disabled_items.items");
4949
itemsList.add("item_frame");
5050
itemsList.add("armor_stand");
51-
List<String> itemFrameRotation = Config.get().getStringList("disable_item_frame_rotation.disabled_worlds");
51+
List<String> itemFrameRotation = get().getStringList("disable_item_frame_rotation.disabled_worlds");
5252
itemFrameRotation.add("example_world");
53-
List<String> epearlList = Config.get().getStringList("enderpearl_cooldown.disabled_worlds");
53+
List<String> epearlList = get().getStringList("enderpearl_cooldown.disabled_worlds");
5454
epearlList.add("example_world");
55-
List<String> offhandWorlds = Config.get().getStringList("disable_offhand.disabled_worlds");
55+
List<String> offhandWorlds = get().getStringList("disable_offhand.disabled_worlds");
5656
offhandWorlds.add("example_world");
57-
Config.get().options().header("+----------------------------------------------------------------------------------------------+" + "\n" + "| |" + "\n" + "| Combat Plus |" + "\n" + "| |" + "\n" + "| Discord: https://discord.gg/m7j2Y9H |" + "\n" + "| |" + "\n" + "| Author: Nik |" + "\n" + "| |" + "\n" + "+----------------------------------------------------------------------------------------------+" + "\n");
58-
Config.get().addDefault("settings.check_for_updates", true);
59-
Config.get().addDefault("settings.developer_mode", false);
60-
Config.get().addDefault("combat.settings.old_pvp", true);
61-
Config.get().addDefault("combat.settings.old_weapon_damage", true);
62-
Config.get().addDefault("combat.settings.old_tool_damage", true);
63-
Config.get().addDefault("combat.settings.old_sharpness", true);
64-
Config.get().addDefault("combat.settings.disable_sweep_attacks.enabled", true);
65-
Config.get().addDefault("combat.settings.disable_sweep_attacks.ignore_sweeping_edge", false);
66-
Config.get().addDefault("combat.settings.disable_arrow_boost", true);
67-
Config.get().addDefault("combat.settings.old_player_regen", true);
68-
Config.get().addDefault("combat.settings.sword_blocking.enabled", true);
69-
Config.get().addDefault("combat.settings.sword_blocking.ignore_shields", true);
70-
Config.get().addDefault("combat.settings.sword_blocking.cancel_sprinting", false);
71-
Config.get().addDefault("combat.settings.sword_blocking.effect", "DAMAGE_RESISTANCE");
72-
Config.get().addDefault("combat.settings.sword_blocking.duration_ticks", 8);
73-
Config.get().addDefault("combat.settings.sword_blocking.amplifier", 0);
74-
Config.get().addDefault("combat.settings.sword_blocking.slow_duration_ticks", 8);
75-
Config.get().addDefault("combat.settings.sword_blocking.slow_amplifier", 2);
76-
Config.get().addDefault("combat.settings.disabled_worlds", combatList);
77-
Config.get().addDefault("golden_apple_cooldown.golden_apple.enabled", true);
78-
Config.get().addDefault("golden_apple_cooldown.golden_apple.cooldown", 10);
79-
Config.get().addDefault("golden_apple_cooldown.golden_apple.actionbar", true);
80-
Config.get().addDefault("golden_apple_cooldown.enchanted_golden_apple.enabled", true);
81-
Config.get().addDefault("golden_apple_cooldown.enchanted_golden_apple.cooldown", 20);
82-
Config.get().addDefault("golden_apple_cooldown.enchanted_golden_apple.actionbar", true);
83-
Config.get().addDefault("golden_apple_cooldown.disabled_worlds", gappleList);
84-
Config.get().addDefault("enderpearl_cooldown.enabled", true);
85-
Config.get().addDefault("enderpearl_cooldown.cooldown", 10);
86-
Config.get().addDefault("enderpearl_cooldown.actionbar", true);
87-
Config.get().addDefault("enderpearl_cooldown.disabled_worlds", epearlList);
88-
Config.get().addDefault("knockback.fishing_rod.enabled", true);
89-
Config.get().addDefault("knockback.fishing_rod.cancel_dragging", true);
90-
Config.get().addDefault("disabled_items.enabled", false);
91-
Config.get().addDefault("disabled_items.items", itemsList);
92-
Config.get().addDefault("disable_item_frame_rotation.enabled", true);
93-
Config.get().addDefault("disable_item_frame_rotation.disabled_worlds", itemFrameRotation);
94-
Config.get().addDefault("disable_offhand.enabled", true);
95-
Config.get().addDefault("disable_offhand.disabled_worlds", offhandWorlds);
96-
Config.get().addDefault("recipes.enchanted_golden_apple", false);
97-
Config.get().addDefault("fixes.projectile_fixer", true);
98-
Config.get().addDefault("custom.player_health.enabled", false);
99-
Config.get().addDefault("custom.player_health.max_health", 20);
100-
Config.get().addDefault("advanced.settings.old_pvp.attack_speed", 24);
101-
Config.get().addDefault("advanced.settings.new_pvp.attack_speed", 4);
102-
Config.get().addDefault("advanced.settings.modifiers.old_swords_damage", 1);
103-
Config.get().addDefault("advanced.settings.modifiers.old_shovels_damage", -0.5);
104-
Config.get().addDefault("advanced.settings.modifiers.old_axes_damage", -2);
105-
Config.get().addDefault("advanced.settings.modifiers.old_pickaxes_damage", 1);
106-
Config.get().addDefault("advanced.settings.old_regen.frequency", 3);
107-
Config.get().addDefault("advanced.settings.old_regen.amount", 1);
108-
Config.get().addDefault("advanced.settings.old_regen.exhaustion", 3);
109-
Config.get().addDefault("advanced.settings.base_player_health", 20);
110-
Config.get().addDefault("advanced.settings.knockback.fishing_rod.damage", 0.01);
57+
get().options().header("+----------------------------------------------------------------------------------------------+" + "\n" + "| |" + "\n" + "| Combat Plus |" + "\n" + "| |" + "\n" + "| Discord: https://discord.gg/m7j2Y9H |" + "\n" + "| |" + "\n" + "| Author: Nik |" + "\n" + "| |" + "\n" + "+----------------------------------------------------------------------------------------------+" + "\n");
58+
get().addDefault("settings.check_for_updates", true);
59+
get().addDefault("settings.developer_mode", false);
60+
get().addDefault("combat.settings.old_pvp", true);
61+
get().addDefault("combat.settings.old_weapon_damage", true);
62+
get().addDefault("combat.settings.old_tool_damage", true);
63+
get().addDefault("combat.settings.old_sharpness", true);
64+
get().addDefault("combat.settings.disable_sweep_attacks.enabled", true);
65+
get().addDefault("combat.settings.disable_sweep_attacks.ignore_sweeping_edge", false);
66+
get().addDefault("combat.settings.disable_arrow_boost", true);
67+
get().addDefault("combat.settings.old_player_regen", true);
68+
get().addDefault("combat.settings.sword_blocking.enabled", true);
69+
get().addDefault("combat.settings.sword_blocking.ignore_shields", true);
70+
get().addDefault("combat.settings.sword_blocking.cancel_sprinting", false);
71+
get().addDefault("combat.settings.sword_blocking.effect", "DAMAGE_RESISTANCE");
72+
get().addDefault("combat.settings.sword_blocking.duration_ticks", 8);
73+
get().addDefault("combat.settings.sword_blocking.amplifier", 0);
74+
get().addDefault("combat.settings.sword_blocking.slow_duration_ticks", 8);
75+
get().addDefault("combat.settings.sword_blocking.slow_amplifier", 2);
76+
get().addDefault("combat.settings.disabled_worlds", combatList);
77+
get().addDefault("golden_apple_cooldown.golden_apple.enabled", true);
78+
get().addDefault("golden_apple_cooldown.golden_apple.cooldown", 10);
79+
get().addDefault("golden_apple_cooldown.golden_apple.actionbar", true);
80+
get().addDefault("golden_apple_cooldown.enchanted_golden_apple.enabled", true);
81+
get().addDefault("golden_apple_cooldown.enchanted_golden_apple.cooldown", 20);
82+
get().addDefault("golden_apple_cooldown.enchanted_golden_apple.actionbar", true);
83+
get().addDefault("golden_apple_cooldown.disabled_worlds", gappleList);
84+
get().addDefault("enderpearl_cooldown.enabled", true);
85+
get().addDefault("enderpearl_cooldown.cooldown", 10);
86+
get().addDefault("enderpearl_cooldown.actionbar", true);
87+
get().addDefault("enderpearl_cooldown.disabled_worlds", epearlList);
88+
get().addDefault("knockback.fishing_rod.enabled", true);
89+
get().addDefault("knockback.fishing_rod.cancel_dragging", true);
90+
get().addDefault("disabled_items.enabled", false);
91+
get().addDefault("disabled_items.items", itemsList);
92+
get().addDefault("disable_item_frame_rotation.enabled", true);
93+
get().addDefault("disable_item_frame_rotation.disabled_worlds", itemFrameRotation);
94+
get().addDefault("disable_offhand.enabled", true);
95+
get().addDefault("disable_offhand.disabled_worlds", offhandWorlds);
96+
get().addDefault("recipes.enchanted_golden_apple", false);
97+
get().addDefault("fixes.projectile_fixer", true);
98+
get().addDefault("custom.player_health.enabled", false);
99+
get().addDefault("custom.player_health.max_health", 20);
100+
get().addDefault("advanced.settings.old_pvp.attack_speed", 24);
101+
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);
106+
get().addDefault("advanced.settings.old_regen.frequency", 3);
107+
get().addDefault("advanced.settings.old_regen.amount", 1);
108+
get().addDefault("advanced.settings.old_regen.exhaustion", 3);
109+
get().addDefault("advanced.settings.base_player_health", 20);
110+
get().addDefault("advanced.settings.knockback.fishing_rod.damage", 0.01);
111111
}
112112
}

0 commit comments

Comments
 (0)