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

wip on FaweQueue

Browse Source
This commit is contained in:
Jesse Boyd
2019-07-19 06:49:29 +10:00
parent 1dcb18ae20
commit e86e4c9c53
91 changed files with 540 additions and 5951 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -307,12 +307,12 @@ public class EditSessionBuilder {
// if (queue == null) {
// boolean placeChunks = this.fastmode || this.limit.FAST_PLACEMENT;
// World unwrapped = WorldWrapper.unwrap(world);
// if (unwrapped instanceof FaweQueue) {
// queue = (FaweQueue) unwrapped;
// if (unwrapped instanceof IQueueExtent) {
// queue = (IQueueExtent) unwrapped;
// } else if (unwrapped instanceof MCAWorld) {
// queue = ((MCAWorld) unwrapped).getQueue();
// } else if (player != null && world.equals(player.getWorld())) {
// queue = player.getFaweQueue(placeChunks, autoQueue);
// queue = player.getIQueueExtent(placeChunks, autoQueue);
// } else {
// queue = SetQueue.IMP.getNewQueue(world, placeChunks, autoQueue);
// }
@ -324,7 +324,7 @@ public class EditSessionBuilder {
// // If fast placement is disabled, it's slower to perform a copy on each chunk
// && this.limit.FAST_PLACEMENT
// // If the specific queue doesn't support it
// && queue.supports(FaweQueue.Capability.CHANGE_TASKS)
// && queue.supports(IQueueExtent.Capability.CHANGE_TASKS)
// // If the edit uses items from the inventory we can't use a delayed task
// && this.blockBag == null;
// }

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

@ -2,7 +2,7 @@ package com.boydti.fawe.util;
import com.boydti.fawe.Fawe;
import com.boydti.fawe.config.Settings;
import com.boydti.fawe.object.FaweQueue;
import com.boydti.fawe.beta.IQueueExtent;
import com.boydti.fawe.object.RunnableVal;
import org.jetbrains.annotations.NotNull;
@ -138,7 +138,7 @@ public abstract class TaskManager {
* @param queue
* @param run
*/
public void runUnsafe(FaweQueue queue, Runnable run) {
public void runUnsafe(IQueueExtent queue, Runnable run) {
queue.startSet(true);
try {
run.run();

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

@ -1,7 +1,7 @@
package com.boydti.fawe.util.task;
import com.boydti.fawe.Fawe;
import com.boydti.fawe.object.FaweQueue;
import com.boydti.fawe.beta.IQueueExtent;
import com.boydti.fawe.object.Metadatable;
import com.boydti.fawe.object.RunnableVal;
import com.boydti.fawe.util.SetQueue;
@ -322,7 +322,7 @@ public class TaskBuilder extends Metadatable {
}
}
private FaweQueue queue;
private IQueueExtent queue;
private long last;
private long start;
private Object asyncWaitLock = new Object();
@ -430,7 +430,7 @@ public class TaskBuilder extends Metadatable {
public static abstract class SplitTask extends RunnableTask {
private final long allocation;
private final FaweQueue queue;
private final IQueueExtent queue;
private long last;
private long start;
private Object asyncWaitLock = new Object();