Skip to content
This repository was archived by the owner on Jun 3, 2024. It is now read-only.

Conversation

@cittyinthecloud
Copy link
Contributor

Both of these events are required for CoFH Core. Doing them in the same PR as they're both relatively simple.

Copy link
Contributor

@kitlith kitlith left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Other than the documentation nit, this LGTM.

Comment on lines 29 to 39
* SaplingGrowTreeEvent is fired when a sapling grows into a tree.<br>
* This event is fired during sapling growth in
* {@link net.minecraft.block.SaplingBlock#generate(IWorld, BlockPos, BlockState, Random)}.<br>
* <br>
* {@link #pos} contains the coordinates of the growing sapling. <br>
* {@link #rand} contains an instance of Random for use. <br>
* <br>
* This event is not cancellable.<br>
* <br>
* This event has a result.<br>
* This result determines if the sapling is allowed to grow. <br>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IIRC generally we turn Forge's use of linebreaks into proper paragraphs.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Kit is correct.

Comment on lines 29 to 39
* SaplingGrowTreeEvent is fired when a sapling grows into a tree.<br>
* This event is fired during sapling growth in
* {@link net.minecraft.block.SaplingBlock#generate(IWorld, BlockPos, BlockState, Random)}.<br>
* <br>
* {@link #pos} contains the coordinates of the growing sapling. <br>
* {@link #rand} contains an instance of Random for use. <br>
* <br>
* This event is not cancellable.<br>
* <br>
* This event has a result.<br>
* This result determines if the sapling is allowed to grow. <br>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Kit is correct.

}

public static boolean onFarmlandTrample(World world, BlockPos pos, BlockState state, float fallDistance, Entity entity) {
//TODO: In forge, the possibility of trampling is handled by IForgeEntity.canTrample
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
//TODO: In forge, the possibility of trampling is handled by IForgeEntity.canTrample
// TODO: In forge, the possibility of trampling is handled by IForgeEntity.canTrample

TheGlitch76
TheGlitch76 previously approved these changes Jul 29, 2020
@TheGlitch76 TheGlitch76 dismissed their stale review July 29, 2020 21:42

not marked HasResult

@TheGlitch76
Copy link
Member

Please resolve merge conflicts

@TheGlitch76
Copy link
Member

Failing checkstyle

@TheGlitch76
Copy link
Member

Lots and lots of merge conflicts and a failing checkstyle

cittyinthecloud and others added 3 commits August 16, 2020 20:02
…-farmland

# Conflicts:
#	patchwork-god-classes/src/main/java/net/minecraftforge/common/ForgeHooks.java
Fix checkstyle and merge conflicts for feature/sapling-and-farmland
Copy link
Member

@TheGlitch76 TheGlitch76 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for the wait, lgtm

@TheGlitch76 TheGlitch76 merged commit 20ee0db into master Oct 25, 2020
@TheGlitch76 TheGlitch76 deleted the feature/sapling-and-farmland branch October 25, 2020 18:29
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants