Skip to content

Fix for Fertilized Farmland #35

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
MisledWater79 wants to merge 2 commits into
base: 1.20.1
Choose a base branch
from
Open

Fix for Fertilized Farmland #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5462776
fix(): Fertilized Farmland not bonemealing
MisledWater79 Oct 27, 2025
3ee3f47
feat(): Added getGrowthSpeed to CropBlockMixin
MisledWater79 Oct 27, 2025
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
2 changes: 1 addition & 1 deletion common/src/main/java/net/satisfy/farm_and_charm/core/block/FertilizedFarmlandBlock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ private float getGrowthChance(ServerLevel serverLevel, BlockPos blockPos) {
}

private void applyBonemealEffect(ServerLevel serverLevel, BlockPos blockPos, RandomSource randomSource) {
if (PlatformHelper.isBonemealEffectEnabled()) {
if (!PlatformHelper.isBonemealEffectEnabled()) {
return;
}
BlockPos posAbove = blockPos.above();
Expand Down
47 changes: 47 additions & 0 deletions common/src/main/java/net/satisfy/farm_and_charm/core/mixin/CropBlockMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@
import net.minecraft.server.level.ServerLevel;
import net.minecraft.util.RandomSource;
import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.CropBlock;
import net.minecraft.world.level.block.FarmBlock;
import net.minecraft.world.level.block.state.BlockState;
import net.satisfy.farm_and_charm.core.registry.ObjectRegistry;
import net.satisfy.farm_and_charm.platform.PlatformHelper;
Expand Down Expand Up @@ -51,5 +54,49 @@ private void mayPlaceOn(BlockState blockState, BlockGetter blockGetter, BlockPos
cir.setReturnValue(true);
}
}

@Inject(method = "getGrowthSpeed", at = @At("HEAD"), cancellable = true)
private static void getGrowthSpeed(Block block, BlockGetter blockGetter, BlockPos blockPos, CallbackInfoReturnable<Float> cir) {
float value = 1.0F;
BlockPos below = blockPos.below();

for (int i = -1; i <= 1; ++i) {
for (int j = -1; j <= 1; ++j) {
float g = 0.0F;
BlockState blockState = blockGetter.getBlockState(below.offset(i, 0, j));
if (blockState.is(Blocks.FARMLAND)) {
g = 1.0F;
if ((Integer)blockState.getValue(FarmBlock.MOISTURE) > 0) {
g = 3.0F;
}
} else if (blockState.is(ObjectRegistry.FERTILIZED_FARM_BLOCK.get())) {
g = 4.0F;
}

if (i != 0 || j != 0) {
g /= 4.0F;
}

value += g;
}
}

BlockPos north = blockPos.north();
BlockPos south = blockPos.south();
BlockPos west = blockPos.west();
BlockPos east = blockPos.east();
boolean isFertilized1 = blockGetter.getBlockState(west).is(block) || blockGetter.getBlockState(east).is(block);
boolean isFertilized2 = blockGetter.getBlockState(north).is(block) || blockGetter.getBlockState(south).is(block);
if (isFertilized1 && isFertilized2) {
value /= 2.0F;
} else {
boolean isFertilized3 = blockGetter.getBlockState(west.north()).is(block) || blockGetter.getBlockState(east.north()).is(block) || blockGetter.getBlockState(east.south()).is(block) || blockGetter.getBlockState(west.south()).is(block);
if (isFertilized3) {
value /= 2.0F;
}
}

cir.setReturnValue(value);
}
}