Working towards 1.16.1-v1: add support for 1.16 changes

bergerhealer · Jul 6, 2020 · 6eda8d2 · 6eda8d2
1 parent b288caa
commit 6eda8d2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.bergerkiller.bukkit</groupId>
     <artifactId>LightCleaner</artifactId>
-    <version>1.15.2-v2</version>
+    <version>1.16.1-v1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>LightCleaner</name>
@@ -13,7 +13,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.serverversion>1.12-R0.1</project.serverversion>
-        <project.bkcversion>1.15.2-v2-SNAPSHOT</project.bkcversion>
+        <project.bkcversion>1.16.1-v1-SNAPSHOT</project.bkcversion>
     </properties>
 
     <repositories>

diff --git a/src/main/java/com/bergerkiller/bukkit/lightcleaner/LightCleaner.java b/src/main/java/com/bergerkiller/bukkit/lightcleaner/LightCleaner.java
@@ -10,6 +10,7 @@
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import com.bergerkiller.bukkit.common.Common;
 import com.bergerkiller.bukkit.common.PluginBase;
 import com.bergerkiller.bukkit.common.config.FileConfiguration;
 import com.bergerkiller.bukkit.common.permissions.NoPermissionException;
@@ -28,7 +29,7 @@ public static boolean isWorldSaveEnabled(World world) {
 
     @Override
     public int getMinimumLibVersion() {
-        return 11404; // has backwards support
+        return Common.VERSION;
     }
 
     @Override

diff --git a/src/main/java/com/bergerkiller/bukkit/lightcleaner/lighting/LightingChunk.java b/src/main/java/com/bergerkiller/bukkit/lightcleaner/lighting/LightingChunk.java
@@ -3,6 +3,7 @@
 import com.bergerkiller.bukkit.common.bases.IntVector2;
 import com.bergerkiller.bukkit.common.chunk.ForcedChunk;
 import com.bergerkiller.bukkit.common.utils.ChunkUtil;
+import com.bergerkiller.bukkit.common.utils.WorldUtil;
 import com.bergerkiller.bukkit.common.wrappers.ChunkSection;
 import com.bergerkiller.bukkit.common.wrappers.HeightMap;
 import com.bergerkiller.bukkit.lightcleaner.LightCleaner;
@@ -79,7 +80,7 @@ public void notifyAccessible(LightingChunk chunk) {
 
     public void fill(Chunk chunk) {
         // Fill using chunk sections
-        hasSkyLight = WorldHandle.fromBukkit(chunk.getWorld()).getWorldProvider().hasSkyLight();
+        hasSkyLight = WorldUtil.getDimensionType(chunk.getWorld()).hasSkyLight();
         ChunkSection[] chunkSections = ChunkUtil.getSections(chunk);
         for (int section = 0; section < SECTION_COUNT; section++) {
             ChunkSection chunkSection = chunkSections[section];