2021-06-15 02:59:31 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Connor Linfoot <connorlinfoot@me.com>
|
|
|
|
Date: Sun, 16 May 2021 15:07:34 +0100
|
|
|
|
Subject: [PATCH] Add basic Datapack API
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/io/papermc/paper/datapack/PaperDatapack.java b/src/main/java/io/papermc/paper/datapack/PaperDatapack.java
|
|
|
|
new file mode 100644
|
|
|
|
index 0000000000000000000000000000000000000000..9b7dd8a0fba4547f5268b3f99e21ddbe6b5bf566
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/src/main/java/io/papermc/paper/datapack/PaperDatapack.java
|
|
|
|
@@ -0,0 +1,50 @@
|
|
|
|
+package io.papermc.paper.datapack;
|
|
|
|
+
|
|
|
|
+import io.papermc.paper.event.server.ServerResourcesReloadedEvent;
|
|
|
|
+import net.minecraft.server.MinecraftServer;
|
|
|
|
+import net.minecraft.server.packs.repository.Pack;
|
|
|
|
+import java.util.List;
|
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
+
|
|
|
|
+public class PaperDatapack implements Datapack {
|
|
|
|
+ private final String name;
|
|
|
|
+ private final Compatibility compatibility;
|
|
|
|
+ private final boolean enabled;
|
|
|
|
+
|
|
|
|
+ PaperDatapack(Pack loader, boolean enabled) {
|
|
|
|
+ this.name = loader.getId();
|
|
|
|
+ this.compatibility = Compatibility.valueOf(loader.getCompatibility().name());
|
|
|
|
+ this.enabled = enabled;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public String getName() {
|
|
|
|
+ return name;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public Compatibility getCompatibility() {
|
|
|
|
+ return compatibility;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public boolean isEnabled() {
|
|
|
|
+ return enabled;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void setEnabled(boolean enabled) {
|
|
|
|
+ if (enabled == this.enabled) {
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ MinecraftServer server = MinecraftServer.getServer();
|
|
|
|
+ List<String> enabledKeys = server.getPackRepository().getSelectedPacks().stream().map(Pack::getId).collect(Collectors.toList());
|
|
|
|
+ if (enabled) {
|
|
|
|
+ enabledKeys.add(this.name);
|
|
|
|
+ } else {
|
|
|
|
+ enabledKeys.remove(this.name);
|
|
|
|
+ }
|
|
|
|
+ server.reloadResources(enabledKeys, ServerResourcesReloadedEvent.Cause.PLUGIN);
|
|
|
|
+ }
|
|
|
|
+}
|
|
|
|
diff --git a/src/main/java/io/papermc/paper/datapack/PaperDatapackManager.java b/src/main/java/io/papermc/paper/datapack/PaperDatapackManager.java
|
|
|
|
new file mode 100644
|
|
|
|
index 0000000000000000000000000000000000000000..cf4374493c11057451a62a655514415cf6b298e0
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/src/main/java/io/papermc/paper/datapack/PaperDatapackManager.java
|
|
|
|
@@ -0,0 +1,25 @@
|
|
|
|
+package io.papermc.paper.datapack;
|
|
|
|
+
|
|
|
|
+import java.util.Collection;
|
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
+import net.minecraft.server.packs.repository.Pack;
|
|
|
|
+import net.minecraft.server.packs.repository.PackRepository;
|
|
|
|
+
|
|
|
|
+public class PaperDatapackManager implements DatapackManager {
|
|
|
|
+ private final PackRepository repository;
|
|
|
|
+
|
|
|
|
+ public PaperDatapackManager(PackRepository repository) {
|
|
|
|
+ this.repository = repository;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public Collection<Datapack> getPacks() {
|
|
|
|
+ Collection<Pack> enabledPacks = repository.getSelectedPacks();
|
|
|
|
+ return repository.getAvailablePacks().stream().map(loader -> new PaperDatapack(loader, enabledPacks.contains(loader))).collect(Collectors.toList());
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public Collection<Datapack> getEnabledPacks() {
|
|
|
|
+ return repository.getSelectedPacks().stream().map(loader -> new PaperDatapack(loader, true)).collect(Collectors.toList());
|
|
|
|
+ }
|
|
|
|
+}
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
2022-11-03 21:03:31 +00:00
|
|
|
index e90ef57567928fdfd08fd16ce84503b07bdfe499..c330d63cc8d40092fdf70e5aea6f6ee9e8521e88 100644
|
2021-06-15 02:59:31 +00:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
2022-08-09 07:18:08 +00:00
|
|
|
@@ -282,6 +282,7 @@ public final class CraftServer implements Server {
|
2021-06-15 02:59:31 +00:00
|
|
|
public boolean ignoreVanillaPermissions = false;
|
|
|
|
private final List<CraftPlayer> playerView;
|
|
|
|
public int reloadCount;
|
|
|
|
+ private final io.papermc.paper.datapack.PaperDatapackManager datapackManager; // Paper
|
|
|
|
public static Exception excessiveVelEx; // Paper - Velocity warnings
|
|
|
|
|
|
|
|
static {
|
2022-08-09 07:18:08 +00:00
|
|
|
@@ -368,6 +369,7 @@ public final class CraftServer implements Server {
|
2022-06-20 17:12:05 +00:00
|
|
|
if (this.configuration.getBoolean("settings.use-map-color-cache")) {
|
|
|
|
MapPalette.setMapColorCache(new CraftMapColorCache(this.logger));
|
|
|
|
}
|
2021-06-15 02:59:31 +00:00
|
|
|
+ datapackManager = new io.papermc.paper.datapack.PaperDatapackManager(console.getPackRepository()); // Paper
|
|
|
|
}
|
|
|
|
|
|
|
|
public boolean getCommandBlockOverride(String command) {
|
2022-08-09 07:18:08 +00:00
|
|
|
@@ -2770,5 +2772,11 @@ public final class CraftServer implements Server {
|
2021-06-15 02:59:31 +00:00
|
|
|
public com.destroystokyo.paper.entity.ai.MobGoals getMobGoals() {
|
|
|
|
return mobGoals;
|
|
|
|
}
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public io.papermc.paper.datapack.PaperDatapackManager getDatapackManager() {
|
|
|
|
+ return datapackManager;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
// Paper end
|
|
|
|
}
|