Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2024-09-27 14:42:36 +02:00
Code Issues Projects Releases Wiki Activity

Switch to including LocalLib for item queries and messages

Browse Source
This commit is contained in:
PikaMug 2021-01-13 00:17:50 -05:00
parent 42e3ba336f
commit 715d093a15
5 changed files with 65 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
main/pom.xml
View File

@ -14,7 +14,7 @@
<repositories>
<repository>
<!-- GPS, PhatLoots, CitizensBooks, mcMMO Classic, DungeonsXL -->
<!-- GPS, PhatLoots, CitizensBooks, mcMMO Classic, DungeonsXL, LocaleLib -->
<id>jitpack.io</id>
<url>https://jitpack.io</url>
</repository>
@ -128,6 +128,11 @@
<version>-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.github.PikaMug</groupId>
<artifactId>LocaleLib</artifactId>
<version>-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
@ -224,6 +229,7 @@
<artifactSet>
<includes>
<include>me.*</include>
<include>com.github.PikaMug:LocaleLib</include>
<include>com.zaxxer:HikariCP</include>
<include>org.slf4j:slf4j-simple</include>
<include>org.slf4j:slf4j-api</include>
@ -231,6 +237,10 @@
</includes>
</artifactSet>
<relocations>
<relocation>
<pattern>me.pikamug.localelib</pattern>
<shadedPattern>me.blackvein.quests.libs.localelib</shadedPattern>
</relocation>
<relocation>
<pattern>com.zaxxer.hikari</pattern>
<shadedPattern>me.blackvein.quests.libs.hikari</shadedPattern>

12
main/src/main/java/me/blackvein/quests/Quest.java
View File

