Update to Bedrock & IXL 1.1
This commit is contained in:
parent
2a9b3d9f94
commit
6eb32ae9fe
|
@ -2,12 +2,12 @@
|
|||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>de.erethon.dungeonsxl</groupId>
|
||||
<artifactId>dungeonsxl-adapter</artifactId>
|
||||
<version>0.18-PRE</version>
|
||||
<version>0.18-SNAPSHOT</version>
|
||||
<packaging>jar</packaging>
|
||||
<parent>
|
||||
<groupId>de.erethon.dungeonsxl</groupId>
|
||||
<artifactId>dungeonsxl-parent</artifactId>
|
||||
<version>0.18-PRE</version>
|
||||
<version>0.18-SNAPSHOT</version>
|
||||
</parent>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
|
|
|
@ -11,10 +11,10 @@ import de.erethon.dungeonsxl.api.Requirement;
|
|||
import de.erethon.dungeonsxl.api.Reward;
|
||||
import de.erethon.dungeonsxl.api.dungeon.GameRule;
|
||||
import de.erethon.dungeonsxl.api.sign.DungeonSign;
|
||||
import de.erethon.dungeonsxl.util.commons.compatibility.Internals;
|
||||
import de.erethon.dungeonsxl.util.commons.javaplugin.DREPlugin;
|
||||
import de.erethon.dungeonsxl.util.commons.javaplugin.DREPluginSettings;
|
||||
import de.erethon.dungeonsxl.util.commons.misc.Registry;
|
||||
import de.erethon.bedrock.compatibility.Internals;
|
||||
import de.erethon.bedrock.plugin.EPlugin;
|
||||
import de.erethon.bedrock.plugin.EPluginSettings;
|
||||
import de.erethon.bedrock.misc.Registry;
|
||||
import de.erethon.dungeonsxxl.requirement.*;
|
||||
import de.erethon.dungeonsxxl.sign.*;
|
||||
import de.erethon.dungeonsxxl.util.GlowUtil;
|
||||
|
@ -22,14 +22,14 @@ import de.erethon.dungeonsxxl.util.GlowUtil;
|
|||
/**
|
||||
* @author Daniel Saukel
|
||||
*/
|
||||
public class DungeonsXXL extends DREPlugin implements DungeonModule {
|
||||
public class DungeonsXXL extends EPlugin implements DungeonModule {
|
||||
|
||||
private DungeonsXL dxl;
|
||||
private GlowUtil glowUtil;
|
||||
|
||||
public DungeonsXXL() {
|
||||
settings = DREPluginSettings.builder()
|
||||
.internals(Internals.v1_15_R1)
|
||||
settings = EPluginSettings.builder()
|
||||
.internals(Internals.v1_16_R3)
|
||||
.metrics(false)
|
||||
.spigotMCResourceId(-1)
|
||||
.build();
|
||||
|
@ -47,7 +47,7 @@ public class DungeonsXXL extends DREPlugin implements DungeonModule {
|
|||
* @return the instance of this plugin
|
||||
*/
|
||||
public static DungeonsXXL getInstance() {
|
||||
return (DungeonsXXL) DREPlugin.getInstance();
|
||||
return (DungeonsXXL) EPlugin.getInstance();
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -9,8 +9,8 @@ import de.erethon.dungeonsxl.api.DungeonsAPI;
|
|||
import de.erethon.dungeonsxl.api.sign.Rocker;
|
||||
import de.erethon.dungeonsxl.api.world.InstanceWorld;
|
||||
import de.erethon.dungeonsxl.player.DPermission;
|
||||
import de.erethon.dungeonsxl.util.commons.misc.BlockUtil;
|
||||
import de.erethon.dungeonsxl.util.commons.misc.EnumUtil;
|
||||
import de.erethon.bedrock.misc.BlockUtil;
|
||||
import de.erethon.bedrock.misc.EnumUtil;
|
||||
import de.erethon.dungeonsxl.world.DGameWorld;
|
||||
import de.erethon.dungeonsxxl.DungeonsXXL;
|
||||
import de.erethon.dungeonsxxl.world.block.GlowingBlock;
|
||||
|
|
|
@ -10,8 +10,8 @@ import de.erethon.dungeonsxl.api.world.InstanceWorld;
|
|||
import de.erethon.dungeonsxl.player.DPermission;
|
||||
import de.erethon.dungeonsxl.sign.passive.InteractSign;
|
||||
import de.erethon.dungeonsxl.trigger.InteractTrigger;
|
||||
import de.erethon.dungeonsxl.util.commons.misc.BlockUtil;
|
||||
import de.erethon.dungeonsxl.util.commons.misc.NumberUtil;
|
||||
import de.erethon.bedrock.misc.BlockUtil;
|
||||
import de.erethon.bedrock.misc.NumberUtil;
|
||||
import de.erethon.dungeonsxl.world.DGameWorld;
|
||||
import org.bukkit.block.Sign;
|
||||
|
||||
|
|
|
@ -9,8 +9,8 @@ import de.erethon.dungeonsxl.api.DungeonsAPI;
|
|||
import de.erethon.dungeonsxl.api.sign.Button;
|
||||
import de.erethon.dungeonsxl.api.world.InstanceWorld;
|
||||
import de.erethon.dungeonsxl.player.DPermission;
|
||||
import de.erethon.dungeonsxl.util.commons.misc.EnumUtil;
|
||||
import de.erethon.dungeonsxl.util.commons.misc.NumberUtil;
|
||||
import de.erethon.bedrock.misc.EnumUtil;
|
||||
import de.erethon.bedrock.misc.NumberUtil;
|
||||
import org.bukkit.Particle;
|
||||
import org.bukkit.block.Sign;
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-shade-plugin</artifactId>
|
||||
<version>3.2.4</version>
|
||||
<version>3.3.0</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<phase>package</phase>
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
<parent>
|
||||
<groupId>de.erethon.dungeonsxl</groupId>
|
||||
<artifactId>dungeonsxl-parent</artifactId>
|
||||
<version>0.18-PRE</version>
|
||||
<version>0.18-SNAPSHOT</version>
|
||||
</parent>
|
||||
<modules>
|
||||
<module>core</module>
|
||||
|
@ -20,7 +20,7 @@
|
|||
<dependency>
|
||||
<groupId>de.erethon.dungeonsxl</groupId>
|
||||
<artifactId>dungeonsxl-dist</artifactId>
|
||||
<version>0.18-PRE</version>
|
||||
<version>0.18-SNAPSHOT</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
|
44
api/pom.xml
44
api/pom.xml
|
@ -2,19 +2,19 @@
|
|||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>de.erethon.dungeonsxl</groupId>
|
||||
<artifactId>dungeonsxl-api</artifactId>
|
||||
<version>0.18-PRE</version>
|
||||
<version>0.18-SNAPSHOT</version>
|
||||
<packaging>jar</packaging>
|
||||
<parent>
|
||||
<groupId>de.erethon.dungeonsxl</groupId>
|
||||
<artifactId>dungeonsxl-parent</artifactId>
|
||||
<version>0.18-PRE</version>
|
||||
<version>0.18-SNAPSHOT</version>
|
||||
</parent>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-javadoc-plugin</artifactId>
|
||||
<version>3.2.0</version>
|
||||
<version>3.3.2</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>attach-javadocs</id>
|
||||
|
@ -26,32 +26,6 @@
|
|||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-shade-plugin</artifactId>
|
||||
<version>3.2.4</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<phase>package</phase>
|
||||
<goals>
|
||||
<goal>shade</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<artifactSet>
|
||||
<includes>
|
||||
<include>de.erethon.commons:commons-dist</include>
|
||||
</includes>
|
||||
</artifactSet>
|
||||
<relocations>
|
||||
<relocation>
|
||||
<pattern>de.erethon.commons</pattern>
|
||||
<shadedPattern>de.erethon.dungeonsxl.util.commons</shadedPattern>
|
||||
</relocation>
|
||||
</relocations>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
<dependencies>
|
||||
|
@ -61,17 +35,5 @@
|
|||
<version>${spigotVersion.latest}</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>de.erethon.commons</groupId>
|
||||
<artifactId>commons-dist</artifactId>
|
||||
<version>6.3.1</version>
|
||||
<scope>compile</scope>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>org.bukkit</groupId>
|
||||
<artifactId>bukkit</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
*/
|
||||
package de.erethon.dungeonsxl.api;
|
||||
|
||||
import de.erethon.commons.misc.Registry;
|
||||
import de.erethon.bedrock.misc.Registry;
|
||||
import de.erethon.dungeonsxl.api.dungeon.GameRule;
|
||||
import de.erethon.dungeonsxl.api.sign.DungeonSign;
|
||||
|
||||
|
|
|
@ -16,7 +16,7 @@ package de.erethon.dungeonsxl.api;
|
|||
|
||||
import de.erethon.caliburn.CaliburnAPI;
|
||||
import de.erethon.caliburn.mob.ExMob;
|
||||
import de.erethon.commons.misc.Registry;
|
||||
import de.erethon.bedrock.misc.Registry;
|
||||
import de.erethon.dungeonsxl.api.dungeon.Dungeon;
|
||||
import de.erethon.dungeonsxl.api.dungeon.Game;
|
||||
import de.erethon.dungeonsxl.api.dungeon.GameRule;
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
*/
|
||||
package de.erethon.dungeonsxl.api.dungeon;
|
||||
|
||||
import de.erethon.commons.misc.EnumUtil;
|
||||
import de.erethon.bedrock.misc.EnumUtil;
|
||||
import org.bukkit.configuration.ConfigurationSection;
|
||||
|
||||
/**
|
||||
|
|
|
@ -16,9 +16,9 @@ package de.erethon.dungeonsxl.api.dungeon;
|
|||
|
||||
import de.erethon.caliburn.item.ExItem;
|
||||
import de.erethon.caliburn.mob.ExMob;
|
||||
import de.erethon.commons.chat.MessageUtil;
|
||||
import de.erethon.commons.misc.EnumUtil;
|
||||
import de.erethon.commons.misc.NumberUtil;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import de.erethon.bedrock.misc.EnumUtil;
|
||||
import de.erethon.bedrock.misc.NumberUtil;
|
||||
import de.erethon.dungeonsxl.api.DungeonsAPI;
|
||||
import de.erethon.dungeonsxl.api.Requirement;
|
||||
import de.erethon.dungeonsxl.api.Reward;
|
||||
|
|
|
@ -14,8 +14,8 @@
|
|||
*/
|
||||
package de.erethon.dungeonsxl.api.player;
|
||||
|
||||
import de.erethon.commons.chat.MessageUtil;
|
||||
import de.erethon.commons.player.PlayerWrapper;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import de.erethon.bedrock.player.PlayerWrapper;
|
||||
import de.erethon.dungeonsxl.api.dungeon.Dungeon;
|
||||
import java.util.List;
|
||||
import org.bukkit.Location;
|
||||
|
@ -26,7 +26,7 @@ import org.bukkit.inventory.ItemStack;
|
|||
* <p>
|
||||
* All players on the server, including the ones in dungeons, have one wrapper object that is an instance of GlobalPlayer.
|
||||
* <p>
|
||||
* Do not cache this for the whole runtime (or use {@link de.erethon.commons.player.PlayerCollection}). The object may be deleted and replaced with an object of
|
||||
* Do not cache this for the whole runtime (or use {@link de.erethon.bedrock.player.PlayerCollection}). The object may be deleted and replaced with an object of
|
||||
* the appropriate type when the player enters or leaves an instance.
|
||||
*
|
||||
* @author Daniel Saukel
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
*/
|
||||
package de.erethon.dungeonsxl.api.player;
|
||||
|
||||
import de.erethon.commons.misc.Registry;
|
||||
import de.erethon.bedrock.misc.Registry;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.UUID;
|
||||
|
|
|
@ -16,9 +16,9 @@ package de.erethon.dungeonsxl.api.player;
|
|||
|
||||
import de.erethon.caliburn.item.ExItem;
|
||||
import de.erethon.caliburn.item.VanillaItem;
|
||||
import de.erethon.commons.chat.MessageUtil;
|
||||
import de.erethon.commons.compatibility.Version;
|
||||
import de.erethon.commons.player.PlayerCollection;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import de.erethon.bedrock.compatibility.Version;
|
||||
import de.erethon.bedrock.player.PlayerCollection;
|
||||
import de.erethon.dungeonsxl.api.Reward;
|
||||
import de.erethon.dungeonsxl.api.dungeon.Dungeon;
|
||||
import de.erethon.dungeonsxl.api.dungeon.Game;
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
package de.erethon.dungeonsxl.api.sign;
|
||||
|
||||
import de.erethon.caliburn.item.VanillaItem;
|
||||
import de.erethon.commons.chat.MessageUtil;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import de.erethon.dungeonsxl.api.DungeonsAPI;
|
||||
import de.erethon.dungeonsxl.api.Trigger;
|
||||
import de.erethon.dungeonsxl.api.world.EditWorld;
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
*/
|
||||
package de.erethon.dungeonsxl.api.sign;
|
||||
|
||||
import de.erethon.commons.player.PlayerCollection;
|
||||
import de.erethon.bedrock.player.PlayerCollection;
|
||||
import de.erethon.dungeonsxl.api.DungeonsAPI;
|
||||
import de.erethon.dungeonsxl.api.world.InstanceWorld;
|
||||
import org.bukkit.block.Sign;
|
||||
|
|
|
@ -2,12 +2,12 @@
|
|||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>de.erethon.dungeonsxl</groupId>
|
||||
<artifactId>dungeonsxl-bukkit_blockdata</artifactId>
|
||||
<version>0.18-PRE</version>
|
||||
<version>0.18-SNAPSHOT</version>
|
||||
<packaging>jar</packaging>
|
||||
<parent>
|
||||
<groupId>de.erethon.dungeonsxl</groupId>
|
||||
<artifactId>dungeonsxl-parent</artifactId>
|
||||
<version>0.18-PRE</version>
|
||||
<version>0.18-SNAPSHOT</version>
|
||||
</parent>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
|
|
|
@ -2,12 +2,12 @@
|
|||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>de.erethon.dungeonsxl</groupId>
|
||||
<artifactId>dungeonsxl-bukkit_magicvalues</artifactId>
|
||||
<version>0.18-PRE</version>
|
||||
<version>0.18-SNAPSHOT</version>
|
||||
<packaging>jar</packaging>
|
||||
<parent>
|
||||
<groupId>de.erethon.dungeonsxl</groupId>
|
||||
<artifactId>dungeonsxl-parent</artifactId>
|
||||
<version>0.18-PRE</version>
|
||||
<version>0.18-SNAPSHOT</version>
|
||||
</parent>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
|
|
|
@ -2,12 +2,12 @@
|
|||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>de.erethon.dungeonsxl</groupId>
|
||||
<artifactId>dungeonsxl-core</artifactId>
|
||||
<version>0.18-PRE</version>
|
||||
<version>0.18-SNAPSHOT</version>
|
||||
<packaging>jar</packaging>
|
||||
<parent>
|
||||
<groupId>de.erethon.dungeonsxl</groupId>
|
||||
<artifactId>dungeonsxl-parent</artifactId>
|
||||
<version>0.18-PRE</version>
|
||||
<version>0.18-SNAPSHOT</version>
|
||||
</parent>
|
||||
<build>
|
||||
<resources>
|
||||
|
|
|
@ -27,7 +27,7 @@ import de.erethon.dungeonsxl.sign.button.*;
|
|||
import de.erethon.dungeonsxl.sign.passive.*;
|
||||
import de.erethon.dungeonsxl.sign.rocker.*;
|
||||
import de.erethon.dungeonsxl.sign.windup.*;
|
||||
import de.erethon.dungeonsxl.util.commons.misc.Registry;
|
||||
import de.erethon.bedrock.misc.Registry;
|
||||
|
||||
/**
|
||||
* @author Daniel Saukel
|
||||
|
|
|
@ -70,14 +70,14 @@ import de.erethon.dungeonsxl.trigger.TriggerListener;
|
|||
import de.erethon.dungeonsxl.trigger.TriggerTypeCache;
|
||||
import de.erethon.dungeonsxl.util.LWCUtil;
|
||||
import de.erethon.dungeonsxl.util.PlaceholderUtil;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.MessageUtil;
|
||||
import de.erethon.dungeonsxl.util.commons.compatibility.Internals;
|
||||
import de.erethon.dungeonsxl.util.commons.compatibility.Version;
|
||||
import de.erethon.dungeonsxl.util.commons.javaplugin.DREPlugin;
|
||||
import de.erethon.dungeonsxl.util.commons.javaplugin.DREPluginSettings;
|
||||
import de.erethon.dungeonsxl.util.commons.misc.FileUtil;
|
||||
import de.erethon.dungeonsxl.util.commons.misc.Registry;
|
||||
import de.erethon.dungeonsxl.util.commons.spiget.comparator.VersionComparator;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import de.erethon.bedrock.compatibility.Internals;
|
||||
import de.erethon.bedrock.compatibility.Version;
|
||||
import de.erethon.bedrock.plugin.EPlugin;
|
||||
import de.erethon.bedrock.plugin.EPluginSettings;
|
||||
import de.erethon.bedrock.misc.FileUtil;
|
||||
import de.erethon.bedrock.misc.Registry;
|
||||
import de.erethon.bedrock.spiget.comparator.VersionComparator;
|
||||
import de.erethon.dungeonsxl.world.DEditWorld;
|
||||
import de.erethon.dungeonsxl.world.DResourceWorld;
|
||||
import de.erethon.dungeonsxl.world.DWorldListener;
|
||||
|
@ -109,7 +109,7 @@ import org.bukkit.scheduler.BukkitRunnable;
|
|||
/**
|
||||
* @author Frank Baumann, Tobias Schmitz, Daniel Saukel
|
||||
*/
|
||||
public class DungeonsXL extends DREPlugin implements DungeonsAPI {
|
||||
public class DungeonsXL extends EPlugin implements DungeonsAPI {
|
||||
|
||||
/* Plugin & lib instances */
|
||||
private static DungeonsXL instance;
|
||||
|
@ -119,7 +119,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_IXL = "1.0.3";
|
||||
public static final String LATEST_IXL = "1.1";
|
||||
public static final String[] EXCLUDED_FILES = {"config.yml", "uid.dat", "DXLData.data", "data"};
|
||||
|
||||
/* Folders of internal features */
|
||||
|
@ -220,8 +220,8 @@ public class DungeonsXL extends DREPlugin implements DungeonsAPI {
|
|||
private Registry<String, CommandScript> commandScriptRegistry;
|
||||
|
||||
public DungeonsXL() {
|
||||
settings = DREPluginSettings.builder()
|
||||
.internals(Internals.andHigher(Internals.v1_8_R1))
|
||||
settings = EPluginSettings.builder()
|
||||
.internals(Internals.INDEPENDENT)
|
||||
.economy(true)
|
||||
.permissions(true)
|
||||
.metrics(true)
|
||||
|
@ -235,14 +235,11 @@ 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.") || ixlVersion.matches("1.0[\\.]?[1-2]?")) {
|
||||
if (ixlVersion.startsWith("0.") || ixlVersion.startsWith("1.0")) {
|
||||
getLogger().log(Level.SEVERE, "DungeonsXL requires ItemsXL v" + LATEST_IXL + " or higher to run.");
|
||||
manager.disablePlugin(this);
|
||||
return;
|
||||
}
|
||||
if (Internals.andHigher(Internals.v1_14_R1).contains(compat.getInternals())) {
|
||||
getLogger().warning("Support for Minecraft 1.14 and higher is experimental. Do not use this in a production environment.");
|
||||
}
|
||||
|
||||
instance = this;
|
||||
initFolders();
|
||||
|
|
|
@ -20,7 +20,7 @@ import de.erethon.dungeonsxl.DungeonsXL;
|
|||
import de.erethon.dungeonsxl.api.player.GlobalPlayer;
|
||||
import de.erethon.dungeonsxl.config.DMessage;
|
||||
import de.erethon.dungeonsxl.player.DPermission;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.MessageUtil;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
|
|
|
@ -21,7 +21,7 @@ import de.erethon.dungeonsxl.api.player.GlobalPlayer;
|
|||
import de.erethon.dungeonsxl.config.DMessage;
|
||||
import de.erethon.dungeonsxl.player.DEditPlayer;
|
||||
import de.erethon.dungeonsxl.player.DPermission;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.MessageUtil;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@ import de.erethon.dungeonsxl.DungeonsXL;
|
|||
import de.erethon.dungeonsxl.api.player.GlobalPlayer;
|
||||
import de.erethon.dungeonsxl.config.DMessage;
|
||||
import de.erethon.dungeonsxl.player.DPermission;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.MessageUtil;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
|
|
|
@ -21,7 +21,7 @@ import de.erethon.dungeonsxl.config.DMessage;
|
|||
import de.erethon.dungeonsxl.dungeon.DDungeon;
|
||||
import de.erethon.dungeonsxl.player.DEditPlayer;
|
||||
import de.erethon.dungeonsxl.player.DPermission;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.MessageUtil;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import de.erethon.dungeonsxl.world.DEditWorld;
|
||||
import de.erethon.dungeonsxl.world.DResourceWorld;
|
||||
import java.io.File;
|
||||
|
|
|
@ -19,12 +19,12 @@ package de.erethon.dungeonsxl.command;
|
|||
import de.erethon.dungeonsxl.DungeonsXL;
|
||||
import de.erethon.dungeonsxl.api.player.PlayerCache;
|
||||
import de.erethon.dungeonsxl.config.MainConfig;
|
||||
import de.erethon.dungeonsxl.util.commons.command.DRECommand;
|
||||
import de.erethon.bedrock.command.ECommand;
|
||||
|
||||
/**
|
||||
* @author Daniel Saukel
|
||||
*/
|
||||
public abstract class DCommand extends DRECommand {
|
||||
public abstract class DCommand extends ECommand {
|
||||
|
||||
protected DungeonsXL plugin;
|
||||
protected MainConfig config;
|
||||
|
|
|
@ -17,16 +17,16 @@
|
|||
package de.erethon.dungeonsxl.command;
|
||||
|
||||
import de.erethon.dungeonsxl.DungeonsXL;
|
||||
import de.erethon.dungeonsxl.util.commons.command.DRECommand;
|
||||
import de.erethon.dungeonsxl.util.commons.command.DRECommandCache;
|
||||
import de.erethon.dungeonsxl.util.commons.compatibility.Version;
|
||||
import de.erethon.bedrock.command.ECommand;
|
||||
import de.erethon.bedrock.command.ECommandCache;
|
||||
import de.erethon.bedrock.compatibility.Version;
|
||||
|
||||
/**
|
||||
* An enumeration of all command instances.
|
||||
*
|
||||
* @author Daniel Saukel
|
||||
*/
|
||||
public class DCommandCache extends DRECommandCache {
|
||||
public class DCommandCache extends ECommandCache {
|
||||
|
||||
public static final String LABEL = "dungeonsxl";
|
||||
|
||||
|
@ -52,7 +52,7 @@ public class DCommandCache extends DRECommandCache {
|
|||
public MsgCommand message;
|
||||
public PlayCommand play;
|
||||
public PortalCommand portal;
|
||||
public DRECommand reload;
|
||||
public ECommand reload;
|
||||
public RenameCommand rename;
|
||||
public ResourcePackCommand resourcePack;
|
||||
public SaveCommand save;
|
||||
|
|
|
@ -23,8 +23,8 @@ import de.erethon.dungeonsxl.config.DMessage;
|
|||
import de.erethon.dungeonsxl.dungeon.DDungeon;
|
||||
import de.erethon.dungeonsxl.dungeon.DungeonConfig;
|
||||
import de.erethon.dungeonsxl.player.DPermission;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.MessageUtil;
|
||||
import de.erethon.dungeonsxl.util.commons.misc.FileUtil;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import de.erethon.bedrock.misc.FileUtil;
|
||||
import java.io.File;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
@ -67,7 +67,7 @@ public class DeleteCommand extends DCommand {
|
|||
deny.setClickEvent(onClickDeny);
|
||||
|
||||
MessageUtil.sendMessage(sender, DMessage.CMD_DELETE_BACKUPS.getMessage());
|
||||
MessageUtil.sendMessage(sender, confirm, new TextComponent(" "), deny);
|
||||
((Player) sender).spigot().sendMessage(confirm, new TextComponent(" "), deny);
|
||||
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -19,7 +19,7 @@ package de.erethon.dungeonsxl.command;
|
|||
import de.erethon.dungeonsxl.DungeonsXL;
|
||||
import de.erethon.dungeonsxl.config.DMessage;
|
||||
import de.erethon.dungeonsxl.player.DPermission;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.MessageUtil;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
|
|
|
@ -26,8 +26,8 @@ import de.erethon.dungeonsxl.api.world.ResourceWorld;
|
|||
import de.erethon.dungeonsxl.config.DMessage;
|
||||
import de.erethon.dungeonsxl.player.DEditPlayer;
|
||||
import de.erethon.dungeonsxl.player.DPermission;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.MessageUtil;
|
||||
import de.erethon.dungeonsxl.util.commons.config.CommonMessage;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import de.erethon.bedrock.config.BedrockMessage;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
|
@ -57,7 +57,7 @@ public class EditCommand extends DCommand {
|
|||
}
|
||||
|
||||
if (!resource.isInvitedPlayer(player) && !DPermission.hasPermission(player, DPermission.EDIT)) {
|
||||
MessageUtil.sendMessage(player, CommonMessage.CMD_NO_PERMISSION.getMessage());
|
||||
MessageUtil.sendMessage(player, BedrockMessage.CMD_NO_PERMISSION.getMessage());
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
@ -24,7 +24,7 @@ import de.erethon.dungeonsxl.config.DMessage;
|
|||
import de.erethon.dungeonsxl.player.DGamePlayer;
|
||||
import de.erethon.dungeonsxl.player.DGroup;
|
||||
import de.erethon.dungeonsxl.player.DPermission;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.MessageUtil;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
|
|
|
@ -23,7 +23,7 @@ import de.erethon.dungeonsxl.api.player.PlayerGroup;
|
|||
import de.erethon.dungeonsxl.api.world.EditWorld;
|
||||
import de.erethon.dungeonsxl.config.DMessage;
|
||||
import de.erethon.dungeonsxl.player.DPermission;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.MessageUtil;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
|
|
|
@ -22,7 +22,7 @@ import de.erethon.dungeonsxl.api.world.GameWorld;
|
|||
import de.erethon.dungeonsxl.config.DMessage;
|
||||
import de.erethon.dungeonsxl.dungeon.DGame;
|
||||
import de.erethon.dungeonsxl.player.DPermission;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.MessageUtil;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
|
|
|
@ -23,7 +23,7 @@ import de.erethon.dungeonsxl.api.event.group.GroupPlayerKickEvent;
|
|||
import de.erethon.dungeonsxl.config.DMessage;
|
||||
import de.erethon.dungeonsxl.player.DGroup;
|
||||
import de.erethon.dungeonsxl.player.DPermission;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.MessageUtil;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
|
|
|
@ -19,9 +19,9 @@ package de.erethon.dungeonsxl.command;
|
|||
import de.erethon.dungeonsxl.DungeonsXL;
|
||||
import de.erethon.dungeonsxl.config.DMessage;
|
||||
import de.erethon.dungeonsxl.player.DPermission;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.MessageUtil;
|
||||
import de.erethon.dungeonsxl.util.commons.command.DRECommand;
|
||||
import de.erethon.dungeonsxl.util.commons.misc.NumberUtil;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import de.erethon.bedrock.command.ECommand;
|
||||
import de.erethon.bedrock.misc.NumberUtil;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Set;
|
||||
import org.bukkit.command.CommandSender;
|
||||
|
@ -44,8 +44,8 @@ public class HelpCommand extends DCommand {
|
|||
|
||||
@Override
|
||||
public void onExecute(String[] args, CommandSender sender) {
|
||||
Set<DRECommand> dCommandList = plugin.getCommandCache().getCommands();
|
||||
ArrayList<DRECommand> toSend = new ArrayList<>();
|
||||
Set<ECommand> dCommandList = plugin.getCommandCache().getCommands();
|
||||
ArrayList<ECommand> toSend = new ArrayList<>();
|
||||
|
||||
int page = 1;
|
||||
if (args.length == 2) {
|
||||
|
@ -54,7 +54,7 @@ public class HelpCommand extends DCommand {
|
|||
int send = 0;
|
||||
int max = 0;
|
||||
int min = 0;
|
||||
for (DRECommand dCommand : dCommandList) {
|
||||
for (ECommand dCommand : dCommandList) {
|
||||
send++;
|
||||
if (send >= page * 5 - 4 && send <= page * 5) {
|
||||
min = page * 5 - 4;
|
||||
|
@ -66,7 +66,7 @@ public class HelpCommand extends DCommand {
|
|||
MessageUtil.sendPluginTag(sender, plugin);
|
||||
MessageUtil.sendCenteredMessage(sender, "&4&l[ &6" + min + "-" + max + " &4/&6 " + send + " &4|&6 " + page + " &4&l]");
|
||||
|
||||
for (DRECommand dCommand : toSend) {
|
||||
for (ECommand dCommand : toSend) {
|
||||
MessageUtil.sendMessage(sender, "&b" + dCommand.getCommand() + "&7 - " + dCommand.getHelp());
|
||||
}
|
||||
}
|
||||
|
|
|
@ -20,8 +20,8 @@ import de.erethon.dungeonsxl.DungeonsXL;
|
|||
import de.erethon.dungeonsxl.config.DMessage;
|
||||
import de.erethon.dungeonsxl.dungeon.DDungeon;
|
||||
import de.erethon.dungeonsxl.player.DPermission;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.MessageUtil;
|
||||
import de.erethon.dungeonsxl.util.commons.misc.FileUtil;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import de.erethon.bedrock.misc.FileUtil;
|
||||
import de.erethon.dungeonsxl.world.DResourceWorld;
|
||||
import de.erethon.dungeonsxl.world.WorldConfig;
|
||||
import java.io.File;
|
||||
|
|
|
@ -20,7 +20,7 @@ import de.erethon.dungeonsxl.DungeonsXL;
|
|||
import de.erethon.dungeonsxl.api.world.ResourceWorld;
|
||||
import de.erethon.dungeonsxl.config.DMessage;
|
||||
import de.erethon.dungeonsxl.player.DPermission;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.MessageUtil;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.OfflinePlayer;
|
||||
import org.bukkit.command.CommandSender;
|
||||
|
|
|
@ -19,7 +19,7 @@ package de.erethon.dungeonsxl.command;
|
|||
import de.erethon.dungeonsxl.DungeonsXL;
|
||||
import de.erethon.dungeonsxl.config.DMessage;
|
||||
import de.erethon.dungeonsxl.player.DPermission;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.MessageUtil;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
|
|
|
@ -26,7 +26,7 @@ import de.erethon.dungeonsxl.api.player.GlobalPlayer;
|
|||
import de.erethon.dungeonsxl.api.player.PlayerGroup;
|
||||
import de.erethon.dungeonsxl.config.DMessage;
|
||||
import de.erethon.dungeonsxl.player.DPermission;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.MessageUtil;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
|
|
|
@ -25,8 +25,8 @@ import de.erethon.dungeonsxl.api.world.ResourceWorld;
|
|||
import de.erethon.dungeonsxl.config.DMessage;
|
||||
import de.erethon.dungeonsxl.dungeon.DungeonConfig;
|
||||
import de.erethon.dungeonsxl.player.DPermission;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.MessageUtil;
|
||||
import de.erethon.dungeonsxl.util.commons.misc.NumberUtil;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import de.erethon.bedrock.misc.NumberUtil;
|
||||
import de.erethon.dungeonsxl.world.DResourceWorld;
|
||||
import java.io.File;
|
||||
import java.util.ArrayList;
|
||||
|
|
|
@ -22,8 +22,8 @@ import de.erethon.dungeonsxl.api.player.GlobalPlayer;
|
|||
import de.erethon.dungeonsxl.api.player.PlayerGroup;
|
||||
import de.erethon.dungeonsxl.config.DMessage;
|
||||
import de.erethon.dungeonsxl.player.DPermission;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.MessageUtil;
|
||||
import de.erethon.dungeonsxl.util.commons.config.CommonMessage;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import de.erethon.bedrock.config.BedrockMessage;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
|
@ -57,7 +57,7 @@ public class LivesCommand extends DCommand {
|
|||
player = (Player) sender;
|
||||
|
||||
} else {
|
||||
MessageUtil.sendMessage(sender, CommonMessage.CMD_NO_CONSOLE_COMMAND.getMessage(getCommand()));
|
||||
MessageUtil.sendMessage(sender, BedrockMessage.CMD_NO_CONSOLE_COMMAND.getMessage(getCommand()));
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
@ -19,10 +19,10 @@ package de.erethon.dungeonsxl.command;
|
|||
import de.erethon.dungeonsxl.DungeonsXL;
|
||||
import de.erethon.dungeonsxl.config.DMessage;
|
||||
import de.erethon.dungeonsxl.player.DPermission;
|
||||
import static de.erethon.dungeonsxl.util.commons.chat.FatLetter.*;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.MessageUtil;
|
||||
import de.erethon.dungeonsxl.util.commons.compatibility.CompatibilityHandler;
|
||||
import de.erethon.dungeonsxl.util.commons.compatibility.Internals;
|
||||
import static de.erethon.bedrock.chat.FatLetter.*;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import de.erethon.bedrock.compatibility.CompatibilityHandler;
|
||||
import de.erethon.bedrock.compatibility.Internals;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.plugin.PluginManager;
|
||||
|
|
|
@ -22,7 +22,7 @@ import de.erethon.dungeonsxl.api.dungeon.GameRule;
|
|||
import de.erethon.dungeonsxl.api.world.EditWorld;
|
||||
import de.erethon.dungeonsxl.config.DMessage;
|
||||
import de.erethon.dungeonsxl.player.DPermission;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.MessageUtil;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import de.erethon.dungeonsxl.world.DResourceWorld;
|
||||
import de.erethon.dungeonsxl.world.WorldConfig;
|
||||
import java.util.HashMap;
|
||||
|
|
|
@ -28,7 +28,7 @@ import de.erethon.dungeonsxl.player.DGamePlayer;
|
|||
import de.erethon.dungeonsxl.player.DGroup;
|
||||
import de.erethon.dungeonsxl.player.DInstancePlayer;
|
||||
import de.erethon.dungeonsxl.player.DPermission;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.MessageUtil;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
|
|
|
@ -25,7 +25,7 @@ import de.erethon.dungeonsxl.global.DPortal;
|
|||
import de.erethon.dungeonsxl.player.DGamePlayer;
|
||||
import de.erethon.dungeonsxl.player.DGlobalPlayer;
|
||||
import de.erethon.dungeonsxl.player.DPermission;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.MessageUtil;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
|
|
|
@ -22,11 +22,12 @@ import de.erethon.dungeonsxl.api.player.GroupAdapter;
|
|||
import de.erethon.dungeonsxl.api.player.InstancePlayer;
|
||||
import de.erethon.dungeonsxl.config.DMessage;
|
||||
import de.erethon.dungeonsxl.player.DPermission;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.DefaultFontInfo;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.MessageUtil;
|
||||
import de.erethon.dungeonsxl.util.commons.compatibility.CompatibilityHandler;
|
||||
import de.erethon.dungeonsxl.util.commons.compatibility.Internals;
|
||||
import de.erethon.bedrock.chat.DefaultFontInfo;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import de.erethon.bedrock.compatibility.CompatibilityHandler;
|
||||
import de.erethon.bedrock.compatibility.Internals;
|
||||
import java.util.Collection;
|
||||
import net.md_5.bungee.api.chat.BaseComponent;
|
||||
import net.md_5.bungee.api.chat.ClickEvent;
|
||||
import net.md_5.bungee.api.chat.TextComponent;
|
||||
import org.bukkit.Bukkit;
|
||||
|
@ -73,7 +74,7 @@ public class ReloadCommand extends DCommand {
|
|||
String message = DefaultFontInfo.center(DMessage.BUTTON_OKAY.getMessage());
|
||||
TextComponent text = new TextComponent(message);
|
||||
text.setClickEvent(onClick);
|
||||
MessageUtil.sendMessage(sender, text);
|
||||
((Player) sender).spigot().sendMessage(text);
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -115,7 +116,11 @@ public class ReloadCommand extends DCommand {
|
|||
String message = DefaultFontInfo.center(DMessage.CMD_RELOAD_BUTTON_CALIBURN.getMessage());
|
||||
TextComponent text = new TextComponent(message);
|
||||
text.setClickEvent(onClick);
|
||||
MessageUtil.sendMessage(sender, text);
|
||||
if (sender instanceof Player) {
|
||||
((Player) sender).spigot().sendMessage(text);
|
||||
} else {
|
||||
sender.sendMessage(BaseComponent.toPlainText(text));
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -25,7 +25,7 @@ import de.erethon.dungeonsxl.dungeon.DungeonConfig;
|
|||
import de.erethon.dungeonsxl.global.GlobalProtection;
|
||||
import de.erethon.dungeonsxl.global.JoinSign;
|
||||
import de.erethon.dungeonsxl.player.DPermission;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.MessageUtil;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import de.erethon.dungeonsxl.world.DResourceWorld;
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
|
|
|
@ -19,7 +19,7 @@ package de.erethon.dungeonsxl.command;
|
|||
import de.erethon.dungeonsxl.DungeonsXL;
|
||||
import de.erethon.dungeonsxl.config.DMessage;
|
||||
import de.erethon.dungeonsxl.player.DPermission;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.MessageUtil;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
|
|
|
@ -21,7 +21,7 @@ import de.erethon.dungeonsxl.api.world.EditWorld;
|
|||
import de.erethon.dungeonsxl.config.DMessage;
|
||||
import de.erethon.dungeonsxl.config.MainConfig.BackupMode;
|
||||
import de.erethon.dungeonsxl.player.DPermission;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.MessageUtil;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
|
|
|
@ -19,8 +19,8 @@ package de.erethon.dungeonsxl.command;
|
|||
import de.erethon.dungeonsxl.DungeonsXL;
|
||||
import de.erethon.dungeonsxl.config.DMessage;
|
||||
import de.erethon.dungeonsxl.player.DPermission;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.MessageUtil;
|
||||
import de.erethon.dungeonsxl.util.commons.compatibility.CompatibilityHandler;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import de.erethon.bedrock.compatibility.CompatibilityHandler;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.command.CommandSender;
|
||||
|
|
|
@ -28,8 +28,8 @@ import de.erethon.dungeonsxl.player.DGamePlayer;
|
|||
import de.erethon.dungeonsxl.player.DGroup;
|
||||
import de.erethon.dungeonsxl.player.DInstancePlayer;
|
||||
import de.erethon.dungeonsxl.player.DPermission;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.MessageUtil;
|
||||
import de.erethon.dungeonsxl.util.commons.config.CommonMessage;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import de.erethon.bedrock.config.BedrockMessage;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
|
@ -64,7 +64,7 @@ public class TestCommand extends DCommand {
|
|||
}
|
||||
|
||||
if (!dungeon.getMap().isInvitedPlayer(player) && !DPermission.hasPermission(player, DPermission.TEST)) {
|
||||
MessageUtil.sendMessage(player, CommonMessage.CMD_NO_PERMISSION.getMessage());
|
||||
MessageUtil.sendMessage(player, BedrockMessage.CMD_NO_PERMISSION.getMessage());
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@ import de.erethon.dungeonsxl.DungeonsXL;
|
|||
import de.erethon.dungeonsxl.api.world.ResourceWorld;
|
||||
import de.erethon.dungeonsxl.config.DMessage;
|
||||
import de.erethon.dungeonsxl.player.DPermission;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.MessageUtil;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.OfflinePlayer;
|
||||
import org.bukkit.command.CommandSender;
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
*/
|
||||
package de.erethon.dungeonsxl.config;
|
||||
|
||||
import de.erethon.dungeonsxl.util.commons.config.Message;
|
||||
import de.erethon.bedrock.config.Message;
|
||||
|
||||
/**
|
||||
* An enumeration of all messages. The values are fetched from the language file.
|
||||
|
|
|
@ -20,8 +20,8 @@ import de.erethon.dungeonsxl.DungeonsXL;
|
|||
import de.erethon.dungeonsxl.api.dungeon.Dungeon;
|
||||
import de.erethon.dungeonsxl.api.player.PlayerGroup.Color;
|
||||
import static de.erethon.dungeonsxl.api.player.PlayerGroup.Color.*;
|
||||
import de.erethon.dungeonsxl.util.commons.config.DREConfig;
|
||||
import de.erethon.dungeonsxl.util.commons.misc.EnumUtil;
|
||||
import de.erethon.bedrock.config.EConfig;
|
||||
import de.erethon.bedrock.misc.EnumUtil;
|
||||
import de.erethon.dungeonsxl.world.WorldConfig;
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
|
@ -37,7 +37,7 @@ import org.bukkit.configuration.ConfigurationSection;
|
|||
*
|
||||
* @author Frank Baumann, Milan Albrecht, Daniel Saukel
|
||||
*/
|
||||
public class MainConfig extends DREConfig {
|
||||
public class MainConfig extends EConfig {
|
||||
|
||||
private DungeonsXL plugin;
|
||||
|
||||
|
|
|
@ -18,7 +18,7 @@ package de.erethon.dungeonsxl.dungeon;
|
|||
|
||||
import de.erethon.dungeonsxl.DungeonsXL;
|
||||
import de.erethon.dungeonsxl.api.world.ResourceWorld;
|
||||
import de.erethon.dungeonsxl.util.commons.config.DREConfig;
|
||||
import de.erethon.bedrock.config.EConfig;
|
||||
import de.erethon.dungeonsxl.world.WorldConfig;
|
||||
import java.io.File;
|
||||
import java.util.ArrayList;
|
||||
|
@ -29,7 +29,7 @@ import java.util.List;
|
|||
*
|
||||
* @author Daniel Saukel
|
||||
*/
|
||||
public class DungeonConfig extends DREConfig {
|
||||
public class DungeonConfig extends EConfig {
|
||||
|
||||
private DungeonsXL plugin;
|
||||
|
||||
|
|
|
@ -27,8 +27,8 @@ import de.erethon.dungeonsxl.config.DMessage;
|
|||
import de.erethon.dungeonsxl.dungeon.DGame;
|
||||
import de.erethon.dungeonsxl.player.DGamePlayer;
|
||||
import de.erethon.dungeonsxl.player.DGlobalPlayer;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.MessageUtil;
|
||||
import de.erethon.dungeonsxl.util.commons.misc.BlockUtil;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import de.erethon.bedrock.misc.BlockUtil;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
import net.md_5.bungee.api.chat.ClickEvent;
|
||||
|
@ -204,7 +204,7 @@ public class DPortal extends GlobalProtection {
|
|||
no.setClickEvent(onClickNo);
|
||||
|
||||
player.sendMessage(DMessage.PLAYER_PORTAL_ROTATE.getMessage());
|
||||
MessageUtil.sendMessage(player.getPlayer(), yes, new TextComponent(" "), no);
|
||||
player.getPlayer().spigot().sendMessage(yes, new TextComponent(" "), no);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -22,8 +22,8 @@ import de.erethon.dungeonsxl.api.player.PlayerGroup;
|
|||
import de.erethon.dungeonsxl.config.DMessage;
|
||||
import de.erethon.dungeonsxl.dungeon.DGame;
|
||||
import de.erethon.dungeonsxl.player.DGroup;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.MessageUtil;
|
||||
import de.erethon.dungeonsxl.util.commons.misc.NumberUtil;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import de.erethon.bedrock.misc.NumberUtil;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.block.Block;
|
||||
import org.bukkit.block.Sign;
|
||||
|
|
|
@ -19,7 +19,7 @@ package de.erethon.dungeonsxl.global;
|
|||
import de.erethon.dungeonsxl.DungeonsXL;
|
||||
import de.erethon.dungeonsxl.config.DMessage;
|
||||
import de.erethon.dungeonsxl.player.DGlobalPlayer;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.MessageUtil;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import java.util.Collection;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.World;
|
||||
|
|
|
@ -18,7 +18,7 @@ package de.erethon.dungeonsxl.global;
|
|||
|
||||
import de.erethon.dungeonsxl.DungeonsXL;
|
||||
import de.erethon.dungeonsxl.player.DGroup;
|
||||
import de.erethon.dungeonsxl.util.commons.misc.NumberUtil;
|
||||
import de.erethon.bedrock.misc.NumberUtil;
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.util.HashMap;
|
||||
|
|
|
@ -22,8 +22,8 @@ import de.erethon.dungeonsxl.api.event.group.GroupCreateEvent.Cause;
|
|||
import de.erethon.dungeonsxl.api.player.GroupAdapter;
|
||||
import de.erethon.dungeonsxl.config.DMessage;
|
||||
import de.erethon.dungeonsxl.player.DGroup;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.MessageUtil;
|
||||
import de.erethon.dungeonsxl.util.commons.misc.NumberUtil;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import de.erethon.bedrock.misc.NumberUtil;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.block.Block;
|
||||
import org.bukkit.block.Sign;
|
||||
|
|
|
@ -19,7 +19,7 @@ package de.erethon.dungeonsxl.global;
|
|||
import de.erethon.dungeonsxl.DungeonsXL;
|
||||
import de.erethon.dungeonsxl.api.dungeon.Dungeon;
|
||||
import de.erethon.dungeonsxl.util.LWCUtil;
|
||||
import de.erethon.dungeonsxl.util.commons.misc.BlockUtil;
|
||||
import de.erethon.bedrock.misc.BlockUtil;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
import org.bukkit.World;
|
||||
|
|
|
@ -21,8 +21,8 @@ import de.erethon.dungeonsxl.api.player.GamePlayer;
|
|||
import de.erethon.dungeonsxl.api.player.PlayerGroup;
|
||||
import de.erethon.dungeonsxl.config.DMessage;
|
||||
import de.erethon.dungeonsxl.util.LWCUtil;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.MessageUtil;
|
||||
import de.erethon.dungeonsxl.util.commons.misc.BlockUtil;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import de.erethon.bedrock.misc.BlockUtil;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
import org.bukkit.ChatColor;
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
package de.erethon.dungeonsxl.global;
|
||||
|
||||
import de.erethon.dungeonsxl.DungeonsXL;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.MessageUtil;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import java.lang.reflect.Constructor;
|
||||
import java.lang.reflect.InvocationTargetException;
|
||||
import org.bukkit.World;
|
||||
|
|
|
@ -20,7 +20,7 @@ import de.erethon.dungeonsxl.api.DungeonsAPI;
|
|||
import de.erethon.dungeonsxl.api.dungeon.GameRule;
|
||||
import de.erethon.dungeonsxl.api.mob.ExternalMobProvider;
|
||||
import de.erethon.dungeonsxl.api.world.GameWorld;
|
||||
import de.erethon.dungeonsxl.util.commons.misc.NumberUtil;
|
||||
import de.erethon.bedrock.misc.NumberUtil;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
import net.citizensnpcs.api.CitizensAPI;
|
||||
|
|
|
@ -27,7 +27,7 @@ import de.erethon.dungeonsxl.api.world.GameWorld;
|
|||
import de.erethon.dungeonsxl.dungeon.DGame;
|
||||
import de.erethon.dungeonsxl.trigger.MobTrigger;
|
||||
import de.erethon.dungeonsxl.trigger.WaveTrigger;
|
||||
import de.erethon.dungeonsxl.util.commons.compatibility.Version;
|
||||
import de.erethon.bedrock.compatibility.Version;
|
||||
import de.erethon.dungeonsxl.world.DGameWorld;
|
||||
import java.util.Set;
|
||||
import org.bukkit.Bukkit;
|
||||
|
|
|
@ -20,8 +20,8 @@ import de.erethon.dungeonsxl.DungeonsXL;
|
|||
import de.erethon.dungeonsxl.api.player.EditPlayer;
|
||||
import de.erethon.dungeonsxl.api.world.EditWorld;
|
||||
import de.erethon.dungeonsxl.config.DMessage;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.MessageUtil;
|
||||
import de.erethon.dungeonsxl.util.commons.misc.ProgressBar;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import de.erethon.bedrock.misc.ProgressBar;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.GameMode;
|
||||
import org.bukkit.Location;
|
||||
|
|
|
@ -39,7 +39,7 @@ import de.erethon.dungeonsxl.api.world.GameWorld;
|
|||
import de.erethon.dungeonsxl.config.DMessage;
|
||||
import de.erethon.dungeonsxl.dungeon.DGame;
|
||||
import de.erethon.dungeonsxl.trigger.DistanceTrigger;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.MessageUtil;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import de.erethon.dungeonsxl.world.DGameWorld;
|
||||
import de.erethon.dungeonsxl.world.DResourceWorld;
|
||||
import de.erethon.dungeonsxl.world.block.TeamFlag;
|
||||
|
|
|
@ -32,8 +32,8 @@ import de.erethon.dungeonsxl.config.DMessage;
|
|||
import de.erethon.dungeonsxl.dungeon.DGame;
|
||||
import de.erethon.dungeonsxl.global.DPortal;
|
||||
import de.erethon.dungeonsxl.util.LocationString;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.MessageUtil;
|
||||
import de.erethon.dungeonsxl.util.commons.compatibility.Internals;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import de.erethon.bedrock.compatibility.Version;
|
||||
import java.io.File;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
@ -56,7 +56,7 @@ public class DGlobalPlayer implements GlobalPlayer {
|
|||
|
||||
protected DungeonsXL plugin;
|
||||
|
||||
protected boolean is1_9 = Internals.isAtLeast(Internals.v1_9_R1);
|
||||
protected boolean is1_9 = Version.isAtLeast(Version.MC1_9);
|
||||
|
||||
protected Player player;
|
||||
|
||||
|
@ -286,7 +286,7 @@ public class DGlobalPlayer implements GlobalPlayer {
|
|||
}
|
||||
if (!fulfilled) {
|
||||
MessageUtil.sendMessage(player, DMessage.ERROR_REQUIREMENTS.getMessage());
|
||||
msgs.forEach(msg -> MessageUtil.sendMessage(player, msg));
|
||||
msgs.forEach(msg -> player.spigot().sendMessage(msg));
|
||||
}
|
||||
|
||||
return fulfilled || DPermission.hasPermission(player, DPermission.IGNORE_REQUIREMENTS);
|
||||
|
|
|
@ -43,8 +43,8 @@ import de.erethon.dungeonsxl.dungeon.DDungeon;
|
|||
import de.erethon.dungeonsxl.dungeon.DGame;
|
||||
import de.erethon.dungeonsxl.dungeon.DungeonConfig;
|
||||
import de.erethon.dungeonsxl.global.GroupSign;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.MessageUtil;
|
||||
import de.erethon.dungeonsxl.util.commons.player.PlayerCollection;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import de.erethon.bedrock.player.PlayerCollection;
|
||||
import de.erethon.dungeonsxl.world.DResourceWorld;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashSet;
|
||||
|
|
|
@ -18,12 +18,13 @@ package de.erethon.dungeonsxl.player;
|
|||
|
||||
import com.google.common.collect.HashMultimap;
|
||||
import com.google.common.collect.Multimap;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.MessageUtil;
|
||||
import de.erethon.dungeonsxl.util.commons.compatibility.Internals;
|
||||
import de.erethon.dungeonsxl.util.commons.config.ConfigUtil;
|
||||
import de.erethon.dungeonsxl.util.commons.config.DREConfig;
|
||||
import de.erethon.dungeonsxl.util.commons.javaplugin.DREPlugin;
|
||||
import de.erethon.dungeonsxl.util.commons.misc.EnumUtil;
|
||||
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 java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
|
@ -48,9 +49,9 @@ import org.bukkit.potion.PotionEffect;
|
|||
*
|
||||
* @author Daniel Saukel
|
||||
*/
|
||||
public class DPlayerData extends DREConfig {
|
||||
public class DPlayerData extends EConfig {
|
||||
|
||||
protected boolean is1_9 = Internals.isAtLeast(Internals.v1_9_R1);
|
||||
protected boolean is1_9 = Version.isAtLeast(Version.MC1_9);
|
||||
|
||||
public static final int CONFIG_VERSION = 4;
|
||||
|
||||
|
@ -483,7 +484,7 @@ public class DPlayerData extends DREConfig {
|
|||
if (!file.exists()) {
|
||||
try {
|
||||
file.createNewFile();
|
||||
MessageUtil.log(DREPlugin.getInstance(), "&6A new player data file has been created and saved as " + file.getName());
|
||||
MessageUtil.log(EPlugin.getInstance(), "&6A new player data file has been created and saved as " + file.getName());
|
||||
} catch (IOException exception) {
|
||||
}
|
||||
}
|
||||
|
|
|
@ -32,7 +32,7 @@ import de.erethon.dungeonsxl.api.world.InstanceWorld;
|
|||
import de.erethon.dungeonsxl.config.DMessage;
|
||||
import de.erethon.dungeonsxl.dungeon.DGame;
|
||||
import de.erethon.dungeonsxl.util.ParsingUtil;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.MessageUtil;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import de.erethon.dungeonsxl.world.DGameWorld;
|
||||
import de.erethon.dungeonsxl.world.block.LockedDoor;
|
||||
import java.util.ArrayList;
|
||||
|
|
|
@ -21,7 +21,7 @@ import de.erethon.dungeonsxl.api.event.group.GroupPlayerKickEvent;
|
|||
import de.erethon.dungeonsxl.api.player.GamePlayer;
|
||||
import de.erethon.dungeonsxl.api.player.PlayerGroup;
|
||||
import de.erethon.dungeonsxl.config.DMessage;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.MessageUtil;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.entity.Player;
|
||||
|
|
|
@ -24,7 +24,7 @@ import de.erethon.dungeonsxl.config.DMessage;
|
|||
import de.erethon.dungeonsxl.player.DGamePlayer;
|
||||
import de.erethon.dungeonsxl.player.DGlobalPlayer;
|
||||
import de.erethon.dungeonsxl.player.DPlayerData;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.MessageUtil;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import net.md_5.bungee.api.ChatColor;
|
||||
import net.md_5.bungee.api.chat.BaseComponent;
|
||||
import net.md_5.bungee.api.chat.ComponentBuilder;
|
||||
|
|
|
@ -20,7 +20,7 @@ import de.erethon.dungeonsxl.DungeonsXL;
|
|||
import de.erethon.dungeonsxl.api.DungeonsAPI;
|
||||
import de.erethon.dungeonsxl.api.Requirement;
|
||||
import de.erethon.dungeonsxl.config.DMessage;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.MessageUtil;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import net.md_5.bungee.api.ChatColor;
|
||||
import net.md_5.bungee.api.chat.BaseComponent;
|
||||
import net.md_5.bungee.api.chat.ComponentBuilder;
|
||||
|
|
|
@ -21,8 +21,8 @@ import de.erethon.dungeonsxl.api.Requirement;
|
|||
import de.erethon.dungeonsxl.config.DMessage;
|
||||
import de.erethon.dungeonsxl.player.DGlobalPlayer;
|
||||
import de.erethon.dungeonsxl.player.DPlayerData;
|
||||
import de.erethon.dungeonsxl.util.commons.misc.NumberUtil;
|
||||
import de.erethon.dungeonsxl.util.commons.misc.SimpleDateUtil;
|
||||
import de.erethon.bedrock.misc.NumberUtil;
|
||||
import de.erethon.bedrock.misc.SimpleDateUtil;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import net.md_5.bungee.api.ChatColor;
|
||||
|
|
|
@ -20,7 +20,7 @@ import de.erethon.dungeonsxl.api.DungeonsAPI;
|
|||
import de.erethon.dungeonsxl.api.Requirement;
|
||||
import de.erethon.dungeonsxl.config.DMessage;
|
||||
import de.erethon.dungeonsxl.player.DGlobalPlayer;
|
||||
import de.erethon.dungeonsxl.util.commons.misc.SimpleDateUtil;
|
||||
import de.erethon.bedrock.misc.SimpleDateUtil;
|
||||
import net.md_5.bungee.api.ChatColor;
|
||||
import net.md_5.bungee.api.chat.BaseComponent;
|
||||
import net.md_5.bungee.api.chat.ComponentBuilder;
|
||||
|
|
|
@ -20,7 +20,7 @@ import de.erethon.dungeonsxl.api.DungeonsAPI;
|
|||
import de.erethon.dungeonsxl.api.Requirement;
|
||||
import de.erethon.dungeonsxl.config.DMessage;
|
||||
import de.erethon.dungeonsxl.player.DGlobalPlayer;
|
||||
import de.erethon.dungeonsxl.util.commons.misc.SimpleDateUtil;
|
||||
import de.erethon.bedrock.misc.SimpleDateUtil;
|
||||
import net.md_5.bungee.api.ChatColor;
|
||||
import net.md_5.bungee.api.chat.BaseComponent;
|
||||
import net.md_5.bungee.api.chat.ComponentBuilder;
|
||||
|
|
|
@ -19,8 +19,8 @@ package de.erethon.dungeonsxl.requirement;
|
|||
import de.erethon.dungeonsxl.api.DungeonsAPI;
|
||||
import de.erethon.dungeonsxl.api.Requirement;
|
||||
import de.erethon.dungeonsxl.config.DMessage;
|
||||
import de.erethon.dungeonsxl.util.commons.misc.EnumUtil;
|
||||
import de.erethon.dungeonsxl.util.commons.misc.NumberUtil;
|
||||
import de.erethon.bedrock.misc.EnumUtil;
|
||||
import de.erethon.bedrock.misc.NumberUtil;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Calendar;
|
||||
import java.util.List;
|
||||
|
|
|
@ -18,7 +18,7 @@ package de.erethon.dungeonsxl.reward;
|
|||
|
||||
import de.erethon.dungeonsxl.api.Reward;
|
||||
import de.erethon.dungeonsxl.config.DMessage;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.MessageUtil;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
/**
|
||||
|
|
|
@ -18,7 +18,7 @@ package de.erethon.dungeonsxl.reward;
|
|||
|
||||
import de.erethon.dungeonsxl.api.Reward;
|
||||
import de.erethon.dungeonsxl.config.DMessage;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.MessageUtil;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import net.milkbowl.vault.economy.Economy;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
|
|
|
@ -25,7 +25,7 @@ import de.erethon.dungeonsxl.api.world.EditWorld;
|
|||
import de.erethon.dungeonsxl.config.DMessage;
|
||||
import de.erethon.dungeonsxl.player.DPlayerListener;
|
||||
import de.erethon.dungeonsxl.trigger.InteractTrigger;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.MessageUtil;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import de.erethon.dungeonsxl.world.DGameWorld;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.block.Block;
|
||||
|
|
|
@ -18,7 +18,7 @@ package de.erethon.dungeonsxl.sign;
|
|||
|
||||
import de.erethon.dungeonsxl.DungeonsXL;
|
||||
import de.erethon.dungeonsxl.api.sign.DungeonSign;
|
||||
import de.erethon.dungeonsxl.util.commons.misc.BlockUtil;
|
||||
import de.erethon.bedrock.misc.BlockUtil;
|
||||
import org.bukkit.Location;
|
||||
|
||||
/**
|
||||
|
|
|
@ -19,7 +19,7 @@ package de.erethon.dungeonsxl.sign.button;
|
|||
import de.erethon.dungeonsxl.api.DungeonsAPI;
|
||||
import de.erethon.dungeonsxl.api.world.InstanceWorld;
|
||||
import de.erethon.dungeonsxl.player.DPermission;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.MessageUtil;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import org.bukkit.block.Sign;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@ import de.erethon.dungeonsxl.api.world.InstanceWorld;
|
|||
import de.erethon.dungeonsxl.config.DMessage;
|
||||
import de.erethon.dungeonsxl.player.DPermission;
|
||||
import de.erethon.dungeonsxl.trigger.InteractTrigger;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.MessageUtil;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import de.erethon.dungeonsxl.world.DGameWorld;
|
||||
import org.black_ixx.bossshop.BossShop;
|
||||
import org.black_ixx.bossshop.core.BSShop;
|
||||
|
|
|
@ -19,7 +19,7 @@ package de.erethon.dungeonsxl.sign.button;
|
|||
import de.erethon.dungeonsxl.api.DungeonsAPI;
|
||||
import de.erethon.dungeonsxl.api.world.InstanceWorld;
|
||||
import de.erethon.dungeonsxl.player.DPermission;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.MessageUtil;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import org.bukkit.block.Sign;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
|
|
|
@ -23,7 +23,7 @@ import de.erethon.dungeonsxl.api.sign.Button;
|
|||
import de.erethon.dungeonsxl.api.world.InstanceWorld;
|
||||
import de.erethon.dungeonsxl.config.DMessage;
|
||||
import de.erethon.dungeonsxl.player.DPermission;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.MessageUtil;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import org.bukkit.block.Sign;
|
||||
|
|
|
@ -27,7 +27,7 @@ import de.erethon.dungeonsxl.config.DMessage;
|
|||
import de.erethon.dungeonsxl.player.DGamePlayer;
|
||||
import de.erethon.dungeonsxl.player.DPermission;
|
||||
import de.erethon.dungeonsxl.trigger.InteractTrigger;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.MessageUtil;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import de.erethon.dungeonsxl.world.DGameWorld;
|
||||
import de.erethon.dungeonsxl.world.DResourceWorld;
|
||||
import org.bukkit.ChatColor;
|
||||
|
|
|
@ -23,9 +23,9 @@ import de.erethon.dungeonsxl.api.sign.Button;
|
|||
import de.erethon.dungeonsxl.api.world.InstanceWorld;
|
||||
import de.erethon.dungeonsxl.config.DMessage;
|
||||
import de.erethon.dungeonsxl.player.DPermission;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.MessageUtil;
|
||||
import de.erethon.dungeonsxl.util.commons.misc.EnumUtil;
|
||||
import de.erethon.dungeonsxl.util.commons.misc.NumberUtil;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import de.erethon.bedrock.misc.EnumUtil;
|
||||
import de.erethon.bedrock.misc.NumberUtil;
|
||||
import org.bukkit.block.Sign;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@ import de.erethon.dungeonsxl.api.DungeonsAPI;
|
|||
import de.erethon.dungeonsxl.api.dungeon.GameRule;
|
||||
import de.erethon.dungeonsxl.api.sign.Button;
|
||||
import de.erethon.dungeonsxl.api.world.InstanceWorld;
|
||||
import de.erethon.dungeonsxl.util.commons.misc.NumberUtil;
|
||||
import de.erethon.bedrock.misc.NumberUtil;
|
||||
import org.bukkit.block.Sign;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
|
|
|
@ -26,8 +26,8 @@ import de.erethon.dungeonsxl.config.DMessage;
|
|||
import de.erethon.dungeonsxl.player.DGamePlayer;
|
||||
import de.erethon.dungeonsxl.player.DPermission;
|
||||
import de.erethon.dungeonsxl.trigger.InteractTrigger;
|
||||
import de.erethon.dungeonsxl.util.commons.misc.NumberUtil;
|
||||
import de.erethon.dungeonsxl.util.commons.misc.ProgressBar;
|
||||
import de.erethon.bedrock.misc.NumberUtil;
|
||||
import de.erethon.bedrock.misc.ProgressBar;
|
||||
import de.erethon.dungeonsxl.world.DGameWorld;
|
||||
import java.util.UUID;
|
||||
import org.bukkit.Bukkit;
|
||||
|
|
|
@ -20,9 +20,9 @@ import de.erethon.dungeonsxl.api.DungeonsAPI;
|
|||
import de.erethon.dungeonsxl.api.sign.Button;
|
||||
import de.erethon.dungeonsxl.api.world.InstanceWorld;
|
||||
import de.erethon.dungeonsxl.player.DPermission;
|
||||
import de.erethon.dungeonsxl.util.commons.compatibility.Internals;
|
||||
import de.erethon.dungeonsxl.util.commons.misc.EnumUtil;
|
||||
import de.erethon.dungeonsxl.util.commons.misc.NumberUtil;
|
||||
import de.erethon.bedrock.compatibility.Version;
|
||||
import de.erethon.bedrock.misc.EnumUtil;
|
||||
import de.erethon.bedrock.misc.NumberUtil;
|
||||
import org.bukkit.SoundCategory;
|
||||
import org.bukkit.block.Sign;
|
||||
import org.bukkit.entity.Player;
|
||||
|
@ -84,7 +84,7 @@ public class SoundMessageSign extends Button {
|
|||
}
|
||||
|
||||
String[] args = getLine(2).split(",");
|
||||
if (args.length >= 1 && args.length != 2 && Internals.isAtLeast(Internals.v1_11_R1)) {
|
||||
if (args.length >= 1 && args.length != 2 && Version.isAtLeast(Version.MC1_11)) {
|
||||
category = EnumUtil.getEnumIgnoreCase(SoundCategory.class, args[0]);
|
||||
if (category == null) {
|
||||
category = SoundCategory.MASTER;
|
||||
|
@ -114,7 +114,7 @@ public class SoundMessageSign extends Button {
|
|||
}
|
||||
|
||||
private void playSound(Player player) {
|
||||
if (Internals.isAtLeast(Internals.v1_11_R1)) {
|
||||
if (Version.isAtLeast(Version.MC1_11)) {
|
||||
player.playSound(getSign().getLocation(), sound, category, volume, pitch);
|
||||
} else {
|
||||
player.playSound(getSign().getLocation(), sound, volume, pitch);
|
||||
|
|
|
@ -21,8 +21,8 @@ import de.erethon.dungeonsxl.api.sign.Button;
|
|||
import de.erethon.dungeonsxl.api.world.InstanceWorld;
|
||||
import de.erethon.dungeonsxl.player.DPermission;
|
||||
import de.erethon.dungeonsxl.sign.LocationSign;
|
||||
import de.erethon.dungeonsxl.util.commons.misc.BlockUtil;
|
||||
import de.erethon.dungeonsxl.util.commons.misc.NumberUtil;
|
||||
import de.erethon.bedrock.misc.BlockUtil;
|
||||
import de.erethon.bedrock.misc.NumberUtil;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.block.Sign;
|
||||
import org.bukkit.entity.Player;
|
||||
|
|
|
@ -20,8 +20,8 @@ import de.erethon.dungeonsxl.api.DungeonsAPI;
|
|||
import de.erethon.dungeonsxl.api.dungeon.GameRule;
|
||||
import de.erethon.dungeonsxl.api.world.InstanceWorld;
|
||||
import de.erethon.dungeonsxl.player.DPermission;
|
||||
import de.erethon.dungeonsxl.util.commons.chat.MessageUtil;
|
||||
import de.erethon.dungeonsxl.util.commons.misc.NumberUtil;
|
||||
import de.erethon.bedrock.chat.MessageUtil;
|
||||
import de.erethon.bedrock.misc.NumberUtil;
|
||||
import java.util.Map;
|
||||
import org.bukkit.block.Sign;
|
||||
import org.bukkit.entity.Player;
|
||||
|
|
|
@ -23,7 +23,7 @@ import de.erethon.dungeonsxl.config.DMessage;
|
|||
import de.erethon.dungeonsxl.dungeon.DGame;
|
||||
import de.erethon.dungeonsxl.player.DPermission;
|
||||
import de.erethon.dungeonsxl.trigger.InteractTrigger;
|
||||
import de.erethon.dungeonsxl.util.commons.misc.NumberUtil;
|
||||
import de.erethon.bedrock.misc.NumberUtil;
|
||||
import de.erethon.dungeonsxl.world.DGameWorld;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.block.Sign;
|
||||
|
|
|
@ -22,8 +22,8 @@ import de.erethon.dungeonsxl.api.sign.Passive;
|
|||
import de.erethon.dungeonsxl.api.world.InstanceWorld;
|
||||
import de.erethon.dungeonsxl.player.DGroup;
|
||||
import de.erethon.dungeonsxl.player.DPermission;
|
||||
import de.erethon.dungeonsxl.util.commons.misc.BlockUtil;
|
||||
import de.erethon.dungeonsxl.util.commons.misc.NumberUtil;
|
||||
import de.erethon.bedrock.misc.BlockUtil;
|
||||
import de.erethon.bedrock.misc.NumberUtil;
|
||||
import de.erethon.dungeonsxl.world.DGameWorld;
|
||||
import de.erethon.dungeonsxl.world.block.TeamBed;
|
||||
import org.bukkit.block.Block;
|
||||
|
|
|
@ -21,7 +21,7 @@ import de.erethon.dungeonsxl.api.sign.Passive;
|
|||
import de.erethon.dungeonsxl.api.world.InstanceWorld;
|
||||
import de.erethon.dungeonsxl.player.DGroup;
|
||||
import de.erethon.dungeonsxl.player.DPermission;
|
||||
import de.erethon.dungeonsxl.util.commons.misc.NumberUtil;
|
||||
import de.erethon.bedrock.misc.NumberUtil;
|
||||
import de.erethon.dungeonsxl.world.DGameWorld;
|
||||
import de.erethon.dungeonsxl.world.block.TeamFlag;
|
||||
import org.bukkit.block.Sign;
|
||||
|
|
|
@ -24,7 +24,7 @@ import de.erethon.dungeonsxl.api.dungeon.GameRule;
|
|||
import de.erethon.dungeonsxl.api.sign.Passive;
|
||||
import de.erethon.dungeonsxl.api.world.InstanceWorld;
|
||||
import de.erethon.dungeonsxl.player.DPermission;
|
||||
import de.erethon.dungeonsxl.util.commons.misc.NumberUtil;
|
||||
import de.erethon.bedrock.misc.NumberUtil;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.Location;
|
||||
|
|
|
@ -22,7 +22,7 @@ import de.erethon.dungeonsxl.api.sign.Passive;
|
|||
import de.erethon.dungeonsxl.api.world.InstanceWorld;
|
||||
import de.erethon.dungeonsxl.player.DPermission;
|
||||
import de.erethon.dungeonsxl.trigger.InteractTrigger;
|
||||
import de.erethon.dungeonsxl.util.commons.misc.NumberUtil;
|
||||
import de.erethon.bedrock.misc.NumberUtil;
|
||||
import de.erethon.dungeonsxl.world.DGameWorld;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
|
|
@ -20,7 +20,7 @@ import de.erethon.dungeonsxl.api.DungeonsAPI;
|
|||
import de.erethon.dungeonsxl.api.sign.Passive;
|
||||
import de.erethon.dungeonsxl.api.world.InstanceWorld;
|
||||
import de.erethon.dungeonsxl.player.DPermission;
|
||||
import de.erethon.dungeonsxl.util.commons.misc.BlockUtil;
|
||||
import de.erethon.bedrock.misc.BlockUtil;
|
||||
import de.erethon.dungeonsxl.world.DGameWorld;
|
||||
import de.erethon.dungeonsxl.world.block.ProtectedBlock;
|
||||
import org.bukkit.block.Sign;
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue