mirror/WorldEdit
2
0
Fork 0
mirror of https://github.com/EngineHub/WorldEdit.git synced 2025-03-07 13:48:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improve speed of BlockState init, tick watchdog (#1680)

Browse Source
This commit is contained in:
Octavia Togami 2021-02-17 11:22:35 -08:00 committed by GitHub
parent 8a46670327
commit e94f082b07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockState.java
View File

@ -19,13 +19,15 @@
package com.sk89q.worldedit.world.block;
import com.google.common.collect.ArrayTable;
import com.google.common.collect.HashBasedTable;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableTable;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Table;
import com.sk89q.jnbt.CompoundTag;
import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.extension.platform.Capability;
import com.sk89q.worldedit.extension.platform.Watchdog;
import com.sk89q.worldedit.internal.block.BlockStateIdAccess;
import com.sk89q.worldedit.registry.state.Property;
@ -78,7 +80,7 @@ public void setInternalId(BlockState blockState, int internalId) {
}
static Map<Map<Property<?>, Object>, BlockState> generateStateMap(BlockType blockType) {
Map<Map<Property<?>, Object>, BlockState> stateMap = new LinkedHashMap<>();
ImmutableMap.Builder<Map<Property<?>, Object>, BlockState> stateMapBuilder = ImmutableMap.builder();
List<? extends Property<?>> properties = blockType.getProperties();
if (!properties.isEmpty()) {
@ -98,29 +100,38 @@ static Map<Map<Property<?>, Object>, BlockState> generateStateMap(BlockType bloc
valueMap.put(property, value);
stateMaker.setState(property, value);
}
stateMap.put(valueMap, stateMaker);
stateMapBuilder.put(ImmutableMap.copyOf(valueMap), stateMaker);
}
}
ImmutableMap<Map<Property<?>, Object>, BlockState> stateMap = stateMapBuilder.build();
if (stateMap.isEmpty()) {
// No properties.
stateMap.put(new LinkedHashMap<>(), new BlockState(blockType));
stateMap = ImmutableMap.of(ImmutableMap.of(), new BlockState(blockType));
}
for (BlockState state : stateMap.values()) {
state.populate(stateMap);
}
// Sometimes loading can take a while. This is the perfect spot to let MC know we're working.
Watchdog watchdog = WorldEdit.getInstance().getPlatformManager().queryCapability(Capability.GAME_HOOKS)
.getWatchdog();
if (watchdog != null) {
watchdog.tick();
}
return stateMap;
}
private void populate(Map<Map<Property<?>, Object>, BlockState> stateMap) {
final Table<Property<?>, Object, BlockState> states = HashBasedTable.create();
final ImmutableTable.Builder<Property<?>, Object, BlockState> states = ImmutableTable.builder();
for (final Map.Entry<Property<?>, Object> entry : this.values.entrySet()) {
final Property<Object> property = (Property<Object>) entry.getKey();
property.getValues().forEach(value -> {
for (Object value : property.getValues()) {
if (value != entry.getValue()) {
BlockState modifiedState = stateMap.get(this.withValue(property, value));
if (modifiedState != null) {
@ -130,16 +141,22 @@ private void populate(Map<Map<Property<?>, Object>, BlockState> stateMap) {
WorldEdit.logger.warn("Found a null state at " + this.withValue(property, value));
}
}
});
}
}
this.states = states.isEmpty() ? states : ArrayTable.create(states);
this.states = states.build();
}
private <V> Map<Property<?>, Object> withValue(final Property<V> property, final V value) {
final Map<Property<?>, Object> values = Maps.newHashMap(this.values);
values.put(property, value);
return values;
final ImmutableMap.Builder<Property<?>, Object> values = ImmutableMap.builder();
for (Map.Entry<Property<?>, Object> entry : this.values.entrySet()) {
if (entry.getKey().equals(property)) {
values.put(entry.getKey(), value);
} else {
values.put(entry);
}
}
return values.build();
}
@Override