2021-06-15 04:59:31 +02: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
|
2024-04-24 15:46:45 +02:00
|
|
|
index 6debfd5866d4411ef8d51995bd07a0e2ece781b3..507cad6ef11603924389956305908fd157043178 100644
|
2021-06-15 04:59:31 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
2024-04-24 15:46:45 +02:00
|
|
|
@@ -305,6 +305,7 @@ public final class CraftServer implements Server {
|
2021-06-15 04:59:31 +02: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 {
|
Updated Upstream (Bukkit/CraftBukkit) (#10242)
* Updated Upstream (Bukkit/CraftBukkit)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
a6a9d2a4 Remove some old ApiStatus.Experimental annotations
be72314c SPIGOT-7300, PR-829: Add new DamageSource API providing enhanced information about entity damage
b252cf05 SPIGOT-7576, PR-970: Add methods in MushroomCow to change stew effects
b1c689bd PR-902: Add Server#isLoggingIPs to get log-ips configuration
08f86d1c PR-971: Add Player methods for client-side potion effects
2e3024a9 PR-963: Add API for in-world structures
a23292a7 SPIGOT-7530, PR-948: Improve Resource Pack API with new 1.20.3 functionality
1851857b SPIGOT-3071, PR-969: Add entity spawn method with spawn reason
cde4c52a SPIGOT-5553, PR-964: Add EntityKnockbackEvent
CraftBukkit Changes:
38fd4bd50 Fix accidentally renamed internal damage method
80f0ce4be SPIGOT-7300, PR-1180: Add new DamageSource API providing enhanced information about entity damage
7e43f3b16 SPIGOT-7581: Fix typo in BlockMushroom
ea14b7d90 SPIGOT-7576, PR-1347: Add methods in MushroomCow to change stew effects
4c687f243 PR-1259: Add Server#isLoggingIPs to get log-ips configuration
22a541a29 Improve support for per-world game rules
cb7dccce2 PR-1348: Add Player methods for client-side potion effects
b8d6109f0 PR-1335: Add API for in-world structures
4398a1b5b SPIGOT-7577: Make CraftWindCharge#explode discard the entity
e74107678 Fix Crafter maximum stack size
0bb0f4f6a SPIGOT-7530, PR-1314: Improve Resource Pack API with new 1.20.3 functionality
4949f556d SPIGOT-3071, PR-1345: Add entity spawn method with spawn reason
20ac73ca2 PR-1353: Fix Structure#place not working as documented with 0 palette
3c1b77871 SPIGOT-6911, PR-1349: Change max book length in CraftMetaBook
333701839 SPIGOT-7572: Bee nests generated without bees
f48f4174c SPIGOT-5553, PR-1336: Add EntityKnockbackEvent
2024-02-11 22:28:00 +01:00
|
|
|
@@ -387,6 +388,7 @@ public final class CraftServer implements Server {
|
2022-06-20 19:12:05 +02:00
|
|
|
if (this.configuration.getBoolean("settings.use-map-color-cache")) {
|
|
|
|
MapPalette.setMapColorCache(new CraftMapColorCache(this.logger));
|
|
|
|
}
|
2021-06-15 04:59:31 +02:00
|
|
|
+ datapackManager = new io.papermc.paper.datapack.PaperDatapackManager(console.getPackRepository()); // Paper
|
|
|
|
}
|
|
|
|
|
|
|
|
public boolean getCommandBlockOverride(String command) {
|
2024-04-24 15:46:45 +02:00
|
|
|
@@ -2976,5 +2978,11 @@ public final class CraftServer implements Server {
|
2021-06-15 04:59:31 +02:00
|
|
|
public com.destroystokyo.paper.entity.ai.MobGoals getMobGoals() {
|
|
|
|
return mobGoals;
|
|
|
|
}
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public io.papermc.paper.datapack.PaperDatapackManager getDatapackManager() {
|
|
|
|
+ return datapackManager;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
// Paper end
|
|
|
|
}
|