NathanSalapat
/
mylandscaping
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed image_button to item_image_button

master
DonBatman 2015-05-04 19:26:47 -07:00
parent c4b3bec5f8
commit 35173c8cec
7 changed files with 73 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
init.lua
View File

@ -6,7 +6,6 @@ dofile(minetest.get_modpath('mylandscaping')..'/stones.lua')
dofile(minetest.get_modpath('mylandscaping')..'/recipes.lua')
--dofile(minetest.get_modpath('mylandscaping')..'/mixer.lua')
minetest.register_alias("myconcrete:concrete", "mylandscaping:concrete")
local mod_myconcrete = minetest.get_modpath("myconcrete")

44
machine.lua
View File

@ -55,22 +55,22 @@ on_construct = function(pos)
"label[1.5,0.5;Retaining Wall]"..
--Styles of blocks
"label[1,1;Wall Blocks]"..
"image_button[1,1.5;1,1;mylandscaping_wall1.png;wall1; ]"..
"image_button[2,1.5;1,1;mylandscaping_wall2.png;wall2; ]"..
"image_button[3,1.5;1,1;mylandscaping_wall3.png;wall3; ]"..
"image_button[4,1.5;1,1;mylandscaping_wall4.png;wall4; ]"..
"item_image_button[1,1.5;1,1;mylandscaping:rwall_left_cement;wall1; ]"..
"item_image_button[2,1.5;1,1;mylandscaping:rwall_middle_cement;wall2; ]"..
"item_image_button[3,1.5;1,1;mylandscaping:rwall_right_cement;wall3; ]"..
"item_image_button[4,1.5;1,1;mylandscaping:rwall_corner_cement;wall4; ]"..
--Styles of columns
"label[1,2.5;Columns]"..
"image_button[1,3;1,1;mylandscaping_wall6.png;column2; ]"..
"image_button[2,3;1,1;mylandscaping_wall7.png;column3; ]"..
"image_button[3,3;1,1;mylandscaping_wall5.png;column4; ]"..
"item_image_button[1,3;1,1;mylandscaping:rwall_column_m_t_cement;column2; ]"..
"item_image_button[2,3;1,1;mylandscaping:rwall_column_ic_t_cement;column3; ]"..
"item_image_button[3,3;1,1;mylandscaping:rwall_column_oc_t_cement;column4; ]"..
"label[6.5,0.5;Patio Stones]"..
--Styles of blocks
"image_button[6,1.5;1,1;mylandscaping_patio1.png;patio1; ]"..
"image_button[7,1.5;1,1;mylandscaping_patio2.png;patio2; ]"..
"image_button[8,1.5;1,1;mylandscaping_patio3.png;patio3; ]"..
"item_image_button[6,1.5;1,1;mylandscaping:stone_square;patio1; ]"..
"item_image_button[7,1.5;1,1;mylandscaping:stone_square_sm;patio2; ]"..
"item_image_button[8,1.5;1,1;mylandscaping:stone_pavers;patio3; ]"..
--Input
"label[3,4; Input]"..
@ -106,7 +106,7 @@ then
if fields["wall1"] then
make_ok = "0"
anzahl = "2"
block = "mylandscaping:rwall_left"
block = "mylandscaping:rwall_left_"
if inv:is_empty("input") then
return
end
@ -114,7 +114,7 @@ then
if fields["wall2"] then
make_ok = "0"
anzahl = "2"
block = "mylandscaping:rwall_middle"
block = "mylandscaping:rwall_middle_"
if inv:is_empty("input") then
return
end
@ -122,7 +122,7 @@ then
if fields["wall3"] then
make_ok = "0"
anzahl = "2"
block = "mylandscaping:rwall_right"
block = "mylandscaping:rwall_right_"
if inv:is_empty("input") then
return
end
@ -130,7 +130,7 @@ then
if fields["wall4"] then
make_ok = "0"
anzahl = "2"
block = "mylandscaping:rwall_corner"
block = "mylandscaping:rwall_corner_"
if inv:is_empty("input") then
return
end
@ -138,7 +138,7 @@ then
if fields["column2"] then
make_ok = "0"
anzahl = "1"
block = "mylandscaping:rwall_column_m_t"
block = "mylandscaping:rwall_column_m_t_"
if inv:is_empty("input") then
return
end
@ -146,7 +146,7 @@ then
if fields["column3"] then
make_ok = "0"
anzahl = "1"
block = "mylandscaping:rwall_column_ic_t"
block = "mylandscaping:rwall_column_ic_t_"
if inv:is_empty("input") then
return
end
@ -154,7 +154,7 @@ then
if fields["column4"] then
make_ok = "0"
anzahl = "1"
block = "mylandscaping:rwall_column_oc_t"
block = "mylandscaping:rwall_column_oc_t_"
if inv:is_empty("input") then
return
end
@ -163,21 +163,21 @@ then
local outstack = inv:get_stack("output", 1)
local dyestack = inv:get_stack("dye", 1)
----------------------------------------------------------------------
if instack:get_name()== "mylandscaping:concrete" then
if instack:get_name()== "mylandscaping:concrete_bag" then
material = "cement"
make_ok = "1"
end
if instack:get_name()== "mylandscaping:concrete" and
if instack:get_name()== "mylandscaping:concrete_bag" and
dyestack:get_name()== "dye:yellow" then
material = "cement_tan"
make_ok = "1"
end
if instack:get_name()== "mylandscaping:concrete" and
if instack:get_name()== "mylandscaping:concrete_bag" and
dyestack:get_name()== "dye:orange" then
material = "cement_autumn"
make_ok = "1"
end
if instack:get_name()== "mylandscaping:concrete" and
if instack:get_name()== "mylandscaping:concrete_bag" and
dyestack:get_name()== "dye:red" then
material = "cement_red"
make_ok = "1"
@ -231,7 +231,7 @@ then
local instack = inv:get_stack("input", 1)
local outstack = inv:get_stack("output", 1)
----------------------------------------------------------------------
if instack:get_name()== "mylandscaping:concrete" then
if instack:get_name()== "mylandscaping:concrete_bag" then
make_ok2 = "1"
end

