Plugin Datapacks

patches/api/0008-Paper-Plugins.patch

@@ -873,14 +873,13 @@ index 0000000000000000000000000000000000000000..e3e902a708a760be167cb1bba8e845c5
 +}
 diff --git a/src/main/java/io/papermc/paper/plugin/provider/classloader/ClassLoaderAccess.java b/src/main/java/io/papermc/paper/plugin/provider/classloader/ClassLoaderAccess.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..64e46fdfa4d404cb08c67a456e5990b729296b98
+index 0000000000000000000000000000000000000000..a37a0b9e161aaf9db892ca4993033076cd924fc3
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/plugin/provider/classloader/ClassLoaderAccess.java
-@@ -0,0 +1,34 @@
+@@ -0,0 +1,33 @@
 +package io.papermc.paper.plugin.provider.classloader;
 +
 +import org.jetbrains.annotations.ApiStatus;
-+import org.jetbrains.annotations.NotNull;
 +
 +/**
 + * The class loader access interface is an <b>internal</b> representation of a class accesses' ability to see types

patches/api/0418-Plugin-Datapacks.patch

@@ -0,0 +1,73 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <jake.m.potrebic@gmail.com>
+Date: Sat, 9 Jan 2021 22:21:41 -0800
+Subject: [PATCH] Plugin Datapacks
+
+
+diff --git a/src/main/java/io/papermc/paper/plugin/DatapackConfiguration.java b/src/main/java/io/papermc/paper/plugin/DatapackConfiguration.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..9e48ad4f2bd9d73fdaf1e05b5338e4a54d5cd146
+--- /dev/null
++++ b/src/main/java/io/papermc/paper/plugin/DatapackConfiguration.java
+@@ -0,0 +1,22 @@
++package io.papermc.paper.plugin;
++
++import net.kyori.adventure.text.Component;
++import org.jetbrains.annotations.NotNull;
++import org.jetbrains.annotations.Nullable;
++
++public interface DatapackConfiguration {
++
++    /**
++     * Gets the directory inside the plugin's file for the datapack.
++     *
++     * @return the datapack directory
++     */
++    @NotNull String directory();
++
++    /**
++     * Gets the datapack's configured name.
++     *
++     * @return the name or null if none configured
++     */
++    @Nullable Component name();
++}
+diff --git a/src/main/java/io/papermc/paper/plugin/configuration/PluginMeta.java b/src/main/java/io/papermc/paper/plugin/configuration/PluginMeta.java
+index ef393f1f93ca48264fc1b6e3a27787f6a9152e1b..c0037d779cbfe926221559598fc9965717202768 100644
+--- a/src/main/java/io/papermc/paper/plugin/configuration/PluginMeta.java
++++ b/src/main/java/io/papermc/paper/plugin/configuration/PluginMeta.java
+@@ -1,5 +1,6 @@
+ package io.papermc.paper.plugin.configuration;
+
++import io.papermc.paper.plugin.DatapackConfiguration;
+ import org.bukkit.permissions.Permission;
+ import org.bukkit.permissions.PermissionDefault;
+ import org.bukkit.plugin.PluginLoadOrder;
+@@ -200,4 +201,11 @@ public interface PluginMeta {
+     @Nullable
+     String getAPIVersion();
+
++    /**
++     * Get the configuration for the datapack associated with the plugin.
++     *
++     * @return the datapack configuration (or null if none)
++     */
++    @Nullable DatapackConfiguration getDatapackConfiguration();
++
+ }
+diff --git a/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java b/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java
+index f1ae66989afaa433bf2896e0bfe2cea472f774d8..4eb40bbbc2740c1fa25adad9d56c1afe634687f1 100644
+--- a/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java
++++ b/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java
+@@ -317,6 +317,11 @@ public final class PluginDescriptionFile implements io.papermc.paper.plugin.conf
+     public @NotNull List<String> getProvidedPlugins() {
+         return this.provides;
+     }
++
++    @Override
++    public @Nullable io.papermc.paper.plugin.DatapackConfiguration getDatapackConfiguration() {
++        return null;
++    }
+     // Paper end
+
+     public PluginDescriptionFile(@NotNull final InputStream stream) throws InvalidDescriptionException {

patches/server/0013-Paper-Plugins.patch

@@ -1573,17 +1573,16 @@ index 0000000000000000000000000000000000000000..f43295fdeaa587cf30c35a1d54516707
 +}
 diff --git a/src/main/java/io/papermc/paper/plugin/entrypoint/dependency/DependencyUtil.java b/src/main/java/io/papermc/paper/plugin/entrypoint/dependency/DependencyUtil.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..b963fae0285d2d87a6f6a4eddf98996a27dabac2
+index 0000000000000000000000000000000000000000..21af10fedcd55ba616281d193862eff9bb79d0ef
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/plugin/entrypoint/dependency/DependencyUtil.java
-@@ -0,0 +1,70 @@
+@@ -0,0 +1,69 @@
 +package io.papermc.paper.plugin.entrypoint.dependency;
 +
 +import com.google.common.graph.MutableGraph;
 +import io.papermc.paper.plugin.configuration.PluginMeta;
 +import io.papermc.paper.plugin.provider.PluginProvider;
 +import io.papermc.paper.plugin.provider.configuration.LoadOrderConfiguration;
