diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml
index 525de0c..3dfd08d 100644
--- a/.github/workflows/verify.yml
+++ b/.github/workflows/verify.yml
@@ -10,15 +10,15 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2.3.4
-      - name: Set up JDK 8
-        uses: actions/setup-java@v2
+      - uses: actions/checkout@v4
+      - name: Set up JDK 11
+        uses: actions/setup-java@v4
         with:
           distribution: adopt
-          java-version: 8
+          java-version: 11
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build with Gradle
         run: ./gradlew --build-cache shadowJar
       - name: Test with Gradle
-        run: ./gradlew test
\ No newline at end of file
+        run: ./gradlew test
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..ccab28b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,32 @@
+.gradle
+**/build/
+!src/**/build/
+gradle.properties
+
+# Ignore Gradle GUI configuration
+gradle-app.setting
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
+
+# Cache of project
+.gradletasknamecache
+
+# User-specific stuff
+.idea/
+*.iml
+
+# CMake
+cmake-build-*/
+
+# Maven
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties
+.mvn/wrapper/maven-wrapper.jar
diff --git a/LandLordMap-bluemap/build.gradle.kts b/LandLordMap-bluemap/build.gradle.kts
index a6fed07..3883994 100644
--- a/LandLordMap-bluemap/build.gradle.kts
+++ b/LandLordMap-bluemap/build.gradle.kts
@@ -1,13 +1,10 @@
 plugins {
     id("biz.princeps.java-conventions")
-    id("com.github.johnrengelman.shadow") version "7.0.0"
+    id("com.github.johnrengelman.shadow") version "8.1.1"
 }
 
 dependencies {
     implementation(project(":LandLordMap-core"))
-    compileOnly("org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT")
-    compileOnly("biz.princeps:landlord-core:4.360")
-    compileOnly("de.eldoria:eldo-util:1.11.0-DEV")
     compileOnly("com.github.BlueMap-Minecraft:BlueMapAPI:v1.7.0")
 }
 
@@ -40,4 +37,4 @@ tasks {
             events("passed", "skipped", "failed")
         }
     }
