From 8730b03a521716cc89fba20f051f44bd27b1223c Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Thu, 25 Apr 2024 03:00:21 +0300
Subject: [PATCH] fixes

---
 res/layouts/pages/generators.xml.lua |  2 +-
 res/layouts/pages/new_world.xml      |  2 +-
 res/layouts/pages/new_world.xml.lua  | 11 ++++++++++-
 src/files/WorldRegions.cpp           |  9 ++++++---
 src/files/WorldRegions.hpp           |  2 +-
 5 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/res/layouts/pages/generators.xml.lua b/res/layouts/pages/generators.xml.lua
index 57964fb0..dd9b6743 100644
--- a/res/layouts/pages/generators.xml.lua
+++ b/res/layouts/pages/generators.xml.lua
@@ -12,5 +12,5 @@ function on_open()
             name=settings.generator_name(k)
         }))
     end
-    panel:add("<button padding='10' onclick='menu:back()'>@Back</button>")
+    panel:add("<button onclick='menu:back()'>@Back</button>")
 end
diff --git a/res/layouts/pages/new_world.xml b/res/layouts/pages/new_world.xml
index d017b382..9828acda 100644
--- a/res/layouts/pages/new_world.xml
+++ b/res/layouts/pages/new_world.xml
@@ -7,7 +7,7 @@
     </textbox>
     <label>@Seed</label>
     <textbox id='seed_box' placeholder='-' padding='4'></textbox>
-    <button onclick='menu.page="generators"' id='generator_btn'>
+    <button onclick='save_state() menu.page="generators"' id='generator_btn'>
         @World generator
     </button>
     <button onclick='create_world()' margin='1,20,1,1'>
diff --git a/res/layouts/pages/new_world.xml.lua b/res/layouts/pages/new_world.xml.lua
index cd8101cf..625ccbba 100644
--- a/res/layouts/pages/new_world.xml.lua
+++ b/res/layouts/pages/new_world.xml.lua
@@ -4,6 +4,11 @@ function world_name_validator(name)
     return name:match("^[%w-\\.\\ ]+$") ~= nil and not world.exists(name)
 end
 
+function save_state()
+    settings.name = document.name_box.text
+    settings.seed = document.seed_box.text
+end
+
 function settings.generator_name(id)
     local prefix, name = parse_path(id)
     if prefix == "core" then
@@ -19,7 +24,9 @@ function create_world()
     end
     local name = document.name_box.text
     local seed = document.seed_box.text
-    core.new_world(name, seed, settings.generator)
+    local generator = settings.generator
+    session.reset_entry('new_world')
+    core.new_world(name, seed, generator)
 end
 
 function on_open()
@@ -31,5 +38,7 @@ function on_open()
         gui.str("World generator", "world"), 
         settings.generator_name(settings.generator)
     )
+    document.name_box.text = settings.name or ''
+    document.seed_box.text = settings.seed or ''
     document.seed_box.placeholder = tostring(math.random()):sub(3)
 end
diff --git a/src/files/WorldRegions.cpp b/src/files/WorldRegions.cpp
index 23f92d9c..99d8ba3f 100644
--- a/src/files/WorldRegions.cpp
+++ b/src/files/WorldRegions.cpp
@@ -219,7 +219,7 @@ void WorldRegions::closeRegFile(glm::ivec3 coord) {
 }
 
 // Marks regfile as used and unmarks when shared_ptr dies
-std::shared_ptr<regfile> WorldRegions::getRegFile(glm::ivec3 coord) {
+std::shared_ptr<regfile> WorldRegions::getRegFile(glm::ivec3 coord, bool create) {
     {
         std::lock_guard lock(regFilesMutex);
         const auto found = openRegFiles.find(coord);
@@ -230,7 +230,10 @@ std::shared_ptr<regfile> WorldRegions::getRegFile(glm::ivec3 coord) {
             return useRegFile(found->first);
         }
     }
-    return createRegFile(coord);
+    if (create) {
+        return createRegFile(coord);
+    }
+    return nullptr;
 }
 
 std::shared_ptr<regfile> WorldRegions::createRegFile(glm::ivec3 coord) {
@@ -273,7 +276,7 @@ void WorldRegions::writeRegion(int x, int z, int layer, WorldRegion* entry){
     fs::path filename = layers[layer].folder/getRegionFilename(x, z);
 
     glm::ivec3 regcoord(x, z, layer);
-    if (auto regfile = getRegFile(regcoord)) {
+    if (auto regfile = getRegFile(regcoord, false)) {
         fetchChunks(entry, x, z, regfile.get());
 
         std::lock_guard lock(regFilesMutex);
diff --git a/src/files/WorldRegions.hpp b/src/files/WorldRegions.hpp
index baeca195..85d8a971 100644
--- a/src/files/WorldRegions.hpp
+++ b/src/files/WorldRegions.hpp
@@ -110,7 +110,7 @@ class WorldRegions {
 
     ubyte* getData(int x, int z, int layer, uint32_t& size);
 
-    std::shared_ptr<regfile> getRegFile(glm::ivec3 coord);
+    std::shared_ptr<regfile> getRegFile(glm::ivec3 coord, bool create=true);
     void closeRegFile(glm::ivec3 coord);
     std::shared_ptr<regfile> useRegFile(glm::ivec3 coord);
     std::shared_ptr<regfile> createRegFile(glm::ivec3 coord);