Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-22 17:27:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make usage of stateful patterns thread-safe (#2633)

Browse Source 
* Make usage of No(Axis)Patterns thread-safe

* make more pattern usage thread-safe

* make more WE patterns thread safe

* remove StatefulPattern
This commit is contained in:
Hannes Greule 2024-03-27 15:16:06 +01:00 committed by GitHub
parent 8095111eff
commit 7b8c7894ba
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
18 changed files with 117 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
worldedit-core/src/main/java/com/fastasyncworldedit/core/function/pattern/ExpressionPattern.java
View File

@ -1,6 +1,7 @@
package com.fastasyncworldedit.core.function.pattern;
import com.sk89q.worldedit.function.pattern.AbstractPattern;
import com.sk89q.worldedit.function.pattern.Pattern;
import com.sk89q.worldedit.internal.expression.EvaluationException;
import com.sk89q.worldedit.internal.expression.Expression;
import com.sk89q.worldedit.internal.expression.ExpressionException;
@ -57,4 +58,9 @@ public class ExpressionPattern extends AbstractPattern {
}
}
@Override
public Pattern fork() {
return new ExpressionPattern(this.expression.clone());
}
}

8
worldedit-core/src/main/java/com/fastasyncworldedit/core/function/pattern/Linear2DBlockPattern.java
View File

