Updated to 1.11.2 API version

Does not mean the added functions are implemented in the prior versions, but it means they all compile against the same API and ZS version
This commit is contained in:
kindlich committed 2019-10-20 18:00:11 +02:00
1 parent 0f74091da5
commit 1c0344a25b
140 files changed
+6307 -6387

No files matched your search

@@ -1,68 +1,62 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package minetweaker.api.block;
import java.util.ArrayList;
import java.util.List;
import minetweaker.util.ArrayUtil;
import java.util.*;
/**
*
* @author Stan
*/
public class BlockPatternOr implements IBlockPattern {
private final IBlockPattern[] elements;
public BlockPatternOr(IBlockPattern[] elements) {
this.elements = elements;
}
private final IBlockPattern[] elements;
public BlockPatternOr(IBlockPattern a, IBlockPattern b) {
this.elements = new IBlockPattern[] { a, b };
}
public BlockPatternOr(IBlockPattern[] elements) {
this.elements = elements;
}
@Override
public List<IBlock> getBlocks() {
List<IBlock> blocks = new ArrayList<IBlock>();
for (IBlockPattern pattern : elements) {
blocks.addAll(pattern.getBlocks());
}
return blocks;
}
public BlockPatternOr(IBlockPattern a, IBlockPattern b) {
this.elements = new IBlockPattern[]{a, b};
}
@Override
public boolean matches(IBlock block) {
for (IBlockPattern pattern : elements) {
if (pattern.matches(block))
return true;
}
@Override
public List<IBlock> getBlocks() {
List<IBlock> blocks = new ArrayList<>();
for(IBlockPattern pattern : elements) {
blocks.addAll(pattern.getBlocks());
}
return blocks;
}
return false;
}
@Override
public boolean matches(IBlock block) {
for(IBlockPattern pattern : elements) {
if(pattern.matches(block))
return true;
}
@Override
public String getDisplayName() {
StringBuilder result = new StringBuilder();
boolean first = true;
for (IBlockPattern pattern : elements) {
if (first) {
first = false;
} else {
result.append(" | ");
}
return false;
}
result.append(pattern.getDisplayName());
}
@Override
public String getDisplayName() {
StringBuilder result = new StringBuilder();
boolean first = true;
for(IBlockPattern pattern : elements) {
if(first) {
first = false;
} else {
result.append(" | ");
}
return result.toString();
}
result.append(pattern.getDisplayName());
}
@Override
public IBlockPattern or(IBlockPattern pattern) {
return new BlockPatternOr(ArrayUtil.append(elements, pattern));
}
return result.toString();
}
@Override
public IBlockPattern or(IBlockPattern pattern) {
return new BlockPatternOr(ArrayUtil.append(elements, pattern));
}
}