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

Reduce subclass impl

Browse Source
This commit is contained in:
TheMode 2021-06-16 14:04:22 +02:00
parent 84f22a6ed4
commit 34b7133f17
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,6 +10,7 @@ import org.jetbrains.annotations.Nullable;
import org.jglrxavpok.hephaistos.nbt.NBTCompound;
import java.util.Map;
import java.util.Objects;
import java.util.function.BiPredicate;
/**
@ -27,10 +28,14 @@ public interface Block extends ProtocolObject, TagReadable, BlockConstants {
return withProperty(property.getName(), value.toString());
}
<T> @NotNull Block withTag(@NotNull Tag<T> tag, @Nullable T value);
@NotNull Block withNbt(@Nullable NBTCompound compound);
default <T> @NotNull Block withTag(@NotNull Tag<T> tag, @Nullable T value) {
var compound = Objects.requireNonNullElseGet(getNbt(), NBTCompound::new);
tag.write(compound, value);
return withNbt(compound);
}
@NotNull Block withHandler(@Nullable BlockHandler handler);
@NotNull String getProperty(@NotNull String property);

7
src/main/java/net/minestom/server/instance/block/BlockTest.java
View File

@ -41,13 +41,6 @@ class BlockTest implements Block {
return Objects.requireNonNull(BlockRegistry.getProperties(this, properties));
}
@Override
public @NotNull <T> Block withTag(@NotNull Tag<T> tag, @Nullable T value) {
var compound = this.compound != null ? this.compound.deepClone() : new NBTCompound();
tag.write(compound, value);
return new BlockTest(registry, properties, compound, handler);
}
@Override
public @NotNull Block withNbt(@Nullable NBTCompound compound) {
return new BlockTest(registry, properties, compound, handler);