73
mixer.lua
View File

@ -62,19 +62,10 @@ on_construct = function(pos)
"list[current_name;gravel;5.5,1;1,1;]"..
"label[6.5,1;Gravel]"..
--Cement
"label[0.5,2.5;Bag Of]"..
"label[0.5,3;Cement]"..
"label[1.5,3.5; Clay]"..
"list[current_name;clay;1.5,2.5;1,1;]"..
"label[2.5,3.5; Sand]"..
"list[current_name;sand;2.5,2.5;1,1;]"..
"button[4,2.5;1,1;make;Make]"..
--Concrete
"label[5,0.5;Concrete Mixer]"..
"list[current_name;cement;5.5,2.5;1,1;]"..
"label[6.5,2.5;Cement]"..
"list[current_name;sand;5.5,2.5;1,1;]"..
"label[6.5,2.5;Sand]"..
"button[5.5,3.5;1,1;mix;Mix]"..
"list[current_name;concrete;5.5,4.5;1,1;]"..
"label[6.5,4.5;Output]"..
@ -85,9 +76,7 @@ on_construct = function(pos)
local inv = meta:get_inventory()
inv:set_size("cobble", 1)
inv:set_size("gravel", 1)
inv:set_size("cement", 1)
inv:set_size("concrete", 1)
inv:set_size("clay", 1)
inv:set_size("sand", 1)
end,
@ -130,18 +119,24 @@ then
make_concrete = "0"
amount2 = "2"
if inv:is_empty("gravel") or
inv:is_empty("cement") then
inv:is_empty("sand") then
return
end
end
local gravelstack = inv:get_stack("gravel", 1)
local cementstack = inv:get_stack("cement", 1)
local sandstack = inv:get_stack("sand", 1)
local concretestack = inv:get_stack("concrete", 1)
----------------------------------------------------------------------
if gravelstack:get_name()== "default:gravel" and
cementstack:get_name()== "mylandscaping:cement_bag" then
sandstack:get_name()== "default:sand" then
make_concrete = "1"
output_concrete = "mylandscaping:concrete"
output_concrete = "mylandscaping:concrete_bag"
end
if gravelstack:get_name()== "default:gravel" and
sandstack:get_name()== "default:desert_sand" then
make_concrete = "1"
output_concrete = "mylandscaping:concrete_bag"
end
----------------------------------------------------------------------
@ -152,50 +147,12 @@ then
end
gravelstack:take_item()
inv:set_stack("gravel",1,gravelstack)
cementstack:take_item()
inv:set_stack("cement",1,cementstack)
end
end
if fields["make"]
then
if fields["make"] then
make_cement = "0"
amount3 = "4"
if inv:is_empty("clay") or
inv:is_empty("sand") then
return
end
end
local claystack = inv:get_stack("clay", 1)
local sandstack = inv:get_stack("sand", 1)
local cementstack = inv:get_stack("cement", 1)
----------------------------------------------------------------------
if claystack:get_name()== "default:clay_lump" and
sandstack:get_name()== "default:sand" then
make_cement = "1"
output_cement = "mylandscaping:cement_bag"
end
if claystack:get_name()== "default:clay_lump" and
sandstack:get_name()== "default:desert_sand" then
make_cement = "1"
output_cement = "mylandscaping:cement_bag"
end
----------------------------------------------------------------------
if make_cement == "1" then
local give = {}
for i = 0, amount3-1 do
give[i+1]=inv:add_item("cement",output_cement)
end
claystack:take_item()
inv:set_stack("clay",1,claystack)
sandstack:take_item()
inv:set_stack("sand",1,sandstack)
inv:set_stack("cement",1,sandstack)
end
end
end
})

