From 3ed2ecfdd06edf6ededc16750b8c4a59675d2e7e Mon Sep 17 00:00:00 2001 From: leumasme Date: Sun, 3 Mar 2024 20:18:52 +0100 Subject: [PATCH] Fix multifarm not harvesting coffee and tea Also fixes fermenter recipes for these crops --- .../forestry/plugins/compat/PluginHarvestCraft.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/forestry/plugins/compat/PluginHarvestCraft.java b/src/main/java/forestry/plugins/compat/PluginHarvestCraft.java index ab8c10276..5496a6582 100644 --- a/src/main/java/forestry/plugins/compat/PluginHarvestCraft.java +++ b/src/main/java/forestry/plugins/compat/PluginHarvestCraft.java @@ -148,7 +148,7 @@ public class PluginHarvestCraft extends ForestryPlugin { ); ImmutableList.Builder genericCropsBuilder = ImmutableList.builder(); - genericCropsBuilder.add("cotton", "rice", "tea", "coffee", "candleberry"); + genericCropsBuilder.add("cotton", "rice", "tealeaf", "coffeebean", "candleberry"); genericCropsBuilder.addAll(herbs); genericCropsBuilder.addAll(spices); @@ -281,7 +281,14 @@ public class PluginHarvestCraft extends ForestryPlugin { } for (String cropName : genericCrops) { - ItemStack genericCropSeed = GameRegistry.findItemStack(HC, cropName + "seedItem", 1); + String seedName = cropName; + // Pam's Tea and Coffee have inconsistent Crop/Seed names, unlike other Pam's crops + if (seedName.equals("tealeaf")) { + seedName = "tea"; + } else if (seedName.equals("coffeebean")) { + seedName = "coffee"; + } + ItemStack genericCropSeed = GameRegistry.findItemStack(HC, seedName + "seedItem", 1); Block genericCropBlock = GameRegistry.findBlock(HC, "pam" + cropName + "Crop"); if (genericCropSeed != null) { RecipeManagers.squeezerManager