From 2140157237c54a0c5103b689008f3338cc0f1683 Mon Sep 17 00:00:00 2001
From: Daniel Saukel <sa.da@unitybox.de>
Date: Fri, 14 Jun 2019 21:57:48 +0200
Subject: [PATCH] Update to Caliburn 0.5.5

---
 README.md                                     |  2 +-
 .../erethon/dungeonsxl/global/JoinSign.java   |  2 +-
 .../dungeonsxl/world/DWorldListener.java      |  4 +++-
 .../dungeonsxl/world/block/RewardChest.java   |  2 +-
 dist/pom.xml                                  | 20 ++++---------------
 pom.xml                                       |  2 +-
 6 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/README.md b/README.md
index a9182990..b53b2aa1 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 ![DungeonsXL](http://feuerstern.bplaced.net/ressourcen/logos/DungeonsXL.png)
 
-[![Builds](http://feuerstern.bplaced.net/ressourcen/buttons/Builds.png)](http://erethon.de/repo/de/erethon/dungeonsxl)
+[![Builds](http://feuerstern.bplaced.net/ressourcen/buttons/Builds.png)](http://erethon.de/repo/de/erethon/dungeonsxl/dungeonsxl-dist)
 [![Wiki](http://feuerstern.bplaced.net/ressourcen/buttons/Wiki.png)](../../wiki/)
 [![Issues](http://feuerstern.bplaced.net/ressourcen/buttons/Issues.png)](../../issues/)
 [![JavaDocs](http://feuerstern.bplaced.net/ressourcen/buttons/JavaDocs.png)](http://erethon.de/javadocs/dungeonsxl/)
diff --git a/core/src/main/java/de/erethon/dungeonsxl/global/JoinSign.java b/core/src/main/java/de/erethon/dungeonsxl/global/JoinSign.java
index e46568ca..f3ae7ba5 100644
--- a/core/src/main/java/de/erethon/dungeonsxl/global/JoinSign.java
+++ b/core/src/main/java/de/erethon/dungeonsxl/global/JoinSign.java
@@ -222,7 +222,7 @@ public abstract class JoinSign extends GlobalProtection {
         int verticalSigns = (int) Math.ceil((float) (1 + maxElements) / 4);
         while (verticalSigns > 1) {
             Block block = world.getBlockAt(x, y - verticalSigns + 1, z);
-            block.setType(VanillaItem.WALL_SIGN.getMaterial(), false);
+            block.setType(startSign.getType(), false);
             DungeonsXL.BLOCK_ADAPTER.setFacing(block, facing);
             verticalSigns--;
         }
diff --git a/core/src/main/java/de/erethon/dungeonsxl/world/DWorldListener.java b/core/src/main/java/de/erethon/dungeonsxl/world/DWorldListener.java
index 57d59c5a..6f52a968 100644
--- a/core/src/main/java/de/erethon/dungeonsxl/world/DWorldListener.java
+++ b/core/src/main/java/de/erethon/dungeonsxl/world/DWorldListener.java
@@ -17,6 +17,7 @@
 package de.erethon.dungeonsxl.world;
 
 import de.erethon.caliburn.CaliburnAPI;
+import de.erethon.caliburn.category.Category;
 import de.erethon.caliburn.item.VanillaItem;
 import de.erethon.caliburn.mob.ExMob;
 import de.erethon.dungeonsxl.DungeonsXL;
@@ -163,10 +164,11 @@ public class DWorldListener implements Listener {
         }
     }
 
+    // TODO: Is this necessary?
     @EventHandler
     public void onItemSpawn(ItemSpawnEvent event) {
         if (DGameWorld.getByWorld(event.getLocation().getWorld()) != null) {
-            if (VanillaItem.SIGN.is(event.getEntity().getItemStack())) {
+            if (Category.SIGNS.containsItem(event.getEntity().getItemStack())) {
                 event.setCancelled(true);
             }
         }
diff --git a/core/src/main/java/de/erethon/dungeonsxl/world/block/RewardChest.java b/core/src/main/java/de/erethon/dungeonsxl/world/block/RewardChest.java
index 5f15d144..11ca09c7 100644
--- a/core/src/main/java/de/erethon/dungeonsxl/world/block/RewardChest.java
+++ b/core/src/main/java/de/erethon/dungeonsxl/world/block/RewardChest.java
@@ -206,7 +206,7 @@ public class RewardChest extends GameBlock {
                         }
                     }
                     if (name == null) {
-                        name = VanillaItem.get(itemStack.getType()).getNewName().replace("_", " ");
+                        name = VanillaItem.get(itemStack.getType()).getName().replace("_", " ");
                     }
                     msg += ChatColor.RED + " " + itemStack.getAmount() + " " + name + ChatColor.GOLD + ",";
                 }
diff --git a/dist/pom.xml b/dist/pom.xml
index 5d8c5b65..79bf1d5d 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -36,6 +36,10 @@
                                     <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>
                                 <relocation>
                                     <pattern>de.erethon.vignette</pattern>
                                     <shadedPattern>de.erethon.dungeonsxl.util.vignette</shadedPattern>
@@ -53,21 +57,5 @@
             <artifactId>dungeonsxl-core</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
-        <dependency>
-            <groupId>de.erethon</groupId>
-            <artifactId>caliburn</artifactId>
-            <version>0.5.4</version>
-        </dependency>
-        <dependency>
-            <groupId>de.erethon.vignette</groupId>
-            <artifactId>vignette-dist</artifactId>
-            <version>1.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>de.erethon.commons</groupId>
-            <artifactId>commons-dist</artifactId>
-            <version>6.0</version>
-        </dependency>
     </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
index 6eba4391..67931130 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
         <dependency>
             <groupId>de.erethon</groupId>
             <artifactId>caliburn</artifactId>
-            <version>0.5.4</version>
+            <version>0.5.5</version>
             <scope>compile</scope>
         </dependency>
         <dependency>