azalea/baritone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change visibility of getImage, Switch BlockPos impl

Browse Source
This commit is contained in:
Howard Stark
2018-08-21 10:44:42 -07:00
parent c301ea5878
commit aa6f025ff0
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/baritone/map/MapChunk.java
+2 -5
View File
@@ -4,15 +4,12 @@ import baritone.bot.Baritone;
import baritone.bot.utils.BlockStateInterface; import baritone.bot.utils.BlockStateInterface;
import baritone.bot.utils.pathing.BetterBlockPos; import baritone.bot.utils.pathing.BetterBlockPos;
import net.minecraft.block.material.MapColor; import net.minecraft.block.material.MapColor;
import net.minecraft.init.Blocks;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.BlockPos.MutableBlockPos; import net.minecraft.util.math.BlockPos.MutableBlockPos;
import net.minecraft.world.chunk.Chunk; import net.minecraft.world.chunk.Chunk;
import org.lwjgl.util.Color;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import java.awt.*;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
@@ -67,10 +64,10 @@ public class MapChunk {
* @param z relative z coord. * @param z relative z coord.
* @return Integer RGB value with contextual shading * @return Integer RGB value with contextual shading
*/ */
public int getColor(int x, int z) { private int getColor(int x, int z) {
int chunkX = chunk.getPos().getXStart() + x; int chunkX = chunk.getPos().getXStart() + x;
int chunkZ = chunk.getPos().getZStart() + z; int chunkZ = chunk.getPos().getZStart() + z;
MutableBlockPos blockPos = new MutableBlockPos(chunkX, chunk.getHeight(new BetterBlockPos(chunkX, 0, chunkZ)), chunkZ); BetterBlockPos blockPos = new BetterBlockPos(chunkX, chunk.getHeight(new BetterBlockPos(chunkX, 0, chunkZ)), chunkZ);
MapColor color = BlockStateInterface.get(blockPos).getMapColor(chunk.getWorld(), blockPos); MapColor color = BlockStateInterface.get(blockPos).getMapColor(chunk.getWorld(), blockPos);
// The chunk heightMap returns the first non-full block above the surface, including bushes. // The chunk heightMap returns the first non-full block above the surface, including bushes.