Upstream/UltimateTimber
1
0
Fork 0
mirror of https://github.com/songoda/UltimateTimber.git synced 2024-09-27 13:22:39 +02:00
Code Issues Projects Releases Wiki Activity

Better support for material data, fix default legacy config typos

Browse Source
This commit is contained in:
Esophose 2019-03-31 03:08:41 -06:00
parent 86dbb57ac2
commit d47ebbb64b
3 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
UltimateTimber-Adapter/Legacy/src/main/java/com.songoda.ultimatetimber.adapter.legacy/LegacyAdapter.java
View File

@ -67,16 +67,18 @@ public class LegacyAdapter implements VersionAdapter {
treeBlockData = new LegacyBlockData(fallingBlock.getMaterial(), data); treeBlockData = new LegacyBlockData(fallingBlock.getMaterial(), data);
} else return drops; } else return drops;
Set<IBlockData> typedBlockData = treeBlock.getTreeBlockType().equals(TreeBlockType.LOG) ? treeDefinition.getLogBlockData() : treeDefinition.getLeafBlockData();
IBlockData definitionBlockData = null; IBlockData definitionBlockData = null;
if (treeBlock.getTreeBlockType().equals(TreeBlockType.LOG)) { for (IBlockData blockData : typedBlockData) {
for (IBlockData blockData : treeDefinition.getLogBlockData()) { if (blockData.getMaterial().equals(treeBlockData.getMaterial()) && blockData.getData() == treeBlockData.getData()) {
if (blockData.getMaterial().equals(treeBlockData.getMaterial())) { definitionBlockData = blockData;
definitionBlockData = blockData; break;
break;
}
} }
} else { }
for (IBlockData blockData : treeDefinition.getLeafBlockData()) {
if (definitionBlockData == null) {
for (IBlockData blockData : typedBlockData) {
if (blockData.getMaterial().equals(treeBlockData.getMaterial())) { if (blockData.getMaterial().equals(treeBlockData.getMaterial())) {
definitionBlockData = blockData; definitionBlockData = blockData;
break; break;

7
UltimateTimber-Adapter/Legacy/src/main/java/com.songoda.ultimatetimber.adapter.legacy/LegacyBlockData.java
View File

@ -30,8 +30,12 @@ public class LegacyBlockData implements IBlockData {
@Override @Override
public boolean isSimilar(IBlockData otherBlockData) { public boolean isSimilar(IBlockData otherBlockData) {
if (this.data.size() == 1)
return this.material.equals(otherBlockData.getMaterial()) && this.getData() == otherBlockData.getData();
Material blockMaterial = otherBlockData.getMaterial(); Material blockMaterial = otherBlockData.getMaterial();
byte blockData = otherBlockData.getData(); byte blockData = otherBlockData.getData();
if (!this.material.equals(blockMaterial)) if (!this.material.equals(blockMaterial))
return false; return false;
for (byte value : this.data) for (byte value : this.data)
@ -42,6 +46,9 @@ public class LegacyBlockData implements IBlockData {
@Override @Override
public boolean isSimilar(Block block) { public boolean isSimilar(Block block) {
if (this.data.size() == 1)
return this.material.equals(block.getType()) && this.getData() == block.getData();
Material blockMaterial = block.getType(); Material blockMaterial = block.getType();
byte blockData = block.getData(); byte blockData = block.getData();
if (!this.material.equals(blockMaterial)) if (!this.material.equals(blockMaterial))

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

@ -222,9 +222,9 @@ trees:
required-tools: [] required-tools: []
dark_oak: dark_oak:
logs: logs:
- LOG:1,5,9,13 - LOG_2:1,5,9,13
leaves: leaves:
- LEAVES:1,5,9,13 - LEAVES_2:1,5,9,13
sapling: SAPLING:5 sapling: SAPLING:5
plantable-soil: [] plantable-soil: []
max-leaf-distance-from-log: 5 max-leaf-distance-from-log: 5
@ -248,7 +248,7 @@ trees:
sapling: BROWN_MUSHROOM sapling: BROWN_MUSHROOM
plantable-soil: plantable-soil:
- MYCEL - MYCEL
max-leaf-distance-from-log: 4 max-leaf-distance-from-log: 6
search-for-leaves-diagonally: false search-for-leaves-diagonally: false
drop-original-log: false drop-original-log: false
drop-original-leaf: false drop-original-leaf: false