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

Refactor CraftingUnitType for easier add-on extensibility #6277

Merged
merged 18 commits into from
Jun 4, 2022
Merged

Refactor CraftingUnitType for easier add-on extensibility #6277

merged 18 commits into from
Jun 4, 2022

Conversation

62832
Copy link
Member

@62832 62832 commented May 18, 2022

Up until now most add-ons attempting to add higher tiers of crafting storage have had to do so through heavy use of mixins or other hacks due to much of the code that makes use of the CraftingUnitType being fairly hard-coded. This PR should hopefully turn it into something more extensible to make use of more cleanly.

@shartte
Copy link
Member

shartte commented May 19, 2022

Yes this is good stuff. That'll make it far easier for addons, I always hated the enum we had 😁

@Technici4n
Copy link
Member

Don't you also want to expose the model rendering? That's still using an enum.

@62832
Copy link
Member Author

62832 commented May 19, 2022

Don't you also want to expose the model rendering? That's still using an enum.

This is still a draft specifically for that reason. Once that's figured out and done I'll mark it as ready.

62832 added a commit to 62832/MEGACells that referenced this pull request May 24, 2022
@62832 62832 marked this pull request as ready for review May 27, 2022 17:39
@62832
Copy link
Member Author

62832 commented May 27, 2022

Most of what I wanted to abstract has been abstracted enough now to allow for relatively painless crafting CPU implementation without any use of Mixin whatsoever.

I still have qualms, however, with the approach taken for model rendering — which inexplicably still gives me trouble on my add-on's end when it comes to generating a model and so far causes display issues for textures that aren't the outer ring or the plus-shaped light on top. I especially hope for some suggestions and improvements for the rendering in particular.

@62832 62832 mentioned this pull request May 27, 2022
2 tasks
Copy link
Member

@Technici4n Technici4n left a comment

Choose a reason for hiding this comment

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

Looks pretty good! Left a few remarks.

@Technici4n Technici4n added this to the 11.0.1 - 1.18.2 milestone May 28, 2022
@62832
Copy link
Member Author

62832 commented May 29, 2022

Sorted.

@Technici4n Technici4n merged commit d7db1ec into AppliedEnergistics:master Jun 4, 2022
@62832 62832 deleted the crafting-unit-refactor branch June 4, 2022 13:12
62832 added a commit to 62832/MEGACells that referenced this pull request Jun 4, 2022
* Initial crafting storage attempt
see AppliedEnergistics/Applied-Energistics-2#6277

* Remove custom BE classes in favour of instantiating AE2's own

* Remove redundant custom block classes

* ditto

* Optimise textures

* Use switch statement to retrieve item for block entity
Fixes constantly returning null due to init order

* Try to fix model rendering?

* Add block drops and crafting recipes

* Move material definitions to provider class

* Add 4 co-processing threads to MEGA accelerator

* Terminology change

* Too many subpackages

* Fix incorrect monitor blockmodel

* Add missing client init, finally render CPUs properly as cutout

* Change formed colour scheme to full-black
they looked more like massive footballs prior to this

* Final(?) tweaks for PR

* Update mods.toml

* Update dependencies
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Dec 2, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants