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

Update dependencies for 1.17

This commit is contained in:
Daniel Saukel 2021-07-04 16:16:08 +02:00
parent 724d0a5ed9
commit e88487d639
4 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addon/core/pom.xml
View File

@ -25,7 +25,7 @@
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot</artifactId>
<version>${spigotVersion.latest}</version>
<version>1.16.5-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>

2
api/pom.xml
View File

@ -64,7 +64,7 @@
<dependency>
<groupId>de.erethon.commons</groupId>
<artifactId>commons-dist</artifactId>
<version>6.2.2</version>
<version>6.2.4</version>
<scope>compile</scope>
<exclusions>
<exclusion>

21
core/src/main/java/de/erethon/dungeonsxl/DungeonsXL.java
View File

@ -118,7 +118,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";
public static final String LATEST_IXL = "1.0.1";
public static final String[] EXCLUDED_FILES = {"config.yml", "uid.dat", "DXLData.data", "data"};
/* Folders of internal features */
@ -236,8 +236,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.")) {
getLogger().log(Level.SEVERE, "DungeonsXL requires ItemsXL v" + LATEST_IXL +" or higher to run.");
if (ixlVersion.startsWith("0.") || ixlVersion.equals("1.0")) {
getLogger().log(Level.SEVERE, "DungeonsXL requires ItemsXL v" + LATEST_IXL + " or higher to run.");
manager.disablePlugin(this);
return;
}
@ -452,15 +452,14 @@ public class DungeonsXL extends DREPlugin implements DungeonsAPI {
File backup = new File(DungeonsXL.BACKUPS, resource.getName() + "-" + System.currentTimeMillis() + "_crashbackup");
FileUtil.copyDir(resource, backup);
// Remove all files from the backupped resource world but not the config & data that we cannot fetch from the instance.
remove:
for (File remove : FileUtil.getFilesForFolder(resource)) {
for (String nope : DungeonsXL.EXCLUDED_FILES) {
if (remove.getName().equals(nope)) {
continue remove;
remove: for (File remove : FileUtil.getFilesForFolder(resource)) {
for (String nope : DungeonsXL.EXCLUDED_FILES) {
if (remove.getName().equals(nope)) {
continue remove;
}
}
remove.delete();
}
}
remove.delete();
}
DResourceWorld.deleteUnusedFiles(file);
FileUtil.copyDir(file, resource, DungeonsXL.EXCLUDED_FILES);
}

4
pom.xml
View File

@ -21,13 +21,13 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<spigotVersion.latest>1.16.5-R0.1-SNAPSHOT</spigotVersion.latest>
<spigotVersion.latest>1.17-R0.1-SNAPSHOT</spigotVersion.latest>
</properties>
<dependencies>
<dependency>
<groupId>de.erethon</groupId>
<artifactId>caliburn</artifactId>
<version>1.0</version>
<version>1.0.1</version>
<scope>compile</scope>
</dependency>
<dependency>