Skip to content

Commit 7663e2c

Browse files
Archy-XArchy-X
committed
Update spigot-api to 1.21.3
1 parent 6fab6db commit 7663e2c

File tree

16 files changed

+82
-43
lines changed

16 files changed

+82
-43
lines changed

‎api-bukkit/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ dependencies {
2121
}
2222
// api(files("../../Slate/build/libs/Slate-1.1.8-all.jar"))
2323
compileOnly("org.jetbrains:annotations:24.1.0")
24-
compileOnly("org.spigotmc:spigot-api:1.21.1-R0.1-SNAPSHOT")
24+
compileOnly("org.spigotmc:spigot-api:1.21.3-R0.1-SNAPSHOT")
2525
}
2626

2727
tasks.withType<JavaCompile> {

‎bukkit/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ dependencies {
4040
implementation("net.kyori:adventure-text-minimessage:4.16.0")
4141
implementation("net.kyori:adventure-platform-bukkit:4.3.3")
4242
compileOnly("org.jetbrains:annotations:24.1.0")
43-
compileOnly("org.spigotmc:spigot-api:1.21.1-R0.1-SNAPSHOT")
43+
compileOnly("org.spigotmc:spigot-api:1.21.3-R0.1-SNAPSHOT")
4444
compileOnly("me.clip:placeholderapi:2.11.6")
4545
compileOnly("com.sk89q.worldguard:worldguard-bukkit:7.0.5") {
4646
exclude("org.spigotmc", "spigot-api")

‎bukkit/src/main/java/dev/aurelium/auraskills/bukkit/hooks/PlaceholderApiProvider.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import dev.aurelium.auraskills.api.util.NumberUtil;
1212
import dev.aurelium.auraskills.bukkit.AuraSkills;
1313
import dev.aurelium.auraskills.bukkit.menus.shared.SkillItem;
14+
import dev.aurelium.auraskills.bukkit.util.AttributeCompat;
1415
import dev.aurelium.auraskills.common.leaderboard.SkillValue;
1516
import dev.aurelium.auraskills.common.ui.ActionBarType;
1617
import dev.aurelium.auraskills.common.user.User;
@@ -20,7 +21,6 @@
2021
import me.clip.placeholderapi.expansion.PlaceholderExpansion;
2122
import org.bukkit.Bukkit;
2223
import org.bukkit.ChatColor;
23-
import org.bukkit.attribute.Attribute;
2424
import org.bukkit.attribute.AttributeInstance;
2525
import org.bukkit.entity.Player;
2626
import org.jetbrains.annotations.NotNull;
@@ -104,7 +104,7 @@ public String onPlaceholderRequest(Player player, String identifier) {
104104

105105
//Gets max hp
106106
if (identifier.equals("hp_max")) {
107-
AttributeInstance attribute = player.getAttribute(Attribute.GENERIC_MAX_HEALTH);
107+
AttributeInstance attribute = player.getAttribute(AttributeCompat.MAX_HEALTH);
108108
if (attribute != null) {
109109
return String.valueOf(Math.round(attribute.getValue() * Traits.HP.optionDouble("action_bar_scaling")));
110110
} else {
@@ -119,7 +119,7 @@ public String onPlaceholderRequest(Player player, String identifier) {
119119

120120
//Gets HP Percent as an integer
121121
if (identifier.equals("hp_percent")) {
122-
AttributeInstance attribute = player.getAttribute(Attribute.GENERIC_MAX_HEALTH);
122+
AttributeInstance attribute = player.getAttribute(AttributeCompat.MAX_HEALTH);
123123
if (attribute != null) {
124124
return String.valueOf(Math.round(player.getHealth() / attribute.getValue()));
125125
} else {

‎bukkit/src/main/java/dev/aurelium/auraskills/bukkit/loot/entity/VanillaEntitySupplier.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package dev.aurelium.auraskills.bukkit.loot.entity;
22

33
import dev.aurelium.auraskills.bukkit.AuraSkills;
4+
import dev.aurelium.auraskills.bukkit.util.AttributeCompat;
45
import org.bukkit.Location;
56
import org.bukkit.World;
6-
import org.bukkit.attribute.Attribute;
77
import org.bukkit.attribute.AttributeInstance;
88
import org.bukkit.entity.Entity;
99
import org.bukkit.entity.EntityType;
@@ -32,14 +32,14 @@ public Entity spawnEntity(AuraSkills plugin, Location location) {
3232

3333
if (entity instanceof LivingEntity livingEntity) {
3434
if (getEntityProperties().health() != null) {
35-
AttributeInstance attribute = livingEntity.getAttribute(Attribute.GENERIC_MAX_HEALTH);
35+
AttributeInstance attribute = livingEntity.getAttribute(AttributeCompat.MAX_HEALTH);
3636
if (attribute != null) {
3737
attribute.setBaseValue(getEntityProperties().health());
3838
livingEntity.setHealth(Math.min(getEntityProperties().health(), attribute.getValue()));
3939
}
4040
}
4141
if (properties.damage() != null) {
42-
AttributeInstance attribute = livingEntity.getAttribute(Attribute.GENERIC_ATTACK_DAMAGE);
42+
AttributeInstance attribute = livingEntity.getAttribute(AttributeCompat.ATTACK_DAMAGE);
4343
if (attribute != null) {
4444
attribute.setBaseValue(getEntityProperties().damage());
4545
}

‎bukkit/src/main/java/dev/aurelium/auraskills/bukkit/skills/agility/AgilityAbilities.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import dev.aurelium.auraskills.bukkit.AuraSkills;
1010
import dev.aurelium.auraskills.bukkit.ability.AbilityImpl;
1111
import dev.aurelium.auraskills.bukkit.item.BukkitPotionType;
12+
import dev.aurelium.auraskills.bukkit.util.AttributeCompat;
1213
import dev.aurelium.auraskills.bukkit.util.CompatUtil;
1314
import dev.aurelium.auraskills.bukkit.util.PotionUtil;
1415
import dev.aurelium.auraskills.common.message.type.AbilityMessage;
@@ -17,7 +18,6 @@
1718
import dev.aurelium.auraskills.common.util.text.TextUtil;
1819
import org.bukkit.Bukkit;
1920
import org.bukkit.Material;
20-
import org.bukkit.attribute.Attribute;
2121
import org.bukkit.attribute.AttributeInstance;
2222
import org.bukkit.entity.Entity;
2323
import org.bukkit.entity.LivingEntity;
@@ -167,7 +167,7 @@ public void fleeting(EntityDamageEvent event, User user, Player player) {
167167
if (isDisabled(ability)) return;
168168
if (failsChecks(player, ability)) return;
169169

170-
AttributeInstance attribute = player.getAttribute(Attribute.GENERIC_MAX_HEALTH);
170+
AttributeInstance attribute = player.getAttribute(AttributeCompat.MAX_HEALTH);
171171
if (attribute == null) return;
172172

173173
double maxHealth = attribute.getValue();
@@ -196,7 +196,7 @@ public void run() {
196196
}
197197

198198
public void removeFleeting(Player player) {
199-
AttributeInstance attribute = player.getAttribute(Attribute.GENERIC_MAX_HEALTH);
199+
AttributeInstance attribute = player.getAttribute(AttributeCompat.MAX_HEALTH);
200200

201201
if (attribute == null) return;
202202

@@ -227,7 +227,7 @@ private void fleetingRemove(Player player, double amountRegenerated) {
227227

228228
if (failsChecks(player, ability)) return;
229229

230-
AttributeInstance attribute = player.getAttribute(Attribute.GENERIC_MAX_HEALTH);
230+
AttributeInstance attribute = player.getAttribute(AttributeCompat.MAX_HEALTH);
231231
if (attribute == null) return;
232232

233233
double maxHealth = attribute.getValue();
@@ -265,7 +265,7 @@ public void fleetingJoin(UserLoadEvent event) {
265265

266266
if (failsChecks(player, ability)) return;
267267

268-
AttributeInstance attribute = player.getAttribute(Attribute.GENERIC_MAX_HEALTH);
268+
AttributeInstance attribute = player.getAttribute(AttributeCompat.MAX_HEALTH);
269269
if (attribute == null) return;
270270

271271
if (player.getHealth() < getFleetingHealthRequired() * attribute.getValue()) {

‎bukkit/src/main/java/dev/aurelium/auraskills/bukkit/skills/alchemy/AlchemyAbilities.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import dev.aurelium.auraskills.bukkit.ability.AbilityImpl;
1010
import dev.aurelium.auraskills.bukkit.item.BukkitPotionType;
1111
import dev.aurelium.auraskills.bukkit.skills.agility.AgilityAbilities;
12+
import dev.aurelium.auraskills.bukkit.util.AttributeCompat;
1213
import dev.aurelium.auraskills.bukkit.util.CompatUtil;
1314
import dev.aurelium.auraskills.bukkit.util.PotionUtil;
1415
import dev.aurelium.auraskills.common.message.type.AbilityMessage;
@@ -19,7 +20,6 @@
1920
import org.bukkit.Material;
2021
import org.bukkit.NamespacedKey;
2122
import org.bukkit.OfflinePlayer;
22-
import org.bukkit.attribute.Attribute;
2323
import org.bukkit.attribute.AttributeInstance;
2424
import org.bukkit.entity.*;
2525
import org.bukkit.event.EventHandler;
@@ -367,15 +367,15 @@ public void lifeSteal(EntityDeathEvent event) {
367367

368368
User user = plugin.getUser(player);
369369

370-
AttributeInstance entityAttribute = entity.getAttribute(Attribute.GENERIC_MAX_HEALTH);
370+
AttributeInstance entityAttribute = entity.getAttribute(AttributeCompat.MAX_HEALTH);
371371
if (entityAttribute == null) return;
372372

373373
// Get the health to regen from a percent of the mob's health
374374
double maxHealth = entityAttribute.getValue();
375375
double percent = getValue(ability, user) / 100;
376376
double healthRegen = maxHealth * percent;
377377

378-
AttributeInstance playerAttribute = player.getAttribute(Attribute.GENERIC_MAX_HEALTH);
378+
AttributeInstance playerAttribute = player.getAttribute(AttributeCompat.MAX_HEALTH);
379379
if (playerAttribute == null) return;
380380

381381
player.setHealth(player.getHealth() + Math.min(healthRegen, playerAttribute.getValue() - player.getHealth()));

‎bukkit/src/main/java/dev/aurelium/auraskills/bukkit/skills/archery/ArcheryAbilities.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
import dev.aurelium.auraskills.api.util.NumberUtil;
1010
import dev.aurelium.auraskills.bukkit.AuraSkills;
1111
import dev.aurelium.auraskills.bukkit.ability.AbilityImpl;
12+
import dev.aurelium.auraskills.bukkit.util.AttributeCompat;
1213
import dev.aurelium.auraskills.bukkit.util.CompatUtil;
1314
import dev.aurelium.auraskills.bukkit.util.VersionUtils;
1415
import dev.aurelium.auraskills.common.user.User;
1516
import dev.aurelium.auraskills.common.util.text.TextUtil;
1617
import org.bukkit.Material;
1718
import org.bukkit.NamespacedKey;
1819
import org.bukkit.Sound;
19-
import org.bukkit.attribute.Attribute;
2020
import org.bukkit.attribute.AttributeInstance;
2121
import org.bukkit.attribute.AttributeModifier;
2222
import org.bukkit.attribute.AttributeModifier.Operation;
@@ -106,7 +106,7 @@ public void stun(Player player, User user, LivingEntity entity) {
106106
if (failsChecks(player, ability)) return;
107107

108108
if (rand.nextDouble() < (getValue(ability, user) / 100)) {
109-
AttributeInstance speed = entity.getAttribute(Attribute.GENERIC_MOVEMENT_SPEED);
109+
AttributeInstance speed = entity.getAttribute(AttributeCompat.MOVEMENT_SPEED);
110110
if (speed == null) return;
111111
// Check if there already is a stun modifier
112112
for (AttributeModifier existingModifier : speed.getModifiers()) {
@@ -139,7 +139,7 @@ public void stun(Player player, User user, LivingEntity entity) {
139139

140140
private void scheduleStunRemoval(LivingEntity entity) {
141141
plugin.getScheduler().scheduleSync(() -> {
142-
AttributeInstance newSpeed = entity.getAttribute(Attribute.GENERIC_MOVEMENT_SPEED);
142+
AttributeInstance newSpeed = entity.getAttribute(AttributeCompat.MOVEMENT_SPEED);
143143
if (newSpeed == null) return;
144144
for (AttributeModifier attributeModifier : newSpeed.getModifiers()) {
145145
if (isStunModifier(attributeModifier)) {
@@ -152,7 +152,7 @@ private void scheduleStunRemoval(LivingEntity entity) {
152152
@EventHandler
153153
public void removeStun(PlayerQuitEvent event) {
154154
// Removes stun on logout
155-
AttributeInstance speed = event.getPlayer().getAttribute(Attribute.GENERIC_MOVEMENT_SPEED);
155+
AttributeInstance speed = event.getPlayer().getAttribute(AttributeCompat.MOVEMENT_SPEED);
156156
if (speed == null) return;
157157

158158
for (AttributeModifier attributeModifier : speed.getModifiers()) {

‎bukkit/src/main/java/dev/aurelium/auraskills/bukkit/skills/endurance/EnduranceAbilities.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import dev.aurelium.auraskills.bukkit.AuraSkills;
66
import dev.aurelium.auraskills.bukkit.ability.AbilityImpl;
77
import dev.aurelium.auraskills.bukkit.user.BukkitUser;
8+
import dev.aurelium.auraskills.bukkit.util.AttributeCompat;
89
import dev.aurelium.auraskills.common.user.User;
9-
import org.bukkit.attribute.Attribute;
1010
import org.bukkit.attribute.AttributeInstance;
1111
import org.bukkit.entity.Player;
1212
import org.bukkit.event.EventHandler;
@@ -64,7 +64,7 @@ else if (event.getRegainReason().equals(EntityRegainHealthEvent.RegainReason.SAT
6464
if (isDisabled(ability)) return;
6565
if (failsChecks(player, ability)) return;
6666
// Gets health
67-
AttributeInstance attribute = player.getAttribute(Attribute.GENERIC_MAX_HEALTH);
67+
AttributeInstance attribute = player.getAttribute(AttributeCompat.MAX_HEALTH);
6868
if (attribute == null) return;
6969

7070
double currentHealth = player.getHealth();
@@ -89,7 +89,7 @@ public void recoveryCustom(CustomRegenEvent event) {
8989

9090
User user = plugin.getUser(player);
9191
// Gets health
92-
AttributeInstance attribute = player.getAttribute(Attribute.GENERIC_MAX_HEALTH);
92+
AttributeInstance attribute = player.getAttribute(AttributeCompat.MAX_HEALTH);
9393
if (attribute == null) return;
9494

9595
double currentHealth = player.getHealth();

‎bukkit/src/main/java/dev/aurelium/auraskills/bukkit/skills/fighting/LightningBlade.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
import dev.aurelium.auraskills.api.mana.ManaAbilities;
44
import dev.aurelium.auraskills.bukkit.AuraSkills;
55
import dev.aurelium.auraskills.bukkit.mana.ReadiedManaAbility;
6+
import dev.aurelium.auraskills.bukkit.util.AttributeCompat;
67
import dev.aurelium.auraskills.bukkit.util.VersionUtils;
78
import dev.aurelium.auraskills.common.message.type.ManaAbilityMessage;
89
import dev.aurelium.auraskills.common.user.User;
910
import org.bukkit.NamespacedKey;
1011
import org.bukkit.Sound;
11-
import org.bukkit.attribute.Attribute;
1212
import org.bukkit.attribute.AttributeInstance;
1313
import org.bukkit.attribute.AttributeModifier;
1414
import org.bukkit.attribute.AttributeModifier.Operation;
@@ -38,7 +38,7 @@ public LightningBlade(AuraSkills plugin) {
3838
@Override
3939
@SuppressWarnings("removal")
4040
public void onActivate(Player player, User user) {
41-
AttributeInstance attribute = player.getAttribute(Attribute.GENERIC_ATTACK_SPEED);
41+
AttributeInstance attribute = player.getAttribute(AttributeCompat.ATTACK_SPEED);
4242
if (attribute == null) return;
4343

4444
// Remove existing modifier if exists
@@ -61,7 +61,7 @@ public void onActivate(Player player, User user) {
6161

6262
@Override
6363
public void onStop(Player player, User user) {
64-
AttributeInstance attribute = player.getAttribute(Attribute.GENERIC_ATTACK_SPEED);
64+
AttributeInstance attribute = player.getAttribute(AttributeCompat.ATTACK_SPEED);
6565
if (attribute == null) return;
6666

6767
for (AttributeModifier modifier : attribute.getModifiers()) {
@@ -125,7 +125,7 @@ public void lightningBladeJoin(PlayerJoinEvent event) {
125125
return;
126126
}
127127
// Remove attack speed attribute modifier
128-
AttributeInstance attribute = player.getAttribute(Attribute.GENERIC_ATTACK_SPEED);
128+
AttributeInstance attribute = player.getAttribute(AttributeCompat.ATTACK_SPEED);
129129
if (attribute == null) return;
130130
for (AttributeModifier modifier : attribute.getModifiers()) {
131131
if (modifier.getName().equals("AureliumSkills-LightningBlade")) {

‎bukkit/src/main/java/dev/aurelium/auraskills/bukkit/source/EntityLeveler.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
import dev.aurelium.auraskills.bukkit.AuraSkills;
1111
import dev.aurelium.auraskills.bukkit.hooks.mythicmobs.MythicMobsHook;
1212
import dev.aurelium.auraskills.bukkit.skills.fighting.FightingAbilities;
13+
import dev.aurelium.auraskills.bukkit.util.AttributeCompat;
1314
import dev.aurelium.auraskills.common.config.Option;
1415
import dev.aurelium.auraskills.common.source.SourceTypes;
1516
import dev.aurelium.auraskills.common.user.User;
1617
import dev.aurelium.auraskills.common.util.data.Pair;
1718
import org.bukkit.Bukkit;
1819
import org.bukkit.NamespacedKey;
19-
import org.bukkit.attribute.Attribute;
2020
import org.bukkit.attribute.AttributeInstance;
2121
import org.bukkit.entity.*;
2222
import org.bukkit.event.EventHandler;
@@ -317,7 +317,7 @@ private Player getBleedDamager(Entity entity) {
317317
private double getDamageMultiplier(LivingEntity entity, EntityXpSource source, EntityDamageEvent event) {
318318
double damageDealt = Math.min(entity.getHealth(), event.getFinalDamage());
319319
if (source.scaleXpWithHealth()) {
320-
AttributeInstance healthAttribute = entity.getAttribute(Attribute.GENERIC_MAX_HEALTH);
320+
AttributeInstance healthAttribute = entity.getAttribute(AttributeCompat.MAX_HEALTH);
321321
if (healthAttribute != null) {
322322
double maxHealth = healthAttribute.getValue();
323323
return damageDealt / maxHealth; // XP gain is damage/maxHealth * sourceXp

0 commit comments

Comments
 (0)