Upstream/FastAsyncWorldedit
1
0
Fork 0
mirror of https://github.com/boy0001/FastAsyncWorldedit.git synced 2024-09-27 14:42:37 +02:00
Code Issues Projects Releases Wiki Activity

Various minor

Browse Source 
remove debug
Angle mask overlay option (end with o)
3rd party command registration fixes
message tweaks
This commit is contained in:
Jesse Boyd 2017-04-08 22:11:25 +10:00
parent 7c49c34c86
commit 1d02901e39
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
6 changed files with 38 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/com/boydti/fawe/config/BBC.java
View File

@ -35,7 +35,7 @@ public enum BBC {
WORLDEDIT_VOLUME("&7You cannot select a volume of %current%. The maximum volume you can modify is %max%.", "Info"),
WORLDEDIT_ITERATIONS("&7You cannot iterate %current% times. The maximum number of iterations allowed is %max%.", "Info"),
WORLDEDIT_UNSAFE("&7Access to that command has been blocked", "Info"),
WORLDEDIT_DANGEROUS_WORLDEDIT("&cFAWE processed unsafe WorldEdit at %s0 by %s1", "Info"),
WORLDEDIT_DANGEROUS_WORLDEDIT("&cProcessed unsafe WorldEdit at %s0 by %s1", "Info"),
WORLDEDIT_BYPASS("&7&oTo bypass your restrictions use &c/wea", "Info"),
WORLDEDIT_EXTEND("&cYour WorldEdit may have extended outside your allowed region.", "Error"),
WORLDEDIT_TOGGLE_TIPS_ON("&7Disabled WorldEdit tips.", "Info"),
@ -115,7 +115,7 @@ public enum BBC {
BRUSH_EXTINGUISHER("Extinguisher equipped (%s0).", "WorldEdit.Brush"),
BRUSH_GRAVITY("Gravity brush equipped (%s0)", "WorldEdit.Brush"),
BRUSH_HEIGHT("Height brush equipped (%s0)", "WorldEdit.Brush"),
BRUSH_TRY_OTHER("&cFAWE adds other, more suitable brushes e.g.\n&8 - &7//br height [radius=5] [#clipboard|file=null] [rotation=0] [yscale=1.00]", "WorldEdit.Brush"),
BRUSH_TRY_OTHER("&cThere are other more suitable brushes e.g.\n&8 - &7//br height [radius=5] [#clipboard|file=null] [rotation=0] [yscale=1.00]", "WorldEdit.Brush"),
BRUSH_COPY("Copy brush equipped (%s0). Left click the base of an object to copy, right click to paste. Increase the brush radius if necessary.", "WorldEdit.Brush"),
BRUSH_COMMAND("Command brush equipped (%s0)", "WorldEdit.Brush"),
BRUSH_HEIGHT_INVALID("Invalid height map file (%s0)", "WorldEdit.Brush"),
@ -226,7 +226,7 @@ public enum BBC {
NOT_PLAYER("&cYou must be a player to perform this action!", "Error"),
PLAYER_NOT_FOUND("&cPlayer not found:&7 %s0", "Error"),
OOM(
"&8[&cCritical&8] &cDetected low memory i.e. < 1%. FAWE will take the following actions:\n&8 - &7Terminate WE block placement\n&8 - &7Clear WE history\n&8 - &7Unload non essential chunks\n&8 - &7Kill entities\n&8 - &7Garbage collect\n&cIgnore this if trying to crash server.\n&7Note: Low memory is likely (but not necessarily) caused by WE",
"&8[&cCritical&8] &cDetected low memory i.e. < 1%. We will take the following actions:\n&8 - &7Terminate WE block placement\n&8 - &7Clear WE history\n&8 - &7Unload non essential chunks\n&8 - &7Kill entities\n&8 - &7Garbage collect\n&cIgnore this if trying to crash server.\n&7Note: Low memory is likely (but not necessarily) caused by WE",
"Error"),
WORLDEDIT_SOME_FAILS("&c%s0 blocks weren't placed because they were outside your allowed region.", "Error"),

1
core/src/main/java/com/boydti/fawe/jnbt/anvil/MCAChunk.java
View File

@ -56,7 +56,6 @@ public class MCAChunk extends FaweChunk<Void> {
private boolean deleted;
public byte[] toBytes(byte[] buffer) throws IOException {
checkNotNull(buffer);
if (buffer == null) {
buffer = new byte[8192];
}

6
core/src/main/java/com/boydti/fawe/object/mask/AngleMask.java
View File

@ -16,15 +16,17 @@ public class AngleMask extends SolidBlockMask {
private final double max;
private final double min;
private final Extent extent;
private final boolean overlay;
private MutableBlockVector mutable = new MutableBlockVector();
private int maxY;
public AngleMask(Extent extent, double min, double max) {
public AngleMask(Extent extent, double min, double max, boolean overlay) {
super(extent);
this.extent = extent;
this.min = min;
this.max = max;
this.maxY = extent.getMaximumPoint().getBlockY();
this.overlay = overlay;
}
@Override
@ -37,7 +39,7 @@ public class AngleMask extends SolidBlockMask {
return false;
}
block = extent.getLazyBlock(x, y + 1, z);
if (test(block.getId(), block.getData())) {
if (overlay && test(block.getId(), block.getData())) {
return false;
}
double slope;

2
core/src/main/java/com/boydti/fawe/util/Updater.java
View File

@ -55,8 +55,6 @@ public class Updater {
Fawe.debug("Updated FAWE to " + versionString);
MainUtil.sendAdmin("&7Restart to update FAWE with these changes: &c/fawe changelog &7or&c " + "http://boydti.com/fawe/cl?" + Integer.toHexString(currentVersion.hash));
}
} else {
System.out.println("Not newer");
}
}
} catch (Throwable ignore) {}

9
core/src/main/java/com/sk89q/worldedit/extension/factory/DefaultMaskParser.java
View File

@ -295,6 +295,13 @@ public class DefaultMaskParser extends FaweParser<Mask> {
}
try {
double y1,y2;
boolean override;
if (split[1].endsWith("o")) {
override = true;
split[1] = split[1].substring(0, split[1].length() - 1);
} else {
override = false;
}
if (split[0].endsWith("d")) {
double y1d = Expression.compile(split[0].substring(0, split[0].length() - 1)).evaluate();
double y2d = Expression.compile(split[1].substring(0, split[1].length() - 1)).evaluate();
@ -304,7 +311,7 @@ public class DefaultMaskParser extends FaweParser<Mask> {
y1 = (Expression.compile(split[0]).evaluate());
y2 = (Expression.compile(split[1]).evaluate());
}
return new AngleMask(extent, y1, y2);
return new AngleMask(extent, y1, y2, override);
} catch (NumberFormatException | ExpressionException e) {
throw new SuggestInputParseException(input, "/<min-angle>:<max-angle>");
}

37
core/src/main/java/com/sk89q/worldedit/extension/platform/CommandManager.java
View File

@ -150,13 +150,6 @@ public final class CommandManager {
dynamicHandler.setFormatter(new LogFormat());
this.methodMap = new ConcurrentHashMap<>();
// TaskManager.IMP.task(new Runnable() {
// @Override
// public void run() {
//
// }
// });
}
/**
@ -166,9 +159,6 @@ public final class CommandManager {
*/
public void registerCommands(Object clazz) {
registerCommands(clazz, new String[0]);
if (dispatcher != null) {
setupDispatcher();
}
}
/**
@ -178,9 +168,26 @@ public final class CommandManager {
* @param aliases The aliases to give the command
*/
public void registerCommands(Object clazz, String... aliases) {
methodMap.put(clazz, aliases);
if (dispatcher != null) {
setupDispatcher();
if (platform != null) {
ParametricBuilder builder = new ParametricBuilder();
builder.setAuthorizer(new ActorAuthorizer());
builder.setDefaultCompleter(new UserCommandCompleter(platformManager));
builder.addBinding(new WorldEditBinding(worldEdit));
builder.addBinding(new PatternBinding(worldEdit), com.sk89q.worldedit.function.pattern.Pattern.class);
builder.addBinding(new MaskBinding(worldEdit), com.sk89q.worldedit.function.mask.Mask.class);
DispatcherNode graph = new CommandGraph().builder(builder).commands();
if (aliases.length == 0) {
graph = graph.registerMethods(clazz);
} else {
graph = graph.group(aliases).registerMethods(clazz).parent();
}
Dispatcher dispatcher = graph.graph().getDispatcher();
platform.registerCommands(dispatcher);
} else {
System.out.println("Put in method map " + clazz);
methodMap.put(clazz, aliases);
}
}
@ -188,6 +195,7 @@ public final class CommandManager {
* Initialize the dispatcher
*/
public void setupDispatcher() {
System.out.println("Setup dispatcher!");
ParametricBuilder builder = new ParametricBuilder();
builder.setAuthorizer(new ActorAuthorizer());
builder.setDefaultCompleter(new UserCommandCompleter(platformManager));
@ -204,12 +212,13 @@ public final class CommandManager {
// add command
String[] aliases = entry.getValue();
if (aliases.length == 0) {
System.out.println("Add class " + entry.getKey());
graph = graph.registerMethods(entry.getKey());
} else {
graph = graph.group(aliases).registerMethods(entry.getKey()).parent();
}
}
methodMap.clear();
dispatcher = graph
.group("/anvil", "anvil")