Fix up farmer behaviors

src/main/java/de/ellpeck/actuallyadditions/api/farmer/FarmerResult.java

@@ -10,8 +10,24 @@
 
 package de.ellpeck.actuallyadditions.api.farmer;
 
+/**
+ * Return values for IFarmerBehavior, each one has a different meaning in harvest and planting contexts.
+ *
+ */
 public enum FarmerResult {
+
+    /**
+     * Indicates that your behavior failed to perform the action it attempted.
+     */
     FAIL,
+
+    /**
+     * Indicates that your behavior succeeded doing the action it attempted.  For harvesting, this also shrinks the current stack by one, and stops processing.
+     */
     SUCCESS,
+
+    /**
+     * Indicates you want the farmer to halt all further actions this tick.  This will exit the farmer behavior loop if returned.
+     */
     STOP_PROCESSING
 }

src/main/java/de/ellpeck/actuallyadditions/api/farmer/IFarmerBehavior.java

@@ -42,5 +42,7 @@ public interface IFarmerBehavior{
 
     int getPriority();
 
-    default Integer getPrioInt() { return getPriority(); }
+    default Integer getPrioInt() {
+        return getPriority();
+    }
 }

src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/farmer/CactusFarmerBehavior.java

@@ -41,7 +41,7 @@ public class CactusFarmerBehavior implements IFarmerBehavior{
                         farmer.extractEnergy(use);
                         return FarmerResult.SUCCESS;
                     }
-                    return FarmerResult.STOP_PROCESSING;
+                    return FarmerResult.FAIL;
                 }
             }
         }

src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/farmer/DefaultFarmerBehavior.java

@@ -74,7 +74,7 @@ public class DefaultFarmerBehavior implements IFarmerBehavior {
     public FarmerResult tryPlantSeed(ItemStack seed, World world, BlockPos pos, IFarmer farmer) {
         int use = 350;
         if (farmer.getEnergy() >= use * 2) {
-            if (defaultPlant(world, pos, this.getPlantablePlantFromStack(seed, world, pos), farmer, use)) { return FarmerResult.SUCCESS; }
+            if (defaultPlant(world, pos, this.getPlantablePlantFromStack(seed, world, pos), farmer, use)) return FarmerResult.SUCCESS;
         }
         return FarmerResult.FAIL;
     }

src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/farmer/MelonPumpkinFarmerBehavior.java

@@ -36,13 +36,11 @@ public class MelonPumpkinFarmerBehavior implements IFarmerBehavior{
                 if (isPumpkin || seedItem == Items.MELON_SEEDS) {
                     if ((pos.getX() % 2 == 0) == (pos.getZ() % 2 == 0)) {
                         IBlockState toPlant = (isPumpkin ? Blocks.PUMPKIN_STEM : Blocks.MELON_STEM).getDefaultState();
-
+                        if (DefaultFarmerBehavior.defaultPlant(world, pos, toPlant, farmer, use)) return FarmerResult.SUCCESS;
-                        if(DefaultFarmerBehavior.defaultPlant(world, pos, toPlant, farmer, use)){
-                            return FarmerResult.SUCCESS;
-                        }
                     }
                     return FarmerResult.STOP_PROCESSING;
                 }
+                return FarmerResult.FAIL;
             }
         }
         return FarmerResult.FAIL;

src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/farmer/NetherWartFarmerBehavior.java

@@ -37,7 +37,7 @@ public class NetherWartFarmerBehavior implements IFarmerBehavior{
                     farmer.extractEnergy(use);
                     return FarmerResult.SUCCESS;
                 }
-                return FarmerResult.STOP_PROCESSING;
+                return FarmerResult.FAIL;
             }
         }
         return FarmerResult.FAIL;
@@ -70,7 +70,7 @@ public class NetherWartFarmerBehavior implements IFarmerBehavior{
                         }
                     }
                 }
-                return FarmerResult.STOP_PROCESSING;
+                return FarmerResult.FAIL;
             }
         }
         return FarmerResult.FAIL;

src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/farmer/ReedFarmerBehavior.java

@@ -65,7 +65,7 @@ public class ReedFarmerBehavior implements IFarmerBehavior{
                                     farmer.extractEnergy(use);
                                     farmer.addToOutput(drops);
 
-                                    result = FarmerResult.STOP_PROCESSING; //Success no longer makes it not replant, and the plant logic seems sketchy right after harvesting.  This works tho.
+                                    result = FarmerResult.STOP_PROCESSING;
                                 }
                             }
                         }

src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFarmer.java

@@ -127,7 +127,10 @@ public class TileEntityFarmer extends TileEntityInventoryBase implements IFarmer
                 IBlockState state = world.getBlockState(query);
                 if (StackUtil.isValid(stack) && state.getBlock().isReplaceable(world, query)) {
                     FarmerResult plantResult = behavior.tryPlantSeed(stack, this.world, query, this);
-                    if (plantResult == FarmerResult.SUCCESS) this.inv.getStackInSlot(i).shrink(1);
+                    if (plantResult == FarmerResult.SUCCESS) {
+                        this.inv.getStackInSlot(i).shrink(1);
+                        return;
+                    } else if (plantResult == FarmerResult.STOP_PROCESSING) return;
                 }
             }