From 5761aa5e7957d6b8c69a378e6a5cbd5ca1c28d51 Mon Sep 17 00:00:00 2001 From: unurled Date: Sat, 27 Nov 2021 11:49:11 +0100 Subject: [PATCH] Update to new name Raxen --- pom.xml | 12 +++++-- .../gq/unurled/elixium/config/Config.java | 30 ---------------- .../elixium/manager/PlayerManager.java | 15 -------- .../Elixium.java => raxen/Raxen.java} | 34 +++++++++---------- .../commands/admin/NbtCommand.java | 16 ++++----- .../commands/admin/ReloadCommand.java | 6 ++-- .../commands/admin/TestGuiCommand.java | 6 ++-- .../commands/player/SkillsCommand.java | 14 ++++---- .../commands/player/StorageCommand.java | 12 +++---- .../components/player/Inventories.java | 5 ++- .../components/player/Profile.java | 2 +- .../components/player/Skills.java | 2 +- .../components/player/Storage.java | 4 +-- .../player/Storages/EnderChest.java | 2 +- .../components/player/Storages/Inventory.java | 3 +- .../java/gq/unurled/raxen/config/Config.java | 34 +++++++++++++++++++ .../config/PlayerConfig.java | 30 ++++++++-------- .../listener/player/ArmorEvent.java | 12 +++---- .../listener/player/ItemHandEvent.java | 12 +++---- .../listener/player/JoinEvent.java | 12 +++---- .../listener/player/LeaveEvent.java | 10 +++--- .../manager/CommandManager.java | 18 +++++----- .../manager/ListenerManager.java | 15 ++++---- .../unurled/raxen/manager/PlayerManager.java | 12 +++++++ .../manager/ProfileManager.java | 22 ++++++------ .../utils/AureliumSkills.java | 14 ++------ .../java/gq/unurled/raxen/utils/LuckPerm.java | 24 +++++++++++++ .../{elixium => raxen}/utils/MongoDB.java | 3 +- .../{elixium => raxen}/utils/Reload.java | 11 +++--- .../{elixium => raxen}/utils/Skills.java | 9 +++-- .../{elixium => raxen}/utils/TabApi.java | 9 +++-- .../{elixium => raxen}/utils/Utils.java | 11 ++---- src/main/resources/config.yml | 1 + src/main/resources/plugin.yml | 4 +-- 34 files changed, 215 insertions(+), 211 deletions(-) delete mode 100644 src/main/java/gq/unurled/elixium/config/Config.java delete mode 100644 src/main/java/gq/unurled/elixium/manager/PlayerManager.java rename src/main/java/gq/unurled/{elixium/Elixium.java => raxen/Raxen.java} (81%) rename src/main/java/gq/unurled/{elixium => raxen}/commands/admin/NbtCommand.java (89%) rename src/main/java/gq/unurled/{elixium => raxen}/commands/admin/ReloadCommand.java (86%) rename src/main/java/gq/unurled/{elixium => raxen}/commands/admin/TestGuiCommand.java (88%) rename src/main/java/gq/unurled/{elixium => raxen}/commands/player/SkillsCommand.java (91%) rename src/main/java/gq/unurled/{elixium => raxen}/commands/player/StorageCommand.java (85%) rename src/main/java/gq/unurled/{elixium => raxen}/components/player/Inventories.java (59%) rename src/main/java/gq/unurled/{elixium => raxen}/components/player/Profile.java (80%) rename src/main/java/gq/unurled/{elixium => raxen}/components/player/Skills.java (92%) rename src/main/java/gq/unurled/{elixium => raxen}/components/player/Storage.java (68%) rename src/main/java/gq/unurled/{elixium => raxen}/components/player/Storages/EnderChest.java (86%) rename src/main/java/gq/unurled/{elixium => raxen}/components/player/Storages/Inventory.java (78%) create mode 100644 src/main/java/gq/unurled/raxen/config/Config.java rename src/main/java/gq/unurled/{elixium => raxen}/config/PlayerConfig.java (83%) rename src/main/java/gq/unurled/{elixium => raxen}/listener/player/ArmorEvent.java (87%) rename src/main/java/gq/unurled/{elixium => raxen}/listener/player/ItemHandEvent.java (87%) rename src/main/java/gq/unurled/{elixium => raxen}/listener/player/JoinEvent.java (68%) rename src/main/java/gq/unurled/{elixium => raxen}/listener/player/LeaveEvent.java (69%) rename src/main/java/gq/unurled/{elixium => raxen}/manager/CommandManager.java (69%) rename src/main/java/gq/unurled/{elixium => raxen}/manager/ListenerManager.java (62%) create mode 100644 src/main/java/gq/unurled/raxen/manager/PlayerManager.java rename src/main/java/gq/unurled/{elixium => raxen}/manager/ProfileManager.java (79%) rename src/main/java/gq/unurled/{elixium => raxen}/utils/AureliumSkills.java (75%) create mode 100644 src/main/java/gq/unurled/raxen/utils/LuckPerm.java rename src/main/java/gq/unurled/{elixium => raxen}/utils/MongoDB.java (90%) rename src/main/java/gq/unurled/{elixium => raxen}/utils/Reload.java (77%) rename src/main/java/gq/unurled/{elixium => raxen}/utils/Skills.java (66%) rename src/main/java/gq/unurled/{elixium => raxen}/utils/TabApi.java (76%) rename src/main/java/gq/unurled/{elixium => raxen}/utils/Utils.java (92%) diff --git a/pom.xml b/pom.xml index 0474f0b..e7af2ad 100644 --- a/pom.xml +++ b/pom.xml @@ -5,11 +5,11 @@ 4.0.0 gq.unurled - elixium - 1.0-SNAPSHOT + raxen + 0.0.1 jar - Elixium + Raxen 1.16 @@ -161,6 +161,12 @@ Beta1.2.5 provided + + net.luckperms + api + 5.3 + provided + diff --git a/src/main/java/gq/unurled/elixium/config/Config.java b/src/main/java/gq/unurled/elixium/config/Config.java deleted file mode 100644 index d2576ff..0000000 --- a/src/main/java/gq/unurled/elixium/config/Config.java +++ /dev/null @@ -1,30 +0,0 @@ -package gq.unurled.elixium.config; - -import de.leonhard.storage.Json; -import gq.unurled.elixium.Elixium; -import lombok.Getter; -import org.bukkit.configuration.file.FileConfiguration; - -import java.io.File; - -public class Config { - private Elixium main; - - private File configFile; - - @Getter - private FileConfiguration config; - - - public Config(Elixium main) { - this.main = main; - this.config = main.getConfig(); - } - - public void init() { - if (!(new File(main.getDataFolder() + "/config.yml").exists())) { - main.saveDefaultConfig(); - } - } - -} diff --git a/src/main/java/gq/unurled/elixium/manager/PlayerManager.java b/src/main/java/gq/unurled/elixium/manager/PlayerManager.java deleted file mode 100644 index 2708676..0000000 --- a/src/main/java/gq/unurled/elixium/manager/PlayerManager.java +++ /dev/null @@ -1,15 +0,0 @@ -package gq.unurled.elixium.manager; - -import gq.unurled.elixium.Elixium; - -import java.util.HashMap; -import java.util.UUID; - -public class PlayerManager { - - private Elixium main; - - public PlayerManager(Elixium main) { - this.main = main; - } -} diff --git a/src/main/java/gq/unurled/elixium/Elixium.java b/src/main/java/gq/unurled/raxen/Raxen.java similarity index 81% rename from src/main/java/gq/unurled/elixium/Elixium.java rename to src/main/java/gq/unurled/raxen/Raxen.java index b35b472..808bc10 100644 --- a/src/main/java/gq/unurled/elixium/Elixium.java +++ b/src/main/java/gq/unurled/raxen/Raxen.java @@ -1,35 +1,30 @@ -package gq.unurled.elixium; +package gq.unurled.raxen; import com.archyx.aureliumskills.api.AureliumAPI; import com.comphenix.protocol.ProtocolLibrary; import com.comphenix.protocol.ProtocolManager; -import gq.unurled.elixium.config.Config; -import gq.unurled.elixium.config.PlayerConfig; -import gq.unurled.elixium.manager.*; -import gq.unurled.elixium.utils.MongoDB; -import gq.unurled.elixium.utils.Reload; -import io.netty.channel.Channel; +import gq.unurled.raxen.config.Config; +import gq.unurled.raxen.config.PlayerConfig; +import gq.unurled.raxen.manager.*; +import gq.unurled.raxen.utils.LuckPerm; +import gq.unurled.raxen.utils.MongoDB; +import gq.unurled.raxen.utils.Reload; import lombok.Getter; import net.kyori.adventure.text.Component; import org.bukkit.ChatColor; -import org.bukkit.Material; -import org.bukkit.entity.LivingEntity; -import org.bukkit.entity.Player; import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.java.JavaPlugin; -import org.jetbrains.annotations.NotNull; -import java.util.HashSet; import java.util.logging.Logger; -import static gq.unurled.elixium.utils.Utils.msgPlayer; - -public final class Elixium extends JavaPlugin { +public final class Raxen extends JavaPlugin { private static final String prefix = ChatColor.AQUA + "Ex" + ChatColor.LIGHT_PURPLE + "> "; + @Getter + private static final String version = "0.0.1"; private final PluginManager pm = getServer().getPluginManager(); - private static Elixium plugin; + private static Raxen plugin; private static Logger logger; @@ -48,7 +43,8 @@ public final class Elixium extends JavaPlugin { private ProtocolManager protocolManager; @Getter public AureliumAPI aureliumAPI; - + @Getter + public LuckPerm luckPerm; @Override public void onEnable() { @@ -64,6 +60,8 @@ public final class Elixium extends JavaPlugin { playerConfig = new PlayerConfig(this); aureliumAPI = new AureliumAPI(); + luckPerm = new LuckPerm(this); + luckPerm.register(); registerCommands(); registerEvents(); @@ -98,7 +96,7 @@ public final class Elixium extends JavaPlugin { return pm; } - public static Elixium getPlugin() { + public static Raxen getPlugin() { return plugin; } diff --git a/src/main/java/gq/unurled/elixium/commands/admin/NbtCommand.java b/src/main/java/gq/unurled/raxen/commands/admin/NbtCommand.java similarity index 89% rename from src/main/java/gq/unurled/elixium/commands/admin/NbtCommand.java rename to src/main/java/gq/unurled/raxen/commands/admin/NbtCommand.java index 7517c6d..2182f94 100644 --- a/src/main/java/gq/unurled/elixium/commands/admin/NbtCommand.java +++ b/src/main/java/gq/unurled/raxen/commands/admin/NbtCommand.java @@ -1,9 +1,9 @@ -package gq.unurled.elixium.commands.admin; +package gq.unurled.raxen.commands.admin; import de.tr7zw.changeme.nbtapi.NBTItem; -import gq.unurled.elixium.Elixium; -import gq.unurled.elixium.components.player.Skills; -import gq.unurled.elixium.manager.ProfileManager; +import gq.unurled.raxen.Raxen; +import gq.unurled.raxen.components.player.Skills; +import gq.unurled.raxen.manager.ProfileManager; import net.kyori.adventure.text.Component; import org.bukkit.Material; import org.bukkit.command.Command; @@ -18,14 +18,14 @@ import org.jetbrains.annotations.Nullable; import java.util.ArrayList; import java.util.List; -import static gq.unurled.elixium.utils.Skills.updateSkills; -import static gq.unurled.elixium.utils.Utils.*; +import static gq.unurled.raxen.utils.Skills.updateSkills; +import static gq.unurled.raxen.utils.Utils.*; public class NbtCommand implements TabExecutor { private ProfileManager profileManager; - public NbtCommand(Elixium main) { + public NbtCommand(Raxen main) { this.profileManager = main.getProfileManager(); } @@ -92,7 +92,7 @@ public class NbtCommand implements TabExecutor { skills.addStrength(nbti.getInteger("STRENGTH")); } it = nbti.getItem(); - msgPlayer(player, Elixium.getPrefix() + color("&fYou successfully added the nbt " +attributes(args[0]) + "&fwith " + args[1] + "&f.")); + msgPlayer(player, Raxen.getPrefix() + color("&fYou successfully added the nbt " +attributes(args[0]) + "&fwith " + args[1] + "&f.")); updateSkills(player); player.getInventory().setItem(player.getInventory().getHeldItemSlot(), it); } diff --git a/src/main/java/gq/unurled/elixium/commands/admin/ReloadCommand.java b/src/main/java/gq/unurled/raxen/commands/admin/ReloadCommand.java similarity index 86% rename from src/main/java/gq/unurled/elixium/commands/admin/ReloadCommand.java rename to src/main/java/gq/unurled/raxen/commands/admin/ReloadCommand.java index 682d84f..f8561d4 100644 --- a/src/main/java/gq/unurled/elixium/commands/admin/ReloadCommand.java +++ b/src/main/java/gq/unurled/raxen/commands/admin/ReloadCommand.java @@ -1,6 +1,6 @@ -package gq.unurled.elixium.commands.admin; +package gq.unurled.raxen.commands.admin; -import gq.unurled.elixium.utils.Reload; +import gq.unurled.raxen.utils.Reload; import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; @@ -11,7 +11,7 @@ import org.jetbrains.annotations.Nullable; import java.util.List; -import static gq.unurled.elixium.utils.Utils.*; +import static gq.unurled.raxen.utils.Utils.*; public class ReloadCommand implements TabExecutor { @Override diff --git a/src/main/java/gq/unurled/elixium/commands/admin/TestGuiCommand.java b/src/main/java/gq/unurled/raxen/commands/admin/TestGuiCommand.java similarity index 88% rename from src/main/java/gq/unurled/elixium/commands/admin/TestGuiCommand.java rename to src/main/java/gq/unurled/raxen/commands/admin/TestGuiCommand.java index 0f65a07..9550f03 100644 --- a/src/main/java/gq/unurled/elixium/commands/admin/TestGuiCommand.java +++ b/src/main/java/gq/unurled/raxen/commands/admin/TestGuiCommand.java @@ -1,4 +1,4 @@ -package gq.unurled.elixium.commands.admin; +package gq.unurled.raxen.commands.admin; import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; @@ -11,8 +11,8 @@ import org.jetbrains.annotations.Nullable; import java.util.List; -import static gq.unurled.elixium.utils.Utils.color; -import static gq.unurled.elixium.utils.Utils.log; +import static gq.unurled.raxen.utils.Utils.color; +import static gq.unurled.raxen.utils.Utils.log; public class TestGuiCommand implements TabExecutor { @Override diff --git a/src/main/java/gq/unurled/elixium/commands/player/SkillsCommand.java b/src/main/java/gq/unurled/raxen/commands/player/SkillsCommand.java similarity index 91% rename from src/main/java/gq/unurled/elixium/commands/player/SkillsCommand.java rename to src/main/java/gq/unurled/raxen/commands/player/SkillsCommand.java index a2e5484..a8c50df 100644 --- a/src/main/java/gq/unurled/elixium/commands/player/SkillsCommand.java +++ b/src/main/java/gq/unurled/raxen/commands/player/SkillsCommand.java @@ -1,8 +1,8 @@ -package gq.unurled.elixium.commands.player; +package gq.unurled.raxen.commands.player; -import gq.unurled.elixium.Elixium; -import gq.unurled.elixium.components.player.Skills; -import gq.unurled.elixium.manager.ProfileManager; +import gq.unurled.raxen.Raxen; +import gq.unurled.raxen.components.player.Skills; +import gq.unurled.raxen.manager.ProfileManager; import net.kyori.adventure.text.Component; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; @@ -13,13 +13,13 @@ import org.jetbrains.annotations.Nullable; import java.util.List; -import static gq.unurled.elixium.utils.Utils.*; +import static gq.unurled.raxen.utils.Utils.*; public class SkillsCommand implements TabExecutor { private ProfileManager profileManager; - public SkillsCommand(Elixium main) { + public SkillsCommand(Raxen main) { this.profileManager = main.getProfileManager(); } @@ -102,7 +102,7 @@ public class SkillsCommand implements TabExecutor { } break; } - gq.unurled.elixium.utils.Skills.updateSkills(player); + gq.unurled.raxen.utils.Skills.updateSkills(player); } return false; } diff --git a/src/main/java/gq/unurled/elixium/commands/player/StorageCommand.java b/src/main/java/gq/unurled/raxen/commands/player/StorageCommand.java similarity index 85% rename from src/main/java/gq/unurled/elixium/commands/player/StorageCommand.java rename to src/main/java/gq/unurled/raxen/commands/player/StorageCommand.java index bb0b8f8..a34f025 100644 --- a/src/main/java/gq/unurled/elixium/commands/player/StorageCommand.java +++ b/src/main/java/gq/unurled/raxen/commands/player/StorageCommand.java @@ -1,10 +1,8 @@ -package gq.unurled.elixium.commands.player; +package gq.unurled.raxen.commands.player; -import gq.unurled.elixium.Elixium; -import gq.unurled.elixium.manager.PlayerManager; -import gq.unurled.elixium.manager.ProfileManager; +import gq.unurled.raxen.Raxen; +import gq.unurled.raxen.manager.ProfileManager; import org.bukkit.Bukkit; -import org.bukkit.OfflinePlayer; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.command.TabExecutor; @@ -15,11 +13,11 @@ import org.jetbrains.annotations.Nullable; import java.util.List; -import static gq.unurled.elixium.utils.Utils.*; +import static gq.unurled.raxen.utils.Utils.*; public class StorageCommand implements TabExecutor { - private ProfileManager profileManager = Elixium.getProfileManager(); + private ProfileManager profileManager = Raxen.getProfileManager(); @Override public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { diff --git a/src/main/java/gq/unurled/elixium/components/player/Inventories.java b/src/main/java/gq/unurled/raxen/components/player/Inventories.java similarity index 59% rename from src/main/java/gq/unurled/elixium/components/player/Inventories.java rename to src/main/java/gq/unurled/raxen/components/player/Inventories.java index be68681..2e35bf5 100644 --- a/src/main/java/gq/unurled/elixium/components/player/Inventories.java +++ b/src/main/java/gq/unurled/raxen/components/player/Inventories.java @@ -1,7 +1,6 @@ -package gq.unurled.elixium.components.player; +package gq.unurled.raxen.components.player; -import gq.unurled.elixium.components.player.Storages.EnderChest; -import gq.unurled.elixium.components.player.Storages.Inventory; +import gq.unurled.raxen.components.player.Storages.Inventory; public class Inventories { private Inventory inv; diff --git a/src/main/java/gq/unurled/elixium/components/player/Profile.java b/src/main/java/gq/unurled/raxen/components/player/Profile.java similarity index 80% rename from src/main/java/gq/unurled/elixium/components/player/Profile.java rename to src/main/java/gq/unurled/raxen/components/player/Profile.java index c42b1e0..912fb90 100644 --- a/src/main/java/gq/unurled/elixium/components/player/Profile.java +++ b/src/main/java/gq/unurled/raxen/components/player/Profile.java @@ -1,4 +1,4 @@ -package gq.unurled.elixium.components.player; +package gq.unurled.raxen.components.player; public class Profile { diff --git a/src/main/java/gq/unurled/elixium/components/player/Skills.java b/src/main/java/gq/unurled/raxen/components/player/Skills.java similarity index 92% rename from src/main/java/gq/unurled/elixium/components/player/Skills.java rename to src/main/java/gq/unurled/raxen/components/player/Skills.java index 0f22a71..9120479 100644 --- a/src/main/java/gq/unurled/elixium/components/player/Skills.java +++ b/src/main/java/gq/unurled/raxen/components/player/Skills.java @@ -1,4 +1,4 @@ -package gq.unurled.elixium.components.player; +package gq.unurled.raxen.components.player; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/gq/unurled/elixium/components/player/Storage.java b/src/main/java/gq/unurled/raxen/components/player/Storage.java similarity index 68% rename from src/main/java/gq/unurled/elixium/components/player/Storage.java rename to src/main/java/gq/unurled/raxen/components/player/Storage.java index d7165c1..726c324 100644 --- a/src/main/java/gq/unurled/elixium/components/player/Storage.java +++ b/src/main/java/gq/unurled/raxen/components/player/Storage.java @@ -1,6 +1,6 @@ -package gq.unurled.elixium.components.player; +package gq.unurled.raxen.components.player; -import gq.unurled.elixium.components.player.Storages.EnderChest; +import gq.unurled.raxen.components.player.Storages.EnderChest; public class Storage { diff --git a/src/main/java/gq/unurled/elixium/components/player/Storages/EnderChest.java b/src/main/java/gq/unurled/raxen/components/player/Storages/EnderChest.java similarity index 86% rename from src/main/java/gq/unurled/elixium/components/player/Storages/EnderChest.java rename to src/main/java/gq/unurled/raxen/components/player/Storages/EnderChest.java index aeb9901..0676d41 100644 --- a/src/main/java/gq/unurled/elixium/components/player/Storages/EnderChest.java +++ b/src/main/java/gq/unurled/raxen/components/player/Storages/EnderChest.java @@ -1,4 +1,4 @@ -package gq.unurled.elixium.components.player.Storages; +package gq.unurled.raxen.components.player.Storages; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/gq/unurled/elixium/components/player/Storages/Inventory.java b/src/main/java/gq/unurled/raxen/components/player/Storages/Inventory.java similarity index 78% rename from src/main/java/gq/unurled/elixium/components/player/Storages/Inventory.java rename to src/main/java/gq/unurled/raxen/components/player/Storages/Inventory.java index c50b002..18feed9 100644 --- a/src/main/java/gq/unurled/elixium/components/player/Storages/Inventory.java +++ b/src/main/java/gq/unurled/raxen/components/player/Storages/Inventory.java @@ -1,8 +1,7 @@ -package gq.unurled.elixium.components.player.Storages; +package gq.unurled.raxen.components.player.Storages; import lombok.Getter; import lombok.Setter; -import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.event.inventory.InventoryType; diff --git a/src/main/java/gq/unurled/raxen/config/Config.java b/src/main/java/gq/unurled/raxen/config/Config.java new file mode 100644 index 0000000..254722a --- /dev/null +++ b/src/main/java/gq/unurled/raxen/config/Config.java @@ -0,0 +1,34 @@ +package gq.unurled.raxen.config; + +import gq.unurled.raxen.Raxen; +import lombok.Getter; +import org.bukkit.configuration.file.FileConfiguration; + +import java.io.File; + +public class Config { + private Raxen main; + + private File configFile; + + @Getter + private FileConfiguration config; + + + public Config(Raxen main) { + this.main = main; + this.config = main.getConfig(); + } + + public void init() { + FileConfiguration config = main.getConfig(); + File configFile = new File(main.getDataFolder() + "/config.yml"); + if (!(configFile.exists())) { + main.saveDefaultConfig(); + } + if(!main.getVersion().equalsIgnoreCase((String) config.get("version"))){ + main.saveDefaultConfig(); + } + } + +} diff --git a/src/main/java/gq/unurled/elixium/config/PlayerConfig.java b/src/main/java/gq/unurled/raxen/config/PlayerConfig.java similarity index 83% rename from src/main/java/gq/unurled/elixium/config/PlayerConfig.java rename to src/main/java/gq/unurled/raxen/config/PlayerConfig.java index 378fa37..f49dc87 100644 --- a/src/main/java/gq/unurled/elixium/config/PlayerConfig.java +++ b/src/main/java/gq/unurled/raxen/config/PlayerConfig.java @@ -1,16 +1,16 @@ -package gq.unurled.elixium.config; +package gq.unurled.raxen.config; import com.mongodb.client.MongoCollection; import com.mongodb.client.model.Filters; -import gq.unurled.elixium.Elixium; -import gq.unurled.elixium.components.player.Inventories; -import gq.unurled.elixium.components.player.Profile; -import gq.unurled.elixium.components.player.Skills; -import gq.unurled.elixium.components.player.Storage; -import gq.unurled.elixium.components.player.Storages.EnderChest; -import gq.unurled.elixium.manager.ProfileManager; -import gq.unurled.elixium.utils.MongoDB; -import gq.unurled.elixium.utils.Utils; +import gq.unurled.raxen.Raxen; +import gq.unurled.raxen.components.player.Inventories; +import gq.unurled.raxen.components.player.Profile; +import gq.unurled.raxen.components.player.Skills; +import gq.unurled.raxen.components.player.Storage; +import gq.unurled.raxen.components.player.Storages.EnderChest; +import gq.unurled.raxen.manager.ProfileManager; +import gq.unurled.raxen.utils.MongoDB; +import gq.unurled.raxen.utils.Utils; import net.kyori.adventure.text.Component; import org.bson.Document; import org.bukkit.Bukkit; @@ -21,20 +21,18 @@ import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; import java.util.List; -import static gq.unurled.elixium.utils.Utils.log; +import static gq.unurled.raxen.utils.Utils.log; public class PlayerConfig { - private Elixium main; + private Raxen main; private MongoDB mongoDB; private MongoCollection mongoCollection; private ProfileManager profileManager; - public PlayerConfig(Elixium main) { + public PlayerConfig(Raxen main) { this.main = main; this.mongoDB = main.getMongoDB(); this.mongoCollection = mongoDB.getMongoCollection(); @@ -110,7 +108,7 @@ public class PlayerConfig { ItemStack[] itListInv = Utils.listItemStackDeserilize(playerDoc.getString("inv")); inv.addItem(itListInv); player.updateInventory(); - gq.unurled.elixium.components.player.Storages.Inventory invv = new gq.unurled.elixium.components.player.Storages.Inventory(inv); + gq.unurled.raxen.components.player.Storages.Inventory invv = new gq.unurled.raxen.components.player.Storages.Inventory(inv); Inventories invvv = new Inventories(invv); profileManager.setPlayerInventory(player.getUniqueId(), invvv); log("Player: " + player.getName() + " data successfully loaded!"); diff --git a/src/main/java/gq/unurled/elixium/listener/player/ArmorEvent.java b/src/main/java/gq/unurled/raxen/listener/player/ArmorEvent.java similarity index 87% rename from src/main/java/gq/unurled/elixium/listener/player/ArmorEvent.java rename to src/main/java/gq/unurled/raxen/listener/player/ArmorEvent.java index e947ffa..1ad7515 100644 --- a/src/main/java/gq/unurled/elixium/listener/player/ArmorEvent.java +++ b/src/main/java/gq/unurled/raxen/listener/player/ArmorEvent.java @@ -1,10 +1,10 @@ -package gq.unurled.elixium.listener.player; +package gq.unurled.raxen.listener.player; import com.destroystokyo.paper.event.player.PlayerArmorChangeEvent; import de.tr7zw.changeme.nbtapi.NBTItem; -import gq.unurled.elixium.Elixium; -import gq.unurled.elixium.components.player.Skills; -import gq.unurled.elixium.manager.ProfileManager; +import gq.unurled.raxen.Raxen; +import gq.unurled.raxen.components.player.Skills; +import gq.unurled.raxen.manager.ProfileManager; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -15,7 +15,7 @@ public class ArmorEvent implements Listener { private ProfileManager profileManager; - public ArmorEvent(Elixium main) { + public ArmorEvent(Raxen main) { this.profileManager = main.getProfileManager(); } @@ -55,6 +55,6 @@ public class ArmorEvent implements Listener { skills.addStrength(nbti.getInteger("STRENGTH")); } } - gq.unurled.elixium.utils.Skills.updateSkills(player); + gq.unurled.raxen.utils.Skills.updateSkills(player); } } diff --git a/src/main/java/gq/unurled/elixium/listener/player/ItemHandEvent.java b/src/main/java/gq/unurled/raxen/listener/player/ItemHandEvent.java similarity index 87% rename from src/main/java/gq/unurled/elixium/listener/player/ItemHandEvent.java rename to src/main/java/gq/unurled/raxen/listener/player/ItemHandEvent.java index 972712c..131e0e6 100644 --- a/src/main/java/gq/unurled/elixium/listener/player/ItemHandEvent.java +++ b/src/main/java/gq/unurled/raxen/listener/player/ItemHandEvent.java @@ -1,9 +1,9 @@ -package gq.unurled.elixium.listener.player; +package gq.unurled.raxen.listener.player; import de.tr7zw.changeme.nbtapi.NBTItem; -import gq.unurled.elixium.Elixium; -import gq.unurled.elixium.components.player.Skills; -import gq.unurled.elixium.manager.ProfileManager; +import gq.unurled.raxen.Raxen; +import gq.unurled.raxen.components.player.Skills; +import gq.unurled.raxen.manager.ProfileManager; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -15,7 +15,7 @@ public class ItemHandEvent implements Listener { private ProfileManager profileManager; - public ItemHandEvent(Elixium main) { + public ItemHandEvent(Raxen main) { this.profileManager = main.getProfileManager(); } @@ -55,6 +55,6 @@ public class ItemHandEvent implements Listener { skills.addStrength(nbti.getInteger("STRENGTH")); } } - gq.unurled.elixium.utils.Skills.updateSkills(player); + gq.unurled.raxen.utils.Skills.updateSkills(player); } } diff --git a/src/main/java/gq/unurled/elixium/listener/player/JoinEvent.java b/src/main/java/gq/unurled/raxen/listener/player/JoinEvent.java similarity index 68% rename from src/main/java/gq/unurled/elixium/listener/player/JoinEvent.java rename to src/main/java/gq/unurled/raxen/listener/player/JoinEvent.java index 798fa6d..bb7a1c3 100644 --- a/src/main/java/gq/unurled/elixium/listener/player/JoinEvent.java +++ b/src/main/java/gq/unurled/raxen/listener/player/JoinEvent.java @@ -1,8 +1,8 @@ -package gq.unurled.elixium.listener.player; +package gq.unurled.raxen.listener.player; -import gq.unurled.elixium.Elixium; -import gq.unurled.elixium.config.PlayerConfig; -import gq.unurled.elixium.manager.ProfileManager; +import gq.unurled.raxen.Raxen; +import gq.unurled.raxen.config.PlayerConfig; +import gq.unurled.raxen.manager.ProfileManager; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; @@ -10,11 +10,11 @@ import org.bukkit.event.player.PlayerJoinEvent; public class JoinEvent implements Listener { - private Elixium main; + private Raxen main; private ProfileManager profileManager; private PlayerConfig playerConfig; - public JoinEvent(Elixium main) { + public JoinEvent(Raxen main) { this.main = main; this.profileManager = main.getProfileManager(); this.playerConfig = main.getPlayerConfig(); diff --git a/src/main/java/gq/unurled/elixium/listener/player/LeaveEvent.java b/src/main/java/gq/unurled/raxen/listener/player/LeaveEvent.java similarity index 69% rename from src/main/java/gq/unurled/elixium/listener/player/LeaveEvent.java rename to src/main/java/gq/unurled/raxen/listener/player/LeaveEvent.java index bea5e86..ae6ece4 100644 --- a/src/main/java/gq/unurled/elixium/listener/player/LeaveEvent.java +++ b/src/main/java/gq/unurled/raxen/listener/player/LeaveEvent.java @@ -1,8 +1,8 @@ -package gq.unurled.elixium.listener.player; +package gq.unurled.raxen.listener.player; -import gq.unurled.elixium.Elixium; -import gq.unurled.elixium.config.PlayerConfig; -import gq.unurled.elixium.manager.ProfileManager; +import gq.unurled.raxen.Raxen; +import gq.unurled.raxen.config.PlayerConfig; +import gq.unurled.raxen.manager.ProfileManager; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; @@ -12,7 +12,7 @@ public class LeaveEvent implements Listener { private final PlayerConfig playerConfig; - public LeaveEvent(Elixium main) { + public LeaveEvent(Raxen main) { ProfileManager profileManager = main.getProfileManager(); this.playerConfig = main.getPlayerConfig(); } diff --git a/src/main/java/gq/unurled/elixium/manager/CommandManager.java b/src/main/java/gq/unurled/raxen/manager/CommandManager.java similarity index 69% rename from src/main/java/gq/unurled/elixium/manager/CommandManager.java rename to src/main/java/gq/unurled/raxen/manager/CommandManager.java index 1686cdc..c83d315 100644 --- a/src/main/java/gq/unurled/elixium/manager/CommandManager.java +++ b/src/main/java/gq/unurled/raxen/manager/CommandManager.java @@ -1,18 +1,18 @@ -package gq.unurled.elixium.manager; +package gq.unurled.raxen.manager; -import gq.unurled.elixium.Elixium; -import gq.unurled.elixium.commands.admin.NbtCommand; -import gq.unurled.elixium.commands.admin.ReloadCommand; -import gq.unurled.elixium.commands.admin.TestGuiCommand; -import gq.unurled.elixium.commands.player.SkillsCommand; -import gq.unurled.elixium.commands.player.StorageCommand; +import gq.unurled.raxen.Raxen; +import gq.unurled.raxen.commands.admin.NbtCommand; +import gq.unurled.raxen.commands.admin.ReloadCommand; +import gq.unurled.raxen.commands.admin.TestGuiCommand; +import gq.unurled.raxen.commands.player.SkillsCommand; +import gq.unurled.raxen.commands.player.StorageCommand; public class CommandManager { - private Elixium main; + private Raxen main; - public CommandManager(Elixium main) { + public CommandManager(Raxen main) { this.main = main; } diff --git a/src/main/java/gq/unurled/elixium/manager/ListenerManager.java b/src/main/java/gq/unurled/raxen/manager/ListenerManager.java similarity index 62% rename from src/main/java/gq/unurled/elixium/manager/ListenerManager.java rename to src/main/java/gq/unurled/raxen/manager/ListenerManager.java index 1723006..b6c4199 100644 --- a/src/main/java/gq/unurled/elixium/manager/ListenerManager.java +++ b/src/main/java/gq/unurled/raxen/manager/ListenerManager.java @@ -1,18 +1,17 @@ -package gq.unurled.elixium.manager; +package gq.unurled.raxen.manager; -import gq.unurled.elixium.Elixium; -import gq.unurled.elixium.listener.player.*; -import gq.unurled.elixium.utils.AureliumSkills; -import gq.unurled.elixium.utils.Reload; -import org.bukkit.event.Listener; +import gq.unurled.raxen.Raxen; +import gq.unurled.raxen.listener.player.*; +import gq.unurled.raxen.utils.AureliumSkills; +import gq.unurled.raxen.utils.Reload; import org.bukkit.plugin.PluginManager; public class ListenerManager { - private final Elixium main; + private final Raxen main; private final PluginManager pm; - public ListenerManager(Elixium main) { + public ListenerManager(Raxen main) { this.main = main; this.pm = main.getPm(); } diff --git a/src/main/java/gq/unurled/raxen/manager/PlayerManager.java b/src/main/java/gq/unurled/raxen/manager/PlayerManager.java new file mode 100644 index 0000000..1f23337 --- /dev/null +++ b/src/main/java/gq/unurled/raxen/manager/PlayerManager.java @@ -0,0 +1,12 @@ +package gq.unurled.raxen.manager; + +import gq.unurled.raxen.Raxen; + +public class PlayerManager { + + private Raxen main; + + public PlayerManager(Raxen main) { + this.main = main; + } +} diff --git a/src/main/java/gq/unurled/elixium/manager/ProfileManager.java b/src/main/java/gq/unurled/raxen/manager/ProfileManager.java similarity index 79% rename from src/main/java/gq/unurled/elixium/manager/ProfileManager.java rename to src/main/java/gq/unurled/raxen/manager/ProfileManager.java index 1d8214b..f59f6cd 100644 --- a/src/main/java/gq/unurled/elixium/manager/ProfileManager.java +++ b/src/main/java/gq/unurled/raxen/manager/ProfileManager.java @@ -1,12 +1,12 @@ -package gq.unurled.elixium.manager; +package gq.unurled.raxen.manager; -import gq.unurled.elixium.Elixium; -import gq.unurled.elixium.components.player.Inventories; -import gq.unurled.elixium.components.player.Profile; -import gq.unurled.elixium.components.player.Skills; -import gq.unurled.elixium.components.player.Storage; -import gq.unurled.elixium.components.player.Storages.EnderChest; -import gq.unurled.elixium.components.player.Storages.Inventory; +import gq.unurled.raxen.Raxen; +import gq.unurled.raxen.components.player.Inventories; +import gq.unurled.raxen.components.player.Profile; +import gq.unurled.raxen.components.player.Skills; +import gq.unurled.raxen.components.player.Storage; +import gq.unurled.raxen.components.player.Storages.EnderChest; +import gq.unurled.raxen.components.player.Storages.Inventory; import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.entity.Player; @@ -16,16 +16,16 @@ import java.util.HashMap; import java.util.Map; import java.util.UUID; -import static gq.unurled.elixium.utils.Utils.log; +import static gq.unurled.raxen.utils.Utils.log; public class ProfileManager { - private Elixium main; + private Raxen main; private Map profiles = new HashMap<>(); private Map storages = new HashMap<>(); private Map inventory = new HashMap<>(); - public ProfileManager(Elixium main) { + public ProfileManager(Raxen main) { this.main = main; } diff --git a/src/main/java/gq/unurled/elixium/utils/AureliumSkills.java b/src/main/java/gq/unurled/raxen/utils/AureliumSkills.java similarity index 75% rename from src/main/java/gq/unurled/elixium/utils/AureliumSkills.java rename to src/main/java/gq/unurled/raxen/utils/AureliumSkills.java index 5d7ffd2..f86145e 100644 --- a/src/main/java/gq/unurled/elixium/utils/AureliumSkills.java +++ b/src/main/java/gq/unurled/raxen/utils/AureliumSkills.java @@ -1,26 +1,18 @@ -package gq.unurled.elixium.utils; +package gq.unurled.raxen.utils; import com.archyx.aureliumskills.api.AureliumAPI; import com.archyx.aureliumskills.api.event.SkillLevelUpEvent; import com.archyx.aureliumskills.skills.Skill; -import com.archyx.aureliumskills.skills.SkillRegistry; -import gq.unurled.elixium.Elixium; -import lombok.Getter; +import gq.unurled.raxen.Raxen; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; -import java.util.Collection; -import java.util.Locale; - -import static gq.unurled.elixium.utils.Utils.log; -import static gq.unurled.elixium.utils.Utils.msgPlayer; - public class AureliumSkills implements Listener { private static AureliumAPI aureliumAPI; - public AureliumSkills(Elixium main) { + public AureliumSkills(Raxen main) { this.aureliumAPI = main.getAureliumAPI(); } diff --git a/src/main/java/gq/unurled/raxen/utils/LuckPerm.java b/src/main/java/gq/unurled/raxen/utils/LuckPerm.java new file mode 100644 index 0000000..f790235 --- /dev/null +++ b/src/main/java/gq/unurled/raxen/utils/LuckPerm.java @@ -0,0 +1,24 @@ +package gq.unurled.raxen.utils; + +import gq.unurled.raxen.Raxen; +import lombok.Getter; +import net.luckperms.api.LuckPerms; +import org.bukkit.Bukkit; +import org.bukkit.plugin.RegisteredServiceProvider; + +public class LuckPerm { + + private static RegisteredServiceProvider provider; + @Getter + private static LuckPerms api; + + public LuckPerm(Raxen main) { + provider = Bukkit.getServicesManager().getRegistration(LuckPerms.class); + } + + public static void register() { + if (provider != null) { + api = provider.getProvider(); + } + } +} diff --git a/src/main/java/gq/unurled/elixium/utils/MongoDB.java b/src/main/java/gq/unurled/raxen/utils/MongoDB.java similarity index 90% rename from src/main/java/gq/unurled/elixium/utils/MongoDB.java rename to src/main/java/gq/unurled/raxen/utils/MongoDB.java index 37952a5..40c78dd 100644 --- a/src/main/java/gq/unurled/elixium/utils/MongoDB.java +++ b/src/main/java/gq/unurled/raxen/utils/MongoDB.java @@ -1,11 +1,10 @@ -package gq.unurled.elixium.utils; +package gq.unurled.raxen.utils; import com.mongodb.ConnectionString; import com.mongodb.client.MongoClient; import com.mongodb.client.MongoClients; import com.mongodb.client.MongoCollection; import com.mongodb.client.MongoDatabase; -import gq.unurled.elixium.Elixium; import lombok.Getter; import org.bson.Document; import org.bukkit.Bukkit; diff --git a/src/main/java/gq/unurled/elixium/utils/Reload.java b/src/main/java/gq/unurled/raxen/utils/Reload.java similarity index 77% rename from src/main/java/gq/unurled/elixium/utils/Reload.java rename to src/main/java/gq/unurled/raxen/utils/Reload.java index 74b1a01..43e2081 100644 --- a/src/main/java/gq/unurled/elixium/utils/Reload.java +++ b/src/main/java/gq/unurled/raxen/utils/Reload.java @@ -1,7 +1,6 @@ -package gq.unurled.elixium.utils; +package gq.unurled.raxen.utils; -import gq.unurled.elixium.Elixium; -import gq.unurled.elixium.config.Config; +import gq.unurled.raxen.Raxen; import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.configuration.file.FileConfiguration; @@ -17,16 +16,14 @@ import java.nio.file.Paths; import java.util.ArrayList; import java.util.List; -import static gq.unurled.elixium.utils.Utils.log; - public class Reload implements Listener { - private static FileConfiguration config = Elixium.getPlugin().getConfig(); + private static FileConfiguration config = Raxen.getPlugin().getConfig(); private static boolean serverReloading = true; public static void kickAll() { for(Player player : Bukkit.getOnlinePlayers()) { - player.kick(Component.text(Elixium.getPrefix() + "\n §cServer is Restarting\n §cPlease Wait a few Minutes to reconnect.")); + player.kick(Component.text(Raxen.getPrefix() + "\n§cServer is Restarting\n §cPlease Wait a few Minutes to reconnect.")); } } diff --git a/src/main/java/gq/unurled/elixium/utils/Skills.java b/src/main/java/gq/unurled/raxen/utils/Skills.java similarity index 66% rename from src/main/java/gq/unurled/elixium/utils/Skills.java rename to src/main/java/gq/unurled/raxen/utils/Skills.java index 3293cfb..cc56a6c 100644 --- a/src/main/java/gq/unurled/elixium/utils/Skills.java +++ b/src/main/java/gq/unurled/raxen/utils/Skills.java @@ -1,16 +1,15 @@ -package gq.unurled.elixium.utils; +package gq.unurled.raxen.utils; -import gq.unurled.elixium.Elixium; +import gq.unurled.raxen.Raxen; import org.bukkit.attribute.Attribute; import org.bukkit.entity.Player; -import static gq.unurled.elixium.utils.Utils.color; -import static gq.unurled.elixium.utils.Utils.msgPlayer; +import static gq.unurled.raxen.utils.Utils.msgPlayer; public class Skills { public static void updateSkills(Player player) { - gq.unurled.elixium.components.player.Skills skills = Elixium.getProfileManager().getPlayerProfile(player.getUniqueId()).getSkils(); + gq.unurled.raxen.components.player.Skills skills = Raxen.getProfileManager().getPlayerProfile(player.getUniqueId()).getSkils(); int health, defense, speed, strength; health = skills.getHealth(); defense = skills.getDefense(); diff --git a/src/main/java/gq/unurled/elixium/utils/TabApi.java b/src/main/java/gq/unurled/raxen/utils/TabApi.java similarity index 76% rename from src/main/java/gq/unurled/elixium/utils/TabApi.java rename to src/main/java/gq/unurled/raxen/utils/TabApi.java index df66b5c..6dc66c4 100644 --- a/src/main/java/gq/unurled/elixium/utils/TabApi.java +++ b/src/main/java/gq/unurled/raxen/utils/TabApi.java @@ -1,18 +1,17 @@ -package gq.unurled.elixium.utils; +package gq.unurled.raxen.utils; import com.comphenix.protocol.PacketType; import com.comphenix.protocol.ProtocolManager; import com.comphenix.protocol.events.ListenerPriority; import com.comphenix.protocol.events.PacketAdapter; -import net.minecraft.server.players.PlayerList; -import gq.unurled.elixium.Elixium; +import gq.unurled.raxen.Raxen; public class TabApi { private ProtocolManager protocolManager; - private Elixium main; + private Raxen main; - public TabApi(Elixium main) { + public TabApi(Raxen main) { this.main = main; this.protocolManager = main.getProtocolManager(); } diff --git a/src/main/java/gq/unurled/elixium/utils/Utils.java b/src/main/java/gq/unurled/raxen/utils/Utils.java similarity index 92% rename from src/main/java/gq/unurled/elixium/utils/Utils.java rename to src/main/java/gq/unurled/raxen/utils/Utils.java index 23578a4..e0adb24 100644 --- a/src/main/java/gq/unurled/elixium/utils/Utils.java +++ b/src/main/java/gq/unurled/raxen/utils/Utils.java @@ -1,29 +1,24 @@ -package gq.unurled.elixium.utils; +package gq.unurled.raxen.utils; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import de.tr7zw.changeme.nbtapi.NBTCompound; import de.tr7zw.changeme.nbtapi.NBTItem; -import gq.unurled.elixium.Elixium; -import gq.unurled.elixium.commands.admin.NbtCommand; +import gq.unurled.raxen.Raxen; import net.kyori.adventure.text.Component; -import net.minecraft.nbt.NBTTagCompound; import org.bukkit.ChatColor; import org.bukkit.Material; -import org.bukkit.craftbukkit.v1_17_R1.inventory.CraftItemStack; import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemFlag; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; -import org.checkerframework.checker.units.qual.N; import java.util.*; import java.util.logging.Logger; public class Utils { - private static Logger logger = Elixium.getPluginLogger(); + private static Logger logger = Raxen.getPluginLogger(); public static String color(String string) { return ChatColor.translateAlternateColorCodes('&', string); diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 599445d..b654e9d 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -1,2 +1,3 @@ +version: "${project.version}" motd: "YAY, Super server!" motd-reload: "Server reloading!" \ No newline at end of file diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index c786100..8384a17 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ -name: Elixium +name: Raxen version: '${project.version}' -main: gq.unurled.elixium.Elixium +main: gq.unurled.raxen.Raxen api-version: 1.17 depend: [ProtocolLib]