Fix #580, Fix #1479 Add a way to register items to work as fertilizer in farms in a config

This commit is contained in:
Nedelosk committed 2016-12-22 02:47:00 +01:00
1 parent d392666dc4
commit d4c2d7220d
12 files changed
+119 -30

No files matched your search

@@ -633,7 +633,7 @@ public class FarmController extends RectangularMultiblockControllerBase implemen
for (FarmTarget target : farmTargets) {
// Check fertilizer and water
if (!fertilizerManager.hasFertilizer(fertilizerConsumption)) {
if (!fertilizerManager.hasFertilizer(inventory, fertilizerConsumption)) {
farmWorkStatus.hasFertilizer = false;
continue;
}
@@ -645,7 +645,7 @@ public class FarmController extends RectangularMultiblockControllerBase implemen
if (cultivateTarget(worldObj, this, target, logic, farmListeners)) {
// Remove fertilizer and water
fertilizerManager.removeFertilizer(fertilizerConsumption);
fertilizerManager.removeFertilizer(inventory, fertilizerConsumption);
removeLiquid(liquid);
farmWorkStatus.didWork = true;
@@ -729,7 +729,7 @@ public class FarmController extends RectangularMultiblockControllerBase implemen
IErrorLogic errorLogic = getErrorLogic();
// Check fertilizer
Boolean hasFertilizer = fertilizerManager.hasFertilizer(fertilizerConsumption);
Boolean hasFertilizer = fertilizerManager.hasFertilizer(inventory, fertilizerConsumption);
if (errorLogic.setCondition(!hasFertilizer, EnumErrorCode.NO_FERTILIZER)) {
return false;
}
@@ -750,7 +750,7 @@ public class FarmController extends RectangularMultiblockControllerBase implemen
}
// Remove fertilizer and water
fertilizerManager.removeFertilizer(fertilizerConsumption);
fertilizerManager.removeFertilizer(inventory, fertilizerConsumption);
removeLiquid(requiredLiquid);
// Let event handlers handle the harvest first.
@@ -765,7 +765,7 @@ public class FarmController extends RectangularMultiblockControllerBase implemen
@Override
public int getStoredFertilizerScaled(int scale) {
return fertilizerManager.getStoredFertilizerScaled(scale);
return fertilizerManager.getStoredFertilizerScaled(inventory, scale);
}
@Override