From 55de5f15899cec0d578fb0a7f991e08eae4c2775 Mon Sep 17 00:00:00 2001 From: Xiao-MoMi <70987828+Xiao-MoMi@users.noreply.github.com> Date: Fri, 29 Jul 2022 12:19:56 +0800 Subject: [PATCH] 1.8.0-PRE-2 --- build.gradle | 2 +- .../net/momirealms/customnameplates/ConfigManager.java | 5 +++-- .../momirealms/customnameplates/CustomNameplates.java | 3 +++ .../customnameplates/resource/ResourceManager.java | 4 ++-- src/main/resources/actionbar.yml | 2 +- src/main/resources/bossbar.yml | 2 +- src/main/resources/config.yml | 10 +++++++--- 7 files changed, 18 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index abfa91b..955631b 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ plugins { } group = 'net.momirealms' -version = '1.8.0-SNAPSHOT' +version = '1.8.0-PRE-2' repositories { mavenCentral() diff --git a/src/main/java/net/momirealms/customnameplates/ConfigManager.java b/src/main/java/net/momirealms/customnameplates/ConfigManager.java index aaa8289..4556b32 100644 --- a/src/main/java/net/momirealms/customnameplates/ConfigManager.java +++ b/src/main/java/net/momirealms/customnameplates/ConfigManager.java @@ -104,6 +104,9 @@ public class ConfigManager { player_prefix = config.getString("config.prefix"); player_suffix = config.getString("config.suffix"); anotherFont = config.getBoolean("config.another-ascii-font.enable",true); + if(config.getBoolean("config.extract-shader",true)){ + CustomNameplates.instance.saveResource("shaders.zip", true); + } itemsAdder = config.getBoolean("config.integrations.ItemsAdder",false); fontOffset = config.getInt("config.another-ascii-font.y-offset",3); @@ -127,8 +130,6 @@ public class ConfigManager { if(CustomNameplates.instance.getServer().getPluginManager().getPlugin("TAB") == null){ tab = false; CustomNameplates.instance.getLogger().warning("Failed to initialize TAB!"); - }else { - AdventureManager.consoleMessage("[CustomNameplates] TAB Hooked!"); } } diff --git a/src/main/java/net/momirealms/customnameplates/CustomNameplates.java b/src/main/java/net/momirealms/customnameplates/CustomNameplates.java index 2f4e109..887d402 100644 --- a/src/main/java/net/momirealms/customnameplates/CustomNameplates.java +++ b/src/main/java/net/momirealms/customnameplates/CustomNameplates.java @@ -95,6 +95,9 @@ public final class CustomNameplates extends JavaPlugin { new Placeholders().register(); AdventureManager.consoleMessage("[CustomNameplates] PlaceholderAPI Hooked!"); } + if (ConfigManager.MainConfig.tab){ + AdventureManager.consoleMessage("[CustomNameplates] TAB Hooked!"); + } Objects.requireNonNull(Bukkit.getPluginCommand("customnameplates")).setExecutor(new Execute(this)); Objects.requireNonNull(Bukkit.getPluginCommand("customnameplates")).setTabCompleter(new TabComplete(this)); this.resourceManager = new ResourceManager(this); diff --git a/src/main/java/net/momirealms/customnameplates/resource/ResourceManager.java b/src/main/java/net/momirealms/customnameplates/resource/ResourceManager.java index 42a862a..38af867 100644 --- a/src/main/java/net/momirealms/customnameplates/resource/ResourceManager.java +++ b/src/main/java/net/momirealms/customnameplates/resource/ResourceManager.java @@ -161,7 +161,7 @@ public class ResourceManager { CustomNameplates.instance.saveResource("space_split.png", false); //复制space_split.png try{ - FileUtils.copyFile(new File(CustomNameplates.instance.getDataFolder(),"space_split.png"), new File(t_file.getPath() + File.separatorChar + ConfigManager.MainConfig.folder_path + "space_split.png")); + FileUtils.copyFile(new File(CustomNameplates.instance.getDataFolder(),"space_split.png"), new File(t_file.getPath() + File.separator + "space_split.png")); }catch (IOException e){ e.printStackTrace(); AdventureManager.consoleMessage("[CustomNameplates] Error! Failed to copy space_split.png to resource pack..."); @@ -263,7 +263,7 @@ public class ResourceManager { private JsonObject getNegativeFontChar(int height, char character) { JsonObject jsonObject = new JsonObject(); jsonObject.add("type", new JsonPrimitive("bitmap")); - jsonObject.add("file", new JsonPrimitive(ConfigManager.MainConfig.namespace + ":" + ConfigManager.MainConfig.folder_path.replaceAll("\\\\","/") +"space_split.png")); + jsonObject.add("file", new JsonPrimitive(ConfigManager.MainConfig.namespace + ":space_split.png")); jsonObject.add("ascent", new JsonPrimitive(-5000)); jsonObject.add("height", new JsonPrimitive(height)); final JsonArray jsonArray = new JsonArray(); diff --git a/src/main/resources/actionbar.yml b/src/main/resources/actionbar.yml index e77926e..8e406dc 100644 --- a/src/main/resources/actionbar.yml +++ b/src/main/resources/actionbar.yml @@ -1,2 +1,2 @@ -text: '%nameplates_prefix%Hello! %player_name% %player_ip%%nameplates_suffix%' +text: '%nameplates_prefix%Hello! %player_name%%nameplates_suffix%' refresh-rate: 5 \ No newline at end of file diff --git a/src/main/resources/bossbar.yml b/src/main/resources/bossbar.yml index 576345d..344680b 100644 --- a/src/main/resources/bossbar.yml +++ b/src/main/resources/bossbar.yml @@ -10,7 +10,7 @@ mode: ProtocolLib bossbar: example: - text: '%nameplates_bg_player%Hello! %player_name% %nameplates_bg_pos%You are now at: %player_x%, %player_y%, %player_z%' + text: '%nameplates_bg_player%Hello! %player_name% %nameplates_bg_pos%You are now at: %player_x%, %player_y%, %player_z%' refresh-rate: 5 # PINK # YELLOW diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 9f445f4..a0d4fbd 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -12,6 +12,7 @@ config: # folder into the resource pack generated by ItemsAdder. ItemsAdder: false # When enabled, the plugin will hook into TAB's team management + # require a restart to apply this TAB: false # Your namespace @@ -53,12 +54,15 @@ 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: 'Hello! ' - suffix: ' %player_ip%' + prefix: 'Hello! ' + suffix: '' # should prefix/suffix be hidden when player is equipping a nameplate hide-prefix-when-equipped: false hide-suffix-when-equipped: false # Thin-font support - use-thin-font: false \ No newline at end of file + use-thin-font: false + + # Extract default shader to plugin folder + extract-shader: true \ No newline at end of file