Skip to content

Commit ab064f7

Browse files
NikV2NikV2
committed
Remove stupid static usage
1 parent 52d7b36 commit ab064f7

13 files changed

Lines changed: 35 additions & 31 deletions

File tree

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,13 +281,15 @@ private void checkSupported() {
281281
setFalse(Config.Setting.ENCHANTED_APPLE_CRAFTING.getKey());
282282
setFalse(Config.Setting.FISHING_ROD_ENABLED.getKey());
283283
setFalse(Config.Setting.DISABLE_SWEEP_ENABLED.getKey());
284+
setFalse(Config.Setting.COMBATLOG_ENABLED.getKey());
284285
getConfiguration().save();
285286
getConfiguration().reloadConfig();
286287
consoleMessage(MsgType.CONSOLE_UNSUPPORTED_VERSION.getMessage());
287288
consoleMessage(MsgType.CONSOLE_UNSUPPORTED_SWEEP_ATTACK.getMessage());
288289
} else if (serverVersion("1.11") || serverVersion("1.12")) {
289290
setFalse(Config.Setting.ENCHANTED_APPLE_CRAFTING.getKey());
290291
setFalse(Config.Setting.FISHING_ROD_ENABLED.getKey());
292+
setFalse(Config.Setting.COMBATLOG_ENABLED.getKey());
291293
getConfiguration().save();
292294
getConfiguration().reloadConfig();
293295
consoleMessage(MsgType.CONSOLE_UNSUPPORTED_VERSION.getMessage());

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

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
11
package me.nik.combatplus;
22

3-
public class Permissions {
4-
5-
public static final String ADMIN = "cp.admin";
6-
7-
public static final String BYPASS_COMBATLOG = "cp.bypass.combatlog";
8-
9-
public static final String BYPASS_GAPPLE = "cp.bypass.gapple";
10-
11-
public static final String BYPASS_EPEARL = "cp.bypass.epearl";
12-
13-
public static final String BYPASS_ITEMS = "cp.bypass.items";
14-
15-
public static final String BYPASS_OFFHAND = "cp.bypass.offhand";
16-
17-
public static final String BYPASS_BOWBOOST = "cp.bypass.bowboost";
18-
19-
public static final String DEBUG = "cp.debug";
3+
public enum Permissions {
4+
ADMIN("cp.admin"),
5+
BYPASS_COMBATLOG("cp.bypass.combatlog"),
6+
BYPASS_GAPPLE("cp.bypass.gapple"),
7+
BYPASS_EPEARL("cp.bypass.epearl"),
8+
BYPASS_ITEMS("cp.bypass.items"),
9+
BYPASS_OFFHAND("cp.bypass.offhand"),
10+
BYPASS_BOWBOOST("cp.bypass.bowboost"),
11+
DEBUG("cp.debug");
12+
13+
private final String permission;
14+
15+
Permissions(String permission) {
16+
this.permission = permission;
17+
}
18+
19+
public String getPermission() {
20+
return this.permission;
21+
}
2022
}

‎src/main/java/me/nik/combatplus/commands/subcommands/Menu.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public String getSyntax() {
3535

3636
@Override
3737
public String getPermission() {
38-
return Permissions.ADMIN;
38+
return Permissions.ADMIN.getPermission();
3939
}
4040

4141
@Override

‎src/main/java/me/nik/combatplus/commands/subcommands/Reload.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public String getSyntax() {
3333

3434
@Override
3535
public String getPermission() {
36-
return Permissions.ADMIN;
36+
return Permissions.ADMIN.getPermission();
3737
}
3838

3939
@Override

‎src/main/java/me/nik/combatplus/handlers/UpdateChecker.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ private String readLines() throws IOException {
5151
}
5252

5353
@EventHandler
54-
public void onJoin(PlayerJoinEvent e) {
55-
if (!e.getPlayer().hasPermission(Permissions.ADMIN)) return;
54+
public void onJoin(final PlayerJoinEvent e) {
55+
if (!e.getPlayer().hasPermission(Permissions.ADMIN.getPermission())) return;
5656
e.getPlayer().sendMessage(MsgType.UPDATE_REMINDER.getMessage().replaceAll("%current%", plugin.getDescription().getVersion()).replaceAll("%new%", newVersion));
5757
}
5858
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public void onArrowDamage(EntityDamageByEntityEvent e) {
2525
if (!(e.getDamager() instanceof Arrow)) return;
2626
Player p = (Player) e.getEntity();
2727
if (worldUtils.combatDisabledWorlds(p)) return;
28-
if (p.hasPermission(Permissions.BYPASS_BOWBOOST)) return;
28+
if (p.hasPermission(Permissions.BYPASS_BOWBOOST.getPermission())) return;
2929
Arrow arrow = (Arrow) e.getDamager();
3030
ProjectileSource holder = arrow.getShooter();
3131
if (holder instanceof Player) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class DisabledItems implements Listener {
2121
public void onCraft(PrepareItemCraftEvent e) {
2222
if (e.getViewers().size() < 1) return;
2323
Player p = (Player) e.getViewers().get(0);
24-
if (p.hasPermission(Permissions.BYPASS_ITEMS)) return;
24+
if (p.hasPermission(Permissions.BYPASS_ITEMS.getPermission())) return;
2525
CraftingInventory inv = e.getInventory();
2626
ItemStack result = inv.getResult();
2727
if (result != null && Config.Setting.DISABLED_ITEMS_LIST.getStringList().contains(result.getType().name().toLowerCase())) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public static String getCooldown(UUID uuid) {
5050
@EventHandler(ignoreCancelled = true)
5151
public void onEatEnchantedGoldenApple(PlayerItemConsumeEvent e) {
5252
if (worldUtils.gappleDisabledWorlds(e.getPlayer())) return;
53-
if (e.getPlayer().hasPermission(Permissions.BYPASS_GAPPLE)) return;
53+
if (e.getPlayer().hasPermission(Permissions.BYPASS_GAPPLE.getPermission())) return;
5454
if (isEnchantedGoldenApple(e)) {
5555
final UUID p = e.getPlayer().getUniqueId();
5656
final Player player = e.getPlayer();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public void onLaunch(ProjectileLaunchEvent e) {
5454
if (!(e.getEntity().getType() == EntityType.ENDER_PEARL)) return;
5555
Player player = (Player) e.getEntity().getShooter();
5656
if (worldUtils.enderpearlDisabledWorlds(player)) return;
57-
if (player.hasPermission(Permissions.BYPASS_EPEARL)) return;
57+
if (player.hasPermission(Permissions.BYPASS_EPEARL.getPermission())) return;
5858
final UUID p = player.getUniqueId();
5959
if (cooldown.containsKey(p)) {
6060
e.setCancelled(true);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public static String getCooldown(UUID uuid) {
5050
@EventHandler(ignoreCancelled = true)
5151
public void onEatGoldenApple(PlayerItemConsumeEvent e) {
5252
if (worldUtils.gappleDisabledWorlds(e.getPlayer())) return;
53-
if (e.getPlayer().hasPermission(Permissions.BYPASS_GAPPLE)) return;
53+
if (e.getPlayer().hasPermission(Permissions.BYPASS_GAPPLE.getPermission())) return;
5454
if (isGoldenApple(e)) {
5555
final UUID p = e.getPlayer().getUniqueId();
5656
final Player player = e.getPlayer();

0 commit comments

Comments
 (0)