RepoMirrors
/
baritone
mirror of https://github.com/cabaletta/baritone
1
0
Fork 1
Code Issues Releases Wiki Activity

Merge pull request #310 from babbaj/builder 

make code easy to understand
This commit is contained in:
Leijurv 2019-01-11 10:00:43 -08:00
parent 863ae447b9 a965859095
commit 56d109bf0a
No known key found for this signature in database
GPG Key ID: 44A3EA646EADAC6A
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/baritone/utils/MapArtSchematic.java
View File

@ -17,6 +17,8 @@
package baritone.utils; package baritone.utils;
import java.util.OptionalInt;
import java.util.function.Predicate;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
@ -27,23 +29,33 @@ public class MapArtSchematic extends Schematic {
public MapArtSchematic(NBTTagCompound schematic) { public MapArtSchematic(NBTTagCompound schematic) {
super(schematic); super(schematic);
heightMap = new int[widthX][lengthZ]; heightMap = new int[widthX][lengthZ];
for (int x = 0; x < widthX; x++) { for (int x = 0; x < widthX; x++) {
https:
for (int z = 0; z < lengthZ; z++) { for (int z = 0; z < lengthZ; z++) {
IBlockState[] column = states[x][z]; IBlockState[] column = states[x][z];
for (int y = heightY - 1; y >= 0; y--) {
if (column[y].getBlock() != Blocks.AIR) { OptionalInt lowestBlockY = getLowest(column, block -> block != Blocks.AIR);
heightMap[x][z] = y; if (lowestBlockY.isPresent()) {
continue https; heightMap[x][z] = lowestBlockY.getAsInt();
} } else {
System.out.println("Column " + x + "," + z + " has no blocks, but it's apparently map art? wtf");
System.out.println("Letting it be whatever");
heightMap[x][z] = 256;
} }
System.out.println("Column " + x + "," + z + " has no blocks, but it's apparently map art? wtf");
System.out.println("Letting it be whatever");
heightMap[x][z] = 256;
} }
} }
} }
private static <T> OptionalInt getLowest(T[] arr, Predicate<T> predicate) {
for (int y = arr.length - 1; y >= 0; y--) {
if (predicate.test(arr[y])) {
return OptionalInt.of(y);
}
}
return OptionalInt.empty();
}
@Override @Override
public boolean inSchematic(int x, int y, int z) { public boolean inSchematic(int x, int y, int z) {
// in map art, we only care about coordinates in or above the art // in map art, we only care about coordinates in or above the art