Release 2.7.12

AreaShop/build.gradle.kts

@@ -25,10 +25,10 @@ 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("io.github.baked-libs:dough-data:1.2.0")
     implementation("com.google.inject:guice:5.1.0") {
         exclude("com.google.guava", "guava")
     }
@@ -48,6 +48,7 @@ dependencies {
     runtimeOnly(project(":adapters:platform:bukkit-1-17", "reobf"))
     runtimeOnly(project(":adapters:platform:bukkit-1-18", "reobf"))
     runtimeOnly(project(":adapters:platform:bukkit-1-19", "reobf"))
+    runtimeOnly(project(":adapters:platform:bukkit-1-20", "reobf"))
 }
 
 repositories {

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

@@ -67,40 +67,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 +120,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/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/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;

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

@@ -1,7 +1,7 @@
 plugins.apply("io.papermc.paperweight.userdev")
 
 dependencies {
-    paperDevBundle("1.19.2-R0.1-SNAPSHOT")
+    paperDevBundle("1.19.4-R0.1-SNAPSHOT")
     compileOnly(projects.areashopInterface)
     compileOnly(projects.areashopNms)
 }

adapters/platform/bukkit-1-19/src/main/java/me/wiefferink/areashop/adapters/platform/v1_19_R3/BlockBehaviourImpl.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 net.minecraft.core.BlockPos;
@@ -7,10 +7,10 @@ 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 org.bukkit.craftbukkit.v1_19_R3.CraftWorld;
+import org.bukkit.craftbukkit.v1_19_R3.block.CraftBlock;
+import org.bukkit.craftbukkit.v1_19_R3.block.CraftBlockState;
+import org.bukkit.craftbukkit.v1_19_R3.block.data.CraftBlockData;
 
 import java.util.Objects;
 
@@ -19,7 +19,7 @@ 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 BlockPos blockPosition = new BlockPos(location.getBlockX(), location.getBlockY(), location.getBlockZ());
         final CraftWorld craftWorld = (CraftWorld) location.getWorld();
         final ServerLevel world = craftWorld.getHandle();
         final CraftBlockData craftBlockData = (CraftBlockData) blockData;

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,21 @@
+plugins.apply("io.papermc.paperweight.userdev")
+
+dependencies {
+    paperDevBundle("1.20-R0.1-SNAPSHOT")
+    compileOnly(projects.areashopInterface)
+    compileOnly(projects.areashopNms)
+}
+
+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-20/src/main/java/me/wiefferink/areashop/adapters/platform/v1_20_R1/BlockBehaviourImpl.java

@@ -0,0 +1,46 @@
+package me.wiefferink.areashop.adapters.platform.v1_20_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_20_R1.CraftWorld;
+import org.bukkit.craftbukkit.v1_20_R1.block.CraftBlock;
+import org.bukkit.craftbukkit.v1_20_R1.block.CraftBlockState;
+import org.bukkit.craftbukkit.v1_20_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.getBlockX(), location.getBlockY(), location.getBlockZ());
+        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-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

@@ -2,13 +2,13 @@ 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
     idea
     eclipse
 }
 
 group = "me.wiefferink"
-version = "2.7.9"
+version = "2.7.12"
 
 subprojects {
 
@@ -41,9 +41,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

@@ -4,12 +4,9 @@ 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.14"
+worldguard = "7.0.8"
+fawe = "2.6.2"
 
 [libraries]
 # Platform
@@ -24,7 +21,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" }

settings.gradle.kts

@@ -1,10 +1,6 @@
 pluginManagement {
     repositories {
         gradlePluginPortal()
-        maven {
-            name = "paper-repo"
-            url = uri("https://papermc.io/repo/repository/maven-public/")
-        }
     }
 }
 
@@ -25,6 +21,7 @@ include(":areashop-nms")
 include(":adapters:platform:bukkit-1-17")
 include(":adapters:platform:bukkit-1-18")
 include(":adapters:platform:bukkit-1-19")
+include(":adapters:platform:bukkit-1-20")
 include(":adapters:platform:paper")
 include(":adapters:platform:platform-interface")
 include(":adapters:plugins:worldedit")