From a650c48dae963d8d403f9eec8396aa9290acab4f Mon Sep 17 00:00:00 2001 From: Auxilor Date: Fri, 16 Apr 2021 10:01:45 +0100 Subject: [PATCH 1/6] Fixed /giverandombook --- build.gradle | 2 +- .../command/commands/CommandGiverandombook.java | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 39de726d..e9d3d834 100644 --- a/build.gradle +++ b/build.gradle @@ -49,7 +49,7 @@ allprojects { } dependencies { - compileOnly 'com.willfp:eco:5.0.0' + compileOnly 'com.willfp:eco:5.0.2' compileOnly 'org.jetbrains:annotations:19.0.0' diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/command/commands/CommandGiverandombook.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/command/commands/CommandGiverandombook.java index e982eb93..d8ecbbc5 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/command/commands/CommandGiverandombook.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/command/commands/CommandGiverandombook.java @@ -6,6 +6,7 @@ import com.willfp.eco.core.command.AbstractTabCompleter; import com.willfp.eco.util.NumberUtils; import com.willfp.ecoenchants.command.tabcompleters.TabCompleterRandomEnchant; import com.willfp.ecoenchants.display.EnchantmentCache; +import com.willfp.ecoenchants.enchantments.EcoEnchant; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.command.CommandSender; @@ -15,7 +16,9 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.EnchantmentStorageMeta; import org.jetbrains.annotations.NotNull; +import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; public class CommandGiverandombook extends AbstractCommand { /** @@ -48,7 +51,13 @@ public class CommandGiverandombook extends AbstractCommand { ItemStack itemStack = new ItemStack(Material.ENCHANTED_BOOK); EnchantmentStorageMeta meta = (EnchantmentStorageMeta) itemStack.getItemMeta(); - Enchantment enchantment = Enchantment.values()[NumberUtils.randInt(0, Enchantment.values().length - 1)]; + List allowed = Arrays.stream(Enchantment.values()).filter(enchantment -> { + if (enchantment instanceof EcoEnchant) { + return ((EcoEnchant) enchantment).isEnabled(); + } + return true; + }).collect(Collectors.toList()); + Enchantment enchantment = allowed.get(NumberUtils.randInt(0, allowed.size() - 1)); int level = NumberUtils.randInt(1, enchantment.getMaxLevel()); meta.addStoredEnchant(enchantment, level, true); itemStack.setItemMeta(meta); From ec7fbd9e0620579aee75a06dc5e18097c61579b4 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Fri, 16 Apr 2021 10:02:09 +0100 Subject: [PATCH 2/6] Updated to eco 5.1.0 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index e9d3d834..77763143 100644 --- a/build.gradle +++ b/build.gradle @@ -49,7 +49,7 @@ allprojects { } dependencies { - compileOnly 'com.willfp:eco:5.0.2' + compileOnly 'com.willfp:eco:5.1.0' compileOnly 'org.jetbrains:annotations:19.0.0' From 132bd2650efbe8bcbc418612bdde97047c4afe02 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Fri, 16 Apr 2021 10:02:27 +0100 Subject: [PATCH 3/6] Updated to 7.2.6 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index f72d0cd4..403343b9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ -version = 7.2.5 +version = 7.2.6 plugin-name = EcoEnchants \ No newline at end of file From e62c12b99d01e344c68af4521c91c454114961ea Mon Sep 17 00:00:00 2001 From: Auxilor Date: Sun, 18 Apr 2021 12:16:33 +0100 Subject: [PATCH 4/6] Fixed grindstone giving experience when no enchantments were removed --- .../merging/grindstone/GrindstoneListeners.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/merging/grindstone/GrindstoneListeners.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/merging/grindstone/GrindstoneListeners.java index a05fb91a..529ccdbf 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/merging/grindstone/GrindstoneListeners.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/merging/grindstone/GrindstoneListeners.java @@ -3,6 +3,8 @@ package com.willfp.ecoenchants.enchantments.support.merging.grindstone; import com.willfp.eco.core.EcoPlugin; import com.willfp.eco.core.PluginDependent; import org.bukkit.enchantments.Enchantment; +import org.bukkit.entity.Entity; +import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; @@ -70,10 +72,15 @@ public class GrindstoneListeners extends PluginDependent implements Listener { newOut.setItemMeta(meta); } - final ItemStack finalOut = newOut; - this.getPlugin().getScheduler().run(() -> { - inventory.setItem(2, finalOut); + inventory.setItem(2, newOut); + if (!toKeep.isEmpty()) { + for (Entity entity : player.getNearbyEntities(10, 10, 10)) { + if (entity.getType() == EntityType.EXPERIENCE_ORB) { + entity.remove(); + } + } + } }); }, 1); } From 6c7efa472e49b759edb13e6c855cfeb7a52c8834 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Sun, 18 Apr 2021 12:16:43 +0100 Subject: [PATCH 5/6] Updated to 7.2.7 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 403343b9..79965d2e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ -version = 7.2.6 +version = 7.2.7 plugin-name = EcoEnchants \ No newline at end of file From 01733208b697ad363fbfc6dfeeea1c80b8d82261 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Sun, 18 Apr 2021 12:17:24 +0100 Subject: [PATCH 6/6] Fixed class from massive error --- .../willfp/ecoskills/classes/SkillClass.java | 32 ------------------- 1 file changed, 32 deletions(-) delete mode 100644 eco-core/core-plugin/src/main/java/com/willfp/ecoskills/classes/SkillClass.java diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoskills/classes/SkillClass.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoskills/classes/SkillClass.java deleted file mode 100644 index 581245bb..00000000 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoskills/classes/SkillClass.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.willfp.ecoskills.classes; - -import com.willfp.ecoskills.config.ClassConfig; -import lombok.Getter; -import org.jetbrains.annotations.NotNull; - -public abstract class SkillClass { - /** - * The name of the class. - */ - @Getter - private final String name; - - /** - * The config for the skill class. - */ - @Getter - private final ClassConfig config; - - protected SkillClass(@NotNull final String name) { - this.name = name; - this.config = new ClassConfig(name, this.getClass()); - - this.update(); - - SkillClasses.addNewSkillClass(this); - } - - public void update() { - config.update(); - } -}