[feat] Bedrock Sun Glare and Sky Color #224
Merged
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
The feature of Bedrock Sun Glare and Sky Color. This is enabled by the `sunlightIntensity` value and `bedrockShading` option in the Visual Improvements settings.
* new configurable parameters
- int `BedrockifyClientSettings#sunlightIntensity`: 0 - 100, default 50
* update `lang/en_us.json`
- edit `bedrockify.options.bedrockShading`
- add `bedrockify.options.sunlightIntensity`
- add tooltip texts:
+ `bedrockify.options.bedrockShading.tooltip`
+ `bedrockify.options.sunlightIntensity.tooltip`
* update `BedrockifyClientSettings`
- add a field `sunlightIntensity`
* update `SettingsGUI`
- add tooltip for the options:
+ `bedrockShading`
+ `sunlightIntensity`
* registered new mixins
- `mixin.client.features.bedrockShading.sunGlare.ClientWorldMixin`
+ to modify the Sky color
- `mixin.client.features.bedrockShading.sunGlare.WorldRendererMixin`
+ to modify the Sun radius
* moved mixins
- `mixin.client.features.bedrockShading.AbstractQuadRendererMixin` -> `lightBlock.AbstractQuadRendererMixin`
- `mixin.client.features.bedrockShading.BlockModelRendererMixin` -> `lightBlock.BlockModelRendererMixin`
- `mixin.client.features.bedrockShading.FluidRendererMixin` -> `lightBlock.FluidRendererMixin`
* new files
- `client.features.bedrockShading.BedrockSunGlareShading`
+ helper class that calculate angle diff
Make it compatible with shader mods.
* update `BedrockSunGlareShading`
- inner classes:
+ enum `ShaderState`: shows the state of custom shader
+ class `ClassMethodHolder`: holds class name, method name, args and predicate
- fields:
+ ShaderState `shaderState`: to determine the state of custom shader
+ Map `MOD_ID_CLASS_MAP`: uses with Reflection
- methods:
+ void `reloadCustomShaderState`: notifies changed the shader state
+ boolean `isEnabled` -> `shouldApplyShading`: gets whether can apply this feature
+ ShaderState `fetchShaderStateInternal`: gets the state of custom shader
* update `mixin.client.features.bedrockShading.sunGlare.WorldRendererMixin`
- new method `bedrockify$reloadWorldRendererCallback`: to reload the state of custom shader
Adds a test case to be compatible with Iris shaders using Reflection.
* update dependencies
- `build.gradle`
+ fabric loom 1.1-SNAPSHOT
+ add a sourceSet of the test
+ add Modrinth's maven repo
+ add Iris, JUnit
- `gradle.properties`
+ add a property of Iris version
* new files
- `test.client.features.bedrockShading.sunGlare.IrisCompatTest`
+ > ./gradlew test
Update the sun vector after client tick due to the sun does not move so fast.
Update the dot product only once when executed `WorldRenderer#renderSky`.
* update `BedrockSunGlareShading`
- fields:
+ float `sunAngleDiff`
+ Vector3f `sunVector3f`
+ MinecraftClient `client`
- methods:
+ void `tick`
+ void `updateAngleDiff`
+ static float `getSunAngleDiffClamped(float)` -> float `getSunAngleDiff()`
* update `BedrockifyClient`
- register a new method in `END_CLIENT_TICK`:
+ `BedrockSunGlareShading#tick`
* update `WorldRendererMixin`
- method name has changed: `bedrockify$storeSunAngleDiff` -> `bedrockify$updateSunAngleDiff`
- mixin injection point has changed: `HEAD` -> `BEFORE_INVOKE` target = `ClientWorld#getSkyColor`
* update `en_us.json` - the word "vanilla rendering" might not be user friendly * update `IrisCompatTest.java` - add JavaDoc - add affected class info to error message * update `BedrockSunGlareShading.java` - update JavaDoc - add new const: ClassMethodHolder `ClassMethodHolder#CONDITION_TRUE` * update `ClientWorldMixin.java` - does not require to extend super class
|
I know there is another way to inject into other mods that uses If more flexibility is needed in the future version, this may be discussed as a way to also obtain the sun angle that is changed by the shaders. |
juancarloscp52
approved these changes
Feb 25, 2023
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.
close #110
The feature of Bedrock Sun Glare and Sky Color. This is enabled by the
sunlightIntensityvalue andbedrockShadingoption in the Visual Improvements settings.Translation keys have been updated. Please check
lang/en_us.json.Behavior
This is disabled by default when the external shader is turned on. It cannot be forced to be enabled at the moment.
Use Reflection to detect whether the external shader is present or not.
bedrockShadingpackage.Changes
new configurable parameter
BedrockifyClientSettings#sunlightIntensity: 0 - 100, default 50update dependencies
build.gradlegradle.propertiesupdate
lang/en_us.jsonbedrockify.options.bedrockShadingbedrockify.options.sunlightIntensitybedrockify.options.bedrockShading.tooltipbedrockify.options.sunlightIntensity.tooltipupdate
SettingsGUIbedrockShadingsunlightIntensityupdate
BedrockifyClientEND_CLIENT_TICK:BedrockSunGlareShading#tickregistered new mixins
mixin.client.features.bedrockShading.sunGlare.ClientWorldMixinmixin.client.features.bedrockShading.sunGlare.WorldRendererMixinmoved mixins
mixin.client.features.bedrockShading.AbstractQuadRendererMixin->lightBlock.AbstractQuadRendererMixinmixin.client.features.bedrockShading.BlockModelRendererMixin->lightBlock.BlockModelRendererMixinmixin.client.features.bedrockShading.FluidRendererMixin->lightBlock.FluidRendererMixinnew files
client.features.bedrockShading.BedrockSunGlareShadingtest.client.features.bedrockShading.sunGlare.IrisCompatTest