Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2024-11-27 21:26:29 +01:00
Code Issues Projects Releases Wiki Activity

Improve translation for entities and older MC versions, fixes #573

Browse Source
This commit is contained in:
BuildTools 2018-12-16 00:36:46 -05:00
parent 867e6a9c00
commit bd1b5619c2
3 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/me/blackvein/quests/Quests.java
View File

@ -177,6 +177,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
@Override
public void onEnable() {
bukkitVersion = Bukkit.getServer().getBukkitVersion().split("-")[0];
query.setBukkitVersion(bukkitVersion);
pListener = new PlayerListener(this);
effListener = new NpcEffectThread(this);
npcListener = new NpcListener(this);

22
src/main/java/me/blackvein/quests/util/LocaleQuery.java
View File

@ -27,13 +27,17 @@ import org.bukkit.entity.Player;
public class LocaleQuery {
private static Class<?> craftMagicNumbers = null;
private final Quests plugin;
static boolean oldVersion = isBelow113();
private static boolean oldVersion = false;
public LocaleQuery(Quests plugin){
this.plugin = plugin;
setup();
}
public void setBukkitVersion(String bukkitVersion) {
oldVersion = isBelow113(bukkitVersion);
}
public void sendMessage(Player player, String message, Material material) {
if (plugin.translateItems) {
String key = queryByType(material);
@ -51,6 +55,7 @@ public class LocaleQuery {
player.sendMessage(message.replace("<item>", Quester.prettyItemString(material.name())));
}
@SuppressWarnings("deprecation")
public void sendMessage(Player player, String message, Material material, Enchantment enchantment) {
if (plugin.translateItems) {
String key = queryByType(material);
@ -61,7 +66,7 @@ public class LocaleQuery {
}
String key2 = "";
if (oldVersion) {
key2 = "enchantment." + MiscUtil.getProperEnchantmentName(enchantment).replace("_", ".")
key2 = "enchantment." + enchantment.getName().toLowerCase().replace("_", ".")
.replace("environmental", "all").replace("protection", "protect");
} else {
key2 = "enchantment.minecraft." + enchantment.toString().toLowerCase();
@ -77,11 +82,12 @@ public class LocaleQuery {
.replace("<enchantment>", Quester.prettyEnchantmentString(enchantment)));
}
@SuppressWarnings("deprecation")
public void sendMessage(Player player, String message, EntityType type) {
if (plugin.translateItems) {
String key = "";
if (oldVersion) {
key = "entity." + MiscUtil.getProperMobName(type) + ".name";
key = "entity." + type.getName() + ".name";
} else {
key = "entity.minecraft." + type.toString().toLowerCase();
}
@ -110,7 +116,6 @@ public class LocaleQuery {
String name = (String) MethodUtils.invokeExactMethod(item, "getName");
return name;
} catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e) {
plugin.getLogger().info("Unable to invoke getName() on MC " + plugin.bukkitVersion);
e.printStackTrace();
}
return null;
@ -125,10 +130,9 @@ public class LocaleQuery {
}
}
public static boolean isBelow113() {
String ver = Quests.bukkitVersion;
if (Quests.bukkitVersion.matches("^[0-9]+$")) {
switch(ver) {
public static boolean isBelow113(String bukkitVersion) {
if (bukkitVersion.matches("^[0-9.]+$")) {
switch(bukkitVersion) {
case "1.12" :
return true;
case "1.11" :
@ -154,7 +158,7 @@ public class LocaleQuery {
return false;
}
}
Bukkit.getLogger().severe("Invalid Bukkit version " + ver);
Bukkit.getLogger().severe("Quests received invalid Bukkit version " + bukkitVersion);
return false;
}
}

7
src/main/java/me/blackvein/quests/util/MiscUtil.java
View File

@ -15,7 +15,6 @@ package me.blackvein.quests.util;
import java.util.LinkedList;
import org.bukkit.ChatColor;
import org.bukkit.enchantments.Enchantment;
import org.bukkit.entity.EntityType;
public class MiscUtil {
@ -30,12 +29,6 @@ public class MiscUtil {
s = s.substring(1, s.length());
return s2 + s;
}
@SuppressWarnings("deprecation")
public static String getProperEnchantmentName(Enchantment enchantment) {
String name = enchantment.getName().toLowerCase();
return name;
}
public static String getProperMobName(EntityType type) {
String name = type.name().toLowerCase();