Skip to content

Commit

Permalink
优化代码实现
Browse files Browse the repository at this point in the history
  • Loading branch information
@SugarMGP
SugarMGP committed Jan 13, 2025
1 parent b857396 commit b22e51b
Show file tree
Hide file tree
Showing 6 changed files with 113 additions and 116 deletions.
7 changes: 4 additions & 3 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>FestiveFirework</groupId>
<artifactId>FestiveFirework</artifactId>
<version>1.2.2.1</version>
<version>1.2.3</version>
<packaging>jar</packaging>

<name>FestiveFirework</name>
Expand All @@ -17,11 +17,12 @@
</properties>

<build>
<defaultGoal>clean package</defaultGoal>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<version>3.13.0</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
Expand All @@ -30,7 +31,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.4</version>
<version>3.5.3</version>
<executions>
<execution>
<phase>package</phase>
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/io/github/sugarmgp/festivefirework/FestiveFirework.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package io.github.sugarmgp.festivefirework;

import io.github.sugarmgp.festivefirework.Command.MainCommand;
import io.github.sugarmgp.festivefirework.Util.TimerManager;
import io.github.sugarmgp.festivefirework.command.MainCommand;
import io.github.sugarmgp.festivefirework.util.TimerManager;
import org.bukkit.Bukkit;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.plugin.java.JavaPlugin;
Expand Down
203 changes: 100 additions & 103 deletions .../festivefirework/Command/MainCommand.java → .../festivefirework/command/MainCommand.java
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package io.github.sugarmgp.festivefirework.Command;
package io.github.sugarmgp.festivefirework.command;

