Upstream/EcoEnchants
1
0
Fork 0
mirror of https://github.com/Auxilor/EcoEnchants.git synced 2024-11-22 15:05:18 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Switched artifacts to use watchers

Browse Source
This commit is contained in:
Auxilor 2021-03-21 19:00:12 +00:00
parent 660d31c2e0
commit c10fe6044d
4 changed files with 92 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Atmospheric.java
View File

@ -15,6 +15,7 @@ public class Atmospheric extends EcoEnchant {
"atmospheric", EnchantmentType.NORMAL
);
}
@Override
public void onTridentLaunch(@NotNull final LivingEntity shooter,
@NotNull final Trident trident,

95
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/itemtypes/Artifact.java
View File

@ -2,7 +2,6 @@ package com.willfp.ecoenchants.enchantments.itemtypes;
import com.google.common.util.concurrent.AtomicDouble;
import com.willfp.eco.util.NumberUtils;
import com.willfp.eco.util.TridentUtils;
import com.willfp.eco.util.optional.Prerequisite;
import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
@ -11,17 +10,15 @@ import com.willfp.ecoenchants.enchantments.util.EnchantChecks;
import org.bukkit.Location;
import org.bukkit.Particle;
import org.bukkit.block.Block;
import org.bukkit.entity.AbstractArrow;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.entity.Trident;
import org.bukkit.entity.Projectile;
import org.bukkit.event.EventHandler;
import org.bukkit.event.HandlerList;
import org.bukkit.event.block.BlockBreakEvent;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
import org.bukkit.event.entity.ProjectileLaunchEvent;
import org.bukkit.event.player.PlayerMoveEvent;
import org.bukkit.inventory.ItemStack;
import org.bukkit.util.Vector;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@ -77,24 +74,15 @@ public abstract class Artifact extends EcoEnchant {
return null;
}
/**
* Called on block break.
*
* @param event The event to listen for.
*/
@EventHandler
public void onBreak(@NotNull final BlockBreakEvent event) {
Player player = event.getPlayer();
Block block = event.getBlock();
@Override
public void onBlockBreak(@NotNull final Player player,
@NotNull final Block block,
final int level,
@NotNull final BlockBreakEvent event) {
if (!this.getConfig().getStrings(EcoEnchants.CONFIG_LOCATION + "on-blocks").contains(block.getType().name().toLowerCase())) {
return;
}
if (!EnchantChecks.mainhand(player, this)) {
return;
}
int amount = this.getConfig().getInt(EcoEnchants.CONFIG_LOCATION + "amount");
block.getWorld().spawnParticle(particle, block.getLocation().add(0.5, 0.5, 0.5), amount, 0.4, 0.4, 0.4, 0, extra, false);
}
@ -130,27 +118,11 @@ public abstract class Artifact extends EcoEnchant {
player.getWorld().spawnParticle(particle, location2, 1, 0, 0, 0, 0, extra, true);
}
/**
* Called when a player hits an entity.
*
* @param event The event to listen for.
*/
@EventHandler
public void onHit(@NotNull final EntityDamageByEntityEvent event) {
if (!(event.getDamager() instanceof Player)) {
return;
}
if (!(event.getEntity() instanceof LivingEntity)) {
return;
}
Player player = (Player) event.getDamager();
LivingEntity entity = (LivingEntity) event.getEntity();
if (!EnchantChecks.mainhand(player, this)) {
return;
}
@Override
public void onMeleeAttack(@NotNull final LivingEntity attacker,
@NotNull final LivingEntity victim,
final int level,
@NotNull final EntityDamageByEntityEvent event) {
double radius = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "radius");
AtomicDouble yAtomic = new AtomicDouble(0);
@ -163,51 +135,30 @@ public abstract class Artifact extends EcoEnchant {
this.getPlugin().getRunnableFactory().create(bukkitRunnable -> {
for (int i = 0; i < 3; i++) {
if (yAtomic.get() > entity.getHeight()) {
if (yAtomic.get() > victim.getHeight()) {
bukkitRunnable.cancel();
}
yAtomic.addAndGet(yDelta);
double y = yAtomic.get();
double x = radius * Math.cos((y + offset) * radiusMultiplier);
double z = radius * Math.sin((y + offset) * radiusMultiplier);
Location particleLocation = entity.getLocation();
Location particleLocation = victim.getLocation();
particleLocation.add(x, y, z);
entity.getWorld().spawnParticle(particle, particleLocation, 1, 0, 0, 0, 0, extra, false);
victim.getWorld().spawnParticle(particle, particleLocation, 1, 0, 0, 0, 0, extra, false);
if (doubleHelix) {
Location particleLocation2 = entity.getLocation();
Location particleLocation2 = victim.getLocation();
particleLocation2.add(-x, y, -z);
entity.getWorld().spawnParticle(particle, particleLocation2, 1, 0, 0, 0, 0, extra, false);
victim.getWorld().spawnParticle(particle, particleLocation2, 1, 0, 0, 0, 0, extra, false);
}
}
}).runTaskTimer(0, 1);
}
/**
* Called on projectile launch.
*
* @param event The event to listen for.
*/
@EventHandler
public void onShoot(@NotNull final ProjectileLaunchEvent event) {
if (!(event.getEntity() instanceof AbstractArrow)) {
return;
}
if (!(event.getEntity().getShooter() instanceof Player)) {
return;
}
Player player = (Player) event.getEntity().getShooter();
AbstractArrow entity = (AbstractArrow) event.getEntity();
ItemStack item = player.getInventory().getItemInMainHand();
if (entity instanceof Trident) {
item = TridentUtils.getItemStack((Trident) entity);
}
if (!EnchantChecks.item(item, this)) {
return;
}
@Override
public void onProjectileLaunch(@NotNull final LivingEntity shooter,
@NotNull final Projectile projectile,
final int level,
@NotNull final ProjectileLaunchEvent event) {
int ticks = this.getConfig().getInt(EcoEnchants.CONFIG_LOCATION + "particle-tick-delay");
int noteColor;
@ -219,10 +170,10 @@ public abstract class Artifact extends EcoEnchant {
final double finalColor = color.get();
this.getPlugin().getRunnableFactory().create(bukkitRunnable -> {
if (entity.isOnGround() || entity.isInBlock() || entity.isDead()) {
if (projectile.isOnGround() || projectile.isDead()) {
bukkitRunnable.cancel();
}
entity.getLocation().getWorld().spawnParticle(particle, entity.getLocation(), 1, 0, 0, 0, finalColor, extra, true);
projectile.getLocation().getWorld().spawnParticle(particle, projectile.getLocation(), 1, 0, 0, 0, finalColor, extra, true);
}).runTaskTimer(4, ticks);
}
}

16
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/Watcher.java
View File

@ -5,6 +5,7 @@ import org.bukkit.block.Block;
import org.bukkit.entity.Arrow;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.entity.Projectile;
import org.bukkit.entity.Trident;
import org.bukkit.event.block.BlockBreakEvent;
import org.bukkit.event.block.BlockDamageEvent;
@ -95,6 +96,21 @@ public interface Watcher {
// Empty default as enchantments only override required watchers.
}
/**
* Called when an entity shoots a projectile.
*
* @param shooter The entity that shot the bow.
* @param projectile The projectile that was shot.
* @param level The level of the enchantment found on the projectile.
* @param event The event that called this watcher.
*/
default void onProjectileLaunch(@NotNull final LivingEntity shooter,
@NotNull final Projectile projectile,
final int level,
@NotNull final ProjectileLaunchEvent event) {
// Empty default as enchantments only override required watchers.
}
/**
* Called when an entity takes fall damage.
*

52
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/WatcherTriggers.java
View File

@ -10,10 +10,12 @@ import com.willfp.eco.util.plugin.AbstractEcoPlugin;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.entity.AbstractArrow;
import org.bukkit.entity.Arrow;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.entity.Projectile;
import org.bukkit.entity.Trident;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
@ -312,6 +314,56 @@ public class WatcherTriggers extends PluginDependent implements Listener {
});
}
/**
* Called when an entity launches a projectile.
*
* @param event The event to listen for.
*/
@EventHandler(ignoreCancelled = true)
public void onProjectileLaunch(@NotNull final ProjectileLaunchEvent event) {
if (McmmoManager.isFake(event)) {
return;
}
if (!(event.getEntity() instanceof AbstractArrow)) {
return;
}
if (!(event.getEntity().getShooter() instanceof Player)) {
return;
}
LivingEntity shooter = (LivingEntity) event.getEntity().getShooter();
Projectile projectile = event.getEntity();
if (shooter.getEquipment() == null) {
return;
}
ItemStack item = shooter.getEquipment().getItemInMainHand();
if (projectile instanceof Trident) {
item = TridentUtils.getItemStack((Trident) projectile);
}
EnchantChecks.getEnchantsOnItem(item).forEach((enchant, level) -> {
if (event.isCancelled()) {
return;
}
if (!enchant.isEnabled()) {
return;
}
if (enchant.getDisabledWorlds().contains(shooter.getWorld())) {
return;
}
enchant.onProjectileLaunch(shooter, projectile, level, event);
});
}
/**
* Called when an entity takes fall damage.
*