VoxeLibre/VoxeLibre
VoxeLibre
/
VoxeLibre
57
134
Fork 173
Code Issues 944 Pull Requests 85 Projects 4 Releases Wiki Activity

Grand mapgen cleanup II & End update #2639

Merged
cora merged 45 commits from mapgen_cleanup into master 2022-09-14 23:08:43 +02:00
Conversation 20 Commits 45 Files Changed 42 +2716 -2294
cora commented 2022-09-10 21:50:14 +02:00
Contributor
Copy Link

Clean up the monstrosity that is mcl_mapgen_core/init.lua:

  • replaced most manual block hacks for non v6 mapgens with standard mt ops like decorations and ores
  • moved v6 fixes to separate file
  • moved ore registrations to separate file
  • moved all structures to mcl_structures (new placement option "static_pos" added for exit portal and spawn platform)
  • Enable natural deepslate and copper ore generation
  • Make jungle decorations more random (more schematics)
  • split up api functions and "world structure" (bedrock,void) generation

BONUS (End update)

  • Added Obsidian pillars with crystals on top at end spawn
  • Removed normal end terrain generation around spawn
  • cause it looks like this is going to be the end update: immobilized shulkers and added basic teleportation scheme
  • Add end boats and End Shipwrecks (with shulkers and elytras)
  • Make sure end dragon spawns, fight still works, ensure generation of structures after (open exit portal, gateway portals)

