From 5a1a31ea108bc6679dc264eb7c5110bbf688a83d Mon Sep 17 00:00:00 2001 From: Danh Date: Tue, 2 Jul 2024 20:04:43 +0700 Subject: [PATCH] 2.9.6 - Make NMS support 1.20.5/6, 1.21 --- pom.xml | 8 +- src/main/java/net/danh/bsoul/Cmd/Soul.java | 8 +- .../java/net/danh/bsoul/Commands/CMDBase.java | 76 +++++++++ .../java/net/danh/bsoul/Events/MobDeath.java | 4 +- .../net/danh/bsoul/Events/PlayerDeath.java | 4 +- .../java/net/danh/bsoul/Manager/Chat.java | 32 ++++ .../java/net/danh/bsoul/Manager/Debug.java | 3 +- .../java/net/danh/bsoul/Manager/Item.java | 6 +- .../java/net/danh/bsoul/Manager/Items.java | 144 ++++++++++++++++++ .../java/net/danh/bsoul/Manager/Player.java | 66 ++++++++ .../java/net/danh/bsoul/NMS/NMSAssistant.java | 78 ++++++++++ .../java/net/danh/bsoul/NMS/NMSVersion.java | 85 +++++++++++ .../java/net/danh/bsoul/Random/Number.java | 67 ++++++++ .../java/net/danh/bsoul/Random/RString.java | 18 +++ src/main/java/net/danh/bsoul/bSoul.java | 5 - 15 files changed, 578 insertions(+), 26 deletions(-) create mode 100644 src/main/java/net/danh/bsoul/Commands/CMDBase.java create mode 100644 src/main/java/net/danh/bsoul/Manager/Chat.java create mode 100644 src/main/java/net/danh/bsoul/Manager/Items.java create mode 100644 src/main/java/net/danh/bsoul/Manager/Player.java create mode 100644 src/main/java/net/danh/bsoul/NMS/NMSAssistant.java create mode 100644 src/main/java/net/danh/bsoul/NMS/NMSVersion.java create mode 100644 src/main/java/net/danh/bsoul/Random/Number.java create mode 100644 src/main/java/net/danh/bsoul/Random/RString.java diff --git a/pom.xml b/pom.xml index 48f52d6..081fd95 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ net.danh bSoul - 2.9.5 + 2.9.6-SNAPSHOT jar bSoul @@ -112,12 +112,6 @@ bstats-bukkit 3.0.2 compile - - - com.github.D-x-Z - DCore - 9aa329d44e - compile org.apache.httpcomponents diff --git a/src/main/java/net/danh/bsoul/Cmd/Soul.java b/src/main/java/net/danh/bsoul/Cmd/Soul.java index 99412de..75e8616 100644 --- a/src/main/java/net/danh/bsoul/Cmd/Soul.java +++ b/src/main/java/net/danh/bsoul/Cmd/Soul.java @@ -1,8 +1,8 @@ package net.danh.bsoul.Cmd; +import net.danh.bsoul.Commands.CMDBase; import net.danh.bsoul.Manager.Data; import net.danh.bsoul.Manager.Resources; -import net.danh.dcore.Commands.CMDBase; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.command.ConsoleCommandSender; @@ -15,10 +15,10 @@ import java.util.List; import java.util.Objects; +import static net.danh.bsoul.Manager.Player.sendConsoleMessage; +import static net.danh.bsoul.Manager.Player.sendPlayerMessage; import static net.danh.bsoul.Manager.Resources.getlanguagefile; -import static net.danh.dcore.Random.Number.getInt; -import static net.danh.dcore.Utils.Player.sendConsoleMessage; -import static net.danh.dcore.Utils.Player.sendPlayerMessage; +import static net.danh.bsoul.Random.Number.getInt; public class Soul extends CMDBase { diff --git a/src/main/java/net/danh/bsoul/Commands/CMDBase.java b/src/main/java/net/danh/bsoul/Commands/CMDBase.java new file mode 100644 index 0000000..e4257eb --- /dev/null +++ b/src/main/java/net/danh/bsoul/Commands/CMDBase.java @@ -0,0 +1,76 @@ +package net.danh.bsoul.Commands; + +import org.bukkit.command.*; +import org.bukkit.entity.Player; +import org.bukkit.plugin.java.JavaPlugin; + +import java.util.List; +import java.util.Objects; + +/** + * @version 1.0 + */ +public abstract class CMDBase implements CommandExecutor, TabCompleter { + + protected JavaPlugin core; + + /** + * @param core Plugin main class + * @param name label + */ + public CMDBase(JavaPlugin core, String name) { + this.core = core; + PluginCommand pluginCommand = core.getCommand(name); + Objects.requireNonNull(pluginCommand).setExecutor(this); + pluginCommand.setTabCompleter(this); + } + + /** + * @param p Player + * @param args args + */ + public abstract void playerexecute(Player p, String[] args); + + /** + * @param c ConsoleCommandSender + * @param args args + */ + public abstract void consoleexecute(ConsoleCommandSender c, String[] args); + + /** + * @param sender Player/Console + * @param command cmd + * @param label label + * @param args args + * @return /label args ... + */ + @Override + public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { + if (sender instanceof Player) { + playerexecute((Player) sender, args); + } + if (sender instanceof ConsoleCommandSender) { + consoleexecute((ConsoleCommandSender) sender, args); + } + return true; + } + + /** + * @param sender sender + * @param cmd cmd + * @param label label + * @param args args + * @return tab + */ + @Override + public List onTabComplete(CommandSender sender, Command cmd, String label, String[] args) { + return TabComplete(sender, args); + } + + /** + * @param sender sender + * @param args args + * @return tab + */ + public abstract List TabComplete(CommandSender sender, String[] args); +} diff --git a/src/main/java/net/danh/bsoul/Events/MobDeath.java b/src/main/java/net/danh/bsoul/Events/MobDeath.java index d2467f0..e78e469 100644 --- a/src/main/java/net/danh/bsoul/Events/MobDeath.java +++ b/src/main/java/net/danh/bsoul/Events/MobDeath.java @@ -13,9 +13,9 @@ import java.util.Random; import static net.danh.bsoul.Manager.Debug.debug; +import static net.danh.bsoul.Manager.Player.sendPlayerMessage; import static net.danh.bsoul.Manager.Resources.*; -import static net.danh.dcore.Random.Number.getRandomInt; -import static net.danh.dcore.Utils.Player.sendPlayerMessage; +import static net.danh.bsoul.Random.Number.getRandomInt; public class MobDeath implements Listener { diff --git a/src/main/java/net/danh/bsoul/Events/PlayerDeath.java b/src/main/java/net/danh/bsoul/Events/PlayerDeath.java index ca87cf8..e46fa29 100644 --- a/src/main/java/net/danh/bsoul/Events/PlayerDeath.java +++ b/src/main/java/net/danh/bsoul/Events/PlayerDeath.java @@ -1,9 +1,9 @@ package net.danh.bsoul.Events; +import net.danh.bsoul.Manager.Chat; import net.danh.bsoul.Manager.Data; import net.danh.bsoul.Manager.Resources; import net.danh.bsoul.bSoul; -import net.danh.dcore.Utils.Chat; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.World; @@ -20,9 +20,9 @@ import java.util.Random; import java.util.concurrent.atomic.AtomicInteger; +import static net.danh.bsoul.Manager.Player.sendPlayerMessage; import static net.danh.bsoul.Manager.Resources.getconfigfile; import static net.danh.bsoul.Manager.Resources.getlanguagefile; -import static net.danh.dcore.Utils.Player.sendPlayerMessage; public class PlayerDeath implements Listener { diff --git a/src/main/java/net/danh/bsoul/Manager/Chat.java b/src/main/java/net/danh/bsoul/Manager/Chat.java new file mode 100644 index 0000000..1f1098e --- /dev/null +++ b/src/main/java/net/danh/bsoul/Manager/Chat.java @@ -0,0 +1,32 @@ +package net.danh.bsoul.Manager; + +import org.bukkit.ChatColor; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * @version 1.0 + */ +public class Chat { + + public static String colorize(String message) { + Pattern pattern = Pattern.compile("#[a-fA-F0-9]{6}"); + Matcher matcher = pattern.matcher(message); + while (matcher.find()) { + String hexCode = message.substring(matcher.start(), matcher.end()); + String replaceSharp = hexCode.replace('#', 'x'); + + char[] ch = replaceSharp.toCharArray(); + StringBuilder builder = new StringBuilder(); + for (char c : ch) { + builder.append("&").append(c); + } + + message = message.replace(hexCode, builder.toString()); + matcher = pattern.matcher(message); + } + return ChatColor.translateAlternateColorCodes('&', message); + } +} + diff --git a/src/main/java/net/danh/bsoul/Manager/Debug.java b/src/main/java/net/danh/bsoul/Manager/Debug.java index 4630633..c1ffaf6 100644 --- a/src/main/java/net/danh/bsoul/Manager/Debug.java +++ b/src/main/java/net/danh/bsoul/Manager/Debug.java @@ -1,7 +1,6 @@ package net.danh.bsoul.Manager; import net.danh.bsoul.bSoul; -import net.danh.dcore.DCore; import java.util.Collections; import java.util.List; @@ -35,7 +34,7 @@ public static void update295() { public static void debug(String message) { if (Resources.getconfigfile().getBoolean("SETTINGS.DEBUG")) { - DCore.dCoreLog(message); + bSoul.getInstance().getLogger().warning(message); } } } diff --git a/src/main/java/net/danh/bsoul/Manager/Item.java b/src/main/java/net/danh/bsoul/Manager/Item.java index 9da486d..1ca9175 100644 --- a/src/main/java/net/danh/bsoul/Manager/Item.java +++ b/src/main/java/net/danh/bsoul/Manager/Item.java @@ -1,8 +1,6 @@ package net.danh.bsoul.Manager; -import net.danh.dcore.NMS.NMSAssistant; -import net.danh.dcore.Utils.Chat; -import net.danh.dcore.Utils.Items; +import net.danh.bsoul.NMS.NMSAssistant; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; @@ -11,8 +9,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static net.danh.bsoul.Manager.Items.makeItem; import static net.danh.bsoul.Manager.Resources.getconfigfile; -import static net.danh.dcore.Utils.Items.makeItem; public class Item { diff --git a/src/main/java/net/danh/bsoul/Manager/Items.java b/src/main/java/net/danh/bsoul/Manager/Items.java new file mode 100644 index 0000000..9a2e939 --- /dev/null +++ b/src/main/java/net/danh/bsoul/Manager/Items.java @@ -0,0 +1,144 @@ +package net.danh.bsoul.Manager; + +import org.bukkit.Material; +import org.bukkit.enchantments.Enchantment; +import org.bukkit.inventory.ItemFlag; +import org.bukkit.inventory.ItemStack; +import org.bukkit.inventory.meta.ItemMeta; + +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; + +/** + * @version 1.0 + */ +public class Items { + + /** + * @param input List Lore + * @return input with color code + */ + public static List Lore(List input) { + List output = new ArrayList<>(); + for (String string : input) { + output.add(Chat.colorize(string)); + } + return output; + } + + /** + * @param material Material + * @param data Data (For legacy version 1.12.x and below) + * @param amount int + * @param glow true/false + * @param HideFlag true/false + * @param Unbreakable true/false + * @param name Item name + * @param lore Item lore + * @return ItemStack + */ + public static ItemStack makeItem(Material material, Short data, Integer amount, Boolean glow, Boolean HideFlag, Boolean Unbreakable, String name, List lore) { + ItemStack itemStack; + if (data >= 0) { + itemStack = new ItemStack(material, amount); + ItemMeta itemMeta = itemStack.getItemMeta(); + Objects.requireNonNull(itemMeta).setDisplayName(Chat.colorize(name)); + if (lore != null) { + itemMeta.setLore(Lore(lore)); + } + if (glow) { + itemMeta.addEnchant(Enchantment.DURABILITY, 1, true); + itemMeta.addItemFlags(ItemFlag.HIDE_ENCHANTS); + } + if (HideFlag) { + itemMeta.addItemFlags(ItemFlag.HIDE_ATTRIBUTES, ItemFlag.HIDE_DESTROYS, ItemFlag.HIDE_PLACED_ON, ItemFlag.HIDE_POTION_EFFECTS, ItemFlag.HIDE_UNBREAKABLE); + } + if (Unbreakable) { + itemMeta.setUnbreakable(true); + } + itemStack.setItemMeta(itemMeta); + } else { + itemStack = new ItemStack(material, amount, data); + ItemMeta itemMeta = itemStack.getItemMeta(); + Objects.requireNonNull(itemMeta).setDisplayName(Chat.colorize(name)); + if (lore != null) { + itemMeta.setLore(Lore(lore)); + } + if (glow) { + itemMeta.addEnchant(Enchantment.DURABILITY, 1, true); + itemMeta.addItemFlags(ItemFlag.HIDE_ENCHANTS); + } + if (HideFlag) { + itemMeta.addItemFlags(ItemFlag.HIDE_ATTRIBUTES, ItemFlag.HIDE_DESTROYS, ItemFlag.HIDE_PLACED_ON, ItemFlag.HIDE_POTION_EFFECTS, ItemFlag.HIDE_UNBREAKABLE); + } + if (Unbreakable) { + itemMeta.setUnbreakable(true); + } + itemStack.setItemMeta(itemMeta); + } + return itemStack; + } + + /** + * @param material Material + * @param data Data (For legacy version 1.13 below), null if you use 1.13+ + * @param amount int + * @param glow true/false + * @param HideFlag true/false + * @param Unbreakable true/false + * @param name Item name + * @param lore Item lore + * @return ItemStack + */ + public static ItemStack makeItem(Material material, Short data, Integer amount, Boolean glow, Boolean HideFlag, Boolean Unbreakable, String name, String... lore) { + ItemStack itemStack; + if (data == null) { + itemStack = new ItemStack(material, amount); + ItemMeta itemMeta = itemStack.getItemMeta(); + Objects.requireNonNull(itemMeta).setDisplayName(Chat.colorize(name)); + if (lore != null) { + List l = new ArrayList<>(); + for (String lores : lore) { + l.add(Chat.colorize(lores)); + } + itemMeta.setLore(Lore(l)); + } + if (glow) { + itemMeta.addEnchant(Enchantment.DURABILITY, 1, true); + itemMeta.addItemFlags(ItemFlag.HIDE_ENCHANTS); + } + if (HideFlag) { + itemMeta.addItemFlags(ItemFlag.HIDE_ATTRIBUTES, ItemFlag.HIDE_DESTROYS, ItemFlag.HIDE_PLACED_ON, ItemFlag.HIDE_POTION_EFFECTS, ItemFlag.HIDE_UNBREAKABLE); + } + if (Unbreakable) { + itemMeta.setUnbreakable(true); + } + itemStack.setItemMeta(itemMeta); + } else { + itemStack = new ItemStack(material, amount, data); + ItemMeta itemMeta = itemStack.getItemMeta(); + Objects.requireNonNull(itemMeta).setDisplayName(Chat.colorize(name)); + if (lore != null) { + List l = new ArrayList<>(); + for (String lores : lore) { + l.add(Chat.colorize(lores)); + } + itemMeta.setLore(l); + } + if (glow) { + itemMeta.addEnchant(Enchantment.DURABILITY, 1, true); + itemMeta.addItemFlags(ItemFlag.HIDE_ENCHANTS); + } + if (HideFlag) { + itemMeta.addItemFlags(ItemFlag.HIDE_ATTRIBUTES, ItemFlag.HIDE_DESTROYS, ItemFlag.HIDE_PLACED_ON, ItemFlag.HIDE_POTION_EFFECTS, ItemFlag.HIDE_UNBREAKABLE); + } + if (Unbreakable) { + itemMeta.setUnbreakable(true); + } + itemStack.setItemMeta(itemMeta); + } + return itemStack; + } + +} \ No newline at end of file diff --git a/src/main/java/net/danh/bsoul/Manager/Player.java b/src/main/java/net/danh/bsoul/Manager/Player.java new file mode 100644 index 0000000..55e4488 --- /dev/null +++ b/src/main/java/net/danh/bsoul/Manager/Player.java @@ -0,0 +1,66 @@ +package net.danh.bsoul.Manager; + +import net.md_5.bungee.api.ChatMessageType; +import net.md_5.bungee.api.chat.TranslatableComponent; +import org.bukkit.command.ConsoleCommandSender; + +import java.util.List; + +/** + * @version 1.0 + */ +public class Player { + + /** + * @param p Player + * @param msg Message... send to player + */ + public static void sendPlayerMessage(org.bukkit.entity.Player p, String... msg) { + for (String string : msg) { + p.sendMessage(Chat.colorize(string)); + } + } + + /** + * @param p Player + * @param msg List Message send to player + */ + public static void sendPlayerMessage(org.bukkit.entity.Player p, List msg) { + for (String string : msg) { + p.sendMessage(Chat.colorize(string)); + } + } + + /** + * @param c ConsoleCommandSender + * @param msg Message... send to console without [DCore] + */ + public static void sendConsoleMessage(ConsoleCommandSender c, String... msg) { + for (String string : msg) { + c.sendMessage(Chat.colorize(string)); + } + } + + /** + * @param c ConsoleCommandSender + * @param msg List Message send to console without [DCore] + */ + public static void sendConsoleMessage(ConsoleCommandSender c, List msg) { + for (String string : msg) { + c.sendMessage(Chat.colorize(string)); + } + } + + /** + * @param p Player + * @param type CHAT, ACTION_BAR + * @param msg Message send to player + */ + public static void sendPlayerMessageType(org.bukkit.entity.Player p, String type, String msg) { + if (type != null) { + p.spigot().sendMessage(ChatMessageType.valueOf(type), new TranslatableComponent(Chat.colorize(msg))); + } else { + p.spigot().sendMessage(ChatMessageType.ACTION_BAR, new TranslatableComponent(Chat.colorize(msg))); + } + } +} diff --git a/src/main/java/net/danh/bsoul/NMS/NMSAssistant.java b/src/main/java/net/danh/bsoul/NMS/NMSAssistant.java new file mode 100644 index 0000000..2739110 --- /dev/null +++ b/src/main/java/net/danh/bsoul/NMS/NMSAssistant.java @@ -0,0 +1,78 @@ +package net.danh.bsoul.NMS; + +/** + * @author Callum Johnson + * @version 1.0 + * @since 11/12/2021 - 22:45 + */ +public class NMSAssistant { + + /** + * Method to get the NMS Version which stands for the current server-version. + * + * @return {@link NMSVersion}. + */ + public NMSVersion getNMSVersion() { + return new NMSVersion(); + } + + /** + * Method to determine if the server version is greater than the given version. + * + * @param version to test against. + * @return {@code true} if it is. + */ + public boolean isVersionGreaterThan(int version) { + return getNMSVersion().getMinor() > version; + } + + /** + * Method to determine if the server version is greater than or equal to the given version. + * + * @param version to test against. + * @return {@code true} if it is. + */ + public boolean isVersionGreaterThanOrEqualTo(int version) { + return getNMSVersion().getMinor() >= version; + } + + /** + * Method to determine if the server version is less than the given version. + * + * @param version to test against. + * @return {@code true} if it is. + */ + public boolean isVersionLessThan(int version) { + return getNMSVersion().getMinor() < version; + } + + /** + * Method to determine if the server version is less than the given version. + * + * @param version to test against. + * @return {@code true} if it is. + */ + public boolean isVersionLessThanOrEqualTo(int version) { + return getNMSVersion().getMinor() <= version; + } + + /** + * Method to determine if the server is currently running this specific version. + * + * @param version to check against. + * @return {@code true} if it is. + */ + public boolean isVersion(int version) { + return getNMSVersion().getMinor() == version; + } + + /** + * Method to determine if the sever isn't currently running this specific version. + * + * @param version to check against. + * @return {@code true} if it isn't. + */ + public boolean isNotVersion(int version) { + return getNMSVersion().getMinor() != version; + } +} \ No newline at end of file diff --git a/src/main/java/net/danh/bsoul/NMS/NMSVersion.java b/src/main/java/net/danh/bsoul/NMS/NMSVersion.java new file mode 100644 index 0000000..da4bf14 --- /dev/null +++ b/src/main/java/net/danh/bsoul/NMS/NMSVersion.java @@ -0,0 +1,85 @@ +package net.danh.bsoul.NMS; + +import org.bukkit.Bukkit; + +import java.util.Objects; + +/** + * @author Callum Johnson + * @version 1.0 + * @since 11/12/2021 - 22:47 + */ +public class NMSVersion { + + + /** + * The major version of Minecraft. + *

+ * Usually, and probably always going to be... '1'. + *

+ */ + private final int major; + + /** + * The minor version of Minecraft. + *

+ * The minor version, for example '8' or '7' or most-recently '18'. + *

+ */ + private final int minor; + + /** + * The revision, 1.7.10 = 'R4' etc. etc. + */ + private final int revision; + + /** + * Constructor to initialise the NMSVersion data-type. + *

+ * Initialises the {@link #major}, {@link #minor} and {@link #revision} variables, + * for usage with the {@link NMSAssistant} or by Ponder Developers. + *

+ */ + public NMSVersion() { + String version = Bukkit.getServer().getBukkitVersion(); + version = version.split("-")[0]; + final String[] versionDetails = version.split("\\."); + major = Integer.parseInt(versionDetails[0]); // Always probably going to be '1'. + minor = Integer.parseInt(versionDetails[1]); // 16/18/7/8 etc. etc. + revision = versionDetails.length == 3 ? Integer.parseInt(versionDetails[2]) : 0; + } + + public int getMajor() { + return major; + } + + public int getMinor() { + return minor; + } + + public int getRevision() { + return revision; + } + + @Override + public String toString() { + return "v" + getMajor() + "_" + getMinor() + "_R" + getRevision(); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + NMSVersion that = (NMSVersion) o; + return major == that.major && minor == that.minor && revision == that.revision; + } + + @Override + public int hashCode() { + return Objects.hash(major, minor, revision); + } +} diff --git a/src/main/java/net/danh/bsoul/Random/Number.java b/src/main/java/net/danh/bsoul/Random/Number.java new file mode 100644 index 0000000..601b503 --- /dev/null +++ b/src/main/java/net/danh/bsoul/Random/Number.java @@ -0,0 +1,67 @@ +package net.danh.bsoul.Random; + +import java.util.concurrent.ThreadLocalRandom; + +/** + * @version 1.0 + */ +public class Number { + + /** + * @param min min + * @param max max + * @return random + */ + public static int getRandomInt(int min, int max) { + if (max >= min + 2) { + return ThreadLocalRandom.current().nextInt(min, max); + } else { + return min; + } + } + + /** + * @param min min + * @param max max + * @return random + */ + public static double getRandomDouble(double min, double max) { + if (max >= min + 2) { + return ThreadLocalRandom.current().nextDouble(min, max); + } else { + return min; + } + } + + /** + * @param s RString + * @return true/false + */ + public static int getInt(String s) { + try { + if (!s.contains("-")) { + return Integer.parseInt(s); + } else { + return getRandomInt(Integer.parseInt(s.split("-")[0]), Integer.parseInt(s.split("-")[1])); + } + } catch (NumberFormatException | NullPointerException e) { + return 0; + } + } + + /** + * @param s RString + * @return true/false + */ + public static double getDouble(String s) { + try { + if (!s.contains("-")) { + return Double.parseDouble(s); + } else { + return getRandomDouble(Double.parseDouble(s.split("-")[0]), Double.parseDouble(s.split("-")[1])); + } + } catch (NumberFormatException | NullPointerException e) { + return 0d; + } + } +} diff --git a/src/main/java/net/danh/bsoul/Random/RString.java b/src/main/java/net/danh/bsoul/Random/RString.java new file mode 100644 index 0000000..4e9aabb --- /dev/null +++ b/src/main/java/net/danh/bsoul/Random/RString.java @@ -0,0 +1,18 @@ +package net.danh.bsoul.Random; + +import java.util.List; +import java.util.Random; + +/** + * @version 1.2 + */ +public class RString { + + /** + * @param list RString + * @return random + */ + public static String getRandomString(List list) { + return list.get(new Random().nextInt(list.size())); + } +} diff --git a/src/main/java/net/danh/bsoul/bSoul.java b/src/main/java/net/danh/bsoul/bSoul.java index 3955094..c6abace 100644 --- a/src/main/java/net/danh/bsoul/bSoul.java +++ b/src/main/java/net/danh/bsoul/bSoul.java @@ -12,8 +12,6 @@ import net.danh.bsoul.Manager.Data; import net.danh.bsoul.Manager.Debug; import net.danh.bsoul.Manager.Resources; -import net.danh.dcore.DCore; -import net.danh.dcore.Utils.File; import org.bstats.bukkit.Metrics; import org.bukkit.Bukkit; import org.bukkit.entity.Player; @@ -35,7 +33,6 @@ public static bSoul getInstance() { public void onEnable() { instance = this; new Metrics(this, 12918); - DCore.RegisterDCore(this); if (getServer().getPluginManager().getPlugin("bSoulMMAddon") == null) { getServer().getPluginManager().registerEvents(new MobDeath(), this); } @@ -49,8 +46,6 @@ public void onEnable() { if (Resources.getconfigfile().getBoolean("ITEM.SOUL.ENABLE")) { getServer().getPluginManager().registerEvents(new SoulChange(), this); } - File.updateFile(this, Resources.getconfigfile(), "config.yml"); - File.updateFile(this, Resources.getlanguagefile(), "language.yml"); db = new SQLite(bSoul.getInstance()); db.load(); for (Player p : getServer().getOnlinePlayers()) {