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

Fix with the latest version of MinestomData

Browse Source
This commit is contained in:
TheMode 2021-07-24 11:22:59 +02:00
parent 7f5ea582c9
commit 3a93ab045a
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/net/minestom/server/registry/Registry.java
View File

@ -7,9 +7,9 @@ import com.google.gson.JsonObject;
import net.minestom.server.utils.NamespaceID; import net.minestom.server.utils.NamespaceID;
import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.util.Objects;
@ApiStatus.Internal @ApiStatus.Internal
public class Registry { public class Registry {
@ -49,7 +49,7 @@ public class Registry {
private final boolean air; private final boolean air;
private final boolean solid; private final boolean solid;
private final boolean liquid; private final boolean liquid;
private final boolean blockEntity; private final String blockEntity;
private BlockEntry(JsonObject main, JsonObject override) { private BlockEntry(JsonObject main, JsonObject override) {
super(main, override); super(main, override);
@ -64,7 +64,10 @@ public class Registry {
this.air = getBoolean("air"); this.air = getBoolean("air");
this.solid = getBoolean("solid"); this.solid = getBoolean("solid");
this.liquid = getBoolean("liquid"); this.liquid = getBoolean("liquid");
this.blockEntity = getBoolean("blockEntity"); {
final var blockEntityElement = element("blockEntity");
this.blockEntity = blockEntityElement != null ? blockEntityElement.getAsString() : null;
}
} }
public @NotNull NamespaceID namespace() { public @NotNull NamespaceID namespace() {
@ -112,6 +115,10 @@ public class Registry {
} }
public boolean isBlockEntity() { public boolean isBlockEntity() {
return blockEntity != null;
}
public @Nullable String blockEntity() {
return blockEntity; return blockEntity;
} }
} }
@ -141,7 +148,10 @@ public class Registry {
} }
protected JsonElement element(String name) { protected JsonElement element(String name) {
return Objects.requireNonNullElseGet(override.get(name), () -> main.get(name)); if (override.has(name)) {
return override.get(name);
}
return main.get(name);
} }
} }
} }