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 0000000..ae7fc8e Binary files /dev/null and b/src/main/resources/resources/halloween.png differ diff --git a/src/main/resources/resources/hutao.png b/src/main/resources/resources/hutao.png new file mode 100644 index 0000000..81e4cd8 Binary files /dev/null and b/src/main/resources/resources/hutao.png differ diff --git a/src/main/resources/resources/rabbit.png b/src/main/resources/resources/rabbit.png new file mode 100644 index 0000000..af5e363 Binary files /dev/null and b/src/main/resources/resources/rabbit.png differ diff --git a/src/main/resources/resources/starsky.png b/src/main/resources/resources/starsky.png new file mode 100644 index 0000000..fb9583b Binary files /dev/null and b/src/main/resources/resources/starsky.png differ diff --git a/src/main/resources/resources/trident.png b/src/main/resources/resources/trident.png new file mode 100644 index 0000000..8526880 Binary files /dev/null and b/src/main/resources/resources/trident.png differ diff --git a/src/main/resources/resources/xmas.png b/src/main/resources/resources/xmas.png new file mode 100644 index 0000000..a3a6245 Binary files /dev/null and b/src/main/resources/resources/xmas.png differ