Skip to content

Commit ee451ad

Browse files
author
Sanoranx
committed
- Added config support for lines and db
1 parent 085c83d commit ee451ad

File tree

10 files changed

+72
-51
lines changed

10 files changed

+72
-51
lines changed

‎config.yml

+15-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,19 @@
1+
db:
2+
host: 'localhost'
3+
port: '3306'
4+
user: 'sanoranx'
5+
password: 'password'
6+
database: 'minecraft'
7+
18
messages:
29
welcome: 'Some message here'
3-
ban: 'You have been banned because of 3 warns on your account'
10+
warn-success: '§b[Warn Me] §fPlayer was successfully warned.'
11+
warn-clean: '§b[Warn Me] §fPlayer %s now has 0 warns'
12+
after-warn-count: '§b[Warn Me] §fPlayer %s now has %d warns.'
13+
player-warn-message: '§b[Warn Me] %s §fhas warned you because of %s.'
14+
player-warn-ban: '§rYou have been banned because of 3 warns.'
15+
console-warn-message: '§b[Warn Me] §f Player %s has been warned by %s with reason of %s'
16+
ban: '§b[Warn Me] You have been banned because of 3 warns on your account'
417
warn-message: '[Warn Me] Player: %s was warned with reason of %s'
5-
warn-success: '[Warn Me] Player %s was successfully warned'
618
warn-after-counting: '[Warn Me] Player %s now has %s warns'
19+
database-connection-error: '§b[Warn Me] §fUnable to connect to database.'

‎out/production/WarnME/ru/sanoranx/WarnMe/Handler.class

172 Bytes
Binary file not shown.

‎out/production/WarnME/ru/sanoranx/WarnMe/Main.class

493 Bytes
Binary file not shown.

‎out/production/WarnME/ru/sanoranx/WarnMe/comands/Warn.class

-133 Bytes
Binary file not shown.

‎out/production/WarnME/ru/sanoranx/WarnMe/database/Database.class

230 Bytes
Binary file not shown.

‎plugin.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: SeeWhatICanDo
1+
name: WarnMe
22
main: ru.sanoranx.WarnMe.Main
33
version: 1.0
44
author: SanoranX

‎src/ru/sanoranx/WarnMe/Handler.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package ru.sanoranx.WarnMe;
22

33
import org.bukkit.Bukkit;
4-
import org.bukkit.ChatColor;
54
import org.bukkit.entity.Player;
65
import org.bukkit.event.EventHandler;
76
import org.bukkit.event.Listener;
@@ -17,11 +16,11 @@ public Handler(Main plugin){
1716
}
1817

