Skip to content

Fix Farmers Delight tomato compatibility (FD 1.2.11) #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Starior wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −4
Open

Fix Farmers Delight tomato compatibility (FD 1.2.11) #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions ...eintegratedfarming/integration/farmersdelight/farming/harvest/TomatoHarvestBehaviour.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@
import net.minecraft.sounds.SoundSource;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.state.BlockState;
import org.jetbrains.annotations.Nullable;
import plus.dragons.createintegratedfarming.api.harvester.CustomHarvestBehaviour;
import vectorwing.farmersdelight.common.Configuration;
import vectorwing.farmersdelight.common.block.TomatoVineBlock;
Expand All @@ -42,6 +44,12 @@ public TomatoHarvestBehaviour(TomatoVineBlock tomato) {
this.tomato = tomato;
}

public static @Nullable TomatoHarvestBehaviour create(Block block) {
if (!(block instanceof TomatoVineBlock tomato))
return null;
return new TomatoHarvestBehaviour(tomato);
}

@Override
public void harvest(HarvesterMovementBehaviour behaviour, MovementContext context, BlockPos pos, BlockState state) {
boolean replant = CustomHarvestBehaviour.replant();
Expand Down
5 changes: 1 addition & 4 deletions ...agons/createintegratedfarming/integration/farmersdelight/registry/FDHarvestBehaviors.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,10 @@
import plus.dragons.createintegratedfarming.api.harvester.CustomHarvestBehaviour;
import plus.dragons.createintegratedfarming.integration.farmersdelight.farming.harvest.MushroomColonyHarvestBehaviour;
import plus.dragons.createintegratedfarming.integration.farmersdelight.farming.harvest.TomatoHarvestBehaviour;
import vectorwing.farmersdelight.common.block.TomatoVineBlock;
import vectorwing.farmersdelight.common.registry.ModBlocks;

public class FDHarvestBehaviors {
public static void register() {
CustomHarvestBehaviour.REGISTRY.registerProvider(MushroomColonyHarvestBehaviour::create);
var tomato = (TomatoVineBlock) ModBlocks.TOMATO_CROP.get();
CustomHarvestBehaviour.REGISTRY.register(tomato, new TomatoHarvestBehaviour(tomato));
CustomHarvestBehaviour.REGISTRY.registerProvider(TomatoHarvestBehaviour::create);
}
}