This commit is contained in:
Leijurv 2018-08-01 14:13:38 -04:00
parent 119b1b3aca
commit 3a6178513b
No known key found for this signature in database
GPG Key ID: 0936202430AE187C
4 changed files with 11 additions and 9 deletions

2
.gitignore vendored
View File

@ -1,6 +1,8 @@
.DS_Store
**/*.swp
/run
# Gradle
/build/
.gradle/

View File

@ -31,6 +31,7 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.entity.EntityPlayerSP;
import net.minecraft.entity.Entity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.world.World;
/**
@ -380,12 +381,11 @@ public class Baritone {
* @return the position of it
*/
public static BlockPos whatAreYouLookingAt() {
/*Minecraft mc = Minecraft.getMinecraft();
Minecraft mc = Minecraft.getMinecraft();
if (mc.objectMouseOver != null && mc.objectMouseOver.typeOfHit == RayTraceResult.Type.BLOCK) {
return mc.objectMouseOver.getBlockPos();
}
return null;*/
throw new UnsupportedOperationException("need to figure out what RayTraceResult is in 1.12.2");
return null;
}
public static void switchToBestTool() {
@ -409,12 +409,11 @@ public class Baritone {
}
public static Entity whatEntityAreYouLookingAt() {
/*Minecraft mc = Minecraft.getMinecraft();
Minecraft mc = Minecraft.getMinecraft();
if (mc.objectMouseOver != null && mc.objectMouseOver.typeOfHit == RayTraceResult.Type.ENTITY) {
return mc.objectMouseOver.entityHit;
}*/
throw new UnsupportedOperationException("need to figure out what RayTraceResult is in 1.12.2");
//return null;
}
return null;
}
public static List<String> getDebugGui() {

View File

@ -125,7 +125,7 @@ public abstract class Action {
Block b = state.getBlock();
Material m = b.getMaterial(state);
if (b instanceof BlockLiquid) {
throw new UnsupportedOperationException("TODO");
System.out.println("Need to fix get flow check!!!");
//return BlockLiquid.getFlow(Minecraft.getMinecraft().world, pos, state) != -1000.0D;
}
return false;

View File

@ -23,6 +23,7 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.entity.EntityPlayerSP;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.chunk.EmptyChunk;
@ -343,7 +344,7 @@ public class Memory extends Manager {
public static final int SCAN_DIST = 50;
public static void scanBlock(BlockPos pos) {
Block block = Baritone.get(pos).getBlock();
if (air.equals(block)) {
if (Blocks.AIR.equals(block)) {
return;
}
BlockMemory memory = getMemory(block);