Coldsmile/BugRepGUI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Async query

Browse Source
This commit is contained in:
Izzel_Aliz 2018-01-05 13:19:53 +08:00
parent e33c35ce34
commit e1cad8d3df
16 changed files with 655 additions and 677 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored Normal file
View File

@ -0,0 +1,3 @@
# Created by .ignore support plugin (hsz.mobi)
.gitignore
.idea/

2
pom.xml
View File

@ -57,14 +57,12 @@
<type>jar</type>
<scope>provided</scope>
</dependency>
<!--Spigot API-->
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.8.3-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<!--Bukkit API-->
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>

113
src/com/ilummc/bugrepgui/Commands.java Normal file
View File

@ -0,0 +1,113 @@
package com.ilummc.bugrepgui;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
public class Commands implements CommandExecutor {
@Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (command.getName().equals("report")) {
if (sender instanceof Player) {
if (sender.hasPermission("bugrepgui.report")) {
Bug bug = new Bug((Player) sender);
Storage.putMap(bug);
Storage.send(sender, "input-bug-info");
return true;
} else {
Storage.send(sender, "no-perm");
return true;
}
} else {
Storage.send(sender, "must-player-run");
return true;
}
} else {
if (args.length == 1 && args[0].equalsIgnoreCase("help")) {
Storage.getHelp(sender);
return true;
}
if (args.length == 1 && args[0].equalsIgnoreCase("view")) {
if (sender instanceof Player) {
if (sender.hasPermission("bugrepgui.view")) {
GUI.open((Player) sender, 1);
} else {
Storage.send(sender, "no-perm");
}
return true;
} else {
Storage.send(sender, "must-player-run");
}
return true;
}
if (args.length == 2 && args[0].equalsIgnoreCase("view") && args[1].equalsIgnoreCase("history")) {
if (sender instanceof Player) {
if (sender.hasPermission("bugrepgui.view")) {
GUI.openHistory((Player) sender, 1);
} else {
Storage.send(sender, "no-perm");
}
return true;
} else {
Storage.send(sender, "must-player-run");
}
}
if (args.length == 1 && args[0].equalsIgnoreCase("report")) {
if (sender instanceof Player) {
if (sender.hasPermission("bugrepgui.report")) {
Bug bug = new Bug((Player) sender);
Storage.putMap(bug);
Storage.send(sender, "input-bug-info");
return true;
} else {
Storage.send(sender, "no-perm");
return true;
}
} else {
Storage.send(sender, "must-player-run");
return true;
}
}
if (args.length == 2 && args[0].equalsIgnoreCase("stats")) {
if (args[1].equalsIgnoreCase("text")) {
if (sender.hasPermission("bugrepgui.stats.text")) {
final CommandSender send = sender;
Thread t = new Thread(() -> {
send.sendMessage(Stats.loadTextRep());
try {
Thread.sleep(3000);
Storage.send(send, "wait");
Thread.sleep(5000);
} catch (InterruptedException e) {
Storage.logExcept(e);
}
send.sendMessage(Stats.loadTextExe());
});
t.start();
return true;
} else {
Storage.send(sender, "no-perm");
return true;
}
}
if (args[1].equalsIgnoreCase("gui")) {
return true;
}
return true;
}
if (args.length == 1 && args[0].equalsIgnoreCase("reload")) {
if (sender.hasPermission("bugrepgui.reload")) {
Storage.reload();
Storage.send(sender, "reload-suc");
return true;
} else {
Storage.send(sender, "no-perm");
}
}
Storage.getHelp(sender);
return true;
}
}
}

16
src/com/ilummc/bugrepgui/Database.java
View File

