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

Revert "Or this?"

Browse Source 
This reverts commit 558144696a.
This commit is contained in:
Jesse Boyd 2019-10-31 00:41:15 +01:00
parent 558144696a
commit ef47ea74df
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
2 changed files with 685 additions and 679 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,6 +47,8 @@ import java.util.stream.IntStream;
import javax.annotation.Nullable; import javax.annotation.Nullable;
public class BlockType implements FawePattern, Keyed { public class BlockType implements FawePattern, Keyed {
protected static final BlockType DUMMY = new BlockType();
public static final NamespacedRegistry<BlockType> REGISTRY = new NamespacedRegistry<>("block type"); public static final NamespacedRegistry<BlockType> REGISTRY = new NamespacedRegistry<>("block type");
private final String id; private final String id;
@ -55,6 +57,12 @@ public class BlockType implements FawePattern, Keyed {
private boolean initItemType; private boolean initItemType;
private ItemType itemType; private ItemType itemType;
// Dummy
private BlockType() {
this.id = null;
this.settings = null;
}
protected BlockType(String id, int internalId, List<BlockState> states) { protected BlockType(String id, int internalId, List<BlockState> states) {
int i = id.indexOf("["); int i = id.indexOf("[");
this.id = i == -1 ? id : id.substring(0, i); this.id = i == -1 ? id : id.substring(0, i);

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

File diff suppressed because it is too large Load Diff