From 83b92e9a13c069e4d5f88a6b5a474c4098130041 Mon Sep 17 00:00:00 2001
From: Daniel Saukel <sa.da@unitybox.de>
Date: Fri, 17 Jun 2016 15:14:57 +0200
Subject: [PATCH] Fix Caliburn integration initialization

---
 README.md                                          | 14 ++++++++------
 .../io/github/dre2n/dungeonsxl/DungeonsXL.java     | 12 ++++++++++--
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index ee7fbe49..a610de0e 100644
--- a/README.md
+++ b/README.md
@@ -46,9 +46,10 @@ If you want to learn how to use DungeonsXL step by step, please have a look at t
 
 ## Compatibility
 ### Server
-DungeonsXL works with 1.7.8 and higher. However, support for 1.9.x has a higher priority than support for 1.8.x and lower.
+DungeonsXL works with 1.7.8 and higher. However, support for 1.10.x / 1.9.x has a higher priority than support for 1.8.x and lower. Some cosmetic features require the Spigot API and will therefore not work with CraftBukkit.
+
 Older versions of DungeonsXL support versions since Minecraft 1.3.x, but of course, they are completely unsupported.
-* [1.7.8-1.9.4](../../tree/master)
+* [1.7.8-1.10](../../tree/master)
 * [1.7.5](../../tree/50f772d14281bfe278dba2559d1758cc459c1a30)
 * [1.7.2](../../tree/eccf82b7335dfb0723e3cd37a57df1a968ea7842)
 * [1.6.4](../../tree/780145cf783ea76fe1bfee04cf89216bd4f92e1d)
@@ -65,12 +66,13 @@ Building DungeonsXL from source requires [Apache Maven](https://maven.apache.org
 Maven automatically fetches all dependencies and builds DungeonsXL; just run _build.bat_ or enter the command _mvn clean install_.
 
 #### BRCommons
-Instead of referencing the internals of the implementation directly, DungeonsXL uses [BRCommons](https://github.com/DRE2N/BRCommons).
-The shaded version of DXL (standard version) contains this library, while the original version needs it as an external plugin.
-Have a look at the [installation instructions](../../wiki/getting-started#installation) for detailed information.
+[BRCommons](https://github.com/DRE2N/BRCommons) is a util library for common tasks. DungeonsXL contains BRCommons 1.0.
+
+#### Caliburn API
+[Caliburn](https://github.com/DRE2N/CaliburnAPI) is an API to read custom items and mobs from config files. DungeonsXL contains Caliburn Beta 0.1.5.
 
 ### Java
-7 and higher
+Make sure that your server uses Java 7 or higher.
 
 ### UUIDs
 Supported.
diff --git a/src/main/java/io/github/dre2n/dungeonsxl/DungeonsXL.java b/src/main/java/io/github/dre2n/dungeonsxl/DungeonsXL.java
index 17e5a622..bac7db28 100644
--- a/src/main/java/io/github/dre2n/dungeonsxl/DungeonsXL.java
+++ b/src/main/java/io/github/dre2n/dungeonsxl/DungeonsXL.java
@@ -17,6 +17,10 @@
 package io.github.dre2n.dungeonsxl;
 
 import io.github.dre2n.caliburn.CaliburnAPI;
+import io.github.dre2n.caliburn.item.ItemCategories;
+import io.github.dre2n.caliburn.item.Items;
+import io.github.dre2n.caliburn.mob.MobCategories;
+import io.github.dre2n.caliburn.mob.Mobs;
 import io.github.dre2n.commons.command.BRCommands;
 import io.github.dre2n.commons.compatibility.Internals;
 import io.github.dre2n.commons.config.MessageConfig;
@@ -58,6 +62,8 @@ import io.github.dre2n.itemsxl.ItemsXL;
 import java.io.File;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.event.HandlerList;
 import org.bukkit.scheduler.BukkitTask;
 
@@ -322,9 +328,11 @@ public class DungeonsXL extends BRPlugin {
      */
     public void loadCaliburnAPI() {
         if (manager.isPluginEnabled("ItemsXL")) {
-            this.caliburn = ItemsXL.getInstance().getAPI();
+            caliburn = ItemsXL.getInstance().getAPI();
         } else {
-            this.caliburn = new CaliburnAPI(this);
+            caliburn = new CaliburnAPI(this);
+            ConfigurationSection placeholder = new YamlConfiguration();
+            caliburn.setup(new Items(caliburn), new Mobs(caliburn), new ItemCategories(caliburn, placeholder), new MobCategories(caliburn, placeholder));
         }
     }