diff --git a/verification/src/changes/accepted-fabric-public-api-changes.json b/verification/src/changes/accepted-fabric-public-api-changes.json index b0ab7f4ad6..ccae871fec 100644 --- a/verification/src/changes/accepted-fabric-public-api-changes.json +++ b/verification/src/changes/accepted-fabric-public-api-changes.json @@ -7,5 +7,14 @@ "CONSTRUCTOR_REMOVED" ] } + ], + "Removal of override": [ + { + "type": "com.sk89q.worldedit.fabric.FabricWorld", + "member": "Method com.sk89q.worldedit.fabric.FabricWorld.playEffect(com.sk89q.worldedit.math.Vector3,int,int)", + "changes": [ + "METHOD_REMOVED" + ] + } ] } diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java index 39422cfc60..62110978af 100644 --- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java +++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java @@ -355,6 +355,7 @@ public void sendBiomeUpdates(Iterable chunks) { } } + @Deprecated @Override public boolean playEffect(Vector3 position, int type, int data) { World world = getWorld(); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/AreaPickaxe.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/AreaPickaxe.java index 788814256a..8841a359cb 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/AreaPickaxe.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/AreaPickaxe.java @@ -52,6 +52,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, @Nullable Direction face) { World world = BlockTool.requireWorld(clicked); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/RecursivePickaxe.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/RecursivePickaxe.java index f2ecc88766..988fee1dd7 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/RecursivePickaxe.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/RecursivePickaxe.java @@ -86,6 +86,7 @@ public boolean actPrimary(Platform server, LocalConfiguration config, Player pla return true; } + @SuppressWarnings("deprecation") private static void recurse(Platform server, EditSession editSession, World world, BlockVector3 pos, BlockVector3 origin, double size, BlockType initialType, Set visited) throws MaxChangedBlocksException { diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/AbstractWorld.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/AbstractWorld.java index c32b128ce2..81940badc7 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/AbstractWorld.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/AbstractWorld.java @@ -46,6 +46,7 @@ */ public abstract class AbstractWorld implements World { + @Deprecated private final PriorityQueue effectQueue = new PriorityQueue<>(); private int taskId = -1; @@ -102,11 +103,13 @@ public void sendBiomeUpdates(Iterable chunks) { public void fixLighting(Iterable chunks) { } + @Deprecated @Override public boolean playEffect(Vector3 position, int type, int data) { return false; } + @Deprecated @Override public boolean queueBlockBreakEffect(Platform server, BlockVector3 position, BlockType blockType, double priority) { if (taskId == -1) { @@ -169,6 +172,7 @@ public boolean isValid() { return true; } + @Deprecated private class QueuedEffect implements Comparable { private final Vector3 position; private final BlockType blockType; @@ -180,7 +184,7 @@ private QueuedEffect(Vector3 position, BlockType blockType, double priority) { this.priority = priority; } - @SuppressWarnings("deprecation") + @Deprecated public void play() { playEffect(position, 2001, blockType.getLegacyId()); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/World.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/World.java index a1fcdca8b0..1e00ff7289 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/World.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/World.java @@ -336,7 +336,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); /** @@ -347,7 +349,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); /** diff --git a/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricWorld.java b/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricWorld.java index e9e750a46d..b112dc2462 100644 --- a/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricWorld.java +++ b/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricWorld.java @@ -576,13 +576,6 @@ public void fixLighting(Iterable chunks) { } } - @Override - public boolean playEffect(Vector3 position, int type, int data) { - // TODO update sound API - // getWorld().playSound(type, FabricAdapter.toBlockPos(position.toBlockPoint()), data); - return true; - } - @Override public WeatherType getWeather() { LevelData info = getWorld().getLevelData(); diff --git a/worldedit-neoforge/src/main/java/com/sk89q/worldedit/neoforge/NeoForgeWorld.java b/worldedit-neoforge/src/main/java/com/sk89q/worldedit/neoforge/NeoForgeWorld.java index 23de89a324..21438c0182 100644 --- a/worldedit-neoforge/src/main/java/com/sk89q/worldedit/neoforge/NeoForgeWorld.java +++ b/worldedit-neoforge/src/main/java/com/sk89q/worldedit/neoforge/NeoForgeWorld.java @@ -561,13 +561,6 @@ public void fixLighting(Iterable chunks) { } } - @Override - public boolean playEffect(Vector3 position, int type, int data) { - // TODO update sound API - // getWorld().play(type, NeoForgeAdapter.toBlockPos(position.toBlockPoint()), data); - return true; - } - @Override public WeatherType getWeather() { LevelData info = getWorld().getLevelData();