Elixium/Raxen
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

0.4.8

Browse source 
get MiniMessage to work, modified some classes and update in build.gradle, update of gradle wrapper
This commit is contained in:
unurled 2022-04-03 22:01:11 +02:00
parent 0b861e39bd
commit 9b14f1ec83
48 changed files with 657 additions and 596 deletions
Download patch file Download diff file Expand all files Collapse all files

57
src/main/java/gq/unurled/raxen/commands/RaxenCommand.java
View file

@ -1,8 +1,7 @@
package gq.unurled.raxen.commands;
import gq.unurled.raxen.Raxen;
import gq.unurled.raxen.manager.StorageManager;
import net.kyori.adventure.text.Component;
import gq.unurled.raxen.manager.entity.StorageManager;
import net.kyori.adventure.text.TextComponent;
import net.kyori.adventure.text.event.ClickEvent;
import org.bukkit.command.Command;
@ -29,7 +28,7 @@ public class RaxenCommand implements TabExecutor {
if(sender instanceof Player) {
Player player = (Player) sender;
if(!(player.hasPermission("raxen."))) {
msgPlayer(player, Raxen.getPrefix().append(colorTextComp("<red>You can't execute this command. Insufficient permission.")));
msgPlayer(player, coloredString(Raxen.getPrefix()) + colorTextComp("<red>You can't execute this command. Insufficient permission."));
}
switch (args.length) {
case 0 -> msgPl(player, 0);
@ -37,13 +36,13 @@ public class RaxenCommand implements TabExecutor {
switch (args[0]) {
case "mongodb", "mongo", "MONGODB", "MONGO" -> {
//print info about connection
sender.sendMessage(Raxen.getPrefix().append(colorTextComp("<gold>Printing About Raxen's MongoDB connection...")));
msgPlayer(player, Raxen.getPrefix()
.append(colorTextComp("<gold>---------------------------------------------")));
sender.sendMessage(coloredString(Raxen.getPrefix()) + colorTextComp("<gold>Printing About Raxen's MongoDB connection..."));
msgPlayer(player, coloredString(Raxen.getPrefix()) +
colorTextComp("<gold>---------------------------------------------"));
msgPlayer(player, colorTextComp("<red>MONGO DB<white>"));
msgPlayer(player, StorageManager.getMongo().getMongoClient().getClusterDescription().toString());
msgPlayer(player, StorageManager.getMongo().getMongoDatabase().getName());
msgPlayer(player, StorageManager.getMongo().getMongoCollection().getNamespace().toString());
msgPlayer(player, StorageManager.getMongodb().getMongoClient().getClusterDescription().toString());
msgPlayer(player, StorageManager.getMongodb().getMongoDatabase().getName());
msgPlayer(player, StorageManager.getMongodb().getMongoCollection().getNamespace().toString());
msgPlayer(player, "<gold>---------------------------------------------");
}
case "v", "version", "ver" -> {
@ -60,37 +59,37 @@ public class RaxenCommand implements TabExecutor {
log(String.valueOf(args.length));
switch (args.length) {
case 0 -> {
msgSender(sender, Raxen.getPrefix() + colorString("<gold>Printing About Raxen..."),
colorString("<gold>---------------------------------------------"),
colorString("<dark_aqua> Raxen "),
colorString("<dark_aqua> - Version: " + Raxen.getVersion()),
colorString("<dark_aqua> - Author: <b><red>U<gold>n&eu<dark_green>r<green>l<aqua>e<dark_aqua>d<reset>"));
TextComponent txt = Component.text(colorString("<dark_aqua> - Website: https://unurled.gq"));
msgSender(sender, Raxen.getPrefix() + "<gold>Printing About Raxen...",
"<gold>---------------------------------------------",
"<dark_aqua> Raxen ",
"<dark_aqua> - Version: " + Raxen.getVersion(),
"<dark_aqua> - Author: <b><red>U<gold>n<yellow>u<dark_green>r<green>l<aqua>e<dark_aqua>d<reset>");
TextComponent txt = colorTextComp("<dark_aqua> - Website: https://unurled.gq");
sender.sendMessage(txt);
sender.sendMessage(colorString("<gold>---------------------------------------------"));
sender.sendMessage(coloredString("<gold>---------------------------------------------"));
return true;
}
case 1 -> {
switch (args[0]) {
case "mongodb", "mongo", "MONGODB", "MONGO" -> {
//print info about connection
sender.sendMessage(Raxen.getPrefix() + colorString("<gold>Printing About Raxen's MongoDB connection..."));
sender.sendMessage(colorString("<gold>---------------------------------------------"), colorString("<red>MONGO DB"));
sender.sendMessage(StorageManager.getMongo().getMongoClient().getClusterDescription().toString());
sender.sendMessage(StorageManager.getMongo().getMongoDatabase().getName());
sender.sendMessage(StorageManager.getMongo().getMongoCollection().getNamespace().toString());
sender.sendMessage(colorString("<gold>---------------------------------------------"));
msgSender(sender, Raxen.getPrefix() + "<gold>Printing About Raxen's MongoDB connection...",
"<gold>---------------------------------------------" + "<red>MONGO DB");
sender.sendMessage(StorageManager.getMongodb().getMongoClient().getClusterDescription().toString());
sender.sendMessage(StorageManager.getMongodb().getMongoDatabase().getName());
sender.sendMessage(StorageManager.getMongodb().getMongoCollection().getNamespace().toString());
sender.sendMessage(coloredString("<gold>---------------------------------------------"));
return true;
}
case "v", "version", "ver" -> {
sender.sendMessage(Raxen.getPrefix() + colorString("<gold>Printing About Raxen..."),
colorString("<gold>---------------------------------------------"),
colorString("<dark_aqua> Raxen "),
colorString("<dark_aqua> - Version: " + Raxen.getVersion()),
colorString("<dark_aqua> - Author: <b><red>U<gold>n&eu<dark_green>r<green>l<aqua>e<dark_aqua>d<reset>"));
TextComponent txt= Component.text(colorString("<dark_aqua> - Website: https://unurled.gq"));
msgSender(sender, Raxen.getPrefix() + "<gold>Printing About Raxen...",
"<gold>---------------------------------------------",
"<dark_aqua> Raxen ",
"<dark_aqua> - Version: " + Raxen.getVersion(),
"<dark_aqua> - Author: <b><red>U<gold>n&eu<dark_green>r<green>l<aqua>e<dark_aqua>d<reset>");
TextComponent txt=colorTextComp("<dark_aqua> - Website: https://unurled.gq");
sender.sendMessage(txt);
sender.sendMessage(colorString("<gold>---------------------------------------------"));
sender.sendMessage(coloredString("<gold>---------------------------------------------"));
return true;
}
case "hemlp", "?", "h" ->

12
src/main/java/gq/unurled/raxen/commands/admin/NbtCommand.java
View file

@ -18,8 +18,8 @@ import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.List;
import static gq.unurled.raxen.components.player.PlayerUtils.updateSkills;
import static gq.unurled.raxen.utils.Items.attributes;
import static gq.unurled.raxen.utils.Skills.updateSkills;
import static gq.unurled.raxen.utils.Utils.*;
public class NbtCommand implements TabExecutor {
@ -38,11 +38,11 @@ public class NbtCommand implements TabExecutor {
}
Player player = (Player) sender;
if(player.getInventory().getItemInMainHand().getType() == Material.AIR || player.getInventory().getItemInMainHand() == null) {
msgPlayer(player,colorString("<red>You must hold an Item in hand."));
msgPlayer(player,colorTextComp("<red>You must hold an Item in hand."));
return true;
}
switch (args.length) {
case 0, 1 -> msgPlayer(player, colorString("<red>You must specify an nbt and an int."));
case 0, 1 -> msgPlayer(player, colorTextComp("<red>You must specify an nbt and an int."));
case 2 -> {
debug(main, "'" + args[0] + "'", "'" + args[1] + "'");
ItemStack it = player.getInventory().getItemInMainHand();
@ -70,8 +70,8 @@ public class NbtCommand implements TabExecutor {
}
}
if (!ever) {
lore.add(Component.text(colorString("<red>Attributes:")));
lore.add(Component.text(colorString(attributes(args[0]) + ": " + (Integer.parseInt(args[1]) + a))));
lore.add(colorTextComp("<red>Attributes:"));
lore.add(colorTextComp(attributes(args[0]) + ": " + (Integer.parseInt(args[1]) + a)));
}
itm.lore(lore);
it.setItemMeta(itm);
@ -90,7 +90,7 @@ public class NbtCommand implements TabExecutor {
attributes.addStrength(player, nbti.getInteger("STRENGTH"));
}
it = nbti.getItem();
msgPlayer(player, Raxen.getPrefix() + colorString("<white>You successfully added the nbt " + attributes(args[0]) + "<white>with " + args[1] + "<white>."));
msgPlayer(player, colorTextComp(Raxen.getPrefix() + "<white>You successfully added the nbt " + attributes(args[0]) + "<white>with " + args[1] + "<white>."));
updateSkills(main, player);
player.getInventory().setItem(player.getInventory().getHeldItemSlot(), it);
}

3
src/main/java/gq/unurled/raxen/commands/player/SkillsCommand.java
View file

@ -1,6 +1,7 @@
package gq.unurled.raxen.commands.player;
import gq.unurled.raxen.Raxen;
import gq.unurled.raxen.components.player.PlayerUtils;
import gq.unurled.raxen.components.player.attributes.Attributes;
import org.bukkit.Bukkit;
import org.bukkit.command.Command;
@ -101,7 +102,7 @@ public class SkillsCommand implements TabExecutor {
}
break;
}
gq.unurled.raxen.utils.Skills.updateSkills(main, player);
PlayerUtils.updateSkills(main, player);
}
return false;
}

5
src/main/java/gq/unurled/raxen/commands/player/StorageCommand.java
View file

@ -1,7 +1,7 @@
package gq.unurled.raxen.commands.player;
import gq.unurled.raxen.Raxen;
import gq.unurled.raxen.manager.PlayerManager;
import gq.unurled.raxen.manager.entity.PlayerManager;
import org.bukkit.Bukkit;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
@ -17,7 +17,7 @@ import static gq.unurled.raxen.utils.Utils.*;
public class StorageCommand implements TabExecutor {
private PlayerManager playerManager = Raxen.getPlayerManager();
private PlayerManager playerManager;
@Override
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
@ -27,6 +27,7 @@ public class StorageCommand implements TabExecutor {
}
Player player = (Player) sender;
Inventory inv;
playerManager = ((Raxen) Bukkit.getPluginManager().getPlugin("Raxen")).getManager().getPlayerManager();
switch (args.length) {
case 0:
if(playerManager.getRaxenPlayer(player).getStorage() == null) {