Fix: Align shaft rotation with large cogwheel offset#24
Open
Apostrcfo2 wants to merge 37 commits into
Open
Conversation
This reverts commit 6a61706. I prefer this option enabled, since it makes the code easier to read. To prevent building task from crashing - just run 'verification/spotlessApply' before 'build'
Original image was obviously AI-generated, but after some adjustments it looks much better And the contour is actually round now
The large cogwheel was not meshing correctly because the offset was applied in radians instead of degrees. Fixed it by applying an exact 11.25-degree offset. Also ensured the central shaft ignores this offset so it stays aligned with connected blocks.
- Compacted TileEntityBreakerIntegration.setBreakTexture method calls into single lines to satisfy Spotless formatting constraints and fix the CI build failure.
- Added './gradlew spotlessApply' to the GitHub Actions workflow to automatically fix styling and formatting inconsistencies, preventing Spotless check failures from blocking the CI pipeline.
Updated download instructions to reflect the change from '.zip' to '.jar' file format for the pre-release.
Refactor cogwheel rendering logic to isolate shaft rendering and improve clarity.
Refactor rendering order for cogwheel and shaft to ensure proper alignment.
Contributor
Author
|
If you want to test this version, it's in the pre-releases of my fork. |
Owner
That's exactly why I was putting this issue away for so long :D |
The link that redirects to the workflow download was redirecting to my repository workflow. For aesthetic reasons, I prefer the link to redirect to the original repository workflow. I believe that was the intention from the beginning.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Description
This PR fixes a visual misalignment where the shaft did not follow the rotation/tilt of the Large Cogwheel when a phase offset was applied for tooth alignment.
The Issue
In the original code, the shaft's rotation was set before the large cogwheel's offset check. When the large cogwheel applied its
Math.PI / 16F(11.25°) adjustment to align with other gears, the shaft remained at the base rotation, causing it to look "straight" while the gear looked "tilted".The Solution
The rendering logic in
CogWheelTileEntityRenderer.javawas reorganized so that the final angle calculation (including the offset) happens before assigning it to the models. Now, both theShaftModeland theLargeCogWheelModelreceive the same processed rotation value, ensuring perfect visual synchronization.Changes
CogWheelTileEntityRenderer.java.References
Media Comparison
Finally!
This took way longer than it should have lol.