Skip to content

Commit 82febc6

Browse files
bytefulbyteful
committed
v1.3.5
1 parent 48007e1 commit 82febc6

18 files changed

+1256
-1238
lines changed

‎src/main/java/me/byteful/plugin/leveltools/LevelToolsCommand.java‎

Lines changed: 115 additions & 114 deletions
Original file line numberDiff line numberDiff line change
@@ -15,134 +15,135 @@
1515

1616
@Command("leveltools")
1717
public class LevelToolsCommand {
18-
@Dependency
19-
private LevelToolsPlugin plugin;
20-
21-
@DefaultFor("leveltools")
22-
@Subcommand("help")
23-
@Description("Shows the list of LevelTools commands.")
24-
public void onHelp(CommandSender sender, CommandHelp<String> help, @Default("1") int page) {
25-
sender.sendMessage(colorize("&6&lLevelTools Command Help:"));
26-
for (String entry : help.paginate(page, 7)) {
27-
sender.sendMessage(colorize(entry));
18+
@Dependency
19+
private LevelToolsPlugin plugin;
20+
21+
@DefaultFor("leveltools")
22+
@Subcommand("help")
23+
@Description("Shows the list of LevelTools commands.")
24+
public void onHelp(CommandSender sender, CommandHelp<String> help, @Default("1") int page) {
25+
sender.sendMessage(colorize("&6&lLevelTools Command Help:"));
26+
for (String entry : help.paginate(page, 7)) {
27+
sender.sendMessage(colorize(entry));
28+
}
2829
}
29-
}
3030

31-
@Subcommand("reload")
32-
@Description("Reloads LevelTools' plugin configuration.")
33-
public void onReload(CommandSender sender) {
34-
if (!checkPerm(sender)) {
35-
return;
36-
}
37-
38-
plugin.reloadConfig();
39-
plugin.setAnvilCombineMode();
40-
sender.sendMessage(colorize(Objects.requireNonNull(plugin.getConfig().getString("messages.successful_reload"))));
41-
}
42-
43-
@Subcommand("reset")
44-
@Description("Resets all XP/Levels for all the items in the target player.")
45-
public void onReset(CommandSender sender, Player target, @Switch("all") boolean all) {
46-
if (!all) {
47-
if (!LevelToolsUtil.isSupportedTool(target.getInventory().getItemInMainHand().getType())) {
48-
sender.sendMessage(colorize(plugin.getConfig().getString("messages.item_not_tool")));
49-
50-
return;
51-
}
52-
53-
final LevelToolsItem tool = LevelToolsUtil.createLevelToolsItem(target.getInventory().getItemInMainHand());
54-
tool.setLevel(0);
55-
tool.setXp(0);
56-
target.getInventory().setItemInMainHand(tool.getItemStack());
57-
sender.sendMessage(colorize(plugin.getConfig().getString("messages.successfully_reset_hand_tool", "&aSuccessfully reset tool in hand's XP/Levels for {player}.").replace("{player}", target.getName())));
58-
59-
return;
60-
}
31+
@Subcommand("reload")
32+
@Description("Reloads LevelTools' plugin configuration.")
33+
public void onReload(CommandSender sender) {
34+
if (!checkPerm(sender)) {
35+
return;
36+
}
6137

62-
final PlayerInventory inv = target.getInventory();
63-
final ItemStack[] contents = inv.getContents();
64-
for (int i = 0; i < contents.length; i++) {
65-
final ItemStack item = contents[i];
66-
if (item == null || !LevelToolsUtil.isSupportedTool(item.getType())) {
67-
continue;
68-
}
69-
final LevelToolsItem tool = LevelToolsUtil.createLevelToolsItem(item);
70-
tool.setLevel(0);
71-
tool.setXp(0);
72-
inv.setItem(i, tool.getItemStack());
73-
}
74-
sender.sendMessage(colorize(Objects.requireNonNull(plugin.getConfig().getString("messages.successfully_reset_tools")).replace("{player}", target.getName())));
75-
}
76-
77-
@Subcommand("xp")
78-
@Description("Sets the item in hand's XP to provided XP.")
79-
public void onXP(Player player, double xp) {
80-
if (!checkPerm(player)) {
81-
return;
38+
plugin.reloadConfig();
39+
plugin.setAnvilCombineMode();
40+
sender.sendMessage(colorize(Objects.requireNonNull(plugin.getConfig().getString("messages.successful_reload"))));
8241
}
8342

84-
final ItemStack item = player.getItemInHand();
85-
86-
if (LevelToolsUtil.isSupportedTool(item.getType())) {
87-
final LevelToolsItem tool = LevelToolsUtil.createLevelToolsItem(item);
88-
tool.setXp(xp);
89-
player.setItemInHand(tool.getItemStack());
90-
player.sendMessage(colorize(Objects.requireNonNull(plugin.getConfig().getString("messages.successfully_executed_action"))));
91-
} else {
92-
player.sendMessage(colorize(Objects.requireNonNull(plugin.getConfig().getString("messages.item_not_tool"))));
43+
@Subcommand("reset")
44+
@Description("Resets all XP/Levels for all the items in the target player.")
45+
public void onReset(CommandSender sender, Player target, @Switch("all") boolean all) {
46+
final ItemStack hand = LevelToolsUtil.getHand(target);
47+
if (!all) {
48+
if (!LevelToolsUtil.isSupportedTool(hand.getType())) {
49+
sender.sendMessage(colorize(plugin.getConfig().getString("messages.item_not_tool")));
50+
51+
return;
52+
}
53+
54+
final LevelToolsItem tool = LevelToolsUtil.createLevelToolsItem(hand);
55+
tool.setLevel(0);
56+
tool.setXp(0);
57+
LevelToolsUtil.setHand(target, tool.getItemStack());
58+
sender.sendMessage(colorize(plugin.getConfig().getString("messages.successfully_reset_hand_tool", "&aSuccessfully reset tool in hand's XP/Levels for {player}.").replace("{player}", target.getName())));
59+
60+
return;
61+
}
62+
63+
final PlayerInventory inv = target.getInventory();
64+
final ItemStack[] contents = inv.getContents();
65+
for (int i = 0; i < contents.length; i++) {
66+
final ItemStack item = contents[i];
67+
if (item == null || !LevelToolsUtil.isSupportedTool(item.getType())) {
68+
continue;
69+
}
70+
final LevelToolsItem tool = LevelToolsUtil.createLevelToolsItem(item);
71+
tool.setLevel(0);
72+
tool.setXp(0);
73+
inv.setItem(i, tool.getItemStack());
74+
}
75+
sender.sendMessage(colorize(Objects.requireNonNull(plugin.getConfig().getString("messages.successfully_reset_tools")).replace("{player}", target.getName())));
9376
}
94-
}
9577

96-
@Subcommand("level")
97-
@Description("Sets the item in hand's level to provided level.")
98-
public void onLevel(Player player, int level) {
99-
if (!checkPerm(player)) {
100-
return;
78+
@Subcommand("xp")
79+
@Description("Sets the item in hand's XP to provided XP.")
80+
public void onXP(Player player, double xp) {
81+
if (!checkPerm(player)) {
82+
return;
83+
}
84+
85+
final ItemStack item = LevelToolsUtil.getHand(player);
86+
87+
if (LevelToolsUtil.isSupportedTool(item.getType())) {
88+
final LevelToolsItem tool = LevelToolsUtil.createLevelToolsItem(item);
89+
tool.setXp(xp);
90+
LevelToolsUtil.setHand(player, tool.getItemStack());
91+
player.sendMessage(colorize(Objects.requireNonNull(plugin.getConfig().getString("messages.successfully_executed_action"))));
92+
} else {
93+
player.sendMessage(colorize(Objects.requireNonNull(plugin.getConfig().getString("messages.item_not_tool"))));
94+
}
10195
}
10296

103-
final ItemStack item = player.getItemInHand();
104-
105-
if (LevelToolsUtil.isSupportedTool(item.getType())) {
106-
final LevelToolsItem tool = LevelToolsUtil.createLevelToolsItem(item);
107-
final int initial = tool.getLevel();
108-
tool.setLevel(level);
109-
if (initial != tool.getLevel()) {
110-
LevelToolsUtil.handleReward(tool, player);
111-
}
112-
player.setItemInHand(tool.getItemStack());
113-
player.sendMessage(colorize(Objects.requireNonNull(plugin.getConfig().getString("messages.successfully_executed_action"))));
114-
} else {
115-
player.sendMessage(colorize(Objects.requireNonNull(plugin.getConfig().getString("messages.item_not_tool"))));
97+
@Subcommand("level")
98+
@Description("Sets the item in hand's level to provided level.")
99+
public void onLevel(Player player, int level) {
100+
if (!checkPerm(player)) {
101+
return;
102+
}
103+
104+
final ItemStack item = LevelToolsUtil.getHand(player);
105+
106+
if (LevelToolsUtil.isSupportedTool(item.getType())) {
107+
final LevelToolsItem tool = LevelToolsUtil.createLevelToolsItem(item);
108+
final int initial = tool.getLevel();
109+
tool.setLevel(level);
110+
LevelToolsUtil.setHand(player, tool.getItemStack());
111+
if (initial != tool.getLevel()) {
112+
LevelToolsUtil.handleReward(tool, player);
113+
}
114+
player.sendMessage(colorize(Objects.requireNonNull(plugin.getConfig().getString("messages.successfully_executed_action"))));
115+
} else {
116+
player.sendMessage(colorize(Objects.requireNonNull(plugin.getConfig().getString("messages.item_not_tool"))));
117+
}
116118
}
117-
}
118119

119-
@Subcommand("levelup")
120-
@Description("Increases the item in hand's level to next level.")
121-
public void onLevelUp(Player player) {
122-
if (!checkPerm(player)) {
123-
return;
120+
@Subcommand("levelup")
121+
@Description("Increases the item in hand's level to next level.")
122+
public void onLevelUp(Player player) {
123+
if (!checkPerm(player)) {
124+
return;
125+
}
126+
127+
final ItemStack item = LevelToolsUtil.getHand(player);
128+
129+
if (LevelToolsUtil.isSupportedTool(item.getType())) {
130+
final LevelToolsItem tool = LevelToolsUtil.createLevelToolsItem(item);
131+
tool.setLevel(tool.getLevel() + 1);
132+
LevelToolsUtil.setHand(player, tool.getItemStack());
133+
LevelToolsUtil.handleReward(tool, player);
134+
player.sendMessage(colorize(Objects.requireNonNull(plugin.getConfig().getString("messages.successfully_executed_action"))));
135+
} else {
136+
player.sendMessage(colorize(Objects.requireNonNull(plugin.getConfig().getString("messages.item_not_tool"))));
137+
}
124138
}
125139

126-
final ItemStack item = player.getItemInHand();
140+
private boolean checkPerm(CommandSender sender) {
141+
if (!sender.hasPermission("leveltools.admin")) {
142+
sender.sendMessage(colorize(Objects.requireNonNull(plugin.getConfig().getString("messages.no_permission"))));
127143

128-
if (LevelToolsUtil.isSupportedTool(item.getType())) {
129-
final LevelToolsItem tool = LevelToolsUtil.createLevelToolsItem(item);
130-
tool.setLevel(tool.getLevel() + 1);
131-
LevelToolsUtil.handleReward(tool, player);
132-
player.setItemInHand(tool.getItemStack());
133-
player.sendMessage(colorize(Objects.requireNonNull(plugin.getConfig().getString("messages.successfully_executed_action"))));
134-
} else {
135-
player.sendMessage(colorize(Objects.requireNonNull(plugin.getConfig().getString("messages.item_not_tool"))));
136-
}
137-
}
138-
139-
private boolean checkPerm(CommandSender sender) {
140-
if (!sender.hasPermission("leveltools.admin")) {
141-
sender.sendMessage(colorize(Objects.requireNonNull(plugin.getConfig().getString("messages.no_permission"))));
144+
return false;
145+
}
142146

143-
return false;
147+
return true;
144148
}
145-
146-
return true;
147-
}
148149
}

‎src/main/java/me/byteful/plugin/leveltools/LevelToolsPlaceholders.java‎

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -12,65 +12,65 @@
1212
import java.util.Locale;
1313

1414
public class LevelToolsPlaceholders extends PlaceholderExpansion {
15-
@Override
16-
public @NotNull String getIdentifier() {
17-
return "leveltools";
18-
}
19-
20-
@Override
21-
public @NotNull String getAuthor() {
22-
return "byteful";
23-
}
24-
25-
@Override
26-
public @NotNull String getVersion() {
27-
return LevelToolsPlugin.getInstance().getDescription().getVersion();
28-
}
29-
30-
@Override
31-
public boolean canRegister() {
32-
return true;
33-
}
34-
35-
@Override
36-
public boolean persist() {
37-
return true;
38-
}
39-
40-
@Override
41-
public @Nullable String onPlaceholderRequest(Player player, @NotNull String params) {
42-
if (player == null) {
43-
return null;
15+
@Override
16+
public @NotNull String getIdentifier() {
17+
return "leveltools";
4418
}
4519

46-
final ItemStack hand = RedLib.MID_VERSION <= 8 ? player.getItemInHand() : player.getInventory().getItemInMainHand();
20+
@Override
21+
public @NotNull String getAuthor() {
22+
return "byteful";
23+
}
24+
25+
@Override
26+
public @NotNull String getVersion() {
27+
return LevelToolsPlugin.getInstance().getDescription().getVersion();
28+
}
29+
30+
@Override
31+
public boolean canRegister() {
32+
return true;
33+
}
4734

48-
if (!LevelToolsUtil.isSupportedTool(hand.getType())) {
49-
return "N/A";
35+
@Override
36+
public boolean persist() {
37+
return true;
5038
}
5139

52-
final LevelToolsItem item = LevelToolsUtil.createLevelToolsItem(hand);
40+
@Override
41+
public @Nullable String onPlaceholderRequest(Player player, @NotNull String params) {
42+
if (player == null) {
43+
return null;
44+
}
45+
46+
final ItemStack hand = RedLib.MID_VERSION <= 8 ? player.getItemInHand() : player.getInventory().getItemInMainHand();
47+
48+
if (!LevelToolsUtil.isSupportedTool(hand.getType())) {
49+
return "N/A";
50+
}
51+
52+
final LevelToolsItem item = LevelToolsUtil.createLevelToolsItem(hand);
5353

54-
switch (params.toLowerCase(Locale.ROOT).replace(" ", "_")) {
55-
case "level": {
56-
return "" + item.getLevel();
57-
}
54+
switch (params.toLowerCase(Locale.ROOT).replace(" ", "_")) {
55+
case "level": {
56+
return "" + item.getLevel();
57+
}
5858

59-
case "xp": {
60-
return "" + item.getXp();
61-
}
59+
case "xp": {
60+
return "" + item.getXp();
61+
}
6262

63-
case "max_xp": {
64-
return "" + item.getMaxXp();
65-
}
63+
case "max_xp": {
64+
return "" + item.getMaxXp();
65+
}
6666

67-
case "progress_bar": {
68-
return LevelToolsUtil.createDefaultProgressBar(item.getXp(), item.getMaxXp());
69-
}
67+
case "progress_bar": {
68+
return LevelToolsUtil.createDefaultProgressBar(item.getXp(), item.getMaxXp());
69+
}
7070

71-
default: {
72-
return "N/A";
73-
}
71+
default: {
72+
return "N/A";
73+
}
74+
}
7475
}
75-
}
7676
}

0 commit comments

Comments
 (0)