Mirror von
https://github.com/IntellectualSites/FastAsyncWorldEdit.git
synchronisiert 2024-09-06 08:02:50 +02:00
Address requested changes
-4534154894 (r50694638)
-4c1d0bc9a6 (r50694886)
Dieser Commit ist enthalten in:
Ursprung
d48808f111
Commit
106f9aed79
@ -1,5 +1,6 @@
|
|||||||
package com.sk89q.worldedit.extension.platform.binding;
|
package com.sk89q.worldedit.extension.platform.binding;
|
||||||
|
|
||||||
|
import com.boydti.fawe.config.Caption;
|
||||||
import com.sk89q.worldedit.WorldEdit;
|
import com.sk89q.worldedit.WorldEdit;
|
||||||
import com.sk89q.worldedit.extension.input.InputParseException;
|
import com.sk89q.worldedit.extension.input.InputParseException;
|
||||||
import com.sk89q.worldedit.internal.expression.EvaluationException;
|
import com.sk89q.worldedit.internal.expression.EvaluationException;
|
||||||
@ -9,6 +10,7 @@ import com.sk89q.worldedit.math.BlockVector2;
|
|||||||
import com.sk89q.worldedit.math.BlockVector3;
|
import com.sk89q.worldedit.math.BlockVector3;
|
||||||
import com.sk89q.worldedit.math.Vector2;
|
import com.sk89q.worldedit.math.Vector2;
|
||||||
import com.sk89q.worldedit.math.Vector3;
|
import com.sk89q.worldedit.math.Vector3;
|
||||||
|
import com.sk89q.worldedit.util.formatting.text.TextComponent;
|
||||||
|
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
import javax.annotation.Nullable;
|
import javax.annotation.Nullable;
|
||||||
@ -73,7 +75,7 @@ public class PrimitiveBindings extends Bindings {
|
|||||||
public Boolean getBoolean(String argument) {
|
public Boolean getBoolean(String argument) {
|
||||||
switch (argument.toLowerCase(Locale.ROOT)) {
|
switch (argument.toLowerCase(Locale.ROOT)) {
|
||||||
case "":
|
case "":
|
||||||
throw new InputParseException("Invalid empty string instead of boolean");
|
throw new InputParseException(Caption.of("fawe.error.input-parser-exception"));
|
||||||
case "true":
|
case "true":
|
||||||
case "yes":
|
case "yes":
|
||||||
case "on":
|
case "on":
|
||||||
@ -89,7 +91,7 @@ public class PrimitiveBindings extends Bindings {
|
|||||||
case "0":
|
case "0":
|
||||||
return false;
|
return false;
|
||||||
default:
|
default:
|
||||||
throw new InputParseException("Invalid boolean " + argument);
|
throw new InputParseException(Caption.of("fawe.error.invalid-boolean", TextComponent.of(argument)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -59,11 +59,12 @@ public abstract class BlockBag {
|
|||||||
}
|
}
|
||||||
fetchBlock(blockState);
|
fetchBlock(blockState);
|
||||||
} catch (OutOfBlocksException e) {
|
} catch (OutOfBlocksException e) {
|
||||||
if (blockState.getBlockType().getMaterial().isAir()) {
|
BlockState placed = blockState; // TODO BlockType.getBlockBagItem(id, data);
|
||||||
|
if (placed.getBlockType().getMaterial().isAir()) {
|
||||||
throw e; // TODO: check
|
throw e; // TODO: check
|
||||||
}
|
}
|
||||||
|
|
||||||
fetchBlock(blockState);
|
fetchBlock(placed);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -131,6 +131,8 @@
|
|||||||
"fawe.error.no-failure": "This shouldn't result in any failure",
|
"fawe.error.no-failure": "This shouldn't result in any failure",
|
||||||
"fawe.error.invalid-bracketing": "Invalid bracketing, are you missing a '{0}'.",
|
"fawe.error.invalid-bracketing": "Invalid bracketing, are you missing a '{0}'.",
|
||||||
"fawe.error.too-simple": "Complexity must be in the range 0-100",
|
"fawe.error.too-simple": "Complexity must be in the range 0-100",
|
||||||
|
"fawe.error.input-parser-exception": "Invalid empty string instead of boolean.",
|
||||||
|
"fawe.error.invalid-boolean": "Invalid boolean {0}",
|
||||||
|
|
||||||
"fawe.cancel.worldedit.cancel.count": "Cancelled {0} edits.",
|
"fawe.cancel.worldedit.cancel.count": "Cancelled {0} edits.",
|
||||||
"fawe.cancel.worldedit.cancel.reason.confirm": "Use //confirm to execute {2}",
|
"fawe.cancel.worldedit.cancel.reason.confirm": "Use //confirm to execute {2}",
|
||||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren