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

Make replantCrops override replantNetherWart

Browse Source 
When replantCrops is false, baritone will not replant nether wart.
Also fixed spacing.
This commit is contained in:
Orinion 2019-08-29 10:36:31 +02:00
parent d2a046c8b4
commit 65a9b1a78a
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/java/baritone/api/Settings.java
View File

@ -662,7 +662,7 @@ public final class Settings {
public final Setting<Boolean> replantCrops = new Setting<>(true); public final Setting<Boolean> replantCrops = new Setting<>(true);
/** /**
* Replant nether wart while farming * Replant nether wart while farming. This setting only has an effect when replantCrops is also enabled
*/ */
public final Setting<Boolean> replantNetherWart = new Setting<>(false); public final Setting<Boolean> replantNetherWart = new Setting<>(false);

13
src/main/java/baritone/process/FarmProcess.java
View File

@ -112,16 +112,18 @@ public final class FarmProcess extends BaritoneProcessHelper implements IFarmPro
SUGARCANE(Blocks.REEDS, null) { SUGARCANE(Blocks.REEDS, null) {
@Override @Override
public boolean readyToHarvest(World world, BlockPos pos, IBlockState state) { public boolean readyToHarvest(World world, BlockPos pos, IBlockState state) {
if(Baritone.settings().replantCrops.value) if (Baritone.settings().replantCrops.value) {
return world.getBlockState(pos.down()).getBlock() instanceof BlockReed; return world.getBlockState(pos.down()).getBlock() instanceof BlockReed;
}
return true; return true;
} }
}, },
CACTUS(Blocks.CACTUS, null) { CACTUS(Blocks.CACTUS, null) {
@Override @Override
public boolean readyToHarvest(World world, BlockPos pos, IBlockState state) { public boolean readyToHarvest(World world, BlockPos pos, IBlockState state) {
if(Baritone.settings().replantCrops.value) if (Baritone.settings().replantCrops.value) {
return world.getBlockState(pos.down()).getBlock() instanceof BlockCactus; return world.getBlockState(pos.down()).getBlock() instanceof BlockCactus;
}
return true; return true;
} }
}; };
@ -172,10 +174,11 @@ public final class FarmProcess extends BaritoneProcessHelper implements IFarmPro
} }
if (Baritone.settings().replantCrops.value) { if (Baritone.settings().replantCrops.value) {
scan.add(Blocks.FARMLAND); scan.add(Blocks.FARMLAND);
if (Baritone.settings().replantNetherWart.value) {
scan.add(Blocks.SOUL_SAND);
}
} }
if (Baritone.settings().replantNetherWart.value) {
scan.add(Blocks.SOUL_SAND);
}
if (Baritone.settings().mineGoalUpdateInterval.value != 0 && tickCount++ % Baritone.settings().mineGoalUpdateInterval.value == 0) { if (Baritone.settings().mineGoalUpdateInterval.value != 0 && tickCount++ % Baritone.settings().mineGoalUpdateInterval.value == 0) {
Baritone.getExecutor().execute(() -> locations = WorldScanner.INSTANCE.scanChunkRadius(ctx, scan, 256, 10, 10)); Baritone.getExecutor().execute(() -> locations = WorldScanner.INSTANCE.scanChunkRadius(ctx, scan, 256, 10, 10));
} }