-
Notifications
You must be signed in to change notification settings - Fork 14
feat: Added increment-block-statistics #90
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
awdrgyj8
wants to merge
3
commits into
milkteamc:master
Choose a base branch
from
awdrgyj8:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -34,6 +34,8 @@ | |
| import org.milkteamc.autotreechop.MessageKeys; | ||
| import org.milkteamc.autotreechop.PlayerConfig; | ||
|
|
||
| import static org.bukkit.Statistic.MINE_BLOCK; | ||
|
|
||
| public class TreeChopUtils { | ||
|
|
||
| private static final Random random = new Random(); | ||
|
|
@@ -304,6 +306,7 @@ private void executeTreeChop( | |
|
|
||
| BlockSnapshot finalLeafSnapshot = leafSnapshot; | ||
|
|
||
| Map<Material, Integer> logStatCounts = new HashMap<>(); | ||
| batchProcessor.processBatch( | ||
| blockList, | ||
| 0, | ||
|
|
@@ -342,12 +345,21 @@ private void executeTreeChop( | |
| } | ||
| block.breakNaturally(); | ||
|
|
||
| if (config.isIncrementBlockStatistics()) { | ||
| logStatCounts.merge(originalLogType, 1, Integer::sum); | ||
| } | ||
|
|
||
| actuallyRemovedLogs.add(location); | ||
| sessionManager.trackRemovedLogForPlayer(playerUUID.toString(), location); | ||
| playerConfig.incrementDailyBlocksBroken(); | ||
| }, | ||
| () -> { | ||
| // After all logs are removed | ||
| if (config.isIncrementBlockStatistics()) { | ||
| logStatCounts.forEach((mat, count) -> | ||
| player.incrementStatistic(MINE_BLOCK, mat, count)); | ||
| } | ||
|
|
||
| if (config.isToolDamage()) { | ||
| applyToolDamage(tool, player, totalBlocks, config); | ||
| } | ||
|
|
@@ -495,6 +507,7 @@ private void executeLeafRemoval( | |
|
|
||
| List<Location> leafList = new ArrayList<>(leavesToRemove); | ||
| int batchSize = config.getLeafRemovalBatchSize(); | ||
| Map<Material, Integer> leafStatCounts = new HashMap<>(); | ||
|
|
||
| batchProcessor.processBatchWithTermination( | ||
| leafList, | ||
|
|
@@ -512,11 +525,17 @@ private void executeLeafRemoval( | |
| Block leafBlock = location.getBlock(); | ||
|
|
||
| // Remove the leaf block with all checks | ||
| removeLeafBlock(leafBlock, player, config, playerConfig, hooks); | ||
| removeLeafBlock(leafBlock, player, config, playerConfig, hooks, leafStatCounts); | ||
|
|
||
| return true; // Continue processing | ||
| }, | ||
| () -> { | ||
| // Flush accumulated leaf statistics | ||
| if (config.isIncrementBlockStatistics()) { | ||
| leafStatCounts.forEach((mat, count) -> | ||
| player.incrementStatistic(MINE_BLOCK, mat, count)); | ||
| } | ||
|
|
||
| // Leaf removal complete - end session | ||
| sessionManager.endLeafRemovalSession(sessionId, playerKey); | ||
| }); | ||
|
|
@@ -531,7 +550,8 @@ private boolean removeLeafBlock( | |
| Player player, | ||
| Config config, | ||
| PlayerConfig playerConfig, | ||
| ProtectionCheckUtils.ProtectionHooks hooks) { | ||
| ProtectionCheckUtils.ProtectionHooks hooks, | ||
| Map<Material, Integer> leafStatCounts) { | ||
|
|
||
| Location leafLocation = leafBlock.getLocation(); | ||
|
|
||
|
|
@@ -573,6 +593,11 @@ private boolean removeLeafBlock( | |
| leafBlock.setType(XMaterial.AIR.get(), false); | ||
| } | ||
|
|
||
| if (config.isIncrementBlockStatistics()) { | ||
| Material leafMaterial = leafBlock.getType(); | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this will always return |
||
| leafStatCounts.merge(leafMaterial, 1, Integer::sum); | ||
| } | ||
|
|
||
| // Update daily blocks count if needed | ||
| if (config.getLeafRemovalCountsTowardsLimit()) { | ||
| playerConfig.incrementDailyBlocksBroken(); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
import
org.bukkit.Statistic, don't use static