-}
\ No newline at end of file
+}
diff --git a/LandLordMap-bluemap/src/main/java/biz/princeps/landlordmap/bluemap/LLBlueMap.java b/LandLordMap-bluemap/src/main/java/biz/princeps/landlordmap/bluemap/LLBlueMap.java
index a49e0e5..2498574 100644
--- a/LandLordMap-bluemap/src/main/java/biz/princeps/landlordmap/bluemap/LLBlueMap.java
+++ b/LandLordMap-bluemap/src/main/java/biz/princeps/landlordmap/bluemap/LLBlueMap.java
@@ -15,43 +15,39 @@
 
 public class LLBlueMap extends JavaPlugin {
 
-    ILandLord landLordAPI;
-    Configuration configuration;
-    BlueMapIntegration blueMapIntegration;
+    private ILandLord landLordAPI;
+    private Configuration configuration;
+    private BlueMapIntegration blueMapIntegration;
 
     @Override
     public void onEnable() {
-        logToConsole(Level.INFO, "Loading configuration...");
+        getLogger().info( "Loading configuration...");
         saveDefaultConfig();
         configuration = new Configuration(this);
 
         blueMapIntegration = new BlueMapIntegration(this);
 
-        final PluginManager pluginManager = Bukkit.getPluginManager();
-        logToConsole(Level.INFO, "Loading listeners...");
+        PluginManager pluginManager = getServer().getPluginManager();
+        getLogger().info("Loading listeners...");
         pluginManager.registerEvents(new LandlordListener(this, blueMapIntegration), this);
 
-        logToConsole(Level.INFO, "Loading commands...");
+        getLogger().info( "Loading commands...");
         PrincepsLib.getCommandManager().registerCommand(new Commands(this));
 
-        logToConsole(Level.INFO, "Loading APIs...");
+        getLogger().info( "Loading APIs...");
         landLordAPI = (ILandLord) pluginManager.getPlugin("Landlord");
 
         BlueMapAPI.onEnable(blueMapAPI -> {
-            logToConsole(Level.INFO, "BlueMap integration is initializing...");
+            getLogger().info( "BlueMap integration is initializing...");
             blueMapIntegration.hookBlueMap(blueMapAPI);
-            logToConsole(Level.INFO, "BlueMap integration has been successfully enabled/reloaded!");
+            getLogger().info( "BlueMap integration has been successfully enabled/reloaded!");
         });
     }
 
     @Override
     public void onDisable() {
         BlueMapAPI.getInstance().ifPresent(blueMapAPI -> blueMapIntegration.unhookBlueMap(blueMapAPI));
-        logToConsole(Level.INFO, "Thank you :)");
-    }
-
-    public void logToConsole(Level level, String message) {
-        Bukkit.getLogger().log(level, "[" + getName() + "] " + message);
+        getLogger().info("Thank you :)");
     }
 
     public Configuration getConfiguration() {
diff --git a/LandLordMap-bluemap/src/main/java/biz/princeps/landlordmap/bluemap/commands/CommandReload.java b/LandLordMap-bluemap/src/main/java/biz/princeps/landlordmap/bluemap/commands/CommandReload.java
index c2969d8..b76757e 100644
--- a/LandLordMap-bluemap/src/main/java/biz/princeps/landlordmap/bluemap/commands/CommandReload.java
+++ b/LandLordMap-bluemap/src/main/java/biz/princeps/landlordmap/bluemap/commands/CommandReload.java
@@ -26,7 +26,7 @@ public void onCommand(Properties properties, Arguments arguments) {
         plugin.reloadConfig();
         plugin.getConfiguration().load();
 
-        final Optional<BlueMapAPI> optionalBlueMapAPI = BlueMapAPI.getInstance();
+        Optional<BlueMapAPI> optionalBlueMapAPI = BlueMapAPI.getInstance();
         if (optionalBlueMapAPI.isPresent()) {
             plugin.getBlueMapIntegration().hookBlueMap(optionalBlueMapAPI.get());
             properties.sendMessage("§aConfig successfully reloaded!");
@@ -35,4 +35,4 @@ public void onCommand(Properties properties, Arguments arguments) {
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/LandLordMap-bluemap/src/main/java/biz/princeps/landlordmap/bluemap/commands/Commands.java b/LandLordMap-bluemap/src/main/java/biz/princeps/landlordmap/bluemap/commands/Commands.java
index 3942cab..562c1f8 100644
--- a/LandLordMap-bluemap/src/main/java/biz/princeps/landlordmap/bluemap/commands/Commands.java
+++ b/LandLordMap-bluemap/src/main/java/biz/princeps/landlordmap/bluemap/commands/Commands.java
@@ -22,12 +22,12 @@ public Commands(LLBlueMap plugin) {
                 plugin.getConfig().getStringList("CommandSettings.Main.aliases").toArray(new String[]{}));
         this.plugin = plugin;
 
-        this.addSubcommand(new CommandReload(plugin));
+        addSubcommand(new CommandReload(plugin));
     }
 
     @Override
     public List<String> tabComplete(CommandSender sender, String alias, String[] args) throws IllegalArgumentException {
-        final List<String> completions = new ArrayList<>();
+        List<String> completions = new ArrayList<>();
 
         if (args.length == 1) {
             subCommandMap.forEach((name, subCommand) -> {
@@ -45,4 +45,4 @@ public List<String> tabComplete(CommandSender sender, String alias, String[] arg
     public void onCommand(Properties properties, Arguments arguments) {
     }
 
-}
\ No newline at end of file
+}
diff --git a/LandLordMap-bluemap/src/main/java/biz/princeps/landlordmap/bluemap/config/Configuration.java b/LandLordMap-bluemap/src/main/java/biz/princeps/landlordmap/bluemap/config/Configuration.java
index c7d2d22..55ab4b0 100644
--- a/LandLordMap-bluemap/src/main/java/biz/princeps/landlordmap/bluemap/config/Configuration.java
+++ b/LandLordMap-bluemap/src/main/java/biz/princeps/landlordmap/bluemap/config/Configuration.java
@@ -34,7 +34,7 @@ public Configuration(LLBlueMap plugin) {
     }
 
     public void load() {
-        final FileConfiguration config = plugin.getConfig();
+        FileConfiguration config = plugin.getConfig();
 
         updateTaskFrequency = config.getLong("update-task-frequency");
         maxProcessedPerUpdate = config.getInt("max-processed-per-update");
diff --git a/LandLordMap-bluemap/src/main/java/biz/princeps/landlordmap/bluemap/integration/BlueMapIntegration.java b/LandLordMap-bluemap/src/main/java/biz/princeps/landlordmap/bluemap/integration/BlueMapIntegration.java
index ebe879b..579b29d 100644
--- a/LandLordMap-bluemap/src/main/java/biz/princeps/landlordmap/bluemap/integration/BlueMapIntegration.java
+++ b/LandLordMap-bluemap/src/main/java/biz/princeps/landlordmap/bluemap/integration/BlueMapIntegration.java
@@ -30,9 +30,9 @@ public class BlueMapIntegration {
 
     public BlueMapIntegration(LLBlueMap plugin) {
         this.plugin = plugin;
-        this.config = plugin.getConfiguration();
+        config = plugin.getConfiguration();
 
-        this.queue = new ConcurrentHashMap<>();
+        queue = new ConcurrentHashMap<>();
     }
 
     private MarkerSet buildMarkerSet(MarkerAPI markerAPI) {
@@ -42,28 +42,28 @@ private MarkerSet buildMarkerSet(MarkerAPI markerAPI) {
     public void hookBlueMap(BlueMapAPI blueMapAPI) {
         Bukkit.getScheduler().runTaskAsynchronously(plugin, bukkitTask -> {
             try {
-                final MarkerAPI markerAPI = blueMapAPI.getMarkerAPI();
-                plugin.logToConsole(Level.INFO, "Loading Landlord markers...");
+                MarkerAPI markerAPI = blueMapAPI.getMarkerAPI();
+                plugin.getLogger().info("Loading Landlord markers...");
 
-                final MarkerSet markerSet = buildMarkerSet(markerAPI);
-                final int size = markerSet.getMarkers().size();
+                MarkerSet markerSet = buildMarkerSet(markerAPI);
+                int size = markerSet.getMarkers().size();
 
-                plugin.logToConsole(Level.INFO, "Updating Landlord markers...");
+                plugin.getLogger().info("Updating Landlord markers...");
                 markerSet.setLabel(config.getMarkerSetLabel());
                 markerSet.setDefaultHidden(config.isMarkerSetDefaultHidden());
                 markerSet.setToggleable(config.isMarkerSetToggleable());
 
                 if (size == 0) {
-                    plugin.logToConsole(Level.WARNING, "Landlord markers not found!");
+                    plugin.getLogger().warning("Landlord markers not found!");
                     importLands(blueMapAPI, markerAPI, markerSet);
                 } else {
-                    plugin.logToConsole(Level.INFO, size + " Landlord markers found!");
+                    plugin.getLogger().info(size + " Landlord markers found!");
                     markerAPI.save();
                 }
-                plugin.logToConsole(Level.INFO, "Loading update task...");
+                plugin.getLogger().info("Loading update task...");
                 initUpdateTask();
             } catch (IOException e) {
-                e.printStackTrace();
+                plugin.getLogger().log(Level.SEVERE, "Could not retrieve marker api", e);
             }
         });
     }
@@ -71,14 +71,14 @@ public void hookBlueMap(BlueMapAPI blueMapAPI) {
     public void unhookBlueMap(BlueMapAPI blueMapAPI) {
         try {
             updateTask.cancel();
-            final MarkerAPI markerAPI = blueMapAPI.getMarkerAPI();
+            MarkerAPI markerAPI = blueMapAPI.getMarkerAPI();
 
-            final Set<IOwnedLand> ownedLands = plugin.getLandLordAPI().getWGManager().getRegions();
-            plugin.logToConsole(Level.WARNING, "Checking " + ownedLands.size() + " lands and processing " + queue.size() + " remaining updates, this could take a while...");
+            Set<IOwnedLand> ownedLands = plugin.getLandLordAPI().getWGManager().getRegions();
+            plugin.getLogger().warning("Checking " + ownedLands.size() + " lands and processing " + queue.size() + " remaining updates, this could take a while...");
 
             for (IOwnedLand ownedLand : plugin.getLandLordAPI().getWGManager().getRegions()) {
-                final OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(ownedLand.getOwner());
-                final Instant lastPlayed = Instant.ofEpochMilli(offlinePlayer.getLastPlayed());
+                OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(ownedLand.getOwner());
+                Instant lastPlayed = Instant.ofEpochMilli(offlinePlayer.getLastPlayed());
 
                 if (lastPlayed.isBefore(Instant.now().minus(config.getMarkerSetLifetime(), ChronoUnit.DAYS))) {
                     enqueueLand(ownedLand, UpdateReason.UNCLAIM);
@@ -86,7 +86,7 @@ public void unhookBlueMap(BlueMapAPI blueMapAPI) {
             }
             processQueue(blueMapAPI, markerAPI, buildMarkerSet(markerAPI), Integer.MAX_VALUE);
         } catch (IOException e) {
-            e.printStackTrace();
+            plugin.getLogger().log(Level.SEVERE, "Could not retrieve marker api", e);
         }
     }
 
@@ -97,17 +97,17 @@ public void initUpdateTask() {
         updateTask = Bukkit.getScheduler().runTaskTimerAsynchronously(plugin, () ->
                 BlueMapAPI.getInstance().ifPresent(blueMapAPI -> {
                     try {
-                        final MarkerAPI markerAPI = blueMapAPI.getMarkerAPI();
+                        MarkerAPI markerAPI = blueMapAPI.getMarkerAPI();
                         processQueue(blueMapAPI, markerAPI, buildMarkerSet(markerAPI), config.getMaxProcessedPerUpdate());
                     } catch (IOException e) {
-                        e.printStackTrace();
+                        plugin.getLogger().log(Level.SEVERE, "Could not retrieve marker api", e);
                     }
                 }), config.getUpdateTaskFrequency(), config.getUpdateTaskFrequency());
     }
 
     private void importLands(BlueMapAPI blueMapAPI, MarkerAPI markerAPI, MarkerSet markerSet) {
-        final Set<IOwnedLand> ownedLands = plugin.getLandLordAPI().getWGManager().getRegions();
-        plugin.logToConsole(Level.WARNING, "Importing " + ownedLands.size() + " lands, this could take a while...");
+        Set<IOwnedLand> ownedLands = plugin.getLandLordAPI().getWGManager().getRegions();
+        plugin.getLogger().warning("Importing " + ownedLands.size() + " lands, this could take a while...");
 
 //        final BlueMapIsland blueMapIsland = new BlueMapIsland(plugin, plugin.getLandLordAPI().getWGManager().getRegion("world_1429_-2113"));
 //
@@ -145,8 +145,8 @@ private void importLands(BlueMapAPI blueMapAPI, MarkerAPI markerAPI, MarkerSet m
 //        }
 
         for (IOwnedLand ownedLand : plugin.getLandLordAPI().getWGManager().getRegions()) {
-            final OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(ownedLand.getOwner());
-            final Instant lastPlayed = Instant.ofEpochMilli(offlinePlayer.getLastPlayed());
+            OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(ownedLand.getOwner());
+            Instant lastPlayed = Instant.ofEpochMilli(offlinePlayer.getLastPlayed());
 
             if (lastPlayed.isAfter(Instant.now().minus(config.getMarkerSetLifetime(), ChronoUnit.DAYS))) {
                 enqueueLand(ownedLand, UpdateReason.CLAIM);
@@ -157,20 +157,15 @@ private void importLands(BlueMapAPI blueMapAPI, MarkerAPI markerAPI, MarkerSet m
     }
 
     public void enqueueLand(IOwnedLand ownedLand, UpdateReason updateReason) {
-        if (ownedLand == null || ownedLand.getOwner() == null)
-            return;
+        if (ownedLand == null || ownedLand.getOwner() == null) return;
 
         queue.compute(ownedLand, (queuedOwnedLand, queuedUpdateReason) -> {
-            if (queuedUpdateReason == null) {
-                return updateReason;
-            }
+            if (queuedUpdateReason == null) return updateReason;
 
             switch (queuedUpdateReason) {
                 case CLAIM:
                 case UNCLAIM:
-                    if (updateReason == UpdateReason.MANAGE) {
-                        return queuedUpdateReason;
-                    }
+                    if (updateReason == UpdateReason.MANAGE) return queuedUpdateReason;
                 default:
                     return updateReason;
             }
@@ -181,7 +176,7 @@ private void processQueue(BlueMapAPI blueMapAPI, MarkerAPI markerAPI, MarkerSet
         int iterations = 0;
 
         for (Iterator<Map.Entry<IOwnedLand, UpdateReason>> iterator = queue.entrySet().iterator(); iterator.hasNext() && iterations < limit; ) {
-            final Map.Entry<IOwnedLand, UpdateReason> entry = iterator.next();
+            Map.Entry<IOwnedLand, UpdateReason> entry = iterator.next();
 
             new BlueMapLand(plugin, entry.getKey()).process(blueMapAPI, markerSet, entry.getValue());
 
@@ -189,13 +184,13 @@ private void processQueue(BlueMapAPI blueMapAPI, MarkerAPI markerAPI, MarkerSet
             iterations++;
         }
 
-        if (iterations == 0)
-            return;
+        if (iterations == 0) return;
+
         try {
             markerAPI.save();
         } catch (IOException e) {
-            e.printStackTrace();
+            plugin.getLogger().log(Level.SEVERE, "Could not save to marker api", e);
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/LandLordMap-bluemap/src/main/java/biz/princeps/landlordmap/bluemap/integration/BlueMapLand.java b/LandLordMap-bluemap/src/main/java/biz/princeps/landlordmap/bluemap/integration/BlueMapLand.java
index b3f2620..fcfa519 100644
--- a/LandLordMap-bluemap/src/main/java/biz/princeps/landlordmap/bluemap/integration/BlueMapLand.java
+++ b/LandLordMap-bluemap/src/main/java/biz/princeps/landlordmap/bluemap/integration/BlueMapLand.java
@@ -31,19 +31,19 @@ public class BlueMapLand {
     private final String members;
 
     public BlueMapLand(LLBlueMap plugin, IOwnedLand ownedLand) {
-        this.config = plugin.getConfiguration();
+        config = plugin.getConfiguration();
 
-        this.id = ownedLand.getName();
-        this.label = config.getBlueMapLandLabel().replace("%ID%", id);
-        this.world = ownedLand.getWorld().getName();
+        id = ownedLand.getName();
+        label = config.getBlueMapLandLabel().replace("%ID%", id);
+        world = ownedLand.getWorld().getName();
 
-        final Chunk chunk = ownedLand.getChunk();
-        this.firstCorner = new Vector2d(chunk.getX() << 4, chunk.getZ() << 4);
-        this.secondCorner = new Vector2d((chunk.getX() << 4) + 16, (chunk.getZ() << 4) + 16);
+        Chunk chunk = ownedLand.getChunk();
+        firstCorner = new Vector2d(chunk.getX() << 4, chunk.getZ() << 4);
+        secondCorner = new Vector2d((chunk.getX() << 4) + 16, (chunk.getZ() << 4) + 16);
 
-        this.owner = ownedLand.getOwner();
-        this.owners = ownedLand.getOwnersString();
-        this.members = ownedLand.getMembersString();
+        owner = ownedLand.getOwner();
+        owners = ownedLand.getOwnersString();
+        members = ownedLand.getMembersString();
     }
 
     public String getId() {
@@ -83,11 +83,11 @@ public void process(BlueMapAPI blueMapAPI, MarkerSet markerSet, UpdateReason upd
     }
 
     public ObjectMarker add(BlueMapAPI blueMapAPI, MarkerSet markerSet) {
-        final Optional<BlueMapMap> optionalBlueMapMap = blueMapAPI.getMap(world);
+        Optional<BlueMapMap> optionalBlueMapMap = blueMapAPI.getMap(world);
         if (!optionalBlueMapMap.isPresent())
             return null;
 
-        final ShapeMarker marker = markerSet.createShapeMarker(
+        ShapeMarker marker = markerSet.createShapeMarker(
                 id,
                 optionalBlueMapMap.get(),
                 Shape.createRect(firstCorner, secondCorner),
@@ -98,12 +98,12 @@ public ObjectMarker add(BlueMapAPI blueMapAPI, MarkerSet markerSet) {
         marker.setLineColor(config.getBlueMapLandLineColor());
         marker.setLineWidth(config.getBlueMapLandLineWidth());
 
-        final Color fillColor;
+        Color fillColor;
         if (config.isBlueMapLandOwnerBased()) {
-            final Color playerColor = new Color((int) owner.getMostSignificantBits());
+            Color playerColor = new Color((int) owner.getMostSignificantBits());
             fillColor = new Color(playerColor.getRed(), playerColor.getGreen(), playerColor.getBlue(), config.getBlueMapLandFillAlpha());
         } else {
-            final Color configColor = config.getBlueMapLandFillColor();
+            Color configColor = config.getBlueMapLandFillColor();
             fillColor = new Color(configColor.getRed(), configColor.getGreen(), configColor.getBlue(), config.getBlueMapLandFillAlpha());
         }
         marker.setFillColor(fillColor);
@@ -119,7 +119,7 @@ public void remove(MarkerSet markerSet) {
     }
 
     public void update(BlueMapAPI blueMapAPI, MarkerSet markerSet) {
-        final ObjectMarker marker = (ObjectMarker) markerSet.getMarker(id).orElse(add(blueMapAPI, markerSet));
+        ObjectMarker marker = (ObjectMarker) markerSet.getMarker(id).orElse(add(blueMapAPI, markerSet));
         if (marker == null)
             return;
 
diff --git a/LandLordMap-bluemap/src/main/java/biz/princeps/landlordmap/bluemap/integration/island/BlueMapIsland.java b/LandLordMap-bluemap/src/main/java/biz/princeps/landlordmap/bluemap/integration/island/BlueMapIsland.java
index f905cbe..420a939 100644
--- a/LandLordMap-bluemap/src/main/java/biz/princeps/landlordmap/bluemap/integration/island/BlueMapIsland.java
+++ b/LandLordMap-bluemap/src/main/java/biz/princeps/landlordmap/bluemap/integration/island/BlueMapIsland.java
@@ -17,8 +17,8 @@ public class BlueMapIsland {
     public BlueMapIsland(LLBlueMap plugin, IOwnedLand ownedLand) {
         this.plugin = plugin;
 
-        this.owner = ownedLand.getOwner();
-        this.lands = new HashMap<>();
+        owner = ownedLand.getOwner();
+        lands = new HashMap<>();
 
         recursiveSearch(ownedLand);
     }
@@ -35,8 +35,8 @@ private void recursiveSearch(IOwnedLand center) {
         if (center == null || lands.containsKey(center))
             return;
 
-        final IOwnedLand[] adjacents = plugin.getLandLordAPI().getWGManager().getSurroundingsOwner(center, owner);
-        final Set<Direction> directions = new HashSet<>();
+        IOwnedLand[] adjacents = plugin.getLandLordAPI().getWGManager().getSurroundingsOwner(center, owner);
+        Set<Direction> directions = EnumSet.noneOf(Direction.class);
 
         for (Direction direction : Direction.values()) {
             if (adjacents[direction.getIndex()] == null) {
@@ -51,17 +51,17 @@ private void recursiveSearch(IOwnedLand center) {
     }
 
     public Vector2d[] getBorderPoints() {
-        final Set<Vector2d> points = new LinkedHashSet<>();
+        Set<Vector2d> points = new LinkedHashSet<>();
 
         for (Map.Entry<IOwnedLand, Set<Direction>> entry : lands.entrySet()) {
-            final Set<Direction> directions = entry.getValue();
+            Set<Direction> directions = entry.getValue();
 
             if (directions.isEmpty())
                 continue;
-            final IOwnedLand iOwnedLand = entry.getKey();
-            final Chunk chunk = iOwnedLand.getChunk();
-            final int chunkX = chunk.getX();
-            final int chunkZ = chunk.getZ();
+            IOwnedLand iOwnedLand = entry.getKey();
+            Chunk chunk = iOwnedLand.getChunk();
+            int chunkX = chunk.getX();
+            int chunkZ = chunk.getZ();
 
             for (Direction direction : directions) {
                 points.add(direction.getFirstPoint(chunkX, chunkZ));
diff --git a/LandLordMap-bluemap/src/main/java/biz/princeps/landlordmap/bluemap/listeners/LandlordListener.java b/LandLordMap-bluemap/src/main/java/biz/princeps/landlordmap/bluemap/listeners/LandlordListener.java
index 08a15ec..601f90f 100644
--- a/LandLordMap-bluemap/src/main/java/biz/princeps/landlordmap/bluemap/listeners/LandlordListener.java
+++ b/LandLordMap-bluemap/src/main/java/biz/princeps/landlordmap/bluemap/listeners/LandlordListener.java
@@ -27,17 +27,18 @@ public class LandlordListener implements Listener {
 
     public LandlordListener(LLBlueMap plugin, BlueMapIntegration blueMapIntegration) {
         this.plugin = plugin;
-        this.config = plugin.getConfiguration();
+        config = plugin.getConfiguration();
         this.blueMapIntegration = blueMapIntegration;
     }
 
     @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
     public void onAsyncPlayerPreLoginEvent(AsyncPlayerPreLoginEvent event) {
-        if (event.getLoginResult() != AsyncPlayerPreLoginEvent.Result.ALLOWED)
+        if (event.getLoginResult() != AsyncPlayerPreLoginEvent.Result.ALLOWED){
             return;
-        final UUID uuid = event.getUniqueId();
-        final OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(uuid);
-        final Instant lastPlayed = Instant.ofEpochMilli(offlinePlayer.getLastPlayed());
+        }
+        UUID uuid = event.getUniqueId();
+        OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(uuid);
+        Instant lastPlayed = Instant.ofEpochMilli(offlinePlayer.getLastPlayed());
 
         if (lastPlayed.isBefore(Instant.now().minus(config.getMarkerSetLifetime(), ChronoUnit.DAYS))) {
             for (IOwnedLand ownedLand : plugin.getLandLordAPI().getWGManager().getRegions(uuid)) {
@@ -58,9 +59,9 @@ public void onLandUnclaimEvent(LandUnclaimEvent event) {
 
     @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
     public void onLandManageEvent(LandManageEvent event) {
-        if (!event.getFlagChanged().equals("FRIENDS"))
+        if (!"FRIENDS".equals(event.getFlagChanged()))
             return;
         blueMapIntegration.enqueueLand(event.getLand(), UpdateReason.MANAGE);
     }
 
-}
\ No newline at end of file
+}
diff --git a/LandLordMap-bluemap/src/main/java/biz/princeps/landlordmap/bluemap/utils/Constants.java b/LandLordMap-bluemap/src/main/java/biz/princeps/landlordmap/bluemap/utils/Constants.java
index cf0622a..552986e 100644
--- a/LandLordMap-bluemap/src/main/java/biz/princeps/landlordmap/bluemap/utils/Constants.java
+++ b/LandLordMap-bluemap/src/main/java/biz/princeps/landlordmap/bluemap/utils/Constants.java
@@ -1,6 +1,9 @@
 package biz.princeps.landlordmap.bluemap.utils;
 
-public class Constants {
+public final class Constants {
+    private Constants() {
+        throw new UnsupportedOperationException("This is a utility class.");
+    }
 
     public static final String MARKER_SET_ID = "LandLordMap";
 
diff --git a/LandLordMap-core/build.gradle.kts b/LandLordMap-core/build.gradle.kts
index 1f80a1c..ca5bb4a 100644
--- a/LandLordMap-core/build.gradle.kts
+++ b/LandLordMap-core/build.gradle.kts
@@ -3,9 +3,9 @@ plugins {
 }
 
 dependencies {
-    compileOnly("org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT")
-    compileOnly("biz.princeps:landlord-core:4.360")
-    compileOnly("de.eldoria:eldo-util:1.11.0-DEV")
+    api("org.spigotmc", "spigot-api", "1.16.5-R0.1-SNAPSHOT")
+    api("biz.princeps", "landlord-core", "4.363")
+    api("de.eldoria", "eldo-util", "1.11.0-DEV")
 }
 
-description = "LandLordMap-core"
\ No newline at end of file
+description = "LandLordMap-core"
diff --git a/LandLordMap-dynmap/build.gradle.kts b/LandLordMap-dynmap/build.gradle.kts
index 16a555e..358c8a7 100644
--- a/LandLordMap-dynmap/build.gradle.kts
+++ b/LandLordMap-dynmap/build.gradle.kts
@@ -1,13 +1,10 @@
 plugins {
     id("biz.princeps.java-conventions")
-    id("com.github.johnrengelman.shadow") version "7.0.0"
+    id("com.github.johnrengelman.shadow") version "8.1.1"
 }
 
 dependencies {
     implementation(project(":LandLordMap-core"))
-    compileOnly("org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT")
-    compileOnly("biz.princeps:landlord-core:4.360")
-    compileOnly("de.eldoria:eldo-util:1.11.0-DEV")
     compileOnly("us.dynmap:dynmap-api:3.0")
     implementation("org.codemc.worldguardwrapper:worldguardwrapper:1.2.0-SNAPSHOT")
 }
@@ -45,4 +42,4 @@ tasks {
             events("passed", "skipped", "failed")
         }
     }
-}
\ No newline at end of file
+}
diff --git a/LandLordMap-dynmap/src/main/java/biz/princeps/landlordmap/dynmap/FlatFileStorage.java b/LandLordMap-dynmap/src/main/java/biz/princeps/landlordmap/dynmap/FlatFileStorage.java
index 00d7602..b7900f6 100644
--- a/LandLordMap-dynmap/src/main/java/biz/princeps/landlordmap/dynmap/FlatFileStorage.java
+++ b/LandLordMap-dynmap/src/main/java/biz/princeps/landlordmap/dynmap/FlatFileStorage.java
@@ -14,6 +14,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.*;
+import java.util.logging.Level;
 
 public class FlatFileStorage {
 
@@ -42,7 +43,7 @@ public void init() {
         try {
             customConfig.load(customConfigFile);
         } catch (IOException | InvalidConfigurationException e) {
-            e.printStackTrace();
+            pl.getLogger().log(Level.SEVERE, "coult not load config", e);
         }
 
     }
@@ -58,7 +59,7 @@ public Map<World, IsleGenerator> getIsles() {
 
         for (World world : Bukkit.getWorlds()) {
             ConfigurationSection section = customConfig.getConfigurationSection(world.getName());
-            if (section == null || section.getKeys(false).size() == 0) {
+            if (section == null || section.getKeys(false).isEmpty()) {
                 continue;
             }
             IsleGenerator gen = new IsleGenerator(pl, world);
@@ -132,4 +133,4 @@ public synchronized void save() {
             e.printStackTrace();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/LandLordMap-dynmap/src/main/java/biz/princeps/landlordmap/dynmap/LLDynmap.java b/LandLordMap-dynmap/src/main/java/biz/princeps/landlordmap/dynmap/LLDynmap.java
index ed73821..9504e5d 100644
--- a/LandLordMap-dynmap/src/main/java/biz/princeps/landlordmap/dynmap/LLDynmap.java
+++ b/LandLordMap-dynmap/src/main/java/biz/princeps/landlordmap/dynmap/LLDynmap.java
@@ -37,26 +37,26 @@ public void onLoad() {
     @Override
     public void onEnable() {
         try {
-            this.dynMap = (DynmapAPI) getServer().getPluginManager().getPlugin("dynmap");
+            dynMap = (DynmapAPI) getServer().getPluginManager().getPlugin("dynmap");
         } catch (NoClassDefFoundError ex) {
             getLogger().warning("dynMap is missing! Couldn't start LLDM!!!");
-            this.getPluginLoader().disablePlugin(this);
+            getPluginLoader().disablePlugin(this);
             return;
         }
         try {
-            this.api = (ILandLord) getServer().getPluginManager().getPlugin("Landlord");
+            api = (ILandLord) getServer().getPluginManager().getPlugin("Landlord");
         } catch (NoClassDefFoundError ex) {
             getLogger().warning("Landlord missing! Please make sure to install the latest version of Landlord!");
-            this.getPluginLoader().disablePlugin(this);
+            getPluginLoader().disablePlugin(this);
             return;
         }
         initMarkers();
         flatFileStorage = new FlatFileStorage(this);
-        this.playerManager = new PlayerManager(this);
-        this.worldGuardHandler = api.getWGManager();
+        playerManager = new PlayerManager(this);
+        worldGuardHandler = api.getWGManager();
 
-        this.landHelper = new LandHelper(this, worldGuardHandler);
-        this.isleGenerator = flatFileStorage.getIsles();
+        landHelper = new LandHelper(this, worldGuardHandler);
+        isleGenerator = flatFileStorage.getIsles();
 
         PrincepsLib.getCommandManager().registerCommand(new Commands(this));
 
@@ -70,7 +70,7 @@ public void onDisable() {
     }
 
     private void initListener() {
-        this.getServer().getPluginManager().registerEvents(new LandlordListener(this), this);
+        getServer().getPluginManager().registerEvents(new LandlordListener(this), this);
     }
 
     /**
@@ -126,7 +126,7 @@ public Map<World, IsleGenerator> getIsleGenerator() {
 
     public void debug(String message) {
         if (getConfig().getBoolean("debugging", false))
-            this.getLogger().info(message);
+            getLogger().info(message);
     }
 
     public String getMessage(String path) {
diff --git a/LandLordMap-dynmap/src/main/java/biz/princeps/landlordmap/dynmap/LandHelper.java b/LandLordMap-dynmap/src/main/java/biz/princeps/landlordmap/dynmap/LandHelper.java
index 8432af6..fe8dc94 100644
--- a/LandLordMap-dynmap/src/main/java/biz/princeps/landlordmap/dynmap/LandHelper.java
+++ b/LandLordMap-dynmap/src/main/java/biz/princeps/landlordmap/dynmap/LandHelper.java
@@ -27,7 +27,7 @@ public class LandHelper {
 
     public LandHelper(LLDynmap p, IWorldGuardManager wg) {
         this.wg = wg;
-        this.pl = p;
+        pl = p;
     }
 
     /**
diff --git a/LandLordMap-dynmap/src/main/java/biz/princeps/landlordmap/dynmap/PlayerManager.java b/LandLordMap-dynmap/src/main/java/biz/princeps/landlordmap/dynmap/PlayerManager.java
index e0f788b..5dfd218 100644
--- a/LandLordMap-dynmap/src/main/java/biz/princeps/landlordmap/dynmap/PlayerManager.java
+++ b/LandLordMap-dynmap/src/main/java/biz/princeps/landlordmap/dynmap/PlayerManager.java
@@ -36,7 +36,7 @@ public PlayerManager(LLDynmap pl) {
                 pl.getLogger().warning("Could not create data.yml!");
             }
         }
-        this.data = YamlConfiguration.loadConfiguration(file);
+        data = YamlConfiguration.loadConfiguration(file);
     }
 
     /**
diff --git a/LandLordMap-dynmap/src/main/java/biz/princeps/landlordmap/dynmap/commands/Color.java b/LandLordMap-dynmap/src/main/java/biz/princeps/landlordmap/dynmap/commands/Color.java
index 45112df..9e12495 100644
--- a/LandLordMap-dynmap/src/main/java/biz/princeps/landlordmap/dynmap/commands/Color.java
+++ b/LandLordMap-dynmap/src/main/java/biz/princeps/landlordmap/dynmap/commands/Color.java
@@ -21,7 +21,7 @@ public Color(LLDynmap pl) {
                 Sets.newHashSet(pl.getConfig().getStringList("CommandSettings.color.permissions")),
                 Sets.newHashSet(pl.getConfig().getStringList("CommandSettings.color.aliases")));
         this.pl = pl;
-        this.wgm = pl.getWorldGuardHandler();
+        wgm = pl.getWorldGuardHandler();
     }
 
     @Override
@@ -35,10 +35,10 @@ public void onCommand(Properties properties, Arguments arguments) {
             return;
         }
 
-        long hex = 0xffffff;
+        long hex;
         try {
             hex = Long.parseLong(arguments.get(0), 16);
-        } catch (Exception ex) {
+        } catch (NumberFormatException ex) {
             properties.sendMessage(pl.getMessage("CommandSettings.color.messages.wrongformat"));
             return;
         }
diff --git a/LandLordMap-dynmap/src/main/java/biz/princeps/landlordmap/dynmap/commands/Commands.java b/LandLordMap-dynmap/src/main/java/biz/princeps/landlordmap/dynmap/commands/Commands.java
index 06374f8..174eb0f 100644
--- a/LandLordMap-dynmap/src/main/java/biz/princeps/landlordmap/dynmap/commands/Commands.java
+++ b/LandLordMap-dynmap/src/main/java/biz/princeps/landlordmap/dynmap/commands/Commands.java
@@ -24,10 +24,10 @@ public Commands(LLDynmap pl) {
                 Sets.newHashSet(pl.getConfig().getStringList("CommandSettings.Main.permissions")),
                 pl.getConfig().getStringList("CommandSettings.Main.aliases").toArray(new String[]{}));
         this.pl = pl;
-        this.wgm = pl.getWorldGuardHandler();
+        wgm = pl.getWorldGuardHandler();
 
-        this.addSubcommand(new Import(pl));
-        this.addSubcommand(new Color(pl));
+        addSubcommand(new Import(pl));
+        addSubcommand(new Color(pl));
     }
 
     @Override
@@ -43,7 +43,7 @@ public List<String> tabComplete(CommandSender sender, String alias, String[] arg
         }
 
         if (args.length == 2) {
-            if (args[0].equalsIgnoreCase("import")) {
+            if ("import".equalsIgnoreCase(args[0])) {
                 Collections.addAll(tabReturn, "all", "wg", "ll");
             }
         }
diff --git a/LandLordMap-dynmap/src/main/java/biz/princeps/landlordmap/dynmap/commands/Import.java b/LandLordMap-dynmap/src/main/java/biz/princeps/landlordmap/dynmap/commands/Import.java
index 92cc606..a0b5140 100644
--- a/LandLordMap-dynmap/src/main/java/biz/princeps/landlordmap/dynmap/commands/Import.java
+++ b/LandLordMap-dynmap/src/main/java/biz/princeps/landlordmap/dynmap/commands/Import.java
@@ -35,7 +35,7 @@ public Import(LLDynmap pl) {
                 Sets.newHashSet(pl.getConfig().getStringList("CommandSettings.import.permissions")),
                 Sets.newHashSet(pl.getConfig().getStringList("CommandSettings.import.aliases")));
         this.pl = pl;
-        this.wgm = pl.getWorldGuardHandler();
+        wgm = pl.getWorldGuardHandler();
         defaultVal = pl.getConfig().getBoolean("WorldGuard.color.default");
         showflag = pl.getConfig().getBoolean("WorldGuard.color.show_flag");
 
@@ -44,7 +44,7 @@ public Import(LLDynmap pl) {
     @Override
     public void onCommand(Properties properties, Arguments arguments) {
         //lldm import <option>
-        if (arguments.size() == 0 || (arguments.size() == 1 && arguments.get()[0].equalsIgnoreCase("all"))) {
+        if (arguments.size() == 0 || (arguments.size() == 1 && "all".equalsIgnoreCase(arguments.get()[0]))) {
             // assume all
             properties.getCommandSender().sendMessage(ChatColor.GREEN + "Starting to import all regions into dynmap!");
             run(() -> {
@@ -112,4 +112,4 @@ private void importWorldguard() {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/LandLordMap-dynmap/src/main/java/biz/princeps/landlordmap/dynmap/graph/Graph.java b/LandLordMap-dynmap/src/main/java/biz/princeps/landlordmap/dynmap/graph/Graph.java
index 84aec98..5ff33f5 100644
--- a/LandLordMap-dynmap/src/main/java/biz/princeps/landlordmap/dynmap/graph/Graph.java
+++ b/LandLordMap-dynmap/src/main/java/biz/princeps/landlordmap/dynmap/graph/Graph.java
@@ -13,7 +13,7 @@ class Graph {
     private static final int NIL = -1;
     private List<Bridge> bridges;
 
-    public Graph(int v) {
+    Graph(int v) {
         V = v;
         adj = new LinkedList[v];
         for (int i = 0; i < v; ++i)
@@ -77,13 +77,13 @@ public List<Bridge> bridge() {
         return bridges;
     }
 
-    class Bridge {
+    static class Bridge {
         final int one;
         final int two;
 
-        public Bridge(int u, int v) {
-            this.one = u;
-            this.two = v;
+        Bridge(int u, int v) {
+            one = u;
+            two = v;
         }
 
         @Override
@@ -94,4 +94,4 @@ public String toString() {
                     '}';
         }
     }
-}
\ No newline at end of file
+}
diff --git a/LandLordMap-dynmap/src/main/java/biz/princeps/landlordmap/dynmap/graph/GraphManager.java b/LandLordMap-dynmap/src/main/java/biz/princeps/landlordmap/dynmap/graph/GraphManager.java
index 806a5a3..34ee4bf 100644
--- a/LandLordMap-dynmap/src/main/java/biz/princeps/landlordmap/dynmap/graph/GraphManager.java
+++ b/LandLordMap-dynmap/src/main/java/biz/princeps/landlordmap/dynmap/graph/GraphManager.java
@@ -12,9 +12,9 @@ public class GraphManager {
     private final LLDynmap pl;
 
     public GraphManager(LLDynmap pl, Set<IOwnedLand> lands) {
-        this.vertices = new ArrayList<>(lands);
+        vertices = new ArrayList<>(lands);
         this.pl = pl;
-        this.graph = new Graph(vertices.size());
+        graph = new Graph(vertices.size());
 
         for (int i = 0; i < vertices.size(); i++) {
             IOwnedLand[] adjacent = pl.getWorldGuardHandler().getSurroundings(vertices.get(i));
@@ -45,7 +45,7 @@ public Map<IOwnedLand, Set<IOwnedLand>> findSections(IOwnedLand pr) {
         // first step, get neighbors of pr
         IOwnedLand[] adjacentOfOwner = pl.getWorldGuardHandler().getSurroundingsOwner(pr, pr.getOwner());
         for (IOwnedLand protectedRegion : adjacentOfOwner) {
-            if (protectedRegion != null && this.vertices.contains(protectedRegion)) {
+            if (protectedRegion != null && vertices.contains(protectedRegion)) {
                 queue.add(protectedRegion);
             }
         }
@@ -53,7 +53,7 @@ public Map<IOwnedLand, Set<IOwnedLand>> findSections(IOwnedLand pr) {
         while (!queue.isEmpty()) {
             IOwnedLand pop = queue.pop();
 
-            Set<IOwnedLand> protectedRegionSet = this.breadthFirstSearch(pr, pop);
+            Set<IOwnedLand> protectedRegionSet = breadthFirstSearch(pr, pop);
             sections.put(pop, protectedRegionSet);
 
             queue.removeAll(protectedRegionSet);
@@ -113,7 +113,7 @@ public Set<IOwnedLand> breadthFirstSearch(IOwnedLand ignored, IOwnedLand source)
         visited[s] = true;
         queue.add(s);
 
-        while (queue.size() != 0) {
+        while (!queue.isEmpty()) {
             s = queue.poll();
             protectedRegionSet.add(vertices.get(s));
             for (Integer n : graph.adj(s)) {
@@ -129,4 +129,3 @@ public Set<IOwnedLand> breadthFirstSearch(IOwnedLand ignored, IOwnedLand source)
     }
 
 }
-
diff --git a/LandLordMap-dynmap/src/main/java/biz/princeps/landlordmap/dynmap/island/Island.java b/LandLordMap-dynmap/src/main/java/biz/princeps/landlordmap/dynmap/island/Island.java
index 92a38bf..f2799ee 100644
--- a/LandLordMap-dynmap/src/main/java/biz/princeps/landlordmap/dynmap/island/Island.java
+++ b/LandLordMap-dynmap/src/main/java/biz/princeps/landlordmap/dynmap/island/Island.java
@@ -43,19 +43,19 @@ public Island(LLDynmap pl, World world, String name, UUID owner, Set<IOwnedLand>
     public Island(LLDynmap pl, World world, String name, UUID owner, Set<IOwnedLand> prs, Map<String, PolyLineMarker> polys, MarkerSet am) {
         this.name = name;
         this.pl = pl;
-        this.protectedRegions = prs;
-        this.polyLineIds = polys;
+        protectedRegions = prs;
+        polyLineIds = polys;
         this.am = am;
         this.world = world;
         this.owner = owner;
-        this.transparency = pl.getConfig().getDouble("Coloring.transparency", 0.6);
+        transparency = pl.getConfig().getDouble("Coloring.transparency", 0.6);
 
         // Calculates the color depending on config options.
         switch (pl.getConfig().getString("Coloring.mode").toUpperCase()) {
             case "STATIC":
-                this.landHex = pl.getConfig().getLong("Coloring.static.land");
-                this.lineHex = pl.getConfig().getLong("Coloring.static.line");
-                this.linethickness = pl.getConfig().getLong("Coloring.static.linethickness");
+                landHex = pl.getConfig().getLong("Coloring.static.land");
+                lineHex = pl.getConfig().getLong("Coloring.static.line");
+                linethickness = pl.getConfig().getLong("Coloring.static.linethickness");
                 break;
 
             case "RANDOMPERPLAYER":
@@ -63,15 +63,15 @@ public Island(LLDynmap pl, World world, String name, UUID owner, Set<IOwnedLand>
                     long fill = pl.getLandHelper().randomColor();
                     pl.getPlayerManager().add(owner, fill, fill);
                 }
-                this.landHex = pl.getPlayerManager().getLandColor(owner);
-                this.lineHex = pl.getPlayerManager().getLineColor(owner);
-                this.linethickness = pl.getConfig().getLong("Coloring.randomperplayer.linethickness");
+                landHex = pl.getPlayerManager().getLandColor(owner);
+                lineHex = pl.getPlayerManager().getLineColor(owner);
+                linethickness = pl.getConfig().getLong("Coloring.randomperplayer.linethickness");
                 break;
 
             case "RANDOMPERISLAND":
-                this.landHex = pl.getLandHelper().randomColor();
-                this.lineHex = landHex;
-                this.linethickness = pl.getConfig().getLong("Coloring.randomperisland.linethickness");
+                landHex = pl.getLandHelper().randomColor();
+                lineHex = landHex;
+                linethickness = pl.getConfig().getLong("Coloring.randomperisland.linethickness");
                 break;
 
             case "RANDOMFROMSETPERPLAYER":
@@ -82,16 +82,16 @@ public Island(LLDynmap pl, World world, String name, UUID owner, Set<IOwnedLand>
                     pl.getPlayerManager().add(owner, fill, fill);
                 }
 
-                this.landHex = pl.getPlayerManager().getLandColor(owner);
-                this.lineHex = pl.getPlayerManager().getLineColor(owner);
-                this.linethickness = pl.getConfig().getLong("Coloring.randomfromsetperplayer.linethickness");
+                landHex = pl.getPlayerManager().getLandColor(owner);
+                lineHex = pl.getPlayerManager().getLineColor(owner);
+                linethickness = pl.getConfig().getLong("Coloring.randomfromsetperplayer.linethickness");
                 break;
 
             case "RANDOMFROMSETPERISLAND":
-                this.landHex = pl.getLandHelper().randomColorFromSet(pl.getConfig().getString("Coloring.mode")
+                landHex = pl.getLandHelper().randomColorFromSet(pl.getConfig().getString("Coloring.mode")
                         .toLowerCase());
-                this.lineHex = landHex;
-                this.linethickness = pl.getConfig().getLong("Coloring.randomperisland.linethickness");
+                lineHex = landHex;
+                linethickness = pl.getConfig().getLong("Coloring.randomperisland.linethickness");
                 break;
         }
     }
@@ -117,7 +117,7 @@ public Set<IOwnedLand> getProtectedRegions() {
      */
     public void addPolyLine(PolyLineMarker pl) {
         if (pl != null) {
-            this.polyLineIds.put(pl.getMarkerID(), pl);
+            polyLineIds.put(pl.getMarkerID(), pl);
         }
     }
 
@@ -154,7 +154,7 @@ public boolean containsLineBetween(Node one, Node two) {
      * @param polyLineMarker polyline that should be removed
      */
     public void removePolyLine(PolyLineMarker polyLineMarker) {
-        this.polyLineIds.remove(polyLineMarker.getMarkerID());
+        polyLineIds.remove(polyLineMarker.getMarkerID());
         polyLineMarker.deleteMarker();
     }
 
@@ -181,7 +181,7 @@ public PolyLineMarker getLineBetween(Node one, Node two) {
     public void markLand(IOwnedLand pr) {
         String landname = pr.getName();
 
-        if (this.am.findAreaMarker(landname) != null) {
+        if (am.findAreaMarker(landname) != null) {
             return;
         }
 
@@ -212,7 +212,7 @@ public void markLand(IOwnedLand pr) {
      */
     public void markLine(String id, double[] x, double[] z) {
 
-        if (this.am.findPolyLineMarker(id) != null) {
+        if (am.findPolyLineMarker(id) != null) {
             return;
         }
 
@@ -233,10 +233,10 @@ public UUID getOwner() {
     }
 
     public void setColor(long hex) {
-        this.landHex = hex;
-        this.lineHex = hex;
+        landHex = hex;
+        lineHex = hex;
         for (IOwnedLand land : protectedRegions) {
-            AreaMarker areaMarker = this.am.findAreaMarker(land.getName());
+            AreaMarker areaMarker = am.findAreaMarker(land.getName());
             if (areaMarker != null) {
                 areaMarker.setFillStyle(transparency, (int) landHex);
                 areaMarker.setLineStyle(1, 0, (int) landHex);
@@ -253,7 +253,7 @@ public void setColor(long hex) {
     @Override
     public String toString() {
         ArrayList<String> isles = new ArrayList<>();
-        for (IOwnedLand protectedRegion : this.protectedRegions) {
+        for (IOwnedLand protectedRegion : protectedRegions) {
             isles.add(protectedRegion.getName());
         }
         return "{ ISLAND name=" + name + ", isles=" + isles + "}";
@@ -280,7 +280,7 @@ private boolean isWithinIsland(IWrappedRegion pr) {
      */
     private boolean isWithinIsland(int x, int z) {
         boolean hasXUp = false, hasXDown = false, hasZUp = false, hasZDown = false;
-        for (IOwnedLand inner : this.getProtectedRegions()) {
+        for (IOwnedLand inner : getProtectedRegions()) {
             int xinner = pl.getWorldGuardHandler().getX(inner.getName());
             int zinner = pl.getWorldGuardHandler().getZ(inner.getName());
             if (x >= xinner && zinner == z) {
@@ -335,10 +335,10 @@ public void outline(IOwnedLand pr, IOwnedLand ignored) {
                 n2 = node;
             }
         }
-        pl.debug("x+1 z: " + n1.toString() + ":" + n2.toString());
+        pl.debug("x+1 z: " + n1 + ":" + n2);
         if (adjacentOfOwner[1] == null) {
             pl.debug("\tinserting");
-            markLine(n1.toString() + ":" + n2.toString(), new double[]{n1.x, n2.x}, new double[]{n1.z, n2.z});
+            markLine(n1 + ":" + n2, new double[]{n1.x, n2.x}, new double[]{n1.z, n2.z});
         } else {
             // Remove edge
             if (containsLineBetween(n1, n2)) {
diff --git a/LandLordMap-dynmap/src/main/java/biz/princeps/landlordmap/dynmap/island/IsleGenerator.java b/LandLordMap-dynmap/src/main/java/biz/princeps/landlordmap/dynmap/island/IsleGenerator.java
index 1f4c6e7..14c5c05 100644
--- a/LandLordMap-dynmap/src/main/java/biz/princeps/landlordmap/dynmap/island/IsleGenerator.java
+++ b/LandLordMap-dynmap/src/main/java/biz/princeps/landlordmap/dynmap/island/IsleGenerator.java
@@ -13,7 +13,16 @@
 import org.dynmap.markers.MarkerSet;
 import org.dynmap.markers.PolyLineMarker;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Queue;
+import java.util.Set;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.locks.Lock;
@@ -45,11 +54,11 @@ public class IsleGenerator {
      * @param world  the world to operate on
      */
     public IsleGenerator(LLDynmap plugin, World world) {
-        this.isles = new HashMap<>();
-        this.am = plugin.getLLMarkers();
-        this.pl = plugin;
+        isles = new HashMap<>();
+        am = plugin.getLLMarkers();
+        pl = plugin;
         this.world = world;
-        this.wg = pl.getWorldGuardHandler();
+        wg = pl.getWorldGuardHandler();
 
         // Starting the queue thread
         new BukkitRunnable() {
@@ -82,7 +91,7 @@ public void insert(IOwnedLand ol) {
 
         // Even if the land already exists, it should be updated. This case covers "advertise claim" for example,
         // where owner is replaced.
-        if (this.getIsle(ol.getName()) != null) {
+        if (getIsle(ol.getName()) != null) {
             pl.getLandHelper().updateLand(ol);
             return;
         }
@@ -138,11 +147,11 @@ private void insertLocal(IOwnedLand pr) {
         lands.remove(null);
 
         pl.debug(pr.getName() + ": Lands: " + lands);
+        Set<IOwnedLand> landList = new HashSet<>();
         switch (lands.size()) {
             case 0:
                 // case 1
                 pl.debug("Case 1");
-                Set<IOwnedLand> landList = new HashSet<>();
                 landList.add(pr);
 
                 // Insert a new island and update the marker id
@@ -187,7 +196,6 @@ private void insertLocal(IOwnedLand pr) {
                 pl.debug("Case 3");
                 // Merge all together into a new one
                 // This list will contain all the lands of the new merged huge island
-                landList = new HashSet<>();
                 landList.add(pr);
 
                 Island newIsland = new Island(pl, world, pr.getName(), pr.getOwner(), landList, am);
@@ -237,7 +245,7 @@ private void insertLocal(IOwnedLand pr) {
     public void remove(IOwnedLand pr) {
         lock.lock();
         try {
-            queue.add(() -> this.removeLocal(pr));
+            queue.add(() -> removeLocal(pr));
         } finally {
             lock.unlock();
         }
@@ -269,11 +277,11 @@ private void removeLocal(IOwnedLand pr) {
         pl.debug("Connected Components: " + connectedComponents);
 
         oldIsland.removeVisual();
-        this.isles.remove(oldIsland.getName());
+        isles.remove(oldIsland.getName());
 
         connectedComponents.forEach((l, set) -> {
             Island island = new Island(pl, world, l.getName(), l.getOwner(), set, am);
-            this.isles.put(island.getName(), island);
+            isles.put(island.getName(), island);
             for (IOwnedLand p : set) {
                 island.markLand(p);
                 island.outline(p, pr);
@@ -365,7 +373,7 @@ private double[] toArray(List<Integer> list) {
      * Prints all islands.
      */
     private void printIsles() {
-        if (isles.size() == 0) pl.debug("EMPTY");
+        if (isles.isEmpty()) pl.debug("EMPTY");
         isles.forEach((a, b) -> pl.debug(a + ":\t" + b.getProtectedRegions() + "\n"));
     }
 
diff --git a/LandLordMap-dynmap/src/main/java/biz/princeps/landlordmap/dynmap/island/Node.java b/LandLordMap-dynmap/src/main/java/biz/princeps/landlordmap/dynmap/island/Node.java
index 909e167..9ef389e 100644
--- a/LandLordMap-dynmap/src/main/java/biz/princeps/landlordmap/dynmap/island/Node.java
+++ b/LandLordMap-dynmap/src/main/java/biz/princeps/landlordmap/dynmap/island/Node.java
@@ -7,10 +7,10 @@ class Node {
     final int z;
     final boolean visited;
 
-    public Node(int x, int z) {
+    Node(int x, int z) {
         this.x = x;
         this.z = z;
-        this.visited = false;
+        visited = false;
     }
 
     public Node getLeft() {
diff --git a/LandLordMap-dynmap/src/main/java/biz/princeps/landlordmap/dynmap/worldguard/LLDM_Worldguard.java b/LandLordMap-dynmap/src/main/java/biz/princeps/landlordmap/dynmap/worldguard/LLDM_Worldguard.java
index 525d3b6..fa14b9b 100644
--- a/LandLordMap-dynmap/src/main/java/biz/princeps/landlordmap/dynmap/worldguard/LLDM_Worldguard.java
+++ b/LandLordMap-dynmap/src/main/java/biz/princeps/landlordmap/dynmap/worldguard/LLDM_Worldguard.java
@@ -6,7 +6,12 @@
 
 import java.util.Optional;
 
-public class LLDM_Worldguard {
+public final class LLDM_Worldguard {
+
+    private LLDM_Worldguard() {
+        throw new UnsupportedOperationException("This is a utility class.");
+    }
+
 
     public static IWrappedFlag<Boolean> LLDM_COLOR_FLAG;
 
diff --git a/buildSrc/src/main/kotlin/biz.princeps.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/biz.princeps.java-conventions.gradle.kts
index 5e57902..44bb977 100644
--- a/buildSrc/src/main/kotlin/biz.princeps.java-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/biz.princeps.java-conventions.gradle.kts
@@ -4,18 +4,14 @@ plugins {
 }
 
 group = "biz.princeps"
-version = "2.3"
+version = "2.4.0"
 
 repositories {
     mavenCentral()
-    // JitPack
-    maven { url = uri("https://jitpack.io") }
-    // Spigot
-    maven { url = uri("https://hub.spigotmc.org/nexus/content/repositories/snapshots/") }
+        maven("https://jitpack.io")
     // EldoUtilitites & Landlord
-    maven { url = uri("https://eldonexus.de/repository/maven-public/") }
-    // CodeMc-public
-    maven { url = uri("https://repo.codemc.org/repository/maven-public/") }
+    maven ("https://eldonexus.de/repository/maven-public/")
+    maven ("https://eldonexus.de/repository/maven-proxies/")
     // Dynmap
     maven { url = uri("https://repo.mikeprimm.com/") }
 }
@@ -24,7 +20,9 @@ allprojects {
     java {
         withSourcesJar()
         withJavadocJar()
-        sourceCompatibility = JavaVersion.VERSION_1_8
+        toolchain{
+            languageVersion.set(JavaLanguageVersion.of(11))
+        }
     }
 }
 
@@ -44,4 +42,3 @@ tasks {
         }
     }
 }
-
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e708b1c..d64cd49 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index aa991fc..1af9e09 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
old mode 100644
new mode 100755
index 4f906e0..1aa94a4
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,99 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +119,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,88 +130,120 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
 fi
 
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
 # For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
     # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
         fi
-        i=`expr $i + 1`
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
     done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index 107acd3..6689b85 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,89 +1,92 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega