carm/EasyPlugin
carm/EasyPlugin
1
Fork 0
mirror of https://github.com/CarmJos/EasyPlugin.git synced 2024-09-19 11:15:48 +00:00
Code Issues Releases Activity

chore(item): 添加序列化方法

Browse Source
This commit is contained in:
Carm Jos 2022-06-18 00:16:02 +08:00
parent 7a06b39b31
commit b6bd4beda0
27 changed files with 1219 additions and 1160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.documentation/javadoc/JAVADOC-README.md
View File

@ -4,6 +4,6 @@
## 如何实现？ ## 如何实现？
若您也想通过 [Github Actions](https://docs.github.com/en/actions/learn-github-actions) 若您也想通过 [Github Actions](https://docs.github.com/en/actions/learn-github-actions)
自动部署项目的Javadoc到 [Github Pages](https://pages.github.com/) ， 自动部署项目的Javadoc到 [Github Pages](https://pages.github.com/) ，
可以参考我的文章 [《自动部署Javadoc到Github Pages》](https://pages.carm.cc/doc/javadoc-in-github.html) 。 可以参考我的文章 [《自动部署Javadoc到Github Pages》](https://pages.carm.cc/doc/javadoc-in-github.html) 。

2
.github/ISSUE_TEMPLATE/bugs_report.md vendored
View File

@ -14,6 +14,7 @@ assignees: ''
### **问题来源** ### **问题来源**
描述一下通过哪些操作才发现的问题，如： 描述一下通过哪些操作才发现的问题，如：
1. 使用了 ... 1. 使用了 ...
2. 输入了 ... 2. 输入了 ...
3. 出现了报错 ... 3. 出现了报错 ...
@ -32,7 +33,6 @@ assignees: ''
- Java版本: `JDK11` / `OPENJDK8` / `JRE8` / `...` - Java版本: `JDK11` / `OPENJDK8` / `JRE8` / `...`
- 服务端版本: 请在后台输入 `version` 并复制相关输出。 - 服务端版本: 请在后台输入 `version` 并复制相关输出。
### **其他补充** ### **其他补充**
如有其他补充，可以在这里描述。 如有其他补充，可以在这里描述。

4
.github/ISSUE_TEMPLATE/feature_issues.md vendored
View File

@ -8,13 +8,17 @@ assignees: ''
--- ---
### **功能简述** ### **功能简述**
简单的描述一下你想要的功能 简单的描述一下你想要的功能
### **需求来源** ### **需求来源**
简单的描述一下为什么需要这个功能。 简单的描述一下为什么需要这个功能。
### **功能参考**(可选) ### **功能参考**(可选)
如果有相关功能的参考，如文本、截图，请提供给我们。 如果有相关功能的参考，如文本、截图，请提供给我们。
### **附加内容** ### **附加内容**
如果有什么小细节需要重点注意，请在这里告诉我们。 如果有什么小细节需要重点注意，请在这里告诉我们。

2
base/command/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>easyplugin-parent</artifactId> <artifactId>easyplugin-parent</artifactId>
<groupId>cc.carm.lib</groupId> <groupId>cc.carm.lib</groupId>
<version>1.4.6</version> <version>1.4.7</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

1
base/command/src/main/java/cc/carm/lib/easyplugin/command/CommandHandler.java
View File

@ -1,4 +1,3 @@
package cc.carm.lib.easyplugin.command; package cc.carm.lib.easyplugin.command;
import org.bukkit.command.Command; import org.bukkit.command.Command;

2
base/gui/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>easyplugin-parent</artifactId> <artifactId>easyplugin-parent</artifactId>
<groupId>cc.carm.lib</groupId> <groupId>cc.carm.lib</groupId>
<version>1.4.6</version> <version>1.4.7</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

300
base/gui/src/main/java/cc/carm/lib/easyplugin/gui/GUI.java
View File

@ -21,191 +21,193 @@ import java.util.stream.IntStream;
public class GUI { public class GUI {
private static JavaPlugin plugin; private static JavaPlugin plugin;
private static final HashMap<UUID, GUI> openedGUIs = new HashMap<>(); private static final HashMap<UUID, GUI> openedGUIs = new HashMap<>();
public static void initialize(JavaPlugin plugin) { public static void initialize(JavaPlugin plugin) {
GUI.plugin = plugin; GUI.plugin = plugin;
} }
public static JavaPlugin getPlugin() { public static JavaPlugin getPlugin() {
return plugin; return plugin;
} }
public static HashMap<UUID, GUI> getOpenedGUIs() { public static HashMap<UUID, GUI> getOpenedGUIs() {
return openedGUIs; return openedGUIs;
} }
protected GUIType type; protected GUIType type;
protected String name; protected String name;
public HashMap<Integer, GUIItem> items; public HashMap<Integer, GUIItem> items;
public Inventory inv; public Inventory inv;
/** /**
* 当玩家点击目标GUI时是否取消 * 当玩家点击目标GUI时是否取消
*/ */
boolean cancelOnTarget = true; boolean cancelOnTarget = true;
/** /**
* 当玩家点击自己背包时是否取消 * 当玩家点击自己背包时是否取消
*/ */
boolean cancelOnSelf = true; boolean cancelOnSelf = true;
/** /**
* 当玩家点击界面外时是否取消 * 当玩家点击界面外时是否取消
*/ */
boolean cancelOnOuter = true; boolean cancelOnOuter = true;
Map<String, Object> flags; Map<String, Object> flags;
GUIListener listener; GUIListener listener;
public GUI(GUIType type, String name) { public GUI(GUIType type, String name) {
this.type = type; this.type = type;
this.name = ColorParser.parse(name); this.name = ColorParser.parse(name);
this.items = new HashMap<>(); this.items = new HashMap<>();
} }
public HashMap<@NotNull Integer, @NotNull GUIItem> getItems() { public HashMap<@NotNull Integer, @NotNull GUIItem> getItems() {
return new HashMap<>(items); return new HashMap<>(items);
} }
public final void setItem(int index, @Nullable GUIItem item) { public final void setItem(int index, @Nullable GUIItem item) {
if (item == null) { if (item == null) {
this.items.remove(index); this.items.remove(index);
} else { } else {
this.items.put(index, item); this.items.put(index, item);
} }
} }
public void setItem(GUIItem item, int... index) { public void setItem(GUIItem item, int... index) {
for (int i : index) { for (int i : index) {
setItem(i, item); setItem(i, item);
} }
} }
public GUIItem getItem(int index) { public GUIItem getItem(int index) {
return this.items.get(index); return this.items.get(index);
} }
/** /**
* 更新玩家箱子的视图 * 更新玩家箱子的视图
*/ */
public void updateView() { public void updateView() {
if (this.inv != null) { if (this.inv != null) {
List<HumanEntity> viewers = this.inv.getViewers(); List<HumanEntity> viewers = this.inv.getViewers();
IntStream.range(0, this.inv.getSize()).forEach(index -> inv.setItem(index, new ItemStack(Material.AIR))); IntStream.range(0, this.inv.getSize()).forEach(index -> inv.setItem(index, new ItemStack(Material.AIR)));
getItems().forEach((index, item) -> inv.setItem(index, item.getDisplay())); getItems().forEach((index, item) -> inv.setItem(index, item.getDisplay()));
viewers.forEach(p -> ((Player) p).updateInventory()); viewers.forEach(p -> ((Player) p).updateInventory());
} }
} }
/** /**
* 设置是否取消点击GUI内物品的事件 * 设置是否取消点击GUI内物品的事件
* 如果不取消，玩家可以从GUI中拿取物品。 * 如果不取消，玩家可以从GUI中拿取物品。
* *
* @param b 是否取消 * @param b 是否取消
*/ */
public void setCancelOnTarget(boolean b) { public void setCancelOnTarget(boolean b) {
this.cancelOnTarget = b; this.cancelOnTarget = b;
} }
/** /**
* 设置是否取消点击自己背包内物品的事件 * 设置是否取消点击自己背包内物品的事件
* 如果不取消，玩家可以从自己的背包中拿取物品。 * 如果不取消，玩家可以从自己的背包中拿取物品。
* *
* @param b 是否取消 * @param b 是否取消
*/ */
public void setCancelOnSelf(boolean b) { public void setCancelOnSelf(boolean b) {
this.cancelOnSelf = b; this.cancelOnSelf = b;
} }
/** /**
* 设置是否取消点击GUI外的事件 * 设置是否取消点击GUI外的事件
* 如果不取消，玩家可以把物品从GUI或背包中丢出去 * 如果不取消，玩家可以把物品从GUI或背包中丢出去
* *
* @param b 是否取消 * @param b 是否取消
*/ */
public void setCancelOnOuter(boolean b) { public void setCancelOnOuter(boolean b) {
this.cancelOnOuter = b; this.cancelOnOuter = b;
} }
public void addFlag(String flag, Object obj) { public void addFlag(String flag, Object obj) {
if (this.flags == null) this.flags = new HashMap<>(); if (this.flags == null) this.flags = new HashMap<>();
this.flags.put(flag, obj); this.flags.put(flag, obj);
} }
public Object getFlag(String flag) { public Object getFlag(String flag) {
if (this.flags == null) return null; if (this.flags == null) return null;
else else
return this.flags.get(flag); return this.flags.get(flag);
} }
public void setFlag(String flag, Object obj) { public void setFlag(String flag, Object obj) {
if (this.flags == null) this.flags = new HashMap<>(); if (this.flags == null) this.flags = new HashMap<>();
this.flags.replace(flag, obj); this.flags.replace(flag, obj);
} }
public void removeFlag(String flag) { public void removeFlag(String flag) {
if (this.flags == null) this.flags = new HashMap<>(); if (this.flags == null) this.flags = new HashMap<>();
this.flags.remove(flag); this.flags.remove(flag);
} }
public void rawClickListener(InventoryClickEvent event) { public void rawClickListener(InventoryClickEvent event) {
} }
public void openGUI(Player player) { public void openGUI(Player player) {
if (this.type == GUIType.CANCEL) { throw new IllegalStateException("被取消或不存在的GUI"); } if (this.type == GUIType.CANCEL) {
throw new IllegalStateException("被取消或不存在的GUI");
}
Inventory inv = Bukkit.createInventory(null, this.type.getSize(), this.name); Inventory inv = Bukkit.createInventory(null, this.type.getSize(), this.name);
IntStream.range(0, inv.getSize()).forEach(index -> inv.setItem(index, new ItemStack(Material.AIR))); IntStream.range(0, inv.getSize()).forEach(index -> inv.setItem(index, new ItemStack(Material.AIR)));
getItems().forEach((index, item) -> inv.setItem(index, item.getDisplay())); getItems().forEach((index, item) -> inv.setItem(index, item.getDisplay()));
GUI previous = getOpenedGUI(player); GUI previous = getOpenedGUI(player);
if(previous != null){ if (previous != null) {
previous.listener.close(player); previous.listener.close(player);
} }
setOpenedGUI(player, this); setOpenedGUI(player, this);
this.inv = inv; this.inv = inv;
player.openInventory(inv); player.openInventory(inv);
if (listener == null) { if (listener == null) {
Bukkit.getPluginManager().registerEvents(listener = new GUIListener(this), getPlugin()); Bukkit.getPluginManager().registerEvents(listener = new GUIListener(this), getPlugin());
} }
} }
/** /**
* 拖动GUI内物品是执行的代码 * 拖动GUI内物品是执行的代码
* *
* @param event InventoryDragEvent * @param event InventoryDragEvent
*/ */
public void onDrag(InventoryDragEvent event) { public void onDrag(InventoryDragEvent event) {
} }
/** /**
* 关闭GUI时执行的代码 * 关闭GUI时执行的代码
*/ */
public void onClose() { public void onClose() {
} }
public static void setOpenedGUI(Player player, GUI gui) { public static void setOpenedGUI(Player player, GUI gui) {
getOpenedGUIs().put(player.getUniqueId(), gui); getOpenedGUIs().put(player.getUniqueId(), gui);
} }
public static boolean hasOpenedGUI(Player player) { public static boolean hasOpenedGUI(Player player) {
return getOpenedGUIs().containsKey(player.getUniqueId()); return getOpenedGUIs().containsKey(player.getUniqueId());
} }
public static GUI getOpenedGUI(Player player) { public static GUI getOpenedGUI(Player player) {
return getOpenedGUIs().get(player.getUniqueId()); return getOpenedGUIs().get(player.getUniqueId());
} }
public static void removeOpenedGUI(Player player) { public static void removeOpenedGUI(Player player) {
getOpenedGUIs().remove(player.getUniqueId()); getOpenedGUIs().remove(player.getUniqueId());
} }
} }

88
base/gui/src/main/java/cc/carm/lib/easyplugin/gui/GUIItem.java
View File

@ -10,64 +10,64 @@ import java.util.Set;
public class GUIItem { public class GUIItem {
ItemStack display; ItemStack display;
boolean actionActive = true; boolean actionActive = true;
public Set<GUIClickAction> actions = new HashSet<>(); public Set<GUIClickAction> actions = new HashSet<>();
public Set<GUIClickAction> actionsIgnoreActive = new HashSet<>(); public Set<GUIClickAction> actionsIgnoreActive = new HashSet<>();
public GUIItem(ItemStack display) { public GUIItem(ItemStack display) {
this.display = display; this.display = display;
} }
public final ItemStack getDisplay() { public final ItemStack getDisplay() {
return this.display; return this.display;
} }
public final void setDisplay(ItemStack display) { public final void setDisplay(ItemStack display) {
this.display = display; this.display = display;
} }
public final boolean isActionActive() { public final boolean isActionActive() {
return this.actionActive; return this.actionActive;
} }
public final void setActionActive(boolean b) { public final void setActionActive(boolean b) {
actionActive = b; actionActive = b;
} }
/** /**
* 玩家点击GUI后执行的代码 * 玩家点击GUI后执行的代码
* *
* @param type 点击的类型 * @param type 点击的类型
*/ */
public void onClick(ClickType type) { public void onClick(ClickType type) {
} }
public void addClickAction(GUIClickAction action) { public void addClickAction(GUIClickAction action) {
actions.add(action); actions.add(action);
} }
public void addActionIgnoreActive(GUIClickAction action) { public void addActionIgnoreActive(GUIClickAction action) {
actionsIgnoreActive.add(action); actionsIgnoreActive.add(action);
} }
public void rawClickAction(InventoryClickEvent event) { public void rawClickAction(InventoryClickEvent event) {
} }
/** /**
* 玩家点击GUI后执行的代码 * 玩家点击GUI后执行的代码
* *
* @param player 点击GUI的玩家 * @param player 点击GUI的玩家
*/ */
public void customAction(Player player) { public void customAction(Player player) {
} }
public abstract static class GUIClickAction { public abstract static class GUIClickAction {
public abstract void run(ClickType type, Player player); public abstract void run(ClickType type, Player player);
} }
} }

120
base/gui/src/main/java/cc/carm/lib/easyplugin/gui/GUIListener.java
View File

@ -11,82 +11,82 @@ import org.bukkit.event.player.PlayerQuitEvent;
public class GUIListener implements Listener { public class GUIListener implements Listener {
GUI currentGUI; GUI currentGUI;
public GUIListener(GUI gui) { public GUIListener(GUI gui) {
this.currentGUI = gui; this.currentGUI = gui;
} }
public GUI getCurrentGUI() { public GUI getCurrentGUI() {
return currentGUI; return currentGUI;
} }
@EventHandler @EventHandler
public void onInventoryClickEvent(InventoryClickEvent event) { public void onInventoryClickEvent(InventoryClickEvent event) {
if (!(event.getWhoClicked() instanceof Player)) return; if (!(event.getWhoClicked() instanceof Player)) return;
Player player = (Player) event.getWhoClicked(); Player player = (Player) event.getWhoClicked();
if (!GUI.hasOpenedGUI(player)) return; if (!GUI.hasOpenedGUI(player)) return;
if (GUI.getOpenedGUI(player) != getCurrentGUI()) return; if (GUI.getOpenedGUI(player) != getCurrentGUI()) return;
getCurrentGUI().rawClickListener(event); getCurrentGUI().rawClickListener(event);
if (event.getSlot() == -999 && getCurrentGUI().cancelOnOuter) { if (event.getSlot() == -999 && getCurrentGUI().cancelOnOuter) {
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
if (event.getClickedInventory() == null) return; if (event.getClickedInventory() == null) return;
if (event.getClickedInventory().equals(getCurrentGUI().inv)) { if (event.getClickedInventory().equals(getCurrentGUI().inv)) {
if (getCurrentGUI().cancelOnTarget) event.setCancelled(true); if (getCurrentGUI().cancelOnTarget) event.setCancelled(true);
if (event.getSlot() != -999) { if (event.getSlot() != -999) {
GUIItem clickedItem = getCurrentGUI().getItem(event.getSlot()); GUIItem clickedItem = getCurrentGUI().getItem(event.getSlot());
if (clickedItem != null) { if (clickedItem != null) {
if (clickedItem.isActionActive()) { if (clickedItem.isActionActive()) {
clickedItem.onClick(event.getClick()); clickedItem.onClick(event.getClick());
clickedItem.rawClickAction(event); clickedItem.rawClickAction(event);
clickedItem.actions.forEach(action -> action.run(event.getClick(), player)); clickedItem.actions.forEach(action -> action.run(event.getClick(), player));
} }
clickedItem.actionsIgnoreActive.forEach(action -> action.run(event.getClick(), player)); clickedItem.actionsIgnoreActive.forEach(action -> action.run(event.getClick(), player));
} }
} }
} else if (event.getClickedInventory().equals(player.getInventory()) && getCurrentGUI().cancelOnSelf) { } else if (event.getClickedInventory().equals(player.getInventory()) && getCurrentGUI().cancelOnSelf) {
event.setCancelled(true); event.setCancelled(true);
} }
} }
@EventHandler @EventHandler
public void onDrag(InventoryDragEvent e) { public void onDrag(InventoryDragEvent e) {
if (!(e.getWhoClicked() instanceof Player)) return; if (!(e.getWhoClicked() instanceof Player)) return;
if (e.getInventory().equals(getCurrentGUI().inv) if (e.getInventory().equals(getCurrentGUI().inv)
|| e.getInventory().equals(e.getWhoClicked().getInventory())) { || e.getInventory().equals(e.getWhoClicked().getInventory())) {
getCurrentGUI().onDrag(e); getCurrentGUI().onDrag(e);
} }
} }
@EventHandler @EventHandler
public void onInventoryCloseEvent(InventoryCloseEvent event) { public void onInventoryCloseEvent(InventoryCloseEvent event) {
if (!(event.getPlayer() instanceof Player)) return; if (!(event.getPlayer() instanceof Player)) return;
if (!event.getInventory().equals(getCurrentGUI().inv)) return; if (!event.getInventory().equals(getCurrentGUI().inv)) return;
close((Player) event.getPlayer()); close((Player) event.getPlayer());
} }
protected void close(Player p){ protected void close(Player p) {
HandlerList.unregisterAll(this); HandlerList.unregisterAll(this);
getCurrentGUI().listener = null; getCurrentGUI().listener = null;
GUI.removeOpenedGUI(p); GUI.removeOpenedGUI(p);
getCurrentGUI().onClose(); getCurrentGUI().onClose();
} }
@EventHandler @EventHandler
public void onPlayerLeave(PlayerQuitEvent event) { public void onPlayerLeave(PlayerQuitEvent event) {
GUI.removeOpenedGUI(event.getPlayer()); GUI.removeOpenedGUI(event.getPlayer());
} }
} }

62
base/gui/src/main/java/cc/carm/lib/easyplugin/gui/GUIType.java
View File

@ -6,44 +6,44 @@ import java.util.Arrays;
public enum GUIType { public enum GUIType {
ONE_BY_NINE(1, 9), ONE_BY_NINE(1, 9),
TWO_BY_NINE(2, 18), TWO_BY_NINE(2, 18),
THREE_BY_NINE(3, 27), THREE_BY_NINE(3, 27),
FOUR_BY_NINE(4, 36), FOUR_BY_NINE(4, 36),
FIVE_BY_NINE(5, 45), FIVE_BY_NINE(5, 45),
SIX_BY_NINE(6, 54), SIX_BY_NINE(6, 54),
CANCEL(0, 0); CANCEL(0, 0);
int lines; int lines;
int size; int size;
GUIType(int lines, int size) { GUIType(int lines, int size) {
this.lines = lines; this.lines = lines;
this.size = size; this.size = size;
} }
public int getLines() { public int getLines() {
return lines; return lines;
} }
public int getSize() { public int getSize() {
return size; return size;
} }
@NotNull @NotNull
public static GUIType getBySize(int size) { public static GUIType getBySize(int size) {
return Arrays.stream(values()).filter(type -> type.getSize() == size).findFirst().orElse(CANCEL); return Arrays.stream(values()).filter(type -> type.getSize() == size).findFirst().orElse(CANCEL);
} }
@NotNull @NotNull
public static GUIType getByLines(int lines) { public static GUIType getByLines(int lines) {
return Arrays.stream(values()).filter(type -> type.getLines() == lines).findFirst().orElse(CANCEL); return Arrays.stream(values()).filter(type -> type.getLines() == lines).findFirst().orElse(CANCEL);
} }
@NotNull @NotNull
public static GUIType getByName(String name) { public static GUIType getByName(String name) {
return Arrays.stream(values()).filter(type -> type.name().equalsIgnoreCase(name)).findFirst().orElse(CANCEL); return Arrays.stream(values()).filter(type -> type.name().equalsIgnoreCase(name)).findFirst().orElse(CANCEL);
} }
} }

119
base/gui/src/main/java/cc/carm/lib/easyplugin/gui/configuration/GUIActionConfiguration.java
View File

@ -3,51 +3,104 @@ package cc.carm.lib.easyplugin.gui.configuration;
import cc.carm.lib.easyplugin.gui.GUIItem; import cc.carm.lib.easyplugin.gui.GUIItem;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.ClickType;
import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
public class GUIActionConfiguration { public class GUIActionConfiguration {
public static @NotNull GUIActionConfiguration of(@NotNull GUIActionType actionType,
@Nullable ClickType clickType,
@Nullable String actionContent) {
return new GUIActionConfiguration(actionType, clickType, actionContent);
}
@Nullable ClickType clickType; public static @NotNull GUIActionConfiguration of(@NotNull GUIActionType actionType,
final @NotNull GUIActionType actionType; @Nullable String actionContent) {
final @Nullable String actionContent; return of(actionType, null, actionContent);
}
public GUIActionConfiguration(@Nullable ClickType clickType, public static @NotNull GUIActionConfiguration of(@NotNull GUIActionType actionType,
@NotNull GUIActionType actionType, @Nullable ClickType clickType) {
@Nullable String actionContent) { return of(actionType, clickType, null);
this.clickType = clickType; }
this.actionType = actionType;
this.actionContent = actionContent;
}
public @Nullable ClickType getClickType() { public static @NotNull GUIActionConfiguration of(@NotNull GUIActionType actionType) {
return clickType; return of(actionType, null, null);
} }
public @NotNull GUIActionType getActionType() { protected final @NotNull GUIActionType actionType;
return actionType;
}
public @Nullable String getActionContent() { protected final @Nullable ClickType clickType;
return actionContent; protected final @Nullable String actionContent;
}
public void checkAction(Player player, ClickType type) { public GUIActionConfiguration(@NotNull GUIActionType actionType,
if (getClickType() == null || getClickType() == type) executeAction(player); @Nullable ClickType clickType,
} @Nullable String actionContent) {
this.clickType = clickType;
this.actionType = actionType;
this.actionContent = actionContent;
}
public void executeAction(Player targetPlayer) { public @Nullable ClickType getClickType() {
getActionType().getExecutor().accept(targetPlayer, getActionContent()); return clickType;
} }
public GUIItem.GUIClickAction toClickAction() { public @NotNull GUIActionType getActionType() {
return new GUIItem.GUIClickAction() { return actionType;
@Override }
public void run(ClickType type, Player player) {
checkAction(player, type); public @Nullable String getActionContent() {
} return actionContent;
}; }
}
public void checkAction(Player player, ClickType type) {
if (getClickType() == null || getClickType() == type) executeAction(player);
}
public void executeAction(Player targetPlayer) {
getActionType().getExecutor().accept(targetPlayer, getActionContent());
}
public GUIItem.GUIClickAction toClickAction() {
return new GUIItem.GUIClickAction() {
@Override
public void run(ClickType type, Player player) {
checkAction(player, type);
}
};
}
@Nullable
@Contract("null->null")
public static GUIActionConfiguration deserialize(@Nullable String actionString) {
if (actionString == null) return null;
int prefixStart = actionString.indexOf("[");
int prefixEnd = actionString.indexOf("]");
if (prefixStart < 0 || prefixEnd < 0) return null;
String prefix = actionString.substring(prefixStart + 1, prefixEnd);
ClickType clickType = null;
GUIActionType actionType;
if (prefix.contains(":")) {
String[] args = prefix.split(":");
clickType = GUIConfiguration.readClickType(args[0]);
actionType = GUIActionType.readActionType(args[1]);
} else {
actionType = GUIActionType.readActionType(prefix);
}
if (actionType == null) return null;
String content = actionString.substring(prefixEnd + 1).trim();
return of(actionType, clickType, content);
}
public @NotNull String serialize() {
String prefix = "[" + getActionType().name() + (getClickType() == null ? "" : ":" + getClickType().name()) + "]";
String content = getActionContent() == null ? "" : " " + getActionContent();
return prefix + content;
}
} }

120
base/gui/src/main/java/cc/carm/lib/easyplugin/gui/configuration/GUIActionType.java
View File

@ -13,76 +13,76 @@ import java.util.function.BiConsumer;
public enum GUIActionType { public enum GUIActionType {
/** /**
* 以玩家聊天的形式执行 * 以玩家聊天的形式执行
* 若内容以 “/" 开头，则会以玩家身份执行命令。 * 若内容以 “/" 开头，则会以玩家身份执行命令。
*/ */
CHAT((player, string) -> { CHAT((player, string) -> {
if (string == null) return; if (string == null) return;
MessageUtils.setPlaceholders(player, Collections.singletonList(string)).forEach(player::chat); MessageUtils.setPlaceholders(player, Collections.singletonList(string)).forEach(player::chat);
}), }),
/** /**
* 以后台的形式执行指令 * 以后台的形式执行指令
* 指令内容不需要以“/”开头。 * 指令内容不需要以“/”开头。
*/ */
CONSOLE((player, string) -> { CONSOLE((player, string) -> {
if (string == null) return; if (string == null) return;
MessageUtils.setPlaceholders(player, Collections.singletonList(string)) MessageUtils.setPlaceholders(player, Collections.singletonList(string))
.forEach(message -> Bukkit.dispatchCommand(Bukkit.getConsoleSender(), message)); .forEach(message -> Bukkit.dispatchCommand(Bukkit.getConsoleSender(), message));
}), }),
/** /**
* 向玩家发送消息。 * 向玩家发送消息。
*/ */
MESSAGE(MessageUtils::send), MESSAGE(MessageUtils::send),
/** /**
* 向玩家发送声音。 * 向玩家发送声音。
* 允许配置音量与音调 * 允许配置音量与音调
* <ul> * <ul>
* <li>SOUND_NAME</li> * <li>SOUND_NAME</li>
* <li>SOUND_NAME:VOLUME</li> * <li>SOUND_NAME:VOLUME</li>
* <li>SOUND_NAME:VOLUME:PITCH</li> * <li>SOUND_NAME:VOLUME:PITCH</li>
* </ul> * </ul>
*/ */
SOUND((player, string) -> { SOUND((player, string) -> {
if (string == null) return; if (string == null) return;
try { try {
String[] args = string.contains(":") ? string.split(":") : new String[]{string}; String[] args = string.contains(":") ? string.split(":") : new String[]{string};
Sound sound = Arrays.stream(Sound.values()) Sound sound = Arrays.stream(Sound.values())
.filter(s -> s.name().equals(args[0])) .filter(s -> s.name().equals(args[0]))
.findFirst().orElse(null); .findFirst().orElse(null);
if (sound == null) return; if (sound == null) return;
float volume = args.length > 1 ? Float.parseFloat(args[1]) : 1F; float volume = args.length > 1 ? Float.parseFloat(args[1]) : 1F;
float pitch = args.length > 2 ? Float.parseFloat(args[2]) : 1F; float pitch = args.length > 2 ? Float.parseFloat(args[2]) : 1F;
player.playSound(player.getLocation(), sound, volume, pitch); player.playSound(player.getLocation(), sound, volume, pitch);
} catch (Exception ignored) { } catch (Exception ignored) {
} }
}), }),
/** /**
* 为玩家关闭GUI。 * 为玩家关闭GUI。
*/ */
CLOSE((player, string) -> player.closeInventory()); CLOSE((player, string) -> player.closeInventory());
BiConsumer<@NotNull Player, @Nullable String> executor; BiConsumer<@NotNull Player, @Nullable String> executor;
GUIActionType(BiConsumer<@NotNull Player, @Nullable String> executor) { GUIActionType(BiConsumer<@NotNull Player, @Nullable String> executor) {
this.executor = executor; this.executor = executor;
} }
public BiConsumer<@NotNull Player, @Nullable String> getExecutor() { public BiConsumer<@NotNull Player, @Nullable String> getExecutor() {
return executor; return executor;
} }
public static GUIActionType readActionType(String string) { public static GUIActionType readActionType(String string) {
return Arrays.stream(GUIActionType.values()) return Arrays.stream(GUIActionType.values())
.filter(action -> action.name().equalsIgnoreCase(string)) .filter(action -> action.name().equalsIgnoreCase(string))
.findFirst().orElse(null); .findFirst().orElse(null);
} }
} }

86
base/gui/src/main/java/cc/carm/lib/easyplugin/gui/configuration/GUIConfiguration.java
View File

@ -13,60 +13,60 @@ import java.util.stream.Collectors;
public class GUIConfiguration { public class GUIConfiguration {
String title; String title;
int lines; int lines;
List<GUIItemConfiguration> guiItems; List<GUIItemConfiguration> guiItems;
public GUIConfiguration(String title, int lines, List<GUIItemConfiguration> guiItems) { public GUIConfiguration(String title, int lines, List<GUIItemConfiguration> guiItems) {
this.title = title; this.title = title;
this.lines = lines; this.lines = lines;
this.guiItems = guiItems; this.guiItems = guiItems;
} }
public String getTitle() { public String getTitle() {
return ColorParser.parse(title); return ColorParser.parse(title);
} }
public int getLines() { public int getLines() {
return lines; return lines;
} }
public GUIType getGUIType() { public GUIType getGUIType() {
return Optional.of(GUIType.getByLines(lines)) return Optional.of(GUIType.getByLines(lines))
.map(type -> type == GUIType.CANCEL ? GUIType.SIX_BY_NINE : type) .map(type -> type == GUIType.CANCEL ? GUIType.SIX_BY_NINE : type)
.get(); .get();
} }
public List<GUIItemConfiguration> getGuiItems() { public List<GUIItemConfiguration> getGuiItems() {
return guiItems; return guiItems;
} }
public void setupItems(Player player, GUI gui) { public void setupItems(Player player, GUI gui) {
getGuiItems().forEach(itemConfiguration -> itemConfiguration.setupItems(player, gui)); getGuiItems().forEach(itemConfiguration -> itemConfiguration.setupItems(player, gui));
} }
public static GUIConfiguration readConfiguration(@Nullable ConfigurationSection section) { public static GUIConfiguration readConfiguration(@Nullable ConfigurationSection section) {
if (section == null) return new GUIConfiguration("name", 6, new ArrayList<>()); if (section == null) return new GUIConfiguration("name", 6, new ArrayList<>());
String title = section.getString("title", ""); String title = section.getString("title", "");
int lines = section.getInt("lines", 6); int lines = section.getInt("lines", 6);
ConfigurationSection itemsSection = section.getConfigurationSection("items"); ConfigurationSection itemsSection = section.getConfigurationSection("items");
if (itemsSection == null) return new GUIConfiguration(title, lines, new ArrayList<>()); if (itemsSection == null) return new GUIConfiguration(title, lines, new ArrayList<>());
return new GUIConfiguration( return new GUIConfiguration(
title, lines, itemsSection.getKeys(false).stream() title, lines, itemsSection.getKeys(false).stream()
.map(key -> GUIItemConfiguration.readFrom(itemsSection.getConfigurationSection(key))) .map(key -> GUIItemConfiguration.readFrom(itemsSection.getConfigurationSection(key)))
.filter(Objects::nonNull) .filter(Objects::nonNull)
.collect(Collectors.toList()) .collect(Collectors.toList())
); );
} }
public static ClickType readClickType(String type) { public static ClickType readClickType(String type) {
return Arrays.stream(ClickType.values()) return Arrays.stream(ClickType.values())
.filter(click -> click.name().equalsIgnoreCase(type)) .filter(click -> click.name().equalsIgnoreCase(type))
.findFirst().orElse(null); .findFirst().orElse(null);
} }
} }

130
base/gui/src/main/java/cc/carm/lib/easyplugin/gui/configuration/GUIItemConfiguration.java
View File

@ -7,86 +7,88 @@ import cc.carm.lib.easyplugin.utils.MessageUtils;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.inventory.ClickType;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.util.ArrayList; import java.util.*;
import java.util.Collections; import java.util.stream.Collectors;
import java.util.List;
import java.util.Optional;
public class GUIItemConfiguration { public class GUIItemConfiguration {
Material material; @NotNull Material type;
int data; int data;
String name; @Nullable String name;
@NotNull List<String> lore; @NotNull List<String> lore;
@NotNull List<Integer> slots; @NotNull List<Integer> slots;
@NotNull List<GUIActionConfiguration> actions; @NotNull List<GUIActionConfiguration> actions;
public GUIItemConfiguration(Material material, int data, public GUIItemConfiguration(@NotNull Material type, int data,
String name, @NotNull List<String> lore, @Nullable String name, @NotNull List<String> lore,
@NotNull List<GUIActionConfiguration> actions, @NotNull List<GUIActionConfiguration> actions,
@NotNull List<Integer> slots) { @NotNull List<Integer> slots) {
this.material = material; this.type = type;
this.data = data; this.data = data;
this.name = name; this.name = name;
this.lore = lore; this.lore = lore;
this.slots = slots; this.slots = slots;
this.actions = actions; this.actions = actions;
} }
public void setupItems(Player player, GUI gui) { public void setupItems(Player player, GUI gui) {
ItemStackFactory icon = new ItemStackFactory(this.material); ItemStackFactory icon = new ItemStackFactory(this.type);
icon.setDurability(this.data); icon.setDurability(this.data);
if (this.name != null) icon.setDisplayName(this.name); if (this.name != null) icon.setDisplayName(this.name);
icon.setLore(MessageUtils.setPlaceholders(player, this.lore)); icon.setLore(MessageUtils.setPlaceholders(player, this.lore));
GUIItem item = new GUIItem(icon.toItemStack()); GUIItem item = new GUIItem(icon.toItemStack());
this.actions.stream().map(GUIActionConfiguration::toClickAction).forEach(item::addClickAction); this.actions.stream().map(GUIActionConfiguration::toClickAction).forEach(item::addClickAction);
this.slots.forEach(slot -> gui.setItem(slot, item)); this.slots.forEach(slot -> gui.setItem(slot, item));
} }
@Nullable public Map<String, Object> serialize() {
public static GUIItemConfiguration readFrom(@Nullable ConfigurationSection itemSection) { LinkedHashMap<String, Object> map = new LinkedHashMap<>();
if (itemSection == null) return null;
Material material = Optional.ofNullable(Material.matchMaterial(itemSection.getString("material", "STONE"))).orElse(Material.STONE);
int data = itemSection.getInt("data", 0);
String name = itemSection.getString("name");
List<String> lore = itemSection.getStringList("lore");
List<Integer> slots = itemSection.getIntegerList("slots"); map.put("type", this.type.name());
int slot = itemSection.getInt("slot", 0); if (this.name != null) map.put("name", this.name);
if (this.data != 0) map.put("data", this.data);
if (!this.lore.isEmpty()) map.put("lore", this.lore);
if (this.slots.size() > 1) {
map.put("slots", this.slots);
} else if (slots.size() == 1) {
map.put("slots", this.slots.get(0));
}
if (!this.actions.isEmpty()) {
map.put("actions", this.actions.stream().map(GUIActionConfiguration::serialize).collect(Collectors.toList()));
}
return map;
}
List<String> actionsString = itemSection.getStringList("actions"); @Nullable
List<GUIActionConfiguration> actions = new ArrayList<>(); public static GUIItemConfiguration readFrom(@Nullable ConfigurationSection itemSection) {
for (String actionString : actionsString) { if (itemSection == null) return null;
int prefixStart = actionString.indexOf("["); String material = Optional.ofNullable(itemSection.getString("type")).orElse("STONE");
int prefixEnd = actionString.indexOf("]"); Material type = Optional.ofNullable(Material.matchMaterial(material)).orElse(Material.STONE);
if (prefixStart < 0 || prefixEnd < 0) continue; int data = itemSection.getInt("data", 0);
String name = itemSection.getString("name");
List<String> lore = itemSection.getStringList("lore");
String prefix = actionString.substring(prefixStart + 1, prefixEnd); List<Integer> slots = itemSection.getIntegerList("slots");
ClickType clickType = null; int slot = itemSection.getInt("slot", 0);
GUIActionType actionType;
if (prefix.contains(":")) {
String[] args = prefix.split(":");
clickType = GUIConfiguration.readClickType(args[0]);
actionType = GUIActionType.readActionType(args[1]);
} else {
actionType = GUIActionType.readActionType(prefix);
}
if (actionType == null) continue; List<String> actionsString = itemSection.getStringList("actions");
actions.add(new GUIActionConfiguration(clickType, actionType, actionString.substring(prefixEnd + 1).trim())); List<GUIActionConfiguration> actions = new ArrayList<>();
} for (String actionString : actionsString) {
GUIActionConfiguration action = GUIActionConfiguration.deserialize(actionString);
if (action == null) continue;
actions.add(action);
}
return new GUIItemConfiguration( return new GUIItemConfiguration(
material, data, name, lore, actions, type, data, name, lore, actions,
slots.size() > 0 ? slots : Collections.singletonList(slot) slots.size() > 0 ? slots : Collections.singletonList(slot)
); );
} }
} }

140
base/gui/src/main/java/cc/carm/lib/easyplugin/gui/paged/AutoPagedGUI.java
View File

@ -10,87 +10,87 @@ import java.util.function.Function;
public class AutoPagedGUI extends CommonPagedGUI { public class AutoPagedGUI extends CommonPagedGUI {
public static Function<Player, ItemStack> defaultPreviousPage = null; public static Function<Player, ItemStack> defaultPreviousPage = null;
public static Function<Player, ItemStack> defaultNextPage = null; public static Function<Player, ItemStack> defaultNextPage = null;
ItemStack previousPageUI; ItemStack previousPageUI;
ItemStack nextPageUI; ItemStack nextPageUI;
int previousPageSlot = -1; int previousPageSlot = -1;
int nextPageSlot = -1; int nextPageSlot = -1;
public AutoPagedGUI(GUIType type, String name, int[] range) { public AutoPagedGUI(GUIType type, String name, int[] range) {
super(type, name, range); super(type, name, range);
} }
public AutoPagedGUI(GUIType type, String name, int a, int b) { public AutoPagedGUI(GUIType type, String name, int a, int b) {
super(type, name, a, b); super(type, name, a, b);
} }
public void setPreviousPageUI(ItemStack lastPageUI) { public void setPreviousPageUI(ItemStack lastPageUI) {
this.previousPageUI = lastPageUI; this.previousPageUI = lastPageUI;
} }
public void setNextPageUI(ItemStack nextPageUI) { public void setNextPageUI(ItemStack nextPageUI) {
this.nextPageUI = nextPageUI; this.nextPageUI = nextPageUI;
} }
public void setPreviousPageSlot(int slot) { public void setPreviousPageSlot(int slot) {
this.previousPageSlot = slot; this.previousPageSlot = slot;
} }
public void setNextPageSlot(int slot) { public void setNextPageSlot(int slot) {
this.nextPageSlot = slot; this.nextPageSlot = slot;
} }
@Override @Override
public void openGUI(Player user) { public void openGUI(Player user) {
if (previousPageSlot >= 0) { if (previousPageSlot >= 0) {
if (hasPreviousPage()) { if (hasPreviousPage()) {
setItem(previousPageSlot, new GUIItem( setItem(previousPageSlot, new GUIItem(
previousPageUI == null ? getDefaultPreviousPage(user) : previousPageUI) { previousPageUI == null ? getDefaultPreviousPage(user) : previousPageUI) {
@Override @Override
public void onClick(ClickType type) { public void onClick(ClickType type) {
if (type == ClickType.RIGHT) { if (type == ClickType.RIGHT) {
goFirstPage(); goFirstPage();
} else { } else {
goPreviousPage(); goPreviousPage();
} }
openGUI(user); openGUI(user);
} }
}); });
} else { } else {
setItem(previousPageSlot, null); setItem(previousPageSlot, null);
} }
} }
if (nextPageSlot >= 0) { if (nextPageSlot >= 0) {
if (hasNextPage()) { if (hasNextPage()) {
setItem(nextPageSlot, new GUIItem( setItem(nextPageSlot, new GUIItem(
nextPageUI == null ? getDefaultNextPage(user) : nextPageUI) { nextPageUI == null ? getDefaultNextPage(user) : nextPageUI) {
@Override @Override
public void onClick(ClickType type) { public void onClick(ClickType type) {
if (type == ClickType.RIGHT) { if (type == ClickType.RIGHT) {
goLastPage(); goLastPage();
} else { } else {
goNextPage(); goNextPage();
} }
openGUI(user); openGUI(user);
} }
}); });
} else { } else {
setItem(nextPageSlot, null); setItem(nextPageSlot, null);
} }
} }
super.openGUI(user); super.openGUI(user);
} }
private static ItemStack getDefaultNextPage(Player player) { private static ItemStack getDefaultNextPage(Player player) {
return defaultNextPage != null ? defaultNextPage.apply(player) : null; return defaultNextPage != null ? defaultNextPage.apply(player) : null;
} }
private static ItemStack getDefaultPreviousPage(Player player) { private static ItemStack getDefaultPreviousPage(Player player) {
return defaultPreviousPage != null ? defaultPreviousPage.apply(player) : null; return defaultPreviousPage != null ? defaultPreviousPage.apply(player) : null;
} }
} }

220
base/gui/src/main/java/cc/carm/lib/easyplugin/gui/paged/CommonPagedGUI.java
View File

@ -11,22 +11,22 @@ import java.util.List;
public class CommonPagedGUI extends PagedGUI { public class CommonPagedGUI extends PagedGUI {
private int[] range; private int[] range;
private CommonPagedGUI(GUIType type, String name) { private CommonPagedGUI(GUIType type, String name) {
super(type, name); super(type, name);
} }
public CommonPagedGUI(GUIType type, String Name, int a, int b) { public CommonPagedGUI(GUIType type, String Name, int a, int b) {
this(type, Name, toRange(type, a, b)); this(type, Name, toRange(type, a, b));
} }
public CommonPagedGUI(GUIType type, String Name, int[] range) { public CommonPagedGUI(GUIType type, String Name, int[] range) {
super(type, Name); super(type, Name);
Arrays.sort(range); Arrays.sort(range);
this.range = range; this.range = range;
} }
@ -41,122 +41,122 @@ public class CommonPagedGUI extends PagedGUI {
} }
*/ */
private static int[] toRange(GUIType type, int a, int b) { private static int[] toRange(GUIType type, int a, int b) {
if (a > b) { if (a > b) {
a = a ^ b; a = a ^ b;
b = a ^ b; b = a ^ b;
a = a ^ b; a = a ^ b;
} }
int lineA = getLine(a); int lineA = getLine(a);
int columnA = getColumn(a); int columnA = getColumn(a);
int lineB = getLine(b); int lineB = getLine(b);
int columnB = getColumn(b); int columnB = getColumn(b);
if (lineB > type.getLines()) if (lineB > type.getLines())
throw new IndexOutOfBoundsException("页面内容范围超过了GUI的大小"); throw new IndexOutOfBoundsException("页面内容范围超过了GUI的大小");
int[] range = new int[(lineB - lineA + 1) * (columnB - columnA + 1)]; int[] range = new int[(lineB - lineA + 1) * (columnB - columnA + 1)];
for (int i = 0, l = 0; i < type.getSize(); i++) { for (int i = 0, l = 0; i < type.getSize(); i++) {
int li = getLine(i); int li = getLine(i);
int ci = getColumn(i); int ci = getColumn(i);
if (li >= lineA && li <= lineB && ci >= columnA && ci <= columnB) { if (li >= lineA && li <= lineB && ci >= columnA && ci <= columnB) {
range[l] = i; range[l] = i;
l++; l++;
} }
} }
return range; return range;
} }
private static int getLine(int i) { private static int getLine(int i) {
return i / 9 + 1; return i / 9 + 1;
} }
private static int getColumn(int i) { private static int getColumn(int i) {
return i % 9 + 1; return i % 9 + 1;
} }
@Override @Override
public boolean hasPreviousPage() { public boolean hasPreviousPage() {
return page > 1; return page > 1;
} }
@Override @Override
public boolean hasNextPage() { public boolean hasNextPage() {
return page < getLastPageNumber(); return page < getLastPageNumber();
} }
/** /**
* 前往第一页 * 前往第一页
*/ */
public void goFirstPage() { public void goFirstPage() {
if (hasPreviousPage()) if (hasPreviousPage())
this.page = 1; this.page = 1;
else else
throw new IndexOutOfBoundsException(); throw new IndexOutOfBoundsException();
} }
/** /**
* 前往最后一页 * 前往最后一页
*/ */
public void goLastPage() { public void goLastPage() {
if (hasNextPage()) if (hasNextPage())
this.page = getLastPageNumber(); this.page = getLastPageNumber();
else else
throw new IndexOutOfBoundsException(); throw new IndexOutOfBoundsException();
} }
/** /**
* 得到最后一页的页码 * 得到最后一页的页码
* *
* @return 最后一页的页码 * @return 最后一页的页码
*/ */
public int getLastPageNumber() { public int getLastPageNumber() {
return (this.container.size() / range.length) + 1; return (this.container.size() / range.length) + 1;
} }
/** /**
* 得到第一页的页码 * 得到第一页的页码
* *
* @return 第一页页码(默认为1) * @return 第一页页码(默认为1)
*/ */
public int getFirstPageNumber() { public int getFirstPageNumber() {
return 1; return 1;
} }
@Override @Override
public void openGUI(Player player) { public void openGUI(Player player) {
if (container.isEmpty()) { if (container.isEmpty()) {
super.openGUI(player); super.openGUI(player);
return; return;
} }
List<GUIItem> list = new ArrayList<>(); List<GUIItem> list = new ArrayList<>();
int start = (page - 1) * range.length; int start = (page - 1) * range.length;
for (int i = start; i < start + range.length; i++) { for (int i = start; i < start + range.length; i++) {
if (i < container.size()) { if (i < container.size()) {
list.add(container.get(i)); list.add(container.get(i));
} else { } else {
break; break;
} }
} }
int i = 0; int i = 0;
Arrays.stream(range).forEach(index -> setItem(index, null)); Arrays.stream(range).forEach(index -> setItem(index, null));
for (int index : range) { for (int index : range) {
if (i < list.size()) { if (i < list.size()) {
setItem(index, list.get(i)); setItem(index, list.get(i));
i++; i++;
} else { } else {
break; break;
} }
} }
super.openGUI(player); super.openGUI(player);
} }
} }

108
base/gui/src/main/java/cc/carm/lib/easyplugin/gui/paged/PagedGUI.java
View File

@ -10,70 +10,70 @@ import java.util.List;
public abstract class PagedGUI extends GUI { public abstract class PagedGUI extends GUI {
List<GUIItem> container = new ArrayList<>(); List<GUIItem> container = new ArrayList<>();
public int page = 1; public int page = 1;
public PagedGUI(GUIType type, String name) { public PagedGUI(GUIType type, String name) {
super(type, name); super(type, name);
} }
public int addItem(GUIItem i) { public int addItem(GUIItem i) {
container.add(i); container.add(i);
return container.size() - 1; return container.size() - 1;
} }
/** /**
* 从GUI中移除一个物品 * 从GUI中移除一个物品
* *
* @param item 物品 * @param item 物品
*/ */
public void removeItem(GUIItem item) { public void removeItem(GUIItem item) {
container.remove(item); container.remove(item);
} }
/** /**
* 从GUI中移除一个物品 * 从GUI中移除一个物品
* *
* @param slot 物品格子数 * @param slot 物品格子数
*/ */
public void removeItem(int slot) { public void removeItem(int slot) {
container.remove(slot); container.remove(slot);
} }
public List<GUIItem> getItemsContainer() { public List<GUIItem> getItemsContainer() {
return new ArrayList<>(container); return new ArrayList<>(container);
} }
/** /**
* 前往上一页 * 前往上一页
*/ */
public void goPreviousPage() { public void goPreviousPage() {
if (hasPreviousPage()) if (hasPreviousPage())
page--; page--;
else else
throw new IndexOutOfBoundsException(); throw new IndexOutOfBoundsException();
} }
/** /**
* 前往下一页 * 前往下一页
*/ */
public void goNextPage() { public void goNextPage() {
if (hasNextPage()) if (hasNextPage())
page++; page++;
else else
throw new IndexOutOfBoundsException(); throw new IndexOutOfBoundsException();
} }
/** /**
* @return 是否有上一页 * @return 是否有上一页
*/ */
public abstract boolean hasPreviousPage(); public abstract boolean hasPreviousPage();
/** /**
* @return 是否有下一页 * @return 是否有下一页
*/ */
public abstract boolean hasNextPage(); public abstract boolean hasNextPage();
} }

63
base/gui/src/test/java/ActionReadTest.java
View File

@ -1,4 +1,3 @@
import cc.carm.lib.easyplugin.gui.configuration.GUIActionType; import cc.carm.lib.easyplugin.gui.configuration.GUIActionType;
import cc.carm.lib.easyplugin.gui.configuration.GUIConfiguration; import cc.carm.lib.easyplugin.gui.configuration.GUIConfiguration;
import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.ClickType;
@ -10,43 +9,43 @@ import java.util.List;
public class ActionReadTest { public class ActionReadTest {
@Test @Test
public void test() { public void test() {
List<String> actions = Arrays.asList( List<String> actions = Arrays.asList(
"[CHAT] 123123", "[CHAT] 123123",
"[SHIFT_LEFT:CHAT] /test qwq", "[SHIFT_LEFT:CHAT] /test qwq",
"[CONSOLE] say hello", "[CONSOLE] say hello",
"[CLOSE]" "[CLOSE]"
); );
for (String actionString : actions) { for (String actionString : actions) {
int prefixStart = actionString.indexOf("["); int prefixStart = actionString.indexOf("[");
int prefixEnd = actionString.indexOf("]"); int prefixEnd = actionString.indexOf("]");
if (prefixStart < 0 || prefixEnd < 0) continue; if (prefixStart < 0 || prefixEnd < 0) continue;
String prefix = actionString.substring(prefixStart + 1, prefixEnd); String prefix = actionString.substring(prefixStart + 1, prefixEnd);
ClickType clickType = null; ClickType clickType = null;
GUIActionType actionType; GUIActionType actionType;
if (prefix.contains(":")) { if (prefix.contains(":")) {
String[] args = prefix.split(":"); String[] args = prefix.split(":");
clickType = GUIConfiguration.readClickType(args[0]); clickType = GUIConfiguration.readClickType(args[0]);
actionType = GUIActionType.readActionType(args[1]); actionType = GUIActionType.readActionType(args[1]);
} else { } else {
actionType = GUIActionType.readActionType(prefix); actionType = GUIActionType.readActionType(prefix);
} }
if (actionType == null) { if (actionType == null) {
System.out.println("# " + actionString); System.out.println("# " + actionString);
System.out.println("- actionType is Null"); System.out.println("- actionType is Null");
continue; continue;
} }
System.out.println("# " + actionType.name() + " " + (clickType == null ? "" : clickType.name())); System.out.println("# " + actionType.name() + " " + (clickType == null ? "" : clickType.name()));
System.out.println("- " + actionString.substring(prefixEnd + 1).trim()); System.out.println("- " + actionString.substring(prefixEnd + 1).trim());
} }
} }
} }

2
base/main/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>easyplugin-parent</artifactId> <artifactId>easyplugin-parent</artifactId>
<groupId>cc.carm.lib</groupId> <groupId>cc.carm.lib</groupId>
<version>1.4.6</version> <version>1.4.7</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

214
base/main/src/main/java/cc/carm/lib/easyplugin/utils/ItemStackFactory.java
View File

@ -14,131 +14,131 @@ import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
public class ItemStackFactory { public class ItemStackFactory {
ItemStack item; ItemStack item;
private ItemStackFactory() { private ItemStackFactory() {
} }
public ItemStackFactory(ItemStack is) { public ItemStackFactory(ItemStack is) {
this.item = is.clone(); this.item = is.clone();
} }
public ItemStackFactory(Material type) { public ItemStackFactory(Material type) {
this(type, 1); this(type, 1);
} }
public ItemStackFactory(Material type, int amount) { public ItemStackFactory(Material type, int amount) {
this(type, amount, (short) 0); this(type, amount, (short) 0);
} }
public ItemStackFactory(Material type, int amount, short data) { public ItemStackFactory(Material type, int amount, short data) {
this.item = new ItemStack(type, amount, data); this.item = new ItemStack(type, amount, data);
} }
public ItemStackFactory(Material type, int amount, int data) { public ItemStackFactory(Material type, int amount, int data) {
this(type, amount, (short) data); this(type, amount, (short) data);
} }
public ItemStack toItemStack() { public ItemStack toItemStack() {
return this.item; return this.item;
} }
public ItemStackFactory setType(Material type) { public ItemStackFactory setType(Material type) {
this.item.setType(type); this.item.setType(type);
return this; return this;
} }
public ItemStackFactory setDurability(int i) { public ItemStackFactory setDurability(int i) {
ItemMeta im = this.item.getItemMeta(); ItemMeta im = this.item.getItemMeta();
if (im instanceof Damageable) { if (im instanceof Damageable) {
((Damageable) im).setDamage(i); ((Damageable) im).setDamage(i);
this.item.setItemMeta(im); this.item.setItemMeta(im);
} }
return this; return this;
} }
public ItemStackFactory setAmount(int a) { public ItemStackFactory setAmount(int a) {
this.item.setAmount(a); this.item.setAmount(a);
return this; return this;
} }
public ItemStackFactory setDisplayName(@NotNull String name) { public ItemStackFactory setDisplayName(@NotNull String name) {
ItemMeta im = this.item.getItemMeta(); ItemMeta im = this.item.getItemMeta();
if (im != null) { if (im != null) {
im.setDisplayName(ColorParser.parse(name)); im.setDisplayName(ColorParser.parse(name));
this.item.setItemMeta(im); this.item.setItemMeta(im);
} }
return this; return this;
} }
public ItemStackFactory setLore(@NotNull List<String> loreList) { public ItemStackFactory setLore(@NotNull List<String> loreList) {
ItemMeta im = this.item.getItemMeta(); ItemMeta im = this.item.getItemMeta();
if (im != null) { if (im != null) {
im.setLore( im.setLore(
loreList.stream() loreList.stream()
.map(ColorParser::parse) .map(ColorParser::parse)
.collect(Collectors.toList()) .collect(Collectors.toList())
); );
this.item.setItemMeta(im); this.item.setItemMeta(im);
} }
return this; return this;
} }
public ItemStackFactory addLore(@NotNull String s) { public ItemStackFactory addLore(@NotNull String s) {
ItemMeta im = this.item.getItemMeta(); ItemMeta im = this.item.getItemMeta();
if (im != null) { if (im != null) {
List<String> lore = im.getLore() != null ? im.getLore() : new ArrayList<>(); List<String> lore = im.getLore() != null ? im.getLore() : new ArrayList<>();
lore.add(ColorParser.parse(s)); lore.add(ColorParser.parse(s));
im.setLore(lore); im.setLore(lore);
this.item.setItemMeta(im); this.item.setItemMeta(im);
} }
return this; return this;
} }
public ItemStackFactory addEnchant(@NotNull Enchantment enchant, int level, boolean ignoreLevelRestriction) { public ItemStackFactory addEnchant(@NotNull Enchantment enchant, int level, boolean ignoreLevelRestriction) {
ItemMeta im = this.item.getItemMeta(); ItemMeta im = this.item.getItemMeta();
if (im != null) { if (im != null) {
im.addEnchant(enchant, level, ignoreLevelRestriction); im.addEnchant(enchant, level, ignoreLevelRestriction);
this.item.setItemMeta(im); this.item.setItemMeta(im);
} }
return this; return this;
} }
public ItemStackFactory removeEnchant(@NotNull Enchantment enchant) { public ItemStackFactory removeEnchant(@NotNull Enchantment enchant) {
ItemMeta im = this.item.getItemMeta(); ItemMeta im = this.item.getItemMeta();
if (im != null) { if (im != null) {
im.removeEnchant(enchant); im.removeEnchant(enchant);
this.item.setItemMeta(im); this.item.setItemMeta(im);
} }
return this; return this;
} }
public ItemStackFactory addFlag(@NotNull ItemFlag flag) { public ItemStackFactory addFlag(@NotNull ItemFlag flag) {
ItemMeta im = this.item.getItemMeta(); ItemMeta im = this.item.getItemMeta();
if (im != null) { if (im != null) {
im.addItemFlags(flag); im.addItemFlags(flag);
this.item.setItemMeta(im); this.item.setItemMeta(im);
} }
return this; return this;
} }
public ItemStackFactory removeFlag(@NotNull ItemFlag flag) { public ItemStackFactory removeFlag(@NotNull ItemFlag flag) {
ItemMeta im = this.item.getItemMeta(); ItemMeta im = this.item.getItemMeta();
if (im != null) { if (im != null) {
im.removeItemFlags(flag); im.removeItemFlags(flag);
this.item.setItemMeta(im); this.item.setItemMeta(im);
} }
return this; return this;
} }
public ItemStackFactory setUnbreakable(boolean unbreakable) { public ItemStackFactory setUnbreakable(boolean unbreakable) {
ItemMeta im = this.item.getItemMeta(); ItemMeta im = this.item.getItemMeta();
if (im != null) { if (im != null) {
im.setUnbreakable(unbreakable); im.setUnbreakable(unbreakable);
this.item.setItemMeta(im); this.item.setItemMeta(im);
} }
return this; return this;
} }
} }

582
base/main/src/main/java/cc/carm/lib/easyplugin/utils/SchedulerUtils.java
View File

@ -12,344 +12,344 @@ import java.util.concurrent.Callable;
@SuppressWarnings("DuplicatedCode") @SuppressWarnings("DuplicatedCode")
public class SchedulerUtils { public class SchedulerUtils {
private final JavaPlugin plugin; private final JavaPlugin plugin;
public SchedulerUtils(JavaPlugin plugin) { public SchedulerUtils(JavaPlugin plugin) {
this.plugin = plugin; this.plugin = plugin;
} }
private JavaPlugin getPlugin() { private JavaPlugin getPlugin() {
return plugin; return plugin;
} }
/** /**
* 在服务端主线程中执行一个任务 * 在服务端主线程中执行一个任务
* *
* @param runnable 需要执行的任务 * @param runnable 需要执行的任务
*/ */
public void run(Runnable runnable) { public void run(Runnable runnable) {
Bukkit.getScheduler().runTask(getPlugin(), runnable); Bukkit.getScheduler().runTask(getPlugin(), runnable);
} }
/** /**
* 异步执行一个任务。 * 异步执行一个任务。
* *
* @param runnable 需要执行的任务 * @param runnable 需要执行的任务
*/ */
public void runAsync(Runnable runnable) { public void runAsync(Runnable runnable) {
Bukkit.getScheduler().runTaskAsynchronously(getPlugin(), runnable); Bukkit.getScheduler().runTaskAsynchronously(getPlugin(), runnable);
} }
/**
* 在主线程延时执行一个任务。
*
* @param delay 延迟的ticks
* @param runnable 需要执行的任务
*/
public void runLater(long delay, Runnable runnable) {
Bukkit.getScheduler().runTaskLater(getPlugin(), runnable, delay);
}
/** /**
* 异步延时执行一个任务。 * 在主线程延时执行一个任务。
* *
* @param delay 延迟的ticks * @param delay 延迟的ticks
* @param runnable 需要执行的任务 * @param runnable 需要执行的任务
*/ */
public void runLaterAsync(long delay, Runnable runnable) { public void runLater(long delay, Runnable runnable) {
Bukkit.getScheduler().runTaskLaterAsynchronously(getPlugin(), runnable, delay); Bukkit.getScheduler().runTaskLater(getPlugin(), runnable, delay);
} }
/** /**
* 间隔一段时间按顺序执行列表中的任务 * 异步延时执行一个任务。
* *
* @param interval 间隔时间 * @param delay 延迟的ticks
* @param tasks 任务列表 * @param runnable 需要执行的任务
*/ */
public void runAtInterval(long interval, Runnable... tasks) { public void runLaterAsync(long delay, Runnable runnable) {
runAtInterval(0L, interval, tasks); Bukkit.getScheduler().runTaskLaterAsynchronously(getPlugin(), runnable, delay);
} }
/**
* 间隔一段时间按顺序执行列表中的任务
*
* @param interval 间隔时间
* @param tasks 任务列表
*/
public void runAtInterval(long interval, Runnable... tasks) {
runAtInterval(0L, interval, tasks);
}
/** /**
* 间隔一段时间按顺序执行列表中的任务 * 间隔一段时间按顺序执行列表中的任务
* *
* @param delay 延迟时间 * @param delay 延迟时间
* @param interval 间隔时间 * @param interval 间隔时间
* @param tasks 任务列表 * @param tasks 任务列表
*/ */
public void runAtInterval(long delay, long interval, Runnable... tasks) { public void runAtInterval(long delay, long interval, Runnable... tasks) {
new BukkitRunnable() { new BukkitRunnable() {
private int index; private int index;
@Override @Override
public void run() { public void run() {
if (this.index >= tasks.length) { if (this.index >= tasks.length) {
this.cancel(); this.cancel();
return; return;
} }
tasks[index].run(); tasks[index].run();
index++; index++;
} }
}.runTaskTimer(getPlugin(), delay, interval); }.runTaskTimer(getPlugin(), delay, interval);
} }
/** /**
* 间隔一段时间按顺序异步执行列表中的任务 * 间隔一段时间按顺序异步执行列表中的任务
* *
* @param interval 间隔时间 * @param interval 间隔时间
* @param tasks 任务列表 * @param tasks 任务列表
*/ */
public void runAtIntervalAsync(long interval, Runnable... tasks) { public void runAtIntervalAsync(long interval, Runnable... tasks) {
runAtIntervalAsync(0L, interval, tasks); runAtIntervalAsync(0L, interval, tasks);
} }
/** /**
* 间隔一段时间按顺序异步执行列表中的任务 * 间隔一段时间按顺序异步执行列表中的任务
* *
* @param delay 延迟时间 * @param delay 延迟时间
* @param interval 间隔时间 * @param interval 间隔时间
* @param tasks 任务列表 * @param tasks 任务列表
*/ */
public void runAtIntervalAsync(long delay, long interval, Runnable... tasks) { public void runAtIntervalAsync(long delay, long interval, Runnable... tasks) {
new BukkitRunnable() { new BukkitRunnable() {
private int index; private int index;
@Override @Override
public void run() { public void run() {
if (this.index >= tasks.length) { if (this.index >= tasks.length) {
this.cancel(); this.cancel();
return; return;
} }
tasks[index].run(); tasks[index].run();
index++; index++;
} }
}.runTaskTimerAsynchronously(getPlugin(), delay, interval); }.runTaskTimerAsynchronously(getPlugin(), delay, interval);
} }
/** /**
* 重复执行一个任务。 * 重复执行一个任务。
* *
* @param repetitions 重复次数 * @param repetitions 重复次数
* @param interval 间隔时间 * @param interval 间隔时间
* @param task 任务 * @param task 任务
* @param onComplete 结束时执行的任务 * @param onComplete 结束时执行的任务
*/ */
public void repeat(int repetitions, long interval, Runnable task, Runnable onComplete) { public void repeat(int repetitions, long interval, Runnable task, Runnable onComplete) {
new BukkitRunnable() { new BukkitRunnable() {
private int index; private int index;
@Override @Override
public void run() { public void run() {
index++; index++;
if (this.index >= repetitions) { if (this.index >= repetitions) {
this.cancel(); this.cancel();
if (onComplete == null) { if (onComplete == null) {
return; return;
} }
onComplete.run(); onComplete.run();
return; return;
} }
task.run(); task.run();
} }
}.runTaskTimer(getPlugin(), 0L, interval); }.runTaskTimer(getPlugin(), 0L, interval);
} }
/** /**
* 重复执行一个任务。 * 重复执行一个任务。
* *
* @param repetitions 重复次数 * @param repetitions 重复次数
* @param interval 间隔时间 * @param interval 间隔时间
* @param task 任务 * @param task 任务
* @param onComplete 结束时执行的任务 * @param onComplete 结束时执行的任务
*/ */
public void repeatAsync(int repetitions, long interval, Runnable task, Runnable onComplete) { public void repeatAsync(int repetitions, long interval, Runnable task, Runnable onComplete) {
new BukkitRunnable() { new BukkitRunnable() {
private int index; private int index;
@Override @Override
public void run() { public void run() {
index++; index++;
if (this.index >= repetitions) { if (this.index >= repetitions) {
this.cancel(); this.cancel();
if (onComplete == null) { if (onComplete == null) {
return; return;
} }
onComplete.run(); onComplete.run();
return; return;
} }
task.run(); task.run();
} }
}.runTaskTimerAsynchronously(getPlugin(), 0L, interval); }.runTaskTimerAsynchronously(getPlugin(), 0L, interval);
} }
/** /**
* 在满足某个条件时，重复执行一个任务。 * 在满足某个条件时，重复执行一个任务。
* *
* @param interval 重复间隔时间 * @param interval 重复间隔时间
* @param predicate 条件 * @param predicate 条件
* @param task 任务 * @param task 任务
* @param onComplete 结束时执行的任务 * @param onComplete 结束时执行的任务
*/ */
public void repeatWhile(long interval, Callable<Boolean> predicate, Runnable task, Runnable onComplete) { public void repeatWhile(long interval, Callable<Boolean> predicate, Runnable task, Runnable onComplete) {
new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
try { try {
if (!predicate.call()) { if (!predicate.call()) {
this.cancel(); this.cancel();
if (onComplete == null) { if (onComplete == null) {
return; return;
} }
onComplete.run(); onComplete.run();
return; return;
} }
task.run(); task.run();
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
}.runTaskTimer(getPlugin(), 0L, interval); }.runTaskTimer(getPlugin(), 0L, interval);
} }
/** /**
* 在满足某个条件时，重复执行一个任务。 * 在满足某个条件时，重复执行一个任务。
* *
* @param interval 重复间隔时间 * @param interval 重复间隔时间
* @param predicate 条件 * @param predicate 条件
* @param task 任务 * @param task 任务
* @param onComplete 结束时执行的任务 * @param onComplete 结束时执行的任务
*/ */
public void repeatWhileAsync(long interval, Callable<Boolean> predicate, Runnable task, Runnable onComplete) { public void repeatWhileAsync(long interval, Callable<Boolean> predicate, Runnable task, Runnable onComplete) {
new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
try { try {
if (!predicate.call()) { if (!predicate.call()) {
this.cancel(); this.cancel();
if (onComplete == null) { if (onComplete == null) {
return; return;
} }
onComplete.run(); onComplete.run();
return; return;
} }
task.run(); task.run();
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
}.runTaskTimerAsynchronously(getPlugin(), 0L, interval); }.runTaskTimerAsynchronously(getPlugin(), 0L, interval);
} }
public interface Task { public interface Task {
void start(Runnable onComplete); void start(Runnable onComplete);
} }
public class TaskBuilder { public class TaskBuilder {
private final Queue<Task> taskList; private final Queue<Task> taskList;
public TaskBuilder() { public TaskBuilder() {
this.taskList = new LinkedList<>(); this.taskList = new LinkedList<>();
} }
public TaskBuilder append(TaskBuilder builder) { public TaskBuilder append(TaskBuilder builder) {
this.taskList.addAll(builder.taskList); this.taskList.addAll(builder.taskList);
return this; return this;
} }
public TaskBuilder appendDelay(long delay) { public TaskBuilder appendDelay(long delay) {
this.taskList.add(onComplete -> SchedulerUtils.this.runLater(delay, onComplete)); this.taskList.add(onComplete -> SchedulerUtils.this.runLater(delay, onComplete));
return this; return this;
} }
public TaskBuilder appendTask(Runnable task) { public TaskBuilder appendTask(Runnable task) {
this.taskList.add(onComplete -> this.taskList.add(onComplete ->
{ {
task.run(); task.run();
onComplete.run(); onComplete.run();
}); });
return this; return this;
} }
public TaskBuilder appendTask(Task task) { public TaskBuilder appendTask(Task task) {
this.taskList.add(task); this.taskList.add(task);
return this; return this;
} }
public TaskBuilder appendDelayedTask(long delay, Runnable task) { public TaskBuilder appendDelayedTask(long delay, Runnable task) {
this.taskList.add(onComplete -> SchedulerUtils.this.runLater(delay, () -> this.taskList.add(onComplete -> SchedulerUtils.this.runLater(delay, () ->
{ {
task.run(); task.run();
onComplete.run(); onComplete.run();
})); }));
return this; return this;
} }
public TaskBuilder appendTasks(long delay, long interval, Runnable... tasks) { public TaskBuilder appendTasks(long delay, long interval, Runnable... tasks) {
this.taskList.add(onComplete -> this.taskList.add(onComplete ->
{ {
Runnable[] runnables = Arrays.copyOf(tasks, tasks.length + 1); Runnable[] runnables = Arrays.copyOf(tasks, tasks.length + 1);
runnables[runnables.length - 1] = onComplete; runnables[runnables.length - 1] = onComplete;
SchedulerUtils.this.runAtInterval(delay, interval, runnables); SchedulerUtils.this.runAtInterval(delay, interval, runnables);
}); });
return this; return this;
} }
public TaskBuilder appendRepeatingTask(int repetitions, long interval, Runnable task) { public TaskBuilder appendRepeatingTask(int repetitions, long interval, Runnable task) {
this.taskList.add(onComplete -> SchedulerUtils.this.repeat(repetitions, interval, task, onComplete)); this.taskList.add(onComplete -> SchedulerUtils.this.repeat(repetitions, interval, task, onComplete));
return this; return this;
} }
public TaskBuilder appendConditionalRepeatingTask(long interval, Callable<Boolean> predicate, Runnable task) { public TaskBuilder appendConditionalRepeatingTask(long interval, Callable<Boolean> predicate, Runnable task) {
this.taskList.add(onComplete -> SchedulerUtils.this.repeatWhile(interval, predicate, task, onComplete)); this.taskList.add(onComplete -> SchedulerUtils.this.repeatWhile(interval, predicate, task, onComplete));
return this; return this;
} }
public TaskBuilder waitFor(Callable<Boolean> predicate) { public TaskBuilder waitFor(Callable<Boolean> predicate) {
this.taskList.add(onComplete -> new BukkitRunnable() { this.taskList.add(onComplete -> new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
try { try {
if (!predicate.call()) { if (!predicate.call()) {
return; return;
} }
this.cancel(); this.cancel();
onComplete.run(); onComplete.run();
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
}.runTaskTimer(getPlugin(), 0L, 1L)); }.runTaskTimer(getPlugin(), 0L, 1L));
return this; return this;
} }
public void runTasks() { public void runTasks() {
this.startNext(); this.startNext();
} }
private void startNext() { private void startNext() {
Task task = this.taskList.poll(); Task task = this.taskList.poll();
if (task == null) { if (task == null) {
return; return;
} }
task.start(this::startNext); task.start(this::startNext);
} }
} }
} }

2
collection/all/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>easyplugin-parent</artifactId> <artifactId>easyplugin-parent</artifactId>
<groupId>cc.carm.lib</groupId> <groupId>cc.carm.lib</groupId>
<version>1.4.6</version> <version>1.4.7</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
collection/bom/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>easyplugin-parent</artifactId> <artifactId>easyplugin-parent</artifactId>
<groupId>cc.carm.lib</groupId> <groupId>cc.carm.lib</groupId>
<version>1.4.6</version> <version>1.4.7</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
collection/common/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>easyplugin-parent</artifactId> <artifactId>easyplugin-parent</artifactId>
<groupId>cc.carm.lib</groupId> <groupId>cc.carm.lib</groupId>
<version>1.4.6</version> <version>1.4.7</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
extension/papi/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>easyplugin-parent</artifactId> <artifactId>easyplugin-parent</artifactId>
<groupId>cc.carm.lib</groupId> <groupId>cc.carm.lib</groupId>
<version>1.4.6</version> <version>1.4.7</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
extension/vault/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>easyplugin-parent</artifactId> <artifactId>easyplugin-parent</artifactId>
<groupId>cc.carm.lib</groupId> <groupId>cc.carm.lib</groupId>
<version>1.4.6</version> <version>1.4.7</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
pom.xml
View File

@ -15,7 +15,7 @@
<groupId>cc.carm.lib</groupId> <groupId>cc.carm.lib</groupId>
<artifactId>easyplugin-parent</artifactId> <artifactId>easyplugin-parent</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>1.4.6</version> <version>1.4.7</version>
<modules> <modules>
<module>base/main</module> <module>base/main</module>