Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-23 00:21:26 +01:00
Code Issues Projects Releases Wiki Activity

Use a BiPredicate for block comparison

Browse Source
This commit is contained in:
TheMode 2021-05-28 14:34:24 +02:00
parent 4739dbd0b8
commit 58df9a9ba8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/net/minestom/server/instance/block/Block.java
View File

@ -10,6 +10,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.util.Map; import java.util.Map;
import java.util.function.BiPredicate;
public interface Block extends Keyed, TagReadable, BlockConstants { public interface Block extends Keyed, TagReadable, BlockConstants {
@ -41,7 +42,7 @@ public interface Block extends Keyed, TagReadable, BlockConstants {
@Nullable BlockHandler getHandler(); @Nullable BlockHandler getHandler();
default boolean compare(@NotNull Block block, @NotNull Comparator comparator) { default boolean compare(@NotNull Block block, @NotNull Comparator comparator) {
return comparator.equals(this, block); return comparator.test(this, block);
} }
default boolean compare(@NotNull Block block) { default boolean compare(@NotNull Block block) {
@ -59,6 +60,7 @@ public interface Block extends Keyed, TagReadable, BlockConstants {
static @Nullable Block fromStateId(short stateId) { static @Nullable Block fromStateId(short stateId) {
return BlockRegistry.fromStateId(stateId); return BlockRegistry.fromStateId(stateId);
} }
static @Nullable Block fromBlockId(int blockId) { static @Nullable Block fromBlockId(int blockId) {
return BlockRegistry.fromBlockId(blockId); return BlockRegistry.fromBlockId(blockId);
} }
@ -83,14 +85,12 @@ public interface Block extends Keyed, TagReadable, BlockConstants {
@FunctionalInterface @FunctionalInterface
interface Comparator { interface Comparator extends BiPredicate<Block, Block> {
Comparator IDENTITY = (b1, b2) -> b1 == b2; Comparator IDENTITY = (b1, b2) -> b1 == b2;
Comparator ID = (b1, b2) -> b1.getBlockId() == b2.getBlockId(); Comparator ID = (b1, b2) -> b1.getBlockId() == b2.getBlockId();
Comparator STATE = (b1, b2) -> b1.getStateId() == b2.getStateId(); Comparator STATE = (b1, b2) -> b1.getStateId() == b2.getStateId();
boolean equals(@NotNull Block b1, @NotNull Block b2);
} }
@FunctionalInterface @FunctionalInterface