Upstream
/
DungeonsXL
mirror of https://github.com/DRE2N/DungeonsXL.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix messages

This commit is contained in:
Daniel Saukel 2022-04-04 20:30:27 +02:00
parent 1240d4c2c5
commit ce0e1ed4f3
4 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addon/core/src/main/java/de/erethon/dungeonsxxl/DungeonsXXL.java
View File

@ -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;
}
/**

13
core/src/main/java/de/erethon/dungeonsxl/config/DMessage.java
View File

@ -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());
}
}

5
core/src/main/java/de/erethon/dungeonsxl/player/DPlayerData.java
View File

@ -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) {
}
}

4
pom.xml
View File

@ -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>