Bump version

AreaShop/build.gradle.kts

@@ -29,10 +29,10 @@ dependencies {
     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.0.1") {
+    implementation("com.google.inject:guice:5.1.0") {
         exclude("com.google.guava", "guava")
     }
-    implementation("com.google.inject.extensions:guice-assistedinject:5.0.1") {
+    implementation("com.google.inject.extensions:guice-assistedinject:5.1.0") {
         exclude("com.google.guava", "guava")
     }
 
@@ -46,6 +46,11 @@ dependencies {
     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"))
+}
+
+repositories {
+    mavenCentral()
 }
 
 tasks {

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

@@ -91,7 +91,7 @@ public final class AreaShop extends JavaPlugin implements AreaShopApi {
 	public static final String defaultFile = "default.yml";
 	public static final String configFile = "config.yml";
 	public static final String configFileHidden = "hiddenConfig.yml";
-	public static final String signLogFile = "sign-errors.yml";
+	public static final String signLogFile = "sign-errors.log";
 	public static final String versionFile = "versions";
 
 	// Euro tag for in the config

AreaShop/src/main/resources/plugin.yml

@@ -5,7 +5,7 @@ description: "Selling and renting WorldGuard regions to your players, highly con
 depend: [Vault, WorldGuard, WorldEdit]
 softdepend: [Multiverse-Core, FastAsyncWorldEdit]
 author: NLThijs48
-website: https://github.com/md5s256/AreaShop
+website: https://github.com/md5sha256/AreaShop
 commands:
   AreaShop:
     description: 'For all commands use /as help.'

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

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

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

@@ -1,4 +1,4 @@
-package me.wiefferink.areashop.adapters.platform.v1_18_R1;
+package me.wiefferink.areashop.adapters.platform.v1_18_R2;
 
 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_18_R1.CraftWorld;
-import org.bukkit.craftbukkit.v1_18_R1.block.CraftBlock;
-import org.bukkit.craftbukkit.v1_18_R1.block.CraftBlockState;
-import org.bukkit.craftbukkit.v1_18_R1.block.data.CraftBlockData;
+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;
 

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

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

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

@@ -0,0 +1,21 @@
+plugins.apply("io.papermc.paperweight.userdev")
+
+dependencies {
+    paperDevBundle("1.19-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-19/src/main/java/me/wiefferink/areashop/adapters/platform/v1_19_R1/BlockBehaviourImpl.java

@@ -0,0 +1,46 @@
+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_R1/NMSImpl.java

@@ -0,0 +1,15 @@
+package me.wiefferink.areashop.adapters.platform.v1_19_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/plugins/fastasyncworldedit/src/main/java/me/wiefferink/areashop/adapters/plugins/FastAsyncWorldEditHandler.java

@@ -59,7 +59,8 @@ public class FastAsyncWorldEditHandler extends WorldEditInterface {
 		private final BoundingBox boundingBox;
 
 		public RegionBoundMask(final ProtectedRegion region) {
-			final BlockVector3 min = region.getMinimumPoint(), max = region.getMaximumPoint();
+			final BlockVector3 min = region.getMinimumPoint();
+			final BlockVector3 max = region.getMaximumPoint();
 			this.boundingBox = new BoundingBox(min.getX(), min.getY(), min.getZ(), max.getX(), max.getY(), max.getZ());
 		}
 
@@ -90,7 +91,6 @@ public class FastAsyncWorldEditHandler extends WorldEditInterface {
 
 	@Beta
 	public CompletableFuture<Boolean> restoreRegionBlocksAsync(File rawFile, GeneralRegionInterface regionInterface) {
-		// TODO implement using the FastAsyncWorldEdit api to paste async
 		File file = null;
 		for (ClipboardFormat formatOption : BuiltInClipboardFormat.values()) {
 			if (new File(rawFile.getAbsolutePath() + "." + formatOption.getPrimaryFileExtension())
@@ -147,6 +147,7 @@ public class FastAsyncWorldEditHandler extends WorldEditInterface {
 		final RegionType regionType = region.getType();
 		final Mask mask = new RegionBoundMask(region);
 		FaweAPI.getTaskManager().async(() -> {
+			boolean result = true;
 			// Read the schematic and paste it into the world
 			try (Closer closer = Closer.create()) {
 				final FileInputStream fis = closer.register(new FileInputStream(finalFile));
@@ -188,30 +189,28 @@ public class FastAsyncWorldEditHandler extends WorldEditInterface {
 						"exceeded the block limit while restoring schematic of " + regionInterface.getName()
 								+ ", limit in exception: " + e.getBlockLimit() + ", limit passed by AreaShop: "
 								+ pluginInterface.getConfig().getInt("maximumBlocks"));
-				completableFuture.complete(false);
+				result = false;
 			} catch (IOException e) {
 				pluginInterface.getLogger().warning(
 						"An error occurred while restoring schematic of " + regionInterface.getName()
 								+ ", enable debug to see the complete stacktrace");
 				pluginInterface.debugI(ExceptionUtils.getStackTrace(e));
-				completableFuture.complete(false);
+				result = false;
 			} catch (Exception e) {
 				pluginInterface.getLogger()
 						.warning("crashed during restore of " + regionInterface.getName());
 				pluginInterface.debugI(ExceptionUtils.getStackTrace(e));
-				completableFuture.complete(false);
+				result = false;
 			}
 			editSession.flushQueue();
-			completableFuture.complete(true);
+			completableFuture.complete(result);
 		});
 		return completableFuture;
 	}
 
 	@Beta
 	public CompletableFuture<Boolean> saveRegionBlocksAsync(File file, GeneralRegionInterface regionInterface) {
-		// TODO implement using the FastAsyncWorldEdit api to save async
 		ClipboardFormat format = BuiltInClipboardFormat.FAST;
-		// TODO allow selecting FAWE format in the config? (when enabled you cannot go back to vanilla WorldEdit easily)
 
 		file = new File(file.getAbsolutePath() + "." + format.getPrimaryFileExtension());
 		pluginInterface.debugI("Trying to save region", regionInterface.getName(), " to file",
@@ -285,7 +284,6 @@ public class FastAsyncWorldEditHandler extends WorldEditInterface {
 
 	@Override
 	public boolean restoreRegionBlocks(File rawFile, GeneralRegionInterface regionInterface) {
-		// TODO implement using the FastAsyncWorldEdit api to paste async
 		File file = null;
 		for (ClipboardFormat formatOption : BuiltInClipboardFormat.values()) {
 			if (new File(rawFile.getAbsolutePath() + "." + formatOption.getPrimaryFileExtension())
@@ -366,7 +364,7 @@ public class FastAsyncWorldEditHandler extends WorldEditInterface {
 							editSession, origin);
 			copy.setTransform(clipboardHolder.getTransform());
 			// Mask to region (for polygon and other weird shaped regions)
-			// TODO make this more efficient (especially for polygon regions)
+			// FIXME make this more efficient (especially for polygon regions)
 			if (region.getType() != RegionType.CUBOID) {
 				copy.setSourceMask(new RegionBoundMask(region));
 			}
@@ -402,9 +400,7 @@ public class FastAsyncWorldEditHandler extends WorldEditInterface {
 
 	@Override
 	public boolean saveRegionBlocks(File file, GeneralRegionInterface regionInterface) {
-		// TODO implement using the FastAsyncWorldEdit api to save async
 		ClipboardFormat format = BuiltInClipboardFormat.FAST;
-		// TODO allow selecting FAWE format in the config? (when enabled you cannot go back to vanilla WorldEdit easily)
 
 		file = new File(file.getAbsolutePath() + "." + format.getPrimaryFileExtension());
 		pluginInterface.debugI("Trying to save region", regionInterface.getName(), " to file",

adapters/plugins/worldedit/src/main/java/me/wiefferink/areashop/adapters/plugins/WorldEditHandler.java

@@ -84,7 +84,10 @@ public class WorldEditHandler extends WorldEditInterface {
 			pluginInterface.getLogger().info("Did not restore region " + regionInterface.getName() + ", world not found: " + regionInterface.getWorldName());
 			return false;
 		}
-		EditSession editSession = pluginInterface.getWorldEdit().getWorldEdit().getEditSessionFactory().getEditSession(world, pluginInterface.getConfig().getInt("maximumBlocks"));
+		EditSession editSession = pluginInterface.getWorldEdit().getWorldEdit().newEditSessionBuilder()
+				.world(world)
+				.maxBlocks(pluginInterface.getConfig().getInt("maximumBlocks"))
+				.build();
 		ProtectedRegion region = regionInterface.getRegion();
 		// Get the origin and size of the region
 		BlockVector3 origin = BlockVector3.at(region.getMinimumPoint().getBlockX(), region.getMinimumPoint().getBlockY(), region.getMinimumPoint().getBlockZ());
@@ -142,7 +145,7 @@ public class WorldEditHandler extends WorldEditInterface {
 			pluginInterface.debugI(ExceptionUtils.getStackTrace(e));
 			return false;
 		}
-		editSession.flushSession();
+		editSession.close();
 		return true;
 	}
 
@@ -170,7 +173,10 @@ public class WorldEditHandler extends WorldEditInterface {
 			pluginInterface.getLogger().warning("Did not save region " + regionInterface.getName() + ", world not found: " + regionInterface.getWorldName());
 			return false;
 		}
-		EditSession editSession = pluginInterface.getWorldEdit().getWorldEdit().getEditSessionFactory().getEditSession(world, pluginInterface.getConfig().getInt("maximumBlocks"));
+		EditSession editSession = pluginInterface.getWorldEdit().getWorldEdit().newEditSessionBuilder()
+				.world(world)
+				.maxBlocks(pluginInterface.getConfig().getInt("maximumBlocks"))
+				.build();
 
 		// Create a clipboard
 		CuboidRegion selection = new CuboidRegion(world, regionInterface.getRegion().getMinimumPoint(), regionInterface.getRegion().getMaximumPoint());

build.gradle.kts

@@ -2,13 +2,13 @@ plugins {
     java
     `java-library`
     `maven-publish`
-    id("io.papermc.paperweight.userdev") version "1.3.3" apply false
+    id("io.papermc.paperweight.userdev") version "1.3.6" apply false
     idea
     eclipse
 }
 
 group = "me.wiefferink"
-version = "2.7.5"
+version = "2.7.8-SNAPSHOT"
 
 subprojects {
 
@@ -81,4 +81,4 @@ subprojects {
             }
         }
     }
-}
+}

gradle/libs.versions.toml

@@ -4,12 +4,12 @@ minecraft = "1.17.1-R0.1-SNAPSHOT"
 findbugs = "3.0.2"
 
 # Minecraft Plugins
-worldedit = "7.2.8"
-worldguard = "7.0.6"
-fawe = "2.0.0"
+worldedit = "7.2.11-SNAPSHOT"
+worldguard = "7.0.7"
+fawe = "2.2.0"
 
 # Gradle plugins
-paperweight = "1.3.3"
+paperweight = "1.3.7"
 
 [libraries]
 # Platform
@@ -26,4 +26,4 @@ fastasyncworldeditCore = { group = "com.fastasyncworldedit", name = "FastAsyncWo
 
 [plugins]
 # Gradle plugins
-paperweightUserdev = { id = "io.papermc.paperweight.userdev", version.ref = "paperweight" }
+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.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle.kts

@@ -25,6 +25,7 @@ include(":areashop-nms")
 // Adapters
 include(":adapters:platform:bukkit-1-17")
 include(":adapters:platform:bukkit-1-18")
+include(":adapters:platform:bukkit-1-19")
 include(":adapters:plugins:worldedit")
 include(":adapters:plugins:worldguard")
 include(":adapters:plugins:fastasyncworldedit")
@@ -34,5 +35,4 @@ include(":areashop")
 
 project(":areashop").projectDir = file("AreaShop")
 
-enableFeaturePreview("VERSION_CATALOGS")
-enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
+enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")