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

Split fence and gate #503

Merged
merged 13 commits into from
Aug 10, 2024
Merged

Conversation

Wmaxlees
Copy link

@Wmaxlees Wmaxlees commented Aug 7, 2024

This pull requests does 2 things;

  1. Splits the config that allows us to enable/disable fences and enable/disable gates
  2. Makes the non-classic woods (warped stem, cherry, etc.) gates, doors, fences, etc rely on the specific gates, doors, fences, etc. flags so that you can turn off cherry doors, for example, without losing all cherry blocks.

@Roadhog360
Copy link
Owner

Does this include your previous pull request for deepslate? It seems like it does.

@Wmaxlees
Copy link
Author

Wmaxlees commented Aug 7, 2024

It does. It's a mistake. I'll wait till that's either merged or rejected and then clean this one up. Sorry for the noise.

@Roadhog360
Copy link
Owner

It's alright. As for this pr... I am wondering if I want to introduce new config options for the gate/fence/woodredstone etc subset of blocks, specifically for the woods not in vanilla 1.7.10. The goal was to have the config toggles only apply to the vanilla woods, in case another mod adds them, which is why the new woods didn't have this value. If I were to accept this, then there'd no longer be a way to disable just those vanilla variants, in the case that another mod's adding them. I'm currently weighing in the potential value of new config options, and if it'd be worth making the config file larger for it

@Wmaxlees
Copy link
Author

Wmaxlees commented Aug 8, 2024

What about something like:

// Existing Configs
b:enableVanillaFences
b:enableVanillaWoodRedstone

// New Configs
b:enableVanillaGates
b:enableNewWoodGates
b:enableNewWoodFences
b:enableNewWoodRedstone

4 new entries to the config. Is that more bloat than you'd like?

@Roadhog360
Copy link
Owner

The problem with this is now, if we change its name, we are undoing the previous config choice people have made and has to be made again.

@Roadhog360
Copy link
Owner

Hm... I think I will accept this outcome. Will be re-reviewed after deepslate is merged

@Roadhog360
Copy link
Owner

Your previous PR has now been merged, so you can move forward with the cleanup you had planned here.

@Roadhog360
Copy link
Owner

What about something like:

// Existing Configs
b:enableVanillaFences
b:enableVanillaWoodRedstone

// New Configs
b:enableVanillaGates
b:enableNewWoodGates
b:enableNewWoodFences
b:enableNewWoodRedstone

4 new entries to the config. Is that more bloat than you'd like?

Is this still planned? Just makin sure

@Wmaxlees
Copy link
Author

Wmaxlees commented Aug 9, 2024

Yes. Still working through the change now that the rebase is done.

@Wmaxlees
Copy link
Author

Wmaxlees commented Aug 9, 2024

Done. We went from 5 -> 12 configs for this. Let me know if it's too much.

@Wmaxlees Wmaxlees marked this pull request as ready for review August 9, 2024 04:48
@Roadhog360
Copy link
Owner

Looks good. You forgot to apply enable new fences to WOOD_FENCE block though

@Wmaxlees
Copy link
Author

Wmaxlees commented Aug 9, 2024

Good catch. Added

@Roadhog360
Copy link
Owner

Roadhog360 commented Aug 10, 2024

Umm I'm trying to merge this but it apparently has merge conflicts? I'm on mobile rn, can you please see what GitHub is complaining for?

It could be the leftover deepslate commits causing a conflict. Might need to cherrypick the changes over a reset version of one pulled from upstream

@Wmaxlees
Copy link
Author

It was some of the recipe checks for GTNH. It should be all merged properly now. Let me double check.

@Wmaxlees
Copy link
Author

Yeah. Merge looks good to me.

@Roadhog360 Roadhog360 merged commit 86b9205 into Roadhog360:master Aug 10, 2024
1 check passed
@Wmaxlees Wmaxlees deleted the split_fence_and_gate branch August 10, 2024 04:23
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.

2 participants