Repository navigation
fix(actinium): follow the GLState facade split - #17
Open
DHJComical wants to merge 2 commits into
Open
DHJComical wants to merge 2 commits into
DHJComical wants to merge 2 commits into
Conversation
Actinium's public GLState API split moved two method bodies that this mod redirects into out of GLStateManager: the vertex array bind now lives in GLSMVertexInput and the deferred attribute flush in GLSMCurrentAttribs. With the old targets the redirects scanned zero targets and the critical injection failure took GLStateManager down with it. Keep the existing mixins so builds against the previous Actinium still apply, relax their injectors to require = 0, and add two mixins that resolve the new facade classes by name, so a version without them only logs a warning.
Actinium moved the body of getBoundTextureForServerState() out of GLStateManager into the public GLSMTextures facade, leaving a one line delegate behind. The atlas upload binding redirect still pointed at the GLStateManager body with require = 1, so every launch died in InjectionError with "Scanned 0 target(s)" and took the whole GLStateManager class down with a NoClassDefFoundError. Keep the old redirect optional and add the facade counterpart, the same way the deferred attrib suppression is handled. Both stay require = 0 so either Actinium layout works.
Author
|
Added a second fix on top: The old mixin is now |
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
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.
Actinium's public GLState API split (
refactor(glsm): split GLStateManager into public state facades) moved two method bodies that this mod redirects into out ofGLStateManager:glBindVertexArray(I)Vnow lives inGLSMVertexInput;flushDeferredVertexAttribs()Vnow lives inGLSMCurrentAttribs.With the old targets the redirects scanned zero targets, and because they were declared with
require = 1the critical injection failure tookGLStateManagerdown with it:NoClassDefFoundError: com/gtnewhorizons/angelica/glsm/GLStateManager.What changed
require = 1torequire = 0so a target that moved is a skipped injector instead of a fatal one.MixinGLSMVertexInputVertexArrayandMixinGLSMCurrentAttribsGenericAttributescover the new locations, keeping the same suppression logic (same-VAO bind skip, redundant COLOR / SECONDARY_UV upload skip). They resolve their target with@Mixin(targets = "..."), so an Actinium version without those classes only logs a warning.novaeng_core.mixin.json.Why this shape
Both Actinium builds have to keep working: the ones where the bodies are still in
GLStateManager, and the ones with the facades. Duplicating the redirect per target withrequire = 0gives full functionality on both, instead of losing the suppression on whichever version the mod was not built against.Verification
NovaEngineering-Core-1.23.3built, deployed to the NovaEngineering pack together with the facade build of Actinium, and the world loads without the injection failure that the previous build produced (Critical injection failure: Redirector nova$flushColor ... failed injection check (0/1)).glVertexAttrib2f/2s/3f/4f,glDeleteVertexArrays,reset,preInit,init,markSplashComplete) still targetGLStateManager, where those entry points remain present in both builds.