Skip to content

Commit 0db422f

Browse files
NikV2NikV2
committed
Commit
1 parent ac228e7 commit 0db422f

33 files changed

Lines changed: 426 additions & 423 deletions

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

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@
1515
import me.nik.combatplus.listeners.ItemFrameRotate;
1616
import me.nik.combatplus.listeners.Offhand;
1717
import me.nik.combatplus.listeners.PlayerRegen;
18-
import me.nik.combatplus.listeners.UpdateReminder;
1918
import me.nik.combatplus.listeners.fixes.Criticals;
2019
import me.nik.combatplus.listeners.fixes.HealthSpoof;
2120
import me.nik.combatplus.listeners.fixes.KillAura;
21+
import me.nik.combatplus.listeners.fixes.NoFall;
2222
import me.nik.combatplus.listeners.fixes.Projectiles;
23+
import me.nik.combatplus.listeners.fixes.Speed;
2324
import me.nik.combatplus.utils.CustomRecipes;
2425
import me.nik.combatplus.utils.Messenger;
2526
import me.nik.combatplus.utils.ResetStats;
@@ -36,11 +37,8 @@
3637

3738
public final class CombatPlus extends JavaPlugin {
3839

39-
private static CombatPlus instance;
40-
4140
@Override
4241
public void onEnable() {
43-
instance = this;
4442
//Load Files
4543
loadFiles();
4644

@@ -55,7 +53,7 @@ public void onEnable() {
5553
checkSupported();
5654

5755
//Load Commands
58-
getCommand("combatplus").setExecutor(new CommandManager());
56+
getCommand("combatplus").setExecutor(new CommandManager(this));
5957

6058
//Load Listeners
6159
initialize();
@@ -82,17 +80,12 @@ public void onDisable() {
8280
Lang.save();
8381

8482
//Unload Instances
85-
instance = null;
8683
getCommand("combatplus").setExecutor(null);
8784

8885
//Done
8986
consoleMessage(Messenger.message("console.disabled"));
9087
}
9188

92-
public static CombatPlus getInstance() {
93-
return instance;
94-
}
95-
9689
private void loadFiles() {
9790
Config.setup();
9891
Config.addDefaults();
@@ -107,7 +100,6 @@ private void loadFiles() {
107100
private void checkForUpdates() {
108101
if (isEnabled("settings.check_for_updates")) {
109102
BukkitTask updateChecker = new UpdateChecker(this).runTaskAsynchronously(this);
110-
registerEvent(new UpdateReminder());
111103
} else {
112104
consoleMessage(Messenger.message("console.update_disabled"));
113105
}
@@ -130,21 +122,21 @@ private void setDefaultStats() {
130122
private void loadStats() {
131123
if (isEnabled("combat.settings.old_pvp")) {
132124
Bukkit.getOnlinePlayers().forEach(player -> {
133-
new SetAttackSpeed(this).setAttackSpd(player);
125+
new SetAttackSpeed().setAttackSpd(player);
134126
});
135127
} else {
136128
Bukkit.getOnlinePlayers().forEach(player -> {
137-
new ResetStats(this).resetAttackSpeed(player);
129+
new ResetStats().resetAttackSpeed(player);
138130
});
139131
}
140132

141133
if (isEnabled("custom.player_health.enabled")) {
142134
Bukkit.getOnlinePlayers().forEach(player -> {
143-
new SetCustomHealth(this).setHealth(player);
135+
new SetCustomHealth().setHealth(player);
144136
});
145137
} else {
146138
Bukkit.getOnlinePlayers().forEach(player -> {
147-
new ResetStats(this).resetMaxHealth(player);
139+
new ResetStats().resetMaxHealth(player);
148140
});
149141
}
150142
}
@@ -156,28 +148,28 @@ private void initialize() {
156148
registerEvent(new AttributesSet(this));
157149
}
158150
if (isEnabled("combat.settings.old_weapon_damage") || isEnabled("combat.settings.old_tool_damage") || isEnabled("combat.settings.disable_sweep_attacks.enabled")) {
159-
registerEvent(new DamageModifiers(this));
151+
registerEvent(new DamageModifiers());
160152
}
161153
if (isEnabled("combat.settings.disable_arrow_boost")) {
162-
registerEvent(new BowBoost(this));
154+
registerEvent(new BowBoost());
163155
}
164156
if (isEnabled("combat.settings.old_player_regen")) {
165157
registerEvent(new PlayerRegen(this));
166158
}
167159
if (isEnabled("disabled_items.enabled")) {
168-
registerEvent(new DisabledItems(this));
160+
registerEvent(new DisabledItems());
169161
}
170162
if (isEnabled("disable_item_frame_rotation.enabled")) {
171-
registerEvent(new ItemFrameRotate(this));
163+
registerEvent(new ItemFrameRotate());
172164
}
173165
if (isEnabled("disable_offhand.enabled")) {
174-
registerEvent(new Offhand(this));
166+
registerEvent(new Offhand());
175167
}
176168
if (isEnabled("fixes.projectile_fixer")) {
177-
registerEvent(new Projectiles(this));
169+
registerEvent(new Projectiles());
178170
}
179171
if (isEnabled("fixes.invalid_criticals")) {
180-
registerEvent(new Criticals(this));
172+
registerEvent(new Criticals());
181173
}
182174
if (isEnabled("fixes.health_spoof")) {
183175
registerEvent(new HealthSpoof(this));
@@ -200,6 +192,12 @@ private void initialize() {
200192
} catch (Exception ignored) {
201193
}
202194
}
195+
if (isEnabled("fixes.no_fall")) {
196+
registerEvent(new NoFall());
197+
}
198+
if (isEnabled("fixes.speed")) {
199+
registerEvent(new Speed());
200+
}
203201
//GUI Listener (Do not remove this, idiot nik)
204202
registerEvent(new GUIListener(this));
205203
}
@@ -261,15 +259,15 @@ private boolean serverVersion(String version) {
261259
return Bukkit.getVersion().contains(version);
262260
}
263261

264-
private void registerEvent(Listener listener) {
262+
public void registerEvent(Listener listener) {
265263
Bukkit.getServer().getPluginManager().registerEvents(listener, this);
266264
}
267265

268266
private boolean isEnabled(String path) {
269267
return Config.get().getBoolean(path);
270268
}
271269

272-
private void consoleMessage(String message) {
270+
public void consoleMessage(String message) {
273271
this.getServer().getConsoleSender().sendMessage(message);
274272
}
275273
}

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

Lines changed: 35 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@
1919

2020
public class GUIManager {
2121

22-
private final CombatPlus plugin = CombatPlus.getInstance();
22+
private final CombatPlus plugin;
23+
24+
public GUIManager(CombatPlus plugin) {
25+
this.plugin = plugin;
26+
}
2327

2428
public void openMainGUI(Player p) {
2529
Inventory mainGUI = Bukkit.createInventory(new CombatPlusHolder(), 36, Messenger.format(Lang.get().getString("gui.main")));
@@ -81,18 +85,6 @@ public void run() {
8185
checkUpdatesMeta.setLore(updatesLore);
8286
checkUpdates.setItemMeta(checkUpdatesMeta);
8387

84-
ItemStack async = new ItemStack(Material.PAPER, 1);
85-
ItemMeta asyncMeta = async.getItemMeta();
86-
asyncMeta.setDisplayName("§6Run Asynchronously");
87-
ArrayList<String> asyncLore = new ArrayList<>();
88-
asyncLore.add("");
89-
asyncLore.add(ChatColor.GRAY + "Currently set to: " + ChatColor.GREEN + isEnabled("settings.async"));
90-
asyncLore.add("");
91-
asyncLore.add(ChatColor.WHITE + "Would you like the plugin");
92-
asyncLore.add(ChatColor.WHITE + "To run tasks Asynchronously?");
93-
asyncMeta.setLore(asyncLore);
94-
async.setItemMeta(asyncMeta);
95-
9688
ItemStack dev = new ItemStack(Material.PAPER, 1);
9789
ItemMeta devMeta = dev.getItemMeta();
9890
devMeta.setDisplayName("§6Developer Mode");
@@ -110,9 +102,8 @@ public void run() {
110102
backMeta.setDisplayName("§cBack");
111103
back.setItemMeta(backMeta);
112104

113-
pluginGUI.setItem(11, checkUpdates);
114-
pluginGUI.setItem(13, async);
115-
pluginGUI.setItem(15, dev);
105+
pluginGUI.setItem(12, checkUpdates);
106+
pluginGUI.setItem(14, dev);
116107
pluginGUI.setItem(31, back);
117108
}
118109
}.runTaskTimer(plugin, 1, 5);
@@ -453,6 +444,34 @@ public void run() {
453444
egaMeta.setLore(egaLore);
454445
ega.setItemMeta(egaMeta);
455446

447+
//nofall
448+
ItemStack nofall = new ItemStack(Material.PAPER, 1);
449+
ItemMeta nofallMeta = nofall.getItemMeta();
450+
nofallMeta.setDisplayName("§6No Fall");
451+
ArrayList<String> nofallLore = new ArrayList<>();
452+
nofallLore.add("");
453+
nofallLore.add(ChatColor.GRAY + "Currently set to: " + ChatColor.GREEN + isEnabled("fixes.no_fall"));
454+
nofallLore.add("");
455+
nofallLore.add(ChatColor.WHITE + "Detects and Cancels some types");
456+
nofallLore.add(ChatColor.WHITE + "Of No Fall Damage Hacks");
457+
nofallMeta.setLore(nofallLore);
458+
nofall.setItemMeta(nofallMeta);
459+
460+
//speed
461+
ItemStack speed = new ItemStack(Material.PAPER, 1);
462+
ItemMeta speedMeta = speed.getItemMeta();
463+
nofallMeta.setDisplayName("§6Speed");
464+
ArrayList<String> speedLore = new ArrayList<>();
465+
speedLore.add("");
466+
speedLore.add(ChatColor.GRAY + "Currently set to: " + ChatColor.GREEN + isEnabled("fixes.speed"));
467+
speedLore.add("");
468+
speedLore.add(ChatColor.WHITE + "Detects and Cancels some types");
469+
speedLore.add(ChatColor.WHITE + "Of Speed & Fly Exploits");
470+
speedMeta.setLore(speedLore);
471+
speed.setItemMeta(speedMeta);
472+
473+
generalTwoGUI.setItem(30, speed);
474+
generalTwoGUI.setItem(28, nofall);
456475
generalTwoGUI.setItem(16, ega);
457476
generalTwoGUI.setItem(14, aura);
458477
generalTwoGUI.setItem(12, hs);

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

Lines changed: 0 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,8 @@
22

33
import me.nik.combatplus.CombatPlus;
44
import me.nik.combatplus.files.Config;
5-
import me.nik.combatplus.utils.Messenger;
6-
import org.bukkit.entity.Player;
75
import org.bukkit.event.Listener;
86

9-
import java.util.List;
10-
117
public class Manager implements Listener {
128

139
protected final CombatPlus plugin;
@@ -16,68 +12,6 @@ public Manager(CombatPlus plugin) {
1612
this.plugin = plugin;
1713
}
1814

19-
protected boolean gappleDisabledWorlds(Player player) {
20-
for (String world : configStringList("golden_apple_cooldown.disabled_worlds")) {
21-
if (player.getWorld().getName().equalsIgnoreCase(world))
22-
return true;
23-
}
24-
return false;
25-
}
26-
27-
protected boolean combatDisabledWorlds(Player player) {
28-
for (String world : configStringList("combat.settings.disabled_worlds")) {
29-
if (player.getWorld().getName().equalsIgnoreCase(world))
30-
return true;
31-
}
32-
return false;
33-
}
34-
35-
protected boolean offHandDisabledWorlds(Player player) {
36-
for (String world : configStringList("disable_offhand.disabled_worlds")) {
37-
if (player.getWorld().getName().equalsIgnoreCase(world))
38-
return true;
39-
}
40-
return false;
41-
}
42-
43-
protected boolean noCraftingDisabledWorlds(Player player) {
44-
for (String world : configStringList("disabled_items.disabled_worlds")) {
45-
if (player.getWorld().getName().equalsIgnoreCase(world))
46-
return true;
47-
}
48-
return false;
49-
}
50-
51-
protected boolean itemFrameRotationDisabledWorlds(Player player) {
52-
for (String world : configStringList("disable_item_frame_rotation.disabled_worlds")) {
53-
if (player.getWorld().getName().equalsIgnoreCase(world))
54-
return true;
55-
}
56-
return false;
57-
}
58-
59-
protected boolean enderpearlDisabledWorlds(Player player) {
60-
for (String world : configStringList("enderpearl_cooldown.disabled_worlds")) {
61-
if (player.getWorld().getName().equalsIgnoreCase(world))
62-
return true;
63-
}
64-
return false;
65-
}
66-
67-
protected boolean customStatsWorlds(Player player) {
68-
for (String world : configStringList("custom.disabled_worlds")) {
69-
if (player.getWorld().getName().equalsIgnoreCase(world))
70-
return true;
71-
}
72-
return false;
73-
}
74-
75-
protected void debug(Player player, String message) {
76-
if (configBoolean("settings.developer_mode") && player.hasPermission("cp.debug")) {
77-
player.sendMessage(Messenger.prefix(message));
78-
}
79-
}
80-
8115
protected boolean configBoolean(String booleans) {
8216
return Config.get().getBoolean(booleans);
8317
}
@@ -90,22 +24,10 @@ protected String configString(String string) {
9024
return Config.get().getString(string);
9125
}
9226

93-
protected double configDouble(String doubles) {
94-
return Config.get().getDouble(doubles);
95-
}
96-
97-
protected List<String> configStringList(String stringList) {
98-
return Config.get().getStringList(stringList);
99-
}
100-
10127
protected void booleanSet(String path, boolean value) {
10228
Config.get().set(path, value);
10329
}
10430

105-
protected boolean isAsync() {
106-
return configBoolean("settings.async");
107-
}
108-
10931
protected void saveAndReload() {
11032
Config.save();
11133
Config.reload();

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,14 @@
1414
import java.util.List;
1515

1616
public class CommandManager implements TabExecutor {
17-
private final CombatPlus plugin = CombatPlus.getInstance();
17+
private final CombatPlus plugin;
1818

1919
private final ArrayList<SubCommand> subCommands = new ArrayList<>();
2020

21-
public CommandManager() {
22-
subCommands.add(new Menu());
23-
subCommands.add(new Reload());
21+
public CommandManager(CombatPlus plugin) {
22+
this.plugin = plugin;
23+
subCommands.add(new Menu(plugin));
24+
subCommands.add(new Reload(plugin));
2425
}
2526

2627
@Override

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
package me.nik.combatplus.commands;
22

3-
import me.nik.combatplus.CombatPlus;
43
import org.bukkit.entity.Player;
54

65
import java.util.List;
76

87
public abstract class SubCommand {
98

10-
protected CombatPlus plugin = CombatPlus.getInstance();
11-
129
public abstract String getName();
1310

1411
public abstract String getDescription();

0 commit comments

Comments
 (0)