feat: Finish Farming Station (#1209)

Author: dphaldes

enderio/src/datagen/java/com/enderio/enderio/datagen/common/loot/EIOBlockLootProvider.java

@@ -28,7 +28,7 @@
 
 public class EIOBlockLootProvider extends BlockLootSubProvider {
     public EIOBlockLootProvider(HolderLookup.Provider registries) {
-        super(Set.of(), FeatureFlagSet.of(FeatureFlags.VANILLA, EIOFeatureFlags.ENDERFACE, EIOFeatureFlags.NIARD, EIOFeatureFlags.FARMING_STATION), registries);
+        super(Set.of(), FeatureFlagSet.of(FeatureFlags.VANILLA, EIOFeatureFlags.ENDERFACE, EIOFeatureFlags.NIARD), registries);
     }
 
     @Override

enderio/src/datagen/java/com/enderio/enderio/datagen/common/recipes/MachineRecipeProvider.java

@@ -517,6 +517,19 @@ public void buildRecipes(RecipeOutput recipeOutput, HolderLookup.Provider regist
                 InventoryChangeTrigger.TriggerInstance.hasItems(EIOItems.ZOMBIE_ELECTRODE.get()))
             .save(recipeOutput);
 
+        ShapedRecipeBuilder.shaped(RecipeCategory.MISC, EIOBlocks.FARMING_STATION.get())
+            .define('E', EIOTags.Items.GEARS_ENERGIZED)
+            .define('G', EIOTags.Items.GEMS_PULSATING_CRYSTAL)
+            .define('S', EIOTags.Items.INGOTS_SOULARIUM)
+            .define('C', EIOBlocks.ENSOULED_CHASSIS.get())
+            .define('D', EIOTags.Items.INGOTS_DARK_STEEL)
+            .define('Z', EIOItems.Z_LOGIC_CONTROLLER.get())
+            .pattern("EGE")
+            .pattern("SCS")
+            .pattern("DZD")
+            .unlockedBy("has_ingredient", InventoryChangeTrigger.TriggerInstance.hasItems(EIOItems.SOULARIUM_INGOT))
+            .save(recipeOutput);
+
         // TODO: Enable once the block detector has a model.
         /*
          * ShapedRecipeBuilder .shaped(RecipeCategory.MISC,
@@ -558,6 +571,7 @@ public void buildRecipes(RecipeOutput recipeOutput, HolderLookup.Provider regist
         list.add(EIOBlocks.VACUUM_CHEST);
         list.add(EIOBlocks.TRAVEL_ANCHOR);
         list.add(EIOBlocks.WIRELESS_CHARGER);
+        list.add(EIOBlocks.FARMING_STATION);
         return list;
     });
 

enderio/src/datagen/java/com/enderio/enderio/datagen/common/tags/EIOBlockTagsProvider.java

@@ -251,6 +251,10 @@ protected void addTags(HolderLookup.Provider provider) {
             .add(EIOBlocks.SILENT_DARK_STEEL_PRESSURE_PLATE.get())
             .add(EIOBlocks.SOULARIUM_PRESSURE_PLATE.get())
             .add(EIOBlocks.SILENT_SOULARIUM_PRESSURE_PLATE.get());
+
+        tag(EIOTags.Blocks.CROPS_WITH_STEM)
+            .add(Blocks.MELON)
+            .add(Blocks.PUMPKIN);
     }
 
     private void addMachineBlockTags() {

enderio/src/generated/resources/data/enderio/advancement/recipes/misc/erase_farming_station.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_ingredient": {
+      "conditions": {
+        "items": [
+          {
+            "items": "enderio:farming_station"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "enderio:erase_farming_station"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_ingredient"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "enderio:erase_farming_station"
+    ]
+  }
+}

enderio/src/generated/resources/data/enderio/advancement/recipes/misc/farming_station.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_ingredient": {
+      "conditions": {
+        "items": [
+          {
+            "items": "enderio:soularium_ingot"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "enderio:farming_station"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_ingredient"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "enderio:farming_station"
+    ]
+  }
+}

enderio/src/generated/resources/data/enderio/recipe/erase_farming_station.json

@@ -0,0 +1,13 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "category": "misc",
+  "ingredients": [
+    {
+      "item": "enderio:farming_station"
+    }
+  ],
+  "result": {
+    "count": 1,
+    "id": "enderio:farming_station"
+  }
+}

enderio/src/generated/resources/data/enderio/recipe/farming_station.json

@@ -0,0 +1,33 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "misc",
+  "key": {
+    "C": {
+      "item": "enderio:ensouled_chassis"
+    },
+    "D": {
+      "tag": "c:ingots/dark_steel"
+    },
+    "E": {
+      "tag": "c:gears/energized"
+    },
+    "G": {
+      "tag": "c:gems/pulsating_crystal"
+    },
+    "S": {
+      "tag": "c:ingots/soularium"
+    },
+    "Z": {
+      "item": "enderio:z_logic_controller"
+    }
+  },
+  "pattern": [
+    "EGE",
+    "SCS",
+    "DZD"
+  ],
+  "result": {
+    "count": 1,
+    "id": "enderio:farming_station"
+  }
+}

enderio/src/generated/resources/data/enderio/tags/block/stem_crop.json

@@ -0,0 +1,6 @@
+{
+  "values": [
+    "minecraft:melon",
+    "minecraft:pumpkin"
+  ]
+}

enderio/src/main/java/com/enderio/enderio/api/farm/FarmInteraction.java

@@ -4,5 +4,5 @@
 
 @ApiStatus.Experimental
 public enum FarmInteraction {
-    FINISHED, POWERED, BLOCKED, IGNORED
+    FINISHED, BLOCKED, IGNORED
 }

enderio/src/main/java/com/enderio/enderio/api/farm/FarmTask.java

@@ -1,10 +1,12 @@
 package com.enderio.enderio.api.farm;
 
 import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.block.entity.BlockEntity;
 import org.jetbrains.annotations.ApiStatus;
 
 @ApiStatus.Experimental
 public interface FarmTask {
 
-    FarmInteraction farm(BlockPos soil, FarmingStation farmBlockEntity);
+    <T extends BlockEntity & FarmingMachine>
+    FarmInteraction process(BlockPos targetBlock, T blockEntity);
 }