Skip to content

Commit 25d886f

Browse files
committed
I've gotten rid of build.yml as I decided that its better for me to manually test each release and upload a compiled jar, which of course if not trusted you can compile yourself using the source code.
- Added config.yml, this plugin will now make a folder with the config.yml file where you can edit all the welcome messages.
1 parent 1d61bc6 commit 25d886f

File tree

5 files changed

+28
-61
lines changed

5 files changed

+28
-61
lines changed

.github/workflows/build.yml

Lines changed: 0 additions & 41 deletions
This file was deleted.

src/main/java/in/rs/milivojevic/KPManager/JoinWelcomer.java

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import okhttp3.Response;
66
import org.bukkit.Bukkit;
77
import org.bukkit.ChatColor;
8+
import org.bukkit.configuration.file.FileConfiguration;
89
import org.bukkit.entity.Player;
910
import org.bukkit.event.EventHandler;
1011
import org.bukkit.event.Listener;
@@ -16,21 +17,30 @@
1617
import java.io.IOException;
1718
import java.util.Objects;
1819

19-
// import static org.bukkit.Bukkit.getLogger;
20-
2120
public final class JoinWelcomer implements Listener {
2221
private final OkHttpClient client = new OkHttpClient();
23-
private final String messagePlayer = ChatColor.AQUA + "Welcome " + ChatColor.GREEN + "{playerName}" + ChatColor.AQUA + " to my server! " + ChatColor.GREEN + "Enjoy your stay!";
24-
private final String messageEveryone = ChatColor.AQUA + "{playerName} joined from " + ChatColor.GREEN + "{country}.";
25-
private final String messageError = ChatColor.RED + "Welcome, " + ChatColor.YELLOW + "{playerName}, " + ChatColor.RED + "to the server! It seems you may have joined from localhost or there was an error with the API ip-api.com. Please check your internet connection and firewall settings.";
22+
private FileConfiguration config;
23+
private String messagePlayer;
24+
private String messageEveryone;
25+
private String messageError;
26+
private final Main plugin;
27+
public JoinWelcomer(Main plugin) {
28+
this.plugin = plugin;
29+
config = plugin.getConfig();
30+
messagePlayer = config.getString("messagePlayer").replace('&', ChatColor.COLOR_CHAR);
31+
messageEveryone = config.getString("messageEveryone").replace('&', ChatColor.COLOR_CHAR);
32+
messageError = config.getString("messageError").replace('&', ChatColor.COLOR_CHAR);
33+
}
34+
35+
36+
2637

2738
private String parseCountry(String xml) {
2839
Document doc = Jsoup.parse(xml, "", org.jsoup.parser.Parser.xmlParser());
2940
Elements elements = doc.select("country");
3041
return elements.text();
3142
}
3243

33-
3444
@EventHandler
3545
public void onPlayerJoin(PlayerJoinEvent event) {
3646
Player player = event.getPlayer();
@@ -40,23 +50,20 @@ public void onPlayerJoin(PlayerJoinEvent event) {
4050
Request requestIp;
4151
requestIp = new Request.Builder().url("http://ip-api.com/xml/" + playerIP).build();
4252

43-
player.sendMessage(messagePlayer.replace("{playerName}", player.getName()));
44-
45-
53+
player.sendMessage(ChatColor.translateAlternateColorCodes('&', messagePlayer.replace("{playerName}", player.getName())));
4654

4755
try (Response response = client.newCall(requestIp).execute()) {
4856
assert response.body() != null;
4957
String body = response.body().string();
5058
String country = parseCountry(body);
51-
// getLogger().info(player.getName() + "Joined from " + country);
59+
5260
if (!country.isEmpty()) {
53-
Bukkit.broadcastMessage(messageEveryone.replace("{playerName}", player.getName()).replace("{country}", country));
61+
Bukkit.broadcastMessage(ChatColor.translateAlternateColorCodes('&', messageEveryone.replace("{playerName}", player.getName()).replace("{country}", country)));
5462
} else {
55-
Bukkit.broadcastMessage(messageError.replace("{playerName}", player.getName()));
63+
Bukkit.broadcastMessage(ChatColor.translateAlternateColorCodes('&', messageError.replace("{playerName}", player.getName())));
5664
}
5765
} catch (IOException e) {
5866
e.printStackTrace();
5967
}
6068
}
6169
}
62-

src/main/java/in/rs/milivojevic/KPManager/LoginManager.java

Lines changed: 0 additions & 6 deletions
This file was deleted.

src/main/java/in/rs/milivojevic/KPManager/Main.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,14 @@ public final class Main extends JavaPlugin implements Listener {
1111
public void onEnable() {
1212
getLogger().info(ChatColor.translateAlternateColorCodes('&', "&bStarting!"));
1313
getLogger().info(ChatColor.translateAlternateColorCodes('&', "&bThis plugin is made by Kamey_"));
14-
Bukkit.getServer().getPluginManager().registerEvents(new JoinWelcomer(), this);
14+
this.saveDefaultConfig();
15+
JoinWelcomer joinWelcomer = new JoinWelcomer(this);
16+
getServer().getPluginManager().registerEvents(joinWelcomer, this);
1517
}
1618

1719

20+
21+
1822
@Override
1923
public void onDisable() {
2024
Bukkit.getServer().getPluginManager().disablePlugin(this);

src/main/resources/config.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
messagePlayer: '&aWelcome &b{playerName} &ato my server! &bEnjoy your stay!'
2+
messageEveryone: '&a{playerName} joined from &b{country}.'
3+
messageError: '&cWelcome, &6{playerName}, &cto the server! It seems you may have joined from localhost or there was an error with the API ip-api.com. Please check your internet connection and firewall settings.'

0 commit comments

Comments
 (0)