Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Null Ingredient for Modular Magic #616

Merged
merged 4 commits into from
Jan 19, 2025

Conversation

WaitingIdly
Copy link
Contributor

changes in this PR:

  • add modular magic (and modular machinery) as optional deps for the buildscript.
  • fix multiple of modular magic's renderers from throwing an NPE when the ingredient being rendered is null (default: true).
  • add a comment indicating that the UTToolCrystalPropertiesMixin was created by me (whoops!).

related issues: Frinn38/Modular-Magic#25, Divine-Journey-2/Divine-Journey-2#940

Copy link

what-the-diff bot commented Jan 19, 2025

PR Summary

  • Addition of a Specially-Designated README Section: Our documentation now has additional details on how to address an error (Null Pointer Exception) that occurs when trying to process an 'empty' or 'null' ingredient.

  • Inclusion of New Dependencies: This code relies on 'modular-machinery' and 'modular-magic' to function, so we've added those into our dependency file (dependencies.gradle).

  • Debugging Capability For Modular Magic: We've made it easier to troubleshoot the 'Modular Magic' part of our code by turning on a debugger in our properties file (gradle.properties).

  • Special Configuration Class For Modular Magic: A new class (ModularMagicCategory) has been set up in UTConfigMods.java to manage all controls related to the integration with Modular Magic, including an option to handle the Null Ingredient issue.

  • Implementation of Mixin Checks: We've added in several check systems (in UTAspectRendererMixin, UTAuraRendererMixin, UTConstellationRendererMixin, UTDemonWillRendererMixin) to ensure that any 'empty' ingredients are detected sooner and don't cause further issues with rendering.

  • Enhancement of Regional Language Support: We've updated our language file (en_us.lang) to fully support the new integration with Modular Magic.

  • Mixin Configuration File Generation: We've created a separate configuration file (mixins.mods.modularmagic.nullingredient.json) which details the 'mixin' commands to be used with Modular Magic.

@ACGaming ACGaming merged commit 4ce7c6b into ACGaming:main Jan 19, 2025
1 check passed
@WaitingIdly WaitingIdly deleted the modular-magic-ingredient branch January 19, 2025 07:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants