From d130190d411f1f63860604b86990bec1fc305b4e Mon Sep 17 00:00:00 2001
From: Tim Daniel Saukel <sa.da@unitybox.de>
Date: Mon, 19 Apr 2021 23:33:43 +0200
Subject: [PATCH] Link IXL 1.0; resolves #986

---
 api/pom.xml                                              | 5 -----
 core/src/main/java/de/erethon/dungeonsxl/DungeonsXL.java | 9 +++------
 core/src/main/resources/plugin.yml                       | 1 +
 pom.xml                                                  | 2 +-
 4 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/api/pom.xml b/api/pom.xml
index 25abb212..8704ec40 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -39,7 +39,6 @@
                         <configuration>
                             <artifactSet>
                                 <includes>
-                                    <include>de.erethon:caliburn</include>
                                     <include>de.erethon.commons:commons-dist</include>
                                 </includes>
                             </artifactSet>                            
@@ -48,10 +47,6 @@
                                     <pattern>de.erethon.commons</pattern>	
                                     <shadedPattern>de.erethon.dungeonsxl.util.commons</shadedPattern>	
                                 </relocation>
-                                <relocation>
-                                    <pattern>de.erethon.caliburn.util.compatibility</pattern>	
-                                    <shadedPattern>de.erethon.dungeonsxl.util.commons.compatibility</shadedPattern>	
-                                </relocation>
                             </relocations>
                         </configuration>
                     </execution>
diff --git a/core/src/main/java/de/erethon/dungeonsxl/DungeonsXL.java b/core/src/main/java/de/erethon/dungeonsxl/DungeonsXL.java
index 8e70ec91..839f9bf7 100644
--- a/core/src/main/java/de/erethon/dungeonsxl/DungeonsXL.java
+++ b/core/src/main/java/de/erethon/dungeonsxl/DungeonsXL.java
@@ -117,8 +117,7 @@ public class DungeonsXL extends DREPlugin implements DungeonsAPI {
     public static final BlockAdapter BLOCK_ADAPTER = Version.isAtLeast(Version.MC1_13) ? new BlockAdapterBlockData() : new BlockAdapterMagicValues();
 
     /* Constants */
-    public static final String LATEST_CALIBURN = "1.0-RC-07";
-    public static final String LATEST_IXL = "0.6.7";
+    public static final String LATEST_IXL = "1.0";
     public static final String[] EXCLUDED_FILES = {"config.yml", "uid.dat", "DXLData.data", "data"};
 
     /* Folders of internal features */
@@ -236,10 +235,8 @@ public class DungeonsXL extends DREPlugin implements DungeonsAPI {
     public void onEnable() {
         super.onEnable();
         String ixlVersion = manager.isPluginEnabled("ItemsXL") ? manager.getPlugin("ItemsXL").getDescription().getVersion() : "";
-        if (ixlVersion.startsWith("0.[0-5]") || ixlVersion.equals("0.6") || ixlVersion.matches("0.6.[1-6]")) {
-            getLogger().log(Level.SEVERE, "DungeonsXL includes v" + LATEST_CALIBURN + " of the Caliburn custom item library. ItemsXL must implement the same or a newer, "
-                    + "but still compatible version of this library. This build of DungeonsXL is compatible with ItemsXL v" + LATEST_IXL
-                    + " and, possibly, higher. The latest DXL and IXL versions available on SpigotMC.org should always be compatible with each other.");
+        if (ixlVersion.startsWith("0.")) {
+            getLogger().log(Level.SEVERE, "DungeonsXL requires ItemsXL v" + LATEST_IXL +" or higher to run.");
             manager.disablePlugin(this);
             return;
         }
diff --git a/core/src/main/resources/plugin.yml b/core/src/main/resources/plugin.yml
index 25ef7142..7dc253f5 100644
--- a/core/src/main/resources/plugin.yml
+++ b/core/src/main/resources/plugin.yml
@@ -4,6 +4,7 @@ version: ${project.parent.version}${buildNo}
 authors: [Frank Baumann, Milan Albrecht, Tobias Schmitz, Daniel Saukel]
 description: ${project.parent.description}
 website: ${project.parent.url}
+depend: [ItemsXL]
 softdepend: [CommandsXL, ItemsXL, Vault, Citizens, CustomMobs, InsaneMobs, MythicMobs, HolographicDisplays, LWC, PlaceholderAPI, Parties]
 commands:
   dungeonsxl:
diff --git a/pom.xml b/pom.xml
index 17bfee94..053ffe79 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>de.erethon</groupId>
             <artifactId>caliburn</artifactId>
-            <version>1.0-RC-07</version>
+            <version>1.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>