refactor: remove dependency on AnotherWorld #38
Conversation
naalit
changed the title
naalit
added
the
Type: Refactoring
| float value = positionValue.getValue(); | ||
|
|
||
| if (noise.noise(pos.x, pos.y, pos.z) / 256f < amount) { | ||
| facet.setFlag(pos, value); | ||
| if (foliageRegion.contains(pos) && noise.noise(pos.x(), pos.y(), pos.z()) / 256f < amount) { |
There was a problem hiding this comment.
Is there no variant to pass a vector to noise.noise(pos)? If that is missing, we should add it...
There was a problem hiding this comment.
No, there isn't. Should that be added to the main Noise interface?
There was a problem hiding this comment.
I think that makes sense, yes. We can use a default implementation for that to only touch that one file.
| @@ -64,7 +65,7 @@ public void updatePlant(DelayedActionTriggeredEvent event, EntityRef plant, Livi | |||
| PerformanceMonitor.startActivity("GrowingFlora - Updating plant"); | |||
| try { | |||
| PlantGrowthDefinition plantDefinition = plantRegistry.getPlantGrowthDefinition(plantComponent.type); | |||
| Long updateDelay = plantDefinition.requestedUpdatePlant(worldProvider, environmentSystem, blockEntityRegistry, plant); | |||
| Long updateDelay = plantDefinition.requestedUpdatePlant(worldProvider, new EnvironmentLocalParameters(environmentSystem, blockComponent.getPosition()), blockEntityRegistry, plant); | |||
There was a problem hiding this comment.
This whole system will only be initialized if all it's dependencies can be met. If ClimateConditions is not loaded, we'll see logs like the following, and the whole feature is not present.
22:47:03.042 [main] WARN o.t.e.core.ComponentSystemManager - Skip system GrowingFlora:SaplingInitializeSystem for loading - possibly missing optional dependencies
22:47:03.045 [main] WARN o.t.e.core.ComponentSystemManager - Skip system GrowingFlora:PlantGrowingSystem for loading - possibly missing optional dependencies
I think this is fine for now, but we can definitely improve on this, e.g., by basing those plant definition on something else if the environmentSystem is not present.
I think this is something for another PR, though. Maybe Terasology/SimpleFarming#120 can give some reference.
There was a problem hiding this comment.
I actually fixed this right before this comment. Those systems are needed for plants to grow, so skipping them isn't great.
Adds [juniper trees](https://en.wikipedia.org/wiki/Juniper) to steppes and [baobabs](https://en.wikipedia.org/wiki/Adansonia_digitata) to scrublands, using GrowingFlora and the assets from PlantPack. Juniper trees are a type of cypress, so I'm using the cypress assets, and they do naturally appear in the American West; baobab trees actually live in Africa, but it's a similar environment and I think they make scrublands a lot more interesting, and baobab already exists in PlantPack unlike other tree species which would make more sense geographically. Depends on Terasology/GrowingFlora#38. * feat: cypress/juniper and baobab trees with GrowingFlora * fix: ground filters removed from GrowingFlora * fix: planted saplings will actually grow
GrowingFlora currently depends on AnotherWorld, but there isn't much reason for that to be the case. I moved some utilities here and to the engine (see MovingBlocks/Terasology#4849, which this PR depends on) and updated some references, which was enough to remove the dependency. Behavior shouldn't change, except that it no longer considers parent biomes for
AnotherWorldsBiomes, and it also no longer has a bug where branch angles were snapped to whole numbers of radians.Eventually, it would be nice to remove the dependency on ClimateConditions (or hopefully make it optional so that climate still affects growth if it is present), since Metal Renegades would like to use GrowingFlora but doesn't necessarily want to enable ClimateConditions.