Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-07-06 20:56:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed more deprecated code

Browse Source
This commit is contained in:
Matthew Miller
2018-06-19 17:03:09 +10:00
parent 416480c16d
commit 66d70f00e7
19 changed files with 107 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
worldedit-core/src/main/java/com/sk89q/worldedit/function/generator/ForestGenerator.java
View File

@ -22,7 +22,6 @@ 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.type.BlockStateHolder;
import com.sk89q.worldedit.blocks.type.BlockType;
import com.sk89q.worldedit.blocks.type.BlockTypes;
@ -35,18 +34,18 @@ import com.sk89q.worldedit.util.TreeGenerator;
*/
public class ForestGenerator implements RegionFunction {
private final TreeGenerator treeGenerator;
private final TreeGenerator.TreeType treeType;
private final EditSession editSession;
/**
* Create a new instance.
*
* @param editSession the edit session
* @param treeGenerator a tree generator
* @param treeType a tree generator
*/
public ForestGenerator(EditSession editSession, TreeGenerator treeGenerator) {
public ForestGenerator(EditSession editSession, TreeGenerator.TreeType treeType) {
this.editSession = editSession;
this.treeGenerator = treeGenerator;
this.treeType = treeType;
}
@Override
@ -55,11 +54,11 @@ public class ForestGenerator implements RegionFunction {
BlockType t = block.getBlockType();
if (t == BlockTypes.GRASS || t == BlockTypes.DIRT) {
treeGenerator.generate(editSession, position.add(0, 1, 0));
treeType.generate(editSession, position.add(0, 1, 0));
return true;
} else if (t == BlockTypes.TALL_GRASS || t == BlockTypes.DEAD_BUSH || t == BlockTypes.POPPY || t == BlockTypes.DANDELION) { // TODO: This list needs to be moved
editSession.setBlock(position, BlockTypes.AIR.getDefaultState());
treeGenerator.generate(editSession, position);
treeType.generate(editSession, position);
return true;
} else if (t == BlockTypes.SNOW) {
editSession.setBlock(position, BlockTypes.AIR.getDefaultState());