Minecraft: added minecraft 1.12 recipes (#4271)

* 1.12 changes

* fix image extension

* fix regex

* Fix tests

I made a PR after this one which made this goodie triggered when the British spelling of colour is used.

I added these two tests, which aren't compatible with your PR. I'm pushing these changes which should fix the test failures.
master
122131 2017-08-24 00:59:04 +02:00 committed by Rob Emery
parent 43b126fbe3
commit 57033cca97
4 changed files with 20 additions and 12 deletions

View File

@ -182,10 +182,10 @@
"localImage": "yes"
},
{
"name": "Colored Hardened Clay",
"regex": "(?:(colou?red|white|orange|magenta|light ?blue|yellow|lime|pink|gray|light ?gray|cyan|purple|blue|brown|green|red|black) ?(hard(ened)?|stained) ?clay)",
"imageName": "colored-hardened-clay.png",
"ingredients": "8 Hardened Clay + 1 Dye",
"name": "Colored Terracotta",
"regex": "(?:(colou?red|white|orange|magenta|light ?blue|yellow|lime|pink|gray|light ?gray|cyan|purple|blue|brown|green|red|black) (hard(ened)?|stained)? ?(clay|terracottas?))",
"imageName": "colored-terracotta.gif",
"ingredients": "8 Terracotta + 1 Dye",
"description": "Used as decoration or building material.",
"localImage": "yes"
},
@ -1261,6 +1261,14 @@
"ingredients": "1 Shulker Box + 1 Dye",
"description": "Block that will store and transport items. It keeps the items when broken, which can be retrieved when placed again.",
"localImage": "yes"
},
{
"name": "Concrete Powder",
"regex": "(?:(colored|white|orange|magenta|light ?blue|yellow|lime|pink|gray|light ?gray|cyan|blue|brown|green|red|black) ?Concretes? ?Powders? ?(Blocks?)?)",
"imageName": "concrete-powder-incomplete.gif",
"ingredients": "4 Sand + 4 Gravel + 1 Dye",
"description": "Block affected by gravity. If a concrete powder block comes into contact with water, it will solidify into a block of concrete.",
"localImage": "yes"
}
]
}

View File

Before

Width:  |  Height:  |  Size: 57 KiB

After

Width:  |  Height:  |  Size: 57 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 335 KiB

View File

@ -127,26 +127,26 @@ ddg_goodie_test(
'minecraft make colored hard clay' =>
test_zci(
'Minecraft Colored Hardened Clay ingredients: 8 Hardened Clay + 1 Dye.'
'Minecraft Colored Terracotta ingredients: 8 Terracotta + 1 Dye.'
,
make_structured_answer(
"Colored Hardened Clay",
"8 Hardened Clay + 1 Dye",
"Colored Terracotta",
"8 Terracotta + 1 Dye",
"Used as decoration or building material.",
"/share/goodie/minecraft/999/images/colored-hardened-clay.png",
"/share/goodie/minecraft/999/images/colored-terracotta.gif",
)
),
# Same as last but with british spelling of colour
'minecraft make coloured hard clay' =>
test_zci(
'Minecraft Colored Hardened Clay ingredients: 8 Hardened Clay + 1 Dye.'
'Minecraft Colored Terracotta ingredients: 8 Terracotta + 1 Dye.'
,
make_structured_answer(
"Colored Hardened Clay",
"8 Hardened Clay + 1 Dye",
"Colored Terracotta",
"8 Terracotta + 1 Dye",
"Used as decoration or building material.",
"/share/goodie/minecraft/999/images/colored-hardened-clay.png",
"/share/goodie/minecraft/999/images/colored-terracotta.gif",
)
),