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

Update to 1.15.2 and start deprecating singular tags #47

Merged
merged 1 commit into from
Mar 4, 2020

Conversation

i509VCB
Copy link
Contributor

@i509VCB i509VCB commented Nov 25, 2019

Fixes #46

Changes proposed in this pull request:

  • Converts LayeredOreBlocks to the new rendering system.
  • Why do all the ores light up at night? I don't know but only the uranium does that now and has a lit state.
  • World gen changes in how features are created were accounted for.

Note I also found an issue where if there was no replacer specified for any of the stone blocks, the overworld version of the ores would fail to actually generate.

@liach
Copy link

liach commented Nov 25, 2019

How about pre2 now that it's out

@i509VCB
Copy link
Contributor Author

i509VCB commented Nov 26, 2019

Got it to pre2

@i509VCB i509VCB changed the title Update to 1.15-pre1 Update to 1.15-pre2 Nov 26, 2019
Copy link
Member

@LemmaEOF LemmaEOF left a comment

Choose a reason for hiding this comment

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

Looking pretty good. Just wanna clarify some things.

@LemmaEOF
Copy link
Member

LemmaEOF commented Dec 1, 2019

You mentioned changing the oregen spec over in Discord. Did that change go through?

@i509VCB
Copy link
Contributor Author

i509VCB commented Dec 1, 2019

That is going to be part of the detachment of world Gen from CR. Which is going to take a bit longer.

@muzikbike
Copy link

Should probably become 1.15 now

@i509VCB
Copy link
Contributor Author

i509VCB commented Dec 10, 2019

I've realized that some parts need a general rewrite, so I've decided to isolate oregen into a new isolated system. Mainly due to biome and dimension specs having an issue because they load before tags are ever handled.

I'll probably name the new ore system StaticOre (because it uses static data) and then implement the current CR system onto it.

In that case CR will just be giving the ores it want generated to the ore generator if anything wants ore.

@LemmaEOF
Copy link
Member

LemmaEOF commented Jan 8, 2020

Is there anything else that needs to be fixed before this can be merged?

gradle.properties Outdated Show resolved Hide resolved
@i509VCB i509VCB changed the title Update to 1.15-pre2 Update to 1.15.1 Jan 9, 2020
@i509VCB
Copy link
Contributor Author

i509VCB commented Jan 9, 2020

Looked at codebase again and see if I could make dimension/biome tags work properly. I think I just need to add a mixin to RegistryTagManager so it is loaded at the same time as the block tags.

I'll do more work tomorrow on it.

@LemmaEOF
Copy link
Member

This is looking pretty good! Feel free to make any breaking changes you deem necessary, since there currently aren't any mods that actually use this lol.

@i509VCB i509VCB changed the title Update to 1.15.1 Update to 1.15.2 Feb 5, 2020
@i509VCB i509VCB changed the base branch from 1.15-pre1 to 1.15.2 March 3, 2020 22:08
@i509VCB i509VCB self-assigned this Mar 3, 2020
@i509VCB i509VCB changed the title Update to 1.15.2 Update to 1.15.2 and start deprecating singular tags Mar 3, 2020
@i509VCB i509VCB merged commit 22f568b into CottonMC:1.15.2 Mar 4, 2020
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.

Tags use singular names instead of plural, as per convention World gen changes in 1.15 break ore gen
4 participants