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

Remove PropertyEntry map wrapper

Browse Source
This commit is contained in:
TheMode 2021-08-04 17:45:17 +02:00
parent 1f0faca4e7
commit ba63fe5b63
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/net/minestom/server/instance/block/BlockImpl.java
View File

@ -17,7 +17,6 @@ import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Function; import java.util.function.Function;
final class BlockImpl implements Block { final class BlockImpl implements Block {
@ -27,13 +26,14 @@ final class BlockImpl implements Block {
(container, namespace, object) -> { (container, namespace, object) -> {
final JsonObject stateObject = object.remove("states").getAsJsonObject(); final JsonObject stateObject = object.remove("states").getAsJsonObject();
// Loop each state // Loop each state
PropertyEntry propertyEntry = new PropertyEntry(); var propertyEntry = new HashMap<Map<String, String>, Block>();
var unmodifiableEntries = Collections.unmodifiableMap(propertyEntry);
for (var stateEntry : stateObject.entrySet()) { for (var stateEntry : stateObject.entrySet()) {
final String query = stateEntry.getKey(); final String query = stateEntry.getKey();
JsonObject stateOverride = stateEntry.getValue().getAsJsonObject(); JsonObject stateOverride = stateEntry.getValue().getAsJsonObject();
final var propertyMap = BlockUtils.parseProperties(query); final var propertyMap = BlockUtils.parseProperties(query);
final Block block = new BlockImpl(Registry.block(namespace, object, stateOverride), final Block block = new BlockImpl(Registry.block(namespace, object, stateOverride),
propertyEntry, propertyMap, null, null); unmodifiableEntries, propertyMap, null, null);
BLOCK_STATE_MAP.put(block.stateId(), block); BLOCK_STATE_MAP.put(block.stateId(), block);
propertyEntry.put(propertyMap, block); propertyEntry.put(propertyMap, block);
} }
@ -66,17 +66,14 @@ final class BlockImpl implements Block {
return CONTAINER.values(); return CONTAINER.values();
} }
protected static class PropertyEntry extends ConcurrentHashMap<Map<String, String>, Block> {
}
private final Registry.BlockEntry registry; private final Registry.BlockEntry registry;
private final PropertyEntry propertyEntry; private final Map<Map<String, String>, Block> propertyEntry;
private final Map<String, String> properties; private final Map<String, String> properties;
private final NBTCompound nbt; private final NBTCompound nbt;
private final BlockHandler handler; private final BlockHandler handler;
BlockImpl(@NotNull Registry.BlockEntry registry, BlockImpl(@NotNull Registry.BlockEntry registry,
@NotNull PropertyEntry propertyEntry, @NotNull Map<Map<String, String>, Block> propertyEntry,
@NotNull Map<String, String> properties, @NotNull Map<String, String> properties,
@Nullable NBTCompound nbt, @Nullable NBTCompound nbt,
@Nullable BlockHandler handler) { @Nullable BlockHandler handler) {