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

Continue moving out of legacy BlockType

Browse Source
This commit is contained in:
Matthew Miller
2018-07-02 13:45:46 +10:00
parent e291cccb94
commit 57c13ef8f4
14 changed files with 57 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,6 +26,7 @@ import com.sk89q.worldedit.blocks.BaseItem;
import com.sk89q.worldedit.blocks.BaseItemStack;
import com.sk89q.worldedit.blocks.type.BlockState;
import com.sk89q.worldedit.blocks.type.BlockStateHolder;
import com.sk89q.worldedit.blocks.type.BlockType;
import com.sk89q.worldedit.blocks.type.BlockTypes;
import com.sk89q.worldedit.extension.platform.Platform;
import com.sk89q.worldedit.function.mask.BlockMask;
@ -93,7 +94,7 @@ public abstract class AbstractWorld implements World {
}
@Override
public boolean queueBlockBreakEffect(Platform server, Vector position, com.sk89q.worldedit.blocks.type.BlockType blockType, double priority) {
public boolean queueBlockBreakEffect(Platform server, Vector position, BlockType blockType, double priority) {
if (taskId == -1) {
taskId = server.schedule(0, 1, () -> {
int max = Math.max(1, Math.min(30, effectQueue.size() / 3));
@ -131,10 +132,10 @@ public abstract class AbstractWorld implements World {
private class QueuedEffect implements Comparable<QueuedEffect> {
private final Vector position;
private final com.sk89q.worldedit.blocks.type.BlockType blockType;
private final BlockType blockType;
private final double priority;
private QueuedEffect(Vector position, com.sk89q.worldedit.blocks.type.BlockType blockType, double priority) {
private QueuedEffect(Vector position, BlockType blockType, double priority) {
this.position = position;
this.blockType = blockType;
this.priority = priority;

20
worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/SimpleBlockMaterial.java
View File

@ -45,6 +45,8 @@ class SimpleBlockMaterial implements BlockMaterial {
private boolean burnable;
private boolean toolRequired;
private boolean replacedDuringPlacement;
private boolean isTranslucent;
private boolean hasContainer;
@Override
public boolean isRenderedAsNormalBlock() {
@ -240,7 +242,25 @@ class SimpleBlockMaterial implements BlockMaterial {
return replacedDuringPlacement;
}
public void setTranslucent(boolean isTranslucent) {
this.isTranslucent = isTranslucent;
}
@Override
public boolean isTranslucent() {
return this.isTranslucent;
}
public void setReplacedDuringPlacement(boolean replacedDuringPlacement) {
this.replacedDuringPlacement = replacedDuringPlacement;
}
@Override
public boolean hasContainer() {
return this.hasContainer;
}
public void setHasContainer(boolean hasContainer) {
this.hasContainer = hasContainer;
}
}