diff --git a/README.md b/README.md index 51b08cb..eb17a51 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # Custom-Nameplates ![CodeFactor Grade](https://img.shields.io/codefactor/grade/github/Xiao-MoMi/Custom-Nameplates) +![Code Size](https://img.shields.io/github/languages/code-size/Xiao-MoMi/Custom-Nameplates) ![bStats Servers](https://img.shields.io/bstats/servers/16649) ![bStats Players](https://img.shields.io/bstats/players/16649) ![GitHub](https://img.shields.io/github/license/Xiao-MoMi/Custom-Nameplates) diff --git a/api/src/main/java/net/momirealms/customnameplates/api/manager/VersionManager.java b/api/src/main/java/net/momirealms/customnameplates/api/manager/VersionManager.java index 3680447..9a6eb78 100644 --- a/api/src/main/java/net/momirealms/customnameplates/api/manager/VersionManager.java +++ b/api/src/main/java/net/momirealms/customnameplates/api/manager/VersionManager.java @@ -35,6 +35,8 @@ public interface VersionManager { */ CompletionStage checkUpdate(); + boolean isVersionNewerThan1_20_5(); + /** * Get plugin version * diff --git a/build.gradle.kts b/build.gradle.kts index 9aa756d..fe3fab8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,7 +7,7 @@ plugins { allprojects { - version = "2.4.1" + version = "2.4.2" apply() apply(plugin = "java") diff --git a/gradle.properties b/gradle.properties index e362bf7..e69de29 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +0,0 @@ -#systemProp.socks.proxyHost=127.0.0.1 -#systemProp.socks.proxyPort=7890 -# -#systemProp.http.proxyHost=127.0.0.1 -#systemProp.http.proxyPort=7890 -# -#systemProp.https.proxyHost=127.0.0.1 -#systemProp.https.proxyPort=7890 \ No newline at end of file diff --git a/paper/src/main/java/net/momirealms/customnameplates/paper/mechanic/misc/VersionManagerImpl.java b/paper/src/main/java/net/momirealms/customnameplates/paper/mechanic/misc/VersionManagerImpl.java index 9a80333..0c3aa5c 100644 --- a/paper/src/main/java/net/momirealms/customnameplates/paper/mechanic/misc/VersionManagerImpl.java +++ b/paper/src/main/java/net/momirealms/customnameplates/paper/mechanic/misc/VersionManagerImpl.java @@ -96,6 +96,11 @@ public class VersionManagerImpl implements VersionManager, Listener { return mcVersion >= 20.2; } + @Override + public boolean isVersionNewerThan1_20_5() { + return mcVersion >= 20.5; + } + @NotNull @Override public String getPluginVersion() { diff --git a/paper/src/main/java/net/momirealms/customnameplates/paper/mechanic/pack/ResourcePackManagerImpl.java b/paper/src/main/java/net/momirealms/customnameplates/paper/mechanic/pack/ResourcePackManagerImpl.java index 5e521d7..6232df8 100644 --- a/paper/src/main/java/net/momirealms/customnameplates/paper/mechanic/pack/ResourcePackManagerImpl.java +++ b/paper/src/main/java/net/momirealms/customnameplates/paper/mechanic/pack/ResourcePackManagerImpl.java @@ -90,9 +90,21 @@ public class ResourcePackManagerImpl implements ResourcePackManager { // save unicodes this.saveLegacyUnicodes(); // generate shaders - this.generateShaders("ResourcePack" + File.separator + "assets" + File.separator + "minecraft" + File.separator + "shaders" + File.separator + "core" + File.separator); - this.generateShaders("ResourcePack" + File.separator + "overlay_1_20_5" + File.separator + "assets" + File.separator + "minecraft" + File.separator + "shaders" + File.separator + "core" + File.separator); - + if (!plugin.getVersionManager().isVersionNewerThan1_20_5()) { + this.generateShaders("ResourcePack" + File.separator + "assets" + File.separator + "minecraft" + File.separator + "shaders" + File.separator + "core" + File.separator); + this.generateShaders("ResourcePack" + File.separator + "overlay_1_20_5" + File.separator + "assets" + File.separator + "minecraft" + File.separator + "shaders" + File.separator + "core" + File.separator); + } else { + this.generateShaders("ResourcePack" + File.separator + "overlay_1_20_5" + File.separator + "assets" + File.separator + "minecraft" + File.separator + "shaders" + File.separator + "core" + File.separator); + try { + FileUtils.copyDirectory( + new File(plugin.getDataFolder(), "ResourcePack" + File.separator + "overlay_1_20_5"), + new File(plugin.getDataFolder(), "ResourcePack") + ); + FileUtils.deleteDirectory(new File(plugin.getDataFolder(), "ResourcePack" + File.separator + "overlay_1_20_5")); + } catch (IOException e) { + e.printStackTrace(); + } + } // add offset characters this.getOffsets(texturesFolder).forEach(providers::add); // add nameplate characters @@ -495,7 +507,14 @@ public class ResourcePackManagerImpl implements ResourcePackManager { } private void setPackFormat() { - plugin.saveResource("ResourcePack" + File.separator + "pack.mcmeta", false); + if (plugin.getVersionManager().isVersionNewerThan1_20_5()) { + plugin.saveResource("ResourcePack" + File.separator + "pack_1_20_5.mcmeta", false); + File file = new File(plugin.getDataFolder(), "ResourcePack" + File.separator + "pack_1_20_5.mcmeta"); + file.renameTo(new File(plugin.getDataFolder(), "ResourcePack" + File.separator + "pack.mcmeta")); + } else { + plugin.saveResource("ResourcePack" + File.separator + "pack.mcmeta", false); + } + // File format_file = new File(plugin.getDataFolder(), "ResourcePack" + File.separator + "pack.mcmeta"); // String line; // StringBuilder sb = new StringBuilder(); diff --git a/paper/src/main/resources/ResourcePack/pack_1_20_5.mcmeta b/paper/src/main/resources/ResourcePack/pack_1_20_5.mcmeta new file mode 100644 index 0000000..7f20e69 --- /dev/null +++ b/paper/src/main/resources/ResourcePack/pack_1_20_5.mcmeta @@ -0,0 +1,10 @@ +{ + "pack":{ + "pack_format": 32, + "description":"CustomNameplates", + "supported_formats": { + "min_inclusive": 32, + "max_inclusive": 34 + } + } +} \ No newline at end of file