Repo-Mirror/EcoArmor
9
0
Fork 0
mirror of https://github.com/Auxilor/EcoArmor.git synced 2025-12-28 11:29:18 +00:00
Code Issues Releases 1 Activity

Optimised effect system

Browse Source
This commit is contained in:
Auxilor
2021-02-21 11:06:20 +00:00
parent 641d0d5804
commit a143604978
19 changed files with 49 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/conditions/conditions/ConditionBelowY.java
View File

@@ -30,7 +30,7 @@ public class ConditionBelowY extends Condition<Double> {
}
if (isMet(player, value)) {
set.getEffects().keySet().forEach(effect -> effect.enable(player));
set.getEffects().keySet().forEach(effect -> effect.enable(player, value));
} else {
set.getEffects().keySet().forEach(effect -> effect.disable(player));
}

25
eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/Effect.java
View File

@@ -6,9 +6,10 @@ import lombok.Getter;
import org.bukkit.entity.Player;
import org.bukkit.event.Listener;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.HashSet;
import java.util.Set;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
public abstract class Effect<T> implements Listener {
@@ -45,7 +46,7 @@ public abstract class Effect<T> implements Listener {
/**
* Players that the effect is currently enabled for.
*/
private final Set<UUID> enabledPlayers = new HashSet<>();
private final Map<UUID, T> enabledPlayers = new HashMap<>();
/**
* Create a new effect.
@@ -62,27 +63,31 @@ public abstract class Effect<T> implements Listener {
update();
Effects.addNewEffect(this);
}
/**
* Get if effect is enabled for player.
* Get the effect strength for a player.
*
* @param player The player.
* @return If enabled.
* @return The strength.
*/
public final boolean isEnabledForPlayer(@NotNull final Player player) {
return enabledPlayers.contains(player.getUniqueId());
@Nullable
public final T getStrengthForPlayer(@NotNull final Player player) {
return enabledPlayers.get(player.getUniqueId());
}
/**
* Enable the effect for a player.
*
* @param player The player.
* @param value The strength.
*/
public final void enable(@NotNull final Player player) {
if (enabledPlayers.contains(player.getUniqueId())) {
public final void enable(@NotNull final Player player,
@NotNull final Object value) {
if (enabledPlayers.containsKey(player.getUniqueId())) {
return;
}
enabledPlayers.add(player.getUniqueId());
enabledPlayers.put(player.getUniqueId(), typeClass.cast(value));
this.onEnable(player);
}

3
eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/AttackSpeedMultiplier.java
View File

@@ -1,7 +1,6 @@
package com.willfp.ecoarmor.effects.effects;
import com.willfp.ecoarmor.effects.Effect;
import com.willfp.ecoarmor.sets.util.ArmorUtils;
import org.bukkit.attribute.Attribute;
import org.bukkit.attribute.AttributeInstance;
import org.bukkit.attribute.AttributeModifier;
@@ -18,7 +17,7 @@ public class AttackSpeedMultiplier extends Effect<Double> {
AttributeInstance maxHealth = player.getAttribute(Attribute.GENERIC_ATTACK_SPEED);
assert maxHealth != null;
Double multiplier = ArmorUtils.getEffectStrength(player, this);
Double multiplier = this.getStrengthForPlayer(player);
if (multiplier == null) {
return;

3
eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/BonusHearts.java
View File

@@ -1,7 +1,6 @@
package com.willfp.ecoarmor.effects.effects;
import com.willfp.ecoarmor.effects.Effect;
import com.willfp.ecoarmor.sets.util.ArmorUtils;
import org.bukkit.attribute.Attribute;
import org.bukkit.attribute.AttributeInstance;
import org.bukkit.attribute.AttributeModifier;
@@ -18,7 +17,7 @@ public class BonusHearts extends Effect<Integer> {
AttributeInstance maxHealth = player.getAttribute(Attribute.GENERIC_MAX_HEALTH);
assert maxHealth != null;
Integer bonus = ArmorUtils.getEffectStrength(player, this);
Integer bonus = this.getStrengthForPlayer(player);
if (bonus == null) {
return;

7
eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/BowDamageMultiplier.java
View File

@@ -1,7 +1,6 @@
package com.willfp.ecoarmor.effects.effects;
import com.willfp.ecoarmor.effects.Effect;
import com.willfp.ecoarmor.sets.util.ArmorUtils;
import org.bukkit.entity.Arrow;
import org.bukkit.entity.Player;
import org.bukkit.entity.Projectile;
@@ -33,11 +32,7 @@ public class BowDamageMultiplier extends Effect<Double> {
Player player = (Player) shooter;
if (!this.isEnabledForPlayer(player)) {
return;
}
Double multiplier = ArmorUtils.getEffectStrength(player, this);
Double multiplier = this.getStrengthForPlayer(player);
if (multiplier == null) {
return;
}

7
eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/DamageMultiplier.java
View File

@@ -1,7 +1,6 @@
package com.willfp.ecoarmor.effects.effects;
import com.willfp.ecoarmor.effects.Effect;
import com.willfp.ecoarmor.sets.util.ArmorUtils;
import org.bukkit.entity.Player;
import org.bukkit.entity.Projectile;
import org.bukkit.event.EventHandler;
@@ -38,11 +37,7 @@ public class DamageMultiplier extends Effect<Double> {
return;
}
if (!this.isEnabledForPlayer(attacker)) {
return;
}
Double multiplier = ArmorUtils.getEffectStrength(attacker, this);
Double multiplier = this.getStrengthForPlayer(attacker);
if (multiplier == null) {
return;
}

7
eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/DamageTakenMultiplier.java
View File

@@ -1,7 +1,6 @@
package com.willfp.ecoarmor.effects.effects;
import com.willfp.ecoarmor.effects.Effect;
import com.willfp.ecoarmor.sets.util.ArmorUtils;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.entity.EntityDamageEvent;
@@ -24,11 +23,7 @@ public class DamageTakenMultiplier extends Effect<Double> {
Player player = (Player) event.getEntity();
if (!this.isEnabledForPlayer(player)) {
return;
}
Double multiplier = ArmorUtils.getEffectStrength(player, this);
Double multiplier = this.getStrengthForPlayer(player);
if (multiplier == null) {
return;
}

7
eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/DurabilityMultiplier.java
View File

@@ -2,7 +2,6 @@ package com.willfp.ecoarmor.effects.effects;
import com.willfp.eco.util.NumberUtils;
import com.willfp.ecoarmor.effects.Effect;
import com.willfp.ecoarmor.sets.util.ArmorUtils;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.player.PlayerItemDamageEvent;
@@ -21,11 +20,7 @@ public class DurabilityMultiplier extends Effect<Double> {
Player player = event.getPlayer();
if (!this.isEnabledForPlayer(player)) {
return;
}
Double multiplier = ArmorUtils.getEffectStrength(player, this);
Double multiplier = this.getStrengthForPlayer(player);
if (multiplier == null) {
return;

7
eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/EvadeChance.java
View File

@@ -2,7 +2,6 @@ package com.willfp.ecoarmor.effects.effects;
import com.willfp.eco.util.NumberUtils;
import com.willfp.ecoarmor.effects.Effect;
import com.willfp.ecoarmor.sets.util.ArmorUtils;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.entity.EntityDamageEvent;
@@ -25,11 +24,7 @@ public class EvadeChance extends Effect<Double> {
Player player = (Player) event.getEntity();
if (!this.isEnabledForPlayer(player)) {
return;
}
Double chance = ArmorUtils.getEffectStrength(player, this);
Double chance = this.getStrengthForPlayer(player);
if (chance == null) {
return;

7
eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/ExperienceMultiplier.java
View File

@@ -2,7 +2,6 @@ package com.willfp.ecoarmor.effects.effects;
import com.willfp.eco.util.events.naturalexpgainevent.NaturalExpGainEvent;
import com.willfp.ecoarmor.effects.Effect;
import com.willfp.ecoarmor.sets.util.ArmorUtils;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.jetbrains.annotations.NotNull;
@@ -16,15 +15,11 @@ public class ExperienceMultiplier extends Effect<Double> {
public void listener(@NotNull final NaturalExpGainEvent event) {
Player player = event.getExpChangeEvent().getPlayer();
if (!this.isEnabledForPlayer(player)) {
return;
}
if (event.getExpChangeEvent().getAmount() < 0) {
return;
}
Double multiplier = ArmorUtils.getEffectStrength(player, this);
Double multiplier = this.getStrengthForPlayer(player);
if (multiplier == null) {
return;

7
eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/FallDamageMultiplier.java
View File

@@ -1,7 +1,6 @@
package com.willfp.ecoarmor.effects.effects;
import com.willfp.ecoarmor.effects.Effect;
import com.willfp.ecoarmor.sets.util.ArmorUtils;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.entity.EntityDamageEvent;
@@ -28,11 +27,7 @@ public class FallDamageMultiplier extends Effect<Double> {
Player player = (Player) event.getEntity();
if (!this.isEnabledForPlayer(player)) {
return;
}
Double multiplier = ArmorUtils.getEffectStrength(player, this);
Double multiplier = this.getStrengthForPlayer(player);
if (multiplier == null) {
return;
}

7
eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/HungerLossMultiplier.java
View File

@@ -2,7 +2,6 @@ package com.willfp.ecoarmor.effects.effects;
import com.willfp.eco.util.NumberUtils;
import com.willfp.ecoarmor.effects.Effect;
import com.willfp.ecoarmor.sets.util.ArmorUtils;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.entity.FoodLevelChangeEvent;
@@ -21,11 +20,7 @@ public class HungerLossMultiplier extends Effect<Double> {
Player player = (Player) event.getEntity();
if (!this.isEnabledForPlayer(player)) {
return;
}
Double multiplier = ArmorUtils.getEffectStrength(player, this);
Double multiplier = this.getStrengthForPlayer(player);
if (multiplier == null) {
return;

6
eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/MeleeDamageMultiplier.java
View File

@@ -1,7 +1,6 @@
package com.willfp.ecoarmor.effects.effects;
import com.willfp.ecoarmor.effects.Effect;
import com.willfp.ecoarmor.sets.util.ArmorUtils;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
@@ -24,11 +23,8 @@ public class MeleeDamageMultiplier extends Effect<Double> {
Player attacker = (Player) event.getDamager();
if (!this.isEnabledForPlayer(attacker)) {
return;
}
Double multiplier = this.getStrengthForPlayer(attacker);
Double multiplier = ArmorUtils.getEffectStrength(attacker, this);
if (multiplier == null) {
return;
}

7
eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/RegenerationMultiplier.java
View File

@@ -1,7 +1,6 @@
package com.willfp.ecoarmor.effects.effects;
import com.willfp.ecoarmor.effects.Effect;
import com.willfp.ecoarmor.sets.util.ArmorUtils;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.entity.EntityRegainHealthEvent;
@@ -24,11 +23,7 @@ public class RegenerationMultiplier extends Effect<Double> {
Player player = (Player) event.getEntity();
if (!this.isEnabledForPlayer(player)) {
return;
}
Double multiplier = ArmorUtils.getEffectStrength(player, this);
Double multiplier = this.getStrengthForPlayer(player);
if (multiplier == null) {
return;

3
eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/SpeedMultiplier.java
View File

@@ -1,7 +1,6 @@
package com.willfp.ecoarmor.effects.effects;
import com.willfp.ecoarmor.effects.Effect;
import com.willfp.ecoarmor.sets.util.ArmorUtils;
import org.bukkit.attribute.Attribute;
import org.bukkit.attribute.AttributeInstance;
import org.bukkit.attribute.AttributeModifier;
@@ -18,7 +17,7 @@ public class SpeedMultiplier extends Effect<Double> {
AttributeInstance movementSpeed = player.getAttribute(Attribute.GENERIC_MOVEMENT_SPEED);
assert movementSpeed != null;
Double strength = ArmorUtils.getEffectStrength(player, this);
Double strength = this.getStrengthForPlayer(player);
if (strength == null) {
return;

6
eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/TridentDamageMultiplier.java
View File

@@ -1,7 +1,6 @@
package com.willfp.ecoarmor.effects.effects;
import com.willfp.ecoarmor.effects.Effect;
import com.willfp.ecoarmor.sets.util.ArmorUtils;
import org.bukkit.entity.Player;
import org.bukkit.entity.Projectile;
import org.bukkit.entity.Trident;
@@ -33,11 +32,8 @@ public class TridentDamageMultiplier extends Effect<Double> {
Player player = (Player) shooter;
if (!this.isEnabledForPlayer(player)) {
return;
}
Double multiplier = this.getStrengthForPlayer(player);
Double multiplier = ArmorUtils.getEffectStrength(player, this);
if (multiplier == null) {
return;
}

3
eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/WarpChance.java
View File

@@ -2,7 +2,6 @@ package com.willfp.ecoarmor.effects.effects;
import com.willfp.eco.util.NumberUtils;
import com.willfp.ecoarmor.effects.Effect;
import com.willfp.ecoarmor.sets.util.ArmorUtils;
import org.bukkit.Location;
import org.bukkit.block.Block;
import org.bukkit.entity.LivingEntity;
@@ -34,7 +33,7 @@ public class WarpChance extends Effect<Double> {
Player player = (Player) event.getDamager();
LivingEntity victim = (LivingEntity) event.getEntity();
Double chance = ArmorUtils.getEffectStrength(player, this);
Double chance = this.getStrengthForPlayer(player);
if (chance == null) {
return;

26
eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/util/EffectWatcher.java
View File

@@ -38,19 +38,29 @@ public class EffectWatcher extends PluginDependent implements Listener {
boolean enabled = true;
if (set == null) {
enabled = false;
} else {
if (set.getEffectStrength(effect) == null) {
enabled = false;
}
effect.disable(player);
continue;
}
if (!ArmorUtils.areConditionsMet(player)) {
enabled = false;
Object strength = set.getEffectStrength(effect);
if (ArmorUtils.isWearingAdvanced(player)) {
Object advancedStrength = set.getAdvancedEffectStrength(effect);
if (advancedStrength != null) {
strength = advancedStrength;
}
}
if (strength == null) {
enabled = false;
}
if (!ArmorUtils.areConditionsMet(player)) {
enabled = false;
}
if (enabled) {
effect.enable(player);
effect.enable(player, strength);
} else {
effect.disable(player);
}

25
eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/sets/util/ArmorUtils.java
View File

@@ -98,31 +98,6 @@ public class ArmorUtils {
return null;
}
/**
* Get the strength of an effect on a player's set.
*
* @param player The player to test.
* @param effect The effect to test.
* @param <T> Effect type.
* @return The strength, or null if not found.
*/
@Nullable
public <T> T getEffectStrength(@NotNull final Player player,
@NotNull final Effect<T> effect) {
ArmorSet set = getSetOnPlayer(player);
if (set == null) {
return null;
}
T strength = set.getEffectStrength(effect);
if (isWearingAdvanced(player)) {
strength = set.getAdvancedEffectStrength(effect);
}
return strength;
}
/**
* Get if all conditions are met for a player.
*