Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,7 @@ public void sendBiomeUpdates(Iterable<BlockVector2> chunks) {
}
}

@Deprecated
@Override
public boolean playEffect(Vector3 position, int type, int data) {
World world = getWorld();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<BlockVector3> visited) throws MaxChangedBlocksException {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
*/
public abstract class AbstractWorld implements World {

@Deprecated
private final PriorityQueue<QueuedEffect> effectQueue = new PriorityQueue<>();
private int taskId = -1;

Expand Down Expand Up @@ -102,11 +103,13 @@ public void sendBiomeUpdates(Iterable<BlockVector2> chunks) {
public void fixLighting(Iterable<BlockVector2> 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) {
Expand Down Expand Up @@ -169,6 +172,7 @@ public boolean isValid() {
return true;
}

@Deprecated
private class QueuedEffect implements Comparable<QueuedEffect> {
private final Vector3 position;
private final BlockType blockType;
Expand All @@ -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());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);

/**
Expand All @@ -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);

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -576,13 +576,6 @@ public void fixLighting(Iterable<BlockVector2> 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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -561,13 +561,6 @@ public void fixLighting(Iterable<BlockVector2> 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();
Expand Down
Loading