Skip to content

Commit

Permalink
Update to 2.0.3
Browse files Browse the repository at this point in the history
  • Loading branch information
takahatashun committed Mar 25, 2020
1 parent 2b3756a commit d21a16a
Show file tree
Hide file tree
Showing 14 changed files with 115 additions and 76 deletions.
31 changes: 21 additions & 10 deletions .idea/workspace.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>me.lxc</groupId>
<artifactId>thesieutoc</artifactId>
<version>2.0.2</version>
<version>2.0.3</version>
<packaging>jar</packaging>

<name>TheSieuToc</name>
Expand Down
17 changes: 10 additions & 7 deletions src/main/java/me/lxc/artxeapi/utils/ArtxeCommands.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,21 @@
import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitRunnable;

import java.text.MessageFormat;

public class ArtxeCommands {

private ArtxeCommands() {}

private static final String MATCH = "(?ium)^(player:|op:|console:|)(.*)$";
private static final String MATCH = "(?ium)^(player:|op:|console:)(.*)$";

public static void dispatchCommand(Player player, String command) {
new BukkitRunnable() {
@Override
public void run() {
final String cmd = command.replaceAll(MATCH, "$2").replaceAll("(?ium)([{]player[}])", player.getName());
final String type = command.replaceAll(MATCH, "$1".replace(":","").toLowerCase());
final String type = command.replaceAll(MATCH, "$1").replace(":","").toLowerCase();
final String cmd = command.replaceAll(MATCH, "$2").replaceAll("(?ium)([{]Player[}])", player.getName());
TheSieuToc.pluginDebug.debug(MessageFormat.format("Run command: '{'type: {0}, command: {1}'}'", type, cmd));
switch (type){
case "op":
if(player.isOp()){
Expand All @@ -27,14 +30,14 @@ public void run() {
player.setOp(false);
}
break;
case "console":
Bukkit.dispatchCommand(Bukkit.getConsoleSender(), cmd);
break;
case "":
case "player":
default:
player.performCommand(cmd);
break;
case "console":
default:
Bukkit.dispatchCommand(Bukkit.getConsoleSender(), cmd);
break;
}
}
}.runTask(TheSieuToc.getInstance());
Expand Down
9 changes: 8 additions & 1 deletion src/main/java/me/lxc/thesieutoc/TheSieuToc.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Objects;
import java.util.logging.Level;

import static me.lxc.artxeapi.utils.ArtxeChat.console;
Expand Down Expand Up @@ -85,6 +86,7 @@ public void reload(short type) {
default:
settings.reload();
hasAPIInfo = !(settings.iTheSieuTocKey.isEmpty() && settings.iTheSieuTocSecret.isEmpty());
pluginDebug = new ArtxeDebug(this, settings.debug);
messages.reload();
ui.reload();
break;
Expand Down Expand Up @@ -125,6 +127,11 @@ public Ui getUi() {
}

public DonorLog getDonorLog() {
return this.donorLog;
if (donorLog.logFile != null && Objects.requireNonNull(donorLog.logFile).exists())
return this.donorLog;
else {
donorLog.createFile();
return this.donorLog;
}
}
}
2 changes: 1 addition & 1 deletion src/main/java/me/lxc/thesieutoc/event/PlayerChat.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public void event(AsyncPlayerChatEvent e) {
unTriggerStep2(player);
player.sendMessage(msg.pin.replaceAll("(?ium)[{]Pin[}]", text));
JsonObject sendCard = TheSieuTocAPI.sendCard(settings.iTheSieuTocKey, settings.iTheSieuTocSecret, info.type, info.amount, info.serial, info.pin);
TheSieuToc.pluginDebug.debug("Response: " + sendCard.toString());
TheSieuToc.pluginDebug.debug("Response: " + (sendCard != null ? sendCard.toString() : "NULL"));
if (!sendCard.get("status").getAsString().equals("00")) {
player.sendMessage(msg.fail);
player.sendMessage(sendCard.get("msg").getAsString());
Expand Down
88 changes: 49 additions & 39 deletions src/main/java/me/lxc/thesieutoc/internal/Commands.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,33 +37,22 @@ public boolean execute(CommandSender sender, String commandLabel, String[] args)

switch (args.length){
case 0:
if(isPlayer){
if(hasAPIInfo) {
chooseCard(player, ui);
return true;
} else return false;
} else {
sender.sendMessage(msg.onlyPlayer);
return false;
}
chooseCard(sender, isPlayer, hasAPIInfo, ui, msg);
return true;
case 1:
switch (args[0].toLowerCase()){
case "reload":
return reload(sender, args.length, msg);
case "choose":
if(hasAPIInfo) {
if (isPlayer) {
chooseCard(player, ui);
return true;
} else {
sender.sendMessage(msg.onlyPlayer);
return false;
}
} else return false;
chooseCard(sender, isPlayer, hasAPIInfo, ui, msg);
return true;
case "check":
if(hasAPIInfo) {
return check(sender, args.length, msg);
} else return false;
} else {
sender.sendMessage(msg.missingApiInfo);
return false;
}
case "top":
return top(sender, args);
default:
Expand All @@ -73,8 +62,8 @@ public boolean execute(CommandSender sender, String commandLabel, String[] args)
case 2:
switch (args[0].toLowerCase()){
case "choose":
if(isPlayer) {
if(hasAPIInfo) {
if(hasAPIInfo) {
if (isPlayer) {
if (isValidCard(args[1])) {
String type = args[1];
chooseAmount(player, type, ui);
Expand All @@ -83,17 +72,23 @@ public boolean execute(CommandSender sender, String commandLabel, String[] args)
sender.sendMessage(msg.invalidCardType);
return false;
}
} else return false;
} else {
sender.sendMessage(msg.onlyPlayer);
return false;
}
} else {
sender.sendMessage(msg.onlyPlayer);
sender.sendMessage(msg.missingApiInfo);
return false;
}
case "reload":
return reload(sender, args.length, msg);
case "check":
if(hasAPIInfo) {
return check(sender, args.length, msg);
} else return false;
} else {
sender.sendMessage(msg.missingApiInfo);
return false;
}
case "top":
return top(sender, args);
default:
Expand All @@ -103,8 +98,8 @@ public boolean execute(CommandSender sender, String commandLabel, String[] args)
case 3:
switch (args[0].toLowerCase()){
case "choose":
if(isPlayer) {
if(hasAPIInfo) {
if(hasAPIInfo) {
if(isPlayer) {
if (isValidCard(args[1])) {
if (ArtxeNumber.isInteger(args[2])) {
if (isValidAmount(Integer.parseInt(args[2]))) {
Expand All @@ -121,17 +116,23 @@ public boolean execute(CommandSender sender, String commandLabel, String[] args)
sender.sendMessage(msg.invalidCardType);
return false;
}
} else return false;
} else {
sender.sendMessage(msg.onlyPlayer);
return false;
}
} else {
sender.sendMessage(msg.onlyPlayer);
sender.sendMessage(msg.missingApiInfo);
return false;
}
case "reload":
return reload(sender, args.length, msg);
case "check":
if(hasAPIInfo) {
if (hasAPIInfo) {
return check(sender, args.length, msg);
} else return false;
} else {
sender.sendMessage(msg.missingApiInfo);
return false;
}
case "top":
return top(sender, args);
default:
Expand Down Expand Up @@ -177,15 +178,24 @@ private boolean check(CommandSender sender, int arg, Messages msg){
}
}

private void chooseCard(Player player, Ui ui){
for(String card : TheSieuToc.getInstance().getSettings().cardEnable){
String text = ui.cardTypeText.replaceAll("(?ium)[{]Card_Type[}]", card);
String hover = splitListToLine(ui.cardTypeHover).replaceAll("(?ium)[{]Card_Type[}]", card);
BaseComponent[] message = new ComponentBuilder(text)
.event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder(hover).create()))
.event(new ClickEvent(ClickEvent.Action.RUN_COMMAND, MessageFormat.format("/donate choose {0}", card)))
.create();
player.spigot().sendMessage(message);
private void chooseCard(CommandSender sender, boolean isPlayer, boolean hasAPIInfo, Ui ui, Messages msg) {
if (hasAPIInfo) {
if (isPlayer) {
final Player player = (Player) sender;
for(String card : TheSieuToc.getInstance().getSettings().cardEnable){
String text = ui.cardTypeText.replaceAll("(?ium)[{]Card_Type[}]", card);
String hover = splitListToLine(ui.cardTypeHover).replaceAll("(?ium)[{]Card_Type[}]", card);
BaseComponent[] message = new ComponentBuilder(text)
.event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder(hover).create()))
.event(new ClickEvent(ClickEvent.Action.RUN_COMMAND, MessageFormat.format("/donate choose {0}", card)))
.create();
player.spigot().sendMessage(message);
}
} else {
sender.sendMessage(msg.onlyPlayer);
}
} else {
sender.sendMessage(msg.missingApiInfo);
}
}

Expand Down
23 changes: 13 additions & 10 deletions src/main/java/me/lxc/thesieutoc/internal/DonorLog.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,7 @@ public DonorLog(File logFile) {
}

public boolean writeLog(Player p, String serial, String pin, String cardType, int amount, boolean success, String notes) {
try {
if (!(logFile.exists())) {
logFile.getParentFile().mkdir();
if (!logFile.createNewFile()) {
return false;
}
}
} catch (IOException e) {
TheSieuToc.getInstance().getLogger().log(Level.SEVERE, "An error occurred ", e);
}
createFile();
Date dt = new Date();
SimpleDateFormat df = new SimpleDateFormat("HH:mm:ss dd/MM/yyyy");
String name = p.getName();
Expand All @@ -50,4 +41,16 @@ public boolean writeLog(Player p, String serial, String pin, String cardType, in
}
return true;
}

public boolean createFile() {
try {
if (!(logFile.exists())) {
logFile.getParentFile().mkdir();
return logFile.createNewFile();
} else return true;
} catch (IOException e) {
TheSieuToc.getInstance().getLogger().log(Level.SEVERE, "An error occurred ", e);
return false;
}
}
}
Loading

0 comments on commit d21a16a

Please sign in to comment.