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

Small changes

Browse Source
This commit is contained in:
MattBDev
2019-06-26 20:14:00 -04:00
parent 1932c96d4f
commit d0a31691e1
61 changed files with 382 additions and 577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
worldedit-core/src/main/java/com/boydti/fawe/util/ExtentTraverser.java
View File

@ -2,6 +2,7 @@ package com.boydti.fawe.util;
import com.sk89q.worldedit.extent.AbstractDelegateExtent;
import com.sk89q.worldedit.extent.Extent;
import java.lang.reflect.Field;
public class ExtentTraverser<T extends Extent> {
@ -75,7 +76,7 @@ public class ExtentTraverser<T extends Extent> {
}
return null;
} catch (Throwable e) {
MainUtil.handleError(e);
e.printStackTrace();
return null;
}
}
@ -91,7 +92,7 @@ public class ExtentTraverser<T extends Extent> {
}
return null;
} catch (Throwable e) {
MainUtil.handleError(e);
e.printStackTrace();
return null;
}
}

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

@ -609,18 +609,12 @@ public class MainUtil {
return newFile;
}
} catch (IOException e) {
MainUtil.handleError(e);
e.printStackTrace();
Fawe.debug("&cCould not save " + resource);
}
return null;
}
public static void handleError(Throwable e) {
if (e == null) {
return;
}
e.printStackTrace(); }
public static int[] regionNameToCoords(String fileName) {
int[] res = new int[2];
int len = fileName.length() - 4;

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

@ -150,7 +150,7 @@ public class ReflectionUtils {
m.setAccessible(true);
return (Map<T, V>) m.get(map);
} catch (Throwable e) {
MainUtil.handleError(e);
e.printStackTrace();
return map;
}
}
@ -163,7 +163,7 @@ public class ReflectionUtils {
m.setAccessible(true);
return (List<T>) m.get(list);
} catch (Throwable e) {
MainUtil.handleError(e);
e.printStackTrace();
return list;
}
}

3
worldedit-core/src/main/java/com/boydti/fawe/util/SetQueue.java
View File

@ -5,6 +5,7 @@ import com.boydti.fawe.config.Settings;
import com.boydti.fawe.object.FaweQueue;
import com.boydti.fawe.wrappers.WorldWrapper;
import com.sk89q.worldedit.world.World;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@ -273,7 +274,7 @@ public class SetQueue {
} catch (Throwable e) {
pool.awaitQuiescence(Settings.IMP.QUEUE.DISCARD_AFTER_MS, TimeUnit.MILLISECONDS);
completer = new ExecutorCompletionService(pool);
MainUtil.handleError(e);
e.printStackTrace();
} finally {
queue.endSet(Settings.IMP.QUEUE.PARALLEL_THREADS > 1);
queue.setStage(QueueStage.NONE);

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

@ -4,15 +4,16 @@ import com.boydti.fawe.Fawe;
import com.boydti.fawe.config.Settings;
import com.boydti.fawe.object.FaweQueue;
import com.boydti.fawe.object.RunnableVal;
import org.jetbrains.annotations.NotNull;
import javax.annotation.Nullable;
import java.util.Collection;
import java.util.Iterator;
import java.util.concurrent.ForkJoinPool;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Supplier;
import javax.annotation.Nullable;
public abstract class TaskManager {
@ -283,7 +284,7 @@ public abstract class TaskManager {
}
}
} catch (InterruptedException e) {
MainUtil.handleError(e);
e.printStackTrace();
}
}
@ -330,7 +331,7 @@ public abstract class TaskManager {
} catch (RuntimeException e) {
this.value = e;
} catch (Throwable neverHappens) {
MainUtil.handleError(neverHappens);
neverHappens.printStackTrace();
} finally {
running.set(false);
}
@ -347,7 +348,7 @@ public abstract class TaskManager {
}
}
} catch (InterruptedException e) {
MainUtil.handleError(e);
e.printStackTrace();
}
if (run.value != null) {
throw run.value;
@ -382,7 +383,7 @@ public abstract class TaskManager {
} catch (RuntimeException e) {
this.value = e;
} catch (Throwable neverHappens) {
MainUtil.handleError(neverHappens);
neverHappens.printStackTrace();
} finally {
running.set(false);
synchronized (function) {
@ -399,7 +400,7 @@ public abstract class TaskManager {
}
}
} catch (InterruptedException e) {
MainUtil.handleError(e);
e.printStackTrace();
}
if (run.value instanceof RuntimeException) {
throw (RuntimeException) run.value;

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

@ -14,9 +14,9 @@ import com.sk89q.worldedit.extent.AbstractDelegateExtent;
import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.regions.Region;
import java.lang.reflect.Field;
import java.util.*;
import java.util.stream.Collectors;
public class WEManager {
@ -33,7 +33,7 @@ public class WEManager {
field.set(parent, new NullExtent((Extent) field.get(parent), reason));
}
} catch (final Exception e) {
MainUtil.handleError(e);
e.printStackTrace();
}
throw new FaweException(reason);
}
@ -189,7 +189,7 @@ public class WEManager {
}), 2);
});
} catch (final Exception e) {
MainUtil.handleError(e);
e.printStackTrace();
}
}, false, false);
}