Skip to content

Relocate caffeine to fix conflicts with other mods/plugins#538

Merged
duplexsystem merged 1 commit intoPolyhedralDev:masterfrom
ryzech:fix/caffeine-relocate
Dec 14, 2025
Merged

Relocate caffeine to fix conflicts with other mods/plugins#538
duplexsystem merged 1 commit intoPolyhedralDev:masterfrom
ryzech:fix/caffeine-relocate

Conversation

@ryzech
Copy link
Copy Markdown
Contributor

@ryzech ryzech commented Nov 19, 2025

Pull Request

Description

When another mod/plugin uses Caffeine there can be a conflict, as both try to create an instance. This is resolved by relocating the dependency.

I have tested this locally and on a development server, it appears to have no change in behavior besides fixing the issue.

Checklist

Mandatory checks

  • The base branch of this PR is an unreleased version branch (that has a ver/ prefix)
    or is a branch that is intended to be merged into a version branch.
  • There are no already existing PRs that provide the same changes.
  • The PR is within the scope of Terra (i.e. is something a configurable terrain generator should be doing).
  • Changes follow the code style for this project.
  • I have read the CONTRIBUTING.md
    document in the root of the git repository.

Types of changes

  • Bug Fix
  • Build system
  • Documentation
  • New Feature
  • Performance
  • Refactoring
  • Repository
  • Revert
  • Style
  • Tests
  • Translation

Compatibility

  • Introduces a breaking change
  • Introduces new functionality in a backwards compatible way.
  • Introduces bug fixes

Documentation

  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.

Testing

  • I have added tests to cover my changes.
  • All new and existing tests passed.

Licensing

  • I am the original author of this code, and I am willing to
    release it under GPLv3.
  • I am not the original author of this code, but it is in public domain or
    released under GPLv3 or a compatible license.

@solonovamax
Copy link
Copy Markdown
Member

Are there any specific mod/plugin that had an issue with this?
I'll likely approve it anyways, I just want to see if there's anything else which doesn't relocate it.

@ryzech
Copy link
Copy Markdown
Contributor Author

ryzech commented Nov 19, 2025

The specific one I had an issue with was EcoEnchants (or more specifically their library called libreforge)

@duplexsystem duplexsystem merged commit 6929de7 into PolyhedralDev:master Dec 14, 2025
duplexsystem added a commit that referenced this pull request Dec 19, 2025
This reverts commit 6929de7, reversing
changes made to a159deb.
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.

3 participants