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

Separation of AncientWillContainer and TerrasteelHelmItem #4749

Open
wants to merge 30 commits into
base: 1.21.1-porting
Choose a base branch
from

Conversation

megadoxs
Copy link

@megadoxs megadoxs commented Sep 6, 2024

These changes should allow for a better implementation by other mods of the AncientWillContainer interface to new armor pieces. Works for both fabric and forge.

Should terraWillCritTarget inside PlayerMixin be refactored to WillCritTarget as it will not contain only a target added by the terrahelm, but by all items that implements AncientWillContainer?

Fixes #4746

PS: Sorry for closing and remaking this pr, had messed up my fork.

@artemisSystem artemisSystem added the after-1.21-port This will not be fixed/implemented before the port to 1.21 label Oct 6, 2024
@megadoxs megadoxs changed the base branch from 1.20.x to 1.21.1 October 16, 2024 15:12
TheRealWormbo and others added 21 commits October 19, 2024 08:49
- bump MC version to 1.20.4
- replace Forge with NeoForge
- rename Forge module to NeoForge, moving relevant files
- replace Sponge Mixin dependency with FabricMC fork
- add MixinExtras
- extract lots of dependency versions into gradle.properties
- remove QuiltFlower references (Fabric and NeoForge both use FernFlower)

Obviously doesn't compile, but Gradle import and generating sources work.
- use NeoForge data attachments for internal data components
- move capability/component IDs to individual interfaces/component classes, so they can be shared between Fabric and NeoForge
(probably not complete)
- Add mc version to more mod version properties
- Add version properties for loaders
- Temporarily use ModDevGradle instead of minivan for xplat, since minivan tries to download macos arm natives from the wrong place
NeoGradle does not work properly on macos yay
- new ResourceLocation(ns, path) -> ResourceLocation.fromNamespaceAndPath(ns, path)
- new ResourceLocation(location) -> ResourceLocation.parse(location)
- new ResourceLocation(path) -> ResourceLocation.withDefaultNamespace(path)
- Remove ResourceLocationHelper (prefix, modelResourceLocation), methods now available in BotaniaAPI with more intuitive names (botaniaRL and botaniaModelRL)
@megadoxs
Copy link
Author

megadoxs commented Nov 2, 2024

This should be ready for 1.21.1 now. Feel free to edit anything if need be.

@artemisSystem
Copy link
Member

We'll have a look at this when the port is complete! Kinda hard to review a PR when the project doesn't compile.

Or maybe we'll incorporate the changes during the port

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
after-1.21-port This will not be fixed/implemented before the port to 1.21
Development

Successfully merging this pull request may close these issues.

AncientWillContainer Interface Compatibility issue
3 participants