Fix some merge issues

This commit is contained in:
Jesse Boyd
2018-08-14 00:38:33 +10:00
parent 025360753f
commit 0632a9ce96
5 changed files with 27 additions and 11 deletions

View File

@ -1011,6 +1011,10 @@ public enum BlockTypes implements BlockType {
return existing;
}
public static final @Nullable BlockTypes get(final String id) {
return $REGISTRY.get(id);
}
public static final @Nullable BlockTypes get(final CharSequence id) {
return $REGISTRY.get(id);
}