mirror of
https://github.com/boy0001/FastAsyncWorldedit.git
synced 2025-02-06 07:31:21 +01:00
Temp fix for java 7
This commit is contained in:
parent
05125ac664
commit
ee272053b2
@ -221,6 +221,12 @@ public class Fawe {
|
||||
this.setupMemoryListener();
|
||||
}
|
||||
|
||||
private boolean isJava8 = MainUtil.getJavaVersion() >= 1.8;
|
||||
|
||||
public boolean isJava8() {
|
||||
return isJava8;
|
||||
}
|
||||
|
||||
/**
|
||||
* The FaweTimer is a useful class for monitoring TPS
|
||||
* @return FaweTimer
|
||||
@ -410,7 +416,7 @@ public class Fawe {
|
||||
debug(" - Report this issue if you cannot resolve it");
|
||||
debug("===============================================");
|
||||
}
|
||||
if (MainUtil.getJavaVersion() < 1.8) {
|
||||
if (!isJava8) {
|
||||
debug("====== UPGRADE TO JAVA 8 ======");
|
||||
debug("You are running " + System.getProperty("java.version"));
|
||||
debug(" - This is only a recommendation");
|
||||
|
@ -55,19 +55,35 @@ public abstract class MappedFaweQueue<WORLD, CHUNK, SECTION> extends FaweQueue {
|
||||
@Override
|
||||
public void optimize() {
|
||||
final ForkJoinPool pool = TaskManager.IMP.getPublicForkJoinPool();
|
||||
final ArrayList<Thread> threads = new ArrayList<Thread>(map.size());
|
||||
map.forEachChunk(new RunnableVal<FaweChunk>() {
|
||||
@Override
|
||||
public void run(final FaweChunk chunk) {
|
||||
pool.submit(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
chunk.optimize();
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
pool.awaitQuiescence(Long.MAX_VALUE, TimeUnit.MILLISECONDS);
|
||||
if (Fawe.get().isJava8()) {
|
||||
map.forEachChunk(new RunnableVal<FaweChunk>() {
|
||||
@Override
|
||||
public void run(final FaweChunk chunk) {
|
||||
pool.submit(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
chunk.optimize();
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
pool.awaitQuiescence(Long.MAX_VALUE, TimeUnit.MILLISECONDS);
|
||||
} else {
|
||||
final ArrayList<Runnable> tasks = new ArrayList<Runnable>(map.size());
|
||||
map.forEachChunk(new RunnableVal<FaweChunk>() {
|
||||
@Override
|
||||
public void run(final FaweChunk chunk) {
|
||||
tasks.add(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
chunk.optimize();
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
TaskManager.IMP.parallel(tasks);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -1,5 +1,6 @@
|
||||
package com.boydti.fawe.jnbt.anvil;
|
||||
|
||||
import com.boydti.fawe.Fawe;
|
||||
import com.boydti.fawe.example.CharFaweChunk;
|
||||
import com.boydti.fawe.example.NMSMappedFaweQueue;
|
||||
import com.boydti.fawe.object.FaweChunk;
|
||||
@ -106,12 +107,18 @@ public class MCAQueue extends NMSMappedFaweQueue<FaweQueue, FaweChunk, FaweChunk
|
||||
System.gc();
|
||||
}
|
||||
};
|
||||
TaskManager.IMP.getPublicForkJoinPool().submit(run);
|
||||
if (Fawe.get().isJava8()) {
|
||||
TaskManager.IMP.getPublicForkJoinPool().submit(run);
|
||||
} else {
|
||||
run.run();
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (Throwable ignore) {}
|
||||
}
|
||||
TaskManager.IMP.getPublicForkJoinPool().awaitQuiescence(Long.MAX_VALUE, TimeUnit.MILLISECONDS);
|
||||
if (Fawe.get().isJava8()) {
|
||||
TaskManager.IMP.getPublicForkJoinPool().awaitQuiescence(Long.MAX_VALUE, TimeUnit.MILLISECONDS);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -101,7 +101,7 @@ public class SetQueue {
|
||||
boolean parallel = Settings.QUEUE.PARALLEL_THREADS > 1;
|
||||
SET_TASK.value2.startSet(parallel);
|
||||
try {
|
||||
if (Settings.QUEUE.PARALLEL_THREADS <= 1) {
|
||||
if (Settings.QUEUE.PARALLEL_THREADS <= 1 || !Fawe.get().isJava8()) {
|
||||
SET_TASK.run();
|
||||
} else {
|
||||
for (int i = 0; i < Settings.QUEUE.PARALLEL_THREADS; i++) {
|
||||
@ -189,7 +189,7 @@ public class SetQueue {
|
||||
boolean parallel = Settings.QUEUE.PARALLEL_THREADS > 1;
|
||||
SET_TASK.value2.startSet(parallel);
|
||||
try {
|
||||
if (!parallel) {
|
||||
if (!parallel || !Fawe.get().isJava8()) {
|
||||
SET_TASK.run();
|
||||
} else {
|
||||
for (int i = 0; i < Settings.QUEUE.PARALLEL_THREADS; i++) {
|
||||
|
@ -6,6 +6,7 @@ import com.boydti.fawe.object.FaweQueue;
|
||||
import com.boydti.fawe.object.RunnableVal;
|
||||
import java.util.Collection;
|
||||
import java.util.Iterator;
|
||||
import java.util.concurrent.ExecutorCompletionService;
|
||||
import java.util.concurrent.ForkJoinPool;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import java.util.concurrent.atomic.AtomicBoolean;
|
||||
@ -60,6 +61,20 @@ public abstract class TaskManager {
|
||||
* @param runnables
|
||||
*/
|
||||
public void parallel(Collection<Runnable> runnables) {
|
||||
if (!Fawe.get().isJava8()) {
|
||||
ExecutorCompletionService c = new ExecutorCompletionService(pool);
|
||||
for (Runnable run : runnables) {
|
||||
c.submit(run, null);
|
||||
}
|
||||
try {
|
||||
for (int i = 0; i < runnables.size(); i++) {
|
||||
c.take();
|
||||
}
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
return;
|
||||
}
|
||||
for (Runnable run : runnables) {
|
||||
pool.submit(run);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user