Replace PlantType system with SpecialPlantable interface and canSustainPlant block method #971
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Closes neoforged#703 Also fixed several spots in NeoForge where we were passing bad arguments as well. Note: the track command's crash from bad argument passed to Translatable will be fixed in this PR: neoforged#915
TelepathicGrunt
added
enhancement
Last commit published: 0a7b1d1bb2e685443705713488c639a62eecf767. PR PublishingThe artifacts published by this PR:
Repository DeclarationIn order to use the artifacts published by the PR, add the following repository to your buildscript: repositories {
maven {
name 'Maven for PR #971' // https://github.com/neoforged/NeoForge/pull/971
url 'https://prmaven.neoforged.net/NeoForge/pr971'
content {
includeModule('net.neoforged', 'neoforge')
includeModule('net.neoforged', 'testframework')
}
}
}MDK installationIn order to setup a MDK using the latest PR version, run the following commands in a terminal. mkdir NeoForge-pr971
cd NeoForge-pr971
curl -L https://prmaven.neoforged.net/NeoForge/pr971/net/neoforged/neoforge/21.0.111-beta-pr-971-PlantTypeRefactor/mdk-pr971.zip -o mdk.zip
jar xf mdk.zip
rm mdk.zip || del mdk.zipTo test a production environment, you can download the installer from here. |
|
@TelepathicGrunt |
|
@TelepathicGrunt |
src/main/java/net/neoforged/neoforge/common/SpecialPlantable.java
Outdated
Show resolved
Hide resolved
XFactHD
requested changes
May 19, 2024
patches/net/minecraft/world/level/block/BambooSaplingBlock.java.patch
Outdated
Show resolved
Hide resolved
patches/net/minecraft/world/level/block/BambooStalkBlock.java.patch
Outdated
Show resolved
Hide resolved
patches/net/minecraft/world/level/block/SmallDripleafBlock.java.patch
Outdated
Show resolved
Hide resolved
BasePlantable sounds like it is for vanilla plantable items too. But the interface is better suited for special plantable blocks that aren't simple vanilla villager plantable tagged BlockItems. (And that we can't patch vanilla items to have the interface as they are using the BlockItem class directly) |
XFactHD
previously approved these changes
Jun 22, 2024
XFactHD
previously approved these changes
Jun 24, 2024
pupnewfster
requested changes
Jun 26, 2024
patches/net/minecraft/world/level/block/ChorusFlowerBlock.java.patch
Outdated
Show resolved
Hide resolved
pupnewfster
previously approved these changes
Jun 26, 2024
|
@TelepathicGrunt, this PR introduces breaking changes. Compatibility checks
|
…t/NeoForge into PlantTypeRefactor
pupnewfster
approved these changes
Jun 26, 2024
This was referenced Jun 26, 2024
robotgryphon
pushed a commit
to robotgryphon/NeoForge
that referenced
this pull request
Jun 27, 2024
…inPlant block method (neoforged#971) Co-authored-by: Dennis C <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
It is well known the old PlantType system used in past is quite clunky and broken in many areas. It does not even cover some important vanilla plants such as Cocoa.
Basically, it tried to be many things at once and failed at all of them. It tried to allow for blocks to define what plant it can keep as well as control what modded crops villagers can place.
This PR splits the two goals into separate systems.
SpecialPlantable interface (any suggestions of different name?)
IPlantableinterface and instead of being on blocks, you would put the SpecialPlantable interface on your own custom item classes.canPlacePlantAtPositionandspawnPlantAtPositionmethods.villagerCanPlantItemis optional to override.villagerCanPlantItemto return true, Villagers can pick up this item and put it into the Villager's inventory. Then the Villager will now be able to plant this item on nearby block that extend FarmBlock!Changed canSustainPlant to return a Tristate and patched it into more blocks
canSustainPlantand return TRUE, FALSE, or DEFAULT enum. If DEFAULT, the plant block will continue to run it's normal logic for checking survivability. If TRUE or FALSE is returned, it will override the plant's survivability checks to what the soil block wants.canSurvivemethod should callcanSustainPlanton the block the plant is attaching to and respect the enum result that comes out. Basically, modded plants will have to "opt-in" into this system. If the pklant overridesmayPlacemethod, they will still respectcanSustainPlantbecause the patches tries to target thecanSurvivemethods where-ever it makes sensecanSustainPlantare in places where vanilla is doing block type checks or light checks. Any check for block shape was ignored to keep patch size down and because those kinds of plants technically support any block as long as the block's shape is good for supporting the plant.CropBlock'sgetGrowthSpeedmethod had its first parameter changed fromBlocktoBlockStatein order to pass in the correct crop block's blockstate tocanSustainPlant. No idea why mojang passed only the Block in but this is an annoying breaking change to a vanilla method param type I ended up doing. Any suggestions around this?Added GameTests for all kinds of plants
Added
neoforge:villager_farmlandsblock tagFeed back welcomed as there's a lot of improvements that can be done to this PR.