[3.4.4] Added support for 1.16

nms/v1_16_R1/pom.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>ru.beykerykt.lightapi.nms</groupId>
+    <artifactId>v1_16_R1</artifactId>
+    <version>3.3.0</version>
+
+    <properties>
+        <maven.install.skip>true</maven.install.skip>
+        <maven.compiler.source>1.6</maven.compiler.source>
+        <maven.compiler.target>1.6</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.bukkit</groupId>
+            <artifactId>craftbukkit</artifactId>
+            <version>1.16.1-R0.1-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>ru.beykerykt.lightapi</groupId>
+            <artifactId>common</artifactId>
+            <version>3.3.0</version>
+        </dependency>
+    </dependencies>
+</project>

nms/v1_16_R1/src/main/java/ru/beykerykt/lightapi/server/nms/craftbukkit/CraftBukkit_v1_16_R1.java

@@ -0,0 +1,328 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016-2017 The ImplexDevOne Project
+ * Copyright (c) 2019 Vladimir Mikhailov <[email protected]>
+ * Copyright (c) 2020 Qveshn
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package ru.beykerykt.lightapi.server.nms.craftbukkit;
+
+import net.minecraft.server.v1_16_R1.*;
+import org.bukkit.World;
+import org.bukkit.craftbukkit.v1_16_R1.CraftWorld;
+import org.bukkit.craftbukkit.v1_16_R1.entity.CraftPlayer;
+import org.bukkit.entity.Player;
+import ru.beykerykt.lightapi.chunks.ChunkInfo;
+import ru.beykerykt.lightapi.LightType;
+import ru.beykerykt.lightapi.server.nms.NmsHandlerBase;
+import ru.beykerykt.lightapi.utils.Debug;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class CraftBukkit_v1_16_R1 extends NmsHandlerBase {
+
+	private Field lightEngine_ThreadedMailbox;
+	private Field threadedMailbox_State;
+	private Method threadedMailbox_DoLoopStep;
+	private Field lightEngineLayer_c;
+	private Method lightEngineStorage_d;
+	private Method lightEngineGraph_a;
+
+	public CraftBukkit_v1_16_R1() {
+		try {
+			threadedMailbox_DoLoopStep = ThreadedMailbox.class.getDeclaredMethod("f");
+			threadedMailbox_DoLoopStep.setAccessible(true);
+			threadedMailbox_State = ThreadedMailbox.class.getDeclaredField("c");
+			threadedMailbox_State.setAccessible(true);
+			lightEngine_ThreadedMailbox = LightEngineThreaded.class.getDeclaredField("b");
+			lightEngine_ThreadedMailbox.setAccessible(true);
+
+			lightEngineLayer_c = LightEngineLayer.class.getDeclaredField("c");
+			lightEngineLayer_c.setAccessible(true);
+			lightEngineStorage_d = LightEngineStorage.class.getDeclaredMethod("d");
+			lightEngineStorage_d.setAccessible(true);
+			lightEngineGraph_a = LightEngineGraph.class.getDeclaredMethod(
+					"a", long.class, long.class, int.class, boolean.class);
+			lightEngineGraph_a.setAccessible(true);
+		} catch (Exception e) {
+			throw toRuntimeException(e);
+		}
+	}
+
+	@Override
+	public void createLight(World world, int x, int y, int z, LightType lightType, int light) {
+		setRawLightLevel(world, lightType, x, y, z, light);
+		recalculateLighting(world, x, y, z, lightType);
+	}
+
+	@Override
+	public void deleteLight(World world, int x, int y, int z, LightType lightType) {
+		setRawLightLevel(world, lightType, x, y, z, 0);
+		recalculateLighting(world, x, y, z, lightType);
+	}
+
+	@SuppressWarnings("SameParameterValue")
+	private void setRawLightLevel(World world, final LightType type, int blockX, int blockY, int blockZ, int lightlevel) {
+		WorldServer worldServer = ((CraftWorld) world).getHandle();
+		final BlockPosition position = new BlockPosition(blockX, blockY, blockZ);
+		final LightEngineThreaded lightEngine = worldServer.getChunkProvider().getLightEngine();
+
+		final int finalLightLevel = lightlevel < 0 ? 0 : lightlevel > 15 ? 15 : lightlevel;
+		executeSync(lightEngine, new Runnable() {
+			@Override
+			public void run() {
+				if (type == LightType.SKY) {
+					LightEngineLayerEventListener layer = lightEngine.a(EnumSkyBlock.SKY);
+					if (!(layer instanceof LightEngineSky)) return;
+					LightEngineSky les = (LightEngineSky) layer;
+					if (finalLightLevel == 0) {
+						les.a(position);
+					} else if (les.a(SectionPosition.a(position)) != null) {
+						try {
+							lightEngineLayer_a(les, position, finalLightLevel);
+						} catch (NullPointerException ignore) {
+							// To prevent problems with the absence of the NibbleArray, even
+							// if les.a(SectionPosition.a(position)) returns non-null value (corrupted data)
+						}
+					}
+				} else {
+					LightEngineLayerEventListener layer = lightEngine.a(EnumSkyBlock.BLOCK);
+					if (!(layer instanceof LightEngineBlock)) return;
+					LightEngineBlock leb = (LightEngineBlock) layer;
+					if (finalLightLevel == 0) {
+						leb.a(position);
+					} else if (leb.a(SectionPosition.a(position)) != null) {
+						try {
+							leb.a(position, finalLightLevel);
+						} catch (NullPointerException ignore) {
+							// To prevent problems with the absence of the NibbleArray, even
+							// if leb.a(SectionPosition.a(position)) returns non-null value (corrupted data)
+						}
+					}
+				}
+			}
+		});
+	}
+
+	@Override
+	protected void recalculateLighting(World world, int blockX, int blockY, int blockZ, final LightType type) {
+		WorldServer worldServer = ((CraftWorld) world).getHandle();
+		final LightEngineThreaded lightEngine = worldServer.getChunkProvider().getLightEngine();
+
+		// Do not recalculate if no changes!
+		if (!lightEngine.a()) {
+			return;
+		}
+
+		executeSync(lightEngine, new Runnable() {
+			@Override
+			public void run() {
+				if (type == LightType.SKY) {
+					LightEngineSky les = (LightEngineSky) lightEngine.a(EnumSkyBlock.SKY);
+					les.a(Integer.MAX_VALUE, true, true);
+				} else {
+					LightEngineBlock leb = (LightEngineBlock) lightEngine.a(EnumSkyBlock.BLOCK);
+					leb.a(Integer.MAX_VALUE, true, true);
+				}
+			}
+		});
+	}
+
+	@Override
+	public void sendChunkSectionsUpdate(
+			World world, int chunkX, int chunkZ, int sectionsMaskSky, int sectionsMaskBlock, Player player
+	) {
+		Chunk chunk = ((CraftWorld) world).getHandle().getChunkAt(chunkX, chunkZ);
+		// https://wiki.vg/index.php?title=Pre-release_protocol&oldid=14804#Update_Light
+		// https://github.com/flori-schwa/VarLight/blob/b9349499f9c9fb995c320f95eae9698dd85aad5c/v1_14_R1/src/me/florian/varlight/nms/v1_14_R1/NmsAdapter_1_14_R1.java#L451
+		//
+		// Two last argument is bit-mask what chunk sections to update. Mask containing
+		// 18 bits, with the lowest bit corresponding to chunk section -1 (in the void,
+		// y=-16 to y=-1) and the highest bit for chunk section 16 (above the world,
+		// y=256 to y=271).
+		PacketPlayOutLightUpdate packet = new PacketPlayOutLightUpdate(
+				chunk.getPos(), chunk.e(), sectionsMaskSky, sectionsMaskBlock, true);
+		((CraftPlayer) player).getHandle().playerConnection.sendPacket(packet);
+	}
+
+	@Override
+	public boolean isValidSectionY(int sectionY) {
+		return sectionY >= -1 && sectionY <= 16;
+	}
+
+	@Override
+	public int asSectionMask(int sectionY) {
+		return 1 << sectionY + 1;
+	}
+
+	@Override
+	protected int getViewDistance(Player player) {
+		return player.getClientViewDistance();
+	}
+
+	@SuppressWarnings({"StatementWithEmptyBody", "unchecked"})
+	private void executeSync(LightEngineThreaded lightEngine, Runnable task) {
+		try {
+			// ##### STEP 1: Pause light engine mailbox to process its tasks. #####
+			ThreadedMailbox<Runnable> threadedMailbox = (ThreadedMailbox<Runnable>) lightEngine_ThreadedMailbox
+					.get(lightEngine);
+			// State flags bit mask:
+			// 0x0001 - Closing flag (ThreadedMailbox is closing if non zero).
+			// 0x0002 - Busy flag (ThreadedMailbox performs a task from queue if non zero).
+			AtomicInteger stateFlags = (AtomicInteger) threadedMailbox_State.get(threadedMailbox);
+			int flags; // to hold values from stateFlags
+			long timeToWait = -1;
+			// Trying to set bit 1 in state bit mask when it is not set yet.
+			// This will break the loop in other thread where light engine mailbox processes the taks.
+			while (!stateFlags.compareAndSet(flags = stateFlags.get() & ~2, flags | 2)) {
+				if ((flags & 1) != 0) {
+					// ThreadedMailbox is closing. The light engine mailbox may also stop processing tasks.
+					// The light engine mailbox can be close due to server shutdown or unloading (closing) the world.
+					// I am not sure is it unsafe to process our tasks while the world is closing is closing,
+					// but will try it (one can throw exception here if it crashes the server).
+					if (timeToWait == -1) {
+						// Try to wait 3 seconds until light engine mailbox is busy.
+						timeToWait = System.currentTimeMillis() + 3 * 1000;
+						Debug.print("ThreadedMailbox is closing. Will wait...");
+					} else if (System.currentTimeMillis() >= timeToWait) {
+						throw new RuntimeException("Failed to enter critical section while ThreadedMailbox is closing");
+					}
+					try {
+						Thread.sleep(50);
+					} catch (InterruptedException ignored) {
+					}
+				}
+			}
+			try {
+				// ##### STEP 2: Safely running the task while the mailbox process is stopped. #####
+				task.run();
+			} finally {
+				// STEP 3: ##### Continue light engine mailbox to process its tasks. #####
+				// Firstly: Clearing busy flag to allow ThreadedMailbox to use it for running light engine tasks.
+				while (!stateFlags.compareAndSet(flags = stateFlags.get(), flags & ~2)) ;
+				// Secondly: IMPORTANT! The main loop of ThreadedMailbox was broken. Not completed tasks may still be
+				// in the queue. Therefore, it is important to start the loop again to process tasks from the queue.
+				// Otherwise, the main server thread may be frozen due to tasks stuck in the queue.
+				threadedMailbox_DoLoopStep.invoke(threadedMailbox);
+			}
+		} catch (InvocationTargetException e) {
+			throw toRuntimeException(e.getCause());
+		} catch (IllegalAccessException e) {
+			throw toRuntimeException(e);
+		}
+	}
+
+	private void lightEngineLayer_a(LightEngineLayer les, BlockPosition var0, int var1) {
+		try {
+			LightEngineStorage ls = (LightEngineStorage) lightEngineLayer_c.get(les);
+			lightEngineStorage_d.invoke(ls);
+			lightEngineGraph_a.invoke(les, 9223372036854775807L, var0.asLong(), 15 - var1, true);
+		} catch (InvocationTargetException e) {
+			throw toRuntimeException(e.getCause());
+		} catch (IllegalAccessException e) {
+			throw toRuntimeException(e);
+		}
+	}
+
+	private static RuntimeException toRuntimeException(Throwable e) {
+		if (e instanceof RuntimeException) {
+			return (RuntimeException) e;
+		}
+		Class cls = e.getClass();
+		return new RuntimeException(
+				String.format("(%s) %s", RuntimeException.class.getPackage().equals(cls.getPackage())
+						? cls.getSimpleName() : cls.getName(), e.getMessage()),
+				e);
+	}
+
+	private int getDeltaLight(int x, int dx) {
+		return (((x ^ ((-dx >> 4) & 15)) + 1) & (-(dx & 1)));
+	}
+
+	@Override
+	public List<ChunkInfo> collectChunks(
+			World world, int blockX, int blockY, int blockZ, LightType lightType, int lightLevel
+	) {
+		if (lightType != LightType.SKY || lightLevel < 15) {
+			return super.collectChunks(world, blockX, blockY, blockZ, lightType, lightLevel);
+		}
+		List<ChunkInfo> list = new ArrayList<ChunkInfo>();
+		Collection<Player> players = null;
+		for (int dx = -1; dx <= 1; dx++) {
+			int lightLevelX = lightLevel - getDeltaLight(blockX & 15, dx);
+			if (lightLevelX > 0) {
+				for (int dz = -1; dz <= 1; dz++) {
+					int lightLevelZ = lightLevelX - getDeltaLight(blockZ & 15, dz);
+					if (lightLevelZ > 0) {
+						if (lightLevelZ > getDeltaLight(blockY & 15, 1)) {
+							int sectionY = (blockY >> 4) + 1;
+							if (isValidSectionY(sectionY)) {
+								int chunkX = blockX >> 4;
+								int chunkZ = blockZ >> 4;
+								ChunkInfo cCoord = new ChunkInfo(
+										world,
+										chunkX + dx,
+										sectionY << 4,
+										chunkZ + dz,
+										players != null ? players : (players = world.getPlayers()));
+								list.add(cCoord);
+							}
+						}
+						for (int sectionY = blockY >> 4; sectionY >= -1; sectionY--) {
+							if (isValidSectionY(sectionY)) {
+								int chunkX = blockX >> 4;
+								int chunkZ = blockZ >> 4;
+								ChunkInfo cCoord = new ChunkInfo(
+										world,
+										chunkX + dx,
+										sectionY << 4,
+										chunkZ + dz,
+										players != null ? players : (players = world.getPlayers()));
+								list.add(cCoord);
+							}
+						}
+					}
+				}
+			}
+		}
+		return list;
+	}
+
+	@Override
+	public boolean isSupported(World world, LightType lightType) {
+		if (!(world instanceof CraftWorld)) {
+			return false;
+		}
+		WorldServer worldServer = ((CraftWorld) world).getHandle();
+		LightEngineThreaded lightEngine = worldServer.getChunkProvider().getLightEngine();
+		if (lightType == LightType.SKY) {
+			return lightEngine.a(EnumSkyBlock.SKY) instanceof LightEngineSky;
+		} else {
+			return lightEngine.a(EnumSkyBlock.BLOCK) instanceof LightEngineBlock;
+		}
+	}
+}

