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

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/data/storage/PlayerProfile.kt
#	gradle.properties
This commit is contained in:
Auxilor 2021-11-01 21:26:13 +00:00
commit e4d2a20eb8
3 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,6 +37,6 @@ public class Thor extends EcoEnchant {
double damage = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "lightning-damage");
boolean silent = this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "local-lightning-sound");
LightningUtils.strike(attacker, damage, silent);
LightningUtils.strike(victim, damage, silent);
}
}

2
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Streamlining.java
View File

@ -23,6 +23,6 @@ public class Streamlining extends EcoEnchant {
return;
}
player.setWalkSpeed((float) (0.2 + (level * EcoEnchants.STREAMLINING.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "speed-per-level"))));
player.setWalkSpeed((float) (0.2f - (level * this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "speed-per-level"))));
}
}

34
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/merging/grindstone/GrindstoneListeners.java
View File

@ -1,5 +1,6 @@
package com.willfp.ecoenchants.enchantments.support.merging.grindstone;
import com.sk89q.worldguard.blacklist.target.ItemMatcher;
import com.willfp.eco.core.EcoPlugin;
import com.willfp.eco.core.PluginDependent;
import com.willfp.eco.util.NumberUtils;
@ -15,9 +16,12 @@ import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.inventory.GrindstoneInventory;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.EnchantmentStorageMeta;
import org.bukkit.inventory.meta.ItemMeta;
import org.jetbrains.annotations.NotNull;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
public class GrindstoneListeners extends PluginDependent<EcoPlugin> implements Listener {
@ -51,31 +55,39 @@ public class GrindstoneListeners extends PluginDependent<EcoPlugin> implements L
ItemStack top = inventory.getItem(0);
ItemStack bottom = inventory.getItem(1);
ItemStack out = inventory.getItem(2);
if (out == null) {
return;
}
Map<Enchantment, Integer> toKeep = GrindstoneMerge.doMerge(top, bottom);
this.getPlugin().getScheduler().runLater(() -> {
if (inventory.getItem(2) != null || event.isCancelled()) return;
Set<Enchantment> enchants = new HashSet<>();
if (top != null) {
enchants.addAll(top.getEnchantments().keySet());
if (inventory.getItem(2) != null || event.isCancelled()) {
return;
}
if (bottom != null) {
enchants.addAll(bottom.getEnchantments().keySet());
ItemMeta outMeta = out.getItemMeta();
assert outMeta != null;
if (outMeta instanceof EnchantmentStorageMeta storageMeta) {
toKeep.forEach((enchant, level) -> storageMeta.addStoredEnchant(enchant, level, true));
out.setItemMeta(storageMeta);
} else {
toKeep.forEach((enchant, level) -> outMeta.addEnchant(enchant, level, true));
out.setItemMeta(outMeta);
}
enchants.removeIf(enchantment -> !(enchantment instanceof EcoEnchant));
if (!enchants.isEmpty()) {
if (!toKeep.isEmpty()) {
Location loc = player.getLocation().clone().add(
NumberUtils.randFloat(-1, 1),
NumberUtils.randFloat(-1, 1),
NumberUtils.randFloat(-1, 1)
);
ExperienceOrb orb = (ExperienceOrb) loc.getWorld().spawnEntity(loc, EntityType.EXPERIENCE_ORB);
orb.setExperience(enchants.size() * 15);
orb.setExperience(toKeep.size() * 15);
}
}, 1);
}
}
}