From b24ddfba27c0aba33cdd28ff16216c6dcc28f4dc Mon Sep 17 00:00:00 2001 From: unurled Date: Thu, 9 Jun 2022 23:27:04 +0200 Subject: [PATCH] gq to me change of domain name --- build.gradle | 12 +- .../components/entity/other/spawn/Eggs.java | 4 - .../components/items/CustomModelData.java | 4 - .../unurled/raxen/utils/libs/WorldEdit.java | 5 - .../java/{gq => me}/unurled/raxen/Raxen.java | 12 +- .../unurled/raxen/commands/RaxenCommand.java | 16 +- .../admin/CustomModelDataCommand.java | 6 +- .../raxen/commands/admin/ItemListCommand.java | 8 +- .../raxen/commands/admin/NbtCommand.java | 10 +- .../raxen/commands/admin/ReloadCommand.java | 72 +- .../raxen/commands/admin/SpawnEntity.java | 10 +- .../raxen/commands/admin/TestGuiCommand.java | 6 +- .../raxen/commands/player/ClassCommand.java | 6 +- .../raxen/commands/player/MainGuiCommand.java | 10 +- .../raxen/commands/player/SkillsCommand.java | 136 ++-- .../raxen/commands/player/StorageCommand.java | 8 +- .../raxen/components/dungeons/Dungeon.java | 10 +- .../raxen/components/dungeons/Gate.java | 2 +- .../raxen/components/dungeons/Rank.java | 2 +- .../raxen/components/dungeons/Type.java | 6 +- .../raxen/components/dungeons/Types.java | 2 +- .../dungeons/types/MonsterType.java | 6 +- .../dungeons/types/forest/ForestDungeon.java | 10 +- .../dungeons/types/forest/ForestMonster.java | 8 +- .../enchantments/EnchantmentWarpper.java | 2 +- .../enchantments/player/Telekinesis.java | 4 +- .../entity/Attributes/Attribute.java | 4 +- .../components/entity/Attributes/Defense.java | 2 +- .../components/entity/Attributes/Health.java | 2 +- .../entity/Attributes/ItemDefense.java | 2 +- .../entity/Attributes/ItemHealth.java | 2 +- .../entity/Attributes/ItemLuck.java | 2 +- .../entity/Attributes/ItemMana.java | 2 +- .../entity/Attributes/ItemSpeed.java | 2 +- .../entity/Attributes/ItemStrength.java | 2 +- .../components/entity/Attributes/Luck.java | 2 +- .../components/entity/Attributes/Mana.java | 2 +- .../entity/Attributes/MaxHealth.java | 2 +- .../components/entity/Attributes/MaxMana.java | 2 +- .../entity/Attributes/MaxManaBuilder.java | 2 +- .../components/entity/Attributes/Speed.java | 2 +- .../entity/Attributes/Strength.java | 2 +- .../entity/other/EntityNamespacedKey.java | 4 +- .../components/entity/other/EntityUtils.java | 8 +- .../components/entity/other/RaxenEntity.java | 4 +- .../entity/other/custom/Entity.java | 6 +- .../other/custom/dungeon/forest/Elf.java | 6 +- .../other/custom/dungeon/forest/Wolf.java | 6 +- .../other/custom/hostile/low/Goblin.java | 8 +- .../components/entity/other/spawn/Eggs.java | 4 + .../components/entity/player/Inventories.java | 4 +- .../components/entity/player/PlayerUtils.java | 8 +- .../components/entity/player/RaxenPlayer.java | 20 +- .../components/entity/player/Scoreboard.java | 10 +- .../components/entity/player/Storage.java | 4 +- .../entity/player/attributes/Attribute.java | 2 +- .../entity/player/attributes/Attributes.java | 8 +- .../entity/player/classes/Class.java | 4 +- .../entity/player/classes/Classes.java | 10 +- .../entity/player/classes/list/Assassin.java | 4 +- .../entity/player/storages/EnderChest.java | 2 +- .../entity/player/storages/Inventory.java | 2 +- .../raxen/components/gui/ItemListGui.java | 12 +- .../unurled/raxen/components/gui/MainGui.java | 8 +- .../raxen/components/items/Attributes.java | 2 +- .../components/items/CustomModelData.java | 4 + .../unurled/raxen/components/items/NBT.java | 2 +- .../raxen/components/items/custom/Item.java | 4 +- .../raxen/components/items/custom/List.java | 6 +- .../components/items/custom/weapon/Dager.java | 10 +- .../raxen/components/lootchest/GUI.java | 6 +- .../lootchest/loots/CustomLoot.java | 6 +- .../components/lootchest/loots/LootItem.java | 2 +- .../lootchest/loots/test/TestSword.java | 6 +- .../components/resourcepack/ResourcePack.java | 6 +- .../unurled/raxen/config/Config.java | 6 +- .../unurled/raxen/config/PlayerConfig.java | 572 +++++++------- .../raxen/listener/entity/DamageEntity.java | 14 +- .../raxen/listener/entity/SpawnEvent.java | 10 +- .../raxen/listener/player/ArmorEvent.java | 10 +- .../listener/player/ClickBlockEvent.java | 6 +- .../listener/player/CloseInventoryEvent.java | 8 +- .../raxen/listener/player/ItemHandEvent.java | 10 +- .../raxen/listener/player/JoinEvent.java | 86 +- .../raxen/listener/player/LeaveEvent.java | 72 +- .../raxen/listener/player/PortalEvent.java | 8 +- .../listener/player/ServerPingEvent.java | 6 +- .../listener/player/TransactionEvent.java | 8 +- .../unurled/raxen/manager/Manager.java | 10 +- .../raxen/manager/entity/EntityManager.java | 8 +- .../raxen/manager/entity/ItemManager.java | 14 +- .../raxen/manager/entity/LootManager.java | 6 +- .../raxen/manager/entity/PlayerManager.java | 16 +- .../raxen/manager/entity/StorageManager.java | 12 +- .../raxen/manager/server/CommandManager.java | 16 +- .../raxen/manager/server/DungeonsManager.java | 10 +- .../manager/server/EnchantmentManager.java | 2 +- .../raxen/manager/server/LibsManager.java | 6 +- .../raxen/manager/server/ListenerManager.java | 12 +- .../raxen/manager/server/ProtocolManager.java | 4 +- .../manager/server/ResourcePackManager.java | 10 +- .../raxen/manager/server/WorldManager.java | 6 +- .../unurled/raxen/utils/DungeonUtils.java | 10 +- .../unurled/raxen/utils/EntityAttributes.java | 10 +- .../{gq => me}/unurled/raxen/utils/Items.java | 8 +- .../unurled/raxen/utils/Reload.java | 142 ++-- .../unurled/raxen/utils/TabApi.java | 4 +- .../{gq => me}/unurled/raxen/utils/Utils.java | 738 +++++++++--------- .../unurled/raxen/utils/libs/Citizens.java | 4 +- .../unurled/raxen/utils/libs/LuckPerm.java | 4 +- .../unurled/raxen/utils/libs/MongoDB.java | 6 +- .../unurled/raxen/utils/libs/Multiverse.java | 2 +- .../unurled/raxen/utils/libs/Mysql.java | 8 +- .../raxen/utils/libs/PlaceHolderAPI.java | 4 +- .../unurled/raxen/utils/libs/Vault.java | 6 +- .../unurled/raxen/utils/libs/WorldEdit.java | 5 + src/main/resources/plugin.yml | 2 +- 117 files changed, 1255 insertions(+), 1255 deletions(-) delete mode 100644 src/main/java/gq/unurled/raxen/components/entity/other/spawn/Eggs.java delete mode 100644 src/main/java/gq/unurled/raxen/components/items/CustomModelData.java delete mode 100644 src/main/java/gq/unurled/raxen/utils/libs/WorldEdit.java rename src/main/java/{gq => me}/unurled/raxen/Raxen.java (93%) rename src/main/java/{gq => me}/unurled/raxen/commands/RaxenCommand.java (95%) rename src/main/java/{gq => me}/unurled/raxen/commands/admin/CustomModelDataCommand.java (96%) rename src/main/java/{gq => me}/unurled/raxen/commands/admin/ItemListCommand.java (88%) rename src/main/java/{gq => me}/unurled/raxen/commands/admin/NbtCommand.java (94%) rename src/main/java/{gq => me}/unurled/raxen/commands/admin/ReloadCommand.java (87%) rename src/main/java/{gq => me}/unurled/raxen/commands/admin/SpawnEntity.java (88%) rename src/main/java/{gq => me}/unurled/raxen/commands/admin/TestGuiCommand.java (88%) rename src/main/java/{gq => me}/unurled/raxen/commands/player/ClassCommand.java (89%) rename src/main/java/{gq => me}/unurled/raxen/commands/player/MainGuiCommand.java (88%) rename src/main/java/{gq => me}/unurled/raxen/commands/player/SkillsCommand.java (84%) rename src/main/java/{gq => me}/unurled/raxen/commands/player/StorageCommand.java (92%) rename src/main/java/{gq => me}/unurled/raxen/components/dungeons/Dungeon.java (85%) rename src/main/java/{gq => me}/unurled/raxen/components/dungeons/Gate.java (97%) rename src/main/java/{gq => me}/unurled/raxen/components/dungeons/Rank.java (74%) rename src/main/java/{gq => me}/unurled/raxen/components/dungeons/Type.java (60%) rename src/main/java/{gq => me}/unurled/raxen/components/dungeons/Types.java (85%) rename src/main/java/{gq => me}/unurled/raxen/components/dungeons/types/MonsterType.java (94%) rename src/main/java/{gq => me}/unurled/raxen/components/dungeons/types/forest/ForestDungeon.java (50%) rename src/main/java/{gq => me}/unurled/raxen/components/dungeons/types/forest/ForestMonster.java (63%) rename src/main/java/{gq => me}/unurled/raxen/components/enchantments/EnchantmentWarpper.java (97%) rename src/main/java/{gq => me}/unurled/raxen/components/enchantments/player/Telekinesis.java (66%) rename src/main/java/{gq => me}/unurled/raxen/components/entity/Attributes/Attribute.java (97%) rename src/main/java/{gq => me}/unurled/raxen/components/entity/Attributes/Defense.java (76%) rename src/main/java/{gq => me}/unurled/raxen/components/entity/Attributes/Health.java (76%) rename src/main/java/{gq => me}/unurled/raxen/components/entity/Attributes/ItemDefense.java (77%) rename src/main/java/{gq => me}/unurled/raxen/components/entity/Attributes/ItemHealth.java (77%) rename src/main/java/{gq => me}/unurled/raxen/components/entity/Attributes/ItemLuck.java (76%) rename src/main/java/{gq => me}/unurled/raxen/components/entity/Attributes/ItemMana.java (76%) rename src/main/java/{gq => me}/unurled/raxen/components/entity/Attributes/ItemSpeed.java (77%) rename src/main/java/{gq => me}/unurled/raxen/components/entity/Attributes/ItemStrength.java (77%) rename src/main/java/{gq => me}/unurled/raxen/components/entity/Attributes/Luck.java (76%) rename src/main/java/{gq => me}/unurled/raxen/components/entity/Attributes/Mana.java (76%) rename src/main/java/{gq => me}/unurled/raxen/components/entity/Attributes/MaxHealth.java (77%) rename src/main/java/{gq => me}/unurled/raxen/components/entity/Attributes/MaxMana.java (76%) rename src/main/java/{gq => me}/unurled/raxen/components/entity/Attributes/MaxManaBuilder.java (89%) rename src/main/java/{gq => me}/unurled/raxen/components/entity/Attributes/Speed.java (76%) rename src/main/java/{gq => me}/unurled/raxen/components/entity/Attributes/Strength.java (77%) rename src/main/java/{gq => me}/unurled/raxen/components/entity/other/EntityNamespacedKey.java (95%) rename src/main/java/{gq => me}/unurled/raxen/components/entity/other/EntityUtils.java (95%) rename src/main/java/{gq => me}/unurled/raxen/components/entity/other/RaxenEntity.java (95%) rename src/main/java/{gq => me}/unurled/raxen/components/entity/other/custom/Entity.java (91%) rename src/main/java/{gq => me}/unurled/raxen/components/entity/other/custom/dungeon/forest/Elf.java (82%) rename src/main/java/{gq => me}/unurled/raxen/components/entity/other/custom/dungeon/forest/Wolf.java (80%) rename src/main/java/{gq => me}/unurled/raxen/components/entity/other/custom/hostile/low/Goblin.java (77%) create mode 100644 src/main/java/me/unurled/raxen/components/entity/other/spawn/Eggs.java rename src/main/java/{gq => me}/unurled/raxen/components/entity/player/Inventories.java (69%) rename src/main/java/{gq => me}/unurled/raxen/components/entity/player/PlayerUtils.java (90%) rename src/main/java/{gq => me}/unurled/raxen/components/entity/player/RaxenPlayer.java (88%) rename src/main/java/{gq => me}/unurled/raxen/components/entity/player/Scoreboard.java (92%) rename src/main/java/{gq => me}/unurled/raxen/components/entity/player/Storage.java (68%) rename src/main/java/{gq => me}/unurled/raxen/components/entity/player/attributes/Attribute.java (93%) rename src/main/java/{gq => me}/unurled/raxen/components/entity/player/attributes/Attributes.java (91%) rename src/main/java/{gq => me}/unurled/raxen/components/entity/player/classes/Class.java (84%) rename src/main/java/{gq => me}/unurled/raxen/components/entity/player/classes/Classes.java (92%) rename src/main/java/{gq => me}/unurled/raxen/components/entity/player/classes/list/Assassin.java (73%) rename src/main/java/{gq => me}/unurled/raxen/components/entity/player/storages/EnderChest.java (85%) rename src/main/java/{gq => me}/unurled/raxen/components/entity/player/storages/Inventory.java (85%) rename src/main/java/{gq => me}/unurled/raxen/components/gui/ItemListGui.java (97%) rename src/main/java/{gq => me}/unurled/raxen/components/gui/MainGui.java (92%) rename src/main/java/{gq => me}/unurled/raxen/components/items/Attributes.java (89%) create mode 100644 src/main/java/me/unurled/raxen/components/items/CustomModelData.java rename src/main/java/{gq => me}/unurled/raxen/components/items/NBT.java (90%) rename src/main/java/{gq => me}/unurled/raxen/components/items/custom/Item.java (55%) rename src/main/java/{gq => me}/unurled/raxen/components/items/custom/List.java (70%) rename src/main/java/{gq => me}/unurled/raxen/components/items/custom/weapon/Dager.java (84%) rename src/main/java/{gq => me}/unurled/raxen/components/lootchest/GUI.java (79%) rename src/main/java/{gq => me}/unurled/raxen/components/lootchest/loots/CustomLoot.java (87%) rename src/main/java/{gq => me}/unurled/raxen/components/lootchest/loots/LootItem.java (93%) rename src/main/java/{gq => me}/unurled/raxen/components/lootchest/loots/test/TestSword.java (67%) rename src/main/java/{gq => me}/unurled/raxen/components/resourcepack/ResourcePack.java (85%) rename src/main/java/{gq => me}/unurled/raxen/config/Config.java (91%) rename src/main/java/{gq => me}/unurled/raxen/config/PlayerConfig.java (89%) rename src/main/java/{gq => me}/unurled/raxen/listener/entity/DamageEntity.java (91%) rename src/main/java/{gq => me}/unurled/raxen/listener/entity/SpawnEvent.java (85%) rename src/main/java/{gq => me}/unurled/raxen/listener/player/ArmorEvent.java (90%) rename src/main/java/{gq => me}/unurled/raxen/listener/player/ClickBlockEvent.java (89%) rename src/main/java/{gq => me}/unurled/raxen/listener/player/CloseInventoryEvent.java (83%) rename src/main/java/{gq => me}/unurled/raxen/listener/player/ItemHandEvent.java (90%) rename src/main/java/{gq => me}/unurled/raxen/listener/player/JoinEvent.java (77%) rename src/main/java/{gq => me}/unurled/raxen/listener/player/LeaveEvent.java (81%) rename src/main/java/{gq => me}/unurled/raxen/listener/player/PortalEvent.java (73%) rename src/main/java/{gq => me}/unurled/raxen/listener/player/ServerPingEvent.java (87%) rename src/main/java/{gq => me}/unurled/raxen/listener/player/TransactionEvent.java (83%) rename src/main/java/{gq => me}/unurled/raxen/manager/Manager.java (88%) rename src/main/java/{gq => me}/unurled/raxen/manager/entity/EntityManager.java (85%) rename src/main/java/{gq => me}/unurled/raxen/manager/entity/ItemManager.java (92%) rename src/main/java/{gq => me}/unurled/raxen/manager/entity/LootManager.java (62%) rename src/main/java/{gq => me}/unurled/raxen/manager/entity/PlayerManager.java (92%) rename src/main/java/{gq => me}/unurled/raxen/manager/entity/StorageManager.java (95%) rename src/main/java/{gq => me}/unurled/raxen/manager/server/CommandManager.java (87%) rename src/main/java/{gq => me}/unurled/raxen/manager/server/DungeonsManager.java (79%) rename src/main/java/{gq => me}/unurled/raxen/manager/server/EnchantmentManager.java (93%) rename src/main/java/{gq => me}/unurled/raxen/manager/server/LibsManager.java (87%) rename src/main/java/{gq => me}/unurled/raxen/manager/server/ListenerManager.java (82%) rename src/main/java/{gq => me}/unurled/raxen/manager/server/ProtocolManager.java (92%) rename src/main/java/{gq => me}/unurled/raxen/manager/server/ResourcePackManager.java (86%) rename src/main/java/{gq => me}/unurled/raxen/manager/server/WorldManager.java (96%) rename src/main/java/{gq => me}/unurled/raxen/utils/DungeonUtils.java (93%) rename src/main/java/{gq => me}/unurled/raxen/utils/EntityAttributes.java (91%) rename src/main/java/{gq => me}/unurled/raxen/utils/Items.java (99%) rename src/main/java/{gq => me}/unurled/raxen/utils/Reload.java (91%) rename src/main/java/{gq => me}/unurled/raxen/utils/TabApi.java (92%) rename src/main/java/{gq => me}/unurled/raxen/utils/Utils.java (96%) rename src/main/java/{gq => me}/unurled/raxen/utils/libs/Citizens.java (84%) rename src/main/java/{gq => me}/unurled/raxen/utils/libs/LuckPerm.java (88%) rename src/main/java/{gq => me}/unurled/raxen/utils/libs/MongoDB.java (91%) rename src/main/java/{gq => me}/unurled/raxen/utils/libs/Multiverse.java (94%) rename src/main/java/{gq => me}/unurled/raxen/utils/libs/Mysql.java (84%) rename src/main/java/{gq => me}/unurled/raxen/utils/libs/PlaceHolderAPI.java (73%) rename src/main/java/{gq => me}/unurled/raxen/utils/libs/Vault.java (92%) create mode 100644 src/main/java/me/unurled/raxen/utils/libs/WorldEdit.java diff --git a/build.gradle b/build.gradle index 31b3ed4..91c6863 100644 --- a/build.gradle +++ b/build.gradle @@ -73,13 +73,13 @@ dependencies { compileOnly 'com.fastasyncworldedit:FastAsyncWorldEdit-Core:2.1.2' compileOnly 'com.fastasyncworldedit:FastAsyncWorldEdit-Bukkit:2.1.2' compileOnly 'me.clip:placeholderapi:2.11.1' - compileOnly 'net.citizensnpcs:citizens-main:2.0.29-SNAPSHOT' + compileOnly 'net.citizensnpcs:citizens-main:2.0.30-SNAPSHOT' compileOnly 'com.onarandombox.multiversecore:Multiverse-Core:4.3.1' compileOnly fileTree(dir: 'libs', include: '*.jar') paperweightDevelopmentBundle("io.papermc.paper:dev-bundle:1.18.2-R0.1-SNAPSHOT") } -group = 'gq.unurled' +group = 'me.unurled' version = '0.5.3' description = 'Raxen' java.sourceCompatibility = JavaVersion.VERSION_17 @@ -109,10 +109,10 @@ shadowJar { include dependency('org.mongodb:bson:4.5.1') include dependency('org.mongodb:mongodb-driver-core:4.5.1') } - relocate("de.tr7zw.changeme", "gq.unurled.libs.de.tr7zw") - relocate("de.tr7zw", "gq.unurled.libs.de.tr7zw") - relocate("com.mongodb", 'gq.unurled.libs.com.mongodb') - relocate("org.bson", 'gq.unurled.libs.org.bson') + relocate("de.tr7zw.changeme", "me.unurled.libs.de.tr7zw") + relocate("de.tr7zw", "me.unurled.libs.de.tr7zw") + relocate("com.mongodb", 'me.unurled.libs.com.mongodb') + relocate("org.bson", 'me.unurled.libs.org.bson') processResources { expand version: project.version } diff --git a/src/main/java/gq/unurled/raxen/components/entity/other/spawn/Eggs.java b/src/main/java/gq/unurled/raxen/components/entity/other/spawn/Eggs.java deleted file mode 100644 index 3b9c6e2..0000000 --- a/src/main/java/gq/unurled/raxen/components/entity/other/spawn/Eggs.java +++ /dev/null @@ -1,4 +0,0 @@ -package gq.unurled.raxen.components.entity.other.spawn; - -public class Eggs { -} diff --git a/src/main/java/gq/unurled/raxen/components/items/CustomModelData.java b/src/main/java/gq/unurled/raxen/components/items/CustomModelData.java deleted file mode 100644 index e3b6224..0000000 --- a/src/main/java/gq/unurled/raxen/components/items/CustomModelData.java +++ /dev/null @@ -1,4 +0,0 @@ -package gq.unurled.raxen.components.items; - -public class CustomModelData { -} diff --git a/src/main/java/gq/unurled/raxen/utils/libs/WorldEdit.java b/src/main/java/gq/unurled/raxen/utils/libs/WorldEdit.java deleted file mode 100644 index 7a78401..0000000 --- a/src/main/java/gq/unurled/raxen/utils/libs/WorldEdit.java +++ /dev/null @@ -1,5 +0,0 @@ -package gq.unurled.raxen.utils.libs; - -public class WorldEdit { - -} diff --git a/src/main/java/gq/unurled/raxen/Raxen.java b/src/main/java/me/unurled/raxen/Raxen.java similarity index 93% rename from src/main/java/gq/unurled/raxen/Raxen.java rename to src/main/java/me/unurled/raxen/Raxen.java index 90b3c20..0fdaf05 100644 --- a/src/main/java/gq/unurled/raxen/Raxen.java +++ b/src/main/java/me/unurled/raxen/Raxen.java @@ -1,19 +1,19 @@ -package gq.unurled.raxen; +package me.unurled.raxen; import com.comphenix.protocol.ProtocolLibrary; import com.comphenix.protocol.ProtocolManager; -import gq.unurled.raxen.config.Config; -import gq.unurled.raxen.config.PlayerConfig; -import gq.unurled.raxen.manager.Manager; -import gq.unurled.raxen.utils.Reload; import lombok.Getter; +import me.unurled.raxen.config.Config; +import me.unurled.raxen.config.PlayerConfig; +import me.unurled.raxen.manager.Manager; +import me.unurled.raxen.utils.Reload; import org.bukkit.Bukkit; import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.java.JavaPlugin; import java.util.logging.Logger; -import static gq.unurled.raxen.utils.Utils.colorComp; +import static me.unurled.raxen.utils.Utils.colorComp; public final class Raxen extends JavaPlugin { diff --git a/src/main/java/gq/unurled/raxen/commands/RaxenCommand.java b/src/main/java/me/unurled/raxen/commands/RaxenCommand.java similarity index 95% rename from src/main/java/gq/unurled/raxen/commands/RaxenCommand.java rename to src/main/java/me/unurled/raxen/commands/RaxenCommand.java index b9ae606..ca3e96a 100644 --- a/src/main/java/gq/unurled/raxen/commands/RaxenCommand.java +++ b/src/main/java/me/unurled/raxen/commands/RaxenCommand.java @@ -1,7 +1,7 @@ -package gq.unurled.raxen.commands; +package me.unurled.raxen.commands; -import gq.unurled.raxen.Raxen; -import gq.unurled.raxen.manager.entity.StorageManager; +import me.unurled.raxen.Raxen; +import me.unurled.raxen.manager.entity.StorageManager; import net.kyori.adventure.text.TextComponent; import net.kyori.adventure.text.event.ClickEvent; import org.bukkit.command.Command; @@ -13,7 +13,7 @@ import org.jetbrains.annotations.Nullable; import java.util.List; -import static gq.unurled.raxen.utils.Utils.*; +import static me.unurled.raxen.utils.Utils.*; public class RaxenCommand implements TabExecutor { @@ -64,7 +64,7 @@ public class RaxenCommand implements TabExecutor { " Raxen ", " - Version: " + Raxen.getVersion(), " - Author: Unurled"); - TextComponent txt = colorTextComp(" - Website: https://unurled.gq"); + TextComponent txt = colorTextComp(" - Website: https://unurled.me"); sender.sendMessage(txt); sender.sendMessage(coloredString("---------------------------------------------")); return true; @@ -87,7 +87,7 @@ public class RaxenCommand implements TabExecutor { " Raxen ", " - Version: " + Raxen.getVersion(), " - Author: Un&eurled"); - TextComponent txt=colorTextComp(" - Website: https://unurled.gq"); + TextComponent txt=colorTextComp(" - Website: https://unurled.me"); sender.sendMessage(txt); sender.sendMessage(coloredString("---------------------------------------------")); return true; @@ -110,8 +110,8 @@ public class RaxenCommand implements TabExecutor { " Raxen ", " - Version: " + Raxen.getVersion(), " - Author: Un&eurled"); - TextComponent txt = (TextComponent) colorComp(" - Website: https://unurled.gq") - .clickEvent(ClickEvent.openUrl("https://unurled.gq")); + TextComponent txt = (TextComponent) colorComp(" - Website: https://unurled.me") + .clickEvent(ClickEvent.openUrl("https://unurled.me")); player.sendMessage(txt); msgPlayer(player, "", "---------------------------------------------"); } diff --git a/src/main/java/gq/unurled/raxen/commands/admin/CustomModelDataCommand.java b/src/main/java/me/unurled/raxen/commands/admin/CustomModelDataCommand.java similarity index 96% rename from src/main/java/gq/unurled/raxen/commands/admin/CustomModelDataCommand.java rename to src/main/java/me/unurled/raxen/commands/admin/CustomModelDataCommand.java index 47ba425..03b64f4 100644 --- a/src/main/java/gq/unurled/raxen/commands/admin/CustomModelDataCommand.java +++ b/src/main/java/me/unurled/raxen/commands/admin/CustomModelDataCommand.java @@ -1,4 +1,4 @@ -package gq.unurled.raxen.commands.admin; +package me.unurled.raxen.commands.admin; import org.bukkit.Material; import org.bukkit.command.Command; @@ -15,8 +15,8 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import static gq.unurled.raxen.utils.Items.customModelData; -import static gq.unurled.raxen.utils.Utils.*; +import static me.unurled.raxen.utils.Items.customModelData; +import static me.unurled.raxen.utils.Utils.*; public class CustomModelDataCommand implements TabExecutor { /** diff --git a/src/main/java/gq/unurled/raxen/commands/admin/ItemListCommand.java b/src/main/java/me/unurled/raxen/commands/admin/ItemListCommand.java similarity index 88% rename from src/main/java/gq/unurled/raxen/commands/admin/ItemListCommand.java rename to src/main/java/me/unurled/raxen/commands/admin/ItemListCommand.java index 832bcd0..346aed9 100644 --- a/src/main/java/gq/unurled/raxen/commands/admin/ItemListCommand.java +++ b/src/main/java/me/unurled/raxen/commands/admin/ItemListCommand.java @@ -1,8 +1,8 @@ -package gq.unurled.raxen.commands.admin; +package me.unurled.raxen.commands.admin; -import gq.unurled.raxen.Raxen; -import gq.unurled.raxen.components.gui.ItemListGui; import lombok.Getter; +import me.unurled.raxen.Raxen; +import me.unurled.raxen.components.gui.ItemListGui; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.command.TabExecutor; @@ -12,7 +12,7 @@ import org.jetbrains.annotations.Nullable; import java.util.List; -import static gq.unurled.raxen.utils.Utils.*; +import static me.unurled.raxen.utils.Utils.*; public class ItemListCommand implements TabExecutor { diff --git a/src/main/java/gq/unurled/raxen/commands/admin/NbtCommand.java b/src/main/java/me/unurled/raxen/commands/admin/NbtCommand.java similarity index 94% rename from src/main/java/gq/unurled/raxen/commands/admin/NbtCommand.java rename to src/main/java/me/unurled/raxen/commands/admin/NbtCommand.java index 119e6e6..5128762 100644 --- a/src/main/java/gq/unurled/raxen/commands/admin/NbtCommand.java +++ b/src/main/java/me/unurled/raxen/commands/admin/NbtCommand.java @@ -1,8 +1,8 @@ -package gq.unurled.raxen.commands.admin; +package me.unurled.raxen.commands.admin; import de.tr7zw.nbtapi.NBTItem; -import gq.unurled.raxen.Raxen; -import gq.unurled.raxen.manager.entity.PlayerManager; +import me.unurled.raxen.Raxen; +import me.unurled.raxen.manager.entity.PlayerManager; import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.Material; @@ -19,8 +19,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; -import static gq.unurled.raxen.components.entity.player.PlayerUtils.updateSkills; -import static gq.unurled.raxen.utils.Utils.*; +import static me.unurled.raxen.components.entity.player.PlayerUtils.updateSkills; +import static me.unurled.raxen.utils.Utils.*; public class NbtCommand implements TabExecutor { diff --git a/src/main/java/gq/unurled/raxen/commands/admin/ReloadCommand.java b/src/main/java/me/unurled/raxen/commands/admin/ReloadCommand.java similarity index 87% rename from src/main/java/gq/unurled/raxen/commands/admin/ReloadCommand.java rename to src/main/java/me/unurled/raxen/commands/admin/ReloadCommand.java index bd33428..edfe519 100644 --- a/src/main/java/gq/unurled/raxen/commands/admin/ReloadCommand.java +++ b/src/main/java/me/unurled/raxen/commands/admin/ReloadCommand.java @@ -1,36 +1,36 @@ -package gq.unurled.raxen.commands.admin; - -import gq.unurled.raxen.utils.Reload; -import org.bukkit.Bukkit; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.command.TabExecutor; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.util.List; - -import static gq.unurled.raxen.utils.Utils.*; - -public class ReloadCommand implements TabExecutor { - @Override - public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String msg, @NotNull String[] args) { - if(sender instanceof Player) { - Player player = (Player) sender; - if(!player.hasPermission("raxen.reload.cmd")) { - player.sendMessage(noPerms()); - return true; - } - } - Reload.kickAll(); - log(colorString("Server stopping!\n Using: /rlpl.\n Please wait a little bit.")); - Bukkit.getServer().shutdown(); - return false; - } - - @Override - public @Nullable List onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, @NotNull String[] args) { - return null; - } -} +package me.unurled.raxen.commands.admin; + +import me.unurled.raxen.utils.Reload; +import org.bukkit.Bukkit; +import org.bukkit.command.Command; +import org.bukkit.command.CommandSender; +import org.bukkit.command.TabExecutor; +import org.bukkit.entity.Player; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.util.List; + +import static me.unurled.raxen.utils.Utils.*; + +public class ReloadCommand implements TabExecutor { + @Override + public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String msg, @NotNull String[] args) { + if(sender instanceof Player) { + Player player = (Player) sender; + if(!player.hasPermission("raxen.reload.cmd")) { + player.sendMessage(noPerms()); + return true; + } + } + Reload.kickAll(); + log(colorString("Server stopping!\n Using: /rlpl.\n Please wait a little bit.")); + Bukkit.getServer().shutdown(); + return false; + } + + @Override + public @Nullable List onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, @NotNull String[] args) { + return null; + } +} diff --git a/src/main/java/gq/unurled/raxen/commands/admin/SpawnEntity.java b/src/main/java/me/unurled/raxen/commands/admin/SpawnEntity.java similarity index 88% rename from src/main/java/gq/unurled/raxen/commands/admin/SpawnEntity.java rename to src/main/java/me/unurled/raxen/commands/admin/SpawnEntity.java index 233bea3..6cd7c7f 100644 --- a/src/main/java/gq/unurled/raxen/commands/admin/SpawnEntity.java +++ b/src/main/java/me/unurled/raxen/commands/admin/SpawnEntity.java @@ -1,7 +1,7 @@ -package gq.unurled.raxen.commands.admin; +package me.unurled.raxen.commands.admin; -import gq.unurled.raxen.Raxen; -import gq.unurled.raxen.components.entity.other.EntityNamespacedKey; +import me.unurled.raxen.Raxen; +import me.unurled.raxen.components.entity.other.EntityNamespacedKey; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.command.TabExecutor; @@ -14,8 +14,8 @@ import org.jetbrains.annotations.Nullable; import java.util.ArrayList; import java.util.List; -import static gq.unurled.raxen.components.entity.other.EntityUtils.setNameSpacedKeys; -import static gq.unurled.raxen.utils.Utils.*; +import static me.unurled.raxen.components.entity.other.EntityUtils.setNameSpacedKeys; +import static me.unurled.raxen.utils.Utils.*; public class SpawnEntity implements TabExecutor { diff --git a/src/main/java/gq/unurled/raxen/commands/admin/TestGuiCommand.java b/src/main/java/me/unurled/raxen/commands/admin/TestGuiCommand.java similarity index 88% rename from src/main/java/gq/unurled/raxen/commands/admin/TestGuiCommand.java rename to src/main/java/me/unurled/raxen/commands/admin/TestGuiCommand.java index 62aa805..b7b9ffd 100644 --- a/src/main/java/gq/unurled/raxen/commands/admin/TestGuiCommand.java +++ b/src/main/java/me/unurled/raxen/commands/admin/TestGuiCommand.java @@ -1,4 +1,4 @@ -package gq.unurled.raxen.commands.admin; +package me.unurled.raxen.commands.admin; import org.bukkit.Bukkit; import org.bukkit.command.Command; @@ -10,8 +10,8 @@ import org.jetbrains.annotations.Nullable; import java.util.List; -import static gq.unurled.raxen.utils.Utils.colorTextComp; -import static gq.unurled.raxen.utils.Utils.log; +import static me.unurled.raxen.utils.Utils.colorTextComp; +import static me.unurled.raxen.utils.Utils.log; public class TestGuiCommand implements TabExecutor { @Override diff --git a/src/main/java/gq/unurled/raxen/commands/player/ClassCommand.java b/src/main/java/me/unurled/raxen/commands/player/ClassCommand.java similarity index 89% rename from src/main/java/gq/unurled/raxen/commands/player/ClassCommand.java rename to src/main/java/me/unurled/raxen/commands/player/ClassCommand.java index a6a9f2e..d15c7bd 100644 --- a/src/main/java/gq/unurled/raxen/commands/player/ClassCommand.java +++ b/src/main/java/me/unurled/raxen/commands/player/ClassCommand.java @@ -1,6 +1,6 @@ -package gq.unurled.raxen.commands.player; +package me.unurled.raxen.commands.player; -import gq.unurled.raxen.Raxen; +import me.unurled.raxen.Raxen; 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.raxen.utils.Utils.error; +import static me.unurled.raxen.utils.Utils.error; public class ClassCommand implements TabExecutor { diff --git a/src/main/java/gq/unurled/raxen/commands/player/MainGuiCommand.java b/src/main/java/me/unurled/raxen/commands/player/MainGuiCommand.java similarity index 88% rename from src/main/java/gq/unurled/raxen/commands/player/MainGuiCommand.java rename to src/main/java/me/unurled/raxen/commands/player/MainGuiCommand.java index 96f05e7..19a2845 100644 --- a/src/main/java/gq/unurled/raxen/commands/player/MainGuiCommand.java +++ b/src/main/java/me/unurled/raxen/commands/player/MainGuiCommand.java @@ -1,7 +1,7 @@ -package gq.unurled.raxen.commands.player; +package me.unurled.raxen.commands.player; -import gq.unurled.raxen.Raxen; -import gq.unurled.raxen.components.gui.MainGui; +import me.unurled.raxen.Raxen; +import me.unurled.raxen.components.gui.MainGui; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.command.TabExecutor; @@ -12,8 +12,8 @@ import org.jetbrains.annotations.Nullable; import java.util.List; -import static gq.unurled.raxen.utils.Utils.errorConsoleSender; -import static gq.unurled.raxen.utils.Utils.noPerms; +import static me.unurled.raxen.utils.Utils.errorConsoleSender; +import static me.unurled.raxen.utils.Utils.noPerms; public class MainGuiCommand implements TabExecutor { diff --git a/src/main/java/gq/unurled/raxen/commands/player/SkillsCommand.java b/src/main/java/me/unurled/raxen/commands/player/SkillsCommand.java similarity index 84% rename from src/main/java/gq/unurled/raxen/commands/player/SkillsCommand.java rename to src/main/java/me/unurled/raxen/commands/player/SkillsCommand.java index 1d67c14..dfbcd52 100644 --- a/src/main/java/gq/unurled/raxen/commands/player/SkillsCommand.java +++ b/src/main/java/me/unurled/raxen/commands/player/SkillsCommand.java @@ -1,68 +1,68 @@ -package gq.unurled.raxen.commands.player; - -import gq.unurled.raxen.Raxen; -import gq.unurled.raxen.components.entity.player.PlayerUtils; -import gq.unurled.raxen.components.entity.player.attributes.Attributes; -import gq.unurled.raxen.manager.entity.PlayerManager; -import org.bukkit.Bukkit; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.command.TabExecutor; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.util.List; - -import static gq.unurled.raxen.utils.Utils.colorTextComp; -import static gq.unurled.raxen.utils.Utils.error; - -public class SkillsCommand implements TabExecutor { - - private Raxen main; - - public SkillsCommand(Raxen main) { - this.main = main; - } - - @Override - public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String msg, @NotNull String[] args) { - if(!(sender instanceof Player)) { - error((Raxen) Bukkit.getPluginManager().getPlugin("Raxen"),"The console can't execute this Command!"); - return true; - } - Player player = (Player) sender; - Attributes attributes = new Attributes(main); - switch (args.length) { - case 0: - //open gui - player.sendMessage(colorTextComp("GUI not implemented yet..").append(colorTextComp("Try /skill help."))); - break; - case 1: - case 2: - player.sendMessage(colorTextComp("Use the command like: ") - .append(colorTextComp("/skill {health|defense|speed|strength} {add|set|remove} {amount}"))); - break; - case 3: - PlayerManager pm = ((Raxen) Bukkit.getPluginManager().getPlugin("Raxen")).getManager().getPlayerManager(); - for (String s : pm.getAttribute().keySet()) { - if (s.equalsIgnoreCase(args[0])) - switch (args[1]) { - case "add": - pm.getAttribute().get(s).add(player, Integer.parseInt(args[2])); - case "remove": - pm.getAttribute().get(s).remove(player, Integer.parseInt(args[2])); - case "set": - pm.getAttribute().get(s).set(player, Integer.parseInt(args[2])); - } - } - PlayerUtils.updateSkills(main, player); - } - return false; - } - - @Override - public @Nullable List onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, @NotNull String[] args) { - return null; - } -} +package me.unurled.raxen.commands.player; + +import me.unurled.raxen.Raxen; +import me.unurled.raxen.components.entity.player.PlayerUtils; +import me.unurled.raxen.components.entity.player.attributes.Attributes; +import me.unurled.raxen.manager.entity.PlayerManager; +import org.bukkit.Bukkit; +import org.bukkit.command.Command; +import org.bukkit.command.CommandSender; +import org.bukkit.command.TabExecutor; +import org.bukkit.entity.Player; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.util.List; + +import static me.unurled.raxen.utils.Utils.colorTextComp; +import static me.unurled.raxen.utils.Utils.error; + +public class SkillsCommand implements TabExecutor { + + private Raxen main; + + public SkillsCommand(Raxen main) { + this.main = main; + } + + @Override + public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String msg, @NotNull String[] args) { + if(!(sender instanceof Player)) { + error((Raxen) Bukkit.getPluginManager().getPlugin("Raxen"),"The console can't execute this Command!"); + return true; + } + Player player = (Player) sender; + Attributes attributes = new Attributes(main); + switch (args.length) { + case 0: + //open gui + player.sendMessage(colorTextComp("GUI not implemented yet..").append(colorTextComp("Try /skill help."))); + break; + case 1: + case 2: + player.sendMessage(colorTextComp("Use the command like: ") + .append(colorTextComp("/skill {health|defense|speed|strength} {add|set|remove} {amount}"))); + break; + case 3: + PlayerManager pm = ((Raxen) Bukkit.getPluginManager().getPlugin("Raxen")).getManager().getPlayerManager(); + for (String s : pm.getAttribute().keySet()) { + if (s.equalsIgnoreCase(args[0])) + switch (args[1]) { + case "add": + pm.getAttribute().get(s).add(player, Integer.parseInt(args[2])); + case "remove": + pm.getAttribute().get(s).remove(player, Integer.parseInt(args[2])); + case "set": + pm.getAttribute().get(s).set(player, Integer.parseInt(args[2])); + } + } + PlayerUtils.updateSkills(main, player); + } + return false; + } + + @Override + public @Nullable List onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, @NotNull String[] args) { + return null; + } +} diff --git a/src/main/java/gq/unurled/raxen/commands/player/StorageCommand.java b/src/main/java/me/unurled/raxen/commands/player/StorageCommand.java similarity index 92% rename from src/main/java/gq/unurled/raxen/commands/player/StorageCommand.java rename to src/main/java/me/unurled/raxen/commands/player/StorageCommand.java index a481a94..29f3955 100644 --- a/src/main/java/gq/unurled/raxen/commands/player/StorageCommand.java +++ b/src/main/java/me/unurled/raxen/commands/player/StorageCommand.java @@ -1,7 +1,7 @@ -package gq.unurled.raxen.commands.player; +package me.unurled.raxen.commands.player; -import gq.unurled.raxen.Raxen; -import gq.unurled.raxen.manager.entity.PlayerManager; +import me.unurled.raxen.Raxen; +import me.unurled.raxen.manager.entity.PlayerManager; import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; @@ -13,7 +13,7 @@ import org.jetbrains.annotations.Nullable; import java.util.List; -import static gq.unurled.raxen.utils.Utils.*; +import static me.unurled.raxen.utils.Utils.*; public class StorageCommand implements TabExecutor { diff --git a/src/main/java/gq/unurled/raxen/components/dungeons/Dungeon.java b/src/main/java/me/unurled/raxen/components/dungeons/Dungeon.java similarity index 85% rename from src/main/java/gq/unurled/raxen/components/dungeons/Dungeon.java rename to src/main/java/me/unurled/raxen/components/dungeons/Dungeon.java index 016422d..eb40166 100644 --- a/src/main/java/gq/unurled/raxen/components/dungeons/Dungeon.java +++ b/src/main/java/me/unurled/raxen/components/dungeons/Dungeon.java @@ -1,15 +1,15 @@ -package gq.unurled.raxen.components.dungeons; +package me.unurled.raxen.components.dungeons; -import gq.unurled.raxen.Raxen; -import gq.unurled.raxen.components.dungeons.types.MonsterType; -import gq.unurled.raxen.components.entity.other.RaxenEntity; import lombok.Getter; +import me.unurled.raxen.Raxen; +import me.unurled.raxen.components.dungeons.types.MonsterType; +import me.unurled.raxen.components.entity.other.RaxenEntity; import org.bukkit.Bukkit; import org.bukkit.Location; import java.util.HashMap; -import static gq.unurled.raxen.utils.DungeonUtils.getRadiusFromRank; +import static me.unurled.raxen.utils.DungeonUtils.getRadiusFromRank; public class Dungeon { diff --git a/src/main/java/gq/unurled/raxen/components/dungeons/Gate.java b/src/main/java/me/unurled/raxen/components/dungeons/Gate.java similarity index 97% rename from src/main/java/gq/unurled/raxen/components/dungeons/Gate.java rename to src/main/java/me/unurled/raxen/components/dungeons/Gate.java index 6d98173..5c90e57 100644 --- a/src/main/java/gq/unurled/raxen/components/dungeons/Gate.java +++ b/src/main/java/me/unurled/raxen/components/dungeons/Gate.java @@ -1,4 +1,4 @@ -package gq.unurled.raxen.components.dungeons; +package me.unurled.raxen.components.dungeons; import org.bukkit.Location; import org.bukkit.Material; diff --git a/src/main/java/gq/unurled/raxen/components/dungeons/Rank.java b/src/main/java/me/unurled/raxen/components/dungeons/Rank.java similarity index 74% rename from src/main/java/gq/unurled/raxen/components/dungeons/Rank.java rename to src/main/java/me/unurled/raxen/components/dungeons/Rank.java index a7be70a..bef8e93 100644 --- a/src/main/java/gq/unurled/raxen/components/dungeons/Rank.java +++ b/src/main/java/me/unurled/raxen/components/dungeons/Rank.java @@ -1,4 +1,4 @@ -package gq.unurled.raxen.components.dungeons; +package me.unurled.raxen.components.dungeons; public enum Rank { F, diff --git a/src/main/java/gq/unurled/raxen/components/dungeons/Type.java b/src/main/java/me/unurled/raxen/components/dungeons/Type.java similarity index 60% rename from src/main/java/gq/unurled/raxen/components/dungeons/Type.java rename to src/main/java/me/unurled/raxen/components/dungeons/Type.java index 40cee3b..f649c6f 100644 --- a/src/main/java/gq/unurled/raxen/components/dungeons/Type.java +++ b/src/main/java/me/unurled/raxen/components/dungeons/Type.java @@ -1,7 +1,7 @@ -package gq.unurled.raxen.components.dungeons; +package me.unurled.raxen.components.dungeons; -import gq.unurled.raxen.components.entity.other.RaxenEntity; -import gq.unurled.raxen.components.lootchest.loots.LootItem; +import me.unurled.raxen.components.entity.other.RaxenEntity; +import me.unurled.raxen.components.lootchest.loots.LootItem; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/gq/unurled/raxen/components/dungeons/Types.java b/src/main/java/me/unurled/raxen/components/dungeons/Types.java similarity index 85% rename from src/main/java/gq/unurled/raxen/components/dungeons/Types.java rename to src/main/java/me/unurled/raxen/components/dungeons/Types.java index ff7b05c..7685d19 100644 --- a/src/main/java/gq/unurled/raxen/components/dungeons/Types.java +++ b/src/main/java/me/unurled/raxen/components/dungeons/Types.java @@ -1,4 +1,4 @@ -package gq.unurled.raxen.components.dungeons; +package me.unurled.raxen.components.dungeons; public enum Types { JUNGLE, diff --git a/src/main/java/gq/unurled/raxen/components/dungeons/types/MonsterType.java b/src/main/java/me/unurled/raxen/components/dungeons/types/MonsterType.java similarity index 94% rename from src/main/java/gq/unurled/raxen/components/dungeons/types/MonsterType.java rename to src/main/java/me/unurled/raxen/components/dungeons/types/MonsterType.java index f98ad1e..7e3da0e 100644 --- a/src/main/java/gq/unurled/raxen/components/dungeons/types/MonsterType.java +++ b/src/main/java/me/unurled/raxen/components/dungeons/types/MonsterType.java @@ -1,6 +1,6 @@ -package gq.unurled.raxen.components.dungeons.types; +package me.unurled.raxen.components.dungeons.types; -import gq.unurled.raxen.components.dungeons.Rank; +import me.unurled.raxen.components.dungeons.Rank; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Material; @@ -13,7 +13,7 @@ import org.jetbrains.annotations.Nullable; import java.util.Random; -import static gq.unurled.raxen.utils.Utils.debug; +import static me.unurled.raxen.utils.Utils.debug; public class MonsterType { public enum type {; diff --git a/src/main/java/gq/unurled/raxen/components/dungeons/types/forest/ForestDungeon.java b/src/main/java/me/unurled/raxen/components/dungeons/types/forest/ForestDungeon.java similarity index 50% rename from src/main/java/gq/unurled/raxen/components/dungeons/types/forest/ForestDungeon.java rename to src/main/java/me/unurled/raxen/components/dungeons/types/forest/ForestDungeon.java index b511432..f389c05 100644 --- a/src/main/java/gq/unurled/raxen/components/dungeons/types/forest/ForestDungeon.java +++ b/src/main/java/me/unurled/raxen/components/dungeons/types/forest/ForestDungeon.java @@ -1,9 +1,9 @@ -package gq.unurled.raxen.components.dungeons.types.forest; +package me.unurled.raxen.components.dungeons.types.forest; -import gq.unurled.raxen.components.dungeons.Dungeon; -import gq.unurled.raxen.components.dungeons.Rank; -import gq.unurled.raxen.components.dungeons.Types; -import gq.unurled.raxen.components.dungeons.types.MonsterType; +import me.unurled.raxen.components.dungeons.Dungeon; +import me.unurled.raxen.components.dungeons.Rank; +import me.unurled.raxen.components.dungeons.Types; +import me.unurled.raxen.components.dungeons.types.MonsterType; public class ForestDungeon extends Dungeon { public ForestDungeon(String name, Rank rank, Types types, MonsterType mType) { diff --git a/src/main/java/gq/unurled/raxen/components/dungeons/types/forest/ForestMonster.java b/src/main/java/me/unurled/raxen/components/dungeons/types/forest/ForestMonster.java similarity index 63% rename from src/main/java/gq/unurled/raxen/components/dungeons/types/forest/ForestMonster.java rename to src/main/java/me/unurled/raxen/components/dungeons/types/forest/ForestMonster.java index f78d71e..ea93b79 100644 --- a/src/main/java/gq/unurled/raxen/components/dungeons/types/forest/ForestMonster.java +++ b/src/main/java/me/unurled/raxen/components/dungeons/types/forest/ForestMonster.java @@ -1,9 +1,9 @@ -package gq.unurled.raxen.components.dungeons.types.forest; +package me.unurled.raxen.components.dungeons.types.forest; -import gq.unurled.raxen.components.dungeons.types.MonsterType; -import gq.unurled.raxen.components.entity.other.custom.dungeon.forest.Elf; -import gq.unurled.raxen.components.entity.other.custom.dungeon.forest.Wolf; import lombok.Getter; +import me.unurled.raxen.components.dungeons.types.MonsterType; +import me.unurled.raxen.components.entity.other.custom.dungeon.forest.Elf; +import me.unurled.raxen.components.entity.other.custom.dungeon.forest.Wolf; public class ForestMonster extends MonsterType { diff --git a/src/main/java/gq/unurled/raxen/components/enchantments/EnchantmentWarpper.java b/src/main/java/me/unurled/raxen/components/enchantments/EnchantmentWarpper.java similarity index 97% rename from src/main/java/gq/unurled/raxen/components/enchantments/EnchantmentWarpper.java rename to src/main/java/me/unurled/raxen/components/enchantments/EnchantmentWarpper.java index 279d478..48651a9 100644 --- a/src/main/java/gq/unurled/raxen/components/enchantments/EnchantmentWarpper.java +++ b/src/main/java/me/unurled/raxen/components/enchantments/EnchantmentWarpper.java @@ -1,4 +1,4 @@ -package gq.unurled.raxen.components.enchantments; +package me.unurled.raxen.components.enchantments; import io.papermc.paper.enchantments.EnchantmentRarity; import net.kyori.adventure.key.Key; diff --git a/src/main/java/gq/unurled/raxen/components/enchantments/player/Telekinesis.java b/src/main/java/me/unurled/raxen/components/enchantments/player/Telekinesis.java similarity index 66% rename from src/main/java/gq/unurled/raxen/components/enchantments/player/Telekinesis.java rename to src/main/java/me/unurled/raxen/components/enchantments/player/Telekinesis.java index f8dcf78..1f94e28 100644 --- a/src/main/java/gq/unurled/raxen/components/enchantments/player/Telekinesis.java +++ b/src/main/java/me/unurled/raxen/components/enchantments/player/Telekinesis.java @@ -1,6 +1,6 @@ -package gq.unurled.raxen.components.enchantments.player; +package me.unurled.raxen.components.enchantments.player; -import gq.unurled.raxen.components.enchantments.EnchantmentWarpper; +import me.unurled.raxen.components.enchantments.EnchantmentWarpper; import org.bukkit.enchantments.Enchantment; import org.bukkit.event.Listener; diff --git a/src/main/java/gq/unurled/raxen/components/entity/Attributes/Attribute.java b/src/main/java/me/unurled/raxen/components/entity/Attributes/Attribute.java similarity index 97% rename from src/main/java/gq/unurled/raxen/components/entity/Attributes/Attribute.java rename to src/main/java/me/unurled/raxen/components/entity/Attributes/Attribute.java index c443622..ff3609b 100644 --- a/src/main/java/gq/unurled/raxen/components/entity/Attributes/Attribute.java +++ b/src/main/java/me/unurled/raxen/components/entity/Attributes/Attribute.java @@ -1,4 +1,4 @@ -package gq.unurled.raxen.components.entity.Attributes; +package me.unurled.raxen.components.entity.Attributes; import de.tr7zw.nbtapi.NBTItem; import org.bukkit.Material; @@ -10,7 +10,7 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.persistence.PersistentDataType; import org.jetbrains.annotations.NotNull; -import static gq.unurled.raxen.utils.Utils.debug; +import static me.unurled.raxen.utils.Utils.debug; public class Attribute { diff --git a/src/main/java/gq/unurled/raxen/components/entity/Attributes/Defense.java b/src/main/java/me/unurled/raxen/components/entity/Attributes/Defense.java similarity index 76% rename from src/main/java/gq/unurled/raxen/components/entity/Attributes/Defense.java rename to src/main/java/me/unurled/raxen/components/entity/Attributes/Defense.java index 8a10592..bee51fd 100644 --- a/src/main/java/gq/unurled/raxen/components/entity/Attributes/Defense.java +++ b/src/main/java/me/unurled/raxen/components/entity/Attributes/Defense.java @@ -1,4 +1,4 @@ -package gq.unurled.raxen.components.entity.Attributes; +package me.unurled.raxen.components.entity.Attributes; import org.bukkit.NamespacedKey; diff --git a/src/main/java/gq/unurled/raxen/components/entity/Attributes/Health.java b/src/main/java/me/unurled/raxen/components/entity/Attributes/Health.java similarity index 76% rename from src/main/java/gq/unurled/raxen/components/entity/Attributes/Health.java rename to src/main/java/me/unurled/raxen/components/entity/Attributes/Health.java index 03be05a..acfdfaa 100644 --- a/src/main/java/gq/unurled/raxen/components/entity/Attributes/Health.java +++ b/src/main/java/me/unurled/raxen/components/entity/Attributes/Health.java @@ -1,4 +1,4 @@ -package gq.unurled.raxen.components.entity.Attributes; +package me.unurled.raxen.components.entity.Attributes; import org.bukkit.NamespacedKey; diff --git a/src/main/java/gq/unurled/raxen/components/entity/Attributes/ItemDefense.java b/src/main/java/me/unurled/raxen/components/entity/Attributes/ItemDefense.java similarity index 77% rename from src/main/java/gq/unurled/raxen/components/entity/Attributes/ItemDefense.java rename to src/main/java/me/unurled/raxen/components/entity/Attributes/ItemDefense.java index ec56ab5..2d9cdaa 100644 --- a/src/main/java/gq/unurled/raxen/components/entity/Attributes/ItemDefense.java +++ b/src/main/java/me/unurled/raxen/components/entity/Attributes/ItemDefense.java @@ -1,4 +1,4 @@ -package gq.unurled.raxen.components.entity.Attributes; +package me.unurled.raxen.components.entity.Attributes; import org.bukkit.NamespacedKey; diff --git a/src/main/java/gq/unurled/raxen/components/entity/Attributes/ItemHealth.java b/src/main/java/me/unurled/raxen/components/entity/Attributes/ItemHealth.java similarity index 77% rename from src/main/java/gq/unurled/raxen/components/entity/Attributes/ItemHealth.java rename to src/main/java/me/unurled/raxen/components/entity/Attributes/ItemHealth.java index e3ce1b1..342842a 100644 --- a/src/main/java/gq/unurled/raxen/components/entity/Attributes/ItemHealth.java +++ b/src/main/java/me/unurled/raxen/components/entity/Attributes/ItemHealth.java @@ -1,4 +1,4 @@ -package gq.unurled.raxen.components.entity.Attributes; +package me.unurled.raxen.components.entity.Attributes; import org.bukkit.NamespacedKey; diff --git a/src/main/java/gq/unurled/raxen/components/entity/Attributes/ItemLuck.java b/src/main/java/me/unurled/raxen/components/entity/Attributes/ItemLuck.java similarity index 76% rename from src/main/java/gq/unurled/raxen/components/entity/Attributes/ItemLuck.java rename to src/main/java/me/unurled/raxen/components/entity/Attributes/ItemLuck.java index a6794dc..206e0d6 100644 --- a/src/main/java/gq/unurled/raxen/components/entity/Attributes/ItemLuck.java +++ b/src/main/java/me/unurled/raxen/components/entity/Attributes/ItemLuck.java @@ -1,4 +1,4 @@ -package gq.unurled.raxen.components.entity.Attributes; +package me.unurled.raxen.components.entity.Attributes; import org.bukkit.NamespacedKey; diff --git a/src/main/java/gq/unurled/raxen/components/entity/Attributes/ItemMana.java b/src/main/java/me/unurled/raxen/components/entity/Attributes/ItemMana.java similarity index 76% rename from src/main/java/gq/unurled/raxen/components/entity/Attributes/ItemMana.java rename to src/main/java/me/unurled/raxen/components/entity/Attributes/ItemMana.java index 02ef8bd..93c8b2b 100644 --- a/src/main/java/gq/unurled/raxen/components/entity/Attributes/ItemMana.java +++ b/src/main/java/me/unurled/raxen/components/entity/Attributes/ItemMana.java @@ -1,4 +1,4 @@ -package gq.unurled.raxen.components.entity.Attributes; +package me.unurled.raxen.components.entity.Attributes; import org.bukkit.NamespacedKey; diff --git a/src/main/java/gq/unurled/raxen/components/entity/Attributes/ItemSpeed.java b/src/main/java/me/unurled/raxen/components/entity/Attributes/ItemSpeed.java similarity index 77% rename from src/main/java/gq/unurled/raxen/components/entity/Attributes/ItemSpeed.java rename to src/main/java/me/unurled/raxen/components/entity/Attributes/ItemSpeed.java index effdb4d..cfbc3b6 100644 --- a/src/main/java/gq/unurled/raxen/components/entity/Attributes/ItemSpeed.java +++ b/src/main/java/me/unurled/raxen/components/entity/Attributes/ItemSpeed.java @@ -1,4 +1,4 @@ -package gq.unurled.raxen.components.entity.Attributes; +package me.unurled.raxen.components.entity.Attributes; import org.bukkit.NamespacedKey; diff --git a/src/main/java/gq/unurled/raxen/components/entity/Attributes/ItemStrength.java b/src/main/java/me/unurled/raxen/components/entity/Attributes/ItemStrength.java similarity index 77% rename from src/main/java/gq/unurled/raxen/components/entity/Attributes/ItemStrength.java rename to src/main/java/me/unurled/raxen/components/entity/Attributes/ItemStrength.java index 0a6b11b..ee11e62 100644 --- a/src/main/java/gq/unurled/raxen/components/entity/Attributes/ItemStrength.java +++ b/src/main/java/me/unurled/raxen/components/entity/Attributes/ItemStrength.java @@ -1,4 +1,4 @@ -package gq.unurled.raxen.components.entity.Attributes; +package me.unurled.raxen.components.entity.Attributes; import org.bukkit.NamespacedKey; diff --git a/src/main/java/gq/unurled/raxen/components/entity/Attributes/Luck.java b/src/main/java/me/unurled/raxen/components/entity/Attributes/Luck.java similarity index 76% rename from src/main/java/gq/unurled/raxen/components/entity/Attributes/Luck.java rename to src/main/java/me/unurled/raxen/components/entity/Attributes/Luck.java index 16b0b08..0fdb7e2 100644 --- a/src/main/java/gq/unurled/raxen/components/entity/Attributes/Luck.java +++ b/src/main/java/me/unurled/raxen/components/entity/Attributes/Luck.java @@ -1,4 +1,4 @@ -package gq.unurled.raxen.components.entity.Attributes; +package me.unurled.raxen.components.entity.Attributes; import org.bukkit.NamespacedKey; diff --git a/src/main/java/gq/unurled/raxen/components/entity/Attributes/Mana.java b/src/main/java/me/unurled/raxen/components/entity/Attributes/Mana.java similarity index 76% rename from src/main/java/gq/unurled/raxen/components/entity/Attributes/Mana.java rename to src/main/java/me/unurled/raxen/components/entity/Attributes/Mana.java index e55ec2c..e3beb23 100644 --- a/src/main/java/gq/unurled/raxen/components/entity/Attributes/Mana.java +++ b/src/main/java/me/unurled/raxen/components/entity/Attributes/Mana.java @@ -1,4 +1,4 @@ -package gq.unurled.raxen.components.entity.Attributes; +package me.unurled.raxen.components.entity.Attributes; import org.bukkit.NamespacedKey; diff --git a/src/main/java/gq/unurled/raxen/components/entity/Attributes/MaxHealth.java b/src/main/java/me/unurled/raxen/components/entity/Attributes/MaxHealth.java similarity index 77% rename from src/main/java/gq/unurled/raxen/components/entity/Attributes/MaxHealth.java rename to src/main/java/me/unurled/raxen/components/entity/Attributes/MaxHealth.java index 67d0c44..b76886e 100644 --- a/src/main/java/gq/unurled/raxen/components/entity/Attributes/MaxHealth.java +++ b/src/main/java/me/unurled/raxen/components/entity/Attributes/MaxHealth.java @@ -1,4 +1,4 @@ -package gq.unurled.raxen.components.entity.Attributes; +package me.unurled.raxen.components.entity.Attributes; import org.bukkit.NamespacedKey; diff --git a/src/main/java/gq/unurled/raxen/components/entity/Attributes/MaxMana.java b/src/main/java/me/unurled/raxen/components/entity/Attributes/MaxMana.java similarity index 76% rename from src/main/java/gq/unurled/raxen/components/entity/Attributes/MaxMana.java rename to src/main/java/me/unurled/raxen/components/entity/Attributes/MaxMana.java index 3cf87f2..58467e6 100644 --- a/src/main/java/gq/unurled/raxen/components/entity/Attributes/MaxMana.java +++ b/src/main/java/me/unurled/raxen/components/entity/Attributes/MaxMana.java @@ -1,4 +1,4 @@ -package gq.unurled.raxen.components.entity.Attributes; +package me.unurled.raxen.components.entity.Attributes; import org.bukkit.NamespacedKey; diff --git a/src/main/java/gq/unurled/raxen/components/entity/Attributes/MaxManaBuilder.java b/src/main/java/me/unurled/raxen/components/entity/Attributes/MaxManaBuilder.java similarity index 89% rename from src/main/java/gq/unurled/raxen/components/entity/Attributes/MaxManaBuilder.java rename to src/main/java/me/unurled/raxen/components/entity/Attributes/MaxManaBuilder.java index 1aee6e7..6977388 100644 --- a/src/main/java/gq/unurled/raxen/components/entity/Attributes/MaxManaBuilder.java +++ b/src/main/java/me/unurled/raxen/components/entity/Attributes/MaxManaBuilder.java @@ -1,4 +1,4 @@ -package gq.unurled.raxen.components.entity.Attributes; +package me.unurled.raxen.components.entity.Attributes; import org.bukkit.NamespacedKey; diff --git a/src/main/java/gq/unurled/raxen/components/entity/Attributes/Speed.java b/src/main/java/me/unurled/raxen/components/entity/Attributes/Speed.java similarity index 76% rename from src/main/java/gq/unurled/raxen/components/entity/Attributes/Speed.java rename to src/main/java/me/unurled/raxen/components/entity/Attributes/Speed.java index 429a74e..0264d2f 100644 --- a/src/main/java/gq/unurled/raxen/components/entity/Attributes/Speed.java +++ b/src/main/java/me/unurled/raxen/components/entity/Attributes/Speed.java @@ -1,4 +1,4 @@ -package gq.unurled.raxen.components.entity.Attributes; +package me.unurled.raxen.components.entity.Attributes; import org.bukkit.NamespacedKey; diff --git a/src/main/java/gq/unurled/raxen/components/entity/Attributes/Strength.java b/src/main/java/me/unurled/raxen/components/entity/Attributes/Strength.java similarity index 77% rename from src/main/java/gq/unurled/raxen/components/entity/Attributes/Strength.java rename to src/main/java/me/unurled/raxen/components/entity/Attributes/Strength.java index c8a7f94..5bf8644 100644 --- a/src/main/java/gq/unurled/raxen/components/entity/Attributes/Strength.java +++ b/src/main/java/me/unurled/raxen/components/entity/Attributes/Strength.java @@ -1,4 +1,4 @@ -package gq.unurled.raxen.components.entity.Attributes; +package me.unurled.raxen.components.entity.Attributes; import org.bukkit.NamespacedKey; diff --git a/src/main/java/gq/unurled/raxen/components/entity/other/EntityNamespacedKey.java b/src/main/java/me/unurled/raxen/components/entity/other/EntityNamespacedKey.java similarity index 95% rename from src/main/java/gq/unurled/raxen/components/entity/other/EntityNamespacedKey.java rename to src/main/java/me/unurled/raxen/components/entity/other/EntityNamespacedKey.java index 6258221..13a4dcc 100644 --- a/src/main/java/gq/unurled/raxen/components/entity/other/EntityNamespacedKey.java +++ b/src/main/java/me/unurled/raxen/components/entity/other/EntityNamespacedKey.java @@ -1,6 +1,6 @@ -package gq.unurled.raxen.components.entity.other; +package me.unurled.raxen.components.entity.other; -import gq.unurled.raxen.Raxen; +import me.unurled.raxen.Raxen; import org.bukkit.NamespacedKey; public class EntityNamespacedKey { diff --git a/src/main/java/gq/unurled/raxen/components/entity/other/EntityUtils.java b/src/main/java/me/unurled/raxen/components/entity/other/EntityUtils.java similarity index 95% rename from src/main/java/gq/unurled/raxen/components/entity/other/EntityUtils.java rename to src/main/java/me/unurled/raxen/components/entity/other/EntityUtils.java index 34a21f6..eb59b23 100644 --- a/src/main/java/gq/unurled/raxen/components/entity/other/EntityUtils.java +++ b/src/main/java/me/unurled/raxen/components/entity/other/EntityUtils.java @@ -1,14 +1,14 @@ -package gq.unurled.raxen.components.entity.other; +package me.unurled.raxen.components.entity.other; -import gq.unurled.raxen.Raxen; -import gq.unurled.raxen.manager.entity.PlayerManager; +import me.unurled.raxen.Raxen; +import me.unurled.raxen.manager.entity.PlayerManager; import org.bukkit.Bukkit; import org.bukkit.entity.LivingEntity; import org.bukkit.persistence.PersistentDataContainer; import org.bukkit.persistence.PersistentDataType; import org.jetbrains.annotations.NotNull; -import static gq.unurled.raxen.utils.Utils.debug; +import static me.unurled.raxen.utils.Utils.debug; public class EntityUtils { diff --git a/src/main/java/gq/unurled/raxen/components/entity/other/RaxenEntity.java b/src/main/java/me/unurled/raxen/components/entity/other/RaxenEntity.java similarity index 95% rename from src/main/java/gq/unurled/raxen/components/entity/other/RaxenEntity.java rename to src/main/java/me/unurled/raxen/components/entity/other/RaxenEntity.java index d79b3db..ad4a2f4 100644 --- a/src/main/java/gq/unurled/raxen/components/entity/other/RaxenEntity.java +++ b/src/main/java/me/unurled/raxen/components/entity/other/RaxenEntity.java @@ -1,8 +1,8 @@ -package gq.unurled.raxen.components.entity.other; +package me.unurled.raxen.components.entity.other; -import gq.unurled.raxen.Raxen; import lombok.Getter; import lombok.Setter; +import me.unurled.raxen.Raxen; import net.kyori.adventure.text.Component; import org.bukkit.Location; import org.bukkit.NamespacedKey; diff --git a/src/main/java/gq/unurled/raxen/components/entity/other/custom/Entity.java b/src/main/java/me/unurled/raxen/components/entity/other/custom/Entity.java similarity index 91% rename from src/main/java/gq/unurled/raxen/components/entity/other/custom/Entity.java rename to src/main/java/me/unurled/raxen/components/entity/other/custom/Entity.java index 7e6439b..3f9a673 100644 --- a/src/main/java/gq/unurled/raxen/components/entity/other/custom/Entity.java +++ b/src/main/java/me/unurled/raxen/components/entity/other/custom/Entity.java @@ -1,10 +1,10 @@ -package gq.unurled.raxen.components.entity.other.custom; +package me.unurled.raxen.components.entity.other.custom; -import gq.unurled.raxen.Raxen; import lombok.Getter; import lombok.Setter; +import me.unurled.raxen.Raxen; -import static gq.unurled.raxen.utils.Utils.colorString; +import static me.unurled.raxen.utils.Utils.colorString; public class Entity { diff --git a/src/main/java/gq/unurled/raxen/components/entity/other/custom/dungeon/forest/Elf.java b/src/main/java/me/unurled/raxen/components/entity/other/custom/dungeon/forest/Elf.java similarity index 82% rename from src/main/java/gq/unurled/raxen/components/entity/other/custom/dungeon/forest/Elf.java rename to src/main/java/me/unurled/raxen/components/entity/other/custom/dungeon/forest/Elf.java index 3adaada..e94833c 100644 --- a/src/main/java/gq/unurled/raxen/components/entity/other/custom/dungeon/forest/Elf.java +++ b/src/main/java/me/unurled/raxen/components/entity/other/custom/dungeon/forest/Elf.java @@ -1,8 +1,8 @@ -package gq.unurled.raxen.components.entity.other.custom.dungeon.forest; +package me.unurled.raxen.components.entity.other.custom.dungeon.forest; -import gq.unurled.raxen.Raxen; -import gq.unurled.raxen.components.entity.other.RaxenEntity; import lombok.Getter; +import me.unurled.raxen.Raxen; +import me.unurled.raxen.components.entity.other.RaxenEntity; import org.bukkit.Location; import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; diff --git a/src/main/java/gq/unurled/raxen/components/entity/other/custom/dungeon/forest/Wolf.java b/src/main/java/me/unurled/raxen/components/entity/other/custom/dungeon/forest/Wolf.java similarity index 80% rename from src/main/java/gq/unurled/raxen/components/entity/other/custom/dungeon/forest/Wolf.java rename to src/main/java/me/unurled/raxen/components/entity/other/custom/dungeon/forest/Wolf.java index 753491b..fd51009 100644 --- a/src/main/java/gq/unurled/raxen/components/entity/other/custom/dungeon/forest/Wolf.java +++ b/src/main/java/me/unurled/raxen/components/entity/other/custom/dungeon/forest/Wolf.java @@ -1,8 +1,8 @@ -package gq.unurled.raxen.components.entity.other.custom.dungeon.forest; +package me.unurled.raxen.components.entity.other.custom.dungeon.forest; -import gq.unurled.raxen.Raxen; -import gq.unurled.raxen.components.entity.other.RaxenEntity; import lombok.Getter; +import me.unurled.raxen.Raxen; +import me.unurled.raxen.components.entity.other.RaxenEntity; import org.bukkit.Location; import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; diff --git a/src/main/java/gq/unurled/raxen/components/entity/other/custom/hostile/low/Goblin.java b/src/main/java/me/unurled/raxen/components/entity/other/custom/hostile/low/Goblin.java similarity index 77% rename from src/main/java/gq/unurled/raxen/components/entity/other/custom/hostile/low/Goblin.java rename to src/main/java/me/unurled/raxen/components/entity/other/custom/hostile/low/Goblin.java index 203b8cc..b3ed93d 100644 --- a/src/main/java/gq/unurled/raxen/components/entity/other/custom/hostile/low/Goblin.java +++ b/src/main/java/me/unurled/raxen/components/entity/other/custom/hostile/low/Goblin.java @@ -1,8 +1,8 @@ -package gq.unurled.raxen.components.entity.other.custom.hostile.low; +package me.unurled.raxen.components.entity.other.custom.hostile.low; -import gq.unurled.raxen.Raxen; -import gq.unurled.raxen.components.entity.other.RaxenEntity; -import gq.unurled.raxen.components.entity.other.custom.Entity; +import me.unurled.raxen.Raxen; +import me.unurled.raxen.components.entity.other.RaxenEntity; +import me.unurled.raxen.components.entity.other.custom.Entity; import org.bukkit.Location; import org.bukkit.entity.EntityType; diff --git a/src/main/java/me/unurled/raxen/components/entity/other/spawn/Eggs.java b/src/main/java/me/unurled/raxen/components/entity/other/spawn/Eggs.java new file mode 100644 index 0000000..8af0d8e --- /dev/null +++ b/src/main/java/me/unurled/raxen/components/entity/other/spawn/Eggs.java @@ -0,0 +1,4 @@ +package me.unurled.raxen.components.entity.other.spawn; + +public class Eggs { +} diff --git a/src/main/java/gq/unurled/raxen/components/entity/player/Inventories.java b/src/main/java/me/unurled/raxen/components/entity/player/Inventories.java similarity index 69% rename from src/main/java/gq/unurled/raxen/components/entity/player/Inventories.java rename to src/main/java/me/unurled/raxen/components/entity/player/Inventories.java index 0aabe01..b5256f4 100644 --- a/src/main/java/gq/unurled/raxen/components/entity/player/Inventories.java +++ b/src/main/java/me/unurled/raxen/components/entity/player/Inventories.java @@ -1,6 +1,6 @@ -package gq.unurled.raxen.components.entity.player; +package me.unurled.raxen.components.entity.player; -import gq.unurled.raxen.components.entity.player.storages.Inventory; +import me.unurled.raxen.components.entity.player.storages.Inventory; public class Inventories { private Inventory inv; diff --git a/src/main/java/gq/unurled/raxen/components/entity/player/PlayerUtils.java b/src/main/java/me/unurled/raxen/components/entity/player/PlayerUtils.java similarity index 90% rename from src/main/java/gq/unurled/raxen/components/entity/player/PlayerUtils.java rename to src/main/java/me/unurled/raxen/components/entity/player/PlayerUtils.java index ac99769..7858543 100644 --- a/src/main/java/gq/unurled/raxen/components/entity/player/PlayerUtils.java +++ b/src/main/java/me/unurled/raxen/components/entity/player/PlayerUtils.java @@ -1,12 +1,12 @@ -package gq.unurled.raxen.components.entity.player; +package me.unurled.raxen.components.entity.player; -import gq.unurled.raxen.Raxen; -import gq.unurled.raxen.manager.entity.PlayerManager; +import me.unurled.raxen.Raxen; +import me.unurled.raxen.manager.entity.PlayerManager; import org.bukkit.Bukkit; import org.bukkit.attribute.Attribute; import org.bukkit.entity.Player; -import static gq.unurled.raxen.utils.Utils.debug; +import static me.unurled.raxen.utils.Utils.debug; public class PlayerUtils { diff --git a/src/main/java/gq/unurled/raxen/components/entity/player/RaxenPlayer.java b/src/main/java/me/unurled/raxen/components/entity/player/RaxenPlayer.java similarity index 88% rename from src/main/java/gq/unurled/raxen/components/entity/player/RaxenPlayer.java rename to src/main/java/me/unurled/raxen/components/entity/player/RaxenPlayer.java index f026758..4617236 100644 --- a/src/main/java/gq/unurled/raxen/components/entity/player/RaxenPlayer.java +++ b/src/main/java/me/unurled/raxen/components/entity/player/RaxenPlayer.java @@ -1,12 +1,12 @@ -package gq.unurled.raxen.components.entity.player; +package me.unurled.raxen.components.entity.player; -import gq.unurled.raxen.Raxen; -import gq.unurled.raxen.components.entity.other.EntityNamespacedKey; -import gq.unurled.raxen.components.entity.player.attributes.Attribute; -import gq.unurled.raxen.components.entity.player.storages.EnderChest; -import gq.unurled.raxen.components.entity.player.storages.Inventory; -import gq.unurled.raxen.utils.EntityAttributes; -import gq.unurled.raxen.utils.Items; +import me.unurled.raxen.Raxen; +import me.unurled.raxen.components.entity.other.EntityNamespacedKey; +import me.unurled.raxen.components.entity.player.attributes.Attribute; +import me.unurled.raxen.components.entity.player.storages.EnderChest; +import me.unurled.raxen.components.entity.player.storages.Inventory; +import me.unurled.raxen.utils.EntityAttributes; +import me.unurled.raxen.utils.Items; import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.Material; @@ -20,8 +20,8 @@ import org.bukkit.persistence.PersistentDataType; import java.util.ArrayList; import java.util.List; -import static gq.unurled.raxen.utils.Items.setItemsToInventory; -import static gq.unurled.raxen.utils.Utils.debug; +import static me.unurled.raxen.utils.Items.setItemsToInventory; +import static me.unurled.raxen.utils.Utils.debug; public class RaxenPlayer { diff --git a/src/main/java/gq/unurled/raxen/components/entity/player/Scoreboard.java b/src/main/java/me/unurled/raxen/components/entity/player/Scoreboard.java similarity index 92% rename from src/main/java/gq/unurled/raxen/components/entity/player/Scoreboard.java rename to src/main/java/me/unurled/raxen/components/entity/player/Scoreboard.java index 5bb65c5..7c196d6 100644 --- a/src/main/java/gq/unurled/raxen/components/entity/player/Scoreboard.java +++ b/src/main/java/me/unurled/raxen/components/entity/player/Scoreboard.java @@ -1,7 +1,7 @@ -package gq.unurled.raxen.components.entity.player; +package me.unurled.raxen.components.entity.player; -import gq.unurled.raxen.Raxen; -import gq.unurled.raxen.utils.libs.Vault; +import me.unurled.raxen.Raxen; +import me.unurled.raxen.utils.libs.Vault; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.scoreboard.DisplaySlot; @@ -9,7 +9,7 @@ import org.bukkit.scoreboard.Objective; import org.bukkit.scoreboard.Score; import org.bukkit.scoreboard.ScoreboardManager; -import static gq.unurled.raxen.utils.Utils.*; +import static me.unurled.raxen.utils.Utils.*; public class Scoreboard { @@ -34,7 +34,7 @@ public class Scoreboard { score2.setScore(2); Score score3 = obj.getScore(colorString("Coins: " + vault.getBalanceString(player))); score3.setScore(1); - Score score4 = obj.getScore(colorString("unurled.gq")); + Score score4 = obj.getScore(colorString("unurled.me")); score4.setScore(0); player.setScoreboard(board); } diff --git a/src/main/java/gq/unurled/raxen/components/entity/player/Storage.java b/src/main/java/me/unurled/raxen/components/entity/player/Storage.java similarity index 68% rename from src/main/java/gq/unurled/raxen/components/entity/player/Storage.java rename to src/main/java/me/unurled/raxen/components/entity/player/Storage.java index ae685de..f1da721 100644 --- a/src/main/java/gq/unurled/raxen/components/entity/player/Storage.java +++ b/src/main/java/me/unurled/raxen/components/entity/player/Storage.java @@ -1,6 +1,6 @@ -package gq.unurled.raxen.components.entity.player; +package me.unurled.raxen.components.entity.player; -import gq.unurled.raxen.components.entity.player.storages.EnderChest; +import me.unurled.raxen.components.entity.player.storages.EnderChest; public class Storage { diff --git a/src/main/java/gq/unurled/raxen/components/entity/player/attributes/Attribute.java b/src/main/java/me/unurled/raxen/components/entity/player/attributes/Attribute.java similarity index 93% rename from src/main/java/gq/unurled/raxen/components/entity/player/attributes/Attribute.java rename to src/main/java/me/unurled/raxen/components/entity/player/attributes/Attribute.java index 9c3881b..297eb8f 100644 --- a/src/main/java/gq/unurled/raxen/components/entity/player/attributes/Attribute.java +++ b/src/main/java/me/unurled/raxen/components/entity/player/attributes/Attribute.java @@ -1,4 +1,4 @@ -package gq.unurled.raxen.components.entity.player.attributes; +package me.unurled.raxen.components.entity.player.attributes; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/gq/unurled/raxen/components/entity/player/attributes/Attributes.java b/src/main/java/me/unurled/raxen/components/entity/player/attributes/Attributes.java similarity index 91% rename from src/main/java/gq/unurled/raxen/components/entity/player/attributes/Attributes.java rename to src/main/java/me/unurled/raxen/components/entity/player/attributes/Attributes.java index 3725e2e..51ae63d 100644 --- a/src/main/java/gq/unurled/raxen/components/entity/player/attributes/Attributes.java +++ b/src/main/java/me/unurled/raxen/components/entity/player/attributes/Attributes.java @@ -1,8 +1,8 @@ -package gq.unurled.raxen.components.entity.player.attributes; +package me.unurled.raxen.components.entity.player.attributes; -import gq.unurled.raxen.Raxen; -import gq.unurled.raxen.components.entity.other.EntityNamespacedKey; -import gq.unurled.raxen.manager.entity.PlayerManager; +import me.unurled.raxen.Raxen; +import me.unurled.raxen.components.entity.other.EntityNamespacedKey; +import me.unurled.raxen.manager.entity.PlayerManager; import org.bukkit.Bukkit; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; diff --git a/src/main/java/gq/unurled/raxen/components/entity/player/classes/Class.java b/src/main/java/me/unurled/raxen/components/entity/player/classes/Class.java similarity index 84% rename from src/main/java/gq/unurled/raxen/components/entity/player/classes/Class.java rename to src/main/java/me/unurled/raxen/components/entity/player/classes/Class.java index f38095e..661350c 100644 --- a/src/main/java/gq/unurled/raxen/components/entity/player/classes/Class.java +++ b/src/main/java/me/unurled/raxen/components/entity/player/classes/Class.java @@ -1,10 +1,10 @@ -package gq.unurled.raxen.components.entity.player.classes; +package me.unurled.raxen.components.entity.player.classes; import lombok.Getter; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; -import static gq.unurled.raxen.utils.Utils.colorTextComp; +import static me.unurled.raxen.utils.Utils.colorTextComp; public class Class { diff --git a/src/main/java/gq/unurled/raxen/components/entity/player/classes/Classes.java b/src/main/java/me/unurled/raxen/components/entity/player/classes/Classes.java similarity index 92% rename from src/main/java/gq/unurled/raxen/components/entity/player/classes/Classes.java rename to src/main/java/me/unurled/raxen/components/entity/player/classes/Classes.java index 64acf91..d93f590 100644 --- a/src/main/java/gq/unurled/raxen/components/entity/player/classes/Classes.java +++ b/src/main/java/me/unurled/raxen/components/entity/player/classes/Classes.java @@ -1,9 +1,9 @@ -package gq.unurled.raxen.components.entity.player.classes; +package me.unurled.raxen.components.entity.player.classes; -import gq.unurled.raxen.Raxen; -import gq.unurled.raxen.manager.entity.PlayerManager; import lombok.Getter; import lombok.Setter; +import me.unurled.raxen.Raxen; +import me.unurled.raxen.manager.entity.PlayerManager; import org.bukkit.Bukkit; import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.FileConfiguration; @@ -13,8 +13,8 @@ import java.io.File; import java.io.IOException; import java.util.HashMap; -import static gq.unurled.raxen.utils.Utils.debug; -import static gq.unurled.raxen.utils.Utils.error; +import static me.unurled.raxen.utils.Utils.debug; +import static me.unurled.raxen.utils.Utils.error; public class Classes { diff --git a/src/main/java/gq/unurled/raxen/components/entity/player/classes/list/Assassin.java b/src/main/java/me/unurled/raxen/components/entity/player/classes/list/Assassin.java similarity index 73% rename from src/main/java/gq/unurled/raxen/components/entity/player/classes/list/Assassin.java rename to src/main/java/me/unurled/raxen/components/entity/player/classes/list/Assassin.java index eaa54f1..4b928f0 100644 --- a/src/main/java/gq/unurled/raxen/components/entity/player/classes/list/Assassin.java +++ b/src/main/java/me/unurled/raxen/components/entity/player/classes/list/Assassin.java @@ -1,6 +1,6 @@ -package gq.unurled.raxen.components.entity.player.classes.list; +package me.unurled.raxen.components.entity.player.classes.list; -import gq.unurled.raxen.components.items.custom.weapon.Dager; +import me.unurled.raxen.components.items.custom.weapon.Dager; import org.bukkit.inventory.ItemStack; public class Assassin { diff --git a/src/main/java/gq/unurled/raxen/components/entity/player/storages/EnderChest.java b/src/main/java/me/unurled/raxen/components/entity/player/storages/EnderChest.java similarity index 85% rename from src/main/java/gq/unurled/raxen/components/entity/player/storages/EnderChest.java rename to src/main/java/me/unurled/raxen/components/entity/player/storages/EnderChest.java index 958ca0d..aca7dbe 100644 --- a/src/main/java/gq/unurled/raxen/components/entity/player/storages/EnderChest.java +++ b/src/main/java/me/unurled/raxen/components/entity/player/storages/EnderChest.java @@ -1,4 +1,4 @@ -package gq.unurled.raxen.components.entity.player.storages; +package me.unurled.raxen.components.entity.player.storages; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/gq/unurled/raxen/components/entity/player/storages/Inventory.java b/src/main/java/me/unurled/raxen/components/entity/player/storages/Inventory.java similarity index 85% rename from src/main/java/gq/unurled/raxen/components/entity/player/storages/Inventory.java rename to src/main/java/me/unurled/raxen/components/entity/player/storages/Inventory.java index 0de76d6..3582675 100644 --- a/src/main/java/gq/unurled/raxen/components/entity/player/storages/Inventory.java +++ b/src/main/java/me/unurled/raxen/components/entity/player/storages/Inventory.java @@ -1,4 +1,4 @@ -package gq.unurled.raxen.components.entity.player.storages; +package me.unurled.raxen.components.entity.player.storages; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/gq/unurled/raxen/components/gui/ItemListGui.java b/src/main/java/me/unurled/raxen/components/gui/ItemListGui.java similarity index 97% rename from src/main/java/gq/unurled/raxen/components/gui/ItemListGui.java rename to src/main/java/me/unurled/raxen/components/gui/ItemListGui.java index f3be692..37f76f8 100644 --- a/src/main/java/gq/unurled/raxen/components/gui/ItemListGui.java +++ b/src/main/java/me/unurled/raxen/components/gui/ItemListGui.java @@ -1,8 +1,8 @@ -package gq.unurled.raxen.components.gui; +package me.unurled.raxen.components.gui; -import gq.unurled.raxen.Raxen; -import gq.unurled.raxen.components.entity.player.PlayerUtils; import lombok.Getter; +import me.unurled.raxen.Raxen; +import me.unurled.raxen.components.entity.player.PlayerUtils; import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.Material; @@ -17,9 +17,9 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Map; -import static gq.unurled.raxen.utils.Items.*; -import static gq.unurled.raxen.utils.Utils.fillGreyPane; -import static gq.unurled.raxen.utils.Utils.log; +import static me.unurled.raxen.utils.Items.*; +import static me.unurled.raxen.utils.Utils.fillGreyPane; +import static me.unurled.raxen.utils.Utils.log; public class ItemListGui implements Listener { diff --git a/src/main/java/gq/unurled/raxen/components/gui/MainGui.java b/src/main/java/me/unurled/raxen/components/gui/MainGui.java similarity index 92% rename from src/main/java/gq/unurled/raxen/components/gui/MainGui.java rename to src/main/java/me/unurled/raxen/components/gui/MainGui.java index b5a3dce..31e034e 100644 --- a/src/main/java/gq/unurled/raxen/components/gui/MainGui.java +++ b/src/main/java/me/unurled/raxen/components/gui/MainGui.java @@ -1,6 +1,6 @@ -package gq.unurled.raxen.components.gui; +package me.unurled.raxen.components.gui; -import gq.unurled.raxen.utils.Items; +import me.unurled.raxen.utils.Items; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -10,8 +10,8 @@ import org.bukkit.inventory.meta.SkullMeta; import java.util.HashMap; -import static gq.unurled.raxen.utils.Utils.colorComp; -import static gq.unurled.raxen.utils.Utils.fillGreyPane; +import static me.unurled.raxen.utils.Utils.colorComp; +import static me.unurled.raxen.utils.Utils.fillGreyPane; public class MainGui { diff --git a/src/main/java/gq/unurled/raxen/components/items/Attributes.java b/src/main/java/me/unurled/raxen/components/items/Attributes.java similarity index 89% rename from src/main/java/gq/unurled/raxen/components/items/Attributes.java rename to src/main/java/me/unurled/raxen/components/items/Attributes.java index ce1aa03..46ee4bb 100644 --- a/src/main/java/gq/unurled/raxen/components/items/Attributes.java +++ b/src/main/java/me/unurled/raxen/components/items/Attributes.java @@ -1,4 +1,4 @@ -package gq.unurled.raxen.components.items; +package me.unurled.raxen.components.items; import lombok.Getter; diff --git a/src/main/java/me/unurled/raxen/components/items/CustomModelData.java b/src/main/java/me/unurled/raxen/components/items/CustomModelData.java new file mode 100644 index 0000000..32b683b --- /dev/null +++ b/src/main/java/me/unurled/raxen/components/items/CustomModelData.java @@ -0,0 +1,4 @@ +package me.unurled.raxen.components.items; + +public class CustomModelData { +} diff --git a/src/main/java/gq/unurled/raxen/components/items/NBT.java b/src/main/java/me/unurled/raxen/components/items/NBT.java similarity index 90% rename from src/main/java/gq/unurled/raxen/components/items/NBT.java rename to src/main/java/me/unurled/raxen/components/items/NBT.java index 4533890..947e9d6 100644 --- a/src/main/java/gq/unurled/raxen/components/items/NBT.java +++ b/src/main/java/me/unurled/raxen/components/items/NBT.java @@ -1,4 +1,4 @@ -package gq.unurled.raxen.components.items; +package me.unurled.raxen.components.items; public class NBT { diff --git a/src/main/java/gq/unurled/raxen/components/items/custom/Item.java b/src/main/java/me/unurled/raxen/components/items/custom/Item.java similarity index 55% rename from src/main/java/gq/unurled/raxen/components/items/custom/Item.java rename to src/main/java/me/unurled/raxen/components/items/custom/Item.java index ae53585..bf426ea 100644 --- a/src/main/java/gq/unurled/raxen/components/items/custom/Item.java +++ b/src/main/java/me/unurled/raxen/components/items/custom/Item.java @@ -1,6 +1,6 @@ -package gq.unurled.raxen.components.items.custom; +package me.unurled.raxen.components.items.custom; -import gq.unurled.raxen.Raxen; +import me.unurled.raxen.Raxen; public interface Item { diff --git a/src/main/java/gq/unurled/raxen/components/items/custom/List.java b/src/main/java/me/unurled/raxen/components/items/custom/List.java similarity index 70% rename from src/main/java/gq/unurled/raxen/components/items/custom/List.java rename to src/main/java/me/unurled/raxen/components/items/custom/List.java index 17f55a5..b0768c9 100644 --- a/src/main/java/gq/unurled/raxen/components/items/custom/List.java +++ b/src/main/java/me/unurled/raxen/components/items/custom/List.java @@ -1,8 +1,8 @@ -package gq.unurled.raxen.components.items.custom; +package me.unurled.raxen.components.items.custom; -import gq.unurled.raxen.Raxen; -import gq.unurled.raxen.components.items.custom.weapon.Dager; import lombok.Getter; +import me.unurled.raxen.Raxen; +import me.unurled.raxen.components.items.custom.weapon.Dager; import java.util.ArrayList; diff --git a/src/main/java/gq/unurled/raxen/components/items/custom/weapon/Dager.java b/src/main/java/me/unurled/raxen/components/items/custom/weapon/Dager.java similarity index 84% rename from src/main/java/gq/unurled/raxen/components/items/custom/weapon/Dager.java rename to src/main/java/me/unurled/raxen/components/items/custom/weapon/Dager.java index 39e7e51..9198d56 100644 --- a/src/main/java/gq/unurled/raxen/components/items/custom/weapon/Dager.java +++ b/src/main/java/me/unurled/raxen/components/items/custom/weapon/Dager.java @@ -1,9 +1,9 @@ -package gq.unurled.raxen.components.items.custom.weapon; +package me.unurled.raxen.components.items.custom.weapon; import de.tr7zw.nbtapi.NBTItem; -import gq.unurled.raxen.Raxen; -import gq.unurled.raxen.components.items.custom.Item; import lombok.Getter; +import me.unurled.raxen.Raxen; +import me.unurled.raxen.components.items.custom.Item; import net.kyori.adventure.text.Component; import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; @@ -14,8 +14,8 @@ import org.bukkit.inventory.meta.ItemMeta; import java.util.ArrayList; import java.util.List; -import static gq.unurled.raxen.components.items.NBT.*; -import static gq.unurled.raxen.utils.Utils.colorTextComp; +import static me.unurled.raxen.components.items.NBT.*; +import static me.unurled.raxen.utils.Utils.colorTextComp; public class Dager implements Item { @Getter diff --git a/src/main/java/gq/unurled/raxen/components/lootchest/GUI.java b/src/main/java/me/unurled/raxen/components/lootchest/GUI.java similarity index 79% rename from src/main/java/gq/unurled/raxen/components/lootchest/GUI.java rename to src/main/java/me/unurled/raxen/components/lootchest/GUI.java index 0f2ae10..e801559 100644 --- a/src/main/java/gq/unurled/raxen/components/lootchest/GUI.java +++ b/src/main/java/me/unurled/raxen/components/lootchest/GUI.java @@ -1,8 +1,8 @@ -package gq.unurled.raxen.components.lootchest; +package me.unurled.raxen.components.lootchest; -import gq.unurled.raxen.Raxen; -import gq.unurled.raxen.manager.entity.PlayerManager; import lombok.Getter; +import me.unurled.raxen.Raxen; +import me.unurled.raxen.manager.entity.PlayerManager; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; diff --git a/src/main/java/gq/unurled/raxen/components/lootchest/loots/CustomLoot.java b/src/main/java/me/unurled/raxen/components/lootchest/loots/CustomLoot.java similarity index 87% rename from src/main/java/gq/unurled/raxen/components/lootchest/loots/CustomLoot.java rename to src/main/java/me/unurled/raxen/components/lootchest/loots/CustomLoot.java index d7741bb..8ccf362 100644 --- a/src/main/java/gq/unurled/raxen/components/lootchest/loots/CustomLoot.java +++ b/src/main/java/me/unurled/raxen/components/lootchest/loots/CustomLoot.java @@ -1,8 +1,8 @@ -package gq.unurled.raxen.components.lootchest.loots; +package me.unurled.raxen.components.lootchest.loots; import de.tr7zw.nbtapi.NBTItem; -import gq.unurled.raxen.Raxen; -import gq.unurled.raxen.components.items.NBT; +import me.unurled.raxen.Raxen; +import me.unurled.raxen.components.items.NBT; import org.bukkit.Location; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/gq/unurled/raxen/components/lootchest/loots/LootItem.java b/src/main/java/me/unurled/raxen/components/lootchest/loots/LootItem.java similarity index 93% rename from src/main/java/gq/unurled/raxen/components/lootchest/loots/LootItem.java rename to src/main/java/me/unurled/raxen/components/lootchest/loots/LootItem.java index 4123119..7b1bdfb 100644 --- a/src/main/java/gq/unurled/raxen/components/lootchest/loots/LootItem.java +++ b/src/main/java/me/unurled/raxen/components/lootchest/loots/LootItem.java @@ -1,4 +1,4 @@ -package gq.unurled.raxen.components.lootchest.loots; +package me.unurled.raxen.components.lootchest.loots; import org.bukkit.Location; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/gq/unurled/raxen/components/lootchest/loots/test/TestSword.java b/src/main/java/me/unurled/raxen/components/lootchest/loots/test/TestSword.java similarity index 67% rename from src/main/java/gq/unurled/raxen/components/lootchest/loots/test/TestSword.java rename to src/main/java/me/unurled/raxen/components/lootchest/loots/test/TestSword.java index da41a6d..8fc0033 100644 --- a/src/main/java/gq/unurled/raxen/components/lootchest/loots/test/TestSword.java +++ b/src/main/java/me/unurled/raxen/components/lootchest/loots/test/TestSword.java @@ -1,7 +1,7 @@ -package gq.unurled.raxen.components.lootchest.loots.test; +package me.unurled.raxen.components.lootchest.loots.test; -import gq.unurled.raxen.Raxen; -import gq.unurled.raxen.components.lootchest.loots.CustomLoot; +import me.unurled.raxen.Raxen; +import me.unurled.raxen.components.lootchest.loots.CustomLoot; public class TestSword extends CustomLoot { diff --git a/src/main/java/gq/unurled/raxen/components/resourcepack/ResourcePack.java b/src/main/java/me/unurled/raxen/components/resourcepack/ResourcePack.java similarity index 85% rename from src/main/java/gq/unurled/raxen/components/resourcepack/ResourcePack.java rename to src/main/java/me/unurled/raxen/components/resourcepack/ResourcePack.java index 74f8f90..4046b58 100644 --- a/src/main/java/gq/unurled/raxen/components/resourcepack/ResourcePack.java +++ b/src/main/java/me/unurled/raxen/components/resourcepack/ResourcePack.java @@ -1,7 +1,7 @@ -package gq.unurled.raxen.components.resourcepack; +package me.unurled.raxen.components.resourcepack; -import gq.unurled.raxen.Raxen; -import gq.unurled.raxen.manager.server.ResourcePackManager; +import me.unurled.raxen.Raxen; +import me.unurled.raxen.manager.server.ResourcePackManager; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitRunnable; diff --git a/src/main/java/gq/unurled/raxen/config/Config.java b/src/main/java/me/unurled/raxen/config/Config.java similarity index 91% rename from src/main/java/gq/unurled/raxen/config/Config.java rename to src/main/java/me/unurled/raxen/config/Config.java index 5eb0ce6..fa21369 100644 --- a/src/main/java/gq/unurled/raxen/config/Config.java +++ b/src/main/java/me/unurled/raxen/config/Config.java @@ -1,7 +1,7 @@ -package gq.unurled.raxen.config; +package me.unurled.raxen.config; -import gq.unurled.raxen.Raxen; import lombok.Getter; +import me.unurled.raxen.Raxen; import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; @@ -9,7 +9,7 @@ import org.bukkit.configuration.file.YamlConfiguration; import java.io.File; import java.io.IOException; -import static gq.unurled.raxen.utils.Utils.debug; +import static me.unurled.raxen.utils.Utils.debug; public class Config { private Raxen main; diff --git a/src/main/java/gq/unurled/raxen/config/PlayerConfig.java b/src/main/java/me/unurled/raxen/config/PlayerConfig.java similarity index 89% rename from src/main/java/gq/unurled/raxen/config/PlayerConfig.java rename to src/main/java/me/unurled/raxen/config/PlayerConfig.java index 40f1d5d..1dbfd95 100644 --- a/src/main/java/gq/unurled/raxen/config/PlayerConfig.java +++ b/src/main/java/me/unurled/raxen/config/PlayerConfig.java @@ -1,286 +1,286 @@ -package gq.unurled.raxen.config; - -import com.mongodb.client.MongoCollection; -import com.mongodb.client.model.Filters; -import gq.unurled.raxen.Raxen; -import gq.unurled.raxen.components.entity.Attributes.Attribute; -import gq.unurled.raxen.components.entity.player.Inventories; -import gq.unurled.raxen.components.entity.player.PlayerUtils; -import gq.unurled.raxen.components.entity.player.Storage; -import gq.unurled.raxen.components.entity.player.attributes.Attributes; -import gq.unurled.raxen.components.entity.player.storages.EnderChest; -import gq.unurled.raxen.manager.entity.PlayerManager; -import gq.unurled.raxen.manager.entity.StorageManager; -import gq.unurled.raxen.utils.Items; -import gq.unurled.raxen.utils.libs.MongoDB; -import net.kyori.adventure.text.Component; -import org.bson.Document; -import org.bukkit.Bukkit; -import org.bukkit.Material; -import org.bukkit.configuration.file.FileConfiguration; -import org.bukkit.entity.Player; -import org.bukkit.event.inventory.InventoryType; -import org.bukkit.inventory.Inventory; -import org.bukkit.inventory.ItemStack; -import org.bukkit.inventory.PlayerInventory; -import org.bukkit.scheduler.BukkitRunnable; -import org.jetbrains.annotations.NotNull; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -import static gq.unurled.raxen.utils.Items.*; -import static gq.unurled.raxen.utils.Utils.debug; - -public class PlayerConfig { - - private static Raxen main; - private MongoDB mongoDB; - private MongoCollection mongoCollection; - private static PlayerManager playerManager; - private static StorageManager sto; - private Attributes attributes; - - public PlayerConfig(Raxen main) { - this.main = main; - sto = main.getManager().getStorageManager(); - this.mongoDB = main.getManager().getLibsManager().getMongoDB(); - this.mongoCollection = mongoDB.getMongoCollection(); - playerManager = main.getManager().getPlayerManager(); - this.attributes = new Attributes(main); - } - - /** - * closes mongo connection - */ - public void close() { - mongoDB.close(); - } - - /** - * save players stuff to mongo db - * @param player - * @param attributes - * @param invstr - * @param reverse - */ - public void saveUsingMongoDB(@NotNull Player player, Attributes attributes, String invstr, Integer reverse) { - debug(main, "Saving " + player.getName() + "'s data!"); - Document doc = new Document("uuid", player.getUniqueId().toString()) - .append("name", player.getName()) - .append("inv", invstr); - HashMap attribute = main.getManager().getPlayerManager().getAttribute(); - for (String s : attribute.keySet()) { - debug("saving " + s); - doc.append(s, attribute.get(s).get(player)); - } - if (playerManager.getRaxenPlayer(player).getStorage() != null) { - if(playerManager.getRaxenPlayer(player).getStorage().getEc() != null) { - debug(main, "Saving " + player.getName() + "'s storage!"); - EnderChest ec = playerManager.getRaxenPlayer(player).getStorage().getEc(); - List list = new ArrayList(); - reverse = 0; - for(ItemStack it : ec.getEc()) { - if(it != null && it.getType() != Material.AIR) { - String s = Items.itemStackSerialize(it, reverse); - list.add(s); - } - reverse += 1; - } - String ecstr = Items.listItemStackSerialize(list); - doc.append("ec", ecstr); - } - } - Document playerDoc = mongoCollection.find(Filters.eq("uuid", player.getUniqueId().toString())).first(); - if(playerDoc == null) { - mongoCollection.insertOne(doc); - debug(main, "insert one"); - } - else { - mongoCollection.replaceOne(Filters.eq("uuid", player.getUniqueId().toString()), doc); - debug(main, "replace one"); - } - } - - /** - * save players stuff to yml - * @param player - * @param attributes - * @param invstr - * @param reverse - */ - public void saveUsingYml(Player player, Attributes attributes, String invstr, Integer reverse) { - FileConfiguration config = sto.createYml(player); - config.set("name", player.getName()); - HashMap attribute = main.getManager().getPlayerManager().getAttribute(); - for (String s : attribute.keySet()) { - config.set(s, attribute.get(s).get(player)); - } - config.set("inv", invstr); - if (playerManager.getRaxenPlayer(player).getStorage() != null) { - if(playerManager.getRaxenPlayer(player).getStorage().getEc() != null) { - EnderChest ec = playerManager.getRaxenPlayer(player).getStorage().getEc(); - List list = new ArrayList(); - reverse = 0; - for(ItemStack it : ec.getEc()) { - reverse += 1; - if(it != null) { - String s = Items.itemStackSerialize(it, reverse); - list.add(s); - } - } - String ecstr = Items.listItemStackSerialize(list); - config.set("ec", ecstr); - } - } - try { - config.save(main.getDataFolder() + "/playerInfo/" + player.getUniqueId() + "/" + "playerInfo.yml"); - } catch (IOException e) { - e.printStackTrace(); - } - } - - /** - * load player stuff from mongo db - * @param player - */ - public void loadUsingMongoDB(@NotNull Player player) { - Document playerDoc = mongoCollection.find(Filters.eq("uuid", player.getUniqueId().toString())).first(); - if(playerDoc == null) { - debug(main, "Intiatilising Data for Player: " + player.getName()); - playerManager.getRaxenPlayer(player).createNewAttribute(); - playerManager.getRaxenPlayer(player).createStorage(); - playerManager.getRaxenPlayer(player).createInventory(); - PlayerUtils.updateSkills(main, player); - return; - } - debug(main, "Loading " + player.getName() + "'s data!"); - attributes.setAttributes(player, playerDoc.getInteger("MAX_HEALTH"), playerDoc.getInteger("HEALTH"), playerDoc.getInteger("ITEM_HEALTH"), - playerDoc.getInteger("DEFENSE"), playerDoc.getInteger("ITEM_DEFENSE"), - playerDoc.getInteger("SPEED"), playerDoc.getInteger("ITEM_SPEED"), - playerDoc.getInteger("STRENGTH"), playerDoc.getInteger("ITEM_STRENGTH"), - playerDoc.getInteger("MAX_MANA"), playerDoc.getInteger("MANA"), playerDoc.getInteger("ITEM_MANA"), - playerDoc.getInteger("LUCK"), playerDoc.getInteger("ITEM_LUCK")); - Inventory ec = Bukkit.createInventory(null, 54, Component.text("Ender Chest")); - if(playerDoc.getString("ec") != null) { - debug(main, "Loading " + player.getName() + "'s storage."); - ec = setItemsToInventory(mapItemStackDeserialize(playerDoc.getString("ec")), ec); - } - playerManager.getRaxenPlayer(player).setStorage(ec); - PlayerInventory inv = player.getInventory(); - inv = setItemsToInventory(listItemStackDeserialize(playerDoc.getString("inv")), inv); - player.getInventory().setContents(inv.getContents()); - player.updateInventory(); - gq.unurled.raxen.components.entity.player.storages.Inventory invv = new gq.unurled.raxen.components.entity.player.storages.Inventory(inv); - Inventories invvv = new Inventories(invv); - playerManager.getRaxenPlayer(player).setInventory(inv); - PlayerUtils.updateSkills(main, player); - } - - /** - * load player stuff from yml - * @param player - * @throws IOException - */ - public void loadUsingYml(Player player) throws IOException { - FileConfiguration config = sto.createYml(player); - attributes.setAttributes(player, config.getInt("maxHealth"), config.getInt("health"), config.getInt("itemHealth"), - config.getInt("defense"), config.getInt("itemDefense"), - config.getInt("speed"), config.getInt("itemSpeed"), - config.getInt("strength"), config.getInt("itemStrength"), - config.getInt("maxMana"), config.getInt("mana"), config.getInt("itemMana"), - config.getInt("luck"), config.getInt("itemLuck")); - Inventory ec = Bukkit.createInventory(null, 54, Component.text("Ender Chest")); - if((String) config.get("ec") != null) { - ec = setItemsToInventory(mapItemStackDeserialize((String) config.get("ec")), ec); - } - EnderChest ecc = new EnderChest(ec); - Storage storage = new Storage(ecc); - playerManager.getRaxenPlayer(player).setStorage(ec); - PlayerInventory inv = (PlayerInventory) Bukkit.createInventory(player, InventoryType.PLAYER); - inv = setItemsToInventory(listItemStackDeserialize((String) config.getString("inv")), inv); - player.getInventory().setContents(inv.getContents()); - player.updateInventory(); - gq.unurled.raxen.components.entity.player.storages.Inventory invv = new gq.unurled.raxen.components.entity.player.storages.Inventory(inv); - Inventories invvv = new Inventories(invv); - playerManager.getRaxenPlayer(player).setInventory(inv); - } - - /** - * saves player stuff - * @param player - */ - public void savePlayerConfig(@NotNull Player player) { - Attributes attributes = new Attributes(main); - PlayerInventory inv = player.getInventory(); - - List listInv = new ArrayList(); - Integer reverse = 0; - for(ItemStack it : inv) { - reverse = reverse + 1; - if(it != null && it.getType() != Material.AIR) { - String s = Items.itemStackSerialize(it, reverse); - listInv.add(s); - } - } - String invstr= Items.itemStackSer(inv); - debug(main, "saving..."); - String storage = sto.getConfig().getString("storage"); - Integer finalReverse = reverse; - String finalInvstr = invstr; - new BukkitRunnable() { - @Override - public void run() { - saveUsingMongoDB(player, attributes, finalInvstr, finalReverse); - } - }.runTaskAsynchronously(main); - debug(main, "using mongo"); - if (storage == "MYSQL" || storage == "YML") { - String finalInvstr1 = invstr; - Integer finalReverse1 = reverse; - new BukkitRunnable() { - @Override - public void run() { - saveUsingYml(player, attributes, finalInvstr1, finalReverse1); - } - }.runTaskAsynchronously(main); - debug(main, "using yml"); - } - - debug(main, "Player: " + player.getName() + " data successfully saved!"); - } - - /** - * load player stuff - * @param player - */ - public void loadPlayerConfig(Player player) { - String st = StorageManager.getConfig().getString("storage"); - String value = ""; - if (st.equals("MONGODB")) { - new BukkitRunnable() { - @Override - public void run() { - loadUsingMongoDB(player); - } - }.runTaskAsynchronously(main); - value = "mongodb"; - } else { - value = "yml"; - new BukkitRunnable() { - @Override - public void run() { - try { - loadUsingYml(player); - } catch (IOException e) { - e.printStackTrace(); - } - } - }.runTaskAsynchronously(main); - } - debug(main, "Player: " + player.getName() + " data successfully loaded using " + value); - } - -} +package me.unurled.raxen.config; + +import com.mongodb.client.MongoCollection; +import com.mongodb.client.model.Filters; +import me.unurled.raxen.Raxen; +import me.unurled.raxen.components.entity.Attributes.Attribute; +import me.unurled.raxen.components.entity.player.Inventories; +import me.unurled.raxen.components.entity.player.PlayerUtils; +import me.unurled.raxen.components.entity.player.Storage; +import me.unurled.raxen.components.entity.player.attributes.Attributes; +import me.unurled.raxen.components.entity.player.storages.EnderChest; +import me.unurled.raxen.manager.entity.PlayerManager; +import me.unurled.raxen.manager.entity.StorageManager; +import me.unurled.raxen.utils.Items; +import me.unurled.raxen.utils.libs.MongoDB; +import net.kyori.adventure.text.Component; +import org.bson.Document; +import org.bukkit.Bukkit; +import org.bukkit.Material; +import org.bukkit.configuration.file.FileConfiguration; +import org.bukkit.entity.Player; +import org.bukkit.event.inventory.InventoryType; +import org.bukkit.inventory.Inventory; +import org.bukkit.inventory.ItemStack; +import org.bukkit.inventory.PlayerInventory; +import org.bukkit.scheduler.BukkitRunnable; +import org.jetbrains.annotations.NotNull; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + +import static me.unurled.raxen.utils.Items.*; +import static me.unurled.raxen.utils.Utils.debug; + +public class PlayerConfig { + + private static Raxen main; + private MongoDB mongoDB; + private MongoCollection mongoCollection; + private static PlayerManager playerManager; + private static StorageManager sto; + private Attributes attributes; + + public PlayerConfig(Raxen main) { + this.main = main; + sto = main.getManager().getStorageManager(); + this.mongoDB = main.getManager().getLibsManager().getMongoDB(); + this.mongoCollection = mongoDB.getMongoCollection(); + playerManager = main.getManager().getPlayerManager(); + this.attributes = new Attributes(main); + } + + /** + * closes mongo connection + */ + public void close() { + mongoDB.close(); + } + + /** + * save players stuff to mongo db + * @param player + * @param attributes + * @param invstr + * @param reverse + */ + public void saveUsingMongoDB(@NotNull Player player, Attributes attributes, String invstr, Integer reverse) { + debug(main, "Saving " + player.getName() + "'s data!"); + Document doc = new Document("uuid", player.getUniqueId().toString()) + .append("name", player.getName()) + .append("inv", invstr); + HashMap attribute = main.getManager().getPlayerManager().getAttribute(); + for (String s : attribute.keySet()) { + debug("saving " + s); + doc.append(s, attribute.get(s).get(player)); + } + if (playerManager.getRaxenPlayer(player).getStorage() != null) { + if(playerManager.getRaxenPlayer(player).getStorage().getEc() != null) { + debug(main, "Saving " + player.getName() + "'s storage!"); + EnderChest ec = playerManager.getRaxenPlayer(player).getStorage().getEc(); + List list = new ArrayList(); + reverse = 0; + for(ItemStack it : ec.getEc()) { + if(it != null && it.getType() != Material.AIR) { + String s = Items.itemStackSerialize(it, reverse); + list.add(s); + } + reverse += 1; + } + String ecstr = Items.listItemStackSerialize(list); + doc.append("ec", ecstr); + } + } + Document playerDoc = mongoCollection.find(Filters.eq("uuid", player.getUniqueId().toString())).first(); + if(playerDoc == null) { + mongoCollection.insertOne(doc); + debug(main, "insert one"); + } + else { + mongoCollection.replaceOne(Filters.eq("uuid", player.getUniqueId().toString()), doc); + debug(main, "replace one"); + } + } + + /** + * save players stuff to yml + * @param player + * @param attributes + * @param invstr + * @param reverse + */ + public void saveUsingYml(Player player, Attributes attributes, String invstr, Integer reverse) { + FileConfiguration config = sto.createYml(player); + config.set("name", player.getName()); + HashMap attribute = main.getManager().getPlayerManager().getAttribute(); + for (String s : attribute.keySet()) { + config.set(s, attribute.get(s).get(player)); + } + config.set("inv", invstr); + if (playerManager.getRaxenPlayer(player).getStorage() != null) { + if(playerManager.getRaxenPlayer(player).getStorage().getEc() != null) { + EnderChest ec = playerManager.getRaxenPlayer(player).getStorage().getEc(); + List list = new ArrayList(); + reverse = 0; + for(ItemStack it : ec.getEc()) { + reverse += 1; + if(it != null) { + String s = Items.itemStackSerialize(it, reverse); + list.add(s); + } + } + String ecstr = Items.listItemStackSerialize(list); + config.set("ec", ecstr); + } + } + try { + config.save(main.getDataFolder() + "/playerInfo/" + player.getUniqueId() + "/" + "playerInfo.yml"); + } catch (IOException e) { + e.printStackTrace(); + } + } + + /** + * load player stuff from mongo db + * @param player + */ + public void loadUsingMongoDB(@NotNull Player player) { + Document playerDoc = mongoCollection.find(Filters.eq("uuid", player.getUniqueId().toString())).first(); + if(playerDoc == null) { + debug(main, "Intiatilising Data for Player: " + player.getName()); + playerManager.getRaxenPlayer(player).createNewAttribute(); + playerManager.getRaxenPlayer(player).createStorage(); + playerManager.getRaxenPlayer(player).createInventory(); + PlayerUtils.updateSkills(main, player); + return; + } + debug(main, "Loading " + player.getName() + "'s data!"); + attributes.setAttributes(player, playerDoc.getInteger("MAX_HEALTH"), playerDoc.getInteger("HEALTH"), playerDoc.getInteger("ITEM_HEALTH"), + playerDoc.getInteger("DEFENSE"), playerDoc.getInteger("ITEM_DEFENSE"), + playerDoc.getInteger("SPEED"), playerDoc.getInteger("ITEM_SPEED"), + playerDoc.getInteger("STRENGTH"), playerDoc.getInteger("ITEM_STRENGTH"), + playerDoc.getInteger("MAX_MANA"), playerDoc.getInteger("MANA"), playerDoc.getInteger("ITEM_MANA"), + playerDoc.getInteger("LUCK"), playerDoc.getInteger("ITEM_LUCK")); + Inventory ec = Bukkit.createInventory(null, 54, Component.text("Ender Chest")); + if(playerDoc.getString("ec") != null) { + debug(main, "Loading " + player.getName() + "'s storage."); + ec = setItemsToInventory(mapItemStackDeserialize(playerDoc.getString("ec")), ec); + } + playerManager.getRaxenPlayer(player).setStorage(ec); + PlayerInventory inv = player.getInventory(); + inv = setItemsToInventory(listItemStackDeserialize(playerDoc.getString("inv")), inv); + player.getInventory().setContents(inv.getContents()); + player.updateInventory(); + me.unurled.raxen.components.entity.player.storages.Inventory invv = new me.unurled.raxen.components.entity.player.storages.Inventory(inv); + Inventories invvv = new Inventories(invv); + playerManager.getRaxenPlayer(player).setInventory(inv); + PlayerUtils.updateSkills(main, player); + } + + /** + * load player stuff from yml + * @param player + * @throws IOException + */ + public void loadUsingYml(Player player) throws IOException { + FileConfiguration config = sto.createYml(player); + attributes.setAttributes(player, config.getInt("maxHealth"), config.getInt("health"), config.getInt("itemHealth"), + config.getInt("defense"), config.getInt("itemDefense"), + config.getInt("speed"), config.getInt("itemSpeed"), + config.getInt("strength"), config.getInt("itemStrength"), + config.getInt("maxMana"), config.getInt("mana"), config.getInt("itemMana"), + config.getInt("luck"), config.getInt("itemLuck")); + Inventory ec = Bukkit.createInventory(null, 54, Component.text("Ender Chest")); + if((String) config.get("ec") != null) { + ec = setItemsToInventory(mapItemStackDeserialize((String) config.get("ec")), ec); + } + EnderChest ecc = new EnderChest(ec); + Storage storage = new Storage(ecc); + playerManager.getRaxenPlayer(player).setStorage(ec); + PlayerInventory inv = (PlayerInventory) Bukkit.createInventory(player, InventoryType.PLAYER); + inv = setItemsToInventory(listItemStackDeserialize((String) config.getString("inv")), inv); + player.getInventory().setContents(inv.getContents()); + player.updateInventory(); + me.unurled.raxen.components.entity.player.storages.Inventory invv = new me.unurled.raxen.components.entity.player.storages.Inventory(inv); + Inventories invvv = new Inventories(invv); + playerManager.getRaxenPlayer(player).setInventory(inv); + } + + /** + * saves player stuff + * @param player + */ + public void savePlayerConfig(@NotNull Player player) { + Attributes attributes = new Attributes(main); + PlayerInventory inv = player.getInventory(); + + List listInv = new ArrayList(); + Integer reverse = 0; + for(ItemStack it : inv) { + reverse = reverse + 1; + if(it != null && it.getType() != Material.AIR) { + String s = Items.itemStackSerialize(it, reverse); + listInv.add(s); + } + } + String invstr= Items.itemStackSer(inv); + debug(main, "saving..."); + String storage = sto.getConfig().getString("storage"); + Integer finalReverse = reverse; + String finalInvstr = invstr; + new BukkitRunnable() { + @Override + public void run() { + saveUsingMongoDB(player, attributes, finalInvstr, finalReverse); + } + }.runTaskAsynchronously(main); + debug(main, "using mongo"); + if (storage == "MYSQL" || storage == "YML") { + String finalInvstr1 = invstr; + Integer finalReverse1 = reverse; + new BukkitRunnable() { + @Override + public void run() { + saveUsingYml(player, attributes, finalInvstr1, finalReverse1); + } + }.runTaskAsynchronously(main); + debug(main, "using yml"); + } + + debug(main, "Player: " + player.getName() + " data successfully saved!"); + } + + /** + * load player stuff + * @param player + */ + public void loadPlayerConfig(Player player) { + String st = StorageManager.getConfig().getString("storage"); + String value = ""; + if (st.equals("MONGODB")) { + new BukkitRunnable() { + @Override + public void run() { + loadUsingMongoDB(player); + } + }.runTaskAsynchronously(main); + value = "mongodb"; + } else { + value = "yml"; + new BukkitRunnable() { + @Override + public void run() { + try { + loadUsingYml(player); + } catch (IOException e) { + e.printStackTrace(); + } + } + }.runTaskAsynchronously(main); + } + debug(main, "Player: " + player.getName() + " data successfully loaded using " + value); + } + +} diff --git a/src/main/java/gq/unurled/raxen/listener/entity/DamageEntity.java b/src/main/java/me/unurled/raxen/listener/entity/DamageEntity.java similarity index 91% rename from src/main/java/gq/unurled/raxen/listener/entity/DamageEntity.java rename to src/main/java/me/unurled/raxen/listener/entity/DamageEntity.java index 875d2eb..53b930f 100644 --- a/src/main/java/gq/unurled/raxen/listener/entity/DamageEntity.java +++ b/src/main/java/me/unurled/raxen/listener/entity/DamageEntity.java @@ -1,8 +1,8 @@ -package gq.unurled.raxen.listener.entity; +package me.unurled.raxen.listener.entity; -import gq.unurled.raxen.Raxen; -import gq.unurled.raxen.components.entity.other.EntityNamespacedKey; -import gq.unurled.raxen.manager.entity.PlayerManager; +import me.unurled.raxen.Raxen; +import me.unurled.raxen.components.entity.other.EntityNamespacedKey; +import me.unurled.raxen.manager.entity.PlayerManager; import org.bukkit.Bukkit; import org.bukkit.attribute.Attribute; import org.bukkit.entity.Entity; @@ -15,7 +15,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; import org.bukkit.persistence.PersistentDataContainer; import org.bukkit.persistence.PersistentDataType; -import static gq.unurled.raxen.utils.Utils.debug; +import static me.unurled.raxen.utils.Utils.debug; public class DamageEntity implements Listener { @@ -62,7 +62,7 @@ public class DamageEntity implements Listener { } if (e.getEntity() instanceof Player) { Player playerVictim = (Player) e.getEntity(); - gq.unurled.raxen.components.entity.player.attributes.Attributes attributes = new gq.unurled.raxen.components.entity.player.attributes.Attributes(main); + me.unurled.raxen.components.entity.player.attributes.Attributes attributes = new me.unurled.raxen.components.entity.player.attributes.Attributes(main); defense = pm.getDefense().get(playerVictim); health = pm.getHealth().get(playerVictim); itemDefense = pm.getItemDefense().get(playerVictim); @@ -103,7 +103,7 @@ public class DamageEntity implements Listener { } if (e.getEntity() instanceof Player) { Player playerVictim = (Player) e.getEntity(); - gq.unurled.raxen.components.entity.player.attributes.Attributes attributes = new gq.unurled.raxen.components.entity.player.attributes.Attributes(main); + me.unurled.raxen.components.entity.player.attributes.Attributes attributes = new me.unurled.raxen.components.entity.player.attributes.Attributes(main); pm.getHealth().set(playerVictim, health); playerVictim.setHealth(health.doubleValue()/5); } else { diff --git a/src/main/java/gq/unurled/raxen/listener/entity/SpawnEvent.java b/src/main/java/me/unurled/raxen/listener/entity/SpawnEvent.java similarity index 85% rename from src/main/java/gq/unurled/raxen/listener/entity/SpawnEvent.java rename to src/main/java/me/unurled/raxen/listener/entity/SpawnEvent.java index f20ac96..d582d8f 100644 --- a/src/main/java/gq/unurled/raxen/listener/entity/SpawnEvent.java +++ b/src/main/java/me/unurled/raxen/listener/entity/SpawnEvent.java @@ -1,8 +1,8 @@ -package gq.unurled.raxen.listener.entity; +package me.unurled.raxen.listener.entity; -import gq.unurled.raxen.Raxen; -import gq.unurled.raxen.components.entity.other.EntityNamespacedKey; -import gq.unurled.raxen.components.entity.other.EntityUtils; +import me.unurled.raxen.Raxen; +import me.unurled.raxen.components.entity.other.EntityNamespacedKey; +import me.unurled.raxen.components.entity.other.EntityUtils; import org.bukkit.entity.EntityType; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; @@ -11,7 +11,7 @@ import org.bukkit.event.Listener; import org.bukkit.event.entity.EntitySpawnEvent; import org.bukkit.persistence.PersistentDataType; -import static gq.unurled.raxen.utils.Utils.debug; +import static me.unurled.raxen.utils.Utils.debug; public class SpawnEvent implements Listener { diff --git a/src/main/java/gq/unurled/raxen/listener/player/ArmorEvent.java b/src/main/java/me/unurled/raxen/listener/player/ArmorEvent.java similarity index 90% rename from src/main/java/gq/unurled/raxen/listener/player/ArmorEvent.java rename to src/main/java/me/unurled/raxen/listener/player/ArmorEvent.java index 2621171..a8c3e70 100644 --- a/src/main/java/gq/unurled/raxen/listener/player/ArmorEvent.java +++ b/src/main/java/me/unurled/raxen/listener/player/ArmorEvent.java @@ -1,11 +1,11 @@ -package gq.unurled.raxen.listener.player; +package me.unurled.raxen.listener.player; import com.destroystokyo.paper.event.player.PlayerArmorChangeEvent; import de.tr7zw.nbtapi.NBTItem; -import gq.unurled.raxen.Raxen; -import gq.unurled.raxen.components.entity.player.PlayerUtils; -import gq.unurled.raxen.components.entity.player.attributes.Attributes; -import gq.unurled.raxen.manager.entity.PlayerManager; +import me.unurled.raxen.Raxen; +import me.unurled.raxen.components.entity.player.PlayerUtils; +import me.unurled.raxen.components.entity.player.attributes.Attributes; +import me.unurled.raxen.manager.entity.PlayerManager; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Entity; diff --git a/src/main/java/gq/unurled/raxen/listener/player/ClickBlockEvent.java b/src/main/java/me/unurled/raxen/listener/player/ClickBlockEvent.java similarity index 89% rename from src/main/java/gq/unurled/raxen/listener/player/ClickBlockEvent.java rename to src/main/java/me/unurled/raxen/listener/player/ClickBlockEvent.java index f1d8082..f7b442c 100644 --- a/src/main/java/gq/unurled/raxen/listener/player/ClickBlockEvent.java +++ b/src/main/java/me/unurled/raxen/listener/player/ClickBlockEvent.java @@ -1,7 +1,7 @@ -package gq.unurled.raxen.listener.player; +package me.unurled.raxen.listener.player; -import gq.unurled.raxen.Raxen; -import gq.unurled.raxen.components.lootchest.GUI; +import me.unurled.raxen.Raxen; +import me.unurled.raxen.components.lootchest.GUI; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.entity.Player; diff --git a/src/main/java/gq/unurled/raxen/listener/player/CloseInventoryEvent.java b/src/main/java/me/unurled/raxen/listener/player/CloseInventoryEvent.java similarity index 83% rename from src/main/java/gq/unurled/raxen/listener/player/CloseInventoryEvent.java rename to src/main/java/me/unurled/raxen/listener/player/CloseInventoryEvent.java index 2a37949..386a0bb 100644 --- a/src/main/java/gq/unurled/raxen/listener/player/CloseInventoryEvent.java +++ b/src/main/java/me/unurled/raxen/listener/player/CloseInventoryEvent.java @@ -1,7 +1,7 @@ -package gq.unurled.raxen.listener.player; +package me.unurled.raxen.listener.player; -import gq.unurled.raxen.Raxen; -import gq.unurled.raxen.manager.entity.PlayerManager; +import me.unurled.raxen.Raxen; +import me.unurled.raxen.manager.entity.PlayerManager; import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.entity.Player; @@ -9,7 +9,7 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.inventory.InventoryCloseEvent; -import static gq.unurled.raxen.utils.Utils.log; +import static me.unurled.raxen.utils.Utils.log; public class CloseInventoryEvent implements Listener { diff --git a/src/main/java/gq/unurled/raxen/listener/player/ItemHandEvent.java b/src/main/java/me/unurled/raxen/listener/player/ItemHandEvent.java similarity index 90% rename from src/main/java/gq/unurled/raxen/listener/player/ItemHandEvent.java rename to src/main/java/me/unurled/raxen/listener/player/ItemHandEvent.java index 136bcf2..5edb79b 100644 --- a/src/main/java/gq/unurled/raxen/listener/player/ItemHandEvent.java +++ b/src/main/java/me/unurled/raxen/listener/player/ItemHandEvent.java @@ -1,10 +1,10 @@ -package gq.unurled.raxen.listener.player; +package me.unurled.raxen.listener.player; import de.tr7zw.nbtapi.NBTItem; -import gq.unurled.raxen.Raxen; -import gq.unurled.raxen.components.entity.player.PlayerUtils; -import gq.unurled.raxen.components.entity.player.attributes.Attributes; -import gq.unurled.raxen.manager.entity.PlayerManager; +import me.unurled.raxen.Raxen; +import me.unurled.raxen.components.entity.player.PlayerUtils; +import me.unurled.raxen.components.entity.player.attributes.Attributes; +import me.unurled.raxen.manager.entity.PlayerManager; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Entity; diff --git a/src/main/java/gq/unurled/raxen/listener/player/JoinEvent.java b/src/main/java/me/unurled/raxen/listener/player/JoinEvent.java similarity index 77% rename from src/main/java/gq/unurled/raxen/listener/player/JoinEvent.java rename to src/main/java/me/unurled/raxen/listener/player/JoinEvent.java index cbb2a6b..7227c11 100644 --- a/src/main/java/gq/unurled/raxen/listener/player/JoinEvent.java +++ b/src/main/java/me/unurled/raxen/listener/player/JoinEvent.java @@ -1,43 +1,43 @@ -package gq.unurled.raxen.listener.player; - -import gq.unurled.raxen.Raxen; -import gq.unurled.raxen.components.entity.player.Scoreboard; -import gq.unurled.raxen.components.resourcepack.ResourcePack; -import gq.unurled.raxen.config.PlayerConfig; -import gq.unurled.raxen.manager.entity.PlayerManager; -import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; -import org.bukkit.event.player.PlayerJoinEvent; - -public class JoinEvent implements Listener { - - private Raxen main; - private PlayerConfig playerConfig; - private Scoreboard scoreboard; - private ResourcePack resourcePack; - private PlayerManager playerManager; - - public JoinEvent(Raxen main) { - this.main = main; - this.playerConfig = main.getPlayerConfig(); - this.scoreboard = new Scoreboard(main); - this.resourcePack = main.getManager().getResourcePackManager().getResourcePack(); - this.playerManager = main.getManager().getPlayerManager(); - } - - /** - * when player joins, load from config all stats - * @param e - */ - @EventHandler - public void PlayerJoinEvent(PlayerJoinEvent e) { - Player player = e.getPlayer(); - playerConfig.loadPlayerConfig(player); - scoreboard.createScorebord(player); - resourcePack.join(player); - playerManager.getRaxenPlayer(player).isRaxenPlayer(true); - playerManager.registerActionBar(player); - } - -} +package me.unurled.raxen.listener.player; + +import me.unurled.raxen.Raxen; +import me.unurled.raxen.components.entity.player.Scoreboard; +import me.unurled.raxen.components.resourcepack.ResourcePack; +import me.unurled.raxen.config.PlayerConfig; +import me.unurled.raxen.manager.entity.PlayerManager; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.player.PlayerJoinEvent; + +public class JoinEvent implements Listener { + + private Raxen main; + private PlayerConfig playerConfig; + private Scoreboard scoreboard; + private ResourcePack resourcePack; + private PlayerManager playerManager; + + public JoinEvent(Raxen main) { + this.main = main; + this.playerConfig = main.getPlayerConfig(); + this.scoreboard = new Scoreboard(main); + this.resourcePack = main.getManager().getResourcePackManager().getResourcePack(); + this.playerManager = main.getManager().getPlayerManager(); + } + + /** + * when player joins, load from config all stats + * @param e + */ + @EventHandler + public void PlayerJoinEvent(PlayerJoinEvent e) { + Player player = e.getPlayer(); + playerConfig.loadPlayerConfig(player); + scoreboard.createScorebord(player); + resourcePack.join(player); + playerManager.getRaxenPlayer(player).isRaxenPlayer(true); + playerManager.registerActionBar(player); + } + +} diff --git a/src/main/java/gq/unurled/raxen/listener/player/LeaveEvent.java b/src/main/java/me/unurled/raxen/listener/player/LeaveEvent.java similarity index 81% rename from src/main/java/gq/unurled/raxen/listener/player/LeaveEvent.java rename to src/main/java/me/unurled/raxen/listener/player/LeaveEvent.java index 3eb4281..4f6cf22 100644 --- a/src/main/java/gq/unurled/raxen/listener/player/LeaveEvent.java +++ b/src/main/java/me/unurled/raxen/listener/player/LeaveEvent.java @@ -1,36 +1,36 @@ -package gq.unurled.raxen.listener.player; - -import gq.unurled.raxen.Raxen; -import gq.unurled.raxen.config.PlayerConfig; -import gq.unurled.raxen.manager.entity.PlayerManager; -import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; -import org.bukkit.event.player.PlayerQuitEvent; - -import java.io.IOException; - -public class LeaveEvent implements Listener { - - private final PlayerConfig playerConfig; - private PlayerManager playerManager; - - public LeaveEvent(Raxen main) { - this.playerConfig = main.getPlayerConfig(); - this.playerManager = main.getManager().getPlayerManager(); - - } - - /** - * when player leaves, saves everything - * @param e - * @throws IOException - */ - @EventHandler - public void PlayerLeaveEvent(PlayerQuitEvent e) throws IOException { - Player player = e.getPlayer(); - playerConfig.savePlayerConfig(player); - playerManager.getRaxenPlayer(player).isRaxenPlayer(false); - playerManager.unRegisterActionBar(player); - } -} +package me.unurled.raxen.listener.player; + +import me.unurled.raxen.Raxen; +import me.unurled.raxen.config.PlayerConfig; +import me.unurled.raxen.manager.entity.PlayerManager; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.player.PlayerQuitEvent; + +import java.io.IOException; + +public class LeaveEvent implements Listener { + + private final PlayerConfig playerConfig; + private PlayerManager playerManager; + + public LeaveEvent(Raxen main) { + this.playerConfig = main.getPlayerConfig(); + this.playerManager = main.getManager().getPlayerManager(); + + } + + /** + * when player leaves, saves everything + * @param e + * @throws IOException + */ + @EventHandler + public void PlayerLeaveEvent(PlayerQuitEvent e) throws IOException { + Player player = e.getPlayer(); + playerConfig.savePlayerConfig(player); + playerManager.getRaxenPlayer(player).isRaxenPlayer(false); + playerManager.unRegisterActionBar(player); + } +} diff --git a/src/main/java/gq/unurled/raxen/listener/player/PortalEvent.java b/src/main/java/me/unurled/raxen/listener/player/PortalEvent.java similarity index 73% rename from src/main/java/gq/unurled/raxen/listener/player/PortalEvent.java rename to src/main/java/me/unurled/raxen/listener/player/PortalEvent.java index dbd56f4..bf12557 100644 --- a/src/main/java/gq/unurled/raxen/listener/player/PortalEvent.java +++ b/src/main/java/me/unurled/raxen/listener/player/PortalEvent.java @@ -1,14 +1,14 @@ -package gq.unurled.raxen.listener.player; +package me.unurled.raxen.listener.player; -import gq.unurled.raxen.components.dungeons.Gate; +import me.unurled.raxen.components.dungeons.Gate; import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.entity.EntityPortalEnterEvent; -import static gq.unurled.raxen.utils.DungeonUtils.isInRange; -import static gq.unurled.raxen.utils.DungeonUtils.whichIsInRange; +import static me.unurled.raxen.utils.DungeonUtils.isInRange; +import static me.unurled.raxen.utils.DungeonUtils.whichIsInRange; public class PortalEvent implements Listener { diff --git a/src/main/java/gq/unurled/raxen/listener/player/ServerPingEvent.java b/src/main/java/me/unurled/raxen/listener/player/ServerPingEvent.java similarity index 87% rename from src/main/java/gq/unurled/raxen/listener/player/ServerPingEvent.java rename to src/main/java/me/unurled/raxen/listener/player/ServerPingEvent.java index 56e6667..f79ee49 100644 --- a/src/main/java/gq/unurled/raxen/listener/player/ServerPingEvent.java +++ b/src/main/java/me/unurled/raxen/listener/player/ServerPingEvent.java @@ -1,14 +1,14 @@ -package gq.unurled.raxen.listener.player; +package me.unurled.raxen.listener.player; -import gq.unurled.raxen.Raxen; import lombok.Getter; import lombok.Setter; +import me.unurled.raxen.Raxen; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.server.ServerListPingEvent; -import static gq.unurled.raxen.utils.Utils.colorTextComp; +import static me.unurled.raxen.utils.Utils.colorTextComp; public class ServerPingEvent implements Listener { diff --git a/src/main/java/gq/unurled/raxen/listener/player/TransactionEvent.java b/src/main/java/me/unurled/raxen/listener/player/TransactionEvent.java similarity index 83% rename from src/main/java/gq/unurled/raxen/listener/player/TransactionEvent.java rename to src/main/java/me/unurled/raxen/listener/player/TransactionEvent.java index a107d59..f0d1896 100644 --- a/src/main/java/gq/unurled/raxen/listener/player/TransactionEvent.java +++ b/src/main/java/me/unurled/raxen/listener/player/TransactionEvent.java @@ -1,8 +1,8 @@ -package gq.unurled.raxen.listener.player; +package me.unurled.raxen.listener.player; -import gq.unurled.raxen.Raxen; -import gq.unurled.raxen.components.entity.player.Scoreboard; -import gq.unurled.raxen.utils.libs.Vault; +import me.unurled.raxen.Raxen; +import me.unurled.raxen.components.entity.player.Scoreboard; +import me.unurled.raxen.utils.libs.Vault; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/src/main/java/gq/unurled/raxen/manager/Manager.java b/src/main/java/me/unurled/raxen/manager/Manager.java similarity index 88% rename from src/main/java/gq/unurled/raxen/manager/Manager.java rename to src/main/java/me/unurled/raxen/manager/Manager.java index 992ca8e..a02bf53 100644 --- a/src/main/java/gq/unurled/raxen/manager/Manager.java +++ b/src/main/java/me/unurled/raxen/manager/Manager.java @@ -1,10 +1,10 @@ -package gq.unurled.raxen.manager; +package me.unurled.raxen.manager; -import gq.unurled.raxen.Raxen; -import gq.unurled.raxen.manager.entity.*; -import gq.unurled.raxen.manager.server.*; -import gq.unurled.raxen.utils.libs.Multiverse; import lombok.Getter; +import me.unurled.raxen.Raxen; +import me.unurled.raxen.manager.entity.*; +import me.unurled.raxen.manager.server.*; +import me.unurled.raxen.utils.libs.Multiverse; /** * Manager class, it enables all features of the plugin. diff --git a/src/main/java/gq/unurled/raxen/manager/entity/EntityManager.java b/src/main/java/me/unurled/raxen/manager/entity/EntityManager.java similarity index 85% rename from src/main/java/gq/unurled/raxen/manager/entity/EntityManager.java rename to src/main/java/me/unurled/raxen/manager/entity/EntityManager.java index bbc8569..66b162c 100644 --- a/src/main/java/gq/unurled/raxen/manager/entity/EntityManager.java +++ b/src/main/java/me/unurled/raxen/manager/entity/EntityManager.java @@ -1,8 +1,8 @@ -package gq.unurled.raxen.manager.entity; +package me.unurled.raxen.manager.entity; -import gq.unurled.raxen.Raxen; import lombok.Getter; import lombok.Setter; +import me.unurled.raxen.Raxen; import org.bukkit.Bukkit; import org.bukkit.World; import org.bukkit.configuration.file.FileConfiguration; @@ -14,7 +14,7 @@ import java.util.HashMap; import java.util.List; import java.util.UUID; -import static gq.unurled.raxen.utils.Utils.debug; +import static me.unurled.raxen.utils.Utils.debug; public class EntityManager { @@ -24,7 +24,7 @@ public class EntityManager { @Setter public List list = new ArrayList<>(); - public HashMap entities = new HashMap<>(); + public HashMap entities = new HashMap<>(); public HashMap livingEntities = new HashMap<>(); diff --git a/src/main/java/gq/unurled/raxen/manager/entity/ItemManager.java b/src/main/java/me/unurled/raxen/manager/entity/ItemManager.java similarity index 92% rename from src/main/java/gq/unurled/raxen/manager/entity/ItemManager.java rename to src/main/java/me/unurled/raxen/manager/entity/ItemManager.java index e74632e..df7bad2 100644 --- a/src/main/java/gq/unurled/raxen/manager/entity/ItemManager.java +++ b/src/main/java/me/unurled/raxen/manager/entity/ItemManager.java @@ -1,11 +1,11 @@ -package gq.unurled.raxen.manager.entity; +package me.unurled.raxen.manager.entity; import de.tr7zw.nbtapi.NBTItem; -import gq.unurled.raxen.Raxen; -import gq.unurled.raxen.components.items.NBT; -import gq.unurled.raxen.components.items.custom.Item; -import gq.unurled.raxen.utils.Utils; import lombok.Getter; +import me.unurled.raxen.Raxen; +import me.unurled.raxen.components.items.NBT; +import me.unurled.raxen.components.items.custom.Item; +import me.unurled.raxen.utils.Utils; import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.Material; @@ -23,7 +23,7 @@ import java.util.List; import java.util.Objects; import java.util.stream.Collectors; -import static gq.unurled.raxen.utils.Utils.*; +import static me.unurled.raxen.utils.Utils.*; public class ItemManager { @@ -42,7 +42,7 @@ public class ItemManager { * register manually all item in Raxen */ private void registerItem() { - gq.unurled.raxen.components.items.custom.List lisst = new gq.unurled.raxen.components.items.custom.List(main); + me.unurled.raxen.components.items.custom.List lisst = new me.unurled.raxen.components.items.custom.List(main); for (Item items : lisst.getItems()) { items.registerItem(main); } diff --git a/src/main/java/gq/unurled/raxen/manager/entity/LootManager.java b/src/main/java/me/unurled/raxen/manager/entity/LootManager.java similarity index 62% rename from src/main/java/gq/unurled/raxen/manager/entity/LootManager.java rename to src/main/java/me/unurled/raxen/manager/entity/LootManager.java index 19d71dd..7e87bbc 100644 --- a/src/main/java/gq/unurled/raxen/manager/entity/LootManager.java +++ b/src/main/java/me/unurled/raxen/manager/entity/LootManager.java @@ -1,8 +1,8 @@ -package gq.unurled.raxen.manager.entity; +package me.unurled.raxen.manager.entity; -import gq.unurled.raxen.Raxen; -import gq.unurled.raxen.components.lootchest.loots.LootItem; import lombok.Getter; +import me.unurled.raxen.Raxen; +import me.unurled.raxen.components.lootchest.loots.LootItem; import java.util.List; diff --git a/src/main/java/gq/unurled/raxen/manager/entity/PlayerManager.java b/src/main/java/me/unurled/raxen/manager/entity/PlayerManager.java similarity index 92% rename from src/main/java/gq/unurled/raxen/manager/entity/PlayerManager.java rename to src/main/java/me/unurled/raxen/manager/entity/PlayerManager.java index 7b167b5..0cd30f0 100644 --- a/src/main/java/gq/unurled/raxen/manager/entity/PlayerManager.java +++ b/src/main/java/me/unurled/raxen/manager/entity/PlayerManager.java @@ -1,11 +1,11 @@ -package gq.unurled.raxen.manager.entity; +package me.unurled.raxen.manager.entity; -import gq.unurled.raxen.Raxen; -import gq.unurled.raxen.components.entity.Attributes.*; -import gq.unurled.raxen.components.entity.other.EntityNamespacedKey; -import gq.unurled.raxen.components.entity.player.RaxenPlayer; -import gq.unurled.raxen.components.entity.player.classes.Class; import lombok.Getter; +import me.unurled.raxen.Raxen; +import me.unurled.raxen.components.entity.Attributes.*; +import me.unurled.raxen.components.entity.other.EntityNamespacedKey; +import me.unurled.raxen.components.entity.player.RaxenPlayer; +import me.unurled.raxen.components.entity.player.classes.Class; import net.kyori.adventure.text.Component; import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitRunnable; @@ -20,7 +20,7 @@ public class PlayerManager { private HashMap actionBar = new HashMap<>(); private HashMap classes = new HashMap<>(); @Getter - private HashMap attribute = new HashMap<>(); + private HashMap attribute = new HashMap<>(); // Attributes private Defense defense; @@ -103,7 +103,7 @@ public class PlayerManager { } /** - * register all Attributes in gq.unurled.raxen.components.entity.Attributes; + * register all Attributes in me.unurled.raxen.components.entity.Attributes; */ public void registerAttributes() { EntityNamespacedKey key = new EntityNamespacedKey(main); diff --git a/src/main/java/gq/unurled/raxen/manager/entity/StorageManager.java b/src/main/java/me/unurled/raxen/manager/entity/StorageManager.java similarity index 95% rename from src/main/java/gq/unurled/raxen/manager/entity/StorageManager.java rename to src/main/java/me/unurled/raxen/manager/entity/StorageManager.java index dc0fcf4..6608f77 100644 --- a/src/main/java/gq/unurled/raxen/manager/entity/StorageManager.java +++ b/src/main/java/me/unurled/raxen/manager/entity/StorageManager.java @@ -1,9 +1,9 @@ -package gq.unurled.raxen.manager.entity; +package me.unurled.raxen.manager.entity; -import gq.unurled.raxen.Raxen; -import gq.unurled.raxen.utils.libs.MongoDB; -import gq.unurled.raxen.utils.libs.Mysql; import lombok.Getter; +import me.unurled.raxen.Raxen; +import me.unurled.raxen.utils.libs.MongoDB; +import me.unurled.raxen.utils.libs.Mysql; import org.bukkit.Bukkit; import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.FileConfiguration; @@ -14,8 +14,8 @@ import org.jetbrains.annotations.NotNull; import java.io.File; import java.io.IOException; -import static gq.unurled.raxen.utils.Utils.debug; -import static gq.unurled.raxen.utils.Utils.error; +import static me.unurled.raxen.utils.Utils.debug; +import static me.unurled.raxen.utils.Utils.error; public class StorageManager { diff --git a/src/main/java/gq/unurled/raxen/manager/server/CommandManager.java b/src/main/java/me/unurled/raxen/manager/server/CommandManager.java similarity index 87% rename from src/main/java/gq/unurled/raxen/manager/server/CommandManager.java rename to src/main/java/me/unurled/raxen/manager/server/CommandManager.java index 42b0754..43cca01 100644 --- a/src/main/java/gq/unurled/raxen/manager/server/CommandManager.java +++ b/src/main/java/me/unurled/raxen/manager/server/CommandManager.java @@ -1,13 +1,13 @@ -package gq.unurled.raxen.manager.server; +package me.unurled.raxen.manager.server; -import gq.unurled.raxen.Raxen; -import gq.unurled.raxen.commands.RaxenCommand; -import gq.unurled.raxen.commands.admin.*; -import gq.unurled.raxen.commands.player.ClassCommand; -import gq.unurled.raxen.commands.player.MainGuiCommand; -import gq.unurled.raxen.commands.player.SkillsCommand; -import gq.unurled.raxen.commands.player.StorageCommand; import lombok.Getter; +import me.unurled.raxen.Raxen; +import me.unurled.raxen.commands.RaxenCommand; +import me.unurled.raxen.commands.admin.*; +import me.unurled.raxen.commands.player.ClassCommand; +import me.unurled.raxen.commands.player.MainGuiCommand; +import me.unurled.raxen.commands.player.SkillsCommand; +import me.unurled.raxen.commands.player.StorageCommand; public class CommandManager { diff --git a/src/main/java/gq/unurled/raxen/manager/server/DungeonsManager.java b/src/main/java/me/unurled/raxen/manager/server/DungeonsManager.java similarity index 79% rename from src/main/java/gq/unurled/raxen/manager/server/DungeonsManager.java rename to src/main/java/me/unurled/raxen/manager/server/DungeonsManager.java index 223d496..54edf1b 100644 --- a/src/main/java/gq/unurled/raxen/manager/server/DungeonsManager.java +++ b/src/main/java/me/unurled/raxen/manager/server/DungeonsManager.java @@ -1,9 +1,9 @@ -package gq.unurled.raxen.manager.server; +package me.unurled.raxen.manager.server; -import gq.unurled.raxen.Raxen; -import gq.unurled.raxen.components.dungeons.Dungeon; -import gq.unurled.raxen.components.dungeons.Gate; -import gq.unurled.raxen.components.dungeons.types.forest.ForestDungeon; +import me.unurled.raxen.Raxen; +import me.unurled.raxen.components.dungeons.Dungeon; +import me.unurled.raxen.components.dungeons.Gate; +import me.unurled.raxen.components.dungeons.types.forest.ForestDungeon; import org.bukkit.Location; import java.util.HashMap; diff --git a/src/main/java/gq/unurled/raxen/manager/server/EnchantmentManager.java b/src/main/java/me/unurled/raxen/manager/server/EnchantmentManager.java similarity index 93% rename from src/main/java/gq/unurled/raxen/manager/server/EnchantmentManager.java rename to src/main/java/me/unurled/raxen/manager/server/EnchantmentManager.java index 91caadb..483ac17 100644 --- a/src/main/java/gq/unurled/raxen/manager/server/EnchantmentManager.java +++ b/src/main/java/me/unurled/raxen/manager/server/EnchantmentManager.java @@ -1,4 +1,4 @@ -package gq.unurled.raxen.manager.server; +package me.unurled.raxen.manager.server; import org.bukkit.enchantments.Enchantment; diff --git a/src/main/java/gq/unurled/raxen/manager/server/LibsManager.java b/src/main/java/me/unurled/raxen/manager/server/LibsManager.java similarity index 87% rename from src/main/java/gq/unurled/raxen/manager/server/LibsManager.java rename to src/main/java/me/unurled/raxen/manager/server/LibsManager.java index e01b9d9..203795d 100644 --- a/src/main/java/gq/unurled/raxen/manager/server/LibsManager.java +++ b/src/main/java/me/unurled/raxen/manager/server/LibsManager.java @@ -1,8 +1,8 @@ -package gq.unurled.raxen.manager.server; +package me.unurled.raxen.manager.server; -import gq.unurled.raxen.Raxen; -import gq.unurled.raxen.utils.libs.*; import lombok.Getter; +import me.unurled.raxen.Raxen; +import me.unurled.raxen.utils.libs.*; public class LibsManager { @Getter diff --git a/src/main/java/gq/unurled/raxen/manager/server/ListenerManager.java b/src/main/java/me/unurled/raxen/manager/server/ListenerManager.java similarity index 82% rename from src/main/java/gq/unurled/raxen/manager/server/ListenerManager.java rename to src/main/java/me/unurled/raxen/manager/server/ListenerManager.java index 322ae54..a99b93f 100644 --- a/src/main/java/gq/unurled/raxen/manager/server/ListenerManager.java +++ b/src/main/java/me/unurled/raxen/manager/server/ListenerManager.java @@ -1,11 +1,11 @@ -package gq.unurled.raxen.manager.server; +package me.unurled.raxen.manager.server; -import gq.unurled.raxen.Raxen; -import gq.unurled.raxen.listener.entity.DamageEntity; -import gq.unurled.raxen.listener.entity.SpawnEvent; -import gq.unurled.raxen.listener.player.*; -import gq.unurled.raxen.utils.Reload; import lombok.Getter; +import me.unurled.raxen.Raxen; +import me.unurled.raxen.listener.entity.DamageEntity; +import me.unurled.raxen.listener.entity.SpawnEvent; +import me.unurled.raxen.listener.player.*; +import me.unurled.raxen.utils.Reload; import org.bukkit.plugin.PluginManager; public class ListenerManager { diff --git a/src/main/java/gq/unurled/raxen/manager/server/ProtocolManager.java b/src/main/java/me/unurled/raxen/manager/server/ProtocolManager.java similarity index 92% rename from src/main/java/gq/unurled/raxen/manager/server/ProtocolManager.java rename to src/main/java/me/unurled/raxen/manager/server/ProtocolManager.java index 1fef008..f411392 100644 --- a/src/main/java/gq/unurled/raxen/manager/server/ProtocolManager.java +++ b/src/main/java/me/unurled/raxen/manager/server/ProtocolManager.java @@ -1,11 +1,11 @@ -package gq.unurled.raxen.manager.server; +package me.unurled.raxen.manager.server; import com.comphenix.protocol.PacketType; import com.comphenix.protocol.events.ListenerPriority; import com.comphenix.protocol.events.PacketAdapter; import com.comphenix.protocol.events.PacketContainer; import com.comphenix.protocol.events.PacketEvent; -import gq.unurled.raxen.Raxen; +import me.unurled.raxen.Raxen; import org.bukkit.entity.Player; public class ProtocolManager { diff --git a/src/main/java/gq/unurled/raxen/manager/server/ResourcePackManager.java b/src/main/java/me/unurled/raxen/manager/server/ResourcePackManager.java similarity index 86% rename from src/main/java/gq/unurled/raxen/manager/server/ResourcePackManager.java rename to src/main/java/me/unurled/raxen/manager/server/ResourcePackManager.java index 758e6f0..169f190 100644 --- a/src/main/java/gq/unurled/raxen/manager/server/ResourcePackManager.java +++ b/src/main/java/me/unurled/raxen/manager/server/ResourcePackManager.java @@ -1,14 +1,14 @@ -package gq.unurled.raxen.manager.server; +package me.unurled.raxen.manager.server; -import gq.unurled.raxen.Raxen; -import gq.unurled.raxen.components.resourcepack.ResourcePack; import lombok.Getter; +import me.unurled.raxen.Raxen; +import me.unurled.raxen.components.resourcepack.ResourcePack; import org.bukkit.configuration.file.FileConfiguration; import java.util.Objects; -import static gq.unurled.raxen.utils.Utils.debug; -import static gq.unurled.raxen.utils.Utils.error; +import static me.unurled.raxen.utils.Utils.debug; +import static me.unurled.raxen.utils.Utils.error; public class ResourcePackManager { diff --git a/src/main/java/gq/unurled/raxen/manager/server/WorldManager.java b/src/main/java/me/unurled/raxen/manager/server/WorldManager.java similarity index 96% rename from src/main/java/gq/unurled/raxen/manager/server/WorldManager.java rename to src/main/java/me/unurled/raxen/manager/server/WorldManager.java index 4705979..d49213f 100644 --- a/src/main/java/gq/unurled/raxen/manager/server/WorldManager.java +++ b/src/main/java/me/unurled/raxen/manager/server/WorldManager.java @@ -1,8 +1,8 @@ -package gq.unurled.raxen.manager.server; +package me.unurled.raxen.manager.server; import com.onarandombox.MultiverseCore.api.MVWorldManager; import com.onarandombox.MultiverseCore.api.MultiverseWorld; -import gq.unurled.raxen.Raxen; +import me.unurled.raxen.Raxen; import org.bukkit.World; import java.io.File; @@ -12,7 +12,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static gq.unurled.raxen.utils.Utils.*; +import static me.unurled.raxen.utils.Utils.*; public class WorldManager { diff --git a/src/main/java/gq/unurled/raxen/utils/DungeonUtils.java b/src/main/java/me/unurled/raxen/utils/DungeonUtils.java similarity index 93% rename from src/main/java/gq/unurled/raxen/utils/DungeonUtils.java rename to src/main/java/me/unurled/raxen/utils/DungeonUtils.java index 45ea5ef..b42b301 100644 --- a/src/main/java/gq/unurled/raxen/utils/DungeonUtils.java +++ b/src/main/java/me/unurled/raxen/utils/DungeonUtils.java @@ -1,9 +1,9 @@ -package gq.unurled.raxen.utils; +package me.unurled.raxen.utils; -import gq.unurled.raxen.Raxen; -import gq.unurled.raxen.components.dungeons.Gate; -import gq.unurled.raxen.components.dungeons.Rank; -import gq.unurled.raxen.components.dungeons.Types; +import me.unurled.raxen.Raxen; +import me.unurled.raxen.components.dungeons.Gate; +import me.unurled.raxen.components.dungeons.Rank; +import me.unurled.raxen.components.dungeons.Types; import org.bukkit.Bukkit; import org.bukkit.Location; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/gq/unurled/raxen/utils/EntityAttributes.java b/src/main/java/me/unurled/raxen/utils/EntityAttributes.java similarity index 91% rename from src/main/java/gq/unurled/raxen/utils/EntityAttributes.java rename to src/main/java/me/unurled/raxen/utils/EntityAttributes.java index e4a61c3..a8c11dc 100644 --- a/src/main/java/gq/unurled/raxen/utils/EntityAttributes.java +++ b/src/main/java/me/unurled/raxen/utils/EntityAttributes.java @@ -1,14 +1,14 @@ -package gq.unurled.raxen.utils; +package me.unurled.raxen.utils; -import gq.unurled.raxen.Raxen; -import gq.unurled.raxen.components.entity.player.attributes.Attribute; -import gq.unurled.raxen.manager.entity.PlayerManager; +import me.unurled.raxen.Raxen; +import me.unurled.raxen.components.entity.player.attributes.Attribute; +import me.unurled.raxen.manager.entity.PlayerManager; import org.bukkit.Bukkit; import org.bukkit.entity.Entity; import java.util.Objects; -import static gq.unurled.raxen.utils.Utils.debug; +import static me.unurled.raxen.utils.Utils.debug; public class EntityAttributes { diff --git a/src/main/java/gq/unurled/raxen/utils/Items.java b/src/main/java/me/unurled/raxen/utils/Items.java similarity index 99% rename from src/main/java/gq/unurled/raxen/utils/Items.java rename to src/main/java/me/unurled/raxen/utils/Items.java index 08fa1c9..753bb19 100644 --- a/src/main/java/gq/unurled/raxen/utils/Items.java +++ b/src/main/java/me/unurled/raxen/utils/Items.java @@ -1,9 +1,9 @@ -package gq.unurled.raxen.utils; +package me.unurled.raxen.utils; import com.google.gson.Gson; import de.tr7zw.nbtapi.NBTItem; -import gq.unurled.raxen.Raxen; -import gq.unurled.raxen.components.items.NBT; +import me.unurled.raxen.Raxen; +import me.unurled.raxen.components.items.NBT; import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.Material; @@ -23,7 +23,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.*; -import static gq.unurled.raxen.utils.Utils.*; +import static me.unurled.raxen.utils.Utils.*; public class Items { diff --git a/src/main/java/gq/unurled/raxen/utils/Reload.java b/src/main/java/me/unurled/raxen/utils/Reload.java similarity index 91% rename from src/main/java/gq/unurled/raxen/utils/Reload.java rename to src/main/java/me/unurled/raxen/utils/Reload.java index d7dcee1..87e9ab0 100644 --- a/src/main/java/gq/unurled/raxen/utils/Reload.java +++ b/src/main/java/me/unurled/raxen/utils/Reload.java @@ -1,71 +1,71 @@ -package gq.unurled.raxen.utils; - -import gq.unurled.raxen.Raxen; -import net.kyori.adventure.text.Component; -import org.bukkit.Bukkit; -import org.bukkit.configuration.file.FileConfiguration; -import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; -import org.bukkit.event.server.ServerListPingEvent; - -import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.List; - -import static gq.unurled.raxen.utils.Utils.colorTextComp; - -public class Reload implements Listener { - - private static FileConfiguration config = Raxen.getPlugin().getConfig(); - private static boolean serverReloading = true; - - /** - * kick all online players - */ - public static void kickAll() { - for(Player player : Bukkit.getOnlinePlayers()) { - player.kick(colorTextComp(Raxen.getPrefix() + "\nServer is Restarting\n Please Wait a few Minutes to reconnect.")); - } - } - - /** - * change the server ping list - * @param e the server ping list event - */ - @EventHandler - public static void pingList(ServerListPingEvent e) { - try { - setPingList(e); - - } catch (IOException ex) { - throw new RuntimeException(ex); - } - } - - /** - * update ping list - * @param e the ping event - * @throws IOException file writing - */ - public static void setPingList(ServerListPingEvent e) throws IOException { - if(serverReloading) { - List newLines = new ArrayList<>(); - for(String line : Files.readAllLines(Paths.get("server.properties"), StandardCharsets.UTF_8)) { - if(line.contains("motd=")) { - newLines.add("motd=" + config.get("motd-reload")); - } else { - newLines.add(line); - } - } - Files.write(Paths.get("server.properties"), newLines, StandardCharsets.UTF_8); - - e.motd(Component.text((String) config.get("motd-reload"))); - } else { - e.motd(Component.text((String) config.get("motd"))); - } - } -} +package me.unurled.raxen.utils; + +import me.unurled.raxen.Raxen; +import net.kyori.adventure.text.Component; +import org.bukkit.Bukkit; +import org.bukkit.configuration.file.FileConfiguration; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.server.ServerListPingEvent; + +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.List; + +import static me.unurled.raxen.utils.Utils.colorTextComp; + +public class Reload implements Listener { + + private static FileConfiguration config = Raxen.getPlugin().getConfig(); + private static boolean serverReloading = true; + + /** + * kick all online players + */ + public static void kickAll() { + for(Player player : Bukkit.getOnlinePlayers()) { + player.kick(colorTextComp(Raxen.getPrefix() + "\nServer is Restarting\n Please Wait a few Minutes to reconnect.")); + } + } + + /** + * change the server ping list + * @param e the server ping list event + */ + @EventHandler + public static void pingList(ServerListPingEvent e) { + try { + setPingList(e); + + } catch (IOException ex) { + throw new RuntimeException(ex); + } + } + + /** + * update ping list + * @param e the ping event + * @throws IOException file writing + */ + public static void setPingList(ServerListPingEvent e) throws IOException { + if(serverReloading) { + List newLines = new ArrayList<>(); + for(String line : Files.readAllLines(Paths.get("server.properties"), StandardCharsets.UTF_8)) { + if(line.contains("motd=")) { + newLines.add("motd=" + config.get("motd-reload")); + } else { + newLines.add(line); + } + } + Files.write(Paths.get("server.properties"), newLines, StandardCharsets.UTF_8); + + e.motd(Component.text((String) config.get("motd-reload"))); + } else { + e.motd(Component.text((String) config.get("motd"))); + } + } +} diff --git a/src/main/java/gq/unurled/raxen/utils/TabApi.java b/src/main/java/me/unurled/raxen/utils/TabApi.java similarity index 92% rename from src/main/java/gq/unurled/raxen/utils/TabApi.java rename to src/main/java/me/unurled/raxen/utils/TabApi.java index df9fde1..b9b403a 100644 --- a/src/main/java/gq/unurled/raxen/utils/TabApi.java +++ b/src/main/java/me/unurled/raxen/utils/TabApi.java @@ -1,10 +1,10 @@ -package gq.unurled.raxen.utils; +package me.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 gq.unurled.raxen.Raxen; +import me.unurled.raxen.Raxen; public class TabApi { diff --git a/src/main/java/gq/unurled/raxen/utils/Utils.java b/src/main/java/me/unurled/raxen/utils/Utils.java similarity index 96% rename from src/main/java/gq/unurled/raxen/utils/Utils.java rename to src/main/java/me/unurled/raxen/utils/Utils.java index fb0ee00..e2492dd 100644 --- a/src/main/java/gq/unurled/raxen/utils/Utils.java +++ b/src/main/java/me/unurled/raxen/utils/Utils.java @@ -1,369 +1,369 @@ -package gq.unurled.raxen.utils; - -import gq.unurled.raxen.Raxen; -import net.kyori.adventure.text.Component; -import net.kyori.adventure.text.TextComponent; -import net.kyori.adventure.text.minimessage.MiniMessage; -import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; -import net.kyori.adventure.text.minimessage.tag.standard.StandardTags; -import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; -import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer; -import org.bukkit.Bukkit; -import org.bukkit.ChatColor; -import org.bukkit.Material; -import org.bukkit.command.CommandSender; -import org.bukkit.configuration.file.FileConfiguration; -import org.bukkit.entity.Player; -import org.bukkit.inventory.Inventory; -import org.bukkit.inventory.ItemStack; -import org.jetbrains.annotations.NotNull; - -import java.io.IOException; -import java.nio.file.*; - -public class Utils { - - /** - * convert a string with mini-message formatting to a colored Component - * @param stringToComponent a string - * @return a component - */ - public static @NotNull Component colorComp(String stringToComponent) { - MiniMessage minimessage = MiniMessage.builder() - .tags(TagResolver.builder() - .resolver(StandardTags.color()) - .resolver(StandardTags.decorations()) - .resolver(StandardTags.reset()) - .build() - ) - .build(); - return minimessage.deserialize(stringToComponent); - } - - /** - * convert a string with mini-message formatting to a colored TextComponent - * @param stringToComponent a string - * @return a component - */ - public static @NotNull TextComponent colorTextComp(String stringToComponent) { - MiniMessage minimessage = MiniMessage.builder() - .tags(TagResolver.builder() - .resolver(StandardTags.color()) - .resolver(StandardTags.decorations()) - .resolver(StandardTags.reset()) - .build() - ) - .build(); - return (TextComponent) minimessage.deserialize(stringToComponent); - } - - /** - * change the mini-message colorized format to the legacy format, with § - * @param string a string - * @return a colored string - */ - public static @NotNull String colorString(String string) { - MiniMessage minimessage = MiniMessage.builder() - .tags(TagResolver.builder() - .resolver(StandardTags.color()) - .resolver(StandardTags.decorations()) - .resolver(StandardTags.reset()) - .build() - ) - .build(); - return LegacyComponentSerializer.legacyAmpersand().serialize(minimessage.deserialize(string)); - } - - /** - * change the mini-message colorized format to the legacy format, with § - * @param string a string - * @return a String - */ - public static String coloredString(String string) { - MiniMessage minimessage = MiniMessage.builder() - .tags(TagResolver.builder() - .resolver(StandardTags.color()) - .resolver(StandardTags.decorations()) - .resolver(StandardTags.reset()) - .build() - ) - .build(); - return ChatColor.translateAlternateColorCodes('&', LegacyComponentSerializer.legacyAmpersand() - .serialize(minimessage.deserialize(string))); - } - - /** - * transform a text-component to a string - * @param comp a string - * @return a String - */ - public static String textCompToString(TextComponent comp) { - MiniMessage minimessage = MiniMessage.builder() - .tags(TagResolver.builder() - .resolver(StandardTags.color()) - .resolver(StandardTags.decorations()) - .resolver(StandardTags.reset()) - .build() - ) - .build(); - return ChatColor.translateAlternateColorCodes('&', LegacyComponentSerializer.legacyAmpersand() - .serialize(comp)); - } - - /** - * Strips all color from a string. - * @param string the string that want's to be decolored. - * @return a decolored string - */ - public static String decolor(String string) { - return MiniMessage.miniMessage().stripTags(string); - } - - /** - * debug output to console if debug is set to true in config - * @param main Raxen instance - * @param strings output to console - */ - public static void debug(Raxen main, String... strings) { - FileConfiguration config = main.getConfig(); - if(config.getBoolean("debug")) { - for(String string : strings) { - main.getLogger().info(string); - } - } - } - - /** - * debug output to console if debug is set to true in config - * @param strings output to console - */ - public static void debug(String... strings) { - Raxen main = (Raxen) Bukkit.getPluginManager().getPlugin("Raxen"); - assert main != null; - FileConfiguration config = main.getConfig(); - if(config.getBoolean("debug")) { - for(String string : strings) { - main.getLogger().info(string); - } - } - } - - /** - * debug output to console if debug is set to true in config - * @param config main file config - * @param strings ouput to console - */ - public static void debug(FileConfiguration config, String... strings) { - Raxen main = (Raxen) Bukkit.getPluginManager().getPlugin("Raxen"); - assert main != null; - if(config.getBoolean("debug")) { - for(String string : strings) { - main.getLogger().info(string); - } - } - } - - /** - * Log the strings to the console - * @param main a main instance running - * @param strings string that want to be outputted. - */ - public static void log(Raxen main, String... strings) { - for(String string : strings) { - main.getLogger().info(string); - } - } - - /** - * Log the strings to the console - * @param strings string that want to be outputted. - */ - public static void log(String... strings) { - Raxen main = (Raxen) Bukkit.getPluginManager().getPlugin("Raxen"); - assert main != null; - for(String string : strings) { - main.getLogger().info(string); - } - } - - /** - * Log the TextComponent to the console - * @param comp TextComponent that want to be outputted. - */ - public static void log(TextComponent... comp) { - Raxen main = (Raxen) Bukkit.getPluginManager().getPlugin("Raxen"); - assert main != null; - for(TextComponent string : comp) { - main.getServer().sendMessage(string); - } - } - - /** - * Warns strings to the console using the logger - * @param strings to warn message - */ - public static void warn(String... strings) { - Raxen main = (Raxen) Bukkit.getPluginManager().getPlugin("Raxen"); - assert main != null; - for(String string : strings) { - main.getLogger().warning(string); - } - } - - /** - * Warns strings to the console using the logger - * @param strings to warn message - * @param main a running instance - */ - public static void warn(Raxen main, String... strings) { - for(String string : strings) { - main.getLogger().warning(string); - } - } - - /** - * Error strings to the console using the logger - * @param strings to error message - */ - public static void error(String... strings) { - Raxen main = (Raxen) Bukkit.getPluginManager().getPlugin("Raxen"); - assert main != null; - for(String string : strings) { - main.getLogger().severe(string); - } - } - - /** - * Error strings to the console using the logger - * @param strings to error message - * @param main a main instance running - */ - public static void error(Raxen main, String... strings) { - for(String string : strings) { - main.getLogger().severe(string); - } - } - - /** - * message strings to player. - * @param player an online player - * @param strings strings that will be sent. - */ - public static void msgPlayer(Player player, String... strings) { - for(String string : strings) { - player.sendMessage(colorComp(string)); - } - } - - /** - * message textComponent to player. - * @param player an online player - * @param comp textComponent that will be sent. - */ - public static void msgPlayer(Player player, TextComponent comp) { - player.sendMessage(colorComp(PlainTextComponentSerializer.plainText().serialize(comp))); - } - - /** - * message the command sender with textComponent. - * @param player the command sender - * @param textComponent message - */ - public static void msgSender(CommandSender player, TextComponent textComponent) { - player.sendMessage(colorComp(PlainTextComponentSerializer.plainText().serialize(textComponent))); - } - - /** - * message the command sender with strings. - * @param player the command sender - * @param strings message - */ - public static void msgSender(CommandSender player, String... strings) { - for(String string : strings) { - player.sendMessage(colorComp(string)); - } - } - - /** - * fill an inventory with grey glass pane. - * @param inv an inventory - * @return the inventory filled - */ - public static Inventory fillGreyPane(Inventory inv) { - int in = -1; - for (ItemStack it : inv) { - in++; - if (it == null || it.getType() == Material.AIR) { - inv.setItem(in, Items.greyPane()); - } - } - return inv; - } - - /** - * output message when player have no perms - * @return a component - */ - public static Component noPerms() { - return colorComp("You don't have the permission to use this feature."); - } - - /** - * error message output to player - * @return a component - */ - public static Component error() { - return colorComp("An Error has occurred. Please retry or contact an Admin."); - } - - public static void errorConsoleSender(CommandSender sender) { - sender.sendMessage(colorComp("Can't use this command as the console.")); - } - - /** - * Copy folder from sourceDirectoryLocation to destinationDirectoryLocation - * @param sourceDirectoryLocation the source directory - * @param destinationDirectoryLocation the copy location - * @throws IOException exception with coping data - */ - public static void copyDirectory(String sourceDirectoryLocation, String destinationDirectoryLocation) throws IOException { - Files.walk(Paths.get(sourceDirectoryLocation)) - .forEach(source -> { - Path destination = Paths.get(destinationDirectoryLocation, source.toString() - .substring(sourceDirectoryLocation.length())); - try { - Files.copy(source, destination); - } catch (IOException e) { - e.printStackTrace(); - } - }); - } - - /** - * remove path directory - * @param path removed folder - * @throws IOException error with handling data - */ - public static void removeDirectory(Path path) throws IOException { - if (Files.isDirectory(path, LinkOption.NOFOLLOW_LINKS)) { - try (DirectoryStream entries = Files.newDirectoryStream(path)) { - for (Path entry : entries) { - removeDirectory(entry); - } - } - } - Files.delete(path); - } - - public static boolean isInt(String strNum) { - if (strNum == null) { - return false; - } - try { - double d = Integer.parseInt(strNum); - } catch (NumberFormatException nfe) { - return false; - } - return true; - } -} +package me.unurled.raxen.utils; + +import me.unurled.raxen.Raxen; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.TextComponent; +import net.kyori.adventure.text.minimessage.MiniMessage; +import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; +import net.kyori.adventure.text.minimessage.tag.standard.StandardTags; +import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; +import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer; +import org.bukkit.Bukkit; +import org.bukkit.ChatColor; +import org.bukkit.Material; +import org.bukkit.command.CommandSender; +import org.bukkit.configuration.file.FileConfiguration; +import org.bukkit.entity.Player; +import org.bukkit.inventory.Inventory; +import org.bukkit.inventory.ItemStack; +import org.jetbrains.annotations.NotNull; + +import java.io.IOException; +import java.nio.file.*; + +public class Utils { + + /** + * convert a string with mini-message formatting to a colored Component + * @param stringToComponent a string + * @return a component + */ + public static @NotNull Component colorComp(String stringToComponent) { + MiniMessage minimessage = MiniMessage.builder() + .tags(TagResolver.builder() + .resolver(StandardTags.color()) + .resolver(StandardTags.decorations()) + .resolver(StandardTags.reset()) + .build() + ) + .build(); + return minimessage.deserialize(stringToComponent); + } + + /** + * convert a string with mini-message formatting to a colored TextComponent + * @param stringToComponent a string + * @return a component + */ + public static @NotNull TextComponent colorTextComp(String stringToComponent) { + MiniMessage minimessage = MiniMessage.builder() + .tags(TagResolver.builder() + .resolver(StandardTags.color()) + .resolver(StandardTags.decorations()) + .resolver(StandardTags.reset()) + .build() + ) + .build(); + return (TextComponent) minimessage.deserialize(stringToComponent); + } + + /** + * change the mini-message colorized format to the legacy format, with § + * @param string a string + * @return a colored string + */ + public static @NotNull String colorString(String string) { + MiniMessage minimessage = MiniMessage.builder() + .tags(TagResolver.builder() + .resolver(StandardTags.color()) + .resolver(StandardTags.decorations()) + .resolver(StandardTags.reset()) + .build() + ) + .build(); + return LegacyComponentSerializer.legacyAmpersand().serialize(minimessage.deserialize(string)); + } + + /** + * change the mini-message colorized format to the legacy format, with § + * @param string a string + * @return a String + */ + public static String coloredString(String string) { + MiniMessage minimessage = MiniMessage.builder() + .tags(TagResolver.builder() + .resolver(StandardTags.color()) + .resolver(StandardTags.decorations()) + .resolver(StandardTags.reset()) + .build() + ) + .build(); + return ChatColor.translateAlternateColorCodes('&', LegacyComponentSerializer.legacyAmpersand() + .serialize(minimessage.deserialize(string))); + } + + /** + * transform a text-component to a string + * @param comp a string + * @return a String + */ + public static String textCompToString(TextComponent comp) { + MiniMessage minimessage = MiniMessage.builder() + .tags(TagResolver.builder() + .resolver(StandardTags.color()) + .resolver(StandardTags.decorations()) + .resolver(StandardTags.reset()) + .build() + ) + .build(); + return ChatColor.translateAlternateColorCodes('&', LegacyComponentSerializer.legacyAmpersand() + .serialize(comp)); + } + + /** + * Strips all color from a string. + * @param string the string that want's to be decolored. + * @return a decolored string + */ + public static String decolor(String string) { + return MiniMessage.miniMessage().stripTags(string); + } + + /** + * debug output to console if debug is set to true in config + * @param main Raxen instance + * @param strings output to console + */ + public static void debug(Raxen main, String... strings) { + FileConfiguration config = main.getConfig(); + if(config.getBoolean("debug")) { + for(String string : strings) { + main.getLogger().info(string); + } + } + } + + /** + * debug output to console if debug is set to true in config + * @param strings output to console + */ + public static void debug(String... strings) { + Raxen main = (Raxen) Bukkit.getPluginManager().getPlugin("Raxen"); + assert main != null; + FileConfiguration config = main.getConfig(); + if(config.getBoolean("debug")) { + for(String string : strings) { + main.getLogger().info(string); + } + } + } + + /** + * debug output to console if debug is set to true in config + * @param config main file config + * @param strings ouput to console + */ + public static void debug(FileConfiguration config, String... strings) { + Raxen main = (Raxen) Bukkit.getPluginManager().getPlugin("Raxen"); + assert main != null; + if(config.getBoolean("debug")) { + for(String string : strings) { + main.getLogger().info(string); + } + } + } + + /** + * Log the strings to the console + * @param main a main instance running + * @param strings string that want to be outputted. + */ + public static void log(Raxen main, String... strings) { + for(String string : strings) { + main.getLogger().info(string); + } + } + + /** + * Log the strings to the console + * @param strings string that want to be outputted. + */ + public static void log(String... strings) { + Raxen main = (Raxen) Bukkit.getPluginManager().getPlugin("Raxen"); + assert main != null; + for(String string : strings) { + main.getLogger().info(string); + } + } + + /** + * Log the TextComponent to the console + * @param comp TextComponent that want to be outputted. + */ + public static void log(TextComponent... comp) { + Raxen main = (Raxen) Bukkit.getPluginManager().getPlugin("Raxen"); + assert main != null; + for(TextComponent string : comp) { + main.getServer().sendMessage(string); + } + } + + /** + * Warns strings to the console using the logger + * @param strings to warn message + */ + public static void warn(String... strings) { + Raxen main = (Raxen) Bukkit.getPluginManager().getPlugin("Raxen"); + assert main != null; + for(String string : strings) { + main.getLogger().warning(string); + } + } + + /** + * Warns strings to the console using the logger + * @param strings to warn message + * @param main a running instance + */ + public static void warn(Raxen main, String... strings) { + for(String string : strings) { + main.getLogger().warning(string); + } + } + + /** + * Error strings to the console using the logger + * @param strings to error message + */ + public static void error(String... strings) { + Raxen main = (Raxen) Bukkit.getPluginManager().getPlugin("Raxen"); + assert main != null; + for(String string : strings) { + main.getLogger().severe(string); + } + } + + /** + * Error strings to the console using the logger + * @param strings to error message + * @param main a main instance running + */ + public static void error(Raxen main, String... strings) { + for(String string : strings) { + main.getLogger().severe(string); + } + } + + /** + * message strings to player. + * @param player an online player + * @param strings strings that will be sent. + */ + public static void msgPlayer(Player player, String... strings) { + for(String string : strings) { + player.sendMessage(colorComp(string)); + } + } + + /** + * message textComponent to player. + * @param player an online player + * @param comp textComponent that will be sent. + */ + public static void msgPlayer(Player player, TextComponent comp) { + player.sendMessage(colorComp(PlainTextComponentSerializer.plainText().serialize(comp))); + } + + /** + * message the command sender with textComponent. + * @param player the command sender + * @param textComponent message + */ + public static void msgSender(CommandSender player, TextComponent textComponent) { + player.sendMessage(colorComp(PlainTextComponentSerializer.plainText().serialize(textComponent))); + } + + /** + * message the command sender with strings. + * @param player the command sender + * @param strings message + */ + public static void msgSender(CommandSender player, String... strings) { + for(String string : strings) { + player.sendMessage(colorComp(string)); + } + } + + /** + * fill an inventory with grey glass pane. + * @param inv an inventory + * @return the inventory filled + */ + public static Inventory fillGreyPane(Inventory inv) { + int in = -1; + for (ItemStack it : inv) { + in++; + if (it == null || it.getType() == Material.AIR) { + inv.setItem(in, Items.greyPane()); + } + } + return inv; + } + + /** + * output message when player have no perms + * @return a component + */ + public static Component noPerms() { + return colorComp("You don't have the permission to use this feature."); + } + + /** + * error message output to player + * @return a component + */ + public static Component error() { + return colorComp("An Error has occurred. Please retry or contact an Admin."); + } + + public static void errorConsoleSender(CommandSender sender) { + sender.sendMessage(colorComp("Can't use this command as the console.")); + } + + /** + * Copy folder from sourceDirectoryLocation to destinationDirectoryLocation + * @param sourceDirectoryLocation the source directory + * @param destinationDirectoryLocation the copy location + * @throws IOException exception with coping data + */ + public static void copyDirectory(String sourceDirectoryLocation, String destinationDirectoryLocation) throws IOException { + Files.walk(Paths.get(sourceDirectoryLocation)) + .forEach(source -> { + Path destination = Paths.get(destinationDirectoryLocation, source.toString() + .substring(sourceDirectoryLocation.length())); + try { + Files.copy(source, destination); + } catch (IOException e) { + e.printStackTrace(); + } + }); + } + + /** + * remove path directory + * @param path removed folder + * @throws IOException error with handling data + */ + public static void removeDirectory(Path path) throws IOException { + if (Files.isDirectory(path, LinkOption.NOFOLLOW_LINKS)) { + try (DirectoryStream entries = Files.newDirectoryStream(path)) { + for (Path entry : entries) { + removeDirectory(entry); + } + } + } + Files.delete(path); + } + + public static boolean isInt(String strNum) { + if (strNum == null) { + return false; + } + try { + double d = Integer.parseInt(strNum); + } catch (NumberFormatException nfe) { + return false; + } + return true; + } +} diff --git a/src/main/java/gq/unurled/raxen/utils/libs/Citizens.java b/src/main/java/me/unurled/raxen/utils/libs/Citizens.java similarity index 84% rename from src/main/java/gq/unurled/raxen/utils/libs/Citizens.java rename to src/main/java/me/unurled/raxen/utils/libs/Citizens.java index 75ac756..7d3bfa6 100644 --- a/src/main/java/gq/unurled/raxen/utils/libs/Citizens.java +++ b/src/main/java/me/unurled/raxen/utils/libs/Citizens.java @@ -1,6 +1,6 @@ -package gq.unurled.raxen.utils.libs; +package me.unurled.raxen.utils.libs; -import gq.unurled.raxen.Raxen; +import me.unurled.raxen.Raxen; import org.bukkit.entity.Entity; public class Citizens { diff --git a/src/main/java/gq/unurled/raxen/utils/libs/LuckPerm.java b/src/main/java/me/unurled/raxen/utils/libs/LuckPerm.java similarity index 88% rename from src/main/java/gq/unurled/raxen/utils/libs/LuckPerm.java rename to src/main/java/me/unurled/raxen/utils/libs/LuckPerm.java index 7420f9b..d7483f2 100644 --- a/src/main/java/gq/unurled/raxen/utils/libs/LuckPerm.java +++ b/src/main/java/me/unurled/raxen/utils/libs/LuckPerm.java @@ -1,7 +1,7 @@ -package gq.unurled.raxen.utils.libs; +package me.unurled.raxen.utils.libs; -import gq.unurled.raxen.Raxen; import lombok.Getter; +import me.unurled.raxen.Raxen; import net.luckperms.api.LuckPerms; import org.bukkit.Bukkit; import org.bukkit.plugin.RegisteredServiceProvider; diff --git a/src/main/java/gq/unurled/raxen/utils/libs/MongoDB.java b/src/main/java/me/unurled/raxen/utils/libs/MongoDB.java similarity index 91% rename from src/main/java/gq/unurled/raxen/utils/libs/MongoDB.java rename to src/main/java/me/unurled/raxen/utils/libs/MongoDB.java index 75748e7..bd75b75 100644 --- a/src/main/java/gq/unurled/raxen/utils/libs/MongoDB.java +++ b/src/main/java/me/unurled/raxen/utils/libs/MongoDB.java @@ -1,4 +1,4 @@ -package gq.unurled.raxen.utils.libs; +package me.unurled.raxen.utils.libs; import com.mongodb.ConnectionString; import com.mongodb.client.MongoClient; @@ -12,8 +12,8 @@ import org.bukkit.configuration.file.FileConfiguration; import java.util.Objects; -import static gq.unurled.raxen.utils.Utils.colorComp; -import static gq.unurled.raxen.utils.Utils.log; +import static me.unurled.raxen.utils.Utils.colorComp; +import static me.unurled.raxen.utils.Utils.log; public class MongoDB { @Getter diff --git a/src/main/java/gq/unurled/raxen/utils/libs/Multiverse.java b/src/main/java/me/unurled/raxen/utils/libs/Multiverse.java similarity index 94% rename from src/main/java/gq/unurled/raxen/utils/libs/Multiverse.java rename to src/main/java/me/unurled/raxen/utils/libs/Multiverse.java index 52376d2..5bbed17 100644 --- a/src/main/java/gq/unurled/raxen/utils/libs/Multiverse.java +++ b/src/main/java/me/unurled/raxen/utils/libs/Multiverse.java @@ -1,4 +1,4 @@ -package gq.unurled.raxen.utils.libs; +package me.unurled.raxen.utils.libs; import com.onarandombox.MultiverseCore.MultiverseCore; import com.onarandombox.MultiverseCore.api.MVWorldManager; diff --git a/src/main/java/gq/unurled/raxen/utils/libs/Mysql.java b/src/main/java/me/unurled/raxen/utils/libs/Mysql.java similarity index 84% rename from src/main/java/gq/unurled/raxen/utils/libs/Mysql.java rename to src/main/java/me/unurled/raxen/utils/libs/Mysql.java index f9be08b..b6a5748 100644 --- a/src/main/java/gq/unurled/raxen/utils/libs/Mysql.java +++ b/src/main/java/me/unurled/raxen/utils/libs/Mysql.java @@ -1,8 +1,8 @@ -package gq.unurled.raxen.utils.libs; +package me.unurled.raxen.utils.libs; -import gq.unurled.raxen.Raxen; -import gq.unurled.raxen.config.Config; -import gq.unurled.raxen.manager.entity.StorageManager; +import me.unurled.raxen.Raxen; +import me.unurled.raxen.config.Config; +import me.unurled.raxen.manager.entity.StorageManager; import org.bukkit.entity.Player; import java.sql.SQLException; diff --git a/src/main/java/gq/unurled/raxen/utils/libs/PlaceHolderAPI.java b/src/main/java/me/unurled/raxen/utils/libs/PlaceHolderAPI.java similarity index 73% rename from src/main/java/gq/unurled/raxen/utils/libs/PlaceHolderAPI.java rename to src/main/java/me/unurled/raxen/utils/libs/PlaceHolderAPI.java index 94eabf7..fa75cfd 100644 --- a/src/main/java/gq/unurled/raxen/utils/libs/PlaceHolderAPI.java +++ b/src/main/java/me/unurled/raxen/utils/libs/PlaceHolderAPI.java @@ -1,6 +1,6 @@ -package gq.unurled.raxen.utils.libs; +package me.unurled.raxen.utils.libs; -import gq.unurled.raxen.Raxen; +import me.unurled.raxen.Raxen; public class PlaceHolderAPI { diff --git a/src/main/java/gq/unurled/raxen/utils/libs/Vault.java b/src/main/java/me/unurled/raxen/utils/libs/Vault.java similarity index 92% rename from src/main/java/gq/unurled/raxen/utils/libs/Vault.java rename to src/main/java/me/unurled/raxen/utils/libs/Vault.java index 5c8a46f..fa454ff 100644 --- a/src/main/java/gq/unurled/raxen/utils/libs/Vault.java +++ b/src/main/java/me/unurled/raxen/utils/libs/Vault.java @@ -1,7 +1,7 @@ -package gq.unurled.raxen.utils.libs; +package me.unurled.raxen.utils.libs; -import gq.unurled.raxen.Raxen; import lombok.Getter; +import me.unurled.raxen.Raxen; import net.milkbowl.vault.economy.Economy; import org.bukkit.Bukkit; import org.bukkit.entity.Player; @@ -9,7 +9,7 @@ import org.bukkit.plugin.RegisteredServiceProvider; import java.text.DecimalFormat; -import static gq.unurled.raxen.utils.Utils.error; +import static me.unurled.raxen.utils.Utils.error; public class Vault { @Getter diff --git a/src/main/java/me/unurled/raxen/utils/libs/WorldEdit.java b/src/main/java/me/unurled/raxen/utils/libs/WorldEdit.java new file mode 100644 index 0000000..7672e9f --- /dev/null +++ b/src/main/java/me/unurled/raxen/utils/libs/WorldEdit.java @@ -0,0 +1,5 @@ +package me.unurled.raxen.utils.libs; + +public class WorldEdit { + +} diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 114001b..e67068f 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: Raxen version: '${version}' -main: gq.unurled.raxen.Raxen +main: me.unurled.raxen.Raxen author: unurled api-version: 1.18 depend: [ProtocolLib, PlaceholderAPI, 'Multiverse-Core']