Mystical Agriculture compatibility with farmer (#64)

Author: Combatcat420

build.gradle

@@ -71,6 +71,16 @@ repositories {
 			includeGroup "top.theillusivec4.curios"
 		}
 	}
+	maven {
+		name = "Blakebr0"
+		url = "https://maven.blakesmods.com/releases"
+		content {
+			// Cucumber
+			includeGroup "com.blakebr0.cucumber"
+			// Mystical Agriculture
+			includeGroup "com.blakebr0.mysticalagriculture"
+		}
+	}
 }
 
 dependencies {
@@ -112,6 +122,14 @@ dependencies {
 	} else {
 		compileOnly "top.theillusivec4.curios:curios-neoforge:${curios_version}"
 	}
+
+	if (project.runtime_include_mystical_agriculture.toBoolean()) {
+		localImplementation "com.blakebr0.cucumber:Cucumber:${cucumber_version}"
+		localImplementation "com.blakebr0.mysticalagriculture:MysticalAgriculture:${mystical_agriculture_version}"
+	} else {
+		compileOnly "com.blakebr0.cucumber:Cucumber:${cucumber_version}"
+		compileOnly "com.blakebr0.mysticalagriculture:MysticalAgriculture:${mystical_agriculture_version}"
+	}
 }
 
 tasks.named('jar') {
@@ -348,7 +366,8 @@ tasks.withType(ProcessResources).configureEach {
 			mi_tweaks_version_range               : mi_tweaks_version_range,
 			emi_version_range                     : emi_version_range,
 			accessories_version_range             : accessories_version_range,
-			curios_version_range                  : curios_version_range
+			curios_version_range                  : curios_version_range,
+			mystical_agriculture_version_range    : mystical_agriculture_version_range
 	]
 	inputs.properties replaceProperties
 

gradle.properties

@@ -3,6 +3,7 @@ runtime_include_emi=true
 runtime_include_mi_tweaks=true
 runtime_include_accessories=false
 runtime_include_curios=false
+runtime_include_mystical_agriculture=false
 
 # Gradle Configuration
 artifact_name=extended-industrialization
@@ -47,4 +48,7 @@ mixinextras_version=0.3.5
 accessories_version=1.0.0-beta.34+1.21
 accessories_version_range=[1.0.0-beta.34-, 1.1.0-)
 curios_version=9.0.10+1.21
-curios_version_range=[9,)
+curios_version_range=[9,)
+cucumber_version=1.21.1-8.0.8
+mystical_agriculture_version=1.21.1-8.0.9
+mystical_agriculture_version_range=[8.0.0,)

src/main/java/net/swedz/extended_industrialization/machines/component/farmer/FarmerComponent.java

@@ -22,6 +22,7 @@
 import net.swedz.extended_industrialization.machines.component.farmer.harvesting.HarvestableBehaviorHolder;
 import net.swedz.extended_industrialization.machines.component.farmer.harvesting.HarvestingContext;
 import net.swedz.extended_industrialization.machines.component.farmer.harvesting.harvestable.CropBlockHarvestable;
+import net.swedz.extended_industrialization.machines.component.farmer.harvesting.harvestable.MysticalAgricultureHarvestable;
 import net.swedz.extended_industrialization.machines.component.farmer.harvesting.harvestable.NetherWartHarvestable;
 import net.swedz.extended_industrialization.machines.component.farmer.harvesting.harvestable.SimpleTallCropHarvestable;
 import net.swedz.extended_industrialization.machines.component.farmer.harvesting.harvestable.TreeHarvestable;
@@ -34,6 +35,7 @@
 import net.swedz.extended_industrialization.machines.component.farmer.task.FarmerTask;
 import net.swedz.extended_industrialization.machines.component.farmer.task.FarmerTaskType;
 import net.swedz.tesseract.neoforge.behavior.BehaviorRegistry;
+import net.swedz.tesseract.neoforge.compat.ModLoadedHelper;
 import net.swedz.tesseract.neoforge.compat.mi.helper.MachineInventoryHelper;
 import net.swedz.tesseract.neoforge.event.FarmlandLoseMoistureEvent;
 
@@ -62,6 +64,11 @@ public static void registerHarvestable(Supplier<HarvestableBehavior> creator)
 		registerPlantable(StandardFarmerPlantable::new);
 		registerPlantable(SpecialFarmerPlantable::new);
 
+		if(ModLoadedHelper.isLoaded("mysticalagriculture"))
+		{
+			registerHarvestable(MysticalAgricultureHarvestable::new);
+		}
+		
 		registerHarvestable(CropBlockHarvestable::new);
 		registerHarvestable(NetherWartHarvestable::new);
 		registerHarvestable(SimpleTallCropHarvestable::new);

src/main/java/net/swedz/extended_industrialization/machines/component/farmer/harvesting/harvestable/MysticalAgricultureHarvestable.java

@@ -0,0 +1,46 @@
+package net.swedz.extended_industrialization.machines.component.farmer.harvesting.harvestable;
+
+import com.blakebr0.mysticalagriculture.block.MysticalCropBlock;
+import com.google.common.collect.Lists;
+import net.minecraft.core.BlockPos;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.storage.loot.LootParams;
+import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
+import net.minecraft.world.phys.Vec3;
+import net.swedz.extended_industrialization.machines.component.farmer.harvesting.HarvestableBehavior;
+import net.swedz.extended_industrialization.machines.component.farmer.harvesting.HarvestingContext;
+
+import java.util.List;
+
+public final class MysticalAgricultureHarvestable implements HarvestableBehavior
+{
+	@Override
+	public boolean matches(HarvestingContext context)
+	{
+		return context.state().getBlock() instanceof MysticalCropBlock;
+	}
+	
+	@Override
+	public boolean isFullyGrown(HarvestingContext context)
+	{
+		MysticalCropBlock mysticalCropBlock = (MysticalCropBlock) context.state().getBlock();
+		return mysticalCropBlock.isMaxAge(context.state());
+	}
+	
+	@Override
+	public List<BlockPos> getBlocks(HarvestingContext context)
+	{
+		return Lists.newArrayList(context.pos());
+	}
+	
+	@Override
+	public List<ItemStack> getDrops(HarvestingContext context)
+	{
+		MysticalCropBlock cropBlock = (MysticalCropBlock) context.state().getBlock();
+		LootParams.Builder builder = new LootParams.Builder((ServerLevel) context.level())
+				.withParameter(LootContextParams.ORIGIN, Vec3.atCenterOf(context.pos()))
+				.withParameter(LootContextParams.TOOL, ItemStack.EMPTY);
+		return cropBlock.getDrops(context.state(), builder);
+	}
+}

src/main/resources/META-INF/neoforge.mods.toml

@@ -65,4 +65,11 @@ modId = "curios"
 type = "optional"
 versionRange = "${curios_version_range}"
 ordering = "AFTER"
+side = "BOTH"
+
+[[dependencies.${ mod_id }]]
+modId = "mysticalagriculture"
+type = "optional"
+versionRange = "${mystical_agriculture_version_range}"
+ordering = "AFTER"
 side = "BOTH"