Skip to content

add Erebus compat #316

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.

Sign up for GitHub

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

Jump to bottom
Merged
brachy84 merged 13 commits into from
Oct 5, 2025
Merged

add Erebus compat #316

brachy84 merged 13 commits into from
Oct 5, 2025

Conversation

@WaitingIdly
Copy link
Collaborator

@WaitingIdly WaitingIdly commented May 28, 2025 •
edited
Loading

changes in this PR:

  • add compat with Erebus composter, smoothie, and offeringAltar with i18n and some examples.
    • requires 3 accessors and a mixin to make a list be ArrayList instead of Arrays.ArrayList.
    • document countless (1 or 2) fascinating bugs within Erebus (code) for the first time.
  • add just enough resources and just enough magiculture as runtime deps for jei compat (like thaumic jei is)/
  • add the material Object Mapper - most of the code for it already existed but wasnt used, think it just got forgotten.
  • add a method to FluidStackList to cast it to be a List<IIngredient>.

@WaitingIdly WaitingIdly added the mod compat Relating to compatability with a mod or features of a mod label May 28, 2025
brachy84
brachy84 requested changes Sep 27, 2025
View reviewed changes
Copy link
Member

@brachy84 brachy84 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All 3 registries are missing a simple add method

@WaitingIdly
modify material handling
7cc6c1d
@WaitingIdly
adjust villager career handling
2838221
@WaitingIdly
rename material to blockmaterial
22c0c91
@WaitingIdly
Merge branch 'master' into erebus
40d55d0 
# Conflicts:
#	src/main/java/com/cleanroommc/groovyscript/mapper/ObjectMapperManager.java
#	src/main/java/com/cleanroommc/groovyscript/mapper/ObjectMappers.java
brachy84
brachy84 requested changes Oct 4, 2025
View reviewed changes
@brachy84 brachy84 merged commit 071a2b7 into CleanroomMC:master Oct 5, 2025
@WaitingIdly WaitingIdly deleted the erebus branch October 6, 2025 04:05
@WaitingIdly WaitingIdly mentioned this pull request Oct 8, 2025
Merged
@WaitingIdly WaitingIdly mentioned this pull request Dec 24, 2025
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@brachy84 brachy84 brachy84 approved these changes

Assignees

No one assigned

Labels

mod compat Relating to compatability with a mod or features of a mod

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@WaitingIdly @brachy84