From 06aa505e9df8e07d42be30f2b669480e073be2aa Mon Sep 17 00:00:00 2001 From: Auxilor Date: Wed, 16 Dec 2020 12:53:43 +0000 Subject: [PATCH] Removed extraction due to duplication glitch --- .../ecoenchants/enchantments/EcoEnchants.java | 1 - .../ecoenchants/normal/Extraction.java | 44 ------------------- .../resources/enchants/normal/extraction.yml | 26 ----------- 3 files changed, 71 deletions(-) delete mode 100644 Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Extraction.java delete mode 100644 Plugin/src/main/resources/enchants/normal/extraction.yml diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java index 43d25c48..d0e51c1a 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java @@ -237,7 +237,6 @@ public class EcoEnchants { public static final EcoEnchant WARPED_ARTIFACT = new WarpedArtifact(); public static final EcoEnchant TEAR_ARTIFACT = new TearArtifact(); public static final EcoEnchant BACKSTAB = new Backstab(); - public static final EcoEnchant EXTRACTION = new Extraction(); public static final EcoEnchant DWELLER = new Dweller(); public static final EcoEnchant STALWART = new Stalwart(); public static final EcoEnchant PLASMIC = new Plasmic(); diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Extraction.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Extraction.java deleted file mode 100644 index 088e10c7..00000000 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Extraction.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.willfp.ecoenchants.enchantments.ecoenchants.normal; - -import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; -import com.willfp.ecoenchants.util.internal.DropQueue; -import org.bukkit.GameMode; -import org.bukkit.Material; -import org.bukkit.block.Block; -import org.bukkit.entity.Player; -import org.bukkit.event.block.BlockBreakEvent; -import org.bukkit.inventory.ItemStack; - -public class Extraction extends EcoEnchant { - public Extraction() { - super( - "extraction", EnchantmentType.NORMAL - ); - } - - // START OF LISTENERS - - @Override - public void onBlockBreak(Player player, Block block, int level, BlockBreakEvent event) { - if (player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.SPECTATOR) - return; - - if(!EnchantmentUtils.passedChance(this, level)) - return; - - Material material = null; - - if(block.getType().equals(Material.GOLD_ORE)) material = Material.GOLD_NUGGET; - if(block.getType().equals(Material.IRON_ORE)) material = Material.IRON_NUGGET; - - if(material == null) return; - - ItemStack item = new ItemStack(material, 1); - - new DropQueue(player) - .setLocation(block.getLocation()) - .addItem(item) - .push(); - } -} diff --git a/Plugin/src/main/resources/enchants/normal/extraction.yml b/Plugin/src/main/resources/enchants/normal/extraction.yml deleted file mode 100644 index 4407f82f..00000000 --- a/Plugin/src/main/resources/enchants/normal/extraction.yml +++ /dev/null @@ -1,26 +0,0 @@ -# -# Extraction EcoEnchant -# - -name: "Extraction" -description: Breaking ores can drop a nugget of the material. -enabled: true - -obtaining: - table: true - villager: true - loot: true - rarity: legendary - -general-config: - targets: - - pickaxe - grindstoneable: true - disabled-in-worlds: [] - conflicts: - - stone_switcher - - silk_touch - maximum-level: 6 - -config: - chance-per-level: 2.5 # Chance for dropping a nugget