Upstream/DungeonsXL
1
0
Fork 0
mirror of https://github.com/DRE2N/DungeonsXL.git synced 2024-11-25 03:55:22 +01:00
Code Issues Projects Releases Wiki Activity

Update to Caliburn 0.5.5

Browse Source
This commit is contained in:
Daniel Saukel 2019-06-14 21:57:48 +02:00
parent 16084f45f8
commit 2140157237
6 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -1,6 +1,6 @@
![DungeonsXL](http://feuerstern.bplaced.net/ressourcen/logos/DungeonsXL.png) ![DungeonsXL](http://feuerstern.bplaced.net/ressourcen/logos/DungeonsXL.png)
[![Builds](http://feuerstern.bplaced.net/ressourcen/buttons/Builds.png)](http://erethon.de/repo/de/erethon/dungeonsxl) [![Builds](http://feuerstern.bplaced.net/ressourcen/buttons/Builds.png)](http://erethon.de/repo/de/erethon/dungeonsxl/dungeonsxl-dist)
[![Wiki](http://feuerstern.bplaced.net/ressourcen/buttons/Wiki.png)](../../wiki/) [![Wiki](http://feuerstern.bplaced.net/ressourcen/buttons/Wiki.png)](../../wiki/)
[![Issues](http://feuerstern.bplaced.net/ressourcen/buttons/Issues.png)](../../issues/) [![Issues](http://feuerstern.bplaced.net/ressourcen/buttons/Issues.png)](../../issues/)
[![JavaDocs](http://feuerstern.bplaced.net/ressourcen/buttons/JavaDocs.png)](http://erethon.de/javadocs/dungeonsxl/) [![JavaDocs](http://feuerstern.bplaced.net/ressourcen/buttons/JavaDocs.png)](http://erethon.de/javadocs/dungeonsxl/)

2
core/src/main/java/de/erethon/dungeonsxl/global/JoinSign.java
View File

@ -222,7 +222,7 @@ public abstract class JoinSign extends GlobalProtection {
int verticalSigns = (int) Math.ceil((float) (1 + maxElements) / 4); int verticalSigns = (int) Math.ceil((float) (1 + maxElements) / 4);
while (verticalSigns > 1) { while (verticalSigns > 1) {
Block block = world.getBlockAt(x, y - verticalSigns + 1, z); Block block = world.getBlockAt(x, y - verticalSigns + 1, z);
block.setType(VanillaItem.WALL_SIGN.getMaterial(), false); block.setType(startSign.getType(), false);
DungeonsXL.BLOCK_ADAPTER.setFacing(block, facing); DungeonsXL.BLOCK_ADAPTER.setFacing(block, facing);
verticalSigns--; verticalSigns--;
} }

4
core/src/main/java/de/erethon/dungeonsxl/world/DWorldListener.java
View File

@ -17,6 +17,7 @@
package de.erethon.dungeonsxl.world; package de.erethon.dungeonsxl.world;
import de.erethon.caliburn.CaliburnAPI; import de.erethon.caliburn.CaliburnAPI;
import de.erethon.caliburn.category.Category;
import de.erethon.caliburn.item.VanillaItem; import de.erethon.caliburn.item.VanillaItem;
import de.erethon.caliburn.mob.ExMob; import de.erethon.caliburn.mob.ExMob;
import de.erethon.dungeonsxl.DungeonsXL; import de.erethon.dungeonsxl.DungeonsXL;
@ -163,10 +164,11 @@ public class DWorldListener implements Listener {
} }
} }
// TODO: Is this necessary?
@EventHandler @EventHandler
public void onItemSpawn(ItemSpawnEvent event) { public void onItemSpawn(ItemSpawnEvent event) {
if (DGameWorld.getByWorld(event.getLocation().getWorld()) != null) { if (DGameWorld.getByWorld(event.getLocation().getWorld()) != null) {
if (VanillaItem.SIGN.is(event.getEntity().getItemStack())) { if (Category.SIGNS.containsItem(event.getEntity().getItemStack())) {
event.setCancelled(true); event.setCancelled(true);
} }
} }

2
core/src/main/java/de/erethon/dungeonsxl/world/block/RewardChest.java
View File

@ -206,7 +206,7 @@ public class RewardChest extends GameBlock {
} }
} }
if (name == null) { if (name == null) {
name = VanillaItem.get(itemStack.getType()).getNewName().replace("_", " "); name = VanillaItem.get(itemStack.getType()).getName().replace("_", " ");
} }
msg += ChatColor.RED + " " + itemStack.getAmount() + " " + name + ChatColor.GOLD + ","; msg += ChatColor.RED + " " + itemStack.getAmount() + " " + name + ChatColor.GOLD + ",";
} }

20
dist/pom.xml vendored
View File

@ -36,6 +36,10 @@
<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>
<relocation> <relocation>
<pattern>de.erethon.vignette</pattern> <pattern>de.erethon.vignette</pattern>
<shadedPattern>de.erethon.dungeonsxl.util.vignette</shadedPattern> <shadedPattern>de.erethon.dungeonsxl.util.vignette</shadedPattern>
@ -53,21 +57,5 @@
<artifactId>dungeonsxl-core</artifactId> <artifactId>dungeonsxl-core</artifactId>
<version>${project.parent.version}</version> <version>${project.parent.version}</version>
</dependency> </dependency>
<dependency>
<groupId>de.erethon</groupId>
<artifactId>caliburn</artifactId>
<version>0.5.4</version>
</dependency>
<dependency>
<groupId>de.erethon.vignette</groupId>
<artifactId>vignette-dist</artifactId>
<version>1.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>de.erethon.commons</groupId>
<artifactId>commons-dist</artifactId>
<version>6.0</version>
</dependency>
</dependencies> </dependencies>
</project> </project>

2
pom.xml
View File

@ -30,7 +30,7 @@
<dependency> <dependency>
<groupId>de.erethon</groupId> <groupId>de.erethon</groupId>
<artifactId>caliburn</artifactId> <artifactId>caliburn</artifactId>
<version>0.5.4</version> <version>0.5.5</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>