Upstream/DungeonsXL
1
0
Fork 0
mirror of https://github.com/DRE2N/DungeonsXL.git synced 2025-02-26 09:11:55 +01:00
Code Issues Projects Releases Wiki Activity

Link IXL 1.0; resolves #986

Browse Source
This commit is contained in:
Tim Daniel Saukel 2021-04-19 23:33:43 +02:00
parent 05af27a52d
commit d130190d41
4 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/pom.xml
View File

@ -39,7 +39,6 @@
<configuration> <configuration>
<artifactSet> <artifactSet>
<includes> <includes>
<include>de.erethon:caliburn</include>
<include>de.erethon.commons:commons-dist</include> <include>de.erethon.commons:commons-dist</include>
</includes> </includes>
</artifactSet> </artifactSet>
@ -48,10 +47,6 @@
<pattern>de.erethon.commons</pattern> <pattern>de.erethon.commons</pattern>
<shadedPattern>de.erethon.dungeonsxl.util.commons</shadedPattern> <shadedPattern>de.erethon.dungeonsxl.util.commons</shadedPattern>
</relocation> </relocation>
<relocation>
<pattern>de.erethon.caliburn.util.compatibility</pattern>
<shadedPattern>de.erethon.dungeonsxl.util.commons.compatibility</shadedPattern>
</relocation>
</relocations> </relocations>
</configuration> </configuration>
</execution> </execution>

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

@ -117,8 +117,7 @@ public class DungeonsXL extends DREPlugin implements DungeonsAPI {
public static final BlockAdapter BLOCK_ADAPTER = Version.isAtLeast(Version.MC1_13) ? new BlockAdapterBlockData() : new BlockAdapterMagicValues(); public static final BlockAdapter BLOCK_ADAPTER = Version.isAtLeast(Version.MC1_13) ? new BlockAdapterBlockData() : new BlockAdapterMagicValues();
/* Constants */ /* Constants */
public static final String LATEST_CALIBURN = "1.0-RC-07"; public static final String LATEST_IXL = "1.0";
public static final String LATEST_IXL = "0.6.7";
public static final String[] EXCLUDED_FILES = {"config.yml", "uid.dat", "DXLData.data", "data"}; public static final String[] EXCLUDED_FILES = {"config.yml", "uid.dat", "DXLData.data", "data"};
/* Folders of internal features */ /* Folders of internal features */
@ -236,10 +235,8 @@ public class DungeonsXL extends DREPlugin implements DungeonsAPI {
public void onEnable() { public void onEnable() {
super.onEnable(); super.onEnable();
String ixlVersion = manager.isPluginEnabled("ItemsXL") ? manager.getPlugin("ItemsXL").getDescription().getVersion() : ""; String ixlVersion = manager.isPluginEnabled("ItemsXL") ? manager.getPlugin("ItemsXL").getDescription().getVersion() : "";
if (ixlVersion.startsWith("0.[0-5]") || ixlVersion.equals("0.6") || ixlVersion.matches("0.6.[1-6]")) { if (ixlVersion.startsWith("0.")) {
getLogger().log(Level.SEVERE, "DungeonsXL includes v" + LATEST_CALIBURN + " of the Caliburn custom item library. ItemsXL must implement the same or a newer, " getLogger().log(Level.SEVERE, "DungeonsXL requires ItemsXL v" + LATEST_IXL +" or higher to run.");
+ "but still compatible version of this library. This build of DungeonsXL is compatible with ItemsXL v" + LATEST_IXL
+ " and, possibly, higher. The latest DXL and IXL versions available on SpigotMC.org should always be compatible with each other.");
manager.disablePlugin(this); manager.disablePlugin(this);
return; return;
} }

1
core/src/main/resources/plugin.yml
View File

@ -4,6 +4,7 @@ version: ${project.parent.version}${buildNo}
authors: [Frank Baumann, Milan Albrecht, Tobias Schmitz, Daniel Saukel] authors: [Frank Baumann, Milan Albrecht, Tobias Schmitz, Daniel Saukel]
description: ${project.parent.description} description: ${project.parent.description}
website: ${project.parent.url} website: ${project.parent.url}
depend: [ItemsXL]
softdepend: [CommandsXL, ItemsXL, Vault, Citizens, CustomMobs, InsaneMobs, MythicMobs, HolographicDisplays, LWC, PlaceholderAPI, Parties] softdepend: [CommandsXL, ItemsXL, Vault, Citizens, CustomMobs, InsaneMobs, MythicMobs, HolographicDisplays, LWC, PlaceholderAPI, Parties]
commands: commands:
dungeonsxl: dungeonsxl:

2
pom.xml
View File

@ -27,7 +27,7 @@
<dependency> <dependency>
<groupId>de.erethon</groupId> <groupId>de.erethon</groupId>
<artifactId>caliburn</artifactId> <artifactId>caliburn</artifactId>
<version>1.0-RC-07</version> <version>1.0</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>