Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ private static Set<CustomEnchantment> buildCustomEnchantments(HoloItemsRevamp pl
new Memento(plugin),
new TideRider(plugin),
new Backdash(plugin),
new DemonAura(plugin),
new Plow(plugin)
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import org.bukkit.event.block.BlockPlaceEvent;
import org.bukkit.event.entity.PlayerDeathEvent;
import org.bukkit.event.entity.ProjectileLaunchEvent;
import org.bukkit.event.player.PlayerExpChangeEvent;
import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.event.player.PlayerToggleSneakEvent;
import org.bukkit.inventory.ItemStack;
Expand All @@ -28,4 +29,7 @@ default void onProjectileLaunch(ProjectileLaunchEvent event, ItemStack itemStack

default void onPlayerToggleSneak(PlayerToggleSneakEvent event, ItemStack itemStack) {
}

default void onPlayerExpChange(PlayerExpChangeEvent event, ItemStack itemStack) {
}
}
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
package com.strangeone101.holoitemsapi.enchantment;

import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.entity.ThrowableProjectile;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.block.BlockBreakEvent;
import org.bukkit.event.block.BlockPlaceEvent;
import org.bukkit.event.entity.PlayerDeathEvent;
import org.bukkit.event.entity.ProjectileLaunchEvent;
import org.bukkit.event.player.PlayerExpChangeEvent;
import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.event.player.PlayerToggleSneakEvent;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.PlayerInventory;

public class EnchantmentListener implements Listener {

Expand Down Expand Up @@ -133,4 +136,31 @@ public void onPlayerToggleSneak(PlayerToggleSneakEvent event) {


}

/**
* Handles PlayerExpChangeEvent enchantments.
* Only does armor slots for now.
*
* @param event The PlayerExpChangeEvent
*/
@EventHandler(ignoreCancelled = true)
public void onPlayerExpChange(PlayerExpChangeEvent event){
final Player player = event.getPlayer();
final PlayerInventory inventory = player.getInventory();
// I was copying SpaceNerden's code and didn't really understand why he didn't do this?
// If this is bad I'd like an explanation why.
final ItemStack[] armor = inventory.getArmorContents();

for(ItemStack item : armor){
if(item == null){
continue;
}

item.getEnchantments().keySet().forEach(enchantment -> {
if(enchantment instanceof EnchantmentAbility ability){
ability.onPlayerExpChange(event, item);
}
});
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -1787,7 +1787,7 @@ public List<Component> getLore() {
}

private static Idol buildOga(HoloItemsRevamp plugin) {
return new Idol() {
return new Idol(new DemonAuraBook(plugin)) {

@Override
public @NotNull String getSkinUrl() {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
package xyz.holocons.mc.holoitemsrevamp.enchantment;

import com.destroystokyo.paper.MaterialTags;
import com.strangeone101.holoitemsapi.enchantment.CustomEnchantment;
import com.strangeone101.holoitemsapi.enchantment.EnchantmentAbility;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.NamedTextColor;
import net.kyori.adventure.text.format.TextDecoration;
import org.bukkit.attribute.Attribute;
import org.bukkit.enchantments.Enchantment;
import org.bukkit.entity.Item;
import org.bukkit.entity.Player;
import org.bukkit.event.block.BlockBreakEvent;
import org.bukkit.event.player.PlayerExpChangeEvent;
import org.bukkit.inventory.ItemStack;
import org.bukkit.scheduler.BukkitRunnable;
import org.jetbrains.annotations.NotNull;
import xyz.holocons.mc.holoitemsrevamp.HoloItemsRevamp;
import xyz.holocons.mc.holoitemsrevamp.integration.Integrations;

public class DemonAura extends CustomEnchantment implements EnchantmentAbility {


public DemonAura(HoloItemsRevamp plugin) {
super(plugin, "demon_aura");
}

@Override
public int getMaxLevel() {
return 1;
}

@Override
public boolean conflictsWith(@NotNull Enchantment other) {
return false;
}

@Override
public boolean canEnchantItem(@NotNull ItemStack item) {
return MaterialTags.ARMOR.isTagged(item);
}

@Override
public @NotNull Component displayName(int level) {
return Component.text()
.color(NamedTextColor.GRAY)
.decoration(TextDecoration.ITALIC, false)
.append(Component.text("Demon Aura"))
.build();
}

@Override
public int getCostMultiplier() {
return 12;
}

@Override
public void onPlayerExpChange(PlayerExpChangeEvent event, ItemStack itemStack) {
// Copied from Memento
final var location = event.getPlayer().getLocation();
if(!Integrations.WORLDGUARD.canUseEnchantment(location, DemonAura.class)){
return;
}

int XpGained = event.getAmount();
if(XpGained <= 0){
// Would be < 0 if you enchanted/used an anvil.
// Or if you used /xp add -1, but that's not a use-case we really care about.
// Not sure when it'd be == 0 but can't hurt to catch the == 0 case anyway.
return;
}

final Player player = event.getPlayer();
double playerHealth = player.getHealth();
var maxHealthAttribute = player.getAttribute(Attribute.GENERIC_MAX_HEALTH);
// This should never happen; the docs say it'll only be null if the attribute doesn't apply.
// But my IDE is complaining.
double maxHealth = maxHealthAttribute == null ? 20 : maxHealthAttribute.getValue();
if(playerHealth >= maxHealth){
// Logic copied from OldHoloItems
return;
}

// Arbitrary formula.
int amountToHeal = (XpGained/7)+1;

if(amountToHeal + playerHealth > maxHealth){
// honestly I don't trust this but whatever
amountToHeal = (int) Math.ceil(maxHealth - playerHealth);
}

// apply amountToHeal:
player.setHealth(playerHealth + amountToHeal);
event.setAmount(XpGained - amountToHeal);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
package xyz.holocons.mc.holoitemsrevamp.item;

import com.strangeone101.holoitemsapi.enchantment.EnchantManager;
import com.strangeone101.holoitemsapi.enchantment.Enchantable;
import com.strangeone101.holoitemsapi.item.CustomItem;
import com.strangeone101.holoitemsapi.recipe.RecipeManager;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.NamedTextColor;
import org.bukkit.Material;
import org.bukkit.enchantments.Enchantment;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.Recipe;
import org.bukkit.inventory.ShapedRecipe;
import org.bukkit.inventory.meta.EnchantmentStorageMeta;
import xyz.holocons.mc.holoitemsrevamp.HoloItemsRevamp;

import java.util.List;

public class DemonAuraBook extends CustomItem implements Enchantable {

private static final String name = "demon_aura";
private static final Material material = Material.ENCHANTED_BOOK;
private static final Component displayName = Component.text("Demon Aura", NamedTextColor.RED);
private static final List<Component> lore = List.of(
Component.text("Heal from EXP gained!", NamedTextColor.DARK_PURPLE)
);

private final EnchantManager enchantManager;

public DemonAuraBook(HoloItemsRevamp plugin) {
super(plugin, name, material, displayName, lore);
this.enchantManager = plugin.getEnchantManager();
this.register();
}

@Override
protected Recipe getRecipe() {
ShapedRecipe recipe = new ShapedRecipe(getKey(), buildStack(null));
recipe.shape(
"aaa",
"aba",
"aaa"
);
recipe.setIngredient('a', Material.CANDLE);
recipe.setIngredient('b', Material.IRON_HORSE_ARMOR);
return recipe;
}

@Override
public Enchantment getEnchantment() {
return Enchantment.getByKey(getKey());
}

@Override
public ItemStack applyEnchantment(ItemStack itemStack) {
var enchantedStack = itemStack.clone();
var enchantedMeta = (EnchantmentStorageMeta) enchantedStack.getItemMeta();

if (enchantedMeta.addStoredEnchant(getEnchantment(), 1, false)) {
enchantedStack.setItemMeta(enchantedMeta);
enchantManager.removeCustomEnchantmentLore(enchantedStack);
enchantManager.applyCustomEnchantmentLore(enchantedStack);
return enchantedStack;
} else {
return null;
}
}
}