Add plugin source to API

PaperMC · Dec 28, 2024 · 0336f2a · 0336f2a
1 parent 54423b6
commit 0336f2a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/paper-api/src/main/java/io/papermc/paper/datapack/DatapackSource.java b/paper-api/src/main/java/io/papermc/paper/datapack/DatapackSource.java
@@ -13,6 +13,7 @@ public sealed interface DatapackSource permits DatapackSourceImpl {
     DatapackSource FEATURE = create("feature");
     DatapackSource WORLD = create("world");
     DatapackSource SERVER = create("server");
+    DatapackSource PLUGIN = create("plugin");
 
     private static DatapackSource create(final String name) {
         return new DatapackSourceImpl(name);

diff --git a/paper-server/src/main/java/io/papermc/paper/datapack/PaperDatapackRegistrar.java b/paper-server/src/main/java/io/papermc/paper/datapack/PaperDatapackRegistrar.java
@@ -116,7 +116,7 @@ public boolean removeDiscoveredPack(final String name) {
                 resourcesSupplier,
                 PackType.SERVER_DATA,
                 new PackSelectionConfig(
-                    configurerImpl.required,
+                    configurerImpl.autoEnableOnServerStart,
                     configurerImpl.position,
                     configurerImpl.fixedPosition
                 ));
@@ -134,7 +134,7 @@ public boolean removeDiscoveredPack(final String name) {
     static final class ConfigurerImpl implements Configurer {
 
         private Component title;
-        private boolean required = false;
+        private boolean autoEnableOnServerStart = false;
         private boolean fixedPosition = false;
         private Pack.Position position = Pack.Position.TOP;
 
@@ -150,7 +150,7 @@ public Configurer title(final Component title) {
 
         @Override
         public Configurer autoEnableOnServerStart(final boolean autoEnableOnServerStart) {
-            this.required = autoEnableOnServerStart;
+            this.autoEnableOnServerStart = autoEnableOnServerStart;
             return this;
         }
 

diff --git a/paper-server/src/main/java/io/papermc/paper/datapack/PaperDiscoveredDatapack.java b/paper-server/src/main/java/io/papermc/paper/datapack/PaperDiscoveredDatapack.java
@@ -22,6 +22,7 @@ public class PaperDiscoveredDatapack implements DiscoveredDatapack {
             .put(PackSource.FEATURE, DatapackSource.FEATURE)
             .put(PackSource.WORLD, DatapackSource.WORLD)
             .put(PackSource.SERVER, DatapackSource.SERVER)
+            .put(PluginPackSource.INSTANCE, DatapackSource.PLUGIN)
             .buildOrThrow();
     }