Feature/1.17.1 (#1172)

* Update adapters for 1.17.1

* Fixes #1074

* fd10efa56b51d915302d616302145c74c3f079ee

* Fix `//chunkinfo` message

* 9fc85704e9570304f1b336612039afc85bb17064

* 03b4437023

* JitPack decided to work again

worldedit-bukkit/build.gradle.kts

@@ -102,7 +102,7 @@ dependencies {
     // Third party
     implementation("org.bstats:bstats-bukkit:2.2.1")
     implementation("org.bstats:bstats-base:2.2.1")
-  //  compileOnlyApi("org.inventivetalent:mapmanager:1.7.10-SNAPSHOT") { isTransitive = false }
+    compileOnlyApi("org.inventivetalent:mapmanager:1.7.10-SNAPSHOT") { isTransitive = false }
     implementation("com.github.TechFortress:GriefPrevention:16.17.1") { isTransitive = false }
     implementation("com.github.bloodmc:GriefDefenderApi:920a610") { isTransitive = false }
     implementation("com.flowpowered:flow-math:1.0.3") {

worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/FaweBukkit.java

@@ -1,5 +1,6 @@
 package com.fastasyncworldedit.bukkit;
 
+import com.fastasyncworldedit.bukkit.util.image.BukkitImageViewer;
 import com.fastasyncworldedit.core.FAWEPlatformAdapterImpl;
 import com.fastasyncworldedit.core.Fawe;
 import com.fastasyncworldedit.core.IFawe;
@@ -126,7 +127,7 @@ public class FaweBukkit implements IFawe, Listener {
                     fos.write(jarData);
                 }
             }
-         //   return new BukkitImageViewer(BukkitAdapter.adapt(player));
+            return new BukkitImageViewer(BukkitAdapter.adapt(player));
         } catch (Throwable ignored) {
         }
         return null;

worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/util/image/BukkitImageViewer.java

@@ -1,4 +1,3 @@
-/*
 package com.fastasyncworldedit.bukkit.util.image;
 
 import com.fastasyncworldedit.core.util.image.Drawable;
@@ -201,5 +200,3 @@ public class BukkitImageViewer implements ImageViewer {
         last = null;
     }
 }
-
- */

worldedit-core/src/main/java/com/sk89q/worldedit/command/util/annotation/Confirm.java

@@ -101,7 +101,7 @@ public @interface Confirm {
                 if (checkExisting(context)) {
                     return true;
                 }
-                actor.print(Caption.of("fawe.cancel.worldedit.cancel.reason.confirm"));
+                actor.print(Caption.of("fawe.cancel.worldedit.cancel.reason.confirm", Processor.getArgs(context)));
                 return confirm(actor, context);
             }
         };

worldedit-core/src/main/resources/lang/strings.json

@@ -136,7 +136,7 @@
     "fawe.error.schematic.not.found": "Schematic {0} not found.",
 
     "fawe.cancel.worldedit.cancel.count": "Cancelled {0} edits.",
-	"fawe.cancel.worldedit.cancel.reason.confirm": "Use //confirm to execute {2}",
+	"fawe.cancel.worldedit.cancel.reason.confirm": "Use //confirm to execute {0}",
 	"fawe.cancel.worldedit.cancel.reason.confirm.region": "Your selection is large ({0} -> {1}, containing {3} blocks). Use //confirm to execute {2}",
 	"fawe.cancel.worldedit.cancel.reason.confirm.radius": "Your radius is large ({0} > {1}). Use //confirm to execute {2}",
 	"fawe.cancel.worldedit.cancel.reason.confirm.limit": "You're exceeding your limit for this action ({0} > {1}). Use //confirm to execute {2}",
@@ -380,7 +380,7 @@
     "worldedit.hpos.no-block": "No block in sight!",
     "worldedit.hpos.already-set": "Position already set.",
     "worldedit.chunk.selected-multiple": "Chunks selected: ({0}, {1}) - ({2}, {3})",
-    "worldedit.chunk.selected": "Chunk selected: {0}, {1}, {2}",
+    "worldedit.chunk.selected": "Chunk selected: {0}, {1}",
     "worldedit.wand.invalid": "Wand item is mis-configured or disabled.",
     "worldedit.wand.selwand.info": "Left click: select pos #1; Right click: select pos #2",
     "worldedit.wand.selwand.now.tool": "The selection wand is now a normal tool. You can disable it with {0} and rebind it to any item with {1} or get a new wand with {2}.",