Compare commits

...
2 Commits
Author SHA1 Message Date
Martin Robertz 3bf5fe4917 update 2024-03-04 11:27:03 +01:00
leumasme 96599e97d8 Fix multifarm not harvesting coffee and tea
Also fixes fermenter recipes for these crops
2024-03-03 20:18:52 +01:00
2 changed files with 10 additions and 3 deletions

No files matched your search

+1 -1
View File
@@ -2,7 +2,7 @@
dependencies {
api('curse.maven:cofh-lib-220333:2388748')
compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-alpha31:api')
compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-alpha33:api')
devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.5.23-GTNH:dev')
compileOnly('com.github.GTNewHorizons:inventory-tweaks:1.6.2:api')
compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.39:api')
@@ -148,7 +148,7 @@ public class PluginHarvestCraft extends ForestryPlugin {
);
ImmutableList.Builder<String> 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