This commit is contained in:
Andrew Miner
2026-10-27 09:19:27 -06:00
parent a822ebbdfd
commit 267349a830
9 changed files with 45 additions and 40 deletions
+34 -4
View File
@@ -2,9 +2,31 @@
local private = {} local private = {}
function private.dump(value, depth, indent, seen) --[[
depth = depth or -1 Creates a diagnostic string from a given object.
This function recursively explores tables trying to show as much detail as possible within the
limits dictated by its arguments. For anything other than a table, it simply uses the results
of calling `tostring` with the object in question.
The output is pretty printed for ease of reading using a new line for each key/value pair, and
indenting successive layers by four spaces.
Args:
value:any - the value to be dumped
depth:int - the maximum layers of nested tables to explore (10 by default)
indent:string - the initial indent to use at the first layer
max_keys:int - the maximum number of keys to print for a single table (100 by default)
seen:table[any,true] - a table containing all the values already seen during a single,
recursive print attempt (to avoid cycles or duplication)
Returns:
a string containing the pretty-printed version of the given object
]]--
function private.dump(value, depth, indent, max_keys, seen)
depth = depth or 10
indent = indent or "" indent = indent or ""
max_keys = max_keys or 100
seen = seen or {} seen = seen or {}
if depth == 0 then return "<too deep: "..tostring(value)..">" end if depth == 0 then return "<too deep: "..tostring(value)..">" end
@@ -16,9 +38,15 @@ function private.dump(value, depth, indent, seen)
if type(value) == "table" then if type(value) == "table" then
result = result.."{\n" result = result.."{\n"
local inner_indent = indent.." " local inner_indent = indent.." "
local key_count = 0
for inner_key, inner_value in pairs(value) do for inner_key, inner_value in pairs(value) do
local inner_text = private.dump(inner_value, depth - 1, inner_indent, seen) local inner_text = private.dump(inner_value, depth - 1, inner_indent, max_keys, seen)
result = result..inner_indent..inner_key.." = "..inner_text.."\n" result = result..inner_indent..inner_key.." = "..inner_text.."\n"
key_count = key_count + 1
if key_count >= max_keys then
result = result..inner_indent.."<too many keys>\n"
break
end
end end
result = result..indent.."}" result = result..indent.."}"
else else
@@ -31,4 +59,6 @@ end
-- Export ----------------------------------------------------------------------------------------- -- Export -----------------------------------------------------------------------------------------
return private.dump return {
dump = private.dump
}
-5
View File
@@ -7,8 +7,3 @@ local core = _G.core
core.clear_registered_biomes() core.clear_registered_biomes()
dofile(core.get_modpath("jvmi_biomes").."/definitions.lua") dofile(core.get_modpath("jvmi_biomes").."/definitions.lua")
-- Script ------------------------------------------------------------------------------------------
core.log("info", "jvmi_biomes loaded")
+2 -2
View File
@@ -21,7 +21,7 @@ local private = {}
Args: Args:
region:Region - the region currently being generated region:Region - the region currently being generated
]]-- ]]--
function private.apply(region) function private.apply_to(region)
private.assign_biomes(region) private.assign_biomes(region)
private.fill_surface(region) private.fill_surface(region)
end end
@@ -82,5 +82,5 @@ end
-- Export ------------------------------------------------------------------------------------------ -- Export ------------------------------------------------------------------------------------------
return { return {
apply_to = private.apply apply_to = private.apply_to
} }
+1 -8
View File
@@ -1,8 +1 @@
-- Imports & Exports ------------------------------------------------------------------------------- -- Do nothing.
local core = _G.core
-- Script ------------------------------------------------------------------------------------------
core.log("info", "jvmi_first loaded")
+1 -8
View File
@@ -1,8 +1 @@
-- Imports & Exports ------------------------------------------------------------------------------- -- Do nothing
local core = _G.core
-- Script ------------------------------------------------------------------------------------------
core.log("info", "jvmi_last loaded")
-2
View File
@@ -9,5 +9,3 @@ local path = core.get_modpath("jvmi_nodes")
dofile(path.."/earthy.lua") dofile(path.."/earthy.lua")
dofile(path.."/liquid.lua") dofile(path.."/liquid.lua")
dofile(path.."/stony.lua") dofile(path.."/stony.lua")
core.log("info", "jvmi_nodes loaded")
+2 -2
View File
@@ -15,7 +15,7 @@ core.register_node("jvmi_nodes:water_flowing", {
description = S("Flowing Water"), description = S("Flowing Water"),
drawtype = C.DRAW_TYPE.FLOWING_LIQUID, drawtype = C.DRAW_TYPE.FLOWING_LIQUID,
tiles = {{ tiles = {{
name = "jvmi_nodes_water_flowing_animated.png", name = "jvmi_nodes_water_flowing.png",
animation = { animation = {
type = C.ANIMATION_TYPE.VERTICAL_FRAMES, type = C.ANIMATION_TYPE.VERTICAL_FRAMES,
aspect_w = 16, aspect_w = 16,
@@ -49,7 +49,7 @@ core.register_node("jvmi_nodes:water_source", {
drawtype = "liquid", drawtype = "liquid",
waving = C.WAVING.LIQUID_LIKE, waving = C.WAVING.LIQUID_LIKE,
tiles = {{ tiles = {{
name = "jvmi_nodes_water_source_animated.png", name = "jvmi_nodes_water_source.png",
animation = { animation = {
type = "vertical_frames", type = "vertical_frames",
aspect_w = 16, aspect_w = 16,
+1 -1
View File
@@ -17,7 +17,7 @@ core.register_node("jvmi_nodes:bedrock", {
sounds = { footstep = "jvmi_nodes_stone_footstep" }, sounds = { footstep = "jvmi_nodes_stone_footstep" },
tiles = {"jvmi_nodes_bedrock.png"}, tiles = {"jvmi_nodes_bedrock.png"},
}) })
core.register_alias("mapgen_bedrock", "jvmi_nodes:stone") core.register_alias("mapgen_bedrock", "jvmi_nodes:bedrock")
core.register_node("jvmi_nodes:stone", { core.register_node("jvmi_nodes:stone", {
description = S("Stone"), description = S("Stone"),
+4 -8
View File
@@ -54,10 +54,12 @@ end
away without finding anything. away without finding anything.
If this function gets called before the world has finished generating, it will automatically If this function gets called before the world has finished generating, it will automatically
delay delay for a bit and try again. After too many delays, it will simply abort the attempt.
Args: Args:
- player:ObjectRef - the player to relocate player:ObjectRef - the player to relocate
delays:int - how many times we've had to defer finding a location (0 by default)
]]-- ]]--
function private.set_starting_pos(player_name, delays) function private.set_starting_pos(player_name, delays)
delays = delays or 0 delays = delays or 0
@@ -105,7 +107,6 @@ function private.set_starting_pos(player_name, delays)
end end
end end
--[[ --[[
Set up privledges and settings for a new player. Set up privledges and settings for a new player.
@@ -129,8 +130,3 @@ core.register_on_joinplayer(function(player, last_login)
private.setup_player(player) private.setup_player(player)
private.set_starting_pos(player:get_player_name()) private.set_starting_pos(player:get_player_name())
end) end)
-- Script ------------------------------------------------------------------------------------------
core.log("info", "jvmi_player loaded")