Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-07-01 02:46:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Limit processing

Browse Source
This commit is contained in:
Jesse Boyd
2019-11-02 12:13:42 +01:00
parent 0b2bd862a0
commit df9e9e510a
102 changed files with 1339 additions and 501 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
worldedit-core/src/main/java/com/boydti/fawe/util/EditSessionBuilder.java
View File

@ -3,8 +3,10 @@ package com.boydti.fawe.util;
import com.boydti.fawe.Fawe;
import com.boydti.fawe.FaweAPI;
import com.boydti.fawe.FaweCache;
import com.boydti.fawe.beta.IBatchProcessor;
import com.boydti.fawe.beta.IQueueExtent;
import com.boydti.fawe.beta.implementation.ParallelQueueExtent;
import com.boydti.fawe.beta.implementation.processors.LimitProcessor;
import com.boydti.fawe.beta.implementation.queue.ParallelQueueExtent;
import com.boydti.fawe.config.BBC;
import com.boydti.fawe.config.Settings;
import com.boydti.fawe.logging.LoggingChangeSet;
@ -18,7 +20,6 @@ import com.boydti.fawe.object.changeset.BlockBagChangeSet;
import com.boydti.fawe.object.changeset.DiskStorageHistory;
import com.boydti.fawe.object.changeset.FaweChangeSet;
import com.boydti.fawe.object.changeset.MemoryOptimizedHistory;
import com.boydti.fawe.object.exception.FaweException;
import com.boydti.fawe.object.extent.FaweRegionExtent;
import com.boydti.fawe.object.extent.MultiRegionExtent;
import com.boydti.fawe.object.extent.NullExtent;
@ -422,10 +423,14 @@ public class EditSessionBuilder {
} else {
// this.extent = new HeightBoundExtent(this.extent, this.limit, 0, maxY);
}
IBatchProcessor limitProcessor = regionExtent;
if (limit != null && !limit.isUnlimited()) {
limitProcessor = new LimitProcessor(limit, limitProcessor);
}
if (regionExtent != null && queue != null && combineStages) {
queue.addProcessor(regionExtent);
queue.addProcessor(limitProcessor);
} else if (regionExtent != null) {
this.extent = regionExtent;
this.extent = limitProcessor.construct(regionExtent.getExtent());
}
if (this.limit.STRIP_NBT != null && !this.limit.STRIP_NBT.isEmpty()) {
System.out.println("TODO add batch processor for strip nbt");

4
worldedit-core/src/main/java/com/boydti/fawe/util/TaskManager.java
View File

@ -1,9 +1,8 @@
package com.boydti.fawe.util;
import com.boydti.fawe.Fawe;
import com.boydti.fawe.beta.implementation.QueueHandler;
import com.boydti.fawe.beta.implementation.queue.QueueHandler;
import com.boydti.fawe.config.Settings;
import com.boydti.fawe.beta.IQueueExtent;
import com.boydti.fawe.object.RunnableVal;
import org.jetbrains.annotations.NotNull;
@ -13,7 +12,6 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ForkJoinPool;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Supplier;

2
worldedit-core/src/main/java/com/boydti/fawe/util/TextureUtil.java
View File

@ -1,7 +1,7 @@
package com.boydti.fawe.util;
import com.boydti.fawe.Fawe;
import com.boydti.fawe.beta.SingleFilterBlock;
import com.boydti.fawe.beta.implementation.filter.block.SingleFilterBlock;
import com.boydti.fawe.config.Settings;
import com.boydti.fawe.util.image.ImageUtil;
import com.google.gson.Gson;

2
worldedit-core/src/main/java/com/boydti/fawe/util/task/TaskBuilder.java
View File

@ -2,7 +2,7 @@ package com.boydti.fawe.util.task;
import com.boydti.fawe.Fawe;
import com.boydti.fawe.beta.IQueueExtent;
import com.boydti.fawe.beta.implementation.QueueHandler;
import com.boydti.fawe.beta.implementation.queue.QueueHandler;
import com.boydti.fawe.object.Metadatable;
import com.boydti.fawe.object.RunnableVal;
import com.boydti.fawe.util.TaskManager;