From 4aab7d0dbd782cf6741bdbba94440faf0c5c2e61 Mon Sep 17 00:00:00 2001 From: Vanessa Ezekowitz Date: Sat, 12 Aug 2017 20:37:50 -0400 Subject: updated several mods biome_lib, boost cart, homedecor modpack, plantlife modpack, cottages, currency, farming redo, gloopblocks, ilights, moreores, moretrees, pipeworks, plasticbox, replacer, signs_lib, streets, travelnet, unified dyes, and vines, and maybe one or two others that I didn't see in the list. :-) I fixed the misc_overrides component (it broke when I switched over to farming redo a while back), and also I've added the classic peaceful_npc mod back into the modpack, since it seems to work now. Be sure when you run a world for the first time after this update, that you "Configure" the world, *disable* all of Dreambuilder Modpack, then re-enable the whole thing. If you don't, a few mods will fail to load due to recent changes in their dependencies. --- dryplants/depends.txt | 1 + dryplants/init.lua | 23 +++++++++++++---------- dryplants/juncus.lua | 17 ++++++++++------- dryplants/reed.lua | 41 ++++++++++++++++++++++------------------- dryplants/reedmace.lua | 39 +++++++++++++++++++++------------------ 5 files changed, 67 insertions(+), 54 deletions(-) (limited to 'dryplants') diff --git a/dryplants/depends.txt b/dryplants/depends.txt index 059033e..39305fb 100644 --- a/dryplants/depends.txt +++ b/dryplants/depends.txt @@ -1,3 +1,4 @@ default biome_lib +plantlife_i18n farming? diff --git a/dryplants/init.lua b/dryplants/init.lua index e6baa7a..fac599c 100644 --- a/dryplants/init.lua +++ b/dryplants/init.lua @@ -7,13 +7,16 @@ local mname = "dryplants" -- textures & ideas partly by Neuromancer -- License (everything): WTFPL --- Contains code from: default, farming +-- Contains code from: default, farming -- Looked at code from: darkage, sickle, stairs -- Dependencies: default, farming, biome_lib --- Supports: +-- Supports: ----------------------------------------------------------------------------------------------- abstract_dryplants = {} +-- support for i18n +local S = plantlife_i18n.gettext + dofile(minetest.get_modpath("dryplants").."/crafting.lua") dofile(minetest.get_modpath("dryplants").."/settings.txt") dofile(minetest.get_modpath("dryplants").."/reed.lua") @@ -111,7 +114,7 @@ local function sickle_on_use(itemstack, user, pointed_thing, uses) end -- the tool minetest.register_tool("dryplants:sickle", { - description = "Sickle", + description = S("Sickle"), inventory_image = "dryplants_sickle.png", on_use = function(itemstack, user, pointed_thing) return sickle_on_use(itemstack, user, pointed_thing, 220) @@ -122,7 +125,7 @@ minetest.register_tool("dryplants:sickle", { -- Cut Grass ----------------------------------------------------------------------------------------------- minetest.register_node("dryplants:grass", { - description = "Cut Grass", + description = S("Cut Grass"), inventory_image = "dryplants_grass.png", wield_image = "dryplants_grass.png", paramtype = "light", @@ -153,7 +156,7 @@ minetest.register_abm({ -- Hay ----------------------------------------------------------------------------------------------- minetest.register_node("dryplants:hay", { - description = "Hay", + description = S("Hay"), inventory_image = "dryplants_hay.png", wield_image = "dryplants_hay.png", paramtype = "light", @@ -172,7 +175,7 @@ minetest.register_node("dryplants:hay", { -- Short Grass ----------------------------------------------------------------------------------------------- minetest.register_node("dryplants:grass_short", { - description = "Short Grass", + description = S("Short Grass"), tiles = {"default_grass.png^dryplants_grass_short.png", "default_dirt.png", "default_dirt.png^default_grass_side.png^dryplants_grass_short_side.png"}, is_ground_content = true, groups = {crumbly=3,soil=1,not_in_creative_inventory=1}, @@ -190,11 +193,11 @@ minetest.register_abm({ interval = GRASS_REGROWING_TIME, --1200, -- 20 minutes: a minetest-day/night-cycle chance = 100/GRASS_REGROWING_CHANCE, action = function(pos) - -- Only become dirt with grass if no cut grass or hay lies on top - local above = minetest.get_node({x=pos.x, y=pos.y+1, z=pos.z}) - if above.name ~= "dryplants:grass" and above.name ~= "dryplants:hay" then + -- Only become dirt with grass if no cut grass or hay lies on top + local above = minetest.get_node({x=pos.x, y=pos.y+1, z=pos.z}) + if above.name ~= "dryplants:grass" and above.name ~= "dryplants:hay" then minetest.set_node(pos, {name="default:dirt_with_grass"}) - end + end end, }) diff --git a/dryplants/juncus.lua b/dryplants/juncus.lua index 2ea094f..4a16ebc 100644 --- a/dryplants/juncus.lua +++ b/dryplants/juncus.lua @@ -6,9 +6,12 @@ -- License (everything): WTFPL -- Contains code from: biome_lib --- Looked at code from: default +-- Looked at code from: default ----------------------------------------------------------------------------------------------- +-- support for i18n +local S = plantlife_i18n.gettext + abstract_dryplants.grow_juncus = function(pos) local juncus_type = math.random(2,3) local right_here = {x=pos.x, y=pos.y+1, z=pos.z} @@ -23,7 +26,7 @@ abstract_dryplants.grow_juncus = function(pos) end minetest.register_node("dryplants:juncus", { - description = "Juncus", + description = S("Juncus"), drawtype = "plantlike", visual_scale = math.sqrt(8), paramtype = "light", @@ -45,8 +48,8 @@ minetest.register_node("dryplants:juncus", { }, on_place = function(itemstack, placer, pointed_thing) local playername = placer:get_player_name() - if minetest.is_protected(pointed_thing.above, playername) or - minetest.is_protected(pointed_thing.under, playername) then + if minetest.is_protected(pointed_thing.above, playername) or + minetest.is_protected(pointed_thing.under, playername) then minetest.chat_send_player(playername, "Someone else owns that spot.") return end @@ -65,7 +68,7 @@ minetest.register_node("dryplants:juncus", { end, }) minetest.register_node("dryplants:juncus_02", { - description = "Juncus", + description = S("Juncus"), drawtype = "plantlike", visual_scale = math.sqrt(8), paramtype = "light", @@ -92,7 +95,7 @@ minetest.register_node("dryplants:juncus_02", { -- near water or swamp biome_lib:register_generate_plant({ surface = { - "default:dirt_with_grass", + "default:dirt_with_grass", --"default:desert_sand", --"default:sand", "stoneage:grass_with_silex", @@ -113,7 +116,7 @@ biome_lib:register_generate_plant({ -- at dunes/beach biome_lib:register_generate_plant({ surface = { - --"default:dirt_with_grass", + --"default:dirt_with_grass", --"default:desert_sand", "default:sand", --"stoneage:grass_with_silex", diff --git a/dryplants/reed.lua b/dryplants/reed.lua index 6f29028..db7d937 100644 --- a/dryplants/reed.lua +++ b/dryplants/reed.lua @@ -4,8 +4,11 @@ -- by Mossmanikin -- License (everything): WTFPL -- Looked at code from: darkage, default, stairs --- Dependencies: default +-- Dependencies: default ----------------------------------------------------------------------------------------------- +-- support for i18n +local S = plantlife_i18n.gettext + minetest.register_alias("stairs:stair_wetreed", "dryplants:wetreed_roof") minetest.register_alias("stairs:slab_wetreed", "dryplants:wetreed_slab") minetest.register_alias("stairs:stair_reed", "dryplants:reed_roof") @@ -16,7 +19,7 @@ minetest.register_alias("stairs:slab_reed", "dryplants:reed_slab") -- Wet Reed ----------------------------------------------------------------------------------------------- minetest.register_node("dryplants:wetreed", { - description = "Wet Reed", + description = S("Wet Reed"), paramtype = "light", paramtype2 = "facedir", tiles = {"dryplants_reed_wet.png"}, @@ -28,7 +31,7 @@ minetest.register_node("dryplants:wetreed", { -- Wet Reed Slab ----------------------------------------------------------------------------------------------- minetest.register_node("dryplants:wetreed_slab", { - description = "Wet Reed Slab", + description = S("Wet Reed Slab"), drawtype = "nodebox", paramtype = "light", paramtype2 = "facedir", @@ -49,7 +52,7 @@ minetest.register_node("dryplants:wetreed_slab", { -- Wet Reed Roof ----------------------------------------------------------------------------------------------- minetest.register_node("dryplants:wetreed_roof", { - description = "Wet Reed Roof", + description = S("Wet Reed Roof"), drawtype = "nodebox", paramtype = "light", paramtype2 = "facedir", @@ -93,7 +96,7 @@ if AUTO_ROOF_CORNER == true then interval = 1, chance = 1, action = function(pos) - + local node_east = minetest.get_node({x=pos.x+1, y=pos.y, z=pos.z }) local node_west = minetest.get_node({x=pos.x-1, y=pos.y, z=pos.z }) local node_north = minetest.get_node({x=pos.x, y=pos.y, z=pos.z+1}) @@ -106,7 +109,7 @@ if AUTO_ROOF_CORNER == true then then minetest.set_node(pos, {name=corner, param2=0}) end - + if ((node_north.name == roof and node_north.param2 == 1) or (node_north.name == corner and node_north.param2 == 2)) and ((node_east.name == roof and node_east.param2 == 0) @@ -114,7 +117,7 @@ if AUTO_ROOF_CORNER == true then then minetest.set_node(pos, {name=corner, param2=1}) end - + if ((node_east.name == roof and node_east.param2 == 2) or (node_east.name == corner and node_east.param2 == 3)) and ((node_south.name == roof and node_south.param2 == 1) @@ -122,7 +125,7 @@ if AUTO_ROOF_CORNER == true then then minetest.set_node(pos, {name=corner, param2=2}) end - + if ((node_south.name == roof and node_south.param2 == 3) or (node_south.name == corner and node_south.param2 == 0)) and ((node_west.name == roof and node_west.param2 == 2) @@ -138,7 +141,7 @@ if AUTO_ROOF_CORNER == true then then minetest.set_node(pos, {name=corner_2, param2=0}) end - + if ((node_north.name == roof and node_north.param2 == 3) or (node_north.name == corner_2 and node_north.param2 == 2)) and ((node_east.name == roof and node_east.param2 == 2) @@ -146,7 +149,7 @@ if AUTO_ROOF_CORNER == true then then minetest.set_node(pos, {name=corner_2, param2=1}) end - + if ((node_east.name == roof and node_east.param2 == 0) or (node_east.name == corner_2 and node_east.param2 == 3)) and ((node_south.name == roof and node_south.param2 == 3) @@ -154,7 +157,7 @@ if AUTO_ROOF_CORNER == true then then minetest.set_node(pos, {name=corner_2, param2=2}) end - + if ((node_south.name == roof and node_south.param2 == 1) or (node_south.name == corner_2 and node_south.param2 == 0)) and ((node_west.name == roof and node_west.param2 == 0) @@ -172,7 +175,7 @@ end -- Wet Reed Roof Corner ----------------------------------------------------------------------------------------------- minetest.register_node("dryplants:wetreed_roof_corner", { - description = "Wet Reed Roof Corner", + description = S("Wet Reed Roof Corner"), drawtype = "nodebox", paramtype = "light", paramtype2 = "facedir", @@ -202,7 +205,7 @@ minetest.register_node("dryplants:wetreed_roof_corner", { -- Wet Reed Roof Corner 2 ----------------------------------------------------------------------------------------------- minetest.register_node("dryplants:wetreed_roof_corner_2", { - description = "Wet Reed Roof Corner 2", + description = S("Wet Reed Roof Corner 2"), drawtype = "nodebox", paramtype = "light", paramtype2 = "facedir", @@ -227,7 +230,7 @@ minetest.register_node("dryplants:wetreed_roof_corner_2", { groups = {snappy=3, flammable=2}, sounds = default.node_sound_leaves_defaults(), }) - + ----------------------------------------------------------------------------------------------- -- Wet Reed becomes (dry) Reed over time ----------------------------------------------------------------------------------------------- @@ -262,7 +265,7 @@ end -- Reed ----------------------------------------------------------------------------------------------- minetest.register_node("dryplants:reed", { - description = "Reed", + description = S("Reed"), paramtype = "light", paramtype2 = "facedir", tiles = {"dryplants_reed.png"}, @@ -274,7 +277,7 @@ minetest.register_node("dryplants:reed", { -- Reed Slab ----------------------------------------------------------------------------------------------- minetest.register_node("dryplants:reed_slab", { - description = "Reed Slab", + description = S("Reed Slab"), drawtype = "nodebox", paramtype = "light", paramtype2 = "facedir", @@ -295,7 +298,7 @@ minetest.register_node("dryplants:reed_slab", { -- Reed Roof ----------------------------------------------------------------------------------------------- minetest.register_node("dryplants:reed_roof", { - description = "Reed Roof", + description = S("Reed Roof"), drawtype = "nodebox", paramtype = "light", paramtype2 = "facedir", @@ -323,7 +326,7 @@ minetest.register_node("dryplants:reed_roof", { -- Reed Roof Corner ----------------------------------------------------------------------------------------------- minetest.register_node("dryplants:reed_roof_corner", { - description = "Reed Roof Corner", + description = S("Reed Roof Corner"), drawtype = "nodebox", paramtype = "light", paramtype2 = "facedir", @@ -353,7 +356,7 @@ minetest.register_node("dryplants:reed_roof_corner", { -- Reed Roof Corner 2 ----------------------------------------------------------------------------------------------- minetest.register_node("dryplants:reed_roof_corner_2", { - description = "Reed Roof Corner 2", + description = S("Reed Roof Corner 2"), drawtype = "nodebox", paramtype = "light", paramtype2 = "facedir", diff --git a/dryplants/reedmace.lua b/dryplants/reedmace.lua index b01e118..c34231f 100644 --- a/dryplants/reedmace.lua +++ b/dryplants/reedmace.lua @@ -6,7 +6,7 @@ -- License (everything): WTFPL -- Contains code from: biome_lib --- Looked at code from: default, trees +-- Looked at code from: default, trees ----------------------------------------------------------------------------------------------- -- NOTES (from wikipedia, some of this might get implemented) @@ -18,6 +18,9 @@ -- Typha stems and leaves can be used to make paper -- The seed hairs were used by some Native American groups as tinder for starting fires +-- support for i18n +local S = plantlife_i18n.gettext + ----------------------------------------------------------------------------------------------- -- REEDMACE SHAPES ----------------------------------------------------------------------------------------------- @@ -70,7 +73,7 @@ abstract_dryplants.grow_reedmace_water = function(pos) minetest.set_node(pos_02, {name="dryplants:reedmace_height_3_spikes"}) else minetest.set_node(pos_02, {name="dryplants:reedmace_height_3"}) - end + end end end end @@ -79,7 +82,7 @@ end -- REEDMACE SPIKES ----------------------------------------------------------------------------------------------- minetest.register_node("dryplants:reedmace_spikes", { - description = "Reedmace", + description = S("Reedmace"), drawtype = "plantlike", paramtype = "light", tiles = {"dryplants_reedmace_spikes.png"}, @@ -101,7 +104,7 @@ minetest.register_node("dryplants:reedmace_spikes", { -- REEDMACE height: 1 ----------------------------------------------------------------------------------------------- minetest.register_node("dryplants:reedmace_top", { - description = "Reedmace, height: 1", + description = S("Reedmace, height: 1"), drawtype = "plantlike", paramtype = "light", tiles = {"dryplants_reedmace_top.png"}, @@ -123,7 +126,7 @@ minetest.register_node("dryplants:reedmace_top", { -- REEDMACE height: 2 ----------------------------------------------------------------------------------------------- minetest.register_node("dryplants:reedmace_height_2", { - description = "Reedmace, height: 2", + description = S("Reedmace, height: 2"), drawtype = "plantlike", visual_scale = math.sqrt(8), paramtype = "light", @@ -146,7 +149,7 @@ minetest.register_node("dryplants:reedmace_height_2", { -- REEDMACE height: 3 ----------------------------------------------------------------------------------------------- minetest.register_node("dryplants:reedmace_height_3", { - description = "Reedmace, height: 3", + description = S("Reedmace, height: 3"), drawtype = "plantlike", visual_scale = math.sqrt(8), paramtype = "light", @@ -169,7 +172,7 @@ minetest.register_node("dryplants:reedmace_height_3", { -- REEDMACE height: 3 & Spikes ----------------------------------------------------------------------------------------------- minetest.register_node("dryplants:reedmace_height_3_spikes", { - description = "Reedmace, height: 3 & Spikes", + description = S("Reedmace, height: 3 & Spikes"), drawtype = "plantlike", visual_scale = math.sqrt(8), paramtype = "light", @@ -192,7 +195,7 @@ minetest.register_node("dryplants:reedmace_height_3_spikes", { -- REEDMACE STEMS ----------------------------------------------------------------------------------------------- minetest.register_node("dryplants:reedmace", { - description = "Reedmace", + description = S("Reedmace"), drawtype = "plantlike", paramtype = "light", tiles = {"dryplants_reedmace.png"}, @@ -212,8 +215,8 @@ minetest.register_node("dryplants:reedmace", { after_destruct = function(pos,oldnode) local node = minetest.get_node({x=pos.x,y=pos.y+1,z=pos.z}) if node.name == "dryplants:reedmace_top" - or node.name == "dryplants:reedmace_spikes" then - minetest.dig_node({x=pos.x,y=pos.y+1,z=pos.z}) + or node.name == "dryplants:reedmace_spikes" then + minetest.dig_node({x=pos.x,y=pos.y+1,z=pos.z}) minetest.add_item(pos,"dryplants:reedmace_sapling") end end, @@ -222,7 +225,7 @@ minetest.register_node("dryplants:reedmace", { -- REEDMACE BOTTOM ----------------------------------------------------------------------------------------------- minetest.register_node("dryplants:reedmace_bottom", { - description = "Reedmace", + description = S("Reedmace"), drawtype = "plantlike", paramtype = "light", tiles = {"dryplants_reedmace_bottom.png"}, @@ -241,10 +244,10 @@ minetest.register_node("dryplants:reedmace_bottom", { }, after_destruct = function(pos,oldnode) local node = minetest.get_node({x=pos.x,y=pos.y+1,z=pos.z}) - if node.name == "dryplants:reedmace" + if node.name == "dryplants:reedmace" or node.name == "dryplants:reedmace_top" - or node.name == "dryplants:reedmace_spikes" then - minetest.dig_node({x=pos.x,y=pos.y+1,z=pos.z}) + or node.name == "dryplants:reedmace_spikes" then + minetest.dig_node({x=pos.x,y=pos.y+1,z=pos.z}) minetest.add_item(pos,"dryplants:reedmace_sapling") end end, @@ -253,7 +256,7 @@ minetest.register_node("dryplants:reedmace_bottom", { -- REEDMACE "SAPLING" (the drop from the above) ----------------------------------------------------------------------------------------------- minetest.register_node("dryplants:reedmace_sapling", { - description = "Reedmace", + description = S("Reedmace"), drawtype = "plantlike", paramtype = "light", tiles = {"dryplants_reedmace_sapling.png"}, @@ -293,7 +296,7 @@ minetest.register_abm({ -- REEDMACE WATER (for entity) ----------------------------------------------------------------------------------------------- minetest.register_node("dryplants:reedmace_water", { - description = "Reedmace", + description = S("Reedmace"), drawtype = "plantlike", paramtype = "light", tiles = {"dryplants_reedmace_water.png"}, @@ -348,7 +351,7 @@ minetest.register_entity("dryplants:reedmace_water_entity",{ -- near water or swamp biome_lib:register_generate_plant({ surface = { - "default:dirt_with_grass", + "default:dirt_with_grass", "default:desert_sand", "stoneage:grass_with_silex", "sumpf:peat", @@ -370,7 +373,7 @@ biome_lib:register_generate_plant({ biome_lib:register_generate_plant({ surface = { "default:dirt", - "default:dirt_with_grass", + "default:dirt_with_grass", --"default:desert_sand", --"stoneage:grass_with_silex", "stoneage:sand_with_silex", -- cgit v1.2.3