Compare commits

..

No commits in common. "de272b51cf66fc17c21d10ebb7369da63316d7f1" and "7dec9feabff394e26368603ab6ea2b9fdcb8e07a" have entirely different histories.

9 changed files with 37 additions and 383 deletions

View File

@ -985,42 +985,8 @@ GNU Lesser General Public License v2.1 or later
- everness_ceramic_sherds_ore.png - everness_ceramic_sherds_ore.png
- everness_pick_archeological.png - everness_pick_archeological.png
- everness_logo.png - everness_logo.png
- everness_fence_coral_wood.png - textures/everness_fence_coral_wood.png
- everness_fence_rail_coral_wood.png - textures/everness_fence_rail_coral_wood.png
- everness_bucket_lava.png
- everness_door_lava_tree_wood.png
- everness_door_lava_tree_wood_item.png
- everness_door_trapdoor_lava_tree_wood.png
- everness_door_trapdoor_lava_tree_wood_side.png
- everness_fence_lava_tree_wood.png
- everness_fence_rail_lava_tree_wood.png
- everness_lava_flowing_animated.png
- everness_lava_source_animated.png
- everness_lava_tree.png
- everness_lava_tree_animated.png
- everness_lava_tree_leaves.png
- everness_lava_tree_sapling.png
- everness_lava_tree_top.png
- everness_lava_tree_wood.png
- everness_mcl_bucket_lava.png
- everness_mineral_cave_moss.png
- everness_mineral_cave_moss_grass.png
- everness_mineral_cave_moss_side.png
- everness_mineral_cobblestone_under.png
- everness_mineral_lava_stone_animated.png
- everness_mineral_lava_stone_bottom.png
- everness_mineral_lava_stone_side.png
- everness_mineral_stone_under.png
- everness_mineral_stone_under_top.png
- everness_mtg_bucket_lava.png
- everness_wall_vine_cave_blue.png
- everness_wall_vine_cave_blue_item.png
- everness_wall_vine_cave_cyan.png
- everness_wall_vine_cave_cyan_item.png
- everness_wall_vine_cave_green.png
- everness_wall_vine_cave_green_item.png
- everness_wall_vine_cave_violet.png
- everness_wall_vine_cave_violet_item.png
**CC-BY-SA-4.0, Pixel Perfection by XSSheep**, https://minecraft.curseforge.com/projects/pixel-perfection-freshly-updated **CC-BY-SA-4.0, Pixel Perfection by XSSheep**, https://minecraft.curseforge.com/projects/pixel-perfection-freshly-updated

View File

