Upstream/UltimateTimber
1
0
Fork 0
mirror of https://github.com/songoda/UltimateTimber.git synced 2024-06-26 06:34:50 +02:00
Code Issues Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
Christian Koop 2022-03-18 21:09:52 +01:00
parent 23bd964898
commit f4f8540aec
No known key found for this signature in database
GPG Key ID: 89A8181384E010A3
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
UltimateTimber/Plugin/src/com/songoda/ultimatetimber/manager/TreeDefinitionManager.java
View File

@ -24,7 +24,11 @@ import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.inventory.meta.ItemMeta;
import java.util.*; import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Random;
import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
public class TreeDefinitionManager extends Manager { public class TreeDefinitionManager extends Manager {
@ -264,6 +268,7 @@ public class TreeDefinitionManager extends Manager {
* Gets a Set of possible TreeDefinitions that match the given Block * Gets a Set of possible TreeDefinitions that match the given Block
* *
* @param block The Block to check * @param block The Block to check
*
* @return A Set of TreeDefinitions for the given Block * @return A Set of TreeDefinitions for the given Block
*/ */
public Set<TreeDefinition> getTreeDefinitionsForLog(Block block) { public Set<TreeDefinition> getTreeDefinitionsForLog(Block block) {
@ -276,6 +281,7 @@ public class TreeDefinitionManager extends Manager {
* @param possibleTreeDefinitions The possible TreeDefinitions * @param possibleTreeDefinitions The possible TreeDefinitions
* @param block The Block to narrow to * @param block The Block to narrow to
* @param treeBlockType The TreeBlockType of the given Block * @param treeBlockType The TreeBlockType of the given Block
*
* @return A Set of TreeDefinitions narrowed down * @return A Set of TreeDefinitions narrowed down
*/ */
public Set<TreeDefinition> narrowTreeDefinition(Set<TreeDefinition> possibleTreeDefinitions, Block block, TreeBlockType treeBlockType) { public Set<TreeDefinition> narrowTreeDefinition(Set<TreeDefinition> possibleTreeDefinitions, Block block, TreeBlockType treeBlockType) {
@ -310,6 +316,7 @@ public class TreeDefinitionManager extends Manager {
* Checks if a given tool is valid for any tree definitions, also takes into account global tools * Checks if a given tool is valid for any tree definitions, also takes into account global tools
* *
* @param tool The tool to check * @param tool The tool to check
*
* @return True if the tool is allowed for toppling any trees * @return True if the tool is allowed for toppling any trees
*/ */
public boolean isToolValidForAnyTreeDefinition(ItemStack tool) { public boolean isToolValidForAnyTreeDefinition(ItemStack tool) {
@ -341,6 +348,7 @@ public class TreeDefinitionManager extends Manager {
* *
* @param treeDefinition The TreeDefinition to use * @param treeDefinition The TreeDefinition to use
* @param tool The tool to check * @param tool The tool to check
*
* @return True if the tool is allowed for toppling the given TreeDefinition * @return True if the tool is allowed for toppling the given TreeDefinition
*/ */
public boolean isToolValidForTreeDefinition(TreeDefinition treeDefinition, ItemStack tool) { public boolean isToolValidForTreeDefinition(TreeDefinition treeDefinition, ItemStack tool) {
@ -386,7 +394,7 @@ public class TreeDefinitionManager extends Manager {
} else { } else {
if (ConfigurationManager.Setting.APPLY_SILK_TOUCH.getBoolean() && hasSilkTouch) { if (ConfigurationManager.Setting.APPLY_SILK_TOUCH.getBoolean() && hasSilkTouch) {
if (ConfigurationManager.Setting.HOOKS_APPLY_EXTRA_DROPS.getBoolean() if (ConfigurationManager.Setting.HOOKS_APPLY_EXTRA_DROPS.getBoolean()
&& McMMOHook.hasWoodcuttingDoubleDrops(player)) && McMMOHook.hasWoodcuttingDoubleDrops(player))
lootedItems.addAll(BlockUtils.getBlockDrops(treeBlock)); lootedItems.addAll(BlockUtils.getBlockDrops(treeBlock));
lootedItems.addAll(BlockUtils.getBlockDrops(treeBlock)); lootedItems.addAll(BlockUtils.getBlockDrops(treeBlock));
} else { } else {
@ -396,7 +404,7 @@ public class TreeDefinitionManager extends Manager {
toTry.addAll(this.globalLogLoot); toTry.addAll(this.globalLogLoot);
if (treeDefinition.shouldDropOriginalLog()) { if (treeDefinition.shouldDropOriginalLog()) {
if (ConfigurationManager.Setting.HOOKS_APPLY_EXTRA_DROPS.getBoolean() if (ConfigurationManager.Setting.HOOKS_APPLY_EXTRA_DROPS.getBoolean()
&& McMMOHook.hasWoodcuttingDoubleDrops(player)) && McMMOHook.hasWoodcuttingDoubleDrops(player))
lootedItems.addAll(BlockUtils.getBlockDrops(treeBlock)); lootedItems.addAll(BlockUtils.getBlockDrops(treeBlock));
lootedItems.addAll(BlockUtils.getBlockDrops(treeBlock)); lootedItems.addAll(BlockUtils.getBlockDrops(treeBlock));
} }
@ -406,7 +414,7 @@ public class TreeDefinitionManager extends Manager {
toTry.addAll(this.globalLeafLoot); toTry.addAll(this.globalLeafLoot);
if (treeDefinition.shouldDropOriginalLeaf()) { if (treeDefinition.shouldDropOriginalLeaf()) {
if (ConfigurationManager.Setting.HOOKS_APPLY_EXTRA_DROPS.getBoolean() if (ConfigurationManager.Setting.HOOKS_APPLY_EXTRA_DROPS.getBoolean()
&& McMMOHook.hasWoodcuttingDoubleDrops(player)) && McMMOHook.hasWoodcuttingDoubleDrops(player))
lootedItems.addAll(BlockUtils.getBlockDrops(treeBlock)); lootedItems.addAll(BlockUtils.getBlockDrops(treeBlock));
lootedItems.addAll(BlockUtils.getBlockDrops(treeBlock)); lootedItems.addAll(BlockUtils.getBlockDrops(treeBlock));
} }
@ -425,14 +433,14 @@ public class TreeDefinitionManager extends Manager {
if (treeLoot.hasItem()) { if (treeLoot.hasItem()) {
if (ConfigurationManager.Setting.HOOKS_APPLY_EXTRA_DROPS.getBoolean() if (ConfigurationManager.Setting.HOOKS_APPLY_EXTRA_DROPS.getBoolean()
&& McMMOHook.hasWoodcuttingDoubleDrops(player)) && McMMOHook.hasWoodcuttingDoubleDrops(player))
lootedItems.add(treeLoot.getItem()); lootedItems.add(treeLoot.getItem());
lootedItems.add(treeLoot.getItem()); lootedItems.add(treeLoot.getItem());
} }
if (treeLoot.hasCommand()) { if (treeLoot.hasCommand()) {
if (ConfigurationManager.Setting.HOOKS_APPLY_EXTRA_DROPS.getBoolean() if (ConfigurationManager.Setting.HOOKS_APPLY_EXTRA_DROPS.getBoolean()
&& McMMOHook.hasWoodcuttingDoubleDrops(player)) && McMMOHook.hasWoodcuttingDoubleDrops(player))
lootedCommands.add(treeLoot.getCommand()); lootedCommands.add(treeLoot.getCommand());
lootedCommands.add(treeLoot.getCommand()); lootedCommands.add(treeLoot.getCommand());
} }
@ -466,6 +474,7 @@ public class TreeDefinitionManager extends Manager {
* Gets all possible plantable soil blocks for the given tree definition * Gets all possible plantable soil blocks for the given tree definition
* *
* @param treeDefinition The TreeDefinition * @param treeDefinition The TreeDefinition
*
* @return A Set of IBlockData of plantable soil * @return A Set of IBlockData of plantable soil
*/ */
public Set<CompatibleMaterial> getPlantableSoilMaterial(TreeDefinition treeDefinition) { public Set<CompatibleMaterial> getPlantableSoilMaterial(TreeDefinition treeDefinition) {
@ -480,6 +489,7 @@ public class TreeDefinitionManager extends Manager {
* *
* @param treeBlockType The TreeBlockType to use * @param treeBlockType The TreeBlockType to use
* @param configurationSection The ConfigurationSection * @param configurationSection The ConfigurationSection
*
* @return A TreeLoot entry from the section * @return A TreeLoot entry from the section
*/ */
private TreeLoot getTreeLootEntry(TreeBlockType treeBlockType, ConfigurationSection configurationSection) { private TreeLoot getTreeLootEntry(TreeBlockType treeBlockType, ConfigurationSection configurationSection) {