@ -7,6 +7,8 @@ import com.sk89q.worldedit.function.pattern.Pattern;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.world.block.BaseBlock;
import java.util.Arrays;
import static java.lang.Math.floorDiv;
/**
@ -52,4 +54,10 @@ public class Linear2DBlockPattern extends AbstractPattern {
return patternsArray[index].apply(extent, get, set);
}
@Override
public Pattern fork() {
final Pattern[] forked = Arrays.stream(this.patternsArray).map(Pattern::fork).toArray(Pattern[]::new);
return new Linear2DBlockPattern(forked, this.xScale, this.zScale);
}
}

8
worldedit-core/src/main/java/com/fastasyncworldedit/core/function/pattern/Linear3DBlockPattern.java
View File

@ -7,6 +7,8 @@ import com.sk89q.worldedit.function.pattern.Pattern;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.world.block.BaseBlock;
import java.util.Arrays;
import static java.lang.Math.floorDiv;
/**
@ -56,4 +58,10 @@ public class Linear3DBlockPattern extends AbstractPattern {
return patternsArray[index].apply(extent, get, set);
}
@Override
public Pattern fork() {
final Pattern[] forked = Arrays.stream(this.patternsArray).map(Pattern::fork).toArray(Pattern[]::new);
return new Linear3DBlockPattern(forked, this.xScale, this.yScale, this.zScale);
}
}

6
worldedit-core/src/main/java/com/fastasyncworldedit/core/function/pattern/LinearBlockPattern.java
View File

@ -47,4 +47,10 @@ public class LinearBlockPattern extends AbstractPattern implements ResettablePat
index = 0;
}
@Override
public Pattern fork() {
final Pattern[] forked = Arrays.stream(this.patternsArray).map(Pattern::fork).toArray(Pattern[]::new);
return new LinearBlockPattern(forked);
}
}

5
worldedit-core/src/main/java/com/fastasyncworldedit/core/function/pattern/MaskedPattern.java
View File

@ -43,4 +43,9 @@ public class MaskedPattern extends AbstractPattern {
return secondary.apply(extent, get, set);
}
@Override
public Pattern fork() {
return new MaskedPattern(this.mask.copy(), this.primary.fork(), this.secondary.fork());
}
}

5
worldedit-core/src/main/java/com/fastasyncworldedit/core/function/pattern/NoXPattern.java
View File

@ -36,4 +36,9 @@ public class NoXPattern extends AbstractPattern {
return pattern.apply(extent, mutable, set);
}
@Override
public Pattern fork() {
return new NoXPattern(this.pattern.fork());
}
}

5
worldedit-core/src/main/java/com/fastasyncworldedit/core/function/pattern/NoYPattern.java
View File

@ -36,4 +36,9 @@ public class NoYPattern extends AbstractPattern {
return pattern.apply(extent, mutable, set);
}
@Override
public Pattern fork() {
return new NoYPattern(this.pattern.fork());
}
}

6
worldedit-core/src/main/java/com/fastasyncworldedit/core/function/pattern/NoZPattern.java
View File

@ -1,6 +1,7 @@
package com.fastasyncworldedit.core.function.pattern;
import com.fastasyncworldedit.core.math.MutableBlockVector3;
import com.fastasyncworldedit.core.queue.Filter;
import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.function.pattern.AbstractPattern;
@ -36,4 +37,9 @@ public class NoZPattern extends AbstractPattern {
return pattern.apply(extent, mutable, set);
}
@Override
public Pattern fork() {
return new NoZPattern(this.pattern.fork());
}
}

5
worldedit-core/src/main/java/com/fastasyncworldedit/core/function/pattern/OffsetPattern.java
View File

@ -60,4 +60,9 @@ public class OffsetPattern extends AbstractPattern {
return pattern.apply(extent, get, mutable);
}
@Override
public Pattern fork() {
return new OffsetPattern(this.pattern.fork(), this.dx, this.dy, this.dz, this.minY, this.maxY);
}
}

5
worldedit-core/src/main/java/com/fastasyncworldedit/core/function/pattern/RandomOffsetPattern.java
View File

@ -72,4 +72,9 @@ public class RandomOffsetPattern extends AbstractPattern {
return pattern.apply(extent, get, mutable);
}
@Override
public Pattern fork() {
return new RandomOffsetPattern(this.pattern.fork(), this.dx, this.dy, this.dz, this.minY, this.maxY);
}
}

7
worldedit-core/src/main/java/com/fastasyncworldedit/core/function/pattern/RelativePattern.java
View File

@ -63,4 +63,11 @@ public class RelativePattern extends AbstractPattern implements ResettablePatter
origin = null;
}
@Override
public Pattern fork() {
RelativePattern forked = new RelativePattern(this.pattern.fork(), this.minY, this.maxY);
forked.origin = this.origin; // maintain origin for forks
return forked;
}
}

5
worldedit-core/src/main/java/com/fastasyncworldedit/core/function/pattern/SolidRandomOffsetPattern.java
View File

@ -94,4 +94,9 @@ public class SolidRandomOffsetPattern extends AbstractPattern {
return pattern.apply(extent, get, set);
}
@Override
public Pattern fork() {
return new SolidRandomOffsetPattern(this.pattern.fork(), this.dx, this.dy, this.dz, this.minY, this.maxY);
}
}

5
worldedit-core/src/main/java/com/fastasyncworldedit/core/function/pattern/SurfaceRandomOffsetPattern.java
View File

@ -129,4 +129,9 @@ public class SurfaceRandomOffsetPattern extends AbstractPattern {
return !block.getBlockType().getMaterial().isMovementBlocker();
}
@Override
public Pattern fork() {
return new SurfaceRandomOffsetPattern(this.pattern.fork(), this.moves, this.minY, this.maxY);
}
}

7
worldedit-core/src/main/java/com/sk89q/worldedit/extent/buffer/ForgetfulExtentBuffer.java
View File

@ -235,4 +235,11 @@ public class ForgetfulExtentBuffer extends AbstractDelegateExtent implements Pat
};
}
//FAWE - stateful pattern
@Override
public Pattern fork() {
return new ForgetfulExtentBuffer(extent, mask.copy());
}
//FAWE end
}

10
worldedit-core/src/main/java/com/sk89q/worldedit/function/pattern/ExtentBufferedCompositePattern.java
View File

@ -25,6 +25,8 @@ import com.sk89q.worldedit.extent.buffer.ExtentBuffer;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.world.block.BaseBlock;
import java.util.Arrays;
import static com.google.common.base.Preconditions.checkArgument;
/**
@ -64,4 +66,12 @@ public class ExtentBufferedCompositePattern extends AbstractExtentPattern {
return lastBlock;
}
//FAWE - stateful pattern
@Override
public Pattern fork() {
final Pattern[] forkedPatterns = Arrays.stream(patterns).map(Pattern::fork).toArray(Pattern[]::new);
return new ExtentBufferedCompositePattern(getExtent(), forkedPatterns);
}
//FAWE end
}

5
worldedit-core/src/main/java/com/sk89q/worldedit/function/pattern/Pattern.java
View File

@ -59,6 +59,11 @@ public interface Pattern extends Filter {
apply(block, block, block);
}
@Override
default Pattern fork() { // covariant return type
return this;
}
//FAWE end
/**

15
worldedit-core/src/main/java/com/sk89q/worldedit/function/pattern/RandomPattern.java
View File

@ -67,6 +67,13 @@ public class RandomPattern extends AbstractPattern {
this.collection = RandomCollection.of(weights, random);
this.patterns = parent.patterns;
}
private RandomPattern(SimpleRandom random, Map<Pattern, Double> weights) {
this.random = random;
this.weights = weights;
this.collection = RandomCollection.of(weights, random);
this.patterns = new LinkedHashSet<>(weights.keySet());
}
//FAWE end
/**
@ -107,6 +114,14 @@ public class RandomPattern extends AbstractPattern {
public boolean apply(Extent extent, BlockVector3 get, BlockVector3 set) throws WorldEditException {
return collection.next(get.getBlockX(), get.getBlockY(), get.getBlockZ()).apply(extent, get, set);
}
@Override
public Pattern fork() {
final LinkedHashMap<Pattern, Double> newWeights = new LinkedHashMap<>();
this.weights.forEach((p, w) -> newWeights.put(p.fork(), w));
return new RandomPattern(this.random, newWeights);
}
//FAWE end
}

5
worldedit-core/src/main/java/com/sk89q/worldedit/function/pattern/StateApplyingPattern.java
View File

@ -29,13 +29,16 @@ import com.sk89q.worldedit.world.block.BlockType;
import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import static com.sk89q.worldedit.blocks.Blocks.resolveProperties;
public class StateApplyingPattern extends AbstractExtentPattern {
private final Map<String, String> states;
private final Map<BlockType, Map<Property<Object>, Object>> cache = Maps.newHashMap();
//FAWE - avoid race conditions
private final Map<BlockType, Map<Property<Object>, Object>> cache = new ConcurrentHashMap<>();
//FAWE end
public StateApplyingPattern(Extent extent, Map<String, String> statesToSet) {
super(extent);