Repo-Mirror/EcoEnchants
9
0
Fork 0
Code Issues Releases 1 Activity

Cleaning

Browse Source
This commit is contained in:
Auxilor
2020-11-06 17:21:13 +00:00
parent 951d9092d5
commit db084eff5c
23 changed files with 80 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/RepairCost.java
View File

@@ -1,13 +1,7 @@
package com.willfp.ecoenchants.v1_16_R2;
import com.willfp.ecoenchants.nms.API.RepairCostWrapper;
import com.willfp.ecoenchants.nms.API.TridentStackWrapper;
import net.minecraft.server.v1_16_R2.EntityThrownTrident;
import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R2.NBTTagInt;
import org.bukkit.craftbukkit.v1_16_R2.entity.CraftTrident;
import org.bukkit.craftbukkit.v1_16_R2.inventory.CraftItemStack;
import org.bukkit.entity.Trident;
import org.bukkit.inventory.ItemStack;
public class RepairCost implements RepairCostWrapper {

6
Plugin/src/main/java/com/willfp/ecoenchants/command/commands/CommandEcodebug.java
View File

@@ -13,7 +13,11 @@ import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin;
import java.lang.reflect.Field;
import java.util.*;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
@SuppressWarnings("unchecked")

1
Plugin/src/main/java/com/willfp/ecoenchants/command/commands/CommandEnchantinfo.java
View File

@@ -9,7 +9,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.util.StringUtils;
import org.apache.commons.lang.WordUtils;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.command.CommandSender;
import org.bukkit.enchantments.Enchantment;

8
Plugin/src/main/java/com/willfp/ecoenchants/config/EnchantmentYamlConfig.java
View File

@@ -6,7 +6,13 @@ import org.bukkit.configuration.InvalidConfigurationException;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.plugin.java.JavaPlugin;
import java.io.*;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.nio.charset.StandardCharsets;
/**

1
Plugin/src/main/java/com/willfp/ecoenchants/display/EnchantDisplay.java
View File

@@ -8,7 +8,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.meta.EnchantmentTarget;
import com.willfp.ecoenchants.util.NumberUtils;
import com.willfp.ecoenchants.util.StringUtils;
import org.bukkit.ChatColor;
import org.bukkit.NamespacedKey;
import org.bukkit.enchantments.Enchantment;
import org.bukkit.inventory.ItemFlag;

7
Plugin/src/main/java/com/willfp/ecoenchants/display/EnchantmentCache.java
View File

@@ -8,7 +8,12 @@ import com.willfp.ecoenchants.util.Logger;
import org.apache.commons.lang.WordUtils;
import org.bukkit.enchantments.Enchantment;
import java.util.*;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Optional;
import java.util.Set;
public class EnchantmentCache {
private static final Set<CacheEntry> CACHE = new HashSet<>();

8
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java
View File

@@ -8,7 +8,6 @@ import com.willfp.ecoenchants.enchantments.util.Watcher;
import com.willfp.ecoenchants.util.StringUtils;
import com.willfp.ecoenchants.util.interfaces.Registerable;
import com.willfp.ecoenchants.util.optional.Prerequisite;
import net.md_5.bungee.api.ChatColor;
import org.apache.commons.lang.WordUtils;
import org.bukkit.Material;
import org.bukkit.NamespacedKey;
@@ -18,7 +17,12 @@ import org.bukkit.event.Listener;
import org.bukkit.inventory.ItemStack;
import java.lang.reflect.Field;
import java.util.*;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.regex.Pattern;
@SuppressWarnings("unchecked")

10
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java
View File

@@ -1,7 +1,15 @@
package com.willfp.ecoenchants.enchantments;
import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.*;
import com.willfp.ecoenchants.enchantments.ecoenchants.curse.*;
import com.willfp.ecoenchants.enchantments.ecoenchants.curse.BreaklessnessCurse;
import com.willfp.ecoenchants.enchantments.ecoenchants.curse.CallingCurse;
import com.willfp.ecoenchants.enchantments.ecoenchants.curse.DecayCurse;
import com.willfp.ecoenchants.enchantments.ecoenchants.curse.FragilityCurse;
import com.willfp.ecoenchants.enchantments.ecoenchants.curse.HarmlessnessCurse;
import com.willfp.ecoenchants.enchantments.ecoenchants.curse.HungerCurse;
import com.willfp.ecoenchants.enchantments.ecoenchants.curse.InaccuracyCurse;
import com.willfp.ecoenchants.enchantments.ecoenchants.curse.MisfortuneCurse;
import com.willfp.ecoenchants.enchantments.ecoenchants.curse.PermanenceCurse;
import com.willfp.ecoenchants.enchantments.ecoenchants.normal.*;
import com.willfp.ecoenchants.enchantments.ecoenchants.special.*;
import org.bukkit.NamespacedKey;

6
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/DecayCurse.java
View File

@@ -21,15 +21,15 @@ import java.util.HashSet;
import java.util.Set;
public final class DecayCurse extends EcoEnchant implements EcoRunnable {
private final Set<Player> players = new HashSet<>();
private int amount = 10000;
public DecayCurse() {
super(
"decay_curse", EnchantmentType.CURSE
);
}
private final Set<Player> players = new HashSet<>();
private int amount = 10000;
@EventHandler
public void onItemPickup(EntityPickupItemEvent event) {
if(!(event.getEntity() instanceof Player))

2
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Extraction.java
View File

@@ -1,10 +1,8 @@
package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils;
import com.willfp.ecoenchants.queue.DropQueue;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.GameMode;
import org.bukkit.Material;
import org.bukkit.block.Block;

2
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Finality.java
View File

@@ -24,7 +24,7 @@ public final class Finality extends EcoEnchant {
return;
double minhealth = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "minimum-health-per-level");
if (!(victim.getHealth() <= level * minhealth))
if (victim.getHealth() > level * minhealth)
return;
event.setDamage(30); // cba to do this properly

2
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Finishing.java
View File

@@ -22,7 +22,7 @@ public final class Finishing extends EcoEnchant {
return;
double minhealth = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "minimum-health-per-level");
if (!(victim.getHealth() <= level * minhealth))
if (victim.getHealth() > level * minhealth)
return;
event.setDamage(30); // cba to do this properly

16
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/InfernalTouch.java
View File

@@ -18,19 +18,27 @@ import org.bukkit.inventory.FurnaceRecipe;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.Recipe;
import java.util.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
public final class InfernalTouch extends EcoEnchant {
private static final HashMap<Material, Pair<Material, Integer>> recipes = new HashMap<>();
private static final Set<Material> allowsFortune = new HashSet<>(Arrays.asList(Material.GOLD_INGOT, Material.IRON_INGOT));
public InfernalTouch() {
super(
"infernal_touch", EnchantmentType.NORMAL
);
}
private static final HashMap<Material, Pair<Material, Integer>> recipes = new HashMap<>();
private static final Set<Material> allowsFortune = new HashSet<>(Arrays.asList(Material.GOLD_INGOT, Material.IRON_INGOT));
static {
Iterator<Recipe> iterator = Bukkit.recipeIterator();
while (iterator.hasNext()) {

6
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Splash.java
View File

@@ -6,7 +6,11 @@ import com.willfp.ecoenchants.enchantments.util.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
import com.willfp.ecoenchants.nms.TridentStack;
import org.bukkit.Bukkit;
import org.bukkit.entity.*;
import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.entity.Trident;
import org.bukkit.event.EventHandler;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
import org.bukkit.event.entity.EntityDamageEvent;

6
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Telekinesis.java
View File

@@ -11,7 +11,11 @@ import com.willfp.ecoenchants.queue.DropQueue;
import org.bukkit.GameMode;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.entity.*;
import org.bukkit.entity.Arrow;
import org.bukkit.entity.Item;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.entity.Trident;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.block.BlockBreakEvent;

6
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Repairing.java
View File

@@ -21,15 +21,15 @@ import java.util.HashSet;
import java.util.Set;
public final class Repairing extends EcoEnchant implements EcoRunnable {
private final Set<Player> players = new HashSet<>();
private int amount = 10000;
public Repairing() {
super(
"repairing", EnchantmentType.SPECIAL
);
}
private final Set<Player> players = new HashSet<>();
private int amount = 10000;
@EventHandler
public void onItemPickup(EntityPickupItemEvent event) {
if(!(event.getEntity() instanceof Player))

3
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/itemtypes/Artifact.java
View File

@@ -76,9 +76,6 @@ public abstract class Artifact extends EcoEnchant {
if (!EnchantChecks.chestplate(player, this)) return;
Location location = player.getLocation();
Vector direction = player.getLocation().clone().getDirection();
Vector point1 = player.getLocation().getDirection().clone();
point1.rotateAroundY(Math.toRadians(90));
point1.multiply(1.2);

1
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/meta/EnchantmentRarity.java
View File

@@ -3,7 +3,6 @@ package com.willfp.ecoenchants.enchantments.meta;
import com.willfp.ecoenchants.config.ConfigManager;
import com.willfp.ecoenchants.util.StringUtils;
import com.willfp.ecoenchants.util.interfaces.Registerable;
import org.bukkit.ChatColor;
import java.util.HashSet;
import java.util.Optional;

4
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/merging/anvil/AnvilListeners.java
View File

@@ -2,13 +2,10 @@ package com.willfp.ecoenchants.enchantments.support.merging.anvil;
import com.willfp.ecoenchants.EcoEnchantsPlugin;
import com.willfp.ecoenchants.config.ConfigManager;
import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.nms.RepairCost;
import com.willfp.ecoenchants.util.EcoBukkitRunnable;
import com.willfp.ecoenchants.util.Logger;
import com.willfp.ecoenchants.util.NumberUtils;
import com.willfp.ecoenchants.util.tuplets.Pair;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
@@ -16,7 +13,6 @@ import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.inventory.PrepareAnvilEvent;
import org.bukkit.inventory.ItemStack;
import org.bukkit.scheduler.BukkitRunnable;
public class AnvilListeners implements Listener {

7
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/obtaining/EnchantingListeners.java
View File

@@ -18,7 +18,12 @@ import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.EnchantmentStorageMeta;
import org.bukkit.scheduler.BukkitRunnable;
import java.util.*;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;
public class EnchantingListeners implements Listener {

6
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/obtaining/VillagerListeners.java
View File

@@ -14,7 +14,11 @@ import org.bukkit.inventory.MerchantRecipe;
import org.bukkit.inventory.meta.EnchantmentStorageMeta;
import org.bukkit.inventory.meta.ItemMeta;
import java.util.*;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;
public class VillagerListeners implements Listener {

3
Plugin/src/main/java/com/willfp/ecoenchants/events/armorequip/ArmorListener.java
View File

@@ -26,9 +26,6 @@ import org.bukkit.inventory.ItemStack;
* @since Jul 30, 2015
*/
public class ArmorListener implements Listener {
public ArmorListener() {
}
//Event Priority is highest because other plugins might cancel the events before we check.
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)

8
Plugin/src/main/java/com/willfp/ecoenchants/loader/Loader.java
View File

@@ -34,7 +34,12 @@ import com.willfp.ecoenchants.integrations.anticheat.plugins.AnticheatMatrix;
import com.willfp.ecoenchants.integrations.anticheat.plugins.AnticheatNCP;
import com.willfp.ecoenchants.integrations.anticheat.plugins.AnticheatSpartan;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
import com.willfp.ecoenchants.integrations.antigrief.plugins.*;
import com.willfp.ecoenchants.integrations.antigrief.plugins.AntigriefFactionsUUID;
import com.willfp.ecoenchants.integrations.antigrief.plugins.AntigriefGriefPrevention;
import com.willfp.ecoenchants.integrations.antigrief.plugins.AntigriefKingdoms;
import com.willfp.ecoenchants.integrations.antigrief.plugins.AntigriefLands;
import com.willfp.ecoenchants.integrations.antigrief.plugins.AntigriefTowny;
import com.willfp.ecoenchants.integrations.antigrief.plugins.AntigriefWorldGuard;
import com.willfp.ecoenchants.integrations.essentials.EssentialsManager;
import com.willfp.ecoenchants.integrations.essentials.plugins.IntegrationEssentials;
import com.willfp.ecoenchants.listeners.ArrowListeners;
@@ -51,7 +56,6 @@ import com.willfp.ecoenchants.util.optional.Prerequisite;
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
import org.bstats.bukkit.Metrics;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.event.HandlerList;
import org.bukkit.generator.BlockPopulator;