EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-11-04 02:53:43 +01:00
Code Issues Projects Releases Wiki Activity

Added new Tree Feller algorithm for Huge Red Mushroom

Browse Source
This commit is contained in:
nossr50
2013-02-27 11:51:44 -08:00
parent 5ba4dc7b77
commit a7f858ab03
2 changed files with 51 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/main/java/com/gmail/nossr50/skills/woodcutting/TreeFeller.java
View File

@@ -36,10 +36,13 @@ public final class TreeFeller {
* @param mcMMOPlayer Player using Tree Feller * @param mcMMOPlayer Player using Tree Feller
* @param blockState Block being broken * @param blockState Block being broken
*/ */
protected static void process(BlockState blockState, Player player) { protected static void processTreeFeller(BlockState blockState, Player player) {
List<BlockState> treeFellerBlocks = new ArrayList<BlockState>(); List<BlockState> treeFellerBlocks = new ArrayList<BlockState>();
processRecursively(blockState, treeFellerBlocks); if(blockState.getTypeId() == 17 || blockState.getTypeId() == 99)
processRegularTrees(blockState, treeFellerBlocks);
else
processRedMushroomTrees(blockState, treeFellerBlocks);
// If the player is trying to break too many blocks // If the player is trying to break too many blocks
if (treeFellerReachedThreshold) { if (treeFellerReachedThreshold) {
@@ -66,12 +69,12 @@ public final class TreeFeller {
} }
/** /**
* Processes Tree Feller * Processes Tree Feller for generic Trees
* *
* @param blockState Block being checked * @param blockState Block being checked
* @param treeFellerBlocks List of blocks to be removed * @param treeFellerBlocks List of blocks to be removed
*/ */
private static void processRecursively(BlockState blockState, List<BlockState> treeFellerBlocks) { private static void processRegularTrees(BlockState blockState, List<BlockState> treeFellerBlocks) {
if (!BlockChecks.isLog(blockState)) { if (!BlockChecks.isLog(blockState)) {
return; return;
} }
@@ -100,7 +103,48 @@ public final class TreeFeller {
return; return;
} }
processRecursively(futureCenterBlock, treeFellerBlocks); processRegularTrees(futureCenterBlock, treeFellerBlocks);
}
}
/**
* Processes Tree Feller for Red Mushrooms (Dome Shaped)
*
* @param blockState Block being checked
* @param treeFellerBlocks List of blocks to be removed
*/
private static void processRedMushroomTrees(BlockState blockState, List<BlockState> treeFellerBlocks) {
if (!BlockChecks.isLog(blockState)) {
return;
}
List<BlockState> futureCenterBlocks = new ArrayList<BlockState>();
World world = blockState.getWorld();
// Handle the blocks around 'block'
for (int y = 0; y <= 1; y++) {
for (int x = -1; x <= 1; x++) {
for (int z = -1; z <= 1; z++) {
BlockState nextBlock = world.getBlockAt(blockState.getLocation().add(x, y, z)).getState();
BlockState otherNextBlock = world.getBlockAt(blockState.getLocation().add(x, y-(y*2), z)).getState();
handleBlock(nextBlock, futureCenterBlocks, treeFellerBlocks);
handleBlock(otherNextBlock, futureCenterBlocks, treeFellerBlocks);
if (treeFellerReachedThreshold) {
return;
}
}
}
}
// Recursive call for each log found
for (BlockState futureCenterBlock : futureCenterBlocks) {
if (treeFellerReachedThreshold) {
return;
}
processRedMushroomTrees(futureCenterBlock, treeFellerBlocks);
} }
} }

2
src/main/java/com/gmail/nossr50/skills/woodcutting/Woodcutting.java
View File

@@ -38,7 +38,7 @@ public final class Woodcutting {
* @param block Block being broken * @param block Block being broken
*/ */
public static void beginTreeFeller(BlockState blockState, Player player) { public static void beginTreeFeller(BlockState blockState, Player player) {
TreeFeller.process(blockState, player); TreeFeller.processTreeFeller(blockState, player);
} }
/** /**