Upstream/mmoitems
1
0
Fork 0
mirror of https://gitlab.com/phoenix-dvpmt/mmoitems.git synced 2024-12-22 04:37:42 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changed to ML placeholder parser

Browse Source
This commit is contained in:
Indyuce 2022-08-18 23:15:39 +02:00
parent 9367fb1d20
commit db78c8d9c3
6 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MMOItems-API/src/main/java/net/Indyuce/mmoitems/MMOItems.java
View File

@ -88,6 +88,7 @@ public class MMOItems extends JavaPlugin {
private TierManager tierManager; private TierManager tierManager;
private SetManager setManager; private SetManager setManager;
@Deprecated
private PlaceholderParser placeholderParser = new DefaultPlaceholderParser(); private PlaceholderParser placeholderParser = new DefaultPlaceholderParser();
private VaultSupport vaultSupport; private VaultSupport vaultSupport;
private RPGHandler rpgPlugin; private RPGHandler rpgPlugin;
@ -513,6 +514,7 @@ public class MMOItems extends JavaPlugin {
return upgradeManager; return upgradeManager;
} }
@Deprecated
public PlaceholderParser getPlaceholderParser() { public PlaceholderParser getPlaceholderParser() {
return placeholderParser; return placeholderParser;
} }

4
MMOItems-API/src/main/java/net/Indyuce/mmoitems/api/crafting/trigger/MessageTrigger.java
View File

@ -1,6 +1,6 @@
package net.Indyuce.mmoitems.api.crafting.trigger; package net.Indyuce.mmoitems.api.crafting.trigger;
import net.Indyuce.mmoitems.MMOItems; import io.lumine.mythic.lib.MythicLib;
import net.Indyuce.mmoitems.api.player.PlayerData; import net.Indyuce.mmoitems.api.player.PlayerData;
import io.lumine.mythic.lib.api.MMOLineConfig; import io.lumine.mythic.lib.api.MMOLineConfig;
@ -17,6 +17,6 @@ public class MessageTrigger extends Trigger {
@Override @Override
public void whenCrafting(PlayerData data) { public void whenCrafting(PlayerData data) {
if(!data.isOnline()) return; if(!data.isOnline()) return;
data.getPlayer().sendMessage(MMOItems.plugin.getPlaceholderParser().parse(data.getPlayer(), message)); data.getPlayer().sendMessage(MythicLib.plugin.getPlaceholderParser().parse(data.getPlayer(), message));
} }
} }

2
MMOItems-API/src/main/java/net/Indyuce/mmoitems/api/interaction/UseItem.java
View File

@ -83,7 +83,7 @@ public class UseItem {
* @param command Command to execute * @param command Command to execute
*/ */
private void scheduleCommandExecution(CommandData command) { private void scheduleCommandExecution(CommandData command) {
String parsed = MMOItems.plugin.getPlaceholderParser().parse(player, command.getCommand()); String parsed = MythicLib.plugin.getPlaceholderParser().parse(player, command.getCommand());
if (!command.hasDelay()) if (!command.hasDelay())
dispatchCommand(parsed, command.isConsoleCommand(), command.hasOpPerms()); dispatchCommand(parsed, command.isConsoleCommand(), command.hasOpPerms());

2
MMOItems-API/src/main/java/net/Indyuce/mmoitems/comp/parse/placeholders/DefaultPlaceholderParser.java
View File

@ -2,7 +2,9 @@ package net.Indyuce.mmoitems.comp.parse.placeholders;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
@Deprecated
public class DefaultPlaceholderParser implements PlaceholderParser { public class DefaultPlaceholderParser implements PlaceholderParser {
@Override @Override
public String parse(OfflinePlayer player, String string) { public String parse(OfflinePlayer player, String string) {
return string.replace("%player%", player.getName()); return string.replace("%player%", player.getName());

3
MMOItems-API/src/main/java/net/Indyuce/mmoitems/comp/parse/placeholders/PlaceholderAPIParser.java
View File

@ -5,6 +5,7 @@ import org.bukkit.OfflinePlayer;
import me.clip.placeholderapi.PlaceholderAPI; import me.clip.placeholderapi.PlaceholderAPI;
import io.lumine.mythic.lib.MythicLib; import io.lumine.mythic.lib.MythicLib;
@Deprecated
public class PlaceholderAPIParser implements PlaceholderParser { public class PlaceholderAPIParser implements PlaceholderParser {
public PlaceholderAPIParser() { public PlaceholderAPIParser() {
new MMOItemsPlaceholders().register(); new MMOItemsPlaceholders().register();
@ -12,6 +13,6 @@ public class PlaceholderAPIParser implements PlaceholderParser {
@Override @Override
public String parse(OfflinePlayer player, String string) { public String parse(OfflinePlayer player, String string) {
return MythicLib.plugin.parseColors(PlaceholderAPI.setPlaceholders(player, string.replace("%player%", player.getName()))); return MythicLib.plugin.parseColors(PlaceholderAPI.setPlaceholders(player, string));
} }
} }

1
MMOItems-API/src/main/java/net/Indyuce/mmoitems/comp/parse/placeholders/PlaceholderParser.java
View File

@ -2,6 +2,7 @@ package net.Indyuce.mmoitems.comp.parse.placeholders;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
@Deprecated
public interface PlaceholderParser { public interface PlaceholderParser {
String parse(OfflinePlayer player, String string); String parse(OfflinePlayer player, String string);
} }