SteamWar/FastAsyncWorldEdit
13
0
Fork 0
geforkt von Mirrors/FastAsyncWorldEdit
Code Issues Pull-Requests Pakete Projekte Releases Wiki Aktivität

Moved packages to worldedit.function.*.

Quellcode durchsuchen
Dieser Commit ist enthalten in:
sk89q 2014-03-28 16:15:40 -07:00
Ursprung 60b839ed09
Commit 53730bfa20
19 geänderte Dateien mit 50 neuen und 46 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

21
src/main/java/com/sk89q/worldedit/EditSession.java
Datei anzeigen

@ -27,13 +27,16 @@ import com.sk89q.worldedit.blocks.BlockType;
import com.sk89q.worldedit.expression.Expression;
import com.sk89q.worldedit.expression.ExpressionException;
import com.sk89q.worldedit.expression.runtime.RValue;
import com.sk89q.worldedit.generator.ForestGenerator;
import com.sk89q.worldedit.generator.GardenPatchGenerator;
import com.sk89q.worldedit.function.block.BlockCount;
import com.sk89q.worldedit.function.operation.OperationHelper;
import com.sk89q.worldedit.function.block.BlockReplace;
import com.sk89q.worldedit.function.generator.ForestGenerator;
import com.sk89q.worldedit.function.generator.GardenPatchGenerator;
import com.sk89q.worldedit.interpolation.Interpolation;
import com.sk89q.worldedit.interpolation.KochanekBartelsInterpolation;
import com.sk89q.worldedit.interpolation.Node;
import com.sk89q.worldedit.masks.*;
import com.sk89q.worldedit.operation.*;
import com.sk89q.worldedit.function.*;
import com.sk89q.worldedit.patterns.Pattern;
import com.sk89q.worldedit.patterns.SingleBlockPattern;
import com.sk89q.worldedit.regions.CuboidRegion;
@ -48,10 +51,10 @@ import com.sk89q.worldedit.shape.RegionShape;
import com.sk89q.worldedit.shape.WorldEditExpressionEnvironment;
import com.sk89q.worldedit.util.TreeGenerator;
import com.sk89q.worldedit.util.noise.RandomNoise;
import com.sk89q.worldedit.visitor.DownwardVisitor;
import com.sk89q.worldedit.visitor.FlatRegionVisitor;
import com.sk89q.worldedit.visitor.RecursiveVisitor;
import com.sk89q.worldedit.visitor.RegionVisitor;
import com.sk89q.worldedit.function.visitor.DownwardVisitor;
import com.sk89q.worldedit.function.visitor.FlatRegionVisitor;
import com.sk89q.worldedit.function.visitor.RecursiveVisitor;
import com.sk89q.worldedit.function.visitor.RegionVisitor;
import java.util.*;
@ -2123,8 +2126,8 @@ public class EditSession {
* @param treeGenerator the tree generator
* @return number of trees created
* @throws MaxChangedBlocksException
* @deprecated Use {@link com.sk89q.worldedit.generator.ForestGenerator} with a
* {@link com.sk89q.worldedit.visitor.FlatRegionVisitor}
* @deprecated Use {@link com.sk89q.worldedit.function.generator.ForestGenerator} with a
* {@link com.sk89q.worldedit.function.visitor.FlatRegionVisitor}
*/
@Deprecated
public int makeForest(Iterable<Vector2D> it, int upperY, int lowerY,

12
src/main/java/com/sk89q/worldedit/commands/RegionCommands.java
Datei anzeigen

@ -29,19 +29,19 @@ import com.sk89q.worldedit.blocks.BlockID;
import com.sk89q.worldedit.expression.ExpressionException;
import com.sk89q.worldedit.filtering.GaussianKernel;
import com.sk89q.worldedit.filtering.HeightMapFilter;
import com.sk89q.worldedit.generator.FloraGenerator;
import com.sk89q.worldedit.generator.ForestGenerator;
import com.sk89q.worldedit.function.generator.FloraGenerator;
import com.sk89q.worldedit.function.generator.ForestGenerator;
import com.sk89q.worldedit.masks.ExistingBlockMask;
import com.sk89q.worldedit.masks.Mask2D;
import com.sk89q.worldedit.masks.NoiseFilter2D;
import com.sk89q.worldedit.operation.FlatRegionMaskingFilter;
import com.sk89q.worldedit.operation.GroundFunction;
import com.sk89q.worldedit.function.FlatRegionMaskingFilter;
import com.sk89q.worldedit.function.GroundFunction;
import com.sk89q.worldedit.regions.search.GroundSearch;
import com.sk89q.worldedit.regions.search.MaskingGroundSearch;
import com.sk89q.worldedit.util.noise.RandomNoise;
import com.sk89q.worldedit.visitor.FlatRegionVisitor;
import com.sk89q.worldedit.function.visitor.FlatRegionVisitor;
import com.sk89q.worldedit.masks.Mask;
import com.sk89q.worldedit.operation.OperationHelper;
import com.sk89q.worldedit.function.operation.OperationHelper;
import com.sk89q.worldedit.patterns.Pattern;
import com.sk89q.worldedit.patterns.SingleBlockPattern;
import com.sk89q.worldedit.regions.*;

2
src/main/java/com/sk89q/worldedit/operation/FlatRegionFunction.java → src/main/java/com/sk89q/worldedit/function/FlatRegionFunction.java
Datei anzeigen

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.sk89q.worldedit.operation;
package com.sk89q.worldedit.function;
import com.sk89q.worldedit.Vector2D;
import com.sk89q.worldedit.WorldEditException;

4
src/main/java/com/sk89q/worldedit/operation/FlatRegionMaskingFilter.java → src/main/java/com/sk89q/worldedit/function/FlatRegionMaskingFilter.java
Datei anzeigen

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.sk89q.worldedit.operation;
package com.sk89q.worldedit.function;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.Vector2D;
@ -28,7 +28,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
/**
* Passes calls to {@link #apply(com.sk89q.worldedit.Vector2D)} to the
* delegate {@link com.sk89q.worldedit.operation.FlatRegionFunction} if they
* delegate {@link com.sk89q.worldedit.function.FlatRegionFunction} if they
* match the given mask.
*/
public class FlatRegionMaskingFilter implements FlatRegionFunction {

2
src/main/java/com/sk89q/worldedit/operation/GroundFunction.java → src/main/java/com/sk89q/worldedit/function/GroundFunction.java
Datei anzeigen

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.sk89q.worldedit.operation;
package com.sk89q.worldedit.function;
import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.Vector2D;

2
src/main/java/com/sk89q/worldedit/operation/RegionFunction.java → src/main/java/com/sk89q/worldedit/function/RegionFunction.java
Datei anzeigen

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.sk89q.worldedit.operation;
package com.sk89q.worldedit.function;
import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.WorldEditException;

4
src/main/java/com/sk89q/worldedit/operation/RegionMaskingFilter.java → src/main/java/com/sk89q/worldedit/function/RegionMaskingFilter.java
Datei anzeigen

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.sk89q.worldedit.operation;
package com.sk89q.worldedit.function;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.Vector;
@ -28,7 +28,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
/**
* Passes calls to {@link #apply(com.sk89q.worldedit.Vector)} to the
* delegate {@link com.sk89q.worldedit.operation.RegionFunction} if they
* delegate {@link com.sk89q.worldedit.function.RegionFunction} if they
* match the given mask.
*/
public class RegionMaskingFilter implements RegionFunction {

3
src/main/java/com/sk89q/worldedit/operation/BlockCount.java → src/main/java/com/sk89q/worldedit/function/block/BlockCount.java
Datei anzeigen

@ -17,10 +17,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.sk89q.worldedit.operation;
package com.sk89q.worldedit.function.block;
import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.function.RegionFunction;
/**
* Counts the number of blocks.

4
src/main/java/com/sk89q/worldedit/operation/BlockReplace.java → src/main/java/com/sk89q/worldedit/function/block/BlockReplace.java
Datei anzeigen

@ -17,12 +17,12 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.sk89q.worldedit.operation;
package com.sk89q.worldedit.function.block;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.masks.Mask;
import com.sk89q.worldedit.function.RegionFunction;
import com.sk89q.worldedit.patterns.Pattern;
/**

4
src/main/java/com/sk89q/worldedit/generator/FloraGenerator.java → src/main/java/com/sk89q/worldedit/function/generator/FloraGenerator.java
Datei anzeigen

@ -17,14 +17,14 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.sk89q.worldedit.generator;
package com.sk89q.worldedit.function.generator;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.blocks.BaseBlock;
import com.sk89q.worldedit.blocks.BlockID;
import com.sk89q.worldedit.operation.RegionFunction;
import com.sk89q.worldedit.function.RegionFunction;
import com.sk89q.worldedit.patterns.BlockChance;
import com.sk89q.worldedit.patterns.Pattern;
import com.sk89q.worldedit.patterns.RandomFillPattern;

4
src/main/java/com/sk89q/worldedit/generator/ForestGenerator.java → src/main/java/com/sk89q/worldedit/function/generator/ForestGenerator.java
Datei anzeigen

@ -17,14 +17,14 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.sk89q.worldedit.generator;
package com.sk89q.worldedit.function.generator;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.blocks.BaseBlock;
import com.sk89q.worldedit.blocks.BlockID;
import com.sk89q.worldedit.operation.RegionFunction;
import com.sk89q.worldedit.function.RegionFunction;
import com.sk89q.worldedit.util.TreeGenerator;
/**

4
src/main/java/com/sk89q/worldedit/generator/GardenPatchGenerator.java → src/main/java/com/sk89q/worldedit/function/generator/GardenPatchGenerator.java
Datei anzeigen

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.sk89q.worldedit.generator;
package com.sk89q.worldedit.function.generator;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.MaxChangedBlocksException;
@ -25,7 +25,7 @@ import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.blocks.BaseBlock;
import com.sk89q.worldedit.blocks.BlockID;
import com.sk89q.worldedit.operation.RegionFunction;
import com.sk89q.worldedit.function.RegionFunction;
import com.sk89q.worldedit.patterns.BlockChance;
import com.sk89q.worldedit.patterns.Pattern;
import com.sk89q.worldedit.patterns.RandomFillPattern;

2
src/main/java/com/sk89q/worldedit/operation/Operation.java → src/main/java/com/sk89q/worldedit/function/operation/Operation.java
Datei anzeigen

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.sk89q.worldedit.operation;
package com.sk89q.worldedit.function.operation;
import com.sk89q.worldedit.WorldEditException;

2
src/main/java/com/sk89q/worldedit/operation/OperationHelper.java → src/main/java/com/sk89q/worldedit/function/operation/OperationHelper.java
Datei anzeigen

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.sk89q.worldedit.operation;
package com.sk89q.worldedit.function.operation;
import com.sk89q.worldedit.MaxChangedBlocksException;
import com.sk89q.worldedit.WorldEditException;

6
src/main/java/com/sk89q/worldedit/visitor/BreadthFirstSearch.java → src/main/java/com/sk89q/worldedit/function/visitor/BreadthFirstSearch.java
Datei anzeigen

@ -17,13 +17,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.sk89q.worldedit.visitor;
package com.sk89q.worldedit.function.visitor;
import com.sk89q.worldedit.BlockVector;
import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.operation.Operation;
import com.sk89q.worldedit.operation.RegionFunction;
import com.sk89q.worldedit.function.operation.Operation;
import com.sk89q.worldedit.function.RegionFunction;
import java.util.*;

4
src/main/java/com/sk89q/worldedit/visitor/DownwardVisitor.java → src/main/java/com/sk89q/worldedit/function/visitor/DownwardVisitor.java
Datei anzeigen

@ -17,12 +17,12 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.sk89q.worldedit.visitor;
package com.sk89q.worldedit.function.visitor;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.masks.Mask;
import com.sk89q.worldedit.operation.RegionFunction;
import com.sk89q.worldedit.function.RegionFunction;
import java.util.List;

6
src/main/java/com/sk89q/worldedit/visitor/FlatRegionVisitor.java → src/main/java/com/sk89q/worldedit/function/visitor/FlatRegionVisitor.java
Datei anzeigen

@ -17,12 +17,12 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.sk89q.worldedit.visitor;
package com.sk89q.worldedit.function.visitor;
import com.sk89q.worldedit.Vector2D;
import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.operation.FlatRegionFunction;
import com.sk89q.worldedit.operation.Operation;
import com.sk89q.worldedit.function.FlatRegionFunction;
import com.sk89q.worldedit.function.operation.Operation;
import com.sk89q.worldedit.regions.CuboidRegion;
import com.sk89q.worldedit.regions.FlatRegion;
import com.sk89q.worldedit.regions.Region;

4
src/main/java/com/sk89q/worldedit/visitor/RecursiveVisitor.java → src/main/java/com/sk89q/worldedit/function/visitor/RecursiveVisitor.java
Datei anzeigen

@ -17,12 +17,12 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.sk89q.worldedit.visitor;
package com.sk89q.worldedit.function.visitor;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.masks.Mask;
import com.sk89q.worldedit.operation.RegionFunction;
import com.sk89q.worldedit.function.RegionFunction;
/**
* An implementation of an {@link BreadthFirstSearch} that uses a mask to

6
src/main/java/com/sk89q/worldedit/visitor/RegionVisitor.java → src/main/java/com/sk89q/worldedit/function/visitor/RegionVisitor.java
Datei anzeigen

@ -17,12 +17,12 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.sk89q.worldedit.visitor;
package com.sk89q.worldedit.function.visitor;
import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.operation.Operation;
import com.sk89q.worldedit.operation.RegionFunction;
import com.sk89q.worldedit.function.operation.Operation;
import com.sk89q.worldedit.function.RegionFunction;
import com.sk89q.worldedit.regions.Region;
/**