From 1b9ac599bd16ad31a3cc5a7e45e198f001f90874 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Thu, 14 Mar 2019 14:55:39 -0400 Subject: [PATCH] Slight improvements, from #1. Bump version --- plugin.yml | 2 +- pom.xml | 2 +- .../me/pikamug/localelib/LocaleManager.java | 34 ++----------------- 3 files changed, 5 insertions(+), 33 deletions(-) diff --git a/plugin.yml b/plugin.yml index db6b312..1867fe0 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,6 +1,6 @@ name: LocaleLib main: me.pikamug.localelib.LocaleLib -version: 1.0 +version: 1.1 api-version: 1.13 description: Show translated item/entity/etc. names in client's language website: https://www.spigotmc.org/resources/quests.3711/ diff --git a/pom.xml b/pom.xml index f54cc71..55e9138 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ me.pikamug.localelib LocaleLib - 1.0 + 1.1 UTF-8 diff --git a/src/main/java/me/pikamug/localelib/LocaleManager.java b/src/main/java/me/pikamug/localelib/LocaleManager.java index 37ab622..7ea6e18 100644 --- a/src/main/java/me/pikamug/localelib/LocaleManager.java +++ b/src/main/java/me/pikamug/localelib/LocaleManager.java @@ -29,11 +29,9 @@ public class LocaleManager{ public LocaleManager() { oldVersion = isBelow113(); - for (Material test : Material.values()) { - if (test.name().equals("LINGERING_POTION")) { - // Bukkit version is 1.9+ - hasBasePotionData = true; - } + if (Material.getMaterial("LINGERING_POTION") != null) { + // Bukkit version is 1.9+ + hasBasePotionData = true; } String version = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3]; try { @@ -256,57 +254,31 @@ private boolean _isBelow113(String bukkitVersion) { if (bukkitVersion.matches("^[0-9.]+$")) { switch(bukkitVersion) { case "1.12.2" : - return true; case "1.12.1" : - return true; case "1.12" : - return true; case "1.11.2" : - return true; case "1.11.1" : - return true; case "1.11" : - return true; case "1.10.2" : - return true; case "1.10.1" : - return true; case "1.10" : - return true; case "1.9.4" : - return true; case "1.9.3" : - return true; case "1.9.2" : - return true; case "1.9.1" : - return true; case "1.9" : - return true; case "1.8.9" : - return true; case "1.8.8" : - return true; case "1.8.7" : - return true; case "1.8.6" : - return true; case "1.8.5" : - return true; case "1.8.4" : - return true; case "1.8.3" : - return true; case "1.8.2" : - return true; case "1.8.1" : - return true; case "1.8" : - return true; case "1.7.10" : - return true; case "1.7.9" : - return true; case "1.7.2" : return true; default: