Skip to content

Commit

Permalink
Support query of enchantment levels. Bump version
Browse files Browse the repository at this point in the history
  • Loading branch information
@PikaMug
PikaMug committed Jan 13, 2021
1 parent 6d8d5c1 commit 037dfe6
Show file tree
Hide file tree
Showing 3 changed files with 72 additions and 47 deletions.
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>me.pikamug.localelib</groupId>
<artifactId>LocaleLib</artifactId>
<version>1.6</version>
<version>1.7</version>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
115 changes: 70 additions & 45 deletions src/main/java/me/pikamug/localelib/LocaleManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,33 +21,31 @@
import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.inventory.meta.PotionMeta;

import me.pikamug.localelib.LocaleKeys;

public class LocaleManager{
private static Class<?> craftMagicNumbers = null;
private static Class<?> itemClazz = null;
private static Class<?> localeClazz = null;
private static boolean oldVersion = false;
private static boolean hasBasePotionData = false;
private Map<String, String> oldBlocks = LocaleKeys.getBlockKeys();
private Map<String, String> oldItems = LocaleKeys.getItemKeys();
private Map<String, String> oldPotions = LocaleKeys.getPotionKeys();
private Map<String, String> oldLingeringPotions = LocaleKeys.getLingeringPotionKeys();
private Map<String, String> oldSplashPotions = LocaleKeys.getSplashPotionKeys();
private Map<String, String> oldEntities = LocaleKeys.getEntityKeys();
private final Map<String, String> oldBlocks = LocaleKeys.getBlockKeys();
private final Map<String, String> oldItems = LocaleKeys.getItemKeys();
private final Map<String, String> oldPotions = LocaleKeys.getPotionKeys();
private final Map<String, String> oldLingeringPotions = LocaleKeys.getLingeringPotionKeys();
private final Map<String, String> oldSplashPotions = LocaleKeys.getSplashPotionKeys();
private final Map<String, String> oldEntities = LocaleKeys.getEntityKeys();

public LocaleManager() {
oldVersion = isBelow113();
if (Material.getMaterial("LINGERING_POTION") != null) {
// Bukkit version is 1.9+
hasBasePotionData = true;
}
String version = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3];
final String version = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3];
try {
craftMagicNumbers = Class.forName("org.bukkit.craftbukkit.{v}.util.CraftMagicNumbers".replace("{v}", version));
itemClazz = Class.forName("net.minecraft.server.{v}.Item".replace("{v}", version));
localeClazz = Class.forName("net.minecraft.server.{v}.LocaleLanguage".replace("{v}", version));
} catch (ClassNotFoundException e) {
} catch (final ClassNotFoundException e) {
e.printStackTrace();
}
}
Expand All @@ -60,7 +58,8 @@ public LocaleManager() {
* but note that most Potions use meta for 1.13+.<p>
*
* Message should contain {@code <item>} string for replacement by
* this method (along with applicable {@code <enchantment>} strings).
* this method (along with applicable {@code <enchantment>} and/or
* {@code <level>} strings).
*
* @param player The player whom the message is to be sent to
* @param message The message to be sent to the player
Expand All @@ -69,23 +68,25 @@ public LocaleManager() {
* @param enchantments Enchantments for the item being translated
* @param meta ItemMeta for the item being translated
*/
public boolean sendMessage(Player player, String message, Material material, short durability, Map<Enchantment, Integer> enchantments, ItemMeta meta) {
public boolean sendMessage(final Player player, final String message, final Material material, final short durability, final Map<Enchantment, Integer> enchantments, final ItemMeta meta) {
if (player == null || material == null) {
return false;
}
String matKey = "";
try {
matKey = queryMaterial(material, durability, meta);
} catch (Exception ex) {
} catch (final Exception ex) {
Bukkit.getLogger().severe("[LocaleLib] Unable to query Material: " + material.name());
return false;
}

Collection<String> enchKeys = queryEnchantments(enchantments).values();

final Collection<String> enchKeys = queryEnchantments(enchantments).values();
final Collection<String> lvlKeys = queryLevels(enchantments).values();
String msg = message.replace("<item>", "\",{\"translate\":\"" + matKey + "\"},\"");
for (String ek : enchKeys) {
msg.replaceFirst("<enchantment>", "\",{\"translate\":\"" + ek + "\"},\"");
for (final String ek : enchKeys) {
msg = msg.replaceFirst("<enchantment>", "\",{\"translate\":\"" + ek + "\"},\"");
}
for (final String lk : lvlKeys) {
msg = msg.replaceFirst("<level>", "\",{\"translate\":\"" + lk + "\"},\"");
}
Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "tellraw " + player.getName() + " [\"" + msg + "\"]");
return true;
Expand All @@ -98,37 +99,45 @@ public boolean sendMessage(Player player, String message, Material material, sho
* Enchantments are optional and may be left null or empty.<p>
*
* Message should contain {@code <item>} string for replacement by
* this method (along with applicable {@code <enchantment>} strings).
* this method (along with applicable {@code <enchantment>} and/or
* {@code <level>} strings).
*
* @param player The player whom the message is to be sent to
* @param message The message to be sent to the player
* @param material The item to be translated
* @param durability Durability for the item being translated
* @param enchantments Enchantments for the item being translated
*/
public boolean sendMessage(Player player, String message, Material material, short durability, Map<Enchantment, Integer> enchantments) {
public boolean sendMessage(final Player player, final String message, final Material material, final short durability, final Map<Enchantment, Integer> enchantments) {
return sendMessage(player, message, material, durability, enchantments, null);
}

/**
* Send message with enchantments translated to the client's locale.
* Map of Enchantment+level is required.
*
* Message should contain one {@code <enchantment>} string for each
* replacement by this method.
* Message should contain {@code <item>} string for replacement by
* this method (along with applicable {@code <enchantment>} and/or
* {@code <level>} strings).
*
* @param player The player whom the message is to be sent to
* @param message The message to be sent to the player
* @param enchantments Enchantments for the item being translated
*/
public boolean sendMessage(Player player, String message, Map<Enchantment, Integer> enchantments) {
public boolean sendMessage(final Player player, final String message, final Map<Enchantment, Integer> enchantments) {
if (player == null || message == null || enchantments == null) {
return false;
}
Collection<String> enchKeys = queryEnchantments(enchantments).values();
String msg = message;
for (String ek : enchKeys) {
msg.replaceFirst("<enchantment>", "\",{\"translate\":\"" + ek + "\"},\"");
final Collection<String> enchKeys = queryEnchantments(enchantments).values();
final Collection<String> lvlKeys = queryLevels(enchantments).values();
final String msg = message;
if (enchKeys != null && !enchKeys.isEmpty()) {
for (final String ek : enchKeys) {
msg.replaceFirst("<enchantment>", "\",{\"translate\":\"" + ek + "\"},\"");
}
for (final String lk : lvlKeys) {
msg.replaceFirst("<level>", "\",{\"translate\":\"" + lk + "\"},\"");
}
}
Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "tellraw " + player.getName() + " [\"" + msg + "\"]");
return true;
Expand All @@ -138,15 +147,15 @@ public boolean sendMessage(Player player, String message, Map<Enchantment, Integ
* Send message with entity name translated to the client's locale.
* EntityType is required.<p>
*
* Message should contain {@code <mob>}
* string for replacement by this method.
* Message should contain {@code <mob>}string for replacement by
* this method.
*
* @param player The player whom the message is to be sent to
* @param message The message to be sent to the player
* @param type The entity type to be translated
* @param extra Career, Ocelot, or Rabbit type if applicable
*/
public boolean sendMessage(Player player, String message, EntityType type, String extra) {
public boolean sendMessage(final Player player, final String message, final EntityType type, final String extra) {
if (player == null || message == null || type == null) {
return false;
}
Expand All @@ -169,7 +178,7 @@ public boolean sendMessage(Player player, String message, EntityType type, Strin
key = "entity.minecraft." + type.toString().toLowerCase();
}
}
String msg = message.replace("<mob>", "\",{\"translate\":\"" + key + "\"},\"");
final String msg = message.replace("<mob>", "\",{\"translate\":\"" + key + "\"},\"");
Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "tellraw " + player.getName() + " [\"" + msg + "\"]");
return true;
}
Expand All @@ -181,7 +190,7 @@ public boolean sendMessage(Player player, String message, EntityType type, Strin
* @return the raw key
* @throws IllegalArgumentException if an item with that material could not be found
*/
public String queryMaterial(Material material) throws IllegalArgumentException, NullArgumentException {
public String queryMaterial(final Material material) throws IllegalArgumentException, NullArgumentException {
return queryMaterial(material, (short) 0, null);
}

Expand All @@ -195,7 +204,7 @@ public String queryMaterial(Material material) throws IllegalArgumentException,
* @throws NullArgumentException if the specified material parameter is null
*/
@SuppressWarnings("deprecation")
public String queryMaterial(Material material, short durability, ItemMeta meta) throws IllegalArgumentException, NullArgumentException {
public String queryMaterial(final Material material, final short durability, final ItemMeta meta) throws IllegalArgumentException, NullArgumentException {
if (material == null) {
throw new NullArgumentException("[LocaleLib] Material cannot be null");
}
Expand All @@ -210,7 +219,7 @@ public String queryMaterial(Material material, short durability, ItemMeta meta)
throw new IllegalArgumentException("[LocaleLib] Block not found: " + material.name() + "." + durability);
}
} else {
ItemStack i = new ItemStack(material, 1, durability);
final ItemStack i = new ItemStack(material, 1, durability);
if (durability >= 0 && i.getItemMeta() instanceof PotionMeta) {
if (hasBasePotionData) {
if (material.equals(Material.POTION)) {
Expand All @@ -231,15 +240,14 @@ public String queryMaterial(Material material, short durability, ItemMeta meta)
}
} else {
try {
Object item = null;
Method m = craftMagicNumbers.getDeclaredMethod("getItem", material.getClass());
final Method m = craftMagicNumbers.getDeclaredMethod("getItem", material.getClass());
m.setAccessible(true);
item = m.invoke(craftMagicNumbers, material);
final Object item = m.invoke(craftMagicNumbers, material);
if (item == null) {
throw new IllegalArgumentException(material.name() + " material could not be queried!");
}
matKey = (String) itemClazz.getMethod("getName").invoke(item);
} catch (Exception ex) {
} catch (final Exception ex) {
throw new IllegalArgumentException("[LocaleLib] Unable to query Material: " + material.name());
}
if (meta != null && meta instanceof PotionMeta) {
Expand All @@ -258,32 +266,49 @@ public String queryMaterial(Material material, short durability, ItemMeta meta)
* @return the raw keys of the enchantments
*/
@SuppressWarnings("deprecation")
public Map<Enchantment, String> queryEnchantments(Map<Enchantment, Integer> enchantments) {
Map<Enchantment, String> enchKeys = new HashMap<Enchantment, String>();
public Map<Enchantment, String> queryEnchantments(final Map<Enchantment, Integer> enchantments) {
final Map<Enchantment, String> enchKeys = new HashMap<Enchantment, String>();
if (enchantments == null || enchantments.isEmpty()) {
return enchKeys;
}
if (oldVersion) {
for (Enchantment e : enchantments.keySet()) {
for (final Enchantment e : enchantments.keySet()) {
enchKeys.put(e, "enchantment." + e.getName().toLowerCase().replace("_", ".")
.replace("environmental", "all").replace("protection", "protect"));
}
} else {
for (Enchantment e : enchantments.keySet()) {
for (final Enchantment e : enchantments.keySet()) {
enchKeys.put(e, "enchantment.minecraft." + e.toString().toLowerCase());
}
}
return enchKeys;
}

/**
* Gets the key name of the specified enchantment levels as it would appear in a Minecraft lang file.
*
* @param enchantments Enchantment levels to get the keys of
* @return the raw keys of the enchantment levels
*/
public Map<Integer, String> queryLevels(final Map<Enchantment, Integer> enchantments) {
final Map<Integer, String> lvlKeys = new HashMap<Integer, String>();
if (enchantments == null || enchantments.isEmpty()) {
return lvlKeys;
}
for (final Integer i : enchantments.values()) {
lvlKeys.put(i, "enchantment.level." + i);
}
return lvlKeys;
}

/**
* Gets the display name of the specified material as it would appear in a Minecraft lang file.
*
* @param key the raw key for the object name
* @return the display name of the specified key within the server locale file
*/
public String toServerLocale(String key) throws IllegalAccessException, InvocationTargetException {
Method trans = Arrays.stream(localeClazz.getMethods())
public String toServerLocale(final String key) throws IllegalAccessException, InvocationTargetException {
final Method trans = Arrays.stream(localeClazz.getMethods())
.filter(m -> m.getReturnType().equals(String.class))
.filter(m -> m.getParameterCount() == 1)
.filter(m -> m.getParameters()[0].getType().equals(String.class))
Expand All @@ -310,7 +335,7 @@ public boolean isBelow113() {
return _isBelow113(Bukkit.getServer().getBukkitVersion().split("-")[0]);
}

private boolean _isBelow113(String bukkitVersion) {
private boolean _isBelow113(final String bukkitVersion) {
if (bukkitVersion.matches("^[0-9.]+$")) {
switch(bukkitVersion) {
case "1.12.2" :
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/plugin.yml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: LocaleLib
main: me.pikamug.localelib.LocaleLib
version: 1.6
version: 1.7
api-version: 1.13
description: Show translated names of items, entities & more in client's language
website: https://www.spigotmc.org/resources/quests.3711/
Expand Down

0 comments on commit 037dfe6

Please sign in to comment.