Clean up the monstrosity that is mcl_mapgen_core/init.lua: - [x] replaced most manual block hacks for non v6 mapgens with standard mt ops like decorations and ores - [x] moved v6 fixes to separate file - [x] moved ore registrations to separate file - [x] moved all structures to mcl_structures (new placement option "static_pos" added for exit portal and spawn platform) - [x] Enable natural deepslate and copper ore generation - [x] Make jungle decorations more random (more schematics) - [x] split up api functions and "world structure" (bedrock,void) generation BONUS (End update) - [x] Added Obsidian pillars with crystals on top at end spawn - [x] Removed normal end terrain generation around spawn - [x] cause it looks like this is going to be the end update: immobilized shulkers and added basic teleportation scheme - [x] Add end boats and End Shipwrecks (with shulkers and elytras) - [x] Make sure end dragon spawns, fight still works, ensure generation of structures after (open exit portal, gateway portals) ![](https://mister-muffin.de/p/0Iyo.png)
❤️ 4 🎉 2 🚀 1
Ghost commented 2022-09-10 23:12:33 +02:00
First-time contributor
Copy Link
2022-09-10 15:07:16: WARNING[Server]: Map::getNodeMetadata(): Block not found
2022-09-10 15:07:16: WARNING[Server]: Map::getNodeMetadata(): Block not found
2022-09-10 15:07:16: WARNING[Server]: Map::getNodeMetadata(): Block not found
2022-09-10 15:07:16: WARNING[Server]: Map::getNodeMetadata(): Block not found
2022-09-10 15:07:16: WARNING[Server]: Map::getNodeMetadata(): Block not found
2022-09-10 15:07:16: WARNING[Server]: Map::getNodeMetadata(): Block not found
2022-09-10 15:07:16: WARNING[Server]: Map::getNodeMetadata(): Block not found
2022-09-10 15:07:16: WARNING[Server]: Map::getNodeMetadata(): Block not found
2022-09-10 15:07:16: WARNING[Server]: Map::getNodeMetadata(): Block not found
2022-09-10 15:07:16: WARNING[Server]: Map::getNodeMetadata(): Block not found
2022-09-10 15:07:16: ACTION[Emerge-0]: [mcl_mapgen_core] Generating chunk (48,-27072,-32) ... (127,-26993,47)
2022-09-10 15:07:17: WARNING[Emerge-0]: [mcl_structures] placing end_spawn_obsidian_platform failed at (100,-26999,0)

When I went to the end. Now the thing is, the platform exists now, so it did generate. Also, can't see more than 5 nodes past the platform for whatever reason.

```bash 2022-09-10 15:07:16: WARNING[Server]: Map::getNodeMetadata(): Block not found 2022-09-10 15:07:16: WARNING[Server]: Map::getNodeMetadata(): Block not found 2022-09-10 15:07:16: WARNING[Server]: Map::getNodeMetadata(): Block not found 2022-09-10 15:07:16: WARNING[Server]: Map::getNodeMetadata(): Block not found 2022-09-10 15:07:16: WARNING[Server]: Map::getNodeMetadata(): Block not found 2022-09-10 15:07:16: WARNING[Server]: Map::getNodeMetadata(): Block not found 2022-09-10 15:07:16: WARNING[Server]: Map::getNodeMetadata(): Block not found 2022-09-10 15:07:16: WARNING[Server]: Map::getNodeMetadata(): Block not found 2022-09-10 15:07:16: WARNING[Server]: Map::getNodeMetadata(): Block not found 2022-09-10 15:07:16: WARNING[Server]: Map::getNodeMetadata(): Block not found 2022-09-10 15:07:16: ACTION[Emerge-0]: [mcl_mapgen_core] Generating chunk (48,-27072,-32) ... (127,-26993,47) 2022-09-10 15:07:17: WARNING[Emerge-0]: [mcl_structures] placing end_spawn_obsidian_platform failed at (100,-26999,0) ``` When I went to the end. Now the thing is, the platform exists now, so it did generate. Also, can't see more than 5 nodes past the platform for whatever reason.
screenshot_20220910_151107.png
213 KiB
screenshot_20220910_151107.png
Ghost commented 2022-09-10 23:13:55 +02:00
First-time contributor
Copy Link

Havent looked at the jungle trees yet, but other than that and the end issue, everything else seems to work.

Havent looked at the jungle trees yet, but other than that and the end issue, everything else seems to work.
cora commented 2022-09-10 23:51:26 +02:00
Author
Contributor
Copy Link

yeah the getNodeMetadata (MineClone2/MineClone2#2365) is unrelated i think - didn't happen for me going to the end just now anyways.

And yeah the lighting thing needs to be fixed.

yeah the getNodeMetadata (https://git.minetest.land/MineClone2/MineClone2/issues/2365) is unrelated i think - didn't happen for me going to the end just now anyways. And yeah the lighting thing needs to be fixed.
Ghost commented 2022-09-11 01:11:58 +02:00
First-time contributor
Copy Link
2022-09-10 16:51:36: WARNING[Emerge-0]: [mcl_structures] placing end_spike failed at (43,-27001,0)
2022-09-10 16:51:36: WARNING[Emerge-0]: [mcl_structures] placing end_spike failed at (34.787730758123,-27001,25.274765848576)
2022-09-10 16:51:36: WARNING[Emerge-0]: [mcl_structures] placing end_spike failed at (13.287730758123,-27001,40.895430200692)
2022-09-10 16:51:36: WARNING[Emerge-0]: [mcl_structures] placing end_spike failed at (-13.287730758123,-27001,40.895430200692)
2022-09-10 16:51:36: WARNING[Emerge-0]: [mcl_structures] placing end_spike failed at (34.787730758123,-27001,-25.274765848576)

Had these, but the spikes still generated.

``` 2022-09-10 16:51:36: WARNING[Emerge-0]: [mcl_structures] placing end_spike failed at (43,-27001,0) 2022-09-10 16:51:36: WARNING[Emerge-0]: [mcl_structures] placing end_spike failed at (34.787730758123,-27001,25.274765848576) 2022-09-10 16:51:36: WARNING[Emerge-0]: [mcl_structures] placing end_spike failed at (13.287730758123,-27001,40.895430200692) 2022-09-10 16:51:36: WARNING[Emerge-0]: [mcl_structures] placing end_spike failed at (-13.287730758123,-27001,40.895430200692) 2022-09-10 16:51:36: WARNING[Emerge-0]: [mcl_structures] placing end_spike failed at (34.787730758123,-27001,-25.274765848576) ``` Had these, but the spikes still generated.
cora force-pushed mapgen_cleanup from 93110b1512 to aea4d1de23 2022-09-11 01:16:32 +02:00 Compare
cora force-pushed mapgen_cleanup from 3d9b4e96e1 to 1f0873ec82 2022-09-11 12:43:29 +02:00 Compare
cora force-pushed mapgen_cleanup from daaacbeade to 20cb80026d 2022-09-11 19:50:26 +02:00 Compare
cora changed title from WIP: Grand mapgen cleanup II to WIP: Grand mapgen cleanup II & End update 2022-09-11 19:55:30 +02:00
AFCMS added the
mapgen
 label 2022-09-11 20:12:29 +02:00
cora force-pushed mapgen_cleanup from 19f11c3898 to f73a179ccc 2022-09-11 21:12:58 +02:00 Compare
cora force-pushed mapgen_cleanup from f73a179ccc to 155a045003 2022-09-11 21:58:39 +02:00 Compare
cora force-pushed mapgen_cleanup from e0e23160d3 to f35bc09e3d 2022-09-12 00:09:35 +02:00 Compare
Ghost commented 2022-09-12 04:28:45 +02:00
First-time contributor
Copy Link

Are new lit end return portals supposed to continue generating every time a new dragon is killed?

Are new lit end return portals supposed to continue generating every time a new dragon is killed?
cora commented 2022-09-12 05:33:19 +02:00
Author
Contributor
Copy Link

well it goes out when you respawn the dragon and then activates again when it's killed.

well it goes out when you respawn the dragon and then activates again when it's killed.
cora changed title from WIP: Grand mapgen cleanup II & End update to Grand mapgen cleanup II & End update 2022-09-12 19:23:19 +02:00
Ghost commented 2022-09-13 18:24:00 +02:00
First-time contributor
Copy Link

Beam healing works, but the dragon isnt spawning upon entering the end for the first time.

Beam healing works, but the dragon isnt spawning upon entering the end for the first time.
cora commented 2022-09-13 18:54:44 +02:00
Author
Contributor
Copy Link

It is (for me at least) - takes a couple seconds generally but if the block containing the exit portal has not been loaded before it spawns.

It is (for me at least) - takes a couple seconds generally but if the block containing the exit portal has not been loaded before it spawns.
Ghost commented 2022-09-13 18:58:53 +02:00
First-time contributor
Copy Link

It is (for me at least) - takes a couple seconds generally but if the block containing the exit portal has not been loaded before it spawns.

Its not spawning at all for me, and I loaded the entire island and flew around trying to find it.

> It is (for me at least) - takes a couple seconds generally but if the block containing the exit portal has not been loaded before it spawns. Its not spawning at all for me, and I loaded the entire island and flew around trying to find it.
cora force-pushed mapgen_cleanup from 7f6337ee0e to 01d8511ac2 2022-09-13 19:04:24 +02:00 Compare
cora commented 2022-09-13 19:05:18 +02:00
Author
Contributor
Copy Link

just tried again and it worked - did the exit portal spawn ? because that triggers the dragon spawning.

just tried again and it worked - did the exit portal spawn ? because that triggers the dragon spawning.
Ghost commented 2022-09-13 19:07:39 +02:00
First-time contributor
Copy Link

just tried again and it worked - did the exit portal spawn ? because that triggers the dragon spawning.

Aye, they generate, but no dragon.

> just tried again and it worked - did the exit portal spawn ? because that triggers the dragon spawning. Aye, they generate, but no dragon.
cora force-pushed mapgen_cleanup from 01d8511ac2 to 5214e0c572 2022-09-13 19:08:43 +02:00 Compare
Ghost force-pushed mapgen_cleanup from 5214e0c572 to a0f6156380 2022-09-13 19:10:28 +02:00 Compare
Ghost commented 2022-09-13 19:11:07 +02:00
First-time contributor
Copy Link

Ok, I will try it again.

Ok, I will try it again.
cora commented 2022-09-13 19:11:25 +02:00
Author
Contributor
Copy Link

mmh works for me every single time, both when i tp to the end and when using a portal

mmh works for me every single time, both when i tp to the end and when using a portal
cora commented 2022-09-13 19:18:09 +02:00
Author
Contributor
Copy Link

I might make the island a bit larger still though - afair in mc there is a good chance the spawn platform is underground within the island.

I might make the island a bit larger still though - afair in mc there is a good chance the spawn platform is underground within the island.
cora commented 2022-09-13 19:18:36 +02:00
Author
Contributor
Copy Link

Also maybe it should emerge the area around the portal maybe that helps with spawning issues

Also maybe it should emerge the area around the portal maybe that helps with spawning issues
cora commented 2022-09-13 19:19:09 +02:00
Author
Contributor
Copy Link

Does it say "[mcl_mapgen_core] ERROR! Ender dragon doesn't want to spawn" in the log btw ?

Does it say "[mcl_mapgen_core] ERROR! Ender dragon doesn't want to spawn" in the log btw ?
cora added 1 commit 2022-09-13 19:49:40 +02:00
Ghost commented 2022-09-13 19:56:25 +02:00
First-time contributor
Copy Link

How about I code up some advancements to go with this? Hehehehe

Also, created two new worlds, both times the e dragon spawned.

How about I code up some advancements to go with this? Hehehehe Also, created two new worlds, both times the e dragon spawned.
👍 2
Ghost commented 2022-09-13 20:04:59 +02:00
First-time contributor
Copy Link

image

![image](/attachments/f06e9ea8-7be6-400e-8330-81da736a3c79)
image.png
44 KiB
Ghost commented 2022-09-13 20:14:56 +02:00
First-time contributor
Copy Link

Oh, one thing I forgot to do....look for clay. Time to fire up dragonfireclient.

Oh, one thing I forgot to do....look for clay. Time to fire up dragonfireclient.
Ghost commented 2022-09-13 20:20:30 +02:00
First-time contributor
Copy Link

Clay gen works 👍

Clay gen works 👍
screenshot_20220913_121936.png
362 KiB
screenshot_20220913_121936.png
cora added 1 commit 2022-09-13 22:41:07 +02:00
cora added 1 commit 2022-09-13 23:09:12 +02:00
cora force-pushed mapgen_cleanup from db06b1e313 to 35bb30d217 2022-09-14 01:55:44 +02:00 Compare
cora force-pushed mapgen_cleanup from 35bb30d217 to 0c518d3bd1 2022-09-14 03:10:37 +02:00 Compare
Ghost approved these changes 2022-09-14 03:42:34 +02:00
Ghost left a comment
First-time contributor
Copy Link

Works. LGTM. Maybe get a second person to test it out too, but doesnt matter.

Works. LGTM. Maybe get a second person to test it out too, but doesnt matter.
Ghost force-pushed mapgen_cleanup from 0c518d3bd1 to eea1695ee3 2022-09-14 22:37:18 +02:00 Compare
cora merged commit 20ccb6d21e into master 2022-09-14 23:08:43 +02:00
cora deleted branch mapgen_cleanup 2022-09-14 23:08:51 +02:00
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
#P1 CRITICAL

for crashes, catastrophic bugs, etc.

  
#P2: HIGH

highest priority level

  
#P3: elevated

2nd-highest priority level

  
#P4 priority: medium

for things that aren't elevated but have been prioritised

  
#P6: low

low priority level

  
#Review

Tickets that may improve or fix an issue but will need a review after a short period of time

  
annoying

non-bugs that annoys people

  
API

   
bug

   
code quality

   
combat

   
commands

   
compatibility

Label to cover migration issues from old worlds or mcl5

  
configurability

   
contribution inside

   
controls

   
core feature

   
creative mode

   
delayed for engine release

   
documentation

   
duplicate

   
enhancement

enhancement request/suggestion

  
environment

Issues that affect weather or light

  
gameplay

   
graphics

   
ground content conflict

mapgen gc-specific quirks

  
GUI/HUD

   
help wanted

   
incomplete feature

   
invalid / won't fix

Invalid, or will not fix

  
items

   
looking for contributor

   
mapgen

   
meta

Relating to VoxeLibre on Mesehub and elsewhere

  
mineclone2+

fit for MineClone2-Plus

  
Minecraft >= 1.13

   
Minecraft >= 1.17

   
missing feature

   
mobile

involving Minetest on mobile devices (android)

  
mobs

   
mod support

Issues related to mod support

  
model needed

A model is needed to be created or updated

  
multiplayer

Issues affecting multiplayer

  
Needs adoption

PR needs author action or to be adopted so changes can be implemented to get the PR closer to merge

  
needs discussion

   
needs engine change

   
needs more information

   
needs research

   
nodes

   
non-Minecraft feature

   
non-mob entities

   
performance

   
player

issues related to the player

  
possible close

   
redstone

   
release notes

This ticket will need information adding to release notes

  
schematics

   
Skyblock

   
sounds

   
Testing / Retest

This needs testing or retesting

  
tools

Related to the tools scripts, which aren't run in game

  
translation

   
unconfirmed
  
mcl5

Possibly relevant for MineClone5

  
mcla

Possibly relevant for Mineclonia

  
Media missing

media files for this feature are missing - contributions welcome

No Label
#P1 CRITICAL
#P2: HIGH
#P3: elevated
#P4 priority: medium
#P6: low
#Review
annoying
API
bug
code quality
combat
commands
compatibility
configurability
contribution inside
controls
core feature
creative mode
delayed for engine release
documentation
duplicate
enhancement
environment
gameplay
graphics
ground content conflict
GUI/HUD
help wanted
incomplete feature
invalid / won't fix
items
looking for contributor
mapgen
meta
mineclone2+
Minecraft >= 1.13
Minecraft >= 1.17
missing feature
mobile
mobs
mod support
model needed
multiplayer
Needs adoption
needs discussion
needs engine change
needs more information
needs research
nodes
non-Minecraft feature
non-mob entities
performance
player
possible close
redstone
release notes
schematics
Skyblock
sounds
Testing / Retest
tools
translation
unconfirmed
mcl5
mcla
Media missing
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: VoxeLibre/VoxeLibre#2639
No description provided.
Delete Branch "mapgen_cleanup"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?