1918
@EventHandler
20-
public void join(PlayerJoinEvent e) throws URISyntaxException {
19+
public void join(PlayerJoinEvent e) {
2120
Player player = e.getPlayer();
2221
Bukkit.getLogger().info("Checking player " + player.getName() + " for warns");
23-
if(plugin.databaseWorker.checkWarnsCount(player) > 2){
24-
player.kickPlayer(ChatColor.RED + "[Warn Me] Your account has been blocked because of warns.");
22+
if(plugin.database.isConnected() && plugin.databaseWorker.checkWarnsCount(player) > 2){
23+
player.kickPlayer(plugin.getConfig().getString("messages.player-warn-ban"));
2524
}
2625
}
2726

‎src/ru/sanoranx/WarnMe/Main.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@ public class Main extends JavaPlugin {
1414

1515
public Database database;
1616
public DatabaseWorker databaseWorker;
17+
1718
@Override
1819
public void onEnable(){
19-
this.database = new Database();
20+
this.database = new Database(this.getConfig().getString("db.host"), this.getConfig().getString("db.port"), this.getConfig().getString("db.database"), getConfig().getString("db.user"), getConfig().getString("db.password"));
2021
this.databaseWorker = new DatabaseWorker(this);
2122
try {
2223
database.connect();
@@ -37,6 +38,7 @@ public void onEnable(){
3738
getLogger().info("Enabled");
3839
getLogger().info("Warn system v0.1 activated");
3940
getLogger().info("Made by SanoranX");
41+
getLogger().info(ChatColor.AQUA + "|" + ChatColor.WHITE);
4042
}
4143

4244

‎src/ru/sanoranx/WarnMe/comands/Warn.java

+37-38
Original file line numberDiff line numberDiff line change
@@ -20,54 +20,53 @@ public Warn(Main main) {
2020

2121
@Override
2222
public boolean onCommand(CommandSender commandSender, Command command, String s, String[] strings) {
23-
if(strings[0].toLowerCase().equals("add")){
24-
if(strings.length == 3) {
25-
boolean isOk = false;
26-
if (!(commandSender instanceof ConsoleCommandSender) && plugin.databaseWorker.addWarn(getPlayer(strings[1]), (Player) commandSender, strings[2])) {
27-
Bukkit.getConsoleSender().sendMessage(ChatColor.RED + "Player: " + strings[0] + " was warned with reason of: " + strings[2] + " by: " + commandSender.getName());
28-
System.out.println("Message:" + plugin.getConfig().getString("messages.welcome"));
29-
commandSender.sendMessage(plugin.getConfig().getString("messages.welcome"));
30-
commandSender.sendMessage(ChatColor.AQUA + "[Warn Me]" + ChatColor.WHITE + " Player was successfully warned.");
31-
commandSender.sendMessage(ChatColor.AQUA + "[Warn Me]" + ChatColor.WHITE + " Player " + strings[1] + " now has: " + plugin.databaseWorker.checkWarnsCount(getPlayer(strings[1])) + " warns");
32-
isOk = true;
33-
}
34-
else if(commandSender instanceof ConsoleCommandSender){
35-
if(plugin.databaseWorker.addWarn(getPlayer(strings[1]), strings[2])){
36-
Bukkit.getConsoleSender().sendMessage(ChatColor.AQUA + "[Warn Me]" + ChatColor.WHITE + " Player was successfully warned.");
37-
Bukkit.getConsoleSender().sendMessage(ChatColor.AQUA + "[Warn Me]" + ChatColor.WHITE + " Player " + strings[1] + " now has: " + plugin.databaseWorker.checkWarnsCount(getPlayer(strings[1])) + " warns");
23+
if(plugin.database.isConnected()){
24+
if(strings[0].toLowerCase().equals("add")){
25+
if(strings.length == 3) {
26+
if (!(commandSender instanceof ConsoleCommandSender) && plugin.databaseWorker.addWarn(getPlayer(strings[1]), (Player) commandSender, strings[2])) {
27+
Bukkit.getConsoleSender().sendMessage(String.format(plugin.getConfig().getString("messages.console-warn-message"), strings[1], commandSender.getName(), strings[2]));
28+
commandSender.sendMessage(plugin.getConfig().getString("messages.warn-success"));
29+
commandSender.sendMessage(String.format(plugin.getConfig().getString("messages.after-warn-count"), strings[1], plugin.databaseWorker.checkWarnsCount(getPlayer(strings[1]))));
30+
}
31+
else if(commandSender instanceof ConsoleCommandSender){
32+
if(plugin.databaseWorker.addWarn(getPlayer(strings[1]), strings[2])){
33+
Bukkit.getConsoleSender().sendMessage(plugin.getConfig().getString("messages.warn-success"));
34+
Bukkit.getConsoleSender().sendMessage(String.format(plugin.getConfig().getString("messages.after-warn-count"), strings[1], plugin.databaseWorker.checkWarnsCount(getPlayer(strings[1]))));
35+
}
36+
}
37+
38+
if(plugin.databaseWorker.checkWarnsCount(getPlayer(strings[1])) > 2){
39+
if(getPlayer(strings[1]).isOnline()){
40+
((Player)getPlayer(strings[1])).kickPlayer((String.format(plugin.getConfig().getString("messages.player-warn-message"), commandSender.getName(), strings[2])) + "\n" + plugin.getConfig().getString("messages.player-warn-ban"));
41+
}
3842
}
39-
}
4043

41-
if(plugin.databaseWorker.checkWarnsCount(getPlayer(strings[1])) > 2){
4244
if(getPlayer(strings[1]).isOnline()){
43-
((Player)getPlayer(strings[1])).kickPlayer(ChatColor.AQUA + "[Warn Me] " + ChatColor.WHITE + commandSender.getName() + " has just warned you with reason of [" + strings[2] + "]. " + ChatColor.RED + "\nYou have been banned because of 3 warns");
45+
((Player)getPlayer(strings[1])).sendMessage(String.format(plugin.getConfig().getString("messages.player-warn-message"), commandSender.getName(), strings[2]));
4446
}
47+
return true;
4548
}
46-
47-
if(getPlayer(strings[1]).isOnline()){
48-
((Player)getPlayer(strings[1])).sendMessage(ChatColor.AQUA + "[Warn Me] " + ChatColor.WHITE + commandSender.getName() + " has just warned you with reason of [" + strings[2] + "]. " + "You now have: " + plugin.databaseWorker.checkWarnsCount(getPlayer(strings[1])) + " warns");
49+
return false;
50+
}
51+
else if(strings[0].toLowerCase().equals("clear")){
52+
Bukkit.getLogger().info("Clearing");
53+
if(plugin.databaseWorker.cleanWarns(getPlayer(strings[1]))){
54+
commandSender.sendMessage(String.format(plugin.getConfig().getString("messages.warn-clean"), strings[1]));
4955
}
5056
return true;
5157
}
52-
return false;
53-
}
54-
else if(strings[0].toLowerCase().equals("clear")){
55-
Bukkit.getLogger().info("Clearing");
56-
if(plugin.databaseWorker.cleanWarns(getPlayer(strings[1]))){
57-
commandSender.sendMessage(ChatColor.AQUA + "[Warn Me] " + strings[1] + ChatColor.WHITE + " Has been cleaned.");
58+
else if(strings[0].toLowerCase().equals("info") && strings.length == 2){
59+
Bukkit.getLogger().info("Checking if " + strings[1] + " has any warns by " + commandSender.getName());
60+
commandSender.sendMessage(ChatColor.AQUA + "[Warn Me]" + ChatColor.WHITE);
61+
commandSender.sendMessage(ChatColor.AQUA + "Player: " + ChatColor.WHITE + strings[1]);
62+
commandSender.sendMessage(ChatColor.AQUA + "UUID: " + ChatColor.WHITE + getPlayer(strings[1]).getUniqueId());
63+
commandSender.sendMessage(ChatColor.AQUA + "Warns: " + ChatColor.WHITE + plugin.databaseWorker.checkWarnsCount(getPlayer(strings[1])));
64+
return true;
5865
}
59-
return true;
60-
}
61-
else if(strings[0].toLowerCase().equals("info")){
62-
Bukkit.getLogger().info("Checking if " + strings[1] + " has any warns by " + commandSender.getName());
63-
commandSender.sendMessage(ChatColor.AQUA + "[Warn Me]" + ChatColor.WHITE);
64-
commandSender.sendMessage(ChatColor.AQUA + "Player: " + ChatColor.WHITE + strings[1]);
65-
commandSender.sendMessage(ChatColor.AQUA + "UUID: " + ChatColor.WHITE + getPlayer(strings[1]).getUniqueId());
66-
commandSender.sendMessage(ChatColor.AQUA + "Warns: " + ChatColor.WHITE + plugin.databaseWorker.checkWarnsCount(getPlayer(strings[1])));
67-
return true;
66+
return false;
6867
}
69-
return false;
70-
68+
commandSender.sendMessage(plugin.getConfig().getString("messages.database-connection-error"));
69+
return true;
7170
}
7271

7372
private OfflinePlayer getPlayer(String name){

‎src/ru/sanoranx/WarnMe/database/Database.java

+13-5
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,22 @@
66
import java.sql.SQLException;
77

88
public class Database {
9-
private final String host = "localhost";
10-
private final String port = "3306";
11-
private final String database = "minecraft";
12-
private final String username = "sanoranx";
13-
private final String password = "password";
9+
private final String host;
10+
private final String port;
11+
private final String database;
12+
private final String username;
13+
private final String password;
1414

1515
private Connection connection;
1616

17+
public Database(String host, String port, String database, String username, String password) {
18+
this.host = host;
19+
this.port = port;
20+
this.database = database;
21+
this.username = username;
22+
this.password = password;
23+
}
24+
1725
public boolean isConnected() {
1826
return (connection != null);
1927
}

0 commit comments

Comments
 (0)