|
|
@@ -6,6 +6,7 @@ import com.gmail.nossr50.datatypes.player.McMMOPlayer;
|
|
|
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
|
|
|
import com.gmail.nossr50.datatypes.skills.SubSkillType;
|
|
|
import com.gmail.nossr50.datatypes.skills.SuperAbilityType;
|
|
|
+import com.gmail.nossr50.datatypes.skills.behaviours.WoodcuttingBehaviour;
|
|
|
import com.gmail.nossr50.mcMMO;
|
|
|
import com.gmail.nossr50.skills.SkillManager;
|
|
|
import com.gmail.nossr50.util.BlockUtils;
|
|
|
@@ -16,19 +17,28 @@ import com.gmail.nossr50.util.random.RandomChanceUtil;
|
|
|
import com.gmail.nossr50.util.skills.CombatUtils;
|
|
|
import com.gmail.nossr50.util.skills.RankUtils;
|
|
|
import com.gmail.nossr50.util.skills.SkillActivationType;
|
|
|
+import com.gmail.nossr50.util.skills.SkillUtils;
|
|
|
import org.bukkit.Material;
|
|
|
import org.bukkit.block.Block;
|
|
|
+import org.bukkit.block.BlockFace;
|
|
|
import org.bukkit.block.BlockState;
|
|
|
import org.bukkit.entity.Player;
|
|
|
import org.bukkit.inventory.ItemStack;
|
|
|
|
|
|
+import java.util.ArrayList;
|
|
|
import java.util.HashSet;
|
|
|
+import java.util.List;
|
|
|
import java.util.Set;
|
|
|
|
|
|
public class WoodcuttingManager extends SkillManager {
|
|
|
|
|
|
+ private final WoodcuttingBehaviour woodcuttingBehaviour;
|
|
|
+ private boolean treeFellerReachedThreshold;
|
|
|
+
|
|
|
public WoodcuttingManager(mcMMO pluginRef, McMMOPlayer mcMMOPlayer) {
|
|
|
super(pluginRef, mcMMOPlayer, PrimarySkillType.WOODCUTTING);
|
|
|
+ this.treeFellerReachedThreshold = false;
|
|
|
+ this.woodcuttingBehaviour = pluginRef.getDynamicSettingsManager().getSkillBehaviourManager().getWoodcuttingBehaviour();
|
|
|
}
|
|
|
|
|
|
public boolean canUseLeafBlower(ItemStack heldItem) {
|
|
|
@@ -42,7 +52,7 @@ public class WoodcuttingManager extends SkillManager {
|
|
|
&& ItemUtils.isAxe(heldItem);
|
|
|
}
|
|
|
|
|
|
- protected boolean canGetDoubleDrops() {
|
|
|
+ public boolean canGetDoubleDrops() {
|
|
|
return Permissions.isSubSkillEnabled(getPlayer(), SubSkillType.WOODCUTTING_HARVEST_LUMBER)
|
|
|
&& RankUtils.hasReachedRank(1, getPlayer(), SubSkillType.WOODCUTTING_HARVEST_LUMBER)
|
|
|
&& RandomChanceUtil.isActivationSuccessful(SkillActivationType.RANDOM_LINEAR_100_SCALE_WITH_CAP, SubSkillType.WOODCUTTING_HARVEST_LUMBER, getPlayer());
|
|
|
@@ -54,7 +64,7 @@ public class WoodcuttingManager extends SkillManager {
|
|
|
* @param blockState Block being broken
|
|
|
*/
|
|
|
public void woodcuttingBlockCheck(BlockState blockState) {
|
|
|
- int xp = Woodcutting.getExperienceFromLog(blockState);
|
|
|
+ int xp = woodcuttingBehaviour.getExperienceFromLog(blockState);
|
|
|
|
|
|
switch (blockState.getType()) {
|
|
|
case BROWN_MUSHROOM_BLOCK:
|
|
|
@@ -63,7 +73,7 @@ public class WoodcuttingManager extends SkillManager {
|
|
|
|
|
|
default:
|
|
|
if (canGetDoubleDrops()) {
|
|
|
- Woodcutting.checkForDoubleDrop(blockState);
|
|
|
+ woodcuttingBehaviour.checkForDoubleDrop(blockState);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -79,20 +89,20 @@ public class WoodcuttingManager extends SkillManager {
|
|
|
Player player = getPlayer();
|
|
|
Set<BlockState> treeFellerBlocks = new HashSet<>();
|
|
|
|
|
|
- Woodcutting.treeFellerReachedThreshold = false;
|
|
|
+ treeFellerReachedThreshold = false;
|
|
|
|
|
|
- Woodcutting.processTree(blockState, treeFellerBlocks);
|
|
|
+ processTree(blockState, treeFellerBlocks);
|
|
|
|
|
|
// If the player is trying to break too many blocks
|
|
|
- if (Woodcutting.treeFellerReachedThreshold) {
|
|
|
- Woodcutting.treeFellerReachedThreshold = false;
|
|
|
+ if (treeFellerReachedThreshold) {
|
|
|
+ treeFellerReachedThreshold = false;
|
|
|
|
|
|
pluginRef.getNotificationManager().sendPlayerInformation(player, NotificationType.SUBSKILL_MESSAGE_FAILED, "Woodcutting.Skills.TreeFeller.Threshold");
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
// If the tool can't sustain the durability loss
|
|
|
- if (!Woodcutting.handleDurabilityLoss(treeFellerBlocks, player.getInventory().getItemInMainHand())) {
|
|
|
+ if (!handleDurabilityLoss(treeFellerBlocks, player.getInventory().getItemInMainHand())) {
|
|
|
pluginRef.getNotificationManager().sendPlayerInformation(player, NotificationType.SUBSKILL_MESSAGE_FAILED, "Woodcutting.Skills.TreeFeller.Splinter");
|
|
|
|
|
|
double health = player.getHealth();
|
|
|
@@ -105,7 +115,137 @@ public class WoodcuttingManager extends SkillManager {
|
|
|
}
|
|
|
|
|
|
dropBlocks(treeFellerBlocks);
|
|
|
- Woodcutting.treeFellerReachedThreshold = false; // Reset the value after we're done with Tree Feller each time.
|
|
|
+ treeFellerReachedThreshold = false; // Reset the value after we're done with Tree Feller each time.
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * Processes Tree Feller in a recursive manner
|
|
|
+ *
|
|
|
+ * @param blockState Block being checked
|
|
|
+ * @param treeFellerBlocks List of blocks to be removed
|
|
|
+ */
|
|
|
+ /*
|
|
|
+ * Algorithm: An int[][] of X/Z directions is created on class
|
|
|
+ * initialization, representing a cylinder with radius of about 2 - the
|
|
|
+ * (0,0) center and all (+-2, +-2) corners are omitted.
|
|
|
+ *
|
|
|
+ * handleBlock() returns a boolean, which is used for the sole purpose of
|
|
|
+ * switching between these two behaviors:
|
|
|
+ *
|
|
|
+ * (Call blockState "this log" for the below explanation.)
|
|
|
+ *
|
|
|
+ * [A] There is another log above this log (TRUNK)
|
|
|
+ * Only the flat cylinder in the directions array is searched.
|
|
|
+ * [B] There is not another log above this log (BRANCH AND TOP)
|
|
|
+ * The cylinder in the directions array is extended up and down by 1
|
|
|
+ * block in the Y-axis, and the block below this log is checked as
|
|
|
+ * well. Due to the fact that the directions array will catch all
|
|
|
+ * blocks on a red mushroom, the special method for it is eliminated.
|
|
|
+ *
|
|
|
+ * This algorithm has been shown to achieve a performance of 2-5
|
|
|
+ * milliseconds on regular trees and 10-15 milliseconds on jungle trees
|
|
|
+ * once the JIT has optimized the function (use the ability about 4 times
|
|
|
+ * before taking measurements).
|
|
|
+ */
|
|
|
+ public void processTree(BlockState blockState, Set<BlockState> treeFellerBlocks) {
|
|
|
+ List<BlockState> futureCenterBlocks = new ArrayList<>();
|
|
|
+
|
|
|
+ // Check the block up and take different behavior (smaller search) if it's a log
|
|
|
+ if (handleBlock(blockState.getBlock().getRelative(BlockFace.UP).getState(), futureCenterBlocks, treeFellerBlocks)) {
|
|
|
+ for (int[] dir : woodcuttingBehaviour.getDirections()) {
|
|
|
+ handleBlock(blockState.getBlock().getRelative(dir[0], 0, dir[1]).getState(), futureCenterBlocks, treeFellerBlocks);
|
|
|
+
|
|
|
+ if (treeFellerReachedThreshold) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ // Cover DOWN
|
|
|
+ handleBlock(blockState.getBlock().getRelative(BlockFace.DOWN).getState(), futureCenterBlocks, treeFellerBlocks);
|
|
|
+ // Search in a cube
|
|
|
+ for (int y = -1; y <= 1; y++) {
|
|
|
+ for (int[] dir : woodcuttingBehaviour.getDirections()) {
|
|
|
+ handleBlock(blockState.getBlock().getRelative(dir[0], y, dir[1]).getState(), futureCenterBlocks, treeFellerBlocks);
|
|
|
+
|
|
|
+ if (treeFellerReachedThreshold) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ // Recursive call for each log found
|
|
|
+ for (BlockState futureCenterBlock : futureCenterBlocks) {
|
|
|
+ if (treeFellerReachedThreshold) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
+ processTree(futureCenterBlock, treeFellerBlocks);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * Handles the durability loss
|
|
|
+ *
|
|
|
+ * @param treeFellerBlocks List of blocks to be removed
|
|
|
+ * @param inHand tool being used
|
|
|
+ * @return True if the tool can sustain the durability loss
|
|
|
+ */
|
|
|
+ public boolean handleDurabilityLoss(Set<BlockState> treeFellerBlocks, ItemStack inHand) {
|
|
|
+ //Treat the NBT tag for unbreakable and the durability enchant differently
|
|
|
+ if(inHand.getItemMeta() != null && inHand.getItemMeta().isUnbreakable()) {
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+
|
|
|
+ short durabilityLoss = 0;
|
|
|
+ Material type = inHand.getType();
|
|
|
+
|
|
|
+ for (BlockState blockState : treeFellerBlocks) {
|
|
|
+ if (BlockUtils.isLog(blockState)) {
|
|
|
+ durabilityLoss += pluginRef.getConfigManager().getConfigSuperAbilities().getSuperAbilityLimits().getToolDurabilityDamage();
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ SkillUtils.handleDurabilityChange(inHand, durabilityLoss);
|
|
|
+ return (inHand.getDurability() < (pluginRef.getRepairableManager().isRepairable(type) ? pluginRef.getRepairableManager().getRepairable(type).getMaximumDurability() : type.getMaxDurability()));
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * Handle a block addition to the list of blocks to be removed and to the
|
|
|
+ * list of blocks used for future recursive calls of
|
|
|
+ * 'processTree()'
|
|
|
+ *
|
|
|
+ * @param blockState Block to be added
|
|
|
+ * @param futureCenterBlocks List of blocks that will be used to call
|
|
|
+ * 'processTree()'
|
|
|
+ * @param treeFellerBlocks List of blocks to be removed
|
|
|
+ * @return true if and only if the given blockState was a Log not already
|
|
|
+ * in treeFellerBlocks.
|
|
|
+ */
|
|
|
+ private boolean handleBlock(BlockState blockState, List<BlockState> futureCenterBlocks, Set<BlockState> treeFellerBlocks) {
|
|
|
+ if (treeFellerBlocks.contains(blockState) || pluginRef.getPlaceStore().isTrue(blockState)) {
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+
|
|
|
+ // Without this check Tree Feller propagates through leaves until the threshold is hit
|
|
|
+ if (treeFellerBlocks.size() > pluginRef.getConfigManager().getConfigSuperAbilities().getSuperAbilityLimits().getTreeFeller().getTreeFellerLimit()) {
|
|
|
+ treeFellerReachedThreshold = true;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (BlockUtils.isLog(blockState)) {
|
|
|
+ treeFellerBlocks.add(blockState);
|
|
|
+ futureCenterBlocks.add(blockState);
|
|
|
+ return true;
|
|
|
+ } else if (BlockUtils.isLeaves(blockState)) {
|
|
|
+ treeFellerBlocks.add(blockState);
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+
|
|
|
+ public enum ExperienceGainMethod {
|
|
|
+ DEFAULT,
|
|
|
+ TREE_FELLER,
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -129,14 +269,14 @@ public class WoodcuttingManager extends SkillManager {
|
|
|
|
|
|
//TODO: Update this to drop the correct items/blocks via NMS
|
|
|
if (material == Material.BROWN_MUSHROOM_BLOCK || material == Material.RED_MUSHROOM_BLOCK) {
|
|
|
- xp += Woodcutting.processTreeFellerXPGains(blockState, processedLogCount);
|
|
|
+ xp += woodcuttingBehaviour.processTreeFellerXPGains(blockState, processedLogCount);
|
|
|
Misc.dropItems(Misc.getBlockCenter(blockState), block.getDrops());
|
|
|
} else {
|
|
|
if (BlockUtils.isLog(blockState)) {
|
|
|
if (canGetDoubleDrops()) {
|
|
|
- Woodcutting.checkForDoubleDrop(blockState);
|
|
|
+ woodcuttingBehaviour.checkForDoubleDrop(blockState);
|
|
|
}
|
|
|
- xp += Woodcutting.processTreeFellerXPGains(blockState, processedLogCount);
|
|
|
+ xp += woodcuttingBehaviour.processTreeFellerXPGains(blockState, processedLogCount);
|
|
|
Misc.dropItems(Misc.getBlockCenter(blockState), block.getDrops());
|
|
|
}
|
|
|
if (BlockUtils.isLeaves(blockState)) {
|
nossr50