Skip to content

Commit 1670009

Browse files
HCFAlertsHCFAlerts
committed
Oxygen | v1.2
- Configuration of the commands: Hub, Find and Server has been improved. - They are now easier to configure.
1 parent 08eef67 commit 1670009

File tree

9 files changed

+87
-170
lines changed

9 files changed

+87
-170
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33

44

5-
# Oxygen | v1.1
5+
# Oxygen | v1.2
66
* By LiteClubDevelopment, Traduciendo
77
---
88

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>me.traduciendo.oxygen</groupId>
88
<artifactId>Oxygen</artifactId>
9-
<version>1.0.1</version>
9+
<version>1.2</version>
1010

1111
<url>https://dsc.gg/liteclubdevelopment</url>
1212
<description>Bungee Core</description>

‎src/main/java/me/traduciendo/oxygen/Oxygen.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ public void startCountdown() {
197197
if (getCountdown() == 0) {
198198
this.getProxy().getScheduler().cancel(this.scheduledTask);
199199
this.getProxy().getPluginManager().dispatchCommand(this.getProxy().getConsole(), this.config.getString("END.COMMAND"));
200-
System.out.println("Finish Command has been successfully executed!");
200+
System.out.println("End Command has been successfully executed!");
201201
}
202202
}, 0L, 1L, TimeUnit.SECONDS);
203203
}

