Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-07-12 10:38:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

continue with merge

Browse Source
This commit is contained in:
Jesse Boyd
2019-04-03 22:28:57 +11:00
parent 8aef06b29e
commit 7086eb8b3e
20 changed files with 136 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
worldedit-core/src/main/java/com/sk89q/worldedit/world/biome/BiomeTypes.java
View File

@ -117,4 +117,8 @@ public class BiomeTypes {
public static @Nullable BiomeType get(final String id) {
return BiomeType.REGISTRY.get(id);
}
public static BiomeType get(int parseInt) {
// TODO
}
}

8
worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockState.java
View File

@ -30,6 +30,7 @@ import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.extension.input.InputParseException;
import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.function.pattern.FawePattern;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.registry.state.AbstractProperty;
import com.sk89q.worldedit.registry.state.Property;
@ -50,7 +51,7 @@ import java.util.Set;
* An immutable class that represents the state a block can be in.
*/
@SuppressWarnings("unchecked")
public class BlockState implements BlockStateHolder<BlockState> {
public class BlockState implements BlockStateHolder<BlockState>, FawePattern {
private final BlockType blockType;
private BaseBlock emptyBaseBlock;
@ -356,11 +357,6 @@ public class BlockState implements BlockStateHolder<BlockState> {
return this;
}
@Override
public BaseBlock toBaseBlock() {
return this.emptyBaseBlock;
}
@Override
public int getInternalId() {
return blockType.getInternalId();

1
worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypes.java
View File

@ -60,6 +60,7 @@ import java.util.stream.Stream;
*/
public final class BlockTypes {
@Nullable public static final BlockType __RESERVED__ = get("minecraft:__reserved__");
@Nullable public static final BlockType ACACIA_BUTTON = get("minecraft:acacia_button");
@Nullable public static final BlockType ACACIA_DOOR = get("minecraft:acacia_door");
@Nullable public static final BlockType ACACIA_FENCE = get("minecraft:acacia_fence");