Account for logical breaking change in ASMAPI.findFirstInstructionBefore() #56
Conversation
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
It is INSANE to me that version info is somehow not exposed in either ForgeSPI or ModLauncher.
- Use FMLLoader to get the current version. If it's below 1.21.3, do not use the fixed logic by default - Add new methods that include a boolean parameter for fixing the logic. This overrides the behavior imposed by CoreMods to fix the logic based on MC version.
Member
Author
|
I've marked this PR as a draft for now as I haven't tested it yet. Feedback on the code would still be appreciated. |
LexManos
reviewed
Oct 31, 2024
Member
Author
|
As suggested by @PaintNinja, I've removed the soft-dependency on FMLLoader and am instead using ModLauncher's blackboard to arbitrarily tell CoreMods if it should not fix the bugged behavior. On all versions before Forge for 1.21.3, I will be sending this key to the blackboard. |
PaintNinja
reviewed
Oct 31, 2024
Member
Author
|
This PR is ready for merge. |
PaintNinja
reviewed
Oct 31, 2024
Jonathing
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
This was discussed in a large part over Discord (starting here). My fix for #35, implemented in #50, did not account for the possibility that older coremods could rely on the broken behavior of the old method.
Unfortunately, fixing this problem relies on getting the Minecraft version within CoreMods. Since CoreMods is not loaded before FMLLoader is, CoreMods now relies on FMLLoader as a soft-dependency in order to get version information. This version information is used to determine whether it should apply the fix to
ASMAPI.findFirstInstructionBefore()by default or not. I have made it so that the fix is applied by default on Minecraft 1.21.3 and later.Additionally, I've added two sister methods that have a boolean parameter,
fixLogic, to override this behavior. This allows for modders who still actively mod older versions to allow overriding the fix for themselves to benefit from the intended behavior of the method.