Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-07-05 16:40:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Few minor improvements to the fuzzy system.

Browse Source
This commit is contained in:
Matthew Miller 2018-12-28 15:05:05 +10:00
parent b544782f3b
commit 54b6e57186
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -129,8 +129,7 @@ public class BlockState implements BlockStateHolder<BlockState> {
@Override @Override
public <V> BlockState with(final Property<V> property, final V value) { public <V> BlockState with(final Property<V> property, final V value) {
BlockState result = states.get(property, value); return states.row(property).getOrDefault(value, this);
return result == null ? this : result;
} }
@Override @Override

33
worldedit-core/src/main/java/com/sk89q/worldedit/world/block/FuzzyBlockState.java
View File

@ -37,6 +37,13 @@ public class FuzzyBlockState extends BlockState {
super(blockType); super(blockType);
} }
private FuzzyBlockState(BlockType blockType, Map<Property<?>, Object> values) {
this(blockType);
for (Map.Entry<Property<?>, Object> entry : values.entrySet()) {
setState(entry.getKey(), entry.getValue());
}
}
/** /**
* Gets a full BlockState from this fuzzy one, filling in * Gets a full BlockState from this fuzzy one, filling in
* properties with default values where necessary. * properties with default values where necessary.
@ -46,8 +53,9 @@ public class FuzzyBlockState extends BlockState {
public BlockState getFullState() { public BlockState getFullState() {
BlockState state = getBlockType().getDefaultState(); BlockState state = getBlockType().getDefaultState();
for (Map.Entry<Property<?>, Object> entry : getStates().entrySet()) { for (Map.Entry<Property<?>, Object> entry : getStates().entrySet()) {
//noinspection unchecked @SuppressWarnings("unchecked")
state = state.with((Property<Object>) entry.getKey(), entry.getValue()); Property<Object> objKey = (Property<Object>) entry.getKey();
state = state.with(objKey, entry.getValue());
} }
return getBlockType().getDefaultState(); return getBlockType().getDefaultState();
} }
@ -65,7 +73,7 @@ public class FuzzyBlockState extends BlockState {
* Builder for FuzzyBlockState * Builder for FuzzyBlockState
*/ */
public static class Builder { public static class Builder {
private BlockState internalState; private BlockType type;
private Map<Property<?>, Object> values = new HashMap<>(); private Map<Property<?>, Object> values = new HashMap<>();
/** /**
@ -76,7 +84,7 @@ public class FuzzyBlockState extends BlockState {
*/ */
public Builder type(BlockType type) { public Builder type(BlockType type) {
checkNotNull(type); checkNotNull(type);
internalState = type.getDefaultState(); this.type = type;
return this; return this;
} }
@ -88,7 +96,7 @@ public class FuzzyBlockState extends BlockState {
*/ */
public Builder type(BlockState state) { public Builder type(BlockState state) {
checkNotNull(state); checkNotNull(state);
internalState = state; this.type = state.getBlockType();
return this; return this;
} }
@ -103,7 +111,8 @@ public class FuzzyBlockState extends BlockState {
public <V> Builder withProperty(Property<V> property, V value) { public <V> Builder withProperty(Property<V> property, V value) {
checkNotNull(property); checkNotNull(property);
checkNotNull(value); checkNotNull(value);
checkNotNull(internalState, "The type must be set before the properties!"); checkNotNull(type, "The type must be set before the properties!");
type.getProperty(property.getName()); // Verify the property is valid for this type
values.put(property, value); values.put(property, value);
return this; return this;
} }
@ -114,15 +123,11 @@ public class FuzzyBlockState extends BlockState {
* @return The fuzzy BlockState * @return The fuzzy BlockState
*/ */
public FuzzyBlockState build() { public FuzzyBlockState build() {
checkNotNull(internalState); checkNotNull(type);
if (values.isEmpty()) { if (values.isEmpty()) {
return internalState.getBlockType().getFuzzyMatcher(); return type.getFuzzyMatcher();
} }
FuzzyBlockState blockState = new FuzzyBlockState(internalState.getBlockType()); return new FuzzyBlockState(type, values);
for (Map.Entry<Property<?>, Object> entry : values.entrySet()) {
blockState.setState(entry.getKey(), entry.getValue());
}
return blockState;
} }
/** /**
@ -131,7 +136,7 @@ public class FuzzyBlockState extends BlockState {
* @return The builder, for chaining * @return The builder, for chaining
*/ */
public Builder reset() { public Builder reset() {
this.internalState = null; this.type = null;
this.values.clear(); this.values.clear();
return this; return this;
} }