Repo-Mirror/eco
9
0
Fork 0
Code Issues Releases 2 Activity

Fixes to placeholders and integrations

Browse Source
This commit is contained in:
Auxilor
2022-10-04 11:43:10 +01:00
parent 5f2255a3bc
commit ae49d41542
7 changed files with 52 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
eco-api/src/main/java/com/willfp/eco/core/Eco.java
View File

@@ -21,7 +21,6 @@ import com.willfp.eco.core.gui.menu.MenuBuilder;
import com.willfp.eco.core.gui.menu.MenuType;
import com.willfp.eco.core.gui.slot.SlotBuilder;
import com.willfp.eco.core.gui.slot.functional.SlotProvider;
import com.willfp.eco.core.integrations.placeholder.PlaceholderIntegration;
import com.willfp.eco.core.items.TestableItem;
import com.willfp.eco.core.placeholder.AdditionalPlayer;
import com.willfp.eco.core.placeholder.PlaceholderInjectable;
@@ -138,10 +137,9 @@ public interface Eco {
* Create a PAPI integration.
*
* @param plugin The plugin.
* @return The integration.
*/
@NotNull
PlaceholderIntegration createPAPIIntegration(@NotNull EcoPlugin plugin);
void createPAPIIntegration(@NotNull EcoPlugin plugin);
/**
* Create a proxy factory.

6
eco-api/src/main/java/com/willfp/eco/core/EcoPlugin.java
View File

@@ -13,7 +13,6 @@ import com.willfp.eco.core.factory.MetadataValueFactory;
import com.willfp.eco.core.factory.NamespacedKeyFactory;
import com.willfp.eco.core.factory.RunnableFactory;
import com.willfp.eco.core.integrations.IntegrationLoader;
import com.willfp.eco.core.integrations.placeholder.PlaceholderManager;
import com.willfp.eco.core.proxy.ProxyFactory;
import com.willfp.eco.core.scheduling.Scheduler;
import com.willfp.eco.core.web.UpdateChecker;
@@ -375,8 +374,7 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
.collect(Collectors.toSet());
if (enabledPlugins.contains("PlaceholderAPI".toLowerCase())) {
this.loadedIntegrations.add("PlaceholderAPI");
PlaceholderManager.addIntegration(Eco.get().createPAPIIntegration(this));
Eco.get().createPAPIIntegration(this);
}
this.loadIntegrationLoaders().forEach(integrationLoader -> {
@@ -386,6 +384,8 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
}
});
this.loadedIntegrations.removeIf(pl -> pl.equalsIgnoreCase(this.getName()));
this.getLogger().info("Loaded integrations: " + String.join(", ", this.getLoadedIntegrations()));
Prerequisite.update();

2
eco-api/src/main/java/com/willfp/eco/core/integrations/placeholder/PlaceholderManager.java
View File

@@ -70,7 +70,7 @@ public final class PlaceholderManager {
/**
* The default PlaceholderAPI pattern; brought in for compatibility.
*/
private static final Pattern PATTERN = Pattern.compile("[%]([^%]+)[%]");
private static final Pattern PATTERN = Pattern.compile("[%]([^% ]+)[%]");
/**
* Register a new placeholder integration.