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

Update to MC 1.16.4

Browse Source
This commit is contained in:
Daniel Saukel 2020-11-04 16:34:58 +01:00
parent 98c9f915fd
commit 7ad1071df1
5 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
addon/core/src/main/java/de/erethon/dungeonsxxl/util/GlowUtil.java
View File

@ -9,17 +9,17 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Random; import java.util.Random;
import net.minecraft.server.v1_16_R2.EntityShulker; import net.minecraft.server.v1_16_R3.EntityShulker;
import net.minecraft.server.v1_16_R2.EntityTypes; import net.minecraft.server.v1_16_R3.EntityTypes;
import net.minecraft.server.v1_16_R2.Packet; import net.minecraft.server.v1_16_R3.Packet;
import net.minecraft.server.v1_16_R2.PacketPlayOutEntityDestroy; import net.minecraft.server.v1_16_R3.PacketPlayOutEntityDestroy;
import net.minecraft.server.v1_16_R2.PacketPlayOutSpawnEntityLiving; import net.minecraft.server.v1_16_R3.PacketPlayOutSpawnEntityLiving;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.craftbukkit.v1_16_R2.CraftWorld; import org.bukkit.craftbukkit.v1_16_R3.CraftWorld;
import org.bukkit.craftbukkit.v1_16_R2.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPlayer;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.entity.Shulker; import org.bukkit.entity.Shulker;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
@ -41,7 +41,7 @@ public class GlowUtil implements Listener {
private Map<ChatColor, Team> teams = new HashMap<>(); private Map<ChatColor, Team> teams = new HashMap<>();
private GlowData<org.bukkit.entity.Entity> glowingBlocks = new GlowData<>(); private GlowData<org.bukkit.entity.Entity> glowingBlocks = new GlowData<>();
private Map<Player, GlowData<net.minecraft.server.v1_16_R2.Entity>> playerGlows = new HashMap<>(); private Map<Player, GlowData<net.minecraft.server.v1_16_R3.Entity>> playerGlows = new HashMap<>();
private GlowRunnable runnable = new GlowRunnable(); private GlowRunnable runnable = new GlowRunnable();
public GlowUtil(Plugin plugin) { public GlowUtil(Plugin plugin) {
@ -177,8 +177,8 @@ public class GlowUtil implements Listener {
runnable.removeEntity(bukkitEntity); runnable.removeEntity(bukkitEntity);
} }
for (Entry<Player, GlowData<net.minecraft.server.v1_16_R2.Entity>> entry : playerGlows.entrySet()) { for (Entry<Player, GlowData<net.minecraft.server.v1_16_R3.Entity>> entry : playerGlows.entrySet()) {
net.minecraft.server.v1_16_R2.Entity nmsEntity = entry.getValue().get(block); net.minecraft.server.v1_16_R3.Entity nmsEntity = entry.getValue().get(block);
if (nmsEntity != null) { if (nmsEntity != null) {
sendPacket(entry.getKey(), new PacketPlayOutEntityDestroy(nmsEntity.getId())); sendPacket(entry.getKey(), new PacketPlayOutEntityDestroy(nmsEntity.getId()));
runnable.removeEntity(nmsEntity); runnable.removeEntity(nmsEntity);
@ -203,7 +203,7 @@ public class GlowUtil implements Listener {
* @param entity an NMS Entity * @param entity an NMS Entity
* @param color the glow color * @param color the glow color
*/ */
public void addGlow(net.minecraft.server.v1_16_R2.Entity entity, ChatColor color) { public void addGlow(net.minecraft.server.v1_16_R3.Entity entity, ChatColor color) {
getTeam(color).addEntry(asEntry(entity)); getTeam(color).addEntry(asEntry(entity));
entity.setFlag(6, true); entity.setFlag(6, true);
} }
@ -233,7 +233,7 @@ public class GlowUtil implements Listener {
* *
* @param entity an NMS Entity * @param entity an NMS Entity
*/ */
public void addRainbowGlow(net.minecraft.server.v1_16_R2.Entity entity) { public void addRainbowGlow(net.minecraft.server.v1_16_R3.Entity entity) {
addRainbowGlow(entity, null); addRainbowGlow(entity, null);
} }
@ -243,7 +243,7 @@ public class GlowUtil implements Listener {
* @param entity an NMS Entity * @param entity an NMS Entity
* @param cancelTime the time in milliseconds until the glow effect shall end; null = forever * @param cancelTime the time in milliseconds until the glow effect shall end; null = forever
*/ */
public void addRainbowGlow(net.minecraft.server.v1_16_R2.Entity entity, Long cancelTime) { public void addRainbowGlow(net.minecraft.server.v1_16_R3.Entity entity, Long cancelTime) {
entity.setFlag(6, true); entity.setFlag(6, true);
runnable.addEntity(entity, cancelTime != null ? System.currentTimeMillis() + cancelTime : null); runnable.addEntity(entity, cancelTime != null ? System.currentTimeMillis() + cancelTime : null);
} }
@ -264,7 +264,7 @@ public class GlowUtil implements Listener {
* *
* @param entity an NMS Entity * @param entity an NMS Entity
*/ */
public void removeGlow(net.minecraft.server.v1_16_R2.Entity entity) { public void removeGlow(net.minecraft.server.v1_16_R3.Entity entity) {
entity.setFlag(6, false); entity.setFlag(6, false);
teams.values().forEach(t -> t.removeEntry(asEntry(entity))); teams.values().forEach(t -> t.removeEntry(asEntry(entity)));
runnable.removeEntity(entity); runnable.removeEntity(entity);
@ -274,7 +274,7 @@ public class GlowUtil implements Listener {
return entity instanceof Player ? entity.getName() : entity.getUniqueId().toString(); return entity instanceof Player ? entity.getName() : entity.getUniqueId().toString();
} }
private static String asEntry(net.minecraft.server.v1_16_R2.Entity entity) { private static String asEntry(net.minecraft.server.v1_16_R3.Entity entity) {
return entity instanceof Player ? entity.getName() : entity.getUniqueID().toString(); return entity instanceof Player ? entity.getName() : entity.getUniqueID().toString();
} }
@ -311,8 +311,8 @@ public class GlowUtil implements Listener {
for (Entry<Object, Long> entry : entities.entrySet().toArray(new Entry[entities.size()])) { for (Entry<Object, Long> entry : entities.entrySet().toArray(new Entry[entities.size()])) {
if (entry.getKey() instanceof org.bukkit.entity.Entity) { if (entry.getKey() instanceof org.bukkit.entity.Entity) {
run((org.bukkit.entity.Entity) entry.getKey(), entry.getValue()); run((org.bukkit.entity.Entity) entry.getKey(), entry.getValue());
} else if (entry.getKey() instanceof net.minecraft.server.v1_16_R2.Entity) { } else if (entry.getKey() instanceof net.minecraft.server.v1_16_R3.Entity) {
run((net.minecraft.server.v1_16_R2.Entity) entry.getKey(), entry.getValue()); run((net.minecraft.server.v1_16_R3.Entity) entry.getKey(), entry.getValue());
} }
} }
} }
@ -332,11 +332,11 @@ public class GlowUtil implements Listener {
getTeam(color).addEntry(asEntry(entity)); getTeam(color).addEntry(asEntry(entity));
} }
private void run(net.minecraft.server.v1_16_R2.Entity entity, Long cancelTime) { private void run(net.minecraft.server.v1_16_R3.Entity entity, Long cancelTime) {
getTeam(color).removeEntry(asEntry(entity)); getTeam(color).removeEntry(asEntry(entity));
if (cancelTime != null && System.currentTimeMillis() >= cancelTime) { if (cancelTime != null && System.currentTimeMillis() >= cancelTime) {
entities.remove(entity); entities.remove(entity);
for (Entry<Player, GlowData<net.minecraft.server.v1_16_R2.Entity>> entry : playerGlows.entrySet()) { for (Entry<Player, GlowData<net.minecraft.server.v1_16_R3.Entity>> entry : playerGlows.entrySet()) {
if (!entry.getValue().glowingBlocks.containsValue(entity)) { if (!entry.getValue().glowingBlocks.containsValue(entity)) {
continue; continue;
} }

4
core/pom.xml
View File

@ -104,7 +104,7 @@
<dependency> <dependency>
<groupId>com.gmail.filoghost.holographicdisplays</groupId> <groupId>com.gmail.filoghost.holographicdisplays</groupId>
<artifactId>holographicdisplays-api</artifactId> <artifactId>holographicdisplays-api</artifactId>
<version>2.3.2</version> <version>2.4.5</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -122,7 +122,7 @@
<dependency> <dependency>
<groupId>me.clip</groupId> <groupId>me.clip</groupId>
<artifactId>placeholderapi</artifactId> <artifactId>placeholderapi</artifactId>
<version>2.10.2</version> <version>2.10.9</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

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

@ -204,7 +204,7 @@ 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.equals("0.6.1")) { if (ixlVersion.startsWith("0.[0-5]") || ixlVersion.equals("0.6") || ixlVersion.matches("0.6.[1-3]")) {
getLogger().log(Level.SEVERE, "DungeonsXL includes v1.0-RC-03 of the Caliburn custom item library. ItemsXL must implement the same or a newer, " getLogger().log(Level.SEVERE, "DungeonsXL includes v1.0-RC-03 of the Caliburn custom item library. ItemsXL must implement the same or a newer, "
+ "but still compatible version of this library. This build of DungeonsXL is compatible with ItemsXL v" + StatusCommand.LATEST_IXL + "but still compatible version of this library. This build of DungeonsXL is compatible with ItemsXL v" + StatusCommand.LATEST_IXL
+ " and, possibly, higher. The latest DXL and IXL versions available on SpigotMC.org should always be compatible with each other."); + " and, possibly, higher. The latest DXL and IXL versions available on SpigotMC.org should always be compatible with each other.");

2
core/src/main/java/de/erethon/dungeonsxl/command/StatusCommand.java
View File

@ -38,7 +38,7 @@ public class StatusCommand extends DCommand {
public static final String TRUE = ChatColor.GREEN + "\u2714"; public static final String TRUE = ChatColor.GREEN + "\u2714";
public static final String FALSE = ChatColor.DARK_RED + "\u2718"; public static final String FALSE = ChatColor.DARK_RED + "\u2718";
public static final String LATEST_IXL = "0.6.3"; public static final String LATEST_IXL = "0.6.4";
public StatusCommand(DungeonsXL plugin) { public StatusCommand(DungeonsXL plugin) {
super(plugin); super(plugin);

4
pom.xml
View File

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