From 54cc9c070b8473bf84a1bc4384d0828bb98d20cb Mon Sep 17 00:00:00 2001 From: carm Date: Fri, 21 Jan 2022 13:03:43 +0800 Subject: [PATCH] =?UTF-8?q?[v1.3.1]=20=E7=89=88=E6=9C=AC=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=20-=20[U]=20=E4=BF=AE=E6=94=B9=E9=A2=84=E6=B5=8B=E4=BB=93?= =?UTF-8?q?=E5=BA=93=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E7=9A=84=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE=EF=BC=8C=E4=BD=BF=E5=85=B6=E5=9C=A8=E5=88=9D=E6=AC=A1?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E6=97=B6=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90?= =?UTF-8?q?=EF=BC=8C=E9=81=BF=E5=85=8D=E7=94=A8=E6=88=B7=E5=AE=8C=E5=85=A8?= =?UTF-8?q?=E4=B8=8D=E7=9F=A5=E9=81=93=E8=BF=98=E6=9C=89=E9=A2=84=E8=AE=BE?= =?UTF-8?q?=E4=BB=93=E5=BA=93=E8=BF=99=E5=9B=9E=E4=BA=8B=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .examples/depositories/README.md | 8 ++++---- README.md | 4 ++-- pom.xml | 2 +- .../ultradepository/manager/DepositoryManager.java | 14 ++++++++++---- .../main/resources/depositories}/farmer.yml | 0 .../main/resources/depositories}/fishman.yml | 0 .../main/resources/depositories}/hunter.yml | 0 .../main/resources/depositories}/miner.yml | 0 8 files changed, 17 insertions(+), 11 deletions(-) rename {.examples/depositories/files => src/main/resources/depositories}/farmer.yml (100%) rename {.examples/depositories/files => src/main/resources/depositories}/fishman.yml (100%) rename {.examples/depositories/files => src/main/resources/depositories}/hunter.yml (100%) rename {.examples/depositories/files => src/main/resources/depositories}/miner.yml (100%) diff --git a/.examples/depositories/README.md b/.examples/depositories/README.md index 29bab90..18ac162 100644 --- a/.examples/depositories/README.md +++ b/.examples/depositories/README.md @@ -17,18 +17,18 @@ ## 预设配置截图 -### 渔夫仓库 ([fishman.yml](files/fishman.yml)) +### 渔夫仓库 ([fishman.yml](../../src/main/resources/depositories/fishman.yml)) ![fishman](images/fishman.png) -### 矿工仓库 ([miner.yml](files/miner.yml)) +### 矿工仓库 ([miner.yml](../../src/main/resources/depositories/miner.yml)) ![miner](images/miner.png) -### 农夫仓库 ([farmer.yml](files/farmer.yml)) +### 农夫仓库 ([farmer.yml](../../src/main/resources/depositories/farmer.yml)) ![farmer](images/farmer.png) -### 猎人仓库 ([hunter.yml](files/hunter.yml)) +### 猎人仓库 ([hunter.yml](../../src/main/resources/depositories/hunter.yml)) ![hunter](images/hunter.png) \ No newline at end of file diff --git a/README.md b/README.md index edffd8a..ab902f7 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ 进入仓库后的物品玩家可以选择拿出或直接按量出售，且每日的出售数量上限和每件物品的价格可以自定义。 -插件支持针对不同的权限配置仓库的容量，由此可以制作付费享用的”农业仓库“、”战斗仓库“、”伐木仓库“... +插件支持针对不同的权限配置仓库的容量，由此可以制作付费享用的”作物仓库“、”药剂师仓库“、”伐木仓库“... 综上，该插件不但提供了一种功能特权，对其合理配置之后也将大大为玩家带来便利。 @@ -218,7 +218,7 @@ 文件名即仓库的ID，**强烈推荐使用纯英文**。以`.`开头的仓库配置不会被加载。部分符号可能会影响正常读取，请避免使用。 -随本项目预设了几个常用的仓库类型，可以 [在这里](.examples/depositories) 找到您需要的仓库配置加以修改后使用。 +随本项目预设了几个常用的仓库类型，可以 [在这里](.examples/depositories) 直接下载您需要的仓库配置加以修改后使用。 您也可以 [点击这里](src/main/resources/depositories/.example-depository.yml) 查看一份*详细的仓库配置示例*，以制作您自己的仓库。 diff --git a/pom.xml b/pom.xml index d846276..be9bed0 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ cc.carm.plugin ultradepository jar - 1.3.0 + 1.3.1 UltraDepository 超级仓库插件，支持设定不同物品的存储仓库。 diff --git a/src/main/java/cc/carm/plugin/ultradepository/manager/DepositoryManager.java b/src/main/java/cc/carm/plugin/ultradepository/manager/DepositoryManager.java index 7e0fb52..0f966c3 100644 --- a/src/main/java/cc/carm/plugin/ultradepository/manager/DepositoryManager.java +++ b/src/main/java/cc/carm/plugin/ultradepository/manager/DepositoryManager.java @@ -6,6 +6,7 @@ import cc.carm.plugin.ultradepository.configuration.PluginMessages; import cc.carm.plugin.ultradepository.configuration.depository.Depository; import cc.carm.plugin.ultradepository.configuration.depository.DepositoryItem; import cc.carm.plugin.ultradepository.event.DepositoryCollectItemEvent; +import cc.carm.plugin.ultradepository.util.JarUtil; import com.google.common.collect.HashMultimap; import org.bukkit.Bukkit; import org.bukkit.Material; @@ -18,6 +19,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.io.File; +import java.io.IOException; import java.util.*; import java.util.stream.Collectors; @@ -45,10 +47,14 @@ public class DepositoryManager { File folder = new File(UltraDepository.getInstance().getDataFolder(), "depositories"); if (!folder.exists()) { folder.mkdir(); - - UltraDepository.getInstance().saveResource( - "depositories/.example-depository.yml", false - ); + + try { + JarUtil.copyFolderFromJar( + "depositories", UltraDepository.getInstance().getDataFolder(), + JarUtil.CopyOption.COPY_IF_NOT_EXIST + ); + } catch (IOException ignore) { + } } else if (folder.isDirectory()) { folder.delete(); diff --git a/.examples/depositories/files/farmer.yml b/src/main/resources/depositories/farmer.yml similarity index 100% rename from .examples/depositories/files/farmer.yml rename to src/main/resources/depositories/farmer.yml diff --git a/.examples/depositories/files/fishman.yml b/src/main/resources/depositories/fishman.yml similarity index 100% rename from .examples/depositories/files/fishman.yml rename to src/main/resources/depositories/fishman.yml diff --git a/.examples/depositories/files/hunter.yml b/src/main/resources/depositories/hunter.yml similarity index 100% rename from .examples/depositories/files/hunter.yml rename to src/main/resources/depositories/hunter.yml diff --git a/.examples/depositories/files/miner.yml b/src/main/resources/depositories/miner.yml similarity index 100% rename from .examples/depositories/files/miner.yml rename to src/main/resources/depositories/miner.yml