Skip to content

Commit da1e9ef

Browse files
NikV2NikV2
committed
Goodbye legacy versions
1 parent d863b8c commit da1e9ef

9 files changed

Lines changed: 44 additions & 160 deletions

File tree

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>me.nik</groupId>
88
<artifactId>CombatPlus</artifactId>
9-
<version>1.5.9</version>
9+
<version>1.6.0</version>
1010
<packaging>jar</packaging>
1111

1212
<name>CombatPlus</name>

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

Lines changed: 0 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,6 @@ public void onEnable() {
8888

8989
this.getServer().getConsoleSender().sendMessage(this.STARTUP_MESSAGE);
9090

91-
//Unsupported Version Check
92-
checkSupported();
93-
9491
//Load Commands
9592
getCommand("combatplus").setExecutor(new CommandManager(this));
9693

@@ -156,7 +153,6 @@ private void checkForUpdates() {
156153
* Default Stats to avoid Server Damage
157154
*/
158155
private void setDefaultStats() {
159-
if (serverVersion("1.8")) return;
160156
Bukkit.getOnlinePlayers().forEach(player -> {
161157
final double defaultHealth = Config.Setting.ADV_BASE_HEALTH.getDouble();
162158
final AttributeInstance playerMaxHealth = player.getAttribute(Attribute.GENERIC_MAX_HEALTH);
@@ -208,66 +204,10 @@ private void initListeners() {
208204
pm.registerEvents(new GuiListener(), this);
209205
}
210206

211-
/**
212-
* Disable unsupported features
213-
*/
214-
private void checkSupported() {
215-
if (serverVersion("1.8")) {
216-
setFalse(Config.Setting.OLD_PVP.getKey());
217-
setFalse(Config.Setting.OLD_WEAPON_DAMAGE.getKey());
218-
setFalse(Config.Setting.OLD_TOOL_DAMAGE.getKey());
219-
setFalse(Config.Setting.OLD_SHARPNESS.getKey());
220-
setFalse(Config.Setting.DISABLE_SWEEP_ENABLED.getKey());
221-
setFalse(Config.Setting.OLD_REGEN.getKey());
222-
setFalse(Config.Setting.CUSTOM_PLAYER_HEALTH_ENABLED.getKey());
223-
setFalse(Config.Setting.DISABLE_OFFHAND_ENABLED.getKey());
224-
setFalse(Config.Setting.ENCHANTED_APPLE_CRAFTING.getKey());
225-
setFalse(Config.Setting.FISHING_ROD_ENABLED.getKey());
226-
setFalse(Config.Setting.GOLDEN_APPLE_ACTIONBAR.getKey());
227-
setFalse(Config.Setting.ENCHANTED_APPLE_ACTIONBAR.getKey());
228-
setFalse(Config.Setting.ENDERPEARL_ACTIONBAR.getKey());
229-
setFalse(Config.Setting.SWORD_BLOCKING_ENABLED.getKey());
230-
setFalse(Config.Setting.HEALTHBAR_ENABLED.getKey());
231-
setFalse(Config.Setting.COMBATLOG_ENABLED.getKey());
232-
getConfiguration().save();
233-
getConfiguration().reloadConfig();
234-
consoleMessage(MsgType.CONSOLE_UNSUPPORTED_VERSION.getMessage());
235-
} else if (serverVersion("1.9") || serverVersion("1.10")) {
236-
setFalse(Config.Setting.DISABLE_SWEEP_ENABLED.getKey());
237-
setFalse(Config.Setting.ENCHANTED_APPLE_CRAFTING.getKey());
238-
setFalse(Config.Setting.FISHING_ROD_ENABLED.getKey());
239-
setFalse(Config.Setting.DISABLE_SWEEP_ENABLED.getKey());
240-
setFalse(Config.Setting.COMBATLOG_ENABLED.getKey());
241-
getConfiguration().save();
242-
getConfiguration().reloadConfig();
243-
consoleMessage(MsgType.CONSOLE_UNSUPPORTED_VERSION.getMessage());
244-
consoleMessage(MsgType.CONSOLE_UNSUPPORTED_SWEEP_ATTACK.getMessage());
245-
} else if (serverVersion("1.11") || serverVersion("1.12")) {
246-
setFalse(Config.Setting.ENCHANTED_APPLE_CRAFTING.getKey());
247-
setFalse(Config.Setting.FISHING_ROD_ENABLED.getKey());
248-
setFalse(Config.Setting.COMBATLOG_ENABLED.getKey());
249-
getConfiguration().save();
250-
getConfiguration().reloadConfig();
251-
consoleMessage(MsgType.CONSOLE_UNSUPPORTED_VERSION.getMessage());
252-
}
253-
}
254-
255-
/**
256-
* @param version The version to look for
257-
* @return Whether or not the Server's running on the specified version
258-
*/
259-
public boolean serverVersion(String version) {
260-
return Bukkit.getVersion().contains(version);
261-
}
262-
263207
/**
264208
* @param message The console message to send to the Server (ChatColor Friendly)
265209
*/
266210
public void consoleMessage(String message) {
267211
this.getServer().getConsoleSender().sendMessage(message);
268212
}
269-
270-
private void setFalse(String path) {
271-
getConfiguration().set(path, false);
272-
}
273213
}

‎src/main/java/me/nik/combatplus/managers/CustomRecipes.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ public CustomRecipes(CombatPlus plugin) {
1414
this.plugin = plugin;
1515
}
1616

17-
/*
18-
Enchanted Golden Apple Crafting
19-
*/
20-
2117
public ShapedRecipe enchantedGoldenAppleRecipe() {
2218
ItemStack item = new ItemStack(Material.ENCHANTED_GOLDEN_APPLE);
2319

‎src/main/java/me/nik/combatplus/modules/impl/CombatLog.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import org.bukkit.event.EventPriority;
1818
import org.bukkit.event.entity.EntityDamageByEntityEvent;
1919
import org.bukkit.event.entity.EntityPickupItemEvent;
20+
import org.bukkit.event.entity.PlayerDeathEvent;
2021
import org.bukkit.event.player.PlayerCommandPreprocessEvent;
2122
import org.bukkit.event.player.PlayerDropItemEvent;
2223
import org.bukkit.event.player.PlayerQuitEvent;
@@ -201,6 +202,13 @@ public void onItemDrop(PlayerDropItemEvent e) {
201202
p.sendMessage(MsgType.COMBATLOG_ITEM_DROP.getMessage());
202203
}
203204

205+
@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
206+
public void onDeath(PlayerDeathEvent e) {
207+
if (!isTagged(e.getEntity())) return;
208+
209+
unTagPlayer(e.getEntity());
210+
}
211+
204212
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
205213
public void onItemPick(EntityPickupItemEvent e) {
206214
if (!Config.Setting.COMBATLOG_PREVENT_PICKING_ITEMS.getBoolean()) return;

‎src/main/java/me/nik/combatplus/modules/impl/DamageModifiers.java‎

Lines changed: 32 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -36,109 +36,109 @@ public void onEntityDamage(EntityDamageByEntityEvent e) {
3636
switch (weapon) {
3737
//Swords
3838
case "NETHERITE_SWORD":
39-
damageConverter(e, player, handItem, Config.Setting.ADV_NETHERITE_SWORD.getString());
39+
damageConverter(e, player, handItem, Config.Setting.ADV_NETHERITE_SWORD.getDouble());
4040
break;
4141
case "DIAMOND_SWORD":
42-
damageConverter(e, player, handItem, Config.Setting.ADV_DIAMOND_SWORD.getString());
42+
damageConverter(e, player, handItem, Config.Setting.ADV_DIAMOND_SWORD.getDouble());
4343
break;
4444
case "GOLDEN_SWORD":
4545
case "GOLD_SWORD":
46-
damageConverter(e, player, handItem, Config.Setting.ADV_GOLDEN_SWORD.getString());
46+
damageConverter(e, player, handItem, Config.Setting.ADV_GOLDEN_SWORD.getDouble());
4747
break;
4848
case "IRON_SWORD":
49-
damageConverter(e, player, handItem, Config.Setting.ADV_IRON_SWORD.getString());
49+
damageConverter(e, player, handItem, Config.Setting.ADV_IRON_SWORD.getDouble());
5050
break;
5151
case "STONE_SWORD":
52-
damageConverter(e, player, handItem, Config.Setting.ADV_STONE_SWORD.getString());
52+
damageConverter(e, player, handItem, Config.Setting.ADV_STONE_SWORD.getDouble());
5353
break;
5454
case "WOODEN_SWORD":
55-
damageConverter(e, player, handItem, Config.Setting.ADV_WOODEN_SWORD.getString());
55+
damageConverter(e, player, handItem, Config.Setting.ADV_WOODEN_SWORD.getDouble());
5656
break;
5757
//Pickaxes
5858
case "NETHERITE_PICKAXE":
59-
damageConverter(e, player, handItem, Config.Setting.ADV_NETHERITE_PICKAXE.getString());
59+
damageConverter(e, player, handItem, Config.Setting.ADV_NETHERITE_PICKAXE.getDouble());
6060
break;
6161
case "DIAMOND_PICKAXE":
62-
damageConverter(e, player, handItem, Config.Setting.ADV_DIAMOND_PICKAXE.getString());
62+
damageConverter(e, player, handItem, Config.Setting.ADV_DIAMOND_PICKAXE.getDouble());
6363
break;
6464
case "GOLDEN_PICKAXE":
6565
case "GOLD_PICKAXE":
66-
damageConverter(e, player, handItem, Config.Setting.ADV_GOLDEN_PICKAXE.getString());
66+
damageConverter(e, player, handItem, Config.Setting.ADV_GOLDEN_PICKAXE.getDouble());
6767
break;
6868
case "IRON_PICKAXE":
69-
damageConverter(e, player, handItem, Config.Setting.ADV_IRON_PICKAXE.getString());
69+
damageConverter(e, player, handItem, Config.Setting.ADV_IRON_PICKAXE.getDouble());
7070
break;
7171
case "STONE_PICKAXE":
72-
damageConverter(e, player, handItem, Config.Setting.ADV_STONE_PICKAXE.getString());
72+
damageConverter(e, player, handItem, Config.Setting.ADV_STONE_PICKAXE.getDouble());
7373
break;
7474
case "WOODEN_PICKAXE":
75-
damageConverter(e, player, handItem, Config.Setting.ADV_WOODEN_PICKAXE.getString());
75+
damageConverter(e, player, handItem, Config.Setting.ADV_WOODEN_PICKAXE.getDouble());
7676
break;
7777
//Axes
7878
case "NETHERITE_AXE":
79-
damageConverter(e, player, handItem, Config.Setting.ADV_NETHERITE_AXE.getString());
79+
damageConverter(e, player, handItem, Config.Setting.ADV_NETHERITE_AXE.getDouble());
8080
break;
8181
case "DIAMOND_AXE":
82-
damageConverter(e, player, handItem, Config.Setting.ADV_DIAMOND_AXE.getString());
82+
damageConverter(e, player, handItem, Config.Setting.ADV_DIAMOND_AXE.getDouble());
8383
break;
8484
case "GOLDEN_AXE":
8585
case "GOLD_AXE":
86-
damageConverter(e, player, handItem, Config.Setting.ADV_GOLDEN_AXE.getString());
86+
damageConverter(e, player, handItem, Config.Setting.ADV_GOLDEN_AXE.getDouble());
8787
break;
8888
case "IRON_AXE":
89-
damageConverter(e, player, handItem, Config.Setting.ADV_IRON_AXE.getString());
89+
damageConverter(e, player, handItem, Config.Setting.ADV_IRON_AXE.getDouble());
9090
break;
9191
case "STONE_AXE":
92-
damageConverter(e, player, handItem, Config.Setting.ADV_STONE_AXE.getString());
92+
damageConverter(e, player, handItem, Config.Setting.ADV_STONE_AXE.getDouble());
9393
break;
9494
case "WOODEN_AXE":
95-
damageConverter(e, player, handItem, Config.Setting.ADV_WOODEN_AXE.getString());
95+
damageConverter(e, player, handItem, Config.Setting.ADV_WOODEN_AXE.getDouble());
9696
break;
9797
//Hoes (Again, the tool!)
9898
case "NETHERITE_HOE":
99-
damageConverter(e, player, handItem, Config.Setting.ADV_NETHERITE_HOE.getString());
99+
damageConverter(e, player, handItem, Config.Setting.ADV_NETHERITE_HOE.getDouble());
100100
break;
101101
case "DIAMOND_HOE":
102-
damageConverter(e, player, handItem, Config.Setting.ADV_DIAMOND_HOE.getString());
102+
damageConverter(e, player, handItem, Config.Setting.ADV_DIAMOND_HOE.getDouble());
103103
break;
104104
case "GOLDEN_HOE":
105105
case "GOLD_HOE":
106-
damageConverter(e, player, handItem, Config.Setting.ADV_GOLDEN_HOE.getString());
106+
damageConverter(e, player, handItem, Config.Setting.ADV_GOLDEN_HOE.getDouble());
107107
break;
108108
case "IRON_HOE":
109-
damageConverter(e, player, handItem, Config.Setting.ADV_IRON_HOE.getString());
109+
damageConverter(e, player, handItem, Config.Setting.ADV_IRON_HOE.getDouble());
110110
break;
111111
case "STONE_HOE":
112-
damageConverter(e, player, handItem, Config.Setting.ADV_STONE_HOE.getString());
112+
damageConverter(e, player, handItem, Config.Setting.ADV_STONE_HOE.getDouble());
113113
break;
114114
case "WOODEN_HOE":
115-
damageConverter(e, player, handItem, Config.Setting.ADV_WOODEN_HOE.getString());
115+
damageConverter(e, player, handItem, Config.Setting.ADV_WOODEN_HOE.getDouble());
116116
break;
117117
//Shovels
118118
case "NETHERITE_SHOVEL":
119-
damageConverter(e, player, handItem, Config.Setting.ADV_NETHERITE_SHOVEL.getString());
119+
damageConverter(e, player, handItem, Config.Setting.ADV_NETHERITE_SHOVEL.getDouble());
120120
break;
121121
case "DIAMOND_SHOVEL":
122122
case "DIAMOND_SPADE":
123-
damageConverter(e, player, handItem, Config.Setting.ADV_DIAMOND_SHOVEL.getString());
123+
damageConverter(e, player, handItem, Config.Setting.ADV_DIAMOND_SHOVEL.getDouble());
124124
break;
125125
case "GOLDEN_SHOVEL":
126126
case "GOLDEN_SPADE":
127127
case "GOLD_SHOVEL":
128128
case "GOLD_SPADE":
129-
damageConverter(e, player, handItem, Config.Setting.ADV_GOLDEN_SHOVEL.getString());
129+
damageConverter(e, player, handItem, Config.Setting.ADV_GOLDEN_SHOVEL.getDouble());
130130
break;
131131
case "IRON_SHOVEL":
132132
case "IRON_SPADE":
133-
damageConverter(e, player, handItem, Config.Setting.ADV_IRON_SHOVEL.getString());
133+
damageConverter(e, player, handItem, Config.Setting.ADV_IRON_SHOVEL.getDouble());
134134
break;
135135
case "STONE_SHOVEL":
136136
case "STONE_SPADE":
137-
damageConverter(e, player, handItem, Config.Setting.ADV_STONE_SHOVEL.getString());
137+
damageConverter(e, player, handItem, Config.Setting.ADV_STONE_SHOVEL.getDouble());
138138
break;
139139
case "WOODEN_SHOVEL":
140140
case "WOODEN_SPADE":
141-
damageConverter(e, player, handItem, Config.Setting.ADV_WOODEN_SHOVEL.getString());
141+
damageConverter(e, player, handItem, Config.Setting.ADV_WOODEN_SHOVEL.getDouble());
142142
break;
143143
}
144144
}
@@ -155,17 +155,12 @@ private void disableSweep(EntityDamageEvent e, Player player, ItemStack handItem
155155
debug(player, "&6Canceled Sweep Attack: &a" + e.isCancelled() + " &6Velocity: X = &a" + x + " &6Y = &a" + y + " &6Z = &a" + z);
156156
}
157157

158-
private void damageConverter(EntityDamageByEntityEvent e, Player player, ItemStack item, String modifier) {
158+
private void damageConverter(EntityDamageByEntityEvent e, Player player, ItemStack item, double modifier) {
159159
final String type = item.getType().name();
160160
if (!Config.Setting.OLD_WEAPON_DAMAGE.getBoolean() && type.endsWith("_SWORD")) return;
161161
if (!Config.Setting.OLD_TOOL_DAMAGE.getBoolean() && !type.endsWith("_SWORD")) return;
162162
double damageDealt = e.getDamage();
163-
double newDmg;
164-
if (divide(modifier)) {
165-
newDmg = damageDealt / convertToDivide(modifier);
166-
} else {
167-
newDmg = damageDealt + Double.parseDouble(modifier);
168-
}
163+
double newDmg = damageDealt + modifier;
169164
if (item.containsEnchantment(Enchantment.DAMAGE_ALL) && Config.Setting.OLD_SHARPNESS.getBoolean()) {
170165
double sharpLvl = item.getEnchantmentLevel(Enchantment.DAMAGE_ALL);
171166
double oldSharpDmg = sharpLvl >= 1 ? 1 + (sharpLvl - 1) * 0.5 : 0; //1.9+
@@ -175,13 +170,4 @@ private void damageConverter(EntityDamageByEntityEvent e, Player player, ItemSta
175170
e.setDamage(newDmg);
176171
debug(player, "&6Item: &a" + item.getType().name() + " &6Old Damage: &a" + damageDealt + " &6New Damage: &a" + newDmg);
177172
}
178-
179-
private boolean divide(String value) {
180-
return value.contains("/");
181-
}
182-
183-
private double convertToDivide(String value) {
184-
String s = value.replaceAll("/", "");
185-
return Double.parseDouble(s);
186-
}
187173
}

‎src/main/java/me/nik/combatplus/modules/impl/EnchantedGoldenApple.java‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,10 @@
1212
import org.bukkit.entity.Player;
1313
import org.bukkit.event.EventHandler;
1414
import org.bukkit.event.player.PlayerItemConsumeEvent;
15-
import org.bukkit.inventory.ItemStack;
1615
import org.bukkit.scheduler.BukkitRunnable;
1716

1817
import java.util.HashMap;
1918
import java.util.Map;
20-
import java.util.Objects;
2119
import java.util.UUID;
2220

2321
public class EnchantedGoldenApple extends Module {
@@ -45,7 +43,7 @@ public String getCooldown(UUID uuid) {
4543
public void onEatEnchantedGoldenApple(PlayerItemConsumeEvent e) {
4644
if (WorldUtils.goldenAppleDisabledWorlds(e.getPlayer())) return;
4745
if (e.getPlayer().hasPermission(Permissions.BYPASS_GAPPLE.getPermission())) return;
48-
if (isEnchantedGoldenApple(e)) {
46+
if (e.getItem().getType() == Material.ENCHANTED_GOLDEN_APPLE) {
4947
final UUID p = e.getPlayer().getUniqueId();
5048
final Player player = e.getPlayer();
5149
if (cooldown.containsKey(p)) {
@@ -81,15 +79,4 @@ public void run() {
8179
}
8280
}
8381
}
84-
85-
private boolean isEnchantedGoldenApple(PlayerItemConsumeEvent e) {
86-
try {
87-
return e.getItem().getType() == Material.ENCHANTED_GOLDEN_APPLE;
88-
} catch (NoSuchFieldError ignored) {
89-
ItemStack goldenApple = new ItemStack(Material.GOLDEN_APPLE);
90-
ItemStack consumedItem = e.getItem();
91-
return consumedItem.getType().name().equals("GOLDEN_APPLE") &&
92-
!Objects.equals(goldenApple.getData(), consumedItem.getData());
93-
}
94-
}
9582
}

‎src/main/java/me/nik/combatplus/modules/impl/GoldenApple.java‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,17 @@
55
import me.nik.combatplus.files.Config;
66
import me.nik.combatplus.managers.MsgType;
77
import me.nik.combatplus.modules.Module;
8-
import me.nik.combatplus.utils.ServerUtils;
98
import me.nik.combatplus.utils.WorldUtils;
109
import net.md_5.bungee.api.ChatMessageType;
1110
import net.md_5.bungee.api.chat.TextComponent;
1211
import org.bukkit.Material;
1312
import org.bukkit.entity.Player;
1413
import org.bukkit.event.EventHandler;
1514
import org.bukkit.event.player.PlayerItemConsumeEvent;
16-
import org.bukkit.inventory.ItemStack;
1715
import org.bukkit.scheduler.BukkitRunnable;
1816

1917
import java.util.HashMap;
2018
import java.util.Map;
21-
import java.util.Objects;
2219
import java.util.UUID;
2320

2421
public class GoldenApple extends Module {
@@ -47,7 +44,7 @@ public String getCooldown(UUID uuid) {
4744
public void onEatGoldenApple(PlayerItemConsumeEvent e) {
4845
if (WorldUtils.goldenAppleDisabledWorlds(e.getPlayer())) return;
4946
if (e.getPlayer().hasPermission(Permissions.BYPASS_GAPPLE.getPermission())) return;
50-
if (isGoldenApple(e)) {
47+
if (e.getItem().getType() == Material.GOLDEN_APPLE) {
5148
final UUID p = e.getPlayer().getUniqueId();
5249
final Player player = e.getPlayer();
5350
if (cooldown.containsKey(p)) {
@@ -83,15 +80,4 @@ public void run() {
8380
}
8481
}
8582
}
86-
87-
private boolean isGoldenApple(PlayerItemConsumeEvent e) {
88-
ItemStack goldenApple = new ItemStack(Material.GOLDEN_APPLE);
89-
ItemStack consumedItem = e.getItem();
90-
if (ServerUtils.isLegacy()) {
91-
return consumedItem.getType().name().equals("GOLDEN_APPLE") &&
92-
Objects.equals(goldenApple.getData(), consumedItem.getData());
93-
} else {
94-
return consumedItem.getType() == Material.GOLDEN_APPLE;
95-
}
96-
}
9783
}

0 commit comments

Comments
 (0)