Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-20 15:11:22 +01:00
Code Issues Projects Releases Wiki Activity

Fix property parsing

Browse Source
This commit is contained in:
TheMode 2021-06-16 14:49:56 +02:00
parent 9c97302a06
commit a4b99c60dc
2 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/main/java/net/minestom/server/instance/block/BlockRegistry.java
View File

@ -20,14 +20,29 @@ class BlockRegistry {
// Block namespace -> properties map to block access // Block namespace -> properties map to block access
private static final Map<String, PropertyEntry> BLOCK_PROPERTY_MAP = new ConcurrentHashMap<>(); private static final Map<String, PropertyEntry> BLOCK_PROPERTY_MAP = new ConcurrentHashMap<>();
private static class PropertyEntry { static @Nullable Block get(@NotNull String namespace) {
private final Map<Map<String, String>, Block> propertyMap = new ConcurrentHashMap<>(); return NAMESPACE_MAP.get(namespace);
}
static @Nullable Block getId(int id) {
return BLOCK_ID_MAP.get(id);
}
static @Nullable Block getState(int stateId) {
return BLOCK_STATE_MAP.get(stateId);
}
static @Nullable Block getProperties(String namespace, Map<String, String> properties) {
final var entry = BLOCK_PROPERTY_MAP.get(namespace);
return entry.propertyMap.get(properties);
}
static @Nullable Block getProperties(Block block, Map<String, String> properties) {
return getProperties(block.getNamespaceId().asString(), properties);
} }
static { static {
// Load data from file // Load data from file
// Blocks
JsonObject blocks = Registry.load(Registry.Resource.BLOCK); JsonObject blocks = Registry.load(Registry.Resource.BLOCK);
blocks.entrySet().forEach(entry -> { blocks.entrySet().forEach(entry -> {
final String blockNamespace = entry.getKey(); final String blockNamespace = entry.getKey();
@ -46,6 +61,10 @@ class BlockRegistry {
}); });
} }
private static class PropertyEntry {
private final Map<Map<String, String>, Block> propertyMap = new ConcurrentHashMap<>();
}
private static void retrieveState(String namespace, JsonObject object, JsonObject stateObject) { private static void retrieveState(String namespace, JsonObject object, JsonObject stateObject) {
PropertyEntry propertyEntry = new PropertyEntry(); PropertyEntry propertyEntry = new PropertyEntry();
stateObject.entrySet().forEach(stateEntry -> { stateObject.entrySet().forEach(stateEntry -> {
@ -81,27 +100,13 @@ class BlockRegistry {
builder.append(c); builder.append(c);
} }
} }
// Add last property if present
{
final String key = keyBuilder.toString();
if (!key.isEmpty()) {
result.put(key, valueBuilder.toString());
}
}
return result; return result;
} }
public static @Nullable Block get(@NotNull String namespace) {
return NAMESPACE_MAP.get(namespace);
}
public static @Nullable Block getId(int id) {
return BLOCK_ID_MAP.get(id);
}
public static @Nullable Block getState(int stateId) {
return BLOCK_STATE_MAP.get(stateId);
}
public static @Nullable Block getProperties(String namespace, Map<String, String> properties) {
final var entry = BLOCK_PROPERTY_MAP.get(namespace);
return entry.propertyMap.get(properties);
}
public static @Nullable Block getProperties(Block block, Map<String, String> properties) {
return getProperties(block.getNamespaceId().asString(), properties);
}
} }

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

@ -38,7 +38,8 @@ class BlockTest implements Block {
public @NotNull Block withProperty(@NotNull String property, @NotNull String value) { public @NotNull Block withProperty(@NotNull String property, @NotNull String value) {
var properties = new HashMap<>(this.properties); var properties = new HashMap<>(this.properties);
properties.put(property, value); properties.put(property, value);
return Objects.requireNonNull(BlockRegistry.getProperties(this, properties)); final Block block = BlockRegistry.getProperties(this, properties);
return Objects.requireNonNull(block);
} }
@Override @Override