-+import org.bukkit.plugin.PluginDescriptionFile;
 +import org.jetbrains.annotations.NotNull;
 +
 +import java.util.ArrayList;
@@ -2508,17 +2507,15 @@ index 0000000000000000000000000000000000000000..2ea978ac957849260e7ca69c9ff56588
 +}
 diff --git a/src/main/java/io/papermc/paper/plugin/entrypoint/strategy/ProviderConfiguration.java b/src/main/java/io/papermc/paper/plugin/entrypoint/strategy/ProviderConfiguration.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..71536981075095ee06234c638c0dfa054e737fb8
+index 0000000000000000000000000000000000000000..5e89936939b7a38c4a8bcec78d7f89739f1749f0
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/plugin/entrypoint/strategy/ProviderConfiguration.java
-@@ -0,0 +1,19 @@
+@@ -0,0 +1,17 @@
 +package io.papermc.paper.plugin.entrypoint.strategy;
 +
 +import io.papermc.paper.plugin.provider.PluginProvider;
 +import io.papermc.paper.plugin.provider.entrypoint.DependencyContext;
 +
-+import java.util.List;
-+
 +/**
 + * Used to share code with the modern and legacy plugin load strategy.
 + *
@@ -4804,10 +4801,10 @@ index 0000000000000000000000000000000000000000..a180612a1ec395202dbae1ca5b97ec01
 +}
 diff --git a/src/main/java/io/papermc/paper/plugin/provider/source/DirectoryProviderSource.java b/src/main/java/io/papermc/paper/plugin/provider/source/DirectoryProviderSource.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..1822e076601db51c8a7954036853bee1fb8e3704
+index 0000000000000000000000000000000000000000..47422c5fb92c0c019a3179a8df720641c3261fd1
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/plugin/provider/source/DirectoryProviderSource.java
-@@ -0,0 +1,40 @@
+@@ -0,0 +1,39 @@
 +package io.papermc.paper.plugin.provider.source;
 +
 +import com.mojang.logging.LogUtils;
@@ -4816,7 +4813,6 @@ index 0000000000000000000000000000000000000000..1822e076601db51c8a7954036853bee1
 +
 +import java.nio.file.Files;
 +import java.nio.file.Path;
-+import java.util.logging.Level;
 +
 +/**
 + * Loads all plugin providers in the given directory.
@@ -5230,25 +5226,18 @@ index 0000000000000000000000000000000000000000..362feffd88e117c0fb93ffeddafe8334
 +}
 diff --git a/src/main/java/io/papermc/paper/plugin/provider/type/paper/PaperLoadOrderConfiguration.java b/src/main/java/io/papermc/paper/plugin/provider/type/paper/PaperLoadOrderConfiguration.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..b7e8a5ba375a558e0442aa9facf96954a9bb135f
+index 0000000000000000000000000000000000000000..d905fb283801f272fbba99a58477d439db357971
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/plugin/provider/type/paper/PaperLoadOrderConfiguration.java
-@@ -0,0 +1,44 @@
+@@ -0,0 +1,37 @@
 +package io.papermc.paper.plugin.provider.type.paper;
 +
 +import io.papermc.paper.plugin.configuration.PluginMeta;
-+import io.papermc.paper.plugin.provider.PluginProvider;
 +import io.papermc.paper.plugin.provider.configuration.LoadOrderConfiguration;
 +import io.papermc.paper.plugin.provider.configuration.PaperPluginMeta;
-+import io.papermc.paper.plugin.provider.type.spigot.SpigotPluginProvider;
-+import org.bukkit.plugin.PluginDescriptionFile;
-+import org.bukkit.plugin.java.JavaPlugin;
 +import org.jetbrains.annotations.NotNull;
 +
-+import java.util.ArrayList;
-+import java.util.Iterator;
 +import java.util.List;
-+import java.util.Map;
 +
 +public class PaperLoadOrderConfiguration implements LoadOrderConfiguration {
 +
@@ -5604,17 +5593,16 @@ index 0000000000000000000000000000000000000000..db343a2f482ac375078610f087569286
 +}
 diff --git a/src/main/java/io/papermc/paper/plugin/provider/type/spigot/SpigotLoadOrderConfiguration.java b/src/main/java/io/papermc/paper/plugin/provider/type/spigot/SpigotLoadOrderConfiguration.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..b2a6544e321fa61c58bdf5684231de1020884fcc
+index 0000000000000000000000000000000000000000..96f84f965f30db09c516a616ba8b5166b4a4c501
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/plugin/provider/type/spigot/SpigotLoadOrderConfiguration.java
-@@ -0,0 +1,72 @@
+@@ -0,0 +1,71 @@
 +package io.papermc.paper.plugin.provider.type.spigot;
 +
 +import io.papermc.paper.plugin.configuration.PluginMeta;
 +import io.papermc.paper.plugin.provider.PluginProvider;
 +import io.papermc.paper.plugin.provider.configuration.LoadOrderConfiguration;
 +import org.bukkit.plugin.PluginDescriptionFile;
-+import org.bukkit.plugin.java.JavaPlugin;
 +import org.jetbrains.annotations.NotNull;
 +
 +import java.util.ArrayList;
@@ -5682,16 +5670,15 @@ index 0000000000000000000000000000000000000000..b2a6544e321fa61c58bdf5684231de10
 +}
 diff --git a/src/main/java/io/papermc/paper/plugin/provider/type/spigot/SpigotPluginProvider.java b/src/main/java/io/papermc/paper/plugin/provider/type/spigot/SpigotPluginProvider.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..0da361611bd93bc3299b8559d5c7c2127a8a6f0f
+index 0000000000000000000000000000000000000000..6c8f4937929318297df9e0db1f0e9ddebedd4fd2
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/plugin/provider/type/spigot/SpigotPluginProvider.java
-@@ -0,0 +1,188 @@
+@@ -0,0 +1,187 @@
 +package io.papermc.paper.plugin.provider.type.spigot;
 +
 +import com.destroystokyo.paper.util.SneakyThrow;
 +import com.destroystokyo.paper.utils.PaperPluginLogger;
 +import io.papermc.paper.plugin.entrypoint.dependency.DependencyUtil;
-+import io.papermc.paper.plugin.manager.PaperPluginManagerImpl;
 +import io.papermc.paper.plugin.provider.configuration.LoadOrderConfiguration;
 +import io.papermc.paper.plugin.provider.entrypoint.DependencyContext;
 +import io.papermc.paper.plugin.entrypoint.dependency.DependencyContextHolder;
@@ -5927,10 +5914,10 @@ index 0000000000000000000000000000000000000000..14ed05945ba5bfeb2b539d4786278b0e
 +
 diff --git a/src/main/java/io/papermc/paper/plugin/storage/BootstrapProviderStorage.java b/src/main/java/io/papermc/paper/plugin/storage/BootstrapProviderStorage.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..e5b70ff297febd936e64055b79f48712d65dbed9
+index 0000000000000000000000000000000000000000..ff33a9625dcf02db6ccf4e4d4a1198a7407caf3e
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/plugin/storage/BootstrapProviderStorage.java
-@@ -0,0 +1,57 @@
+@@ -0,0 +1,54 @@
 +package io.papermc.paper.plugin.storage;
 +
 +import com.mojang.logging.LogUtils;
@@ -5941,13 +5928,10 @@ index 0000000000000000000000000000000000000000..e5b70ff297febd936e64055b79f48712
 +import io.papermc.paper.plugin.provider.entrypoint.DependencyContext;
 +import io.papermc.paper.plugin.entrypoint.dependency.DependencyContextHolder;
 +import io.papermc.paper.plugin.entrypoint.strategy.ModernPluginLoadingStrategy;
-+import io.papermc.paper.plugin.entrypoint.strategy.PluginGraphCycleException;
 +import io.papermc.paper.plugin.entrypoint.strategy.ProviderConfiguration;
 +import io.papermc.paper.plugin.provider.PluginProvider;
 +import io.papermc.paper.plugin.provider.ProviderStatus;
 +import io.papermc.paper.plugin.provider.ProviderStatusHolder;
-+import io.papermc.paper.plugin.provider.configuration.PaperPluginMeta;
-+import io.papermc.paper.plugin.provider.configuration.type.DependencyConfiguration;
 +import org.slf4j.Logger;
 +
 +import java.util.ArrayList;
@@ -6037,10 +6021,10 @@ index 0000000000000000000000000000000000000000..374e7d3d69fc8603ecf54999f173123d
 +}
 diff --git a/src/main/java/io/papermc/paper/plugin/storage/ServerPluginProviderStorage.java b/src/main/java/io/papermc/paper/plugin/storage/ServerPluginProviderStorage.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..fbe76a678f45bd3c55f25f2b6a4366efc0521cb8
+index 0000000000000000000000000000000000000000..4e24077c03f1890acd3c733f0a66fdbb8f381e8c
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/plugin/storage/ServerPluginProviderStorage.java
-@@ -0,0 +1,70 @@
+@@ -0,0 +1,68 @@
 +package io.papermc.paper.plugin.storage;
 +
 +import com.mojang.logging.LogUtils;
@@ -6049,8 +6033,6 @@ index 0000000000000000000000000000000000000000..fbe76a678f45bd3c55f25f2b6a4366ef
 +import io.papermc.paper.plugin.entrypoint.strategy.ProviderConfiguration;
 +import io.papermc.paper.plugin.manager.PaperPluginManagerImpl;
 +import io.papermc.paper.plugin.provider.PluginProvider;
-+import io.papermc.paper.plugin.provider.ProviderStatus;
-+import io.papermc.paper.plugin.provider.ProviderStatusHolder;
 +import io.papermc.paper.plugin.provider.type.paper.PaperPluginParent;
 +import org.bukkit.plugin.Plugin;
 +import org.bukkit.plugin.java.JavaPlugin;