From ce0e1ed4f39a72497bd5be0a9d24f3fe1374a663 Mon Sep 17 00:00:00 2001
From: Daniel Saukel <Sataniel98@users.noreply.github.com>
Date: Mon, 4 Apr 2022 20:30:27 +0200
Subject: [PATCH] Fix messages

---
 .../java/de/erethon/dungeonsxxl/DungeonsXXL.java    |  4 +++-
 .../java/de/erethon/dungeonsxl/config/DMessage.java | 13 +++++++++++++
 .../de/erethon/dungeonsxl/player/DPlayerData.java   |  5 ++---
 pom.xml                                             |  4 ++--
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/addon/core/src/main/java/de/erethon/dungeonsxxl/DungeonsXXL.java b/addon/core/src/main/java/de/erethon/dungeonsxxl/DungeonsXXL.java
index a2da88d7..883f94ae 100644
--- a/addon/core/src/main/java/de/erethon/dungeonsxxl/DungeonsXXL.java
+++ b/addon/core/src/main/java/de/erethon/dungeonsxxl/DungeonsXXL.java
@@ -24,6 +24,7 @@ import de.erethon.dungeonsxxl.util.GlowUtil;
  */
 public class DungeonsXXL extends EPlugin implements DungeonModule {
 
+    private static DungeonsXXL instance;
     private DungeonsXL dxl;
     private GlowUtil glowUtil;
 
@@ -37,6 +38,7 @@ public class DungeonsXXL extends EPlugin implements DungeonModule {
 
     @Override
     public void onEnable() {
+        instance = this;
         dxl = DungeonsXL.getInstance();
         glowUtil = new GlowUtil(this);
     }
@@ -47,7 +49,7 @@ public class DungeonsXXL extends EPlugin implements DungeonModule {
      * @return the instance of this plugin
      */
     public static DungeonsXXL getInstance() {
-        return (DungeonsXXL) EPlugin.getInstance();
+        return instance;
     }
 
     /**
diff --git a/core/src/main/java/de/erethon/dungeonsxl/config/DMessage.java b/core/src/main/java/de/erethon/dungeonsxl/config/DMessage.java
index 0d600f3d..9e28bb71 100644
--- a/core/src/main/java/de/erethon/dungeonsxl/config/DMessage.java
+++ b/core/src/main/java/de/erethon/dungeonsxl/config/DMessage.java
@@ -16,7 +16,10 @@
  */
 package de.erethon.dungeonsxl.config;
 
+import de.erethon.bedrock.chat.MessageUtil;
 import de.erethon.bedrock.config.Message;
+import de.erethon.bedrock.config.MessageHandler;
+import de.erethon.dungeonsxl.DungeonsXL;
 
 /**
  * An enumeration of all messages. The values are fetched from the language file.
@@ -253,4 +256,14 @@ public enum DMessage implements Message {
         return path;
     }
 
+    @Override
+    public MessageHandler getMessageHandler() {
+        return DungeonsXL.getInstance().getMessageHandler();
+    }
+
+    @Override
+    public void debug() {
+        MessageUtil.log(DungeonsXL.getInstance(), getMessage());
+    }
+
 }
diff --git a/core/src/main/java/de/erethon/dungeonsxl/player/DPlayerData.java b/core/src/main/java/de/erethon/dungeonsxl/player/DPlayerData.java
index d79512cb..3d1b63e9 100644
--- a/core/src/main/java/de/erethon/dungeonsxl/player/DPlayerData.java
+++ b/core/src/main/java/de/erethon/dungeonsxl/player/DPlayerData.java
@@ -19,12 +19,11 @@ package de.erethon.dungeonsxl.player;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
 import de.erethon.bedrock.chat.MessageUtil;
-import de.erethon.bedrock.compatibility.Internals;
 import de.erethon.bedrock.compatibility.Version;
 import de.erethon.bedrock.config.ConfigUtil;
 import de.erethon.bedrock.config.EConfig;
-import de.erethon.bedrock.plugin.EPlugin;
 import de.erethon.bedrock.misc.EnumUtil;
+import de.erethon.dungeonsxl.DungeonsXL;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -484,7 +483,7 @@ public class DPlayerData extends EConfig {
         if (!file.exists()) {
             try {
                 file.createNewFile();
-                MessageUtil.log(EPlugin.getInstance(), "&6A new player data file has been created and saved as " + file.getName());
+                MessageUtil.log(DungeonsXL.getInstance(), "&6A new player data file has been created and saved as " + file.getName());
             } catch (IOException exception) {
             }
         }
diff --git a/pom.xml b/pom.xml
index 4f7404a4..6ca17f37 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>de.erethon.caliburn</groupId>
             <artifactId>caliburn-api</artifactId>
-            <version>1.1-SNAPSHOT</version>
+            <version>1.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>de.erethon.caliburn</groupId>
             <artifactId>calicomp</artifactId>
-            <version>1.1-SNAPSHOT</version>
+            <version>1.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>