34
myconcrete_machine.lua
View File

@ -58,22 +58,22 @@ on_construct = function(pos)
"label[1.5,0.5;Retaining Wall]"..
--Styles of blocks
"label[1,1;Wall Blocks]"..
"image_button[1,1.5;1,1;mylandscaping_wall1.png;wall1; ]"..
"image_button[2,1.5;1,1;mylandscaping_wall2.png;wall2; ]"..
"image_button[3,1.5;1,1;mylandscaping_wall3.png;wall3; ]"..
"image_button[4,1.5;1,1;mylandscaping_wall4.png;wall4; ]"..
"item_image_button[1,1.5;1,1;mylandscaping:rwall_left_cement;wall1; ]"..
"item_image_button[2,1.5;1,1;mylandscaping:rwall_middle_cement;wall2; ]"..
"item_image_button[3,1.5;1,1;mylandscaping:rwall_right_cement;wall3; ]"..
"item_image_button[4,1.5;1,1;mylandscaping:rwall_corner_cement;wall4; ]"..
--Styles of columns
"label[1,2.5;Columns]"..
"image_button[1,3;1,1;mylandscaping_wall6.png;column2; ]"..
"image_button[2,3;1,1;mylandscaping_wall7.png;column3; ]"..
"image_button[3,3;1,1;mylandscaping_wall5.png;column4; ]"..
"item_image_button[1,3;1,1;mylandscaping:rwall_column_m_t_cement;column2; ]"..
"item_image_button[2,3;1,1;mylandscaping:rwall_column_ic_t_cement;column3; ]"..
"item_image_button[3,3;1,1;mylandscaping:rwall_column_oc_t_cement;column4; ]"..
"label[6.5,0.5;Patio Stones]"..
--Styles of blocks
"image_button[6,1.5;1,1;mylandscaping_patio1.png;patio1; ]"..
"image_button[7,1.5;1,1;mylandscaping_patio2.png;patio2; ]"..
"image_button[8,1.5;1,1;mylandscaping_patio3.png;patio3; ]"..
"item_image_button[6,1.5;1,1;mylandscaping:stone_square;patio1; ]"..
"item_image_button[7,1.5;1,1;mylandscaping:stone_square_sm;patio2; ]"..
"item_image_button[8,1.5;1,1;mylandscaping:stone_pavers;patio3; ]"..
--Input
"label[3,4; Input]"..
@ -109,7 +109,7 @@ then
if fields["wall1"] then
make_ok = "0"
anzahl = "2"
block = "mylandscaping:rwall_left"
block = "mylandscaping:rwall_left_"
if inv:is_empty("input") then
return
end
@ -117,7 +117,7 @@ then
if fields["wall2"] then
make_ok = "0"
anzahl = "2"
block = "mylandscaping:rwall_middle"
block = "mylandscaping:rwall_middle_"
if inv:is_empty("input") then
return
end
@ -125,7 +125,7 @@ then
if fields["wall3"] then
make_ok = "0"
anzahl = "2"
block = "mylandscaping:rwall_right"
block = "mylandscaping:rwall_right_"
if inv:is_empty("input") then
return
end
@ -133,7 +133,7 @@ then
if fields["wall4"] then
make_ok = "0"
anzahl = "2"
block = "mylandscaping:rwall_corner"
block = "mylandscaping:rwall_corner_"
if inv:is_empty("input") then
return
end
@ -141,7 +141,7 @@ then
if fields["column2"] then
make_ok = "0"
anzahl = "1"
block = "mylandscaping:rwall_column_m_t"
block = "mylandscaping:rwall_column_m_t_"
if inv:is_empty("input") then
return
end
@ -149,7 +149,7 @@ then
if fields["column3"] then
make_ok = "0"
anzahl = "1"
block = "mylandscaping:rwall_column_ic_t"
block = "mylandscaping:rwall_column_ic_t_"
if inv:is_empty("input") then
return
end
@ -157,7 +157,7 @@ then
if fields["column4"] then
make_ok = "0"
anzahl = "1"
block = "mylandscaping:rwall_column_oc_t"
block = "mylandscaping:rwall_column_oc_t_"
if inv:is_empty("input") then
return
end

