Upstream/EcoEnchants
1
0
Fork 0
mirror of https://github.com/Auxilor/EcoEnchants.git synced 2025-02-02 02:11:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added particles to villagers when it gets a special enchantment

Browse Source
This commit is contained in:
Auxilor 2021-07-30 00:16:59 +01:00
parent 61ba8b98f3
commit 2aaaa3e524
2 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/obtaining/VillagerListeners.java
View File

@ -7,7 +7,11 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.meta.EnchantmentTarget; import com.willfp.ecoenchants.enchantments.meta.EnchantmentTarget;
import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;
import org.bukkit.Color;
import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.Particle;
import org.bukkit.entity.Entity;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.event.entity.VillagerAcquireTradeEvent; import org.bukkit.event.entity.VillagerAcquireTradeEvent;
@ -66,6 +70,8 @@ public class VillagerListeners extends PluginDependent<EcoPlugin> implements Lis
double multiplier = 0.01 / this.getPlugin().getConfigYml().getDouble("villager.book-times-less-likely"); double multiplier = 0.01 / this.getPlugin().getConfigYml().getDouble("villager.book-times-less-likely");
EcoEnchant applied = null;
for (EcoEnchant enchantment : enchantments) { for (EcoEnchant enchantment : enchantments) {
if (NumberUtils.randFloat(0, 1) > enchantment.getRarity().getVillagerProbability() * multiplier) { if (NumberUtils.randFloat(0, 1) > enchantment.getRarity().getVillagerProbability() * multiplier) {
continue; continue;
@ -97,14 +103,24 @@ public class VillagerListeners extends PluginDependent<EcoPlugin> implements Lis
meta.getStoredEnchants().forEach(((enchantment1, integer) -> meta.removeStoredEnchant(enchantment1))); meta.getStoredEnchants().forEach(((enchantment1, integer) -> meta.removeStoredEnchant(enchantment1)));
meta.addStoredEnchant(enchantment, level, false); meta.addStoredEnchant(enchantment, level, false);
applied = enchantment;
break; break;
} }
if (applied == null) {
return;
}
result.setItemMeta(meta); result.setItemMeta(meta);
MerchantRecipe recipe = new MerchantRecipe(result, uses, maxUses, experienceReward, villagerExperience, priceMultiplier); MerchantRecipe recipe = new MerchantRecipe(result, uses, maxUses, experienceReward, villagerExperience, priceMultiplier);
recipe.setIngredients(ingredients); recipe.setIngredients(ingredients);
event.setRecipe(recipe); event.setRecipe(recipe);
if (applied.getType().equals(EnchantmentType.SPECIAL)) {
showParticles(event.getEntity());
}
} }
/** /**
@ -217,5 +233,36 @@ public class VillagerListeners extends PluginDependent<EcoPlugin> implements Lis
MerchantRecipe recipe = new MerchantRecipe(result, uses, maxUses, experienceReward, villagerExperience, priceMultiplier); MerchantRecipe recipe = new MerchantRecipe(result, uses, maxUses, experienceReward, villagerExperience, priceMultiplier);
recipe.setIngredients(ingredients); recipe.setIngredients(ingredients);
event.setRecipe(recipe); event.setRecipe(recipe);
if (toAdd.keySet().stream().anyMatch(enchant -> enchant.getType().equals(EnchantmentType.SPELL))) {
showParticles(event.getEntity());
}
}
private void showParticles(@NotNull final Entity villager) {
Particle.DustOptions extra = new Particle.DustOptions(
Color.fromRGB(Integer.parseInt(
this.getPlugin().getLangYml().getString("special-particle-color").substring(1),
16
)),
1.0f
);
Location location = villager.getLocation().clone();
location.add(0, 1, 0);
int limit = NumberUtils.randInt(8, 13);
for (int i = 0; i < limit; i++) {
Location spawnLoc = location.clone();
spawnLoc.add(
NumberUtils.randFloat(-1.2, 1.2),
NumberUtils.randFloat(-0.3, 1.2),
NumberUtils.randFloat(-1.2, 1.2)
);
spawnLoc.getWorld().spawnParticle(Particle.REDSTONE, spawnLoc, 1, 0, 0, 0, 0, extra, true);
}
} }
} }

2
eco-core/core-plugin/src/main/resources/lang.yml
View File

@ -42,6 +42,8 @@ spell-color: "&9"
description-color: "&8" description-color: "&8"
special-particle-color: "#FF69B4"
enchantments: enchantments:
protection: protection:
name: "Protection" name: "Protection"