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

Blocks update for 1.15 #348

Merged
merged 14 commits into from
Apr 15, 2020
Merged

Blocks update for 1.15 #348

merged 14 commits into from
Apr 15, 2020

Conversation

miclav
Copy link

@miclav miclav commented Jan 9, 2020

This pull request contains:

Screen Shot 2020-01-09 at 16 29 22
Screen Shot 2020-01-09 at 16 29 33

@miclav miclav marked this pull request as ready for review January 9, 2020 21:44
@miclav miclav changed the title World115 Blocks update for 1.15 Jan 9, 2020
@elamperti
Copy link
Collaborator

elamperti commented Feb 6, 2020

I was able to build and render a 1.15 map successfuly (although there are lots of warnings for outdated biomes?)

[WARNING] [default] Out dated chunk -11:-103: Old biome data found!

Other than that, it's looking good.

Selection_105

I'll test with a 1.14 map we're using in a server to see if anything else breaks, but so far it looks good 👍 Great work!

@miclav
Copy link
Author

miclav commented Feb 24, 2020

Bells are now also rendered correctly
image

@ddoiron79
Copy link

my error the map was generated in 1212 resolution and it need to be 1616 to fit with marker

@elamperti
Copy link
Collaborator

@ddoiron79 although not related with the changes on this PR, if the markers are wrongly positioned with different resolutions then it's a bug and it should have its own issue.

@jasonwc
Copy link

jasonwc commented Feb 29, 2020

Also can verify this works! Deployed alongside a minecraft server using the Docker image and it works great! Saw the same warnings, but the rendered map looks fine.

@matthewpayne
Copy link

Any chance someone can compile this for Windows. I can't seem to compile it, or don't know how for windows. I really need to map out 1.15. I really wish this was merged.. thanks for the good work

@cliffmeyers
Copy link

@matthewpayne not sure if this helps, but if you're on W10 you can install Ubuntu via Windows Subsystem for Linux and follow the Linux instructions. It's worked well for me.

Copy link
Collaborator

@elamperti elamperti left a comment

Choose a reason for hiding this comment

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

Assuming @bemk changes in chunk format are ok, this PR is looking good to be merged into world113. Thanks for your contribution @miclav!

@m0r13
Copy link
Member

m0r13 commented Mar 18, 2020

Just had a look as well. Code looks good, I'm just wondering with the slight change in the world biome format if it's possible/useful to support the biome format 1.14 as well.

@Ghost-chu
Copy link

Can i have a build for this pr?
I'm glad to test and reporting if there have any bugs ^ ^

@m0r13
Copy link
Member

m0r13 commented Mar 19, 2020

@Ghost-chu unfortunately the build system is not ready for that at the moment. Hopefully in the future.

@elamperti
Copy link
Collaborator

@m0r13 I've just opened #351 to track the 1.14 biome format, so we can greenlight this PR, merge it and keep world113 as reference for the 1.13+ changes.

Is there anything else pending to merge this?

@m0r13
Copy link
Member

m0r13 commented Mar 19, 2020

Think good to go then.

@josephrooks
Copy link

josephrooks commented Apr 4, 2020

I was able to build and render a 1.15 map successfuly (although there are lots of warnings for outdated biomes?)

[WARNING] [default] Out dated chunk -11:-103: Old biome data found!

Other than that, it's looking good.

Selection_105

I'll test with a 1.14 map we're using in a server to see if anything else breaks, but so far it looks good 👍 Great work!

The game updates chunk data as new chunks are loaded, does that map have chunks on it you generated in a previous version and haven't visited again in a newer one? You can force it to update the whole map to the latest version by starting the server up with the -forceupgrade flag. It'll load each chunk, update it, and save it.

This warning might just be to let you know it's rendering chunks that are still using the old format, if you're not seeing anything visually wrong with them. I wouldn't know, but given that the format does change at least slightly with each version, it's probably a backwards compatibility thing that you can safely ignore.

@bemk
Copy link

bemk commented Apr 4, 2020

@josephrooks The outdated chunks warning is because those chunks were generated using an older version of Minecraft, and the game only brings the biome data up to date when the chunk gets loaded anew.

The trick to avoid this, and I've described that in my pull request which has been merged into this one, is to start the server with a --forceUpgrade parameter on the command line. That way the server runs through all the chunks before opening up to clients.

If it weren't for a couple of mental health problems, I'd also have added dual support for the old and new formats. The difference between the two can be found by looking at the array size in the NBT data.

Another thing that's still missing, is that the biome data now also includes an elevation component. So a map maker would be able to stack multiple biomes on top of one another, but currently the biome data of the lowest 4x4x4 sub chunk is used by mapcrafter for the entire 4x4 column all the way up to build height. Again, I would have considered adding it if I didn't have a lack of focus at the minute.

@cliffmeyers
Copy link

Seems like updating the warning message Old biome data found! to include "did you use --forceUpgrade?" might be enough to steer people in the right direction on their own in the future?

@elamperti
Copy link
Collaborator

I'll be merging this branch so we can focus our efforts on world113 and merge that one into master soon (after doing some checks and updating the README, at least!)

FYI @m0r13

@elamperti elamperti merged commit 25f3f4f into mapcrafter:world113 Apr 15, 2020
@oskarkk

This comment has been minimized.

@slothbear
Copy link

Is ok to update an existing map (made from the master branch) with the world113 branch program? Or best to generate a new map from scratch? I am mapping a very large world and the full (non-update) method takes many hours.

@bemk
Copy link

bemk commented May 6, 2020

@slothbear I haven't tested it, but from what I can tell if you update mapcrafter at the same time with the server executable, and run start that server executable at least once with the --force-upgrade option, it should mostly work with the existing images.

The way biomes are stored is changed a little, so you may find the biome edges may be up to 4 blocks off between the existing tiles sitting beside the newly updated tiles.

There may be a couple of other little glitches but nothing too bad really. And if all else fails, just let it crank for a couple of hours. It's what I did, but then again, the biome colours were all off before we updated that code.

@mapcrafter mapcrafter locked as resolved and limited conversation to collaborators May 27, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.