Upstream

worldedit-bukkit/adapters/adapter-26.1/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v26_1/PaperweightBlockMaterial.java

@@ -28,7 +28,6 @@
 import net.minecraft.world.level.block.EntityBlock;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.material.Fluids;
 import net.minecraft.world.level.material.PushReaction;
 
 public class PaperweightBlockMaterial extends BukkitBlockMaterial<Block, BlockState> {
@@ -69,7 +68,7 @@ public boolean isPowerSource() {
 
     @Override
     public boolean isLiquid() {
-        return !this.blockState.getFluidState().is(Fluids.EMPTY);
+        return !this.blockState.getFluidState().isEmpty();
     }
 
     @Override

worldedit-bukkit/adapters/adapter-26.2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v26_2/PaperweightBlockMaterial.java

@@ -29,7 +29,6 @@
 import net.minecraft.world.level.block.EntityBlock;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.material.Fluids;
 import net.minecraft.world.level.material.PushReaction;
 
 public class PaperweightBlockMaterial extends BukkitBlockMaterial<Block, BlockState> {
@@ -70,7 +69,7 @@ public boolean isPowerSource() {
 
     @Override
     public boolean isLiquid() {
-        return !this.blockState.getFluidState().is(Fluids.EMPTY);
+        return !this.blockState.getFluidState().isEmpty();
     }
 
     @Override

worldedit-bukkit/adapters/adapter-26.3/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v26_3/PaperweightBlockMaterial.java

@@ -28,7 +28,6 @@
 import net.minecraft.world.level.block.EntityBlock;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.material.Fluids;
 import net.minecraft.world.level.material.PushReaction;
 
 public class PaperweightBlockMaterial extends BukkitBlockMaterial<Block, BlockState> {
@@ -69,7 +68,7 @@ public boolean isPowerSource() {
 
     @Override
     public boolean isLiquid() {
-        return !this.blockState.getFluidState().is(Fluids.EMPTY);
+        return !this.blockState.getFluidState().isEmpty();
     }
 
     @Override

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java

@@ -453,6 +453,7 @@ public void fixAfterFastMode(Iterable<BlockVector2> chunks) {
         }
     }
 
+    @Deprecated
     @Override
     public boolean playEffect(Vector3 position, int type, int data) {
         World world = getWorld();

worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/AreaPickaxe.java

@@ -49,6 +49,7 @@ public boolean canUse(Actor player) {
         return player.hasPermission("worldedit.superpickaxe.area");
     }
 
+    @SuppressWarnings("deprecation")
     @Override
     public boolean actPrimary(Platform server, LocalConfiguration config, Player player, LocalSession session, Location clicked) {
         int ox = clicked.getBlockX();

worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/RecursivePickaxe.java

@@ -106,6 +106,7 @@ public boolean actPrimary(
         return true;
     }
 
+    @SuppressWarnings("deprecation")
     private static void recurse(
             Platform server, EditSession editSession, World world, BlockVector3 pos,
             BlockVector3 origin, double size, BlockType initialType, Set<BlockVector3> visited

worldedit-core/src/main/java/com/sk89q/worldedit/util/net/HttpRequest.java

@@ -45,6 +45,12 @@
 import java.util.Map;
 import java.util.concurrent.ThreadLocalRandom;
 
+/**
+ * A class for making HTTP requests.
+ *
+ * @deprecated Use the native JDK HttpClient API instead.
+ */
+@Deprecated(forRemoval = true)
 public class HttpRequest implements Closeable {
 
     private static final int CONNECT_TIMEOUT = 1000 * 5;

worldedit-core/src/main/java/com/sk89q/worldedit/util/paste/EngineHubPaste.java

@@ -21,11 +21,13 @@
 
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
-import com.sk89q.worldedit.util.net.HttpRequest;
 
 import java.io.IOException;
 import java.net.URI;
 import java.net.URL;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
 import java.util.Map;
 import java.util.concurrent.Callable;
 
@@ -39,7 +41,6 @@ public Callable<URL> paste(String content, PasteMetadata metadata) {
     }
 
     private static final class PasteTask implements Callable<URL> {
-
         private final String content;
         private final PasteMetadata metadata;
 
@@ -50,51 +51,55 @@ private PasteTask(String content, PasteMetadata metadata) {
 
         @Override
         public URL call() throws IOException, InterruptedException {
-            URL initialUrl = HttpRequest.url("https://paste.enginehub.org/signed_paste");
-
-            HttpRequest requestBuilder = HttpRequest.get(initialUrl);
-
-            requestBuilder.header("x-paste-meta-from", "EngineHub");
-            if (metadata.name != null) {
-                requestBuilder.header("x-paste-meta-name", metadata.name);
-            }
-            if (metadata.author != null) {
-                requestBuilder.header("x-paste-meta-author", metadata.author);
-            }
-            if (metadata.extension != null) {
-                requestBuilder.header("x-paste-meta-extension", metadata.extension);
-            }
-
-            SignedPasteResponse response = GSON.fromJson(requestBuilder
-                    .execute()
-                    .expectResponseCode(200)
-                    .returnContent()
-                    .asString("UTF-8"), TypeToken.get(SignedPasteResponse.class).getType());
-
-            HttpRequest.Form form = HttpRequest.Form.create();
-            for (Map.Entry<String, String> entry : response.uploadFields.entrySet()) {
-                form.add(entry.getKey(), entry.getValue());
+            try (HttpClient client = HttpClient.newHttpClient()) {
+                HttpRequest.Builder signRequestBuilder = HttpRequest.newBuilder()
+                        .uri(URI.create("https://paste.enginehub.org/signed_paste_v2"))
+                        .header("x-paste-meta-from", "EngineHub");
+
+                if (metadata.name != null) {
+                    signRequestBuilder.header("x-paste-meta-name", metadata.name);
+                }
+                if (metadata.author != null) {
+                    signRequestBuilder.header("x-paste-meta-author", metadata.author);
+                }
+                if (metadata.extension != null) {
+                    signRequestBuilder.header("x-paste-meta-extension", metadata.extension);
+                }
+
+                HttpResponse<String> signResponse = client.send(signRequestBuilder.build(), HttpResponse.BodyHandlers.ofString());
+
+                if (signResponse.statusCode() != 200) {
+                    throw new IOException("Failed to initiate paste upload: " + signResponse.statusCode() + " " + signResponse.body());
+                }
+
+                SignedPasteResponse response = GSON.fromJson(
+                        signResponse.body(),
+                        TypeToken.get(SignedPasteResponse.class).getType()
+                );
+
+                HttpRequest.Builder uploadRequestBuilder = HttpRequest.newBuilder()
+                        .uri(URI.create(response.uploadUrl))
+                        .method("PUT", HttpRequest.BodyPublishers.ofString(content));
+
+                for (Map.Entry<String, String> entry : response.headers.entrySet()) {
+                    uploadRequestBuilder.header(entry.getKey(), entry.getValue());
+                }
+
+                // If this succeeds, it will not return any data aside from a 204 status.
+                HttpResponse<String> uploadResponse = client.send(uploadRequestBuilder.build(), HttpResponse.BodyHandlers.ofString());
+
+                if (uploadResponse.statusCode() != 200 && uploadResponse.statusCode() != 204) {
+                    throw new IOException("Failed to upload paste: " + uploadResponse.statusCode() + " " + uploadResponse.body());
+                }
+
+                return URI.create(response.viewUrl).toURL();
             }
-            form.add("file", content);
-
-            URL url = HttpRequest.url(response.uploadUrl);
-            // If this succeeds, it will not return any data aside from a 204 status.
-            HttpRequest.post(url)
-                    .bodyMultipartForm(form)
-                    .execute()
-                    .expectResponseCode(200, 204);
-
-            return URI.create(response.viewUrl).toURL();
         }
-
     }
 
     private static final class SignedPasteResponse {
-
         String viewUrl;
         String uploadUrl;
-        Map<String, String> uploadFields;
-
+        Map<String, String> headers;
     }
-
 }

worldedit-core/src/main/java/com/sk89q/worldedit/world/AbstractWorld.java

@@ -48,6 +48,7 @@
  */
 public abstract class AbstractWorld implements World {
 
+    @Deprecated
     private final PriorityQueue<QueuedEffect> effectQueue = new PriorityQueue<>();
     private int taskId = -1;
 
@@ -102,6 +103,7 @@ public void fixAfterFastMode(Iterable<BlockVector2> chunks) {
     public void fixLighting(Iterable<BlockVector2> chunks) {
     }
 
+    @Deprecated
     @Override
     public boolean playEffect(Vector3 position, int type, int data) {
         return false;
@@ -114,6 +116,7 @@ public boolean playBlockBreakEffect(Vector3 position, BlockType type) {
     }
     //FAWE end
 
+    @Deprecated
     @Override
     public boolean queueBlockBreakEffect(Platform server, BlockVector3 position, BlockType blockType, double priority) {
         if (taskId == -1) {
@@ -180,6 +183,7 @@ public void setWeather(WeatherType weatherType) {
     public void setWeather(WeatherType weatherType, long duration) {
     }
 
+    @Deprecated
     private class QueuedEffect implements Comparable<QueuedEffect> {
 
         private final Vector3 position;
@@ -192,6 +196,7 @@ private QueuedEffect(Vector3 position, BlockType blockType, double priority) {
             this.priority = priority;
         }
 
+        @Deprecated
         //FAWE start - allow block break effect of non-legacy blocks
         public void play() {
             playBlockBreakEffect(position, blockType);

worldedit-core/src/main/java/com/sk89q/worldedit/world/World.java

@@ -391,7 +391,9 @@ default boolean generateFeature(ConfiguredFeatureType type, EditSession editSess
      * @param type     the effect type
      * @param data     the effect data
      * @return true if the effect was played
+     * @deprecated This is deprecated without replacement.
      */
+    @Deprecated
     boolean playEffect(Vector3 position, int type, int data);
 
     //FAWE start - allow block break effect of non-legacy blocks
@@ -413,7 +415,9 @@ default boolean generateFeature(ConfiguredFeatureType type, EditSession editSess
      * @param blockType the block type
      * @param priority  the priority
      * @return true if the effect was played
+     * @deprecated This is deprecated without replacement.
      */
+    @Deprecated
     boolean queueBlockBreakEffect(Platform server, BlockVector3 position, BlockType blockType, double priority);
 
     /**