2.7.13 release

AreaShop/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("com.github.johnrengelman.shadow") version "7.1.2"
+    id("com.github.johnrengelman.shadow") version "8.1.1"
 }
 
 description = "AreaShop"
@@ -24,15 +24,14 @@ dependencies {
     }
 
     // 3rd party libraries
-    implementation(libs.findbugs)
-    implementation("io.papermc:paperlib:1.0.7")
+    implementation("io.papermc:paperlib:1.0.8")
     implementation("com.github.NLthijs48:InteractiveMessenger:e7749258ca")
     implementation("com.github.NLthijs48:BukkitDo:819d51ec2b")
-    implementation("io.github.baked-libs:dough-data:1.0.3")
-    implementation("com.google.inject:guice:5.1.0") {
+    implementation("io.github.baked-libs:dough-data:1.2.0")
+    implementation("com.google.inject:guice:7.0.0") {
         exclude("com.google.guava", "guava")
     }
-    implementation("com.google.inject.extensions:guice-assistedinject:5.1.0") {
+    implementation("com.google.inject.extensions:guice-assistedinject:7.0.0") {
         exclude("com.google.guava", "guava")
     }
 
@@ -41,15 +40,25 @@ dependencies {
     implementation(projects.areashopNms)
     implementation(projects.adapters.platform.platformInterface)
     implementation(projects.adapters.platform.paper)
-    // Adapters
+
     runtimeOnly(projects.adapters.plugins.worldedit)
     runtimeOnly(projects.adapters.plugins.worldguard)
     runtimeOnly(projects.adapters.plugins.fastasyncworldedit)
-    runtimeOnly(project(":adapters:platform:bukkit-1-17", "reobf"))
-    runtimeOnly(project(":adapters:platform:bukkit-1-18", "reobf"))
-    runtimeOnly(project(":adapters:platform:bukkit-1-19", "reobf"))
+    // Adapters
+    if (!providers.environmentVariable("JITPACK").isPresent) {
+        runtimeOnly(project(":adapters:platform:bukkit-1-17", "reobf"))
+    }
+    runtimeOnly(projects.adapters.platform.bukkit118)
+    runtimeOnly(projects.adapters.platform.bukkit119)
+    runtimeOnly(projects.adapters.platform.bukkit120)
+
+    testImplementation("com.github.seeseemelk:MockBukkit-v1.20:3.9.0")
+    testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.1")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1")
 }
 
+
+
 repositories {
     mavenCentral()
 }
@@ -62,7 +71,9 @@ tasks {
     }
 
     assemble {
-        dependsOn(shadowJar)
+        if (!providers.systemProperty("JITPACK").isPresent) {
+            dependsOn(shadowJar)
+        }
     }
 
     jar {

AreaShop/src/main/java/me/wiefferink/areashop/commands/AddCommand.java

@@ -1,6 +1,8 @@
 package me.wiefferink.areashop.commands;
 
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import me.wiefferink.areashop.AreaShop;
 import me.wiefferink.areashop.MessageBridge;
 import me.wiefferink.areashop.events.ask.AddingRegionEvent;
@@ -24,8 +26,6 @@ import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.HashMap;

AreaShop/src/main/java/me/wiefferink/areashop/commands/AddfriendCommand.java

@@ -1,5 +1,7 @@
 package me.wiefferink.areashop.commands;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import me.wiefferink.areashop.MessageBridge;
 import me.wiefferink.areashop.adapters.platform.OfflinePlayerHelper;
 import me.wiefferink.areashop.managers.IFileManager;
@@ -12,8 +14,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.List;
 

AreaShop/src/main/java/me/wiefferink/areashop/commands/AddsignCommand.java

@@ -1,5 +1,7 @@
 package me.wiefferink.areashop.commands;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import me.wiefferink.areashop.MessageBridge;
 import me.wiefferink.areashop.features.signs.RegionSign;
 import me.wiefferink.areashop.features.signs.SignManager;
@@ -15,8 +17,6 @@ import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.util.BlockIterator;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;

AreaShop/src/main/java/me/wiefferink/areashop/commands/BuyCommand.java

@@ -1,5 +1,7 @@
 package me.wiefferink.areashop.commands;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import me.wiefferink.areashop.MessageBridge;
 import me.wiefferink.areashop.managers.IFileManager;
 import me.wiefferink.areashop.regions.BuyRegion;
@@ -8,8 +10,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.List;
 

AreaShop/src/main/java/me/wiefferink/areashop/commands/DelCommand.java

@@ -1,5 +1,7 @@
 package me.wiefferink.areashop.commands;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import me.wiefferink.areashop.MessageBridge;
 import me.wiefferink.areashop.events.ask.DeletingRegionEvent;
 import me.wiefferink.areashop.interfaces.WorldEditInterface;
@@ -12,8 +14,6 @@ import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.TreeSet;

AreaShop/src/main/java/me/wiefferink/areashop/commands/DelfriendCommand.java

@@ -1,5 +1,7 @@
 package me.wiefferink.areashop.commands;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import me.wiefferink.areashop.MessageBridge;
 import me.wiefferink.areashop.adapters.platform.OfflinePlayerHelper;
 import me.wiefferink.areashop.managers.IFileManager;
@@ -8,16 +10,11 @@ import me.wiefferink.areashop.regions.GeneralRegion;
 import me.wiefferink.areashop.regions.RentRegion;
 import me.wiefferink.areashop.tools.BukkitSchedulerExecutor;
 import me.wiefferink.areashop.tools.Utils;
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 @Singleton
 public class DelfriendCommand extends CommandAreaShop {

AreaShop/src/main/java/me/wiefferink/areashop/commands/DelsignCommand.java

@@ -1,9 +1,10 @@
 package me.wiefferink.areashop.commands;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import me.wiefferink.areashop.MessageBridge;
 import me.wiefferink.areashop.features.signs.RegionSign;
 import me.wiefferink.areashop.features.signs.SignManager;
-import me.wiefferink.areashop.features.signs.SignsFeature;
 import me.wiefferink.areashop.tools.Materials;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
@@ -11,8 +12,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.util.BlockIterator;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;

AreaShop/src/main/java/me/wiefferink/areashop/commands/FindCommand.java

@@ -1,5 +1,7 @@
 package me.wiefferink.areashop.commands;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import me.wiefferink.areashop.MessageBridge;
 import me.wiefferink.areashop.managers.IFileManager;
 import me.wiefferink.areashop.regions.BuyRegion;
@@ -11,8 +13,6 @@ import net.milkbowl.vault.economy.Economy;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedList;

AreaShop/src/main/java/me/wiefferink/areashop/commands/GroupaddCommand.java

@@ -1,5 +1,7 @@
 package me.wiefferink.areashop.commands;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import me.wiefferink.areashop.MessageBridge;
 import me.wiefferink.areashop.interfaces.WorldEditInterface;
 import me.wiefferink.areashop.interfaces.WorldEditSelection;
@@ -11,8 +13,6 @@ import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.TreeSet;

AreaShop/src/main/java/me/wiefferink/areashop/commands/GroupdelCommand.java

@@ -1,5 +1,7 @@
 package me.wiefferink.areashop.commands;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import me.wiefferink.areashop.MessageBridge;
 import me.wiefferink.areashop.interfaces.WorldEditInterface;
 import me.wiefferink.areashop.interfaces.WorldEditSelection;
@@ -11,8 +13,6 @@ import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.TreeSet;

AreaShop/src/main/java/me/wiefferink/areashop/commands/GroupinfoCommand.java

@@ -1,13 +1,13 @@
 package me.wiefferink.areashop.commands;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import me.wiefferink.areashop.MessageBridge;
 import me.wiefferink.areashop.managers.IFileManager;
 import me.wiefferink.areashop.regions.RegionGroup;
 import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.command.CommandSender;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;

AreaShop/src/main/java/me/wiefferink/areashop/commands/GrouplistCommand.java

@@ -1,12 +1,12 @@
 package me.wiefferink.areashop.commands;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import me.wiefferink.areashop.MessageBridge;
 import me.wiefferink.areashop.managers.IFileManager;
 import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.command.CommandSender;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.List;
 

AreaShop/src/main/java/me/wiefferink/areashop/commands/ImportCommand.java

@@ -1,13 +1,12 @@
 package me.wiefferink.areashop.commands;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import me.wiefferink.areashop.MessageBridge;
-import me.wiefferink.areashop.regions.ImportJob;
 import me.wiefferink.areashop.regions.ImportJobFactory;
 import me.wiefferink.interactivemessenger.processing.Message;
 import org.bukkit.command.CommandSender;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.List;
 

AreaShop/src/main/java/me/wiefferink/areashop/commands/InfoCommand.java

@@ -1,6 +1,8 @@
 package me.wiefferink.areashop.commands;
 
 import io.github.bakedlibs.dough.blocks.BlockPosition;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import me.wiefferink.areashop.MessageBridge;
 import me.wiefferink.areashop.managers.IFileManager;
 import me.wiefferink.areashop.regions.BuyRegion;
@@ -12,8 +14,6 @@ import me.wiefferink.interactivemessenger.processing.Message;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;

AreaShop/src/main/java/me/wiefferink/areashop/commands/MeCommand.java

@@ -1,5 +1,7 @@
 package me.wiefferink.areashop.commands;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import me.wiefferink.areashop.MessageBridge;
 import me.wiefferink.areashop.adapters.platform.OfflinePlayerHelper;
 import me.wiefferink.areashop.managers.IFileManager;
@@ -8,13 +10,10 @@ import me.wiefferink.areashop.regions.GeneralRegion;
 import me.wiefferink.areashop.regions.RentRegion;
 import me.wiefferink.areashop.tools.BukkitSchedulerExecutor;
 import me.wiefferink.areashop.tools.Utils;
-import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -67,40 +66,44 @@ public class MeCommand extends CommandAreaShop {
 			this.offlinePlayerHelper.lookupOfflinePlayerAsync(args[1]).thenAcceptAsync(offlinePlayer -> {
 				if (!offlinePlayer.hasPlayedBefore()) {
 					messageBridge.message(sender, "me-noPlayer", args[1]);
+				} else {
+					sendMessageAboutRegions(sender, offlinePlayer);
 				}
 			}, this.executor);
 			return;
 		}
-		if(!player.hasPlayedBefore()) {
-			return;
-		}
+		sendMessageAboutRegions(sender, player);
+	}
 
+	private void sendMessageAboutRegions(CommandSender sender, OfflinePlayer target) {
 		// Get the regions owned by the player
 		Set<RentRegion> rentRegions = new HashSet<>();
 		for(RentRegion region : fileManager.getRentsRef()) {
-			if(region.isOwner(player)) {
+			if(region.isOwner(target)) {
 				rentRegions.add(region);
 			}
 		}
 		Set<BuyRegion> buyRegions = new HashSet<>();
 		for(BuyRegion region : fileManager.getBuysRef()) {
-			if(region.isOwner(player)) {
+			if(region.isOwner(target)) {
 				buyRegions.add(region);
 			}
 		}
 		// Get the regions the player is added as friend
 		Set<GeneralRegion> friendRegions = new HashSet<>();
 		for(GeneralRegion region : fileManager.getRegionsRef()) {
-			if(region.getFriendsFeature().getFriends().contains(player.getUniqueId())) {
+			if(region.getFriendsFeature().getFriends().contains(target.getUniqueId())) {
 				friendRegions.add(region);
 			}
 		}
 
 		// Send messages
 		boolean foundSome = !rentRegions.isEmpty() || !buyRegions.isEmpty() || !friendRegions.isEmpty();
-		if(foundSome) {
-			messageBridge.message(sender, "me-header", player.getName());
+		if(!foundSome) {
+			messageBridge.message(sender, "me-nothing", target.getName());
+			return;
 		}
+		messageBridge.message(sender, "me-header", target.getName());
 		if(!rentRegions.isEmpty()) {
 			for(RentRegion region : rentRegions) {
 				messageBridge.messageNoPrefix(sender, "me-rentLine", region);
@@ -116,12 +119,7 @@ public class MeCommand extends CommandAreaShop {
 				messageBridge.messageNoPrefix(sender, "me-friendLine", region);
 			}
 		}
-
-		if(!foundSome) {
-			messageBridge.message(sender, "me-nothing", player.getName());
-		} else {
-			messageBridge.messageNoPrefix(sender, "me-clickHint");
-		}
+		messageBridge.messageNoPrefix(sender, "me-clickHint");
 	}
 
 	@Override

AreaShop/src/main/java/me/wiefferink/areashop/commands/MessageCommand.java

@@ -1,5 +1,7 @@
 package me.wiefferink.areashop.commands;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import me.wiefferink.areashop.MessageBridge;
 import me.wiefferink.areashop.tools.Utils;
 import me.wiefferink.interactivemessenger.processing.Message;
@@ -8,8 +10,6 @@ import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.List;
 

AreaShop/src/main/java/me/wiefferink/areashop/commands/ReloadCommand.java

@@ -1,12 +1,11 @@
 package me.wiefferink.areashop.commands;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import me.wiefferink.areashop.AreaShop;
 import me.wiefferink.areashop.MessageBridge;
 import org.bukkit.command.CommandSender;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
 @Singleton
 public class ReloadCommand extends CommandAreaShop {
 

AreaShop/src/main/java/me/wiefferink/areashop/commands/RentCommand.java

@@ -1,5 +1,7 @@
 package me.wiefferink.areashop.commands;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import me.wiefferink.areashop.MessageBridge;
 import me.wiefferink.areashop.managers.IFileManager;
 import me.wiefferink.areashop.regions.RentRegion;
@@ -7,8 +9,6 @@ import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.List;
 

AreaShop/src/main/java/me/wiefferink/areashop/commands/ResellCommand.java

@@ -1,5 +1,7 @@
 package me.wiefferink.areashop.commands;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import me.wiefferink.areashop.MessageBridge;
 import me.wiefferink.areashop.managers.IFileManager;
 import me.wiefferink.areashop.regions.BuyRegion;
@@ -7,8 +9,6 @@ import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.List;
 

AreaShop/src/main/java/me/wiefferink/areashop/commands/SchematiceventCommand.java

@@ -1,5 +1,7 @@
 package me.wiefferink.areashop.commands;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import me.wiefferink.areashop.MessageBridge;
 import me.wiefferink.areashop.managers.IFileManager;
 import me.wiefferink.areashop.regions.BuyRegion;
@@ -8,8 +10,6 @@ import me.wiefferink.areashop.regions.RentRegion;
 import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.command.CommandSender;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;

AreaShop/src/main/java/me/wiefferink/areashop/commands/SellCommand.java

@@ -1,5 +1,7 @@
 package me.wiefferink.areashop.commands;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import me.wiefferink.areashop.MessageBridge;
 import me.wiefferink.areashop.managers.IFileManager;
 import me.wiefferink.areashop.regions.BuyRegion;
@@ -8,8 +10,6 @@ import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.List;
 

AreaShop/src/main/java/me/wiefferink/areashop/commands/SetdurationCommand.java

@@ -1,5 +1,7 @@
 package me.wiefferink.areashop.commands;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import me.wiefferink.areashop.MessageBridge;
 import me.wiefferink.areashop.managers.IFileManager;
 import me.wiefferink.areashop.regions.RentRegion;
@@ -8,8 +10,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.List;
 

AreaShop/src/main/java/me/wiefferink/areashop/commands/SetlandlordCommand.java

@@ -1,5 +1,7 @@
 package me.wiefferink.areashop.commands;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import me.wiefferink.areashop.MessageBridge;
 import me.wiefferink.areashop.adapters.platform.OfflinePlayerHelper;
 import me.wiefferink.areashop.managers.IFileManager;
@@ -9,8 +11,6 @@ import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.List;
 

AreaShop/src/main/java/me/wiefferink/areashop/commands/SetownerCommand.java

@@ -1,5 +1,7 @@
 package me.wiefferink.areashop.commands;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import me.wiefferink.areashop.MessageBridge;
 import me.wiefferink.areashop.adapters.platform.OfflinePlayerHelper;
 import me.wiefferink.areashop.managers.IFileManager;
@@ -8,13 +10,9 @@ import me.wiefferink.areashop.regions.GeneralRegion;
 import me.wiefferink.areashop.regions.RentRegion;
 import me.wiefferink.areashop.tools.BukkitSchedulerExecutor;
 import me.wiefferink.areashop.tools.Utils;
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;

AreaShop/src/main/java/me/wiefferink/areashop/commands/SetpriceCommand.java

@@ -1,5 +1,7 @@
 package me.wiefferink.areashop.commands;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import me.wiefferink.areashop.MessageBridge;
 import me.wiefferink.areashop.managers.IFileManager;
 import me.wiefferink.areashop.regions.BuyRegion;
@@ -9,8 +11,6 @@ import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.List;
 

AreaShop/src/main/java/me/wiefferink/areashop/commands/SetrestoreCommand.java

@@ -1,6 +1,7 @@
 package me.wiefferink.areashop.commands;
 
-import me.wiefferink.areashop.AreaShop;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import me.wiefferink.areashop.MessageBridge;
 import me.wiefferink.areashop.managers.IFileManager;
 import me.wiefferink.areashop.regions.GeneralRegion;
@@ -8,8 +9,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.plugin.Plugin;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.List;
 

AreaShop/src/main/java/me/wiefferink/areashop/commands/SetteleportCommand.java

@@ -1,6 +1,8 @@
 package me.wiefferink.areashop.commands;
 
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import me.wiefferink.areashop.MessageBridge;
 import me.wiefferink.areashop.managers.IFileManager;
 import me.wiefferink.areashop.regions.BuyRegion;
@@ -10,8 +12,6 @@ import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.List;
 

AreaShop/src/main/java/me/wiefferink/areashop/commands/StackCommand.java

@@ -2,6 +2,8 @@ package me.wiefferink.areashop.commands;
 
 import com.sk89q.worldguard.protection.managers.RegionManager;
 import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import me.wiefferink.areashop.AreaShop;
 import me.wiefferink.areashop.MessageBridge;
 import me.wiefferink.areashop.events.ask.AddingRegionEvent;
@@ -22,8 +24,6 @@ import org.bukkit.plugin.Plugin;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.util.Vector;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.List;
 

AreaShop/src/main/java/me/wiefferink/areashop/commands/StopresellCommand.java

@@ -1,5 +1,7 @@
 package me.wiefferink.areashop.commands;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import me.wiefferink.areashop.MessageBridge;
 import me.wiefferink.areashop.managers.IFileManager;
 import me.wiefferink.areashop.regions.BuyRegion;
@@ -7,8 +9,6 @@ import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.List;
 

AreaShop/src/main/java/me/wiefferink/areashop/commands/TeleportCommand.java

@@ -1,13 +1,13 @@
 package me.wiefferink.areashop.commands;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import me.wiefferink.areashop.MessageBridge;
 import me.wiefferink.areashop.managers.IFileManager;
 import me.wiefferink.areashop.regions.GeneralRegion;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.List;
 

AreaShop/src/main/java/me/wiefferink/areashop/commands/UnrentCommand.java

@@ -1,5 +1,7 @@
 package me.wiefferink.areashop.commands;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import me.wiefferink.areashop.MessageBridge;
 import me.wiefferink.areashop.managers.IFileManager;
 import me.wiefferink.areashop.regions.GeneralRegion;
@@ -8,8 +10,6 @@ import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.List;
 

AreaShop/src/main/java/me/wiefferink/areashop/features/CommandsFeature.java

@@ -1,5 +1,7 @@
 package me.wiefferink.areashop.features;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import me.wiefferink.areashop.AreaShop;
 import me.wiefferink.areashop.events.ask.AddingRegionEvent;
 import me.wiefferink.areashop.events.ask.BuyingRegionEvent;
@@ -21,8 +23,6 @@ import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import java.util.List;
 
 @Singleton

AreaShop/src/main/java/me/wiefferink/areashop/features/DebugFeature.java

@@ -1,5 +1,7 @@
 package me.wiefferink.areashop.features;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import me.wiefferink.areashop.AreaShop;
 import me.wiefferink.areashop.events.ask.BuyingRegionEvent;
 import me.wiefferink.areashop.events.ask.RentingRegionEvent;
@@ -20,8 +22,6 @@ import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.event.EventHandler;
 
 import javax.annotation.Nonnull;
-import javax.inject.Inject;
-import javax.inject.Singleton;
 
 @Singleton
 public class DebugFeature extends RegionFeature {

AreaShop/src/main/java/me/wiefferink/areashop/features/TeleportFeature.java

@@ -3,6 +3,7 @@ package me.wiefferink.areashop.features;
 import com.google.inject.assistedinject.Assisted;
 import com.google.inject.assistedinject.AssistedInject;
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+import jakarta.inject.Inject;
 import me.wiefferink.areashop.AreaShop;
 import me.wiefferink.areashop.features.signs.RegionSign;
 import me.wiefferink.areashop.features.signs.SignManager;
@@ -19,7 +20,6 @@ import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
 
 import javax.annotation.Nonnull;
-import javax.inject.Inject;
 import java.util.Collection;
 import java.util.EnumSet;
 import java.util.Iterator;

AreaShop/src/main/java/me/wiefferink/areashop/features/WorldGuardRegionFlagsFeature.java

@@ -5,6 +5,8 @@ import com.sk89q.worldguard.protection.flags.Flag;
 import com.sk89q.worldguard.protection.flags.InvalidFlagFormat;
 import com.sk89q.worldguard.protection.flags.RegionGroupFlag;
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import me.wiefferink.areashop.AreaShop;
 import me.wiefferink.areashop.events.notify.UpdateRegionEvent;
 import me.wiefferink.areashop.interfaces.RegionAccessSet;
@@ -15,8 +17,6 @@ import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.event.EventHandler;
 
 import javax.annotation.Nonnull;
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import java.util.Objects;
 import java.util.Set;
 import java.util.UUID;

AreaShop/src/main/java/me/wiefferink/areashop/features/signs/SignManager.java

@@ -102,6 +102,7 @@ public class SignManager extends Manager {
 
 
     public void shutdown() {
+        update();
         this.signCacheMap.values().forEach(SignCache::clear);
         this.signCacheMap.clear();
     }

AreaShop/src/main/java/me/wiefferink/areashop/managers/CommandManager.java

@@ -1,6 +1,8 @@
 package me.wiefferink.areashop.managers;
 
 import com.google.inject.Injector;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import me.wiefferink.areashop.AreaShop;
 import me.wiefferink.areashop.MessageBridge;
 import me.wiefferink.areashop.commands.AddCommand;
@@ -43,8 +45,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabCompleter;
 
 import javax.annotation.Nonnull;
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.SortedSet;

AreaShop/src/main/java/me/wiefferink/areashop/managers/FeatureManager.java

@@ -2,6 +2,8 @@ package me.wiefferink.areashop.managers;
 
 import com.google.inject.Injector;
 import com.google.inject.ProvisionException;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import me.wiefferink.areashop.AreaShop;
 import me.wiefferink.areashop.features.CommandsFeature;
 import me.wiefferink.areashop.features.DebugFeature;
@@ -14,8 +16,6 @@ import me.wiefferink.areashop.features.signs.SignsFeature;
 import me.wiefferink.areashop.regions.GeneralRegion;
 
 import javax.annotation.Nonnull;
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;

AreaShop/src/main/java/me/wiefferink/areashop/managers/FileManager.java

@@ -1,10 +1,11 @@
 package me.wiefferink.areashop.managers;
 
-import com.google.common.base.Charsets;
 import com.google.common.io.Files;
 import com.sk89q.worldguard.protection.managers.RegionManager;
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;
 import io.github.bakedlibs.dough.blocks.BlockPosition;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import me.wiefferink.areashop.AreaShop;
 import me.wiefferink.areashop.MessageBridge;
 import me.wiefferink.areashop.events.ask.AddingRegionEvent;
@@ -32,8 +33,6 @@ import org.bukkit.entity.Player;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -118,6 +117,10 @@ public class FileManager extends Manager implements IFileManager {
 	public void shutdown() {
 		// Update lastactive time for players that are online now
 		for(GeneralRegion region : this.regions.values()) {
+			if (region.getOwner() == null) {
+				AreaShop.warn(String.format("%s has no owner", region.getName()));
+				continue;
+			}
 			Player player = Bukkit.getPlayer(region.getOwner());
 			if(player != null) {
 				region.updateLastActiveTime();

AreaShop/src/main/java/me/wiefferink/areashop/managers/IFileManager.java

@@ -96,9 +96,9 @@ public interface IFileManager {
     Collection<RentRegion> getRents();
 
     /**
-     * Get all rental regions.
+     * Get all rental regions (readonly)
      *
-     * @return List of all rental regions
+     * @return Unmodifiable collection of all rental regions
      */
     Collection<RentRegion> getRentsRef();
 
@@ -109,6 +109,10 @@ public interface IFileManager {
      */
     List<BuyRegion> getBuys();
 
+    /**
+     * Get all buy regions (readonly)
+     * @return Unmodifiable collection of all buy regions
+     */
     Collection<BuyRegion> getBuysRef();
 
     /**
@@ -119,9 +123,9 @@ public interface IFileManager {
     List<GeneralRegion> getRegions();
 
     /**
-     * Get all regions.
+     * Get all regions (readonly)
      *
-     * @return List of all regions (it is safe to modify the list)
+     * @return Unmodifiable collection of all regions
      */
     Collection<GeneralRegion> getRegionsRef();
 

AreaShop/src/main/java/me/wiefferink/areashop/managers/SignLinkerManager.java

@@ -1,5 +1,7 @@
 package me.wiefferink.areashop.managers;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import me.wiefferink.areashop.AreaShop;
 import me.wiefferink.areashop.MessageBridge;
 import me.wiefferink.areashop.features.signs.RegionSign;
@@ -23,8 +25,6 @@ import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.util.BlockIterator;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;

AreaShop/src/main/java/me/wiefferink/areashop/regions/BuyRegion.java

@@ -58,6 +58,21 @@ public class BuyRegion extends GeneralRegion {
 		this.economy = economy;
 	}
 
+	@Override
+	public boolean isOwner(UUID player) {
+		return isBuyer(player);
+	}
+
+	@Override
+	public UUID getOwner() {
+		return getBuyer();
+	}
+
+	@Override
+	public void setOwner(UUID player) {
+		setBuyer(player);
+	}
+
 	@Override
 	public RegionType getType() {
 		return RegionType.BUY;

AreaShop/src/main/java/me/wiefferink/areashop/regions/GeneralRegion.java

@@ -435,33 +435,18 @@ public abstract class GeneralRegion implements GeneralRegionInterface, Comparabl
 	 * @param player Player to check ownership for
 	 * @return true if the player currently rents or buys this region
 	 */
-	public boolean isOwner(UUID player) {
-		return (this instanceof RentRegion && ((RentRegion)this).isRenter(player)) || (this instanceof BuyRegion && ((BuyRegion)this).isBuyer(player));
-	}
+	public abstract boolean isOwner(UUID player);
 
 	/**
 	 * Get the player that is currently the owner of this region (either bought or rented it).
 	 * @return The UUID of the owner of this region
 	 */
-	public UUID getOwner() {
-		if(this instanceof RentRegion) {
-			return ((RentRegion)this).getRenter();
-		} else {
-			return ((BuyRegion)this).getBuyer();
-		}
-	}
-
+	public abstract UUID getOwner();
 	/**
 	 * Change the owner of the region.
 	 * @param player The player that should be the owner
 	 */
-	public void setOwner(UUID player) {
-		if(this instanceof RentRegion) {
-			((RentRegion)this).setRenter(player);
-		} else {
-			((BuyRegion)this).setBuyer(player);
-		}
-	}
+	public abstract void setOwner(UUID player);
 
 	/**
 	 * Get the landlord of this region (the player that receives any revenue from this region).

AreaShop/src/main/java/me/wiefferink/areashop/regions/RentRegion.java

@@ -72,6 +72,22 @@ public class RentRegion extends GeneralRegion {
 		this.economy = economy;
 	}
 
+
+	@Override
+	public boolean isOwner(UUID player) {
+		return isRenter(player);
+	}
+
+	@Override
+	public UUID getOwner() {
+		return getRenter();
+	}
+
+	@Override
+	public void setOwner(UUID player) {
+		setRenter(player);
+	}
+
 	@Override
 	public RegionType getType() {
 		return RegionType.RENT;

AreaShop/src/main/java/me/wiefferink/areashop/tools/BukkitSchedulerExecutor.java

@@ -1,11 +1,11 @@
 package me.wiefferink.areashop.tools;
 
 
+import jakarta.inject.Inject;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.scheduler.BukkitScheduler;
 import org.jetbrains.annotations.NotNull;
 
-import javax.inject.Inject;
 import java.util.concurrent.Executor;
 
 public class BukkitSchedulerExecutor implements Executor {

AreaShop/src/main/java/me/wiefferink/areashop/tools/Utils.java

@@ -2,6 +2,7 @@ package me.wiefferink.areashop.tools;
 
 import com.sk89q.worldguard.protection.managers.RegionManager;
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+import jakarta.inject.Inject;
 import me.wiefferink.areashop.AreaShop;
 import me.wiefferink.areashop.interfaces.WorldEditSelection;
 import me.wiefferink.areashop.interfaces.WorldGuardInterface;
@@ -23,7 +24,6 @@ import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
 
-import javax.inject.Inject;
 import java.lang.reflect.Method;
 import java.math.BigDecimal;
 import java.math.RoundingMode;

README.md

@@ -1,4 +1,6 @@
 ![AreaShop logo](https://cloud.githubusercontent.com/assets/6951068/9471294/f016d8ee-4b4f-11e5-9bda-d61b1c423ebb.png)<br/>
+[![](https://jitpack.io/v/md5sha256/AreaShop.svg)](https://jitpack.io/#md5sha256/AreaShop)
+<br>
 **Usage and configuration:**
 [►Download (releases)](https://github.com/md5sha256/AreasShop/releases)&nbsp;&nbsp;
 [►Commands and Permissions](https://github.com/NLthijs48/AreaShop/wiki/Commands-and-Permissions)

adapters/platform/bukkit-1-18/build.gradle.kts

@@ -1,7 +1,5 @@
-plugins.apply("io.papermc.paperweight.userdev")
-
 dependencies {
-    paperDevBundle("1.18.2-R0.1-SNAPSHOT")
+    compileOnly("io.papermc.paper:paper-api:1.18.2-R0.1-SNAPSHOT")
     compileOnly(projects.areashopInterface)
     compileOnly(projects.areashopNms)
 }
@@ -10,12 +8,4 @@ description = "AreaShop NMS Helper 1-18"
 
 tasks {
 
-    assemble {
-        dependsOn("reobfJar")
-    }
-
-    named("reobfJar", io.papermc.paperweight.tasks.RemapJar::class) {
-        outputJar.set(file("build/libs/${project.name}-${project.version}.jar"))
-    }
-
 }

adapters/platform/bukkit-1-18/src/main/java/me/wiefferink/areashop/adapters/platform/v1_18_R2/BlockBehaviourImpl.java

@@ -1,16 +1,10 @@
 package me.wiefferink.areashop.adapters.platform.v1_18_R2;
 
 import me.wiefferink.areashop.nms.BlockBehaviourHelper;
-import net.minecraft.core.BlockPos;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.level.block.state.BlockState;
 import org.bukkit.Location;
 import org.bukkit.block.Block;
+import org.bukkit.block.BlockState;
 import org.bukkit.block.data.BlockData;
-import org.bukkit.craftbukkit.v1_18_R2.CraftWorld;
-import org.bukkit.craftbukkit.v1_18_R2.block.CraftBlock;
-import org.bukkit.craftbukkit.v1_18_R2.block.CraftBlockState;
-import org.bukkit.craftbukkit.v1_18_R2.block.data.CraftBlockData;
 
 import java.util.Objects;
 
@@ -19,28 +13,16 @@ public class BlockBehaviourImpl implements BlockBehaviourHelper {
     @Override
     public boolean canPlace(Location location, BlockData blockData) {
         Objects.requireNonNull(location.getWorld(), "Null World!");
-        final BlockPos blockPosition = new BlockPos(location.getX(), location.getY(), location.getZ());
-        final CraftWorld craftWorld = (CraftWorld) location.getWorld();
-        final ServerLevel world = craftWorld.getHandle();
-        final CraftBlockData craftBlockData = (CraftBlockData) blockData;
-        final BlockState ibd = craftBlockData.getState();
-        return ibd.canSurvive(world, blockPosition);
+        return location.getBlock().canPlace(blockData);
     }
 
     @Override
     public boolean isBlockValid(Block block) {
-        final CraftBlock craftBlock = (CraftBlock) block;
-        final CraftWorld craftWorld = (CraftWorld) craftBlock.getWorld();
-        final ServerLevel world = craftWorld.getHandle();
-        final BlockState ibd = craftBlock.getNMS();
-        return ibd.canSurvive(world, craftBlock.getPosition());
+        return block.canPlace(block.getBlockData());
     }
 
     @Override
-    public boolean isBlockStateValid(org.bukkit.block.BlockState blockState) {
-        final CraftBlockState craftBlockState = (CraftBlockState) blockState;
-        final BlockState ibd = craftBlockState.getHandle();
-        return ibd.canSurvive(craftBlockState.getBlock().getCraftWorld().getHandle(), craftBlockState.getPosition());
+    public boolean isBlockStateValid(BlockState blockState) {
+        return blockState.getBlock().canPlace(blockState.getBlockData());
     }
-
 }

adapters/platform/bukkit-1-19/build.gradle.kts

@@ -1,7 +1,5 @@
-plugins.apply("io.papermc.paperweight.userdev")
-
 dependencies {
-    paperDevBundle("1.19.2-R0.1-SNAPSHOT")
+    compileOnly("io.papermc.paper:paper-api:1.19.4-R0.1-SNAPSHOT")
     compileOnly(projects.areashopInterface)
     compileOnly(projects.areashopNms)
 }
@@ -10,12 +8,4 @@ description = "AreaShop NMS Helper 1-19"
 
 tasks {
 
-    assemble {
-        dependsOn("reobfJar")
-    }
-
-    named("reobfJar", io.papermc.paperweight.tasks.RemapJar::class) {
-        outputJar.set(file("build/libs/${project.name}-${project.version}.jar"))
-    }
-
 }

adapters/platform/bukkit-1-19/src/main/java/me/wiefferink/areashop/adapters/platform/v1_19_R1/BlockBehaviourImpl.java

@@ -1,46 +0,0 @@
-package me.wiefferink.areashop.adapters.platform.v1_19_R1;
-
-import me.wiefferink.areashop.nms.BlockBehaviourHelper;
-import net.minecraft.core.BlockPos;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.level.block.state.BlockState;
-import org.bukkit.Location;
-import org.bukkit.block.Block;
-import org.bukkit.block.data.BlockData;
-import org.bukkit.craftbukkit.v1_19_R1.CraftWorld;
-import org.bukkit.craftbukkit.v1_19_R1.block.CraftBlock;
-import org.bukkit.craftbukkit.v1_19_R1.block.CraftBlockState;
-import org.bukkit.craftbukkit.v1_19_R1.block.data.CraftBlockData;
-
-import java.util.Objects;
-
-public class BlockBehaviourImpl implements BlockBehaviourHelper {
-
-    @Override
-    public boolean canPlace(Location location, BlockData blockData) {
-        Objects.requireNonNull(location.getWorld(), "Null World!");
-        final BlockPos blockPosition = new BlockPos(location.getX(), location.getY(), location.getZ());
-        final CraftWorld craftWorld = (CraftWorld) location.getWorld();
-        final ServerLevel world = craftWorld.getHandle();
-        final CraftBlockData craftBlockData = (CraftBlockData) blockData;
-        final BlockState ibd = craftBlockData.getState();
-        return ibd.canSurvive(world, blockPosition);
-    }
-
-    @Override
-    public boolean isBlockValid(Block block) {
-        final CraftBlock craftBlock = (CraftBlock) block;
-        final CraftWorld craftWorld = (CraftWorld) craftBlock.getWorld();
-        final ServerLevel world = craftWorld.getHandle();
-        final BlockState ibd = craftBlock.getNMS();
-        return ibd.canSurvive(world, craftBlock.getPosition());
-    }
-
-    @Override
-    public boolean isBlockStateValid(org.bukkit.block.BlockState blockState) {
-        final CraftBlockState craftBlockState = (CraftBlockState) blockState;
-        final BlockState ibd = craftBlockState.getHandle();
-        return ibd.canSurvive(craftBlockState.getBlock().getCraftWorld().getHandle(), craftBlockState.getPosition());
-    }
-
-}

adapters/platform/bukkit-1-19/src/main/java/me/wiefferink/areashop/adapters/platform/v1_19_R3/BlockBehaviourImpl.java

@@ -0,0 +1,28 @@
+package me.wiefferink.areashop.adapters.platform.v1_19_R3;
+
+import me.wiefferink.areashop.nms.BlockBehaviourHelper;
+import org.bukkit.Location;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockState;
+import org.bukkit.block.data.BlockData;
+
+import java.util.Objects;
+
+public class BlockBehaviourImpl implements BlockBehaviourHelper {
+
+    @Override
+    public boolean canPlace(Location location, BlockData blockData) {
+        Objects.requireNonNull(location.getWorld(), "Null World!");
+        return location.getBlock().canPlace(blockData);
+    }
+
+    @Override
+    public boolean isBlockValid(Block block) {
+        return block.canPlace(block.getBlockData());
+    }
+
+    @Override
+    public boolean isBlockStateValid(BlockState blockState) {
+        return blockState.getBlock().canPlace(blockState.getBlockData());
+    }
+}

adapters/platform/bukkit-1-19/src/main/java/me/wiefferink/areashop/adapters/platform/v1_19_R3/NMSImpl.java

@@ -1,4 +1,4 @@
-package me.wiefferink.areashop.adapters.platform.v1_19_R1;
+package me.wiefferink.areashop.adapters.platform.v1_19_R3;
 
 import me.wiefferink.areashop.nms.BlockBehaviourHelper;
 import me.wiefferink.areashop.nms.NMS;

adapters/platform/bukkit-1-20/build.gradle.kts

@@ -0,0 +1,11 @@
+dependencies {
+    compileOnly("io.papermc.paper:paper-api:1.20.1-R0.1-SNAPSHOT")
+    compileOnly(projects.areashopInterface)
+    compileOnly(projects.areashopNms)
+}
+
+description = "AreaShop NMS Helper 1-20"
+
+tasks {
+
+}

adapters/platform/bukkit-1-20/src/main/java/me/wiefferink/areashop/adapters/platform/v1_20_R1/BlockBehaviourImpl.java

@@ -0,0 +1,28 @@
+package me.wiefferink.areashop.adapters.platform.v1_20_R1;
+
+import me.wiefferink.areashop.nms.BlockBehaviourHelper;
+import org.bukkit.Location;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockState;
+import org.bukkit.block.data.BlockData;
+
+import java.util.Objects;
+
+public class BlockBehaviourImpl implements BlockBehaviourHelper {
+
+    @Override
+    public boolean canPlace(Location location, BlockData blockData) {
+        Objects.requireNonNull(location.getWorld(), "Null World!");
+        return location.getBlock().canPlace(blockData);
+    }
+
+    @Override
+    public boolean isBlockValid(Block block) {
+        return block.canPlace(block.getBlockData());
+    }
+
+    @Override
+    public boolean isBlockStateValid(BlockState blockState) {
+        return blockState.getBlock().canPlace(blockState.getBlockData());
+    }
+}

adapters/platform/bukkit-1-20/src/main/java/me/wiefferink/areashop/adapters/platform/v1_20_R1/NMSImpl.java

@@ -0,0 +1,15 @@
+package me.wiefferink.areashop.adapters.platform.v1_20_R1;
+
+import me.wiefferink.areashop.nms.BlockBehaviourHelper;
+import me.wiefferink.areashop.nms.NMS;
+
+public class NMSImpl implements NMS {
+
+    private final BlockBehaviourImpl blockBehaviourHelper = new BlockBehaviourImpl();
+
+    @Override
+    public BlockBehaviourHelper blockBehaviourHelper() {
+        return this.blockBehaviourHelper;
+    }
+
+}

adapters/platform/paper/src/main/java/me/wiefferink/areashop/adapters/platform/paper/PaperOfflinePlayerHelper.java

@@ -34,7 +34,11 @@ public class PaperOfflinePlayerHelper implements OfflinePlayerHelper {
     @Override
     public CompletableFuture<OfflinePlayer> lookupOfflinePlayerAsync(String username) {
         final CompletableFuture<OfflinePlayer> future = new CompletableFuture<>();
-        this.server.getScheduler().runTaskAsynchronously(this.plugin, () -> future.complete(plugin.getServer().getPlayer(username)));
+        this.server.getScheduler().runTaskAsynchronously(this.plugin, () -> {
+            @SuppressWarnings("deprecation")
+            OfflinePlayer offlinePlayer = plugin.getServer().getOfflinePlayer(username);
+            future.complete(offlinePlayer);
+        });
         return future;
     }
 }

build.gradle.kts

@@ -1,14 +1,20 @@
+import com.github.spotbugs.snom.Effort
+import com.github.spotbugs.snom.SpotBugsPlugin
+
 plugins {
     java
     `java-library`
     `maven-publish`
-    id("io.papermc.paperweight.userdev") version "1.3.6" apply false
+    id("io.papermc.paperweight.userdev") version "1.5.5" apply false
+    id("com.github.spotbugs") version "5.1.3"
     idea
     eclipse
 }
 
 group = "me.wiefferink"
-version = "2.7.9"
+version = "2.7.13"
+
+java.toolchain.languageVersion.set(JavaLanguageVersion.of(17))
 
 subprojects {
 
@@ -23,8 +29,9 @@ subprojects {
         }
         plugin<IdeaPlugin>()
         plugin<EclipsePlugin>()
+        // plugin<SpotBugsPlugin>()
     }
-
+    
     repositories {
         mavenCentral()
         maven("https://oss.sonatype.org/content/groups/public/")
@@ -41,9 +48,10 @@ subprojects {
         maven("https://maven.enginehub.org/repo/")
     }
 
+    java.toolchain.languageVersion.set(JavaLanguageVersion.of(17))
+
     tasks {
         withType(JavaCompile::class) {
-            java.toolchain.languageVersion.set(JavaLanguageVersion.of(17))
             options.release.set(17)
             options.encoding = Charsets.UTF_8.name()
             options.isFork = true

gradle/libs.versions.toml

@@ -1,21 +1,16 @@
 [versions]
 # Platforms
 minecraft = "1.17.1-R0.1-SNAPSHOT"
-findbugs = "3.0.2"
 
 # Minecraft Plugins
-worldedit = "7.2.12"
-worldguard = "7.0.7"
-fawe = "2.4.5"
-
-# Gradle plugins
-paperweight = "1.3.7"
+worldedit = "7.2.15"
+worldguard = "7.0.9"
+fawe = "2.7.1"
 
 [libraries]
 # Platform
 spigot = { group = "org.spigotmc", name = "spigot-api", version.ref = "minecraft" }
 paper = { group = "io.papermc.paper", name = "paper-api", version.ref = "minecraft" }
-findbugs = { group = "com.google.code.findbugs", name = "jsr305", version.ref = "findbugs" }
 
 # Minecraft Plugins
 worldeditBukkit = { group = "com.sk89q.worldedit", name = "worldedit-bukkit", version.ref = "worldedit" }
@@ -24,7 +19,3 @@ worldguardBukkit = { group = "com.sk89q.worldguard", name = "worldguard-bukkit",
 worldguardCore = { group = "com.sk89q.worldguard", name = "worldguard-core", version.ref = "worldguard" }
 fastasyncworldeditBukkit = { group = "com.fastasyncworldedit", name = "FastAsyncWorldEdit-Bukkit", version.ref = "fawe" }
 fastasyncworldeditCore = { group = "com.fastasyncworldedit", name = "FastAsyncWorldEdit-Core", version.ref = "fawe" }
-
-[plugins]
-# Gradle plugins
-paperweightUserdev = { id = "io.papermc.paperweight.userdev", version.ref = "paperweight" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -205,6 +205,12 @@ set -- \
         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.

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+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!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+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

jitpack.yml

@@ -0,0 +1,5 @@
+before_install:
+  - sdk install java 17.0.8-amzn
+  - sdk use java 17.0.8-amzn
+install:
+  - ./gradlew build publishToMavenLocal

settings.gradle.kts

@@ -1,10 +1,6 @@
 pluginManagement {
     repositories {
         gradlePluginPortal()
-        maven {
-            name = "paper-repo"
-            url = uri("https://papermc.io/repo/repository/maven-public/")
-        }
     }
 }
 
@@ -22,15 +18,21 @@ include(":areashop-interface")
 include(":areashop-nms")
 
 // Adapters
-include(":adapters:platform:bukkit-1-17")
-include(":adapters:platform:bukkit-1-18")
-include(":adapters:platform:bukkit-1-19")
 include(":adapters:platform:paper")
 include(":adapters:platform:platform-interface")
+
 include(":adapters:plugins:worldedit")
 include(":adapters:plugins:worldguard")
 include(":adapters:plugins:fastasyncworldedit")
 
+if (!providers.environmentVariable("JITPACK").isPresent) {
+    include(":adapters:platform:bukkit-1-17")
+    include(":adapters:platform:bukkit-1-18")
+    include(":adapters:platform:bukkit-1-19")
+    include(":adapters:platform:bukkit-1-20")
+
+}
+
 // Main project
 include(":areashop")