Upstream/UltimateTimber
1
0
Fork 0
mirror of https://github.com/songoda/UltimateTimber.git synced 2024-12-02 23:03:37 +01:00
Code Issues Projects Releases Wiki Activity

Fixed tree setting issues. Improved the tree audio experience

Browse Source
This commit is contained in:
Esophose 2019-03-30 16:25:04 -06:00
parent d00668bfbb
commit 120cb29c3b
4 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
UltimateTimber-Adapter/Current/src/main/java/com.songoda.ultimatetimber.adapter.current/CurrentAdapter.java
View File

@ -123,13 +123,17 @@ public class CurrentAdapter implements VersionAdapter {
@Override @Override
public void playFallingSound(ITreeBlock treeBlock) { public void playFallingSound(ITreeBlock treeBlock) {
Location location = treeBlock.getLocation(); Location location = treeBlock.getLocation();
location.getWorld().playSound(location, Sound.BLOCK_CHEST_OPEN, 3F, 0.1F); location.getWorld().playSound(location, Sound.BLOCK_CHEST_OPEN, 2F, 0.1F);
} }
@Override @Override
public void playLandingSound(ITreeBlock treeBlock) { public void playLandingSound(ITreeBlock treeBlock) {
Location location = treeBlock.getLocation(); Location location = treeBlock.getLocation();
location.getWorld().playSound(location, Sound.BLOCK_WOOD_FALL, 3F, 0.1F); if (treeBlock.getTreeBlockType().equals(TreeBlockType.LOG)) {
location.getWorld().playSound(location, Sound.BLOCK_WOOD_FALL, 2F, 0.1F);
} else {
location.getWorld().playSound(location, Sound.BLOCK_GRASS_BREAK, 0.5F, 0.75F);
}
} }
} }

8
UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/animation/TreeAnimationDisintegrate.java
View File

@ -4,10 +4,7 @@ import com.songoda.ultimatetimber.UltimateTimber;
import com.songoda.ultimatetimber.adapter.VersionAdapter; import com.songoda.ultimatetimber.adapter.VersionAdapter;
import com.songoda.ultimatetimber.manager.ConfigurationManager; import com.songoda.ultimatetimber.manager.ConfigurationManager;
import com.songoda.ultimatetimber.manager.TreeDefinitionManager; import com.songoda.ultimatetimber.manager.TreeDefinitionManager;
import com.songoda.ultimatetimber.tree.DetectedTree; import com.songoda.ultimatetimber.tree.*;
import com.songoda.ultimatetimber.tree.ITreeBlock;
import com.songoda.ultimatetimber.tree.TreeBlockSet;
import com.songoda.ultimatetimber.tree.TreeDefinition;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -30,9 +27,6 @@ public class TreeAnimationDisintegrate extends TreeAnimation {
boolean useCustomSound = ConfigurationManager.Setting.USE_CUSTOM_SOUNDS.getBoolean(); boolean useCustomSound = ConfigurationManager.Setting.USE_CUSTOM_SOUNDS.getBoolean();
boolean useCustomParticles = ConfigurationManager.Setting.USE_CUSTOM_PARTICLES.getBoolean(); boolean useCustomParticles = ConfigurationManager.Setting.USE_CUSTOM_PARTICLES.getBoolean();
if (useCustomSound)
versionAdapter.playFallingSound(this.detectedTree.getDetectedTreeBlocks().getInitialLogBlock());
List<ITreeBlock<Block>> orderedLogBlocks = new ArrayList<>(this.detectedTree.getDetectedTreeBlocks().getLogBlocks()); List<ITreeBlock<Block>> orderedLogBlocks = new ArrayList<>(this.detectedTree.getDetectedTreeBlocks().getLogBlocks());
orderedLogBlocks.sort(Comparator.comparingInt(x -> x.getLocation().getBlockY())); orderedLogBlocks.sort(Comparator.comparingInt(x -> x.getLocation().getBlockY()));

10
UltimateTimber/Plugin/src/main/resources/config-current.yml
View File

@ -16,8 +16,8 @@ disabled-worlds:
- disabled_world_name - disabled_world_name
# The max number of logs that can be broken at one time # The max number of logs that can be broken at one time
# Default: 120 # Default: 150
max-logs-per-chop: 120 max-logs-per-chop: 150
# The minimum number of leaves required for something to be considered a tree # The minimum number of leaves required for something to be considered a tree
# Default: 5 # Default: 5
@ -202,10 +202,10 @@ trees:
- JUNGLE_WOOD - JUNGLE_WOOD
- STRIPPED_JUNGLE_WOOD - STRIPPED_JUNGLE_WOOD
leaves: leaves:
- SPRUCE_LEAVES - JUNGLE_LEAVES
sapling: SPRUCE_SAPLING sapling: JUNGLE_SAPLING
plantable-soil: [] plantable-soil: []
max-leaf-distance-from-log: 5 max-leaf-distance-from-log: 6
search-for-leaves-diagonally: false search-for-leaves-diagonally: false
drop-original-log: true drop-original-log: true
drop-original-leaf: false drop-original-leaf: false

6
UltimateTimber/Plugin/src/main/resources/config-legacy.yml
View File

@ -17,8 +17,8 @@ disabled-worlds:
- disabled_world_name - disabled_world_name
# The max number of logs that can be broken at one time # The max number of logs that can be broken at one time
# Default: 120 # Default: 150
max-logs-per-chop: 120 max-logs-per-chop: 150
# The minimum number of leaves required for something to be considered a tree # The minimum number of leaves required for something to be considered a tree
# Default: 5 # Default: 5
@ -217,7 +217,7 @@ trees:
- LEAVES:15 - LEAVES:15
sapling: SAPLING:3 sapling: SAPLING:3
plantable-soil: [] plantable-soil: []
max-leaf-distance-from-log: 5 max-leaf-distance-from-log: 6
search-for-leaves-diagonally: false search-for-leaves-diagonally: false
drop-original-log: true drop-original-log: true
drop-original-leaf: false drop-original-leaf: false