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

Merge pull request #3 from davchoo/feature/blocky

Browse source 
Fix block registry scanning in MappingsReader
This commit is contained in:
Kas-tle 2023-02-01 15:26:28 -08:00 committed by GitHub
commit d14ca99a52
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
core/src/main/java/org/geysermc/geyser/registry/mappings/versions/MappingsReader_v1.java
View file

@ -97,8 +97,9 @@ public class MappingsReader_v1 extends MappingsReader {
String identifier = Identifier.formalize(entry.getKey());
CustomBlockMapping customBlockMapping = this.readBlockMappingEntry(identifier, entry.getValue());
consumer.accept(identifier, customBlockMapping);
} catch (InvalidCustomMappingsFileException e) {
GeyserImpl.getInstance().getLogger().error("Error in registering blocks for custom mapping file: " + file.toString(), e);
} catch (Exception e) {
GeyserImpl.getInstance().getLogger().error("Error in registering blocks for custom mapping file: " + file.toString());
GeyserImpl.getInstance().getLogger().error("due to entry: " + entry, e);
}
}
});
@ -187,13 +188,22 @@ public class MappingsReader_v1 extends MappingsReader {
// If this is true, we will only register the states the user has specified rather than all the possible block states
boolean onlyOverrideStates = node.has("only_override_states") && node.get("only_override_states").asBoolean();
JsonNode stateOverrides = node.get("state_overrides");
if (onlyOverrideStates && (stateOverrides == null || !stateOverrides.isObject())) {
throw new InvalidCustomMappingsFileException("Block entry for " + identifier + " has only_override_states set to true, but has no state_overrides.");
// Create the data for the overall block
CustomBlockData.Builder customBlockDataBuilder = new CustomBlockDataBuilder()
.name(name);
if (BlockRegistries.JAVA_IDENTIFIERS.get().containsKey(identifier)) {
// There is only one Java block state to override
CustomBlockData blockData = customBlockDataBuilder
.components(createCustomBlockComponents(node, identifier, name))
.build();
return new CustomBlockMapping(blockData, Map.of(identifier, blockData.defaultBlockState()), identifier, !onlyOverrideStates);
}
Map<String, CustomBlockComponents> componentsMap = new LinkedHashMap<>();
JsonNode stateOverrides = node.get("state_overrides");
if (stateOverrides != null && stateOverrides.isObject()) {
// Load components for specific Java block states
Iterator<Map.Entry<String, JsonNode>> fields = stateOverrides.fields();
@ -206,11 +216,15 @@ public class MappingsReader_v1 extends MappingsReader {
componentsMap.put(state, createCustomBlockComponents(overrideEntry.getValue(), state, name));
}
}
if (componentsMap.isEmpty() && onlyOverrideStates) {
throw new InvalidCustomMappingsFileException("Block entry for " + identifier + " has only_override_states set to true, but has no state_overrides.");
}
if (!onlyOverrideStates) {
// Create components for any remaining Java block states
BlockRegistries.JAVA_IDENTIFIERS.get().keySet()
.stream()
.filter(s -> s.startsWith(identifier))
.filter(s -> s.startsWith(identifier + "["))
.filter(Predicate.not(componentsMap::containsKey))
.forEach(state -> componentsMap.put(state, createCustomBlockComponents(null, state, name)));
}
@ -219,18 +233,11 @@ public class MappingsReader_v1 extends MappingsReader {
throw new InvalidCustomMappingsFileException("Unknown Java block: " + identifier);
}
// Create the data for the overall block
CustomBlockData.Builder customBlockDataBuilder = new CustomBlockDataBuilder()
.name(name)
// We pass in the first state and just use the hitbox from that as the default
// Each state will have its own so this is fine
.components(createCustomBlockComponents(node, componentsMap.keySet().iterator().next(), name));
// We pass in the first state and just use the hitbox from that as the default
// Each state will have its own so this is fine
String firstState = componentsMap.keySet().iterator().next();
customBlockDataBuilder.components(createCustomBlockComponents(node, firstState, name));
if (componentsMap.size() == 1) {
// There are no other block states, so skip creating properties and permutations
CustomBlockData blockData = customBlockDataBuilder.build();
return new CustomBlockMapping(blockData, Map.of(identifier, blockData.defaultBlockState()), identifier, !onlyOverrideStates);
}
return createCustomBlockMapping(customBlockDataBuilder, componentsMap, identifier, !onlyOverrideStates);
}

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

@ -116,7 +116,7 @@ public class CustomSkullRegistryPopulator {
});
skinHashes.forEach((skinHash) -> {
if (!skinHash.matches("^[a-fA-F0-9]{64}$")) {
if (!skinHash.matches("^[a-fA-F0-9]+$")) {
GeyserImpl.getInstance().getLogger().error("Skin hash " + skinHash + " does not match required format ^[a-fA-F0-9]{64}$ and will not be added as a custom block.");
return;
}