‎src/main/java/me/traduciendo/oxygen/OxygenCommand.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,18 @@ public void execute(CommandSender sender, String[] args) {
2121

2222
if (args.length == 0) {
2323
sender.sendMessage(CC.translate("&3&m=============================="));
24-
sender.sendMessage(CC.translate("&b&lOxygen&7 &8- &7" + plugin.getDescription().getVersion()));
24+
sender.sendMessage(CC.translate("&bOxygen&7 &8- &7" + plugin.getDescription().getVersion()));
2525
sender.sendMessage(CC.translate(""));
26-
sender.sendMessage(CC.translate("&b&l┃ &f/oxygen reload"));
26+
sender.sendMessage(CC.translate("&3┃ &f/oxygen reload"));
2727
sender.sendMessage(CC.translate("&3&m=============================="));
2828
return;
2929
}
3030

3131
if (args[0].equalsIgnoreCase("reload")) {
3232
plugin.reloadConfig();
3333
sender.sendMessage(CC.translate("&3&m=============================="));
34-
sender.sendMessage(CC.translate("&b&lOxygen&7 &areloaded successfully!"));
35-
sender.sendMessage(CC.translate("&b&l┃ &7Reloaded files: &fconfig.yml"));
34+
sender.sendMessage(CC.translate("&bOxygen&7 &areloaded successfully!"));
35+
sender.sendMessage(CC.translate("&3┃ &7Reloaded files: &fconfig.yml"));
3636
sender.sendMessage(CC.translate("&3&m=============================="));
3737
} else {
3838
sender.sendMessage(CC.translate("&cInvalid command. Use /oxygen reload."));

‎src/main/java/me/traduciendo/oxygen/bungeecore/commands/server/FindCommand.java‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import me.traduciendo.oxygen.utils.CC;
55
import me.traduciendo.oxygen.utils.CreatorYML;
66
import net.md_5.bungee.api.CommandSender;
7+
import net.md_5.bungee.api.ProxyServer;
78
import net.md_5.bungee.api.connection.ProxiedPlayer;
89
import net.md_5.bungee.api.plugin.Command;
910

@@ -18,7 +19,7 @@ public class FindCommand extends Command {
1819
private final CreatorYML config = Oxygen.getInstance().getConfigYML();
1920

2021
public FindCommand() {
21-
super("find", "oxygen.command.find", "findplayer", "find player", "look", "lookup", "where", "whereis");
22+
super("find", "oxygen.command.find", "findplayer", "lookup");
2223
}
2324

2425
@Override
@@ -33,20 +34,15 @@ public void execute(CommandSender sender, String[] args) {
3334
return;
3435
}
3536

36-
ProxiedPlayer player = Oxygen.getInstance().getProxy().getPlayer(args[0]);
37-
if (player == null) {
38-
sender.sendMessage(CC.translate(
39-
config.getConfiguration().getString("FIND.OFFLINE_PLAYER_COLOR") + args[0] + " " +
40-
config.getConfiguration().getString("FIND.OFFLINE")
41-
));
42-
return;
43-
}
37+
ProxiedPlayer target = ProxyServer.getInstance().getPlayer(args[0]);
38+
String message = target == null
39+
? config.getConfiguration().getString("FIND.OFFLINE")
40+
.replace("%player%", args[0])
41+
: config.getConfiguration().getString("FIND.MESSAGE")
42+
.replace("%player%", target.getName())
43+
.replace("%server%", target.getServer().getInfo().getName());
4444

45-
sender.sendMessage(CC.translate(
46-
config.getConfiguration().getString("FIND.PLAYER_COLOR") + player.getName() +
47-
config.getConfiguration().getString("FIND.MESSAGE") + " " +
48-
config.getConfiguration().getString("FIND.SERVER_COLOR") + player.getServer().getInfo().getName() +
49-
config.getConfiguration().getString("FIND.FINAL")
50-
));
45+
sender.sendMessage(CC.translate(message));
5146
}
5247
}
48+

‎src/main/java/me/traduciendo/oxygen/bungeecore/commands/server/HubCommand.java‎

Lines changed: 25 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -26,48 +26,38 @@ public HubCommand() {
2626
}
2727

2828
@Override
29-
public void execute(CommandSender commandSender, String[] args) {
29+
public void execute(CommandSender sender, String[] args) {
3030
if (!config.getConfiguration().getBoolean("HUB.ENABLED", true)) {
31-
commandSender.sendMessage(CC.translate("&cThis command is currently disabled."));
31+
sender.sendMessage(CC.translate("&cThis command is currently disabled."));
3232
return;
3333
}
3434

35-
if (!(commandSender instanceof ProxiedPlayer)) {
35+
if (!(sender instanceof ProxiedPlayer)) return;
36+
ProxiedPlayer player = (ProxiedPlayer) sender;
37+
38+
int hubNumber = args.length == 1 ? parseHubNumber(args[0]) : 0;
39+
if (hubNumber < 0) {
40+
player.sendMessage(CC.translate("&cInvalid hub number."));
3641
return;
3742
}
38-
ProxiedPlayer player = (ProxiedPlayer) commandSender;
39-
if (args.length == 0) {
40-
Random random = new Random();
41-
int attachment = random.nextInt(1) + 1;
42-
if (attachment < 2) {
43-
player.sendMessage(CC.translate(config.getConfiguration().getString("HUB.MESSAGE") + " " +
44-
(config.getConfiguration().getString("HUB.HUB-NAME") + attachment +
45-
config.getConfiguration().getString("HUB.FINAL"))));
46-
ServerInfo serverInfo = ProxyServer.getInstance().getServerInfo((config.getConfiguration().getString("HUB.HUB-NAME") + attachment));
47-
player.connect(serverInfo);
48-
return;
49-
}
50-
player.sendMessage(CC.translate("&cWe don't have more hubs than 3, please try again."));
51-
} else {
52-
if (args.length != 1) {
53-
return;
54-
}
55-
try {
56-
Integer.parseInt(args[0]);
57-
} catch (NumberFormatException e) {
58-
player.sendMessage(CC.translate("&cA hub with that name cannot be found."));
59-
return;
60-
}
6143

62-
if (Integer.parseInt(args[0]) < 2) {
63-
player.sendMessage(CC.translate(config.getConfiguration().getString("HUB.MESSAGE") + " " +
64-
(config.getConfiguration().getString("HUB.HUB-NAME") + args[0] +
65-
config.getConfiguration().getString("HUB.FINAL"))));
66-
ServerInfo serverInfo2 = ProxyServer.getInstance().getServerInfo((config.getConfiguration().getString("HUB.HUB-NAME") + args[0]));
67-
player.connect(serverInfo2);
68-
return;
69-
}
70-
player.sendMessage(CC.translate("&cWe don't have more hubs than 1, please try again."));
44+
String hubName = "Hub-0" + hubNumber;
45+
ServerInfo serverInfo = ProxyServer.getInstance().getServerInfo(hubName);
46+
47+
if (serverInfo == null) {
48+
player.sendMessage(CC.translate("&cHub not found. Use: /hub <number>"));
49+
return;
50+
}
51+
52+
player.sendMessage(CC.translate(config.getConfiguration().getString("HUB.MESSAGE").replace("%server%", String.valueOf(hubNumber))));
53+
player.connect(serverInfo);
54+
}
55+
56+
private int parseHubNumber(String arg) {
57+
try {
58+
return Integer.parseInt(arg);
59+
} catch (NumberFormatException e) {
60+
return -1;
7161
}
7262
}
7363
}

‎src/main/java/me/traduciendo/oxygen/bungeecore/commands/server/ServerCommand.java‎

Lines changed: 33 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import me.traduciendo.oxygen.utils.CC;
55
import me.traduciendo.oxygen.utils.CreatorYML;
66
import net.md_5.bungee.api.CommandSender;
7+
import net.md_5.bungee.api.ProxyServer;
78
import net.md_5.bungee.api.config.ServerInfo;
89
import net.md_5.bungee.api.connection.ProxiedPlayer;
910
import net.md_5.bungee.api.plugin.Command;
@@ -24,41 +25,42 @@ public ServerCommand() {
2425
}
2526

2627
@Override
27-
public void execute(CommandSender commandSender, String[] args) {
28+
public void execute(CommandSender sender, String[] args) {
2829
if (!config.getConfiguration().getBoolean("SERVER.ENABLED", true)) {
29-
commandSender.sendMessage(CC.translate("&cThis command is currently disabled."));
30+
sender.sendMessage(CC.translate("&cThis command is currently disabled."));
3031
return;
3132
}
3233

33-
if (commandSender instanceof ProxiedPlayer) {
34-
ProxiedPlayer player = (ProxiedPlayer) commandSender;
35-
if (player.hasPermission("oxygen.command.server")) {
36-
if (args.length == 0) {
37-
player.sendMessage(CC.translate((config.getConfiguration().getString("SERVER.CONNECTED") + " " + player.getServer().getInfo().getName() + (config.getConfiguration().getString("SERVER.CONNECTED_FINAL")))));
38-
StringBuilder servers = new StringBuilder(CC.translate((config.getConfiguration().getString("SERVER.SERVERS"))));
39-
boolean first = true;
40-
for (String name : Oxygen.getInstance().getProxy().getServers().keySet()) {
41-
if (first) {
42-
servers.append(name);
43-
} else {
44-
servers.append(CC.translate((config.getConfiguration().getString("SERVER.FORMAT")))).append(name);
45-
}
46-
first = false;
47-
}
48-
player.sendMessage(CC.translate(servers.toString()));
49-
player.sendMessage(CC.translate((config.getConfiguration().getString("SERVER.USAGE"))));
50-
} else if (args.length == 1) {
51-
ServerInfo si = Oxygen.getInstance().getProxy().getServerInfo(args[0]);
52-
if (si != null) {
53-
player.sendMessage(CC.translate((config.getConfiguration().getString("SERVER.MESSAGE") + " " + si.getName() + (config.getConfiguration().getString("SERVER.FINAL")))));
54-
player.connect(si);
55-
} else {
56-
player.sendMessage(CC.translate((config.getConfiguration().getString("SERVER.NO_PERMISSION"))));
57-
}
58-
}
59-
} else {
60-
player.sendMessage(CC.translate((config.getConfiguration().getString("SERVER.NO_PERMISSION"))));
61-
}
34+
if (!(sender instanceof ProxiedPlayer)) return;
35+
ProxiedPlayer player = (ProxiedPlayer) sender;
36+
37+
if (args.length == 0) {
38+
showCurrentServer(player);
39+
} else if (args.length == 1) {
40+
connectToServer(player, args[0]);
41+
} else {
42+
player.sendMessage(CC.translate(config.getConfiguration().getString("SERVER.USAGE")));
43+
}
44+
}
45+
46+
private void showCurrentServer(ProxiedPlayer player) {
47+
String currentServer = player.getServer().getInfo().getName();
48+
player.sendMessage(CC.translate(config.getConfiguration().getString("SERVER.CONNECTED").replace("%server%", currentServer)));
49+
50+
String serversList = ProxyServer.getInstance().getServers().keySet().stream()
51+
.reduce(config.getConfiguration().getString("SERVER.SERVERS"), (list, server) -> list + server + config.getConfiguration().getString("SERVER.FORMAT"));
52+
53+
player.sendMessage(CC.translate(serversList));
54+
}
55+
56+
private void connectToServer(ProxiedPlayer player, String serverName) {
57+
ServerInfo serverInfo = ProxyServer.getInstance().getServerInfo(serverName);
58+
if (serverInfo == null) {
59+
player.sendMessage(CC.translate(config.getConfiguration().getString("SERVER.NO_PERMISSION")));
60+
return;
6261
}
62+
63+
player.sendMessage(CC.translate(config.getConfiguration().getString("SERVER.MESSAGE").replace("%server%", serverName)));
64+
player.connect(serverInfo);
6365
}
6466
}

‎src/main/resources/bungee.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Oxygen
22
main: me.traduciendo.oxygen.Oxygen
33
author: Traduciendo
4-
version: 1.1
4+
version: 1.2
55
description: Modern Bungee Core
66
website: dsc.gg/liteclubdevelopment

‎src/main/resources/config.yml‎

Lines changed: 10 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#=============================================#
22
# #
3-
# Oxygen | v1.1 #
3+
# Oxygen | v1.2 #
44
# LiteClubDevelopment #
55
# #
66
#=============================================#
@@ -21,70 +21,6 @@ TIMER:
2121
SLOTS: 3500 # Max Slots
2222
CLOCK-TYPE: 1 # 1 for custom or 2 for d:h:m:s clock
2323

24-
# Chat
25-
CHATS:
26-
DEFAULT:
27-
ENABLED: true
28-
PERM: "oxygen.chat.default"
29-
PERM_ENABLED: false
30-
FORMAT: "%addon% %tag% %rank% %player%&7: &f%message%"
31-
ADDON_ENABLED: true
32-
DONATOR:
33-
ENABLED: true
34-
PERM: "oxygen.chat.donator"
35-
PERM_ENABLED: true
36-
FORMAT: "&a[Donator] %tag%%rank%%player%&7: &f%message%"
37-
ADDON_ENABLED: true
38-
ADDON: "&a[Donator]" # Addon display on default chat, example: [Donator] [$$$] [Mod] Traduciendo: Example Message
39-
STAFF:
40-
ENABLED: true
41-
PERM: "oxygen.chat.staff"
42-
PERM_ENABLED: true
43-
FORMAT: "&b[Staff] %tag%%rank%%player%&7: &f%message%"
44-
ADDON_ENABLED: true
45-
ADDON: "&b[Staff]" # Addon display on default chat, example: [Staff] [$$$] [Mod] Traduciendo: Example Message
46-
ADMIN:
47-
ENABLED: true
48-
PERM: "oxygen.chat.admin"
49-
PERM_ENABLED: true
50-
FORMAT: "&c[Admin] %tag%%rank%%player%&7: &f%message%"
51-
ADDON_ENABLED: true
52-
ADDON: "&c[Admin]" # Addon display on default chat, example: [Admin] [$$$] [Mod] Traduciendo: Example Message
53-
CUSTOM:
54-
ENABLED: true
55-
PERM: "oxygen.chat.custom"
56-
PERM_ENABLED: true
57-
FORMAT: "&5[Custom] %tag%%rank%%player%&7: &f%message%"
58-
ADDON_ENABLED: true
59-
ADDON: "&5[Custom]" # Addon display on default chat, example: [Custom] [$$$] [Mod] Traduciendo: Example Message
60-
61-
# Tag
62-
TAGS:
63-
HEART: # oxygen.tag.heart
64-
ENABLED: true
65-
NAME: "Heart"
66-
DISPLAY_NAME: "&c❤"
67-
DISPLAY_LORE_SELECT:
68-
- "&7Click to select %display_name%&7 tag."
69-
DISPLAY_LORE_UN_SELECT:
70-
- "&7Click to remove %display_name%&7 tag."
71-
DISPLAY_LORE_NO_PERMISSION:
72-
- "&7Buy %display_name%&7 tag at /store"
73-
PREFIX: "&c❤"
74-
SLOT: 1
75-
RICH: # oxygen.tag.rich
76-
ENABLED: true
77-
NAME: "Rich"
78-
DISPLAY_NAME: "&a$&2$&a$"
79-
DISPLAY_LORE_SELECT:
80-
- "&7Click to select %display_name%&7 tag."
81-
DISPLAY_LORE_UN_SELECT:
82-
- "&7Click to remove %display_name%&7 tag."
83-
DISPLAY_LORE_NO_PERMISSION:
84-
- "&7Buy %display_name%&7 tag at /store"
85-
PREFIX: "&a$&2$&a$"
86-
SLOT: 2
87-
8824
# Messages
8925
KICK:
9026
ENABLED: true
@@ -149,28 +85,21 @@ HELP:
14985
- ""
15086
- "&4⚠ &cFor instant assistance join our teamspeak!"
15187
- "&7&m----------------------------------------"
88+
15289
HUB:
15390
ENABLED: true
154-
MESSAGE: "&aSending you to the &f"
155-
FINAL: "&a..." # Final Message: &aSending you to the &fHub-01&a...
156-
HUB-NAME: "Hub-0" # Automatic Hub Detection.
91+
MESSAGE: "&aSending you to the &fHub-0%server%&a..."
15792
FIND:
158-
ENABLED: true # oxygen.command.find
159-
MESSAGE: "&fis currently on"
160-
FINAL: "&f." # Final Message: &4<player> &fis currently on &4<server>&f.
161-
PLAYER_COLOR: "&4" # Only works in main message.
162-
SERVER_COLOR: "&4" # Only works in main message.
163-
OFFLINE: "&cis currently not on the network."
164-
OFFLINE_PLAYER_COLOR: "&c" # Only works in offline message.
93+
ENABLED: true
94+
MESSAGE: "&4%player% &cis currently on &4%server%&f."
95+
OFFLINE: "&4%player% &cis currently not on the network."
16596
USAGE: "&cUsage: /find <player>"
16697
SERVER:
16798
ENABLED: true
168-
MESSAGE: "&aConnecting you to &f"
169-
FINAL: "&a!" # Final Message: &aConnecting you to &f<server>&a!
170-
CONNECTED: "&cYou are currently connected to &f"
171-
CONNECTED_FINAL: "&c." # Final Message: &cYou are currently connected to &f<server>&c.
99+
MESSAGE: "&aConnecting you to &f%server%&a!"
100+
CONNECTED: "&cYou are currently connected to &f%server%&c."
172101
USAGE: "&cConnect to a server with &f/server <name>&c."
173102
SERVERS: "&aServers&7: &f"
174-
FORMAT: "&7, &f" # Ex: &aServers&7: &fLobby&7, &fHCF
175-
NO_PERMISSION: "&cYou don't have permissions or server don't exist." # oxygen.command.server
103+
FORMAT: " &f" # Ex: &aServers&7: &fLobby &fHCF
104+
NO_PERMISSION: "&cYou don't have permissions or server don't exist."
176105

0 commit comments

Comments
 (0)