From 71d0f7219fe71d1c561f82c6b567e1726c0b340b Mon Sep 17 00:00:00 2001 From: Jules Date: Sun, 22 Oct 2023 02:11:45 +0200 Subject: [PATCH] Fixed placeholders with proxy-based profiles --- MMOCore-API/pom.xml | 2 +- .../comp/profile/ForceClassProfileDataModule.java | 3 +-- .../comp/profile/MMOCoreProfileDataModule.java | 12 ++++++------ 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/MMOCore-API/pom.xml b/MMOCore-API/pom.xml index d0357d1a..6be4345b 100644 --- a/MMOCore-API/pom.xml +++ b/MMOCore-API/pom.xml @@ -142,7 +142,7 @@ fr.phoenixdevt Profile-API - 1.1 + 1.1-SNAPSHOT provided true diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/comp/profile/ForceClassProfileDataModule.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/comp/profile/ForceClassProfileDataModule.java index d69f2c80..51d0c9e7 100644 --- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/comp/profile/ForceClassProfileDataModule.java +++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/comp/profile/ForceClassProfileDataModule.java @@ -15,10 +15,9 @@ import net.Indyuce.mmocore.manager.InventoryManager; import org.apache.commons.lang.Validate; import org.bukkit.Bukkit; import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; import org.bukkit.plugin.java.JavaPlugin; -public class ForceClassProfileDataModule implements ProfileDataModule, Listener { +public class ForceClassProfileDataModule implements ProfileDataModule { public ForceClassProfileDataModule() { final ProfileProvider provider = Bukkit.getServicesManager().getRegistration(ProfileProvider.class).getProvider(); provider.registerModule(this); diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/comp/profile/MMOCoreProfileDataModule.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/comp/profile/MMOCoreProfileDataModule.java index 8bd10e53..d4f117fe 100644 --- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/comp/profile/MMOCoreProfileDataModule.java +++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/comp/profile/MMOCoreProfileDataModule.java @@ -3,6 +3,7 @@ package net.Indyuce.mmocore.comp.profile; import fr.phoenixdevt.profiles.ProfileDataModule; import fr.phoenixdevt.profiles.event.ProfileCreateEvent; import fr.phoenixdevt.profiles.event.ProfileRemoveEvent; +import fr.phoenixdevt.profiles.placeholder.PlaceholderProcessor; import fr.phoenixdevt.profiles.placeholder.PlaceholderRequest; import io.lumine.mythic.lib.MythicLib; import io.lumine.mythic.lib.api.player.MMOPlayerData; @@ -11,10 +12,9 @@ import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.attribute.PlayerAttribute; import net.Indyuce.mmocore.experience.Profession; import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; import org.bukkit.plugin.java.JavaPlugin; -public class MMOCoreProfileDataModule implements ProfileDataModule, Listener { +public class MMOCoreProfileDataModule implements ProfileDataModule, PlaceholderProcessor { @Override public JavaPlugin getOwningPlugin() { @@ -22,13 +22,13 @@ public class MMOCoreProfileDataModule implements ProfileDataModule, Listener { } @Override - public boolean hasPlaceholders() { - return true; + public String getIdentifier() { + return "mmocore"; } @Override - public String getIdentifier() { - return "mmocore"; + public ProfileDataModule getDataModule() { + return this; } @Override