From a9a02a3eaaf1c68e6ad2f152e739793504f9c30e Mon Sep 17 00:00:00 2001 From: Xiao-MoMi <70987828+Xiao-MoMi@users.noreply.github.com> Date: Wed, 22 Jun 2022 17:36:38 +0800 Subject: [PATCH] 1.0 --- .../customnameplates/ConfigManager.java | 2 +- .../customnameplates/font/FontCache.java | 2 +- .../customnameplates/font/FontWidth.java | 2 +- .../resource/ResourceManager.java | 6 +++--- src/main/resources/config.yml | 5 ++--- src/main/resources/plugin.yml | 2 -- src/main/resources/resources/halloween.png | Bin 0 -> 525 bytes src/main/resources/resources/hutao.png | Bin 0 -> 985 bytes src/main/resources/resources/rabbit.png | Bin 0 -> 268 bytes src/main/resources/resources/starsky.png | Bin 0 -> 502 bytes src/main/resources/resources/trident.png | Bin 0 -> 229 bytes src/main/resources/resources/xmas.png | Bin 0 -> 479 bytes 12 files changed, 8 insertions(+), 11 deletions(-) create mode 100644 src/main/resources/resources/halloween.png create mode 100644 src/main/resources/resources/hutao.png create mode 100644 src/main/resources/resources/rabbit.png create mode 100644 src/main/resources/resources/starsky.png create mode 100644 src/main/resources/resources/trident.png create mode 100644 src/main/resources/resources/xmas.png diff --git a/src/main/java/net/momirealms/customnameplates/ConfigManager.java b/src/main/java/net/momirealms/customnameplates/ConfigManager.java index ea8c7ae..eb7012c 100644 --- a/src/main/java/net/momirealms/customnameplates/ConfigManager.java +++ b/src/main/java/net/momirealms/customnameplates/ConfigManager.java @@ -149,7 +149,7 @@ public class ConfigManager { idle_timeout = databaseConfig.getInt("Pool-Settings.idle-timeout"); } }else { - AdventureManager.consoleMessage("这种存储方式不存在"); + AdventureManager.consoleMessage("[CustomNameplates] Error! No such storage mode!"); Bukkit.getPluginManager().disablePlugin(CustomNameplates.instance); } } diff --git a/src/main/java/net/momirealms/customnameplates/font/FontCache.java b/src/main/java/net/momirealms/customnameplates/font/FontCache.java index 31bd6b4..ec8d38e 100644 --- a/src/main/java/net/momirealms/customnameplates/font/FontCache.java +++ b/src/main/java/net/momirealms/customnameplates/font/FontCache.java @@ -6,7 +6,7 @@ public record FontCache(String name, FontChar fontChar, NameplateConfig config) public static FontCache EMPTY; static { - FontCache.EMPTY = new FontCache("none", new FontChar(' ', ' ', ' '), NameplateConfig.EMPTY); + FontCache.EMPTY = new FontCache("none", new FontChar('小', '默', '米'), NameplateConfig.EMPTY); } public String getName() { diff --git a/src/main/java/net/momirealms/customnameplates/font/FontWidth.java b/src/main/java/net/momirealms/customnameplates/font/FontWidth.java index e8596cc..61945f4 100644 --- a/src/main/java/net/momirealms/customnameplates/font/FontWidth.java +++ b/src/main/java/net/momirealms/customnameplates/font/FontWidth.java @@ -27,7 +27,7 @@ public enum FontWidth { RIGHT_ARROW('>', 4), QUESTION_MARK('?', 5), SLASH('/', 5), BACK_SLASH('\\', 5), LINE('|', 1), TILDE('~', 5), TICK('`', 2), PERIOD('.', 1), COMMA(',', 1), SPACE(' ', 3), - IN_BETWEEN(' ', 1), DEFAULT('默', 8), DEFAULT2('米', 7); + IN_BETWEEN(' ', 1), DEFAULT('默', 8); private final char character; private final int length; diff --git a/src/main/java/net/momirealms/customnameplates/resource/ResourceManager.java b/src/main/java/net/momirealms/customnameplates/resource/ResourceManager.java index 8d4d454..f107317 100644 --- a/src/main/java/net/momirealms/customnameplates/resource/ResourceManager.java +++ b/src/main/java/net/momirealms/customnameplates/resource/ResourceManager.java @@ -111,7 +111,7 @@ public class ResourceManager { return; } //资源包生成成功提示 - AdventureManager.consoleMessage("[CustomNameplates] Resource pack has been successfully generated! " + this.caches.size() + " nameplates Loaded."); + AdventureManager.consoleMessage("[CustomNameplates] Resource pack has been successfully generated! " + (this.caches.size() -1) + " nameplates Loaded."); if (this.plugin.getHookManager().hasItemsAdder()){ try{ FileUtils.copyDirectory(g_file, new File(Bukkit.getPluginManager().getPlugin("ItemsAdder").getDataFolder() + File.separator + "data"+ File.separator + "resource_pack" + File.separator + "assets") ); @@ -126,7 +126,7 @@ public class ResourceManager { 保存插件预设资源 */ private void saveDefaultResources() { - List list = Arrays.asList("cat", "egg", "cheems", "wither"); + List list = Arrays.asList("cat", "egg", "cheems", "wither", "xmas", "halloween","hutao","starsky","trident","rabbit"); list.forEach(name -> CustomNameplates.instance.saveResource("resources" + File.separatorChar + name + ".png", false)); } @@ -168,7 +168,7 @@ public class ResourceManager { config.set("color","WHITE"); } if (!config.contains("size")){ - config.set("size", 12); + config.set("size", 16); } ChatColor color = ChatColor.WHITE; try { diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index f36545c..7bda0df 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -1,9 +1,8 @@ config: - # Messages Language + # Language lang: en # Your namespace - # "minecraft" is also namespace: "nameplates" # Font Name @@ -35,7 +34,7 @@ config: # Placeholder based prefix and suffix system. When enabled, it is recommended # to use PlaceholderAPI to be able to use this feature to the fullest extent. # keep it empty if you don't want to enable this feature. - prefix: '%vault_prefix%' + prefix: '' suffix: '' # Should the plugin hook into other plugins diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index d311fe3..41e96e2 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -8,8 +8,6 @@ depend: - PlaceholderAPI softdepend: - ItemsAdder - - Oraxen - - PlaceholderAPI commands: customnameplates: usage: /customnameplates help diff --git a/src/main/resources/resources/halloween.png b/src/main/resources/resources/halloween.png new file mode 100644 index 0000000000000000000000000000000000000000..ae7fc8e640ef74113cee6d6b33b79ba42ac4ab7d GIT binary patch literal 525 zcmV+o0`mQdP)2?6^ zsQ~-(HX_F+WX~B7u@(R6005>IKR6CJx3QV&wBNIRn P00000NkvXXu0mjfe(m5N literal 0 HcmV?d00001 diff --git a/src/main/resources/resources/hutao.png b/src/main/resources/resources/hutao.png new file mode 100644 index 0000000000000000000000000000000000000000..81e4cd8d5d1e15d79dafd8ab78ba87a86fd88724 GIT binary patch literal 985 zcmV;~119{5P)_W4|WSV%xjhQjq-4+v*C8j1O(+G2z5EEmZ9nNKJEV{rLegFcteYbXG z9W5L$-uAUG{n)#;@t?doZ_aZ*{?9r8=Xs8h;V@aDC^EYNP*sr}lXJ+UVCwX!e0%Jh zthSFf;8>;BzM}pmcG@jjXXPVr#$E(``Lv7UTX7V(mE&7+j#a{F?;-iE(q!1XwAdT_ z8|vkof3IeoR4%yp)MXsTq_2g+i?^BdweZX3MSf`7&-1|4!Xjtxtc&ysB11yS)14dg zl8D@;`POS3_6-0~5{=O8aI*N%G62JE9stfo;$p0?S=wu$|HOo_ z_#5h_zoA}M$96F{)Sh|m8C zz*t|ieE+*^A{vCX@Ddh4xSds^rQcOFQf83KT08OSxl@ETg6yfR0bt?xRn4#!1K{d! zON_nTE$y25F|$wsl{jCzoqqO!JQ}OOZh_Tc1b~qzyKt1l7t5=ZL?aBhdFW|(@xl0y z;{5zg9}a=jUgst9Buzlt$f~c>@{8 z6(+lTceHh?c8ifNp9Gj%{sVxsQV_Pq1t2ffxJ76qC@Hb=-cueX)>im1a8XzcWb#Ww zpeXn|+9isTa;D&zNyJoo54}KdXJ$pdUa1_JSzZYqYoXptL8&d}Haqm>h8K6 zKNX6?JPCVRIUR8BBUGYM327xMRh#rZC+Dw;cfCH@R@cbCxXxy_3j6Hw00000NkvXX Hu0mjfoXzAA literal 0 HcmV?d00001 diff --git a/src/main/resources/resources/rabbit.png b/src/main/resources/resources/rabbit.png new file mode 100644 index 0000000000000000000000000000000000000000..af5e363e699b551c524333ba4c7165aa95bb6d24 GIT binary patch literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^20$#p!3-qR3wWA=lw^r(L`iUdT1k0gQ7VIDN`6wR zf@f}GdTLN=VoGJ<$y6JlBB21E5Z6B^KL5Y;?fc;`K!N{YVAQhP0mxx13GxdD3ovZn zzhpm9q|VdDF{I+wo=J{;4GKIg)ARoRpT1P!a93`R`1b(McFu&Z#qBYs-9<-E%?H?XPT$|px?H6v@ z=Vu%)3fCl{2R1q@(VyH0Is#VSF=ZCo{B?|gox+|%yEmhVOCZ_0#q-coSiHL(G-RlMS`G2kVF`@a!OdczH9?rg?*-tG@lSvO0RKH4HvrWMvj6}907*qoM6N<$f>eRnQUCw| literal 0 HcmV?d00001 diff --git a/src/main/resources/resources/trident.png b/src/main/resources/resources/trident.png new file mode 100644 index 0000000000000000000000000000000000000000..85268807f7dfe0d477309c177cdf52d25d2087ac GIT binary patch literal 229 zcmV^P)A(Oi297+s$ME&jJBH7%-ZH4_88CeQ_7z1l zFBdnM28n~%FJ3$b^Ccu?;bJg(Tmad87(iAJGXrEcH=hugy&|~?9-u?t1Go$xGD!$T f42w)WREtpn?HZC1op+}<00000NkvXXu0mjfZ1`7< literal 0 HcmV?d00001 diff --git a/src/main/resources/resources/xmas.png b/src/main/resources/resources/xmas.png new file mode 100644 index 0000000000000000000000000000000000000000..a3a6245d6bae6029499e18fbc1fcc5344b5b1c85 GIT binary patch literal 479 zcmeAS@N?(olHy`uVBq!ia0vp^20$#p!3-qR3wWA=lw^r(L`iUdT1k0gQ7VIDN`6wR zf@f}GdTLN=VoGJ<$y6JlqNo6$5LfVm^uG5t z?@pVfWY#&w>vx)YKeRNO?y>Jj?~R%BT@Lm^7yY|G#{W&eZjPZcU#jjrqCn-I@E6DJakNJW1huO)p z%nAaYYgi_{`BTEIP+dBIZtud^RufZyiYG8MBzWqD8az$|dY-}4)z4*}Q$iB}kxk&I literal 0 HcmV?d00001