Skip to content
This repository has been archived by the owner on Aug 12, 2024. It is now read-only.

Cleaner Cuberite integration and world customizations #74

Merged
merged 7 commits into from
Mar 1, 2017

Conversation

dave-tucker
Copy link
Contributor

This PR fixes #71 and #54

The cuberite integration has been cleaned up so we now no longer have overlapping code.
To bump the cuberite version, we just increment the build number in the Dockerfile.

While cleaning this up, I took the liberty of adjusting the world.ini to generate an empty world instead of having one checked in to the repo.

The empty world was a little too empty for my liking, so I changed the config to generate a flat world underneath the containers.
This also reduced the complexity of the plugin code while also adding a new feature...

Introducing Customizations 🎉
You can transport your containers from the Plains to any other Biome of your choosing.
There are some examples of how to do this in the README along with images.
Oh, and if you are longing for the vanilla Dockercraft experience, you can use the Sky biome 😀

Additional minor fixes:

  • Added support for RC release of docker (now works on Docker for Mac beta)
  • Reformatted lua code with ZeroBraneStudio to get our indentation under control
  • Removed a stray binary that was checked in by mistake

Dave Tucker added 6 commits December 8, 2016 18:05
- Keep only the server.ini, world.ini and motd.txt files
- Make generators in world.ini configurable
- Pin Cuberite version in Dockerfile to latest (630)
- Rearrange Dockerfile to bust the cache less often

Fixes: docker#71, docker#54

Signed-off-by: Dave Tucker <dt@docker.com>
Signed-off-by: Dave Tucker <dt@docker.com>
This should never have been checked in

Signed-off-by: Dave Tucker <dt@docker.com>
I noticed some weird things happening after I'd changed to using a newly
generated world. Namely, the WorldStarted hook was being triggered
*after* the updates for other containers had already been queued!

To fix this I:
- Made all ground drawing happen in addGround
- Changed the update queue to be a more traditional strict queue
  - This has the added benefit that we can check the length easily
- Removed unused hooks - WorldStarted and OnChunkGenerated

Signed-off-by: Dave Tucker <dt@docker.com>
The lua code was a mess of mixed indentation and trailing spaces.
Using ZeroBraneStudio correct indentation and vim, this is now fixed.
We should aspire to keep it tidier

Signed-off-by: Dave Tucker <dt@docker.com>
Signed-off-by: Dave Tucker <dt@docker.com>
@dave-tucker
Copy link
Contributor Author

One final implementation note...

I adjusted the addGround method to also addSky - it puts Air blocks in the spaces around the containers. This clears out any pesky trees that might be in the way... but it also allows you to do something cool, like putting all of your containers underground :)

I also seemed to be hitting a bug with Docker 1.13 RC3 - occasionally the container info didn't make it back and/or we were dropping block updates. This manifested as missing text on signs.
Strangely enough, disconnecting and reconnecting to the world cleared the issue.

Signed-off-by: Dave Tucker <dt@docker.com>
@dave-tucker
Copy link
Contributor Author

Merging as master won't build due to new Cuberite runtime requirements (some missing apt-get invocations no doubt).

@dave-tucker dave-tucker merged commit 8d1259f into docker:master Mar 1, 2017
@dave-tucker dave-tucker mentioned this pull request Mar 1, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Cubrite vendoring and update
1 participant