Skip to content

Commit

Permalink
feat(*): some fixes and update to 1.19
Browse files Browse the repository at this point in the history
  • Loading branch information
Zielin0 committed Jun 17, 2022
1 parent 520a1b8 commit 02e4178
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 19 deletions.
10 changes: 6 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,23 @@
## 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.

## Issues

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

Expand Down
10 changes: 5 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>gq.zielinus</groupId>
<artifactId>DiscordWhitelist</artifactId>
<version>1.0-SNAPSHOT</version>
<version>1.19-1.1-SNAPSHOT</version>
<packaging>jar</packaging>

<name>DiscordWhitelist</name>
Expand Down Expand Up @@ -57,7 +57,7 @@

<repositories>
<repository>
<id>spigotmc-repo</id>
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
</repository>
<repository>
Expand All @@ -70,19 +70,19 @@
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.12.2-R0.1-SNAPSHOT</version>
<version>1.19-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.24</version>
<scope>provided</scope>
<version>1.16.22</version>
</dependency>
<dependency>
<groupId>net.dv8tion</groupId>
<artifactId>JDA</artifactId>
<version>5.0.0-alpha.3</version>
<version>5.0.0-alpha.12</version>
</dependency>
</dependencies>
</project>
15 changes: 9 additions & 6 deletions src/main/java/gq/zielinus/discordwhitelist/DiscordWhitelist.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand All @@ -28,18 +27,20 @@ public final class DiscordWhitelist extends JavaPlugin {
private Guild discordServer;

private List<String> 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;
}
Expand All @@ -55,14 +56,16 @@ public void onEnable() {

@Override
public void onDisable() {
getLogger().severe(ChatColor.RED + "DiscordWhitelist disabled!");
logger.severe("DiscordWhitelist disabled!");
discordBot.shutdown();
}

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) {
Expand Down Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Expand Down
9 changes: 5 additions & 4 deletions src/main/resources/config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# default config.yml
BOT_TOKEN: 123456
register-channel: "testing"
discord-server-name: "piwnica zielina"
role-name: "whitelisted"
BOT_TOKEN: "123456"
register-channel: "Channel Name"
discord-server-name: "Server Name"
role-name: "whitelisted"
hex-color: "#213769"

0 comments on commit 02e4178

Please sign in to comment.