More spell library changes

Author: Malfrador

papyrus-server/minecraft-patches/sources/net/minecraft/server/dedicated/DedicatedServer.java.patch

@@ -0,0 +1,20 @@
+--- a/net/minecraft/server/dedicated/DedicatedServer.java
++++ b/net/minecraft/server/dedicated/DedicatedServer.java
+@@ -19,6 +_,7 @@
+ import java.util.Locale;
+ import java.util.Optional;
+ import javax.annotation.Nullable;
++import de.erethon.spellbook.api.SpellbookAPI;
+ import net.minecraft.DefaultUncaughtExceptionHandler;
+ import net.minecraft.DefaultUncaughtExceptionHandlerWithName;
+ import net.minecraft.SharedConstants;
+@@ -235,6 +_,9 @@
+         this.server.loadPlugins();
+         this.server.enablePlugins(org.bukkit.plugin.PluginLoadOrder.STARTUP);
+         // CraftBukkit end
++        // Papyrus start
++        server.setSpellbookAPI(new SpellbookAPI(server));
++        // Papyrus end
+ 
+         // Paper start - Add Velocity IP Forwarding Support
+         boolean usingProxy = org.spigotmc.SpigotConfig.bungee || io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled;

papyrus-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch

@@ -13,22 +13,25 @@
      // Paper end - Folia reagion threading API
 
 +    // Papyrus start
-+    private final SpellbookAPI spellbookAPI;
++    private SpellbookAPI spellbookAPI;
 +    // Papyrus end
 +
      static {
          ConfigurationSerialization.registerClass(CraftOfflinePlayer.class);
          ConfigurationSerialization.registerClass(CraftPlayerProfile.class);
-@@ -496,6 +_,12 @@
+@@ -496,6 +_,15 @@
          this.potionBrewer = new io.papermc.paper.potion.PaperPotionBrewer(console); // Paper - custom potion mixes
          datapackManager = new io.papermc.paper.datapack.PaperDatapackManager(console.getPackRepository()); // Paper
          this.spark = new io.papermc.paper.SparksFly(this); // Paper - spark
-+        spellbookAPI = new SpellbookAPI(this); // Papyrus - Spellbook API
 +    }
 +
 +    @Override
 +    public SpellbookAPI getSpellbookAPI() {
 +        return spellbookAPI;
++    }
++
++    public void setSpellbookAPI(SpellbookAPI api) {
++        this.spellbookAPI = api;
      }
 
      public boolean getCommandBlockOverride(String command) {