@ -1,251 +0,0 @@
# textdomain: everness
Quartz Crystal=Kvarca kristalo
Baobab Roasted Fruit=Rostita baobabfrukto
Pyrite Ingot=Pirita ingoto
Pyrite Lump=Pirita bulo
Bamboo Door=Bombua pordo
Bamboo Trapdoor=Bombua plankpordo
Bamboo Wood Fence Gate=Bombua ligna barilo
Bone Pyrit Door=Osta pirita pordo
Willow Door=Salika pordo
Dry Wood Fence=Seka ligna barilo
Dry Wood Fence Rail=Seka ligna barila relo
Dry Wood Mese Post Light=Seka ligna mesea fosta lampo
Bamboo Wood Fence=Bombua ligna barilo
Bamboo Wood Fence Rail=Bombua ligna barila relo
Bamboo Wood Mese Post Light=Bombua ligna mesea fosta lampo
Pyrite Ore=Pirita minaĵo
Pyrite Block=Pirita bloko
Forged Pyrite Block=Forĝita pirita bloko
Pyrite Brick=Pirita briko
Pyrite Slab Brick=Pirita plata briko
Pyrite Spiral=Pirita spiralaĵo
Pyrite Pillar Bottom=Pirita kolonosubo
Pyrite Pillar Middle=Pirita kolonomezo
Pyrite Pillar Top=Pirita kolonosupro
Pyrite Pillar Small=Pirita eta kolono
Polished Pyrite Block=Polurita pirita bloko
Quartz Ore=Kvarca minaĵo
Coral Desert Stone=Korala dezerta ŝtono
Coral Bones=Koralaj ostoj
Coral Desert Cobblestone=Korala dezerta pavimŝtono
Coral Mossy Cobblestone=Korala muska pavimŝtono
Coral Desert Stone with Moss=Korala dezerta ŝtono kun musko
Forsaken Desert Stone=Forlasita dezerta ŝtono
Forsaken Desert Cobblestone Red=Forlasita dezerta ruĝa pavimŝtono
Forsaken Desert Cobblestone=Forlasita dezerta pavimŝtono
Volcanic Rock=Vulkana ŝtono
Volcanic Rock with Magma=Vulkana ŝtono kun lafo
Cursed Stone=Malbenita ŝtono
Cursed Brick=Malbenita briko
Volcanic Sulfur Stone=Vulkana sulfurŝtono
Sulfur Stone=Sulfurŝtono
Forsaken Tundra Cobblestone=Forlasita glaciebena pavimŝtono
Forsaken Tundra Stone=Forlasita glaciebena ŝtono
Mold Cobble=Elfandita pavimŝtono
Forsaken Tundra Brick=Forlasita glaciebena briko
Forsaken Tundra Rocks=Forlasitaj glaciebenaj ŝtonoj
Blue Crying Obsidian=Blua ploranta obsidiano
Blue Weeping Obsidian=Blua krianta obsidiano
Weeping Obsidian=Krianta obsidiano
Mold Stone=Fandŝtono
Soul Sandstone=Anima sablŝtono
Soul Sandstone Veined=Anima sablŝtono
Purple Crystal Block=Purpura kristala bloko
Orange Crystal Block=Oranĝa kristala bloko
Quartz Block=Kvarca bloko
Chiseled Quartz=Ĉizita kvarco
Quartz Pillar=Kvarca kolono
Forsaken Desert Brick=Forlasita dezerta briko
Forsaken Desert Brick Red=Forlasita ruĝa dezerta briko
Forsaken Desert Chiseled Stone=Forlasita ĉizita dezerta ŝtono
Forsaken Desert Engraved Stone=Forlasita gravurita dezerta ŝtono
Coral Dirt=Korala tero
Cursed Dirt=Malbenita tero
Crystal Dirt=Kristala tero
Forsaken Tundra Dirt=Forlasita glaciebena tero
Forsaken Tundra Dirt with Grass=Forlasita glaciebena tero kun herbo
Dirt with Coral Grass=Tero kun korala herbo
Dirt with Cursed Grass=Tero kun malbenita herbo
Dirt with Crystal Grass=Tero kun kristala herbo
Dry Ocean Dirt=Seka mara tero
Dirt=Tero
Dirt with Grass=Tero kun herbo
Crystal Cave Dirt=Kristalkaverna tero
Crystal Cave Dirt with Moss=Kristalkaverna tero kun musko
Moss Block=Muska bloko
Crystal Moss Block=Kristala muska bloko
Coral Sand=Korala sablo
Coral White Sand=Korala blanka sablo
Cursed Sand=Malbenita sablo
Crystal Sand=Kristala sablo
Forsaken Tundra Beach Sand=Forlasita glaciebena marborda sablo
Forsaken Tundra Beach Sand with Shells=Forlasita glaciebena marborda sablo kun konkoj
Forsaken Desert Sand=Forlasita dezerta sablo
Frosted Snow Block=Frosta neĝa bloko
Frosted Ice=Frosta glacio
Frosted Ice Translucent=Frosta travidebla glacio
Frosted Cave Ice=Frosta kaverna glacio
Bone=Osto
Ancient Emerald Ice=Praa smeralda glacio
Dense Emerald Ice=Densa smeralda glacio
Emerald Ice=Smeralda glacio
Cursed Mud=Malbenita koto
Cobweb=Aranereto
Cave Flower=Kaverna floro
Cave Flower with Particles=Kaverna floro radieta
Forsaken Fire=Forlasita fajro
Coral Tree Trunk=Korala trunko
Coral Tree Bioluminescent=Korala vivluma trunko
Cursed Dream Stone=Malbenita sonĝŝtono
Dry Tree Trunk=Seka trunko
Baobab Tree Trunk=Baobaba trunko
Sequoia Tree Trunk=Ciprusa trunko
Willow Tree Trunk=Salika trunko
Willow Wood Planks=Salikaj lignaj tabuloj
Dry Wood Planks=Sekaj lignaj tabuloj
Hollow Tree Trunk=Kava trunko
Crystal Tree Trunk=Kristala trunko
Mese Tree Trunk=Mesea trunko
Baobab Tree Leaves=Baobabaj folioj
Sequoia Tree Leaves=Ciprusaj folioj
Baobab Fruit=Baobabfrukto
Baobab Fruit Marker=Markilo de baobabfrukto
Baobab Sapling=Baobaba arbido
Willow Tree Leaves=Salikaj folioj
Coral Tree Leaves=Koralaj folioj
Dry Tree Branches=Sekaj arbaj folioj
Crystal Tree Leaves=Kristalaj folioj
Coral Tree Sapling=Korala arbido
Coral Tree Bioluminescent Sapling=Korala vivluma arbido
Dry Tree Sapling=Seka arbido
Cursed Dream Tree Sapling=Malbenita sonĝarbido
Sequoia Tree Sapling=Ciprusa arbido
Crystal Tree Sapling=Kristala arbido
Crystal Tree Large Sapling=Kristala arbidego
Crystal Bush Stem=Kristala arbetaĵa tubo
Crystal Bush Leaves=Kristala arbetaĵaj folioj
Crystal Bush Sapling=Kristala arbetaĵa arbido
Cursed Bush Stem=Malbenita arbetaĵa tubo
Cursed Bush Leaves=Malbenitaj arbetaĵaj folioj
Cursed Bush Sapling=Malbenita arbetaĵa arbido
Coral Burdock=Korala lapo
Coral Bush=Korala arbetaĵo
Coral Shrub=Korala arbetaĵeto
Orange Coral Grass=Oranĝa koralherbo
Globulagus=Eŭkalipto globulo
Tall Coral Grass=Alta koralherbo
Purple Crystal=Purpura kristalo
Orange Crystal=Oranĝa kristalo
Cyan Crystal=Bluverda kristalo
Coral Plant Bioluminescent=Vivluma koralaĵo
Blooming Cooksonia=Floranta Kuksonia
Creeping Moss Spores=Grimpantaj muskaj sporoj
Frosted Icicle=Frosta pendglacio
Frosted Icicle Floor=Frosta starglacio
Coral Grass=Koralherbo
Red Castor=Ruĝa ricino
Crystal Mushrooms=Kristala fungo
Twisted Crystal Grass=Tordita kristalherbo
Crystal Grass=Kristalherbo
Marsh Grass=Marĉa herbo
Forsaken Plant=Forlasita kreskaĵo
Blue Cactus=Blua kakto
Cave Barrel Cactus=Kaverna barelkakto
Venus Trap Plant=Muŝkaptulo
Illumi Root=Iluma radiko
Crystal Waterlily=Kristala nimfeo
Orange Cactus=Oranĝa kakto
Agave Leaf=Agava folio
Egg plant=Melongeno
Ivis Moss=Ivisa musko
Ngrass=N-herbo
Bamboo Sprout=Bombuido
Blood Spoore Plant=Sanga sporkreskaĵo
Blood Spoore Plant Small=Sanga sporkreskaĵeto
Termite Block=Termita bloko
Bamboo Block=Bombua bloko
Bamboo Planks=Bombuaj tabuloj
Bamboo Mosaic=Bombua mozaiko
Baobab Wood Planks=Baobabaj lignaj tabuloj
Sequoia Wood Planks=Ciprusaj lignaj tabuloj
Coral Corals=Koralaj koralaĵoj
Coral Frosted=Frosta koralo
Coral Starfish=Korala stelfiŝo
Spine Kelp=Spina algo
Crystal Coral Dark=Malhela kristalkoralo
Crystal Coral Light=Hela kristalkoralo
Skull with Candle=Kaposto kun kandelo
Forsythia Bush=Forsita arbetaĵo
Glowing Pillar=Luma kolono
Blue Vine Lantern=Blua grimparbusta lanterno
Amaranita Lantern=Amaranita lanterno
Lumecorn=Lumtritiko
Tinted Glass Red=Vitro tinkturita ruĝe
Pyrite Lantern=Pirita lanterno
Pyrite Glass=Pirita vitro
Lumabus Vine Lantern=Luma grimparbusta lanterno
Eye Vine Lantern=Okula grimparbusta lanterno
Cursed Pumpkin Lantern=Malbenita kukurba lanterno
Floating Crystal=Ŝvebanta kristalo
Bamboo=Bambuo
Pyrite Glass Pane=Pirita vitra vitraĵo
Quartz Block Stair=Kvarca bloko ŝtupo
Quartz Block Slab=Kvarca bloko plato
Quartz Chiseled Stair=Ĉizita kvarco ŝtupo
Quartz Chiseled Slab=Ĉizita kvarco plato
Quartz Pillar Stair=Kvarca kolono ŝtupo
Quartz Pillar Slab=Kvarca kolono plato
Dry Wood Stair=Seka ligna ŝtupo
Dry Wood Slab=Seka ligna plato
Bamboo Wood Stair=Bombua ŝtupo
Bamboo Wood Slab=Bombua plato
Bamboo Mosaic Wood Stair=Bombua mozaika ŝtupo
Bamboo Mosaic Wood Slab=Bombua mozaika plato
Forsaken Desert Brick Stair=Forlasita dezerta briko ŝtupo
Forsaken Desert Brick Slab=Forlasita dezerta briko plato
Forsaken Desert Brick Red Stair=Forlasita dezerta ruĝa briko ŝtupo
Forsaken Desert Brick Red Slab=Forlasita dezerta ruĝa briko plato
Forsaken Desert Chiseled Stone Stair=Forlasita ĉizita dezerta ŝtono ŝtupo
Forsaken Desert Chiseled Stone Slab=Forlasita ĉizita dezerta ŝtono plato
Baobab Wood Stair=Baobaba ligna ŝtupo
Baobab Wood Slab=Baobaba ligna plato
Sequoia Wood Stair=Ciprusa ligna ŝtupo
Sequoia Wood Slab=Ciprusa ligna plato
Forsaken Tundra Cobblestone Stair=Forlasita glaciebena pavimŝtona ŝtupo
Forsaken Tundra Cobblestone Slab=Forlasita glaciebena pavimŝtona plato
Forsaken Tundra Stone Stair=Forlasita glaciebena ŝtona ŝtupo
Forsaken Tundra Stone Slab=Forlasita glaciebena ŝtona plato
Forsaken Tundra Brick Stair=Forlasita glaciebena briko ŝtupo
Forsaken Tundra Brick Slab=Forlasita glaciebena briko plato
Willow Wood Stair=Salika ligna ŝtupo
Willow Wood Slab=Salika ligna plato
Magma Cobblestone Stair=Lafa pavimŝtona ŝtupo
Magma Cobblestone Slab=Lafa pavimŝtona plato
Volcanic Rock Stair=Vulkana ŝtona ŝtupo
Volcanic Rock Slab=Vulkana ŝtona plato
Volcanic Rock with Magma Stair=Vulkana ŝtono kun lafo ŝtupo
Volcanic Rock with Magma Slab=Vulkana ŝtono kun lafo plato
Vine Shears=Grimparbusta tondilo
Cave Vine=Kaverna grimparbusto
Cave Vine with Mese Leaves=Kaverna grimparbusto kun meseaj folioj
Whispering Gourd Vine=Flustra kukurba grimparbusto
Bulb Vine=Bulba grimparbusto
Willow Vine=Salika grimparbusto
Eye Vine=Okula grimparbusto
Lumabus Vine=Luma grimparbusto
Ivis Vine=Ivisa grimparbusto
Flowered Vine=Flora grimparbusto
Reeds Vine=Kana grimparbusto
Twisted Vine=Tordita grimparbusto
Golden Vine=Ora grimparbusto
Dense Vine=Densa grimparbusto
Coral Cobblestone Wall=Korala pavimŝtona muro
Coral Mossy Cobblestone Wall=Korala muska pavimŝtona muro
Cursed Brick Wall=Malbenita briko muro
Forsaken Tundra Cobblestone Wall=Forlasita glaciebena pavimŝtona muro
Forsaken Tundra Stone Wall=Forlasita glaciebena ŝtona muro
Forsaken Tundra Brick Wall=Forlasita glaciebena briko muro
Magma Cobblestone Wall=Lafa pavimŝtona muro
Volcanic Rock Wall=Vulkana ŝtona muro
Volcanic Rock with Magma Wall=Vulkana ŝtono kun lafo muro

