Rendering and jetpack fixes - #155
beeeeeeeeean wants to merge 5 commits into
Conversation
…added missing localization strings.
| boolean renderUniverseInDimension = false; | ||
| if (planet != null) { | ||
| if (planet.linkedDimension() != null) { | ||
| renderUniverseInDimension = planet.linkedDimension().renderUniverseInDimension(); |
There was a problem hiding this comment.
Would be better as a single && chain when setting the renderUniverseInDimension variable, but this is non-blocking.
| } | ||
|
|
||
| if (dimension == RocketDimensions.DEEP_SPACE || (Objects.requireNonNull(planet.linkedDimension()).renderUniverseInDimension() && planet.linkedDimension().key() != Level.OVERWORLD) || RocketConfig.CLIENT.enableCustomSky.get()) { | ||
| if (dimension == RocketDimensions.DEEP_SPACE || (renderUniverseInDimension && planet.linkedDimension().key() != Level.OVERWORLD) || RocketConfig.CLIENT.enableCustomSky.get()) { |
There was a problem hiding this comment.
Since we are ||ing with the config setting, we should remove the override to ignore the overworld, since our datapack by default does not have the universe render in the overworld. Alternatively, the config setting should have a check so that it only applies to the overworld, so we check the datapack for dimensions that are not the overworld and the config setting for the overworld.
| if (exclude != null) { | ||
| if (pl.planet.id() == exclude.id()) continue; | ||
| PlanetDimensionData linkedDimension = exclude.linkedDimension(); | ||
| if (!isDeepSpace && !RocketConfig.CLIENT.enableCustomSky.get() && linkedDimension != null && linkedDimension.renderUniverseInDimension()) continue; |
There was a problem hiding this comment.
We should not be doing this check in this method. If this method is called, we want to be rendering the universe, and this check will skip all planets if exclude fails to match it. This kind of check should come before this method is called, instead of making this method do effectively nothing if the planet passed as exclude is bad. Do not even check if we are in deep space; the only check we want to be doing in this method is skipping the exclude planet.
2 participants
No description provided.