Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-07-02 19:36:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove all raw usages of BSH, improve API generics

Browse Source
This commit is contained in:
Kenzie Togami
2018-12-26 16:39:10 -08:00
parent a88f6b8430
commit 3fefcbf971
83 changed files with 242 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
worldedit-core/src/main/java/com/sk89q/worldedit/function/pattern/BlockPattern.java
View File

@ -30,14 +30,14 @@ import com.sk89q.worldedit.world.block.BlockStateHolder;
*/
public class BlockPattern extends AbstractPattern {
private BlockStateHolder block;
private BaseBlock block;
/**
* Create a new pattern with the given block.
*
* @param block the block
*/
public BlockPattern(BlockStateHolder block) {
public BlockPattern(BlockStateHolder<?> block) {
setBlock(block);
}
@ -46,7 +46,7 @@ public class BlockPattern extends AbstractPattern {
*
* @return the block that is always returned
*/
public BlockStateHolder getBlock() {
public BaseBlock getBlock() {
return block;
}
@ -55,13 +55,13 @@ public class BlockPattern extends AbstractPattern {
*
* @param block the block
*/
public void setBlock(BlockStateHolder block) {
public void setBlock(BlockStateHolder<?> block) {
checkNotNull(block);
this.block = block;
this.block = block.toBaseBlock();
}
@Override
public BlockStateHolder apply(BlockVector3 position) {
public BaseBlock apply(BlockVector3 position) {
return block;
}

4
worldedit-core/src/main/java/com/sk89q/worldedit/function/pattern/ClipboardPattern.java
View File

@ -23,7 +23,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.worldedit.extent.clipboard.Clipboard;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import com.sk89q.worldedit.world.block.BaseBlock;
/**
* A pattern that reads from {@link Clipboard}.
@ -45,7 +45,7 @@ public class ClipboardPattern extends AbstractPattern {
}
@Override
public BlockStateHolder apply(BlockVector3 position) {
public BaseBlock apply(BlockVector3 position) {
int xp = Math.abs(position.getBlockX()) % size.getBlockX();
int yp = Math.abs(position.getBlockY()) % size.getBlockY();
int zp = Math.abs(position.getBlockZ()) % size.getBlockZ();

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

@ -20,6 +20,7 @@
package com.sk89q.worldedit.function.pattern;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.world.block.BaseBlock;
import com.sk89q.worldedit.world.block.BlockStateHolder;
/**
@ -33,6 +34,6 @@ public interface Pattern {
* @param position the position
* @return a block
*/
BlockStateHolder apply(BlockVector3 position);
BaseBlock apply(BlockVector3 position);
}

4
worldedit-core/src/main/java/com/sk89q/worldedit/function/pattern/RandomPattern.java
View File

@ -22,7 +22,7 @@ package com.sk89q.worldedit.function.pattern;
import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import com.sk89q.worldedit.world.block.BaseBlock;
import java.util.ArrayList;
import java.util.List;
@ -53,7 +53,7 @@ public class RandomPattern extends AbstractPattern {
}
@Override
public BlockStateHolder apply(BlockVector3 position) {
public BaseBlock apply(BlockVector3 position) {
double r = random.nextDouble();
double offset = 0;

4
worldedit-core/src/main/java/com/sk89q/worldedit/function/pattern/RepeatingExtentPattern.java
View File

@ -23,7 +23,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import com.sk89q.worldedit.world.block.BaseBlock;
/**
* Returns the blocks from {@link Extent}, repeating when out of bounds.
@ -83,7 +83,7 @@ public class RepeatingExtentPattern extends AbstractPattern {
}
@Override
public BlockStateHolder apply(BlockVector3 position) {
public BaseBlock apply(BlockVector3 position) {
BlockVector3 base = position.add(offset);
BlockVector3 size = extent.getMaximumPoint().subtract(extent.getMinimumPoint()).add(1, 1, 1);
int x = base.getBlockX() % size.getBlockX();