diff --git a/pom.xml b/pom.xml index 3283ef5..3dc3663 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ de.kcodeyt Heads - 1.1.0 + 1.1.1 diff --git a/src/main/java/de/kcodeyt/heads/Heads.java b/src/main/java/de/kcodeyt/heads/Heads.java index d4c74d1..da6307e 100644 --- a/src/main/java/de/kcodeyt/heads/Heads.java +++ b/src/main/java/de/kcodeyt/heads/Heads.java @@ -85,11 +85,10 @@ public void onLoad() { return; } - try(final InputStreamReader inputReader = new InputStreamReader(this.getResource("lang")); - final BufferedReader bufferedReader = new BufferedReader(inputReader)) { + try(final BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(this.getResource("lang/lang_list.txt")))) { String line; while((line = bufferedReader.readLine()) != null) - this.saveResource("lang/" + line); + this.saveResource("lang/" + line + ".txt"); } catch(Exception e) { this.getLogger().error("Could not find the language resources of this plugin!", e); return; diff --git a/src/main/java/de/kcodeyt/heads/lang/TranslationKey.java b/src/main/java/de/kcodeyt/heads/lang/TranslationKey.java index 373c380..d76adac 100644 --- a/src/main/java/de/kcodeyt/heads/lang/TranslationKey.java +++ b/src/main/java/de/kcodeyt/heads/lang/TranslationKey.java @@ -27,7 +27,10 @@ public enum TranslationKey { CONSOLE_USES_PLAYER_COMMAND, - HEAD_COMMAND_USAGE, INVALID_NAME, PLAYER_NOT_FOUND, HEAD_GIVEN; + HEAD_COMMAND_USAGE, + INVALID_NAME, + PLAYER_NOT_FOUND, + HEAD_GIVEN; @Getter private final String key; diff --git a/src/main/java/de/kcodeyt/heads/util/LocalSkinAPI.java b/src/main/java/de/kcodeyt/heads/util/LocalSkinAPI.java index 8638134..1ffc22c 100644 --- a/src/main/java/de/kcodeyt/heads/util/LocalSkinAPI.java +++ b/src/main/java/de/kcodeyt/heads/util/LocalSkinAPI.java @@ -73,7 +73,14 @@ public static void loadNameLookup() { } } + private static boolean isLegacySkin(Skin skin) { + final int skinDataLength = skin.getSkinData().data.length; + return skinDataLength != 32 * 64 * 4 && skinDataLength != 64 * 64 * 4 && skinDataLength != 128 * 64 * 4 && skinDataLength != 128 * 128 * 4; + } + public static void addOrUpdatePlayer(String name, Skin skin) { + if(skin.isPersona() || !isLegacySkin(skin)) return; + NAME_TO_LATEST.put(name, skin.getSkinId()); final SkinData skinData = SkinData.builder(). diff --git a/src/main/resources/lang/lang_list.txt b/src/main/resources/lang/lang_list.txt new file mode 100644 index 0000000..533d12c --- /dev/null +++ b/src/main/resources/lang/lang_list.txt @@ -0,0 +1,2 @@ +en_US +de_DE \ No newline at end of file diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index ca31b85..ad7132e 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,4 +1,4 @@ name: Heads -version: "1.1.0" +version: "1.1.1" api: [ "1.0.0" ] main: de.kcodeyt.heads.Heads \ No newline at end of file