plugin/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>ru.beykerykt</groupId>
     <artifactId>LightAPI-fork</artifactId>
-    <version>3.4.3</version>
+    <version>3.4.4</version>
 
     <properties>
         <maven.compiler.source>1.6</maven.compiler.source>
@@ -20,6 +20,11 @@
             <artifactId>common</artifactId>
             <version>3.3.0</version>
         </dependency>
+        <dependency>
+            <groupId>ru.beykerykt.lightapi.nms</groupId>
+            <artifactId>v1_16_R1</artifactId>
+            <version>3.3.0</version>
+        </dependency>
         <dependency>
             <groupId>ru.beykerykt.lightapi.nms</groupId>
             <artifactId>v1_15_R1</artifactId>

plugin/src/main/java/ru/beykerykt/lightapi/LightAPI.java

@@ -105,6 +105,7 @@ public void onLoad() {
 		craftbukkit.getVersions().put("v1_13_R2", CraftBukkit_v1_13_R2.class);
 		craftbukkit.getVersions().put("v1_14_R1", CraftBukkit_v1_14_R1.class);
 		craftbukkit.getVersions().put("v1_15_R1", CraftBukkit_v1_15_R1.class);
+		craftbukkit.getVersions().put("v1_16_R1", CraftBukkit_v1_16_R1.class);
 		ServerModManager.registerServerMod(craftbukkit);
 
 		ServerModInfo spigot = new ServerModInfo("Spigot");
@@ -118,6 +119,7 @@ public void onLoad() {
 		spigot.getVersions().put("v1_13_R2", CraftBukkit_v1_13_R2.class);
 		spigot.getVersions().put("v1_14_R1", CraftBukkit_v1_14_R1.class);
 		spigot.getVersions().put("v1_15_R1", CraftBukkit_v1_15_R1.class);
+		spigot.getVersions().put("v1_16_R1", CraftBukkit_v1_16_R1.class);
 		ServerModManager.registerServerMod(spigot);
 
 		ServerModInfo paperspigot = new ServerModInfo("PaperSpigot");