69
myconcrete_mixer.lua
View File

@ -61,19 +61,10 @@ on_construct = function(pos)
"list[current_name;gravel;5.5,1;1,1;]"..
"label[6.5,1;Gravel]"..
--Cement
"label[0.5,2.5;Bag Of]"..
"label[0.5,3;Cement]"..
"label[1.5,3.5; Lime]"..
"list[current_name;clay;1.5,2.5;1,1;]"..
"label[2.5,3.5; Sand]"..
"list[current_name;sand;2.5,2.5;1,1;]"..
"button[4,2.5;1,1;make;Make]"..
--Concrete
"label[5,0.5;Concrete Mixer]"..
"list[current_name;cement;5.5,2.5;1,1;]"..
"label[6.5,2.5;Cement]"..
"list[current_name;sand;5.5,2.5;1,1;]"..
"label[6.5,2.5;Sand]"..
"button[5.5,3.5;1,1;mix;Mix]"..
"list[current_name;concrete;5.5,4.5;1,1;]"..
"label[6.5,4.5;Output]"..
@ -129,18 +120,24 @@ then
make_concrete = "0"
amount2 = "2"
if inv:is_empty("gravel") or
inv:is_empty("cement") then
inv:is_empty("sand") then
return
end
end
local gravelstack = inv:get_stack("gravel", 1)
local cementstack = inv:get_stack("cement", 1)
local sandstack = inv:get_stack("sand", 1)
local concretestack = inv:get_stack("concrete", 1)
----------------------------------------------------------------------
if gravelstack:get_name()== "default:gravel" and
cementstack:get_name()== "mylandscaping:cement_bag" then
sandstack:get_name()== "default:sand" then
make_concrete = "1"
output_concrete = "myconcrete:concrete"
output_concrete = "mylandscaping:concrete_bag"
end
if gravelstack:get_name()== "default:gravel" and
sandstack:get_name()== "default:desert_sand" then
make_concrete = "1"
output_concrete = "mylandscaping:concrete_bag"
end
----------------------------------------------------------------------
@ -151,50 +148,12 @@ then
end
gravelstack:take_item()
inv:set_stack("gravel",1,gravelstack)
cementstack:take_item()
inv:set_stack("cement",1,cementstack)
end
end
if fields["make"]
then
if fields["make"] then
make_cement = "0"
amount3 = "4"
if inv:is_empty("clay") or
inv:is_empty("sand") then
return
end
end
local claystack = inv:get_stack("clay", 1)
local sandstack = inv:get_stack("sand", 1)
local cementstack = inv:get_stack("cement", 1)
----------------------------------------------------------------------
if claystack:get_name()== "myconcrete:lime" and
sandstack:get_name()== "default:sand" then
make_cement = "1"
output_cement = "mylandscaping:cement_bag"
end
if claystack:get_name()== "myconcrete:lime" and
sandstack:get_name()== "default:desert_sand" then
make_cement = "1"
output_cement = "mylandscaping:cement_bag"
end
----------------------------------------------------------------------
if make_cement == "1" then
local give = {}
for i = 0, amount3-1 do
give[i+1]=inv:add_item("cement",output_cement)
end
claystack:take_item()
inv:set_stack("clay",1,claystack)
sandstack:take_item()
inv:set_stack("sand",1,sandstack)
end
end
end
})

8
recipes.lua
View File

@ -2,8 +2,8 @@ minetest.register_craft({
output = 'mylandscaping:machine',
recipe = {
{'default:shovel_steel', 'bucket:bucket_with_water', ''},
{'default:default:steel_ingot', 'mylandscaping:cement_bag', 'default:default:steel_ingot'},
{'default:default:steel_ingot', 'default:default:steel_ingot', 'default:default:steel_ingot'},
{'default:steel_ingot', 'mylandscaping:cement_bag', 'default:steel_ingot'},
{'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'},
}
})
@ -16,7 +16,7 @@ minetest.register_craft({
}
})--]]
minetest.register_craftitem('mylandscaping:cement_bag', {
description = 'bag of cement',
minetest.register_craftitem('mylandscaping:concrete_bag', {
description = 'bag of concrete mix',
inventory_image = 'mylandscaping_cement_bag.png',
})

2
walls.lua
View File

@ -79,7 +79,7 @@ for i in ipairs (block_mat) do
minetest.register_node('mylandscaping:rwall_'..typ..mat, {
minetest.register_node('mylandscaping:rwall_'..typ.."_"..mat, {
description = desc1..' Retaining Wall '..desc2,
drawtype = 'mesh',
mesh = 'mylandscaping_'..obj..'.obj',