Feature/watertagged #704
There are no files selected for viewing
This file contains 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 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 |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| package net.countercraft.movecraft.processing.tasks.detection.validators; | ||
|
|
||
| import net.countercraft.movecraft.MovecraftLocation; | ||
| import net.countercraft.movecraft.craft.type.CraftType; | ||
| import net.countercraft.movecraft.processing.MovecraftWorld; | ||
| import net.countercraft.movecraft.processing.functions.DetectionPredicate; | ||
| import net.countercraft.movecraft.processing.functions.Result; | ||
| import org.bukkit.Material; | ||
| import org.bukkit.block.data.BlockData; | ||
| import org.bukkit.block.data.Waterlogged; | ||
| import org.bukkit.entity.Player; | ||
| import org.jetbrains.annotations.NotNull; | ||
| import org.jetbrains.annotations.Nullable; | ||
|
|
||
| import java.util.Deque; | ||
| import java.util.Map; | ||
|
|
||
| public class LiquidBlockValidator implements DetectionPredicate<Map<Material, Deque<MovecraftLocation>>> { | ||
| @Override | ||
| public @NotNull Result validate(@NotNull Map<Material, Deque<MovecraftLocation>> materialDequeMap, @NotNull CraftType type, @NotNull MovecraftWorld world, @Nullable Player player) { | ||
| String allowedAmountString = type.getStringProperty(CraftType.LIQUIDS_MAX_AMOUNT); | ||
| boolean blockNumber = !allowedAmountString.startsWith("N"); //if false use block percentage | ||
| final String errorMessage = "Too many waterlogged blocks on craft"; | ||
|
|
||
| int maxAmount; | ||
| try { | ||
| if (blockNumber) { | ||
| maxAmount = Integer.parseInt(allowedAmountString.substring(1)); | ||
| } else { | ||
| maxAmount = Integer.parseInt(allowedAmountString); | ||
| } | ||
| } catch (NumberFormatException e) { | ||
| return Result.failWithMessage("liquidsMaxAmount wasn't configurated properly"); | ||
| } | ||
|
|
||
| final int liquidBlocks = getLiquidAmount(materialDequeMap, world); | ||
| if (liquidBlocks == 0) | ||
| return Result.succeed(); | ||
|
|
||
| if (maxAmount == 0) | ||
| return Result.failWithMessage(errorMessage); | ||
|
|
||
| if(blockNumber) { | ||
| if (liquidBlocks <= maxAmount) { | ||
| return Result.succeed(); | ||
| } else { | ||
| return Result.failWithMessage(errorMessage); | ||
| } | ||
| } else { | ||
| int allBlocks = getTotalBlocks(materialDequeMap); | ||
| double percentage = ((double) liquidBlocks / allBlocks) * 100; | ||
|
|
||
| if (percentage <= maxAmount) { | ||
| return Result.succeed(); | ||
| } else { | ||
| return Result.failWithMessage(errorMessage); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| public int getLiquidAmount(Map<Material, Deque<MovecraftLocation>> materialDequeMap, MovecraftWorld world) { | ||
| int amount = 0; | ||
| for (var locationList : materialDequeMap.entrySet()) { | ||
| final Deque<MovecraftLocation> locations = locationList.getValue(); | ||
|
|
||
| if (locationList.getKey() == Material.WATER || locationList.getKey() == Material.BUBBLE_COLUMN) { | ||
| amount += locations.size(); | ||
| continue; | ||
| } | ||
|
|
||
| for (var location : locations) { | ||
| BlockData blockData = world.getData(location); | ||
|
|
||
| if (blockData instanceof Waterlogged waterlogged && waterlogged.isWaterlogged()) { | ||
| amount++; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return amount; | ||
| } | ||
|
|
||
| public int getTotalBlocks(Map<Material, Deque<MovecraftLocation>> materialDequeMap) { | ||
| int amount = 0; | ||
| for (var locationList : materialDequeMap.values()) { | ||
| amount += locationList.size(); | ||
| } | ||
|
|
||
| return amount; | ||
| } | ||
|
Comment on lines
+83
to
+90
There was a problem hiding this comment. This should be calculated for us, look at how There was a problem hiding this comment. It does the same exact thing, just using a functional one liner approach: int total = materialDequeMap.values().parallelStream().mapToInt(Deque::size).sum();Prefer this? |
||
| } | ||
This file contains 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.
This should utilize
RequiredBlockEntry's logicThere 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.
How so, there is only a max amount no min amount in this case