Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 09:47:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add Pattern#applyBlock in favor of Pattern#apply

Browse Source 
As Fawe extends into its own Filter class, this will need a Fawe-suitable solution at some point when removing the deprecated method.
This is a compatibility-layer workaround for plugins calling the WorldEdit method `Pattern#applyBlock`.
This commit is contained in:
NotMyFault 2021-05-06 11:54:22 +02:00
parent 5dafa5f62b
commit 22be7410fc
No known key found for this signature in database
GPG Key ID: 158F5701A6AAD00C
1 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
worldedit-core/src/main/java/com/sk89q/worldedit/function/pattern/Pattern.java
View File

@ -23,21 +23,25 @@ import com.boydti.fawe.beta.Filter;
import com.boydti.fawe.beta.implementation.filter.block.FilterBlock; import com.boydti.fawe.beta.implementation.filter.block.FilterBlock;
import com.sk89q.worldedit.WorldEditException; import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.extent.Extent; import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.internal.util.DeprecationUtil;
import com.sk89q.worldedit.internal.util.NonAbstractForCompatibility;
import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.world.block.BaseBlock; import com.sk89q.worldedit.world.block.BaseBlock;
import com.sk89q.worldedit.world.block.BlockStateHolder;
/** /**
* Returns a {@link BlockStateHolder} for a given position. * Returns a {@link BaseBlock} for a given position.
*/ */
// FAWE Start
public interface Pattern extends Filter { public interface Pattern extends Filter {
/** /**
* Return a {@link BlockStateHolder} for the given position. * Return a {@link BaseBlock} for the given position.
* *
* @param position the position * @param position the position
* @return a block * @return a block
* @deprecated use {@link Pattern#applyBlock(BlockVector3)}
*/ */
@Deprecated
BaseBlock apply(BlockVector3 position); BaseBlock apply(BlockVector3 position);
default boolean apply(Extent extent, BlockVector3 get, BlockVector3 set) throws WorldEditException { default boolean apply(Extent extent, BlockVector3 get, BlockVector3 set) throws WorldEditException {
@ -48,4 +52,24 @@ public interface Pattern extends Filter {
default void applyBlock(final FilterBlock block) { default void applyBlock(final FilterBlock block) {
apply(block, block, block); apply(block, block, block);
} }
// FAWE End
/**
* Return a {@link BaseBlock} for the given position.
*
* @param position the position
* @return a block
* @apiNote This must be overridden by new subclasses. See {@link NonAbstractForCompatibility}
* for details
*/
@NonAbstractForCompatibility(
delegateName = "apply",
delegateParams = { BlockVector3.class }
)
default BaseBlock applyBlock(BlockVector3 position) {
DeprecationUtil.checkDelegatingOverride(getClass());
return apply(position);
}
} }