@ -1,15 +1,12 @@
package com.ilummc.bugrepgui;
import java.sql.*;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import java.sql.*;
import java.util.*;
import java.util.Date;
public class Database {
/*
* SERIAL REPNAME REPTIME REPMSG EXENAME EXETIME EXEMSG EXECUTED BACK
@ -317,10 +314,7 @@ public class Database {
c = DriverManager.getConnection(url, Storage.getConfig().getString("mysql-username"),
Storage.getConfig().getString("mysql-password"));
state = c.createStatement();
} catch (SQLException e) {
Storage.logExcept(e);
return false;
} catch (ClassNotFoundException e) {
} catch (SQLException | ClassNotFoundException e) {
Storage.logExcept(e);
return false;
}

23
src/com/ilummc/bugrepgui/EventListener.java
View File

@ -1,20 +1,17 @@
package com.ilummc.bugrepgui;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.event.player.AsyncPlayerChatEvent;
import org.bukkit.event.player.PlayerCommandPreprocessEvent;
import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerMoveEvent;
import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.event.player.*;
import org.bukkit.inventory.Inventory;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class EventListener implements org.bukkit.event.Listener {
String alias;
public EventListener setAlias(String msg) {
this.alias = msg;
@ -38,7 +35,7 @@ public class EventListener implements org.bukkit.event.Listener {
}
}
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = false)
@EventHandler(priority = EventPriority.HIGHEST)
public void onChat(AsyncPlayerChatEvent evt) {
String regex2 = "[^']+";
Pattern pattern2 = Pattern.compile(regex2);
@ -68,7 +65,7 @@ public class EventListener implements org.bukkit.event.Listener {
}
}
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = false)
@EventHandler(priority = EventPriority.HIGHEST)
public void onMove(PlayerMoveEvent evt) {
if (Storage.map.containsKey(evt.getPlayer().getUniqueId().toString())) {
evt.setCancelled(true);
@ -84,14 +81,14 @@ public class EventListener implements org.bukkit.event.Listener {
}
}
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = false)
@EventHandler(priority = EventPriority.HIGHEST)
public void onOffline(PlayerQuitEvent evt) {
if (Storage.map.containsKey(evt.getPlayer().getUniqueId().toString())) {
Storage.map.remove(evt.getPlayer().getUniqueId().toString());
}
}
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = false)
@EventHandler(priority = EventPriority.HIGHEST)
public void onClick(InventoryClickEvent evt) {
String regex = "[¡ì[0-9a-fA-f]]*\\u005b\\s[0-9]*\\s/\\s[0-9]*\\s\\u005d\\s*[\\d\\D]*";
Pattern pattern = Pattern.compile(regex);
@ -135,7 +132,7 @@ public class EventListener implements org.bukkit.event.Listener {
}
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = false)
@EventHandler(priority = EventPriority.HIGHEST)
public void onJoin(PlayerJoinEvent evt) {
Database.check(evt.getPlayer());
}

40
src/com/ilummc/bugrepgui/GUI.java
View File

@ -1,8 +1,5 @@
package com.ilummc.bugrepgui;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.entity.Player;
@ -10,22 +7,36 @@ import org.bukkit.event.inventory.ClickType;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.plugin.java.JavaPlugin;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Objects;
public class GUI {
static List<Inventory> invs = new ArrayList<>();
static List<Inventory> his = new ArrayList<>();
static Integer pages;
private static List<Inventory> invs = new ArrayList<>();
private static List<Inventory> his = new ArrayList<>();
private static Integer pages;
public static void open(Player player, int page) {
new Thread(() -> {
loadInv();
Bukkit.getScheduler().runTask(JavaPlugin.getPlugin(Main.class), () -> {
player.closeInventory();
player.openInventory(invs.get(page - 1));
});
}).start();
}
public static void openHistory(Player player, int page) {
new Thread(() -> {
loadHis(player);
Bukkit.getScheduler().runTask(JavaPlugin.getPlugin(Main.class), () -> {
player.closeInventory();
player.openInventory(his.get(page - 1));
});
}).start();
}
public static void loadHis(Player player) {
@ -135,15 +146,10 @@ public class GUI {
}
/**
*
* @param inv
* this inventory
* @param page
* this page
* @param id
* slot id
* @param click
* click type
* @param inv this inventory
* @param page this page
* @param id slot id
* @param click click type
*/
public static void click(Inventory inv, Integer page, Integer id, ClickType click, Player player) {
if (inv.getItem(id) != null) {
@ -184,7 +190,7 @@ public class GUI {
}
}
if (id == 47) {
if (page != pages) {
if (!Objects.equals(page, pages)) {
open(player, page + 1);
} else {
Storage.send(player, "no-this-page");
@ -212,7 +218,7 @@ public class GUI {
}
}
if (id == 47) {
if (page != pages) {
if (!Objects.equals(page, pages)) {
openHistory(player, page + 1);
} else {
Storage.send(player, "no-this-page");

9
src/com/ilummc/bugrepgui/Main.java
View File

@ -1,9 +1,8 @@
package com.ilummc.bugrepgui;
import org.bukkit.Bukkit;
import org.bukkit.plugin.java.*;
import com.ilummc.bugrepgui.util.UpdateChecker;
import org.bukkit.Bukkit;
import org.bukkit.plugin.java.JavaPlugin;
public class Main extends JavaPlugin {
@Override
@ -15,8 +14,8 @@ public class Main extends JavaPlugin {
Storage.init(this.getConfig(), this.getDataFolder(), "lang_" + lang + ".yml");
getServer().getPluginManager().registerEvents(new EventListener().setAlias(getConfig().getString("alias")),
this);
getCommand("bug").setExecutor(new cmdExe());
getCommand("bugrepgui").setExecutor(new cmdExe());
getCommand("bug").setExecutor(new Commands());
getCommand("bugrepgui").setExecutor(new Commands());
if (this.getConfig().getBoolean("check-update"))
UpdateChecker.check(this.getDescription().getVersion(), this.getDescription().getWebsite());
}

4
src/com/ilummc/bugrepgui/Notify.java
View File

@ -23,9 +23,9 @@ public class Notify {
public static void notifyb(String serial, String msg, Player exename) {
Player player = Database.getRepPlayer(serial);
if (player.isOnline()) {
String str = Database.format.replaceAll("%serial%", serial.toString())
String str = Database.format.replaceAll("%serial%", serial)
.replaceAll("%exename%", exename.getDisplayName()).replaceAll("%reply%", msg);
String str2 = Database.format2.replaceAll("%serial%", serial.toString())
String str2 = Database.format2.replaceAll("%serial%", serial)
.replaceAll("%exename%", exename.getDisplayName()).replaceAll("%reply%", msg);
String msgs[] = { str, Storage.compile(str2) };
player.sendMessage(msgs);

6
src/com/ilummc/bugrepgui/Stats.java
View File

@ -1,13 +1,14 @@
package com.ilummc.bugrepgui;
import com.ilummc.bugrepgui.stats.Reporter;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
import com.ilummc.bugrepgui.stats.Reporter;
public class Stats {
public static String[] loadTextRep() {
Map<String, Integer> res = Database.loadStatsRep();
Set<String> set = res.keySet();
@ -29,6 +30,7 @@ public class Stats {
msg[all + 1] = Storage.getMsg("rep-stats").replaceAll("%amount%", all.toString());
return msg;
}
public static String[] loadTextExe() {
Map<String, Integer> res = Database.loadStatsExe();
Set<String> set = res.keySet();

21
src/com/ilummc/bugrepgui/Storage.java
View File

@ -1,10 +1,5 @@
package com.ilummc.bugrepgui;
import java.io.File;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
@ -12,7 +7,13 @@ import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.Player;
import java.io.File;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class Storage {
private static FileConfiguration configyml;
private static File folder;
static String serial;
@ -55,15 +56,7 @@ public class Storage {
}
public static String compile(String str) {
char[] cha = str.toCharArray();
for (int i = 0; i < str.length(); i++) {
if (cha[i] == '&') {
if ((cha[i + 1] >= '0' && cha[i + 1] <= '9') || (cha[i + 1] >= 'a' && cha[i + 1] <= 'f')) {
cha[i] = '¡ì';
}
}
}
return String.valueOf(cha);
return ChatColor.translateAlternateColorCodes('&', str);
}
public static String getMsg(String msg) {

18
src/com/ilummc/bugrepgui/bungee/GlobalNotify.java
View File

@ -1,17 +1,12 @@
package com.ilummc.bugrepgui.bungee;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import com.ilummc.bugrepgui.Storage;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import java.sql.*;
import java.util.Collection;
import java.util.Iterator;
import com.ilummc.bugrepgui.Storage;
import net.md_5.bungee.api.connection.ProxiedPlayer;
public class GlobalNotify {
private static Connection c = null;
private static Statement state = null;
@ -146,10 +141,7 @@ public class GlobalNotify {
c = DriverManager.getConnection(url, Main.config.getString("mysql-username"),
Main.config.getString("mysql-password"));
state = c.createStatement();
} catch (SQLException e) {
Main.printException(e.getMessage());
return false;
} catch (ClassNotFoundException e) {
} catch (SQLException | ClassNotFoundException e) {
Main.printException(e.getMessage());
return false;
}

18
src/com/ilummc/bugrepgui/bungee/Main.java
View File

@ -1,17 +1,16 @@
package com.ilummc.bugrepgui.bungee;
import java.io.File;
import java.io.IOException;
import java.nio.file.CopyOption;
import java.nio.file.Files;
import java.util.logging.Logger;
import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.api.plugin.Plugin;
import net.md_5.bungee.config.Configuration;
import net.md_5.bungee.config.ConfigurationProvider;
import net.md_5.bungee.config.YamlConfiguration;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.util.logging.Logger;
public class Main extends Plugin {
static Logger log;
static File folder;
@ -48,13 +47,13 @@ public class Main extends Plugin {
cf = new File(f + "/config.yml");
try {
if (!cf.exists()) {
Files.copy(getResourceAsStream("config.yml"), cf.toPath(), new CopyOption[0]);
Files.copy(getResourceAsStream("config.yml"), cf.toPath());
}
reloadConfig();
lf = new File(f + "/lang_" + config.getString("lang") + ".yml");
if (!lf.exists()) {
Files.copy(getResourceAsStream("lang_" + config.getString("lang") + ".yml"), lf.toPath(),
new CopyOption[0]);
Files.copy(getResourceAsStream("lang_" + config.getString("lang") + ".yml"), lf.toPath()
);
}
reloadLang();
} catch (Exception e) {
@ -70,6 +69,7 @@ public class Main extends Plugin {
printException(e.getMessage());
}
}
private void reloadLang() {
try {
lang = ConfigurationProvider.getProvider(YamlConfiguration.class).load(lf);

116
src/com/ilummc/bugrepgui/cmdExe.java
View File

@ -1,116 +0,0 @@
package com.ilummc.bugrepgui;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
public class cmdExe implements CommandExecutor {
@Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (command.getName().equals("report")) {
if (sender instanceof Player) {
if (sender.hasPermission("bugrepgui.report")) {
Bug bug = new Bug((Player) sender);
Storage.putMap(bug);
Storage.send(sender, "input-bug-info");
return true;
} else {
Storage.send(sender, "no-perm");
return true;
}
} else {
Storage.send(sender, "must-player-run");
return true;
}
} else {
if (args.length == 1 && args[0].equalsIgnoreCase("help")) {
Storage.getHelp(sender);
return true;
}
if (args.length == 1 && args[0].equalsIgnoreCase("view")) {
if (sender instanceof Player) {
if (sender.hasPermission("bugrepgui.view")) {
GUI.open((Player) sender, 1);
} else {
Storage.send(sender, "no-perm");
}
return true;
} else {
Storage.send(sender, "must-player-run");
}
return true;
}
if (args.length == 2 && args[0].equalsIgnoreCase("view") && args[1].equalsIgnoreCase("history")) {
if (sender instanceof Player) {
if (sender.hasPermission("bugrepgui.view")) {
GUI.openHistory((Player) sender, 1);
} else {
Storage.send(sender, "no-perm");
}
return true;
} else {
Storage.send(sender, "must-player-run");
}
}
if (args.length == 1 && args[0].equalsIgnoreCase("report")) {
if (sender instanceof Player) {
if (sender.hasPermission("bugrepgui.report")) {
Bug bug = new Bug((Player) sender);
Storage.putMap(bug);
Storage.send(sender, "input-bug-info");
return true;
} else {
Storage.send(sender, "no-perm");
return true;
}
} else {
Storage.send(sender, "must-player-run");
return true;
}
}
if (args.length == 2 && args[0].equalsIgnoreCase("stats")) {
if (args[1].equalsIgnoreCase("text")) {
if (sender.hasPermission("bugrepgui.stats.text")) {
final CommandSender send = sender;
Thread t = new Thread(new Runnable() {
@Override
public void run() {
send.sendMessage(Stats.loadTextRep());
try {
Thread.sleep(3000);
Storage.send(send, "wait");
Thread.sleep(5000);
} catch (InterruptedException e) {
Storage.logExcept(e);
}
send.sendMessage(Stats.loadTextExe());
}
});
t.start();
return true;
} else {
Storage.send(sender, "no-perm");
return true;
}
}
if (args[1].equalsIgnoreCase("gui")) {
return true;
}
return true;
}
if (args.length == 1 && args[0].equalsIgnoreCase("reload")) {
if (sender.hasPermission("bugrepgui.reload")) {
Storage.reload();
Storage.send(sender, "reload-suc");
return true;
} else {
Storage.send(sender, "no-perm");
}
}
Storage.getHelp(sender);
return true;
}
}
}

18
src/com/ilummc/bugrepgui/util/UpdateChecker.java
View File

@ -1,21 +1,18 @@
package com.ilummc.bugrepgui.util;
import com.ilummc.bugrepgui.Storage;
import org.bukkit.Bukkit;
import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.net.HttpURLConnection;
import java.net.URL;
import org.bukkit.Bukkit;
import com.ilummc.bugrepgui.Storage;
public class UpdateChecker {
public static void check(String version, String web) {
final String ver = version;
final String webn = web;
Thread t = new Thread(new Runnable() {
@Override
public void run() {
Thread t = new Thread(() -> {
Storage.log("checking-update");
try {
HttpURLConnection c = (HttpURLConnection) new URL("http://www.spigotmc.org/api/general.php")
@ -25,10 +22,8 @@ public class UpdateChecker {
c.getOutputStream()
.write(("key=98BE0FE67F88AB82B4C197FAF1DC3B69206EFDCC4D3B80FC83A00037510B99B4&resource=35119")
.getBytes("UTF-8"));
String oldVersion = ver;
String newVersion = new BufferedReader(new InputStreamReader(c.getInputStream())).readLine()
.replaceAll("[a-zA-Z ]", "");
if (newVersion.equals(oldVersion)) {
String newVersion = new BufferedReader(new InputStreamReader(c.getInputStream())).readLine();
if (newVersion.equals(ver)) {
Storage.log("no-new-version");
} else {
String[] msg = Storage.getMsg("new-version").replaceAll("%version%", newVersion)
@ -41,7 +36,6 @@ public class UpdateChecker {
} catch (Exception e) {
Storage.logExcept(e);
}
}
});
t.start();
}

4
src/config.yml
View File

@ -10,11 +10,11 @@ mysql-port: 3306
mysql-username: ''
mysql-password: ''
mysql-db: ''
###########################################################################
############################################################################
# This controls the date format(such as CST or PST or EST) in the bug view #
# Here is a country list for you :) #
# https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2 #
###########################################################################
############################################################################
locale: 'US'
lang: 'en'
# This controls the message when left click a bug

7
src/plugin.yml
View File

@ -1,8 +1,8 @@
name: BugRepGUI
main: com.ilummc.bugrepgui.Main
version: 1.8
version: 1.10
author: IzzelAliz
website: https://www.spigotmc.org/resources/bugreportgui-better-than-rating.35119/
website: https://www.spigotmc.org/resources/35119/
commands:
bug:
description: /bug help for more help
@ -10,6 +10,9 @@ commands:
bugrepgui:
description: /bugrepgui for more help
usage: /bugrepgui
report:
description: Report a bug
usage: /report
permissions:
bugrepgui.admin: