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

Added support for custom materials to ArbitraryShape and adjusted //generate accordingly.

Browse Source
This commit is contained in:
TomyLobo
2011-10-31 22:03:35 +01:00
parent 02a70cca4a
commit 8a83f7f70e
2 changed files with 118 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/com/sk89q/worldedit/commands/GenerationCommands.java
View File

@ -25,6 +25,7 @@ import com.sk89q.minecraft.util.commands.CommandPermissions;
import com.sk89q.minecraft.util.commands.Logging;
import static com.sk89q.minecraft.util.commands.Logging.LogMode.*;
import com.sk89q.worldedit.*;
import com.sk89q.worldedit.blocks.BaseBlock;
import com.sk89q.worldedit.expression.Expression;
import com.sk89q.worldedit.expression.ExpressionException;
import com.sk89q.worldedit.patterns.Pattern;
@ -332,12 +333,12 @@ public class GenerationCommands {
if (args.hasFlag('r')) {
shape = new ArbitraryShape(region) {
@Override
protected boolean isInside(double x, double y, double z) {
protected BaseBlock getMaterial(int x, int y, int z, BaseBlock defaultMaterial) {
try {
return expression.evaluate(x, y, z) > 0;
return expression.evaluate(x, y, z) > 0 ? defaultMaterial : null;
} catch (Exception e) {
e.printStackTrace();
return false;
return null;
}
}
};
@ -350,12 +351,12 @@ public class GenerationCommands {
shape = new ArbitraryShape(region) {
@Override
protected boolean isInside(double x, double y, double z) {
protected BaseBlock getMaterial(int x, int y, int z, BaseBlock defaultMaterial) {
try {
return expression.evaluate(x - placementX, y - placementY, z - placementZ) > 0;
return expression.evaluate(x - placementX, y - placementY, z - placementZ) > 0 ? defaultMaterial : null;
} catch (Exception e) {
e.printStackTrace();
return false;
return null;
}
}
};
@ -366,14 +367,14 @@ public class GenerationCommands {
final Vector stretch = max.subtract(center);
shape = new ArbitraryShape(region) {
@Override
protected boolean isInside(double x, double y, double z) {
protected BaseBlock getMaterial(int x, int y, int z, BaseBlock defaultMaterial) {
final Vector scaled = new Vector(x, y, z).subtract(center).divide(stretch);
try {
return expression.evaluate(scaled.getX(), scaled.getY(), scaled.getZ()) > 0;
return expression.evaluate(scaled.getX(), scaled.getY(), scaled.getZ()) > 0 ? defaultMaterial : null;
} catch (Exception e) {
e.printStackTrace();
return false;
return null;
}
}
};