@ -17,8 +17,6 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import com.alessiodp.parties.api.interfaces.Party;
import com.alessiodp.parties.api.interfaces.PartyPlayer;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.DyeColor;
@ -34,6 +32,8 @@ import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemFlag;
import org.bukkit.inventory.ItemStack;
import com.alessiodp.parties.api.interfaces.Party;
import com.alessiodp.parties.api.interfaces.PartyPlayer;
import com.codisimus.plugins.phatloots.PhatLootsAPI;
import com.codisimus.plugins.phatloots.loot.CommandLoot;
import com.codisimus.plugins.phatloots.loot.LootBundle;
@ -507,7 +507,7 @@ public class Quest implements Comparable<Quest> {
* @param allowMultiplayer Allow multiplayer sharing
*/
@SuppressWarnings("deprecation")
public void completeQuest(final Quester q, boolean allowMultiplayer) {
public void completeQuest(final Quester q, final boolean allowMultiplayer) {
final OfflinePlayer player = q.getOfflinePlayer();
if (player.isOnline()) {
final QuesterPreCompleteQuestEvent preEvent = new QuesterPreCompleteQuestEvent(q, this);
@ -634,9 +634,9 @@ public class Quest implements Comparable<Quest> {
}
}
if (rews.getPartiesExperience() > 0 && plugin.getDependencies().getPartiesApi() != null) {
PartyPlayer partyPlayer = plugin.getDependencies().getPartiesApi().getPartyPlayer(player.getUniqueId());
final PartyPlayer partyPlayer = plugin.getDependencies().getPartiesApi().getPartyPlayer(player.getUniqueId());
if (partyPlayer != null && partyPlayer.getPartyId() != null) {
Party party = plugin.getDependencies().getPartiesApi().getParty(partyPlayer.getPartyId());
final Party party = plugin.getDependencies().getPartiesApi().getParty(partyPlayer.getPartyId());
if (party != null) {
party.giveExperience(rews.getPartiesExperience());
issuedReward = true;
@ -795,7 +795,7 @@ public class Quest implements Comparable<Quest> {
}
}
if (plugin.getSettings().canTranslateNames() && text.contains("<item>")) {
plugin.getLocaleQuery().sendMessage(p, text, i.getType(), i.getDurability(),
plugin.getLocaleManager().sendMessage(p, text, i.getType(), i.getDurability(),
i.getEnchantments());
} else {
for (final Entry<Enchantment, Integer> e : i.getEnchantments().entrySet()) {

51
main/src/main/java/me/blackvein/quests/Quester.java
View File

@ -69,7 +69,6 @@ import me.blackvein.quests.util.ConfigUtil;
import me.blackvein.quests.util.InventoryUtil;
import me.blackvein.quests.util.ItemUtil;
import me.blackvein.quests.util.Lang;
import me.blackvein.quests.util.LocaleQuery;
import me.blackvein.quests.util.MiscUtil;
import me.blackvein.quests.util.RomanNumeral;
import me.clip.placeholderapi.PlaceholderAPI;
@ -1348,7 +1347,7 @@ public class Quester implements Comparable<Quester> {
// Blocks are solid so check for durability
if (m.getDurability() == is.getDurability()) {
broken = is;
} else if (!LocaleQuery.isBelow113(plugin.getDetectedBukkitVersion())) {
} else if (!plugin.getLocaleManager().isBelow113()) {
// Ignore durability for 1.13+
broken = is;
}
@ -1379,7 +1378,7 @@ public class Quester implements Comparable<Quester> {
// Blocks are solid so check for durability
if (m.getDurability() == is.getDurability()) {
toBreak = is;
} else if (!LocaleQuery.isBelow113(plugin.getDetectedBukkitVersion())) {
} else if (!plugin.getLocaleManager().isBelow113()) {
// Ignore durability for 1.13+
toBreak = is;
}
@ -1455,7 +1454,7 @@ public class Quester implements Comparable<Quester> {
// Blocks are solid so check for durability
if (m.getDurability() == is.getDurability()) {
damaged = is;
} else if (!LocaleQuery.isBelow113(plugin.getDetectedBukkitVersion())) {
} else if (!plugin.getLocaleManager().isBelow113()) {
// Ignore durability for 1.13+
damaged = is;
}
@ -1476,7 +1475,7 @@ public class Quester implements Comparable<Quester> {
// Blocks are solid so check for durability
if (m.getDurability() == is.getDurability()) {
toDamage = is;
} else if (!LocaleQuery.isBelow113(plugin.getDetectedBukkitVersion())) {
} else if (!plugin.getLocaleManager().isBelow113()) {
// Ignore durability for 1.13+
toDamage = is;
}
@ -1543,7 +1542,7 @@ public class Quester implements Comparable<Quester> {
// Blocks are solid so check for durability
if (m.getDurability() == is.getDurability()) {
placed = is;
} else if (!LocaleQuery.isBelow113(plugin.getDetectedBukkitVersion())) {
} else if (!plugin.getLocaleManager().isBelow113()) {
// Ignore durability for 1.13+
placed = is;
}
@ -1564,7 +1563,7 @@ public class Quester implements Comparable<Quester> {
// Blocks are solid so check for durability
if (m.getDurability() == is.getDurability()) {
toPlace = is;
} else if (!LocaleQuery.isBelow113(plugin.getDetectedBukkitVersion())) {
} else if (!plugin.getLocaleManager().isBelow113()) {
// Ignore durability for 1.13+
toPlace = is;
}
@ -1630,7 +1629,7 @@ public class Quester implements Comparable<Quester> {
// Blocks are solid so check for durability
if (m.getDurability() == is.getDurability()) {
used = is;
} else if (!LocaleQuery.isBelow113(plugin.getDetectedBukkitVersion())) {
} else if (!plugin.getLocaleManager().isBelow113()) {
// Ignore durability for 1.13+
used = is;
}
@ -1651,7 +1650,7 @@ public class Quester implements Comparable<Quester> {
// Blocks are solid, so check durability
if (m.getDurability() == is.getDurability()) {
toUse = is;
} else if (!LocaleQuery.isBelow113(plugin.getDetectedBukkitVersion())) {
} else if (!plugin.getLocaleManager().isBelow113()) {
// Ignore durability for 1.13+
toUse = is;
}
@ -1717,7 +1716,7 @@ public class Quester implements Comparable<Quester> {
// Blocks are solid so check for durability
if (m.getDurability() == is.getDurability()) {
cut = is;
} else if (!LocaleQuery.isBelow113(plugin.getDetectedBukkitVersion())) {
} else if (!plugin.getLocaleManager().isBelow113()) {
// Ignore durability for 1.13+
cut = is;
}
@ -1738,7 +1737,7 @@ public class Quester implements Comparable<Quester> {
// Blocks are solid so check for durability
if (m.getDurability() == is.getDurability()) {
toCut = is;
} else if (!LocaleQuery.isBelow113(plugin.getDetectedBukkitVersion())) {
} else if (!plugin.getLocaleManager().isBelow113()) {
// Ignore durability for 1.13+
toCut = is;
}
@ -2754,7 +2753,7 @@ public class Quester implements Comparable<Quester> {
}
if (plugin.getSettings().canTranslateNames() && !goal.hasItemMeta()
&& !goal.getItemMeta().hasDisplayName()) {
plugin.getLocaleQuery().sendMessage(p, message, increment.getType(), increment.getDurability(), null);
plugin.getLocaleManager().sendMessage(p, message, increment.getType(), increment.getDurability(), null);
} else {
sendMessage(message.replace("<item>", ItemUtil.getName(increment)));
}
@ -2768,7 +2767,7 @@ public class Quester implements Comparable<Quester> {
}
if (plugin.getSettings().canTranslateNames() && !goal.hasItemMeta()
&& !goal.getItemMeta().hasDisplayName()) {
plugin.getLocaleQuery().sendMessage(p, message, increment.getType(), increment.getDurability(), null);
plugin.getLocaleManager().sendMessage(p, message, increment.getType(), increment.getDurability(), null);
} else {
sendMessage(message.replace("<item>", ItemUtil.getName(increment)));
}
@ -2782,7 +2781,7 @@ public class Quester implements Comparable<Quester> {
}
if (plugin.getSettings().canTranslateNames() && !goal.hasItemMeta()
&& !goal.getItemMeta().hasDisplayName()) {
plugin.getLocaleQuery().sendMessage(p, message, increment.getType(), increment.getDurability(), null);
plugin.getLocaleManager().sendMessage(p, message, increment.getType(), increment.getDurability(), null);
} else {
sendMessage(message.replace("<item>", ItemUtil.getName(increment)));
}
@ -2796,7 +2795,7 @@ public class Quester implements Comparable<Quester> {
}
if (plugin.getSettings().canTranslateNames() && !goal.hasItemMeta()
&& !goal.getItemMeta().hasDisplayName()) {
plugin.getLocaleQuery().sendMessage(p, message, increment.getType(), increment.getDurability(), null);
plugin.getLocaleManager().sendMessage(p, message, increment.getType(), increment.getDurability(), null);
} else {
sendMessage(message.replace("<item>", ItemUtil.getName(increment)));
}
@ -2810,7 +2809,7 @@ public class Quester implements Comparable<Quester> {
}
if (plugin.getSettings().canTranslateNames() && !goal.hasItemMeta()
&& !goal.getItemMeta().hasDisplayName()) {
plugin.getLocaleQuery().sendMessage(p, message, increment.getType(), increment.getDurability(), null);
plugin.getLocaleManager().sendMessage(p, message, increment.getType(), increment.getDurability(), null);
} else {
sendMessage(message.replace("<item>", ItemUtil.getName(increment)));
}
@ -2825,7 +2824,7 @@ public class Quester implements Comparable<Quester> {
}
if (plugin.getSettings().canTranslateNames() && !goal.hasItemMeta()
&& !goal.getItemMeta().hasDisplayName()) {
plugin.getLocaleQuery().sendMessage(p, message, goal.getType(), goal.getDurability(), null);
plugin.getLocaleManager().sendMessage(p, message, goal.getType(), goal.getDurability(), null);
} else {
sendMessage(message.replace("<item>", ItemUtil.getName(is)));
}
@ -2840,7 +2839,7 @@ public class Quester implements Comparable<Quester> {
}
if (plugin.getSettings().canTranslateNames() && !goal.hasItemMeta()
&& !goal.getItemMeta().hasDisplayName()) {
plugin.getLocaleQuery().sendMessage(p, message, goal.getType(), goal.getDurability(), null);
plugin.getLocaleManager().sendMessage(p, message, goal.getType(), goal.getDurability(), null);
} else {
sendMessage(message.replace("<item>", ItemUtil.getName(is)));
}
@ -2855,12 +2854,12 @@ public class Quester implements Comparable<Quester> {
}
if (plugin.getSettings().canTranslateNames() && is.hasItemMeta() && !is.getItemMeta().hasDisplayName()) {
// Bukkit version is 1.9+
plugin.getLocaleQuery().sendMessage(p, message, goal.getType(), goal.getDurability(),
plugin.getLocaleManager().sendMessage(p, message, goal.getType(), goal.getDurability(),
goal.getEnchantments(), goal.getItemMeta());
} else if (plugin.getSettings().canTranslateNames() && !is.hasItemMeta()
&& Material.getMaterial("LINGERING_POTION") == null) {
// Bukkit version is below 1.9
plugin.getLocaleQuery().sendMessage(p, message, goal.getType(), goal.getDurability(),
plugin.getLocaleManager().sendMessage(p, message, goal.getType(), goal.getDurability(),
goal.getEnchantments());
} else {
for (final Entry<Enchantment, Integer> e : is.getEnchantments().entrySet()) {
@ -2880,12 +2879,12 @@ public class Quester implements Comparable<Quester> {
}
if (plugin.getSettings().canTranslateNames() && is.hasItemMeta() && !is.getItemMeta().hasDisplayName()) {
// Bukkit version is 1.9+
plugin.getLocaleQuery().sendMessage(p, message, goal.getType(), goal.getDurability(),
plugin.getLocaleManager().sendMessage(p, message, goal.getType(), goal.getDurability(),
goal.getEnchantments(), goal.getItemMeta());
} else if (plugin.getSettings().canTranslateNames() && !is.hasItemMeta()
&& Material.getMaterial("LINGERING_POTION") == null) {
// Bukkit version is below 1.9
plugin.getLocaleQuery().sendMessage(p, message, goal.getType(), goal.getDurability(),
plugin.getLocaleManager().sendMessage(p, message, goal.getType(), goal.getDurability(),
goal.getEnchantments());
} else {
sendMessage(message.replace("<item>", ItemUtil.getName(is)));
@ -2902,7 +2901,7 @@ public class Quester implements Comparable<Quester> {
}
if (plugin.getSettings().canTranslateNames() && !goal.hasItemMeta()
&& !goal.getItemMeta().hasDisplayName()) {
plugin.getLocaleQuery().sendMessage(p, message, goal.getType(), goal.getDurability(), null);
plugin.getLocaleManager().sendMessage(p, message, goal.getType(), goal.getDurability(), null);
} else {
sendMessage(message.replace("<item>", ItemUtil.getName(is)));
}
@ -2920,7 +2919,7 @@ public class Quester implements Comparable<Quester> {
}
if (plugin.getSettings().canTranslateNames() && !goal.hasItemMeta()
&& !goal.getItemMeta().hasDisplayName()) {
plugin.getLocaleQuery().sendMessage(p, message, is.getType(), is.getDurability(), null);
plugin.getLocaleManager().sendMessage(p, message, is.getType(), is.getDurability(), null);
} else {
sendMessage(message.replace("<item>", ItemUtil.getName(is)));
}
@ -2952,7 +2951,7 @@ public class Quester implements Comparable<Quester> {
+ goal.getAmount();
}
if (plugin.getSettings().canTranslateNames()) {
plugin.getLocaleQuery().sendMessage(p, message, mob, extra);
plugin.getLocaleManager().sendMessage(p, message, mob, extra);
} else {
sendMessage(message.replace("<mob>", MiscUtil.snakeCaseToUpperCamelCase(mob.name())));
}
@ -2991,7 +2990,7 @@ public class Quester implements Comparable<Quester> {
message += ChatColor.GREEN + ": " + goal.getAmount() + "/" + goal.getAmount();
}
if (plugin.getSettings().canTranslateNames()) {
plugin.getLocaleQuery().sendMessage(p, message, mob, extra);
plugin.getLocaleManager().sendMessage(p, message, mob, extra);
} else {
sendMessage(message.replace("<mob>", MiscUtil.snakeCaseToUpperCamelCase(mob.name())));
}

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

@ -102,10 +102,10 @@ import me.blackvein.quests.tasks.PlayerMoveThread;
import me.blackvein.quests.util.ConfigUtil;
import me.blackvein.quests.util.ItemUtil;
import me.blackvein.quests.util.Lang;
import me.blackvein.quests.util.LocaleQuery;
import me.blackvein.quests.util.MiscUtil;
import me.blackvein.quests.util.RomanNumeral;
import me.clip.placeholderapi.PlaceholderAPI;
import me.pikamug.localelib.LocaleManager;
import net.citizensnpcs.api.CitizensAPI;
import net.citizensnpcs.api.npc.NPC;
@ -138,7 +138,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
private DungeonsListener dungeonsListener;
private PartiesListener partiesListener;
private DenizenTrigger trigger;
private LocaleQuery localeQuery;
private LocaleManager localeManager;
private Storage storage;
@Override
@ -148,8 +148,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
// 1 - Initialize variables
bukkitVersion = Bukkit.getServer().getBukkitVersion().split("-")[0];
settings = new Settings(this);
localeQuery = new LocaleQuery(this);
localeQuery.setBukkitVersion(bukkitVersion);
localeManager = new LocaleManager();
blockListener = new BlockListener(this);
itemListener = new ItemListener(this);
npcListener = new NpcListener(this);
@ -471,8 +470,8 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
return trigger;
}
public LocaleQuery getLocaleQuery() {
return localeQuery;
public LocaleManager getLocaleManager() {
return localeManager;
}
public Storage getStorage() {
@ -913,7 +912,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
message = PlaceholderAPI.setPlaceholders(quester.getPlayer(), message);
}
if (getSettings().canTranslateNames() && !e.hasItemMeta() && !e.getItemMeta().hasDisplayName()) {
localeQuery.sendMessage(quester.getPlayer(), message, e.getType(), e.getDurability(), null);
localeManager.sendMessage(quester.getPlayer(), message, e.getType(), e.getDurability(), null);
} else {
quester.sendMessage(message.replace("<item>", ItemUtil.getName(e)));
}
@ -935,7 +934,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
message = PlaceholderAPI.setPlaceholders(quester.getPlayer(), message);
}
if (getSettings().canTranslateNames() && !e.hasItemMeta() && !e.getItemMeta().hasDisplayName()) {
localeQuery.sendMessage(quester.getPlayer(), message, e.getType(), e.getDurability(), null);
localeManager.sendMessage(quester.getPlayer(), message, e.getType(), e.getDurability(), null);
} else {
quester.sendMessage(message.replace("<item>", ItemUtil.getName(e)));
}
@ -957,7 +956,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
message = PlaceholderAPI.setPlaceholders(quester.getPlayer(), message);
}
if (getSettings().canTranslateNames() && !e.hasItemMeta() && !e.getItemMeta().hasDisplayName()) {
localeQuery.sendMessage(quester.getPlayer(), message, e.getType(), e.getDurability(), null);
localeManager.sendMessage(quester.getPlayer(), message, e.getType(), e.getDurability(), null);
} else {
quester.sendMessage(message.replace("<item>", ItemUtil.getName(e)));
}
@ -979,7 +978,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
message = PlaceholderAPI.setPlaceholders(quester.getPlayer(), message);
}
if (getSettings().canTranslateNames() && !e.hasItemMeta() && !e.getItemMeta().hasDisplayName()) {
localeQuery.sendMessage(quester.getPlayer(), message, e.getType(), e.getDurability(), null);
localeManager.sendMessage(quester.getPlayer(), message, e.getType(), e.getDurability(), null);
} else {
quester.sendMessage(message.replace("<item>", ItemUtil.getName(e)));
}
@ -1001,7 +1000,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
message = PlaceholderAPI.setPlaceholders(quester.getPlayer(), message);
}
if (getSettings().canTranslateNames() && !e.hasItemMeta() && !e.getItemMeta().hasDisplayName()) {
localeQuery.sendMessage(quester.getPlayer(), message, e.getType(), e.getDurability(), null);
localeManager.sendMessage(quester.getPlayer(), message, e.getType(), e.getDurability(), null);
} else {
quester.sendMessage(message.replace("<item>", ItemUtil.getName(e)));
}
@ -1026,7 +1025,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
message = PlaceholderAPI.setPlaceholders(quester.getPlayer(), message);
}
if (getSettings().canTranslateNames() && !is.hasItemMeta() && !is.getItemMeta().hasDisplayName()) {
localeQuery.sendMessage(quester.getPlayer(), message, is.getType(), is.getDurability(),
localeManager.sendMessage(quester.getPlayer(), message, is.getType(), is.getDurability(),
is.getEnchantments());
} else {
quester.sendMessage(message.replace("<item>", ItemUtil.getName(is)));
@ -1050,7 +1049,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
message = PlaceholderAPI.setPlaceholders(quester.getPlayer(), message);
}
if (getSettings().canTranslateNames() && !is.hasItemMeta() && !is.getItemMeta().hasDisplayName()) {
localeQuery.sendMessage(quester.getPlayer(), message, is.getType(), is.getDurability(),
localeManager.sendMessage(quester.getPlayer(), message, is.getType(), is.getDurability(),
is.getEnchantments());
} else {
quester.sendMessage(message.replace("<item>", ItemUtil.getName(is)));
@ -1075,12 +1074,12 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
}
if (getSettings().canTranslateNames() && is.hasItemMeta() && !is.getItemMeta().hasDisplayName()) {
// Bukkit version is 1.9+
localeQuery.sendMessage(quester.getPlayer(), message, is.getType(), is.getDurability(),
localeManager.sendMessage(quester.getPlayer(), message, is.getType(), is.getDurability(),
is.getEnchantments(), is.getItemMeta());
} else if (getSettings().canTranslateNames() && !is.hasItemMeta()
&& Material.getMaterial("LINGERING_POTION") == null) {
// Bukkit version is below 1.9
localeQuery.sendMessage(quester.getPlayer(), message, is.getType(), is.getDurability(),
localeManager.sendMessage(quester.getPlayer(), message, is.getType(), is.getDurability(),
is.getEnchantments());
} else {
if (is.getEnchantments().isEmpty()) {
@ -1116,12 +1115,12 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
}
if (getSettings().canTranslateNames() && is.hasItemMeta() && !is.getItemMeta().hasDisplayName()) {
// Bukkit version is 1.9+
localeQuery.sendMessage(quester.getPlayer(), message, is.getType(), is.getDurability(),
localeManager.sendMessage(quester.getPlayer(), message, is.getType(), is.getDurability(),
is.getEnchantments(), is.getItemMeta());
} else if (getSettings().canTranslateNames() && !is.hasItemMeta()
&& Material.getMaterial("LINGERING_POTION") == null) {
// Bukkit version is below 1.9
localeQuery.sendMessage(quester.getPlayer(), message, is.getType(), is.getDurability(),
localeManager.sendMessage(quester.getPlayer(), message, is.getType(), is.getDurability(),
is.getEnchantments());
} else {
quester.sendMessage(message.replace("<item>", ItemUtil.getName(is)));
@ -1145,7 +1144,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
message = PlaceholderAPI.setPlaceholders(quester.getPlayer(), message);
}
if (getSettings().canTranslateNames() && !is.hasItemMeta() && !is.getItemMeta().hasDisplayName()) {
localeQuery.sendMessage(quester.getPlayer(), message, is.getType(), is.getDurability(),
localeManager.sendMessage(quester.getPlayer(), message, is.getType(), is.getDurability(),
is.getEnchantments());
} else {
quester.sendMessage(message.replace("<item>", ItemUtil.getName(is)));
@ -1217,7 +1216,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
message = PlaceholderAPI.setPlaceholders(quester.getPlayer(), message);
}
if (getSettings().canTranslateNames()) {
localeQuery.sendMessage(quester.getPlayer(), message, e, null);
localeManager.sendMessage(quester.getPlayer(), message, e, null);
} else {
quester.sendMessage(message.replace("<mob>", MiscUtil.getProperMobName(e)));
}
@ -1260,7 +1259,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
message = PlaceholderAPI.setPlaceholders(quester.getPlayer(), message);
}
if (getSettings().canTranslateNames() && !is.hasItemMeta() && !is.getItemMeta().hasDisplayName()) {
localeQuery.sendMessage(quester.getPlayer(), message, is.getType(), is.getDurability(),
localeManager.sendMessage(quester.getPlayer(), message, is.getType(), is.getDurability(),
is.getEnchantments());
} else {
quester.sendMessage(message.replace("<item>", ItemUtil.getName(is)));
@ -1325,7 +1324,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
message += color + ": " + e2.getValue() + "/" + e.getValue();
}
if (getSettings().canTranslateNames()) {
localeQuery.sendMessage(quester.getPlayer(), message, e.getKey(), null);
localeManager.sendMessage(quester.getPlayer(), message, e.getKey(), null);
} else {
quester.sendMessage(message.replace("<mob>",
MiscUtil.getProperMobName(e.getKey())));

10
main/src/main/java/me/blackvein/quests/listeners/NpcListener.java
View File

@ -37,7 +37,6 @@ import me.blackvein.quests.Quests;
import me.blackvein.quests.enums.ObjectiveType;
import me.blackvein.quests.util.ItemUtil;
import me.blackvein.quests.util.Lang;
import me.blackvein.quests.util.RomanNumeral;
import net.citizensnpcs.api.CitizensAPI;
import net.citizensnpcs.api.event.NPCDeathEvent;
import net.citizensnpcs.api.event.NPCLeftClickEvent;
@ -110,7 +109,7 @@ public class NpcListener implements Listener {
text += " x " + ChatColor.DARK_AQUA + hand.getAmount() + ChatColor.GRAY;
if (plugin.getSettings().canTranslateNames() && !hasMeta
&& !hand.getItemMeta().hasDisplayName()) {
plugin.getLocaleQuery().sendMessage(player, Lang
plugin.getLocaleManager().sendMessage(player, Lang
.get(player, "questInvalidDeliveryItem").replace("<item>", text), hand
.getType(), hand.getDurability(), null);
} else {
@ -170,16 +169,13 @@ public class NpcListener implements Listener {
if (hand.getType().equals(Material.ENCHANTED_BOOK)) {
final EnchantmentStorageMeta esmeta = (EnchantmentStorageMeta) hand.getItemMeta();
if (esmeta.hasStoredEnchants()) {
// TODO translate Roman numerals
for (final Entry<Enchantment, Integer> e : esmeta.getStoredEnchants()
.entrySet()) {
final HashMap<Enchantment, Integer> single
= new HashMap<Enchantment, Integer>();
single.put(e.getKey(), e.getValue());
plugin.getLocaleQuery().sendMessage(player, ChatColor.GRAY + "\u2515 "
+ ChatColor.DARK_GREEN
+ "<enchantment> " + RomanNumeral.getNumeral(e.getValue())
+ "\n", single);
plugin.getLocaleManager().sendMessage(player, ChatColor.GRAY + "\u2515 "
+ ChatColor.DARK_GREEN + "<enchantment> <level>\n", single);
}
}
}