From b4f733bf39f1d858b1e717400b1b38cd28132fe3 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Tue, 12 Oct 2021 10:53:22 +0100 Subject: [PATCH 1/9] Fixed diurnal --- .../ecoenchants/enchantments/ecoenchants/normal/Diurnal.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Diurnal.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Diurnal.java index 14cf3c6a..656e20bb 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Diurnal.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Diurnal.java @@ -24,7 +24,9 @@ public class Diurnal extends EcoEnchant { return; } - if (!(attacker.getWorld().getTime() < 12300 && attacker.getWorld().getTime() > 23850)) { + long time = attacker.getWorld().getTime(); + + if (time > 12300 && time < 23850) { return; } From 6a4cf0b0704e2dbb6610df66a2e17294d72c2582 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Tue, 12 Oct 2021 10:53:33 +0100 Subject: [PATCH 2/9] Updated to 8.13.6 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index fa5c1c0a..f7f0351a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ -version = 8.13.5 +version = 8.13.6 plugin-name = EcoEnchants \ No newline at end of file From bf37b98a36d830b5c08ad685c43f06d42904141a Mon Sep 17 00:00:00 2001 From: Will FP <38837418+WillFP@users.noreply.github.com> Date: Tue, 12 Oct 2021 20:12:17 +0100 Subject: [PATCH 3/9] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f8f17d45..09bd0292 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@


- EcoEnchants logo + EcoEnchants logo

From c564f4dea436d70bddb65111fa63b363ffd2e3ab Mon Sep 17 00:00:00 2001 From: Auxilor Date: Wed, 13 Oct 2021 15:25:48 +0100 Subject: [PATCH 4/9] Display optimisation --- .../willfp/ecoenchants/display/EnchantDisplay.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/EnchantDisplay.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/EnchantDisplay.java index aeaa7ef8..b760bbfd 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/EnchantDisplay.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/EnchantDisplay.java @@ -184,8 +184,10 @@ public class EnchantDisplay extends DisplayModule { @Override public void revert(@NotNull final ItemStack itemStack) { - if (!EnchantmentTarget.ALL.getMaterials().contains(itemStack.getType())) { - return; + if (options.isRequireTarget()) { + if (!EnchantmentTarget.ALL.getMaterials().contains(itemStack.getType())) { + return; + } } FastItemStack fast = FastItemStack.wrap(itemStack); @@ -211,6 +213,12 @@ public class EnchantDisplay extends DisplayModule { @Override public Object[] generateVarArgs(@NotNull final ItemStack itemStack) { + if (options.isRequireTarget()) { + if (!EnchantmentTarget.ALL.getMaterials().contains(itemStack.getType())) { + return new Object[]{false}; + } + } + ItemMeta meta = itemStack.getItemMeta(); if (meta == null) { return new Object[]{false}; From d613abfee04c2f8b91e9193759a1a2be3a0175e8 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Wed, 13 Oct 2021 15:25:58 +0100 Subject: [PATCH 5/9] Updated to 8.13.7 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index f7f0351a..b913ba1f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ -version = 8.13.6 +version = 8.13.7 plugin-name = EcoEnchants \ No newline at end of file From 99e4e98484808f533e86a54f1ea69cbe548b28fa Mon Sep 17 00:00:00 2001 From: Auxilor Date: Fri, 15 Oct 2021 14:40:04 +0100 Subject: [PATCH 6/9] Improved /ecoenchants locale download --- .../ecoenchants/command/CommandLocaleDownload.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/command/CommandLocaleDownload.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/command/CommandLocaleDownload.java index 64f6a878..0413cc37 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/command/CommandLocaleDownload.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/command/CommandLocaleDownload.java @@ -2,6 +2,8 @@ package com.willfp.ecoenchants.command; import com.willfp.eco.core.command.CommandHandler; import com.willfp.eco.core.command.impl.Subcommand; +import com.willfp.eco.core.config.interfaces.Config; +import com.willfp.eco.core.config.yaml.YamlTransientConfig; import com.willfp.eco.core.web.Paste; import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.enchantments.EcoEnchant; @@ -31,7 +33,13 @@ public class CommandLocaleDownload extends Subcommand { } Paste paste = Paste.getFromHastebin(args.get(0)); - YamlConfiguration configuration = YamlConfiguration.loadConfiguration(new StringReader(paste.getContents())); + if (paste == null) { + sender.sendMessage(this.getPlugin().getLangYml().getMessage("invalid-locale")); + return; + } + + String contents = paste.getContents(); + Config configuration = new YamlTransientConfig(contents); for (String key : configuration.getKeys(true)) { this.getPlugin().getLangYml().set(key, configuration.get(key)); From f5aababf0013f0ad0985a5c91c7c99636cdf5218 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Fri, 15 Oct 2021 14:40:12 +0100 Subject: [PATCH 7/9] Updated to 8.13.8 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index b913ba1f..30fd0522 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ -version = 8.13.7 +version = 8.13.8 plugin-name = EcoEnchants \ No newline at end of file From 0677a80c1bfb5add90dff19ec1056cc931496d55 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Sat, 16 Oct 2021 10:31:09 +0100 Subject: [PATCH 8/9] Removed unneeded NMS hook --- .../proxy/v1_16_R3/RepairCost.java | 22 ---------------- .../proxy/v1_17_R1/RepairCost.java | 22 ---------------- .../support/merging/anvil/AnvilListeners.java | 7 +++--- .../proxy/proxies/RepairCostProxy.java | 25 ------------------- 4 files changed, 4 insertions(+), 72 deletions(-) delete mode 100644 eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R3/RepairCost.java delete mode 100644 eco-core/core-nms/v1_17_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_17_R1/RepairCost.java delete mode 100644 eco-core/core-proxy/src/main/java/com/willfp/ecoenchants/proxy/proxies/RepairCostProxy.java diff --git a/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R3/RepairCost.java b/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R3/RepairCost.java deleted file mode 100644 index fc4e6868..00000000 --- a/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R3/RepairCost.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.willfp.ecoenchants.proxy.v1_16_R3; - -import com.willfp.ecoenchants.proxy.proxies.RepairCostProxy; -import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftItemStack; -import org.bukkit.inventory.ItemStack; -import org.jetbrains.annotations.NotNull; - -public final class RepairCost implements RepairCostProxy { - @Override - public ItemStack setRepairCost(@NotNull final ItemStack itemStack, - final int cost) { - net.minecraft.server.v1_16_R3.ItemStack nmsStack = CraftItemStack.asNMSCopy(itemStack); - nmsStack.setRepairCost(cost); - return CraftItemStack.asBukkitCopy(nmsStack); - } - - @Override - public int getRepairCost(@NotNull final ItemStack itemStack) { - net.minecraft.server.v1_16_R3.ItemStack nmsStack = CraftItemStack.asNMSCopy(itemStack); - return nmsStack.getRepairCost(); - } -} diff --git a/eco-core/core-nms/v1_17_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_17_R1/RepairCost.java b/eco-core/core-nms/v1_17_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_17_R1/RepairCost.java deleted file mode 100644 index ce98da51..00000000 --- a/eco-core/core-nms/v1_17_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_17_R1/RepairCost.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.willfp.ecoenchants.proxy.v1_17_R1; - -import com.willfp.ecoenchants.proxy.proxies.RepairCostProxy; -import org.bukkit.craftbukkit.v1_17_R1.inventory.CraftItemStack; -import org.bukkit.inventory.ItemStack; -import org.jetbrains.annotations.NotNull; - -public final class RepairCost implements RepairCostProxy { - @Override - public ItemStack setRepairCost(@NotNull final ItemStack itemStack, - final int cost) { - net.minecraft.world.item.ItemStack nmsStack = CraftItemStack.asNMSCopy(itemStack); - nmsStack.setRepairCost(cost); - return CraftItemStack.asBukkitCopy(nmsStack); - } - - @Override - public int getRepairCost(@NotNull final ItemStack itemStack) { - net.minecraft.world.item.ItemStack nmsStack = CraftItemStack.asNMSCopy(itemStack); - return nmsStack.getRepairCost(); - } -} diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/merging/anvil/AnvilListeners.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/merging/anvil/AnvilListeners.java index 11810094..c374aa21 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/merging/anvil/AnvilListeners.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/merging/anvil/AnvilListeners.java @@ -6,7 +6,6 @@ import com.willfp.eco.core.fast.FastItemStack; import com.willfp.eco.core.proxy.ProxyConstants; import com.willfp.eco.util.NumberUtils; import com.willfp.ecoenchants.proxy.proxies.OpenInventoryProxy; -import com.willfp.ecoenchants.proxy.proxies.RepairCostProxy; import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.Player; @@ -125,14 +124,16 @@ public class AnvilListeners extends PluginDependent implements Listen } if (this.getPlugin().getConfigYml().getBool("anvil.rework-cost")) { - int repairCost = this.getPlugin().getProxy(RepairCostProxy.class).getRepairCost(item); + int repairCost = FastItemStack.wrap(item).getRepairCost(); int reworkCount = NumberUtils.log2(repairCost + 1); if (repairCost == 0) { reworkCount = 0; } reworkCount++; repairCost = (int) Math.pow(2, reworkCount) - 1; - item = this.getPlugin().getProxy(RepairCostProxy.class).setRepairCost(item, repairCost); + FastItemStack fis = FastItemStack.wrap(item); + fis.setRepairCost(repairCost); + item = fis.unwrap(); } int cost; diff --git a/eco-core/core-proxy/src/main/java/com/willfp/ecoenchants/proxy/proxies/RepairCostProxy.java b/eco-core/core-proxy/src/main/java/com/willfp/ecoenchants/proxy/proxies/RepairCostProxy.java deleted file mode 100644 index 98821b08..00000000 --- a/eco-core/core-proxy/src/main/java/com/willfp/ecoenchants/proxy/proxies/RepairCostProxy.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.willfp.ecoenchants.proxy.proxies; - -import com.willfp.eco.core.proxy.AbstractProxy; -import org.bukkit.inventory.ItemStack; -import org.jetbrains.annotations.NotNull; - -public interface RepairCostProxy extends AbstractProxy { - /** - * Set the rework penalty of an item. - * - * @param itemStack The item to query. - * @param cost The rework penalty to set. - * @return The item, with the rework penalty applied. - */ - ItemStack setRepairCost(@NotNull ItemStack itemStack, - int cost); - - /** - * Get the rework penalty of an item. - * - * @param itemStack The item to query. - * @return The rework penalty found on the item. - */ - int getRepairCost(@NotNull ItemStack itemStack); -} From fb4206d6a60e841dbfddc9bd80155abea5fd75d8 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Sat, 16 Oct 2021 10:31:18 +0100 Subject: [PATCH 9/9] Updated to 8.13.9 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 30fd0522..b4428374 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ -version = 8.13.8 +version = 8.13.9 plugin-name = EcoEnchants \ No newline at end of file