diff --git a/README.md b/README.md
index 494868f..80d4321 100644
--- a/README.md
+++ b/README.md
@@ -5,13 +5,13 @@
## Requirements
- Discord Bot (Make sure that bot has permission to create roles)
- Discord Server
-- Minecraft (1.12.2)
-- Minecraft Server (1.12.2)
+- Minecraft (1.19)
+- Minecraft Server (1.19)
## Installing
1. Go to releases ([here](https://github.com/Zielin0/DiscordWhitelist/releases)).
-2. Download the `DiscordWhitelist-1.0-SNAPSHOT.jar` file.
+2. Download the `DiscordWhitelist-11.19-1.1-SNAPSHOT.jar` file.
3. Put this file into the plugins folder.
4. Start the server.
@@ -19,7 +19,9 @@
If you encounter any issues, please open an [ISSUE](https://github.com/Zielin0/DiscordWhitelist/issues).
-No known issues at the moment.
+Known issues:
+
+- When the token is valid and server name is not console will output token error
## License
diff --git a/pom.xml b/pom.xml
index a555b2f..f9c1aec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
gq.zielinus
DiscordWhitelist
- 1.0-SNAPSHOT
+ 1.19-1.1-SNAPSHOT
jar
DiscordWhitelist
@@ -57,7 +57,7 @@
- spigotmc-repo
+ spigot-repo
https://hub.spigotmc.org/nexus/content/repositories/snapshots/
@@ -70,19 +70,19 @@
org.spigotmc
spigot-api
- 1.12.2-R0.1-SNAPSHOT
+ 1.19-R0.1-SNAPSHOT
provided
org.projectlombok
lombok
+ 1.18.24
provided
- 1.16.22
net.dv8tion
JDA
- 5.0.0-alpha.3
+ 5.0.0-alpha.12
diff --git a/src/main/java/gq/zielinus/discordwhitelist/DiscordWhitelist.java b/src/main/java/gq/zielinus/discordwhitelist/DiscordWhitelist.java
index 816a736..89f09db 100644
--- a/src/main/java/gq/zielinus/discordwhitelist/DiscordWhitelist.java
+++ b/src/main/java/gq/zielinus/discordwhitelist/DiscordWhitelist.java
@@ -10,13 +10,12 @@
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.Role;
import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.entity.Player;
import org.bukkit.plugin.java.JavaPlugin;
import java.awt.*;
import java.util.ArrayList;
import java.util.List;
+import java.util.logging.Logger;
public final class DiscordWhitelist extends JavaPlugin {
@@ -28,18 +27,20 @@ public final class DiscordWhitelist extends JavaPlugin {
private Guild discordServer;
private List igns = new ArrayList<>();
+
+ public Logger logger = Bukkit.getLogger();
@SneakyThrows
@Override
public void onEnable() {
super.onEnable();
- getLogger().info(ChatColor.LIGHT_PURPLE + "DiscordWhitelist enabled!");
+ logger.info("DiscordWhitelist enabled!");
saveDefaultConfig();
String botToken = getConfig().getString("BOT_TOKEN");
if (botToken == null) {
- getLogger().severe(ChatColor.RED + "Please provide a BOT_TOKEN in the config.yml file.");
+ logger.warning("Please provide a BOT_TOKEN in the config.yml file.");
getServer().getPluginManager().disablePlugin(this);
return;
}
@@ -55,7 +56,7 @@ public void onEnable() {
@Override
public void onDisable() {
- getLogger().severe(ChatColor.RED + "DiscordWhitelist disabled!");
+ logger.severe("DiscordWhitelist disabled!");
discordBot.shutdown();
}
@@ -63,6 +64,8 @@ public String getRegisterChannel() {
return getConfigOptionOrDefault("register-channel", "test");
}
+ public String getHexColor() { return getConfigOptionOrDefault("hex-color", "#ff32a7"); }
+
private String getConfigOptionOrDefault(String key, String defaultValue) {
String name = getConfig().getString(key);
if (name == null) {
@@ -91,7 +94,7 @@ public void clearIGNs() {
}
public Role getOrCreateWhitelistedRle() {
- return getOrCreateRole(getWhitelistedRoleName(), "#ff32a7");
+ return getOrCreateRole(getWhitelistedRoleName(), getHexColor());
}
private Role getOrCreateRole(String name, String hexColor) {
diff --git a/src/main/java/gq/zielinus/discordwhitelist/listeners/DiscordEventListener.java b/src/main/java/gq/zielinus/discordwhitelist/listeners/DiscordEventListener.java
index fea5956..a10af56 100644
--- a/src/main/java/gq/zielinus/discordwhitelist/listeners/DiscordEventListener.java
+++ b/src/main/java/gq/zielinus/discordwhitelist/listeners/DiscordEventListener.java
@@ -74,6 +74,7 @@ public void onMessageReceived(@NotNull MessageReceivedEvent event) {
} else {
messageToSend = "You've registered and added to whitelist! :sunglasses:";
reactionToSend = "U+1F60E";
+ Bukkit.getLogger().info(message + " has registered to whitelist.");
plugin.registerIGN(message);
}
}
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index da3742e..416a3ac 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -1,5 +1,6 @@
# default config.yml
-BOT_TOKEN: 123456
-register-channel: "testing"
-discord-server-name: "piwnica zielina"
-role-name: "whitelisted"
\ No newline at end of file
+BOT_TOKEN: "123456"
+register-channel: "Channel Name"
+discord-server-name: "Server Name"
+role-name: "whitelisted"
+hex-color: "#213769"
\ No newline at end of file