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

Add FTB Chunks ore prospector compatibility #2642

Open
wants to merge 44 commits into
base: 1.20.1
Choose a base branch
from

Conversation

omergunr100
Copy link
Contributor

@omergunr100 omergunr100 commented Dec 25, 2024

What

Show ore veins and bedrock fluids in the FTB Chunks map.

Implementation Details

Ore veins are using the ftb api, for the fluid veins needed to resort to mixins.

Outcome

Resolves #2587

Additional Information

Fixes long standing bug where fluid veins were serialized incorrectly, yield and percentage left were reversed in serialization.

@krossgg krossgg added the type: feature New feature or request label Dec 25, 2024
@omergunr100 omergunr100 marked this pull request as ready for review December 26, 2024 14:35
@omergunr100 omergunr100 requested a review from a team as a code owner December 26, 2024 14:35
@omergunr100 omergunr100 marked this pull request as draft December 26, 2024 15:29
@omergunr100 omergunr100 marked this pull request as ready for review December 26, 2024 16:41
@jtuc
Copy link
Contributor

jtuc commented Dec 26, 2024

Really looking forward to this! Take my comments with a grain of salt, I'm not part of the devteam - I just like testing things.

@omergunr100
Copy link
Contributor Author

your right click menu and large map mixin look good, I'll cherry pick them over to my branch, though the mini map at least from what I understand is a much more limited version of the large map, and mouse/key click events don't trigger on it, so I don't think that the large map type check is necessary (unless you managed to trigger them on the mini map that is)

@omergunr100
Copy link
Contributor Author

oh never mind you just used it to cast

@omergunr100
Copy link
Contributor Author

I think it's done

@omergunr100
Copy link
Contributor Author

found a bug with the fluid widget waypoint code, will debug it tomorrow, don't merge this yet

@omergunr100
Copy link
Contributor Author

Fixed the bug, the fluid vein overlay for the minimap is kind of weird, I could just remove it entirely, would appreciate more opinions

@screret
Copy link
Member

screret commented Dec 29, 2024

I think it should render the fluids on the minimap as well.

@omergunr100
Copy link
Contributor Author

I think I should add a way to switch specific map mod compats on/off through the config.
Otherwise whenever you create a waypoint you get 2 different waypoints from multiple mods and it's a nuisance, I mean when it was just xaerox and journey map it was fine because you had one or the other, but ftb chunks is used for chunk loading and is in most packs along side journey map or xaerox.

@omergunr100
Copy link
Contributor Author

Dejankified the minimap fluid vein overlay... with one tiny downside, if the ftb team decide to do a refactor of how they render waypoints it'll (in some likelyhood) cause ftb chunks not to load.
I think it's only fair, they created the jank and I am the unjankler.


@Configurable
@Configurable.Comment({ "Xaerox's map integration enabled" })
public boolean xaeroxMapIntegration = true;
Copy link
Member

Choose a reason for hiding this comment

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

xaerosMap, not xaeroxMap


@Configurable
@Configurable.Comment({ "FTB Chunks integration enabled" })
public boolean chunksIntegration = false;
Copy link
Member

Choose a reason for hiding this comment

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

name this ftbChunksIntegration

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type: feature New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Minimap support for FTB Chunks
4 participants