import io.github.sugarmgp.festivefirework.FestiveFirework;
import io.github.sugarmgp.festivefirework.Util.FireworkUtil;
import io.github.sugarmgp.festivefirework.Util.TimerManager;
import io.github.sugarmgp.festivefirework.util.FireworkUtil;
import io.github.sugarmgp.festivefirework.util.TimerManager;
import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.command.Command;
Expand Down Expand Up @@ -46,38 +46,44 @@ public boolean onCommand(CommandSender commandSender, Command command, String s,
sendHelp(msgHead, commandSender);
} else if (strings.length == 1) {
String message0 = strings[0];
if (message0.equals("start")) {
if (FireworkUtil.getStatus()) {
commandSender.sendMessage(msgHead + ChatColor.DARK_RED + "烟花燃放已经开始了");
return false;
}
List<Map<?, ?>> points = config.getMapList("points");
if (points.isEmpty()) {
commandSender.sendMessage(msgHead + ChatColor.DARK_RED + "燃放点列表为空");
return false;
}
int interval = config.getInt("interval");
FireworkUtil.start(interval, points);
commandSender.sendMessage(msgHead + ChatColor.DARK_GREEN + "开始燃放烟花");
} else if (message0.equals("stop")) {
if (!FireworkUtil.getStatus()) {
commandSender.sendMessage(msgHead + ChatColor.DARK_RED + "烟花燃放已经停止了");
return false;
}
FireworkUtil.stop();
commandSender.sendMessage(msgHead + ChatColor.DARK_GREEN + "停止燃放烟花");
} else if (message0.equals("reload")) {
if (FireworkUtil.getStatus()) {
commandSender.sendMessage(msgHead + ChatColor.DARK_RED + "请先停止烟花燃放");
return false;
}
plugin.reloadConfig();
plugin.getTimerManager().reloadTimerConfig();
commandSender.sendMessage(msgHead + ChatColor.DARK_GREEN + "成功重载插件");
} else if (message0.equals("help")) {
sendHelp(msgHead, commandSender);
} else {
commandSender.sendMessage(msgHead + ChatColor.DARK_RED + "语法错误");
switch (message0) {
case "start":
if (FireworkUtil.getStatus()) {
commandSender.sendMessage(msgHead + ChatColor.DARK_RED + "烟花燃放已经开始了");
return false;
}
List<Map<?, ?>> points = config.getMapList("points");
if (points.isEmpty()) {
commandSender.sendMessage(msgHead + ChatColor.DARK_RED + "燃放点列表为空");
return false;
}
int interval = config.getInt("interval");
FireworkUtil.start(interval, points);
commandSender.sendMessage(msgHead + ChatColor.DARK_GREEN + "开始燃放烟花");
break;
case "stop":
if (!FireworkUtil.getStatus()) {
commandSender.sendMessage(msgHead + ChatColor.DARK_RED + "烟花燃放已经停止了");
return false;
}
FireworkUtil.stop();
commandSender.sendMessage(msgHead + ChatColor.DARK_GREEN + "停止燃放烟花");
break;
case "reload":
if (FireworkUtil.getStatus()) {
commandSender.sendMessage(msgHead + ChatColor.DARK_RED + "请先停止烟花燃放");
return false;
}
plugin.reloadConfig();
plugin.getTimerManager().reloadTimerConfig();
commandSender.sendMessage(msgHead + ChatColor.DARK_GREEN + "成功重载插件");
break;
case "help":
sendHelp(msgHead, commandSender);
break;
default:
commandSender.sendMessage(msgHead + ChatColor.DARK_RED + "语法错误");
break;
}
} else if (strings.length == 2) {
String message0 = strings[0];
Expand Down Expand Up @@ -174,50 +180,58 @@ public boolean onCommand(CommandSender commandSender, Command command, String s,
} else if (message0.equals("timer")) {
TimerManager timerManager = plugin.getTimerManager();
SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd-HHmmss");
if (message1.equals("add-start")) {
Date date;
try {
date = formatter.parse(message2);
} catch (ParseException e) {
commandSender.sendMessage(msgHead + ChatColor.DARK_RED + "时间格式错误");
return false;
switch (message1) {
case "add-start": {
Date date;
try {
date = formatter.parse(message2);
} catch (ParseException e) {
commandSender.sendMessage(msgHead + ChatColor.DARK_RED + "时间格式错误");
return false;
}
boolean flag = timerManager.addTimer(1, date);
if (!flag) {
commandSender.sendMessage(msgHead + ChatColor.DARK_RED + "此时间已经被占用");
} else {
commandSender.sendMessage(msgHead + ChatColor.DARK_GREEN + "成功添加定时器");
}
break;
}
boolean flag = timerManager.addTimer(1, date);
if (!flag) {
commandSender.sendMessage(msgHead + ChatColor.DARK_RED + "此时间已经被占用");
} else {
commandSender.sendMessage(msgHead + ChatColor.DARK_GREEN + "成功添加定时器");
case "add-stop": {
Date date;
try {
date = formatter.parse(message2);
} catch (ParseException e) {
commandSender.sendMessage(msgHead + ChatColor.DARK_RED + "时间格式错误");
return false;
}
boolean flag = timerManager.addTimer(2, date);
if (!flag) {
commandSender.sendMessage(msgHead + ChatColor.DARK_RED + "此时间已经被占用");
} else {
commandSender.sendMessage(msgHead + ChatColor.DARK_GREEN + "成功添加定时器");
}
break;
}
} else if (message1.equals("add-stop")) {
Date date;
try {
date = formatter.parse(message2);
} catch (ParseException e) {
commandSender.sendMessage(msgHead + ChatColor.DARK_RED + "时间格式错误");
return false;
case "del": {
int num;
try {
num = Integer.parseInt(message2);
} catch (NumberFormatException e) {
commandSender.sendMessage(msgHead + ChatColor.DARK_RED + "语法错误");
return false;
}
boolean flag = timerManager.delTimer(num);
if (!flag) {
commandSender.sendMessage(msgHead + ChatColor.DARK_RED + "找不到该定时器");
} else {
commandSender.sendMessage(msgHead + ChatColor.DARK_GREEN + "成功删除定时器");
}
break;
}
boolean flag = timerManager.addTimer(2, date);
if (!flag) {
commandSender.sendMessage(msgHead + ChatColor.DARK_RED + "此时间已经被占用");
} else {
commandSender.sendMessage(msgHead + ChatColor.DARK_GREEN + "成功添加定时器");
}
} else if (message1.equals("del")) {
int num;
try {
num = Integer.parseInt(message2);
} catch (NumberFormatException e) {
default:
commandSender.sendMessage(msgHead + ChatColor.DARK_RED + "语法错误");
return false;
}
boolean flag = timerManager.delTimer(num);
if (!flag) {
commandSender.sendMessage(msgHead + ChatColor.DARK_RED + "找不到该定时器");
} else {
commandSender.sendMessage(msgHead + ChatColor.DARK_GREEN + "成功删除定时器");
}
} else {
commandSender.sendMessage(msgHead + ChatColor.DARK_RED + "语法错误");
break;
}
} else if (message0.equals("interval") && message1.equals("set")) {
if (FireworkUtil.getStatus()) {
Expand Down Expand Up @@ -300,35 +314,18 @@ private int findPoint(List<Map<?, ?>> points, String str) {
@Override
public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
if (args.length == 1) {
ArrayList<String> commandTab = new ArrayList<String>();
commandTab.add("point");
commandTab.add("start");
commandTab.add("stop");
commandTab.add("timer");
commandTab.add("interval");
commandTab.add("reload");
commandTab.add("help");
return commandTab;
return Arrays.asList("point","start","stop","timer","interval","reload","help");
} else if (args.length == 2) {
if (args[0].equals("point")) {
ArrayList<String> commandTab = new ArrayList<String>();
commandTab.add("add");
commandTab.add("del");
commandTab.add("rename");
commandTab.add("list");
return commandTab;
} else if (args[0].equals("timer")) {
ArrayList<String> commandTab = new ArrayList<String>();
commandTab.add("add-start");
commandTab.add("add-stop");
commandTab.add("del");
commandTab.add("list");
return commandTab;
} else if (args[0].equals("interval")) {
ArrayList<String> commandTab = new ArrayList<String>();
commandTab.add("set");
commandTab.add("get");
return commandTab;
switch (args[0]) {
case "point": {
return Arrays.asList("add","del","rename","list");
}
case "timer": {
return Arrays.asList("add-start","add-stop","del","list");
}
case "interval": {
return Arrays.asList("set","get");
}
}
} else if (args.length == 3) {
if (args[0].equals("point") && (args[1].equals("del") || args[1].equals("rename"))) {
Expand Down
5 changes: 2 additions & 3 deletions ...gp/festivefirework/Util/FireworkUtil.java → ...gp/festivefirework/util/FireworkUtil.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.github.sugarmgp.festivefirework.Util;
package io.github.sugarmgp.festivefirework.util;

import io.github.sugarmgp.festivefirework.FestiveFirework;
import org.bukkit.*;
Expand Down Expand Up @@ -38,7 +38,7 @@ private static void work(int interval, List<Map<?, ?>> points) {
double z = (Double) map.get("z");
Location location = new Location(world, x, y, z);

if (Bukkit.getOnlinePlayers().size() == 0)
if (Bukkit.getOnlinePlayers().isEmpty())
continue;
if (!location.getChunk().isLoaded())
continue;
Expand Down Expand Up @@ -79,7 +79,6 @@ private static void work(int interval, List<Map<?, ?>> points) {
fwm.clearEffects();
fwm.addEffect(fb.build());
fwm.setPower(power);
fw.setPersistent(false);
fw.setFireworkMeta(fwm);
Bukkit.getScheduler().runTaskLater(plugin, new RemoveFirework(fw), power * 30 + 40);
});
Expand Down
2 changes: 1 addition & 1 deletion .../festivefirework/Util/RemoveFirework.java → .../festivefirework/util/RemoveFirework.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.github.sugarmgp.festivefirework.Util;
package io.github.sugarmgp.festivefirework.util;

import org.bukkit.entity.Firework;

Expand Down
8 changes: 4 additions & 4 deletions ...gp/festivefirework/Util/TimerManager.java → ...gp/festivefirework/util/TimerManager.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.github.sugarmgp.festivefirework.Util;
package io.github.sugarmgp.festivefirework.util;

import com.google.common.base.Charsets;
import io.github.sugarmgp.festivefirework.FestiveFirework;
Expand All @@ -23,9 +23,9 @@

public class TimerManager {
private FileConfiguration timerConfig;
private File timerFile;
private List<Map<?, ?>> timers;
private SimpleDateFormat formatter;
private final File timerFile;
private final List<Map<?, ?>> timers;
private final SimpleDateFormat formatter;

public TimerManager() {
formatter = new SimpleDateFormat("yyyy.MM.dd-HH:mm:ss");
Expand Down

0 comments on commit b22e51b

Please sign in to comment.