9
0
mirror of https://github.com/Xiao-MoMi/Custom-Nameplates.git synced 2025-12-19 15:09:23 +00:00
This commit is contained in:
XiaoMoMi
2024-07-25 22:41:15 +08:00
parent 3000b26bfa
commit cc8c3d6bcd
7 changed files with 42 additions and 13 deletions

View File

@@ -1,6 +1,7 @@
# Custom-Nameplates # Custom-Nameplates
![CodeFactor Grade](https://img.shields.io/codefactor/grade/github/Xiao-MoMi/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 Servers](https://img.shields.io/bstats/servers/16649)
![bStats Players](https://img.shields.io/bstats/players/16649) ![bStats Players](https://img.shields.io/bstats/players/16649)
![GitHub](https://img.shields.io/github/license/Xiao-MoMi/Custom-Nameplates) ![GitHub](https://img.shields.io/github/license/Xiao-MoMi/Custom-Nameplates)

View File

@@ -35,6 +35,8 @@ public interface VersionManager {
*/ */
CompletionStage<Boolean> checkUpdate(); CompletionStage<Boolean> checkUpdate();
boolean isVersionNewerThan1_20_5();
/** /**
* Get plugin version * Get plugin version
* *

View File

@@ -7,7 +7,7 @@ plugins {
allprojects { allprojects {
version = "2.4.1" version = "2.4.2"
apply<JavaPlugin>() apply<JavaPlugin>()
apply(plugin = "java") apply(plugin = "java")

View File

@@ -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

View File

@@ -96,6 +96,11 @@ public class VersionManagerImpl implements VersionManager, Listener {
return mcVersion >= 20.2; return mcVersion >= 20.2;
} }
@Override
public boolean isVersionNewerThan1_20_5() {
return mcVersion >= 20.5;
}
@NotNull @NotNull
@Override @Override
public String getPluginVersion() { public String getPluginVersion() {

View File

@@ -90,9 +90,21 @@ public class ResourcePackManagerImpl implements ResourcePackManager {
// save unicodes // save unicodes
this.saveLegacyUnicodes(); this.saveLegacyUnicodes();
// generate shaders // generate shaders
this.generateShaders("ResourcePack" + 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 + "overlay_1_20_5" + File.separator + "assets" + File.separator + "minecraft" + File.separator + "shaders" + File.separator + "core" + File.separator); 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 // add offset characters
this.getOffsets(texturesFolder).forEach(providers::add); this.getOffsets(texturesFolder).forEach(providers::add);
// add nameplate characters // add nameplate characters
@@ -495,7 +507,14 @@ public class ResourcePackManagerImpl implements ResourcePackManager {
} }
private void setPackFormat() { 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"); // File format_file = new File(plugin.getDataFolder(), "ResourcePack" + File.separator + "pack.mcmeta");
// String line; // String line;
// StringBuilder sb = new StringBuilder(); // StringBuilder sb = new StringBuilder();

View File

@@ -0,0 +1,10 @@
{
"pack":{
"pack_format": 32,
"description":"CustomNameplates",
"supported_formats": {
"min_inclusive": 32,
"max_inclusive": 34
}
}
}