GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity

Remove redundant populate method and remove BLOCKS_JSON after last use

Browse source
This commit is contained in:
davchoo 2023-01-16 14:48:48 -05:00
parent 4ab26e0717
commit 4d78503b7c
No known key found for this signature in database
GPG key ID: 501B6F4FD961CF9A
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/src/main/java/org/geysermc/geyser/registry/BlockRegistries.java
View file

@ -118,7 +118,7 @@ public class BlockRegistries {
static {
CustomSkullRegistryPopulator.populate();
BlockRegistryPopulator.populate();
BlockRegistryPopulator.registerJavaBlocks();
COLLISIONS = IntMappedRegistry.create(Pair.of("org.geysermc.geyser.translator.collision.CollisionRemapper", "mappings/collision.json"), CollisionRegistryLoader::new);
CustomBlockRegistryPopulator.registerCustomBedrockBlocks();
BlockRegistryPopulator.registerBedrockBlocks();

12
core/src/main/java/org/geysermc/geyser/registry/populator/BlockRegistryPopulator.java
View file

@ -74,14 +74,6 @@ public final class BlockRegistryPopulator {
*/
private static JsonNode BLOCKS_JSON;
public static void populate() {
registerJavaBlocks();
// CustomBlockRegistryPopulator.registerCustomBedrockBlocks() and registerBedrockBlocks() moved to BlockRegistries to ensure correct load order
// Needs to be placed somewhere at some point
//BLOCKS_JSON = null;
}
public static void registerBedrockBlocks() {
BiFunction<String, NbtMapBuilder, String> emptyMapper = (bedrockIdentifier, statesBuilder) -> null;
ImmutableMap<ObjectIntPair<String>, BiFunction<String, NbtMapBuilder, String>> blockMappers = ImmutableMap.<ObjectIntPair<String>, BiFunction<String, NbtMapBuilder, String>>builder()
@ -262,9 +254,11 @@ public final class BlockRegistryPopulator {
.customBlockStateIds(customBlockStateIds)
.build());
}
BLOCKS_JSON = null;
}
private static void registerJavaBlocks() {
public static void registerJavaBlocks() {
JsonNode blocksJson;
try (InputStream stream = GeyserImpl.getInstance().getBootstrap().getResource("mappings/blocks.json")) {
blocksJson = GeyserImpl.JSON_MAPPER.readTree(stream);