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.

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

Implemented a large amount of worldgen #386

Merged
merged 22 commits into from
Aug 21, 2023
Merged

Implemented a large amount of worldgen #386

merged 22 commits into from
Aug 21, 2023

Conversation

explorer3039
Copy link
Contributor

@explorer3039 explorer3039 commented Aug 13, 2023 •
edited
Loading

Added deepslate layer, bedrock layer at -64, and vanilla-like ores gen.

@explorer3039 explorer3039 marked this pull request as draft August 13, 2023 07:38
@explorer3039 explorer3039 changed the title Implemented bedrock, deepslate and deepslate ores in worldgen Implemented a large amount of worldgen Aug 13, 2023
@explorer3039 explorer3039 marked this pull request as ready for review August 13, 2023 09:07
Jonpro03
Jonpro03 requested changes Aug 14, 2023
View reviewed changes
Copy link
Member

@Jonpro03 Jonpro03 left a comment

Choose a reason for hiding this comment

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

Thank you so much for the PR! I have a few suggestions but the only change I'd consider req'd is to change the else ifs to a switch.

Cheers!

Obsidian/WorldData/Generators/Overworld/ChunkBuilder.cs Outdated Show resolved Hide resolved
Obsidian/WorldData/Generators/Overworld/ChunkBuilder.cs Outdated Show resolved Hide resolved
Obsidian/WorldData/Generators/Overworld/ChunkBuilder.cs Outdated Show resolved Hide resolved
Jonpro03
Jonpro03 previously approved these changes Aug 14, 2023
View reviewed changes
Copy link
Member

@Jonpro03 Jonpro03 left a comment

Choose a reason for hiding this comment

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

Thanks for the edits! I suspect @Tides will want you to put the ItemEntity code back, even if it is broken :)
Hold tight for a second code reviewer then we'll get this merged.

Craftplacer
Craftplacer requested changes Aug 16, 2023
View reviewed changes
Obsidian/Entities/ItemEntity.cs Outdated Show resolved Hide resolved
Craftplacer
Craftplacer previously approved these changes Aug 17, 2023
View reviewed changes
@Craftplacer Craftplacer requested a review from Tides August 17, 2023 06:22
Tides
Tides previously requested changes Aug 18, 2023
View reviewed changes
Copy link
Member

@Tides Tides left a comment

Choose a reason for hiding this comment

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

Hey! Thank you for opening up a pr to add ore to our world generation. Everything else aside from my comments looks good~

Obsidian/Assets/tags.json Show resolved Hide resolved
Obsidian/Entities/ItemEntity.cs Outdated Show resolved Hide resolved
Obsidian/WorldData/Generators/Overworld/ChunkBuilder.cs Outdated Show resolved Hide resolved
Obsidian/WorldData/Generators/Overworld/ChunkBuilder.cs Outdated Show resolved Hide resolved
Obsidian/WorldData/Generators/Overworld/ChunkBuilder.cs Outdated Show resolved Hide resolved
Jonpro03
Jonpro03 approved these changes Aug 21, 2023
View reviewed changes
Copy link
Member

@Jonpro03 Jonpro03 left a comment

Choose a reason for hiding this comment

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

Looks excellent. Thanks again for the PR!

@Jonpro03 Jonpro03 dismissed Tides’s stale review August 21, 2023 23:50

Comments have been addressed - merging

@Jonpro03 Jonpro03 merged commit a85ebf8 into ObsidianMC:master Aug 21, 2023
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Jonpro03 Jonpro03 Jonpro03 approved these changes

@Tides Tides Tides left review comments

@Craftplacer Craftplacer Craftplacer left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@explorer3039 @Jonpro03 @Tides @Craftplacer