View File

@ -224,22 +224,6 @@ x_farming.x_bonemeal:register_tree_defs({
Everness.grow_palm_tree(pos) Everness.grow_palm_tree(pos)
return true
end
},
{
-- sapling name
name = 'everness:lava_tree_sapling',
-- 1 out of `chance`, e.g. 2 = 50% chance
chance = 4,
-- grow tree from sapling
grow_tree = function(pos)
if not x_farming.x_bonemeal.is_on_soil(pos) then
return false
end
Everness.grow_lava_tree(pos)
return true return true
end end
}, },

View File

@ -2625,7 +2625,7 @@ Everness:register_node('everness:flame_permanent_blue', {
-- Mapgen Marker -- Mapgen Marker
Everness:register_node('everness:marker', { Everness:register_node('everness:marker', {
drawtype = 'airlike', -- drawtype = 'airlike',
description = 'Marker for mapgen', description = 'Marker for mapgen',
tiles = { 'everness_lootchest_marker_top.png', 'everness_lootchest_marker_side.png' }, tiles = { 'everness_lootchest_marker_top.png', 'everness_lootchest_marker_side.png' },
groups = { dig_immediate = 3, not_in_creative_inventory = 1 }, groups = { dig_immediate = 3, not_in_creative_inventory = 1 },

View File

@ -31,13 +31,12 @@ local skybox_defs = {
} }
}, },
sun_parameters = { sun_parameters = {
scale = 1.57,
texture = 'everness_cursed_lands_sun.png', texture = 'everness_cursed_lands_sun.png',
scale = 1.57,
sunrise = 'everness_cursed_lands_sunrisebg.png', sunrise = 'everness_cursed_lands_sunrisebg.png',
tonemap = 'everness_cursed_lands_sun_tonemap.png' tonemap = 'everness_cursed_lands_sun_tonemap.png'
}, },
moon_parameters = { moon_parameters = {
scale = 1.57,
texture = 'everness_cursed_lands_moon.png', texture = 'everness_cursed_lands_moon.png',
tonemap = 'everness_cursed_lands_moon_tonemap.png' tonemap = 'everness_cursed_lands_moon_tonemap.png'
}, },

View File

@ -30,12 +30,10 @@ local function pick_dropped_items(player)
-- filter - leave only builtin items -- filter - leave only builtin items
for _, object in ipairs(objects) do for _, object in ipairs(objects) do
local luaentity = object:get_luaentity()
if not object:is_player() if not object:is_player()
and luaentity and object:get_luaentity()
and luaentity.name == '__builtin:item' and object:get_luaentity().name == '__builtin:item'
and luaentity.itemstring ~= '' and object:get_luaentity().itemstring ~= ''
then then
table.insert(objects_to_collect, object) table.insert(objects_to_collect, object)
end end
@ -47,43 +45,18 @@ local function pick_dropped_items(player)
end) end)
for _, object in ipairs(objects_to_collect) do for _, object in ipairs(objects_to_collect) do
local luaentity = object:get_luaentity() local itemstack = ItemStack(object:get_luaentity().itemstring)
local itemstack = ItemStack(luaentity.itemstring)
if not luaentity._being_collected then if inv:room_for_item('main', itemstack) and not object:get_luaentity()._being_collected
-- Invoke global on_item_pickup callbacks. then
-- for _, callback in ipairs(minetest.registered_on_item_pickups) do inv:add_item('main', itemstack)
-- local result = callback(itemstack, player, { type = 'object', ref = object }) object:get_luaentity()._being_collected = true
-- if result then
-- itemstack = ItemStack(result)
-- end
-- end
local leftover_stack = inv:add_item('main', itemstack)
local stack_count_prev = itemstack:get_count()
local stack_count_leftover = leftover_stack:get_count()
if leftover_stack and stack_count_prev ~= stack_count_leftover then
-- Collect item / Item fits in the inventory
local pos_obj = object:get_pos()
if leftover_stack ~= 0 then
minetest.spawn_item(pos_obj, leftover_stack:to_string())
end
luaentity._being_collected = true
object:set_acceleration({ x = 0, y = 0, z = 0 }) object:set_acceleration({ x = 0, y = 0, z = 0 })
object:set_velocity({ x = 0, y = 0, z = 0 }) object:set_velocity({ x = 0, y = 0, z = 0 })
luaentity.physical_state = false object:get_luaentity().physical_state = false
luaentity.object:set_properties({ object:get_luaentity().object:set_properties({ physical = false })
physical = false,
-- prevent picking up items while they are moving to the player local pos_obj = object:get_pos()
-- since the items are in the players inventory already this would
-- duplicate the itemstack
selectionbox = { 0, 0, 0, 0, 0, 0 },
collisionbox = { 0, 0, 0, 0, 0, 0 }
})
object:move_to(vector.new( object:move_to(vector.new(
(pos.x - pos_obj.x) + pos_obj.x, (pos.x - pos_obj.x) + pos_obj.x,
@ -105,7 +78,6 @@ local function pick_dropped_items(player)
end end
end end
end end
end
minetest.register_on_joinplayer(function(player) minetest.register_on_joinplayer(function(player)
local player_meta = player:get_meta() local player_meta = player:get_meta()

Binary file not shown.

Before

Width:  |  Height:  |  Size: 41 KiB

After

Width:  |  Height:  |  Size: 494 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 159 B

View File

@ -105,28 +105,12 @@ function Everness.grow_palm_tree(pos)
end end
function Everness.grow_lava_tree(pos) function Everness.grow_lava_tree(pos)
local schem_everness_lava_tree = minetest.read_schematic(minetest.get_modpath('everness') .. '/schematics/everness_lava_tree.mts', {}) local path = minetest.get_modpath('everness') .. '/schematics/everness_lava_tree.mts'
local lava_nodes = minetest.find_nodes_in_area_under_air( local lava_tree_size = { x = 7, y = 13, z = 7 }
vector.subtract(pos, 1), local lava_tree_size_x = math.floor(lava_tree_size.x / 2)
vector.add(pos, 1), local lava_tree_size_z = math.floor(lava_tree_size.z / 2)
{ 'group:lava' } minetest.place_schematic({ x = pos.x - lava_tree_size_x, y = pos.y, z = pos.z - lava_tree_size_z },
) path, '0', nil, false)
local replacements
if #lava_nodes > 0 then
replacements = {
['everness:lava_tree'] = 'everness:lava_tree_with_lava',
}
end
minetest.place_schematic(
pos,
schem_everness_lava_tree,
'random',
replacements,
false,
'place_center_x, place_center_z'
)
end end
function Everness.grow_sapling(pos, groups_under) function Everness.grow_sapling(pos, groups_under)